Merge branch 'master' into pytest7

.github/workflows/ci.yml

@@ -19,25 +19,13 @@ jobs:
           - '3.9'
           - '3.10'
         django-version:
-          - '3.2'
           - '4.1'
           - '4.2'
         redis-version:
           - 'latest'
 
         # Only test pre-release dependencies for the latest Python.
-        # And keep testing Django 3.2 with python 3.6 and 3.7
         include:
-          # Django 3.2 and python 3.6 with latest redis
-          - django-version: '3.2'
-            redis-version: 'latest'
-            python-version: '3.6'
-
-          # Django 3.2 and python 3.7 with latest redis
-          - django-version: '3.2'
-            redis-version: 'latest'
-            python-version: '3.7'
-
           # Django 4.1 and python 3.11 with latest redis
           - django-version: '4.1'
             redis-version: 'latest'

.ruff.toml

@@ -120,9 +120,7 @@ ignore = [
 
 fix = true
 
-# TODO: enable this when python3.6 will stop being supported,
-#  from april 2024 https://docs.djangoproject.com/en/4.2/releases/3.2/
-#target-version = "py36"
+target-version = "py38"
 
 [flake8-tidy-imports]
 ## Disallow all relative imports.

changelog.d/699.misc

@@ -0,0 +1 @@
+Drop support for django 3.2, python 3.6 and python 3.7

setup.cfg

@@ -12,7 +12,6 @@ classifiers =
     Development Status :: 5 - Production/Stable
     Environment :: Web Environment
     Framework :: Django
-    Framework :: Django :: 3.2
     Framework :: Django :: 4.1
     Framework :: Django :: 4.2
     Intended Audience :: Developers
@@ -21,8 +20,6 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
@@ -31,22 +28,21 @@ classifiers =
     Topic :: Utilities
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.8
 packages =
     django_redis
     django_redis.client
     django_redis.serializers
     django_redis.compressors
 install_requires =
-    Django>=3.2
-    redis>=3,!=4.0.0,!=4.0.1
+    Django>=4.1
+    redis>=4.0.2
 
 [options.extras_require]
-hiredis = redis[hiredis]>=3,!=4.0.0,!=4.0.1
+hiredis = redis[hiredis]>=4.0.2
 
 [coverage:run]
 omit =
-    # tests
     tests/*,
 
 [coverage:report]
@@ -60,23 +56,20 @@ envlist =
     ruff
     mypy
     # tests against released versions
-    py{36,37,38,39,310,311}-dj{22,31,32,41,42}-redislatest
+    py{38,39,310,311}-dj{41,42}-redislatest
     # tests against unreleased versions
     py311-dj42-redismaster
     py311-djmain-redis{latest,master}
 
 [gh-actions]
 python =
-    3.6: py36
-    3.7: py37
     3.8: py38, black, ruff, mypy
     3.9: py39
     3.10: py310
     3.11: py311
 
 [gh-actions:env]
 DJANGO =
-    3.2: dj32
     4.1: dj41
     4.2: dj42
     main: djmain
@@ -102,7 +95,6 @@ commands =
   {envpython} -m coverage xml
 
 deps =
-    dj32: Django>=3.2,<3.3
     dj41: Django>=4.1,<4.2
     dj42: Django>=4.2,<5.0
     djmain: https://github.com/django/django/archive/main.tar.gz