Skip to content

Commit 5fbfe12

Browse files
Devops: Upgrade uv>=v0.7.6 and astral-sh/setup-uv@v6 (aiidateam#6887)
--------- Co-authored-by: Daniel Hollas <[email protected]>
1 parent 6b55786 commit 5fbfe12

File tree

7 files changed

+12
-14
lines changed

7 files changed

+12
-14
lines changed

.github/actions/install-aiida-core/action.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ inputs:
1414
required: false
1515
# NOTE: Hard-learned lesson: we cannot use type=boolean here, apparently :-(
1616
# https://stackoverflow.com/a/76294014
17-
# NOTE2: When installing from lockfile, aiida-core and its dependencies
18-
# are installed in a virtual environment located in .venv directory.
19-
# Subsuquent jobs steps must either activate the environment or use `uv run`
2017
from-lock:
2118
description: Install aiida-core dependencies from uv lock file
2219
default: 'true'
@@ -31,10 +28,11 @@ runs:
3128
python-version: ${{ inputs.python-version }}
3229

3330
- name: Set up uv
34-
uses: astral-sh/setup-uv@v5.2.1
31+
uses: astral-sh/setup-uv@v6
3532
with:
36-
version: 0.5.22
33+
version: 0.7.6
3734
python-version: ${{ inputs.python-version }}
35+
activate-environment: true
3836

3937
- name: Install dependencies from uv lock
4038
if: ${{ inputs.from-lock == 'true' }}

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
from-lock: 'true'
6161

6262
- name: Run benchmarks
63-
run: uv run pytest --db-backend psql --benchmark-only --benchmark-json benchmark.json tests/
63+
run: pytest --db-backend psql --benchmark-only --benchmark-json benchmark.json tests/
6464

6565
- name: Store benchmark result
6666
uses: aiidateam/github-action-benchmark@v3

.github/workflows/ci-code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
- name: Run test suite
111111
env:
112112
AIIDA_WARN_v3: 0
113-
run: uv run pytest -n auto -m 'presto' tests/
113+
run: pytest -n auto -m 'presto' tests/
114114

115115

116116
verdi:

.github/workflows/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,16 @@ jobs:
127127
from-lock: 'true'
128128

129129
- name: Setup SSH on localhost
130-
run: source .venv/bin/activate && .github/workflows/setup_ssh.sh
130+
run: .github/workflows/setup_ssh.sh
131131

132132
- name: Suppress RabbitMQ version warning
133-
run: uv run verdi config set warnings.rabbitmq_version False
133+
run: verdi config set warnings.rabbitmq_version False
134134

135135
- name: Run tests
136136
id: tests
137137
env:
138138
AIIDA_WARN_v3: 0
139-
run: uv run pytest -s --db-backend sqlite -m 'requires_rmq' tests/
139+
run: pytest -s --db-backend sqlite -m 'requires_rmq' tests/
140140

141141
- name: Slack notification
142142
# Always run this step (otherwise it would be skipped if any of the previous steps fail) but only if the

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ repos:
5757
)$
5858
5959
- repo: https://github.com/astral-sh/uv-pre-commit
60-
rev: 0.5.22
60+
rev: 0.7.6
6161
hooks:
6262
# Check and update the uv lockfile
6363
- id: uv-lock

.readthedocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ build:
1717
# https://docs.readthedocs.io/en/stable/build-customization.html#install-dependencies-with-uv
1818
pre_create_environment:
1919
- asdf plugin add uv
20-
- asdf install uv 0.5.22
21-
- asdf global uv 0.5.22
20+
- asdf install uv 0.7.6
21+
- asdf global uv 0.7.6
2222
create_environment:
2323
# Create a virtual environment in '.venv/' folder
2424
# which is picked up automatically by `uv sync` and `uv run` commands below

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,4 +535,4 @@ commands = molecule {posargs:test}
535535
# .pre-commit-config.yaml
536536
# .github/actions/install-aiida-core/action.yml
537537
# .readthedocs.yml
538-
required-version = ">=0.5.21"
538+
required-version = ">=0.7.0"

0 commit comments

Comments
 (0)