From: Tom Clegg Date: Thu, 13 Feb 2020 02:50:07 +0000 (-0500) Subject: 16039: Touch python clients so they run tests with the latest SDK. X-Git-Tag: 2.1.0~298^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a4f57793d8757c451330e6d861eb3c5af2bff3b8 16039: Touch python clients so they run tests with the latest SDK. Otherwise, "pip install" (during "install services/nodemanager", for example) downgrades the SDK from the current version to the latest version published on pip, and all test suites run with that version, instead of the version we think we're testing. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py index aa68933c6a..07d6beffd6 100644 --- a/sdk/cwl/setup.py +++ b/sdk/cwl/setup.py @@ -36,7 +36,8 @@ setup(name='arvados-cwl-runner', 'bin/arvados-cwl-runner', ], # Note that arvados/build/run-build-packages.sh looks at this - # file to determine what version of cwltool and schema-salad to build. + # file to determine what version of cwltool and schema-salad to + # build. install_requires=[ 'cwltool==1.0.20190831161204', 'schema-salad==4.5.20190815125611', @@ -63,5 +64,5 @@ setup(name='arvados-cwl-runner', 'mock>=1.0', 'subprocess32>=3.5.1', ], - zip_safe=True - ) + zip_safe=True, +) diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py index af00142a04..59b49a19fe 100755 --- a/sdk/pam/setup.py +++ b/sdk/pam/setup.py @@ -53,5 +53,5 @@ setup(name='arvados-pam', ], test_suite='tests', tests_require=['pbr<1.7.0', 'mock>=1.0', 'python-pam'], - zip_safe=False - ) + zip_safe=False, +) diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py index a2b9a0ca92..75e8f85fbd 100644 --- a/services/nodemanager/setup.py +++ b/services/nodemanager/setup.py @@ -56,5 +56,5 @@ setup(name='arvados-node-manager', 'apache-libcloud==2.5.0', 'subprocess32>=3.5.1', ], - zip_safe=False - ) + zip_safe=False, +) diff --git a/tools/crunchstat-summary/setup.py b/tools/crunchstat-summary/setup.py index 40c5a2f9a3..557b6d3f4e 100755 --- a/tools/crunchstat-summary/setup.py +++ b/tools/crunchstat-summary/setup.py @@ -42,5 +42,5 @@ setup(name='crunchstat_summary', ], test_suite='tests', tests_require=['pbr<1.7.0', 'mock>=1.0'], - zip_safe=False - ) + zip_safe=False, +)