From 1a4f68c07197e7bcfeb43a057744dc303715f967 Mon Sep 17 00:00:00 2001
From: Matthew Feickert <matthew.feickert@cern.ch>
Date: Mon, 16 Sep 2024 18:42:25 -0500
Subject: [PATCH] build: Use build-system pybind11 over Git submodule (#313)

build: Add support for NumPy 2.0 wheels

* Update lower bound on build-system pybind11 to v2.12.0 to add support for
  compiling for NumPy 2.0.
   - c.f. https://github.com/pybind/pybind11/releases/tag/v2.12.0
* Remove pybind11 submodule to use build-system instead.

ci: List Python packages installed before testing

* Add an easy to parse log of the environment used for each test, which is useful
  for debugging differences between CI jobs seperated in time.
---
 .github/workflows/ci.yml | 3 +++
 .gitmodules              | 3 ---
 MANIFEST.in              | 1 -
 pybind11                 | 1 -
 pyproject.toml           | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 160000 pybind11

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d70468c5..e36aef5e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,6 +60,9 @@ jobs:
           echo $PATH
           python -m pip install '.[test]' -v
 
+      - name: List installed Python packages
+        run: python -m pip list
+
       - name: Test package
         run: python -m pytest -vv -rs -Wd
 
diff --git a/.gitmodules b/.gitmodules
index 1090dee3..c3d1c0d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "fastjet"]
 	path = extern/fastjet-core
 	url = https://gitlab.com/fastjet/fastjet.git
-[submodule "pybind11"]
-	path = pybind11
-	url = https://github.com/pybind/pybind11.git
 [submodule "fastjet-contrib"]
 	path = extern/fastjet-contrib
 	url = https://github.com/cms-externals/fastjet-contrib.git
diff --git a/MANIFEST.in b/MANIFEST.in
index 9cefe048..7d1a5828 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,6 @@
 graft src
 graft tests
 graft extern
-graft pybind11
 global-exclude .git .gitmodules
 include LICENSE README.md pyproject.toml setup.py setup.cfg patch_clustersequence.txt
 exclude .cirrus.yml
diff --git a/pybind11 b/pybind11
deleted file mode 160000
index 8a099e44..00000000
--- a/pybind11
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a099e44b3d5f85b20f05828d919d2332a8de841
diff --git a/pyproject.toml b/pyproject.toml
index 770f1a49..fad0ad45 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 requires = [
     "setuptools>=42",
     "setuptools_scm[toml]>=3.4",
-    "pybind11>=2.6.1",
+    "pybind11>=2.12.0",
 ]
 build-backend = "setuptools.build_meta"