projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19926: Remove "option 1/2" remnants from the Python SDK install docs
[arvados.git]
/
sdk
/
python
/
setup.py
diff --git
a/sdk/python/setup.py
b/sdk/python/setup.py
index d28df099879c907e5bd0bc5bd5498a4ae71fc2a1..1c65c4ced8ac8a61b6552279aee9584ef48c3b66 100644
(file)
--- a/
sdk/python/setup.py
+++ b/
sdk/python/setup.py
@@
-48,19
+48,22
@@
setup(name='arvados-python-client',
install_requires=[
'ciso8601 >=2.0.0',
'future',
install_requires=[
'ciso8601 >=2.0.0',
'future',
- 'google-api-python-client >=1.6.2, <2',
+ 'google-api-core <2.11.0', # 2.11.0rc1 is incompatible with google-auth<2
+ 'google-api-python-client >=2.1.0',
'google-auth<2',
'httplib2 >=0.9.2, <0.20.2',
'pycurl >=7.19.5.1, <7.45.0',
'google-auth<2',
'httplib2 >=0.9.2, <0.20.2',
'pycurl >=7.19.5.1, <7.45.0',
- 'ruamel.yaml >=0.15.54, <0.17.
11
',
+ 'ruamel.yaml >=0.15.54, <0.17.
22
',
'setuptools',
'ws4py >=0.4.2',
'setuptools',
'ws4py >=0.4.2',
- 'protobuf<4.0.0dev'
+ 'protobuf<4.0.0dev',
+ 'pyparsing<3',
+ 'setuptools>=40.3.0',
],
classifiers=[
'Programming Language :: Python :: 3',
],
test_suite='tests',
],
classifiers=[
'Programming Language :: Python :: 3',
],
test_suite='tests',
- tests_require=['pbr<1.7.0', 'mock>=1.0,<4', 'PyYAML'],
+ tests_require=['pbr<1.7.0', 'mock>=1.0,<4', 'PyYAML'
, 'parameterized'
],
zip_safe=False
)
zip_safe=False
)