Skip to content

Commit

Permalink
Add Django 5.0 support (#249)
Browse files Browse the repository at this point in the history
Django 5.0 Support
Deprecated Python 3.7 and added Python 3.12
* Update tox.ini to support Py3.12 and Django 5.0
* Update quickstart.rst to support Py3.12 and Django 5.0
* Update CHANGELOG.rst to support Py3.12 and Django 5.0
* Update setup.py  to upport for Python 3.12 and Django 5.0
* Update tox.ini

Co-authored-by: senbonsakura <[email protected]>
Co-authored-by: Andrew Chen Wang <[email protected]>
  • Loading branch information
3 people authored Jan 2, 2024
1 parent b411e00 commit f9a9282
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
django-version: ['3.2', '4.1', '4.2']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
django-version: ['3.2', '4.1', '4.2', '5.0']
exclude:
- python-version: '3.11'
django-version: '3.2'
- python-version: '3.12'
django-version: '3.2'
- python-version: '3.11'
django-version: '4.1'
- python-version: '3.7'
- python-version: '3.12'
django-version: '4.1'
- python-version: '3.7'
django-version: '4.2'
services:
redis:
image: redis:6
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
What’s new in django-cachalot?
==============================
2.6.2
-----

- Support for Python 3.12 and Django 5.0

2.6.1
-----
Expand Down
4 changes: 2 additions & 2 deletions docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Quick start
Requirements
............

- Django 3.2, 4.1, 4.2
- Python 3.7-3.11
- Django 3.2, 4.1, 4.2, 5.0
- Python 3.7-3.12
- a cache configured as ``'default'`` with one of these backends:

- `django-redis <https://github.com/niwinz/django-redis>`_
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Django>=3.2,<4.3
Django>=3.2,<5.1
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.1',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5.0',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Topic :: Internet :: WWW/HTTP',
],
license='BSD',
Expand Down
10 changes: 8 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
envlist =
py{37,38,39,310}-django3.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
py{38,39,310}-django4.1-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
py{38,39,310,311}-django4.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
py{310,311}-djangomain-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
py{38,39,310,312}-django4.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
py{310,311,312}-django5.0-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
py{310,311,312}-djangomain-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},


[testenv]
passenv = *
Expand All @@ -13,10 +15,12 @@ basepython =
py39: python3.9
py310: python3.10
py311: python3.11
py312: python3.12
deps =
django3.2: Django>=3.2,<4.0
django4.1: Django>=4.1,<4.2
django4.2: Django>=4.2,<4.3
django5.0: Django>=5.0,<5.1
djangomain: https://github.com/django/django/archive/main.tar.gz
psycopg2>=2.9.5,<3.0
psycopg
Expand Down Expand Up @@ -49,10 +53,12 @@ python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312

[gh-actions:env]
DJANGO =
3.2: django3.2
4.1: django4.1
4.2: django4.2
5.0: django5.0
main: djangomain

0 comments on commit f9a9282

Please sign in to comment.