Skip to content

Commit adb416c

Browse files
committed
Try PyPy again
1 parent 7a6c75d commit adb416c

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

.travis.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ matrix:
1616
- PY_CMD=python3
1717
- $PY_CMD -m pip install --user --upgrade pip wheel setuptools
1818
install:
19+
# breathe 4.14 doesn't work with bit fields. See https://github.com/michaeljones/breathe/issues/462
20+
# Latest breathe + Sphinx causes warnings and errors out
1921
- $PY_CMD -m pip install --user --upgrade "sphinx<3" sphinx_rtd_theme breathe==4.13.1 flake8 pep8-naming pytest
2022
- curl -fsSL https://sourceforge.net/projects/doxygen/files/rel-1.8.15/doxygen-1.8.15.linux.bin.tar.gz/download | tar xz
2123
- export PATH="$PWD/doxygen-1.8.15/bin:$PATH"
@@ -163,6 +165,17 @@ matrix:
163165
- libblas-dev
164166
- liblapack-dev
165167
- gfortran
168+
- os: linux
169+
dist: xenial
170+
env: PYPY=7.3 PYTHON=3.6 CPP=11 GCC=5
171+
name: PyPy 7.3, Python 3.6, c++11, gcc 5
172+
addons:
173+
apt:
174+
packages:
175+
- libblas-dev
176+
- liblapack-dev
177+
- gfortran
178+
- g++-5
166179
# Build in 32-bit mode and tests against the CMake-installed version
167180
- os: linux
168181
dist: trusty
@@ -224,8 +237,8 @@ before_install:
224237
$SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
225238
else
226239
if [ "$PYPY" = "7.3" ]; then
227-
curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.1-aarch64.tar.bz2 | tar xj
228-
PY_CMD=$(echo `pwd`/pypy2.7-v7.3.1-linux64/bin/pypy)
240+
curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.1-linux64.tar.bz2 | tar xj
241+
PY_CMD=$(echo `pwd`/pypy$PYTHON-v7.3.1-linux64/bin/pypy)
229242
CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
230243
else
231244
PY_CMD=python$PYTHON

docs/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
breathe_projects = {'pybind11': '.build/doxygenxml/'}
3737
breathe_default_project = 'pybind11'
3838
breathe_domain_by_extension = {'h': 'cpp'}
39+
breathe_doxygen_config_options = {
40+
'ENABLE_PREPROCESSING' : 'YES',
41+
'MACRO_EXPANSION' : 'YES',
42+
}
3943

4044
# Add any paths that contain templates here, relative to this directory.
4145
templates_path = ['.templates']

include/pybind11/operators.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ PYBIND11_UNARY_OPERATOR(float, float_, (double) l)
157157
#undef PYBIND11_BINARY_OPERATOR
158158
#undef PYBIND11_INPLACE_OPERATOR
159159
#undef PYBIND11_UNARY_OPERATOR
160-
NAMESPACE_END(detail);
160+
NAMESPACE_END(detail)
161161

162162
using detail::self;
163163

0 commit comments

Comments
 (0)