arvados-cli 0.1.20141223204517 → 0.1.20150108184905

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/bin/crunch-job +13 -0
  3. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4943645494dbd8213f865c567e7f79d71ef13d41
4
- data.tar.gz: 37f9159a2b76629cdf69b4b491d0fc441abf7dd3
3
+ metadata.gz: 153a67d36836b7514ef712e6d223ffca811f1c04
4
+ data.tar.gz: fa5b78b27d52f0670d05dc3a0ec17eaadb5d16e1
5
5
  SHA512:
6
- metadata.gz: f896593e2eb44e16c65535bda1516534dec812385be286e3e5ccbf0c33e7afb14783f8fa0a5c5afc011b6ce70e119cde9423ba5c26a1a8321ea59dc9caa9634a
7
- data.tar.gz: b68ed75f67d37aa0485cd5854dde564d6219bb335a4a7404882f671365695d782cd71221d75c4734a3b51ac41afb21f58ab5133625c42520c1e2f09e73b414d9
6
+ metadata.gz: 5ffe37170dc000b4651f04624a3dd0c6c2e29338bcf724d265a5bf5a0bbb098a820687c1e678a82a20ee2c36618c1d9845d0dfb2c103a1a08ac5cf0d0ac4fc0b
7
+ data.tar.gz: badfb94148c8a34c2d46cbed018a294ed23ad486ebc9900adbc03300288e6e1980192b71c6309bb656e35cb7430eb935198e1e3e5a0390a0e7c7f91c831802f8
data/bin/crunch-job CHANGED
@@ -1851,14 +1851,27 @@ if (@ARGV) {
1851
1851
  $Log->("Built Python SDK virtualenv");
1852
1852
  }
1853
1853
 
1854
+ my $pkgs;
1854
1855
  if ($venv_built) {
1855
1856
  $Log->("Running in Python SDK virtualenv");
1857
+ $pkgs = `(\Q$venv_dir/bin/pip\E freeze 2>/dev/null | grep arvados) || dpkg-query --show '*arvados*'`;
1856
1858
  my $orig_argv = join(" ", map { quotemeta($_); } @ARGV);
1857
1859
  @ARGV = ("/bin/sh", "-ec",
1858
1860
  ". \Q$venv_dir/bin/activate\E; exec $orig_argv");
1859
1861
  } elsif (-d $python_src) {
1860
1862
  $Log->("Warning: virtualenv not found inside Docker container default " +
1861
1863
  "\$PATH. Can't install Python SDK.");
1864
+ } else {
1865
+ $pkgs = `(pip freeze 2>/dev/null | grep arvados) || dpkg-query --show '*arvados*'`;
1866
+ }
1867
+
1868
+ if ($pkgs) {
1869
+ $Log->("Using Arvados SDK:");
1870
+ foreach my $line (split /\n/, $pkgs) {
1871
+ $Log->($line);
1872
+ }
1873
+ } else {
1874
+ $Log->("Arvados SDK packages not found");
1862
1875
  }
1863
1876
 
1864
1877
  while (my ($sdk_dir, $sdk_envkey) = each(%SDK_ENVVARS)) {
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arvados-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.20141223204517
4
+ version: 0.1.20150108184905
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arvados Authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-23 00:00:00.000000000 Z
11
+ date: 2015-01-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: arvados
@@ -178,7 +178,7 @@ dependencies:
178
178
  - - "<"
179
179
  - !ruby/object:Gem::Version
180
180
  version: 1.0.0
181
- description: Arvados command line tools, git commit 4d154281759194e776b4fd2fa925de5036c2a3f4
181
+ description: Arvados command line tools, git commit 5523be76b00bc58cf9568cf7a1353326c6795cac
182
182
  email: gem-dev@curoverse.com
183
183
  executables:
184
184
  - arv