Skip to content

Commit eaa5f7b

Browse files
committed
Revert "feat: add entrypoint for cmake modules dir" (pybind#4270)
* Revert "feat: add entrypoint for cmake modules dir (pybind#4258)" This reverts commit 1d4a65e. * docs: revert changelog mention too
1 parent 251516b commit eaa5f7b

File tree

4 files changed

+0
-10
lines changed

4 files changed

+0
-10
lines changed

docs/changelog.rst

-3
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ Performance and style:
103103

104104
Build system improvements:
105105

106-
* Experimental support for ``cmake.modules`` entrypoint.
107-
`#4258 <https://github.com/pybind/pybind11/pull/4258>`_
108-
109106
* Include a pkg-config file when installing pybind11, such as in the Python
110107
package.
111108
`#4077 <https://github.com/pybind/pybind11/pull/4077>`_

setup.py

-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ def remove_output(*sources: str) -> Iterator[None]:
144144
stdout=sys.stdout,
145145
stderr=sys.stderr,
146146
)
147-
if not global_sdist:
148-
Path("pybind11/share/cmake/pybind11/__init__.py").touch()
149147

150148
txt = get_and_replace(setup_py, version=version, extra_cmd=extra_cmd)
151149
code = compile(txt, setup_py, "exec")

tests/extra_python_package/test_files.py

-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ def test_build_sdist(monkeypatch, tmpdir):
160160
files |= {f"pybind11{n}" for n in local_sdist_files}
161161
files.add("pybind11.egg-info/entry_points.txt")
162162
files.add("pybind11.egg-info/requires.txt")
163-
files.add("pybind11/share/cmake/pybind11/__init__.py")
164163
assert simpler == files
165164

166165
with open(os.path.join(MAIN_DIR, "tools", "setup_main.py.in"), "rb") as f:
@@ -247,7 +246,6 @@ def tests_build_wheel(monkeypatch, tmpdir):
247246
"dist-info/entry_points.txt",
248247
"dist-info/top_level.txt",
249248
}
250-
files.add("pybind11/share/cmake/pybind11/__init__.py")
251249

252250
with zipfile.ZipFile(str(wheel)) as z:
253251
names = z.namelist()

tools/setup_main.py.in

-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ setup(
3636
],
3737
"pipx.run": [
3838
"pybind11 = pybind11.__main__:main",
39-
],
40-
"cmake.modules": [
41-
"pybind11 = pybind11.share.cmake.pybind11",
4239
]
4340
},
4441
cmdclass=cmdclass

0 commit comments

Comments
 (0)