Skip to content

Commit 2195839

Browse files
saxixsaxix
committed
Merge branch 'release/2.6'
* release/2.6: (24 commits) lint updats tox matrix fixes tox matrix updats tox updates tox config add flake8 config updates CI lint updates CI lint preparing release update tox updates tox.ini updates tox add missing pyproject.toml pep 621 updated RTD deps updated RTD deps updated RTD config updated RTD config ...
2 parents 10ac3ac + 499cae5 commit 2195839

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2245
-1277
lines changed

‎.flake8‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[flake8]
2+
max-complexity = 12
3+
max-line-length = 120
4+
exclude =
5+
.*/
6+
__pycache__
7+
docs
8+
~build
9+
dist
10+
*.md
11+
12+
per-file-ignores =
13+
src/**/migrations/*.py:E501

‎.github/workflows/tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
python-version: [ "3.9", "3.11"]
30-
django-version: [ "3.2", "4.2"]
29+
python-version: [ "3.11", "3.12"]
30+
django-version: [ "4.2", "5.1"]
3131
db-engine: ["pg", "mysql"]
3232
env:
3333
PY_VER: ${{ matrix.python-version}}

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
!.gitignore
55
!.editorconfig
66
!.pre-commit-config.yaml
7+
!.readthedocs.yaml
8+
!.flake8
79
coverage.xml
810
notes.txt
911
build/
@@ -19,5 +21,6 @@ __pycache__
1921
.testmondata
2022
Pipfile.lock
2123
poetry.lock
22-
pyproject.toml
24+
!pyproject.toml
2325
.venv/
26+
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: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
4+
# Required
5+
version: 2
6+
7+
# Set the OS, Python version and other tools you might need
8+
build:
9+
os: ubuntu-22.04
10+
tools:
11+
python: "3.10"
12+
# You can also specify other tool versions:
13+
# nodejs: "20"
14+
# rust: "1.70"
15+
# golang: "1.20"
16+
17+
# Build documentation in the "docs/" directory with Sphinx
18+
sphinx:
19+
configuration: docs/conf.py
20+
# You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
21+
# builder: "dirhtml"
22+
# Fail on all warnings to avoid broken references
23+
# fail_on_warning: true
24+
25+
# Optionally build your docs in additional formats such as PDF and ePub
26+
# formats:
27+
# - pdf
28+
# - epub
29+
30+
# Optional but recommended, declare the Python requirements required
31+
# to build your documentation
32+
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
33+
python:
34+
install:
35+
- requirements: docs/requirements.pip
36+
- method: pip
37+
path: .

‎CHANGES‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Release 2.6
2+
-----------
3+
* add support do Django 5.x
4+
* drop support python 3.9
5+
* drop support django 3.x
6+
* move to .pyproject.toml
7+
8+
19
Release 2.5
210
-----------
311
* BUG FIX: fixes check() implementation

‎Pipfile‎

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

‎docs/conf.py‎

Lines changed: 4 additions & 4 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

@@ -81,7 +81,7 @@
8181
version = concurrency.VERSION
8282
# The full version, including alpha/beta/rc tags.
8383
release = concurrency.VERSION
84-
next_version = '1.5'
84+
next_version = '2.6'
8585

8686
# The language for content autogenerated by Sphinx. Refer to documentation
8787
# for a list of supported languages.
@@ -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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
sphinx==3.5.2
2-
django==3.1
1+
sphinx
2+
django
33
sphinx_issues

‎pyproject.toml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
[project]
2+
name = "django-concurrency"
3+
version = "2.6.0"
4+
description = "Optimistic lock implementation for Django. Prevents users from doing concurrent editing"
5+
authors = [
6+
{name = "sax", email = "s.apostolico@gmail.com"},
7+
]
8+
dependencies = []
9+
requires-python = ">=3.10"
10+
readme = "README.md"
11+
license = {text = "MIT"}
12+
13+
[project.optional-dependencies]
14+
dj4 = [
15+
"django>=4.2,<5",
16+
]
17+
dj5 = [
18+
"django>=5.1",
19+
]
20+
21+
[tool.pdm]
22+
[[tool.pdm.source]]
23+
url = "https://pypi.org/simple"
24+
verify_ssl = true
25+
name = "pypi"
26+
27+
[tool.pdm.dev-dependencies]
28+
dev = [
29+
"black>=24.8.0",
30+
"bump2version>=1.0.1",
31+
"check-manifest",
32+
"django-reversion",
33+
"django-webtest",
34+
"flake8",
35+
"isort",
36+
"mock",
37+
"pre-commit",
38+
"psycopg2-binary",
39+
"pytest>=8.3.3",
40+
"pytest-cov",
41+
"pytest-django",
42+
"pytest-echo",
43+
"sphinx",
44+
"sphinx-issues",
45+
"tox",
46+
"twine",
47+
]
48+
49+
[tool.isort]
50+
profile = "black"
51+
52+
[tool.black]
53+
line-length = 120
54+
include = '\.pyi?$'
55+
exclude = '''
56+
/(
57+
\.git
58+
| \.hg
59+
| \.mypy_cache
60+
| \.tox
61+
| \.venv
62+
| venv
63+
| _build
64+
| buck-out
65+
| build
66+
| dist
67+
| migrations
68+
| snapshots
69+
)/
70+
'''

0 commit comments

Comments
 (0)