Merge branch 'dev' into syft_error_improvements

OpenMined · Jun 27, 2024 · 987d144 · 987d144
2 parents c06d798 + ee68336
commit 987d144
Show file tree

Hide file tree

Showing 203 changed files with 5,850 additions and 10,286 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.7-beta.10
+current_version = 0.8.7-beta.13
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.github/workflows/cd-docs.yml b/.github/workflows/cd-docs.yml
@@ -27,7 +27,7 @@ jobs:
 
  - name: Install tox
  run: |
- pip install --upgrade pip uv==0.1.35 tox tox-uv==1.5.1
+ pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0
  uv --version
 
  - name: Build the docs

diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml
@@ -132,7 +132,7 @@ jobs:
 
  - name: Install tox
  run: |
- pip install --upgrade pip uv==0.1.35 tox tox-uv==1.5.1
+ pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0
 
  - name: Run K8s tests
  env:
@@ -193,7 +193,7 @@ jobs:
 
  - name: Install tox and uv
  run: |
- pip install --upgrade pip uv==0.1.35 tox tox-uv==1.5.1 tox-current-env
+ pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0 tox-current-env
 
  - name: Run unit tests
  run: |

diff --git a/.github/workflows/cd-syft-dev.yml b/.github/workflows/cd-syft-dev.yml
@@ -84,7 +84,7 @@ jobs:
  echo "GRID_VERSION=$(python packages/grid/VERSION)" >> $GITHUB_OUTPUT
 
  - name: Build and push `syft` image to registry
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages
  file: ./packages/grid/syft-client/syft.Dockerfile
@@ -95,7 +95,7 @@ jobs:
  ${{ secrets.ACR_SERVER }}/openmined/syft-client:${{ steps.grid.outputs.GRID_VERSION }}
 
  - name: Build and push `grid-backend` image to registry
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages
  file: ./packages/grid/backend/backend.dockerfile
@@ -107,7 +107,7 @@ jobs:
  ${{ secrets.ACR_SERVER }}/openmined/grid-backend:${{ steps.grid.outputs.GRID_VERSION }}
 
  - name: Build and push `grid-frontend` image to registry
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages/grid/frontend
  file: ./packages/grid/frontend/frontend.dockerfile
@@ -119,7 +119,7 @@ jobs:
  target: grid-ui-development
 
  - name: Build and push `grid-seaweedfs` image to registry
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages/grid/seaweedfs
  file: ./packages/grid/seaweedfs/seaweedfs.dockerfile
@@ -130,7 +130,7 @@ jobs:
  ${{ secrets.ACR_SERVER }}/openmined/grid-seaweedfs:${{ steps.grid.outputs.GRID_VERSION }}
 
  - name: Build and push `grid-enclave-attestation` image to registry
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages/grid/enclave/attestation
  file: ./packages/grid/enclave/attestation/attestation.dockerfile
@@ -164,7 +164,7 @@ jobs:
  helm version
 
  # install tox
- python -m pip install --upgrade pip
+ python -m pip install --upgrade pip==24.0
  pip install tox
 
  tox -e syft.build.helm

diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml
@@ -112,7 +112,8 @@ jobs:
  run: |
  sudo apt update -y
  sudo apt install software-properties-common -y
- sudo apt install gcc -y
+ sudo apt install gcc curl -y
+ sudo apt-get install python3-dev -y
 
  - name: Setup Python on arm64
  if: ${{ endsWith(matrix.runner, '-arm64') }}
@@ -133,7 +134,7 @@ jobs:
 
  - name: Install dependencies
  run: |
- pip install --upgrade pip uv==0.1.35 bump2version tox tox-uv==1.5.1
+ pip install --upgrade pip==24.0 uv==0.2.13 bump2version tox tox-uv==1.9.0
  uv --version
 
  - name: Get Release tag
@@ -185,7 +186,7 @@ jobs:
 
  - name: Build and push `grid-backend` image to DockerHub
  id: grid-backend-build
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages
  file: ./packages/grid/backend/backend.dockerfile
@@ -203,7 +204,7 @@ jobs:
 
  - name: Build and push `grid-frontend` image to DockerHub
  id: grid-frontend-build
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages/grid/frontend
  file: ./packages/grid/frontend/frontend.dockerfile
@@ -221,7 +222,7 @@ jobs:
 
  - name: Build and push `grid-seaweedfs` image to DockerHub
  id: grid-seaweedfs-build
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages/grid/seaweedfs
  file: ./packages/grid/seaweedfs/seaweedfs.dockerfile
@@ -241,7 +242,7 @@ jobs:
  - name: Build and push `grid-enclave-attestation` image to DockerHub
  if: ${{ endsWith(matrix.runner, '-x64') }}
  id: grid-enclave-attestation-build
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages/grid/enclave/attestation
  file: ./packages/grid/enclave/attestation/attestation.dockerfile
@@ -259,7 +260,7 @@ jobs:
 
  - name: Build and push `syft` image to registry
  id: syft-build
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
  with:
  context: ./packages/
  file: ./packages/grid/syft-client/syft.Dockerfile
@@ -385,7 +386,7 @@ jobs:
  python-version: "3.12"
  - name: Install dependencies
  run: |
- pip install --upgrade pip uv==0.1.35 tox tox-uv==1.5.1 setuptools wheel twine bump2version PyYAML
+ pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0 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
@@ -65,7 +65,7 @@ jobs:
  - name: Install dependencies
  if: ${{steps.get-hashes.outputs.current_hash != steps.get-hashes.outputs.previous_hash }}
  run: |
- python -m pip install --upgrade pip
+ python -m pip install --upgrade pip==24.0
  pip install --upgrade tox setuptools wheel twine bump2version PyYAML
 
  - name: Bump the Version
