From 69bcec69c2158196bf0f5c5e405812c2705279c8 Mon Sep 17 00:00:00 2001 From: teo Date: Fri, 22 Mar 2024 10:40:38 +0200 Subject: [PATCH 1/6] bumped version to 0.8.5 --- .bumpversion.cfg | 2 +- .bumpversion_stable.cfg | 6 +++--- VERSION | 2 +- packages/grid/VERSION | 2 +- packages/grid/backend/worker_cpu.dockerfile | 2 +- packages/grid/devspace.yaml | 2 +- packages/grid/frontend/package.json | 2 +- packages/grid/helm/syft/Chart.yaml | 4 ++-- packages/grid/helm/syft/values.yaml | 2 +- .../grid/podman/podman-kube/podman-syft-kube-config.yaml | 2 +- packages/grid/podman/podman-kube/podman-syft-kube.yaml | 4 ++-- packages/hagrid/hagrid/cache.py | 4 ++-- packages/hagrid/hagrid/deps.py | 2 +- packages/hagrid/hagrid/manifest_template.yml | 4 ++-- packages/hagrid/hagrid/stable_version.py | 2 +- packages/syft/setup.cfg | 2 +- packages/syft/src/syft/VERSION | 2 +- packages/syft/src/syft/__init__.py | 2 +- packages/syft/src/syft/stable_version.py | 2 +- packages/syftcli/manifest.yml | 8 ++++---- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f2017a5fea8..cbc01bc6a4e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.5-beta.10 +current_version = 0.8.5 tag = False tag_name = {new_version} commit = True diff --git a/.bumpversion_stable.cfg b/.bumpversion_stable.cfg index d5ac2112d98..17db13dc3a6 100644 --- a/.bumpversion_stable.cfg +++ b/.bumpversion_stable.cfg @@ -1,15 +1,15 @@ [bumpversion] -current_version = 0.8.4 +current_version = 0.8.5 tag = False tag_name = {new_version} commit = True -parse = +parse = (?P\d+) \. (?P\d+) \. (?P\d+) -serialize = +serialize = {major}.{minor}.{patch} [bumpversion:file:packages/syft/src/syft/stable_version.py] diff --git a/VERSION b/VERSION index 7e223c385b9..6e8df740b30 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.5-beta.10" +__version__ = "0.8.5" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/packages/grid/VERSION b/packages/grid/VERSION index 3a6b1b83053..65e777033eb 100644 --- a/packages/grid/VERSION +++ b/packages/grid/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.5-beta.10" +__version__ = "0.8.5" # 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 index 25817600671..9548cb3c495 100644 --- 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-beta.10" +ARG SYFT_VERSION_TAG="0.8.5" FROM openmined/grid-backend:${SYFT_VERSION_TAG} ARG PYTHON_VERSION="3.12" diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml index 8624875b09f..55bf820e175 100644 --- 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-beta.10" + VERSION: "0.8.5" # 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 index 3c6c53e5797..f6497bc88e0 100644 --- a/packages/grid/frontend/package.json +++ b/packages/grid/frontend/package.json @@ -1,6 +1,6 @@ { "name": "pygrid-ui", - "version": "0.8.5-beta.10", + "version": "0.8.5", "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 index 88753c6c4e1..be6a64339d2 100644 --- 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-beta.10" -appVersion: "0.8.5-beta.10" +version: "0.8.5" +appVersion: "0.8.5" 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 index 7625c9be08e..f1f7f495eb5 100644 --- 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-beta.10 + version: 0.8.5 # 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 index 0d1612eec58..2ce4da02edb 100644 --- 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-beta.10 + VERSION: 0.8.5 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 index 418eaca3bc2..f0bfef40555 100644 --- 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-beta.10 + image: docker.io/openmined/grid-backend:0.8.5 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-beta.10 + image: docker.io/openmined/grid-frontend:0.8.5 imagePullPolicy: IfNotPresent resources: {} tty: true diff --git a/packages/hagrid/hagrid/cache.py b/packages/hagrid/hagrid/cache.py index d2a9c0487f9..7d20b1b205f 100644 --- a/packages/hagrid/hagrid/cache.py +++ b/packages/hagrid/hagrid/cache.py @@ -3,8 +3,8 @@ import os from typing import Any -STABLE_BRANCH = "0.8.4" -DEFAULT_BRANCH = "0.8.4" +STABLE_BRANCH = "0.8.5" +DEFAULT_BRANCH = "0.8.5" DEFAULT_REPO = "OpenMined/PySyft" arg_defaults = { diff --git a/packages/hagrid/hagrid/deps.py b/packages/hagrid/hagrid/deps.py index 3b6a1a657ad..0c2ad796cba 100644 --- 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-beta.10" +LATEST_BETA_SYFT = "0.8.5" 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 index a6facca1628..43ce36e6554 100644 --- 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-beta.10 -dockerTag: 0.8.5-beta.10 +syft_version: 0.8.5 +dockerTag: 0.8.5 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/ hash: 95c17b2d0d4d2ab97727315eb1545b3fd74f8fdc target_dir: ~/.hagrid/PySyft/ diff --git a/packages/hagrid/hagrid/stable_version.py b/packages/hagrid/hagrid/stable_version.py index f9772cfc6a3..6ab7dba0f59 100644 --- a/packages/hagrid/hagrid/stable_version.py +++ b/packages/hagrid/hagrid/stable_version.py @@ -1 +1 @@ -LATEST_STABLE_SYFT = "0.8.4" +LATEST_STABLE_SYFT = "0.8.5" diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg index 8ab47ba1c43..45e499f7e0e 100644 --- a/packages/syft/setup.cfg +++ b/packages/syft/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = syft -version = attr: "0.8.5-beta.10" +version = attr: "0.8.5" 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 index 3a6b1b83053..65e777033eb 100644 --- a/packages/syft/src/syft/VERSION +++ b/packages/syft/src/syft/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.5-beta.10" +__version__ = "0.8.5" # 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 index eaa749ec91a..1b88457eb56 100644 --- a/packages/syft/src/syft/__init__.py +++ b/packages/syft/src/syft/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.8.5-beta.10" +__version__ = "0.8.5" # stdlib from collections.abc import Callable diff --git a/packages/syft/src/syft/stable_version.py b/packages/syft/src/syft/stable_version.py index f9772cfc6a3..6ab7dba0f59 100644 --- a/packages/syft/src/syft/stable_version.py +++ b/packages/syft/src/syft/stable_version.py @@ -1 +1 @@ -LATEST_STABLE_SYFT = "0.8.4" +LATEST_STABLE_SYFT = "0.8.5" diff --git a/packages/syftcli/manifest.yml b/packages/syftcli/manifest.yml index 01eed9ddbca..44a90115702 100644 --- a/packages/syftcli/manifest.yml +++ b/packages/syftcli/manifest.yml @@ -1,11 +1,11 @@ manifestVersion: 1.0 -syftVersion: 0.8.5-beta.10 -dockerTag: 0.8.5-beta.10 +syftVersion: 0.8.5 +dockerTag: 0.8.5 images: - - docker.io/openmined/grid-frontend:0.8.5-beta.10 - - docker.io/openmined/grid-backend:0.8.5-beta.10 + - docker.io/openmined/grid-frontend:0.8.5 + - docker.io/openmined/grid-backend:0.8.5 - docker.io/library/mongo:7.0.4 - docker.io/traefik:v2.10 From 216965efbafb15ff306ac6ce0d10dfc880984929 Mon Sep 17 00:00:00 2001 From: teo Date: Fri, 22 Mar 2024 10:48:28 +0200 Subject: [PATCH 2/6] fix lint --- .bumpversion_stable.cfg | 4 ++-- .../src/syft/service/action/action_object.py | 10 ++++++---- .../tests/syft/transforms/transforms_test.py | 16 ++++++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.bumpversion_stable.cfg b/.bumpversion_stable.cfg index 17db13dc3a6..fd7e8aa4551 100644 --- a/.bumpversion_stable.cfg +++ b/.bumpversion_stable.cfg @@ -3,13 +3,13 @@ current_version = 0.8.5 tag = False tag_name = {new_version} commit = True -parse = +parse = (?P\d+) \. (?P\d+) \. (?P\d+) -serialize = +serialize = {major}.{minor}.{patch} [bumpversion:file:packages/syft/src/syft/stable_version.py] diff --git a/packages/syft/src/syft/service/action/action_object.py b/packages/syft/src/syft/service/action/action_object.py index caeaf450e23..42330c8d7b0 100644 --- a/packages/syft/src/syft/service/action/action_object.py +++ b/packages/syft/src/syft/service/action/action_object.py @@ -995,10 +995,12 @@ def syft_make_action( path: str, op: str, remote_self: UID | LineageID | None = None, - args: list[UID | LineageID | ActionObjectPointer | ActionObject | Any] - | None = None, - kwargs: dict[str, UID | LineageID | ActionObjectPointer | ActionObject | Any] - | None = None, + args: ( + list[UID | LineageID | ActionObjectPointer | ActionObject | Any] | None + ) = None, + kwargs: ( + dict[str, UID | LineageID | ActionObjectPointer | ActionObject | Any] | None + ) = None, action_type: ActionType | None = None, ) -> Action: """Generate new action from the information diff --git a/packages/syft/tests/syft/transforms/transforms_test.py b/packages/syft/tests/syft/transforms/transforms_test.py index 80c37a3907e..d6555dc8657 100644 --- a/packages/syft/tests/syft/transforms/transforms_test.py +++ b/packages/syft/tests/syft/transforms/transforms_test.py @@ -56,13 +56,17 @@ def test_validate_klass_and_version( else: expected_result = ( MockObjectFromSyftBaseObj.__canonical_name__, - version_from - if isinstance(klass_from, str) - else MockObjectFromSyftBaseObj.__version__, + ( + version_from + if isinstance(klass_from, str) + else MockObjectFromSyftBaseObj.__version__ + ), MockObjectToSyftBaseObj.__canonical_name__, - version_to - if isinstance(klass_to, str) - else MockObjectToSyftBaseObj.__version__, + ( + version_to + if isinstance(klass_to, str) + else MockObjectToSyftBaseObj.__version__ + ), ) result = validate_klass_and_version( klass_from, klass_to, version_from, version_to From 2a39697977e8bf664aefcbe3a641003632fc0de5 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Fri, 22 Mar 2024 16:41:47 +0530 Subject: [PATCH 3/6] hardcode syft base image version --- .../container_workload/pool_image_test.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/integration/container_workload/pool_image_test.py b/tests/integration/container_workload/pool_image_test.py index d973dc01d7e..517956d5c53 100644 --- a/tests/integration/container_workload/pool_image_test.py +++ b/tests/integration/container_workload/pool_image_test.py @@ -24,9 +24,11 @@ def test_image_build(domain_1_port) -> None: port=domain_1_port, email="info@openmined.org", password="changethis" ) + syft_base_tag = "0.8.5-beta.10" # {sy.__version__} + # Submit Docker Worker Config docker_config_rl = f""" - FROM openmined/grid-backend:{sy.__version__} + FROM openmined/grid-backend:{syft_base_tag} RUN pip install recordlinkage """ docker_config = DockerWorkerConfig(dockerfile=docker_config_rl) @@ -77,9 +79,11 @@ def test_pool_launch(domain_1_port) -> None: ) assert len(domain_client.worker_pools.get_all()) == 1 + syft_base_tag = "0.8.5-beta.10" # {sy.__version__} + # Submit Docker Worker Config docker_config_opendp = f""" - FROM openmined/grid-backend:{sy.__version__} + FROM openmined/grid-backend:{syft_base_tag} RUN pip install opendp """ docker_config = DockerWorkerConfig(dockerfile=docker_config_opendp) @@ -177,9 +181,11 @@ 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__} + # the DS makes a request to create an image and a pool based on the image docker_config_np = f""" - FROM openmined/grid-backend:{sy.__version__} + FROM openmined/grid-backend:{syft_base_tag} RUN pip install numpy """ docker_config = DockerWorkerConfig(dockerfile=docker_config_np) From 7600cacd932c136e5f5cd094e28f75df59321b5c Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Fri, 22 Mar 2024 16:46:56 +0530 Subject: [PATCH 4/6] comment backend.test.basecpu test in CI --- .github/workflows/pr-tests-stack.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index c36b3ee9e56..a6e47a320c8 100644 --- 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: From 0615acb3744886968cce5c08944520a073d1b9c8 Mon Sep 17 00:00:00 2001 From: teo Date: Fri, 22 Mar 2024 13:53:52 +0200 Subject: [PATCH 5/6] fix lint --- tests/integration/container_workload/pool_image_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/container_workload/pool_image_test.py b/tests/integration/container_workload/pool_image_test.py index 7ac600f1fbc..93a9e5c9de3 100644 --- a/tests/integration/container_workload/pool_image_test.py +++ b/tests/integration/container_workload/pool_image_test.py @@ -27,8 +27,8 @@ def test_image_build(domain_1_port) -> None: syft_base_tag = "0.8.5-beta.10" # {sy.__version__} # Submit Docker Worker Config - docker_config_rl = """ - FROM openmined/grid-backend:0.8.5-beta.10 + docker_config_rl = f""" + FROM openmined/grid-backend:{syft_base_tag} RUN pip install recordlinkage """ docker_config = DockerWorkerConfig(dockerfile=docker_config_rl) @@ -185,8 +185,8 @@ def test_pool_image_creation_job_requests(domain_1_port) -> None: # the DS makes a request to create an image and a pool based on the image - docker_config_np = """ - FROM openmined/grid-backend:0.8.5-beta.10 + docker_config_np = f""" + FROM openmined/grid-backend:{syft_base_tag} RUN pip install numpy """ docker_config = DockerWorkerConfig(dockerfile=docker_config_np) From 0b49d0848234fd9af75b4ecbffdb1023722b9d5f Mon Sep 17 00:00:00 2001 From: teo Date: Fri, 22 Mar 2024 13:57:47 +0200 Subject: [PATCH 6/6] fix lint --- tests/integration/container_workload/pool_image_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/container_workload/pool_image_test.py b/tests/integration/container_workload/pool_image_test.py index 93a9e5c9de3..ae4b4368396 100644 --- a/tests/integration/container_workload/pool_image_test.py +++ b/tests/integration/container_workload/pool_image_test.py @@ -82,8 +82,8 @@ def test_pool_launch(domain_1_port) -> None: syft_base_tag = "0.8.5-beta.10" # {sy.__version__} # Submit Docker Worker Config - docker_config_opendp = """ - FROM openmined/grid-backend:0.8.5-beta.10 + docker_config_opendp = f""" + FROM openmined/grid-backend:{syft_base_tag} RUN pip install opendp """ docker_config = DockerWorkerConfig(dockerfile=docker_config_opendp)