Skip to content

Commit 2752e2e

Browse files
committed
Remove conda checking
1 parent f7ec9f8 commit 2752e2e

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

lib/pycall/libpython/finder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def python_investigator_py
121121
end
122122

123123
def set_PYTHONHOME(python_config)
124-
if !ENV.has_key?('PYTHONHOME') && python_config[:conda]
124+
if !ENV.has_key?('PYTHONHOME')
125125
case RUBY_PLATFORM
126126
when /mingw32/, /cygwin/, /mswin/
127127
ENV['PYTHONHOME'] = python_config[:exec_prefix]

lib/pycall/python/investigator.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
from distutils.sysconfig import get_config_var
22
import sys
33

4-
def conda():
5-
return 'conda' in sys.version or 'Continuum' in sys.version
6-
74
for var in ('executable', 'exec_prefix', 'prefix'):
85
print(var + ': ' + str(getattr(sys, var)))
9-
print('conda: ' + ('true' if conda() else 'false'))
106
print('multiarch: ' + str(getattr(getattr(sys, 'implementation', sys), '_multiarch', None)))
117
for var in ('VERSION', 'INSTSONAME', 'LIBRARY', 'LDLIBRARY', 'LIBDIR', 'PYTHONFRAMEWORKPREFIX', 'MULTIARCH'):
128
print(var + ': ' + str(get_config_var(var)))

0 commit comments

Comments
 (0)