Merge branch 'main' into fds-rename-resplitter

.devcontainer/Dockerfile

@@ -29,8 +29,8 @@ RUN apt-get install -y curl wget gnupg python3 python-is-python3 python3-pip git
     build-essential tmux vim
 
 RUN python -m pip install \
-    pip==23.3.1 \
-    setuptools==68.2.2 \
+    pip==24.0.0 \
+    setuptools==69.5.1 \
     poetry==1.7.1
 
 USER $USERNAME

.github/CODEOWNERS

@@ -18,6 +18,9 @@ README.md @jafermarq @tanertopal @danieljanes
 # Changelog
 /doc/source/ref-changelog.md @jafermarq @tanertopal @danieljanes
 
+# Translations
+/doc/locales @charlesbvll @tanertopal @danieljanes
+
 # GitHub Actions and Workflows
 /.github/workflows @Robert-Steiner @tanertopal @danieljanes
 /.github/actions @Robert-Steiner @tanertopal @danieljanes

.github/actions/bootstrap/action.yml

@@ -6,17 +6,17 @@ inputs:
     default: 3.8
   pip-version:
     description: "Version of pip to be installed using pip"
-    default: 23.3.1
+    default: 24.0.0
   setuptools-version:
     description: "Version of setuptools to be installed using pip"
-    default: 68.2.2
+    default: 69.5.1
   poetry-version:
     description: "Version of poetry to be installed using pip"
     default: 1.7.1
   poetry-skip:
     description: "Option to skip the poetry installation"
     required: false
-    default: 'false'
+    default: "false"
 outputs:
   python-version:
     description: "Version range or exact version of Python or PyPy"

.github/workflows/_docker-build.yml

@@ -88,6 +88,7 @@ jobs:
         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 }}

.github/workflows/docker-images.yml

@@ -0,0 +1,75 @@
+name: Build docker images
+
+on:
+  workflow_dispatch:
+    inputs:
+      flwr-version:
+        description: "Version of Flower."
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  parameters:
+    name: Collect build parameters
+    runs-on: ubuntu-22.04
+    timeout-minutes: 10
+    outputs:
+      pip-version: ${{ steps.versions.outputs.pip-version }}
+      setuptools-version: ${{ steps.versions.outputs.setuptools-version }}
+      matrix: ${{ steps.matrix.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - uses: ./.github/actions/bootstrap
+        id: bootstrap
+
+      - id: versions
+        run: |
+          echo "pip-version=${{ steps.bootstrap.outputs.pip-version }}" >> "$GITHUB_OUTPUT"
+          echo "setuptools-version=${{ steps.bootstrap.outputs.setuptools-version }}" >> "$GITHUB_OUTPUT"
+
+      - id: matrix
+        run: |
+           python dev/build-docker-image-matrix.py --flwr-version ${{ github.event.inputs.flwr-version }} > matrix.json
+           echo "matrix=$(cat matrix.json)" >> $GITHUB_OUTPUT
+
+  build-base-images:
+    name: Build base images
+    uses: ./.github/workflows/_docker-build.yml
+    needs: parameters
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.parameters.outputs.matrix).base }}
+    with:
+      namespace-repository: ${{ matrix.images.namespace_repository }}
+      file-dir: ${{ matrix.images.file_dir }}
+      build-args: |
+        PYTHON_VERSION=${{ matrix.images.python_version }}
+        PIP_VERSION=${{ needs.parameters.outputs.pip-version }}
+        SETUPTOOLS_VERSION=${{ needs.parameters.outputs.setuptools-version }}
+        DISTRO=${{ matrix.images.distro.name }}
+        DISTRO_VERSION=${{ matrix.images.distro.version }}
+        FLWR_VERSION=${{ matrix.images.flwr_version }}
+      tags: ${{ matrix.images.tag }}
+    secrets:
+      dockerhub-user: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  build-binary-images:
+    name: Build binary images
+    uses: ./.github/workflows/_docker-build.yml
+    needs: [parameters, build-base-images]
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.parameters.outputs.matrix).binary }}
+    with:
+      namespace-repository: ${{ matrix.images.namespace_repository }}
+      file-dir: ${{ matrix.images.file_dir }}
+      build-args: BASE_IMAGE=${{ matrix.images.base_image }}
+      tags: ${{ matrix.images.tags }}
+    secrets:
+      dockerhub-user: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/e2e.yml

@@ -118,12 +118,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Bootstrap
-        uses: ./.github/actions/bootstrap
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
+      - name: Install build tools
+        run: |
+            python -m pip install -U pip==23.3.1
+        shell: bash
+      # Using approach described here for Python location caching:
+      # https://blog.allenai.org/python-caching-in-github-actions-e9452698e98d
+      - name: Cache Python location
+        id: cache-python
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.pythonLocation }}
+          key: pythonloc-${{ runner.os }}-${{ matrix.directory }}-${{ env.pythonLocation }}-${{ hashFiles('**/pyproject.toml') }}
+          restore-keys: |
+            pythonloc-${{ runner.os }}-${{ matrix.directory }}-${{ env.pythonLocation }}
       - name: Install dependencies
-        run: python -m poetry install
+        run: python -m pip install --upgrade .
       - name: Install Flower wheel from artifact store
         if: ${{ github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
         run: |
@@ -137,6 +151,9 @@ jobs:
       - name: Run virtual client test
         if: ${{ matrix.directory != 'bare-client-auth' }}
         run: python simulation.py
+      - name: Run simulation engine test
+        if: ${{ matrix.directory == 'pytorch' || matrix.directory == 'tensorflow'}}
+        run: python simulation_next.py
       - name: Run driver test
         if: ${{ matrix.directory != 'bare-client-auth' }}
         run: ./../test_driver.sh "${{ matrix.directory }}"