Skip to content

python3Packages.wagtail: relax django-taggit dependency#275356

Merged
natsukium merged 2 commits intoNixOS:masterfrom
sephii:wagtail-taggit
Jan 20, 2024
Merged

python3Packages.wagtail: relax django-taggit dependency#275356
natsukium merged 2 commits intoNixOS:masterfrom
sephii:wagtail-taggit

Conversation

@sephii
Copy link
Contributor

@sephii sephii commented Dec 19, 2023

Description of changes

django-taggit was upgraded in 94aac10, but this version is not supported by Wagtail 5.2.2. I checked the django-taggit changelog, and the changes in 5.0 don’t have any impact on Wagtail (I’ve opened a PR to change this upstream) so it should be safe to relax the dependency.

I have no idea why the python3Packages.wagtail package can be built, and why building the python3Packages.wagtail-localize package (which depends on wagtail) fails.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Dec 19, 2023
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 19, 2023
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 23, 2023
@sephii
Copy link
Contributor Author

sephii commented Jan 13, 2024

Thanks for the review! Is there anything missing to get this PR merged?

@NickCao
Copy link
Member

NickCao commented Jan 15, 2024

python3Packages.wagtail already builds on master, please check.

@sephii
Copy link
Contributor Author

sephii commented Jan 15, 2024

@NickCao see the notes in the PR description:

I have no idea why the python3Packages.wagtail package can be built, and why building the python3Packages.wagtail-localize package (which depends on wagtail) fails.

This PR fixes building the python3Packages.wagtail-localize package (the python3Packages.wagtail package should theoretically fail to build on master, I don't know why it doesn't).

@natsukium
Copy link
Member

natsukium commented Jan 15, 2024

@ofborg build python311Packages.wagtail python311Packages.wagtail-localize

@NickCao
Copy link
Member

NickCao commented Jan 15, 2024

As you can see, the build of python311Packages.wagtail-localize still fails with

       > ERROR Missing dependencies:
       >        Wagtail>=4.1
       >        Willow[heif]<1.7,>=1.6.2
       >        Wagtail>=4.1
       >        django-taggit<5.0,>=2.0

@sephii
Copy link
Contributor Author

sephii commented Jan 16, 2024

The build works on this PR branch but is indeed broken on master because of #271586 . The willow upgrade broke the wagtail-localize and wagtail packages. I’ve added a patch to relax the Willow dependency as well and rebased on master. The build should now pass.

Note the dependency was fixed upstream on the main branch so this patch can be removed when the next Wagtail version will be released.

@natsukium
Copy link
Member

Please use python311Packages instead of python3Packages in the commit message to avoid calling the ofborg build manually.

Commit names of Python libraries should reflect that they are Python libraries, so write for example python311Packages.numpy: 1.11 -> 1.12. It is highly recommended to specify the current default version to enable automatic build by ofborg.
https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/python.section.md#contributing-guidelines-contributing-guidelines

@natsukium natsukium merged commit 2445b32 into NixOS:master Jan 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants