Skip to content

Commit 8b233b9

Browse files
committed
pep 621
1 parent f3c5ac1 commit 8b233b9

File tree

15 files changed

+25
-157
lines changed

15 files changed

+25
-157
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ Pipfile.lock
2222
poetry.lock
2323
pyproject.toml
2424
.venv/
25+
pdm.lock

.pre-commit-config.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,9 @@ repos:
1212
entry: isort
1313
language: system
1414
types: [python]
15-
- id: check-manifest
16-
name: check-manifest
17-
entry: check-manifest
18-
language: system
19-
types: [python]
20-
files: '^$'
21-
always_run: true
2215

23-
- repo: git://github.com/pre-commit/pre-commit-hooks
16+
17+
- repo: https://github.com/pre-commit/pre-commit-hooks
2418
rev: v1.4.0
2519
hooks:
2620
- id: debug-statements

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ version: 2
88
build:
99
os: ubuntu-22.04
1010
tools:
11-
python: "3.9"
11+
python: "3.10"
1212
# You can also specify other tool versions:
1313
# nodejs: "20"
1414
# rust: "1.70"

CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
-----------
33
* add support do Django 5.x
44
* drop support python 3.9
5+
* move to .pyproject.toml
56

67

78
Release 2.5

Pipfile

Lines changed: 0 additions & 26 deletions
This file was deleted.

docs/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
'django': ('http://django.readthedocs.org/en/latest/', None),
4646
'sphinx': ('http://sphinx.readthedocs.org/en/latest/', None),
4747
}
48-
extlinks = {'issue': ('https://github.com/saxix/django-concurrency/issues/%s', 'issue #'),
49-
'django_issue': ('https://code.djangoproject.com/ticket/%s', 'issue #'),
48+
extlinks = {'issue': ('https://github.com/saxix/django-concurrency/issues/%s', 'issue #%s'),
49+
'django_issue': ('https://code.djangoproject.com/ticket/%s', 'issue #%s'),
5050

5151
}
5252

@@ -122,7 +122,7 @@
122122

123123
# The theme to use for HTML and HTML Help pages. See the documentation for
124124
# a list of builtin themes.
125-
html_theme = "default"
125+
# html_theme = "default"
126126
#
127127
# Theme options are theme-specific and customize the look and feel of a theme
128128
# further. For a list of options available for each theme, see the

docs/requirements.pip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
sphinx==3.5.2
1+
sphinx
22
django
33
sphinx_issues

setup.cfg

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,3 @@ max-complexity = 12
1717
max-line-length = 160
1818
exclude = .tox,migrations,.git,docs,diff_match_patch.py, deploy/**,settings
1919
ignore = E501,E401,W391,E128,E261,E731,W504
20-
21-
[aliases]
22-
test=pytest
23-
24-
[bdist_wheel]
25-
universal=1
26-
27-
[devpi:upload]
28-
formats = bdist_wheel,sdist.tgz

setup.py

Lines changed: 0 additions & 97 deletions
This file was deleted.

src/concurrency/admin.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
from django.core.exceptions import ImproperlyConfigured, ValidationError
1010
from django.db import transaction
1111
from django.db.models import Q
12+
from django.forms import CheckboxInput
1213
from django.forms.formsets import INITIAL_FORM_COUNT, ManagementForm, MAX_NUM_FORM_COUNT, TOTAL_FORM_COUNT
1314
from django.forms.models import BaseModelFormSet
1415
from django.http import HttpResponse, HttpResponseRedirect
1516
from django.utils.encoding import force_str
17+
from django.utils.html import format_html
1618
from django.utils.safestring import mark_safe
17-
from django.utils.translation import ngettext
19+
from django.utils.translation import gettext_lazy as _, ngettext
1820

1921
from concurrency import core, forms
2022
from concurrency.api import get_revision_of_object
@@ -23,9 +25,7 @@
2325
from concurrency.exceptions import RecordModifiedError
2426
from concurrency.forms import ConcurrentForm, VersionWidget
2527
from concurrency.utils import flatten
26-
from django.forms import CheckboxInput
27-
from django.utils.html import format_html
28-
from django.utils.translation import gettext_lazy as _
28+
2929
ALL = object()
3030

3131

0 commit comments

Comments
 (0)