[ARVADOS] updated: c24d0cc28ee40a37d7f0ead787394765386e5413
git at public.curoverse.com
git at public.curoverse.com
Mon Sep 22 11:11:52 EDT 2014
Summary of changes:
.../javascripts/{selection.js => selection.js.erb} | 12 ++-
apps/workbench/app/models/arvados_base.rb | 6 ++
apps/workbench/app/models/group.rb | 4 +
apps/workbench/app/views/application/show.html.erb | 39 ++++++++
apps/workbench/app/views/collections/show.html.erb | 18 ----
.../app/views/pipeline_templates/show.html.erb | 2 +-
apps/workbench/app/views/projects/show.html.erb | 18 ----
.../workbench/test/integration/collections_test.rb | 19 +++-
apps/workbench/test/integration/projects_test.rb | 2 +-
apps/workbench/test/integration_helper.rb | 6 +-
sdk/cli/Gemfile.lock | 36 +++----
sdk/cli/README.textile | 11 ---
sdk/cli/arvados-cli.gemspec | 8 +-
sdk/ruby/arvados.gemspec | 12 +--
services/api/Gemfile | 4 +-
services/api/Gemfile.lock | 8 +-
services/api/app/models/job.rb | 109 +++++++++++++++++++++
...140918141529_change_user_owner_uuid_not_null.rb | 2 +
.../db/migrate/20140918153705_add_state_to_job.rb | 24 +++++
services/api/db/structure.sql | 8 +-
services/api/script/crunch-dispatch.rb | 2 +-
services/api/test/unit/job_test.rb | 66 +++++++++++++
services/fuse/setup.py | 2 +-
services/keepstore/handler_test.go | 4 +-
services/keepstore/handlers.go | 6 +-
services/keepstore/keepstore.go | 4 +-
.../{block_work_list.go => work_queue.go} | 42 ++++----
...{block_work_list_test.go => work_queue_test.go} | 30 +++---
28 files changed, 362 insertions(+), 142 deletions(-)
rename apps/workbench/app/assets/javascripts/{selection.js => selection.js.erb} (96%)
delete mode 100644 sdk/cli/README.textile
create mode 100644 services/api/db/migrate/20140918153705_add_state_to_job.rb
rename services/keepstore/{block_work_list.go => work_queue.go} (80%)
rename services/keepstore/{block_work_list_test.go => work_queue_test.go} (83%)
via c24d0cc28ee40a37d7f0ead787394765386e5413 (commit)
via 95723281b6a2b9d594f92cc5577c2f41e08338df (commit)
via fb9235f1b9abe0661eb7640c4db0ab7001f90f1d (commit)
via 1ccabc86f9eb3b51e02a3571d5b133fec8258f49 (commit)
via f47d364957c90269535d3992cd048ce5aef95cd0 (commit)
via 5ff389fc3450f97b62ef919109d6cc5691c96897 (commit)
via 411ba18c2288d67a802a422259c2678e3d4681a4 (commit)
via bd0d76fa76bbb0697c13487bb7d04f0b56d01a29 (commit)
via 5f4f8509e8fce0bcfb071188b5773a405b61f976 (commit)
via 3cc699f70a514878b7ce7adbc3c96e73f92fdf82 (commit)
via 4403160024a6de9d2bba41cf5377aa5c3d462500 (commit)
via fe59fe52fd8d10f79b863022dbac6426082dfa46 (commit)
via f5fd953bdf34b6a6b7ba698f76b54f21ee47afc8 (commit)
via 2bc8ce335b15136ce39b2652ab41e20b15632d08 (commit)
via f6cd6a5f0ca78c51c30e2689ca3d5a4caeb41073 (commit)
via 5bb258b6e289b97e4bda28ff1b2d50a255339030 (commit)
via 51444751090ef020a33a125c636f9afc099f6a46 (commit)
via 72fb7ca979e133064f0c41193222fe352f7fbf8a (commit)
via 3294cfcae73fe5b2cff051298b26076103251ca9 (commit)
via a4fc0448d97894d438fc770d7e5a890be8d8a01d (commit)
via d585a31fb1a2b2c4964ff2c8928a42358e8a060f (commit)
via 6d6ee07abb8892fb1e3f606c1347d18abc321ced (commit)
via 9d724d2028cc942b02f5a3846fc25d46761ce136 (commit)
via 67182ab96a8dda99ffa897a2fb04d361cd73777d (commit)
via 96f5b2d78c60d1a16f51a269270d180b3f9a60a3 (commit)
via 4ac75eb713fcd03b45eb1b4929e21897b4aa871b (commit)
via 6137770472ef5b55fd604f87d303d6e07c7e3f2f (commit)
via 4154420cdd2a2ac6cdb2cc57357f42513fb287cc (commit)
via 6f2433691034b6e223445c5a047554ee7c6f92c1 (commit)
via 700fcdd3594713fc2f692d5c3c31474f0c8e14ff (commit)
via 454e8fd7bbe6afdfd5fe9905cd0376741bf5f9a0 (commit)
via aff3c1ad491cf4ce7fe7912eaf17c1109d35faf6 (commit)
via ec48719c7de0d18772b811645956fab87ce14bff (commit)
via c2a7a5a0e1a89d10d286e060374ad9e1b83a24c7 (commit)
via 9126da70d57cdd32938c4b3814fedf2bd1f1db93 (commit)
from 5be834f3ac1bdd81f2c40514cdb5795a8585e1f6 (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 c24d0cc28ee40a37d7f0ead787394765386e5413
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Sep 22 10:50:25 2014 -0400
3894: Remove outdated README.
diff --git a/sdk/cli/README.textile b/sdk/cli/README.textile
deleted file mode 100644
index f15980d..0000000
--- a/sdk/cli/README.textile
+++ /dev/null
@@ -1,11 +0,0 @@
-Before running tests:
-
-* Set up environment variables: @ARVADOS_API_HOST@,
- @ARVADOS_API_TOKEN@, @ARVADOS_API_HOST_INSECURE@
-* Run @bundle install@
-
-Running tests:
-
-<pre><code>
- PYTHONPATH=../python bundle exec rake test
-</code></pre>
commit 95723281b6a2b9d594f92cc5577c2f41e08338df
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Sep 22 10:23:16 2014 -0400
3894: Use git log --first-parent to get nearest commit/merge on
current branch to label package version, rather than nearest
commit. This ensures the package version number increases when an
older commit is merged after a newer commit.
diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index c596822..88a409c 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -5,8 +5,8 @@ end
Gem::Specification.new do |s|
s.name = 'arvados-cli'
- s.version = '0.1.' + `git log --pretty=format:'%ci' -n 1 .`[0..18].gsub(/[ \-:]/,'')
- s.date = `git log --pretty=format:'%ci' -n 1 .`[0..9]
+ 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.summary = "Arvados CLI tools"
s.description = "Arvados command line tools, git commit " + `git log --pretty=format:'%H' -n 1 .`
s.authors = ["Arvados Authors"]
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index 0b2bc36..cc6b5f5 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -5,8 +5,8 @@ end
Gem::Specification.new do |s|
s.name = 'arvados'
- s.version = '0.1.' + `git log --pretty=format:'%ci' -n 1 .`[0..18].gsub(/[ \-:]/,'')
- s.date = `git log --pretty=format:'%ci' -n 1 .`[0..9]
+ 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.summary = "Arvados client library"
s.description = "Arvados client library, git commit " + `git log --pretty=format:'%H' -n 1 .`
s.authors = ["Arvados Authors"]
commit fb9235f1b9abe0661eb7640c4db0ab7001f90f1d
Merge: 1ccabc8 f47d364
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 19 17:40:28 2014 -0400
3894: Merge branch 'master' into 3894-gem-version
commit 1ccabc86f9eb3b51e02a3571d5b133fec8258f49
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 19 17:37:51 2014 -0400
3894: Fix up runtime dependency specs to make bundle comfortable.
diff --git a/sdk/cli/Gemfile.lock b/sdk/cli/Gemfile.lock
index a435b05..81b6b52 100644
--- a/sdk/cli/Gemfile.lock
+++ b/sdk/cli/Gemfile.lock
@@ -1,12 +1,12 @@
PATH
remote: .
specs:
- arvados-cli (0.1.20140903145725)
+ arvados-cli (0.1.20140919112741)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
- arvados (~> 0.1.0)
+ arvados (~> 0.1, >= 0.1.0)
curb (~> 0.8)
- google-api-client (~> 0.6.3)
+ google-api-client (~> 0.6, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
oj (~> 2.0, >= 2.0.3)
@@ -15,16 +15,16 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- activesupport (3.2.17)
+ activesupport (3.2.19)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.6)
andand (1.3.3)
- arvados (0.1.20140903145725)
- activesupport (>= 3.2.13)
- andand
- google-api-client (~> 0.6.3)
- json (>= 1.7.7)
+ arvados (0.1.20140919112741)
+ activesupport (~> 3.2, >= 3.2.13)
+ andand (~> 1.3, >= 1.3.3)
+ google-api-client (~> 0.6, >= 0.6.3)
+ json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
autoparse (0.3.3)
addressable (>= 2.3.1)
@@ -32,17 +32,18 @@ GEM
multi_json (>= 1.0.0)
curb (0.8.6)
extlib (0.9.16)
- faraday (0.8.9)
- multipart-post (~> 1.2.0)
- google-api-client (0.6.4)
+ faraday (0.9.0)
+ multipart-post (>= 1.2, < 3)
+ google-api-client (0.7.1)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
extlib (>= 0.9.15)
- faraday (~> 0.8.4)
+ faraday (>= 0.9.0)
jwt (>= 0.1.5)
launchy (>= 2.1.1)
multi_json (>= 1.0.0)
- signet (~> 0.4.5)
+ retriable (>= 1.4)
+ signet (>= 0.5.0)
uuidtools (>= 2.1.0)
i18n (0.6.11)
json (1.8.1)
@@ -52,12 +53,13 @@ GEM
addressable (~> 2.3)
minitest (5.2.3)
multi_json (1.10.1)
- multipart-post (1.2.0)
+ multipart-post (2.0.0)
oj (2.10.2)
rake (10.1.1)
- signet (0.4.5)
+ retriable (1.4.1)
+ signet (0.5.1)
addressable (>= 2.2.3)
- faraday (~> 0.8.1)
+ faraday (>= 0.9.0.rc5)
jwt (>= 0.1.5)
multi_json (>= 1.0.0)
trollop (2.0)
diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index 12f833c..c596822 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
s.executables << "arv-crunch-job"
s.executables << "arv-tag"
s.required_ruby_version = '>= 2.1.0'
- s.add_runtime_dependency 'arvados', '~> 0.1.0'
- s.add_runtime_dependency 'google-api-client', '~> 0.6.3'
+ s.add_runtime_dependency 'arvados', '~> 0.1', '>= 0.1.0'
+ s.add_runtime_dependency 'google-api-client', '~> 0.6', '>= 0.6.3'
s.add_runtime_dependency 'activesupport', '~> 3.2', '>= 3.2.13'
s.add_runtime_dependency 'json', '~> 1.7', '>= 1.7.7'
s.add_runtime_dependency 'trollop', '~> 2.0'
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index 08ef71c..0b2bc36 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
s.licenses = ['Apache License, Version 2.0']
s.files = ["lib/arvados.rb", "lib/arvados/keep.rb"]
s.required_ruby_version = '>= 2.1.0'
- s.add_dependency('google-api-client', '~> 0.6.3')
- s.add_dependency('activesupport', '>= 3.2.13')
- s.add_dependency('json', '>= 1.7.7')
- s.add_dependency('andand')
+ s.add_dependency('google-api-client', '~> 0.6', '>= 0.6.3')
+ s.add_dependency('activesupport', '~> 3.2', '>= 3.2.13')
+ s.add_dependency('json', '~> 1.7', '>= 1.7.7')
+ s.add_dependency('andand', '~> 1.3', '>= 1.3.3')
s.add_runtime_dependency('jwt', '>= 0.1.5', '< 1.0.0')
s.homepage =
'https://arvados.org'
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list