Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev into 0.8.5 #8618

Merged
merged 168 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
a2b7e4b
add VeilidStreamer for sending large messages in chunks
itstauq Feb 27, 2024
450981a
Refactor everything
itstauq Feb 29, 2024
de42ee2
fix bugs in veilid streamer and add notebooks for testing
itstauq Mar 1, 2024
5bd08e7
Make VeilidStreamer compatible with app_call by adding callback to re…
itstauq Mar 3, 2024
107b1c0
Add instructions to use VeilidStreamer in the docstring
itstauq Mar 3, 2024
ab65443
Send chunks parallelly, add batching and retries, improve test notebooks
itstauq Mar 4, 2024
2ecd1e8
fix linting issues
itstauq Mar 6, 2024
76fc280
fix linting issues try 2
itstauq Mar 6, 2024
5c5c5eb
fix linting issues try 3
itstauq Mar 6, 2024
219ee62
add architecture diagram for VeilidStreamer
itstauq Mar 8, 2024
78c1d95
Integrate VeilidStreamer with veilid_core
itstauq Mar 8, 2024
880439c
Add code to benchmark Veilid's performance with different message sizes
itstauq Mar 8, 2024
fd6895f
Add a single notebook with instructions to send large veilid messages
itstauq Mar 8, 2024
5066cac
replace batching and retries with semaphores; update test notebook
itstauq Mar 11, 2024
bf894d6
- Use random UUID to identify a stream call instead of message hash
itstauq Mar 11, 2024
acb8491
Merge branch 'rasswanth/veilid-prototype' into tauquir/veilid-chunking
itstauq Mar 12, 2024
7fa98fc
[tox] use uv
yashgorana Mar 12, 2024
fed4f07
Bump fastapi from 0.103.2 to 0.109.1 in /packages/grid/veilid
dependabot[bot] Mar 13, 2024
e002dce
Merge branch 'dev' into tauquir/veilid-chunking
rasswanth-s Mar 13, 2024
49c976c
Merge branch 'dev' into tauquir/veilid-chunking
madhavajay Mar 14, 2024
11fc174
Merge branch 'dev' into yash/uv-pip
yashgorana Mar 14, 2024
629d5a5
Merge branch 'dev' into yash/uv-pip
yashgorana Mar 14, 2024
980d4cd
[ci] pin uv and tox-uv version
yashgorana Mar 14, 2024
1a8a58e
[ci] split uv cache from pip cache
yashgorana Mar 14, 2024
c06d2fa
[ci] fix haiku bug
yashgorana Mar 14, 2024
a0eaa29
[tox] fix pip list when uv not available
yashgorana Mar 14, 2024
237eec8
Merge branch 'dev' into yash/uv-pip
yashgorana Mar 14, 2024
5e37f59
[ci] fix macos --user install uv not found
yashgorana Mar 14, 2024
0fd71ea
Merge branch 'dev' into yash/uv-pip
shubham3121 Mar 14, 2024
6ef5449
bump versons
teo-milea Mar 14, 2024
e20e740
Merge branch 'dev' into yash/uv-pip
yashgorana Mar 14, 2024
edf91ce
[syft]bump version
alfred-openmined-bot Mar 14, 2024
f1985ca
bump protocol and remove notebooks
alfred-openmined-bot Mar 14, 2024
956f9d5
Merge branch 'dev' into yash/uv-pip
yashgorana Mar 14, 2024
5e678d6
Merge pull request #8569 from OpenMined/yash/uv-pip
yashgorana Mar 14, 2024
5390c4e
[syft] create temp workspace per worker
yashgorana Mar 14, 2024
f3beecf
[tests] some more fixes
yashgorana Mar 14, 2024
96d0f74
Merge pull request #8573 from OpenMined/dependabot/pip/packages/grid/…
madhavajay Mar 14, 2024
ceca366
Changed ENABLE_SIGNUP in tox task to False to prevent 07 notebook error
madhavajay Mar 15, 2024
d2e0913
Revert dm-haiku==0.0.10 for arm64 linux and tensorstore issues
madhavajay Mar 15, 2024
7294105
Temp fix for CI from remote branches
madhavajay Mar 15, 2024
1077712
Ingore pyOpenSSL issue
madhavajay Mar 15, 2024
a15a80b
Merge pull request #8587 from madhavajay/madhava/revert_haiku
madhavajay Mar 15, 2024
fe04814
Merge branch 'dev' into madhava/signup_test_fix
madhavajay Mar 15, 2024
55ce6d9
fix syft.test.helm
rasswanth-s Mar 15, 2024
d7702b9
added a volumeLabels function
rasswanth-s Mar 15, 2024
3c3f03c
Merge pull request #8589 from OpenMined/rasswanth/fix-helm-test
yashgorana Mar 15, 2024
9e283e6
bump protocol and remove notebooks
alfred-openmined-bot Mar 15, 2024
dfd526c
Merge branch 'dev' into rasswanth/fix-helm-upgrade
yashgorana Mar 15, 2024
7150dcf
Merge pull request #8590 from OpenMined/rasswanth/fix-helm-upgrade
yashgorana Mar 15, 2024
bfedb5f
Merge branch 'dev' into yash/syft-tmpdir
yashgorana Mar 15, 2024
1679c64
Merge branch 'dev' into madhava/signup_test_fix
yashgorana Mar 15, 2024
e2f30c3
Add ability to send responses greater than 32 KB in size
itstauq Mar 15, 2024
4b693e2
Merge remote-tracking branch 'origin' into tauquir/veilid-chunking
itstauq Mar 15, 2024
d56f190
fixed register endpoint in veilid
rasswanth-s Mar 15, 2024
b237552
Merge branch 'tauquir/veilid-chunking' of github.com:OpenMined/PySyft…
itstauq Mar 15, 2024
5551e4f
Make VeilidStreamer compatible with vld_key and update notebooks
itstauq Mar 15, 2024
3714bc0
Add retries to VeilidStreamer; remove unnecessary notebooks
itstauq Mar 15, 2024
dfb40e0
added ping endpoint to veilid
rasswanth-s Mar 15, 2024
676ecd3
[syftcli]bump version
alfred-openmined-bot Mar 17, 2024
534c6e0
[syft]bump version
alfred-openmined-bot Mar 17, 2024
61619ed
bump protocol and remove notebooks
alfred-openmined-bot Mar 17, 2024
b222058
Add endpoint for testing handle_app_call and add more tests to notebook
itstauq Mar 17, 2024
a309d41
fix missing build package in syft.publish
rasswanth-s Mar 18, 2024
6561c26
Merge pull request #8594 from OpenMined/rasswanth/fix-syft-cd
rasswanth-s Mar 18, 2024
66d6b4c
Merge branch 'dev' into rasswanth/veilid-misc-improv
rasswanth-s Mar 18, 2024
434aeab
[syft]bump version
alfred-openmined-bot Mar 18, 2024
8ac20c7
bump protocol and remove notebooks
alfred-openmined-bot Mar 18, 2024
1ea7eb5
Merge pull request #8591 from OpenMined/rasswanth/veilid-misc-improv
rasswanth-s Mar 18, 2024
a480fd8
bump protocol and remove notebooks
alfred-openmined-bot Mar 18, 2024
b12dc01
Merge branch 'dev' into yash/syft-tmpdir
yashgorana Mar 18, 2024
3e9a6ba
Merge branch 'dev' into madhava/signup_test_fix
yashgorana Mar 18, 2024
64d2ba3
Merge pull request #8586 from madhavajay/madhava/signup_test_fix
yashgorana Mar 18, 2024
ab718dd
[syft]bump version
alfred-openmined-bot Mar 18, 2024
2933921
bump protocol and remove notebooks
alfred-openmined-bot Mar 18, 2024
dc326e2
[tests] yield fixtures + kill mongo + ignore rmtree errors
yashgorana Mar 18, 2024
577a695
Merge branch 'dev' into yash/syft-tmpdir
yashgorana Mar 18, 2024
1ad7b84
[syft] ignore rmtree errors
yashgorana Mar 18, 2024
37f299c
[tests] fix windows lock file unlink
yashgorana Mar 18, 2024
bda9371
[helm] make common.secrets.set more robust
yashgorana Mar 18, 2024
91b166d
refactor input policy to define a _is_valid method
shubham3121 Mar 18, 2024
14c357c
add a check for input policy before executing user custom code
shubham3121 Mar 18, 2024
6565302
Merge branch 'dev' into shubham/fix-output-policy
shubham3121 Mar 18, 2024
44aa77e
fix missing context argument to _is_valid for input policy in user co…
shubham3121 Mar 18, 2024
9f28ff2
[helm] use values.dev.yaml
yashgorana Mar 18, 2024
99c124f
[helm] some veilid cleanup
yashgorana Mar 18, 2024
86b01b4
add a CachedExecutionResult class to represent cache value and store …
shubham3121 Mar 18, 2024
ca54d5f
Update values.dev.yaml
yashgorana Mar 18, 2024
cc3f8ce
- Abstract away app_call and app_call_reply entirely
itstauq Mar 18, 2024
7d3b981
rename a CachedExecutionResult to CachedSyftObject
shubham3121 Mar 18, 2024
2a1ddf1
add changes for resolving PR comments
itstauq Mar 18, 2024
5f2999a
Merge branch 'dev' into tauquir/veilid-chunking
itstauq Mar 18, 2024
dcfbb99
fix propogation of error when input policy doesn't match
shubham3121 Mar 18, 2024
87a08c1
fix variable is_approved scope in _user_execute_code
shubham3121 Mar 18, 2024
2d6cc76
fix roles for get_all
teo-milea Mar 18, 2024
92622a0
moved check for api refresh
teo-milea Mar 18, 2024
be44b74
Update docstring for STREAM_SINGLE request
itstauq Mar 19, 2024
03ad5aa
Add BytesEnum to utils.py and use it in veilid_streamer.py
itstauq Mar 19, 2024
8972cac
enabled api update on SyftSuccess results
teo-milea Mar 19, 2024
0353be8
fix bug with hello-syft nb
teo-milea Mar 19, 2024
33a276c
remove unwrap
teo-milea Mar 19, 2024
847b84f
added update required bool in SyftResponseMessage
teo-milea Mar 19, 2024
32e0f11
Merge pull request #8599 from OpenMined/fix_api_bugs
shubham3121 Mar 19, 2024
b87b24a
Add changes for resolving PR comments; fix logging
itstauq Mar 19, 2024
1aaa42d
Removing issue where hagrid art is causing warnings in notebooks
madhavajay Mar 20, 2024
ef51a0d
Merge branch 'dev' into yash/syft-tmpdir
yashgorana Mar 20, 2024
105e1c3
Add suggestions from PR comments
itstauq Mar 20, 2024
7113121
[tests] static xdist proc
yashgorana Mar 20, 2024
0d07473
Ensure that all the chunks are received before reassembling the message
itstauq Mar 20, 2024
ab741db
Merge branch 'dev' into tauquir/veilid-chunking
itstauq Mar 20, 2024
fce9580
[tests] run sqlite tests on same proc
yashgorana Mar 20, 2024
fb64d9f
[tests] reruns=3 reruns_delay=3
yashgorana Mar 20, 2024
4c2d722
removed compression proxy route
rasswanth-s Mar 20, 2024
905c97f
[hagrid] bump version
alfred-openmined-bot Mar 20, 2024
d2e5c27
Merge branch 'dev' into tauquir/veilid-chunking
rasswanth-s Mar 20, 2024
9735e72
skip veilid tests temporarily
rasswanth-s Mar 20, 2024
b04db1f
Merge pull request #8558 from OpenMined/tauquir/veilid-chunking
rasswanth-s Mar 20, 2024
1582846
bump protocol and remove notebooks
alfred-openmined-bot Mar 20, 2024
8f9a788
Merge branch 'dev' into yash/helm-secrets-tpl
rasswanth-s Mar 20, 2024
74525c4
[syft] cleanup init_stores
yashgorana Mar 20, 2024
179b757
[syft] fix db name
yashgorana Mar 20, 2024
f412135
[syft] sqlite wal mode
yashgorana Mar 20, 2024
31fdfc8
[syft] add sqlite busy_timeout
yashgorana Mar 20, 2024
8cf17c6
[syft] fix macos tests
yashgorana Mar 20, 2024
1bd447e
Merge branch 'dev' into yash/syft-tmpdir
yashgorana Mar 20, 2024
19e3cdd
Merge pull request #8585 from OpenMined/yash/syft-tmpdir
teo-milea Mar 20, 2024
c38ac05
[syft] cleanup node services init
yashgorana Mar 20, 2024
255427f
[syft] validate service instance
yashgorana Mar 20, 2024
c318570
mypy fixes
yashgorana Mar 20, 2024
bea8fa6
Merge pull request #8601 from madhavajay/madhava/hagrid_art
madhavajay Mar 21, 2024
a4b415c
Improve .dockerignore files
madhavajay Mar 21, 2024
9248ee7
Merge pull request #8608 from madhavajay/madhava/dockerignore
madhavajay Mar 21, 2024
fb2835f
Merge branch 'dev' into yash/helm-secrets-tpl
rasswanth-s Mar 21, 2024
cea40a0
Merge pull request #8598 from OpenMined/yash/helm-secrets-tpl
rasswanth-s Mar 21, 2024
8428294
Merge branch 'dev' into yash/node-svc
rasswanth-s Mar 21, 2024
d2dc4a8
save input_ids as part of ExecutionOutput
shubham3121 Mar 21, 2024
415d5ca
check for inputs before loading output from cache in user code execution
shubham3121 Mar 21, 2024
4163d87
Merge pull request #8607 from OpenMined/yash/node-svc
rasswanth-s Mar 21, 2024
e9cebfd
update test to validate results are cached
shubham3121 Mar 21, 2024
7d83e33
add check in notebook to test for different inputs for given approved…
shubham3121 Mar 21, 2024
b146b66
fix return typing for _is_valid
shubham3121 Mar 21, 2024
63aadef
Merge branch 'dev' into shubham/fix-output-policy
teo-milea Mar 21, 2024
dec5beb
Merge pull request #8596 from OpenMined/shubham/fix-output-policy
teo-milea Mar 21, 2024
95c17b2
bump protocol and remove notebooks
alfred-openmined-bot Mar 21, 2024
0bcf047
[syft]bump version
alfred-openmined-bot Mar 21, 2024
632a763
bump protocol and remove notebooks
alfred-openmined-bot Mar 21, 2024
f44a5e8
update post merge task with python-version 3.12
shubham3121 Mar 22, 2024
da7eefa
Merge pull request #8613 from OpenMined/post-cleanup-python
shubham3121 Mar 22, 2024
6a3847f
Merge branch 'dev' into update_readme
teo-milea Mar 22, 2024
69bcec6
bumped version to 0.8.5
teo-milea Mar 22, 2024
216965e
fix lint
teo-milea Mar 22, 2024
60c0dae
hardcode the latest beta release
teo-milea Mar 22, 2024
6d1b40d
install uv and tox-uv in post release tests workflow
shubham3121 Mar 22, 2024
8f23426
Merge pull request #8616 from OpenMined/fix-post-release-workflow
teo-milea Mar 22, 2024
168a096
fix lint
teo-milea Mar 22, 2024
b144b3d
Merge branch 'dev' into update_readme
teo-milea Mar 22, 2024
49748fa
Merge branch 'dev' into fix_test_versions
teo-milea Mar 22, 2024
8c2534e
Merge branch 'dev' into bump_version_0.8.5
teo-milea Mar 22, 2024
5b280fb
Merge pull request #8583 from OpenMined/update_readme
teo-milea Mar 22, 2024
6ed342b
Merge branch 'dev' into fix_test_versions
teo-milea Mar 22, 2024
2a39697
hardcode syft base image version
shubham3121 Mar 22, 2024
722b077
Merge branch 'dev' into bump_version_0.8.5
shubham3121 Mar 22, 2024
7600cac
comment backend.test.basecpu test in CI
shubham3121 Mar 22, 2024
497b54a
Merge pull request #8615 from OpenMined/fix_test_versions
teo-milea Mar 22, 2024
3b5edc8
Merge branch 'dev' into bump_version_0.8.5
teo-milea Mar 22, 2024
0615acb
fix lint
teo-milea Mar 22, 2024
0b49d08
fix lint
teo-milea Mar 22, 2024
dd99cf5
Merge pull request #8614 from OpenMined/bump_version_0.8.5
teo-milea Mar 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.5-beta.5
current_version = 0.8.5
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.4
current_version = 0.8.5
tag = False
tag_name = {new_version}
commit = True
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/cd-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ jobs:

