From d5e38f121f4ba9aacbce0e0439f788b2fac2f118 Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgkio@gmail.com>
Date: Sat, 14 Sep 2024 22:39:05 -0700
Subject: [PATCH] Fixes to resolve tests_packaging failures.

---
 tests/extra_python_package/test_files.py | 1 +
 tools/setup_global.py.in                 | 4 +++-
 tools/setup_main.py.in                   | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/extra_python_package/test_files.py b/tests/extra_python_package/test_files.py
index c9e87ba767..9f91149888 100644
--- a/tests/extra_python_package/test_files.py
+++ b/tests/extra_python_package/test_files.py
@@ -110,6 +110,7 @@
     "pybind11",
     "pybind11/include",
     "pybind11/include/pybind11",
+    "pybind11/include/pybind11/compat",
     "pybind11/include/pybind11/detail",
     "pybind11/include/pybind11/eigen",
     "pybind11/include/pybind11/stl",
diff --git a/tools/setup_global.py.in b/tools/setup_global.py.in
index 885ac5c725..7d22a71e18 100644
--- a/tools/setup_global.py.in
+++ b/tools/setup_global.py.in
@@ -26,12 +26,13 @@ class InstallHeadersNested(install_headers):
 
 
 main_headers = glob.glob("pybind11/include/pybind11/*.h")
+compat_headers = glob.glob("pybind11/include/pybind11/compat/*.h")
 detail_headers = glob.glob("pybind11/include/pybind11/detail/*.h")
 eigen_headers = glob.glob("pybind11/include/pybind11/eigen/*.h")
 stl_headers = glob.glob("pybind11/include/pybind11/stl/*.h")
 cmake_files = glob.glob("pybind11/share/cmake/pybind11/*.cmake")
 pkgconfig_files = glob.glob("pybind11/share/pkgconfig/*.pc")
-headers = main_headers + detail_headers + stl_headers + eigen_headers
+headers = main_headers + compat_headers + detail_headers + eigen_headers + stl_headers
 
 cmdclass = {"install_headers": InstallHeadersNested}
 $extra_cmd
@@ -55,6 +56,7 @@ setup(
         (base + "share/cmake/pybind11", cmake_files),
         (base + "share/pkgconfig", pkgconfig_files),
         (base + "include/pybind11", main_headers),
+        (base + "include/pybind11/compat", compat_headers),
         (base + "include/pybind11/detail", detail_headers),
         (base + "include/pybind11/eigen", eigen_headers),
         (base + "include/pybind11/stl", stl_headers),
diff --git a/tools/setup_main.py.in b/tools/setup_main.py.in
index 6358cc7b9b..1eaaa4eab4 100644
--- a/tools/setup_main.py.in
+++ b/tools/setup_main.py.in
@@ -14,6 +14,7 @@ setup(
     packages=[
         "pybind11",
         "pybind11.include.pybind11",
+        "pybind11.include.pybind11.compat",
         "pybind11.include.pybind11.detail",
         "pybind11.include.pybind11.eigen",
         "pybind11.include.pybind11.stl",
@@ -23,6 +24,7 @@ setup(
     package_data={
         "pybind11": ["py.typed"],
         "pybind11.include.pybind11": ["*.h"],
+        "pybind11.include.pybind11.compat": ["*.h"],
         "pybind11.include.pybind11.detail": ["*.h"],
         "pybind11.include.pybind11.eigen": ["*.h"],
         "pybind11.include.pybind11.stl": ["*.h"],