iron_worker_ng 0.16.0 → 0.16.1
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 +9 -4
- 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: f5eb1551366764bd2dd549f93d6ef582083f204d
|
|
4
|
+
data.tar.gz: d9bb9ab2aab46694ad44048670be24c81a3c1cca
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a26a6fefeb5825f4bdea93bc31d6f1da2279501e8c387031f74d73f1057ac64b134ad95fa16d610f028d965a3ecb6477097c941d0b895df4189048ab9ba03daf
|
|
7
|
+
data.tar.gz: d38f4d9ec8e3b4cb9c0602d2fd4fc7ac5ba147611939928be0fc5b479fa4279f1039ff9911653e475fcd284d2d9834b1927b1a7b0bd38332dda63365416db822
|
|
@@ -28,8 +28,12 @@ module IronWorkerNG
|
|
|
28
28
|
|
|
29
29
|
pip_packages_dir = Dir.glob(pip_dir_name + '/usr/' + local + '/lib/*python*').first
|
|
30
30
|
|
|
31
|
+
pips_dir_name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'pips')
|
|
32
|
+
|
|
33
|
+
::Dir.mkdir(pips_dir_name)
|
|
34
|
+
|
|
31
35
|
deps_string = @deps.map { |dep| dep.version == '' ? dep.name : dep.name + dep.version }.join(' ')
|
|
32
|
-
install_command = pip_dir_name + '/usr/' + local + '/bin/pip install --user -U -I ' + deps_string
|
|
36
|
+
install_command = pip_dir_name + '/usr/' + local + '/bin/pip install --user -U -I --root ' + pips_dir_name + ' ' + deps_string
|
|
33
37
|
|
|
34
38
|
fork do
|
|
35
39
|
ENV['PYTHONPATH'] = pip_packages_dir + '/site_packages:' + pip_packages_dir + '/dist-packages'
|
|
@@ -38,10 +42,10 @@ module IronWorkerNG
|
|
|
38
42
|
|
|
39
43
|
Process.wait
|
|
40
44
|
|
|
41
|
-
pips_packages_dir = Dir.glob(ENV['HOME'] + '/.local/lib/*python*').first
|
|
45
|
+
pips_packages_dir = Dir.glob(pips_dir_name + ENV['HOME'] + '/.local/lib/*python*').first
|
|
42
46
|
|
|
43
|
-
if File.exists?(ENV['HOME'] + '/.local/bin')
|
|
44
|
-
container_add(container, '__pips__/__bin__', ENV['HOME'] + '/.local/bin', true)
|
|
47
|
+
if File.exists?(pips_dir_name + ENV['HOME'] + '/.local/bin')
|
|
48
|
+
container_add(container, '__pips__/__bin__', pips_dir_name + ENV['HOME'] + '/.local/bin', true)
|
|
45
49
|
end
|
|
46
50
|
|
|
47
51
|
if File.exists?(pips_packages_dir + '/site-packages')
|
|
@@ -52,6 +56,7 @@ module IronWorkerNG
|
|
|
52
56
|
container_add(container, '__pips__', pips_packages_dir + '/dist-packages' , true)
|
|
53
57
|
end
|
|
54
58
|
|
|
59
|
+
FileUtils.rm_rf(pips_dir_name)
|
|
55
60
|
FileUtils.rm_rf(pip_dir_name)
|
|
56
61
|
end
|
|
57
62
|
end
|