From 1f8cb73d024f1d37e9aef8364f1b5a3af0222740 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 10 Mar 2022 10:37:37 -0500 Subject: [PATCH] crunchstat-summary pins to current Python SDK version Same logic as used for arvados-cwl-runner no issue # Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- tools/crunchstat-summary/setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/crunchstat-summary/setup.py b/tools/crunchstat-summary/setup.py index 8507990f5a..a881390e47 100755 --- a/tools/crunchstat-summary/setup.py +++ b/tools/crunchstat-summary/setup.py @@ -15,6 +15,11 @@ README = os.path.join(SETUP_DIR, 'README.rst') import arvados_version version = arvados_version.get_version(SETUP_DIR, "crunchstat_summary") +if os.environ.get('ARVADOS_BUILDING_VERSION', False): + pysdk_dep = "=={}".format(version) +else: + # On dev releases, arvados-python-client may have a different timestamp + pysdk_dep = "<={}".format(version) short_tests_only = False if '--short-tests-only' in sys.argv: @@ -38,7 +43,7 @@ setup(name='crunchstat_summary', ('share/doc/crunchstat_summary', ['agpl-3.0.txt']), ], install_requires=[ - 'arvados-python-client', + 'arvados-python-client{}'.format(pysdk_dep), ], test_suite='tests', tests_require=['pbr<1.7.0', 'mock>=1.0'], -- 2.30.2