Skip to content

Commit

Permalink
support for Wagtail 6 (#127)
Browse files Browse the repository at this point in the history
* support for Wagtail 6

* update circleci config

* Update CircleCI Python orb

* Fix typo

* One more try

* Remove patch

* fix tests
  • Loading branch information
jberghoef authored Feb 28, 2024
1 parent b416601 commit 7ef67f0
Show file tree
Hide file tree
Showing 23 changed files with 753 additions and 705 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
docker:
# specify the version you desire here
# use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
- image: circleci/python:3.9.7
- image: cimg/python:3.11

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/cookie_consent.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe("Cookie consent", () => {

// Change homepage
cy.visit("/cms/pages/2/edit/");
cy.get(".dropdown-toggle").click({ force: true });
cy.get("[data-w-dropdown-target='toggle']").click({ force: true, multiple: true });
cy.get("[name='action-publish']").click({ force: true });

// Visit homepage
Expand Down Expand Up @@ -87,7 +87,7 @@ describe("Cookie consent", () => {

// Change homepage
cy.visit("/cms/pages/2/edit/");
cy.get(".dropdown-toggle").click({ force: true });
cy.get("[data-w-dropdown-target='toggle']").click({ force: true, multiple: true });
cy.get("[name='action-publish']").click({ force: true });

// Visit homepage
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/home_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe("The home page", () => {
cy.contains("Lazy passive delayed").click();
cy.contains("Lazy passive regular").click();

cy.get(".dropdown-toggle").click();
cy.get("[data-w-dropdown-target='toggle']").click({ force: true, multiple: true });
cy.get("[name='action-publish']").click();

cy.setConsent({
Expand Down Expand Up @@ -111,7 +111,7 @@ describe("The home page", () => {
cy.contains("Lazy passive delayed").click();
cy.contains("Lazy passive regular").click();

cy.get(".dropdown-toggle").click();
cy.get("[data-w-dropdown-target='toggle']").click({ force: true, multiple: true });
cy.get("[name='action-publish']").click();

cy.setConsent({
Expand Down
4 changes: 2 additions & 2 deletions sandbox/exampledata/cms.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
{
"model": "contenttypes.contenttype",
"pk": 56,
"pk": 54,
"fields": {
"app_label": "home",
"model": "homepage"
Expand All @@ -28,7 +28,7 @@
"title": "Wagtail Tag Manager",
"draft_title": "Wagtail Tag Manager",
"slug": "wagtail-tag-manager",
"content_type": 56,
"content_type": 54,
"live": true,
"has_unpublished_changes": false,
"url_path": "/wagtail-tag-manager/",
Expand Down
4 changes: 2 additions & 2 deletions sandbox/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django>=4.2,<4.3
wagtail>=5.1,<5.2
Django>=5.0,<5.1
wagtail>=6.0,<6.1
django-debug-toolbar
-e .[docs,test]
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ minversion = 3.0
strict = true
django_find_project = false
testpaths = tests
python_paths = .

[isort]
line_length = 80
Expand Down
21 changes: 6 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@


install_requires = [
"wagtail>=4.0,<6.0",
"wagtail_modeladmin>=1.0.0,<1.1.0",
"wagtail>=4.0,<7.0",
"wagtail_modeladmin>=2.0.0,<2.1.0",
"selenium>=3.141.0,<3.142.0",
]

Expand All @@ -18,7 +18,6 @@
"pycodestyle",
"pytest-cov",
"pytest-django",
"pytest-pythonpath",
"pytest-randomly",
"pytest-sugar",
"pytest",
Expand Down Expand Up @@ -52,18 +51,10 @@
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.0",
"Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
"Programming Language :: Python :: 3.11",
"Framework :: Django :: 4.0",
"Framework :: Wagtail :: 2",
"Framework :: Wagtail :: 3",
"Framework :: Wagtail :: 4",
"Framework :: Django :: 5.0",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
],
)

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7ef67f0

Please sign in to comment.