From 931f9aae00541e94df17f4adea2ff8688b94706b Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 22 May 2025 10:41:33 +0100 Subject: [PATCH 1/2] Ignore the .tox directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d7a2d23..7fbd69a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ tests/testapp/var/media/ coverage coverage_html_report/ venv/ +.tox \ No newline at end of file From 9083cbeaaa7066d0715eee1c9e814605b6ac288a Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 22 May 2025 10:51:27 +0100 Subject: [PATCH 2/2] Essentially only test from Wagtail 5.2 and up and Django 4.2 and up --- .github/workflows/test.yml | 2 +- setup.py | 14 +++++++------- tox.ini | 19 +++++++------------ 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6affeb..ce90a59 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ["3.8", "3.9", "3.10", "3.11"] + python: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - name: Checkout repository diff --git a/setup.py b/setup.py index 36c3ee0..fda7297 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ "flake8>=7.0.0,<7.1", "isort>=5.10.1", # For test site - "wagtail>=4.1", + "wagtail>=5.2", ] # Documentation dependencies @@ -46,23 +46,23 @@ "Operating System :: OS Independent", "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", + "Programming Language :: Python :: 3.13", "Framework :: Django", - "Framework :: Django :: 3.2", - "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", + "Framework :: Django :: 5.1", + "Framework :: Django :: 5.2", "Framework :: Wagtail", - "Framework :: Wagtail :: 3", - "Framework :: Wagtail :: 4", "Framework :: Wagtail :: 5", + "Framework :: Wagtail :: 6", + "Framework :: Wagtail :: 7", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", ], - install_requires=["django-recaptcha>=4"], + install_requires=["django-recaptcha>=4", "wagtail>=5.2"], extras_require={ "testing": testing_extras, "docs": documentation_extras, diff --git a/tox.ini b/tox.ini index 43dcfb9..be6d103 100644 --- a/tox.ini +++ b/tox.ini @@ -7,9 +7,8 @@ skipsdist = True usedevelop = True envlist = - py{38,39,310,311}-dj42-wt{50,51,52,60,61,62}-dr4 - py{310,311,312}-dj50-wt{52,60,61,62}-dr4 - py{310,311,312}-dj51-wt{60,61,62}-dr4 + py{39}-dj42-wt{52,63,64,70}-dr4 + py{310,311,312,313}-dj{51,52}-wt{63,63,70}-dr4 [testenv] install_command = pip install -e ".[testing]" -U {opts} {packages} @@ -17,23 +16,19 @@ allowlist_externals = make basepython = - py38: python3.8 py39: python3.9 py310: python3.10 py311: python3.11 py312: python3.12 + py313: python3.13 deps = dj42: Django>=4.2,<4.3 - dj50: Django>=5.0,<5.1 dj51: Django>=5.1,<5.2 - wt42: wagtail>=4.2,<5.0 - wt50: wagtail>=5.0,<5.1 - wt51: wagtail>=5.1,<5.2 wt52: wagtail>=5.2,<5.3 - wt60: wagtail>=6.0,<6.1 - wt61: wagtail>=6.1,<6.2 - wt62: wagtail>=6.2,<6.3 + wt63: wagtail>=6.3,<6.4 + wt64: wagtail>=6.4,<6.5 + wt70: wagtail>=7.0,<7.1 dr4: django_recaptcha>=4.0.0,<5.0.0 commands = @@ -42,8 +37,8 @@ commands = [gh-actions] python = - 3.8: py38 3.9: py39 3.10: py310 3.11: py311 3.12: py312 + 3.13: py313