Skip to content

Commit

Permalink
Move pybind11/compat to pybind11/conduit as suggested by @henryiii:
Browse files Browse the repository at this point in the history
  • Loading branch information
rwgk committed Nov 10, 2024
1 parent fdcd0ea commit bbca3b4
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ set(PYBIND11_HEADERS
include/pybind11/cast.h
include/pybind11/chrono.h
include/pybind11/common.h
include/pybind11/compat/pybind11_conduit_v1.h
include/pybind11/compat/pybind11_platform_abi_id.h
include/pybind11/compat/wrap_include_python_h.h
include/pybind11/complex.h
include/pybind11/conduit/pybind11_conduit_v1.h
include/pybind11/conduit/pybind11_platform_abi_id.h
include/pybind11/conduit/wrap_include_python_h.h
include/pybind11/options.h
include/pybind11/eigen.h
include/pybind11/eigen/common.h
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion include/pybind11/detail/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#pragma once

#include <pybind11/compat/wrap_include_python_h.h>
#include <pybind11/conduit/wrap_include_python_h.h>
#if PY_VERSION_HEX < 0x03080000
# error "PYTHON < 3.8 IS UNSUPPORTED. pybind11 v2.13 was the last to support Python 3.7."
#endif
Expand Down
2 changes: 1 addition & 1 deletion include/pybind11/detail/internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# include <pybind11/gil.h>
#endif

#include <pybind11/compat/pybind11_platform_abi_id.h>
#include <pybind11/conduit/pybind11_platform_abi_id.h>
#include <pybind11/pytypes.h>

#include <exception>
Expand Down
2 changes: 1 addition & 1 deletion tests/exo_planet_c_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#endif

// THIS MUST STAY AT THE TOP!
#include <pybind11/compat/pybind11_conduit_v1.h> // VERY light-weight dependency.
#include <pybind11/conduit/pybind11_conduit_v1.h> // VERY light-weight dependency.

#include "test_cpp_conduit_traveler_types.h"

Expand Down
14 changes: 7 additions & 7 deletions tests/extra_python_package/test_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
"include/pybind11/warnings.h",
}

compat_headers = {
"include/pybind11/compat/README.txt",
"include/pybind11/compat/pybind11_conduit_v1.h",
"include/pybind11/compat/pybind11_platform_abi_id.h",
"include/pybind11/compat/wrap_include_python_h.h",
conduit_headers = {
"include/pybind11/conduit/README.txt",
"include/pybind11/conduit/pybind11_conduit_v1.h",
"include/pybind11/conduit/pybind11_platform_abi_id.h",
"include/pybind11/conduit/wrap_include_python_h.h",
}

detail_headers = {
Expand Down Expand Up @@ -104,7 +104,7 @@
"setup_helpers.py",
}

headers = main_headers | compat_headers | detail_headers | eigen_headers | stl_headers
headers = main_headers | conduit_headers | detail_headers | eigen_headers | stl_headers
src_files = headers | cmake_files | pkgconfig_files
all_files = src_files | py_files

Expand All @@ -113,7 +113,7 @@
"pybind11",
"pybind11/include",
"pybind11/include/pybind11",
"pybind11/include/pybind11/compat",
"pybind11/include/pybind11/conduit",
"pybind11/include/pybind11/detail",
"pybind11/include/pybind11/eigen",
"pybind11/include/pybind11/stl",
Expand Down
8 changes: 4 additions & 4 deletions tools/setup_global.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ class InstallHeadersNested(install_headers):


main_headers = glob.glob("pybind11/include/pybind11/*.h")
compat_headers = sum([glob.glob(f"pybind11/include/pybind11/compat/*.{ext}")
for ext in ("h", "txt")], [])
conduit_headers = sum([glob.glob(f"pybind11/include/pybind11/conduit/*.{ext}")
for ext in ("h", "txt")], [])
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 + compat_headers + detail_headers + eigen_headers + stl_headers
headers = main_headers + conduit_headers + detail_headers + eigen_headers + stl_headers

cmdclass = {"install_headers": InstallHeadersNested}
$extra_cmd
Expand All @@ -57,7 +57,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/conduit", conduit_headers),
(base + "include/pybind11/detail", detail_headers),
(base + "include/pybind11/eigen", eigen_headers),
(base + "include/pybind11/stl", stl_headers),
Expand Down
4 changes: 2 additions & 2 deletions tools/setup_main.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ setup(
packages=[
"pybind11",
"pybind11.include.pybind11",
"pybind11.include.pybind11.compat",
"pybind11.include.pybind11.conduit",
"pybind11.include.pybind11.detail",
"pybind11.include.pybind11.eigen",
"pybind11.include.pybind11.stl",
Expand All @@ -24,7 +24,7 @@ setup(
package_data={
"pybind11": ["py.typed"],
"pybind11.include.pybind11": ["*.h"],
"pybind11.include.pybind11.compat": ["*.h", "*.txt"],
"pybind11.include.pybind11.conduit": ["*.h", "*.txt"],
"pybind11.include.pybind11.detail": ["*.h"],
"pybind11.include.pybind11.eigen": ["*.h"],
"pybind11.include.pybind11.stl": ["*.h"],
Expand Down

0 comments on commit bbca3b4

Please sign in to comment.