arvados-cli 0.1.20151117034231 → 0.1.20151118230027

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39e52085fe5a0ef6fc6ed0857443a5e1c6453711
-  data.tar.gz: 5acad63069d81197322b7e390d4b0e4d756881a4
+  metadata.gz: 993e2394a764ef0fda3c46cfad7c73bef8a386c6
+  data.tar.gz: cedebc3a757baab5c83a81471fc4cebc1058acb3
 SHA512:
-  metadata.gz: a3085bf60663bb8d19110376b4d7a88653d52e9df4b2781dd8ee9a929e1cfbc110a33ba1f884ba874c535a8527c845cf1aef147b668f229d098b323fce4a601a
-  data.tar.gz: b9ae59d181a1bdd4603aa0ff20f12fb9415d26fc8625f370b0e400dfe943a4098e59fb34b5137f129519f2c4fad0b9c9fdc1619a233dfca22ef8c7fdecdb780d
+  metadata.gz: e731dda19cd33c64f07a4b22176101ef2c2235c896b68d7a82633bee7ceaa60d5798bed5e3de46a5f542fb2f23376312f84e8b13a38a551d5143162ec799dd29
+  data.tar.gz: d623f94305db653df8077968a853caaf25df93daee17af95984bf9b4c5acb72de03e71489fb50e80492741627285c57d95607c560e7707d49613ab55b177873b

data/bin/crunch-job

@@ -965,7 +965,10 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
         $command .= $stdbuf;
         $command .= "perl - \Q$ENV{CRUNCH_SRC}/crunch_scripts/$Job->{script}\E";
       } else {
-        $command .= "/bin/sh -c \'mkdir -p \"$ENV{JOB_WORK}\" \"$ENV{TASK_WORK}\" && " .
+        $command .= "/bin/sh -c \'python -c " .
+            '"from pkg_resources import get_distribution as get; print \"Using Arvados SDK version\", get(\"arvados-python-client\").version"' .
+            ">&2 2>/dev/null; " .
+            "mkdir -p \"$ENV{JOB_WORK}\" \"$ENV{TASK_WORK}\" && " .
             "if which stdbuf >/dev/null ; then " .
             "  exec $stdbuf \Q$ENV{CRUNCH_SRC}/crunch_scripts/$Job->{script}\E ;" .
             " else " .
@@ -2169,10 +2172,11 @@ if (@ARGV) {
     $Log->("Built Python SDK virtualenv");
   }
 
-  my $pip_bin = "pip";
+  my @pysdk_version_cmd = ("python", "-c",
+    "from pkg_resources import get_distribution as get; print get('arvados-python-client').version");
   if ($venv_built) {
     $Log->("Running in Python SDK virtualenv");
-    $pip_bin = "$venv_dir/bin/pip";
+    @pysdk_version_cmd = ();
     my $orig_argv = join(" ", map { quotemeta($_); } @ARGV);
     @ARGV = ("/bin/sh", "-ec",
              ". \Q$venv_dir/bin/activate\E; exec $orig_argv");
@@ -2181,14 +2185,18 @@ if (@ARGV) {
            "\$PATH. Can't install Python SDK.");
   }
 
-  my $pkgs = `(\Q$pip_bin\E freeze 2>/dev/null | grep arvados) || dpkg-query --show '*arvados*'`;
-  if ($pkgs) {
-    $Log->("Using Arvados SDK:");
-    foreach my $line (split /\n/, $pkgs) {
-      $Log->($line);
+  if (@pysdk_version_cmd) {
+    open(my $pysdk_version_pipe, "-|", @pysdk_version_cmd);
+    my $pysdk_version = <$pysdk_version_pipe>;
+    close($pysdk_version_pipe);
+    if ($? == 0) {
+      chomp($pysdk_version);
+      $Log->("Using Arvados SDK version $pysdk_version");
+    } else {
+      # A lot could've gone wrong here, but pretty much all of it means that
+      # Python won't be able to load the Arvados SDK.
+      $Log->("Warning: Arvados SDK not found");
     }
-  } else {
-    $Log->("Arvados SDK packages not found");
   }
 
   while (my ($sdk_dir, $sdk_envkey) = each(%SDK_ENVVARS)) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20151117034231
+  version: 0.1.20151118230027
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -178,7 +178,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: Arvados command line tools, git commit 714c555bda26a6a27fad7caef382d1d6705ad215
+description: Arvados command line tools, git commit 155b1aa3772eb2d9421c5bfc678320401eb3b058
 email: gem-dev@curoverse.com
 executables:
 - arv