Skip to content

Tensorflow py2 fixes #56820

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
Merged
merged 2 commits into from
Mar 4, 2019
Merged

Tensorflow py2 fixes #56820

merged 2 commits into from
Mar 4, 2019
+10 −5

Conversation

timokau
Copy link
Member

@timokau timokau commented Mar 4, 2019

Motivation for this change

CC @FRidh @jyp @averelld

Will merge this as soon as ofBorg approves to fix the current breakage on nixos-unstable.

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.

Sorry, something went wrong.

timokau added 2 commits March 4, 2019 14:08
@timokau
pythonPackages.tensorflow-tensorboard: fix python2 build

Verified

This commit was signed with the committer’s verified signature.
jtojnar Jan Tojnar
GPG key ID: 7FAB2A15F7A607A4
Verified
Learn about vigilant mode
9e95109 
Fix build after NixOS#56669. Update the
python2 hash and re-add the python2 `futures` dependency. Not sure if
there was a reason for it to be removed in the first place.
@timokau
pythonPackages.tensorflow: fix python<3.4 build
af7455b 
This was already added for the source build, but missing for the binary
build.
@timokau timokau requested a review from FRidh as a code owner March 4, 2019 13:13
@GrahamcOfBorg GrahamcOfBorg requested a review from abbradar March 4, 2019 13:38
@timokau timokau merged commit 2a5993d into NixOS:master Mar 4, 2019
@timokau timokau deleted the tensorflow-py2-fixes branch March 4, 2019 14:01
@timokau timokau mentioned this pull request Mar 17, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh

@abbradar abbradar

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
2 participants
@timokau @GrahamcOfBorg