mortar 0.15.44 → 0.15.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69018fe3fcc68f124e0ce0956e95c119f0e95f0c
-  data.tar.gz: 1f87f69724e6d035058f424908e3fb4722e13dbc
+  metadata.gz: 7b425947c9f2e121f7966e6402791cf9e90ea8cd
+  data.tar.gz: bd3489c3255a5ac16537a89f6c2f96f13f714155
 SHA512:
-  metadata.gz: c148ae56445cfe61e2abeb86329ad40404ea0959e1d38ed2eb04fbb5cfd1b8f002a101ab669984a0b3e2efee8ab4f470cce57fa9193711d1e5b241b3f7d82403
-  data.tar.gz: a06d738aca0278dd07867fa04c762e7282c8d5fa0a5acab31c5fedaa72de65382eae79306994a932f9fbfe3e0f5307b9f10e5884368ae532bfd06baf2e0c523a
+  metadata.gz: d3d14b322f8d6ed07a7f5a7a586cf1476600c856f008f881eea7e20f2363d578d50e448e577d8eb50c067a91f0f6108692291b1cdf3101c2f767a141f2864d90
+  data.tar.gz: 717f0676a0a4f85247b24a7cfa7250bffeff37b6de487cd6c1d5749ca174897ca7e0f8ff3efa4a17dda061af0047b035a42c200be1b4f442ceb02d72cb6c46bc

data/lib/mortar/local/python.rb

@@ -190,6 +190,9 @@ class Mortar::Local::Python
     end
     if should_do_requirements_install
       action "Installing user defined python dependencies" do
+        unless upgrade_pip()
+          return false
+        end
         unless install_user_python_dependencies()
           return false
         end
@@ -197,6 +200,9 @@ class Mortar::Local::Python
       end
     end
     if should_install_python_dependencies?
+      unless upgrade_pip()
+        return false
+      end
       unless install_python_dependencies()
         return false
       end
@@ -303,6 +309,10 @@ class Mortar::Local::Python
 
   end
 
+  def upgrade_pip
+    return (run_pip_command "install --upgrade setuptools" and run_pip_command "install --upgrade pip")
+  end
+
   def install_user_python_dependencies
     return run_pip_command "install --requirement #{pip_requirements_path}"
   end

data/lib/mortar/version.rb

@@ -16,5 +16,5 @@
 
 module Mortar
   # see http://semver.org/
-  VERSION = "0.15.44"
+  VERSION = "0.15.45"
 end

data/spec/mortar/local/python_spec.rb

@@ -75,6 +75,7 @@ module Mortar::Local
       end
       it "install if necessary" do
         python = Mortar::Local::Python.new
+        stub(python).upgrade_pip.returns(true)
         stub(python).has_valid_virtualenv?.returns(true)
         stub(python).should_do_requirements_install.returns(false)
         mock(python).should_install_python_dependencies?.returns(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.15.44
+  version: 0.15.45
 platform: ruby
 authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc