Merge pull request #100 from rmatsumiya/master

Modify PYTHONHOME configuration not to depend on anaconda version

fix #99

Author: mrkn

lib/pycall/libpython/finder.rb

@@ -40,10 +40,6 @@ def find_libpython(python = nil)
           debug_report("find_libpython(#{python.inspect})")
           python, python_config = find_python_config(python)
 
-          set_PYTHONHOME(python_config)
-          libs = make_libs(python_config)
-          libpaths = make_libpaths(python_config)
-
           # Try LIBPYTHON environment variable first.
           if (libpython = ENV['LIBPYTHON'])
             if File.file?(libpython)
@@ -59,6 +55,9 @@ def find_libpython(python = nil)
           end
 
           # Find libpython (we hope):
+          set_PYTHONHOME(python_config)
+          libs = make_libs(python_config)
+          libpaths = make_libpaths(python_config)
           multiarch = python_config[:MULTIARCH] || python_config[:multiarch]
           libs.each do |lib|
             libpaths.each do |libpath|
@@ -121,7 +120,7 @@ def python_investigator_py
         end
 
         def set_PYTHONHOME(python_config)
-          if !ENV.has_key?('PYTHONHOME') && python_config[:conda]
+          if !ENV.has_key?('PYTHONHOME')
             case RUBY_PLATFORM
             when /mingw32/, /cygwin/, /mswin/
               ENV['PYTHONHOME'] = python_config[:exec_prefix]

lib/pycall/python/investigator.py

@@ -1,12 +1,8 @@
 from distutils.sysconfig import get_config_var
 import sys
 
-def conda():
-    return 'conda' in sys.version or 'Continuum' in sys.version
-
 for var in ('executable', 'exec_prefix', 'prefix'):
   print(var + ': ' + str(getattr(sys, var)))
-print('conda: ' + ('true' if conda() else 'false'))
 print('multiarch: ' + str(getattr(getattr(sys, 'implementation', sys), '_multiarch', None)))
 for var in ('VERSION', 'INSTSONAME', 'LIBRARY', 'LDLIBRARY', 'LIBDIR', 'PYTHONFRAMEWORKPREFIX', 'MULTIARCH'):
   print(var + ': ' + str(get_config_var(var)))