- name: Install tox
run: |
pip install -U tox
pip install --upgrade pip uv==0.1.18 tox tox-uv==1.5.1
uv --version

- name: Build the docs
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cd-post-release-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ jobs:
restore-keys: |
${{ runner.os }}-pip-py${{ matrix.python-version }}-

- name: Install Hagrid and tox
- name: Install Hagrid, tox and uv
run: |
pip install -U hagrid
pip install tox
pip install --upgrade pip uv==0.1.18 tox tox-uv==1.5.1

- name: Hagrid Version
run: |
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:

- name: Install tox
run: |
pip install tox
pip install --upgrade pip uv==0.1.18 tox tox-uv==1.5.1

- name: Run K8s tests
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cd-syft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ jobs:

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install --upgrade bump2version tox
pip install --upgrade pip uv==0.1.18 bump2version tox tox-uv==1.5.1
uv --version

- name: Get Release tag
id: get_release_tag
Expand Down Expand Up @@ -370,8 +370,8 @@ jobs:
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install --upgrade tox setuptools wheel twine bump2version PyYAML
pip install --upgrade pip uv==0.1.18 tox tox-uv==1.5.1 setuptools wheel twine bump2version PyYAML
uv --version

- name: Bump the Version
if: needs.merge-docker-images.outputs.release_tag == 'beta'
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/e2e-tests-notebook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ jobs:
run: |
python -m pip install --upgrade --user pip

- name: Install Deps
run: |
pip install --upgrade pip uv==0.1.18 tox tox-uv==1.5.1

- name: Get pip cache dir
id: pip-cache
shell: bash
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/post-merge-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:

jobs:
post-merge-cleanup-notebooks:
strategy:
matrix:
python-version: ["3.12"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
33 changes: 17 additions & 16 deletions .github/workflows/pr-tests-enclave.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: PR Tests - Enclave

on:
workflow_call:
# Temporarily disabled oblv tests
# workflow_call:

pull_request:
branches:
- dev
- main
- "0.8"
# pull_request:
# branches:
# - dev
# - main
# - "0.8"

workflow_dispatch:
inputs:
Expand Down Expand Up @@ -58,31 +59,31 @@ jobs:
- name: Upgrade pip
if: steps.changes.outputs.syft == 'true'
run: |
python -m pip install --upgrade --user pip
pip install --upgrade pip uv==0.1.18
uv --version

- name: Get pip cache dir
id: pip-cache
if: steps.changes.outputs.syft == 'true'
shell: bash
run: |
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT

- name: pip cache
uses: actions/cache@v4
if: steps.changes.outputs.syft == 'true'
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}
key: ${{ runner.os }}-uv-py${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-pip-py${{ matrix.python-version }}-
${{ runner.os }}-uv-py${{ matrix.python-version }}-

- name: Install Dependencies
if: steps.changes.outputs.syft == 'true'
run: |
pip install --upgrade tox packaging wheel --default-timeout=60
pip install --upgrade tox tox-uv==1.5.1

# Temporarily disabled oblv tests
# - name: Run Enclave tests
# if: steps.changes.outputs.syft == 'true'
# run: |
# tox -e stack.test.integration.enclave.oblv
- name: Run Enclave tests
if: steps.changes.outputs.syft == 'true'
run: |
tox -e stack.test.integration.enclave.oblv
22 changes: 12 additions & 10 deletions .github/workflows/pr-tests-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,24 @@ jobs:
- name: Upgrade pip
if: steps.changes.outputs.frontend == 'true'
run: |
python -m pip install --upgrade --user pip
pip install --upgrade pip uv==0.1.18
uv --version

- name: Get pip cache dir
id: pip-cache
if: steps.changes.outputs.frontend == 'true'
shell: bash
run: |
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT

- name: pip cache
uses: actions/cache@v4
if: steps.changes.outputs.frontend == 'true'
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ hashFiles('packages/hagrid/setup.cfg') }}
key: ${{ runner.os }}-uv-py${{ matrix.python-version }}-${{ hashFiles('packages/hagrid/setup.cfg') }}
restore-keys: |
${{ runner.os }}-pip-py${{ matrix.python-version }}-
${{ runner.os }}-uv-py${{ matrix.python-version }}-

