Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
b6f79f28
Commit
b6f79f28
authored
Aug 02, 2016
by
Wenzel Jakob
Committed by
GitHub
Aug 02, 2016
Browse files
Merge pull request #302 from dean0x7d/ci
Improve CI test coverage: eigen, numpy and C++14
parents
3764e284
880a7e4d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
47 deletions
+66
-47
.appveyor.yml
.appveyor.yml
+26
-19
.travis.yml
.travis.yml
+39
-27
example/CMakeLists.txt
example/CMakeLists.txt
+1
-1
No files found.
.appveyor.yml
View file @
b6f79f28
version
:
1.0.{build}
os
:
Visual Studio
2015
clone_folder
:
C:\projects\pybind11
test
:
off
configuration
:
-
Release
-
Debug
branches
:
only
:
-
master
platform
:
-
x86
-
x64
environment
:
CTEST_OUTPUT_ON_FAILURE
:
1
matrix
:
-
CMAKE_PLATFORM
:
"
Visual
Studio
14
2015"
PYTHON_DIR
:
"
C:
\\
Python34"
CTEST_OUTPUT_ON_FAILURE
:
1
-
CMAKE_PLATFORM
:
"
Visual
Studio
14
2015
Win64"
PYTHON_DIR
:
"
C:
\\
Python34-x64"
CTEST_OUTPUT_ON_FAILURE
:
1
-
CONDA
:
27
-
CONDA
:
35
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
:
-
echo Running cmake...
-
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"
-
cmake --build . --config %Configuration% --target check -- /v:m /logger:%MSBuildLogger%
-
cmake -A "%CMAKE_ARCH%"
-
set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-
cmake --build . --config Release --target check -- /v:m /logger:%MSBuildLogger%
.travis.yml
View file @
b6f79f28
language
:
cpp
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
:
directories
:
-
$HOME/.cache/pip
...
...
@@ -12,33 +26,31 @@ addons:
-
kubuntu-backports
# cmake 2.8.12
packages
:
-
g++-4.8
-
g++-4.8-multilib
-
g++-multilib
-
python3.5
-
python3.5-dev
-
python3.5-venv
-
python3.5-dev:i386
-
cmake
matrix
:
include
:
-
os
:
linux
compiler
:
gcc-4.8
install
:
-
pyvenv-3.5 venv
-
source venv/bin/activate
-
pip install -U pip wheel
-
pip install numpy
script
:
-
CXX=g++-4.8 cmake -DPYBIND11_PYTHON_VERSION=3.5
-
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
install
:
-
|
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
export CXX=g++-4.8 CC=gcc-4.8;
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; brew update; brew install python$PMAJOR;
else
curl -fsSL -O https://bootstrap.pypa.io/get-pip.py
sudo -H python get-pip.py
fi
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
:
-
cmake -DPYBIND11_PYTHON_VERSION=$PYTHON -DPYBIND11_CPP_STANDARD=-std=c++$CPP
-
CTEST_OUTPUT_ON_FAILURE=TRUE make check -j
2
example/CMakeLists.txt
View file @
b6f79f28
...
...
@@ -34,7 +34,7 @@ find_package(Eigen3 QUIET)
if
(
EIGEN3_FOUND
)
list
(
APPEND PYBIND11_EXAMPLES eigen.cpp
)
message
(
STATUS
"Building Eigen testcase"
)
message
(
STATUS
"Building Eigen
v
${
EIGEN3_VERSION
}
testcase"
)
else
()
message
(
STATUS
"NOT Building Eigen testcase"
)
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment