From 9a3b161ba596f0c713bf28f94d260533b0c95043 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 14 Nov 2024 15:09:02 +0000 Subject: [PATCH 1/3] Ignore the .tox/ directory generated by running tox locally --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d7a2d23..3e1dd95 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ tests/testapp/var/media/ coverage coverage_html_report/ venv/ +.tox/ From 9b9f3e75da3167234f1f408d397d01e125138cec Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 14 Nov 2024 15:09:44 +0000 Subject: [PATCH 2/3] Update test matrix And update the supported Django and Wagtail versions and classifiers. --- .github/workflows/test.yml | 2 +- setup.py | 8 +++----- tox.ini | 9 ++++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6affeb..40ccaf9 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"] steps: - name: Checkout repository diff --git a/setup.py b/setup.py index 36c3ee0..8dd01ea 100644 --- a/setup.py +++ b/setup.py @@ -46,19 +46,17 @@ "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", "Framework :: Django", - "Framework :: Django :: 3.2", - "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", + "Framework :: Django :: 5.1", "Framework :: Wagtail", - "Framework :: Wagtail :: 3", - "Framework :: Wagtail :: 4", "Framework :: Wagtail :: 5", + "Framework :: Wagtail :: 6", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", ], diff --git a/tox.ini b/tox.ini index 43dcfb9..818f3c7 100644 --- a/tox.ini +++ b/tox.ini @@ -7,9 +7,9 @@ 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,310,311}-dj42-wt{50,51,52,60,61,62,63}-dr4 + py{310,311,312}-dj50-wt{52,60,61,62,63}-dr4 + py{310,311,312}-dj51-wt{60,61,62,63}-dr4 [testenv] install_command = pip install -e ".[testing]" -U {opts} {packages} @@ -17,7 +17,6 @@ allowlist_externals = make basepython = - py38: python3.8 py39: python3.9 py310: python3.10 py311: python3.11 @@ -34,6 +33,7 @@ deps = wt60: wagtail>=6.0,<6.1 wt61: wagtail>=6.1,<6.2 wt62: wagtail>=6.2,<6.3 + wt63: wagtail>=6.3,<6.4 dr4: django_recaptcha>=4.0.0,<5.0.0 commands = @@ -42,7 +42,6 @@ commands = [gh-actions] python = - 3.8: py38 3.9: py39 3.10: py310 3.11: py311 From 84649cd3fdf17e5918ba39a58ca3ba7bc11a2828 Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 14 Nov 2024 15:12:01 +0000 Subject: [PATCH 3/3] Add wagtail as a dependency I set the dependency to wagtail>=5.0 becuase thats what the testing is run against. --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8dd01ea..fad7990 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,10 @@ "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", ], - install_requires=["django-recaptcha>=4"], + install_requires=[ + "wagtail>=5.0", + "django-recaptcha>=4" + ], extras_require={ "testing": testing_extras, "docs": documentation_extras,