- name: Docker on MacOS
if: steps.changes.outputs.frontend == 'true' && matrix.os == 'macos-latest'
Expand All @@ -71,7 +72,7 @@ jobs:
- name: Install Tox
if: steps.changes.outputs.frontend == 'true'
run: |
pip install --upgrade tox
pip install --upgrade tox tox-uv==1.5.1

- name: Remove existing containers
if: steps.changes.outputs.frontend == 'true'
Expand Down Expand Up @@ -127,23 +128,24 @@ jobs:
- name: Upgrade pip
if: steps.changes.outputs.stack == 'true'
run: |
python -m pip install --upgrade --user pip
pip install --upgrade pip uv==0.1.18
uv --version

- name: Get pip cache dir
id: pip-cache
if: steps.changes.outputs.stack == 'true'
shell: bash
run: |
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT

- name: pip cache
uses: actions/cache@v4
if: steps.changes.outputs.stack == 'true'
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ hashFiles('packages/hagrid/setup.cfg') }}
key: ${{ runner.os }}-uv-py${{ matrix.python-version }}-${{ hashFiles('packages/hagrid/setup.cfg') }}
restore-keys: |
${{ runner.os }}-pip-py${{ matrix.python-version }}-
${{ runner.os }}-uv-py${{ matrix.python-version }}-

