From 2417417ebb2c8a155463b4a632e1b74488ebe027 Mon Sep 17 00:00:00 2001 From: WisdomPill Date: Fri, 3 Nov 2023 09:47:43 +0200 Subject: [PATCH 1/3] Drop django 3.2 and consequentially drop python 3.6 and 3.7 --- .github/workflows/ci.yml | 12 ------------ .ruff.toml | 4 +--- setup.cfg | 6 +----- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bc3a829..258f8105 100644 --- a/.github/workflows/ci.yml +++ b/.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' diff --git a/.ruff.toml b/.ruff.toml index 9c85337e..111d1f8e 100644 --- a/.ruff.toml +++ b/.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. diff --git a/setup.cfg b/setup.cfg index 77582ff1..7498b062 100644 --- a/setup.cfg +++ b/setup.cfg @@ -60,15 +60,13 @@ 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 @@ -76,7 +74,6 @@ python = [gh-actions:env] DJANGO = - 3.2: dj32 4.1: dj41 4.2: dj42 main: djmain @@ -102,7 +99,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 From 7c1e997569d9f5e48d0e2c42150ea12d916f2804 Mon Sep 17 00:00:00 2001 From: WisdomPill Date: Fri, 3 Nov 2023 10:28:29 +0200 Subject: [PATCH 2/3] Added changelog --- changelog.d/699.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/699.misc diff --git a/changelog.d/699.misc b/changelog.d/699.misc new file mode 100644 index 00000000..0aaebb99 --- /dev/null +++ b/changelog.d/699.misc @@ -0,0 +1 @@ +Drop support for django 3.2, python 3.6 and python 3.7 \ No newline at end of file From ed9d67091b194ce64f9b5904948b31b0af9a9898 Mon Sep 17 00:00:00 2001 From: WisdomPill Date: Sat, 4 Nov 2023 21:54:39 +0200 Subject: [PATCH 3/3] Fixes to setup.cfg file --- setup.cfg | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7498b062..7413e9ef 100644 --- a/setup.cfg +++ b/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]