21601: Move --short-tests-only check to arvados_version

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

diff --git a/sdk/cwl/arvados_version.py b/sdk/cwl/arvados_version.py
index 020ec3873829b73fd9ae41c4f26764f88ce732e2..b594f88a7c87b6c5a021131602a088e80833a4a4 100644 (file)
--- 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 020ec3873829b73fd9ae41c4f26764f88ce732e2..b594f88a7c87b6c5a021131602a088e80833a4a4 100644 (file)
--- 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 e3d66aa472e655e4dbbd92d755c8adf28f9b8f0b..00429de844d3aeb384336166cdc3ac3cfe8da1e9 100644 (file)
--- 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 020ec3873829b73fd9ae41c4f26764f88ce732e2..b594f88a7c87b6c5a021131602a088e80833a4a4 100644 (file)
--- 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 2b386c70b47aa2c925b87aedff14838297b88315..565fdcd1ea3c582057bf70d9fdf8633c3c45dd94 100644 (file)
--- 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 020ec3873829b73fd9ae41c4f26764f88ce732e2..b594f88a7c87b6c5a021131602a088e80833a4a4 100644 (file)
--- 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 b04829652e948b4de22c3c433620287c4fb51ef1..80a26980f178d763820cf2bbe1a8d8c72de95a94 100644 (file)
--- 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 020ec3873829b73fd9ae41c4f26764f88ce732e2..b594f88a7c87b6c5a021131602a088e80833a4a4 100644 (file)
--- 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 98be9f27025b4c3c7828626dd7676fddbe845dfd..4bb9df2ba940b6a9c9e1fe445a55b481dad61aa5 100755 (executable)
--- 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 020ec3873829b73fd9ae41c4f26764f88ce732e2..b594f88a7c87b6c5a021131602a088e80833a4a4 100644 (file)
--- 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),