From 4a68b94f4dffcf311606731a240ba7f2c2763aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 17 Oct 2023 08:50:01 +0200 Subject: [PATCH] deps: Drop support for unsupported Python and Django Drop support for Python 3.7 and Django 4.0 which are no longer supported upstream. --- .github/workflows/test.yml | 6 ------ docker-compose.yml | 4 ++-- setup.py | 3 +-- tox.ini | 4 +--- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a452c0e..f0c9827a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,6 @@ jobs: strategy: matrix: python-version: - - '3.7' - '3.8' - '3.9' - '3.10' @@ -42,11 +41,6 @@ jobs: - name: Django 3.2.x Test run: | tox -e "py${PYTHON_VERSION/\./}-django32" - if: ${{ env.PYTHON_VERSION == '3.7' || env.PYTHON_VERSION == '3.8' || env.PYTHON_VERSION == '3.9' || env.PYTHON_VERSION == '3.10' }} - - - name: Django 4.0.x Test - run: | - tox -e "py${PYTHON_VERSION/\./}-django40" if: ${{ env.PYTHON_VERSION == '3.8' || env.PYTHON_VERSION == '3.9' || env.PYTHON_VERSION == '3.10' }} - name: Django 4.1.x Test diff --git a/docker-compose.yml b/docker-compose.yml index d20d937f..db187be9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,8 +20,8 @@ services: context: . dockerfile: ./files/tests/Dockerfile args: - - PYTHON_VERSIONS=3.6.12 3.7.9 3.8.7 3.9.1 + - PYTHON_VERSIONS=3.8.7 3.9.1 environment: - - PYTHON_VERSIONS=3.6.12 3.7.9 3.8.7 3.9.1 + - PYTHON_VERSIONS=3.8.7 3.9.1 volumes: - .:/code diff --git a/setup.py b/setup.py index 83977e71..08349de2 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ def load_requirements(): ], long_description=long_description(), long_description_content_type="text/markdown", - python_requires=">=3.7", + python_requires=">=3.8", install_requires=load_requirements(), classifiers=[ "Development Status :: 5 - Production/Stable", @@ -50,7 +50,6 @@ def load_requirements(): "Environment :: Web Environment", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", diff --git a/tox.ini b/tox.ini index 93ebed14..f07a8edd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] envlist = - py{37,38,39,310}-django32 - py{38,39,310}-django40 + py{38,39,310}-django32 py{38,39,310,311}-django41 py{38,39,310,311}-django42 py{310,311,312}-django50 @@ -14,7 +13,6 @@ commands = coverage run manage.py test deps = django32: Django>=3.2,<3.3 - django40: Django>=4.0,<4.1 django41: Django>=4.1,<4.2 django42: Django>=4.2,<4.3 django50: Django>=5.0a1,<5.1