Merge branch 'dev' into replace-string-0.8.3

OpenMined · Dec 7, 2023 · 74f8039 · 74f8039
2 parents 50e1907 + 1d7dd99
commit 74f8039
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 32 deletions.
diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml
@@ -1,8 +1,8 @@
 name: CD - Syft
 
 on:
-  schedule:
-    - cron: "00 12 * * */7" # At 12:00 UTC on every seven days
+  # schedule:
+  # - cron: "00 12 * * */7" # At 12:00 UTC on every seven days
 
   workflow_dispatch:
     inputs:
@@ -87,14 +87,14 @@ jobs:
           python -m pip install --upgrade pip
           pip install --upgrade  bump2version tox
 
-      - name: Bump the Version
-        id: bump-version
-        run: |
-          ls **/VERSION | xargs -I {} python {}
-          cat packages/grid/devspace.yaml | grep '0\.'
-          bump2version prenum --allow-dirty --no-commit
-          ls **/VERSION | xargs -I {} python {}
-          cat packages/grid/devspace.yaml | grep '0\.'
+      # - name: Bump the Version
+      #   id: bump-version
+      #   run: |
+      #     ls **/VERSION | xargs -I {} python {}
+      #     cat packages/grid/devspace.yaml | grep '0\.'
+      #     bump2version prenum --allow-dirty --no-commit
+      #     ls **/VERSION | xargs -I {} python {}
+      #     cat packages/grid/devspace.yaml | grep '0\.'
 
       - name: Generate Release Metadata
         id: release_metadata
@@ -289,16 +289,16 @@ jobs:
           python -m pip install --upgrade pip
           pip install --upgrade tox setuptools wheel twine bump2version PyYAML
 
-      - name: Bump the Version
-        id: bump-version
-        run: |
-          ls **/VERSION | xargs -I {} python {}
-          cat packages/grid/devspace.yaml | grep '0\.'
-          bump2version prenum --allow-dirty --no-commit
-          tox -e lint || true
-          ls **/VERSION | xargs -I {} python {}
-          cat packages/grid/devspace.yaml | grep '0\.'
-          python packages/hagrid/scripts/update_manifest.py $(python packages/grid/VERSION)
+      # - name: Bump the Version
+      #   id: bump-version
+      #   run: |
+      #     ls **/VERSION | xargs -I {} python {}
+      #     cat packages/grid/devspace.yaml | grep '0\.'
+      #     bump2version prenum --allow-dirty --no-commit
+      #     tox -e lint || true
+      #     ls **/VERSION | xargs -I {} python {}
+      #     cat packages/grid/devspace.yaml | grep '0\.'
+      #     python packages/hagrid/scripts/update_manifest.py $(python packages/grid/VERSION)
 
       - name: Check Protocol Version
         run: |
@@ -352,13 +352,13 @@ jobs:
         run: |
           python scripts/convert_to_pypi_readme.py --input-file  packages/syft/README.md --output-file packages/syft/PYPI.md --version ${{ steps.release_checks.outputs.future_stable_version }}
 
