8000 chore: Merging back 5.0.0a1 build by fsbraun · Pull Request #8169 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

chore: Merging back 5.0.0a1 build #8169

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 3, 2025
Merged

chore: Merging back 5.0.0a1 build #8169

merged 14 commits into from
Mar 3, 2025

Conversation

fsbraun
Copy link
Member
@fsbraun fsbraun commented Mar 2, 2025

Description

  1. This merges back the 5.0.0a1 build into develop-4 (esp. including updated changelogs and release notes)
  2. develop-4 will become main
  3. A legacy develop-4 will be available for some time (to be determined) from before the merge
  4. After the merge, the release/5.0.x branch will be created
  5. After the creation of the release/5.0.x branch, I will bump the version in main to 5.1.0dev (so that the main branch has a higher version number then the release/5.0.x branch

Related resources

  • #...
  • #...

Checklist

  • I have opened this pull request against develop-4
  • 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 the channel #pr-reviews on our Discord Server to find a “pr review buddy” who is going to review my pull request.

Summary by Sourcery

Updates the project to version 5.0.0a1, including changes to static files, CSS, and JavaScript bundles.

Enhancements:

  • Update django-cms-iconfont to version 5.0.0a1.
  • Update static files to use version 5.0.0a1.
  • Update cms__init__.py to reflect the new version.
  • Improve the triggering of refresh events in cms.structureboard.js by using setTimeout to ensure the current execution context is completed before the events are triggered.
  • Add a cms-icon-none class to allow setting width to cms-icon

Copy link
Contributor
sourcery-ai bot commented Mar 2, 2025

Reviewer's Guide by Sourcery

This pull request merges the changes for the 5.0.0a1 build. It includes updating the version number, modifying file paths to reflect the new version, adding asynchronous event dispatching, and introducing new CSS files for styling.

Updated class diagram for StructureBoard

classDiagram
  class StructureBoard {
    static _triggerRefreshEvents()
  }
  note for StructureBoard "The _triggerRefreshEvents method now dispatches events asynchronously using setTimeout."
Loading

File-Level Changes

Change Details Files
Updated the font file paths for the django-cms-iconfont to reflect the new version.
  • Updated the font file paths to point to the 5.0.0a1 directory.
cms/static/cms/sass/components/_iconography.scss
Modified the _triggerRefreshEvents method to dispatch events asynchronously.
  • Wrapped the event dispatching logic within a setTimeout function with a delay of 0 milliseconds.
cms/static/cms/js/modules/cms.structureboard.js
Updated the django CMS version number.
  • Changed the __version__ variable from 4.1.1 to 5.0.0a1.
cms/__init__.py
Updated the CSS file path for the CMS wizard styles to reflect the new version.
  • Renamed the directory from 4.1.1 to 5.0.0a1 in the file path.
cms/static/cms/css/4.1.1/cms.wizard.css
cms/static/cms/css/5.0.0a1/cms.wizard.css
Updated the bundle admin base javascript file path to reflect the new version.
  • Renamed the directory from 4.1.1 to 5.0.0a1 in the file path.
cms/static/cms/js/dist/4.1.1/bundle.admin.base.min.js
cms/static/cms/js/dist/5.0.0a1/bundle.admin.base.min.js
Updated the bundle admin changeform javascript file path to reflect the new version.
  • Renamed the directory from 4.1.1 to 5.0.0a1 in the file path.
cms/static/cms/js/dist/4.1.1/bundle.admin.changeform.min.js
cms/static/cms/js/dist/5.0.0a1/bundle.admin.changeform.min.js
Updated the bundle forms apphookselect javascript file path to reflect the new version.
  • Renamed the directory from 4.1.1 to 5.0.0a1 in the file path.
cms/static/cms/js/dist/4.1.1/bundle.forms.apphookselect.min.js
cms/static/cms/js/dist/5.0.0a1/bundle.forms.apphookselect.min.js
Updated the bundle forms pageselectwidget javascript file path to reflect the new version.
  • Renamed the directory from 4.1.1 to 5.0.0a1 in the file path.
cms/static/cms/js/dist/4.1.1/bundle.forms.pageselectwidget.min.js
cms/static/cms/js/dist/5.0.0a1/bundle.forms.pageselectwidget.min.js
Updated the bundle forms pagesmartlinkwidget javascript file path to reflect the new version.
  • Renamed the directory from 4.1.1 to 5.0.0a1 in the file path.
cms/static/cms/js/dist/4.1.1/bundle.forms.pagesmartlinkwidget.min.js
cms/static/cms/js/dist/5.0.0a1/bundle.forms.pagesmartlinkwidget.min.js
Updated the bundle forms slugwidget javascript file path to reflect the new version.
  • Renamed the directory from 4.1.1 to 5.0.0a1 in the file path.
cms/static/cms/js/dist/4.1.1/bundle.forms.slugwidget.min.js
cms/static/cms/js/dist/5.0.0a1/bundle.forms.slugwidget.min.js
Added new CSS files for admin and base styling.
  • Added cms.admin.css to provide styling for the admin interface.
  • Added cms.base.css to provide base styling for the CMS.
cms/static/cms/css/5.0.0a1/cms.admin.css
cms/static/cms/css/5.0.0a1/cms.base.css
Added new CSS file for welcome styling.
  • Added cms.welcome.css to provide styling for the welcome screen.
cms/static/cms/css/5.0.0a1/cms.welcome.css

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor
@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @fsbraun - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider using a more specific commit message than 'Merging back', as it doesn't convey the purpose of the changes.
  • It would be helpful to include a brief summary of the changes included in this merge in the description.
Here's what I looked at during the review
  • 🟡 General issues: 2 issues found
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
Copy link
Member
@vinitkumar vinitkumar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Let's get this merged and released 🚢 🚀

@@ -10,8 +10,8 @@ sphinx-autobuild
datetime
coverage
django~=4.2
git+https://github.com/django-cms/django-cms@release/4.1.x
-e ..
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is something left from local development? Looks like it is failing the CI.

@vinitkumar vinitkumar merged commit 778067d into develop-4 Mar 3, 2025
65 checks passed
@github-actions github-actions bot deleted the release/build branch April 3, 2025 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0