Skip to content
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

Drop support for Plone 5.2 and Plone 6.0 #156

Merged
merged 12 commits into from
Oct 8, 2024
Merged

Conversation

ericof
Copy link
Member

@ericof ericof commented Jun 26, 2024

  • Drop support for Plone 5.2
  • Drop support for Plone 6.0
  • Use plone/meta
  • Move tests to pytest
  • Add default distribution
  • Resolve conflicts
  • Make sure tests run on Plone 6.1
  • Fix failing CI
  • Create default content

Fixes #155

Before merge:

  • Create 4.x.x branch of plone.volto, update buildout.coredev 6.0 to use it
  • Update required checks

@mister-roboto
Copy link

@ericof thanks for creating this Pull Request and helping to improve Plone!

TL;DR: Finish pushing changes, pass all other checks, then paste a comment:

@jenkins-plone-org please run jobs

To ensure that these changes do not break other parts of Plone, the Plone test suite matrix needs to pass, but it takes 30-60 min. Other CI checks are usually much faster and the Plone Jenkins resources are limited, so when done pushing changes and all other checks pass either start all Jenkins PR jobs yourself, or simply add the comment above in this PR to start all the jobs automatically.

Happy hacking!

Copy link
Member

@mauritsvanrees mauritsvanrees left a comment

Choose a reason for hiding this comment

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

How is anyone supposed to review this?
Can't you base this on my PR #153? I split that up into multiple commits to make it easier to review: reviewers can ignore big commits like "black", "pyupgrade", or "zpretty", and focus on the much smaller real changes.
With some git magic it would probably still be possibly to do that, without getting dozens of merge conflicts. (I don't much mind having wasted some time on my PR, that just sometimes happens when multiple people work on one project, and is not the real issue.)

Having said that: happy to see support for the older Plone versions dropped.
What is the reason for changing the i18n domain to plone.volto?

Oh, you may want to rename the news snippet from 155.internal to 155.breaking. This is not quite an internal-only change. ;-)

Copy link
Contributor

@stevepiercy stevepiercy left a comment

Choose a reason for hiding this comment

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

I reviewed only README.md.

Can some of this content by moved into the open PR plone/documentation#1671 ?

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@ericof
Copy link
Member Author

ericof commented Jun 27, 2024

I still need to fix dependencies and find out why tests fail in ci (but they pass locally)

@ericof
Copy link
Member Author

ericof commented Jun 27, 2024

How is anyone supposed to review this? Can't you base this on my PR #153? I split that up into multiple commits to make it easier to review: reviewers can ignore big commits like "black", "pyupgrade", or "zpretty", and focus on the much smaller real changes. With some git magic it would probably still be possibly to do that, without getting dozens of merge conflicts. (I don't much mind having wasted some time on my PR, that just sometimes happens when multiple people work on one project, and is not the real issue.)

I will make many PR's on top of yours. That way we can review one by one.

Having said that: happy to see support for the older Plone versions dropped. What is the reason for changing the i18n domain to plone.volto?

I changed it for 'laziness', but I see a use case for it now. Either way, I will roll it back to plone .

Oh, you may want to rename the news snippet from 155.internal to 155.breaking. This is not quite an internal-only change. ;-)
Thank you for pointing the obvious thing 😅

news/155.internal Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
src/plone/volto/patches.py Show resolved Hide resolved
src/plone/volto/profiles.zcml Show resolved Hide resolved
src/plone/volto/testing.py Show resolved Hide resolved
@tisto
Copy link
Member

tisto commented Sep 6, 2024

The reason we are dropping support for Plone 5.2/6.0 is Plone Distributions, right?

@davisagli
Copy link
Member

The reason we are dropping support for Plone 5.2/6.0 is Plone Distributions, right?

@tisto Right. plone.volto becomes the package which holds the default distribution. We'll create a 4.x branch where we can backport anything needed to continue supporting 5.2 and 6.0.

@davisagli
Copy link
Member

davisagli commented Sep 6, 2024

Testing on jenkins with this set of PRs:

https://github.com/plone/Products.CMFPlone/pull/3981
https://github.com/plone/plone.exportimport/pull/31
https://github.com/plone/plone.distribution/pull/90
https://github.com/plone/plone.volto/pull/156
https://github.com/plone/plone.classicui/pull/13

@mauritsvanrees
Copy link
Member

Just thinking: at some point we will want to remove plonetheme.barceloneta:default from profiles.zcml. And also avoid installing plone.staticresources, and probably plone.app.theming. But that sounds more like something to try for Plone 7. Currently the Classic UI is still too useful as fallback for those that know it.

@mauritsvanrees mauritsvanrees merged commit c636d66 into main Oct 8, 2024
9 of 13 checks passed
@mauritsvanrees mauritsvanrees deleted the issue-155-plone-61 branch October 8, 2024 09:11
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.

Prepare plone.volto to Plone 6.1
6 participants