10000 chore: Merge back build 4.1.3 into `release/4.1.x` by fsbraun · Pull Request #8023 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

chore: Merge back build 4.1.3 into release/4.1.x #8023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 7, 2024
Merged

chore: Merge back build 4.1.3 into release/4.1.x #8023

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eae0bd6
[4.1.3 release process] Building locales
Sep 22, 2024
3951c27
[4.1.3 release process] Bumped version to 4.1.3
Sep 22, 2024
e57003f
[4.1.3 release process] compilemessages
Sep 22, 2024
815e0ad
[4.1.3 release process] compiling new static files
Sep 22, 2024
42d7942
[4.1.3 release process] updating latest docs
Sep 22, 2024
e24a9c8
Update CHANGELOG.rst
fsbraun Sep 22, 2024
c47daff
Update 4.1.3.rst
fsbraun Sep 22, 2024
fa1c03e
Update 4.1.3.rst
fsbraun Sep 22, 2024
5797caa
chore: Django 5.2-compatible test fixtures (#8008)
fsbraun Sep 23, 2024
2ae666c
Update CHANGELOG.rst typo
fsbraun Sep 23, 2024
42f0d0d
chore: Backport https://github.com/django-cms/django-cms/pull/8021
Oct 5, 2024
02e9e48
fix: Update databases.txt to include psycopg2 for Django < 4.2
fsbraun Oct 5, 2024
cbdbc88
fix: Mark language and user middleware synchronous for ASGI (Backport…
Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: Django 5.2-compatible test fixtures (#8008) 
* chore: Re-hook fixture loading to stay compatible with django 5.2

* Remove Postgres pin to v12 for testing

* Exclude Py39 from dj51

* Pin postgres to version 15

* Switch from psycopg2 to recommended psycopg>=3.1.8

---------

Co-authored-by: Github Release Action <info@django-cms.org>
  • Loading branch information
@fsbraun
fsbraun and Github Release Action committed Sep 23, 2024
commit 5797caa60582302487d53d922ad9e69e2817db7a
24 changes: 19 additions & 5 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,25 @@ jobs:
django-4.0.txt,
django-4.1.txt,
django-4.2.txt,
django-5.0.txt
django-5.0.txt,
django-5.1.txt,
]
os: [
ubuntu-20.04,
]
exclude:
- requirements-file: django-5.0.txt
python-version: 3.8
- requirements-file: django-5.1.txt
python-version: 3.8
- requirements-file: django-5.0.txt
python-version: 3.9
- requirements-file: django-5.1.txt
python-version: 3.9

services:
postgres:
image: postgres:12
image: postgres:15
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand Down Expand Up @@ -78,16 +83,21 @@ jobs:
django-4.0.txt,
django-4.1.txt,
django-4.2.txt,
django-5.0.txt
django-5.0.txt,
django-5.1.txt,
]
os: [
ubuntu-20.04,
]
exclude:
- requirements-file: django-5.0.txt
python-version: 3.8
- requirements-file: django-5.1.txt
python-version: 3.8
- requirements-file: django-5.0.txt
python-version: 3.9
- requirements-file: django-5.1.txt
python-version: 3.9

services:
mysql:
Expand Down Expand Up @@ -136,14 +146,18 @@ jobs:
django-4.0.txt,
django-4.1.txt,
django-4.2.txt,
django-5.0.txt
django-5.0.txt,
django-5.0.txt,
django-5.1.txt,
]
os: [
ubuntu-20.04,
]
exclude:
- requirements-file: django-5.0.txt
python-version: 3.9
- requirements-file: django-5.1.txt
python-version: 3.9

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -212,7 +226,7 @@ jobs:

services:
postgres:
image: postgres:13
image: postgres:15
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand Down
4 changes: 2 additions & 2 deletions cms/test_utils/testcases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ def showWarning(message, category, filename, lineno, file=None, line=None):
class BaseCMSTestCase:
counter = 1

def _fixture_setup(self):
super()._fixture_setup()
def _pre_setup(self):
super()._pre_setup()
self.create_fixtures()
activate("en")

Expand Down
71 changes: 47 additions & 24 deletions cms/tests/test_page_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,6 +1605,29 @@ def test_add_page_no_redirect(self):
self.assertEqual(Page.objects.all().count(), 2)

class PermissionsTestCase(PageTestBase):
def assertContainsPermissions(self, response):
try:
# Django >= 5.1
self.assertContains(
response,
'<h2 id="pagepermission_set-2-heading" class="inline-heading">Page permissions</h2>',
html=True,
)
except AssertionError:
# Django < 5.1
self.assertContains(response, '<h2>Page permissions</h2>', html=True)

def assertNotContainsPermissions(self, response):
try:
# Django >= 5.1
self.assertNotContains(
response,
'<h2 id="pagepermission_set-1-heading" class="inline-heading">Page permissions</h2>',
html=True,
)
except AssertionError:
# Django < 5.1
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)

def _add_translation_to_page(self, page):
translation = create_page_content(
Expand Down Expand Up @@ -2180,7 +2203,7 @@ def test_user_can_add_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -2217,7 +2240,7 @@ def test_user_cant_add_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertFalse(self._page_permission_exists(user=staff_user_2))

Expand Down Expand Up @@ -2259,7 +2282,7 @@ def test_user_can_edit_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -2309,7 +2332,7 @@ def test_user_cant_edit_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertFalse(
self._page_permission_exists(
Expand Down Expand Up @@ -2351,7 +2374,7 @@ def test_user_can_delete_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -2391,7 +2414,7 @@ def test_user_cant_delete_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertTrue(self._page_permission_exists(user=staff_user_2))

Expand Down Expand Up @@ -2425,7 +2448,7 @@ def test_user_can_add_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -2462,7 +2485,7 @@ def test_user_cant_add_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertFalse(self._page_permission_exists(user=staff_user_2, can_view=True))

Expand Down Expand Up @@ -2503,7 +2526,7 @@ def test_user_can_edit_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -2551,7 +2574,7 @@ def test_user_cant_edit_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertFalse(
self._page_permission_exists(
Expand Down Expand Up @@ -2595,7 +2618,7 @@ def test_user_can_delete_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -2637,7 +2660,7 @@ def test_user_cant_delete_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertTrue(self._page_permission_exists(user=staff_user_2, can_view=True))

Expand Down Expand Up @@ -3625,7 +3648,7 @@ def test_user_can_add_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -3662,7 +3685,7 @@ def test_user_cant_add_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertFalse(self._page_permission_exists(user=staff_user_2))

Expand Down Expand Up @@ -3704,7 +3727,7 @@ def test_user_can_edit_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -3754,7 +3777,7 @@ def test_user_cant_edit_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertFalse(
self._page_permission_exists(
Expand Down Expand Up @@ -3796,7 +3819,7 @@ def test_user_can_delete_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -3836,7 +3859,7 @@ def test_user_cant_delete_page_permissions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertTrue(self._page_permission_exists(user=staff_user_2))

Expand Down Expand Up @@ -3870,7 +3893,7 @@ def test_user_can_add_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -3907,7 +3930,7 @@ def test_user_cant_add_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertFalse(self._page_permission_exists(user=staff_user_2, can_view=True))

Expand Down Expand Up @@ -3948,7 +3971,7 @@ def test_user_can_edit_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -3996,7 +4019,7 @@ def test_user_cant_edit_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertFalse(
self._page_permission_exists(
Expand Down Expand Up @@ -4040,7 +4063,7 @@ def test_user_can_delete_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertContains(response, '<h2>Page permissions</h2>', html=True)
self.assertContainsPermissions(response)
response = self.client.post(endpoint, data)
self.assertEqual(response.status_code, 302)
self.assertRedirects(response, endpoint)
Expand Down Expand Up @@ -4082,7 +4105,7 @@ def test_user_cant_delete_page_view_restrictions(self):

with self.login_user_context(staff_user):
response = self.client.get(endpoint)
self.assertNotContains(response, '<h2>Page permissions</h2>', html=True)
self.assertNotContainsPermissions(response)
self.client.post(endpoint, data)
self.assertTrue(self._page_permission_exists(user=staff_user_2, can_view=True))

Expand Down
2 changes: 1 addition & 1 deletion test_requirements/databases.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
psycopg2==2.9.5
psycopg>=3.1.8
mysqlclient==2.0.3
2 changes: 1 addition & 1 deletion test_requirements/django-5.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-r requirements_base.txt
Django>=5.0a1,<5.1
Django>=5.0,<5.1
2 changes: 2 additions & 0 deletions test_requirements/django-5.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-r requirements_base.txt
Django>=5.1,<5.2
Loading
0