Bump FastJet to v3.4.1 and fastjet-contrib to v1.051 (#206)

* Bump fastjet-core and fastjet-contrib versions * remove patch that is not needed anymore * bump the version number
scikit-hep · May 16, 2023 · 6e14bd9 · 6e14bd9
1 parent 59dfe8e
commit 6e14bd9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 24 deletions.
diff --git a/fastjet-contrib b/fastjet-contrib
diff --git a/fastjet-core b/fastjet-core
diff --git a/patch_fastjet_i.txt b/patch_fastjet_i.txt
diff --git a/setup.py b/setup.py
@@ -61,13 +61,6 @@ 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_fastjet_i.txt"],
-                cwd=FASTJET,
-            )
-
             # Patch for segfault of LimitedWarning
             # For more info see https://github.com/scikit-hep/fastjet/pull/131
             subprocess.run(

diff --git a/src/fastjet/version.py b/src/fastjet/version.py
@@ -2,7 +2,7 @@
 
 import re
 
-__version__ = "3.4.0.8"
+__version__ = "3.4.1.0"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))
+5 −0		Centauro/AUTHORS
+343 −0		Centauro/COPYING
+134 −0		Centauro/Centauro.cc
+71 −0		Centauro/Centauro.hh
+77 −0		Centauro/Makefile
+1 −0		Centauro/NEWS
+3 −0		Centauro/README
+1 −0		Centauro/VERSION
+83 −0		Centauro/example.cc
+471 −0		Centauro/example.ref
+71 −0		ChangeLog
+251 −0		DEVEL-GUIDELINES
+3 −0		KTClusCXX/AUTHORS
+348 −0		KTClusCXX/COPYING
+2 −0		KTClusCXX/ChangeLog
+347 −0		KTClusCXX/KTClusCXX.hh
+72 −0		KTClusCXX/Makefile
+1 −0		KTClusCXX/NEWS
+15 −0		KTClusCXX/README
+1 −0		KTClusCXX/VERSION
+87 −0		KTClusCXX/example.cc
+58 −0		KTClusCXX/example.ref
+96 −0		KTClusCXX/exampleall.cc
+2,463 −0		KTClusCXX/exampleall.ref
+23 −1		LundPlane/AUTHORS
+74 −0		LundPlane/ChangeLog
+265 −0		LundPlane/LundEEHelpers.hh
+3 −2		LundPlane/LundGenerator.cc
+3 −2		LundPlane/LundGenerator.hh
+3 −2		LundPlane/LundWithSecondary.cc
+3 −2		LundPlane/LundWithSecondary.hh
+13 −6		LundPlane/Makefile
+15 −0		LundPlane/NEWS
+20 −3		LundPlane/README
+88 −0		LundPlane/RecursiveLundEEGenerator.cc
+301 −0		LundPlane/RecursiveLundEEGenerator.hh
+6 −5		LundPlane/SecondaryLund.cc
+3 −2		LundPlane/SecondaryLund.hh
+1 −1		LundPlane/VERSION
+3 −2		LundPlane/example.cc
+5 −4		LundPlane/example.py
+145 −0		LundPlane/example_dpsi_collinear.cc
+19 −0		LundPlane/example_dpsi_collinear.ref
+173 −0		LundPlane/example_dpsi_slice.cc
+19 −0		LundPlane/example_dpsi_slice.ref
+3 −2		LundPlane/example_secondary.cc
+3 −2		LundPlane/read_lund_json.py
+30 −0		NEWS
+1 −1		Nsubjettiness/AxesDefinition.hh
+7 −0		Nsubjettiness/ChangeLog
+1 −2		Nsubjettiness/MeasureDefinition.cc
+2 −0		Nsubjettiness/NEWS
+1 −1		Nsubjettiness/VERSION
+13 −0		RecursiveTools/ChangeLog
+1 −0		RecursiveTools/NEWS
+7 −2		RecursiveTools/RecursiveSymmetryCutBase.cc
+1 −1		RecursiveTools/VERSION
+2 −1		VERSION
+33 −0		configure
+18 −0		data/single-epDIS-event.dat
+7 −0		scripts/c11check/Makefile
+13 −0		scripts/c11check/c11check.cc
+58 −0		scripts/internal/TODO
+0 −0		scripts/internal/Template/AUTHORS
+343 −0		scripts/internal/Template/COPYING
+3 −0		scripts/internal/Template/ChangeLog
+77 −0		scripts/internal/Template/Makefile
+0 −0		scripts/internal/Template/NEWS
+0 −0		scripts/internal/Template/README
+33 −0		scripts/internal/Template/Template.cc
+50 −0		scripts/internal/Template/Template.hh
+1 −0		scripts/internal/Template/VERSION
+71 −0		scripts/internal/Template/example.cc
+11 −0		scripts/internal/Template/example.ref
+46 −0		scripts/internal/check-updates.sh
+119 −0		scripts/internal/common.sh
+128 −0		scripts/internal/generate-html-contents.pl
+29 −0		scripts/internal/get-author-emails.py
+32 −0		scripts/internal/package.sh
+274 −0		scripts/internal/release-fjcontrib.sh
+151 −0		scripts/internal/switch-to-version.sh
+62 −0		scripts/new-contrib-from-template.sh
+85 −0		scripts/register-new-contrib.sh
+84 −0		scripts/release-contrib.sh
+183 −0		scripts/update-contribs.sh