Skip to content

Commit f1a64a8

Browse files
Merge pull request #118 from SylvainCorlay/update-pybind11
Update to pybind11 2.2
2 parents ef24fbc + bec2b97 commit f1a64a8

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.appveyor.yml

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

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ install:
9595
- conda update -q conda
9696
# Useful for debugging any issues with conda
9797
- conda info -a
98-
- conda install xtensor==0.12.0 pytest numpy pybind11==2.1.1 -c conda-forge
98+
- conda install xtensor==0.12.1 pytest numpy pybind11==2.2.1 -c conda-forge
9999
- conda install cmake gtest -c conda-forge
100100
- cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
101101
- make -j2 test_xtensor_python

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,15 @@ from the `docs` subdirectory.
187187

188188
`xtensor-python` depends on the `xtensor` and `pybind11` libraries
189189

190-
| `xtensor-python` | `xtensor` | `pybind11` |
191-
|-------------------|------------|-------------|
192-
| master | ^0.12.0 | ^2.1.0 |
193-
| 0.14.x | ^0.12.0 | ^2.1.0 |
194-
| 0.13.x | ^0.11.0 | ^2.1.0 |
195-
| 0.12.x | ^0.10.2 | 2.1.\* |
196-
| 0.11.x | ^0.10.0 | 2.1.\* |
197-
| 0.10.x | ^0.9.0 | 2.1.\* |
198-
| 0.9.x | ^0.8.1 | 2.1.\* |
190+
| `xtensor-python` | `xtensor` | `pybind11` |
191+
|------------------|-----------|------------------|
192+
| master | ^0.12.0 | ~2.1.0 or ~2.2.1 |
193+
| 0.14.x | ^0.12.0 | ~2.1.0 or ~2.2.1 |
194+
| 0.13.x | ^0.11.0 | ~2.1.0 or ~2.2.1 |
195+
| 0.12.x | ^0.10.2 | 2.1.\* |
196+
| 0.11.x | ^0.10.0 | 2.1.\* |
197+
| 0.10.x | ^0.9.0 | 2.1.\* |
198+
| 0.9.x | ^0.8.1 | 2.1.\* |
199199

200200
These dependencies are automatically resolved when using the conda package manager.
201201

0 commit comments

Comments
 (0)