-      - name: Commit changes to Syft
-        uses: EndBug/add-and-commit@v9
-        with:
-          author_name: ${{ secrets.OM_BOT_NAME }}
-          author_email: ${{ secrets.OM_BOT_EMAIL }}
-          message: "[syft]bump version"
-          add: "['.bumpversion.cfg', 'VERSION', 'packages/grid/VERSION','packages/syft/PYPI.md', 'packages/grid/devspace.yaml', 'packages/syft/src/syft/VERSION', 'packages/syft/setup.cfg', 'packages/grid/frontend/package.json', 'packages/syft/src/syft/__init__.py', 'packages/hagrid/hagrid/manifest_template.yml', 'packages/grid/helm/syft/Chart.yaml','packages/grid/helm/repo', 'packages/hagrid/hagrid/deps.py', 'packages/grid/podman/podman-kube/podman-syft-kube.yaml' ,'packages/grid/podman/podman-kube/podman-syft-kube-config.yaml', 'packages/syftcli/manifest.yml', 'packages/syft/src/syft/protocol/protocol_version.json', 'packages/grid/backend/worker_cpu.dockerfile']"
+      # - name: Commit changes to Syft
+      #   uses: EndBug/add-and-commit@v9
+      #   with:
+      #     author_name: ${{ secrets.OM_BOT_NAME }}
+      #     author_email: ${{ secrets.OM_BOT_EMAIL }}
+      #     message: "[syft]bump version"
+      #     add: "['.bumpversion.cfg', 'VERSION', 'packages/grid/VERSION','packages/syft/PYPI.md', 'packages/grid/devspace.yaml', 'packages/syft/src/syft/VERSION', 'packages/syft/setup.cfg', 'packages/grid/frontend/package.json', 'packages/syft/src/syft/__init__.py', 'packages/hagrid/hagrid/manifest_template.yml', 'packages/grid/helm/syft/Chart.yaml','packages/grid/helm/repo', 'packages/hagrid/hagrid/deps.py', 'packages/grid/podman/podman-kube/podman-syft-kube.yaml' ,'packages/grid/podman/podman-kube/podman-syft-kube-config.yaml', 'packages/syftcli/manifest.yml', 'packages/syft/src/syft/protocol/protocol_version.json', 'packages/grid/backend/worker_cpu.dockerfile']"
 
       - name: Scheduled Build and Publish
         if: github.event_name == 'schedule'

diff --git a/README.md b/README.md
@@ -15,15 +15,15 @@ Perform data science on `data` that remains in `someone else's` server
 ## Install Client
 
 ```bash
-$ pip install -U syft
+$ pip install -U syft[data_science]
 ```
 
 ## Launch Server
 
 ```python
 # from Jupyter / Python
 import syft as sy
-sy.requires(">=0.8.2,<0.8.3")
+sy.requires(">=0.8.3,<0.8.4")
 node = sy.orchestra.launch(name="my-domain", port=8080, dev_mode=True, reset=True)
 ```
 
@@ -38,7 +38,7 @@ Starting syft-node server on 0.0.0.0:8080
 
 ```python
 import syft as sy
-sy.requires(">=0.8.2,<0.8.3")
+sy.requires(">=0.8.3,<0.8.4")
 domain_client = sy.login(port=8080, email="[email protected]", password="changethis")
 ```
 
@@ -119,11 +119,12 @@ $ helm install ... --set ingress.ingressClass="gce"
 # Versions
 
 `0.9.0` - Coming soon...  
-`0.8.3` (Beta) - `dev` branch 👈🏽 <a href="https://github.com/OpenMined/PySyft/tree/dev/notebooks/api/0.8">API</a> - Coming soon...  
-`0.8.2` (Stable) - <a href="https://github.com/OpenMined/PySyft/tree/0.8.2/notebooks/api/0.8">API</a>
+`0.8.4` (Beta) - `dev` branch 👈🏽 <a href="https://github.com/OpenMined/PySyft/tree/dev/notebooks/api/0.8">API</a> - Coming soon...  
+`0.8.3` (Stable) - <a href="https://github.com/OpenMined/PySyft/tree/0.8.3/notebooks/api/0.8">API</a>
 
 Deprecated:
 
+- `0.8.2` - <a href="https://github.com/OpenMined/PySyft/tree/0.8.2/notebooks/api/0.8">API</a>
 - `0.8.1` - <a href="https://github.com/OpenMined/PySyft/tree/0.8.1/notebooks/api/0.8">API</a>
 - `0.8.0` - <a href="https://github.com/OpenMined/PySyft/tree/0.8/notebooks/api/0.8">API</a>
 - `0.7.0` - <a href="https://github.com/OpenMined/courses/tree/introduction-to-remote-data-science-dev">Course 3 Updated</a>