a2km 0.0.2 → 0.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/a2km/command.rb +3 -6
- data/lib/a2km/env.rb +6 -10
- data/lib/a2km/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: a4a6d6bd3b30a288da79c0bb8c8c7865844965b7
|
4
|
+
data.tar.gz: 38ab6cb67e22bd30870819c4435518b6ffa10e2f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 15ee8b2c5b4a8e0b62d73e5b15c50ab3f59504771cf68df5b5502dba137b837a0fa7e2e7f3007a69909e2404b90dfd4f2ae8db93cae3f986e476b42358b52d59
|
7
|
+
data.tar.gz: 58b7ab12ef9d1a07d293d35ee47e6f5b318752d1c7eb7cdb6791aae752d77c206c4b8927d0b3ef3d86be22796a5897766d64bcc2a09ec59bca7183ad1f3159ea
|
data/lib/a2km/command.rb
CHANGED
@@ -163,26 +163,24 @@ module A2KM
|
|
163
163
|
end
|
164
164
|
|
165
165
|
command :"env-kernel" do |c|
|
166
|
-
c.syntax = 'a2km env-kernel [--venv|--conda] <name> [-e env-name] [--
|
166
|
+
c.syntax = 'a2km env-kernel [--venv|--conda] <name> [-e env-name] [--user]'
|
167
167
|
c.description = 'Create a kernel from an env (conda or virtualenv)'
|
168
168
|
|
169
169
|
c.option '--conda', "use conda env (default)"
|
170
170
|
c.option '--venv', "use virtualenv"
|
171
171
|
c.option '-e ENV', "specify the environment name to use (if different from <name>)"
|
172
|
-
c.option '--prefix PREFIX', 'specify the prefix for the executable to be installed'
|
173
172
|
c.action do |args, options|
|
174
173
|
name = args.shift
|
175
174
|
options.default :user => false
|
176
175
|
options.default :e => name
|
177
|
-
options.default :prefix => '~'
|
178
176
|
env = options.e
|
179
|
-
|
177
|
+
|
180
178
|
kind = 'conda'
|
181
179
|
if options.venv
|
182
180
|
kind = 'venv'
|
183
181
|
end
|
184
182
|
puts "Making kernel '#{name}' for #{kind}:#{env}"
|
185
|
-
spec = A2KM::make_env_kernel(name, env, kind: kind
|
183
|
+
spec = A2KM::make_env_kernel(name, env, kind: kind)
|
186
184
|
end
|
187
185
|
end
|
188
186
|
|
@@ -229,7 +227,6 @@ module A2KM
|
|
229
227
|
end
|
230
228
|
|
231
229
|
from = A2KM.get_kernel(from_name)
|
232
|
-
from = A2KM.kernels[from_name]
|
233
230
|
src = from['resources_dir']
|
234
231
|
|
235
232
|
if options.user?
|
data/lib/a2km/env.rb
CHANGED
@@ -59,13 +59,10 @@ END
|
|
59
59
|
in_env(env, "python -c 'import ipykernel; print(ipykernel.__version__)'", kind: kind)
|
60
60
|
end
|
61
61
|
|
62
|
-
def make_kernel_exe(kernel_name, env_name, kind: 'conda'
|
62
|
+
def make_kernel_exe(kernel_name, env_name, kind: 'conda')
|
63
|
+
path = A2KM.get_kernel(kernel_name)['resources_dir']
|
63
64
|
cmd = kernel_script(env_name, kind: kind)
|
64
|
-
|
65
|
-
if not File.directory? bin
|
66
|
-
FileUtils.mkdir bin
|
67
|
-
end
|
68
|
-
kernel_exe = File.join(bin, "jupyter-kernel-#{kernel_name}")
|
65
|
+
kernel_exe = File.join(path, "jupyter-kernel-#{kernel_name}")
|
69
66
|
puts "Making executable '#{kernel_exe}'"
|
70
67
|
|
71
68
|
File.open(kernel_exe, 'w') do |f|
|
@@ -80,13 +77,10 @@ END
|
|
80
77
|
end
|
81
78
|
end
|
82
79
|
|
83
|
-
def self.make_env_kernel(kernel_name, env_name, kind: 'conda',
|
84
|
-
prefix = File.expand_path(prefix)
|
80
|
+
def self.make_env_kernel(kernel_name, env_name, kind: 'conda', user: true)
|
85
81
|
v = ENV_UTILS.ipykernel_version(env_name, kind: kind)
|
86
82
|
|
87
83
|
puts "Found ipykernel-#{v}"
|
88
|
-
|
89
|
-
exe = ENV_UTILS.make_kernel_exe(kernel_name, env_name, kind: kind, prefix: prefix)
|
90
84
|
if user
|
91
85
|
user_arg = '--user'
|
92
86
|
else
|
@@ -94,6 +88,8 @@ END
|
|
94
88
|
end
|
95
89
|
|
96
90
|
ENV_UTILS.in_env(env_name, "python -m ipykernel.kernelspec --name #{kernel_name} #{user_arg}", kind: kind)
|
91
|
+
exe = ENV_UTILS.make_kernel_exe(kernel_name, env_name, kind: kind)
|
92
|
+
|
97
93
|
spec = A2KM.get_kernel_json(kernel_name)
|
98
94
|
spec['argv'] = [exe, '-f', '{connection_file}']
|
99
95
|
spec['display_name'] = "#{spec['display_name']} (#{kind}:#{env_name})"
|
data/lib/a2km/version.rb
CHANGED