From 5f0788d21d8cf4fe9637633c97f859699d1e1d18 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Wed, 6 Mar 2024 11:42:24 +0800 Subject: [PATCH 1/6] Update test matrix, deps on tox.ini --- tox.ini | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 495bb74..acec93d 100644 --- a/tox.ini +++ b/tox.ini @@ -2,10 +2,9 @@ skip_missing_interpreters = True envlist = - py{38,39,310}-dj{32,41}-wt{41,42,50,51,52} - py311-dj41-wt{41,42,50,51,52} - py311-dj42-wt{50,51,52} - py312-dj42-wt{52} + py{38,39,310}-dj32-wt52 + py{38,39,310,311}-dj42-wt{52,60} + py{311,312}-dj50-wt{52,60} flake8,isort,docs [gh-actions] @@ -26,14 +25,11 @@ pip_pre = True deps = {[base]deps} dj32: django>=3.2,<4.0 - dj41: django>=4.1,<4.2 dj42: django>=4.2,<4.3 + dj50: django>=5.0,<5.1 djHEAD: django - wt41: Wagtail>=4.1,<4.2 - wt42: Wagtail>=4.2,<4.3 - wt50: Wagtail>=5.0,<5.1 - wt51: Wagtail>=5.1,<5.2 wt52: Wagtail>=5.2,<5.3 + wt60: Wagtail>=6.0,<6.1 wtHEAD: Wagtail [testenv:flake8] From 45fa4b53ac5cddfa1cbfee1a9f566d639328e2dc Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Wed, 6 Mar 2024 11:43:26 +0800 Subject: [PATCH 2/6] Bump Wagtail lowerbound version, Update classifiers on setup.py --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 51fb333..e66c8c5 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ url='https://github.com/takeflight/wagtail-schema.org', install_requires=[ - 'wagtail>=4.1', + 'wagtail>=5.2', ], extras_require={ 'testing': ['jinja2>=2.10,<3.0', 'markupsafe==2.0.1'] @@ -45,15 +45,17 @@ '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', 'Framework :: Django :: 3.2', 'Framework :: Django :: 4', - 'Framework :: Django :: 4.1', 'Framework :: Django :: 4.2', + 'Framework :: Django :: 5', + 'Framework :: Django :: 5.0', 'Framework :: Wagtail', - 'Framework :: Wagtail :: 4', 'Framework :: Wagtail :: 5', + 'Framework :: Wagtail :: 6', 'License :: OSI Approved :: BSD License', ], ) From 5ae08c990d995593c73acc377f2daad8c162e097 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Wed, 6 Mar 2024 11:43:51 +0800 Subject: [PATCH 3/6] Update supported Wagtail version on README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 99884b2..adcbcaa 100644 --- a/README.rst +++ b/README.rst @@ -7,9 +7,9 @@ Add Schema.org JSON-LD to your website Installing ========== -wagtail-schema.org supports Wagtail 4.1 upwards. +wagtail-schema.org supports Wagtail 5.2 upwards. -Install for Wagtail 4.1+ using pip: +Install for Wagtail 5.2+ using pip: .. code-block:: console From 262e58e02e8e910812e69dad5bc1b088daa8ea64 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Wed, 6 Mar 2024 11:44:36 +0800 Subject: [PATCH 4/6] Add Python 3.12 to python-version, Bump Github workflow action versions --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9b647bc..3d385e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,15 +15,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ["3.8", "3.9", "3.10", "3.11"] + python: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python id: setup-python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} From 659e2e54ff3fb3e25b54e260acbeedd2197802d5 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Wed, 6 Mar 2024 11:53:53 +0800 Subject: [PATCH 5/6] Apply Django upgrade considerations --- tests/app/urls.py | 7 ++++--- tests/settings.py | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/app/urls.py b/tests/app/urls.py index 016e514..f3cf206 100644 --- a/tests/app/urls.py +++ b/tests/app/urls.py @@ -2,6 +2,7 @@ from django.conf import settings from django.contrib import admin +from django.urls import path from django.urls import include, re_path from wagtail import urls as wagtail_urls @@ -11,10 +12,10 @@ urlpatterns = [ re_path(r'^django-admin/', admin.site.urls), - re_path(r'^admin/', include(wagtailadmin_urls)), - re_path(r'^documents/', include(wagtaildocs_urls)), + path('admin/', include(wagtailadmin_urls)), + path('documents/', include(wagtaildocs_urls)), - re_path(r'', include(wagtail_urls)), + path('', include(wagtail_urls)), ] diff --git a/tests/settings.py b/tests/settings.py index 77df07e..2b6a225 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -76,7 +76,6 @@ LANGUAGE_CODE = 'en-au' TIME_ZONE = 'Australia/Hobart' USE_I18N = True -USE_L10N = True USE_TZ = True From a192e82895639b1be7ba4022255f5fce0807b6db Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Fri, 15 Mar 2024 10:25:58 +0800 Subject: [PATCH 6/6] Rename branch on test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d385e3..6e0c5f8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Tests on: pull_request: branches: - - main + - master push: concurrency: