Merge pull request #255 from saxix/uv

uses uv/ruff and full PEP621

Author: saxix

.github/file-filters.yml

@@ -0,0 +1,45 @@
+# This is used by the action https://github.com/dorny/paths-filter
+docker: &docker
+  - added|modified: './docker/**/*'
+  - added|modified: './docker/*'
+
+dependencies: &dependencies
+  - 'pdm.lock'
+  - 'pyproject.toml'
+
+actions: &actions
+  - added|modified: './.github/**/*'
+
+python: &python
+  - added|modified: 'src/**'
+  - added|modified: 'tests/**'
+  - 'manage.py'
+
+changelog:
+  - added|modified: 'changes/**'
+  - 'CHANGELOG.md'
+
+mypy:
+  - *python
+  - 'mypy.ini'
+
+run_tests:
+  - *actions
+  - *python
+  - *docker
+  - *dependencies
+  - 'pytest.ini'
+
+migrations:
+  - added|modified: 'src/**/migrations/*'
+
+lint:
+  - *python
+  - '.flake8'
+  - 'pyproject.toml'
+
+docs:
+  - added|modified: './docs/**/*'
+  - modified: './src/birder/config/__init__.py'
+  - modified: './github/workflows/docs.yml'
+  - modified: './github/file-filters.yml'

.github/workflows/tests.yaml

@@ -8,6 +8,18 @@ on:
     pull_request:
 
 jobs:
+    pkg_meta:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v2
+            -   uses: actions/setup-python@v2
+
+            -   name: Install dependencies
+                run: |
+                    python -m pip install --upgrade pip tox
+            -   name: Lint with flake8
+                run: |
+                    tox -e pkg_meta
     lint:
         runs-on: ubuntu-latest
         steps:
@@ -27,7 +39,7 @@ jobs:
             fail-fast: false
             matrix:
                 python-version: [ "3.11", "3.12"]
-                django-version: [ "4.2", "5.1"]
+                django-version: [ "3.2", "4.2", "5.1"]
                 db-engine: ["pg", "mysql"]
         env:
             PY_VER: ${{ matrix.python-version}}
@@ -47,16 +59,16 @@ jobs:
               - 5432:5432
             options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
-#          mysql:
-#            image: mysql:5.7
-#            env:
-#              MYSQL_DATABASE: test_db
-#              MYSQL_USER: user
-#              MYSQL_PASSWORD: password
-#              MYSQL_ROOT_PASSWORD: rootpassword
-#            ports:
-#              - 33306:3306
-#            options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
+          mysql:
+            image: mysql:5.7
+            env:
+              MYSQL_DATABASE: test_db
+              MYSQL_USER: user
+              MYSQL_PASSWORD: password
+              MYSQL_ROOT_PASSWORD: rootpassword
+            ports:
+              - 33306:3306
+            options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
 
         steps:
             - uses: actions/checkout@v2

.gitignore

@@ -19,8 +19,5 @@ __pycache__
 *.mo
 *.sqlite
 .testmondata
-Pipfile.lock
-poetry.lock
-!pyproject.toml
 .venv/
-pdm.lock
+src/concurrency/version.py

.pre-commit-config.yaml

@@ -1,37 +1,35 @@
-exclude: '^$'
-fail_fast: false
 repos:
--   repo: local
-    hooks:
-      - id: isort
-        args:
-            - -rc
-            - src/
-            - tests/
-        name: isort
-        entry: isort
-        language: system
-        types: [python]
-
-
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v1.4.0
-    hooks:
-    -   id: debug-statements
-        exclude: manage.py
-    -   id: end-of-file-fixer
-    -   id: flake8
-        exclude: docs/
-        args:
-        - src/
-        - tests/
-    -   id: check-merge-conflict
-    -   id: check-case-conflict
-#    -   id: name-tests-test
-#    -   id: trailing-whitespace
-#    -   id: requirements-txt-fixer
-#        files: requirements-dev.txt
-#-   repo: git://github.com/asottile/reorder_python_imports
-#    rev: v1.0.1
-#    hooks:
-#    -   id: reorder-python-imports
+    -   repo: https://github.com/pre-commit/pre-commit-hooks
+        rev: v5.0.0
+        hooks:
+            -   id: end-of-file-fixer
+            -   id: trailing-whitespace
+    -   repo: https://github.com/python-jsonschema/check-jsonschema
+        rev: 0.31.0
+        hooks:
+            -   id: check-github-workflows
+                args: [ "--verbose" ]
+    -   repo: https://github.com/tox-dev/tox-ini-fmt
+        rev: "1.5.0"
+        hooks:
+            -   id: tox-ini-fmt
+                args: [ "-p", "lint" ]
+    -   repo: https://github.com/tox-dev/pyproject-fmt
+        rev: "v2.5.0"
+        hooks:
+            -   id: pyproject-fmt
+    -   repo: https://github.com/astral-sh/ruff-pre-commit
+        rev: "v0.9.4"
+        hooks:
+            -   id: ruff-format
+            -   id: ruff
+                args: [ "--fix", "--unsafe-fixes", "--exit-non-zero-on-fix" ]
+    -   repo: https://github.com/adamchainz/djade-pre-commit
+        rev: "1.3.2"
+        hooks:
+            -   id: djade
+                args: [ --target-version, "5.1" ]  # Replace with Django version
+    -   repo: meta
+        hooks:
+            -   id: check-hooks-apply
+            -   id: check-useless-excludes

Makefile

@@ -34,7 +34,7 @@ travis:
 
 
 clean:
-	rm -fr ${BUILDDIR} dist *.egg-info .coverage coverage.xml .eggs
+	rm -fr ${BUILDDIR} dist *.egg-info .coverage coverage.xml .eggs build
 	find src -name __pycache__ -o -name "*.py?" -o -name "*.orig" -prune | xargs rm -rf
 	find tests -name __pycache__ -o -name "*.py?" -o -name "*.orig" -prune | xargs rm -rf
 	find src/concurrency/locale -name django.mo | xargs rm -f

README.md

@@ -6,6 +6,8 @@ Django Concurrency
 [![coverage](https://codecov.io/github/saxix/django-concurrency/coverage.svg?branch=develop)](https://codecov.io/github/saxix/django-concurrency?branch=develop)
 [![Test](https://github.com/saxix/django-concurrency/actions/workflows/tests.yaml/badge.svg)](https://github.com/saxix/django-concurrency/actions/workflows/tests.yaml)
 [![Docs](https://readthedocs.org/projects/django-concurrency/badge/?version=stable)](http://django-concurrency.readthedocs.io/en/stable/)
+[![Django](https://img.shields.io/pypi/frameworkversions/django/django-concurrency)](https://pypi.org/project/django-concurrency/)
+[![Supported Python versions](https://img.shields.io/pypi/pyversions/django-concurrency.svg)](https://pypi.org/project/django-concurrency/)
 
 
 django-concurrency is an [optimistic lock][1] implementation for Django.
@@ -48,8 +50,8 @@ you will get a ``RecordModifiedError`` on ``b.save()``
 Similar projects
 ----------------
 
-Other projects that handle concurrent editing are [django-optimistic-lock][10] 
-and [django-locking][11] anyway concurrency is "a batteries included" optimistic 
+Other projects that handle concurrent editing are [django-optimistic-lock][10]
+and [django-locking][11] anyway concurrency is "a batteries included" optimistic
 lock management system, here some features not available elsewhere:
 
  * can be applied to any model; not only your code (ie. django.contrib.auth.Group)

compose.yml

@@ -0,0 +1,23 @@
+services:
+
+  postgres:
+    image: postgis/postgis:14-3.4-alpine
+    platform: linux/amd64
+    ports:
+      - "5432:5432"
+    shm_size: '1gb'
+    environment:
+      POSTGRES_PASSWORD: password
+      POSTGRES_USER: postgres
+      POSTGRES_HOST_AUTH_METHOD: trust
+
+  mysql:
+    image: mysql
+    stdin_open: true
+    tty: true
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: concurrency
+      MYSQL_ALLOW_EMPTY_PASSWORD: true

docs/_ext/version.py

@@ -1,14 +1,9 @@
 import re
 
-from docutils.parsers.rst import Directive, directives
-from sphinx import addnodes, roles
-from sphinx.errors import ExtensionError
-from sphinx.util.console import bold
+
 # RE for option descriptions without a '--' prefix
-from sphinx.writers.html import HTMLTranslator
 
-simple_option_desc_re = re.compile(
-    r'([-_a-zA-Z0-9]+)(\s*.*?)(?=,\s+(?:/|-|--)|$)')
+simple_option_desc_re = re.compile(r"([-_a-zA-Z0-9]+)(\s*.*?)(?=,\s+(?:/|-|--)|$)")
 
 
 def setup(app):
@@ -20,19 +15,19 @@ def setup(app):
     app.add_crossref_type(
         directivename="templatetag",
         rolename="ttag",
-        indextemplate="pair: %s; template tag"
+        indextemplate="pair: %s; template tag",
     )
     app.add_crossref_type(
         directivename="templatefilter",
         rolename="tfilter",
-        indextemplate="pair: %s; template filter"
+        indextemplate="pair: %s; template filter",
     )
     app.add_crossref_type(
         directivename="fieldlookup",
         rolename="lookup",
         indextemplate="pair: %s; field lookup type",
     )
-    app.add_config_value('next_version', '0.0', True)
+    app.add_config_value("next_version", "0.0", True)
     app.add_crossref_type(
         directivename="release",
         rolename="release",