[ARVADOS] updated: 2.1.0-2052-g1f8cb73d0
Git user
git at public.arvados.org
Thu Mar 10 21:49:20 UTC 2022
Summary of changes:
sdk/python/setup.py | 2 +-
tools/crunchstat-summary/setup.py | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
via 1f8cb73d024f1d37e9aef8364f1b5a3af0222740 (commit)
via d655e2addaba4168f76fb7c4e2e9f6d649917bcc (commit)
from a3522bb093bab34ce7d51d3cab23fcc44547cffc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 1f8cb73d024f1d37e9aef8364f1b5a3af0222740
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Mar 10 10:37:37 2022 -0500
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 <peter.amstutz at curii.com>
diff --git a/tools/crunchstat-summary/setup.py b/tools/crunchstat-summary/setup.py
index 8507990f5..a881390e4 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'],
commit d655e2addaba4168f76fb7c4e2e9f6d649917bcc
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Mar 10 10:03:34 2022 -0500
Put upper bound on PyCURL
Starting with PyCURL 7.45.0 it is incompatible with the version of GNU
TLS that ships with Debian 10.
no issue #
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index f82d44ab6..126b12f15 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -51,7 +51,7 @@ setup(name='arvados-python-client',
'google-api-python-client >=1.6.2, <2',
'google-auth<2',
'httplib2 >=0.9.2, <0.20.2',
- 'pycurl >=7.19.5.1',
+ 'pycurl >=7.19.5.1, <7.45.0',
'ruamel.yaml >=0.15.54, <0.17.11',
'setuptools',
'ws4py >=0.4.2',
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list