projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13306: Adds declaration of py2/3 support to arvados cwl and python sdks
[arvados.git]
/
sdk
/
python
/
setup.py
diff --git
a/sdk/python/setup.py
b/sdk/python/setup.py
index 5804517a6c168b0bc072bd3edcd7d92b6cd39e81..5c781b158350fa6d7d869b061b24d0cfd95dcae1 100644
(file)
--- a/
sdk/python/setup.py
+++ b/
sdk/python/setup.py
@@
-3,24
+3,18
@@
#
# SPDX-License-Identifier: Apache-2.0
#
# SPDX-License-Identifier: Apache-2.0
+from __future__ import absolute_import
import os
import sys
import os
import sys
-import
setuptools.command.egg_info as egg_info_cmd
+import
re
from setuptools import setup, find_packages
SETUP_DIR = os.path.dirname(__file__) or '.'
README = os.path.join(SETUP_DIR, 'README.rst')
from setuptools import setup, find_packages
SETUP_DIR = os.path.dirname(__file__) or '.'
README = os.path.join(SETUP_DIR, 'README.rst')
-tagger = egg_info_cmd.egg_info
-version = os.environ.get("ARVADOS_BUILDING_VERSION")
-if not version:
- version = ""
- try:
- import gittaggers
- tagger = gittaggers.EggInfoFromGit
- except ImportError:
- pass
+import arvados_version
+version = arvados_version.get_version(SETUP_DIR, "arvados")
short_tests_only = False
if '--short-tests-only' in sys.argv:
short_tests_only = False
if '--short-tests-only' in sys.argv:
@@
-52,17
+46,21
@@
setup(name='arvados-python-client',
('share/doc/arvados-python-client', ['LICENSE-2.0.txt', 'README.rst']),
],
install_requires=[
('share/doc/arvados-python-client', ['LICENSE-2.0.txt', 'README.rst']),
],
install_requires=[
- 'ciso8601 >=1.0.
0, <=1.0.4
',
+ 'ciso8601 >=1.0.
6, <2.0.0
',
'future',
'google-api-python-client >=1.6.2, <1.7',
'httplib2 >=0.9.2',
'pycurl >=7.19.5.1',
'future',
'google-api-python-client >=1.6.2, <1.7',
'httplib2 >=0.9.2',
'pycurl >=7.19.5.1',
- 'ruamel.yaml >=0.1
3.
7',
+ 'ruamel.yaml >=0.1
5.54, <=0.15.7
7',
'setuptools',
'setuptools',
- 'ws4py <0.4',
+ 'ws4py >=0.4.2',
+ 'subprocess32 >=3.5.1',
+ ],
+ classifiers=[
+ 'Programming Language :: Python :: 2',
+ 'Programming Language :: Python :: 3',
],
test_suite='tests',
tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
],
test_suite='tests',
tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
- zip_safe=False,
- cmdclass={'egg_info': tagger},
+ zip_safe=False
)
)