Adding uv

Author: glanzel

.github/workflows/django.yml

@@ -55,19 +55,22 @@ jobs:
           cache-name: cache-pip-packages
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/requirements/dev.txt') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pyproject.toml') }}
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
       - name: Install Dependencies
+        env:
+          UV_PROJECT_ENVIRONMENT: "/home/runner/.local"
         run: |
           sudo apt update
           sudo apt install -y gdal-bin
           sudo apt install libsqlite3-mod-spatialite
           npm install
-          pip install -r requirements/dev.txt
-          pip install coveralls
+          pip install uv
+          uv sync --all-groups
+          uv add coveralls
       - name: Run Tests
         env:
           PGPASSWORD: postgres
@@ -81,12 +84,30 @@ jobs:
       - name: Run Frontend Tests
         run: |
           npm test
+      - name: Check Coverage File
+        run: |
+          echo "Checking if .coverage file exists..."
+          if [ -f .coverage ]; then
+            echo "✓ .coverage file exists"
+            echo "File size: $(du -h .coverage | cut -f1)"
+            echo "File type: $(file .coverage)"
+            echo "First 100 bytes:"
+            head -c 100 .coverage | hexdump -C
+            echo ""
+            echo "Testing coverage data..."
+            .venv/bin/coverage report --skip-covered --skip-empty || echo "Coverage report failed"
+          else
+            echo "✗ .coverage file NOT found!"
+            echo "Current directory: $(pwd)"
+            echo "Looking for coverage files..."
+            find . -name ".coverage*" -type f 2>/dev/null || echo "No coverage files found"
+            exit 1
+          fi
       - name: Coveralls Python
-        uses: coverallsapp/github-action@v2
-        with:
-          flag-name: python
-          parallel: true
-          file: .coverage
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          .venv/bin/coveralls --service=github --parallel --flag-name=python
       - name: Coveralls JS
         uses: coverallsapp/github-action@v2
         with:

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 This project (not yet) adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- Images remain in the upload section through validation
+
+### Changed
+
+- Using uv as python package manager now
+
 ## mB-v2509.1
 
 ### Changed
@@ -373,9 +383,3 @@ count as labels)
 - actions: only create actions for phases and projects if the project is not
   a draft (!1437)
 - reformat CHANGELOG.md
-
-## Unreleased
-
-### Fixed
-
-- Images remain in the upload section through validation

Makefile

@@ -1,6 +1,6 @@
 all: help
 
-VIRTUAL_ENV ?= venv
+VIRTUAL_ENV ?= .venv
 SOURCE_DIRS = adhocracy4 tests
 NODE_BIN = node_modules/.bin
 ARGUMENTS=$(filter-out $(firstword $(MAKECMDGOALS)), $(MAKECMDGOALS))
@@ -30,9 +30,12 @@ help:
 .PHONY: install
 install:
 	npm install
-	if [ ! -f $(VIRTUAL_ENV)/bin/python3 ]; then python3 -m venv $(VIRTUAL_ENV); fi
-	$(VIRTUAL_ENV)/bin/pip install -r requirements/dev.txt
-
+	@if [ ! -f $(VIRTUAL_ENV)/bin/pip ]; then python3 -m venv $(VIRTUAL_ENV); fi
+	@if ! command -v uv --version; then \
+	$(VIRTUAL_ENV)/bin/pip install pipx; \
+	$(VIRTUAL_ENV)/bin/pipx install uv; \
+	fi
+	uv sync --all-groups
 .PHONY: clean
 clean:
 	if [ -f package-lock.json ]; then rm package-lock.json; fi

README.md

@@ -24,15 +24,26 @@ To try it out yourself, best start with [a+][https://github.com/liqd/adhocracy-p
     git clone https://github.com/liqd/adhocracy4.git
     cd adhocracy4
     make install 
+    # make install adds an installation of uv in a global virtual env via pipx
+    # Uv install the packages to .venv 
 
-## Start virtual environment
+## Use Make
+    make test
+    make help
+
+## Development
+To add a new Library use uv 
 ```
-source venv/bin/activate
+uv add module
 ```
-## Check if tests work
+this automaticly updates pyproject.toml and uv.lock
+
+## Virtual Enviroment
+if you want to do something inside the venv manually use
 ```
-make test
+uv run python manage.py ...
 ```
+(which invokes .venev/bin/python manage.py ... )
 
 
 

pyproject.toml

@@ -25,7 +25,7 @@ dependencies = [
     "django-allauth",
     "django-autoslug",
     "django-background-tasks",
-    "django-ckeditor-5",
+    "django-ckeditor-5 @ https://github.com/liqd/django-ckeditor-5/releases/download/v0.2.11-liqd/django_ckeditor_5-0.2.11-py3-none-any.whl",
     "django-enumfield",
     "django-filter",
     "django-multiselectfield",
@@ -44,6 +44,21 @@ dependencies = [
 ]
 dynamic = ["version"]
 
+[dependency-groups]
+dev = [
+    "black",
+    "factory-boy",
+    "Faker",
+    "flake8",
+    "freezegun",
+    "isort",
+    "psycopg[binary]",
+    "pytest",
+    "pytest-cov",
+    "pytest-django",
+    "pytest-factoryboy",
+]
+
 [project.urls]
 "Homepage" = "https://github.com/liqd/adhocracy4"
 "Bug Tracker" = "https://github.com/liqd/adhocracy4/issues"
@@ -55,7 +70,7 @@ include = ["adhocracy4"]
 
 [tool.isort]
 profile = "black"
-skip = ["node_modules", "venv"]
+skip = ["node_modules", "venv", ".venv"]
 skip_glob = ["*/migrations/*.py"]
 known_first_party = ["adhocracy4", "tests"]
 force_single_line = true