From 0f861b9b3898567d01b5ebe373f9a0dffb321e7e Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Wed, 4 Oct 2023 14:33:44 +0100 Subject: [PATCH 01/10] Update testing matrix to include Wagtail 5.1 --- tox.ini | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index c7b9e8f..54ba931 100644 --- a/tox.ini +++ b/tox.ini @@ -15,14 +15,16 @@ WAGTAIL = 4.1: wt41 4.2: wt42 5.0: wt50 + 5.1: wt51 [tox] skipsdist = True usedevelop = True envlist = - py{38,39,310}-dj{32,41}-wt{41,42,50} - py{311}-dj{41,42}-wt{50} + py{38,39,310}-dj{32,41}-wt{41,42,50,51} + py311-dj41-wt{41,42,50,51} + py311-dj42-wt{50,51} [testenv] description = Unit tests @@ -42,3 +44,4 @@ deps = wt41: wagtail>=4.1,<4.2 wt42: wagtail>=4.2,<5.0 wt50: wagtail>=5.0,<5.1 + wt51: wagtail>=5.1,<5.2 From 61ac8da9627113234c4d546b8de2273e1df887b5 Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Wed, 4 Oct 2023 14:35:43 +0100 Subject: [PATCH 02/10] Simplify the actions matrix --- .github/workflows/tests.yml | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e696225..541804a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,34 +6,21 @@ on: pull_request: branches: [main] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: read # to fetch code (actions/checkout) + jobs: build: - name: | - build (Python ${{ matrix.python-version }}, - Django ${{ matrix.django-version }}, - Wagtail ${{ matrix.wagtail-version }}), runs-on: ubuntu-latest strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] - django-version: ["3.2", "4.1", "4.2"] - wagtail-version: ["4.1", "4.2", "5.0"] - exclude: - - python-version: "3.8" - django-version: "4.2" - - python-version: "3.9" - django-version: "4.2" - - python-version: "3.10" - django-version: "4.2" - - python-version: "3.11" - django-version: "3.2" - - python-version: "3.11" - wagtail-version: "4.1" - - python-version: "3.11" - wagtail-version: "4.2" - - django-version: "3.2" - wagtail-version: "5.0" + python: ["3.8", "3.9", "3.10", "3.11"] + steps: - uses: actions/checkout@v3 From 4f48c6a36aac280e29c479562b15440ff11f1cbd Mon Sep 17 00:00:00 2001 From: Nick Moreton Date: Wed, 4 Oct 2023 14:53:11 +0100 Subject: [PATCH 03/10] Adjust to match the supported versions of Python, Django and Wagtail. --- setup.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index f28d415..03832be 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,13 +13,13 @@ license_files = LICENSE.txt [options] -python_requires = >= 3.7 +python_requires = >= 3.8 setup_requires = setuptools >= 40.6 pip >= 10 include_package_data = true packages = find: install_requires = - Django>=3.2, <4.2 - wagtail>=4.1, <5.0 + Django>=3.2, <4.3 + wagtail>=4.1, <5.2 python-unsplash>=1.1.0, <1.2 From 3c82c2bb267636fa367797d31b2eb858bca6ae08 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Thu, 16 Nov 2023 11:55:52 +0800 Subject: [PATCH 04/10] Update tox.ini to include Wagtail 5.2, Drop tests for Wagtail 4.2 and 5.0 as they have reached EOL, Update changelog --- CHANGELOG.md | 3 +++ tox.ini | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ca5095..98240f7 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 5.1+ +- Drop tests for Wagtail 4.2 and 5.0 as they have reached EOL + ## 1.0.1 (2023-07-27) - Adds support for Wagtail 5.0 diff --git a/tox.ini b/tox.ini index 54ba931..7d0a3d6 100644 --- a/tox.ini +++ b/tox.ini @@ -13,18 +13,17 @@ DJANGO = WAGTAIL = 4.1: wt41 - 4.2: wt42 - 5.0: wt50 5.1: wt51 + 5.2: wt52 [tox] skipsdist = True usedevelop = True envlist = - py{38,39,310}-dj{32,41}-wt{41,42,50,51} - py311-dj41-wt{41,42,50,51} - py311-dj42-wt{50,51} + py{38,39,310}-dj{32,41}-wt{41,51,52} + py311-dj41-wt{41,51,52} + py311-dj42-wt{51,52} [testenv] description = Unit tests @@ -42,6 +41,5 @@ deps = dj41: Django>=4.1,<4.2 dj42: Django>=4.2,<4.3 wt41: wagtail>=4.1,<4.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 From 08c68346d23c53240cdd48ea94aa1494a8ebe976 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Fri, 17 Nov 2023 16:19:29 +0800 Subject: [PATCH 05/10] Remove upperbound for Wagtail and Django in setup.cfg --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 03832be..e554b07 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,6 +20,6 @@ setup_requires = include_package_data = true packages = find: install_requires = - Django>=3.2, <4.3 - wagtail>=4.1, <5.2 + Django>=3.2 + wagtail>=4.1 python-unsplash>=1.1.0, <1.2 From 70ff334fed169d4a8c87d640233d33cec511b2db Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Tue, 27 Feb 2024 16:03:03 +0800 Subject: [PATCH 06/10] Upgrade Wagtail lowerbound, Add support for Python 3.12, Update latest python version, update setup.py --- .github/workflows/tests.yml | 2 +- .pre-commit-config.yaml | 2 +- setup.cfg | 2 +- setup.py | 6 +++--- tox.ini | 18 +++++++++--------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 541804a..4c0aa7f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - python: ["3.8", "3.9", "3.10", "3.11"] + python: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 438cd17..245c974 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ default_language_version: node: system - python: python3.11 + python: python3.12 repos: - repo: https://github.com/python/black rev: 23.1.0 diff --git a/setup.cfg b/setup.cfg index e554b07..e1a5ce9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,5 +21,5 @@ include_package_data = true packages = find: install_requires = Django>=3.2 - wagtail>=4.1 + wagtail>=5.2 python-unsplash>=1.1.0, <1.2 diff --git a/setup.py b/setup.py index c55a65a..f95d770 100644 --- a/setup.py +++ b/setup.py @@ -27,17 +27,17 @@ license="MIT", packages=find_packages(exclude=["tests*"]), include_package_data=True, - install_requires=["wagtail>=4.1", "python-unsplash>=1.1.0"], + install_requires=["wagtail>=5.2", "python-unsplash>=1.1.0"], extras_require={"testing": testing_extras}, classifiers=[ "Development Status :: 3 - Alpha", "Environment :: Web Environment", "Framework :: Django", "Framework :: Django :: 3.2", - "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", "Framework :: Wagtail", - "Framework :: Wagtail :: 4", "Framework :: Wagtail :: 5", + "Framework :: Wagtail :: 6", ], ), diff --git a/tox.ini b/tox.ini index 7d0a3d6..5960173 100644 --- a/tox.ini +++ b/tox.ini @@ -4,26 +4,26 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [gh-actions:env] DJANGO = 3.2: dj32 - 4.1: dj41 4.2: dj42 + 5.0: dj50 WAGTAIL = - 4.1: wt41 - 5.1: wt51 5.2: wt52 + 6.0: wt60 [tox] skipsdist = True usedevelop = True envlist = - py{38,39,310}-dj{32,41}-wt{41,51,52} - py311-dj41-wt{41,51,52} - py311-dj42-wt{51,52} + py{38,39,310}-dj32-wt52 + py{38,39,310,311}-dj42-wt{52,60} + py{311,312}-dj50-wt{52,60} [testenv] description = Unit tests @@ -35,11 +35,11 @@ basepython = py39: python3.9 py310: python3.10 py311: python3.11 + py312: python3.12 deps = dj32: Django>=3.2,<4.0 - dj41: Django>=4.1,<4.2 dj42: Django>=4.2,<4.3 - wt41: wagtail>=4.1,<4.2 - wt51: wagtail>=5.1,<5.2 + dj50: Django>=5.0,<5.1 wt52: wagtail>=5.2,<5.3 + wt60: wagtail>=6.0,<6.1 From b8343386bee9f9bda3953ce7f3f0982b52d079a5 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Tue, 27 Feb 2024 16:04:00 +0800 Subject: [PATCH 07/10] Remove unnecessary installation of deprecated wagtail.contrib.modeladmin package, Add default value for STATIC_URL --- wagtailmakeup/tests/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wagtailmakeup/tests/settings.py b/wagtailmakeup/tests/settings.py index 7f621df..35574f9 100644 --- a/wagtailmakeup/tests/settings.py +++ b/wagtailmakeup/tests/settings.py @@ -18,7 +18,6 @@ "wagtail.contrib.routable_page", "wagtail.contrib.frontend_cache", "wagtail.contrib.settings", - "wagtail.contrib.modeladmin", "wagtail.contrib.table_block", "wagtail.contrib.forms", "wagtail.embeds", @@ -72,3 +71,5 @@ USE_TZ = True WAGTAILADMIN_BASE_URL = "http://localhost:8000/admin/" + +STATIC_URL = "/static/" From 313c5fcc584f53ad69222582da621a37a64a8e04 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Tue, 27 Feb 2024 16:11:15 +0800 Subject: [PATCH 08/10] Bump Github workflow action versions --- .github/workflows/release.yml | 6 +++--- .github/workflows/tests.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d24075..e7a192d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3 @@ -23,7 +23,7 @@ jobs: run: python setup.py bdist_wheel sdist - name: Upload Python packages artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: Python Packages path: dist diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4c0aa7f..8ee7086 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,10 +22,10 @@ jobs: python: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -40,6 +40,6 @@ jobs: WAGTAIL: ${{ matrix.wagtail-version }} - name: Upload coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: name: Python ${{ matrix.python-version }} From 720b2e6e0b6c1696dabacc128e13059743e43146 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Fri, 8 Mar 2024 15:18:37 +0800 Subject: [PATCH 09/10] Set upperbound on setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index e1a5ce9..ecf15ec 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,5 +21,5 @@ include_package_data = true packages = find: install_requires = Django>=3.2 - wagtail>=5.2 + wagtail>=5.2,<6.1 python-unsplash>=1.1.0, <1.2 From a427c5e5ae3f19499d8d2b68926bd824eb40c355 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Fri, 8 Mar 2024 18:42:30 +0800 Subject: [PATCH 10/10] Revert "Set upperbound on setup.cfg" This reverts commit 720b2e6e0b6c1696dabacc128e13059743e43146. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ecf15ec..e1a5ce9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,5 +21,5 @@ include_package_data = true packages = find: install_requires = Django>=3.2 - wagtail>=5.2,<6.1 + wagtail>=5.2 python-unsplash>=1.1.0, <1.2