init support for django4.2 #150

FreemanPancake · 2024-03-13T01:28:01Z

Description

Related resources

add support for django 4.2 and python 3.10
remove support django < 3.2 and python < 3.8

Checklist

I have opened this pull request against master
I have added or modified the tests when changing logic
I have followed the conventional commits guidelines to add meaningful information into the changelog
I have read the contribution guidelines and I have joined #workgroup-pr-review on
Slack to find a “pr review buddy” who is going to review my pull request.

…cake/djangocms-snippet into feat/django-42-compat

codecov · 2024-03-13T04:41:01Z

Codecov Report

Attention: Patch coverage is 55.55556% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 90.66%. Comparing base (1cd77a8) to head (2ed194b).

Files	Patch %	Lines
djangocms_snippet/settings.py	0.00%	4 Missing ⚠️

Additional details and impacted files

@@                     Coverage Diff                      @@
##           support/django-cms-4.0.x     #150      +/-   ##
============================================================
- Coverage                     91.52%   90.66%   -0.86%     
============================================================
  Files                            22       24       +2     
  Lines                           401      407       +6     
  Branches                         34       36       +2     
============================================================
+ Hits                            367      369       +2     
- Misses                           25       29       +4     
  Partials                          9        9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…test

for more information, see https://pre-commit.ci

…cake/djangocms-snippet into feat/django-42-compat

for more information, see https://pre-commit.ci

joshyu · 2024-03-13T05:45:26Z

@fsbraun / @Aiky30 ,

please help to approve the workflows and review this PR.

joshyu · 2024-03-13T06:47:47Z

Hi @fsbraun,

We encountered a unit test error which we can't find the root cause and the solution.
Can you please tell us the root cause?

we didn't find the migration file 0035_alter_cmsplugin_id_alter_globalpagepermission_id_and_more.py ?

fsbraun

LGTM! The tests fail, since there are migrations missing in the core for Django 4.2. They are no-ops, but still show up.

I suggest you add a change to the tests.test_migrations test and only check if there are migrations for the djangocms-snippet module:

        try:
            call_command("makemigrations", "djangocms_snippet", **options)
        except SystemExit as e:
            status_code = str(e)
        else:
            # the "no changes" exit code is 0
            status_code = "0"

joshyu · 2024-03-13T06:56:30Z

@fsbraun ,

do you mean I add a SkipIf to check django version. skip if django == 4.2?
as there are no errors under django 3.2

fsbraun · 2024-03-13T06:58:03Z

No, I'm suggesting to change that code snippet in the tests/tests_migrations.py file. The difference is the 2nd line. It restricts the make migrations management command to the djangocms_snippet app which is the only one to be tested here.

joshyu · 2024-03-13T07:41:01Z

@fsbraun,

Sorry I didn't understand how to do this. do you mean change makemigration to migrate?
If my understanding is not correct, please can you tell me how to do it? sorry for the bother.

fsbraun · 2024-03-13T08:08:19Z

Sorry, my mistake. I've looked at the wrong branch (support/4.0.0 instead of support/4.0.x). The proposed change has already been made.

Next, I suggest running the tests locally with the dry_run option temporarily set to False. This will create a new migration file which should be committed to the PR.

fix: add missing migration file

joshyu · 2024-03-14T03:28:09Z

@fsbraun ,
please help to approve the workflow and review the update.

Cheers

joshyu · 2024-03-14T07:19:32Z

@fsbraun , can you check whether the PR is OK? Thanks.

