Skip to content

Commit

Permalink
Merge branch 'dev' into padawan-contrib-3
Browse files Browse the repository at this point in the history
  • Loading branch information
Smartappli authored Aug 1, 2024
2 parents aca83da + cda8ec7 commit 594e05e
Show file tree
Hide file tree
Showing 62 changed files with 753 additions and 783 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.9.0-beta.3
current_version = 0.9.1-beta.1
tag = False
tag_name = {new_version}
commit = True
Expand Down
2 changes: 1 addition & 1 deletion .bumpversion_stable.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.8.8
current_version = 0.9.0
tag = False
tag_name = {new_version}
commit = True
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd-feature-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd-syft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-tests-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
368 changes: 87 additions & 281 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mono Repo Global Version
__version__ = "0.9.0-beta.3"
__version__ = "0.9.1-beta.1"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
126 changes: 126 additions & 0 deletions docs/img/Syft-Logo-Light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
126 changes: 126 additions & 0 deletions docs/img/Syft-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions notebooks/api/0.8/00-load-data.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down Expand Up @@ -732,7 +732,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.2"
"version": "3.11.5"
},
"toc": {
"base_numbering": 1,
Expand Down
2 changes: 1 addition & 1 deletion notebooks/api/0.8/01-submit-code.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
2 changes: 1 addition & 1 deletion notebooks/api/0.8/02-review-code-and-approve.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
2 changes: 1 addition & 1 deletion notebooks/api/0.8/03-data-scientist-download-result.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
2 changes: 1 addition & 1 deletion notebooks/api/0.8/04-pytorch-example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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"
]
Expand Down
2 changes: 1 addition & 1 deletion notebooks/api/0.8/05-custom-policy.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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"
]
Expand Down
2 changes: 1 addition & 1 deletion notebooks/api/0.8/06-multiple-code-requests.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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"
]
Expand Down
2 changes: 1 addition & 1 deletion notebooks/api/0.8/07-datasite-register-control-flow.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"metadata": {},
"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"
]
Expand Down
Loading

0 comments on commit 594e05e

Please sign in to comment.