fix: test and fix pinning

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

.gitignore

@@ -50,3 +50,4 @@ CMakeUserPresents.json
 /tmp*
 .ruby-version
 .*cache*/
+*.lock

pyproject.toml

@@ -31,7 +31,7 @@ keywords = [
     "C++11",
     "Python bindings",
 ]
-dynamic = ["version"]
+dynamic = ["version", "optional-dependencies"]
 requires-python = ">=3.8"
 
 [project.urls]
@@ -42,9 +42,6 @@ Discussions = "https://github.com/pybind/pybind11/discussions"
 Changelog = "https://pybind11.readthedocs.io/en/latest/changelog.html"
 Chat = "https://gitter.im/pybind/Lobby"
 
-[project.optional-dependencies]
-global = ["pybind11-global"]  # TODO: pin
-
 [project.scripts]
 pybind11-config = "pybind11.__main__:main"
 
@@ -55,6 +52,15 @@ pybind11 = "pybind11.__main__:main"
 pybind11 = "pybind11.share.pkgconfig"
 
 
+[dependency-groups]
+test = [
+  "pytest",
+  "build",
+  "tomlkit",
+]
+dev = [{ include-group = "test" }]
+
+
 [tool.scikit-build]
 minimum-version = "build-system.requires"
 sdist.exclude = [
@@ -101,9 +107,11 @@ version_info = tuple(_to_int(s) for s in __version__.split("."))
 '''
 
 
-# Can't use tool.uv.sources with requirements.txt
 [tool.uv]
+# Can't use tool.uv.sources with requirements.txt
 index-strategy = "unsafe-best-match"
+# This extra confuses uv
+override-dependencies = ["pybind11-global"]
 
 
 [tool.mypy]

tests/extra_python_package/test_files.py

@@ -184,16 +184,23 @@ def test_build_sdist(monkeypatch, tmpdir):
     )
 
     (sdist,) = tmpdir.visit("*.tar.gz")
+    version = sdist.basename.split("-")[1][:-7]
 
     with tarfile.open(str(sdist), "r:gz") as tar:
         simpler = {n.split("/", 1)[-1] for n in tar.getnames()[1:]}
+        (pkg_info_path,) = (n for n in simpler if n.endswith("PKG-INFO"))
 
         pyproject_toml = read_tz_file(tar, "pyproject.toml")
+        pkg_info = read_tz_file(tar, pkg_info_path).decode("utf-8")
 
     files = headers | sdist_files
     assert files <= simpler
 
     assert b'name = "pybind11"' in pyproject_toml
+    assert "License-Expression: BSD-3-Clause" in pkg_info
+    assert "License-File: LICENSE" in pkg_info
+    assert "Provides-Extra: global" in pkg_info
+    assert f'Requires-Dist: pybind11-global=={version}; extra == "global"' in pkg_info
 
 
 def test_build_global_dist(monkeypatch, tmpdir):
@@ -216,13 +223,19 @@ def test_build_global_dist(monkeypatch, tmpdir):
 
     with tarfile.open(str(sdist), "r:gz") as tar:
         simpler = {n.split("/", 1)[-1] for n in tar.getnames()[1:]}
+        (pkg_info_path,) = (n for n in simpler if n.endswith("PKG-INFO"))
 
         pyproject_toml = read_tz_file(tar, "pyproject.toml")
+        pkg_info = read_tz_file(tar, pkg_info_path).decode("utf-8")
 
     files = headers | sdist_files
     assert files <= simpler
 
     assert b'name = "pybind11-global"' in pyproject_toml
+    assert "License-Expression: BSD-3-Clause" in pkg_info
+    assert "License-File: LICENSE" in pkg_info
+    assert "Provides-Extra: global" not in pkg_info
+    assert 'Requires-Dist: pybind11-global; extra == "global"' not in pkg_info
 
 
 def tests_build_wheel(monkeypatch, tmpdir):
@@ -251,6 +264,8 @@ def tests_build_wheel(monkeypatch, tmpdir):
         cmakeconfig = (share / "cmake/pybind11/pybind11Config.cmake").read_text(
             encoding="utf-8"
         )
+        (pkg_info_path,) = (n for n in names if n.endswith("METADATA"))
+        pkg_info = zipfile.Path(z, pkg_info_path).read_text(encoding="utf-8")
 
     trimmed = {n for n in names if "dist-info" not in n}
     trimmed |= {f"dist-info/{n.split('/', 1)[-1]}" for n in names if "dist-info" in n}
@@ -264,6 +279,11 @@ def tests_build_wheel(monkeypatch, tmpdir):
     pkgconfig_expected = PKGCONFIG.format(VERSION=simple_version)
     assert pkgconfig_expected == pkgconfig
 
+    assert "License-Expression: BSD-3-Clause" in pkg_info
+    assert "License-File: LICENSE" in pkg_info
+    assert "Provides-Extra: global" in pkg_info
+    assert f'Requires-Dist: pybind11-global=={version}; extra == "global"' in pkg_info
+
 
 def tests_build_global_wheel(monkeypatch, tmpdir):
     monkeypatch.chdir(MAIN_DIR)
@@ -303,6 +323,14 @@ def tests_build_global_wheel(monkeypatch, tmpdir):
             encoding="utf-8"
         )
 
+        (pkg_info_path,) = (n for n in names if n.endswith("METADATA"))
+        pkg_info = zipfile.Path(z, pkg_info_path).read_text(encoding="utf-8")
+
+    assert "License-Expression: BSD-3-Clause" in pkg_info
+    assert "License-File: LICENSE" in pkg_info
+    assert "Provides-Extra: global" not in pkg_info
+    assert 'Requires-Dist: pybind11-global; extra == "global"' not in pkg_info
+
     trimmed = {n[len(beginning) + 1 :] for n in names}
 
     assert files == trimmed

tools/make_global.py

@@ -16,7 +16,6 @@
 def get_global() -> str:
     pyproject = tomlkit.parse(PYPROJECT.read_text())
     del pyproject["tool"]["scikit-build"]["generate"]
-    del pyproject["project"]["optional-dependencies"]
     del pyproject["project"]["entry-points"]
     del pyproject["project"]["scripts"]
     del pyproject["tool"]["scikit-build"]["metadata"]["optional-dependencies"]