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.

Sign up for GitHub

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

python: provide hasCxxDistutils attribute for pythonPackages.numpy #59811

Merged
merged 1 commit into from Apr 28, 2019
Merged

python: provide hasCxxDistutils attribute for pythonPackages.numpy #59811

merged 1 commit into from Apr 28, 2019

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Apr 18, 2019

Patching numpy.distutils used to be required for pythonPackages.cython
to build on darwin. It was later accidentally disabled during one of the
refactorings, but that did not break cython. This change reinstantiates
the patch. It still applies, so it should be low maintenance and it can
still be useful.

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@veprbl
python: provide hasCxxDistutils attribute for pythonPackages.numpy
244fffa 
Patching numpy.distutils used to be required for pythonPackages.cython
to build on darwin. It was later accidentally disabled during one of the
refactorings, but that did not break cython. This change reinstantiates
the patch. It still applies, so it should be low maintenance and it can
still be useful.
@veprbl veprbl requested a review from FRidh as a code owner April 18, 2019 03:08
@FRidh
Copy link
Member

FRidh commented Apr 18, 2019

How come it did not break the build, and in what way is it then still useful?

@FRidh FRidh self-assigned this Apr 18, 2019
@veprbl
Copy link
Member Author

veprbl commented Apr 23, 2019

How come it did not break the build, and in what way is it then still useful?

Probably because the pythonPackages.cython tests were disabled at some point

nixpkgs/pkgs/development/python-modules/Cython/default.nix

Lines 55 to 57 in 8c881a1

doCheck = false;
# doCheck = !stdenv.isDarwin;

Though the test was disabled (bca8144) before the patch was taken out (efbe87f)
This should be useful for the original purpose of fixing compilation of the C++ code for modules that use numpy.distutils. I don't expect that there are too many such instances. It might be still useful for pythonPackages.cython tests and maybe for building pythonPackages.xgboost on macOS, but I did not check that extensively.

@FRidh FRidh changed the base branch from master to staging April 28, 2019 07:17
@FRidh FRidh merged commit 8fa36fc into NixOS:staging Apr 28, 2019
@veprbl veprbl deleted the pr/numpy_reenable_distutils_patch branch December 1, 2020 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

Assignees

@FRidh FRidh

Labels
6.topic: python 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@veprbl @FRidh @GrahamcOfBorg