Skip to content

Commit

Permalink
Revert "feat: add entrypoint for cmake modules dir" (pybind#4270)
Browse files Browse the repository at this point in the history
* Revert "feat: add entrypoint for cmake modules dir (pybind#4258)"

This reverts commit 1d4a65e.

* docs: revert changelog mention too
  • Loading branch information
henryiii authored Oct 21, 2022
1 parent 2ce76f7 commit 91cfb77
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 10 deletions.
3 changes: 0 additions & 3 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ Performance and style:

Build system improvements:

* Experimental support for ``cmake.modules`` entrypoint.
`#4258 <https://github.com/pybind/pybind11/pull/4258>`_

* Include a pkg-config file when installing pybind11, such as in the Python
package.
`#4077 <https://github.com/pybind/pybind11/pull/4077>`_
Expand Down
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ def remove_output(*sources: str) -> Iterator[None]:
stdout=sys.stdout,
stderr=sys.stderr,
)
if not global_sdist:
Path("pybind11/share/cmake/pybind11/__init__.py").touch()

txt = get_and_replace(setup_py, version=version, extra_cmd=extra_cmd)
code = compile(txt, setup_py, "exec")
Expand Down
2 changes: 0 additions & 2 deletions tests/extra_python_package/test_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ def test_build_sdist(monkeypatch, tmpdir):
files |= {f"pybind11{n}" for n in local_sdist_files}
files.add("pybind11.egg-info/entry_points.txt")
files.add("pybind11.egg-info/requires.txt")
files.add("pybind11/share/cmake/pybind11/__init__.py")
assert simpler == files

with open(os.path.join(MAIN_DIR, "tools", "setup_main.py.in"), "rb") as f:
Expand Down Expand Up @@ -253,7 +252,6 @@ def tests_build_wheel(monkeypatch, tmpdir):
"dist-info/entry_points.txt",
"dist-info/top_level.txt",
}
files.add("pybind11/share/cmake/pybind11/__init__.py")

with zipfile.ZipFile(str(wheel)) as z:
names = z.namelist()
Expand Down
3 changes: 0 additions & 3 deletions tools/setup_main.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ setup(
],
"pipx.run": [
"pybind11 = pybind11.__main__:main",
],
"cmake.modules": [
"pybind11 = pybind11.share.cmake.pybind11",
]
},
cmdclass=cmdclass
Expand Down

0 comments on commit 91cfb77

Please sign in to comment.