Merge pull request #135 from jmarrec/121_Py_initialize

#121 - Revert "Remove conda checking"

Author: mrkn

lib/pycall/libpython/finder.rb

@@ -120,7 +120,7 @@ def python_investigator_py
         end
 
         def set_PYTHONHOME(python_config)
-          if !ENV.has_key?('PYTHONHOME')
+          if !ENV.has_key?('PYTHONHOME') && python_config[:conda]
             case RUBY_PLATFORM
             when /mingw32/, /cygwin/, /mswin/
               ENV['PYTHONHOME'] = python_config[:exec_prefix]

lib/pycall/python/investigator.py

@@ -1,8 +1,12 @@
 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)))