diff --git a/.travis.yml b/.travis.yml index a0aeb1be..fbc09158 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,11 @@ matrix: - python: 2.7 env: PANDAS_VERSION=0.16.1 NUMPY_VERSION=1.9.2 SCIPY_VERSION=0.15.1 - python: 2.7 - env: PANDAS_VERSION=0.17.1 NUMPY_VERSION=1.10.2 SCIPY_VERSION=0.16.1 + env: PANDAS_VERSION=0.17.1 NUMPY_VERSION=1.10.4 SCIPY_VERSION=0.16.1 - python: 3.4 env: PANDAS_VERSION=0.16.1 NUMPY_VERSION=1.9.2 SCIPY_VERSION=0.15.1 - python: 3.4 - env: PANDAS_VERSION=0.17.1 NUMPY_VERSION=1.10.2 SCIPY_VERSION=0.16.1 + env: PANDAS_VERSION=0.17.1 NUMPY_VERSION=1.10.4 SCIPY_VERSION=0.16.1 cache: directories: - $HOME/.cache/.pip/ diff --git a/appveyor.yml b/appveyor.yml index 346e2ee3..508d6d23 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ -matrix: - fast_finish: true +#matrix: +# fast_finish: true environment: global: @@ -9,15 +9,58 @@ environment: CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\appveyor\\run_with_env.cmd" matrix: - - PYTHON: "C:\\Python34_64" - PYTHON_VERSION: "3.4" + - PYTHON: "C:\\Python27_64" + PYTHON_VERSION: "2.7" PYTHON_ARCH: "64" PANDAS_VERSION: "0.16.1" NUMPY_VERSION: "1.9.2" - CONDA_PY: "34" - CONDA_NPY: "19" SCIPY_VERSION: "0.15.1" + - PYTHON_VERSION: "2.7" + PYTHON_ARCH: "32" + PANDAS_VERSION: "0.16.1" + NUMPY_VERSION: "1.9.2" + SCIPY_VERSION: "0.15.1" + + - PYTHON_VERSION: "3.4" + PYTHON_ARCH: "64" + PANDAS_VERSION: "0.16.1" + NUMPY_VERSION: "1.9.2" + SCIPY_VERSION: "0.15.1" + + - PYTHON_VERSION: "3.4" + PYTHON_ARCH: "32" + PANDAS_VERSION: "0.16.1" + NUMPY_VERSION: "1.9.2" + SCIPY_VERSION: "0.15.1" + + - PYTHON_VERSION: "2.7" + PYTHON_ARCH: "64" + PANDAS_VERSION: "0.17.1" + NUMPY_VERSION: "1.10.4" + SCIPY_VERSION: "0.16.1" + + - PYTHON: "C:\\Python27_64" + PYTHON_VERSION: "2.7" + PYTHON_ARCH: "32" + PANDAS_VERSION: "0.17.1" + NUMPY_VERSION: "1.10.4" + SCIPY_VERSION: "0.16.1" + + - PYTHON: "C:\\Python34_64" + PYTHON_VERSION: "3.4" + PYTHON_ARCH: "64" + PANDAS_VERSION: "0.17.1" + NUMPY_VERSION: "1.10.4" + SCIPY_VERSION: "0.16.1" + + - PYTHON: "C:\\Python34_64" + PYTHON_VERSION: "3.4" + PYTHON_ARCH: "32" + PANDAS_VERSION: "0.17.1" + NUMPY_VERSION: "1.10.4" + SCIPY_VERSION: "0.16.1" + # We always use a 64-bit machine, but can build x86 distributions # with the PYTHON_ARCH variable (which is used by CMD_IN_ENV). platform: