a2km 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd0be9d8cdd24b99dfca16dad1fdaca90ae3eb2
-  data.tar.gz: 3e45923484920d0c0849d9a408d0ba7e644257d9
+  metadata.gz: a4a6d6bd3b30a288da79c0bb8c8c7865844965b7
+  data.tar.gz: 38ab6cb67e22bd30870819c4435518b6ffa10e2f
 SHA512:
-  metadata.gz: 94d3adad6abb635bc980075c362bf875af5b8a78a9ed8f8d9fefa53b37e8eddcff9f1b0ee996a8dc756836a2e8b88d3b4966ac35bd7757e0ffb402e8a72d9a23
-  data.tar.gz: 5194abffa5630161a00d9f938d9ee29319f83bfe668d30cfb0689d3286b2edf6a34d08b7995df704f7277322a78f84125504dcd077f441eafae2adedfa30ba4b
+  metadata.gz: 15ee8b2c5b4a8e0b62d73e5b15c50ab3f59504771cf68df5b5502dba137b837a0fa7e2e7f3007a69909e2404b90dfd4f2ae8db93cae3f986e476b42358b52d59
+  data.tar.gz: 58b7ab12ef9d1a07d293d35ee47e6f5b318752d1c7eb7cdb6791aae752d77c206c4b8927d0b3ef3d86be22796a5897766d64bcc2a09ec59bca7183ad1f3159ea

data/lib/a2km/command.rb

@@ -163,26 +163,24 @@ module A2KM
       end
 
       command :"env-kernel" do |c|
-        c.syntax = 'a2km env-kernel [--venv|--conda] <name> [-e env-name] [--prefix PREFIX] [--user]'
+        c.syntax = 'a2km env-kernel [--venv|--conda] <name> [-e env-name] [--user]'
         c.description = 'Create a kernel from an env (conda or virtualenv)'
         
         c.option '--conda', "use conda env (default)"
         c.option '--venv', "use virtualenv"
         c.option '-e ENV', "specify the environment name to use (if different from <name>)"
-        c.option '--prefix PREFIX', 'specify the prefix for the executable to be installed'
         c.action do |args, options|
           name = args.shift
           options.default :user => false
           options.default :e => name
-          options.default :prefix => '~'
           env = options.e
-
+          
           kind = 'conda'
           if options.venv
             kind = 'venv'
           end
           puts "Making kernel '#{name}' for #{kind}:#{env}"
-          spec = A2KM::make_env_kernel(name, env, kind: kind, prefix: options.prefix)
+          spec = A2KM::make_env_kernel(name, env, kind: kind)
         end
       end
 
@@ -229,7 +227,6 @@ module A2KM
           end
 
           from = A2KM.get_kernel(from_name)
-          from = A2KM.kernels[from_name]
           src = from['resources_dir']
 
           if options.user?

data/lib/a2km/env.rb

@@ -59,13 +59,10 @@ END
       in_env(env, "python -c 'import ipykernel; print(ipykernel.__version__)'", kind: kind)
     end
 
-    def make_kernel_exe(kernel_name, env_name, kind: 'conda', prefix: '/usr/local')
+    def make_kernel_exe(kernel_name, env_name, kind: 'conda')
+      path = A2KM.get_kernel(kernel_name)['resources_dir']
       cmd = kernel_script(env_name, kind: kind)
-      bin = File.join(prefix, 'bin')
-      if not File.directory? bin
-        FileUtils.mkdir bin
-      end
-      kernel_exe = File.join(bin, "jupyter-kernel-#{kernel_name}")
+      kernel_exe = File.join(path, "jupyter-kernel-#{kernel_name}")
       puts "Making executable '#{kernel_exe}'"
       
       File.open(kernel_exe, 'w') do |f|
@@ -80,13 +77,10 @@ END
     end
   end
 
-  def self.make_env_kernel(kernel_name, env_name, kind: 'conda', prefix: '/usr/local', user: true)
-    prefix = File.expand_path(prefix)
+  def self.make_env_kernel(kernel_name, env_name, kind: 'conda', user: true)
     v = ENV_UTILS.ipykernel_version(env_name, kind: kind)
     
     puts "Found ipykernel-#{v}"
-    
-    exe = ENV_UTILS.make_kernel_exe(kernel_name, env_name, kind: kind, prefix: prefix)
     if user
       user_arg = '--user'
     else
@@ -94,6 +88,8 @@ END
     end
     
     ENV_UTILS.in_env(env_name, "python -m ipykernel.kernelspec --name #{kernel_name} #{user_arg}", kind: kind)
+    exe = ENV_UTILS.make_kernel_exe(kernel_name, env_name, kind: kind)
+    
     spec = A2KM.get_kernel_json(kernel_name)
     spec['argv'] = [exe, '-f', '{connection_file}']
     spec['display_name'] = "#{spec['display_name']} (#{kind}:#{env_name})"

data/lib/a2km/version.rb

@@ -1,5 +1,5 @@
 # Copyright Min RK, License: BSD 3-clause
 
 module A2KM
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: a2km
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Min RK