Merge pull request #30255 from yongtang:30200-environmet-markers

PiperOrigin-RevId: 257207713
This commit is contained in:
TensorFlower Gardener 2019-07-09 09:27:58 -07:00
commit d577a968ce

View File

@ -52,6 +52,8 @@ _VERSION = '1.14.0'
REQUIRED_PACKAGES = [ REQUIRED_PACKAGES = [
'absl-py >= 0.7.0', 'absl-py >= 0.7.0',
'astor >= 0.6.0', 'astor >= 0.6.0',
'backports.weakref >= 1.0rc1;python_version<"3.4"',
'enum34 >= 1.1.6;python_version<"3.4"',
'gast >= 0.2.0', 'gast >= 0.2.0',
'google_pasta >= 0.1.6', 'google_pasta >= 0.1.6',
'keras_applications >= 1.0.8', 'keras_applications >= 1.0.8',
@ -97,11 +99,6 @@ if 'tf_nightly' in project_name:
elif 'tensorflow_estimator' in pkg: elif 'tensorflow_estimator' in pkg:
REQUIRED_PACKAGES[i] = 'tf-estimator-nightly' REQUIRED_PACKAGES[i] = 'tf-estimator-nightly'
# weakref.finalize and enum were introduced in Python 3.4
if sys.version_info < (3, 4):
REQUIRED_PACKAGES.append('backports.weakref >= 1.0rc1')
REQUIRED_PACKAGES.append('enum34 >= 1.1.6')
# pylint: disable=line-too-long # pylint: disable=line-too-long
CONSOLE_SCRIPTS = [ CONSOLE_SCRIPTS = [
'toco_from_protos = tensorflow.lite.toco.python.toco_from_protos:main', 'toco_from_protos = tensorflow.lite.toco.python.toco_from_protos:main',