Merge pull request #108 from mrkn/update_travis_ci

Update travis-ci configuration

Author: mrkn

.travis.yml

@@ -2,48 +2,63 @@ language: ruby
 
 os: linux
 
-dist: trusty
+dist: bionic
 sudo: required
 
 rvm:
 - ruby-head
-- 2.5.0
-- 2.4.3
-- 2.3.5
+- 2.6
+- 2.5
+- 2.4
 
 env:
   global:
   - PYCALL_DEBUG_FIND_LIBPYTHON=1
   matrix:
-  - 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
+  - PYENV_VERSION=3.8.0
+  - PYENV_VERSION=3.7.5
+  - PYENV_VERSION=2.7.17
+  - PYENV_VERSION=system LIBPYTHON=/usr/lib/x86_64-linux-gnu/libpython3.6m.so
+  - PYENV_VERSION=system LIBPYTHON=/usr/lib/x86_64-linux-gnu/libpython2.7.so
+  - PYENV_VERSION=miniconda2-4.3.30
+  - PYENV_VERSION=miniconda3-4.3.30
 
 matrix:
   include:
   - os: osx
-    osx_image: xcode9
+    osx_image: xcode11.2
     compiler: clang
-    rvm: 2.4.1
-    env: PYENV_VERSION=3.6.2
+    rvm: 2.6
+    env: PYENV_VERSION=3.8.0
   - os: osx
-    osx_image: xcode9
+    osx_image: xcode11.2
     compiler: clang
-    rvm: 2.4.1
-    env: PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
+    rvm: 2.5
+    env: PYENV_VERSION=3.8.0
   - os: osx
-    osx_image: xcode9
+    osx_image: xcode11.2
     compiler: clang
-    rvm: 2.4.1
+    rvm: 2.4
+    env: PYENV_VERSION=3.8.0
+  - os: osx
+    osx_image: xcode11.2
+    compiler: clang
+    rvm: 2.6
+    env: PYENV_VERSION=miniconda3-4.3.11
+  - os: osx
+    osx_image: xcode11.2
+    compiler: clang
+    rvm: 2.5
+    env: PYENV_VERSION=miniconda3-4.3.11
+  - os: osx
+    osx_image: xcode11.2
+    compiler: clang
+    rvm: 2.4
     env: PYENV_VERSION=miniconda3-4.3.11
   allow_failures:
   - os: osx
 
 before_install:
-- gem update --system
-- gem update bundler
 - export PATH="$(pyenv root)/bin:$PATH"
 - eval "$(pyenv init -)"
 

ci/travis_install.sh

@@ -10,19 +10,35 @@ if test -z "$PYENV_VERSION"; then
   exit 1
 fi
 
+pyenv_root=$(pyenv root)
+
 if test -n "$LIBPYTHON"; then
-  export LIBPYTHON=$(pyenv root)/$LIBPYTHON
+  if test ! -f $LIBPYTHON; then
+    if test -f ${pyenv_root}/$LIBPYTHON; then
+      export LIBPYTHON=${pyenv_root}/$LIBPYTHON
+    else
+      echo "Invalid value in LIBPYTHON: ${LIBPYTHON}" >&2
+      exit 1
+    fi
+  fi
 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
+(
+  cd $(pyenv root)
+  if [ -d .git ]; then
+    git fetch origin
+    git checkout master
+    git reset --hard origin/master
   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
+system)
+  ;;
+*)
+  PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install -f $PYENV_VERSION
+  ;;
+esac
 
 case "$PYENV_VERSION" in
 *conda*)
@@ -40,6 +56,11 @@ case "$PYENV_VERSION" in
   travis_retry conda create -q -n test-environment python=$python_version numpy
   source $(pyenv prefix)/bin/activate test-environment
   ;;
+system)
+  travis_retry pip install --user numpy
+  sudo sh -c "apt-get update && apt-get install --no-install-recommends -y python3-pip"
+  travis_retry python3.6 -m pip install --user numpy
+  ;;
 *)
   travis_retry pip install --user numpy
   ;;

pycall.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/pycall/extconf.rb"]
 
-  spec.add_development_dependency "bundler", ">= 1.17.2"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
   spec.add_development_dependency "rake-compiler-dock"