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

Replace future with six #85

Merged
merged 8 commits into from Oct 31, 2022
Merged

Replace future with six #85

merged 8 commits into from Oct 31, 2022

Conversation

petschki
Copy link
Member

@mister-roboto
Copy link

@petschki 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!

@petschki
Copy link
Member Author

@jenkins-plone-org please run jobs

1 similar comment
@petschki
Copy link
Member Author

@jenkins-plone-org please run jobs

@petschki
Copy link
Member Author

jenkins jobs are green, but I do not really know why the tox/pytest setup doesn't work on gha ... @davisagli maybe you have some idea here?

@petschki petschki marked this pull request as ready for review October 25, 2022 09:47
@petschki
Copy link
Member Author

@jenkins-plone-org please run jobs

@davisagli
Copy link
Sponsor Member

@petschki It looks like the tests have a dependency on https://pypi.org/project/py/ which used to be a dependency of pytest, but now needs to be required explicitly, or replaced

Copy link
Sponsor 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.

LGTM, can be merged when green.

I would also be fine with dropping 3.5 and 3.6 as these are end of life. Maybe 2.7 and 3.7 as well, dropping Plone 5.2 support, but that can be done when someone wants to clean up this package, removing Py 2 code.
But if it is not too much trouble, we can of course keep any old Python versions.

@petschki
Copy link
Member Author

@jenkins-plone-org please run jobs

@petschki
Copy link
Member Author

@jenkins-plone-org please run jobs

mauritsvanrees added a commit to plone/buildout.coredev that referenced this pull request Oct 27, 2022
This will be a new test dependency for diazo.
See plone/diazo#85
@mauritsvanrees
Copy link
Sponsor Member

The Jenkins Plone 6 jobs failed because of a missing version pin for py in coredev. I have added it and started a 3.10 job.

Is py really needed though? Its pypi page says: "NOTE: this library is in maintenance mode and should not be used in new code."
On my Mac, when I comment out the new py dependency in setup.py, all tox tests still pass. So maybe it was only needed temporarily?

Meanwhile on Jenkins 5.2 3.8 passes, but 2.7 and 3.7 fail:

Invalid test_suite, None, in diazo.tests.test_diazo

As I wrote, it could be an option to target this at Plone 6 only.

@petschki
Copy link
Member Author

Invalid test_suite, None, in diazo.tests.test_diazo

This is fixed. While pytest gives a warning when returning the testsuite in test_suite(), zope.testrunner needs it explicitly.

I've pinned the py dependency in versions.cfg but this doesn't seem to work right now. Try to remove it again...

@mauritsvanrees
Copy link
Sponsor Member

All green, I merge.

@mauritsvanrees mauritsvanrees merged commit b9b67fe into master Oct 31, 2022
@mauritsvanrees mauritsvanrees deleted the replace-future-with-six branch October 31, 2022 10:42
@mauritsvanrees
Copy link
Sponsor Member

Thanks!

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.

None yet

4 participants