From ab22c8dd9c13e1e1e30e063b78044e96dca7f99f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 03:41:32 +0100 Subject: [PATCH 01/17] ci: pre-commit autoupdate (#190) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v3.8.0 → v3.10.1](https://github.com/asottile/pyupgrade/compare/v3.8.0...v3.10.1) - [github.com/PyCQA/flake8: 6.0.0 → 6.1.0](https://github.com/PyCQA/flake8/compare/6.0.0...6.1.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c4490a88..8a453b44 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ ci: repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.8.0 + rev: v3.10.1 hooks: - id: pyupgrade args: ["--py38-plus"] @@ -21,7 +21,7 @@ repos: args: [--target-version, "3.2"] - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 + rev: 6.1.0 hooks: - id: flake8 additional_dependencies: From d67e13cf3b037995b2636a51af084e7ea851fa89 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Thu, 10 Aug 2023 10:33:42 +0100 Subject: [PATCH 02/17] Allow using variable as identifier in static_alias template tag (#191) --- CHANGELOG.rst | 4 ++++ .../templatetags/djangocms_alias_tags.py | 2 +- tests/test_templatetags.py | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e3a40b75..0fd7009f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,10 @@ Changelog ========= +Unreleased +========== +* fix: Allow using a variable as the identifier in static_alias template tag + 2.0.0rc1 ======== * Django 4.0, 4.1, and 4.2 support added diff --git a/djangocms_alias/templatetags/djangocms_alias_tags.py b/djangocms_alias/templatetags/djangocms_alias_tags.py index 871f8ea9..bc7f7a63 100644 --- a/djangocms_alias/templatetags/djangocms_alias_tags.py +++ b/djangocms_alias/templatetags/djangocms_alias_tags.py @@ -69,7 +69,7 @@ class StaticAlias(Tag): """ name = 'static_alias' options = PlaceholderOptions( - Argument('static_code', resolve=False), + Argument('static_code', resolve=True), MultiValueArgument('extra_bits', required=False, resolve=False), blocks=[ ('endstatic_alias', 'nodelist'), diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 5989ef66..0d57d551 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -340,3 +340,22 @@ def page_edit_url(lang): self.assertIsNotNone(alias.get_content("en", show_draft_content=True)) self.assertIsNotNone(alias.get_content("de", show_draft_content=True)) + + def test_alias_rendered_when_identifier_is_variable(self): + alias_template = """{% load djangocms_alias_tags %}{% static_alias foo_variable %}""" # noqa: E501 + + alias = self._create_alias(static_code="some_unique_id") + add_plugin( + alias.get_placeholder(self.language), + 'TextPlugin', + language=self.language, + body='Content Alias 1234', + ) + + output = self.render_template_obj( + alias_template, + {'foo_variable': "some_unique_id"}, + self.get_request('/'), + ) + + self.assertEqual(output, "Content Alias 1234") From 6951b803de8bf2a97cb85da495d500a197a61447 Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Thu, 31 Aug 2023 15:54:25 +0100 Subject: [PATCH 03/17] fix: New migrations in cms cause migration failure (#192) * fix: New migrations in cms cause migration failure when depending on latest * chore: Add to changelog --- CHANGELOG.rst | 1 + djangocms_alias/migrations/0003_auto_20230725_1547.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0fd7009f..ccb6721d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,7 @@ Changelog Unreleased ========== +* fix: Migration dependency on latest django-cms migration. * fix: Allow using a variable as the identifier in static_alias template tag 2.0.0rc1 diff --git a/djangocms_alias/migrations/0003_auto_20230725_1547.py b/djangocms_alias/migrations/0003_auto_20230725_1547.py index 3b575cf1..04473f86 100644 --- a/djangocms_alias/migrations/0003_auto_20230725_1547.py +++ b/djangocms_alias/migrations/0003_auto_20230725_1547.py @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('cms', '__latest__'), + ('cms', '__first__'), ('djangocms_alias', '0002_auto_20200723_1424'), ] From 10fd8d400450e2344c98b2ab4add55b31cf70f7c Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Fri, 1 Sep 2023 02:30:09 +0100 Subject: [PATCH 04/17] chore: Bump to 2.0.0rc2 (#193) --- CHANGELOG.rst | 4 ++-- djangocms_alias/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ccb6721d..38408c62 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog ========= -Unreleased -========== +2.0.0rc2 +======== * fix: Migration dependency on latest django-cms migration. * fix: Allow using a variable as the identifier in static_alias template tag diff --git a/djangocms_alias/__init__.py b/djangocms_alias/__init__.py index 6ba7000c..cdc07416 100644 --- a/djangocms_alias/__init__.py +++ b/djangocms_alias/__init__.py @@ -1 +1 @@ -__version__ = '2.0.0rc1' +__version__ = '2.0.0rc2' From ad2f0ab5d4ec3781bd0c3bb2233a725e28c2a3f2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 01:41:21 +0100 Subject: [PATCH 05/17] ci: pre-commit autoupdate (#194) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/adamchainz/django-upgrade: 1.14.0 → 1.14.1](https://github.com/adamchainz/django-upgrade/compare/1.14.0...1.14.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a453b44..7c66e337 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: args: ["--py38-plus"] - repo: https://github.com/adamchainz/django-upgrade - rev: '1.14.0' + rev: '1.14.1' hooks: - id: django-upgrade args: [--target-version, "3.2"] From 871a5f12c843762094def175063e10d450c0b757 Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Thu, 21 Sep 2023 17:54:09 +0100 Subject: [PATCH 06/17] Create SECURITY.md --- SECURITY.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..51ebe3e6 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +# Security Policy + +## Reporting a Vulnerability + +As ever, we remind our users and contributors that all security reports, patches and concerns be addressed only to our security team by email, at security@django-cms.org. From 961754c7b2241ba0d4767e2a3d19cb455e51224f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=C5=A1ek=20Chalupn=C3=AD=C4=8Dek?= Date: Mon, 25 Sep 2023 01:36:09 +0200 Subject: [PATCH 07/17] avoid generating migrations based on settings.LANGUAGE (#186) * avoid generating migrations based on settings * fixing flake8 * added migration reflecting model changes * preparation for merge with other incoming migrations --- .../0004_alter_aliascontent_language.py | 19 +++++++++++++++++++ djangocms_alias/models.py | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 djangocms_alias/migrations/0004_alter_aliascontent_language.py diff --git a/djangocms_alias/migrations/0004_alter_aliascontent_language.py b/djangocms_alias/migrations/0004_alter_aliascontent_language.py new file mode 100644 index 00000000..122efd72 --- /dev/null +++ b/djangocms_alias/migrations/0004_alter_aliascontent_language.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.20 on 2023-07-26 13:43 + +from django.db import migrations, models +import django.utils.translation + + +class Migration(migrations.Migration): + + dependencies = [ + ('djangocms_alias', '0003_auto_20230725_1547'), + ] + + operations = [ + migrations.AlterField( + model_name='aliascontent', + name='language', + field=models.CharField(default=django.utils.translation.get_language, max_length=10), + ), + ] diff --git a/djangocms_alias/models.py b/djangocms_alias/models.py index 861f0ec0..1bd9793c 100644 --- a/djangocms_alias/models.py +++ b/djangocms_alias/models.py @@ -268,7 +268,6 @@ class AliasContent(models.Model): placeholder_slotname = 'content' language = models.CharField( max_length=10, - choices=settings.LANGUAGES, default=get_language, ) @@ -278,6 +277,10 @@ class Meta: verbose_name = _('alias content') verbose_name_plural = _('alias contents') + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self._meta.get_field('language').choices = settings.LANGUAGES + def __str__(self): return f'{self.name} ({self.language})' From b116098abbcfcc9fc6dd0992f6664191dd8ac6ab Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 02:33:26 +0200 Subject: [PATCH 08/17] ci: pre-commit autoupdate (#197) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v3.10.1 → v3.14.0](https://github.com/asottile/pyupgrade/compare/v3.10.1...v3.14.0) - [github.com/adamchainz/django-upgrade: 1.14.1 → 1.15.0](https://github.com/adamchainz/django-upgrade/compare/1.14.1...1.15.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7c66e337..4af5cb25 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,13 +9,13 @@ ci: repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.10.1 + rev: v3.14.0 hooks: - id: pyupgrade args: ["--py38-plus"] - repo: https://github.com/adamchainz/django-upgrade - rev: '1.14.1' + rev: '1.15.0' hooks: - id: django-upgrade args: [--target-version, "3.2"] From 7ab8cd66b13b52b1731feaabc5b1887c102e42d2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 12:56:59 +0000 Subject: [PATCH 09/17] ci: pre-commit autoupdate (#198) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/pyupgrade: v3.14.0 → v3.15.0](https://github.com/asottile/pyupgrade/compare/v3.14.0...v3.15.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4af5cb25..d9e46ab0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ ci: repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.14.0 + rev: v3.15.0 hooks: - id: pyupgrade args: ["--py38-plus"] From 0dd5ed6210e02730215f927873119d4f1b8fd37c Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Sun, 12 Nov 2023 14:18:10 +0000 Subject: [PATCH 10/17] ci: Test against django main (#195) * ci: Test against django main * fix: requirements path Co-authored-by: Fabian Braun --------- Co-authored-by: Fabian Braun --- .github/workflows/test.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1a7bb91b..1bde1392 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -75,3 +75,34 @@ jobs: with: name: html-report path: htmlcov + + unit-tests-django-main: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + python-version: ['3.11'] + requirements-file: [ + 'py311-djmain-cms41-default.txt', + 'py311-djmain-cms41-versioning.txt', + ] + os: [ + ubuntu-20.04, + ] + + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r tests/requirements/${{ matrix.requirements-file }} + python setup.py install + + - name: Run coverage + run: coverage run setup.py test + continue-on-error: true From 3892d4101abd343298677a8d5b61ff5bc7658d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=C5=A1ek=20Chalupn=C3=AD=C4=8Dek?= Date: Thu, 16 Nov 2023 15:06:29 +0100 Subject: [PATCH 11/17] Update djangocms_alias_tags.py (#200) adding use_cache to static_alias to allow caching --- djangocms_alias/templatetags/djangocms_alias_tags.py | 1 + 1 file changed, 1 insertion(+) diff --git a/djangocms_alias/templatetags/djangocms_alias_tags.py b/djangocms_alias/templatetags/djangocms_alias_tags.py index bc7f7a63..0da46dd1 100644 --- a/djangocms_alias/templatetags/djangocms_alias_tags.py +++ b/djangocms_alias/templatetags/djangocms_alias_tags.py @@ -176,6 +176,7 @@ def render_tag(self, context, static_code, extra_bits, nodelist=None): placeholder=placeholder, context=context, nodelist=nodelist, + use_cache=True, ) return content return '' From 29721efe0f199c9e572952f7cbec43b1072c417e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Nov 2023 00:50:04 +0000 Subject: [PATCH 12/17] build(deps): bump actions/checkout from 3 to 4 (#196) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fabian Braun --- .github/workflows/codeql.yml | 2 +- .github/workflows/lint.yml | 4 ++-- .github/workflows/publish-to-live-pypi.yml | 2 +- .github/workflows/publish-to-test-pypi.yml | 2 +- .github/workflows/test.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 21f969d2..3917e1a2 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ece5970a..4a68e3e0 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml index daac48bd..a77086ce 100644 --- a/.github/workflows/publish-to-live-pypi.yml +++ b/.github/workflows/publish-to-live-pypi.yml @@ -15,7 +15,7 @@ jobs: permissions: id-token: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index 820bfe9e..bd364c24 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -15,7 +15,7 @@ jobs: permissions: id-token: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1bde1392..2f65e1ca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: - '3.11' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-20.04 needs: unit-tests steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: From 1d23542c06274a8b8f6867d3bfe7500575930425 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 5 Dec 2023 13:29:19 +0100 Subject: [PATCH 13/17] fix: `static_alias` unnecessarily creates new content objects when used with versioning (#202) * Fix alias content creation regression * Run djmain tests against develop-4 --- djangocms_alias/templatetags/djangocms_alias_tags.py | 4 ++-- tests/requirements/py311-djmain-cms41-default.txt | 4 ++-- tests/requirements/py311-djmain-cms41-versioning.txt | 4 ++-- tests/test_templatetags.py | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/djangocms_alias/templatetags/djangocms_alias_tags.py b/djangocms_alias/templatetags/djangocms_alias_tags.py index 0da46dd1..6fa39f9d 100644 --- a/djangocms_alias/templatetags/djangocms_alias_tags.py +++ b/djangocms_alias/templatetags/djangocms_alias_tags.py @@ -109,7 +109,7 @@ def _get_alias(self, request, static_code, extra_bits): if is_versioning_enabled() and not request.user.is_authenticated: return None - # Parlers get_or_create doesn't work well with translations, so we must perform our own get or create + # Parler's get_or_create doesn't work well with translations, so we must perform our own get or create default_category = Category.objects.filter(translations__name=DEFAULT_STATIC_ALIAS_CATEGORY_NAME).first() if not default_category: default_category = Category.objects.create(name=DEFAULT_STATIC_ALIAS_CATEGORY_NAME) @@ -124,7 +124,7 @@ def _get_alias(self, request, static_code, extra_bits): alias = Alias.objects.create(category=default_category, **alias_creation_kwargs) - if not AliasContent._default_manager.filter(alias=alias, language=language).exists(): + if not AliasContent._base_manager.filter(alias=alias, language=language).exists(): # Create a first content object if none exists in the given language. # If versioning is enabled we can only create the records with a logged-in user / staff member if is_versioning_enabled() and not request.user.is_authenticated: diff --git a/tests/requirements/py311-djmain-cms41-default.txt b/tests/requirements/py311-djmain-cms41-default.txt index 63904f35..7cfca4ae 100644 --- a/tests/requirements/py311-djmain-cms41-default.txt +++ b/tests/requirements/py311-djmain-cms41-default.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 @@ -31,7 +31,7 @@ django-classy-tags==4.0.0 # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 +git+https://github.com/django-cms/django-cms@develop-4#egg=django-cms # via # -r requirements.in # djangocms-versioning diff --git a/tests/requirements/py311-djmain-cms41-versioning.txt b/tests/requirements/py311-djmain-cms41-versioning.txt index 63904f35..7cfca4ae 100644 --- a/tests/requirements/py311-djmain-cms41-versioning.txt +++ b/tests/requirements/py311-djmain-cms41-versioning.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 @@ -31,7 +31,7 @@ django-classy-tags==4.0.0 # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 +git+https://github.com/django-cms/django-cms@develop-4#egg=django-cms # via # -r requirements.in # djangocms-versioning diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 0d57d551..7c9df5f1 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -334,12 +334,15 @@ def page_edit_url(lang): with self.login_user_context(self.superuser): self.client.get(page_edit_url("en")) # supposed to create the alias and alias content for en + self.client.get(page_edit_url("en")) # supposed to create no additional object self.client.get(page_edit_url("de")) # supposed to create the alias content for de alias = AliasModel.objects.get(static_code="template_example_global_alias_code") self.assertIsNotNone(alias.get_content("en", show_draft_content=True)) self.assertIsNotNone(alias.get_content("de", show_draft_content=True)) + # Ensure that exactly two content objects have been created + self.assertEqual(alias.contents(manager="admin_manager").count(), 2) def test_alias_rendered_when_identifier_is_variable(self): alias_template = """{% load djangocms_alias_tags %}{% static_alias foo_variable %}""" # noqa: E501 From 0e090e5f4a786ec4d5f3b9fa74e3f8f37c29682b Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 12 Dec 2023 16:40:12 +0100 Subject: [PATCH 14/17] feat: Django 5.0 support, fixed test suite (#203) * Update test suite * Update requirements for py3.12 * Fix flake8 issues and tox.ini * Fix coverage command in tox.ini * ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci * Fix CategoryFilter test for Django 5.0 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 1 + djangocms_alias/cms_plugins.py | 22 ++--- setup.py | 5 +- tests/base.py | 4 - tests/requirements/compile.py | 14 +++- .../requirements/py310-dj32-cms41-default.txt | 49 ++++++----- .../py310-dj32-cms41-versioning.txt | 49 ++++++----- .../requirements/py310-dj40-cms41-default.txt | 45 +++++----- .../py310-dj40-cms41-versioning.txt | 45 +++++----- .../requirements/py310-dj41-cms41-default.txt | 47 ++++++----- .../py310-dj41-cms41-versioning.txt | 47 ++++++----- .../requirements/py310-dj42-cms41-default.txt | 47 ++++++----- .../py310-dj42-cms41-versioning.txt | 47 ++++++----- .../requirements/py310-dj50-cms41-default.txt | 84 +++++++++++++++++++ .../py310-dj50-cms41-versioning.txt | 84 +++++++++++++++++++ .../requirements/py311-dj40-cms41-default.txt | 37 ++++---- .../py311-dj40-cms41-versioning.txt | 41 ++++----- .../requirements/py311-dj41-cms41-default.txt | 43 +++++----- .../py311-dj41-cms41-versioning.txt | 43 +++++----- .../requirements/py311-dj42-cms41-default.txt | 43 +++++----- .../py311-dj42-cms41-versioning.txt | 43 +++++----- .../requirements/py311-dj50-cms41-default.txt | 82 ++++++++++++++++++ .../py311-dj50-cms41-versioning.txt | 82 ++++++++++++++++++ .../py311-djmain-cms41-default.txt | 35 ++++---- .../py311-djmain-cms41-versioning.txt | 35 ++++---- .../py311-djmain-cms4dev-default.txt | 82 ++++++++++++++++++ .../py311-djmain-cms4dev-versioning.txt | 82 ++++++++++++++++++ .../requirements/py312-dj42-cms41-default.txt | 84 +++++++++++++++++++ .../py312-dj42-cms41-versioning.txt | 84 +++++++++++++++++++ .../requirements/py312-dj50-cms41-default.txt | 84 +++++++++++++++++++ .../py312-dj50-cms41-versioning.txt | 84 +++++++++++++++++++ .../requirements/py39-dj32-cms41-default.txt | 49 ++++++----- .../py39-dj32-cms41-versioning.txt | 49 ++++++----- .../requirements/py39-dj40-cms41-default.txt | 45 +++++----- .../py39-dj40-cms41-versioning.txt | 45 +++++----- .../requirements/py39-dj41-cms41-default.txt | 47 ++++++----- .../py39-dj41-cms41-versioning.txt | 47 ++++++----- .../requirements/py39-dj42-cms41-default.txt | 47 ++++++----- .../py39-dj42-cms41-versioning.txt | 47 ++++++----- tests/requirements/requirements.in | 1 - tests/test_admin_filters.py | 4 +- tests/test_templatetags.py | 19 +++-- tests/test_toolbar.py | 2 +- tox.ini | 9 +- 44 files changed, 1469 insertions(+), 516 deletions(-) create mode 100644 tests/requirements/py310-dj50-cms41-default.txt create mode 100644 tests/requirements/py310-dj50-cms41-versioning.txt create mode 100644 tests/requirements/py311-dj50-cms41-default.txt create mode 100644 tests/requirements/py311-dj50-cms41-versioning.txt create mode 100644 tests/requirements/py311-djmain-cms4dev-default.txt create mode 100644 tests/requirements/py311-djmain-cms4dev-versioning.txt create mode 100644 tests/requirements/py312-dj42-cms41-default.txt create mode 100644 tests/requirements/py312-dj42-cms41-versioning.txt create mode 100644 tests/requirements/py312-dj50-cms41-default.txt create mode 100644 tests/requirements/py312-dj50-cms41-versioning.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f65e1ca..ef7382c0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,6 +19,7 @@ jobs: - 3.9 - '3.10' - '3.11' + - '3.12' steps: - uses: actions/checkout@v4 diff --git a/djangocms_alias/cms_plugins.py b/djangocms_alias/cms_plugins.py index 039547ee..05284e72 100644 --- a/djangocms_alias/cms_plugins.py +++ b/djangocms_alias/cms_plugins.py @@ -140,24 +140,26 @@ def can_detach(cls, user, target_placeholder, plugins): @classmethod def detach_alias_plugin(cls, plugin, language): - source_placeholder = plugin.alias.get_placeholder(language) + source_placeholder = plugin.alias.get_placeholder(language, show_draft_content=True) # We're in edit mode target_placeholder = plugin.placeholder - source_plugins = plugin.alias.get_plugins(language) # Deleting uses a copy of a plugin to preserve pk on existing # ``plugin`` object. This is done due to # plugin.get_plugin_toolbar_info requiring a PK in a passed # instance. - source_placeholder.delete_plugin(copy(plugin)) + target_placeholder.delete_plugin(copy(plugin)) target_placeholder._shift_plugin_positions( language, plugin.position, offset=target_placeholder.get_last_plugin_position(language), ) - copied_plugins = copy_plugins_to_placeholder( - source_plugins, - placeholder=target_placeholder, - language=language, - start_positions={language: plugin.position}, - ) - return copied_plugins + if source_placeholder: + source_plugins = source_placeholder.get_plugins_list() + copied_plugins = copy_plugins_to_placeholder( + source_plugins, + placeholder=target_placeholder, + language=language, + start_positions={language: plugin.position}, + ) + return copied_plugins + return [] diff --git a/setup.py b/setup.py index c469c3c8..71f33f77 100644 --- a/setup.py +++ b/setup.py @@ -13,15 +13,16 @@ 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development', 'Topic :: Software Development :: Libraries :: Application Frameworks', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Framework :: Django', 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.0', 'Framework :: Django :: 4.1', + 'Framework :: Django :: 4.2', + 'Framework :: Django :: 5.0', 'Framework :: Django CMS :: 4.1', ] diff --git a/tests/base.py b/tests/base.py index 97fd6506..498976bf 100644 --- a/tests/base.py +++ b/tests/base.py @@ -2,7 +2,6 @@ from django.contrib.auth.models import Permission from django.http import QueryDict from django.test.client import RequestFactory -from django.urls import resolve from cms.api import add_plugin, create_page, create_page_content from cms.middleware.toolbar import ToolbarMiddleware @@ -184,7 +183,6 @@ def _process_request_by_toolbar_middleware(self, request, obj=None): if obj: request.toolbar.set_object(obj) request.toolbar.populate() - request.resolver_match = resolve(request.path) request.toolbar.post_template_populate() return request @@ -193,8 +191,6 @@ def _add_default_permissions(self, user): user.user_permissions.add(Permission.objects.get(codename='add_text')) user.user_permissions.add(Permission.objects.get(codename='delete_text')) user.user_permissions.add(Permission.objects.get(codename='change_text')) - # Page permissions - user.user_permissions.add(Permission.objects.get(codename='publish_page')) user.user_permissions.add(Permission.objects.get(codename='add_page')) user.user_permissions.add(Permission.objects.get(codename='change_page')) user.user_permissions.add(Permission.objects.get(codename='delete_page')) diff --git a/tests/requirements/compile.py b/tests/requirements/compile.py index bea4cbec..d19e98c1 100755 --- a/tests/requirements/compile.py +++ b/tests/requirements/compile.py @@ -19,7 +19,11 @@ "py39-dj42-cms41": [], "py310-dj42-cms41": [], "py311-dj42-cms41": [], - "py311-djmain-cms41": [], + "py312-dj42-cms41": [], + "py310-dj50-cms41": [], + "py311-dj50-cms41": [], + "py312-dj50-cms41": [], + "py311-djmain-cms4dev": [], } django_dict = { @@ -28,11 +32,13 @@ "dj40": "Django>=4.0,<4.1", "dj41": "Django>=4.1,<4.2", "dj42": "Django>=4.2,<5", + "dj50": "Django>=5.0,<5.1", } cms_dict = { "cms40": "https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms", "cms41": "django-cms>=4.1.0rc2,<4.2", + "cms4dev": "https://github.com/django-cms/django-cms/tarball/release/4.1.x#egg=django-cms" } @@ -73,6 +79,12 @@ def run(*args, **kwargs): "--allow-unsafe", ] + sys.argv[1:] + print("Upgrading pip-tools") + for py_ver in {key.split("-")[0] for key in COMPILE_SETTINGS.keys()}: + args = [f"python{py_ver[2]}.{py_ver[3:]}", "-m", "pip", "install", "--upgrade", "pip-tools"] + subprocess.run(args, capture_output=True) + + print("Creating requirement files") for key, value in COMPILE_SETTINGS.items(): run( get_args(key + "-default.txt", value, common_args), diff --git a/tests/requirements/py310-dj32-cms41-default.txt b/tests/requirements/py310-dj32-cms41-default.txt index e6d06b70..4a19225e 100644 --- a/tests/requirements/py310-dj32-cms41-default.txt +++ b/tests/requirements/py310-dj32-cms41-default.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==3.2.19 +django==3.2.23 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==3.2.19 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,39 +42,45 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 -pytz==2023.3 +pytz==2023.3.post1 # via django six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py310-dj32-cms41-versioning.txt b/tests/requirements/py310-dj32-cms41-versioning.txt index e6d06b70..4a19225e 100644 --- a/tests/requirements/py310-dj32-cms41-versioning.txt +++ b/tests/requirements/py310-dj32-cms41-versioning.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==3.2.19 +django==3.2.23 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==3.2.19 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,39 +42,45 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 -pytz==2023.3 +pytz==2023.3.post1 # via django six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py310-dj40-cms41-default.txt b/tests/requirements/py310-dj40-cms41-default.txt index e73fb751..9052a5e8 100644 --- a/tests/requirements/py310-dj40-cms41-default.txt +++ b/tests/requirements/py310-dj40-cms41-default.txt @@ -4,15 +4,15 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper django==4.0.10 # via @@ -23,19 +23,18 @@ django==4.0.10 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py310-dj40-cms41-versioning.txt b/tests/requirements/py310-dj40-cms41-versioning.txt index e73fb751..9052a5e8 100644 --- a/tests/requirements/py310-dj40-cms41-versioning.txt +++ b/tests/requirements/py310-dj40-cms41-versioning.txt @@ -4,15 +4,15 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper django==4.0.10 # via @@ -23,19 +23,18 @@ django==4.0.10 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py310-dj41-cms41-default.txt b/tests/requirements/py310-dj41-cms41-default.txt index 54753f61..6039ea4a 100644 --- a/tests/requirements/py310-dj41-cms41-default.txt +++ b/tests/requirements/py310-dj41-cms41-default.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.1.9 +django==4.1.13 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.1.9 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py310-dj41-cms41-versioning.txt b/tests/requirements/py310-dj41-cms41-versioning.txt index 54753f61..6039ea4a 100644 --- a/tests/requirements/py310-dj41-cms41-versioning.txt +++ b/tests/requirements/py310-dj41-cms41-versioning.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.1.9 +django==4.1.13 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.1.9 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py310-dj42-cms41-default.txt b/tests/requirements/py310-dj42-cms41-default.txt index 888487d3..dc6387e3 100644 --- a/tests/requirements/py310-dj42-cms41-default.txt +++ b/tests/requirements/py310-dj42-cms41-default.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.2.1 +django==4.2.8 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.2.1 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py310-dj42-cms41-versioning.txt b/tests/requirements/py310-dj42-cms41-versioning.txt index 888487d3..dc6387e3 100644 --- a/tests/requirements/py310-dj42-cms41-versioning.txt +++ b/tests/requirements/py310-dj42-cms41-versioning.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.2.1 +django==4.2.8 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.2.1 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py310-dj50-cms41-default.txt b/tests/requirements/py310-dj50-cms41-default.txt new file mode 100644 index 00000000..7985adfd --- /dev/null +++ b/tests/requirements/py310-dj50-cms41-default.txt @@ -0,0 +1,84 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django==5.0 + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py310-dj50-cms41-versioning.txt b/tests/requirements/py310-dj50-cms41-versioning.txt new file mode 100644 index 00000000..7985adfd --- /dev/null +++ b/tests/requirements/py310-dj50-cms41-versioning.txt @@ -0,0 +1,84 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django==5.0 + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-dj40-cms41-default.txt b/tests/requirements/py311-dj40-cms41-default.txt index faee0c30..776153bb 100644 --- a/tests/requirements/py311-dj40-cms41-default.txt +++ b/tests/requirements/py311-dj40-cms41-default.txt @@ -4,15 +4,15 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.5 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper django==4.0.10 # via @@ -23,18 +23,17 @@ django==4.0.10 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.3.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning +django-cms==4.1.0rc5 + # via djangocms-versioning django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 @@ -49,31 +48,35 @@ django-sekizai==4.1.0 # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 +typing-extensions==4.9.0 # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-dj40-cms41-versioning.txt b/tests/requirements/py311-dj40-cms41-versioning.txt index 9f15e4ba..776153bb 100644 --- a/tests/requirements/py311-dj40-cms41-versioning.txt +++ b/tests/requirements/py311-dj40-cms41-versioning.txt @@ -4,15 +4,15 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper django==4.0.10 # via @@ -23,19 +23,18 @@ django==4.0.10 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,41 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 +typing-extensions==4.9.0 # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-dj41-cms41-default.txt b/tests/requirements/py311-dj41-cms41-default.txt index 4e500c7a..1dc5aae8 100644 --- a/tests/requirements/py311-dj41-cms41-default.txt +++ b/tests/requirements/py311-dj41-cms41-default.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.1.9 +django==4.1.13 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.1.9 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,41 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 +typing-extensions==4.9.0 # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-dj41-cms41-versioning.txt b/tests/requirements/py311-dj41-cms41-versioning.txt index 4e500c7a..1dc5aae8 100644 --- a/tests/requirements/py311-dj41-cms41-versioning.txt +++ b/tests/requirements/py311-dj41-cms41-versioning.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.1.9 +django==4.1.13 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.1.9 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,41 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 +typing-extensions==4.9.0 # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-dj42-cms41-default.txt b/tests/requirements/py311-dj42-cms41-default.txt index 93704949..f6c8ca5e 100644 --- a/tests/requirements/py311-dj42-cms41-default.txt +++ b/tests/requirements/py311-dj42-cms41-default.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.2.1 +django==4.2.8 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.2.1 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,41 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 +typing-extensions==4.9.0 # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-dj42-cms41-versioning.txt b/tests/requirements/py311-dj42-cms41-versioning.txt index 93704949..f6c8ca5e 100644 --- a/tests/requirements/py311-dj42-cms41-versioning.txt +++ b/tests/requirements/py311-dj42-cms41-versioning.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.2.1 +django==4.2.8 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.2.1 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,41 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 +typing-extensions==4.9.0 # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-dj50-cms41-default.txt b/tests/requirements/py311-dj50-cms41-default.txt new file mode 100644 index 00000000..aeaf404b --- /dev/null +++ b/tests/requirements/py311-dj50-cms41-default.txt @@ -0,0 +1,82 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django==5.0 + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-dj50-cms41-versioning.txt b/tests/requirements/py311-dj50-cms41-versioning.txt new file mode 100644 index 00000000..aeaf404b --- /dev/null +++ b/tests/requirements/py311-dj50-cms41-versioning.txt @@ -0,0 +1,82 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django==5.0 + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-djmain-cms41-default.txt b/tests/requirements/py311-djmain-cms41-default.txt index 7cfca4ae..d71764e5 100644 --- a/tests/requirements/py311-djmain-cms41-default.txt +++ b/tests/requirements/py311-djmain-cms41-default.txt @@ -10,9 +10,9 @@ beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper django @ https://github.com/django/django/tarball/main # via @@ -23,19 +23,20 @@ django @ https://github.com/django/django/tarball/main # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -git+https://github.com/django-cms/django-cms@develop-4#egg=django-cms +django-cms==4.1.0rc5 # via # -r requirements.in # djangocms-versioning -django-formtools==2.4 +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +44,41 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 +typing-extensions==4.9.0 # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-djmain-cms41-versioning.txt b/tests/requirements/py311-djmain-cms41-versioning.txt index 7cfca4ae..d71764e5 100644 --- a/tests/requirements/py311-djmain-cms41-versioning.txt +++ b/tests/requirements/py311-djmain-cms41-versioning.txt @@ -10,9 +10,9 @@ beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper django @ https://github.com/django/django/tarball/main # via @@ -23,19 +23,20 @@ django @ https://github.com/django/django/tarball/main # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -git+https://github.com/django-cms/django-cms@develop-4#egg=django-cms +django-cms==4.1.0rc5 # via # -r requirements.in # djangocms-versioning -django-formtools==2.4 +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +44,41 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 +typing-extensions==4.9.0 # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-djmain-cms4dev-default.txt b/tests/requirements/py311-djmain-cms4dev-default.txt new file mode 100644 index 00000000..ee5ef8cb --- /dev/null +++ b/tests/requirements/py311-djmain-cms4dev-default.txt @@ -0,0 +1,82 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django @ https://github.com/django/django/tarball/main + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms @ https://github.com/django-cms/django-cms/tarball/release/4.1.x + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py311-djmain-cms4dev-versioning.txt b/tests/requirements/py311-djmain-cms4dev-versioning.txt new file mode 100644 index 00000000..ee5ef8cb --- /dev/null +++ b/tests/requirements/py311-djmain-cms4dev-versioning.txt @@ -0,0 +1,82 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django @ https://github.com/django/django/tarball/main + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms @ https://github.com/django-cms/django-cms/tarball/release/4.1.x + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py312-dj42-cms41-default.txt b/tests/requirements/py312-dj42-cms41-default.txt new file mode 100644 index 00000000..530fd5b8 --- /dev/null +++ b/tests/requirements/py312-dj42-cms41-default.txt @@ -0,0 +1,84 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django==4.2.8 + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via + # django-app-helper + # django-cms diff --git a/tests/requirements/py312-dj42-cms41-versioning.txt b/tests/requirements/py312-dj42-cms41-versioning.txt new file mode 100644 index 00000000..530fd5b8 --- /dev/null +++ b/tests/requirements/py312-dj42-cms41-versioning.txt @@ -0,0 +1,84 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django==4.2.8 + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via + # django-app-helper + # django-cms diff --git a/tests/requirements/py312-dj50-cms41-default.txt b/tests/requirements/py312-dj50-cms41-default.txt new file mode 100644 index 00000000..b415b24d --- /dev/null +++ b/tests/requirements/py312-dj50-cms41-default.txt @@ -0,0 +1,84 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django==5.0 + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via + # django-app-helper + # django-cms diff --git a/tests/requirements/py312-dj50-cms41-versioning.txt b/tests/requirements/py312-dj50-cms41-versioning.txt new file mode 100644 index 00000000..b415b24d --- /dev/null +++ b/tests/requirements/py312-dj50-cms41-versioning.txt @@ -0,0 +1,84 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# requirements/compile.py +# +asgiref==3.7.2 + # via django +beautifulsoup4==4.12.2 + # via bs4 +bs4==0.0.1 + # via -r requirements.in +coverage==7.3.2 + # via -r requirements.in +dj-database-url==2.1.0 + # via django-app-helper +django==5.0 + # via + # dj-database-url + # django-classy-tags + # django-cms + # django-formtools + # django-parler + # django-sekizai + # django-treebeard + # djangocms-admin-style + # djangocms-versioning +django-app-helper==3.3.3 + # via -r requirements.in +django-classy-tags==4.1.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 + # via django-cms +django-fsm==2.8.1 + # via + # -r requirements.in + # djangocms-versioning +django-parler==2.3 + # via -r requirements.in +django-sekizai==4.1.0 + # via + # -r requirements.in + # django-cms +django-treebeard==4.7 + # via django-cms +djangocms-admin-style==3.2.6 + # via django-cms +djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master + # via -r requirements.in +docopt==0.6.2 + # via django-app-helper +flake8==6.1.0 + # via -r requirements.in +isort==5.13.1 + # via -r requirements.in +mccabe==0.7.0 + # via flake8 +packaging==23.2 + # via django-cms +pycodestyle==2.11.1 + # via flake8 +pyflakes==3.1.0 + # via + # -r requirements.in + # flake8 +six==1.16.0 + # via django-app-helper +soupsieve==2.5 + # via beautifulsoup4 +sqlparse==0.4.4 + # via django +typing-extensions==4.9.0 + # via dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via + # django-app-helper + # django-cms diff --git a/tests/requirements/py39-dj32-cms41-default.txt b/tests/requirements/py39-dj32-cms41-default.txt index 96b7d89d..3d730476 100644 --- a/tests/requirements/py39-dj32-cms41-default.txt +++ b/tests/requirements/py39-dj32-cms41-default.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==3.2.19 +django==3.2.23 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==3.2.19 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,39 +42,45 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 -pytz==2023.3 +pytz==2023.3.post1 # via django six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py39-dj32-cms41-versioning.txt b/tests/requirements/py39-dj32-cms41-versioning.txt index 96b7d89d..3d730476 100644 --- a/tests/requirements/py39-dj32-cms41-versioning.txt +++ b/tests/requirements/py39-dj32-cms41-versioning.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==3.2.19 +django==3.2.23 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==3.2.19 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,39 +42,45 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 -pytz==2023.3 +pytz==2023.3.post1 # via django six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py39-dj40-cms41-default.txt b/tests/requirements/py39-dj40-cms41-default.txt index 003d27c9..fb9d56d9 100644 --- a/tests/requirements/py39-dj40-cms41-default.txt +++ b/tests/requirements/py39-dj40-cms41-default.txt @@ -4,15 +4,15 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper django==4.0.10 # via @@ -23,19 +23,18 @@ django==4.0.10 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py39-dj40-cms41-versioning.txt b/tests/requirements/py39-dj40-cms41-versioning.txt index 003d27c9..fb9d56d9 100644 --- a/tests/requirements/py39-dj40-cms41-versioning.txt +++ b/tests/requirements/py39-dj40-cms41-versioning.txt @@ -4,15 +4,15 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper django==4.0.10 # via @@ -23,19 +23,18 @@ django==4.0.10 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py39-dj41-cms41-default.txt b/tests/requirements/py39-dj41-cms41-default.txt index a7c57ea0..f5b5c08e 100644 --- a/tests/requirements/py39-dj41-cms41-default.txt +++ b/tests/requirements/py39-dj41-cms41-default.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.1.9 +django==4.1.13 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.1.9 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py39-dj41-cms41-versioning.txt b/tests/requirements/py39-dj41-cms41-versioning.txt index a7c57ea0..f5b5c08e 100644 --- a/tests/requirements/py39-dj41-cms41-versioning.txt +++ b/tests/requirements/py39-dj41-cms41-versioning.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.1.9 +django==4.1.13 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.1.9 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py39-dj42-cms41-default.txt b/tests/requirements/py39-dj42-cms41-default.txt index 8489f1f0..ad0732ef 100644 --- a/tests/requirements/py39-dj42-cms41-default.txt +++ b/tests/requirements/py39-dj42-cms41-default.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.2.1 +django==4.2.8 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.2.1 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/py39-dj42-cms41-versioning.txt b/tests/requirements/py39-dj42-cms41-versioning.txt index 8489f1f0..ad0732ef 100644 --- a/tests/requirements/py39-dj42-cms41-versioning.txt +++ b/tests/requirements/py39-dj42-cms41-versioning.txt @@ -4,17 +4,17 @@ # # requirements/compile.py # -asgiref==3.6.0 +asgiref==3.7.2 # via django beautifulsoup4==4.12.2 # via bs4 bs4==0.0.1 # via -r requirements.in -coverage==7.2.3 +coverage==7.3.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via django-app-helper -django==4.2.1 +django==4.2.8 # via # dj-database-url # django-classy-tags @@ -23,19 +23,18 @@ django==4.2.1 # django-parler # django-sekizai # django-treebeard + # djangocms-admin-style # djangocms-versioning -django-app-helper==3.2.0 +django-app-helper==3.3.3 # via -r requirements.in -django-classy-tags==4.0.0 +django-classy-tags==4.1.0 # via # -r requirements.in # django-cms # django-sekizai -django-cms==4.1.0rc3 - # via - # -r requirements.in - # djangocms-versioning -django-formtools==2.4 +django-cms==4.1.0rc5 + # via djangocms-versioning +django-formtools==2.4.1 # via django-cms django-fsm==2.8.1 # via @@ -43,37 +42,43 @@ django-fsm==2.8.1 # djangocms-versioning django-parler==2.3 # via -r requirements.in -django-sekizai==4.0.0 +django-sekizai==4.1.0 # via # -r requirements.in # django-cms django-treebeard==4.7 # via django-cms -djangocms-admin-style==3.2.4 +djangocms-admin-style==3.2.6 # via django-cms djangocms-versioning @ https://github.com/django-cms/djangocms-versioning/tarball/master # via -r requirements.in docopt==0.6.2 # via django-app-helper -flake8==6.0.0 +flake8==6.1.0 # via -r requirements.in -isort==5.12.0 +isort==5.13.1 # via -r requirements.in mccabe==0.7.0 # via flake8 -packaging==23.1 +packaging==23.2 # via django-cms -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via flake8 -pyflakes==3.0.1 +pyflakes==3.1.0 # via # -r requirements.in # flake8 six==1.16.0 # via django-app-helper -soupsieve==2.4.1 +soupsieve==2.5 # via beautifulsoup4 sqlparse==0.4.4 # via django -typing-extensions==4.5.0 - # via dj-database-url +typing-extensions==4.9.0 + # via + # asgiref + # dj-database-url + +# The following packages are considered to be unsafe in a requirements file: +setuptools==69.0.2 + # via django-cms diff --git a/tests/requirements/requirements.in b/tests/requirements/requirements.in index a4dcc83a..c1c732de 100644 --- a/tests/requirements/requirements.in +++ b/tests/requirements/requirements.in @@ -10,5 +10,4 @@ isort pyflakes>=2.1.1 # Unreleased django-cms 4.1 compatible packages -django-cms https://github.com/django-cms/djangocms-versioning/tarball/master diff --git a/tests/test_admin_filters.py b/tests/test_admin_filters.py index be8c2e10..7fdd201b 100644 --- a/tests/test_admin_filters.py +++ b/tests/test_admin_filters.py @@ -253,7 +253,7 @@ def test_category_filter_lookups_ordered_alphabetical(self): ) version_admin = admin.site._registry[AliasModel] - category_filter = CategoryFilter(None, {"category": ""}, AliasModel, version_admin) + category_filter = CategoryFilter(None, {"category": [""]}, AliasModel, version_admin) # Get the first choice in the filter lookup object first_lookup_value = category_filter.lookup_choices[0][1] # Lookup value should match the category name linked to alias content @@ -286,7 +286,7 @@ def test_category_filter_lookup_should_only_show_aliases_linked_to_content(self) category_two = Category.objects.create(name='a - category') version_admin = admin.site._registry[AliasModel] - category_filter = CategoryFilter(None, {"category": ""}, AliasModel, version_admin) + category_filter = CategoryFilter(None, {"category": [""]}, AliasModel, version_admin) # Get the first choice in the filter lookup object first_lookup_value = category_filter.lookup_choices[0][1] diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 7c9df5f1..96ab9ff9 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -3,7 +3,7 @@ from django.contrib.sites.models import Site from django.test.utils import override_settings -from cms.api import add_plugin, create_page, create_title +from cms.api import add_plugin, create_page, create_page_content from cms.toolbar.utils import get_object_edit_url, get_object_preview_url from djangocms_alias.cms_plugins import Alias @@ -297,8 +297,8 @@ def test_static_alias_shows_correct_content_for_versioning_states(self): # The edit and preview url should show the draft contents with self.login_user_context(self.superuser): - edit_response = self.client.get(page_edit_url) - preview_response = self.client.get(page_preview_url) + edit_response = self.client.get(page_edit_url, follow=True) + preview_response = self.client.get(page_preview_url, follow=True) self.assertContains(edit_response, 'Updated Draft content for: template_example_global_alias_code') self.assertContains(preview_response, 'Updated Draft content for: template_example_global_alias_code') @@ -316,7 +316,7 @@ def test_static_alias_creates_content_for_missing_languages(self): limit_visibility_in_menu=None, created_by=self.superuser ) - create_title( + create_page_content( title="Statischer Code-Test", language="de", page=page, @@ -330,15 +330,16 @@ def page_edit_url(lang): return get_object_edit_url(page.get_title_obj(lang)) else: def page_edit_url(lang): - return get_object_edit_url(page.get_content_obj(lang)) + return get_object_edit_url(page.get_content_obj(lang), language=lang) with self.login_user_context(self.superuser): - self.client.get(page_edit_url("en")) # supposed to create the alias and alias content for en - self.client.get(page_edit_url("en")) # supposed to create no additional object - self.client.get(page_edit_url("de")) # supposed to create the alias content for de + self.client.get(page_edit_url("en"), follow=True) # supposed to create the alias and alias content for en + self.client.get(page_edit_url("en"), follow=True) # supposed to create no additional object + self.client.get(page_edit_url("de"), follow=True) # supposed to create the alias content for de - alias = AliasModel.objects.get(static_code="template_example_global_alias_code") + alias = AliasModel.objects.filter(static_code="template_example_global_alias_code").first() + self.assertIsNotNone(alias, "Alias not created") self.assertIsNotNone(alias.get_content("en", show_draft_content=True)) self.assertIsNotNone(alias.get_content("de", show_draft_content=True)) # Ensure that exactly two content objects have been created diff --git a/tests/test_toolbar.py b/tests/test_toolbar.py index 389022d1..1db0c244 100644 --- a/tests/test_toolbar.py +++ b/tests/test_toolbar.py @@ -58,7 +58,7 @@ def test_add_aliases_submenu_to_admin_menu(self): except AttributeError: page_url = get_object_edit_url(self.page.get_content_obj(self.language)) with self.login_user_context(user): - response = self.client.get(page_url) + response = self.client.get(page_url, follow=True) self.assertContains(response, 'Aliases') def test_aliases_link_placement(self): diff --git a/tox.ini b/tox.ini index 3461e4ff..4eab8871 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,9 @@ [tox] envlist = - py{39,310}-dj{32,40}-cms41-{default,versioning} - py{39,310,311}-dj{41,42}-cms41-{default,versioning} - # djmain-py311-{default,versioning} + py{39,310}-dj{32}-cms41-{default,versioning} + py{39,310,311,312}-dj{42}-cms41-{default,versioning} + py{310,311,312}-dj{50}-cms41-{default,versioning} + # py{311}-dj42-cms41-{default,versioning} skip_missing_interpreters=True @@ -13,7 +14,7 @@ deps = -r tests/requirements/{envname}.txt commands = {envpython} --version - {env:COMMAND:coverage} run setup.py test + {env:COMMAND:coverage} run ./test_settings.py [testenv:flake8] deps = flake8 From 655713bf4809348424350ba032a497af783102ee Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 12 Dec 2023 19:59:45 +0100 Subject: [PATCH 15/17] Bump version to 2.0.0rc3 --- djangocms_alias/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangocms_alias/__init__.py b/djangocms_alias/__init__.py index cdc07416..12038a47 100644 --- a/djangocms_alias/__init__.py +++ b/djangocms_alias/__init__.py @@ -1 +1 @@ -__version__ = '2.0.0rc2' +__version__ = '2.0.0rc3' From 6e4c5fb855ee5778620c45c89dcd2e5604e53991 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 12 Dec 2023 20:02:31 +0100 Subject: [PATCH 16/17] Update CHANGELOG.rst --- CHANGELOG.rst | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 38408c62..7120b688 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,20 +2,21 @@ Changelog ========= -2.0.0rc2 -======== +2.0.0rc3 (2023-12-12) +===================== +* fix: avoid generating migrations based on settings.LANGUAGE by @vasekch in https://github.com/django-cms/djangocms-alias/pull/186 +* fix: Enable caching for `static_alias` template tag by @vasekch in https://github.com/django-cms/djangocms-alias/pull/200 +* fix: `static_alias` unnecessarily creates new content objects when used with versioning by @fsbraun in https://github.com/django-cms/djangocms-alias/pull/202 +* feat: Django 5.0 support, fixed test suite by @fsbraun in https://github.com/django-cms/djangocms-alias/pull/203 * fix: Migration dependency on latest django-cms migration. * fix: Allow using a variable as the identifier in static_alias template tag - -2.0.0rc1 -======== -* Django 4.0, 4.1, and 4.2 support added -* Django 2.2 support removed -* Python 3.7 support removed -* Changed test setup to run tox from github actions for consistency in testing -* Use django CMS 4.1 GrouperModelAdmin utility (breaking change wrt. django CMS 4.0) -* Admin menu entry show alias change list in the language of the currently shown object -* Automatically create static aliases in the language needed (fixing #162) +* fest: Django 4.0, 4.1, and 4.2 support added +* fest: Django 2.2 support removed +* fest: Python 3.7 support removed +* ci: Changed test setup to run tox from github actions for consistency in testing +* feat: Use django CMS 4.1 GrouperModelAdmin utility (breaking change wrt. django CMS 4.0) +* fix: Admin menu entry show alias change list in the language of the currently shown object +* fix: Automatically create static aliases in the language needed (fixing #162) 1.11.0 (2022-10-14) =================== From ba96174a4d3470dc749882b4f3a28429617f240e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 20:09:42 +0100 Subject: [PATCH 17/17] build(deps-dev): bump browserify-sign from 4.2.1 to 4.2.2 (#204) Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2. - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: browserify-sign dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fabian Braun --- package-lock.json | 51 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfec46e2..5869294a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1586,26 +1586,29 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dev": true, "dependencies": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 4" } }, "node_modules/browserify-sign/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "dependencies": { "inherits": "^2.0.3", @@ -9887,26 +9890,26 @@ } }, "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dev": true, "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" }, "dependencies": { "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, "requires": { "inherits": "^2.0.3",