[ARVADOS] updated: f1c20b66097f1bb37c0ffc8808b4a5831e91f87b
git at public.curoverse.com
git at public.curoverse.com
Mon Sep 29 12:29:42 EDT 2014
Summary of changes:
sdk/cli/arvados-cli.gemspec | 9 ++++++---
sdk/python/setup.py | 22 ++++++++++++++++++++--
sdk/ruby/arvados.gemspec | 9 ++++++---
services/fuse/setup.py | 22 ++++++++++++++++++++--
4 files changed, 52 insertions(+), 10 deletions(-)
via f1c20b66097f1bb37c0ffc8808b4a5831e91f87b (commit)
via c53ffcb20017ae0f99fc49095c7008555ac171cc (commit)
via 2ca602f880757f016f8d0d212b8851818decc718 (commit)
from f6d1dd8018f7facf8e4c1f3c82ce777fec1d5a6a (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 f1c20b66097f1bb37c0ffc8808b4a5831e91f87b
Merge: f6d1dd8 c53ffcb
Author: Brett Smith <brett at curoverse.com>
Date: Mon Sep 29 12:28:36 2014 -0400
Merge branch '3848-egg-default-git-tag-wip'
Closes #3848, #3952.
commit c53ffcb20017ae0f99fc49095c7008555ac171cc
Author: Brett Smith <brett at curoverse.com>
Date: Fri Sep 26 17:06:15 2014 -0400
3848: Package version numbers use UTC timestamps.
Per note-9 in the issue.
diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index 88a409c..9daae38 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -3,12 +3,15 @@ if not File.exists?('/usr/bin/git') then
exit
end
+git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":")
+git_timestamp = Time.at(git_timestamp.to_i).utc
+
Gem::Specification.new do |s|
s.name = 'arvados-cli'
- s.version = '0.1.' + `git log --first-parent --pretty=format:'%ci' -n 1 .`[0..18].gsub(/[ \-:]/,'')
- s.date = `git log --first-parent --pretty=format:'%ci' -n 1 .`[0..9]
+ s.version = "0.1.#{git_timestamp.strftime('%Y%m%d%H%M%S')}"
+ s.date = git_timestamp.strftime("%Y-%m-%d")
s.summary = "Arvados CLI tools"
- s.description = "Arvados command line tools, git commit " + `git log --pretty=format:'%H' -n 1 .`
+ s.description = "Arvados command line tools, git commit #{git_hash}"
s.authors = ["Arvados Authors"]
s.email = 'gem-dev at curoverse.com'
#s.bindir = '.'
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 5ae4e64..03637cb 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -2,6 +2,7 @@
import os
import subprocess
+import time
from setuptools import setup, find_packages
@@ -12,15 +13,13 @@ cmd_opts = {'egg_info': {}}
try:
git_tags = subprocess.check_output(
['git', 'log', '--first-parent', '--max-count=1',
- '--format=format:%ci %h', SETUP_DIR]).split()
- assert len(git_tags) == 4
+ '--format=format:%ct %h', SETUP_DIR]).split()
+ assert len(git_tags) == 2
except (AssertionError, OSError, subprocess.CalledProcessError):
pass
else:
- del git_tags[2] # Remove timezone
- for ii in [0, 1]: # Remove non-digits from other datetime fields
- git_tags[ii] = ''.join(c for c in git_tags[ii] if c.isdigit())
- cmd_opts['egg_info']['tag_build'] = '.{}{}.{}'.format(*git_tags)
+ git_tags[0] = time.strftime('%Y%m%d%H%M%S', time.gmtime(int(git_tags[0])))
+ cmd_opts['egg_info']['tag_build'] = '.{}.{}'.format(*git_tags)
setup(name='arvados-python-client',
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index cc6b5f5..85f4172 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -3,12 +3,15 @@ if not File.exists?('/usr/bin/git') then
exit
end
+git_timestamp, git_hash = `git log -n1 --first-parent --format=%ct:%H .`.chomp.split(":")
+git_timestamp = Time.at(git_timestamp.to_i).utc
+
Gem::Specification.new do |s|
s.name = 'arvados'
- s.version = '0.1.' + `git log --first-parent --pretty=format:'%ci' -n 1 .`[0..18].gsub(/[ \-:]/,'')
- s.date = `git log --first-parent --pretty=format:'%ci' -n 1 .`[0..9]
+ s.version = "0.1.#{git_timestamp.strftime('%Y%m%d%H%M%S')}"
+ s.date = git_timestamp.strftime("%Y-%m-%d")
s.summary = "Arvados client library"
- s.description = "Arvados client library, git commit " + `git log --pretty=format:'%H' -n 1 .`
+ s.description = "Arvados client library, git commit #{git_hash}"
s.authors = ["Arvados Authors"]
s.email = 'gem-dev at curoverse.com'
s.licenses = ['Apache License, Version 2.0']
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 3ea28cb..be9e4e6 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -2,6 +2,7 @@
import os
import subprocess
+import time
from setuptools import setup, find_packages
@@ -12,15 +13,13 @@ cmd_opts = {'egg_info': {}}
try:
git_tags = subprocess.check_output(
['git', 'log', '--first-parent', '--max-count=1',
- '--format=format:%ci %h', SETUP_DIR]).split()
- assert len(git_tags) == 4
+ '--format=format:%ct %h', SETUP_DIR]).split()
+ assert len(git_tags) == 2
except (AssertionError, OSError, subprocess.CalledProcessError):
pass
else:
- del git_tags[2] # Remove timezone
- for ii in [0, 1]: # Remove non-digits from other datetime fields
- git_tags[ii] = ''.join(c for c in git_tags[ii] if c.isdigit())
- cmd_opts['egg_info']['tag_build'] = '.{}{}.{}'.format(*git_tags)
+ git_tags[0] = time.strftime('%Y%m%d%H%M%S', time.gmtime(int(git_tags[0])))
+ cmd_opts['egg_info']['tag_build'] = '.{}.{}'.format(*git_tags)
setup(name='arvados_fuse',
commit 2ca602f880757f016f8d0d212b8851818decc718
Author: Brett Smith <brett at curoverse.com>
Date: Mon Sep 22 16:45:19 2014 -0400
3848: Python packages build with git tag by default.
This moves the build logic that we currently encode in Jenkins into
our setup.py, and makes it easier for developers to have versions in
sync with real users.
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index e0afe89..5ae4e64 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -1,10 +1,27 @@
#!/usr/bin/env python
import os
+import subprocess
from setuptools import setup, find_packages
-README = os.path.join(os.path.dirname(__file__), 'README.rst')
+SETUP_DIR = os.path.dirname(__file__)
+README = os.path.join(SETUP_DIR, 'README.rst')
+
+cmd_opts = {'egg_info': {}}
+try:
+ git_tags = subprocess.check_output(
+ ['git', 'log', '--first-parent', '--max-count=1',
+ '--format=format:%ci %h', SETUP_DIR]).split()
+ assert len(git_tags) == 4
+except (AssertionError, OSError, subprocess.CalledProcessError):
+ pass
+else:
+ del git_tags[2] # Remove timezone
+ for ii in [0, 1]: # Remove non-digits from other datetime fields
+ git_tags[ii] = ''.join(c for c in git_tags[ii] if c.isdigit())
+ cmd_opts['egg_info']['tag_build'] = '.{}{}.{}'.format(*git_tags)
+
setup(name='arvados-python-client',
version='0.1',
@@ -33,4 +50,6 @@ setup(name='arvados-python-client',
],
test_suite='tests',
tests_require=['mock>=1.0', 'PyYAML'],
- zip_safe=False)
+ zip_safe=False,
+ options=cmd_opts,
+ )
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 02450cb..3ea28cb 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -1,10 +1,27 @@
#!/usr/bin/env python
import os
+import subprocess
from setuptools import setup, find_packages
-README = os.path.join(os.path.dirname(__file__), 'README.rst')
+SETUP_DIR = os.path.dirname(__file__)
+README = os.path.join(SETUP_DIR, 'README.rst')
+
+cmd_opts = {'egg_info': {}}
+try:
+ git_tags = subprocess.check_output(
+ ['git', 'log', '--first-parent', '--max-count=1',
+ '--format=format:%ci %h', SETUP_DIR]).split()
+ assert len(git_tags) == 4
+except (AssertionError, OSError, subprocess.CalledProcessError):
+ pass
+else:
+ del git_tags[2] # Remove timezone
+ for ii in [0, 1]: # Remove non-digits from other datetime fields
+ git_tags[ii] = ''.join(c for c in git_tags[ii] if c.isdigit())
+ cmd_opts['egg_info']['tag_build'] = '.{}{}.{}'.format(*git_tags)
+
setup(name='arvados_fuse',
version='0.1',
@@ -26,4 +43,6 @@ setup(name='arvados_fuse',
],
test_suite='tests',
tests_require=['PyYAML'],
- zip_safe=False)
+ zip_safe=False,
+ options=cmd_opts,
+ )
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list