* djangocms-versioning compatibility - Initial Model and cms_config implementation (#75) * feat: Snippet CMS 4.0 and djangocms-versioning Data migration (#74) * feat: Moderation compatibility and version copy method implementation (#77) * feat: Versioning Compatibility Changes (#79) * fix: Fixed bug that causes ChangeView not to use SnippetForm (#80) * feat: Reworked form fields and added the ability to show draft snippets (#81) * fix: Adding valid HTML to the add snippet form throws an error (#82) * fix: form initialisation error in read-only mode (#83) * fix: History URL button broken link on the Snippets change form (#84) * fix: Draft snippet render error due to draft snippets (#86) * feat: Default versioning import user id setting can be set via environment variable (#89) * Release 4.0.0.dev1 (#91) * fix: django-cms 4.0.x - Remove breaking django-treebeard pinning issue (#93) * Release 4.0.0.dev2 (#95) * feat: Removing slug field and hyperlink from list display when versioning is enabled (#98) * fix: Snippet plugin showing ID instead of name(#100) * Fix: Compare view removed unnecessary template logic (#101) * Release 4.0.0.dev3 (#103) * feat: Preview icon renders content in read only (#102) * Release 4.0.0.dev4 (#109) * fix: Added test coverage to admin preview view (#96) * port-feat: pre-commit config added from the v3 workstream (#117) Changes partially taken from this change: a56091c Requires additional work when the django-cms 4.0 workstream is official, the version bump code has been ignored because it would generate official releases only: #116 * feat: django-cms 4.0.x - django 3.2 and Python 3.9 compatibility (#92) * Release 4.0.1.dev1 (#119) * feat: Enable add button on the SnippetPluginForm (#127) * Release 4.0.1.dev2 (#128) * init support for django4.2 (#150) * init support for django4.2 * add change log for add compatiable for django 4.2 and python 3.10 * Update CHANGELOG.rst * Update .pre-commit-config.yaml * fix lint config issue * remove test code * add blackline for flake8 * add pyproject.toml file * add requirement files * fix ci failed issue * format setup.py import section * upgrade isort version to fix pre commit ci issue * upgrade the django-upgrade package to pass through the pre commit ci test * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * upgrade packages in pre commit * resort init file changes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * comment the django-upgrade from ci * fix: add missing migration file * fix: update previous file instead of creating new file --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Josh Peng Yu <[email protected]> * fix pyproject.toml config error (#151) * Added site field in models n site filter in admin (#159) * Added site field in models n site filter in admin * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * updated versioning branch * Add test cases and updated the implementation * Update CHANGELOG.rst Co-authored-by: Mark Walker <[email protected]> * corrected formatting * fixed flake8 issues * removed list_filter --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Mark Walker <[email protected]> * Release/4.1.0 (#155) * bump version to 4.1.0 * bump version to 4.1.0 pyproject.toml * replace test requirement url * update changelog date * update release date. * Update README.rst * Update README.rst * Create PULL_REQUEST_TEMPLATE.md (#85) Add PR template * Only include badges at the top to avoid confusion & removed old badges like travis. (#106) * Added pypi github actions (#108) * FEATURE: adjust setup metadata (#110) * correct doc about default value of DJANGOCMS_SNIPPET_CACHE (#120) * Update to ace 1.9.6, load ace editor from static files if djangocms_static_ace is installed, add dark mode (#123) Fix: Load ace editor from static files if `djangocms-static-ace` is installed Fix: Respect if user has set dark mode Add: Weak dependency on djangocms-static-ace Doc: optional static-ace dependency * ci: Update pypi action branch names (#125) * Bump version: 3.0.0 → 3.1.0 (#126) * fix: django-cms 3.x - Remove breaking django-treebeard pinning issue (#94) * Removed pinning. * Update setup.py --------- Co-authored-by: Fabian Braun <[email protected]> * fix: add noop django 4 migration (#134) * fix: add noop django 4 migration * fix: isort * ci: Prepare release of version 3.1.1 (#139) * Update CHANGELOG.rst * Bump version * Pin treebeard for Django CMS 3.7 tests * Update dj30_cms37.txt * chore: Package overhaul (#140) * ci: Update pre-commit * ci: Run ruff formatter * build: Move package in to src dir * test: Update requirements building * chore: Keeping git happy after moving to src * ci: Add dependabot config * ci: Update tests to run tox * build: Project config * test: Update tox setup * build: Update setup to build_meta * ci: Update pypi workflows * ci: Update linter to ruff * chore: Fix RUF012 * ci: Update linter trigger * chore: Drop python 3.8 * chore: Drop python 3.8 * chore: Adjust coverage config * fix: Test pypi workflow * Bump actions/setup-python from 4 to 5 (#148) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: Test only for migrations within package * Update tests * run tests on all branches * fix tests * Update readme, changelog * Fix common test suite for django CMS 3.11, 4.0, and 4.1 * Update CHANGELOG * Merge branches together * Update precommit-config * fix: ruff precommit * ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci * fix: ruff issues * More ruff fixes * Update pyproject.toml * ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci * fix: Remove isort and flake8 from setup.cfg * ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci * Update setup.cfg * Fix: universal branch (#167) * fix: manifest.in * fix: SnippetAdmin use overrdden change_form_template * ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Update lint workflow --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Adam Murray <[email protected]> Co-authored-by: Aiky30 <[email protected]> Co-authored-by: Bernard Van Der Vyver <[email protected]> Co-authored-by: Michael Collins <[email protected]> Co-authored-by: 傅瑞曼 <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Josh Peng Yu <[email protected]> Co-authored-by: Vipul Narang <[email protected]> Co-authored-by: Mark Walker <[email protected]> Co-authored-by: Nicolai <[email protected]> Co-authored-by: Kaushal Dhungel <[email protected]> Co-authored-by: Simon Krull <[email protected]> Co-authored-by: Liumeo <[email protected]> Co-authored-by: Mark Walker <[email protected]> Co-authored-by: Patrik <[email protected]> Co-authored-by: Mark Walker <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Josh Yu <[email protected]>

FreemanPancake added 10 commits March 12, 2024 08:28

init support for django4.2

f736166

add change log for add compatiable for django 4.2 and python 3.10

8f11493

Update CHANGELOG.rst

2cd638d

Update .pre-commit-config.yaml

90ecd5d

fix lint config issue

dbdb805

Merge branch 'feat/django-42-compat' of https://github.com/FreemanPan…

d8db98d

…cake/djangocms-snippet into feat/django-42-compat

remove test code

0a2f688

add blackline for flake8

4ce25ab

add pyproject.toml file

a8b2ed2

add requirement files

baf22fc

FreemanPancake and others added 10 commits March 13, 2024 05:01

fix ci failed issue

d162423

format setup.py import section

66daaf9

upgrade isort version to fix pre commit ci issue

53005f4

upgrade the django-upgrade package to pass through the pre commit ci …

5171da0

…test

[pre-commit.ci] auto fixes from pre-commit.com hooks

e0bd82a

for more information, see https://pre-commit.ci

upgrade packages in pre commit

c298d73

Merge branch 'feat/django-42-compat' of https://github.com/FreemanPan…

ea8af72

…cake/djangocms-snippet into feat/django-42-compat

resort init file changes

682d6a4

[pre-commit.ci] auto fixes from pre-commit.com hooks

1f20ce5

for more information, see https://pre-commit.ci

comment the django-upgrade from ci

63219c6

fsbraun approved these changes Mar 13, 2024

View reviewed changes

joshyu added 2 commits March 13, 2024 08:35

fix: add missing migration file

ae6a41b

fix: update previous file instead of creating new file

f4ecced

Merge pull request #2 from joshyu/feat/django-42-compat

2ed194b

fix: add missing migration file

fsbraun approved these changes Mar 14, 2024

View reviewed changes

fsbraun merged commit 1fb6fca into django-cms:support/django-cms-4.0.x Mar 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

init support for django4.2 #150

init support for django4.2 #150

FreemanPancake commented Mar 13, 2024 •

edited by marksweb

Loading

codecov bot commented Mar 13, 2024 •

edited

Loading

joshyu commented Mar 13, 2024 •

edited

Loading

joshyu commented Mar 13, 2024 •

edited

Loading

fsbraun left a comment

joshyu commented Mar 13, 2024

fsbraun commented Mar 13, 2024 •

edited

Loading

joshyu commented Mar 13, 2024

fsbraun commented Mar 13, 2024

joshyu commented Mar 14, 2024

joshyu commented Mar 14, 2024

init support for django4.2 #150

init support for django4.2 #150

Conversation

FreemanPancake commented Mar 13, 2024 • edited by marksweb Loading

Description

Related resources

Checklist

codecov bot commented Mar 13, 2024 • edited Loading

Codecov Report

joshyu commented Mar 13, 2024 • edited Loading

joshyu commented Mar 13, 2024 • edited Loading

fsbraun left a comment

Choose a reason for hiding this comment

joshyu commented Mar 13, 2024

fsbraun commented Mar 13, 2024 • edited Loading

joshyu commented Mar 13, 2024

fsbraun commented Mar 13, 2024

joshyu commented Mar 14, 2024

joshyu commented Mar 14, 2024

FreemanPancake commented Mar 13, 2024 •

edited by marksweb

Loading

codecov bot commented Mar 13, 2024 •

edited

Loading

joshyu commented Mar 13, 2024 •

edited

Loading

joshyu commented Mar 13, 2024 •

edited

Loading

fsbraun commented Mar 13, 2024 •

edited

Loading