Skip to content

Commit e4759f9

Browse files
authored
Merge pull request #205 from JohanMabille/upgrade_pybind
Upgraded to pybind11 2.2.4
2 parents 0a8a00b + fd2a1ec commit e4759f9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install:
2222
- conda update -q conda
2323
- conda info -a
2424
- conda install gtest cmake -c conda-forge
25-
- conda install pytest numpy pybind11==2.2.1 xtensor==0.20.6 -c conda-forge
25+
- conda install pytest numpy pybind11==2.2.4 xtensor==0.20.6 -c conda-forge
2626
- "set PYTHONHOME=%MINICONDA%"
2727
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
2828
- nmake test_xtensor_python

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ matrix:
8888
env: PY=3
8989
env:
9090
global:
91-
- MINCONDA_VERSION="4.3.21"
91+
- MINCONDA_VERSION="latest"
9292
- MINCONDA_LINUX="Linux-x86_64"
9393
- MINCONDA_OSX="MacOSX-x86_64"
9494
before_install:
@@ -104,7 +104,7 @@ before_install:
104104
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
105105
export CXX=clang++ CC=clang PYTHONHOME=$HOME/miniconda;
106106
fi
107-
- PYBIND11_VERSION=${PYBIND11_VERSION:-2.2.1}
107+
- PYBIND11_VERSION=${PYBIND11_VERSION:-2.2.4}
108108

109109
install:
110110
# Define the version of miniconda to download
@@ -115,7 +115,7 @@ install:
115115
fi
116116
- if [[ "$PY" == "3" ]]; then
117117
wget "http://repo.continuum.io/miniconda/Miniconda3-$MINCONDA_VERSION-$MINCONDA_OS.sh" -O miniconda.sh;
118-
PY_EXE=$HOME/miniconda/bin/python3.6;
118+
PY_EXE=$HOME/miniconda/bin/python3.7;
119119
else
120120
wget "http://repo.continuum.io/miniconda/Miniconda2-$MINCONDA_VERSION-$MINCONDA_OS.sh" -O miniconda.sh;
121121
PY_EXE=$HOME/miniconda/bin/python2.7;

0 commit comments

Comments
 (0)