Use diff instead of patch

Author: chrisburr

recipe/gh2146.diff

@@ -0,0 +1,187 @@
+diff --git a/.travis.yml b/.travis.yml
+index d81cd8c7b..959e602d0 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -143,8 +143,19 @@ matrix:
+   # Test a PyPy 2.7 build
+   - os: linux
+     dist: trusty
+-    env: PYPY=5.8 PYTHON=2.7 CPP=11 GCC=4.8
+-    name: PyPy 5.8, Python 2.7, c++11, gcc 4.8
++    env: PYPY=5.8.0 PYTHON=2.7 CPP=11 GCC=4.8
++    name: PyPy 5.8.0, Python 2.7, c++11, gcc 4.8
++    addons:
++      apt:
++        packages:
++          - libblas-dev
++          - liblapack-dev
++          - gfortran
++  # Test a PyPy 3.6 build
++  - os: linux
++    dist: trusty
++    env: PYPY=7.3.0 PYTHON=3.6 CPP=11 GCC=4.8
++    name: PyPy 7.3.0, Python 3.6, c++11, gcc 4.8
+     addons:
+       apt:
+         packages:
+@@ -211,10 +222,17 @@ before_install:
+     SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
+     $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" = "5.8" ]; then
++    if [ "$PYPY" = "5.8.0" ]; then
+       curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux64.tar.bz2 | tar xj
+       PY_CMD=$(echo `pwd`/pypy2-v5.8.0-linux64/bin/pypy)
+       CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
++    elif [ -n "$PYPY" ]; then
++      curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy${PYTHON:0:3}-v${PYPY}-linux64.tar.bz2 | tar xj
++      PY_CMD=$PWD/pypy${PYTHON:0:3}-v${PYPY}-linux64/bin/pypy
++      if [ "${PYTHON:0:1}" = "3" ]; then
++        PY_CMD="${PY_CMD}3"
++      fi
++      CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
+     else
+       PY_CMD=python$PYTHON
+       if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+@@ -252,16 +270,14 @@ install:
+       export CXXFLAGS="-stdlib=libc++"
+     fi
+ 
+-    export NPY_NUM_BUILD_JOBS=2
+-    echo "Installing pytest, numpy, scipy..."
+     local PIP_CMD=""
+-    if [ -n $PYPY ]; then
+-      # For expediency, install only versions that are available on the extra index.
+-      travis_wait 30 \
+-        $PY_CMD -m pip install --user --upgrade --extra-index-url https://imaginary.ca/trusty-pypi \
+-          pytest numpy==1.15.4 scipy==1.2.0
++    export NPY_NUM_BUILD_JOBS=2
++    if [ -n "$PYPY" ]; then
++       echo Installing "pytest"
++       $PY_CMD -m pip install --user --upgrade pytest
+     else
+-      $PY_CMD -m pip install --user --upgrade pytest numpy scipy
++       echo "Installing pytest, numpy, scipy..."
++       $PY_CMD -m pip install --user --upgrade pytest numpy scipy
+     fi
+     echo "done."
+ 
+diff --git a/include/pybind11/detail/class.h b/include/pybind11/detail/class.h
+index edfa7de68..6fc9862fa 100644
+--- a/include/pybind11/detail/class.h
++++ b/include/pybind11/detail/class.h
+@@ -15,7 +15,7 @@
+ NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
+ NAMESPACE_BEGIN(detail)
+ 
+-#if PY_VERSION_HEX >= 0x03030000
++#if PY_VERSION_HEX >= 0x03030000 && !defined(PYPY_VERSION)
+ #  define PYBIND11_BUILTIN_QUALNAME
+ #  define PYBIND11_SET_OLDPY_QUALNAME(obj, nameobj)
+ #else
+@@ -448,7 +448,7 @@ extern "C" inline int pybind11_clear(PyObject *self) {
+ /// Give instances of this type a `__dict__` and opt into garbage collection.
+ inline void enable_dynamic_attributes(PyHeapTypeObject *heap_type) {
+     auto type = &heap_type->ht_type;
+-#if defined(PYPY_VERSION)
++#if defined(PYPY_VERSION) && (PYPY_VERSION_NUM < 0x06000000)
+     pybind11_fail(std::string(type->tp_name) + ": dynamic attributes are "
+                                                "currently not supported in "
+                                                "conjunction with PyPy!");
+diff --git a/include/pybind11/eval.h b/include/pybind11/eval.h
+index ea85ba1db..422e629f5 100644
+--- a/include/pybind11/eval.h
++++ b/include/pybind11/eval.h
+@@ -66,6 +66,20 @@ void exec(const char (&s)[N], object global = globals(), object local = object()
+     eval<eval_statements>(s, global, local);
+ }
+ 
++#if defined(PYPY_VERSION) && PY_VERSION_HEX >= 0x3000000
++template <eval_mode mode = eval_statements>
++object eval_file(str, object, object) {
++    pybind11_fail("eval_file not supported in PyPy3. Use eval");
++}
++template <eval_mode mode = eval_statements>
++object eval_file(str, object) {
++    pybind11_fail("eval_file not supported in PyPy3. Use eval");
++}
++template <eval_mode mode = eval_statements>
++object eval_file(str) {
++    pybind11_fail("eval_file not supported in PyPy3. Use eval");
++}
++#else
+ template <eval_mode mode = eval_statements>
+ object eval_file(str fname, object global = globals(), object local = object()) {
+     if (!local)
+@@ -113,5 +127,6 @@ object eval_file(str fname, object global = globals(), object local = object())
+         throw error_already_set();
+     return reinterpret_steal<object>(result);
+ }
++#endif
+ 
+ NAMESPACE_END(PYBIND11_NAMESPACE)
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 57f681c66..82f9a0ed1 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -215,6 +215,10 @@ def pytest_configure():
+     pytest.requires_eigen_and_scipy = skipif(
+         not have_eigen or not scipy, reason="eigen and/or scipy are not installed")
+     pytest.unsupported_on_pypy = skipif(pypy, reason="unsupported on PyPy")
++    pytest.unsupported_on_pypy3 = skipif(pypy and sys.version_info.major >= 3,
++                                         reason="unsupported on PyPy3")
++    pytest.unsupported_on_pypy_lt_6 = skipif(pypy and sys.pypy_version_info[0] < 6,
++                                             reason="unsupported on PyPy<6")
+     pytest.unsupported_on_py2 = skipif(sys.version_info.major < 3,
+                                        reason="unsupported on Python 2.x")
+     pytest.gc_collect = gc_collect
+diff --git a/tests/test_eval.py b/tests/test_eval.py
+index bda4ef6bf..94228e7d2 100644
+--- a/tests/test_eval.py
++++ b/tests/test_eval.py
+@@ -1,4 +1,5 @@
+ import os
++import pytest
+ from pybind11_tests import eval_ as m
+ 
+ 
+@@ -10,8 +11,12 @@ def test_evals(capture):
+     assert m.test_eval()
+     assert m.test_eval_single_statement()
+ 
++    assert m.test_eval_failure()
++
++
++@pytest.unsupported_on_pypy3
++def test_eval_file():
+     filename = os.path.join(os.path.dirname(__file__), "test_eval_call.py")
+     assert m.test_eval_file(filename)
+ 
+-    assert m.test_eval_failure()
+     assert m.test_eval_file_failure()
+diff --git a/tests/test_multiple_inheritance.cpp b/tests/test_multiple_inheritance.cpp
+index ba1674fb2..70e341785 100644
+--- a/tests/test_multiple_inheritance.cpp
++++ b/tests/test_multiple_inheritance.cpp
+@@ -193,7 +193,7 @@ TEST_SUBMODULE(multiple_inheritance, m) {
+         .def_readwrite_static("static_value", &VanillaStaticMix2::static_value);
+ 
+ 
+-#if !defined(PYPY_VERSION)
++#if !(defined(PYPY_VERSION) && (PYPY_VERSION_NUM < 0x06000000))
+     struct WithDict { };
+     struct VanillaDictMix1 : Vanilla, WithDict { };
+     struct VanillaDictMix2 : WithDict, Vanilla { };
+diff --git a/tests/test_multiple_inheritance.py b/tests/test_multiple_inheritance.py
+index 475dd3b3d..1c493f397 100644
+--- a/tests/test_multiple_inheritance.py
++++ b/tests/test_multiple_inheritance.py
+@@ -253,7 +253,7 @@ def test_mi_static_properties():
+         assert d.static_value == 0
+ 
+ 
+-@pytest.unsupported_on_pypy
++@pytest.unsupported_on_pypy_lt_6
+ def test_mi_dynamic_attributes():
+     """Mixing bases with and without dynamic attribute support"""
+