Merge branch 'dev' into network-test

OpenMined · Apr 2, 2024 · 32724a6 · 32724a6
2 parents 1cc6e53 + 8c2c819
commit 32724a6
Show file tree

Hide file tree

Showing 30 changed files with 1,754 additions and 1,729 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.5-post.1
+current_version = 0.8.5-post.2
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.bumpversion_stable.cfg b/.bumpversion_stable.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.5-post.1
+current_version = 0.8.5-post.2
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.github/workflows/cd-post-release-tests.yml b/.github/workflows/cd-post-release-tests.yml
@@ -8,15 +8,30 @@ on:
         required: true
         type: string
 
+      release_platform:
+        description: "Release Platform"
+        required: true
+        type: choice
+        options:
+          - "REAL_PYPI"
+          - "TEST_PYPI"
+
   workflow_call:
     inputs:
       syft_version:
         description: "Syft version to test"
         required: true
         type: string
 
+      release_platform:
+        description: "Release Platform"
+        required: true
+        type: string
+        default: "REAL_PYPI"
+
 jobs:
   notebook-test-hagrid:
+    if: github.event.inputs.release_platform == 'REAL_PYPI'
     strategy:
       max-parallel: 99
       matrix:
@@ -155,13 +170,19 @@ jobs:
 
       - name: Install Syft
         run: |
