diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99f1a1b2..9905ba32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,20 +16,8 @@ jobs: strategy: matrix: python-version: [3.8, 3.9, "3.10", 3.11, 3.12] - django-version: [3.2, 4.1, 4.2, 5.0] + django-version: [4.2, 5.0, master] exclude: - # Django 3.2 - - python-version: "3.10" - django-version: 3.2 - - python-version: 3.11 - django-version: 3.2 - - python-version: 3.12 - django-version: 3.2 - - # Django 4.1 - - python-version: 3.12 - django-version: 4.1 - # Django 4.2 - python-version: 3.12 django-version: 4.2 @@ -40,6 +28,12 @@ jobs: - python-version: 3.9 django-version: 5.0 + # master + - python-version: 3.8 + django-version: master + - python-version: 3.9 + django-version: master + steps: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4.7.1 diff --git a/setup.py b/setup.py index c4062508..374f50dc 100755 --- a/setup.py +++ b/setup.py @@ -19,14 +19,12 @@ url="https://github.com/jieter/django-tables2/", packages=find_packages(exclude=["tests.*", "tests", "example.*", "example", "docs"]), include_package_data=True, # declarations in MANIFEST.in - install_requires=["Django>=3.2"], + install_requires=["Django>=4.2"], extras_require={"tablib": ["tablib"]}, classifiers=[ "Development Status :: 5 - Production/Stable", "Environment :: Web Environment", "Framework :: Django", - "Framework :: Django :: 3.2", # Until April 2024 - "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", "Framework :: Django :: 5.0", "Intended Audience :: Developers", diff --git a/tox.ini b/tox.ini index 2d401c23..fe1ab635 100644 --- a/tox.ini +++ b/tox.ini @@ -1,23 +1,22 @@ [tox] args_are_paths = false envlist = - py36-{3.2,master}, - py37-{3.2,master}, - py38-{3.2,4.0,master}, - py39-{3.2,4.0,master}, - py310{3.2,4.0,master}, + py38-{4.2}, + py39-{4.2}, + py310{4.2,5.0,master}, + py311{4.2,5.0,master}, + py312{5.0,master}, docs, flake8, isort, [testenv] basepython = - py35: python3.5 - py36: python3.6 - py37: python3.7 py38: python3.8 py39: python3.9 py310: python3.10 + py311: python3.11 + py312: python3.12 usedevelop = true pip_pre = true setenv = @@ -26,14 +25,14 @@ setenv = commands = coverage run --source=django_tables2 manage.py test {posargs} deps = - 3.2: Django==3.2.* - 4.0: Django==4.0a1 + 4.2: Django==4.2.* + 5.0: Django==5.0.* master: https://github.com/django/django/archive/master.tar.gz coverage -r{toxinidir}/requirements/common.pip [testenv:docs] -basepython = python3.8 +basepython = python3.11 whitelist_externals = make changedir = docs setenv = @@ -45,7 +44,7 @@ deps = -r{toxinidir}/docs/requirements.txt [testenv:flake8] -basepython = python3.9 +basepython = python3.11 deps = flake8==3.7.9 commands = flake8 @@ -55,7 +54,7 @@ exclude = .git,__pycache__,.tox,example/app/migrations max-line-length = 120 [testenv:isort] -basepython = python3.9 +basepython = python3.11 deps = -r requirements/common.pip isort==5.6.4