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 <tom@tomclegg.ca>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index aa68933c6abc17f2d19860c2cd838a3026546257..07d6beffd68bef7370b25f74694d28f869250c2c 100644 (file)
--- 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
           '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',
       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',
       ],
           '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 af00142a04756400491d52db4c9197f7ae094cdd..59b49a19fe4876562175c09adc6939c52bdb86b5 100755 (executable)
--- 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'],
       ],
       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 a2b9a0ca92458a5c3b7b2b4af414b5451b922b75..75e8f85fbd1b3bfb4fba3de66ec9d341e06fb5ed 100644 (file)
--- 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',
       ],
           '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 40c5a2f9a31be5922bba781b4b530d3b7363125f..557b6d3f4e688c263706b3b5036c52ccf98d6821 100755 (executable)
--- 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'],
       ],
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0'],

-      zip_safe=False
-      )
+      zip_safe=False,
+)