-          pip install syft==${{ inputs.syft_version }}
+          if (${{ inputs.release_platform }} == "REAL_PYPI"); then
+            pip install syft==${{ inputs.syft_version }}
+          fi
+          if (${{ inputs.release_platform }}" == "TEST_PYPI"); then
+            pip install -i https://test.pypi.org/simple/ syft==${{ inputs.syft_version }}
+          fi
 
       - name: Check Syft version
         run: |
           python -c "import syft; print(syft.__version__)"
 
   notebook-test-k8s-k3d:
+    if: github.event.inputs.release_platform == 'REAL_PYPI'
     strategy:
       max-parallel: 99
       matrix:
@@ -216,3 +237,63 @@ jobs:
           SYFT_VERSION: ${{ inputs.syft_version }}
         run: |
           tox -e syft.test.helm
+
+  # This job is used to test the syft unit tests on Test PyPi
+  syft-unit-tests:
+    strategy:
+      max-parallel: 99
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python-version: ["3.12", "3.11", "3.10"]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: System Architecture
+        run: |
+          echo "System Architecture: $(uname -m)"
+          echo "System Version: $(uname -a)"
+
+      - uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Upgrade pip
+        run: |
+          python -m pip install --upgrade --user pip
+
+      - name: Get pip cache dir
+        id: pip-cache
+        shell: bash
+        run: |
+          echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
+
+      - name: pip cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-py${{ matrix.python-version }}-
+
+      - name: Install Syft
+        env:
+          SYFT_VERSION: ${{ inputs.syft_version }}
+        run: |
+          if [[ "${{ inputs.release_platform }}" == "TEST_PYPI" ]]; then
+            pip install -i https://test.pypi.org/simple/ syft==${{ inputs.syft_version }}[data_science];
+          fi
+          if [[ "${{ inputs.release_platform }}" == "REAL_PYPI" ]]; then
+            pip install syft==${{ inputs.syft_version }}[data_science];
+          fi
+
+      - name: Install Hagrid, tox and uv
+        run: |
+          pip install -U hagrid
+          pip install --upgrade pip uv==0.1.18 tox tox-uv==1.5.1 tox-current-env
+
+      - name: Run unit tests
+        run: |
+          tox -e syft.test.unit --current-env
diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml
@@ -345,6 +345,7 @@ jobs:
 
     outputs:
       syft_version: ${{ steps.release_checks.outputs.syft_version }}
+      release_platform: ${{ github.event.inputs.release_platform }}
 
     steps:
       - name: Permission to home directory
@@ -563,3 +564,4 @@ jobs:
     uses: OpenMined/PySyft/.github/workflows/cd-post-release-tests.yml@dev
     with:
       syft_version: ${{ needs.deploy-syft.outputs.syft_version }}
+      release_platform: ${{ github.event.inputs.release_platform}}
diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ helm install ... --set ingress.class="gce"
 
 `0.9.0` - Coming soon...  
 `0.8.6` (Beta) - `dev` branch 👈🏽 <a href="https://github.com/OpenMined/PySyft/tree/dev/notebooks/api/0.8">API</a> - Coming soon...  
-`0.8.5-post.1` (Stable) - <a href="https://github.com/OpenMined/PySyft/tree/0.8.5-post.1/notebooks/api/0.8">API</a>
+`0.8.5-post.2` (Stable) - <a href="https://github.com/OpenMined/PySyft/tree/0.8.5-post.2/notebooks/api/0.8">API</a>
 
 Deprecated:
 

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
- # Mono Repo Global Version
-__version__ = "0.8.5-post.1"
+# Mono Repo Global Version
+__version__ = "0.8.5-post.2"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

diff --git a/packages/grid/VERSION b/packages/grid/VERSION
@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.5-post.1"
+__version__ = "0.8.5-post.2"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

diff --git a/packages/grid/backend/worker_cpu.dockerfile b/packages/grid/backend/worker_cpu.dockerfile
@@ -9,7 +9,7 @@
 # Later we'd want to uninstall old python, and then install a new python runtime...
 # ... but pre-built syft deps may break!
 
-ARG SYFT_VERSION_TAG="0.8.5-post.1"
+ARG SYFT_VERSION_TAG="0.8.5-post.2"
 FROM openmined/grid-backend:${SYFT_VERSION_TAG}
 
 ARG PYTHON_VERSION="3.12"

diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml
@@ -25,7 +25,7 @@ vars:
   DEVSPACE_ENV_FILE: "default.env"
   CONTAINER_REGISTRY: "docker.io"
   NODE_NAME: "mynode"
-  VERSION: "0.8.5-post.1"
+  VERSION: "0.8.5-post.2"
 
 # This is a list of `images` that DevSpace can build for this project
 # We recommend to skip image building during development (devspace dev) as much as possible

diff --git a/packages/grid/frontend/package.json b/packages/grid/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pygrid-ui",
-  "version": "0.8.5-post.1",
+  "version": "0.8.5-post.2",
   "private": true,
   "scripts": {
     "dev": "pnpm i && vite dev --host --port 80",

diff --git a/packages/grid/helm/syft/Chart.yaml b/packages/grid/helm/syft/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: syft
 description: Perform numpy-like analysis on data that remains in someone elses server
 type: application
-version: "0.8.5-post.1"
-appVersion: "0.8.5-post.1"
+version: "0.8.5-post.2"
+appVersion: "0.8.5-post.2"
 home: https://github.com/OpenMined/PySyft/
 icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png
diff --git a/packages/grid/helm/syft/values.yaml b/packages/grid/helm/syft/values.yaml
@@ -1,7 +1,7 @@
 global:
   # Affects only backend, frontend, and seaweedfs containers
   registry: docker.io
-  version: 0.8.5-post.1
+  version: 0.8.5-post.2
 
   # Force default secret values for development. DO NOT SET THIS TO FALSE IN PRODUCTION
   randomizedSecrets: true

diff --git a/packages/grid/podman/podman-kube/podman-syft-kube-config.yaml b/packages/grid/podman/podman-kube/podman-syft-kube-config.yaml
@@ -31,7 +31,7 @@ data:
   RABBITMQ_VERSION: 3
   SEAWEEDFS_VERSION: 3.59
   DOCKER_IMAGE_SEAWEEDFS: chrislusf/seaweedfs:3.55
-  VERSION: 0.8.5-post.1
+  VERSION: 0.8.5-post.2
   VERSION_HASH: unknown
   STACK_API_KEY: ""
 

diff --git a/packages/grid/podman/podman-kube/podman-syft-kube.yaml b/packages/grid/podman/podman-kube/podman-syft-kube.yaml
@@ -41,7 +41,7 @@ spec:
         - configMapRef:
             name: podman-syft-config
 
-      image: docker.io/openmined/grid-backend:0.8.5-post.1
+      image: docker.io/openmined/grid-backend:0.8.5-post.2
       imagePullPolicy: IfNotPresent
       resources: {}
       tty: true
@@ -57,7 +57,7 @@ spec:
       envFrom:
         - configMapRef:
             name: podman-syft-config
-      image: docker.io/openmined/grid-frontend:0.8.5-post.1
+      image: docker.io/openmined/grid-frontend:0.8.5-post.2
       imagePullPolicy: IfNotPresent
       resources: {}
       tty: true

diff --git a/packages/hagrid/hagrid/deps.py b/packages/hagrid/hagrid/deps.py
@@ -36,7 +36,7 @@
 from .nb_output import NBOutput
 from .version import __version__
 
-LATEST_BETA_SYFT = "0.8.5-post.1"
+LATEST_BETA_SYFT = "0.8.5-post.2"
 
 DOCKER_ERROR = """
 You are running an old version of docker, possibly on Linux. You need to install v2.

diff --git a/packages/hagrid/hagrid/manifest_template.yml b/packages/hagrid/hagrid/manifest_template.yml
@@ -1,7 +1,7 @@
 manifestVersion: 0.1
 hagrid_version: 0.3.113
-syft_version: 0.8.5-post.1
-dockerTag: 0.8.5-post.1
+syft_version: 0.8.5-post.2
+dockerTag: 0.8.5-post.2
 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
 hash: c51169a89a83506dd401442a3900c4cea5330af6
 target_dir: ~/.hagrid/PySyft/

diff --git a/packages/hagrid/hagrid/stable_version.py b/packages/hagrid/hagrid/stable_version.py
@@ -1 +1 @@
-LATEST_STABLE_SYFT = "0.8.5-post.1"
+LATEST_STABLE_SYFT = "0.8.5-post.2"
diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = syft
-version = attr: "0.8.5-post.1"
+version = attr: "0.8.5-post.2"
 description = Perform numpy-like analysis on data that remains in someone elses server
 author = OpenMined
 author_email = info@openmined.org

diff --git a/packages/syft/src/syft/VERSION b/packages/syft/src/syft/VERSION
@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.5-post.1"
+__version__ = "0.8.5-post.2"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

diff --git a/packages/syft/src/syft/__init__.py b/packages/syft/src/syft/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.8.5-post.1"
+__version__ = "0.8.5-post.2"
 
 # stdlib
 from collections.abc import Callable

diff --git a/packages/syft/src/syft/protocol/data_protocol.py b/packages/syft/src/syft/protocol/data_protocol.py
@@ -458,6 +458,7 @@ def revert_latest_protocol(self) -> Result[SyftSuccess, SyftError]:
 
         # Save history
         self.save_history(protocol_history)
+        self.load_state()
 
     def check_protocol(self) -> Result[SyftSuccess, SyftError]:
         if len(self.diff) != 0: