Update supported versions and dependencies #509

zerolab · 2022-01-21T11:03:17Z

This PR:

allows installing wagtail-localize wtih Wagtail 2.16 (currently off its main branch)
Fixes a number of deprecations in prep for Django 4.0 support
Fixes test failures with Wagtail 2.16 (reference
Bumps the black version to the latest
regenerates the package-lock.json file after the addition of .nvmrc

as of 2.16 `wagtail.admin.views.generic.DeleteView` has been updated to match the Django 4.0 `DeleteView` implementation which uses `FormMixin` so the action happens in `form_valid` https://github.com/wagtail/wagtail/blob/main/docs/releases/2.16.md#wagtailadminviewsgenericdeleteview-follows-django-40-conventions

uses new lockfile version

codecov-commenter · 2022-01-21T22:12:57Z

Codecov Report

Merging #509 (b7a63b3) into main (7b4788a) will decrease coverage by 0.55%.
The diff coverage is 56.81%.

@@            Coverage Diff             @@
##             main     #509      +/-   ##
==========================================
- Coverage   92.92%   92.37%   -0.56%     
==========================================
  Files          36       36              
  Lines        3025     3055      +30     
  Branches      478      486       +8     
==========================================
+ Hits         2811     2822      +11     
- Misses        114      126      +12     
- Partials      100      107       +7

Impacted Files	Coverage Δ
wagtail_localize/locales/__init__.py	`50.00% <50.00%> (-50.00%)`	⬇️
wagtail_localize/locales/views.py	`93.37% <50.00%> (-3.85%)`	⬇️
wagtail_localize/test/__init__.py	`50.00% <50.00%> (-50.00%)`	⬇️
wagtail_localize/wagtail_hooks.py	`84.84% <57.14%> (-3.59%)`	⬇️
wagtail_localize/__init__.py	`60.00% <60.00%> (-40.00%)`	⬇️
wagtail_localize/test/settings.py	`97.05% <66.66%> (-2.95%)`	⬇️
wagtail_localize/version.py	`75.00% <100.00%> (+2.77%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7b4788a...b7a63b3. Read the comment docs.

Stormheg

Thanks so much for your work @zerolab ❤️

All looks good, but I do have one minor question about Django 3.0 and 3.1 missing from the tox dependencies. Perhaps you removed these by accident?

One other this I noticed is that we have some invalid dependency matrix combinations in Tox, we should probably clean that up (see comment for details). Not necessarily to be done in this PR but if you're up to it 🙂

Stormheg · 2022-01-24T14:43:06Z

tox.ini

+    polib>=1.1,<2.0
+
+    django2.2: Django~=2.2
+    django3.2: Django~=3.2


Question: shouldn't Django 3.0 and 3.1 be listed here as they are still listed in envlist?

3.0 and 3.1 are no longer supported, so doing some tidyup there

Gotcha! That makes sense.

Stormheg · 2022-01-24T14:45:43Z

tox.ini

-    wagtail2.13: wagtail>=2.13,<2.14
-    wagtail2.14: wagtail>=2.14,<2.15
-    wagtail2.15: wagtail>=2.15rc1,<2.16
+    wagtail2.11: wagtail~=2.11


Praise: didn't know about the tilde equals ~= in pip and looked it up, it has the same result as >=2.11,<2.12 but much shorter. Nicely done! 👍 😄

Stormheg · 2022-01-24T15:00:18Z

tox.ini

@@ -2,7 +2,7 @@
 skipsdist = True
 usedevelop = True

-envlist = python{3.7,3.8,3.9}-django{2.2,3.0,3.1,3.2,main}-wagtail{2.11,2.12,2.13,2.14,2.15,main}-{sqlite,postgres}
+envlist = python{3.7,3.8,3.9}-django{2.2,3.0,3.1,3.2,main}-wagtail{2.11,2.12,2.13,2.14,2.15,2.16,main}-{sqlite,postgres}


Issue (non-blocking): this envlist is very large and contains some invalid combinations like python3.8-django2.2-wagtailmain-postgres. These can't be tested because the Wagtail/Python/Django versions are not compatible.

Suggestion: we should clean this up (in a follow-up PR?) to remove invalid combinations. I've done something similar in the past for wagtail-live by splitting the envlist over multiple lines. See https://github.com/wagtail/wagtail-live/blob/main/tox.ini#L4

great suggestion. was thinking the same last night.
we're doing that in wagtailmedia - https://github.com/torchbox/wagtailmedia/blob/main/tox.ini#L5-L8

will get on it. may move the version definition in own include as I did in torchbox/wagtailmedia@0317d44 - should be cleaner than explicitly installing the testing requirements in tox

Thanks! Happy to re-review if needed 🙂

updated in 2a35212 + 170f17a

… tox

Stormheg

Thanks again @zerolab

Some small changes to be made to tox.ini and setup.py. Everything else looks fabulous!

Stormheg · 2022-01-25T11:59:18Z

tox.ini

+    py{3.7,3.8,3.9}-django{2.2}-wagtail{2.11,2.12,2.13}-{sqlite,postgres}
+    py{3.7,3.8,3.9}-django{3.2}-wagtail{2.14,2.15,2.16}-{sqlite,postgres}
+    py{3.7,3.8,3.9}-django{4.0}-wagtail2.16-{sqlite,postgres}
+    py{310}-dj{3.2,main}-wagtail{2.15,2.16,main}-{sqlite,postgres}


Adding the dots to the i, so to speak 😉

Suggested change

py{310}-dj{3.2,main}-wagtail{2.15,2.16,main}-{sqlite,postgres}

py{3.10}-dj{3.2,main}-wagtail{2.15,2.16,main}-{sqlite,postgres}

Stormheg · 2022-01-25T11:59:48Z

tox.ini

@@ -2,7 +2,11 @@
 skipsdist = True
 usedevelop = True

-envlist = python{3.7,3.8,3.9}-django{2.2,3.0,3.1,3.2,main}-wagtail{2.11,2.12,2.13,2.14,2.15,main}-{sqlite,postgres}
+envlist =
+    py{3.7,3.8,3.9}-django{2.2}-wagtail{2.11,2.12,2.13}-{sqlite,postgres}


Suggestion: the basepython section should be updated to match. Tox doesn't know what py3.7 means, since you've changed it from python3.7

I should not do this type of changes while travelling on a bus :)
good spot. updated to use python as previously, and dotted the 3.10 as well as added the definition in the basepython section

Stormheg · 2022-01-25T12:06:43Z

setup.py

@@ -41,9 +44,9 @@
        "Framework :: Wagtail",


chore: did not note this in my previous review: but since we don't support Django 3.0 and 3.1 anymore, those classifiers should be removed from this section.

Stormheg

TY ❤️

Allow running tests on Wagtail 2.16 (currently via main)

dd38772

zerolab requested a review from kaedroho January 21, 2022 11:03

zerolab force-pushed the chore/wagtail-216-and-deps branch from b94f6fe to b17a653 Compare January 21, 2022 17:15

zerolab mentioned this pull request Jan 21, 2022

Add support for ListBlock #510

Merged

zerolab force-pushed the chore/wagtail-216-and-deps branch 3 times, most recently from cd6a213 to 7b3d91e Compare January 21, 2022 17:30

zerolab added 5 commits January 21, 2022 23:09

Fix deprecations

f226bed

Bump freezegun

9ef6ccb

Bump pre-commit dependencies

427fc28

uses new lockfile version

Update package-lock.json using new lockfile version

b4b9107

zerolab force-pushed the chore/wagtail-216-and-deps branch from 067acab to 7941c63 Compare January 21, 2022 22:09

zerolab force-pushed the chore/wagtail-216-and-deps branch from 7941c63 to 659b8fc Compare January 21, 2022 22:18

Stormheg approved these changes Jan 24, 2022

View reviewed changes

zerolab force-pushed the chore/wagtail-216-and-deps branch from 659b8fc to 170f17a Compare January 24, 2022 16:42

zerolab added 2 commits January 25, 2022 11:41

Tidy up install matrix

98a5cbf

Move version to version.py and avoid duplicate testing declaration in…

9f36f7e

… tox

zerolab force-pushed the chore/wagtail-216-and-deps branch from 170f17a to 9f36f7e Compare January 25, 2022 11:45

zerolab requested a review from Stormheg January 25, 2022 11:51

Stormheg suggested changes Jan 25, 2022

View reviewed changes

Tidy up post code review

719df38

zerolab requested a review from Stormheg January 25, 2022 12:20

Stormheg approved these changes Jan 25, 2022

View reviewed changes

Test against Django 4.0 (and Wagtail main)

5cc1748

zerolab force-pushed the chore/wagtail-216-and-deps branch from b7a63b3 to 5cc1748 Compare January 26, 2022 14:18

zerolab merged commit 58c1e0b into wagtail:main Jan 26, 2022

zerolab deleted the chore/wagtail-216-and-deps branch January 26, 2022 14:45

zerolab added a commit that referenced this pull request Jan 26, 2022

Update changelog for #509

2e596df

zerolab mentioned this pull request Jan 26, 2022

Specify Postgres version for the Wagtail main env test in CI #481

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update supported versions and dependencies #509

Update supported versions and dependencies #509

zerolab commented Jan 21, 2022

codecov-commenter commented Jan 21, 2022 •

edited

Loading

Stormheg left a comment

Stormheg Jan 24, 2022

zerolab Jan 24, 2022

Stormheg Jan 24, 2022

Stormheg Jan 24, 2022

Stormheg Jan 24, 2022

zerolab Jan 24, 2022

Stormheg Jan 24, 2022

zerolab Jan 24, 2022

Stormheg left a comment

Stormheg Jan 25, 2022

Stormheg Jan 25, 2022

zerolab Jan 25, 2022

Stormheg Jan 25, 2022 •

edited

Loading

zerolab Jan 25, 2022

Stormheg left a comment

	py{310}-dj{3.2,main}-wagtail{2.15,2.16,main}-{sqlite,postgres}
	py{3.10}-dj{3.2,main}-wagtail{2.15,2.16,main}-{sqlite,postgres}

Update supported versions and dependencies #509

Update supported versions and dependencies #509

Conversation

zerolab commented Jan 21, 2022

codecov-commenter commented Jan 21, 2022 • edited Loading

Codecov Report

Stormheg left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Stormheg left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Stormheg Jan 25, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Stormheg left a comment

Choose a reason for hiding this comment

codecov-commenter commented Jan 21, 2022 •

edited

Loading

Stormheg Jan 25, 2022 •

edited

Loading