Zengtudor
/
pybind11
mirror of https://github.com/pybind/pybind11.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* Revert "feat: add entrypoint for cmake modules dir (#4258)"

This reverts commit 1d4a65e2f1.

* docs: revert changelog mention too
This commit is contained in:
Henry Schreiner 2022-10-21 17:25:53 -04:00 committed by GitHub
parent 2ce76f7833
commit 91cfb77022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -103,9 +103,6 @@ Performance and style:
Build system improvements: 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 * Include a pkg-config file when installing pybind11, such as in the Python
package. package.
`#4077 <https://github.com/pybind/pybind11/pull/4077>`_ `#4077 <https://github.com/pybind/pybind11/pull/4077>`_

2
setup.py
View File

@ -144,8 +144,6 @@ with remove_output("pybind11/include", "pybind11/share"):
stdout=sys.stdout, stdout=sys.stdout,
stderr=sys.stderr, 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) txt = get_and_replace(setup_py, version=version, extra_cmd=extra_cmd)
code = compile(txt, setup_py, "exec") code = compile(txt, setup_py, "exec")

2
tests/extra_python_package/test_files.py
View File

@ -166,7 +166,6 @@ def test_build_sdist(monkeypatch, tmpdir):
files |= {f"pybind11{n}" for n in local_sdist_files} files |= {f"pybind11{n}" for n in local_sdist_files}
files.add("pybind11.egg-info/entry_points.txt") files.add("pybind11.egg-info/entry_points.txt")
files.add("pybind11.egg-info/requires.txt") files.add("pybind11.egg-info/requires.txt")
files.add("pybind11/share/cmake/pybind11/__init__.py")
assert simpler == files assert simpler == files
with open(os.path.join(MAIN_DIR, "tools", "setup_main.py.in"), "rb") as f: with open(os.path.join(MAIN_DIR, "tools", "setup_main.py.in"), "rb") as f:
@ -253,7 +252,6 @@ def tests_build_wheel(monkeypatch, tmpdir):
"dist-info/entry_points.txt", "dist-info/entry_points.txt",
"dist-info/top_level.txt", "dist-info/top_level.txt",
} }
files.add("pybind11/share/cmake/pybind11/__init__.py")
with zipfile.ZipFile(str(wheel)) as z: with zipfile.ZipFile(str(wheel)) as z:
names = z.namelist() names = z.namelist()

3
tools/setup_main.py.in
View File

@ -38,9 +38,6 @@ setup(
], ],
"pipx.run": [ "pipx.run": [
"pybind11 = pybind11.__main__:main", "pybind11 = pybind11.__main__:main",
],
"cmake.modules": [
"pybind11 = pybind11.share.cmake.pybind11",
] ]
}, },
cmdclass=cmdclass cmdclass=cmdclass