[ARVADOS] updated: 992ddfa686f54799e0cee1690e7c59ceb98977f9
git at public.curoverse.com
git at public.curoverse.com
Thu Nov 20 11:02:32 EST 2014
Summary of changes:
.../views/pipeline_instances/_show_inputs.html.erb | 5 +-
.../test/integration/pipeline_instances_test.rb | 27 +++++-
doc/_includes/_ssh_addkey.liquid | 2 +-
doc/images/workbench-move-selected.png | Bin 11267 -> 47833 bytes
doc/user/topics/arv-run.html.textile.liquid | 2 +-
doc/user/topics/run-command.html.textile.liquid | 3 +-
.../tutorial-firstscript.html.textile.liquid | 2 +-
.../tutorials/tutorial-keep.html.textile.liquid | 14 +--
...tutorial-pipeline-workbench.html.textile.liquid | 2 +-
sdk/python/arvados/collection.py | 4 +
sdk/python/setup.py | 31 +++---
.../api/app/controllers/application_controller.rb | 70 +++++++-------
.../arvados/v1/collections_controller.rb | 23 +----
services/api/app/models/collection.rb | 106 ++++++++++++++++++---
services/api/test/fixtures/pipeline_templates.yml | 1 -
.../arvados/v1/collections_controller_test.rb | 72 +++++++-------
services/api/test/integration/websocket_test.rb | 2 +-
services/api/test/unit/collection_test.rb | 40 +++++++-
services/fuse/arvados_fuse/__init__.py | 28 +++---
services/fuse/setup.py | 30 +++---
services/fuse/tests/test_mount.py | 72 +++++++++++---
services/keepstore/handler_test.go | 12 +--
services/keepstore/keepstore.go | 8 +-
services/keepstore/logging_router.go | 41 +++-----
.../arvnodeman/computenode/dispatch/__init__.py | 65 +++++++++----
.../arvnodeman/computenode/dispatch/slurm.py | 49 ++++++++++
services/nodemanager/arvnodeman/config.py | 11 +++
services/nodemanager/arvnodeman/daemon.py | 49 ++++++----
services/nodemanager/arvnodeman/launcher.py | 9 +-
services/nodemanager/doc/ec2.example.cfg | 5 +
.../nodemanager/tests/test_computenode_dispatch.py | 103 +++++++++++++-------
.../tests/test_computenode_dispatch_slurm.py | 58 +++++++++++
services/nodemanager/tests/test_config.py | 18 ++++
services/nodemanager/tests/test_daemon.py | 51 ++++++++++
services/nodemanager/tests/testutil.py | 6 ++
35 files changed, 728 insertions(+), 293 deletions(-)
create mode 100644 services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
create mode 100644 services/nodemanager/tests/test_computenode_dispatch_slurm.py
discards 21ead51011e160608ebd6bb953d8d86d0439c9c2 (commit)
via 992ddfa686f54799e0cee1690e7c59ceb98977f9 (commit)
via b77fb69914fda0aedecddf2e62076cb404265647 (commit)
via 2834445f90c62644fde2cd46f9a4328600caba59 (commit)
via a325b04603deacebc07d322e691d7cc4e38b2f24 (commit)
via d270d652cb21c601513fb89e77a64270fc80bf21 (commit)
via 9d7efc36748d8b83af3d5dbdcd5326834fb317ff (commit)
via 6f31d0c9d4b6a0d3070e933a84cfd843722e81b1 (commit)
via 6c68141eb50255128cf38b5717b15b16f2a8cdff (commit)
via ffc7c1b20530dda13c1adf3aa48122ac881bbc29 (commit)
via 6874da0dd56d6c0320880dfb3bd4da34a3c0a7d3 (commit)
via 4af4a2cf12d3b87a4fdbd09115bc258961b706bb (commit)
via 22381d218295075e63c06f0b60bcb24cee7b30b6 (commit)
via 8d324f6d853ce38ab816ce12e8557b0e47ce9c2f (commit)
via 89285c343d05bc7ceef55a46c4ebb38d9b047baf (commit)
via 1a2a05a4714a4bc538800d08d353b0306d5e49ad (commit)
via b1f65fcd4fa5fca5400f63fa25823fef6229a158 (commit)
via 40b15b9523c1a89769c8df5bafa250075af0c567 (commit)
via b1f3c944c3217b6e42a377f4b0a04985c9cea908 (commit)
via 0e5cd501a34ebcf6e138b4693f4fa4094bff24b4 (commit)
via 22c135139279edcf5be0218eb90c375f2433a4b9 (commit)
via 3735d52b65928e3626a8e223acadc318a3d31097 (commit)
via f9ba8a730dbc1a457485886aa4591991e9dbbf0d (commit)
via 97a2555a220d424b029d39b6b6e62f28bc3bc148 (commit)
via 3ce8039e7ca278e4816ca90cd973bdbe08404b87 (commit)
via 9f52191b13196b1926f7b8b0c7c35aac56e02198 (commit)
via 69fae522bf6fe6dbaa64ce7d75ef4ce5616ced72 (commit)
via 22ae84c0d72cdeab882017a8caf2ade4465ddd59 (commit)
via 8deda2012ea7e25610f2cbd0a271e131d9364503 (commit)
via 732f7f0740dc7e5d5cff54f9cc30d4cd4597cb27 (commit)
via 763af5413e6195fe004846abf86a7ae134168990 (commit)
via f72ca2ac98200452700dc386fa439a45b8bb15e3 (commit)
via b75e2a12f618e2b69f3af1672abfb4773e202bed (commit)
via 84d5db363e4c10881fdb5317b01f46bdc33c002a (commit)
via dea90c956d96d06e39df0f6567c3bb6582a5b3dd (commit)
via 75a07d8175c9ee9a1c212cd1abe1c0d64a91cfc7 (commit)
via aa6f07c9687670ee98e15d9afa2bd47416839dc6 (commit)
via 7bd04ed26901e34e3e5788093bee12be4406dd7b (commit)
via 372cff3e04b4243eb68d9ae3e296aebcee459aea (commit)
via d3229c7f727f40436cad66fba5f3345e0b3eede5 (commit)
via 069b22b2d1196d0437253e60e616840ea141e1a9 (commit)
via 4d01f18d6a1129fb3f2f0efc4bda31795519fda2 (commit)
via e363a7973a911a6484b24d4e7f92f363d4d3e521 (commit)
via 53192c327dcce6159d21f6cc27f7d5c0bfc9e7b0 (commit)
via eee66a4fd87be84379929d17864f244b0a68fd74 (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 (21ead51011e160608ebd6bb953d8d86d0439c9c2)
\
N -- N -- N (992ddfa686f54799e0cee1690e7c59ceb98977f9)
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 992ddfa686f54799e0cee1690e7c59ceb98977f9
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Nov 20 10:59:47 2014 -0500
4400: Do not add ".commitdate.hash" tag if a build tag is already set.
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index bc1fab9..c83617e 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -5,24 +5,27 @@ import subprocess
import time
from setuptools import setup, find_packages
+from setuptools.command.egg_info import egg_info
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:%ct %h', SETUP_DIR],
- stderr=open('/dev/null','w')
- ).split()
- assert len(git_tags) == 2
-except (AssertionError, OSError, subprocess.CalledProcessError):
- pass
-else:
- 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)
+class TagBuildWithCommit(egg_info):
+ """Tag the build with the sha1 and date of the last git commit.
+ If a build tag has already been set (e.g., "egg_info -b", building
+ from source package), leave it alone.
+ """
+ def tags(self):
+ if self.tag_build is None:
+ git_tags = subprocess.check_output(
+ ['git', 'log', '--first-parent', '--max-count=1',
+ '--format=format:%ct %h', SETUP_DIR]).split()
+ assert len(git_tags) == 2
+ git_tags[0] = time.strftime(
+ '%Y%m%d%H%M%S', time.gmtime(int(git_tags[0])))
+ self.tag_build = '.{}.{}'.format(*git_tags)
+ return egg_info.tags(self)
setup(name='arvados-python-client',
version='0.1',
@@ -55,5 +58,5 @@ setup(name='arvados-python-client',
test_suite='tests',
tests_require=['mock>=1.0', 'PyYAML'],
zip_safe=False,
- options=cmd_opts,
+ cmdclass={'egg_info': TagBuildWithCommit},
)
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index c6f9424..3af3c84 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -5,23 +5,27 @@ import subprocess
import time
from setuptools import setup, find_packages
+from setuptools.command.egg_info import egg_info
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:%ct %h', SETUP_DIR],
- stderr=open('/dev/null','w')).split()
- assert len(git_tags) == 2
-except (AssertionError, OSError, subprocess.CalledProcessError):
- pass
-else:
- 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)
+class TagBuildWithCommit(egg_info):
+ """Tag the build with the sha1 and date of the last git commit.
+ If a build tag has already been set (e.g., "egg_info -b", building
+ from source package), leave it alone.
+ """
+ def tags(self):
+ if self.tag_build is None:
+ git_tags = subprocess.check_output(
+ ['git', 'log', '--first-parent', '--max-count=1',
+ '--format=format:%ct %h', SETUP_DIR]).split()
+ assert len(git_tags) == 2
+ git_tags[0] = time.strftime(
+ '%Y%m%d%H%M%S', time.gmtime(int(git_tags[0])))
+ self.tag_build = '.{}.{}'.format(*git_tags)
+ return egg_info.tags(self)
setup(name='arvados_fuse',
version='0.1',
@@ -44,5 +48,5 @@ setup(name='arvados_fuse',
test_suite='tests',
tests_require=['PyYAML'],
zip_safe=False,
- options=cmd_opts,
+ cmdclass={'egg_info': TagBuildWithCommit},
)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list