Browse Source

Fix CI test failures with homebrew python 3.6 and windows conda 2.7 (#17)

master
Dean Moldovan 8 years ago committed by Wenzel Jakob
parent
commit
6dfbb291a7
  1. 12
      .appveyor.yml
  2. 28
      .travis.yml

12
.appveyor.yml

@ -9,20 +9,16 @@ environment:
MSSdk: 1 MSSdk: 1
matrix: matrix:
- PYTHON: 27 - PYTHON: 27
- PYTHON: 35 - PYTHON: 36
- CONDA: 27 - CONDA: 27
- CONDA: 35 - CONDA: 35
matrix:
allow_failures:
- platform: x86
CONDA: 27
install: install:
- cmd: '"%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PLATFORM%' - cmd: '"%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PLATFORM%'
- ps: | - ps: |
if ($env:PYTHON) { if ($env:PYTHON) {
if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" } if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" }
$env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH" $env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH"
pip install --disable-pip-version-check --user --upgrade pip pip install --disable-pip-version-check --user --upgrade pip setuptools
} elseif ($env:CONDA) { } elseif ($env:CONDA) {
if ($env:CONDA -eq "27") { $env:CONDA = "" } if ($env:CONDA -eq "27") { $env:CONDA = "" }
if ($env:PLATFORM -eq "x64") { $env:CONDA = "$env:CONDA-x64" } if ($env:PLATFORM -eq "x64") { $env:CONDA = "$env:CONDA-x64" }
@ -36,8 +32,8 @@ build_script:
- ps: | - ps: |
if ($env:PYTHON) { if ($env:PYTHON) {
python setup.py sdist python setup.py sdist
pip install --verbose dist\python_example-0.0.1.zip pip install --verbose dist\python_example-0.0.1.tar.gz
} elseif ($env:CONDA) { } else {
conda build conda.recipe conda build conda.recipe
conda install --use-local python_example conda install --use-local python_example
} }

28
.travis.yml

@ -1,12 +1,22 @@
language: cpp language: cpp
os: matrix:
- linux include:
- osx - os: linux
env: env: PYTHON=2.7
- PYTHON=2.7 - os: linux
- PYTHON=3.5 env: PYTHON=3.5
- CONDA=2.7 - os: linux
- CONDA=3.5 env: CONDA=2.7
- os: linux
env: CONDA=3.5
- os: osx
env: PYTHON=2.7
- os: osx
env: PYTHON=3.6
- os: osx
env: CONDA=2.7
- os: osx
env: CONDA=3.5
addons: addons:
apt: apt:
sources: sources:
@ -20,7 +30,7 @@ before_install:
- | - |
if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX=g++-4.8 CC=gcc-4.8; fi if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX=g++-4.8 CC=gcc-4.8; fi
if [ -n "$PYTHON" ]; then if [ -n "$PYTHON" ]; then
if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$PYTHON" = "3.5" ]; then if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "${PYTHON:0:1}" = "3" ]; then
brew update; brew install python3; brew update; brew install python3;
fi fi
pip install --user --upgrade pip virtualenv pip install --user --upgrade pip virtualenv

Loading…
Cancel
Save