GitHub Workflows: Fix up UV and caching

- Update `setup-uv` to v6

- Fix up caching.

- Cache keys for virtualenv and the like are based on lockfile

Author: datalogics-kam

.github/workflows/pre-commit.yml

@@ -18,19 +18,24 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
       - name: Install uv
-        uses: astral-sh/setup-uv@v1
-      - name: Restore uv cache
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: 0.8.22
+          python-version: 3.11
+          enable-cache: true
+          cache-suffix: pre-commit
+          cache-dependency-glob: uv.lock
+      - name: Restore venv cache
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cache/uv
             .venv
-          key: ${{ runner.os }}-uv-${{ hashFiles('pyproject.toml') }}
+          key: ${{ runner.os }}-uv-${{ hashFiles('uv.lock') }}
+      - uses: actions/cache@v4
+        with:
+          path: .mypy_cache
+          key: mypy_cache|${{ hashFiles('pyproject.toml') }}
       - name: Synchronize project dependencies
         run: uv sync --group dev
       - name: Run pre-commit checks

.github/workflows/test-and-publish.yml

@@ -33,16 +33,21 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install uv
-        uses: astral-sh/setup-uv@v1
-      - name: Restore uv cache
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: 0.8.22
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+          cache-suffix: pre-commit
+          cache-dependency-glob: uv.lock
+      - name: Restore venv cache
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cache/uv
             ${{ env.UV_PROJECT_ENVIRONMENT }}
-          key: ${{ runner.os }}-uv-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}
+          key: ${{ runner.os }}-uv-${{ matrix.python-version }}-${{ hashFiles('uv.lock') }}
       - name: Synchronize project dependencies
-        run: uv sync --group dev --python ${{ matrix.python-version }}
+        run: uv sync --group dev
       - name: Run tests
         run: uv run pytest