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-GCCcore-13.2.0.eb #22035

Closed
wants to merge 90 commits into from

Conversation

julianmorillo
Copy link
Contributor

No description provided.

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 git-2.41.0-gfbf-2023b-nodocs.eb

Diff against git-2.45.1-GCCcore-13.3.0.eb

easybuild/easyconfigs/g/git/git-2.45.1-GCCcore-13.3.0.eb

diff --git a/easybuild/easyconfigs/g/git/git-2.45.1-GCCcore-13.3.0.eb b/easybuild/easyconfigs/g/git/git-2.41.0-gfbf-2023b-nodocs.eb
index 3cd07e7cc6..93ff47d7fd 100644
--- a/easybuild/easyconfigs/g/git/git-2.45.1-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/g/git/git-2.41.0-gfbf-2023b-nodocs.eb
@@ -1,29 +1,30 @@
 easyblock = 'ConfigureMake'
 
 name = 'git'
-version = '2.45.1'
+version = '2.41.0'
+versionsuffix = '-nodocs'
 
 homepage = 'https://git-scm.com'
 description = """Git is a free and open source distributed version control system designed
 to handle everything from small to very large projects with speed and efficiency."""
 
-toolchain = {'name': 'GCCcore', 'version': '13.3.0'}
+toolchain = {'name': 'gfbf', 'version': '2023b'}
 
 source_urls = ['https://github.com/git/git/archive']
 sources = ['v%(version)s.tar.gz']
-checksums = ['d98c8f70d58f49f7546d59b25e25f2deae6999eb036a33b0fe6f5d07c33f67c6']
+checksums = ['4f0b74bbde2800b00d3a50a7f389bcf1d59f1265b6986c00048d8ba4892ab01a']
 
 builddependencies = [
-    ('binutils', '2.42'),
-    ('Autotools', '20231222'),
+    ('binutils', '2.40'),
+    ('Autotools', '20220317'),
 ]
 
 dependencies = [
-    ('cURL', '8.7.1'),
-    ('expat', '2.6.2'),
-    ('gettext', '0.22.5'),
-    ('Perl', '5.38.2'),
-    ('OpenSSL', '3', '', SYSTEM),
+    ('cURL', '8.3.0'),
+    ('expat', '2.5.0'),
+    ('gettext', '0.22'),
+    ('Perl', '5.38.0'),
+    ('OpenSSL', '1.1', '', SYSTEM),
 ]
 
 preconfigopts = 'make configure && '
Diff against git-2.42.0-GCCcore-13.2.0.eb

easybuild/easyconfigs/g/git/git-2.42.0-GCCcore-13.2.0.eb

diff --git a/easybuild/easyconfigs/g/git/git-2.42.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/g/git/git-2.41.0-gfbf-2023b-nodocs.eb
index 05e3652110..93ff47d7fd 100644
--- a/easybuild/easyconfigs/g/git/git-2.42.0-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/g/git/git-2.41.0-gfbf-2023b-nodocs.eb
@@ -1,17 +1,18 @@
 easyblock = 'ConfigureMake'
 
 name = 'git'
-version = '2.42.0'
+version = '2.41.0'
+versionsuffix = '-nodocs'
 
 homepage = 'https://git-scm.com'
 description = """Git is a free and open source distributed version control system designed
 to handle everything from small to very large projects with speed and efficiency."""
 
-toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
+toolchain = {'name': 'gfbf', 'version': '2023b'}
 
 source_urls = ['https://github.com/git/git/archive']
 sources = ['v%(version)s.tar.gz']
-checksums = ['60c06eb7ce840903169ed4872224b2409dd8d8a518e9df847c6dc0ef10d35d99']
+checksums = ['4f0b74bbde2800b00d3a50a7f389bcf1d59f1265b6986c00048d8ba4892ab01a']
 
 builddependencies = [
     ('binutils', '2.40'),
Diff against git-2.41.0-GCCcore-12.3.0-nodocs.eb

easybuild/easyconfigs/g/git/git-2.41.0-GCCcore-12.3.0-nodocs.eb

diff --git a/easybuild/easyconfigs/g/git/git-2.41.0-GCCcore-12.3.0-nodocs.eb b/easybuild/easyconfigs/g/git/git-2.41.0-gfbf-2023b-nodocs.eb
index c327d50770..93ff47d7fd 100644
--- a/easybuild/easyconfigs/g/git/git-2.41.0-GCCcore-12.3.0-nodocs.eb
+++ b/easybuild/easyconfigs/g/git/git-2.41.0-gfbf-2023b-nodocs.eb
@@ -8,7 +8,7 @@ homepage = 'https://git-scm.com'
 description = """Git is a free and open source distributed version control system designed
 to handle everything from small to very large projects with speed and efficiency."""
 
-toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
+toolchain = {'name': 'gfbf', 'version': '2023b'}
 
 source_urls = ['https://github.com/git/git/archive']
 sources = ['v%(version)s.tar.gz']
@@ -20,10 +20,10 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('cURL', '8.0.1'),
+    ('cURL', '8.3.0'),
     ('expat', '2.5.0'),
-    ('gettext', '0.21.1'),
-    ('Perl', '5.36.1'),
+    ('gettext', '0.22'),
+    ('Perl', '5.38.0'),
     ('OpenSSL', '1.1', '', SYSTEM),
 ]
 

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'

@julianmorillo julianmorillo deleted the fastjet branch December 16, 2024 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant