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

numpy: fix distutils patch for 1.19.0 #92112

Merged
merged 1 commit into from Jul 4, 2020
Merged

numpy: fix distutils patch for 1.19.0 #92112

merged 1 commit into from Jul 4, 2020

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Jul 3, 2020

Motivation for this change

The python3Packages.numpy build is broken on darwin after update to 1.19.0

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@veprbl veprbl added this to WIP in Staging via automation Jul 3, 2020
@veprbl veprbl moved this from WIP to Needs review in Staging Jul 3, 2020
Staging automation moved this from Needs review to Ready Jul 3, 2020
jonringer
jonringer approved these changes Jul 3, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

nothing looks darwin specific.
but diff LGTM

@veprbl
Copy link
Member Author

veprbl commented Jul 3, 2020

@jonringer The patch is only applied when python is built with clang.

@jonringer
Copy link
Contributor

Ah, I suspected it was a "darwin-only" code path. but the diff looks good so, I don't think it would be any harm

@jonringer
Copy link
Contributor

@GrahamcOfBorg build python2Packages.numpy
@GrahamcOfBorg build python3Packages.numpy
@GrahamcOfBorg build python37Packages.numpy

@veprbl veprbl changed the base branch from staging to staging-next July 4, 2020 11:10
@veprbl
Copy link
Member Author

veprbl commented Jul 4, 2020

Changed target to staging-next for #91090

@veprbl veprbl removed the request for review from Ma27 July 4, 2020 11:33
FRidh
FRidh reviewed Jul 4, 2020
View reviewed changes
pkgs/development/python-modules/numpy/numpy-distutils-C++.patch
@@ -26,6 +25,6 @@ index 6ed5eec..82a88b5 100644
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
+ extra_postargs, display = display)
+
except DistutilsExecError:
msg = str(get_exception())
except DistutilsExecError as e:
Copy link
Member

@FRidh FRidh Jul 4, 2020 •
edited

Choose a reason for hiding this comment

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

hope they don't run pylint as part of the tests because pylint doesn't like variables this short ;)

except DistUtilsExecError as exc:
    raise CompileError from exc

@FRidh FRidh merged commit 721d0c4 into NixOS:staging-next Jul 4, 2020
Staging automation moved this from Ready to Done Jul 4, 2020
@veprbl veprbl deleted the pr/numpy_1_19_0_fix branch July 4, 2020 20:35
@vcunat
Copy link
Member

vcunat commented Jul 11, 2020 •
edited

Any plans for python2Packages.numpy? The problem is that there the version is overridden to 1.16.5 and the updated patch won't apply...

@veprbl
Copy link
Member Author

veprbl commented Jul 11, 2020

@vcunat Thanks for bringing this up. I assumed that the old numpy version would be in a separate expression, like we have for python2Packages.matplotlib. #92968 should address this.

@veprbl veprbl restored the pr/numpy_1_19_0_fix branch December 1, 2020 16:47
@veprbl veprbl deleted the pr/numpy_1_19_0_fix branch December 1, 2020 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh left review comments

@jonringer jonringer jonringer approved these changes

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 0
Projects
Staging
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@veprbl @jonringer @vcunat @FRidh