Skip to content

Commit

Permalink
Merge pull request #729 from WisdomPill/drop_django41_add_django50
Browse files Browse the repository at this point in the history
Dropped django4.1 and added django 5.0
  • Loading branch information
WisdomPill committed Feb 17, 2024
2 parents 9d074d4 + 294dcd0 commit 1675e95
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
17 changes: 8 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,28 @@ jobs:
fail-fast: false
matrix:
python-version:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
django-version:
- '4.1'
- '4.2'
- '5.0'
redis-version:
- 'latest'

# Only test pre-release dependencies for the latest Python.
include:
# Django 4.1 and python 3.11 with latest redis
- django-version: '4.1'
# Django 4.2 and python 3.8 with latest redis
- django-version: '4.2'
redis-version: 'latest'
python-version: '3.11'
python-version: '3.8'

# Django 4.2 and python 3.11 with latest redis
# Django 4.2 and python 3.9 with latest redis
- django-version: '4.2'
redis-version: 'latest'
python-version: '3.11'
python-version: '3.9'

# latest Django with pre-release redis
- django-version: '4.2'
- django-version: '5.0'
redis-version: 'master'
python-version: '3.11'

Expand Down
1 change: 1 addition & 0 deletions changelog.d/729.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Dropped support for django 4.1 and added support for django 5.0
12 changes: 6 additions & 6 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ classifiers =
Development Status :: 5 - Production/Stable
Environment :: Web Environment
Framework :: Django
Framework :: Django :: 4.1
Framework :: Django :: 4.2
Framework :: Django :: 5.0
Intended Audience :: Developers
License :: OSI Approved :: BSD License
Operating System :: OS Independent
Expand All @@ -35,7 +35,7 @@ packages =
django_redis.serializers
django_redis.compressors
install_requires =
Django>=4.1
Django>=4.2
redis>=4.0.2

[options.extras_require]
Expand All @@ -56,9 +56,9 @@ envlist =
ruff
mypy
# tests against released versions
py{38,39,310,311}-dj{41,42}-redislatest
py{38,39,310,311}-dj{42,50}-redislatest
# tests against unreleased versions
py311-dj42-redismaster
py311-dj50-redismaster
py311-djmain-redis{latest,master}

[gh-actions]
Expand All @@ -70,8 +70,8 @@ python =

[gh-actions:env]
DJANGO =
4.1: dj41
4.2: dj42
5.0: dj50
main: djmain
REDIS =
latest: redislatest
Expand All @@ -96,8 +96,8 @@ commands =
{envpython} -m coverage xml

deps =
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<5.0
dj50: Django>=5.0,<5.1
djmain: https://github.com/django/django/archive/main.tar.gz
msgpack>=0.6.0
pytest
Expand Down

0 comments on commit 1675e95

Please sign in to comment.