WIP: See if we can use uv lockfile

aiidateam · Nov 25, 2024 · ddf23f7 · ddf23f7
1 parent 41a0fd9
commit ddf23f7
Show file tree

Hide file tree

Showing 3 changed files with 4,849 additions and 22 deletions.
diff --git a/.github/actions/install-aiida-core/action.yml b/.github/actions/install-aiida-core/action.yml
@@ -12,8 +12,9 @@ inputs:
     required: false
   # NOTE: Hard-learned lesson: we cannot use type=boolean here, apparently :-(
   # https://stackoverflow.com/a/76294014
+  # TODO: Rename this
   from-requirements:
-    description: Install aiida-core dependencies from pre-compiled requirements.txt file
+    description: Install aiida-core dependencies from a uv lock file
     default: 'true'
     required: false
 
@@ -25,26 +26,15 @@ runs:
     with:
       python-version: ${{ inputs.python-version }}
 
-  - name: Install uv installer
-    run: curl --proto '=https' --tlsv1.2 -LsSf https://${{ env.UV_URL }} | sh
-    env:
-      UV_VERSION: 0.2.9
-      UV_URL: github.com/astral-sh/uv/releases/download/$UV_VERSION/uv-installer.sh
-    shell: bash
+  - name: Set up uv
+    uses: astral-sh/setup-uv@v3
+    with:
+      version: 0.5.4
 
-  - name: Install dependencies from requirements-py-*.txt
+  - name: Install dependencies from uv lock
     if: ${{ inputs.from-requirements == 'true' }}
-    run: uv pip install --system -r requirements/requirements-py-${{ inputs.python-version }}.txt
-    shell: bash
+    run: uv sync --locked
 
   - name: Install aiida-core
-    run: uv pip install --system ${{ env.NO_DEPS }} -e .${{ inputs.extras }}
-    env:
-        # Don't install dependencies if they were installed through requirements file AND
-        # if no extras are required.
-        #
-        # If this syntax looks weird to you, dear reader, know that this is
-        # GHA's way to do ternary operator. :-/
-        # https://docs.github.com/en/actions/learn-github-actions/expressions#example
-      NO_DEPS: ${{ (inputs.from-requirements == 'true' && inputs.extras == '')  && '--no-deps' || '' }}
-    shell: bash
+    if: ${{ inputs.from-requirements != 'true' }}
+    run: uv pip install --system -e .${{ inputs.extras }}
diff --git a/.github/workflows/ci-code.yml b/.github/workflows/ci-code.yml
@@ -34,6 +34,7 @@ jobs:
     - name: Install utils/ dependencies
       run: pip install -r utils/requirements.txt
 
+    # TODO: Change this to make sure that the lock is up-to-date
     - name: Check requirements files
       id: check_reqs
       run: python ./utils/dependency_management.py check-requirements DEFAULT
@@ -104,7 +105,7 @@ jobs:
         AIIDA_WARN_v3: 1
       # Python 3.12 has a performance regression when running with code coverage
       # so run code coverage only for python 3.9.
-      run: pytest --db-backend psql -m 'not nightly' tests/ ${{ matrix.python-version == '3.9' && '--cov aiida' || '' }}
+      run: uv run pytest --db-backend psql -m 'not nightly' tests/ ${{ matrix.python-version == '3.9' && '--cov aiida' || '' }}
 
     - name: Upload coverage report
       if: matrix.python-version == 3.9 && github.repository == 'aiidateam/aiida-core'
@@ -139,7 +140,7 @@ jobs:
     - name: Run test suite
       env:
         AIIDA_WARN_v3: 0
-      run: pytest -m 'presto' tests/
+      run: uv run pytest -m 'presto' tests/
 
 
   verdi: