Skip to content

Commit 7efe342

Browse files
SmartappliSmartappli
authored
Merge branch 'dev' into padawan-contrib-10
2 parents 188fa4e + ed1f17a commit 7efe342

171 files changed

Lines changed: 4009 additions & 27306 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bumpversion.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.9.0-beta.3
2+
current_version = 0.9.1-beta.4
33
tag = False
44
tag_name = {new_version}
55
commit = True

‎.bumpversion_stable.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.8.8
2+
current_version = 0.9.0
33
tag = False
44
tag_name = {new_version}
55
commit = True

‎.github/workflows/cd-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install pip dependencies
2929
run: |
3030
python -m pip install --upgrade pip
31-
pip install uv==0.2.17 tox tox-uv==1.9.0
31+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
3232
uv --version
3333
3434
- name: Build the docs

‎.github/workflows/cd-feature-branch.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Install dependencies
6666
run: |
6767
python -m pip install --upgrade pip
68-
pip install uv==0.2.17 tox tox-uv==1.9.0 bump2version==1.0.1
68+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 bump2version==1.0.1
6969
uv --version
7070
7171
- name: Generate Release Metadata
@@ -290,7 +290,7 @@ jobs:
290290
- name: Install dependencies
291291
run: |
292292
python -m pip install --upgrade pip
293-
pip install uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML
293+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML
294294
uv --version
295295
296296
- name: Bump to Final Release version
@@ -346,8 +346,8 @@ jobs:
346346

347347
- name: Copy helm repo files from Syft Repo
348348
run: |
349-
cp packages/grid/helm/repo/index.yaml ghpages/helm/
350349
cp packages/grid/helm/repo/syft-${{ needs.merge-docker-images.outputs.server_version }}.tgz ghpages/helm/
350+
cd ghpages/helm && helm repo index . --url https://openmined.github.io/PySyft/helm
351351
352352
- name: Commit changes to gh-pages
353353
uses: EndBug/add-and-commit@v9

‎.github/workflows/cd-post-release-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
- name: Install pip dependencies
120120
run: |
121121
python -m pip install --upgrade pip
122-
pip install uv==0.2.17 tox tox-uv==1.9.0
122+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
123123
uv --version
124124
125125
- name: Get uv cache dir
@@ -195,7 +195,7 @@ jobs:
195195
196196
- name: Install tox and uv
197197
run: |
198-
pip install uv==0.2.17 tox tox-uv==1.9.0 tox-current-env
198+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 tox-current-env
199199
200200
- name: Run unit tests
201201
run: |

‎.github/workflows/cd-syft-dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
tags: |
105105
${{ secrets.ACR_SERVER }}/openmined/syft-backend:dev
106106
${{ secrets.ACR_SERVER }}/openmined/syft-backend:dev-${{ github.sha }}
107-
${{ secrets.ACR_SERVER }}/openmined/syft-backend:${{ steps.syft.outputs.SERVER_VERSION }}
107+
${{ secrets.ACR_SERVER }}/openmined/syft-backend:${{ steps.server.outputs.SERVER_VERSION }}
108108
109109
- name: Build and push `syft-frontend` image to registry
110110
uses: docker/build-push-action@v6
@@ -115,7 +115,7 @@ jobs:
115115
tags: |
116116
${{ secrets.ACR_SERVER }}/openmined/syft-frontend:dev
117117
${{ secrets.ACR_SERVER }}/openmined/syft-frontend:dev-${{ github.sha }}
118-
${{ secrets.ACR_SERVER }}/openmined/syft-frontend:${{ steps.syft.outputs.SERVER_VERSION }}
118+
${{ secrets.ACR_SERVER }}/openmined/syft-frontend:${{ steps.server.outputs.SERVER_VERSION }}
119119
target: syft-ui-development
120120

