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 bullseye support #1958

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Drop bullseye support #1958

merged 2 commits into from
Apr 23, 2024

Conversation

legoktm
Copy link
Member

@legoktm legoktm commented Apr 10, 2024

Status

Ready for review (needs infra help)

Description

This is split into two commits for ease of review and future git blame.

Drop bullseye support

We are moving to bookworm, so we can set Python 3.11 as the minimum
version to support and avoid installing poetry from pip.

There's one FIXME in the piuparts job because we don't have
bookworm on apt.freedom.press yet. Using the bullseye repository
should be fine for now.

Apply ruff fixes for Python 3.11

  • Use T | None instead of Optional[T].
  • Also use T | U instead of Union[T, U]
  • Use new datetime.UTC as shorthand

Test Plan

  • Visual review
  • CI passes
  • Needs infra to move "required" labels from bullseye jobs to bookworm equivalents

Checklist

If these changes modify code paths involving cryptography, the opening of files in VMs or network (via the RPC service) traffic, Qubes testing in the staging environment is required. For fine tuning of the graphical user interface, testing in any environment in Qubes is required. Please check as applicable:

  • I have tested these changes in the appropriate Qubes environment
  • I do not have an appropriate Qubes OS workstation set up (the reviewer will need to test these changes)
  • These changes should not need testing in Qubes

If these changes add or remove files other than client code, the AppArmor profile may need to be updated. Please check as applicable:

  • I have updated the AppArmor profile
  • No update to the AppArmor profile is required for these changes
  • I don't know and would appreciate guidance

If these changes modify the database schema, you should include a database migration. Please check as applicable:

  • I have written a migration and upgraded a test database based on main and confirmed that the migration is self-contained and applies cleanly
  • I have written a migration but have not upgraded a test database based on main and would like the reviewer to do so
  • I need help writing a database migration
  • No database schema changes are needed

We are moving to bookworm, so we can set Python 3.11 as the minimum
version to support and avoid installing poetry from pip.

There's one FIXME in the piuparts job because we don't have
bookworm on apt.freedom.press yet. Using the bullseye repository
should be fine for now.
* Use `T | None` instead of `Optional[T]`.
* Also use `T | U` instead of `Union[T, U]`
* Use new `datetime.UTC` as shorthand
Copy link
Contributor

@rocodes rocodes left a comment

Choose a reason for hiding this comment

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

Thanks for preparing this. LGTM and have added 2 small docs PRs to accompany this change. LGTM, pending infra assistance.

@legoktm
Copy link
Member Author

legoktm commented Apr 23, 2024

"Required" jobs has been updated on the infra side, so going to merge!

@legoktm legoktm merged commit 7567a24 into main Apr 23, 2024
48 checks passed
@legoktm legoktm deleted the drop-bullseye branch April 23, 2024 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants