[ARVADOS] updated: 7aa4ca166afbbd0370458e9b288d999c76f1aab6
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 26 17:04:24 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/dates.js | 3 +
.../app/assets/stylesheets/application.css.scss | 13 ++
.../app/assets/stylesheets/projects.css.scss | 9 +-
.../app/controllers/application_controller.rb | 24 +-
.../app/controllers/projects_controller.rb | 19 +-
apps/workbench/app/controllers/users_controller.rb | 22 +-
apps/workbench/app/helpers/application_helper.rb | 4 +
.../app/helpers/pipeline_components_helper.rb | 3 +-
.../app/helpers/pipeline_instances_helper.rb | 115 ++++++++--
apps/workbench/app/models/arvados_base.rb | 2 +-
apps/workbench/app/models/job.rb | 20 +-
.../app/views/application/_content_layout.html.erb | 10 +-
.../views/application/_job_status_label.html.erb | 5 +-
.../{show.html.erb => _title_and_buttons.html.erb} | 22 +-
apps/workbench/app/views/application/show.html.erb | 71 +-----
.../collections/_show_source_summary.html.erb | 3 +-
.../workbench/app/views/jobs/_show_recent.html.erb | 2 +-
.../workbench/app/views/jobs/_show_status.html.erb | 110 ++-------
apps/workbench/app/views/jobs/show.html.erb | 32 +++
...unning.html.erb => _running_component.html.erb} | 123 +++-------
.../_show_components_json.html.erb | 14 ++
.../_show_components_running.html.erb | 252 ++++-----------------
.../views/projects/_compute_node_status.html.erb | 45 +++-
.../views/projects/_compute_node_summary.html.erb | 10 +-
.../app/views/projects/_show_dashboard.html.erb | 66 +++---
.../app/views/users/_manage_repositories.html.erb | 5 +-
apps/workbench/app/views/users/_tables.html.erb | 2 +-
apps/workbench/config/application.default.yml | 16 +-
apps/workbench/config/application.yml.example | 4 +-
apps/workbench/test/diagnostics/pipeline_test.rb | 2 +-
.../pipeline_instances_controller_test.rb | 11 +
.../test/functional/users_controller_test.rb | 11 +
apps/workbench/test/integration/projects_test.rb | 23 +-
.../test/integration/user_profile_test.rb | 2 +-
apps/workbench/test/test_helper.rb | 28 ++-
doc/api/methods/nodes.html.textile.liquid | 2 +
doc/api/schema/Job.html.textile.liquid | 1 +
doc/api/schema/Node.html.textile.liquid | 1 +
docker/api/Dockerfile | 3 +-
docker/api/application.yml.in | 2 +
docker/base/Dockerfile | 2 +-
docker/build_tools/build.rb | 1 +
docker/config.yml.example | 5 +
docker/jobs/Dockerfile | 5 +-
docker/passenger/Dockerfile | 6 +-
sdk/cli/arvados-cli.gemspec | 9 +-
sdk/cli/bin/arv-run-pipeline-instance | 71 +++---
sdk/cli/bin/crunch-job | 38 ++--
sdk/go/arvadosclient/arvadosclient_test.go | 8 +-
sdk/go/keepclient/keepclient_test.go | 4 +-
sdk/python/arvados/commands/keepdocker.py | 2 +-
sdk/python/bin/arv-get | 6 +-
sdk/python/setup.py | 11 +-
sdk/python/tests/run_test_server.py | 8 +-
sdk/ruby/arvados.gemspec | 9 +-
.../app/controllers/arvados/v1/jobs_controller.rb | 7 +-
.../app/controllers/arvados/v1/nodes_controller.rb | 18 ++
services/api/app/controllers/static_controller.rb | 17 +-
services/api/app/mailers/admin_notifier.rb | 12 -
services/api/app/mailers/user_notifier.rb | 3 +
services/api/app/models/arvados_model.rb | 7 -
services/api/app/models/job.rb | 140 +++++-------
services/api/app/models/node.rb | 12 +
.../admin_notifier/new_inactive_user.text.erb | 4 +-
.../api/app/views/admin_notifier/new_user.text.erb | 4 +-
.../views/user_notifier/account_is_setup.text.erb | 4 +-
services/api/config/application.default.yml | 12 +-
services/api/config/application.yml.example | 2 +
.../db/migrate/20140918153705_add_state_to_job.rb | 23 +-
.../20140924091559_add_job_uuid_to_nodes.rb | 13 ++
services/api/db/structure.sql | 9 +-
services/api/lib/has_uuid.rb | 2 +-
services/api/script/crunch-dispatch.rb | 160 +++++++------
services/api/script/rails | 2 +-
services/api/script/update_node_attributes.rb | 106 ---------
services/api/test/fixtures/collections.yml | 24 ++
services/api/test/fixtures/jobs.yml | 11 +
services/api/test/fixtures/links.yml | 14 ++
services/api/test/fixtures/nodes.yml | 37 ++-
services/api/test/fixtures/pipeline_instances.yml | 20 ++
services/api/test/fixtures/repositories.yml | 5 +
.../functional/arvados/v1/jobs_controller_test.rb | 6 +
.../functional/arvados/v1/nodes_controller_test.rb | 72 ++++++
services/api/test/test_helper.rb | 26 +++
services/api/test/unit/job_test.rb | 49 ++--
services/api/test/unit/node_test.rb | 6 +
services/api/test/unit/permission_test.rb | 13 ++
services/fuse/setup.py | 11 +-
services/fuse/tests/test_mount.py | 2 +
services/keep/tools/traffic_test.py | 4 +-
services/keepproxy/keepproxy_test.go | 2 +-
services/keepstore/handler_test.go | 120 +++++++++-
services/keepstore/handlers.go | 76 ++++++-
services/keepstore/keepstore.go | 14 +-
94 files changed, 1279 insertions(+), 1087 deletions(-)
copy apps/workbench/app/views/application/{show.html.erb => _title_and_buttons.html.erb} (76%)
create mode 100644 apps/workbench/app/views/jobs/show.html.erb
copy apps/workbench/app/views/pipeline_instances/{_show_components_running.html.erb => _running_component.html.erb} (60%)
create mode 100644 services/api/db/migrate/20140924091559_add_job_uuid_to_nodes.rb
delete mode 100755 services/api/script/update_node_attributes.rb
via 7aa4ca166afbbd0370458e9b288d999c76f1aab6 (commit)
via 178a193ccba881a6498525de57e355bbb7597416 (commit)
via 16b0697d6ea10d21381936bc9b5ad10914deb9b1 (commit)
via 029656d8b2646bae51de03426a6496cbce0cc9d7 (commit)
via 0fc69ec920fb2edf48a196adfbce1e7c66218f04 (commit)
via cad9d2f9fe930e51279a8496929857039deea2de (commit)
via c02331eb9e7d302efdd788af0dd3ba9124352edb (commit)
via b506247f4a34e1a409f57c3a01c07a94970fe68f (commit)
via 1b189a0961ba757caf6160285b59daa26c7cdcae (commit)
via d4724463bd248922dc37b43f59d54890d10581c1 (commit)
via eaf8fb3be8218971b9a66d10b7bbabbbf92cd041 (commit)
via c2c38069d28fc68dea6e1b2cb0d5f4f36e1ef03f (commit)
via d592a37f987ed90e017bc9d2d962a2f620e27095 (commit)
via 22c3f131e929bef5574ef71a98bc48290c36dfb3 (commit)
via a3787ef83a0538097fb6f802f675be740a241ebc (commit)
via ce410ef35e137e040ace097a74a33f04c5975ad9 (commit)
via c491bfd795b7c7c4f26f18003290bd7ec9e88d60 (commit)
via abc1db31bae1b33ed899a1da4b59f2edc0f5f189 (commit)
via 1d8f975be8d35444aca0f21a0b6c91bc4a277662 (commit)
via 4e8745c2a744a2c3e6b44ee6100fb1a26749cebf (commit)
via a805395a2a64aa83a1604ade6932151a0846b577 (commit)
via 48d04722a5e0478e22be33f58036806a55b3a0eb (commit)
via 44242bfe2c86302c65650cf7fe3a7187223c6304 (commit)
via bbaaeabfc2d28c8a24f106b81e6677832cd68b3d (commit)
via 1d135e43d06148b100fbc8534144b405e4824af9 (commit)
via c2e491ff35fe12d895587a6e7cf0cc9f1f7bfcd9 (commit)
via 2861857a87d4c40924f783862ee09e91cec0b96f (commit)
via 88650e2c0020e1122449d7b91ad3ebf78bab9d23 (commit)
via 94b11dfc98ed84d0f91f2bc2fc81e76b4d3c35d7 (commit)
via e9622f371ad4d75f0a0b5ee9480fae779dd63156 (commit)
via 5253b7d81a54c6087b35148499c360c692fac870 (commit)
via a452ab111d29f4f06d31c3fe760bb17b211020a6 (commit)
via be3b98a52ae6773913696955e2d9c6585fc89441 (commit)
via 11b71c18e7506374953119d717f7c4e8c52f8bc4 (commit)
via 4bb3091019c84f748a60492fb52dcc0bba0bbef0 (commit)
via 9daebff7dfeaa7092da078f3a0bfdc0c9d8e51e0 (commit)
via 9a15397a7e030704f63441d6e7893cb3d8be1d64 (commit)
via 8a833d4bb82249d3f2b9c0473c0af51db92fdc72 (commit)
via d962404672ddd32804ddc7b8f502d01843e36404 (commit)
via 9700a3a646ea5e1d50e5525bd094e8eb90af8ce1 (commit)
via 8f3b2fc8dbe18a031fb7aa943b626a0f3932c3ec (commit)
via 6741a2db39cab991efd28d742071170fdbe908f2 (commit)
via 44e4d85c32d5e4ea4dc651570672e59d7a10d3b3 (commit)
via 8b4cd21c6bd056e4ebf7487132a454cb5b8aacc5 (commit)
via 3154ba6b56adb7a76bd5665c6c4c3326efea8eaa (commit)
via b0fa2109b62079c50c5228d227c591fde7b40ab7 (commit)
via 77ad02138232ebf8885ceef5b4c398bf6fd39587 (commit)
via 24fd61eb70995d505bd990a79339571294b8f6eb (commit)
via 409fe707a4d05f1986d7bb0c29ec977d19aa63f5 (commit)
via da0d61f9a95848d47d28462d89e0a2070c39d587 (commit)
via 9340ba16925c4288e6de8a457b74ae9524b04213 (commit)
via e350e7a5a074d6666f60b0a1789dce8da3037d8f (commit)
via 37404e821668b6b9b1952a0a5a3b28901835884b (commit)
via 3d84dd62a85647e9b3dfc34af8303c09b9923498 (commit)
via 93c7127afd21f82662e9b471e7c617ae8c59ad19 (commit)
via 68dc1fcaec00d7d954be19f2c184e04626639616 (commit)
via 0091abfb8041e1f63ba8b7ec9baa7bb57a05bcdb (commit)
via 1a8481cd4ebacf2036090273bb6b9444dbed16a8 (commit)
via 2a8d349eaf2b1ac2254056ea32859f72a226d63f (commit)
via 301917a75b61cd8a9447b5c525c38dc2e3416c9e (commit)
via 4c53b3aee935b41e11c71ff1468a10d6a80c390c (commit)
via c8ad3a2a0f27964eff5d5c2d845afab728836473 (commit)
via 2b0a7c3f635bc2340956d670c6aeda417dd11cec (commit)
via 8716b38d3cd20640c28b6fe048927309a0f916cd (commit)
via f76e58645366a0cf1d33e8d681cb051e313ea713 (commit)
via af09cce22f077b5a537e1b7eea8d98981de9f400 (commit)
via 5fd423a57ab1f34162f4cb2c08bd6b0b2515af40 (commit)
via 2e940d5cd2a39b31dacf2aa65487ed62645abe14 (commit)
via d7c09707b2b5146367c2988b75deffce21b5ae2c (commit)
via 2bab50e5573bec3e46585fe23e2ffb26b1b8fe55 (commit)
via 8c52fddd7b87b36bbd5cb0d362009df33ef5f0fc (commit)
via 06a956718e8dd55a2cdd4a84fcdfb7a3b5a0f635 (commit)
via 8c97b8ad6f4b026f8bd2626a6d1b76d2fc60f253 (commit)
via b25e164d6cfc0712be5856c63f7592145669232d (commit)
via 2832018a959557515bfad1f763bf8d4b72182fd6 (commit)
via 9c7058321b88320594fccec767a8326e0bb9db4f (commit)
via 92211c8bed5aaf3abd83d02c4adbaf2329123bac (commit)
via 1d5d09e8d1568fdae039571306bd5e56a8273ac7 (commit)
via 1513d62bc0716698b71789f7affbf78e675cbff8 (commit)
via 039e808b1be1f2106118dc20174977d8e8766125 (commit)
via eec77d22e408fe3983cba666c6f5185ecf2d15ec (commit)
via 4ea6cda50c7fcd3d30ac01e8a421cc68cd4ea23d (commit)
via eb8dc9dee0793139aac55f4aa65a7b2de433afea (commit)
via 3f7a73ef946efc268017fc6f5ea31868e18d39dd (commit)
via 5ef678825d7b436526489e9158a916b605814133 (commit)
via d2517f46eb0d1a668ac8124144220436c80d6f65 (commit)
via ae346e842a13be74e4b4d44afb0ec61b7a2749cb (commit)
via 240ab2c50a01531df162850be255a4c4e1084fc2 (commit)
via 3e3df723e221dadf2512ac4935c1f6f0fe8f7834 (commit)
via d23d4ce9e4c52605cb23286b9e9b46a808f7437d (commit)
via 5af4f00db1cbac83f52bf02b424968fd0ef387b1 (commit)
via 1fc256cee80eef7aa2178789f23a729ba9f27b79 (commit)
via d6478bb286c0bb1e7b8af67fb4800db792200022 (commit)
via 22c7912d7c62877647fc714cd0bbef8f37a2b120 (commit)
via 5b2a15b6a4addfc648ef1060be47ffef64e64777 (commit)
via d70e5d076e907266c0f40364aaa69fdce449ce9f (commit)
via 7e27eb2cca7e9e22ad1f56a6f0ecbbc40ad4cb64 (commit)
via 104244f9ab68f409dbad2272910c21e317994a5d (commit)
via 2e8aee62b13edd8eac34ac8536d41992c7adbf69 (commit)
via 80ec2c7fe823b84ba5b3533f3c43d1bf3c627f70 (commit)
via 96e711607984bd74a682dd3f3819dbc453a6591b (commit)
via aecc7109edd37aee2388c06a36d5c8ba853b3267 (commit)
via ccff8ce154b393512dd4b563853f63a9abeefba4 (commit)
via 4eaf39dbe947beaaa87e656b470d7f21880ba607 (commit)
via 148306afed19fc9138a04bcf161d8f24d83b2ac0 (commit)
via f9a2ed53565bf921821dff5e2120b6496ac9acdd (commit)
via 2b6f61a7d202b771be7e85c14fb4d1cb592142ec (commit)
via 8934b505b0cdd6af699d910148046ede7c44b7da (commit)
via 15409c5e2b7946ff7f5fd104a6757a4d874448d4 (commit)
via 768889aad2bf97586d68b52af4f2b9ccae78251e (commit)
via cbd11b4bfd5bcc637abe0e7678239dd1e7a2fbd2 (commit)
from f69d1a2009372ac539eec3bf77d92a55e6b9cd3c (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 7aa4ca166afbbd0370458e9b288d999c76f1aab6
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 178a193ccba881a6498525de57e355bbb7597416
Merge: f69d1a2 16b0697
Author: Brett Smith <brett at curoverse.com>
Date: Fri Sep 26 16:44:52 2014 -0400
Merge branch 'master' into 3848-egg-default-git-tag-wip
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list