Skip to content

corrscope: remove setuptools dependency#249837

Merged
natsukium merged 1 commit intoNixOS:masterfrom
tjni:corrscope
Aug 18, 2023
Merged

corrscope: remove setuptools dependency#249837
natsukium merged 1 commit intoNixOS:masterfrom
tjni:corrscope

Conversation

@tjni
Copy link
Copy Markdown
Contributor

@tjni tjni commented Aug 17, 2023

Description of changes

Upstream specifies a dependency on setuptools in its pyproject.toml that is going to be caught by stronger dependency validation when we switch to build for building Python packages. It is only there because of a bug in old versions of poetry, so I'm pulling in a patch I submitted upstream to remove it again, hopeful that it will be accepted.

Opportunistically also changing the sha256 attribute in fetchFromGitHub to hash.

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.

@tjni tjni mentioned this pull request Aug 17, 2023
Closed
@ofborg ofborg bot requested a review from OPNA2608 August 17, 2023 23:18
@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 17, 2023
@natsukium
Copy link
Copy Markdown
Member

natsukium commented Aug 18, 2023 

building '/nix/store/pxbcnwa0q5ny0rkay3qhqrnm9qb79rnd-corrscope-0.8.1-test-version.drv'...
env HOME=$TMPDIR /nix/store/liacsbhkqqlkzj0j2hi8p33sh7vj6x60-corrscope-0.8.1/bin/corr --version returned a non-zero exit code.
Traceback (most recent call last):
  File "/nix/store/liacsbhkqqlkzj0j2hi8p33sh7vj6x60-corrscope-0.8.1/bin/.corr-wrapped", line 6, in <module>
    from corrscope.cli import main
  File "/nix/store/liacsbhkqqlkzj0j2hi8p33sh7vj6x60-corrscope-0.8.1/lib/python3.10/site-packages/corrscope/cli.py", line 9, in <module>
    from corrscope.channel import ChannelConfig
  File "/nix/store/liacsbhkqqlkzj0j2hi8p33sh7vj6x60-corrscope-0.8.1/lib/python3.10/site-packages/corrscope/channel.py", line 7, in <module>
    from ruamel.yaml.comments import CommentedMap
ModuleNotFoundError: No module named 'ruamel.yaml'

This PR did not cause this, but just in case.

natsukium
natsukium approved these changes Aug 18, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@natsukium natsukium left a comment

Choose a reason for hiding this comment

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

I will merge it since this failure is outside the scope of this PR.

@natsukium natsukium merged commit 203e459 into NixOS:master Aug 18, 2023
@tjni
Copy link
Copy Markdown
Contributor Author

tjni commented Aug 18, 2023

Thank you! I am worried that this could be because ruamel.yaml switched to using PEP 420 implicit namespace packages but ruamel.base did not. I saw this failure in a different application as well back when ruamel.yaml was updated. We will need to come up with a solution for this sort of thing as well.

@tjni tjni deleted the corrscope branch August 18, 2023 01:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@natsukium natsukium natsukium approved these changes

@OPNA2608 OPNA2608 Awaiting requested review from OPNA2608

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@tjni @natsukium