From: Fernando Monserrat Date: Fri, 23 Mar 2018 16:22:44 +0000 (-0300) Subject: 13200:test to remove prefix on python X-Git-Tag: 1.1.4~14^2~15 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ab052248e5637d7d0a3ad8636dfd1b674a2ccc45 13200:test to remove prefix on python Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat --- diff --git a/build/run-library.sh b/build/run-library.sh index 238d6d62cc..677695c698 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -50,7 +50,7 @@ version_from_git() { return fi - local git_ts git_hash prefix + local git_ts git_hash if [[ -n "$1" ]] ; then prefix="$1" else diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py index d9dd970c82..0e9ee945fb 100644 --- a/sdk/cwl/setup.py +++ b/sdk/cwl/setup.py @@ -16,7 +16,7 @@ README = os.path.join(SETUP_DIR, 'README.rst') tagger = egg_info_cmd.egg_info version = os.environ.get("ARVADOS_BUILDING_VERSION") if not version: - version = "" + version = "1.0" try: import gittaggers tagger = gittaggers.EggInfoFromGit diff --git a/sdk/python/setup.py b/sdk/python/setup.py index 5804517a6c..88bf51e8a8 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst') tagger = egg_info_cmd.egg_info version = os.environ.get("ARVADOS_BUILDING_VERSION") if not version: - version = "" + version = "0.1" try: import gittaggers tagger = gittaggers.EggInfoFromGit diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py index 1506c20820..6a6a96a045 100644 --- a/services/dockercleaner/setup.py +++ b/services/dockercleaner/setup.py @@ -12,7 +12,7 @@ from setuptools import setup, find_packages tagger = egg_info_cmd.egg_info version = os.environ.get("ARVADOS_BUILDING_VERSION") if not version: - version = "" + version = "0.1" try: import gittaggers tagger = gittaggers.EggInfoFromGit diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py index 437e95e272..454c24edbf 100644 --- a/services/nodemanager/setup.py +++ b/services/nodemanager/setup.py @@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst') tagger = egg_info_cmd.egg_info version = os.environ.get("ARVADOS_BUILDING_VERSION") if not version: - version = "" + version = "0.1" try: import gittaggers tagger = gittaggers.EggInfoFromGit