updates

Author: saxix

.github/workflows/tests.yaml

@@ -27,7 +27,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 +47,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",

docs/conf.py

@@ -5,7 +5,7 @@
 
 import concurrency
 
-src = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, 'src'))
+src = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, "src"))
 sys.path.insert(0, src)
 
 
@@ -27,51 +27,52 @@
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext")))
-extensions = ['sphinx.ext.autodoc',
-              'sphinx.ext.todo',
-              'sphinx.ext.graphviz',
-              'sphinx.ext.intersphinx',
-              'sphinx.ext.doctest',
-              'sphinx.ext.extlinks',
-              'sphinx.ext.autosummary',
-              'sphinx.ext.coverage',
-              'sphinx.ext.viewcode',
-              'sphinx_issues',
-              'version'
-              ]
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.todo",
+    "sphinx.ext.graphviz",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.doctest",
+    "sphinx.ext.extlinks",
+    "sphinx.ext.autosummary",
+    "sphinx.ext.coverage",
+    "sphinx.ext.viewcode",
+    "sphinx_issues",
+    "version",
+]
 
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/2.7/', None),
-    'django': ('http://django.readthedocs.org/en/latest/', None),
-    'sphinx': ('http://sphinx.readthedocs.org/en/latest/', None),
+    "python": ("https://docs.python.org/2.7/", None),
+    "django": ("http://django.readthedocs.org/en/latest/", None),
+    "sphinx": ("http://sphinx.readthedocs.org/en/latest/", None),
+}
+extlinks = {
+    "issue": ("https://github.com/saxix/django-concurrency/issues/%s", "issue #%s"),
+    "django_issue": ("https://code.djangoproject.com/ticket/%s", "issue #%s"),
 }
-extlinks = {'issue': ('https://github.com/saxix/django-concurrency/issues/%s', 'issue #%s'),
-            'django_issue': ('https://code.djangoproject.com/ticket/%s', 'issue #%s'),
-
-            }
 
-github_project_url = 'https://github.com/saxix/django-concurrency'
+github_project_url = "https://github.com/saxix/django-concurrency"
 
 todo_include_todos = True
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # HTML translator class for the builder
 html_translator_class = "version.DjangoHTMLTranslator"
 
 # General information about the project.
-project = u'Django Concurrency'
-copyright = u'2012-2019, Stefano Apostolico'
+project = "Django Concurrency"
+copyright = "2012-2019, Stefano Apostolico"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -81,7 +82,7 @@
 version = concurrency.VERSION
 # The full version, including alpha/beta/rc tags.
 release = concurrency.VERSION
-next_version = '2.6'
+next_version = "2.6"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -95,7 +96,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ["_build"]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 # default_role = None
@@ -112,7 +113,7 @@
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -195,7 +196,7 @@
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'djangoconcurrencydoc'
+htmlhelp_basename = "djangoconcurrencydoc"
 
 # -- Options for LaTeX output --------------------------------------------------
 
@@ -208,8 +209,13 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'DjangoConcurrency.tex', u'Django Concurrency Documentation',
-     u'Stefano Apostolico', 'manual'),
+    (
+        "index",
+        "DjangoConcurrency.tex",
+        "Django Concurrency Documentation",
+        "Stefano Apostolico",
+        "manual",
+    ),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -241,6 +247,11 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'djangoconcurrency', u'Django Concurrency Documentation',
-     [u'Stefano Apostolico'], 1)
+    (
+        "index",
+        "djangoconcurrency",
+        "Django Concurrency Documentation",
+        ["Stefano Apostolico"],
+        1,
+    )
 ]

docs/cookbook.rst

@@ -101,7 +101,7 @@ To avoid this simply disable concurrency, by using a mixin:
 .. code-block:: python
 
     class ConcurrencyVersionAdmin(reversion.admin.VersionAdmin):
-    
+
         @disable_concurrency()
         def revision_view(self, request, object_id, version_id, extra_context=None):
             return super().revision_view(request, object_id, version_id, extra_context=None)

manage.py

@@ -3,14 +3,18 @@
 import sys
 
 here = os.path.abspath(os.path.join(os.path.dirname(__file__)))
-rel = lambda *args: os.path.join(here, *args)
+
+
+def rel(*args):
+    return os.path.join(here, *args)
+
 
 sys.path.insert(0, rel(os.pardir))
 
 
 if __name__ == "__main__":
-    sys.path.insert(0, 'src')
-    sys.path.insert(0, 'tests/demoapp')
+    sys.path.insert(0, "src")
+    sys.path.insert(0, "tests/demoapp")
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
 
     from django.core.management import execute_from_command_line