Small Dockerfile & Makefile fixes

Author: dolfinus

.github/workflows/changelog.yml

@@ -38,7 +38,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          make venv
+          export UV=$(which uv)
+          make venv-install
 
       - name: Check changelog entry exists
         run: |

.github/workflows/codeql-analysis.yml

@@ -40,7 +40,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          make venv
+          export UV=$(which uv)
+          make venv-install
 
       - name: Run mypy
         run: uv run mypy ./data_rentgen --config-file ./pyproject.toml

.github/workflows/release.yml

@@ -41,7 +41,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          make venv
+          export UV=$(which uv)
+          make venv-install
 
       - name: Generate OpenAPI Schema
         run: |

.github/workflows/test.yml

@@ -46,7 +46,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          make venv
+          export UV=$(which uv)
+          make venv-install
 
       - name: Run Tests
         run: |
@@ -116,11 +117,13 @@ jobs:
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
-      - name: Upgrade pip
-        run: python -m pip install --upgrade pip setuptools wheel
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
 
       - name: Install dependencies
-        run: pip install -I coverage
+        run: |
+          export UV=$(which uv)
+          make venv-install
 
       - name: Download all raw coverage data
         uses: actions/download-artifact@v7
@@ -130,8 +133,8 @@ jobs:
 
       - name: Combine Coverage Data
         run: |
-          coverage combine coverage-data
-          coverage xml -o combined_coverage.xml
+          uv run coverage combine coverage-data
+          uv run coverage xml -o combined_coverage.xml
 
       - name: Coverage comment
         id: coverage

Makefile

@@ -6,7 +6,7 @@ VERSION = develop
 VIRTUAL_ENV ?= .venv
 PYTHON = ${VIRTUAL_ENV}/bin/python
 PIP = ${VIRTUAL_ENV}/bin/pip
-UV = ${VIRTUAL_ENV}/bin/uv
+UV ?= ${VIRTUAL_ENV}/bin/uv
 PYTEST = ${VIRTUAL_ENV}/bin/pytest
 COVERAGE = ${VIRTUAL_ENV}/bin/coverage