Skip to content

Commit 68642d7

Browse files
committed
Merge branch 'streeter-django-5.x'
2 parents bf44ff2 + b647056 commit 68642d7

4 files changed

Lines changed: 18 additions & 21 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
12+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
1313

1414
steps:
1515
- uses: actions/checkout@v4

CHANGES.md

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

4+
v1.4
5+
----
6+
7+
* Test on Django 4.2 through 5.2
8+
* Test on Python 3.8 through 3.12
9+
* Drop support for Django < 4.2 and Python < 3.8
10+
11+
412
v1.3.2
513
----
614

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setup(
77
name="django-ormcache",
8-
version="1.3.2",
8+
version="1.4",
99
description="ORM cache for Django",
1010
license="MIT",
1111
keywords="cache django",
@@ -18,8 +18,8 @@
1818
long_description_content_type="text/markdown",
1919
packages=find_packages(exclude=["tests"]),
2020
package_dir={"ormcache": "ormcache"},
21-
python_requires=">=3.7, <4",
22-
install_requires=["Django>=2.0,<5.0", "six"],
21+
python_requires=">=3.8, <3.13",
22+
install_requires=["Django>=4.2,<6.0", "six"],
2323
classifiers=[
2424
"Framework :: Django",
2525
"Intended Audience :: Developers",

tox.ini

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
[tox]
22
isolated_build = False
33
envlist =
4-
# Django 2.0, 2.1
5-
django{20,21}-py{37}
6-
# Django 2.2, 3.0, 3.1
7-
django{22,30,31}-py{37,38,39}
8-
# Django 3.2
9-
django{32}-py{37,38,39,310}
104
# Django 4.0, 4.1, 4.2
11-
django{40,41,42}-py{38,39,310,311,312}
5+
django{42}-py{38,39,310,311,312}
6+
# Django 5.0, 5.1, 5.2
7+
django{50,51,52}-py{310,311,312}
128
# Django mainline disabled
139
#django{main}-py{311}
1410

1511
[gh-actions]
1612
python =
17-
3.7: py37
1813
3.8: py38, docs
1914
3.9: py39
2015
3.10: py310
@@ -23,22 +18,16 @@ python =
2318

2419
[testenv]
2520
basepython =
26-
py37: python3.7
2721
py38: python3.8
2822
py39: python3.9
2923
py310: python3.10
3024
py311: python3.11
3125
py312: python3.12
3226
deps =
33-
django20: Django>=2.0,<2.1
34-
django21: Django>=2.2.1,<2.3
35-
django22: Django>=2.2.1,<2.3
36-
django30: Django>=3.0,<3.1
37-
django31: Django>=3.1,<3.2
38-
django32: Django>=3.2,<3.3
39-
django40: Django>=4.0,<4.1
40-
django41: Django>=4.1,<4.2
4127
django42: Django>=4.2,<5.0
28+
django50: Django>=5.0,<5.1
29+
django51: Django>=5.1,<5.2
30+
django52: Django>=5.2,<6.0
4231
djangomain: https://github.com/django/django/archive/main.tar.gz
4332

4433
pytest

0 commit comments

Comments
 (0)