Skip to content

flatcam: do not pin setuptools in shapely#249849

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

flatcam: do not pin setuptools in shapely#249849
tjni merged 1 commit intoNixOS:staging-nextfrom
tjni:flatcam

Conversation

@tjni
Copy link
Copy Markdown
Contributor

@tjni tjni commented Aug 18, 2023

Description of changes

In the 1.8.x branch of shapely, setuptools was pinned to less than 64 because of a bug the maintainers were seeing related to Windows tests (shapely/shapely#1481). We don't have that problem, and in fact we are on a newer version of setuptools. Once we migrate to build, this version constraint will start failing the build.

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 trepetti August 18, 2023 00:37
@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

I suggest that we update the version of shapely as per this comment. #249847 (comment)
However, a major update is required and needs to be checked.

@natsukium
Copy link
Copy Markdown
Member

I found this while drowning in the sea of PR.
#248004

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

tjni commented Aug 24, 2023

Merging this first to unbreak the build. Will follow up on updating it.

@tjni tjni merged commit 093f591 into NixOS:staging-next Aug 24, 2023
@tjni tjni deleted the flatcam branch August 24, 2023 06:19
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