Merge branch 'simplify-ci-and-fix-macosx-wheels'

* simplify-ci-and-fix-macosx-wheels:
  ci: Update scikit-ci-addons to ensure 2.x and 3.x wheels are generated
  scikit-ci: Update PATH and remove use python instead of $<PYTHON>
  scikit-ci: Display python version

Author: jcfr

.circleci-matrix.yml

@@ -13,4 +13,4 @@ command:
   - docker run dockcross/$MANYLINUX_IMAGE > ~/bin/dockcross && chmod +x ~/bin/dockcross
   - |
     DOCKER_ARGS="-e CIRCLECI -e MANYLINUX_PYTHON=$MANYLINUX_PYTHON -e GIRDER_TOKEN"
-    dockcross -a "$DOCKER_ARGS" bash -c "/opt/python/${MANYLINUX_PYTHON}/bin/pip install scikit-ci==0.11.0 && /opt/python/${MANYLINUX_PYTHON}/bin/ci --clear-cached-env"
+    dockcross -a "$DOCKER_ARGS" bash -c "/opt/python/${MANYLINUX_PYTHON}/bin/pip install scikit-ci==0.12.0 && /opt/python/${MANYLINUX_PYTHON}/bin/ci --clear-cached-env"

.travis.yml

@@ -31,7 +31,7 @@ cache:
     - $HOME/downloads
 
 before_install:
-  - pip install scikit-ci==0.11.0 scikit-ci-addons==0.7.0
+  - pip install scikit-ci==0.12.0 scikit-ci-addons==0.10.0
   - ci_addons --install ../addons
 
 install:

appveyor.yml

@@ -40,7 +40,7 @@ cache:
   - C:\\cmake-3.6.2
 
 init:
-  - python -m pip install scikit-ci==0.11.0 scikit-ci-addons==0.7.0
+  - python -m pip install scikit-ci==0.12.0 scikit-ci-addons==0.10.0
   - python -m ci_addons --install ../addons
 
   - ps: ../addons/appveyor/rolling-build.ps1

circle.yml

@@ -9,7 +9,7 @@ dependencies:
   override:
     - curl -fsSL https://git.io/v2Ifs -o ~/bin/circleci-matrix
     - chmod +x ~/bin/circleci-matrix
-    - pip install scikit-ci-addons==0.8.0
+    - pip install scikit-ci-addons==0.10.0
     - ci_addons docker load-pull-save dockcross/manylinux-x64
     - ci_addons docker load-pull-save dockcross/manylinux-x86
 

scikit-ci.yml

@@ -2,12 +2,9 @@ schema_version: "0.5.0"
 
 before_install:
 
-  environment:
-    PYTHON: python
-
   appveyor:
     environment:
-      PYTHON: $<PYTHON_DIR>\\python.exe
+      PATH: $<PYTHON_DIR>;$<PYTHON_DIR>\\Scripts;$<PATH>
       RUN_ENV: .\\..\\addons\\appveyor\\run-with-visual-studio.cmd
     commands:
       - python ../addons/appveyor/patch_vs2008.py
@@ -22,28 +19,29 @@ before_install:
   travis:
     osx:
       environment:
-        RUN_ENV: ../addons/travis/run-with-pyenv.sh
+        PATH: $<HOME>/.pyenv/versions/$<PYTHONVERSION>/bin:$<PATH>
       commands:
         - python ../addons/travis/install_pyenv.py
         - python ../addons/travis/install_cmake.py 3.6.2
 
 install:
   commands:
-    - $<RUN_ENV> $<PYTHON> -m pip install --disable-pip-version-check --upgrade pip
-    - $<RUN_ENV> $<PYTHON> -m pip install -r requirements-dev.txt
+    - python --version
+    - python -m pip install --disable-pip-version-check --upgrade pip
+    - $<RUN_ENV> pip install -r requirements-dev.txt
 
 before_build:
   commands:
-    - $<RUN_ENV> $<PYTHON> -m flake8
+    - flake8
 
 build:
   commands:
-    - $<RUN_ENV> $<PYTHON> setup.py --hide-listing sdist
-    - $<RUN_ENV> $<PYTHON> setup.py --hide-listing bdist_wheel
+    - python setup.py --hide-listing sdist
+    - $<RUN_ENV> python setup.py --hide-listing bdist_wheel
 
 after_test:
   commands:
-    - python -m pip install girder-client==2.0.0
+    - pip install girder-client==2.0.0
     - python: |
               import girder_client, os, subprocess
               if 'GIRDER_TOKEN' in os.environ:
@@ -54,4 +52,4 @@ after_test:
                     shell=True)
               else:
                   print("Skipping upload: GIRDER_TOKEN environment variable is not set")
-    - $<RUN_ENV> $<PYTHON> setup.py clean
+    - python setup.py clean