Merge branch 'dev' into nodemetadatajson_fix

OpenMined · Nov 1, 2023 · abc6d0c · abc6d0c
2 parents c35217d + 29e45bd
commit abc6d0c
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 31 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.2-beta.42
+current_version = 0.8.2-beta.43
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml
@@ -51,6 +51,15 @@ jobs:
         with:
           token: ${{ secrets.SYFT_BOT_COMMIT_TOKEN }}
 
+      # free 10GB of space
+      - name: Remove unnecessary files
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          docker image prune --all --force
+          docker builder prune --all --force
+          docker system prune --all --force
+
       - name: Set up Python
         uses: actions/setup-python@v3
         with:

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.2-beta.42"
+__version__ = "0.8.2-beta.43"
 # 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.2-beta.42"
+__version__ = "0.8.2-beta.43"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml
@@ -15,13 +15,13 @@ pipelines:
     run: |-
       run_dependencies --all
       ensure_pull_secrets --all
-      build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.42 -t dev-latest
+      build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.43 -t dev-latest
       create_deployments --all
 
 vars:
   DEVSPACE_ENV_FILE: "default.env"
   CONTAINER_REGISTRY: "docker.io"
-  VERSION: "0.8.2-beta.42"
+  VERSION: "0.8.2-beta.43"
 
 # 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.2-beta.42",
+  "version": "0.8.2-beta.43",
   "private": true,
   "scripts": {
     "dev": "pnpm i && vite dev --host --port 80",

diff --git a/packages/grid/helm/repo/index.yaml b/packages/grid/helm/repo/index.yaml
@@ -1,9 +1,25 @@
 apiVersion: v1
 entries:
   syft:
+  - apiVersion: v2
+    appVersion: 0.8.2-beta.43
+    created: "2023-11-01T09:01:30.063405211Z"
+    dependencies:
+    - name: component-chart
+      repository: https://charts.devspace.sh
+      version: 0.9.1
+    description: Perform numpy-like analysis on data that remains in someone elses
+      server
+    digest: 0cf59d375012ea87f2e72d11501084d47848384d5887d61d36f87de59eb35c7b
+    icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png
+    name: syft
+    type: application
+    urls:
+    - https://openmined.github.io/PySyft/helm/syft-0.8.2-beta.43.tgz
+    version: 0.8.2-beta.43
   - apiVersion: v2
     appVersion: 0.8.2-beta.42
-    created: "2023-11-01T07:23:14.147715282Z"
+    created: "2023-11-01T09:01:30.062429802Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -19,7 +35,7 @@ entries:
     version: 0.8.2-beta.42
   - apiVersion: v2
     appVersion: 0.8.2-beta.41
-    created: "2023-11-01T07:23:14.146592088Z"
+    created: "2023-11-01T09:01:30.061160189Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -35,7 +51,7 @@ entries:
     version: 0.8.2-beta.41
   - apiVersion: v2
     appVersion: 0.8.2-beta.40
-    created: "2023-11-01T07:23:14.145052996Z"
+    created: "2023-11-01T09:01:30.059896877Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -51,7 +67,7 @@ entries:
     version: 0.8.2-beta.40
   - apiVersion: v2
     appVersion: 0.8.2-beta.39
-    created: "2023-11-01T07:23:14.143561304Z"
+    created: "2023-11-01T09:01:30.058862267Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -67,7 +83,7 @@ entries:
     version: 0.8.2-beta.39
   - apiVersion: v2
     appVersion: 0.8.2-beta.38
-    created: "2023-11-01T07:23:14.140786718Z"
+    created: "2023-11-01T09:01:30.057726556Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -83,7 +99,7 @@ entries:
     version: 0.8.2-beta.38
   - apiVersion: v2
     appVersion: 0.8.2-beta.37
-    created: "2023-11-01T07:23:14.139147726Z"
+    created: "2023-11-01T09:01:30.056581445Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -99,7 +115,7 @@ entries:
     version: 0.8.2-beta.37
   - apiVersion: v2
     appVersion: 0.8.1
-    created: "2023-11-01T07:23:14.137257436Z"
+    created: "2023-11-01T09:01:30.055357833Z"
     dependencies:
     - name: component-chart
       repository: https://charts.devspace.sh
@@ -113,4 +129,4 @@ entries:
     urls:
     - https://openmined.github.io/PySyft/helm/syft-0.8.1.tgz
     version: 0.8.1
-generated: "2023-11-01T07:23:14.135621544Z"
+generated: "2023-11-01T09:01:30.053688917Z"
diff --git a/packages/grid/helm/repo/syft-0.8.2-beta.43.tgz b/packages/grid/helm/repo/syft-0.8.2-beta.43.tgz
diff --git a/packages/grid/helm/syft/Chart.yaml b/packages/grid/helm/syft/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: syft
 description: Perform numpy-like analysis on data that remains in someone elses server
 type: application
-version: "0.8.2-beta.42"
-appVersion: "0.8.2-beta.42"
+version: "0.8.2-beta.43"
+appVersion: "0.8.2-beta.43"
 icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png
 
 dependencies:

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.2-beta.42
+      image: docker.io/openmined/grid-backend:0.8.2-beta.43
       imagePullPolicy: IfNotPresent
       resources: {}
       tty: true
@@ -57,7 +57,7 @@ spec:
       envFrom:
         - configMapRef:
             name: podman-syft-config
-      image: docker.io/openmined/grid-frontend:0.8.2-beta.42
+      image: docker.io/openmined/grid-frontend:0.8.2-beta.43
       imagePullPolicy: IfNotPresent
       resources: {}
       tty: true

diff --git a/packages/hagrid/hagrid/deps.py b/packages/hagrid/hagrid/deps.py
@@ -42,7 +42,7 @@
 from .version import __version__
 
 LATEST_STABLE_SYFT = "0.8.1"
-LATEST_BETA_SYFT = "0.8.2-beta.42"
+LATEST_BETA_SYFT = "0.8.2-beta.43"
 
 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,9 +1,9 @@
 manifestVersion: 0.1
 hagrid_version: 0.3.79
-syft_version: 0.8.2-beta.42
-dockerTag: 0.8.2-beta.42
+syft_version: 0.8.2-beta.43
+dockerTag: 0.8.2-beta.43
 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
-hash: 8841973247774a7b9dca6311c25ab84fcc017e72
+hash: 597988d661d6e607396e33b5bde007a4e00a0707
 target_dir: ~/.hagrid/PySyft/
 files:
   grid:

diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = syft
-version = attr: "0.8.2-beta.42"
+version = attr: "0.8.2-beta.43"
 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.2-beta.42"
+__version__ = "0.8.2-beta.43"
 # 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.2-beta.42"
+__version__ = "0.8.2-beta.43"
 
 # stdlib
 import pathlib

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

diff --git a/tox.ini b/tox.ini
@@ -48,6 +48,15 @@ description = Syft
 commands =
     pip list
 
+# Syft Minimal - without dev packages
+[testenv:syft-minimal]
+deps =
+    -e{toxinidir}/packages/syft
+changedir = {toxinidir}/packages/syft
+description = Syft
+commands =
+    pip list
+
 [testenv:hagrid]
 deps =
     -e{toxinidir}/packages/hagrid[dev]
@@ -356,11 +365,10 @@ commands =
 [testenv:syft.protocol.check]
 description = Syft Protocol Check
 deps =
-    {[testenv:syft]deps}
+    {[testenv:syft-minimal]deps}
 changedir = {toxinidir}/packages/syft
 allowlist_externals =
     bash
-
 setenv =
     BUMP = {env:BUMP:False}
 commands =