From a683ec930d6658145b2e96131288f4ef3000a7d5 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Sat, 16 Mar 2024 19:10:15 -0400 Subject: [PATCH] 21601: Move --short-tests-only check to arvados_version Arvados-DCO-1.1-Signed-off-by: Brett Smith --- sdk/cwl/arvados_version.py | 8 ++++++++ sdk/python/arvados_version.py | 8 ++++++++ sdk/python/setup.py | 6 +----- services/dockercleaner/arvados_version.py | 8 ++++++++ services/dockercleaner/setup.py | 6 +----- services/fuse/arvados_version.py | 8 ++++++++ services/fuse/setup.py | 6 +----- tools/crunchstat-summary/arvados_version.py | 8 ++++++++ tools/crunchstat-summary/setup.py | 6 +----- tools/user-activity/arvados_version.py | 8 ++++++++ 10 files changed, 52 insertions(+), 20 deletions(-) diff --git a/sdk/cwl/arvados_version.py b/sdk/cwl/arvados_version.py index 020ec38738..b594f88a7c 100644 --- a/sdk/cwl/arvados_version.py +++ b/sdk/cwl/arvados_version.py @@ -71,6 +71,14 @@ if REPO_PATH is None: if (SETUP_DIR / mod_name).is_dir() ) +def short_tests_only(arglist=sys.argv): + try: + arglist.remove('--short-tests-only') + except ValueError: + return False + else: + return True + def git_log_output(path, *args): return subprocess.check_output( ['git', '-C', str(REPO_PATH), diff --git a/sdk/python/arvados_version.py b/sdk/python/arvados_version.py index 020ec38738..b594f88a7c 100644 --- a/sdk/python/arvados_version.py +++ b/sdk/python/arvados_version.py @@ -71,6 +71,14 @@ if REPO_PATH is None: if (SETUP_DIR / mod_name).is_dir() ) +def short_tests_only(arglist=sys.argv): + try: + arglist.remove('--short-tests-only') + except ValueError: + return False + else: + return True + def git_log_output(path, *args): return subprocess.check_output( ['git', '-C', str(REPO_PATH), diff --git a/sdk/python/setup.py b/sdk/python/setup.py index e3d66aa472..00429de844 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -17,11 +17,7 @@ README = os.path.join(SETUP_DIR, 'README.rst') import arvados_version version = arvados_version.get_version(SETUP_DIR, "arvados") - -short_tests_only = False -if '--short-tests-only' in sys.argv: - short_tests_only = True - sys.argv.remove('--short-tests-only') +short_tests_only = arvados_version.short_tests_only() class BuildPython(build_py.build_py): """Extend setuptools `build_py` to generate API documentation diff --git a/services/dockercleaner/arvados_version.py b/services/dockercleaner/arvados_version.py index 020ec38738..b594f88a7c 100644 --- a/services/dockercleaner/arvados_version.py +++ b/services/dockercleaner/arvados_version.py @@ -71,6 +71,14 @@ if REPO_PATH is None: if (SETUP_DIR / mod_name).is_dir() ) +def short_tests_only(arglist=sys.argv): + try: + arglist.remove('--short-tests-only') + except ValueError: + return False + else: + return True + def git_log_output(path, *args): return subprocess.check_output( ['git', '-C', str(REPO_PATH), diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py index 2b386c70b4..565fdcd1ea 100644 --- a/services/dockercleaner/setup.py +++ b/services/dockercleaner/setup.py @@ -15,11 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst') import arvados_version version = arvados_version.get_version(SETUP_DIR, "arvados_docker") - -short_tests_only = False -if '--short-tests-only' in sys.argv: - short_tests_only = True - sys.argv.remove('--short-tests-only') +short_tests_only = arvados_version.short_tests_only() setup(name="arvados-docker-cleaner", version=version, diff --git a/services/fuse/arvados_version.py b/services/fuse/arvados_version.py index 020ec38738..b594f88a7c 100644 --- a/services/fuse/arvados_version.py +++ b/services/fuse/arvados_version.py @@ -71,6 +71,14 @@ if REPO_PATH is None: if (SETUP_DIR / mod_name).is_dir() ) +def short_tests_only(arglist=sys.argv): + try: + arglist.remove('--short-tests-only') + except ValueError: + return False + else: + return True + def git_log_output(path, *args): return subprocess.check_output( ['git', '-C', str(REPO_PATH), diff --git a/services/fuse/setup.py b/services/fuse/setup.py index b04829652e..80a26980f1 100644 --- a/services/fuse/setup.py +++ b/services/fuse/setup.py @@ -20,11 +20,7 @@ if os.environ.get('ARVADOS_BUILDING_VERSION', False): 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: - short_tests_only = True - sys.argv.remove('--short-tests-only') +short_tests_only = arvados_version.short_tests_only() setup(name='arvados_fuse', version=version, diff --git a/tools/crunchstat-summary/arvados_version.py b/tools/crunchstat-summary/arvados_version.py index 020ec38738..b594f88a7c 100644 --- a/tools/crunchstat-summary/arvados_version.py +++ b/tools/crunchstat-summary/arvados_version.py @@ -71,6 +71,14 @@ if REPO_PATH is None: if (SETUP_DIR / mod_name).is_dir() ) +def short_tests_only(arglist=sys.argv): + try: + arglist.remove('--short-tests-only') + except ValueError: + return False + else: + return True + def git_log_output(path, *args): return subprocess.check_output( ['git', '-C', str(REPO_PATH), diff --git a/tools/crunchstat-summary/setup.py b/tools/crunchstat-summary/setup.py index 98be9f2702..4bb9df2ba9 100755 --- a/tools/crunchstat-summary/setup.py +++ b/tools/crunchstat-summary/setup.py @@ -20,11 +20,7 @@ if os.environ.get('ARVADOS_BUILDING_VERSION', False): 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: - short_tests_only = True - sys.argv.remove('--short-tests-only') +short_tests_only = arvados_version.short_tests_only() setup(name='crunchstat_summary', version=version, diff --git a/tools/user-activity/arvados_version.py b/tools/user-activity/arvados_version.py index 020ec38738..b594f88a7c 100644 --- a/tools/user-activity/arvados_version.py +++ b/tools/user-activity/arvados_version.py @@ -71,6 +71,14 @@ if REPO_PATH is None: if (SETUP_DIR / mod_name).is_dir() ) +def short_tests_only(arglist=sys.argv): + try: + arglist.remove('--short-tests-only') + except ValueError: + return False + else: + return True + def git_log_output(path, *args): return subprocess.check_output( ['git', '-C', str(REPO_PATH), -- 2.30.2