[ARVADOS] updated: 1.1.3-265-gd1a1142

Git user git at public.curoverse.com
Fri Mar 23 17:39:42 EDT 2018


Summary of changes:
 build/run-build-packages.sh   | 5 +----
 sdk/python/arvados_version.py | 2 +-
 sdk/python/setup.py           | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

  discards  208e6434663bf71c9c2aeb52c1f77ac42c5aae45 (commit)
  discards  72ec363342fc8c5ba405bfe5a1eb154c96ca5f1b (commit)
  discards  7bc3091196bb34b24dbbaa230648957410cb2ff6 (commit)
  discards  43f385d060db9bf75b34c36f7026ea88fe401b16 (commit)
  discards  b9991e10e12dd19eb51d680e6b732c6d3e46611d (commit)
  discards  e4cc6d3f509f7bdaef8d3532d7f92f4130b7bcf2 (commit)
  discards  a75f764ac04d88c4bf47a6104958078eef2a5410 (commit)
       via  d1a11420bd56432052d7813bb734a9d4a607413e (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (208e6434663bf71c9c2aeb52c1f77ac42c5aae45)
            \
             N -- N -- N (d1a11420bd56432052d7813bb734a9d4a607413e)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 d1a11420bd56432052d7813bb734a9d4a607413e
Author: Javier Bértoli <jbertoli at veritasgenetics.com>
Date:   Fri Mar 23 18:39:14 2018 -0300

    Trying some str formatting
    
    refs #13200
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at veritasgenetics.com>

diff --git a/sdk/python/arvados_version.py b/sdk/python/arvados_version.py
index bc8ce73..1d55981 100644
--- a/sdk/python/arvados_version.py
+++ b/sdk/python/arvados_version.py
@@ -17,4 +17,4 @@ class VersionInfoFromGit():
         gitinfo = subprocess.check_output(
             ['git', 'log', '--first-parent', '--max-count=1',
              '--format=format:%ct', '.']).strip()
-        return time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo)))
+        return str(time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo))))
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 1adc19f..1695159 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -18,7 +18,7 @@ if not version:
     try:
         import arvados_version
         vtag = arvados_version.VersionInfoFromGit()
-        version = vtag.git_latest_tag() + vtag.git_timestamp_tag()
+        version = str(vtag.git_latest_tag() + vtag.git_timestamp_tag())
     except ImportError:
         pass
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list