From 0306463bc1c12159e07decdfaf660891cd049041 Mon Sep 17 00:00:00 2001 From: Koen van der Veen Date: Wed, 6 Dec 2023 10:19:13 +0000 Subject: [PATCH 1/3] update readme --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5cbd897cc81..c3178da4446 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ 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 @@ -23,7 +23,7 @@ $ pip install -U syft ```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="info@openmined.org", password="changethis") ``` @@ -119,11 +119,12 @@ $ helm install ... --set ingress.ingressClass="gce" # Versions `0.9.0` - Coming soon... -`0.8.3` (Beta) - `dev` branch 👈🏽 API - Coming soon... -`0.8.2` (Stable) - API +`0.8.4` (Beta) - `dev` branch 👈🏽 API - Coming soon... +`0.8.3` (Stable) - API Deprecated: +- `0.8.2` - API - `0.8.1` - API - `0.8.0` - API - `0.7.0` - Course 3 Updated From c795faa0c24424627b358ed60f839684cfee9999 Mon Sep 17 00:00:00 2001 From: Koen van der Veen Date: Wed, 6 Dec 2023 10:25:26 +0000 Subject: [PATCH 2/3] update cd --- .github/workflows/cd-syft.yml | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml index 3ae5e414d92..96e9d765591 100644 --- 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: | From bbf606a74b4a7aa5813b68ee930fc1dcdacb1910 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Wed, 6 Dec 2023 16:58:00 +0530 Subject: [PATCH 3/3] disable commit changes to syft in cd-syft.yml --- .github/workflows/cd-syft.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml index 96e9d765591..e15769add33 100644 --- a/.github/workflows/cd-syft.yml +++ b/.github/workflows/cd-syft.yml @@ -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'