15370: Fix flaky test.

[arvados.git] / sdk / python / setup.py

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index a3d1661ed356fd28cd2df16d234317398a2bd234..126b12f156bea0b173fd4d3a2ca3c8766ee0d41a 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -1,19 +1,20 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# 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')
 
-try:
-    import gittaggers
-    tagger = gittaggers.EggInfoFromGit
-except ImportError:
-    tagger = egg_info_cmd.egg_info
+import arvados_version
+version = arvados_version.get_version(SETUP_DIR, "arvados")
 
 short_tests_only = False
 if '--short-tests-only' in sys.argv:
@@ -21,13 +22,13 @@ if '--short-tests-only' in sys.argv:
     sys.argv.remove('--short-tests-only')
 
 setup(name='arvados-python-client',
-      version='0.1',
+      version=version,
       description='Arvados client library',
       long_description=open(README).read(),
       author='Arvados',
       author_email='info@arvados.org',
       url="https://arvados.org",
-      download_url="https://github.com/curoverse/arvados.git",
+      download_url="https://github.com/arvados/arvados.git",
       license='Apache 2.0',
       packages=find_packages(),
       scripts=[
@@ -36,26 +37,29 @@ 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',
           'bin/arv-ws'
       ],
       data_files=[
           ('share/doc/arvados-python-client', ['LICENSE-2.0.txt', 'README.rst']),
       ],
       install_requires=[
-          'ciso8601',
+          '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',
+          'google-api-python-client >=1.6.2, <2',
+          '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',
           'setuptools',
-          'ws4py <0.4',
+          'ws4py >=0.4.2',
+      ],
+      classifiers=[
+          'Programming Language :: Python :: 3',
       ],
       test_suite='tests',
-      tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML'],
-      zip_safe=False,
-      cmdclass={'egg_info': tagger},
+      tests_require=['pbr<1.7.0', 'mock>=1.0,<4', 'PyYAML'],
+      zip_safe=False
       )