Merge pull request #250 from saxix/feature/pep621

domdinicola · web-flow · commit a2d8b8a09759 · 2024-07-30T09:56:13.000+02:00
pep 621
diff --git a/.gitignore b/.gitignore
@@ -20,5 +20,6 @@ __pycache__
 .testmondata
 Pipfile.lock
 poetry.lock
-pyproject.toml
+!pyproject.toml
 .venv/
+pdm.lock
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,15 +12,9 @@ repos:
         entry: isort
         language: system
         types: [python]
-      - id: check-manifest
-        name: check-manifest
-        entry: check-manifest
-        language: system
-        types: [python]
-        files: '^$'
-        always_run: true
 
--   repo: git://github.com/pre-commit/pre-commit-hooks
+
+-   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v1.4.0
     hooks:
     -   id: debug-statements
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -8,7 +8,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.9"
+    python: "3.10"
     # You can also specify other tool versions:
     # nodejs: "20"
     # rust: "1.70"
diff --git a/CHANGES b/CHANGES
@@ -2,6 +2,7 @@
 -----------
 * add support do Django 5.x
 * drop support python 3.9
+* move to .pyproject.toml
 
 
 Release 2.5
diff --git a/Pipfile b/Pipfile
diff --git a/docs/conf.py b/docs/conf.py
@@ -45,8 +45,8 @@
     '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 #'),
-            'django_issue': ('https://code.djangoproject.com/ticket/%s', 'issue #'),
+extlinks = {'issue': ('https://github.com/saxix/django-concurrency/issues/%s', 'issue #%s'),
+            'django_issue': ('https://code.djangoproject.com/ticket/%s', 'issue #%s'),
 
             }
 
@@ -81,7 +81,7 @@
 version = concurrency.VERSION
 # The full version, including alpha/beta/rc tags.
 release = concurrency.VERSION
-next_version = '1.5'
+next_version = '2.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -122,7 +122,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+# html_theme = "default"
 #
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
diff --git a/docs/requirements.pip b/docs/requirements.pip
@@ -1,3 +1,3 @@
-sphinx==3.5.2
+sphinx
 django
 sphinx_issues
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,54 @@
+[project]
+name = "django-concurrency"
+version = "2.5"
+description = "Optimistic lock implementation for Django. Prevents users from doing concurrent editing"
+authors = [
+    {name = "sax", email = "s.apostolico@gmail.com"},
+]
+dependencies = []
+requires-python = ">=3.10"
+readme = "README.md"
+license = {text = "MIT"}
+
+[tool.pdm]
+[[tool.pdm.source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[tool.pdm.dev-dependencies]
+dev = [
+    "black",
+    "bump2version>=1.0.1",
+    "check-manifest",
+    "django",
+    "django-reversion",
+    "django-webtest",
+    "flake8",
+    "isort",
+    "mock",
+    "pre-commit",
+    "psycopg2-binary",
+    "pytest",
+    "pytest-cov",
+    "pytest-django",
+    "pytest-echo",
+    "sphinx",
+    "sphinx-issues",
+    "tox",
+    "twine",
+]
+
+[tool.isort]
+combine_as_imports = true
+default_section = "THIRDPARTY"
+include_trailing_comma = true
+known_tests = "pytest,unittest,factory"
+known_demo = "demo"
+known_django = "django"
+sections = "FUTURE,STDLIB,DJANGO,THIRDPARTY,TESTS,FIRSTPARTY,DEMO,LOCALFOLDER"
+known_first_party = "etools_validator"
+multi_line_output = 3
+line_length = 120
+balanced_wrapping = true
+order_by_type = false
diff --git a/setup.cfg b/setup.cfg
@@ -17,12 +17,3 @@ max-complexity = 12
 max-line-length = 160
 exclude = .tox,migrations,.git,docs,diff_match_patch.py, deploy/**,settings
 ignore = E501,E401,W391,E128,E261,E731,W504
-
-[aliases]
-test=pytest
-
-[bdist_wheel]
-universal=1
-
-[devpi:upload]
-formats = bdist_wheel,sdist.tgz
diff --git a/setup.py b/setup.py
diff --git a/src/concurrency/admin.py b/src/concurrency/admin.py
@@ -9,12 +9,14 @@
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.db import transaction
 from django.db.models import Q
+from django.forms import CheckboxInput
 from django.forms.formsets import INITIAL_FORM_COUNT, ManagementForm, MAX_NUM_FORM_COUNT, TOTAL_FORM_COUNT
 from django.forms.models import BaseModelFormSet
 from django.http import HttpResponse, HttpResponseRedirect
 from django.utils.encoding import force_str
+from django.utils.html import format_html
 from django.utils.safestring import mark_safe
-from django.utils.translation import ngettext
+from django.utils.translation import gettext_lazy as _, ngettext
 
 from concurrency import core, forms
 from concurrency.api import get_revision_of_object
@@ -23,9 +25,7 @@
 from concurrency.exceptions import RecordModifiedError
 from concurrency.forms import ConcurrentForm, VersionWidget
 from concurrency.utils import flatten
-from django.forms import CheckboxInput
-from django.utils.html import format_html
-from django.utils.translation import gettext_lazy as _
+
 ALL = object()
 
 
diff --git a/tests/demoapp/demo/backends.py b/tests/demoapp/demo/backends.py
@@ -1,5 +1,3 @@
-from typing import Any
-
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.backends import ModelBackend
diff --git a/tests/demoapp/demo/migrations5/0001_initial.py b/tests/demoapp/demo/migrations5/0001_initial.py
@@ -1,11 +1,12 @@
 # Generated by Django 5.0.1 on 2024-01-25 17:49
 
-import concurrency.fields
 import django.contrib.auth.models
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
 
+import concurrency.fields
+
 
 class Migration(migrations.Migration):
 
diff --git a/tests/demoapp/demo/settings.py b/tests/demoapp/demo/settings.py
@@ -1,6 +1,8 @@
 import os
 from tempfile import mktemp
 
+import django
+
 try:
     from psycopg2cffi import compat
 
@@ -28,8 +30,6 @@
                   'reversion',
                   'demo'
                   ]
-import django
-
 IS_DJANGO_5 = django.VERSION[0] == 5
 if IS_DJANGO_5:
     MIGRATION_MODULES = {
diff --git a/tests/test_forms.py b/tests/test_forms.py
@@ -1,11 +1,12 @@
+from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
 from django.forms.models import modelform_factory
 from django.forms.widgets import HiddenInput, TextInput
 from django.test import override_settings, TestCase
 from django.test.testcases import SimpleTestCase
 from django.utils.encoding import smart_str
 from django.utils.translation import gettext as _
-from django.conf import settings
+
 import pytest
 
 from concurrency.exceptions import VersionError
diff --git a/tox.ini b/tox.ini

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 -sphinx==3.5.2
 +sphinx
 django
 sphinx_issues