Skip to content

etesync-dav: pull patch into flask to work with setuptools 67.5.0+#249847

Merged
tjni merged 1 commit intoNixOS:staging-nextfrom
tjni:etesync-dav
Aug 24, 2023
Merged

etesync-dav: pull patch into flask to work with setuptools 67.5.0+#249847
tjni merged 1 commit intoNixOS:staging-nextfrom
tjni:etesync-dav

Conversation

@tjni
Copy link
Copy Markdown
Contributor

@tjni tjni commented Aug 17, 2023

Description of changes

Pull a patch into version 2.0.3 of flask that replaces usages of pkg_resources. In setuptools 67.5.0+, this starts to output a deprecation warning, which fails flask's tests. While we could stop running tests or patch how it responds to warnings, I thought we could use the patch to improve the behavior without changing the testing.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from Valodim August 18, 2023 00:21
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Aug 18, 2023
@natsukium
Copy link
Copy Markdown
Member

IMO it would be better to version up instead of the patch since upstream does not pin the flask version.
https://github.com/etesync/etesync-dav/blob/cff246c13b613755fd3b709ab3318d3ddcdd9123/setup.py#L115

I would like to hear from the package maintainers, @thyol and @Valodim.

@tjni tjni marked this pull request as draft August 24, 2023 00:49
@tjni tjni changed the base branch from master to staging-next August 24, 2023 00:50
@tjni tjni marked this pull request as ready for review August 24, 2023 00:51
@tjni
Copy link
Copy Markdown
Contributor Author

tjni commented Aug 24, 2023

I do think unpinning flask is a good idea, and I am going to see if that's possible. In the meantime, I think it's best to merge this into staging-next so that the build doesn't break for users.

@tjni tjni merged commit 6461738 into NixOS:staging-next Aug 24, 2023
@tjni tjni deleted the etesync-dav branch August 24, 2023 00:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants