mortar 0.15.44 → 0.15.45
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/mortar/local/python.rb +10 -0
- data/lib/mortar/version.rb +1 -1
- data/spec/mortar/local/python_spec.rb +1 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7b425947c9f2e121f7966e6402791cf9e90ea8cd
|
|
4
|
+
data.tar.gz: bd3489c3255a5ac16537a89f6c2f96f13f714155
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d3d14b322f8d6ed07a7f5a7a586cf1476600c856f008f881eea7e20f2363d578d50e448e577d8eb50c067a91f0f6108692291b1cdf3101c2f767a141f2864d90
|
|
7
|
+
data.tar.gz: 717f0676a0a4f85247b24a7cfa7250bffeff37b6de487cd6c1d5749ca174897ca7e0f8ff3efa4a17dda061af0047b035a42c200be1b4f442ceb02d72cb6c46bc
|
data/lib/mortar/local/python.rb
CHANGED
|
@@ -190,6 +190,9 @@ class Mortar::Local::Python
|
|
|
190
190
|
end
|
|
191
191
|
if should_do_requirements_install
|
|
192
192
|
action "Installing user defined python dependencies" do
|
|
193
|
+
unless upgrade_pip()
|
|
194
|
+
return false
|
|
195
|
+
end
|
|
193
196
|
unless install_user_python_dependencies()
|
|
194
197
|
return false
|
|
195
198
|
end
|
|
@@ -197,6 +200,9 @@ class Mortar::Local::Python
|
|
|
197
200
|
end
|
|
198
201
|
end
|
|
199
202
|
if should_install_python_dependencies?
|
|
203
|
+
unless upgrade_pip()
|
|
204
|
+
return false
|
|
205
|
+
end
|
|
200
206
|
unless install_python_dependencies()
|
|
201
207
|
return false
|
|
202
208
|
end
|
|
@@ -303,6 +309,10 @@ class Mortar::Local::Python
|
|
|
303
309
|
|
|
304
310
|
end
|
|
305
311
|
|
|
312
|
+
def upgrade_pip
|
|
313
|
+
return (run_pip_command "install --upgrade setuptools" and run_pip_command "install --upgrade pip")
|
|
314
|
+
end
|
|
315
|
+
|
|
306
316
|
def install_user_python_dependencies
|
|
307
317
|
return run_pip_command "install --requirement #{pip_requirements_path}"
|
|
308
318
|
end
|
data/lib/mortar/version.rb
CHANGED
|
@@ -75,6 +75,7 @@ module Mortar::Local
|
|
|
75
75
|
end
|
|
76
76
|
it "install if necessary" do
|
|
77
77
|
python = Mortar::Local::Python.new
|
|
78
|
+
stub(python).upgrade_pip.returns(true)
|
|
78
79
|
stub(python).has_valid_virtualenv?.returns(true)
|
|
79
80
|
stub(python).should_do_requirements_install.returns(false)
|
|
80
81
|
mock(python).should_install_python_dependencies?.returns(true)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: mortar
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.15.
|
|
4
|
+
version: 0.15.45
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mortar Data
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-11-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rdoc
|