Remove old-style Python-C++ converters

And merge the two files now that there are no old ones.

Author: QuLogic

src/_backend_agg_wrapper.cpp

@@ -5,7 +5,6 @@
 #include "numpy_cpp.h"
 #include "py_converters.h"
 #include "_backend_agg.h"
-#include "py_converters_11.h"
 
 namespace py = pybind11;
 using namespace pybind11::literals;

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_wrapper.cpp

@@ -14,7 +14,6 @@
 #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;

src/meson.build

@@ -73,8 +73,6 @@ extension_data = {
   '_backend_agg': {
     'subdir': 'matplotlib/backends',
     'sources': files(
-      'py_converters.cpp',
-      'py_converters_11.cpp',
       '_backend_agg.cpp',
       '_backend_agg_wrapper.cpp',
     ),
@@ -92,7 +90,6 @@ extension_data = {
     'sources': files(
       'ft2font.cpp',
       'ft2font_wrapper.cpp',
-      'py_converters.cpp',
     ),
     'dependencies': [
       freetype_dep, pybind11_dep, numpy_dep, agg_dep.partial_dependency(includes: true),
@@ -107,7 +104,7 @@ extension_data = {
     'subdir': 'matplotlib',
     'sources': files(
       '_image_wrapper.cpp',
-      'py_converters_11.cpp',
+      'py_converters.cpp',
     ),
     'dependencies': [
       pybind11_dep,
@@ -118,8 +115,6 @@ extension_data = {
   '_path': {
     'subdir': 'matplotlib',
     'sources': files(
-      'py_converters.cpp',
-      'py_converters_11.cpp',
       '_path_wrapper.cpp',
     ),
     'dependencies': [numpy_dep, agg_dep, pybind11_dep],