@@ -121,7 +121,7 @@ jobs:
 
  - name: Install build dependencies for syftcli
  run: |
- pip install --upgrade pip
+ pip install --upgrade pip==24.0
 
  - name: Install Tox
  run: |

diff --git a/.github/workflows/e2e-tests-notebook.yml b/.github/workflows/e2e-tests-notebook.yml
@@ -63,7 +63,7 @@ jobs:
 
  - name: Install Deps
  run: |
- pip install --upgrade pip uv==0.1.35 tox tox-uv==1.5.1
+ pip install --upgrade pip==24.0 uv==0.2.13 tox tox-uv==1.9.0
 
  - name: Get pip cache dir
  id: pip-cache

diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml
@@ -46,7 +46,7 @@ jobs:
  - name: Upgrade pip
  if: steps.changes.outputs.frontend == 'true'
  run: |
- pip install --upgrade pip uv==0.1.35
+ pip install --upgrade pip==24.0 uv==0.2.13
  uv --version
 
  - name: Get pip cache dir
@@ -67,12 +67,12 @@ jobs:
 
  - name: Docker on MacOS
  if: steps.changes.outputs.frontend == 'true' && matrix.os == 'macos-latest'
- uses: crazy-max/ghaction-setup-docker@v3.2.0
+ uses: crazy-max/ghaction-setup-docker@v3.3.0
 
  - name: Install Tox
  if: steps.changes.outputs.frontend == 'true'
  run: |
- pip install --upgrade tox tox-uv==1.5.1
+ pip install --upgrade tox tox-uv==1.9.0
 
  - name: Remove existing containers
  if: steps.changes.outputs.frontend == 'true'

diff --git a/.github/workflows/pr-tests-helm-lint.yml b/.github/workflows/pr-tests-helm-lint.yml
@@ -33,7 +33,7 @@ jobs:
  brew install kube-linter FairwindsOps/tap/polaris
 
  # Install python deps
- pip install --upgrade pip
+ pip install --upgrade pip==24.0
  pip install tox
 
  kube-linter version

diff --git a/.github/workflows/pr-tests-helm-upgrade.yml b/.github/workflows/pr-tests-helm-upgrade.yml
@@ -37,7 +37,7 @@ jobs:
  brew update
 
  # Install python deps
- pip install --upgrade pip
+ pip install --upgrade pip==24.0
  pip install tox
 
  # Install kubernetes

diff --git a/.github/workflows/pr-tests-linting.yml b/.github/workflows/pr-tests-linting.yml
@@ -29,7 +29,7 @@ jobs:
 
  - name: Install pip packages
  run: |
- pip install --upgrade pip uv==0.1.35
+ pip install --upgrade pip==24.0 uv==0.2.13
  uv --version
 
  - name: Get pip cache dir
@@ -49,7 +49,7 @@ jobs:
 
  - name: Install Tox
  run: |
- pip install --upgrade tox tox-uv==1.5.1
+ pip install --upgrade tox tox-uv==1.9.0
 
  - uses: pre-commit/[email protected]
 

diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml
@@ -52,7 +52,7 @@ jobs:
  - name: Upgrade pip
  if: steps.changes.outputs.stack == 'true'
  run: |
- pip install --upgrade pip uv==0.1.35
+ pip install --upgrade pip==24.0 uv==0.2.13
  uv --version
 
  - name: Get pip cache dir
@@ -74,7 +74,7 @@ jobs:
  - name: Install tox
  if: steps.changes.outputs.stack == 'true'
  run: |
- pip install --upgrade tox tox-uv==1.5.1
+ pip install --upgrade tox tox-uv==1.9.0
 
  - name: Run syft backend base image building test
  if: steps.changes.outputs.stack == 'true'
@@ -113,7 +113,7 @@ jobs:
  - name: Upgrade pip
  if: steps.changes.outputs.stack == 'true'
  run: |
- pip install --upgrade pip uv==0.1.35
+ pip install --upgrade pip==24.0 uv==0.2.13
  uv --version
 
  - name: Get pip cache dir
@@ -135,7 +135,7 @@ jobs:
  - name: Install tox
  if: steps.changes.outputs.stack == 'true'
  run: |
- pip install --upgrade tox tox-uv==1.5.1
+ pip install --upgrade tox tox-uv==1.9.0
 
  - name: Run Syft Integration Tests
  if: steps.changes.outputs.stack == 'true'
@@ -200,7 +200,7 @@ jobs:
  - name: Upgrade pip
  if: steps.changes.outputs.stack == 'true'
  run: |
- pip install --upgrade pip uv==0.1.35
+ pip install --upgrade pip==24.0 uv==0.2.13
  uv --version
 
  - name: Get pip cache dir
@@ -222,7 +222,7 @@ jobs:
  - name: Install tox
  if: steps.changes.outputs.stack == 'true'
  run: |
- pip install --upgrade tox tox-uv==1.5.1
+ pip install --upgrade tox tox-uv==1.9.0
 
  - name: Install kubectl
  if: steps.changes.outputs.stack == 'true'
@@ -353,7 +353,7 @@ jobs:
  - name: Upgrade pip
  if: steps.changes.outputs.stack == 'true'
  run: |
- pip install --upgrade pip uv==0.1.35
+ pip install --upgrade pip==24.0 uv==0.2.13
  uv --version
 
  - name: Get pip cache dir
@@ -375,7 +375,7 @@ jobs:
  - name: Install tox
  if: steps.changes.outputs.stack == 'true'
  run: |
- pip install --upgrade tox tox-uv==1.5.1
+ pip install --upgrade tox tox-uv==1.9.0
 
  - name: Install kubectl
  if: steps.changes.outputs.stack == 'true'