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

Jump to bottom

buildPythonPackage: add support for setupPyGlobalFlags (2) #64701

Merged
merged 1 commit into from Jul 15, 2019
Merged

buildPythonPackage: add support for setupPyGlobalFlags (2) #64701

merged 1 commit into from Jul 15, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Jul 13, 2019

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.

@FRidh FRidh mentioned this pull request Jul 13, 2019
Merged
10 tasks
@FRidh FRidh requested a review from abbradar July 13, 2019 11:37
@FRidh
Copy link
Member Author

FRidh commented Jul 13, 2019

I think this is a good time to also rename the two options to get rid of the setupPy part.

abbradar
abbradar approved these changes Jul 13, 2019
View reviewed changes
Copy link
Member

@abbradar abbradar left a comment

Choose a reason for hiding this comment

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

Small moment: the commit message is still about setupPyDistFlags ;)

Didn't actually test it now because I'll die rebuilding all the world and Tensorflow. Testing it on virt-manager would be easier. @aske?

@abbradar
Copy link
Member

BTW we'll also need to test pyproject-using packages with flags - maybe they actually needed global flags all along.

@FRidh
Copy link
Member Author

FRidh commented Jul 13, 2019

There are not that many upstreams that already use pyproject, let alone those that require these flags.

@FRidh FRidh changed the title buildPythonPackage: add support for setupPyDistFlags (2) buildPythonPackage: add support for setupPyGlobalFlags (2) Jul 13, 2019
@FRidh
Copy link
Member Author

FRidh commented Jul 13, 2019

I would like to rename the options to buildOptions, globalOptions and installOptions to match with pip. This will however break backwards compatibility for setupPyBuildFlags and installFlags.

@abbradar
Copy link
Member

abbradar commented Jul 13, 2019 •
edited

Sounds good to me! We could leave old options and append them to the new ones with builtins.trace for a while, to give people time to move.

@FRidh
Copy link
Member Author

FRidh commented Jul 13, 2019

Some bike-shedding: Options or Flags? The latter is used more commonly in Nixpkgs, but the former matches with pip.

@abbradar
Copy link
Member

I'd say Options because otherwise we'll have collisions with buildFlags etc from autoconf/make-based builds, and we may want to use both for.... I'm not sure we actually want to :D

@abbradar
Copy link
Member

Anyway, buildOptions is better to be visibly different from usual buildFlags so people distinguish them easier.

@FRidh
Copy link
Member Author

FRidh commented Jul 15, 2019

I will keep the renaming for another time.

@FRidh FRidh merged commit 7da15d9 into NixOS:staging Jul 15, 2019
@FRidh FRidh deleted the setuppy branch July 15, 2019 15:48
@aske aske mentioned this pull request Nov 20, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abbradar abbradar abbradar approved these changes

Assignees
No one assigned
Labels
2.status: work-in-progress 6.topic: python 8.has: documentation 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@FRidh @abbradar