Skip to content

Commit fb7b0ae

Browse files
committed
Python and dependency version updates
1 parent 00fc485 commit fb7b0ae

File tree

5 files changed

+39
-45
lines changed

5 files changed

+39
-45
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
tests:
1313
name: "Python ${{ matrix.python-version }}"
14-
runs-on: "ubuntu-20.04"
14+
runs-on: "ubuntu-latest"
1515
services:
1616
redis:
1717
image: redis
@@ -24,17 +24,18 @@ jobs:
2424
- 6379:6379
2525
strategy:
2626
matrix:
27-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
27+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
2828
steps:
29-
- uses: "actions/checkout@v2"
30-
- uses: "actions/setup-python@v2"
29+
- uses: "actions/checkout@v6"
30+
- uses: "actions/setup-python@v6"
3131
with:
3232
python-version: "${{ matrix.python-version }}"
3333
- name: "Install dependencies"
3434
run: |
3535
set -xe
3636
python -m pip install --upgrade pip setuptools
3737
python -m pip install --upgrade poetry tox tox-gh-actions
38+
pip install --user poetry-plugin-export
3839
3940
- name: "Run tox targets for ${{ matrix.python-version }}"
4041
run: "python -m tox"

.python-version

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
3.8.5
2-
3.7.8
3-
3.6.11
1+
3.10.19
2+
3.11.14
3+
3.12.12
4+
3.13.11
5+
3.14.2

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ build:
22
image: latest
33

44
python:
5-
version: 3.8
5+
version: 3.10
66
pip_install: true
77
extra_requirements:
88
- docs

pyproject.toml

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ classifiers = [
2121
"Intended Audience :: Developers",
2222
"Operating System :: Unix",
2323
"Programming Language :: Python",
24-
"Programming Language :: Python",
25-
"Programming Language :: Python :: 3.6",
26-
"Programming Language :: Python :: 3.7",
27-
"Programming Language :: Python :: 3.8",
28-
"Programming Language :: Python :: 3.9",
2924
"Programming Language :: Python :: 3.10",
3025
"Programming Language :: Python :: 3.11",
3126
"Programming Language :: Python :: 3.12",
@@ -35,35 +30,36 @@ packages = [{ include = "cacheback" }]
3530
include = ["LICENSE"]
3631

3732
[tool.poetry.dependencies]
38-
python = ">=3.6.2,<4"
39-
importlib-metadata = {version = "*", python = "<3.8"}
33+
python = ">=3.10.0,<4"
4034

41-
django = ">=2"
42-
celery = {version = ">=4", optional = true}
43-
django-rq = {version = ">=2", optional = true}
35+
django = ">=5.2"
36+
celery = {version = ">=5.0", optional = true}
37+
django-rq = {version = ">=3", optional = true}
4438
Sphinx = {version = ">=3.3.0,<4", optional = true}
4539

46-
[tool.poetry.dev-dependencies]
47-
pytest = ">=6.0"
48-
pytest-django = ">=4.1"
49-
pytest-cov = ">=2.10"
50-
pytest-isort = ">=1.2"
51-
pytest-flake8 = ">=1.0"
52-
flake8 = "<5"
53-
pytest-black = {version = ">=0.3"}
54-
freezegun = ">=1.0"
55-
coverage = {version = ">=5.0", extras = ["toml"]}
56-
celery = ">=4"
57-
django-rq = ">=2"
58-
typing_extensions = { version = ">=3.10", python = "<3.10" }
40+
[tool.poetry.requires-plugins]
41+
poetry-plugin-export = ">=1.8"
42+
43+
[tool.poetry.group.dev.dependencies]
44+
pytest = ">=9.0"
45+
pytest-django = ">=4.11"
46+
pytest-cov = ">=7.0"
47+
pytest-isort = ">=4.0"
48+
pytest-flake8 = ">=1.3"
49+
flake8 = ">=7"
50+
pytest-black =">=0.6"
51+
freezegun = ">=1.5"
52+
coverage = {version = ">=7.0", extras = ["toml"]}
53+
celery = ">=5.0"
54+
django-rq = ">=3"
5955

6056
[tool.poetry.extras]
6157
celery = ["celery"]
6258
rq = ["django-rq"]
6359
docs = ["Sphinx"]
6460

6561
[build-system]
66-
requires = ["poetry>=1.1"]
62+
requires = ["poetry>=2.1"]
6763
build-backend = "poetry.masonry.api"
6864

6965
[tool.pytest.ini_options]

tox.ini

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
[tox]
22
isolated_build = true
33
envlist =
4-
py{36,37,38,39}-django{22,30,31}
5-
py{36,37,38,39,310}-django{32}
6-
py{38,39,310}-django{40}
4+
py{310,311,312,313,314}-django{52}
5+
py{312,313,314}-django{60}
76

87
[gh-actions]
98
python =
10-
3.6: py36
11-
3.7: py37
12-
3.8: py38
13-
3.9: py39
149
3.10: py310
10+
3.12: py312
11+
3.13: py313
12+
3.14: py314
1513

1614
[testenv]
1715
setenv = PYTHONPATH={toxinidir}
1816
deps =
19-
django22: Django>=2.2,<2.3
20-
django30: Django>=3.0,<3.1
21-
django31: Django>=3.1,<3.2
22-
django32: Django>=3.2,<3.3
23-
django40: Django>=4.0,<4.1
17+
django52: Django>=5.2,<5.3
18+
django60: Django>=6.0,<6.1
2419
allowlist_externals =
2520
poetry
2621
sh
2722
skip_install = true
2823
commands =
29-
poetry export --dev --without-hashes -o {toxworkdir}/requirements.txt
24+
poetry export --all-groups --without-hashes -o {toxworkdir}/requirements.txt
3025
sh -c 'grep -v "^[dD]jango==" {toxworkdir}/requirements.txt | poetry run pip install --no-deps -r /dev/stdin'
3126
pytest --isort --flake8 --black --cov

0 commit comments

Comments
 (0)