File tree Expand file tree Collapse file tree 2 files changed +23
-17
lines changed
Expand file tree Collapse file tree 2 files changed +23
-17
lines changed Original file line number Diff line number Diff line change @@ -9,20 +9,16 @@ environment:
99 MSSdk : 1
1010 matrix :
1111 - PYTHON : 27
12- - PYTHON : 35
12+ - PYTHON : 36
1313 - CONDA : 27
1414 - CONDA : 35
15- matrix :
16- allow_failures :
17- - platform : x86
18- CONDA : 27
1915install :
2016- cmd : ' "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PLATFORM%'
2117- ps : |
2218 if ($env:PYTHON) {
2319 if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" }
2420 $env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH"
25- pip install --disable-pip-version-check --user --upgrade pip
21+ pip install --disable-pip-version-check --user --upgrade pip setuptools
2622 } elseif ($env:CONDA) {
2723 if ($env:CONDA -eq "27") { $env:CONDA = "" }
2824 if ($env:PLATFORM -eq "x64") { $env:CONDA = "$env:CONDA-x64" }
@@ -36,8 +32,8 @@ build_script:
3632- ps : |
3733 if ($env:PYTHON) {
3834 python setup.py sdist
39- pip install --verbose dist\python_example-0.0.1.zip
40- } elseif ($env:CONDA) {
35+ pip install --verbose dist\python_example-0.0.1.tar.gz
36+ } else {
4137 conda build conda.recipe
4238 conda install --use-local python_example
4339 }
Original file line number Diff line number Diff line change 11language : cpp
2- os :
3- - linux
4- - osx
5- env :
6- - PYTHON=2.7
7- - PYTHON=3.5
8- - CONDA=2.7
9- - CONDA=3.5
2+ matrix :
3+ include :
4+ - os : linux
5+ env : PYTHON=2.7
6+ - os : linux
7+ env : PYTHON=3.5
8+ - os : linux
9+ env : CONDA=2.7
10+ - os : linux
11+ env : CONDA=3.5
12+ - os : osx
13+ env : PYTHON=2.7
14+ - os : osx
15+ env : PYTHON=3.6
16+ - os : osx
17+ env : CONDA=2.7
18+ - os : osx
19+ env : CONDA=3.5
1020addons :
1121 apt :
1222 sources :
@@ -20,7 +30,7 @@ before_install:
2030- |
2131 if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX=g++-4.8 CC=gcc-4.8; fi
2232 if [ -n "$PYTHON" ]; then
23- if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$PYTHON" = "3.5 " ]; then
33+ if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "${ PYTHON:0:1} " = "3" ]; then
2434 brew update; brew install python3;
2535 fi
2636 pip install --user --upgrade pip virtualenv
You can’t perform that action at this time.
0 commit comments