diff --git a/.gitignore b/.gitignore index 326a7fdd..fd135ec4 100755 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ ENV/ # Editors .vscode/ *~ +.idea/ # Development & testing .coverage diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8ed0649b..c3aecb4f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,26 +28,28 @@ stages: strategy: matrix: # Oldest versions of python should use the oldest versions of - # wagtail we support, for testing purposes. - py3.10: - PYTHON_VERSION: '3.10' - WAGTAIL_VERSION: '7.0.*' - TEMPLATE: 'basic' - py3.11: - PYTHON_VERSION: '3.11' - WAGTAIL_VERSION: '7.1.*' - TEMPLATE: 'basic' + # wagtail we support, for testing purposes. Wagtail 7.0 LTS + # predates Django 6 and its metadata leaves Django uncapped, so + # we pin Django explicitly on that slot. py3.12: PYTHON_VERSION: '3.12' - WAGTAIL_VERSION: '7.1.*' + WAGTAIL_VERSION: '7.0.*' + DJANGO_VERSION: '<6.0' TEMPLATE: 'basic' - py3.13_basic: + py3.13: PYTHON_VERSION: '3.13' + WAGTAIL_VERSION: '7.3.*' + DJANGO_VERSION: '' + TEMPLATE: 'basic' + py3.14_basic: + PYTHON_VERSION: '3.14' WAGTAIL_VERSION: '7.*' + DJANGO_VERSION: '' TEMPLATE: 'basic' - py3.13_pro: - PYTHON_VERSION: '3.13' + py3.14_pro: + PYTHON_VERSION: '3.14' WAGTAIL_VERSION: '7.*' + DJANGO_VERSION: '' TEMPLATE: 'pro' steps: @@ -57,7 +59,7 @@ stages: versionSpec: '$(PYTHON_VERSION)' architecture: 'x64' - - script: python -m pip install -r requirements-ci.txt wagtail==$(WAGTAIL_VERSION) + - script: python -m pip install -r requirements-ci.txt "wagtail==$(WAGTAIL_VERSION)" "Django$(DJANGO_VERSION)" displayName: 'CR-QC: Install coderedcms from local repo' - script: coderedcms start testproject --template $(TEMPLATE) diff --git a/docs/getting_started/tutorial05.rst b/docs/getting_started/tutorial05.rst index 83c4a128..95ecd248 100644 --- a/docs/getting_started/tutorial05.rst +++ b/docs/getting_started/tutorial05.rst @@ -103,7 +103,7 @@ Publish and see what happens! The published Blog landing page. Whoa! The blog posts are already showing up! What is this magic? Well, remember that this is a parent page type -and the blog posts were children of this page. The option to "show children" is already pre-selected in the edit mode +and the blog posts were children of this page. The option to "show children" is already preselected in the edit mode for landing pages. Let's look at that now. Ways to display sub-pages on a landing page diff --git a/docs/releases/index.rst b/docs/releases/index.rst index ad0f78b6..c936a732 100644 --- a/docs/releases/index.rst +++ b/docs/releases/index.rst @@ -15,6 +15,8 @@ Supported Versions: +--------------+---------+-----------+---------------------------+ | CRX version | Wagtail | Python | Support Status | +==============+=========+===========+===========================+ +| CRX 7.0 | 7.0-7.3 | 3.12-3.14 | Supported | ++--------------+---------+-----------+---------------------------+ | CRX 6.0 | 7.0-7.1 | 3.10-3.13 | Supported | +--------------+---------+-----------+---------------------------+ | CRX 5.0 | 6.3-6.4 | 3.9-3.13 | Supported | @@ -35,6 +37,7 @@ Supported Versions: .. toctree:: :maxdepth: 1 + v7.0.0 v6.0.0 v5.0.2 v5.0.1 diff --git a/docs/releases/v7.0.0.rst b/docs/releases/v7.0.0.rst new file mode 100644 index 00000000..cfb8f690 --- /dev/null +++ b/docs/releases/v7.0.0.rst @@ -0,0 +1,26 @@ +v7.0.0 release notes +==================== + + +New features +------------ + +* Support Wagtail 7.3. + +* Support Django 6.0. + +* Support Python 3.14. + + +Upgrade considerations +---------------------- + +Dropped support for Python 3.10 and 3.11, which are not supported by Django 6. + +Be sure to read the `Wagtail 7.3 upgrade considerations `_ and the `Django 6.0 release notes `_. + + +Thank you! +---------- + +Thanks to everyone who contributed to `7.0.0 on GitHub `_. \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 825a4f64..49f7a06a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,16 +15,14 @@ classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Programming Language :: Python :: 3 :: Only", "Framework :: Django", "Framework :: Django :: 4.2", - "Framework :: Django :: 5.0", - "Framework :: Django :: 5.1", "Framework :: Django :: 5.2", + "Framework :: Django :: 6.0", "Framework :: Wagtail", "Framework :: Wagtail :: 7", "Topic :: Internet :: WWW/HTTP", @@ -35,7 +33,7 @@ dependencies = [ "beautifulsoup4>=4.8,<5", # should be the same as wagtail "django-eventtools==1.0.*", "django-bootstrap5==25.2", - "Django>=4.2,<6.0", # should be the same as wagtail + "Django>=4.2,<7.0", # should be the same as wagtail "geocoder==1.38.*", "icalendar==6.3.*", "wagtail>=7.0,<8.0", @@ -48,7 +46,7 @@ dynamic = ["version"] license = {file = "LICENSE.txt"} name = "coderedcms" readme = "README.md" -requires-python = ">=3.10" +requires-python = ">=3.12" [project.scripts] coderedcms = "coderedcms.bin.coderedcms:main"