iron_worker_ng 0.16.1 → 0.16.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/iron_worker_ng/feature/python/merge_pip.rb +24 -8
- data/lib/iron_worker_ng/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 70a3b6a65088b9dfa6bba31d40261c11606c6ec7
|
|
4
|
+
data.tar.gz: 391535ed4aafe8ad54550f4747780bfda885623a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9cefab9e472a20fddf6b6f74a445249673906495da03a70a07b4b95c8d8ff9fdb2d3e2c39934f789ba43eb081b8b448ee710bf6aec8eba282bbb220aa101387d
|
|
7
|
+
data.tar.gz: 4bc1f6cb50de98da74b48c78d712ab85bd51ee5ede9bc825b9dd5a7fef57768c6e5d4d239814fefb869812c1a862c74a1bff766d755ef88a9767ed058b097cc0
|
|
@@ -22,30 +22,46 @@ module IronWorkerNG
|
|
|
22
22
|
::Dir.mkdir(pip_dir_name)
|
|
23
23
|
|
|
24
24
|
p = 'pip-1.3.1'
|
|
25
|
-
`cd #{pip_dir_name} && curl -O https://pypi.python.org/packages/source/p/pip/#{p}.tar.gz && tar xf #{p}.tar.gz && cd #{p} && python setup.py install --root #{pip_dir_name} && rm -rf #{p} #{p}.tar.gz`
|
|
25
|
+
`cd #{pip_dir_name} && curl -O https://pypi.python.org/packages/source/p/pip/#{p}.tar.gz && tar xf #{p}.tar.gz && cd #{p} && python setup.py install --user --root #{pip_dir_name} && cd .. && rm -rf #{p} #{p}.tar.gz`
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
pip_packages_dir = ::Dir.glob(pip_dir_name + ENV['HOME'] + '/.local/lib/python*').first
|
|
28
|
+
pip_packages_dir ||= ::Dir.glob(pip_dir_name + ENV['HOME'] + '/Library/Python/*/lib/python*').first
|
|
28
29
|
|
|
29
|
-
|
|
30
|
+
pip_binary = pip_dir_name + ENV['HOME'] + '/.local/bin/pip'
|
|
31
|
+
|
|
32
|
+
unless File.exists?(pip_binary)
|
|
33
|
+
pip_binary = Dir.glob(pip_dir_name + ENV['HOME'] + '/Library/Python/*/bin/pip').first
|
|
34
|
+
|
|
35
|
+
if pip_binary.nil?
|
|
36
|
+
IronCore::Logger.error 'IronWorkerNG', 'Unfamiliar Python environment, please switch to full remote build (add \'remote\' to your .worker)', IronCore::Error
|
|
37
|
+
end
|
|
38
|
+
end
|
|
30
39
|
|
|
31
40
|
pips_dir_name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'pips')
|
|
32
41
|
|
|
33
42
|
::Dir.mkdir(pips_dir_name)
|
|
34
43
|
|
|
35
44
|
deps_string = @deps.map { |dep| dep.version == '' ? dep.name : dep.name + dep.version }.join(' ')
|
|
36
|
-
install_command =
|
|
45
|
+
install_command = pip_binary + ' install -U -I --user --root ' + pips_dir_name + ' ' + deps_string
|
|
37
46
|
|
|
38
47
|
fork do
|
|
39
|
-
ENV['PYTHONPATH'] = pip_packages_dir + '/
|
|
48
|
+
ENV['PYTHONPATH'] = pip_packages_dir + '/site-packages:' + pip_packages_dir + '/dist-packages'
|
|
40
49
|
puts `#{install_command}`
|
|
41
50
|
end
|
|
42
51
|
|
|
43
52
|
Process.wait
|
|
44
53
|
|
|
45
|
-
pips_packages_dir = Dir.glob(pips_dir_name + ENV['HOME'] + '/.local/lib
|
|
54
|
+
pips_packages_dir = ::Dir.glob(pips_dir_name + ENV['HOME'] + '/.local/lib/python*').first
|
|
55
|
+
pips_packages_dir ||= ::Dir.glob(pips_dir_name + ENV['HOME'] + '/Library/Python/*/lib/python*').first
|
|
56
|
+
|
|
57
|
+
pips_binary_dir = pips_dir_name + ENV['HOME'] + '/.local/bin'
|
|
58
|
+
|
|
59
|
+
unless File.exists?(pips_binary_dir)
|
|
60
|
+
pips_binary_dir = ::Dir.glob(pips_dir_name + ENV['HOME'] + '/Library/Python/*/bin').first
|
|
61
|
+
end
|
|
46
62
|
|
|
47
|
-
if File.exists?(
|
|
48
|
-
container_add(container, '__pips__/__bin__',
|
|
63
|
+
if (not pips_binary_dir.nil?) && File.exists?(pips_binary_dir)
|
|
64
|
+
container_add(container, '__pips__/__bin__', pips_binary_dir, true)
|
|
49
65
|
end
|
|
50
66
|
|
|
51
67
|
if File.exists?(pips_packages_dir + '/site-packages')
|