- name: Install Docker Compose
if: steps.changes.outputs.stack == 'true' && runner.os == 'Linux'
Expand All @@ -161,7 +163,7 @@ jobs:
- name: Install Tox
if: steps.changes.outputs.stack == 'true'
run: |
pip install --upgrade tox
pip install --upgrade tox tox-uv==1.5.1

- name: Remove existing containers
if: steps.changes.outputs.stack == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-tests-hagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
if: steps.changes.outputs.hagrid == 'true'
run: |
bandit -r hagrid
safety check -i 42923 -i 54229 -i 54230 -i 54230 -i 54229 -i 62044
safety check -i 42923 -i 54229 -i 54230 -i 54230 -i 54229 -i 62044 -i 65213

- name: Run normal tests
if: steps.changes.outputs.hagrid == 'true'
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/pr-tests-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,27 @@ jobs:

- name: Install pip packages
run: |
python -m pip install --upgrade --user pip tox
pip install --upgrade pip uv==0.1.18
uv --version

- name: Get pip cache dir
id: pip-cache
shell: bash
run: |
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT

# TODO: change cache key from setup.cfg to something more general
- name: pip cache
uses: actions/cache@v4
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}
key: ${{ runner.os }}-uv-py${{ matrix.python-version }}-${{ hashFiles('setup.cfg') }}
restore-keys: |
${{ runner.os }}-pip-py${{ matrix.python-version }}-
${{ runner.os }}-uv-py${{ matrix.python-version }}-

