From 0d74e70ea4fc4c3841c783cb8a884e49e9641fe6 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Tue, 12 Dec 2023 13:18:58 +0200 Subject: [PATCH] Drop support for non-supported versions of Django and Python Resolves #556 --- .github/workflows/test.yml | 17 ++++++----------- pyproject.toml | 2 +- setup.cfg | 13 +++++++------ tox.ini | 15 ++++++--------- 4 files changed, 20 insertions(+), 27 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 96b71a72..82b9ac6a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,21 +22,16 @@ jobs: name: dist path: dist/ Test: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest strategy: fail-fast: true matrix: include: - - os: ubuntu-20.04 - python-version: "3.6" - - os: ubuntu-20.04 - python-version: "3.7" - - os: ubuntu-22.04 - python-version: "3.8" - - os: ubuntu-22.04 - python-version: "3.9" - - os: ubuntu-22.04 - python-version: "3.10" + - python-version: "3.8" + - python-version: "3.9" + - python-version: "3.10" + - python-version: "3.11" + - python-version: "3.12" steps: - uses: actions/checkout@v4 - name: "Set up Python ${{ matrix.python-version }}" diff --git a/pyproject.toml b/pyproject.toml index 6daff4ac..9e8df09b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools", # TODO: look into using python-babel instead of requiring django at build time - "django>=2.1", # for makemessages + "django>=3.2", # for makemessages ] [tool.isort] diff --git a/setup.cfg b/setup.cfg index 09a3300b..a7486833 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,27 +14,28 @@ classifiers = Development Status :: 5 - Production/Stable Environment :: Web Environment Framework :: Django - Framework :: Django :: 2.2 - Framework :: Django :: 3.0 - Framework :: Django :: 3.1 Framework :: Django :: 3.2 Framework :: Django :: 4.0 + Framework :: Django :: 4.1 + Framework :: Django :: 4.2 + Framework :: Django :: 5.0 Intended Audience :: Developers License :: OSI Approved :: BSD License Operating System :: OS Independent 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 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Database [options] packages = find: include_package_data = True install_requires = - Django >= 2.1 + Django >= 3.2 [options.packages.find] exclude = diff --git a/tox.ini b/tox.ini index 73e27c7f..c129822d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] envlist = - py36-django{22,30,31} - py37-django{22,30,31} - py38-django{22,30,31,32} - py{39,310}-django{40,41,42} + py{38,39,310}-django{32} + py{38,39,310,311,312}-django{40,41,42} + py{310,311,312}-django{50} # TODO: reinstate running on postgres: py39-django{40}-postgres docs @@ -15,12 +14,11 @@ setenv = deps = coverage dj-database-url - django22: Django ~= 2.2 - django30: Django ~= 3.0 - django31: Django ~= 3.1 + django32: Django ~= 3.2 django40: Django ~= 4.0 django41: Django ~= 4.1 django42: Django ~= 4.2 + django50: Django ~= 5.0 djangomain: https://github.com/django/django/archive/main.tar.gz postgres: psycopg2 commands = @@ -36,9 +34,8 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [gh-actions] python = - 3.6: py36 - 3.7: py37 3.8: py38 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312