diff options
author | Yuchen Zeng <zyc@google.com> | 2017-03-22 10:54:31 -0700 |
---|---|---|
committer | Yuchen Zeng <zyc@google.com> | 2017-03-22 10:54:31 -0700 |
commit | 937302b0df8d18f0cba94b2fd5f9804a138c0b3a (patch) | |
tree | 671f0b2df4a05551be02580c5b2c6444c0aa5ff3 /setup.py | |
parent | eb799b78b3b260722a74bfcaa14b43ecaa9341ae (diff) | |
parent | be0dba162edf8a105a0e529f1e70e2b352137d4c (diff) |
Merge remote-tracking branch 'upstream/master' into cares_rebase
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -216,14 +216,13 @@ PACKAGE_DIRECTORIES = { INSTALL_REQUIRES = ( 'six>=1.5.2', - 'enum34>=1.0.4', # TODO(atash): eventually split the grpcio package into a metapackage # depending on protobuf and the runtime component (independent of protobuf) 'protobuf>=3.2.0', ) if not PY3: - INSTALL_REQUIRES += ('futures>=2.2.0',) + INSTALL_REQUIRES += ('futures>=2.2.0', 'enum34>=1.0.4') SETUP_REQUIRES = INSTALL_REQUIRES + ( 'sphinx>=1.3', |