Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "feat: add entrypoint for cmake modules dir" #4270

Merged
merged 2 commits into from
Oct 21, 2022
Merged

Revert "feat: add entrypoint for cmake modules dir" #4270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd7a9c4
Revert "feat: add entrypoint for cmake modules dir (#4258)"
henryiii Oct 21, 2022
31fd0d2
docs: revert changelog mention too
henryiii Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions docs/changelog.rst
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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