[ARVADOS] updated: 1.1.0-53-gde4ce53
Git user
git at public.curoverse.com
Thu Oct 12 16:24:22 EDT 2017
Summary of changes:
sdk/cwl/gittaggers.py | 3 ---
sdk/cwl/setup.py | 5 -----
sdk/python/gittaggers.py | 3 ---
3 files changed, 11 deletions(-)
via de4ce53753593df32da017bafa10e431ebdf9537 (commit)
from c798a4499117a696d84c41cf90d7c8b437ec7e37 (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 de4ce53753593df32da017bafa10e431ebdf9537
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Thu Oct 12 17:24:11 2017 -0300
12389: rollback
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index 6a248fa..764d0f1 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -6,7 +6,6 @@ from setuptools.command.egg_info import egg_info
import subprocess
import time
import os
-import requests
SETUP_DIR = os.path.dirname(__file__) or '.'
@@ -37,10 +36,8 @@ class EggInfoFromGit(egg_info):
return time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo)))
"""
def git_latest_tag(self):
- buildnumber = requests.get ('https://ci.curoverse.com/job/new-versioning-build-packages-centos7/lastBuild/buildNumber')
gitinfo = subprocess.check_output(
['git', 'describe', '--abbrev=0'])
- gitinfo = gitinfo + '-' + str(buildnumber.json())
return str(gitinfo)
def tags(self):
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 5cffbb6..ab3442b 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -7,7 +7,6 @@ import os
import sys
import subprocess
import setuptools.command.egg_info as egg_info_cmd
-import requests
from setuptools import setup, find_packages
@@ -22,12 +21,8 @@ except ImportError:
versionfile = os.path.join(SETUP_DIR, "arvados_cwl/_version.py")
try:
- buildnumber = requests.get ('https://ci.curoverse.com/job/new-versioning-build-packages-centos7/lastBuild/buildNumber')
gitinfo = subprocess.check_output(
['git', 'describe', '--abbrev=0'])
- gitinfo = gitinfo + '-' + str(buildnumber.json())
- return str(gitinfo)
-
with open(versionfile, "w") as f:
f.write("__version__ = '%s'\n" % gitinfo)
except Exception as e:
diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py
index 85f9989..8acbe27 100644
--- a/sdk/python/gittaggers.py
+++ b/sdk/python/gittaggers.py
@@ -5,7 +5,6 @@
from setuptools.command.egg_info import egg_info
import subprocess
import time
-import requests
class EggInfoFromGit(egg_info):
"""Tag the build with git commit timestamp.
@@ -26,10 +25,8 @@ class EggInfoFromGit(egg_info):
"""
def git_latest_tag(self):
- buildnumber = requests.get ('https://ci.curoverse.com/job/new-versioning-build-packages-centos7/lastBuild/buildNumber')
gitinfo = subprocess.check_output(
['git', 'describe', '--abbrev=0'])
- gitinfo = gitinfo + '-' + str(buildnumber.json())
return str(gitinfo)
def tags(self):
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list