Merge branch 'release/2.0.0'

Author: erikvw

.coveragerc

@@ -2,4 +2,4 @@
 extend-ignore = E203
 max-line-length = 88
 max-complexity = 10
-exclude = */migrations/*,.tox,.git,__pycache__,build,dist,.eggs,.egg-info
+exclude = */migrations/*,.tox,.git,__pycache__,build,dist,.eggs,.egg-info,.venv

.editorconfig

@@ -0,0 +1,8 @@
+---
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.flake8

@@ -5,14 +5,16 @@ on: [push, pull_request]
 
 jobs:
   build:
-    name: build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }})
+    name: |
+      build (Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }}, ${{ matrix.database-engine }})
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
         python-version: ['3.12', '3.13']
         django-version: ['5.2', 'dev']
+        database-engine: ["mysql", "postgres"]
 
     services:
       mysql:
@@ -23,6 +25,17 @@ jobs:
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
 
     steps:
       - name: Install pycups and words dependency
@@ -32,38 +45,39 @@ jobs:
           sudo apt-get install libcups2-dev wamerican
 
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
+          enable-cache: true
 
-      - name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key:
-            ${{ matrix.python-version }}-v1-${{ hashFiles('**/pyproject.toml') }}
-          restore-keys: |
-            ${{ matrix.python-version }}-v1-
+#      - name: Get uv cache dir
+#        id: uv-cache
+#        run: echo "dir=$(uv run pip cache dir)" >> $GITHUB_OUTPUT
+#
+#      - name: Cache uv dependencies
+#        uses: actions/cache@v4
+#        with:
+#          path: ${{ steps.uv-cache.outputs.dir }}
+#          key: uv-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/tox.ini') }}
+#          restore-keys: |
+#            uv-${{ matrix.python-version }}-
 
-      - name: Install dependencies
+      - name: Install tox
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/tox.txt
+          uv tool install tox --with tox-uv
 
+      - name: Verify tox plugins
+        run: uv run --active --group test --no-sources tox --version
 
       - name: Tox tests
         run: |
-          tox -v
+          uv run --active --group test --no-sources tox
         env:
           DJANGO: ${{ matrix.django-version }}
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           name: Python ${{ matrix.python-version }}

.github/dependabot.yml

@@ -1,3 +1,4 @@
+.idea/*
 _version.py
 .project
 .pydevproject

.github/workflows/build.yml

@@ -13,7 +13,7 @@ repos:
     rev: 25.1.0
     hooks:
       - id: black
-        language_version: python3.11
+        language_version: python3.12
 
   - repo: https://github.com/pycqa/flake8
     rev: 7.3.0
@@ -28,7 +28,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: requirements-txt-fixer
         files: requirements/.*\.txt$

.gitignore

@@ -0,0 +1,29 @@
+---
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version, and other tools you might need
+build:
+  os: ubuntu-24.04
+  tools:
+    python: "3.13"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optionally, but recommended,
+# declare the Python requirements required to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+
+python:
+  install:
+    - requirements: docs/requirements.txt
+
+# Build PDF & ePub
+formats:
+  - epub
+  - pdf

.pre-commit-config.yaml

@@ -1,4 +1,11 @@
 
+2.0.0
+-----
+- build using uv
+- fix dependencies
+- add docs
+- bump django-revision dependency
+
 1.0.0
 -----
 - fix: check for update_fields is not none and add audit fields