diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e68240d..50d114e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 diff --git a/CHANGES.md b/CHANGES.md index ddaff6d..e6c7e13 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,14 @@ Changelog ========= +v1.4 +---- + +* Test on Django 4.2 through 5.2 +* Test on Python 3.8 through 3.12 +* Drop support for Django < 4.2 and Python < 3.8 + + v1.3.2 ---- diff --git a/setup.py b/setup.py index e5f3bd1..cad0251 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name="django-ormcache", - version="1.3.2", + version="1.4", description="ORM cache for Django", license="MIT", keywords="cache django", @@ -18,8 +18,8 @@ long_description_content_type="text/markdown", packages=find_packages(exclude=["tests"]), package_dir={"ormcache": "ormcache"}, - python_requires=">=3.7, <4", - install_requires=["Django>=2.0,<5.0", "six"], + python_requires=">=3.8, <3.13", + install_requires=["Django>=4.2,<6.0", "six"], classifiers=[ "Framework :: Django", "Intended Audience :: Developers", diff --git a/tox.ini b/tox.ini index a1a1bd1..c0f7c49 100644 --- a/tox.ini +++ b/tox.ini @@ -1,20 +1,15 @@ [tox] isolated_build = False envlist = - # Django 2.0, 2.1 - django{20,21}-py{37} - # Django 2.2, 3.0, 3.1 - django{22,30,31}-py{37,38,39} - # Django 3.2 - django{32}-py{37,38,39,310} # Django 4.0, 4.1, 4.2 - django{40,41,42}-py{38,39,310,311,312} + django{42}-py{38,39,310,311,312} + # Django 5.0, 5.1, 5.2 + django{50,51,52}-py{310,311,312} # Django mainline disabled #django{main}-py{311} [gh-actions] python = - 3.7: py37 3.8: py38, docs 3.9: py39 3.10: py310 @@ -23,22 +18,16 @@ python = [testenv] basepython = - py37: python3.7 py38: python3.8 py39: python3.9 py310: python3.10 py311: python3.11 py312: python3.12 deps = - django20: Django>=2.0,<2.1 - django21: Django>=2.2.1,<2.3 - django22: Django>=2.2.1,<2.3 - django30: Django>=3.0,<3.1 - django31: Django>=3.1,<3.2 - django32: Django>=3.2,<3.3 - django40: Django>=4.0,<4.1 - django41: Django>=4.1,<4.2 django42: Django>=4.2,<5.0 + django50: Django>=5.0,<5.1 + django51: Django>=5.1,<5.2 + django52: Django>=5.2,<6.0 djangomain: https://github.com/django/django/archive/main.tar.gz pytest