MAINT Fix CI setup (#131)

Author: MuellerSeb

.travis.yml

@@ -1,5 +1,7 @@
 language: python
-sudo: false
+sudo: required
+services:
+  - xvfb
 matrix:
     include:
     - python: "3.6"
@@ -17,6 +19,7 @@ before_install:
     - export PATH=/home/travis/miniconda3/bin:$PATH
     - conda update --yes conda
     - conda info -a
+    - conda config --add channels conda-forge
 
 install:
     - conda create -q -n krige-env -y $DEPS pip pytest-cov pytest python=${TRAVIS_PYTHON_VERSION}
@@ -27,8 +30,6 @@ install:
 
 before_script:
   - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
 
 # command to run tests
 script: 
@@ -39,7 +40,7 @@ script:
         # scikit-learn needed by the regression kriging example
         conda install -y scikit-learn
         set -x
-        for f in examples/*.py; do 
+        for f in examples/*.py; do
            python $f 2>&1 | tee -a ~/log.txt
         done
         if grep -q "Traceback (most recent call last):" ~/log.txt; then false; else true; fi

appveyor.yml

@@ -1,11 +1,6 @@
 build: false
 
 environment:
-  global:
-    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
-    # /E:ON and /V:ON options are not enabled in the batch script intepreter
-    # See: http://stackoverflow.com/a/13751649/163740
-    WITH_COMPILER: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_compiler.cmd"
   matrix:
     - PYTHON_VERSION: "2.7.x"
       PYTHON_ARCH: "64"
@@ -26,9 +21,12 @@ init:
 install:
   - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PYTHON%\\Library\\bin;%PATH%"
   - conda config --set always_yes yes --set changeps1 no
+  - conda config --add channels conda-forge
+  - conda update -q conda
   - conda info -a
-  - conda install numpy scipy nose matplotlib cython scikit-learn pytest pytest-cov
-  - pip install coverage
+  - conda create --name pykrige numpy scipy matplotlib cython scikit-learn
+  - activate pykrige
+  - pip install coverage pytest-cov
   - pip install -e .
 
 

examples/krige_cv.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Krige CV
 --------

examples/krige_geometric.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Geometric example
 ------------------
@@ -56,13 +57,13 @@
 # >>> Longitude: [122 166  92 138  86 122 136]
 # >>> Latitude:  [-46 -36 -25 -73 -25  50 -29]
 # >>> z:         [ 2.75  3.36  2.24  3.07  3.37  5.25  2.82]
-# >>> 
+# >>>
 # >>> Krige at 60° latitude:
 # >>> ======================
 # >>> Longitude: [   0.   60.  120.  180.  240.  300.  360.]
 # >>> Value:     [ 5.32  5.14  5.3   5.18  5.35  5.61  5.32]
 # >>> Sigma²:    [ 2.19  1.31  0.41  1.22  2.1   2.46  2.19]
-# >>> 
+# >>>
 # >>> Ignoring curvature:
 # >>> =====================
 # >>> Value:     [ 4.55  4.72  5.25  4.82  4.61  4.53  4.48]

examples/regression_kriging2d.py

@@ -14,7 +14,7 @@
 from pykrige.rk import RegressionKriging
 from pykrige.compat import train_test_split
 
-svr_model = SVR(C=0.1)
+svr_model = SVR(C=0.1, gamma="auto")
 rf_model = RandomForestRegressor(n_estimators=100)
 lr_model = LinearRegression(normalize=True, copy_X=True, fit_intercept=False)
 

pykrige/compat.py

@@ -4,6 +4,8 @@
 
 from __future__ import absolute_import
 import sys
+import inspect
+from functools import partial
 
 
 PY3 = (sys.version_info[0] == 3)
@@ -19,6 +21,11 @@
         from sklearn.cross_validation import train_test_split
 
     SKLEARN_INSTALLED = True
+    if PY3:
+        arg_spec = inspect.getfullargspec(GridSearchCV)[0]
+        # https://stackoverflow.com/a/56618067/6696397
+        if "return_train_score" in arg_spec:
+            GridSearchCV = partial(GridSearchCV, return_train_score=True)
 
 except ImportError:
     SKLEARN_INSTALLED = False