121121
- name: Build and push `syft-seaweedfs` image to registry
@@ -127,7 +127,7 @@ jobs:
127127
tags: |
128128
${{ secrets.ACR_SERVER }}/openmined/syft-seaweedfs:dev
129129
${{ secrets.ACR_SERVER }}/openmined/syft-seaweedfs:dev-${{ github.sha }}
130-
${{ secrets.ACR_SERVER }}/openmined/syft-seaweedfs:${{ steps.syft.outputs.SERVER_VERSION }}
130+
${{ secrets.ACR_SERVER }}/openmined/syft-seaweedfs:${{ steps.server.outputs.SERVER_VERSION }}
131131
132132
- name: Build and push `syft-enclave-attestation` image to registry
133133
uses: docker/build-push-action@v6
@@ -138,7 +138,7 @@ jobs:
138138
tags: |
139139
${{ secrets.ACR_SERVER }}/openmined/syft-enclave-attestation:dev
140140
${{ secrets.ACR_SERVER }}/openmined/syft-enclave-attestation:dev-${{ github.sha }}
141-
${{ secrets.ACR_SERVER }}/openmined/syft-enclave-attestation:${{ steps.syft.outputs.SERVER_VERSION }}
141+
${{ secrets.ACR_SERVER }}/openmined/syft-enclave-attestation:${{ steps.server.outputs.SERVER_VERSION }}
142142
143143
- name: Build Helm Chart & Copy to infra
144144
if: github.ref == 'refs/heads/dev' || github.event.inputs.deploy-helm == 'true'

‎.github/workflows/cd-syft.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
- name: Install dependencies
115115
run: |
116116
python -m pip install --upgrade pip
117-
pip install uv==0.2.17 tox tox-uv==1.9.0 bump2version==1.0.1
117+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 bump2version==1.0.1
118118
uv --version
119119
120120
- name: Get Release tag
@@ -392,7 +392,7 @@ jobs:
392392
- name: Install dependencies
393393
run: |
394394
python -m pip install --upgrade pip
395-
pip install uv==0.2.17 tox tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML
395+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0 setuptools wheel twine bump2version PyYAML
396396
uv --version
397397
398398
- name: Bump the Version
@@ -557,8 +557,8 @@ jobs:
557557

558558
- name: Copy helm repo files from Syft Repo
559559
run: |
560-
cp packages/grid/helm/repo/index.yaml ghpages/helm/
561560
cp packages/grid/helm/repo/syft-${{ steps.release_checks.outputs.syft_version }}.tgz ghpages/helm/
561+
cd ghpages/helm && helm repo index . --url https://openmined.github.io/PySyft/helm
562562
563563
- name: Commit changes to gh-pages
564564
uses: EndBug/add-and-commit@v9
@@ -574,7 +574,7 @@ jobs:
574574
# we need to wait for PyPI to update before running the post-release tests
575575
- name: Wait for PyPI to update
576576
run: |
577-
sleep 60
577+
sleep 120
578578
579579
# Can we remove the always flag from the below job?
580580
call-cd-post-release-tests:

‎.github/workflows/cd-syftcli.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
- name: Install pip dependencies
123123
run: |
124124
python -m pip install --upgrade pip
125-
pip install uv==0.2.17 tox tox-uv==1.9.0
125+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
126126
uv --version
127127
128128
- name: Build syftcli

‎.github/workflows/e2e-tests-notebook.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Install pip dependencies
6161
run: |
6262
python -m pip install --upgrade pip
63-
pip install uv==0.2.17 tox tox-uv==1.9.0
63+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
6464
uv --version
6565
6666
- name: Get pip cache dir

‎.github/workflows/post-merge-tasks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install pip packages
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install uv==0.2.17 tox tox-uv==1.9.0
30+
pip install uv==0.2.17 tox==4.16.0 tox-uv==1.9.0
3131
uv --version
3232
3333
- name: Check and Bump Protocol Version

0 commit comments

Comments
 (0)