Skip to content

python3.pkgs.python-swiftclient: patch out duplicate script#249854

Merged
natsukium merged 1 commit intoNixOS:masterfrom
tjni:python-swiftclient
Aug 18, 2023
Merged

python3.pkgs.python-swiftclient: patch out duplicate script#249854
natsukium merged 1 commit intoNixOS:masterfrom
tjni:python-swiftclient

Conversation

@tjni
Copy link
Copy Markdown
Contributor

@tjni tjni commented Aug 18, 2023

Description of changes

There is a name collision between the scripts that are created from the scripts section of setup.cfg and the entry_points section of setup.cfg. While pip is OK with this, installer is not.

It would be better to create a patch upstream and fetch it, but it's a lot of work I don't want to do right now to create an account on Gerrit and set up everything to contribute to an OpenStack project.

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.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Aug 18, 2023
@ofborg ofborg bot requested a review from SuperSandro2000 August 18, 2023 01:22
@ofborg ofborg bot added 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 Aug 18, 2023
@natsukium
Copy link
Copy Markdown
Member

@ofborg build python310Packages.python-swiftclient

@natsukium natsukium merged commit 82a2255 into NixOS:master Aug 18, 2023
@SuperSandro2000
Copy link
Copy Markdown
Member

It would be better to create a patch upstream and fetch it, but it's a lot of work I don't want to do right now to create an account on Gerrit and set up everything to contribute to an OpenStack project.

That's not the problem usually, the contributed patches are not always looked at and can take a good while to get merged and released.

Comment on lines +28 to +29
sed -i '/^scripts =/d' setup.cfg
sed -i '/bin\/swift/d' setup.cfg
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This could be combined into one sed call

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants