Bump FastJet version to 3.4.0 from 3.3.4 using a patch (#122)

* Update fastjet-core to 3.4.0 with patch

* fix typo

* fix typo

* fix typo

* fix patch

* final changes for update

* Fix last issues

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

MANIFEST.in

@@ -3,4 +3,4 @@ graft tests
 graft fastjet-core
 graft pybind11
 global-exclude .git .gitmodules
-include LICENSE README.md pyproject.toml setup.py setup.cfg
+include LICENSE README.md pyproject.toml setup.py setup.cfg patch.txt

patch.txt

@@ -0,0 +1,14 @@
+--- fastjet-core/pyinterface/fastjet.i	2022-10-25 23:22:36.000000000 +0200
++++ fastjet-core/pyinterface/fastjet_p.i	2022-10-26 16:25:20.000000000 +0200
+@@ -138,7 +138,10 @@
+
+ // include FastJetError in python module
+ %pythoncode {
+-  from _fastjet import FastJetError
++  if __package__ or "." in __name__:
++    from ._fastjet import FastJetError
++  else:
++    from _fastjet import FastJetError
+ }
+
+ FASTJET_ERRORS_AS_PYTHON_EXCEPTIONS(fastjet)

setup.py

@@ -53,6 +53,13 @@ def build_extensions(self):
                 cgal_dir = DIR / zip_obj.namelist()[0]
                 zip_obj.extractall(DIR)
 
+            # Patch for FastJet core version 3.4.0
+            # To be removed when https://gitlab.com/fastjet/fastjet/-/merge_requests/1 is merged upstream
+            subprocess.run(
+                ["patch", "pyinterface/fastjet.i", DIR / "patch.txt"],
+                cwd=FASTJET,
+            )
+
             env = os.environ.copy()
             env["PYTHON"] = sys.executable
             env["PYTHON_INCLUDE"] = f'-I{sysconfig.get_path("include")}'

src/fastjet/version.py

@@ -2,7 +2,7 @@
 
 import re
 
-__version__ = "3.3.4.0rc10"
+__version__ = "3.4.0.0rc1"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))