Merge branch 'develop' into fix/preserve-cbv-name

fsbraun · web-flow · commit c04c7f47b38e · 2023-10-17T11:19:32.000+02:00
diff --git a/cms/tests/test_permmod.py b/cms/tests/test_permmod.py
@@ -956,7 +956,7 @@ def test_emulate_admin_index(self):
         ]
         for user in USERS:
             user.set_password('staff')
-            # re-use the same methods the UserPage form does.
+            # reuse the same methods the UserPage form does.
             # Note that it internally calls .save(), as we've not done so.
             save_permissions({
                 'can_add_page': True,
diff --git a/test_requirements/requirements_base.txt b/test_requirements/requirements_base.txt
@@ -1,7 +1,7 @@
 coverage>=4
 python-coveralls>2.5.0
 unittest-xml-reporting==1.11.0
-Pillow==9.3.0
+Pillow==10.0.1
 django-treebeard>=4.3
 argparse
 dj-database-url

Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ def test_emulate_admin_index(self):`
`956`	`956`	`]`
`957`	`957`	`for user in USERS:`
`958`	`958`	`user.set_password('staff')`
`959`		`- # re-use the same methods the UserPage form does.`
	`959`	`+ # reuse the same methods the UserPage form does.`
`960`	`960`	`# Note that it internally calls .save(), as we've not done so.`
`961`	`961`	`save_permissions({`
`962`	`962`	`'can_add_page': True,`