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

pythonPackages.nipype: 1.1.5 -> 1.1.7 #53254

Merged
merged 2 commits into from Jan 11, 2019
Merged

pythonPackages.nipype: 1.1.5 -> 1.1.7 #53254

merged 2 commits into from Jan 11, 2019

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Noticed it was broken in #53224

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 nox --run "nox-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.

@FRidh
Copy link
Member

FRidh commented Jan 3, 2019

@GrahamcOfBorg build pythonPackages.nipype python3Packages.nipype

FRidh
FRidh reviewed Jan 3, 2019
View reviewed changes
pkgs/development/python-modules/nipype/default.nix Outdated
xvfbwrapper
] ++ stdenv.lib.optional (!isPy3k) [
configparser
futures
];

checkInputs = [ pytest mock pytestcov pytest_xdist pytest-forked codecov which glibcLocales ];
buildInputs = [
Copy link
Member

Choose a reason for hiding this comment

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

These are typically only checkInputs

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah but when tests are disabled they don't get added to buildInputs so the build fails. See https://github.com/nipy/nipype/blob/dcc013b0187bf5312db9174f8cb8932991c601cb/nipype/info.py#L136

Copy link
Member

@FRidh FRidh Jan 5, 2019 •
edited

Choose a reason for hiding this comment

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

Here they say they want users to be able to run the tests:
nipy/nipype#2649 (comment)
So, strictly speaking, it's not a requirement to use the library. Therefore, I am of the opinion we should patch pytest* out of REQUIRES. Of course, it's only an improvement.

@worldofpeace
Copy link
Contributor Author

Darwin build is broken because of xvfbwrapper tests failing.
Maybe we should disable tests for darwin?

@worldofpeace
Copy link
Contributor Author

It's actually probably a good idea to just disable them entirely. 3f4b890

@worldofpeace
pythonPackages.nipype: 1.1.5 -> 1.1.7
9619e6a 
Fix build by dropping a patch for an issue that is already fixed.
See: nipy/nipype#2701

Also had to disable tests.
See: nipy/nipype#2839
@worldofpeace
pythonPackages.xvfbwrapper: disable tests
9257887 
See: cgoldberg/xvfbwrapper#30
@worldofpeace
Copy link
Contributor Author

I think I've done the things 😄

@dotlambda
Copy link
Member

@GrahamcOfBorg build pythonPackages.nipype python3Packages.nipype

@dotlambda dotlambda merged commit e9b34b1 into NixOS:master Jan 11, 2019
@dotlambda
Copy link
Member

I'm sure I did not click on "Squash and merge". Also, why am I the author of e9b34b1? GitHub seems to have fucked up again :(

@worldofpeace
Copy link
Contributor Author

Yeah It would appear that it was "Squash and merge", GitHub and it's sillyness 🤣

@worldofpeace worldofpeace deleted the nipype/1.1.7 branch January 11, 2019 20:06
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

@dotlambda dotlambda dotlambda left review comments

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@worldofpeace @FRidh @dotlambda @GrahamcOfBorg