Skip to content

Commit

Permalink
Merge branch 'dev' into snwagh/edit-readme-with-compute-resources
Browse files Browse the repository at this point in the history
  • Loading branch information
snwagh authored Jun 5, 2024
2 parents 1d0e511 + bff337a commit 7e44e05
Show file tree
Hide file tree
Showing 62 changed files with 1,491 additions and 714 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.8.7-beta.9
current_version = 0.8.7-beta.10
tag = False
tag_name = {new_version}
commit = True
Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ repos:
args: ["--fix=lf"]
exclude: '\.bat|\.csv|\.ps1$|packages/syft/tests/mongomock'

- repo: https://github.com/MarcoGorelli/absolufy-imports
- repo: https://github.com/MarcoGorelli/absolufy-imports # This repository has been archived by the owner on Aug 15, 2023. It is now read-only.
rev: v0.3.1
hooks:
- id: absolufy-imports
Expand Down Expand Up @@ -76,15 +76,15 @@ repos:
always_run: true

- repo: https://github.com/nbQA-dev/nbQA
rev: 1.8.3
rev: 1.8.5
# nbQA has no files attribute
# files: "^notebooks/(api|tutorials|admin)"
hooks:
- id: nbqa-isort

- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: "v0.4.3"
rev: "v0.4.7"
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix, --show-fixes]
Expand All @@ -94,7 +94,7 @@ repos:
types_or: [python, pyi, jupyter]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.8.0
rev: v1.10.0
hooks:
- id: mypy
name: "mypy: syft-cli"
Expand All @@ -119,7 +119,7 @@ repos:
]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.8.0
rev: v1.10.0
hooks:
- id: mypy
name: "mypy: grid"
Expand All @@ -144,7 +144,7 @@ repos:
]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.8.0
rev: v1.10.0
hooks:
- id: mypy
name: "mypy: syft"
Expand Down Expand Up @@ -175,7 +175,7 @@ repos:
- id: nbstripout
files: "^notebooks/(api|tutorials|admin)"

- repo: https://github.com/pre-commit/mirrors-prettier
- repo: https://github.com/pre-commit/mirrors-prettier # This repository has been archived by the owner on Apr 11, 2024. It is now read-only.
rev: "v3.0.0-alpha.9-for-vscode"
hooks:
- id: prettier
Expand Down
9 changes: 0 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -440,15 +440,6 @@ OpenMined and Syft appreciates all contributors, if you would like to fix a bug
</tr>
</table>

# Open Collective

`OpenMined` is a fiscally sponsored `501(c)(3)` in the USA. We are funded by our generous supporters on <a href="https://opencollective.com/openmined">Open Collective</a>. <br /><br />

<picture>
<source media="(prefers-color-scheme: dark)" srcset="docs/img/opencollective_dark.png">
<img src="docs/img/opencollective_light.png" alt="Contributors" width="100%" />
</picture>

# Disclaimer

Syft is under active development and is not yet ready for pilots on private data without our assistance. As early access participants, please contact us via [Slack](https://slack.openmined.org/) or email if you would like to ask a question or have a use case that you would like to discuss.
Expand Down
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.8.7-beta.9"
__version__ = "0.8.7-beta.10"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
2 changes: 1 addition & 1 deletion notebooks/admin/Custom API + Custom Worker.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
"source": [
"worker_pool_name = \"bigquery-pool\"\n",
"domain_client.api.services.worker_pool.launch(\n",
" name=worker_pool_name,\n",
" pool_name=worker_pool_name,\n",
" image_uid=workerimage.id,\n",
" num_workers=1,\n",
")"
Expand Down
6 changes: 3 additions & 3 deletions notebooks/api/0.8/10-container-images.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
" image_uid=workerimage.id,\n",
" tag=docker_tag,\n",
" registry_uid=registry_uid,\n",
" pull=pull,\n",
" pull_image=pull,\n",
")\n",
"docker_build_result"
]
Expand Down Expand Up @@ -600,7 +600,7 @@
"source": [
"worker_pool_name = \"opendp-pool\"\n",
"worker_pool_res = domain_client.api.services.worker_pool.launch(\n",
" name=worker_pool_name,\n",
" pool_name=worker_pool_name,\n",
" image_uid=workerimage.id,\n",
" num_workers=2,\n",
")"
Expand Down Expand Up @@ -1483,7 +1483,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.7"
"version": "3.12.2"
}
},
"nbformat": 4,
Expand Down
Loading

0 comments on commit 7e44e05

Please sign in to comment.