Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add easyconfigs fastjet-3.4.2-gompi-2023b.eb and siscone-3.0.6-GCCcor… #22037

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

julianmorillo
Copy link
Contributor

…e-13.2.0.eb

Copy link

Updated software fastjet-3.4.2-gompi-2023b.eb

Diff against fastjet-3.4.2-gompi-2023a.eb

easybuild/easyconfigs/f/fastjet/fastjet-3.4.2-gompi-2023a.eb

diff --git a/easybuild/easyconfigs/f/fastjet/fastjet-3.4.2-gompi-2023a.eb b/easybuild/easyconfigs/f/fastjet/fastjet-3.4.2-gompi-2023b.eb
index 36cf015e39..a75f60b625 100644
--- a/easybuild/easyconfigs/f/fastjet/fastjet-3.4.2-gompi-2023a.eb
+++ b/easybuild/easyconfigs/f/fastjet/fastjet-3.4.2-gompi-2023b.eb
@@ -9,7 +9,7 @@ version = '3.4.2'
 homepage = 'https://fastjet.fr/'
 description = """A software package for jet finding in pp and e+e- collisions"""
 
-toolchain = {'name': 'gompi', 'version': '2023a'}
+toolchain = {'name': 'gompi', 'version': '2023b'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['https://fastjet.fr/repo/']
@@ -25,9 +25,9 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('Python', '3.11.3'),
+    ('Python', '3.11.5'),
     ('siscone', '3.0.6'),
-    ('CGAL', '5.6'),
+    ('CGAL', '5.6.1'),
 ]
 configopts = '--enable-cgal-header-only --enable-pyext --enable-allplugins --enable-allcxxplugins '
 configopts += "--enable-shared"
Diff against fastjet-3.4.0-gompi-2022a.eb

easybuild/easyconfigs/f/fastjet/fastjet-3.4.0-gompi-2022a.eb

diff --git a/easybuild/easyconfigs/f/fastjet/fastjet-3.4.0-gompi-2022a.eb b/easybuild/easyconfigs/f/fastjet/fastjet-3.4.2-gompi-2023b.eb
index 631c87a53f..a75f60b625 100644
--- a/easybuild/easyconfigs/f/fastjet/fastjet-3.4.0-gompi-2022a.eb
+++ b/easybuild/easyconfigs/f/fastjet/fastjet-3.4.2-gompi-2023b.eb
@@ -4,20 +4,20 @@
 easyblock = 'ConfigureMake'
 
 name = 'fastjet'
-version = '3.4.0'
+version = '3.4.2'
 
 homepage = 'https://fastjet.fr/'
 description = """A software package for jet finding in pp and e+e- collisions"""
 
-toolchain = {'name': 'gompi', 'version': '2022a'}
+toolchain = {'name': 'gompi', 'version': '2023b'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['https://fastjet.fr/repo/']
 sources = [SOURCELOWER_TAR_GZ]
 patches = ['fastjet-3.4.0_excludeSISCone.patch']
 checksums = [
-    'ee07c8747c8ead86d88de4a9e4e8d1e9e7d7614973f5631ba8297f7a02478b91',
-    '698902b4c4d54873d640239461cccc036234986ae8d6a33ceb649462ade971d3'  # fastjet-3.4.0_excludeSISCone.patch
+    {'fastjet-3.4.2.tar.gz': 'b3d33155b55ce43f420cd6d99b525acf7bdc2593a7bb7ea898a9ddb3d8ca38e3'},
+    {'fastjet-3.4.0_excludeSISCone.patch': '698902b4c4d54873d640239461cccc036234986ae8d6a33ceb649462ade971d3'},
 ]
 
 builddependencies = [
@@ -25,13 +25,11 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('siscone', '3.0.5'),
-    ('CGAL', '4.14.3'),
+    ('Python', '3.11.5'),
+    ('siscone', '3.0.6'),
+    ('CGAL', '5.6.1'),
 ]
-# For CGAL >=5
-# configopts = '--enable-cgal-header-only --enable-pyext --enable-allplugins --enable-allcxxplugins '
-configopts = '--enable-cgal --enable-pyext --enable-allplugins --enable-allcxxplugins '
+configopts = '--enable-cgal-header-only --enable-pyext --enable-allplugins --enable-allcxxplugins '
 configopts += "--enable-shared"
 
 sanity_check_paths = {

Updated software siscone-3.0.6-GCCcore-13.2.0.eb

Diff against siscone-3.0.6-GCCcore-12.3.0.eb

easybuild/easyconfigs/s/siscone/siscone-3.0.6-GCCcore-12.3.0.eb

diff --git a/easybuild/easyconfigs/s/siscone/siscone-3.0.6-GCCcore-12.3.0.eb b/easybuild/easyconfigs/s/siscone/siscone-3.0.6-GCCcore-13.2.0.eb
index a6a381868f..b6258d945a 100644
--- a/easybuild/easyconfigs/s/siscone/siscone-3.0.6-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/s/siscone/siscone-3.0.6-GCCcore-13.2.0.eb
@@ -9,7 +9,7 @@ version = '3.0.6'
 homepage = 'https://siscone.hepforge.org/'
 description = """Hadron Seedless Infrared-Safe Cone jet algorithm"""
 
-toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
 
 source_urls = ['https://siscone.hepforge.org/downloads/']
 sources = [SOURCELOWER_TAR_GZ]
Diff against siscone-3.0.5-GCCcore-11.3.0.eb

easybuild/easyconfigs/s/siscone/siscone-3.0.5-GCCcore-11.3.0.eb

diff --git a/easybuild/easyconfigs/s/siscone/siscone-3.0.5-GCCcore-11.3.0.eb b/easybuild/easyconfigs/s/siscone/siscone-3.0.6-GCCcore-13.2.0.eb
index 5ca8d172b3..b6258d945a 100644
--- a/easybuild/easyconfigs/s/siscone/siscone-3.0.5-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/s/siscone/siscone-3.0.6-GCCcore-13.2.0.eb
@@ -4,24 +4,24 @@
 easyblock = 'ConfigureMake'
 
 name = 'siscone'
-version = '3.0.5'
+version = '3.0.6'
 
 homepage = 'https://siscone.hepforge.org/'
 description = """Hadron Seedless Infrared-Safe Cone jet algorithm"""
 
-toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
 
 source_urls = ['https://siscone.hepforge.org/downloads/']
 sources = [SOURCELOWER_TAR_GZ]
-checksums = ['08c63ad96516970c0ef5c030de2e626d6760efda8ece20dee410a515b7acf1e8']
+checksums = ['f9f19e87433305d073e5715a175d8ef0a56101f97203e5bd36a09b3eeb5cb04a']
 
 builddependencies = [
-    ('binutils', '2.38'),
+    ('binutils', '2.40'),
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libsiscone.%s' % SHLIB_EXT],
-    'dirs': ['include/siscone'],
+    'files': ["lib/libsiscone.so"],
+    'dirs': ["include/siscone"],
 }
 
 moduleclass = 'phys'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant