X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/196cb2e84834de79f25414de09a8d00bbe1a5eae..035b113f60302f6d9c265e6e3a63dbb3c5873153:/sdk/python/setup.py diff --git a/sdk/python/setup.py b/sdk/python/setup.py index a19b876fd3..6e3f59dd7e 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 +from __future__ import absolute_import import os import sys import re @@ -12,27 +13,8 @@ from setuptools import setup, find_packages SETUP_DIR = os.path.dirname(__file__) or '.' README = os.path.join(SETUP_DIR, 'README.rst') -env_version = os.environ.get("ARVADOS_BUILDING_VERSION") - -def save_version(module, v): - with open(os.path.join(SETUP_DIR, module, "_version.py"), 'w') as fp: - return fp.write("__version__ = '%s'\n" % v) - -def read_version(module): - with open(os.path.join(SETUP_DIR, module, "_version.py"), 'r') as fp: - return re.match("__version__ = '(.*)'$", fp.read()).groups()[0] - -if env_version: - save_version("arvados", env_version) -else: - try: - import arvados_version - vtag = arvados_version.VersionInfoFromGit() - save_version("arvados", vtag.git_latest_tag() + vtag.git_timestamp_tag()) - except ImportError: - pass - -version = read_version("arvados") +import arvados_version +version = arvados_version.get_version(SETUP_DIR, "arvados") short_tests_only = False if '--short-tests-only' in sys.argv: @@ -64,12 +46,12 @@ 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 >=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', - 'ruamel.yaml >=0.13.7', + 'ruamel.yaml >=0.13.11, <0.15', 'setuptools', 'ws4py <0.4', ],