From c5338db924759f283a5426e81118554ab9a7f891 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 19 Aug 2024 14:34:42 +0100 Subject: [PATCH] Drop support for Wagtail <5.2, Django <4.2 --- .github/workflows/nightly-tests.yml | 10 +++---- .github/workflows/test.yml | 42 ++++++++++++++--------------- CHANGELOG.txt | 7 +++++ README.md | 2 +- setup.py | 5 ++-- 5 files changed, 37 insertions(+), 29 deletions(-) diff --git a/.github/workflows/nightly-tests.yml b/.github/workflows/nightly-tests.yml index 9ba6483..b3f5d88 100644 --- a/.github/workflows/nightly-tests.yml +++ b/.github/workflows/nightly-tests.yml @@ -16,7 +16,7 @@ jobs: services: postgres: - image: postgres:12 + image: postgres:14 env: POSTGRES_PASSWORD: postgres ports: @@ -25,15 +25,15 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: "3.12" - name: Install dependencies run: | python -m pip install --upgrade pip - pip install "psycopg2>=2.6" - pip install "Django>=4.2,<4.3" + pip install "psycopg>=3.2" + pip install "Django>=5.1,<5.2" pip install "git+https://github.com/wagtail/wagtail.git@main#egg=wagtail" pip install -e . - name: Test diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 124acbb..5d3b62a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,11 +6,11 @@ on: pull_request: # Current configuration: -# - django 3.2, python 3.8, wagtail 4.1, sqlite -# - django 4.1, python 3.9, wagtail 5.0, postgresql -# - django 4.2, python 3.10, wagtail 5.1, sqlite -# - django 4.2, python 3.11, wagtail 5.2, postgresql -# - django 4.1, python 3.11, wagtail main, postgres (allow failures) +# - django 4.2, python 3.8, wagtail 5.2, sqlite +# - django 4.2, python 3.9, wagtail 6.0, postgresql +# - django 5.0, python 3.11, wagtail 6.1, sqlite +# - django 5.1, python 3.12, wagtail 6.2, postgresql +# - django 5.1, python 3.12, wagtail main, postgres (allow failures) jobs: test: runs-on: ubuntu-20.04 @@ -19,37 +19,37 @@ jobs: matrix: include: - python: "3.8" - django: "Django>=3.2,<3.3" - wagtail: "wagtail>=4.1,<4.2" + django: "Django>=4.2,<4.3" + wagtail: "wagtail>=5.2,<5.3" database: "sqlite3" experimental: false - python: "3.9" - django: "Django>=4.1,<4.2" - wagtail: "wagtail>=5.0,<5.1" + django: "Django>=4.2,<4.3" + wagtail: "wagtail>=6.0,<6.1" database: "postgresql" - psycopg: "psycopg2>=2.6" + psycopg: "psycopg>=3.2" experimental: false - - python: "3.10" - django: "Django>=4.2,<4.3" - wagtail: "wagtail>=5.1,<5.2" + - python: "3.11" + django: "Django>=5.0,<5.1" + wagtail: "wagtail>=6.1,<6.2" database: "sqlite3" experimental: false - - python: "3.11" - django: "Django>=4.2,<4.3" - wagtail: "wagtail>=5.2,<5.3" + - python: "3.12" + django: "Django>=5.1,<5.2" + wagtail: "wagtail>=6.2,<6.3" database: "postgresql" - psycopg: "psycopg2>=2.6" + psycopg: "psycopg>=3.2" experimental: false - - python: "3.11" - django: "Django>=4.2,<4.3" + - python: "3.12" + django: "Django>=5.1,<5.2" wagtail: "git+https://github.com/wagtail/wagtail.git@main#egg=wagtail" database: "postgresql" - psycopg: "psycopg2>=2.6" + psycopg: "psycopg>=3.2" experimental: true services: postgres: - image: postgres:12 + image: postgres:14 env: POSTGRES_PASSWORD: postgres ports: diff --git a/CHANGELOG.txt b/CHANGELOG.txt index aa5b6f9..c6c26e2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,10 @@ +0.5 (xxxx-xx-xx) +---------------- + +* Fixes for Wagtail 6.x (Matt Westcott) +* Dropped support for Wagtail <5.2, Django <4.2 + + 0.4 (2023-08-01) ---------------- diff --git a/README.md b/README.md index e8c3377..12ac483 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ An extension for Wagtail allowing pages to be submitted for review (including to ## Requirements -Wagtail 4.1 or higher +Wagtail 5.2 or higher ## Installation diff --git a/setup.py b/setup.py index fec7e2b..43685c9 100644 --- a/setup.py +++ b/setup.py @@ -29,12 +29,13 @@ '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 :: 4', + 'Framework :: Django :: 5', 'Framework :: Wagtail', - 'Framework :: Wagtail :: 3', 'Framework :: Wagtail :: 4', 'Framework :: Wagtail :: 5', + 'Framework :: Wagtail :: 6', ], )