Merge pull request #37 from mrkn/anaconda

Set PYTHONHOME when using anaconda or miniconda

Author: mrkn

.travis.yml

@@ -1,41 +1,57 @@
-sudo: false
 language: ruby
 
+os: linux
+
+dist: trusty
+sudo: required
+
 rvm:
-  - ruby-head
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
-  - 2.1.10
+- ruby-head
+- 2.4.2
+- 2.3.5
+- 2.2.8
+- 2.1.10
 
 env:
   global:
   - PYCALL_DEBUG_FIND_LIBPYTHON=1
   matrix:
-  - PYTHON=python PYENV_VERSION=system
-  - PYTHON=python3 PYENV_VERSION=3.5.3 LIBPYTHON=wrong_value
-  - PYENV_VERSION=3.5.3 LIBPYTHON=/opt/python/3.5.3/lib/libpython3.5m.so
-
-addons:
-  apt:
-    packages:
-      - python3
-      - python3-dev
-      - python3-all
-      - python3-all-dev
+  - PYENV_VERSION=2.7.13
+  - PYENV_VERSION=3.6.2
+  - PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
+  - PYENV_VERSION=miniconda2-4.1.11
+  - PYENV_VERSION=miniconda3-4.3.11
+
+matrix:
+  include:
+  - os: osx
+    osx_image: xcode9
+    compiler: clang
+    rvm: 2.4.1
+    env: PYENV_VERSION=3.6.2
+  - os: osx
+    osx_image: xcode9
+    compiler: clang
+    rvm: 2.4.1
+    env: PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
+  - os: osx
+    osx_image: xcode9
+    compiler: clang
+    rvm: 2.4.1
+    env: PYENV_VERSION=miniconda3-4.3.11
+  allow_failure:
+  - os: osx
 
 before_install:
-  - gem update --system
-  - gem update bundler
+- gem update --system
+- gem update bundler
+- export PATH="$(pyenv root)/bin:$PATH"
+- eval "$(pyenv init -)"
 
-before_script:
-  - bundle exec rake clobber compile
-  - echo === python investigator.py ===
-  - python lib/pycall/python/investigator.py
-  - python3 lib/pycall/python/investigator.py
-  - travis_retry pip install --user numpy
-  - PYENV_VERSION=3.5.3 travis_retry pip3 install --user numpy
+install:
+- ci/travis_install.sh
 
-matrix:
-  allow_failures:
-  - env: PYTHON=python  # Ignore failed on python 2.7
+before_script:
+- . ci/travis_before_script.sh
+- bundle exec rake clobber compile
+- python lib/pycall/python/investigator.py

ci/travis_before_script.sh

@@ -0,0 +1,21 @@
+__DIR__=$(cd $(dirname $BASH_SOURCE); pwd)
+. $__DIR__/travis_retry.sh
+
+set -ex
+
+if test -z "$PYENV_VERSION"; then
+  echo "ERROR: PYENV_VERSION is not provided" >2
+  exit 1
+fi
+
+if test -n "$LIBPYTHON"; then
+  export LIBPYTHON=$(pyenv root)/$LIBPYTHON
+fi
+
+case "$PYENV_VERSION" in
+*conda*)
+  source $(pyenv prefix)/bin/activate test-environment
+  ;;
+esac
+
+set +ex

ci/travis_install.sh

@@ -0,0 +1,48 @@
+#! /bin/bash
+
+__DIR__=$(cd $(dirname $BASH_SOURCE); pwd)
+. $__DIR__/travis_retry.sh
+
+set -ex
+
+if test -z "$PYENV_VERSION"; then
+  echo "ERROR: PYENV_VERSION is not provided" >2
+  exit 1
+fi
+
+if test -n "$LIBPYTHON"; then
+  export LIBPYTHON=$(pyenv root)/$LIBPYTHON
+fi
+
+if test "$PYENV_VERSION" = "system"; then
+  if test -z "$LIBPYTHON"; then
+    echo "ERROR: LIBPYTHON is not provided for PYENV_VERSION=system" >2
+    exit 1
+  fi
+  # NOTE: PYENV_VERSION should be the version of LIBPYTHON during install script
+  PYENV_VERSION=$(basename $(dirname $(dirname $LIBPYTHON)))
+fi
+PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install -f $PYENV_VERSION
+
+case "$PYENV_VERSION" in
+*conda*)
+  case "$PYENV_VERSION" in
+  *conda2*)
+    python_version=2.7
+    ;;
+  *)
+    python_version=3.6
+    ;;
+  esac
+  conda config --set always_yes yes --set changeps1 no
+  travis_retry conda update -q conda
+  conda info -a
+  travis_retry conda create -q -n test-environment python=$python_version numpy
+  source $(pyenv prefix)/bin/activate test-environment
+  ;;
+*)
+  travis_retry pip install --user numpy
+  ;;
+esac
+
+bundle install

ci/travis_retry.sh

@@ -0,0 +1,19 @@
+travis_retry ()
+{
+    local result=0
+    local count=1
+    while [ $count -le 3 ]; do
+        [ $result -ne 0 ] && {
+            echo -e "\n${ANSI_RED}The command \"$@\" failed. Retrying, $count of 3.${ANSI_RESET}\n" 1>&2
+        }
+        "$@"
+        result=$?
+        [ $result -eq 0 ] && break
+        count=$(($count + 1))
+        sleep 1
+    done
+    [ $count -gt 3 ] && {
+        echo -e "\n${ANSI_RED}The command \"$@\" failed 3 times.${ANSI_RESET}\n" 1>&2
+    }
+    return $result
+}

lib/pycall/libpython/finder.rb

@@ -39,6 +39,7 @@ def find_libpython(python = nil)
 	    end
 	  end
 
+          set_PYTHONHOME(python_config)
           libs = make_libs(python_config)
           libpaths = make_libpaths(python_config)
 
@@ -101,6 +102,10 @@ def investigate_python_config(python)
             {}.tap do |config|
               io.each_line do |line|
                 key, value = line.chomp.split(': ', 2)
+                case value
+                when 'True', 'true', 'False', 'false'
+                  value = (value == 'True' || value == 'true')
+                end
                 config[key.to_sym] = value if value != 'None'
               end
             end
@@ -113,6 +118,17 @@ def python_investigator_py
           File.expand_path('../../python/investigator.py', __FILE__)
         end
 
+        def set_PYTHONHOME(python_config)
+          if !ENV.has_key?('PYTHONHOME') && python_config[:conda]
+            case RUBY_PLATFORM
+            when /mingw32/, /cygwin/, /mswin/
+              ENV['PYTHONHOME'] = python_config[:exec_prefix]
+            else
+              ENV['PYTHONHOME'] = python_config.values_at(:prefix, :exec_prefix).join(':')
+            end
+          end
+        end
+
         def make_libs(python_config)
           libs = []
           %i(INSTSONAME LDLIBRARY).each do |key|

lib/pycall/python/investigator.py

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

spec/spec_helper.rb

@@ -2,7 +2,15 @@
 
 puts
 puts "Environment variables:"
-%w[LIBPYTHON PYTHON PYTHONPATH PYCALL_DEBUG_FIND_LIBPYTHON].each do |key|
+%w[
+  ANACONDA
+  LIBPYTHON
+  PYENV_VERSION
+  PYTHON
+  PYTHON_VERSION
+  PYTHONPATH
+  PYCALL_DEBUG_FIND_LIBPYTHON
+].each do |key|
   puts "- #{key}=#{ENV[key]}"
 end