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

Revert "Only install enum34 on Python <3.4 versions" #14844

Merged
merged 1 commit into from
Nov 30, 2017
Merged

Revert "Only install enum34 on Python <3.4 versions" #14844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions tensorflow/tools/pip_package/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@

REQUIRED_PACKAGES = [
'absl-py',
# weakref.finalize introduced in Python 3.4
'backports.weakref >= 1.0rc1; python_version < "3.4"',
# enum module introduced in Python 3.4
'enum34 >= 1.1.6; python_version < "3.4"',
# Needed for unittest.mock in Python 2
'mock >= 2.0.0; python_version < "3.0"',
'enum34 >= 1.1.6',
'numpy >= 1.12.1',
'six >= 1.10.0',
'protobuf >= 3.4.0',
Expand All @@ -57,6 +52,8 @@
REQUIRED_PACKAGES.append('wheel >= 0.26')
else:
REQUIRED_PACKAGES.append('wheel')
# mock comes with unittest.mock for python3, need to install for python2
REQUIRED_PACKAGES.append('mock >= 2.0.0')

# tf-nightly should depend on tb-nightly
if 'tf_nightly' in project_name:
Expand All @@ -65,6 +62,10 @@
REQUIRED_PACKAGES[i] = 'tb-nightly >= 1.5.0a0, < 1.6.0a0'
break

# weakref.finalize was introduced in Python 3.4
if sys.version_info < (3, 4):
REQUIRED_PACKAGES.append('backports.weakref >= 1.0rc1')

# pylint: disable=line-too-long
CONSOLE_SCRIPTS = [
'freeze_graph = tensorflow.python.tools.freeze_graph:main',
Expand Down