X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8f987a9271eda80697b3a8fc53e7ebb0f93816f9..89b90c41d1aa07933a3ac43e6a2d9edddb4f3c15:/sdk/python/setup.py diff --git a/sdk/python/setup.py b/sdk/python/setup.py index 88bf51e8a8..0fc2dde31b 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -3,24 +3,18 @@ # # SPDX-License-Identifier: Apache-2.0 +from __future__ import absolute_import 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') -tagger = egg_info_cmd.egg_info -version = os.environ.get("ARVADOS_BUILDING_VERSION") -if not version: - version = "0.1" - 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: @@ -43,6 +37,7 @@ setup(name='arvados-python-client', 'bin/arv-keepdocker', 'bin/arv-ls', 'bin/arv-migrate-docker19', + 'bin/arv-federation-migrate', 'bin/arv-normalize', 'bin/arv-put', 'bin/arv-run', @@ -52,17 +47,24 @@ setup(name='arvados-python-client', ('share/doc/arvados-python-client', ['LICENSE-2.0.txt', 'README.rst']), ], install_requires=[ - 'ciso8601 >=1.0.0, <=1.0.4', + 'ciso8601 >=2.0.0', 'future', 'google-api-python-client >=1.6.2, <1.7', 'httplib2 >=0.9.2', 'pycurl >=7.19.5.1', - 'ruamel.yaml >=0.13.7', + 'ruamel.yaml >=0.15.54, <=0.15.77', 'setuptools', - 'ws4py <0.4', + 'ws4py >=0.4.2', + ], + extras_require={ + ':os.name=="posix" and python_version<"3"': ['subprocess32 >= 3.5.1'], + ':python_version<"3"': ['pytz'], + }, + classifiers=[ + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 3', ], test_suite='tests', tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'], - zip_safe=False, - cmdclass={'egg_info': tagger}, + zip_safe=False )