Merge branch '15888-remove-py2-from-test' into master

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

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index e5126c12b0f567ba64f251a483e0a1ddf055d8ef..430350b885971b945b56d625363e8f26e5f06e1f 100644 (file)
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) The Arvados Authors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
@@ -28,7 +28,7 @@ setup(name='arvados-python-client',
       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=[
@@ -37,26 +37,34 @@ 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 >=1.0.6, <2.0.0',
+          '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.15.54',
+          'pycurl >=7.19.5.1, <7.43.0.4', # 7.43.0.4 removes support for python2
+          'ruamel.yaml >=0.15.54, <=0.16.5',
           'setuptools',
           'ws4py >=0.4.2',
-          'subprocess32 >=3.5.1',
+          'rsa < 4.1'
+      ],
+      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'],
+      tests_require=['pbr<1.7.0', 'mock>=1.0,<4', 'PyYAML'],
       zip_safe=False
       )