Skip to content

Upgrade to Plone 6.2.0#125

Merged
ericof merged 12 commits into
mainfrom
plone6.2.0
Jun 22, 2026
Merged

Upgrade to Plone 6.2.0#125
ericof merged 12 commits into
mainfrom
plone6.2.0

Conversation

@sneridagh

Copy link
Copy Markdown
Member

@ericof @davisagli could you please check if there is some upgrade in the 6.2.0 upgrade steps that have to be backported? I guess you have more background on which ones are needed and which don't. Thanks!!

@sneridagh sneridagh requested review from davisagli and ericof May 28, 2026 10:17
@ericof

ericof commented May 28, 2026

Copy link
Copy Markdown
Contributor

Let me look at it, as we need also to replace the Migration Tool here.

@sneridagh

Copy link
Copy Markdown
Member Author

@ericof I made the machine take a look. I think these are the only ones that are worth it, but check it out.

ericof and others added 6 commits June 19, 2026 16:28
Adapt kitconcept.core to Products.CMFPlone 6.2.0:

- Drop the local MigrationTool override of addon_list/initializeTool;
  the addon registry now lives in plone.base
- Import IAddonList from plone.base.interfaces and deprecate the local
  IAddonList alias
- Remove initialize_migration_tool from the base setup handler
- Renumber the 6.2-alpha upgrade step (fix_history_action_permission +
  IClassicUISchema) to 20260620001 so it runs after the formblock step
Drive site creation in the test layer through the distribution
answers/handlers instead of the bespoke setUpDefaultContent path:

- Add a CoreFixture (answers-driven) and DEFAULT_ANSWERS, dropping the
  manual add_site call in the fixture
- Add session-scoped distribution/answers fixtures and a create_site
  helper so tests can build sites with arbitrary answers
- Un-skip the LRF content-type test and build a multilingual site for it

This is the test groundwork required to exercise the new multilingual
support.
Provide an optional "multilingual" Generic Setup profile that pulls in
plone.app.multilingual and ships the LRF (Language Root Folder) type,
moving it out of the dependencies profile. Downstream projects can now
rely on this profile instead of shipping the configuration themselves.
Provide pre_handler/handler/post_handler on the distribution plus a
creation utilities module (content, registry, permissions, site logo,
multilingual support) so the site-creation logic lives in the core
distribution instead of being duplicated by downstream projects.

- Wire the handlers onto the testing distribution
- Add an available_languages argument to add_site, defaulting to the
  default language when not provided
- Correct a typo in the move_rename_object script docstring
- Regenerate the de/en/pt_BR locale catalogs and the POT template
@ericof

ericof commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

Updated this branch — merged latest main (now includes the plone.formblock work from #246/#127) and restructured the diff into focused commits for easier review.

Commits

  1. Upgrade to Plone 6.2.0 (#387)f182d4be

    • Drop the local MigrationTool override of addon_list/initializeTool (the addon registry now lives in plone.base).
    • Import IAddonList from plone.base.interfaces; the local IAddonList is now a deprecated alias.
    • Remove initialize_migration_tool from the base setup handler.
    • Renumber the 6.2-alpha upgrade step (fix_history_action_permission + IClassicUISchema) to 20260620001 so it runs after the merged formblock step (20260619001).
  2. Rework test fixtures to create sites via distribution handlersa641dbd8

    • New answers-driven CoreFixture + DEFAULT_ANSWERS, dropping the bespoke setUpDefaultContent.
    • Session-scoped distribution/answers fixtures and a create_site helper.
    • Un-skip the LRF content-type test (now builds a multilingual site).
  3. Add multilingual support profilea047acd4

    • New optional multilingual Generic Setup profile (pulls in plone.app.multilingual) that ships the LRF (Language Root Folder) type, moved out of the dependencies profile.
    • Removes config that downstream projects currently duplicate.
  4. Add reusable distribution handlers and site-creation utilities1231ad92

    • pre_handler/handler/post_handler on the distribution + a utils/creation.py module (content, registry, permissions, site logo, multilingual support).
    • Wire the handlers onto the testing distribution; add an available_languages arg to add_site.
    • Also removes logic downstream projects currently duplicate.
  5. Fix script docstring typo and refresh localesec2e560d

    • Typo fix in move_rename_object docstring; regenerated de/en/pt_BR catalogs + POT.

Notes

  • Commits 3 and 4 intentionally remove configuration/logic that downstream distributions ship today; commit 2 is the test groundwork that exercises commit 3.
  • Full backend suite: 143 passed (LRF test now un-skipped). ruff + zpretty clean.
  • Per-commit caveat: commit 2's tests reference code introduced in commits 3–4, so the final tree is green but an intermediate checkout of commit 2 alone would not be.

@ericof

ericof commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

@sneridagh After merging, but before releasing, I want to make sure kitconcept-website works with the changes introduced here.

@sneridagh sneridagh left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

LGTM!!! Flawless, lovely work!

@ericof

ericof commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

@sneridagh Before merging it I will test on kitconcept-website just to be sure it is working as expected, (And probably make some additional fixes)

@ericof ericof merged commit 61c35d1 into main Jun 22, 2026
24 of 25 checks passed
@ericof ericof deleted the plone6.2.0 branch June 22, 2026 16:55
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