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

python3Packages.imageio: 2.4.1 -> 2.5.0 #56135

Merged
merged 2 commits into from Feb 22, 2019
Merged

Conversation

pmiddend
Copy link
Contributor

Motivation for this change

imageio now optionally needs imageio-ffmpeg, which I also put into this PR.

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.

@pmiddend pmiddend requested a review from FRidh as a code owner February 21, 2019 08:44
@pmiddend pmiddend changed the title Imageio update python3Packages.imageio: 2.4.1 -> 2.5.0 Feb 21, 2019
@pmiddend
Copy link
Contributor Author

@dotlambda I corrected all the things you noticed (thanks for the thorough review btw!), but noticed that imageio has an incompatibility with Python 2.7 anymore, see imageio/imageio#436 - so we'll have to wait for a word from the author.
The world would be so much simpler without Python 2 support. :/

checkInputs = [ pytest psutil ];
checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
imageio-ffmpeg ffmpeg
];
propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [
futures
enum34

Choose a reason for hiding this comment

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

I suspect this is where you could add pathlib (for imageio/imageio#436)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@almarklein Thanks, that's exactly where I put them.

, pytest
, numpy
, isPy3k
, ffmpeg

Choose a reason for hiding this comment

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

Are you sure that ffmpeg (and imageio-ffmpeg) should be hard-dependencies here? They are optional dependencies from imageio's point of view, mainly because ffmpeg is quite heavy.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@almarklein I see your concern, but declaring it as a function parameter in the place you mention isn't really "depending" on it at runtime. It's just used as part of checkInputs, to execute the tests.

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.imageio python3.pkgs.imageio

@pmiddend
Copy link
Contributor Author

@dotlambda Fixed.

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.imageio python3.pkgs.imageio

@dotlambda dotlambda merged commit 76edd96 into NixOS:master Feb 22, 2019
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.

None yet

4 participants