Try PyPy again

Author: henryiii

.travis.yml

@@ -16,6 +16,8 @@ matrix:
     - PY_CMD=python3
     - $PY_CMD -m pip install --user --upgrade pip wheel setuptools
     install:
+    # breathe 4.14 doesn't work with bit fields. See https://github.com/michaeljones/breathe/issues/462
+    # Latest breathe + Sphinx causes warnings and errors out
     - $PY_CMD -m pip install --user --upgrade "sphinx<3" sphinx_rtd_theme breathe==4.13.1 flake8 pep8-naming pytest
     - curl -fsSL https://sourceforge.net/projects/doxygen/files/rel-1.8.15/doxygen-1.8.15.linux.bin.tar.gz/download | tar xz
     - export PATH="$PWD/doxygen-1.8.15/bin:$PATH"
@@ -163,6 +165,17 @@ matrix:
           - libblas-dev
           - liblapack-dev
           - gfortran
+  - os: linux
+    dist: xenial
+    env: PYPY=7.3 PYTHON=3.6 CPP=11 GCC=5
+    name: PyPy 7.3, Python 3.6, c++11, gcc 5
+    addons:
+      apt:
+        packages:
+          - libblas-dev
+          - liblapack-dev
+          - gfortran
+          - g++-5
   # Build in 32-bit mode and tests against the CMake-installed version
   - os: linux
     dist: trusty
@@ -182,6 +195,9 @@ matrix:
           cmake ../pybind11-tests ${CMAKE_EXTRA_ARGS} -DPYBIND11_WERROR=ON
           make pytest -j 2"
         set +ex
+  allow_failures:
+    - name: PyPy 7.3, Python 2.7, c++11, gcc 4.8
+    - name: PyPy 7.3, Python 3.6, c++11, gcc 5
 cache:
   directories:
   - $HOME/.local/bin
@@ -224,8 +240,8 @@ before_install:
     $SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
   else
     if [ "$PYPY" = "7.3" ]; then
-      curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.1-aarch64.tar.bz2 | tar xj
-      PY_CMD=$(echo `pwd`/pypy2.7-v7.3.1-linux64/bin/pypy)
+      curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.1-linux64.tar.bz2 | tar xj
+      PY_CMD=$(echo `pwd`/pypy$PYTHON-v7.3.1-linux64/bin/pypy)
       CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
     else
       PY_CMD=python$PYTHON

docs/conf.py

@@ -36,6 +36,10 @@
 breathe_projects = {'pybind11': '.build/doxygenxml/'}
 breathe_default_project = 'pybind11'
 breathe_domain_by_extension = {'h': 'cpp'}
+breathe_doxygen_config_options = {
+    'ENABLE_PREPROCESSING'   : 'YES',
+    'MACRO_EXPANSION'        : 'YES',
+}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['.templates']

include/pybind11/operators.h

@@ -157,7 +157,7 @@ PYBIND11_UNARY_OPERATOR(float,      float_,       (double) l)
 #undef PYBIND11_BINARY_OPERATOR
 #undef PYBIND11_INPLACE_OPERATOR
 #undef PYBIND11_UNARY_OPERATOR
-NAMESPACE_END(detail);
+NAMESPACE_END(detail)
 
 using detail::self;