Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 8 python packages in python-unstable #64952

Merged
merged 8 commits into from Jul 17, 2019

Conversation

costrouc
Copy link
Member

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Member

@teto teto left a comment

Choose a reason for hiding this comment

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

Some of the edits seem like unnecessary churn unless we have a specific nix style to respect (the conversion from one liners to one package per line for instance) but overall looks good.

Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Can you drop

  • pythonPackages.pydot_ng: refactor fix broken build

#64462 is a more complete fix, but I'm not sure if it should be removed from nixpkgs
since it's dead #64462 (comment)

@costrouc
Copy link
Member Author

@worldofpeace I have removed pythonPackages.pydot_ng from the PR. Ready for merge. I have nix-review running and everything looks good so far (about 50% done)

@ofborg ofborg bot requested a review from domenkozar July 17, 2019 13:46
@worldofpeace
Copy link
Contributor

@FRidh I feel like the situation with the hashes being base32 probably isn't something to document specifically for python packages, but perhaps in general.

As for about pytest, I'm not sure if we've documented the situation with not mixing versions globally in
9.14.4.1. Contributing guidelines but it would be easy to add a note about pytest packages if something like that was there.

@worldofpeace
Copy link
Contributor

@costrouc When you supply the fixes for the requested changes it would help reviewers if you did easily fixup'able commits so the changes can easily be seen on github. That way I don't have to start over with the review, even if we're certain we got everything.

Otherwise LGTM, be sure to paste your nix-review report in a gist.

@FRidh
Copy link
Member

FRidh commented Jul 17, 2019

@worldofpeace you mean contrary to fixing up the commits directly? I always request for that instead, so I can just merge when I need to, instead of asking yet another time for squashing them. I guess there's pros and cons to both.

@worldofpeace
Copy link
Contributor

@FRidh That's because it's convenient for me to just fixup the authors history real quick and merge once I know it's good.

@costrouc
Copy link
Member Author

@worldofpeace so I should create a fixup commit after all the packages? Right now I do some rebase/fixup trickery so that I can keep each commit separate and dealing with a single package each.

@worldofpeace
Copy link
Contributor

@costrouc Essentially

Original commit

pythonPackages.jsonschema: 2.6.0 -> 3.0.1

"Please drop x input not needed" on jsonschema

pythonPackages.jsonschema: drop x input

Or even just a fixup! commit.
Is it uncommon for people to do this?

@costrouc
Copy link
Member Author

If I follow you are suggesting that I create additional commits and you will handle combining commits once the PR is ready for merge. I will do that from now on if there are any more recommended changes.

@worldofpeace
Copy link
Contributor

Yeah essentially, I think @FRidh is suggesting that it just adds an extra step for merge since you're waiting for the author to fix the history.

@teto
Copy link
Member

teto commented Jul 17, 2019

As @worldofpeace, I prefer fixup commits but I don't think it's possible from github's ui to squash the fixup ? does the rebase do that ?

@worldofpeace
Copy link
Contributor

@teto Oh no, I checkout the pr locally and just force push that.

@costrouc
Copy link
Member Author

Ready for merge. Here are the logs of nix-review https://gist.github.com/costrouc/b5bd51c2736378c0e5a3c5831e085fbd

I didn't wait for the nix-review to finish because I've been waiting on the last 5 packages for about 2 hours

@costrouc
Copy link
Member Author

@worldofpeace of peace is it normal for so many packages to not build in a nix-review?

@worldofpeace
Copy link
Contributor

@costrouc Some of the failures could have been caused by bf54079.

But we should be able to use https://hydra.nixos.org/jobset/nixpkgs/python-unstable to figure this out.
I think we're good for merge.

@worldofpeace worldofpeace merged commit 427ef4c into NixOS:python-unstable Jul 17, 2019
@costrouc
Copy link
Member Author

costrouc commented Jul 17, 2019

This broke aws-sam-translator which many packages depend on https://hydra.nixos.org/eval/1530873. Due to jsonschema as you expected

@worldofpeace
Copy link
Contributor

@costrouc
Copy link
Member Author

I'll submit a PR for that

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants