From 8e66b24b65cbce101cddc7ba21ade1bf5c6e0c7f Mon Sep 17 00:00:00 2001
From: Daniel Hollas <daniel.hollas@bristol.ac.uk>
Date: Sun, 29 Dec 2024 20:08:52 +0100
Subject: [PATCH] CI: Update uv

---
 .github/actions/install-aiida-core/action.yml | 19 ++++++++++---------
 .github/workflows/test-install.yml            |  2 +-
 .pre-commit-config.yaml                       |  3 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/actions/install-aiida-core/action.yml b/.github/actions/install-aiida-core/action.yml
index 01cadce94..5be7f7e7d 100644
--- a/.github/actions/install-aiida-core/action.yml
+++ b/.github/actions/install-aiida-core/action.yml
@@ -7,8 +7,10 @@ inputs:
     default: '3.9'              # Lowest supported version
     required: false
   extras:
-    description: aiida-core extras (including brackets)
-    default: ''
+    description: list of optional dependencies
+    # NOTE: The default 'pre-commit' extra recursively contains
+    # other extras needed to run the tests.
+    default: pre-commit
     required: false
   # NOTE: Hard-learned lesson: we cannot use type=boolean here, apparently :-(
   # https://stackoverflow.com/a/76294014
@@ -16,7 +18,7 @@ inputs:
   # are installed in a virtual environment located in .venv directory.
   # Subsuquent jobs steps must either activate the environment or use `uv run`
   from-lock:
-    description: Install aiida-core dependencies from a uv lock file
+    description: Install aiida-core dependencies from uv lock file
     default: 'true'
     required: false
 
@@ -29,19 +31,18 @@ runs:
       python-version: ${{ inputs.python-version }}
 
   - name: Set up uv
-    uses: astral-sh/setup-uv@v4
+    uses: astral-sh/setup-uv@v5
     with:
-      version: 0.5.6
+      version: 0.5.x
+      python-version: ${{ inputs.python-version }}
 
   - name: Install dependencies from uv lock
     if: ${{ inputs.from-lock == 'true' }}
     # NOTE: We're asserting that the lockfile is up to date
-    # NOTE2: 'pre-commit' extra recursively contains other extras
-    # needed to run the tests.
-    run: uv sync --locked --extra pre-commit
+    run: uv sync --locked --extra ${{ inputs.extras }}
     shell: bash
 
   - name: Install aiida-core
     if: ${{ inputs.from-lock != 'true' }}
-    run: uv pip install --system -e .${{ inputs.extras }}
+    run: uv pip install -e .${{ inputs.extras }}
     shell: bash
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index 7a0076fbb..e46c2a5df 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -43,7 +43,7 @@ jobs:
       run: uv pip install --system -r utils/requirements.txt
 
     - name: Validate uv lockfile
-      run: uv lock --locked
+      run: uv lock --check
 
     - name: Validate conda environment file
       run: python ./utils/dependency_management.py validate-environment-yml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d37447c38..380f8766f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -191,12 +191,13 @@ repos:
   - id: check-uv-lock
     name: Check uv lockfile up to date
     # NOTE: This will not automatically update the lockfile
-    entry: uv lock --locked
+    entry: uv lock --check
     language: system
     pass_filenames: false
     files: >-
       (?x)^(
         pyproject.toml|
+        uv.lock|
       )$
 
   - id: generate-conda-environment