fix: more cleanup

Author: henryiii

README.md

@@ -56,7 +56,7 @@ pybind11 can map the following core C++ features to Python:
 ## Goodies
 In addition to the core functionality, pybind11 provides some extra goodies:
 
-- Python 2.7, 3.5+, and PyPy (tested on 7.3) are supported with an implementation-agnostic
+- Python 2.7, 3.5+, and PyPy/PyPy3 7.3 are supported with an implementation-agnostic
   interface.
 
 - It is possible to bind C++11 lambda functions with captured variables. The

docs/changelog.rst

@@ -29,6 +29,9 @@ See :ref:`upgrade-guide-2.6` for help upgrading to the new version.
 * ``py::memoryview``  update and documentation.
   `#2223 <https://github.com/pybind/pybind11/pull/2223>`_
 
+* PyPy/PyPy3 7.3 supported, support for older versions dropped
+  `#2456 <https://github.com/pybind/pybind11/pull/2456>`_ and other PRs.
+
 * Minimum CMake required increased to 3.4.
   `#2338 <https://github.com/pybind/pybind11/pull/2338>`_ and
   `#2370 <https://github.com/pybind/pybind11/pull/2370>`_

include/pybind11/eval.h

@@ -66,7 +66,7 @@ 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
+#if defined(PYPY_VERSION) && PY_VERSION_HEX >= 0x03000000
 template <eval_mode mode = eval_statements>
 object eval_file(str, object, object) {
     pybind11_fail("eval_file not supported in PyPy3. Use eval");

tests/test_multiple_inheritance.cpp

@@ -193,14 +193,12 @@ TEST_SUBMODULE(multiple_inheritance, m) {
         .def_readwrite_static("static_value", &VanillaStaticMix2::static_value);
 
 
-#if !(defined(PYPY_VERSION) && (PYPY_VERSION_NUM < 0x06000000))
     struct WithDict { };
     struct VanillaDictMix1 : Vanilla, WithDict { };
     struct VanillaDictMix2 : WithDict, Vanilla { };
     py::class_<WithDict>(m, "WithDict", py::dynamic_attr()).def(py::init<>());
     py::class_<VanillaDictMix1, Vanilla, WithDict>(m, "VanillaDictMix1").def(py::init<>());
     py::class_<VanillaDictMix2, WithDict, Vanilla>(m, "VanillaDictMix2").def(py::init<>());
-#endif
 
     // test_diamond_inheritance
     // Issue #959: segfault when constructing diamond inheritance instance