Merge branch 'dev' into fix-pythonserver-attribute-error

khoaguin · Aug 5, 2024 · c09e0d3 · c09e0d3
2 parents 4fe82eb + 1ebd845
commit c09e0d3
Show file tree

Hide file tree

Showing 82 changed files with 1,867 additions and 852 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.0-beta.3
+current_version = 0.9.1-beta.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.8
+current_version = 0.9.0
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml
@@ -346,8 +346,8 @@ jobs:
 
       - name: Copy helm repo files from Syft Repo
         run: |
-          cp packages/grid/helm/repo/index.yaml ghpages/helm/
           cp packages/grid/helm/repo/syft-${{ needs.merge-docker-images.outputs.server_version  }}.tgz ghpages/helm/
+          cd ghpages/helm && helm repo index . --url https://openmined.github.io/PySyft/helm
 
       - name: Commit changes to gh-pages
         uses: EndBug/add-and-commit@v9

diff --git a/.github/workflows/cd-syft-dev.yml b/.github/workflows/cd-syft-dev.yml
@@ -104,7 +104,7 @@ jobs:
           tags: |
             ${{ secrets.ACR_SERVER }}/openmined/syft-backend:dev
             ${{ secrets.ACR_SERVER }}/openmined/syft-backend:dev-${{ github.sha }}
-            ${{ secrets.ACR_SERVER }}/openmined/syft-backend:${{ steps.syft.outputs.SERVER_VERSION }}
+            ${{ secrets.ACR_SERVER }}/openmined/syft-backend:${{ steps.server.outputs.SERVER_VERSION }}
 
       - name: Build and push `syft-frontend` image to registry
         uses: docker/build-push-action@v6
@@ -115,7 +115,7 @@ jobs:
           tags: |
             ${{ secrets.ACR_SERVER }}/openmined/syft-frontend:dev
             ${{ secrets.ACR_SERVER }}/openmined/syft-frontend:dev-${{ github.sha }}
-            ${{ secrets.ACR_SERVER }}/openmined/syft-frontend:${{ steps.syft.outputs.SERVER_VERSION }}
+            ${{ secrets.ACR_SERVER }}/openmined/syft-frontend:${{ steps.server.outputs.SERVER_VERSION }}
           target: syft-ui-development
 
       - name: Build and push `syft-seaweedfs` image to registry
@@ -127,7 +127,7 @@ jobs:
           tags: |
             ${{ secrets.ACR_SERVER }}/openmined/syft-seaweedfs:dev
             ${{ secrets.ACR_SERVER }}/openmined/syft-seaweedfs:dev-${{ github.sha }}
-            ${{ secrets.ACR_SERVER }}/openmined/syft-seaweedfs:${{ steps.syft.outputs.SERVER_VERSION }}
+            ${{ secrets.ACR_SERVER }}/openmined/syft-seaweedfs:${{ steps.server.outputs.SERVER_VERSION }}
 
       - name: Build and push `syft-enclave-attestation` image to registry
         uses: docker/build-push-action@v6
@@ -138,7 +138,7 @@ jobs:
           tags: |
             ${{ secrets.ACR_SERVER }}/openmined/syft-enclave-attestation:dev
             ${{ secrets.ACR_SERVER }}/openmined/syft-enclave-attestation:dev-${{ github.sha }}
-            ${{ secrets.ACR_SERVER }}/openmined/syft-enclave-attestation:${{ steps.syft.outputs.SERVER_VERSION }}
+            ${{ secrets.ACR_SERVER }}/openmined/syft-enclave-attestation:${{ steps.server.outputs.SERVER_VERSION }}
 
       - name: Build Helm Chart & Copy to infra
         if: github.ref == 'refs/heads/dev' || github.event.inputs.deploy-helm == 'true'

diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml
@@ -557,8 +557,8 @@ jobs:
 
       - name: Copy helm repo files from Syft Repo
         run: |
-          cp packages/grid/helm/repo/index.yaml ghpages/helm/
           cp packages/grid/helm/repo/syft-${{ steps.release_checks.outputs.syft_version }}.tgz ghpages/helm/
+          cd ghpages/helm && helm repo index . --url https://openmined.github.io/PySyft/helm
 
       - name: Commit changes to gh-pages
         uses: EndBug/add-and-commit@v9

diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml
@@ -59,10 +59,10 @@ jobs:
       - name: Run syft backend base image building test
         if: steps.changes.outputs.stack == 'true'
         timeout-minutes: 60
-        # run: |
-        #   echo "Skipping pr image test"
         run: |
-          tox -e backend.test.basecpu
+          echo "Skipping pr image test"
+        # run: |
+        #   tox -e backend.test.basecpu
 
   pr-tests-syft-integration:
     strategy:

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

diff --git a/docs/img/Syft-Logo-Light.svg b/docs/img/Syft-Logo-Light.svg
diff --git a/docs/img/Syft-Logo.svg b/docs/img/Syft-Logo.svg
diff --git a/notebooks/api/0.8/00-load-data.ipynb b/notebooks/api/0.8/00-load-data.ipynb
@@ -30,7 +30,7 @@
    },
    "outputs": [],
    "source": [
-    "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
+    "SYFT_VERSION = \">=0.9,<1.0.0\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
     "# %pip install {package_string} -q"
    ]
@@ -732,7 +732,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.2"
+   "version": "3.11.5"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/notebooks/api/0.8/01-submit-code.ipynb b/notebooks/api/0.8/01-submit-code.ipynb
@@ -22,7 +22,7 @@
    },
    "outputs": [],
    "source": [
-    "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
+    "SYFT_VERSION = \">=0.9,<1.0.0\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
     "# %pip install {package_string} -q"
    ]

diff --git a/notebooks/api/0.8/02-review-code-and-approve.ipynb b/notebooks/api/0.8/02-review-code-and-approve.ipynb
@@ -22,7 +22,7 @@
    },
    "outputs": [],
    "source": [
-    "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
+    "SYFT_VERSION = \">=0.9,<1.0.0\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
     "# %pip install {package_string} -q"
    ]

diff --git a/notebooks/api/0.8/03-data-scientist-download-result.ipynb b/notebooks/api/0.8/03-data-scientist-download-result.ipynb
@@ -22,7 +22,7 @@
    },
    "outputs": [],
    "source": [
-    "SYFT_VERSION = \">=0.8.2.b0,<0.9\"\n",
+    "SYFT_VERSION = \">=0.9,<1.0.0\"\n",
     "package_string = f'\"syft{SYFT_VERSION}\"'\n",
     "# %pip install {package_string} -q"
    ]