Merge branch 'dev' into eelco/bigquery-testing-jobs

OpenMined · Aug 31, 2024 · 3d43dfb · 3d43dfb
2 parents 75aa156 + cda05f8
commit 3d43dfb
Show file tree

Hide file tree

Showing 47 changed files with 1,464 additions and 721 deletions.
diff --git a/.github/workflows/cd-docs.yml b/.github/workflows/cd-docs.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Install pip dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Build the docs

diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 bump2version==1.0.1
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2 bump2version==1.0.1
           uv --version
 
       - name: Generate Release Metadata
@@ -290,7 +290,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2 setuptools wheel twine bump2version PyYAML
           uv --version
 
       - name: Bump to Final Release version

diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml
@@ -119,7 +119,7 @@ jobs:
       - name: Install pip dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -195,7 +195,7 @@ jobs:
 
       - name: Install tox and uv
         run: |
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 tox-current-env
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2 tox-current-env
 
       - name: Run unit tests
         run: |

diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml
@@ -114,7 +114,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 bump2version==1.0.1
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2 bump2version==1.0.1
           uv --version
 
       - name: Get Release tag
@@ -392,7 +392,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2 setuptools wheel twine bump2version PyYAML
           uv --version
 
       - name: Bump the Version

diff --git a/.github/workflows/cd-syftcli.yml b/.github/workflows/cd-syftcli.yml
@@ -122,7 +122,7 @@ jobs:
       - name: Install pip dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Build syftcli

diff --git a/.github/workflows/e2e-tests-notebook.yml b/.github/workflows/e2e-tests-notebook.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Install pip dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get pip cache dir

diff --git a/.github/workflows/post-merge-tasks.yml b/.github/workflows/post-merge-tasks.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Install pip packages
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Check and Bump Protocol Version

diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml
@@ -47,7 +47,7 @@ jobs:
         if: steps.changes.outputs.frontend == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir

diff --git a/.github/workflows/pr-tests-helm-lint.yml b/.github/workflows/pr-tests-helm-lint.yml
@@ -34,7 +34,7 @@ jobs:
 
           # Install python deps
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
 
           kube-linter version
           polaris version

diff --git a/.github/workflows/pr-tests-helm-upgrade.yml b/.github/workflows/pr-tests-helm-upgrade.yml
@@ -38,7 +38,7 @@ jobs:
 
           # Install python deps
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
 
           # Install kubernetes
           brew install helm k3d devspace kubectl

diff --git a/.github/workflows/pr-tests-linting.yml b/.github/workflows/pr-tests-linting.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Install pip packages
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir

diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml
@@ -53,7 +53,7 @@ jobs:
         if: steps.changes.outputs.stack == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Run syft backend base image building test
@@ -96,7 +96,7 @@ jobs:
         if: steps.changes.outputs.stack == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -179,7 +179,7 @@ jobs:
         if: steps.changes.outputs.stack == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -328,7 +328,7 @@ jobs:
         if: steps.changes.outputs.stack == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -451,11 +451,11 @@ jobs:
         run: |
           sudo python ./scripts/patch_hosts.py --add-k3d-registry
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: true
-          large-packages: false
+      # - name: Free Disk Space (Ubuntu)
+      #   uses: jlumbroso/free-disk-space@main
+      #   with:
+      #     tool-cache: true
+      #     large-packages: false
 
       # free 10GB of space
       - name: Remove unnecessary files
@@ -471,7 +471,7 @@ jobs:
         if: steps.changes.outputs.stack == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -513,6 +513,7 @@ jobs:
         timeout-minutes: 60
         env:
           GITHUB_CI: true
+          TOX_PYTHON: python${{ matrix.python-version }}
         shell: bash
         run: |
           K3D_VERSION=v5.6.3
@@ -526,6 +527,7 @@ jobs:
           curl -sSL https://github.com/loft-sh/devspace/releases/download/${DEVSPACE_VERSION}/devspace-linux-amd64 -o ./devspace
           chmod +x devspace
           devspace version
+          export PATH="/usr/share/miniconda/bin:$PATH"
           tox -e stack.test.notebook.scenario.k8s
 
       - name: Get current timestamp
@@ -595,7 +597,7 @@ jobs:
         if: steps.changes.outputs.syft == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir

diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml
@@ -66,7 +66,7 @@ jobs:
         if: steps.changes.outputs.syft == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -157,7 +157,7 @@ jobs:
         if: steps.changes.outputs.syft == 'true'  || steps.changes.outputs.notebooks == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -194,7 +194,8 @@ jobs:
       matrix:
         # Disable on windows until its flakyness is reduced.
         # os: [ubuntu-latest, macos-latest, windows-latest]
-        os: [ubuntu-latest, macos-latest]
+        # os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest] # mac wont start SMTPD mail server?
         python-version: ["3.12"]
         deployment-type: ["python"]
         bump-version: ["False"]
@@ -244,7 +245,7 @@ jobs:
         if: steps.changes.outputs.syft == 'true'  || steps.changes.outputs.notebooks_scenario == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -264,15 +265,15 @@ jobs:
             ${{ runner.os }}-uv-py${{ matrix.python-version }}-
 
       - name: Run notebook scenario tests
-        uses: nick-fields/retry@v3
         if: steps.changes.outputs.syft == 'true'  || steps.changes.outputs.notebooks_scenario == 'true'
         env:
           ORCHESTRA_DEPLOYMENT_TYPE: "${{ matrix.deployment-type }}"
           BUMP_VERSION: "${{ matrix.bump-version }}"
-        with:
-          timeout_seconds: 2400
-          max_attempts: 3
-          command: tox -e syft.test.notebook.scenario
+          TOX_PYTHON: python${{ matrix.python-version }}
+        shell: bash
+        run: |
+          export PATH="/usr/share/miniconda/bin:$PATH"
+          tox -e syft.test.notebook.scenario
 
   pr-tests-syft-notebook-scenario-sync:
     strategy:
@@ -330,7 +331,7 @@ jobs:
         if: steps.changes.outputs.syft == 'true'  || steps.changes.outputs.notebooks_scenario == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -407,7 +408,7 @@ jobs:
         if: steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir
@@ -504,7 +505,7 @@ jobs:
         if: steps.changes.outputs.syft == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
+          pip install uv==0.4.1 tox==4.18.0 tox-uv==1.11.2
           uv --version
 
       - name: Get uv cache dir