Merge 7b8cbc5 into a7a8318

.travis.yml

@@ -1,10 +1,25 @@
 language: python
 sudo: false
-python:
-  - 2.7
-  - 3.4
-  - 3.5
-  - 3.6
+matrix:
+  include:
+  - python: 2.7
+    env: REQUIREMENTS=ci-requirements.txt
+  - python: 3.4
+    env: REQUIREMENTS=ci-requirements.txt
+  - python: 3.5
+    env: REQUIREMENTS=ci-requirements.txt
+  - python: 3.6
+    env: REQUIREMENTS=ci-requirements.txt
+  - python: 2.7
+    env: REQUIREMENTS=ci-requirements-latest.txt
+  - python: 3.6
+    env: REQUIREMENTS=ci-requirements-latest.txt
+  allow_failures:
+  - python: 2.7
+    env: REQUIREMENTS=ci-requirements-latest.txt
+  - python: 3.6
+    env: REQUIREMENTS=ci-requirements-latest.txt
+
 branches:
   only:
     master
@@ -16,8 +31,9 @@ before_install:
   - ccache -s
   - export PATH=/usr/lib/ccache:${PATH}
   - pip install --upgrade pip
+  - pip install wheel
 install:
-  - pip install --upgrade -r travis-ci-requirements.txt
+  - pip install --upgrade -r "./ci/${REQUIREMENTS}"
   - python setup.py develop
 before_script:
   - mkdir testrunner
@@ -29,4 +45,5 @@ notifications:
   email:
     - travis-ci@enthought.com
 after_success:
-  coveralls
+  - pip install coveralls
+  - coveralls

appveyor.yml

@@ -2,39 +2,46 @@ build: false
 shallow_clone: true
 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
-    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
-
   matrix:
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x"
-      PYTHON_ARCH: "64"
+    - python: "C:/Python27-x64"
+      requirements: "ci-requirements.txt"
+
+    - python: "C:/Python34-x64"
+      requirements: "ci-requirements.txt"
+      distutils_use_sdk: "1"
+
+    - python: "C:/Python35-x64"
+      requirements: "ci-requirements.txt"
+
+    - python: "C:/Python36-x64"
+      requirements: "ci-requirements.txt"
 
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4.x"
-      PYTHON_ARCH: "64"
+    - python: "C:/Python27-x64"
+      requirements: "ci-requirements-latest.txt"
 
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.x"
-      PYTHON_ARCH: "64"
+    - python: "C:/Python36-x64"
+      requirements: "ci-requirements-latest.txt"
 
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.x"
-      PYTHON_ARCH: "64"
+matrix:
+  allow_failures:
+  - requirements: "ci-requirements-latest.txt"
 
 cache:
-  - c:\egg_cache
+  - C:\Users\appveyor\AppData\Local\pip\Cache
 
 init:
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - ps: $env:path = "$env:python;$env:python\scripts;$env:path"
 install:
-  - ps: if ((Test-Path "c:/egg_cache") -eq 0) { mkdir c:/egg_cache }
-  - ps: python -m pip install --upgrade --no-binary wheel pip
-  - ps: pip install --upgrade wheel
-  - ps: pip --version
-  - "%CMD_IN_ENV% .\\appveyor\\appveyor-install.cmd"
+  - python -m pip install --upgrade --no-binary wheel pip
+  - pip install --upgrade wheel
+  - pip install --upgrade -r ci/%requirements%
+  - pip --version
+  - ci/build.cmd pip install -e .
 test_script:
-  - "%CMD_IN_ENV% .\\appveyor\\appveyor-test.cmd"
+  - ps: md testrun
+  - ps: copy .coveragerc testrun/
+  - ps: cd testrun
+  - coverage run -m nose.core -v traits --exe
+on_success:
+  - pip install coveralls
+  - coveralls

ci/build.cmd

@@ -0,0 +1,21 @@
+@echo off
+:: To build extensions for 64 bit Python 3, we need to configure environment
+:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 4
+::
+:: More details at:
+:: https://github.com/cython/cython/wiki/CythonExtensionsOnWindows
+
+IF "%DISTUTILS_USE_SDK%"=="1" (
+    ECHO Configuring environment to build with MSVC on a 64bit architecture
+    ECHO Using Windows SDK 7.1
+    "C:\Program Files\Microsoft SDKs\Windows\v7.1\Setup\WindowsSdkVer.exe" -q -version:v7.1
+    CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release
+    SET MSSdk=1
+    REM Need the following to allow tox to see the SDK compiler
+    SET TOX_TESTENV_PASSENV=DISTUTILS_USE_SDK MSSdk INCLUDE LIB
+) ELSE (
+    ECHO Using default MSVC build environment
+)
+
+CALL %*

ci/ci-requirements-latest.txt

@@ -0,0 +1,5 @@
+nose
+cython
+sphinx
+coverage
+numpy

ci/ci-requirements.txt

@@ -0,0 +1,5 @@
+nose == 1.3.4
+cython == 0.26
+sphinx == 1.6.3
+coverage == 4.4.1
+numpy == 1.13.1