.circleci/config.yml

@@ -1,16 +1,15 @@
 jobs:
   nightly-wagtail-test:
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.13
     steps:
       - checkout
       - run: git clone git@github.com:wagtail/wagtail.git
 
       # Install your plugin with its testing requirements.
       - run: pip install -e .[test]
       # Replace Wagtail with the one checked out from git.
-      # Also pin Django to 3.x until django-bakery adds Django 4 support
-      - run: pip install ./wagtail "Django<4"
+      - run: pip install ./wagtail
       # Run the tests.
       - run: pytest
 

.github/workflows/publish-test.yml

@@ -0,0 +1,48 @@
+name: Publish to TestPyPI
+on:
+  push:
+    tags:
+      # Only run for tags ending with `.devN`
+      # https://peps.python.org/pep-0440/#summary-of-permitted-suffixes-and-relative-ordering
+      - '*\.dev\d+'
+jobs:
+  test:
+    uses: ./.github/workflows/test.yml
+
+  build:
+    needs: ['test']
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v3
+        with:
+          python-version: 3.11
+
+      - run: |
+          pip install setuptools
+          python setup.py sdist
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./dist
+
+  # https://docs.pypi.org/trusted-publishers/using-a-publisher/
+  test-pypi-publish:
+    needs: ['build']
+    environment: 'publish-test'
+
+    name: upload release to TestPyPI
+    runs-on: ubuntu-latest
+    permissions:
+      # Mandatory for trusted publishing
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v3
+
+      - name: Publish package distributions to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: artifact/
+          print-hash: true
+          repository-url: https://test.pypi.org/legacy/

.github/workflows/publish.yml

@@ -0,0 +1,48 @@
+name: Publish to PyPI
+on:
+  push:
+    tags:
+      # Only run for tags **not** ending with `.devN`
+      # https://peps.python.org/pep-0440/#summary-of-permitted-suffixes-and-relative-ordering
+      - '*'
+      - '!*\.dev\d+'
+jobs:
+  test:
+    uses: ./.github/workflows/test.yml
+
+  build:
+    needs: ['test']
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v3
+        with:
+          python-version: 3.11
+
+      - run: |
+          pip install setuptools
+          python setup.py sdist
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./dist
+
+  # https://docs.pypi.org/trusted-publishers/using-a-publisher/
+  pypi-publish:
+    needs: ['build']
+    environment: 'publish'
+
+    name: upload release to PyPI
+    runs-on: ubuntu-latest
+    permissions:
+      # Mandatory for trusted publishing
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v3
+
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: artifact/
+          print-hash: true

.github/workflows/test.yml

@@ -1,11 +1,11 @@
-name: Wagtail Bakery CI
+name: Test & Lint
 
 on:
   push:
     branches:
       - main
-
   pull_request:
+  workflow_call:  # Allow for the publish workflows to run the tests by calling this workflow
 
 jobs:
   test:
@@ -14,7 +14,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        python: ["3.8", "3.9", "3.10", "3.11"]
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         experimental: [false]
         toxenv: ["py"]
         include:
@@ -26,7 +26,7 @@ jobs:
             toxenv: isort
             experimental: false
             # Future Wagtail release from main branch (allowed to fail)
-          - python: "3.11"
+          - python: "3.12"
             toxenv: wagtailmain
             experimental: true
     steps:
@@ -37,7 +37,7 @@ jobs:
           python-version: ${{ matrix.python }}
       - name: Install dependencies
         run: |
-          python -m pip install tox tox-py
+          python -m pip install setuptools tox tox-py
 
         # This step runs only for jobs NOT in the include matrix
       - name: Run tox targets for Python ${{ matrix.python }}

CHANGELOG.md

@@ -5,9 +5,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/wagtail-nest/wagtail-bakery/compare/0.7.0...HEAD)
+## [Unreleased](https://github.com/wagtail-nest/wagtail-bakery/compare/0.8.0...HEAD)
 
