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.

Sign up for GitHub

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

Jump to bottom

Fix Bookworm CI pipeline #1565

Merged
merged 3 commits into from
Oct 11, 2022
Merged

Fix Bookworm CI pipeline #1565

merged 3 commits into from
Oct 11, 2022

Conversation

gonzalo-bulnes
Copy link
Contributor

@gonzalo-bulnes gonzalo-bulnes commented Sep 27, 2022 •
edited by legoktm
Loading

Description

Fixes the failure of all Bookworm jobs in CI, by allowing PyQt5-sip (or any other dependency) to be upgraded without affecting the Bullseye testing conditions.

This is a follow up on #1555

Test Plan

  • Confirm that the Bullseye requirements have not changed
  • Confirm that the Bookworm special requirements are readable (it should feel easy to say what's different in Bookworm from Bullseye)
  • CI is fully green 🍏 🐛 🍏
  • Confirm that CI for Bullseye and Bookworm is passing 🍏 🍏 🍏

@gonzalo-bulnes gonzalo-bulnes requested a review from a team as a code owner September 27, 2022 04:24
@gonzalo-bulnes gonzalo-bulnes added the ⚙️ Tooling Improving maintainability and increasing maintainer joy : ) label Sep 27, 2022
@gonzalo-bulnes
Copy link
Contributor Author

Reviewers: if you've got ideas to streamline the Makefile changes, I'm all ears!

@gonzalo-bulnes
Add Debian codename script
c43d511
@gonzalo-bulnes
Add distinct Bullseye and Bookworm dev-requirements
e03cf4e 
This allows to test Bookworm with a version of PyQt5-sip that
can be installed with Python 3.10, while keeping the advantages
of the Circle CI configuration matrix.
@gonzalo-bulnes gonzalo-bulnes force-pushed the fix-bookworm-ci-pipeline branch from 231bcec to e03cf4e Compare September 27, 2022 04:30
@gonzalo-bulnes
Upgrade pyqt5-sip for Python 3.10 on Bookworm
748e36b 
This upgrade allows to start drafting support for Bookworm.

The package version remains pinned to the system package version
under Debian Bullseye (currently supported).
@gonzalo-bulnes gonzalo-bulnes force-pushed the fix-bookworm-ci-pipeline branch from b01b77c to 748e36b Compare September 27, 2022 04:36
@gonzalo-bulnes gonzalo-bulnes changed the title Fix bookworm ci pipeline Fix Bookworm CI pipeline Sep 27, 2022
legoktm
legoktm reviewed Sep 27, 2022
View reviewed changes
Makefile Show resolved Hide resolved
legoktm
legoktm requested changes Sep 29, 2022
View reviewed changes
Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

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

  • Confirm that the Bullseye requirements have not changed
  • Confirm that the Bookworm special requirements are readable (it should feel easy to say what's different in Bookworm from Bullseye)
  • CI is fully green 🍏 🍏 🍏

@gonzalo-bulnes
Copy link
Contributor Author

We should delete dev-requirements.txt, yes. But after fixing the diff. Thanks for pointing that out, I forgot that regenerating the files would upgrade the indirect dependencies 🤦‍♀️

I'll fix that!

@gonzalo-bulnes
Copy link
Contributor Author

gonzalo-bulnes commented Oct 4, 2022 •
edited
Loading

Meh, there is no way that I know of to re-generate the requirement files while keeping the indirect dependencies pinned... short of pinning them.

So my plan goes as follows:

This was referenced Oct 4, 2022
Merged
Closed
@gonzalo-bulnes
Copy link
Contributor Author

gonzalo-bulnes commented Oct 4, 2022 •
edited
Loading

Note: I've updated the test plan to account for the known vulnerability in mako < 1.2.2 (see #1566) that is now braking the pipeline, but will be fixed after this PR is merged. (It is a scheduling problem only.)

Edit: Nope, that can't be. The upgrade must come first as per repo policies.

legoktm
legoktm approved these changes Oct 11, 2022
View reviewed changes
Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

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

Fields of 🟢 as far as the eye can see. Yay! 📖 🪱 here we come!

@legoktm legoktm merged commit 71d9a0c into main Oct 11, 2022
@legoktm legoktm deleted the fix-bookworm-ci-pipeline branch October 11, 2022 22:30
@gonzalo-bulnes
Copy link
Contributor Author

Oops, the merging was a bit premature. I'm creating a follow up branch to fix the requirement files that were mangled by Git's conflict resolution 🙂

@gonzalo-bulnes gonzalo-bulnes mentioned this pull request Oct 11, 2022
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@legoktm legoktm legoktm approved these changes

@sssoleileraaa sssoleileraaa Awaiting requested review from sssoleileraaa

Assignees
No one assigned
Labels
⚙️ Tooling Improving maintainability and increasing maintainer joy : )
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gonzalo-bulnes @legoktm