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

Add pipInstallFlags to all pip install invocations in python hooks #244444

Closed
wants to merge 1 commit into from

Conversation

balattar
Copy link

Description of changes

Resolves #172936

The pipInstallFlags environment variable was only being passed to the pip-install-hook. This causes other invocations of pip (like in setup-tools-build-hook and pip-buildhook`) to effectively ignore the pipInstallFlags argument to the buildPythonPackage function.

This PR resolves the issue by adding the install flags to every pip invocation in the python hooks

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.

Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

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

Also, I this this PR triggers many rebuilds, so I'd make it target branch python-updates that is worked on in #244135 . We could also ask @SuperSandro2000 for a review.

@@ -25,7 +27,7 @@ pipShellHook() {
export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
mkdir -p "$tmp_path/@pythonSitePackages@"
@pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" \
--no-build-isolation >&2
--no-build-isolation $pipInstallFlags >&2
Copy link
Contributor

Choose a reason for hiding this comment

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

In #239969 (cherry picked into #244135 ), I added support for pipBuildFlags, so this part is not needed once #244135 is merged.

@@ -33,7 +35,7 @@ setuptoolsShellHook() {
export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
mkdir -p "$tmp_path/@pythonSitePackages@"
eval "@pythonInterpreter@ -m pip install -e . --prefix $tmp_path \
--no-build-isolation >&2"
--no-build-isolation $pipInstallFlags >&2"
Copy link
Contributor

Choose a reason for hiding this comment

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

You do have a point about this flag though! And this is a change in behavior that needs to be documented. I also wonder: very few packages depend on setuptoolsBuildHook, so how did this requirement arise for you?

@doronbehar
Copy link
Contributor

Friendly ping @balattar

@doronbehar
Copy link
Contributor

Closing due to no reply by OP.

@doronbehar doronbehar closed this Sep 7, 2023
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.

Feature request: pipInstallFlags for shell hooks
3 participants