mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-22 13:15:12 +00:00
Improve CI test coverage: eigen, numpy and C++14
This commit is contained in:
parent
f38f359f96
commit
3ac1275248
@ -1,26 +1,33 @@
|
|||||||
version: 1.0.{build}
|
version: 1.0.{build}
|
||||||
os: Visual Studio 2015
|
os: Visual Studio 2015
|
||||||
clone_folder: C:\projects\pybind11
|
|
||||||
test: off
|
test: off
|
||||||
configuration:
|
platform:
|
||||||
- Release
|
- x86
|
||||||
- Debug
|
- x64
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
environment:
|
environment:
|
||||||
|
CTEST_OUTPUT_ON_FAILURE: 1
|
||||||
matrix:
|
matrix:
|
||||||
- CMAKE_PLATFORM: "Visual Studio 14 2015"
|
- CONDA: 27
|
||||||
PYTHON_DIR: "C:\\Python34"
|
- CONDA: 35
|
||||||
CTEST_OUTPUT_ON_FAILURE: 1
|
|
||||||
- CMAKE_PLATFORM: "Visual Studio 14 2015 Win64"
|
|
||||||
PYTHON_DIR: "C:\\Python34-x64"
|
|
||||||
CTEST_OUTPUT_ON_FAILURE: 1
|
|
||||||
install:
|
install:
|
||||||
- cinstall: python
|
- ps: |
|
||||||
|
if ($env:PLATFORM -eq "x64") { $env:CMAKE_ARCH = "x64" }
|
||||||
|
if ($env:PYTHON) {
|
||||||
|
if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" }
|
||||||
|
$env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH"
|
||||||
|
pip install --disable-pip-version-check --user --upgrade pip wheel
|
||||||
|
pip install numpy scipy
|
||||||
|
} elseif ($env:CONDA) {
|
||||||
|
if ($env:CONDA -eq "27") { $env:CONDA = "" }
|
||||||
|
if ($env:PLATFORM -eq "x64") { $env:CONDA = "$env:CONDA-x64" }
|
||||||
|
$env:PATH = "C:\Miniconda$env:CONDA\;C:\Miniconda$env:CONDA\Scripts\;$env:PATH"
|
||||||
|
conda install -y -q numpy scipy
|
||||||
|
}
|
||||||
|
- ps: |
|
||||||
|
Start-FileDownload 'http://bitbucket.org/eigen/eigen/get/3.2.9.zip'
|
||||||
|
7z x 3.2.9.zip -y > $null
|
||||||
|
$env:CMAKE_INCLUDE_PATH = "eigen-eigen-dc6cfdf9bcec"
|
||||||
build_script:
|
build_script:
|
||||||
- echo Running cmake...
|
- cmake -A "%CMAKE_ARCH%"
|
||||||
- cd c:\projects\pybind11
|
|
||||||
- cmake -G "%CMAKE_PLATFORM%" -DPYTHON_EXECUTABLE:FILEPATH=%PYTHON_DIR%/python.exe
|
|
||||||
- set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
|
- set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
|
||||||
- cmake --build . --config %Configuration% --target check -- /v:m /logger:%MSBuildLogger%
|
- cmake --build . --config Release --target check -- /v:m /logger:%MSBuildLogger%
|
||||||
|
56
.travis.yml
56
.travis.yml
@ -1,5 +1,19 @@
|
|||||||
language: cpp
|
language: cpp
|
||||||
sudo: false
|
sudo: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- os: linux
|
||||||
|
compiler: gcc-4.8
|
||||||
|
env: PYTHON=2.7 CPP=11
|
||||||
|
- os: linux
|
||||||
|
compiler: gcc-4.8
|
||||||
|
env: PYTHON=3.5 CPP=11
|
||||||
|
- os: osx
|
||||||
|
osx_image: xcode7.3
|
||||||
|
env: PYTHON=2.7 CPP=14
|
||||||
|
- os: osx
|
||||||
|
osx_image: xcode7.3
|
||||||
|
env: PYTHON=3.5 CPP=14
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/.cache/pip
|
- $HOME/.cache/pip
|
||||||
@ -12,33 +26,27 @@ addons:
|
|||||||
- kubuntu-backports # cmake 2.8.12
|
- kubuntu-backports # cmake 2.8.12
|
||||||
packages:
|
packages:
|
||||||
- g++-4.8
|
- g++-4.8
|
||||||
- g++-4.8-multilib
|
|
||||||
- g++-multilib
|
|
||||||
- python3.5
|
- python3.5
|
||||||
- python3.5-dev
|
- python3.5-dev
|
||||||
- python3.5-venv
|
|
||||||
- python3.5-dev:i386
|
|
||||||
- cmake
|
- cmake
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- os: linux
|
|
||||||
compiler: gcc-4.8
|
|
||||||
install:
|
install:
|
||||||
- pyvenv-3.5 venv
|
- |
|
||||||
- source venv/bin/activate
|
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
|
||||||
- pip install -U pip wheel
|
export CXX=g++-4.8 CC=gcc-4.8;
|
||||||
- pip install numpy
|
pip install --user --upgrade pip virtualenv
|
||||||
|
virtualenv -p python$PYTHON venv
|
||||||
|
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
||||||
|
if [ "${PYTHON:0:1}" = "3" ]; then PMAJOR=3; fi
|
||||||
|
brew update; brew install python$PMAJOR;
|
||||||
|
pip$PMAJOR install --user --upgrade pip virtualenv
|
||||||
|
python$PMAJOR -m virtualenv venv
|
||||||
|
fi
|
||||||
|
source venv/bin/activate
|
||||||
|
pip install numpy scipy
|
||||||
|
- |
|
||||||
|
wget -q -O eigen.tar.gz https://bitbucket.org/eigen/eigen/get/3.2.9.tar.gz
|
||||||
|
tar xzf eigen.tar.gz
|
||||||
|
export CMAKE_INCLUDE_PATH=eigen-eigen-dc6cfdf9bcec
|
||||||
script:
|
script:
|
||||||
- CXX=g++-4.8 cmake -DPYBIND11_PYTHON_VERSION=3.5
|
- cmake -DPYBIND11_PYTHON_VERSION=$PYTHON -DPYBIND11_CPP_STANDARD=-std=c++$CPP
|
||||||
- CTEST_OUTPUT_ON_FAILURE=TRUE make check -j 2
|
- CTEST_OUTPUT_ON_FAILURE=TRUE make check -j 2
|
||||||
- os: osx
|
|
||||||
compiler: clang
|
|
||||||
script:
|
|
||||||
- cmake -DPYBIND11_PYTHON_VERSION=2.7
|
|
||||||
- CTEST_OUTPUT_ON_FAILURE=TRUE make check -j 2
|
|
||||||
#- os: linux
|
|
||||||
#compiler: gcc-4.8
|
|
||||||
#script:
|
|
||||||
#- pyvenv-3.5 venv
|
|
||||||
#- cmake -DPYBIND11_PYTHON_VERSION=3.5 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.5m -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.5m.so -DPYTHON_EXECUTABLE:FILEPATH=`pwd`/venv/bin/python3.5 -DCMAKE_CXX_COMPILER=g++-4.8 -DCMAKE_CXX_FLAGS=-m32
|
|
||||||
#- make -j 2
|
|
||||||
|
@ -34,7 +34,7 @@ find_package(Eigen3 QUIET)
|
|||||||
|
|
||||||
if(EIGEN3_FOUND)
|
if(EIGEN3_FOUND)
|
||||||
list(APPEND PYBIND11_EXAMPLES eigen.cpp)
|
list(APPEND PYBIND11_EXAMPLES eigen.cpp)
|
||||||
message(STATUS "Building Eigen testcase")
|
message(STATUS "Building Eigen v${EIGEN3_VERSION} testcase")
|
||||||
else()
|
else()
|
||||||
message(STATUS "NOT Building Eigen testcase")
|
message(STATUS "NOT Building Eigen testcase")
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user