Skip to content

Commit c08b1f0

Browse files
authored
Merge pull request #59 from maykinmedia/amend-supported-django-versions
2 parents ea64067 + 4aee625 commit c08b1f0

8 files changed

Lines changed: 31 additions & 51 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,14 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
python: ['3.10', '3.11', '3.12']
19-
django: ['3.2', '4.2']
20-
exclude:
21-
- python: '3.11'
22-
django: '3.2'
23-
- python: '3.12'
24-
django: '3.2'
18+
python: ['3.12', '3.13', '3.14']
19+
django: ['5.2', '6.0']
2520

2621
name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }})
2722

2823
steps:
29-
- uses: actions/checkout@v4
30-
- uses: actions/setup-python@v5
24+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
25+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
3126
with:
3227
python-version: ${{ matrix.python }}
3328

@@ -41,7 +36,7 @@ jobs:
4136
DJANGO: ${{ matrix.django }}
4237

4338
- name: Publish coverage report
44-
uses: codecov/codecov-action@v4
39+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6
4540
with:
4641
token: ${{ secrets.CODECOV_TOKEN }}
4742

@@ -56,10 +51,10 @@ jobs:
5651
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
5752

5853
steps:
59-
- uses: actions/checkout@v4
60-
- uses: actions/setup-python@v5
54+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
55+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
6156
with:
62-
python-version: '3.10'
57+
python-version-file: 'pyproject.toml'
6358

6459
- name: Build wheel
6560
run: |

.github/workflows/code_quality.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
matrix:
2323
toxenv: [isort, black, flake8, docs]
2424
steps:
25-
- uses: actions/checkout@v4
26-
- uses: actions/setup-python@v5
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
26+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
2727
with:
28-
python-version: '3.10'
28+
python-version-file: 'pyproject.toml'
2929
- name: Install dependencies
3030
run: pip install tox
3131
- run: tox

.readthedocs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
version: 2
66

77
build:
8-
os: ubuntu-22.04
8+
os: ubuntu-24.04
99
tools:
10-
python: "3.10"
10+
python: "3.13"
1111

1212
python:
1313
install:

README.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ Features
2727
Installation
2828
============
2929

30-
Requirements
31-
------------
32-
33-
* Python 3.10 or above
34-
* Django 3.2 or newer
35-
36-
3730
Install
3831
-------
3932

docs/quickstart.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
Quickstart
22
==========
33

4-
Requirements
5-
------------
6-
7-
* Python 3.10 or newer
8-
* Django 3.2 or newer
9-
104
Installation
115
------------
126

pyproject.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ keywords = ["django", "certificate", "security"]
1515
classifiers = [
1616
"Development Status :: 5 - Production/Stable",
1717
"Framework :: Django",
18-
"Framework :: Django :: 3.2",
19-
"Framework :: Django :: 4.2",
18+
"Framework :: Django :: 5.2",
19+
"Framework :: Django :: 6.0",
2020
"Intended Audience :: Developers",
2121
"Operating System :: Unix",
2222
"Operating System :: MacOS",
2323
"Operating System :: Microsoft :: Windows",
24-
"Programming Language :: Python :: 3.10",
25-
"Programming Language :: Python :: 3.11",
2624
"Programming Language :: Python :: 3.12",
25+
"Programming Language :: Python :: 3.13",
26+
"Programming Language :: Python :: 3.14",
2727
"Topic :: Software Development :: Libraries :: Python Modules",
2828
]
29-
requires-python = ">=3.10"
29+
requires-python = ">=3.12"
3030
dependencies = [
31-
"django>=3.2",
31+
"django>=5.2",
3232
"django-privates>=1.5",
3333
"cryptography>=35.0.0",
3434
]

simple_certmanager/migrations/0003_signingrequest_and_more.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class Migration(migrations.Migration):
8282
migrations.AddConstraint(
8383
model_name="signingrequest",
8484
constraint=models.CheckConstraint(
85-
check=models.Q(
85+
condition=models.Q(
8686
models.Q(
8787
models.Q(("csr", ""), ("private_key", "")),
8888
models.Q(

tox.ini

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
[tox]
22
envlist =
3-
py310-django32
4-
py{310,311,312}-django{42}
3+
py{312,313,314}-django{52,60}
4+
py{312,313,314}-django{52,60}-mypy
55
isort
66
black
77
flake8
88
docs
9-
py310-django32-mpy
10-
py{310,311,312}-django{42}-mypy
119
skip_missing_interpreters = true
1210

1311
[gh-actions]
1412
python =
15-
3.10: py310
16-
3.11: py311
1713
3.12: py312
14+
3.13: py313
15+
3.14: py314
1816

1917
[gh-actions:env]
2018
DJANGO =
21-
3.2: django32
22-
4.2: django42
19+
5.2: django52
20+
6.0: django60
2321

2422
[testenv]
2523
setenv =
@@ -29,8 +27,8 @@ extras =
2927
tests
3028
coverage
3129
deps =
32-
django32: Django~=3.2.0
33-
django42: Django~=4.2.0
30+
django52: Django~=5.2.0
31+
django60: Django~=6.0.0
3432
commands =
3533
py.test tests \
3634
--cov --cov-report xml:reports/coverage-{envname}.xml \
@@ -63,13 +61,13 @@ commands=
6361
--tb=auto \
6462
{posargs}
6563

66-
[testenv:py{310,311,312}-django{32,42}-mypy]
64+
[testenv:py{312,313,314}-django{52,60}-mypy]
6765
extras =
6866
tests
6967
testutils
7068
type-checking
7169
deps =
72-
django32: django-stubs[compatible-mypy]~=4.2.0
73-
django42: django-stubs[compatible-mypy]~=5.1.0
70+
django52: django-stubs[compatible-mypy]~=5.2.0
71+
django60: django-stubs[compatible-mypy]~=6.0.0
7472
skipsdist = True
7573
commands = mypy simple_certmanager

0 commit comments

Comments
 (0)