Merge pull request #8619 from OpenMined/reverse_release_changes

Reverted changes for the latest release
OpenMined · Mar 22, 2024 · e17a041 · e17a041
2 parents e176cf3 + 2f1302c
commit e17a041
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 38 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.5
+current_version = 0.8.6-beta.0
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml
@@ -293,11 +293,11 @@ jobs:
         run: |
           pip install --upgrade tox tox-uv==1.5.1
 
-      # - name: Run syft backend base image building test
-      #   if: steps.changes.outputs.stack == 'true'
-      #   timeout-minutes: 60
-      #   run: |
-      #     tox -e backend.test.basecpu
+      - name: Run syft backend base image building test
+        if: steps.changes.outputs.stack == 'true'
+        timeout-minutes: 60
+        run: |
+          tox -e backend.test.basecpu
 
   pr-tests-notebook-stack:
     strategy:

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

diff --git a/notebooks/api/0.8/10-container-images.ipynb b/notebooks/api/0.8/10-container-images.ipynb
@@ -131,8 +131,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "custom_dockerfile_str = \"\"\"\n",
-    "FROM openmined/grid-backend:0.8.5-beta.10\n",
+    "custom_dockerfile_str = f\"\"\"\n",
+    "FROM openmined/grid-backend:{syft_base_worker_tag}\n",
     "\n",
     "RUN pip install pydicom\n",
     "\n",
@@ -1108,8 +1108,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "custom_dockerfile_str_2 = \"\"\"\n",
-    "FROM openmined/grid-backend:0.8.5-beta.10\n",
+    "custom_dockerfile_str_2 = f\"\"\"\n",
+    "FROM openmined/grid-backend:{syft_base_worker_tag}\n",
     "\n",
     "RUN pip install opendp\n",
     "\"\"\".strip()\n",
@@ -1260,8 +1260,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "custom_dockerfile_str_3 = \"\"\"\n",
-    "FROM openmined/grid-backend:0.8.5-beta.10\n",
+    "custom_dockerfile_str_3 = f\"\"\"\n",
+    "FROM openmined/grid-backend:{syft_base_worker_tag}\n",
     "\n",
     "RUN pip install recordlinkage\n",
     "\"\"\".strip()\n",

diff --git a/packages/grid/VERSION b/packages/grid/VERSION
@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.5"
+__version__ = "0.8.6-beta.0"
 # 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"
+ARG SYFT_VERSION_TAG="0.8.6-beta.0"
 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"
+  VERSION: "0.8.6-beta.0"
 
 # 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",
+  "version": "0.8.6-beta.0",
   "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"
-appVersion: "0.8.5"
+version: "0.8.6-beta.0"
+appVersion: "0.8.6-beta.0"
 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
+  version: 0.8.6-beta.0
 
   # 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
+  VERSION: 0.8.6-beta.0
   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
+      image: docker.io/openmined/grid-backend:0.8.6-beta.0
       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
+      image: docker.io/openmined/grid-frontend:0.8.6-beta.0
       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"
+LATEST_BETA_SYFT = "0.8.6-beta.0"
 
 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.112
-syft_version: 0.8.5
-dockerTag: 0.8.5
+syft_version: 0.8.6-beta.0
+dockerTag: 0.8.6-beta.0
 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
 hash: 95c17b2d0d4d2ab97727315eb1545b3fd74f8fdc
 target_dir: ~/.hagrid/PySyft/

diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = syft
-version = attr: "0.8.5"
+version = attr: "0.8.6-beta.0"
 description = Perform numpy-like analysis on data that remains in someone elses server
 author = OpenMined
 author_email = [email protected]

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"
+__version__ = "0.8.6-beta.0"
 # 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"
+__version__ = "0.8.6-beta.0"
 
 # stdlib
 from collections.abc import Callable

diff --git a/packages/syftcli/manifest.yml b/packages/syftcli/manifest.yml
@@ -1,11 +1,11 @@
 manifestVersion: 1.0
 
-syftVersion: 0.8.5
-dockerTag: 0.8.5
+syftVersion: 0.8.6-beta.0
+dockerTag: 0.8.6-beta.0
 
 images:
-  - docker.io/openmined/grid-frontend:0.8.5
-  - docker.io/openmined/grid-backend:0.8.5
+  - docker.io/openmined/grid-frontend:0.8.6-beta.0
+  - docker.io/openmined/grid-backend:0.8.6-beta.0
   - docker.io/library/mongo:7.0.4
   - docker.io/traefik:v2.10
 

diff --git a/tests/integration/container_workload/pool_image_test.py b/tests/integration/container_workload/pool_image_test.py
@@ -24,7 +24,7 @@ def test_image_build(domain_1_port) -> None:
         port=domain_1_port, email="[email protected]", password="changethis"
     )
 
-    syft_base_tag = "0.8.5-beta.10"  # {sy.__version__}
+    syft_base_tag = {sy.__version__}
 
     # Submit Docker Worker Config
     docker_config_rl = f"""
@@ -77,9 +77,9 @@ def test_pool_launch(domain_1_port) -> None:
     domain_client: DomainClient = sy.login(
         port=domain_1_port, email="[email protected]", password="changethis"
     )
-    # assert len(domain_client.worker_pools.get_all()) == 1
+    assert len(domain_client.worker_pools.get_all()) == 1
 
-    syft_base_tag = "0.8.5-beta.10"  # {sy.__version__}
+    syft_base_tag = {sy.__version__}
 
     # Submit Docker Worker Config
     docker_config_opendp = f"""
@@ -119,7 +119,7 @@ def test_pool_launch(domain_1_port) -> None:
     assert len(worker_pool_res) == 3
 
     assert all(worker.error is None for worker in worker_pool_res)
-    # assert len(domain_client.worker_pools.get_all()) == 2
+    assert len(domain_client.worker_pools.get_all()) == 2
 
     worker_pool = domain_client.worker_pools[worker_pool_name]
     assert len(worker_pool.worker_list) == 3
@@ -181,7 +181,7 @@ def test_pool_image_creation_job_requests(domain_1_port) -> None:
     assert isinstance(res, SyftSuccess)
     ds_client = sy.login(email=ds_email, password="secret_pw", port=domain_1_port)
 
-    syft_base_tag = "0.8.5-beta.10"  # {sy.__version__}
+    syft_base_tag = {sy.__version__}
 
     # the DS makes a request to create an image and a pool based on the image