Merge branch 'main' into add-ci-e2e-test-containers

.github/CODEOWNERS

@@ -15,6 +15,9 @@ README.md @jafermarq @tanertopal @danieljanes
 # Flower Examples
 /examples @jafermarq @tanertopal @danieljanes
 
+# Flower Templates
+/src/py/flwr/cli/new/templates @jafermarq @tanertopal @danieljanes
+
 # Changelog
 /doc/source/ref-changelog.md @jafermarq @tanertopal @danieljanes
 

.github/workflows/_docker-build.yml

@@ -60,8 +60,24 @@ jobs:
           hash = hashlib.sha256('''${{ inputs.namespace-repository }}
           ${{ inputs.file-dir }}
           ${{ inputs.build-args }}'''.encode())
+          # Adds two spaces to the line breaks to ensure proper indentation
+          # when passing the multi-line string to the wretry.action.
+          # Without it, the multi-line string is passed like this:
+          #
+          # build-args: |
+          #   ARG1=
+          # ARG2=
+          # ARG3=
+          #
+          # This causes the Docker action to interpret ARG2 and ARG3 as keys instead
+          # of values ​​of the multi-line string.
+          build_args = '''${{ inputs.build-args }}'''.replace("\n", "\n  ")
+
           with open(os.environ['GITHUB_OUTPUT'], 'a') as fh:
               print(f"id={hash.hexdigest()}", file=fh)
+              print("build-args<<EOF", file=fh)
+              print(build_args, file=fh)
+              print("EOF", file=fh)
 
       - name: Set up QEMU
         if: matrix.platform.qemu != ''
@@ -85,19 +101,24 @@ jobs:
           password: ${{ secrets.dockerhub-token }}
 
       - name: Build and push
+        uses: Wandalen/wretry.action@6feedb7dedadeb826de0f45ff482b53b379a7844 # v3.5.0
         id: build
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
         with:
-          pull: true
-          platforms: ${{ matrix.platform.docker }}
-          context: "{{defaultContext}}:${{ inputs.file-dir }}"
-          build-args: ${{ inputs.build-args }}
-          outputs: type=image,name=${{ inputs.namespace-repository }},push-by-digest=true,name-canonical=true,push=true
+          action: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
+          attempt_limit: 60 # 60 attempts * (9 secs delay + 1 sec retry) = ~10 mins
+          attempt_delay: 9000 # 9 secs
+          with: |
+            pull: true
+            platforms: ${{ matrix.platform.docker }}
+            context: "{{defaultContext}}:${{ inputs.file-dir }}"
+            outputs: type=image,name=${{ inputs.namespace-repository }},push-by-digest=true,name-canonical=true,push=true
+            build-args: |
+              ${{ steps.build-id.outputs.build-args }}
 
       - name: Export digest
         run: |
           mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
+          digest="${{ fromJSON(steps.build.outputs.outputs).digest }}"
           touch "/tmp/digests/${digest#sha256:}"
 
       - name: Upload digest

.github/workflows/release-nightly.yml

@@ -3,7 +3,6 @@ name: Release nightly
 on:
   schedule:
     - cron: "0 23 * * *"
-    - cron: "30 23 * * *"
 
 env:
   FLWR_TELEMETRY_ENABLED: 0
@@ -25,15 +24,11 @@ jobs:
         id: bootstrap
         uses: ./.github/actions/bootstrap
       - name: Release nightly
-        if: github.event.schedule == '0 23 * * *'
+        id: release
         env:
           PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-        run: ./dev/publish-nightly.sh
-      - name: Read nightly version and name
-        if: github.event.schedule == '30 23 * * *'
-        id: release
         run: |
-          RESULT=$(./dev/publish-nightly.sh --skip-publish)
+          RESULT=$(./dev/publish-nightly.sh)
           if [ "$RESULT" == "There were no commits in the last 24 hours." ]; then
             echo "skip=true" >> $GITHUB_OUTPUT
           fi
@@ -45,7 +40,7 @@ jobs:
 
   build-docker-base-images:
     name: Build nightly base images
-    if: github.repository == 'adap/flower' && needs.release-nightly.outputs.skip != 'true' && github.event.schedule == '30 23 * * *'
+    if: github.repository == 'adap/flower' && needs.release-nightly.outputs.skip != 'true'
     uses: ./.github/workflows/_docker-build.yml
     needs: release-nightly
     with:
@@ -65,7 +60,7 @@ jobs:
 
   build-docker-binary-images:
     name: Build nightly binary images
-    if: github.repository == 'adap/flower' && needs.release-nightly.outputs.skip != 'true' && github.event.schedule == '30 23 * * *'
+    if: github.repository == 'adap/flower' && needs.release-nightly.outputs.skip != 'true'
     uses: ./.github/workflows/_docker-build.yml
     needs: [release-nightly, build-docker-base-images]
     strategy:

datasets/pyproject.toml

@@ -54,7 +54,7 @@ exclude = [
 [tool.poetry.dependencies]
 python = "^3.8"
 numpy = "^1.21.0"
-datasets = "^2.14.6"
+datasets = ">=2.14.6 <2.20.0"
 pillow = { version = ">=6.2.1", optional = true }
 soundfile = { version = ">=0.12.1", optional = true }
 librosa = { version = ">=0.10.0.post2", optional = true }

dev/format.sh

@@ -3,6 +3,7 @@ set -e
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../
 
 # Python
+python -m flwr_tool.init_py_fix src/py/flwr
 python -m isort --skip src/py/flwr/proto src/py
 python -m black -q --exclude src/py/flwr/proto src/py
 python -m docformatter -i -r src/py/flwr -e src/py/flwr/proto

dev/publish-nightly.sh

@@ -24,16 +24,12 @@ cd "$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"/../
 # The version name in the pyproject.toml will be appended with "-dev" and the current date.
 # The result will be a release on PyPi of the package "flwr-nightly" of version e.g.
 # "0.1.1.dev20200716" as seen at https://pypi.org/project/flwr-nightly/
-# If the script is called with the flag `--skip-publish`, the name and version are changed
-# in the pyproject.toml but the package won't be published.
 
 if [[ $(git log --since="24 hours ago" --pretty=oneline) ]]; then
     sed -i -E "s/^name = \"(.+)\"/name = \"\1-nightly\"/" pyproject.toml
     sed -i -E "s/^version = \"(.+)\"/version = \"\1.dev$(date '+%Y%m%d')\"/" pyproject.toml
-    if [ "$1" != "--skip-publish" ]; then
-        python -m poetry build
-        python -m poetry publish -u __token__ -p $PYPI_TOKEN
-    fi
+    python -m poetry build
+    python -m poetry publish -u __token__ -p $PYPI_TOKEN
 else
     echo "There were no commits in the last 24 hours."
 fi