- name: Install Tox
run: |
pip install --upgrade tox tox-uv==1.5.1

- uses: pre-commit/[email protected]

Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/pr-tests-stack-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,28 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Upgrade pip
run: |
pip install --upgrade pip uv==0.1.18
uv --version

# - name: Get pip cache dir
# id: pip-cache
# shell: bash
# run: |
# echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
# echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT

# - name: pip cache
# uses: actions/cache@v3
# with:
# path: ${{ steps.pip-cache.outputs.dir }}
# key: ${{ runner.os }}-pip-py${{ matrix.python-version }}
# key: ${{ runner.os }}-uv-py${{ matrix.python-version }}
# restore-keys: |
# ${{ runner.os }}-pip-py${{ matrix.python-version }}

- name: Upgrade pip
run: |
python -m pip install --upgrade --user pip
# ${{ runner.os }}-uv-py${{ matrix.python-version }}

- name: Install tox
run: |
pip install -U tox
pip install --upgrade tox tox-uv==1.5.1

- name: Install Docker Compose
if: runner.os == 'Linux'
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/pr-tests-stack-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,32 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Upgrade pip
if: steps.changes.outputs.stack == 'true'
run: |
pip install --upgrade pip uv==0.1.18
uv --version

- name: Get pip cache dir
if: steps.changes.outputs.stack == 'true'
id: pip-cache
shell: bash
run: |
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT

- name: pip cache
uses: actions/cache@v4
if: steps.changes.outputs.stack == 'true'
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-py${{ matrix.python-version }}
key: ${{ runner.os }}-uv-py${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-py${{ matrix.python-version }}

- name: Upgrade pip
if: steps.changes.outputs.stack == 'true'
run: |
python -m pip install --upgrade --user pip
${{ runner.os }}-uv-py${{ matrix.python-version }}

- name: Install tox
if: steps.changes.outputs.stack == 'true'
run: |
pip install -U tox
pip install --upgrade tox tox-uv==1.5.1

- name: Show choco installed packages
if: steps.changes.outputs.stack == 'true' && matrix.os == 'windows'
Expand Down
Loading
Loading