From 2748660499d0625d4af4bf66814e551120486c77 Mon Sep 17 00:00:00 2001 From: katdom13 Date: Mon, 27 May 2024 19:18:46 +0800 Subject: [PATCH 1/6] Wagtail 3.0 upgrade consideration: All other modules under wagtail.core can now be found under wagtail --- wagtailmakeup/tests/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/wagtailmakeup/tests/settings.py b/wagtailmakeup/tests/settings.py index 35574f9..bbe15cd 100644 --- a/wagtailmakeup/tests/settings.py +++ b/wagtailmakeup/tests/settings.py @@ -47,7 +47,6 @@ "django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.messages.middleware.MessageMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", - "wagtail.core.middleware.SiteMiddleware", ] ROOT_URLCONF = "wagtailmakeup.tests.urls" From 802873ae04460ac4c7f8437f1a72a7601a2e8ad9 Mon Sep 17 00:00:00 2001 From: katdom13 Date: Mon, 27 May 2024 19:27:56 +0800 Subject: [PATCH 2/6] Update test matrix --- tox.ini | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index 5960173..6216d3a 100644 --- a/tox.ini +++ b/tox.ini @@ -8,22 +8,21 @@ python = [gh-actions:env] DJANGO = - 3.2: dj32 4.2: dj42 5.0: dj50 WAGTAIL = 5.2: wt52 6.0: wt60 + 6.1: wt61 [tox] skipsdist = True usedevelop = True envlist = - py{38,39,310}-dj32-wt52 - py{38,39,310,311}-dj42-wt{52,60} - py{311,312}-dj50-wt{52,60} + py{38,39,310,311}-dj42-wt{52,60,61} + py{310,311,312}-dj50-wt{52,60,61} [testenv] description = Unit tests @@ -38,8 +37,8 @@ basepython = py312: python3.12 deps = - dj32: Django>=3.2,<4.0 dj42: Django>=4.2,<4.3 dj50: Django>=5.0,<5.1 wt52: wagtail>=5.2,<5.3 wt60: wagtail>=6.0,<6.1 + wt61: wagtail>=6.1,<6.2 From 24ac8e49478d08a17231c9e78a4210c3de0c7cce Mon Sep 17 00:00:00 2001 From: katdom13 Date: Mon, 27 May 2024 19:28:37 +0800 Subject: [PATCH 3/6] Update classifiers, update requirements --- setup.cfg | 8 ++++---- setup.py | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/setup.cfg b/setup.cfg index e1a5ce9..da32c0f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,11 +15,11 @@ license_files = [options] python_requires = >= 3.8 setup_requires = - setuptools >= 40.6 - pip >= 10 + setuptools >= 70.0.0 + pip >= 24.0 include_package_data = true packages = find: install_requires = - Django>=3.2 + Django>=4.2 wagtail>=5.2 - python-unsplash>=1.1.0, <1.2 + python-unsplash>=1.2.5 diff --git a/setup.py b/setup.py index e103999..410d7c3 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ long_description = f.read() testing_extras = [ - "coverage>=4.5", + "coverage>=7.5.2", ] setup( @@ -27,13 +27,12 @@ license="MIT", packages=find_packages(exclude=["tests*"]), include_package_data=True, - install_requires=["wagtail>=5.2", "python-unsplash>=1.1.0"], + install_requires=["wagtail>=5.2", "python-unsplash>=1.2.5"], extras_require={"testing": testing_extras}, classifiers=[ "Development Status :: 3 - Alpha", "Environment :: Web Environment", "Framework :: Django", - "Framework :: Django :: 3.2", "Framework :: Django :: 4.2", "Framework :: Django :: 5.0", "Framework :: Wagtail", From 4cb76dec7753e1445f6180f58a3df8d2b762a778 Mon Sep 17 00:00:00 2001 From: katdom13 Date: Mon, 27 May 2024 19:30:11 +0800 Subject: [PATCH 4/6] Update linters --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 245c974..80f38dc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,17 +3,17 @@ default_language_version: python: python3.12 repos: - repo: https://github.com/python/black - rev: 23.1.0 + rev: 24.4.2 hooks: - id: black exclude: migrations/ - repo: https://github.com/PyCQA/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort - repo: https://github.com/pycqa/flake8 # flake8 config is in setup.cfg - rev: 3.8.3 + rev: 7.0.0 hooks: - id: flake8 - repo: https://github.com/pre-commit/mirrors-prettier From 698016536d9e08f9b39bce954a73b455ee494737 Mon Sep 17 00:00:00 2001 From: katdom13 Date: Mon, 27 May 2024 19:30:22 +0800 Subject: [PATCH 5/6] Update change logs --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0466d54..2069a4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased +- Add tests for Wagtail 6 +- Drop support for Django < 4.2 + ## 1.1.0 (2024-03-11) - Add tests for Wagtail 5.1+ From 3056a91725fd9a9a675863786edf615d1e767fae Mon Sep 17 00:00:00 2001 From: nickmoreton Date: Thu, 15 Aug 2024 16:22:32 +0100 Subject: [PATCH 6/6] Update the tox test matrix to include Wagtail 6.2 --- tox.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 6216d3a..a84c798 100644 --- a/tox.ini +++ b/tox.ini @@ -15,14 +15,15 @@ WAGTAIL = 5.2: wt52 6.0: wt60 6.1: wt61 + 6.2: wt62 [tox] skipsdist = True usedevelop = True envlist = - py{38,39,310,311}-dj42-wt{52,60,61} - py{310,311,312}-dj50-wt{52,60,61} + py{38,39,310,311}-dj42-wt{52,60,61,62} + py{310,311,312}-dj50-wt{52,60,61,62} [testenv] description = Unit tests @@ -42,3 +43,4 @@ deps = wt52: wagtail>=5.2,<5.3 wt60: wagtail>=6.0,<6.1 wt61: wagtail>=6.1,<6.2 + wt62: wagtail>=6.2,<6.3