-Nothing yet
+### Added
+
+- Compatibility with Wagtail 6.0 and 6.1. [#95](https://github.com/wagtail-nest/wagtail-bakery/pull/95)
+- Compatibility with Django 5.0. [#95](https://github.com/wagtail-nest/wagtail-bakery/pull/95)
+
+### Fixed
+
+- Fix links to Wagtail documentation. [#91](https://github.com/wagtail-nest/wagtail-bakery/pull/91)
+- Fix link to django-bakery documentation. [#94](https://github.com/wagtail-nest/wagtail-bakery/pull/94)
+
+### Removed
+
+- Drop support for Wagtail before 5.2. [#95](https://github.com/wagtail-nest/wagtail-bakery/pull/95)
+- Drop support for Django before 4.2. [#95](https://github.com/wagtail-nest/wagtail-bakery/pull/95)
+
+## [0.8.0](https://github.com/wagtail-nest/wagtail-bakery/compare/0.7.0...0.8.0)
+
+### Added
+
+- Compatibility with Wagtail 5.0 and Django 4.2. [#86](https://github.com/wagtail-nest/wagtail-bakery/pull/86)
+- (Development) Update factory-boy to 3.x [#87](https://github.com/wagtail-nest/wagtail-bakery/pull/87)
 
 ## [0.7.0](https://github.com/wagtail-nest/wagtail-bakery/compare/0.6.0...0.7.0)
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help all clean install flake8 isort lint test build publish publish-test
+.PHONY: help all clean install flake8 isort lint test
 .DEFAULT_GOAL := help
 
 help: ## See what commands are available.
@@ -24,21 +24,3 @@ lint: flake8 isort ## Lint the project.
 
 test: ## Test the project.
 	py.test
-
-build: ## Build the package.
-	@echo '== Cleanup =='
-	rm dist/* 2>/dev/null || true
-	@echo '== Build project =='
-	python setup.py sdist
-
-publish: build ## Publishes a new version to PyPI.
-	@echo '== Publish project to PyPi =='
-	twine upload dist/*
-	@echo '== Success =='
-	@echo 'Go to https://pypi.org/project/wagtail-bakery/ and check that all is well.'
-
-publish-test: build ## Publishes a new version to TestPyPI.
-	@echo '== Publish project to PyPi [TEST] =='
-	twine upload --repository-url https://test.pypi.org/legacy/ dist/*
-	@echo '== Success =='
-	@echo 'Go to https://test.pypi.org/project/wagtail-bakery/ and check that all is well.'

README.md

@@ -4,37 +4,44 @@ A set of helpers for baking your Django Wagtail site out as flat files.
 
 [![License: MIT](https://img.shields.io/pypi/l/wagtail-bakery)](https://github.com/wagtail-nest/wagtail-bakery/blob/main/LICENSE)
 [![Build Status](https://github.com/wagtail-nest/wagtail-bakery/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/wagtail-nest/wagtail-bakery/actions/workflows/test.yml)
-[![Coverage Status](https://coveralls.io/repos/github/wagtail-nest/wagtail-bakery/badge.svg?branch=main)](https://coveralls.io/github/wagtail-nest/wagtail-bakery?branch=main)
+[![Version](https://img.shields.io/pypi/v/wagtail-bakery.svg)](https://pypi.python.org/pypi/wagtail-bakery/)
+[![Monthly downloads](https://img.shields.io/pypi/dm/wagtail-bakery.svg?logo=Downloads)](https://pypi.python.org/pypi/wagtail-bakery/)
 
-Wagtail-bakery is built on top of [Django bakery](https://github.com/datadesk/django-bakery). Please read their [documentation](https://django-bakery.readthedocs.io/en/latest/) for detailed configuration and how to build default Django flat files. Yes. Wagtail-bakery is not limited to build Wagtail pages specifically, mixed content is possible!
+Wagtail-bakery is built on top of [Django bakery](https://github.com/datadesk/django-bakery). Please read their [documentation](https://palewi.re/docs/django-bakery/) for detailed configuration and how to build default Django flat files. Yes. Wagtail-bakery is not limited to build Wagtail pages specifically, mixed content is possible!
 
 ## Links
 
 - [Issues](https://github.com/wagtail-nest/wagtail-bakery/issues)
+- [Discussion boards](https://github.com/wagtail/wagtail/discussions) are open for sharing ideas and plans for the Wagtail project.
 - [Changelog](https://github.com/wagtail-nest/wagtail-bakery/issues)
-- [Coverage](https://coveralls.io/github/wagtail-nest/wagtail-bakery)
+
+### Security
+
+We take the security of Wagtail, and related packages we maintain, seriously. If you have found a security issue with any of our projects please email us at [security@wagtail.org](mailto:security@wagtail.org) so we can work together to find and patch the issue. We appreciate responsible disclosure with any security related issues, so please contact us first before creating a GitHub issue.
+
+If you want to send an encrypted email (optional), the public key ID for security@wagtail.org is 0xbed227b4daf93ff9, and this public key is available from most commonly-used keyservers.
 
 ## Features
 
 - Single management command that will build your Wagtail site out as flat files
-- Support for multisite, [theming](https://github.com/wagtail/wagtail-themes) and [multilingual](http://docs.wagtail.io/en/latest/advanced_topics/i18n/index.html) setup
+- Support for multisite, [theming](https://github.com/wagtail/wagtail-themes) and [multilingual](https://docs.wagtail.org/en/latest/advanced_topics/i18n.html) setup
 - Support for `i18n_patterns`
 - Support for generating a static API
 - Ready to use Wagtail Buildable views to build all your (un)published pages at once (no extra code required!)
 
 ## Supported Versions
 
-- Python 3.8 - 3.11
-- Django 3.2 - 4.1
-- Wagtail >= 4.1
+- Python 3.8 - 3.12
+- Django 4.2 - 5.0
+- Wagtail >= 5.2
 
-We aim to support the Wagtail versions as [supported](http://docs.wagtail.io/en/latest/releases/upgrading.html) by Wagtail (current LTS, current stable).
+We aim to support the Wagtail versions as [supported](http://docs.wagtail.org/en/latest/releases/upgrading.html) by Wagtail (current LTS, current stable).
 
-Django/Wagtail combinations as [supported](http://docs.wagtail.io/en/latest/releases/upgrading.html#compatible-django-python-versions) by Wagtail (for the Wagtail versions as defined above).
+Django/Wagtail combinations as [supported](http://docs.wagtail.org/en/latest/releases/upgrading.html#compatible-django-python-versions) by Wagtail (for the Wagtail versions as defined above).
 
 ### Browser support
 
-We align our browser support targets with that of Wagtail. Have a look at the [official documentation](http://docs.wagtail.io/en/latest/contributing/developing.html).
+We align our browser support targets with that of Wagtail. Have a look at the [official documentation](http://docs.wagtail.org/en/latest/contributing/developing.html).
 
 ## Installation
 
@@ -94,7 +101,7 @@ BAKERY_VIEWS = (
 )
 ```
 
-The API views use Wagtail's V2 API module. To configure the data that is rendered by these views, please refer to Wagtail's [V2 API configuration guide](http://docs.wagtail.io/en/stable/advanced_topics/api/v2/configuration.html).
+The API views use Wagtail's V2 API module. To configure the data that is rendered by these views, please refer to Wagtail's [V2 API configuration guide](http://docs.wagtail.org/en/latest/advanced_topics/api/v2/configuration.html).
 
 ## Usage
 
@@ -155,14 +162,19 @@ Test as follow:
 
 ### Releases
 
-1. Ensure you have the latest versions of `pip`, `setuptools` and `twine` installed in your virtual environment.
 1. Create a new branch (e.g. `release/1.1.3`) for the release of the new version.
 1. Update the version number in `setup.py` following [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 1. Update `CHANGELOG.md`.
 1. On GitHub, create a pull request and squash merge it.
-1. Checkout and pull the `main` branch locally.
-1. (Optional) If you need to verify anything, use `make publish-test` to upload to https://test.pypi.org and enter your PyPi _test_ credentials as needed.
-1. Use `make publish` and enter your PyPi credentials as needed.
+1. On GitHub, if this is a minor release bump (for example `1.1.0` or `1.2.0` but not `1.1.1`, `1.2.3`), create a `stable/1.1.x` branch from `main`.
+1. (Optional) Publish to TestPyPI if you need to verify anything:
+   1. Create and push a tag following the pattern `X.Y.Z.devN` (for example `1.1.3.dev1`).
+   1. Follow the action progress for the [Publish to TestPyPI](https://github.com/wagtail-nest/wagtail-bakery/actions/workflows/publish-test.yml) workflow.
+   1. Check the result on [TestPyPI: wagtail-bakery](https://test.pypi.org/project/wagtail-bakery/).
+1. Publish to PyPI:
+   1. Create and push a tag following [PEP 440 – Version Identification Specification](https://peps.python.org/pep-0440/) (for example `1.1.3` or `1.1.3rc1`), except for the `.devN` suffix used for testing (see _Publish to TestPyPI_ step above)
+   1. Follow the action progress for the [Publish to PyPI](https://github.com/wagtail-nest/wagtail-bakery/actions/workflows/publish.yml) workflow
+   1. Check the result on [PyPI: wagtail-bakery](https://pypi.org/project/wagtail-bakery/)
 1. On GitHub, create a release and a tag for the new version.
 
 ## Credits

examples/aws/requirements.txt

@@ -1,4 +1,4 @@
 django
 django-environ
-wagtail>=4.2
+wagtail>=5.2
 git+https://github.com/wagtail-nest/wagtail-bakery.git#egg=wagtail-bakery

examples/multisite/requirements.txt

@@ -1,3 +1,3 @@
 django
-wagtail>=4.2
+wagtail>=5.2
 git+https://github.com/wagtail-nest/wagtail-bakery.git#egg=wagtail-bakery

examples/site/requirements.txt

@@ -1,3 +1,3 @@
 django
-wagtail>=4.2
+wagtail>=5.2
 git+https://github.com/wagtail/wagtail-bakery.git#egg=wagtail-bakery

setup.cfg

@@ -30,6 +30,3 @@ known_third_party=bakery,django,factory,pytest,wagtail
 
 [tool:pytest]
 testpaths=tests
-
-[wheel]
-universal=1

setup.py

@@ -9,7 +9,7 @@
 ]
 
 test_requires = [
-    'factory-boy<3',
+    'factory-boy',
     'flake8',
     'isort',
     'pytest',
@@ -19,12 +19,12 @@
 
 setup(
     name='wagtail-bakery',
-    version='0.7.0',
+    version='0.8.0',
     description='A set of helpers for baking your Django Wagtail site out as flat files.',
     long_description=long_description,
     long_description_content_type='text/markdown',
     author='Rob Moorman and Wagtail Core Team',
-    author_email='hello@wagtail.io',
+    author_email='hello@wagtail.org',
     url="https://github.com/wagtail-nest/wagtail-bakery/",
     project_urls={
         "Source": "https://github.com/wagtail-nest/wagtail-bakery/",
@@ -44,12 +44,14 @@
         'License :: OSI Approved :: MIT License',
         'Framework :: Django',
         'Framework :: Wagtail',
-        'Framework :: Wagtail :: 4',
+        'Framework :: Wagtail :: 5',
+        'Framework :: Wagtail :: 6',
         'Operating System :: Unix',
         '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',
     ],
 )

tests/conftest.py

@@ -90,4 +90,5 @@ def pytest_configure():
             'wagtailbakery.views.AllPagesView',
         ),
         CELERY_ALWAYS_EAGER=True,
+        STATIC_URL="/static/",
     )

tests/factories/page.py

@@ -2,7 +2,7 @@
 from wagtail.models import Page
 
 
-class PageFactory(factory.DjangoModelFactory):
+class PageFactory(factory.django.DjangoModelFactory):
     depth = 2
     numchild = 0
     path = '00010002'

tests/factories/site.py

@@ -2,7 +2,7 @@
 from wagtail.models import Site
 
 
-class SiteFactory(factory.DjangoModelFactory):
+class SiteFactory(factory.django.DjangoModelFactory):
     hostname = 'localhost'
     port = 80
     is_default_site = True