From 6049a816aa1a36c491ac7aa3ebf73c6d5b5b5853 Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Tue, 19 Nov 2024 19:58:45 +0000 Subject: [PATCH] Adjust tox testing for Wagtail 6.3 (#79) --- .github/workflows/test.yml | 2 +- CHANGELOG.md | 4 ++++ pyproject.toml | 5 ++--- tox.ini | 13 +++++++------ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d278170..6a4ef53 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: needs: lint strategy: matrix: - python: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 33c77ff..0ff95d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +- Update tox testing to include Wagtail 6.3 +- Add tox testing for Django 5.1 +- Drop testing around python 3.8 + ## 0.13.0 - Made the footnotes orderable (https://github.com/torchbox/wagtail-footnotes/pull/74) @willbarton diff --git a/pyproject.toml b/pyproject.toml index fd207c8..bcad362 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,22 +17,21 @@ classifiers = [ "License :: OSI Approved :: MIT License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "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", "Framework :: Django", - "Framework :: Django :: 3.2", "Framework :: Django :: 4.2", "Framework :: Django :: 5.0", + "Framework :: Django :: 5.1", "Framework :: Wagtail", "Framework :: Wagtail :: 5", "Framework :: Wagtail :: 6", ] dynamic = ["version"] # will read __version__ from wagtail_footnotes/__init__.py -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = [ "Wagtail>=5.2", "Django>=3.2", diff --git a/tox.ini b/tox.ini index 57b3306..e61595d 100644 --- a/tox.ini +++ b/tox.ini @@ -2,12 +2,12 @@ min_version = 4.0 envlist = - python{3.8,3.9,3.10,3.11}-django4.2-wagtail{5.2,6.1,6.2} - python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.1,6.2} + python{3.9,3.10,3.11}-django4.2-wagtail{5.2,6.2,6.3} + python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.2,6.3} + python{3.10,3.11,3.12}-django5.1-wagtail6.3 [gh-actions] python = - 3.8: python3.8 3.9: python3.9 3.10: python3.10 3.11: python3.11 @@ -30,10 +30,11 @@ set_env = deps = django4.2: Django>=4.2,<4.3 django5.0: Django>=5.0,<5.1 + django5.1: Django>=5.1,<5.2 wagtail5.2: wagtail>=5.2,<5.3 - wagtail6.1: wagtail>=6.1,<6.2 wagtail6.2: wagtail>=6.2,<6.3 + wagtail6.3: wagtail>=6.3,<6.4 extras = testing @@ -50,12 +51,12 @@ commands = [testenv:interactive] description = An interactive environment for local testing purposes -base_python = python3.11 +base_python = python3.12 ; Note: the following are commented out for development convenience, ; so as to test the interactive mode with a different Wagtail version ; deps = -; wagtail>=5.2,<6.0 +; wagtail>=6.3,<6.4 commands_pre = python testmanage.py makemigrations --settings=tests.settings