Merge branch 'pybind11-cleanup' into freethread

Author: QuLogic

.github/workflows/tests.yml

@@ -261,7 +261,7 @@ jobs:
           # Preinstall build requirements to enable no-build-isolation builds.
           python -m pip install --upgrade $PRE \
             'contourpy>=1.0.1' cycler fonttools kiwisolver importlib_resources \
-            numpy packaging pillow 'pyparsing!=3.1.0' python-dateutil setuptools-scm \
+            packaging pillow 'pyparsing!=3.1.0' python-dateutil setuptools-scm \
             'meson-python>=0.13.1' 'pybind11>=2.6' \
             -r requirements/testing/all.txt \
             ${{ matrix.extra-requirements }}

pyproject.toml

@@ -46,7 +46,6 @@ requires-python = ">=3.10"
 # Should be a copy of the build dependencies below.
 dev = [
     "meson-python>=0.13.1",
-    "numpy>=1.25",
     "pybind11>=2.6,!=2.13.3",
     "setuptools_scm>=7",
     # Not required by us but setuptools_scm without a version, cso _if_
@@ -73,18 +72,6 @@ requires = [
     "meson-python>=0.13.1",
     "pybind11>=2.6,!=2.13.3",
     "setuptools_scm>=7",
-
-    # Comments on numpy build requirement range:
-    #
-    #   1. >=2.0.x is the numpy requirement for wheel builds for distribution
-    #      on PyPI - building against 2.x yields wheels that are also
-    #      ABI-compatible with numpy 1.x at runtime.
-    #   2. Note that building against numpy 1.x works fine too - users and
-    #      redistributors can do this by installing the numpy version they like
-    #      and disabling build isolation.
-    #   3. The <2.3 upper bound is for matching the numpy deprecation policy,
-    #      it should not be loosened.
-    "numpy>=2.0.0rc1,<2.3",
 ]
 
 [tool.meson-python.args]

requirements/dev/build-requirements.txt

@@ -1,4 +1,3 @@
 pybind11!=2.13.3
 meson-python
-numpy<2.1.0
 setuptools-scm

requirements/testing/mypy.txt

@@ -18,7 +18,6 @@ contourpy>=1.0.1
 cycler>=0.10
 fonttools>=4.22.0
 kiwisolver>=1.3.1
-numpy>=1.19
 packaging>=20.0
 pillow>=8
 pyparsing>=2.3.1

src/_backend_agg.h

@@ -1232,11 +1232,11 @@ inline void RendererAgg::draw_gouraud_triangles(GCAgg &gc,
                                                 ColorArray &colors,
                                                 agg::trans_affine &trans)
 {
-    if (points.shape(0) && !check_trailing_shape(points, "points", 3, 2)) {
-        throw py::error_already_set();
+    if (points.shape(0)) {
+        check_trailing_shape(points, "points", 3, 2);
     }
-    if (colors.shape(0) && !check_trailing_shape(colors, "colors", 3, 4)) {
-        throw py::error_already_set();
+    if (colors.shape(0)) {
+        check_trailing_shape(colors, "colors", 3, 4);
     }
     if (points.shape(0) != colors.shape(0)) {
         throw py::value_error(

src/_backend_agg_wrapper.cpp

@@ -2,10 +2,8 @@
 #include <pybind11/numpy.h>
 #include <pybind11/stl.h>
 #include "mplutils.h"
-#include "numpy_cpp.h"
 #include "py_converters.h"
 #include "_backend_agg.h"
-#include "py_converters_11.h"
 
 namespace py = pybind11;
 using namespace pybind11::literals;
@@ -189,14 +187,6 @@ PyRendererAgg_draw_gouraud_triangles(RendererAgg *self,
 
 PYBIND11_MODULE(_backend_agg, m)
 {
-    auto ia = [m]() -> const void* {
-        import_array();
-        return &m;
-    };
-    if (ia() == NULL) {
-        throw py::error_already_set();
-    }
-
     py::class_<RendererAgg>(m, "RendererAgg", py::buffer_protocol())
         .def(py::init<unsigned int, unsigned int, double>(),
              "width"_a, "height"_a, "dpi"_a)

src/_image_wrapper.cpp

@@ -2,7 +2,7 @@
 #include <pybind11/numpy.h>
 
 #include "_image_resample.h"
-#include "py_converters_11.h"
+#include "py_converters.h"
 
 namespace py = pybind11;
 using namespace pybind11::literals;

src/_path.h

@@ -18,7 +18,6 @@
 
 #include "path_converters.h"
 #include "_backend_agg_basic_types.h"
-#include "numpy_cpp.h"
 
 const size_t NUM_VERTICES[] = { 1, 1, 1, 2, 3 };
 
@@ -1004,15 +1003,15 @@ void convert_path_to_polygons(PathIterator &path,
 
 template <class VertexSource>
 void
-__cleanup_path(VertexSource &source, std::vector<double> &vertices, std::vector<npy_uint8> &codes)
+__cleanup_path(VertexSource &source, std::vector<double> &vertices, std::vector<uint8_t> &codes)
 {
     unsigned code;
     double x, y;
     do {
         code = source.vertex(&x, &y);
         vertices.push_back(x);
         vertices.push_back(y);
-        codes.push_back((npy_uint8)code);
+        codes.push_back(static_cast<uint8_t>(code));
     } while (code != agg::path_cmd_stop);
 }
 

src/_path_wrapper.cpp

@@ -7,14 +7,11 @@
 #include <string>
 #include <vector>
 
-#include "numpy_cpp.h"
-
 #include "_path.h"
 
 #include "_backend_agg_basic_types.h"
 #include "py_adaptors.h"
 #include "py_converters.h"
-#include "py_converters_11.h"
 
 namespace py = pybind11;
 using namespace pybind11::literals;
@@ -184,9 +181,7 @@ Py_affine_transform(py::array_t<double, py::array::c_style | py::array::forcecas
     if (vertices_arr.ndim() == 2) {
         auto vertices = vertices_arr.unchecked<2>();
 
-        if(!check_trailing_shape(vertices, "vertices", 2)) {
-            throw py::error_already_set();
-        }
+        check_trailing_shape(vertices, "vertices", 2);
 
         py::ssize_t dims[] = { vertices.shape(0), 2 };
         py::array_t<double> result(dims);
@@ -267,7 +262,7 @@ Py_cleanup_path(mpl::PathIterator path, agg::trans_affine trans, bool remove_nan
     bool do_clip = (clip_rect.x1 < clip_rect.x2 && clip_rect.y1 < clip_rect.y2);
 
     std::vector<double> vertices;
-    std::vector<npy_uint8> codes;
+    std::vector<uint8_t> codes;
 
     cleanup_path(path, trans, remove_nans, do_clip, clip_rect, snap_mode, stroke_width,
                  *simplify, return_curves, sketch, vertices, codes);
@@ -375,14 +370,6 @@ Py_is_sorted_and_has_non_nan(py::object obj)
 
 PYBIND11_MODULE(_path, m)
 {
-    auto ia = [m]() -> const void* {
-        import_array();
-        return &m;
-    };
-    if (ia() == NULL) {
-        throw py::error_already_set();
-    }
-
     m.def("point_in_path", &Py_point_in_path,
           "x"_a, "y"_a, "radius"_a, "path"_a, "trans"_a);
     m.def("points_in_path", &Py_points_in_path,

src/ft2font_wrapper.cpp

@@ -5,7 +5,6 @@
 
 #include "ft2font.h"
 #include "_enums.h"
-#include "numpy/arrayobject.h"
 
 #include <set>
 #include <sstream>
@@ -1597,14 +1596,6 @@ ft2font__getattr__(std::string name) {
 
 PYBIND11_MODULE(ft2font, m)
 {
-    auto ia = [m]() -> const void* {
-        import_array();
-        return &m;
-    };
-    if (ia() == NULL) {
-        throw py::error_already_set();
-    }
-
     if (FT_Init_FreeType(&_ft2Library)) {  // initialize library
         throw std::runtime_error("Could not initialize the freetype2 library");
     }