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

{tools}[system] EasyBuild v5.0.0beta1 (WIP) #22049

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

Conversation

boegel
Copy link
Member

@boegel boegel commented Dec 18, 2024

(created using eb --new-pr)

@boegel boegel added the update label Dec 18, 2024
@boegel boegel marked this pull request as draft December 18, 2024 12:38
Copy link

Updated software EasyBuild-5.0.0beta1.eb

Diff against EasyBuild-4.9.4.eb

easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.4.eb

diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.4.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-5.0.0beta1.eb
index 064536bb93..ed54b7bbac 100644
--- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.4.eb
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-5.0.0beta1.eb
@@ -1,9 +1,9 @@
 easyblock = 'EB_EasyBuildMeta'
 
 name = 'EasyBuild'
-version = '4.9.4'
+version = '5.0.0beta1'
 
-homepage = 'https://easybuilders.github.io/easybuild'
+homepage = 'https://easybuild.io'
 description = """EasyBuild is a software build and installation framework
  written in Python that allows you to install software in a structured,
  repeatable and robust way."""
@@ -11,40 +11,16 @@ description = """EasyBuild is a software build and installation framework
 toolchain = SYSTEM
 
 source_urls = [
-    # easybuild-framework
-    'https://files.pythonhosted.org/packages/bd/25/512d9e895a86f4df198274e8a5f6868406d97cc75da9acc5797f78139b52/',
-    # easybuild-easyblocks
-    'https://files.pythonhosted.org/packages/d7/b0/b9289c78fafc21c5c01b225aeee89c69914166742e5f80955d49ed8f9722/',
-    # easybuild-easyconfigs
-    'https://files.pythonhosted.org/packages/ed/2c/7b2b22235ffe9310a93cbfef06fb3723466aa8ccc4aca4888b59433e55a6/',
+    'https://github.com/easybuilders/easybuild-framework/archive/',
+    'https://github.com/easybuilders/easybuild-easyblocks/archive/',
+    'https://github.com/easybuilders/easybuild-easyconfigs/archive/',
 ]
-# note: subdirectory for each unpacked source tarball is renamed because custom easyblock in older EasyBuild version
-# that is used for installing EasyBuild with EasyBuild expects subdirectories with '-' rather than '_';
-# see also https://github.com/easybuilders/easybuild-easyblocks/pull/3358
 sources = [
-    {
-        'filename': 'easybuild_framework-%(version)s.tar.gz',
-        'extract_cmd': "tar xfvz %s && mv easybuild_framework-%(version)s easybuild-framework-%(version)s",
-    },
-    {
-        'filename': 'easybuild_easyblocks-%(version)s.tar.gz',
-        'extract_cmd': "tar xfvz %s && mv easybuild_easyblocks-%(version)s easybuild-easyblocks-%(version)s",
-    },
-    {
-        'filename': 'easybuild_easyconfigs-%(version)s.tar.gz',
-        'extract_cmd': "tar xfvz %s && mv easybuild_easyconfigs-%(version)s easybuild-easyconfigs-%(version)s",
-    },
-]
-patches = ['EasyBuild-4.9.4_fix-riscv-toolchain-opts-typo.patch']
-checksums = [
-    {'easybuild_framework-4.9.4.tar.gz': '5b380a2e3a359f64f06789c390200b922a840f6b10b441e5163696a34bd9bc27'},
-    {'easybuild_easyblocks-4.9.4.tar.gz': '1272f1e294090caafde8cbda72ae344ef400fdd161163781f67b3cffe761dd62'},
-    {'easybuild_easyconfigs-4.9.4.tar.gz': 'beee4e098f5fee18f2029d6a0b893549aba26e075b147cc0008cb16fd4c8d982'},
-    {'EasyBuild-4.9.4_fix-riscv-toolchain-opts-typo.patch':
-     '602d9abfdd90f435bdc877b1d2710a17ae577c790914e7bf61428dc7073ad1b6'},
+    'easybuild-framework-v%(version)s.tar.gz',
+    'easybuild-easyblocks-v%(version)s.tar.gz',
+    'easybuild-easyconfigs-v%(version)s.tar.gz',
 ]
 
-# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
Diff against EasyBuild-4.9.3.eb

easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.3.eb

diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.3.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-5.0.0beta1.eb
index 4059b34221..ed54b7bbac 100644
--- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.3.eb
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-5.0.0beta1.eb
@@ -1,9 +1,9 @@
 easyblock = 'EB_EasyBuildMeta'
 
 name = 'EasyBuild'
-version = '4.9.3'
+version = '5.0.0beta1'
 
-homepage = 'https://easybuilders.github.io/easybuild'
+homepage = 'https://easybuild.io'
 description = """EasyBuild is a software build and installation framework
  written in Python that allows you to install software in a structured,
  repeatable and robust way."""
@@ -11,37 +11,16 @@ description = """EasyBuild is a software build and installation framework
 toolchain = SYSTEM
 
 source_urls = [
-    # easybuild-framework
-    'https://files.pythonhosted.org/packages/10/a0/e5484d4078f7450042cd7b7a1af24fd3f8d0cb4818f4578e4c322ba488d8/',
-    # easybuild-easyblocks
-    'https://files.pythonhosted.org/packages/ee/40/4f6412917f83429f9389b977903c8905f216cb211c8bf3111f28c3017677/',
-    # easybuild-easyconfigs
-    'https://files.pythonhosted.org/packages/13/95/44d1e10ceaaf08219ef50d1d97d500ba3b6b34f2d76dd1ff64def71612dc/',
+    'https://github.com/easybuilders/easybuild-framework/archive/',
+    'https://github.com/easybuilders/easybuild-easyblocks/archive/',
+    'https://github.com/easybuilders/easybuild-easyconfigs/archive/',
 ]
-# note: subdirectory for each unpacked source tarball is renamed because custom easyblock in older EasyBuild version
-# that is used for installing EasyBuild with EasyBuild expects subdirectories with '-' rather than '_';
-# see also https://github.com/easybuilders/easybuild-easyblocks/pull/3358
 sources = [
-    {
-        'filename': 'easybuild_framework-%(version)s.tar.gz',
-        'extract_cmd': "tar xfvz %s && mv easybuild_framework-%(version)s easybuild-framework-%(version)s",
-    },
-    {
-        'filename': 'easybuild_easyblocks-%(version)s.tar.gz',
-        'extract_cmd': "tar xfvz %s && mv easybuild_easyblocks-%(version)s easybuild-easyblocks-%(version)s",
-    },
-    {
-        'filename': 'easybuild_easyconfigs-%(version)s.tar.gz',
-        'extract_cmd': "tar xfvz %s && mv easybuild_easyconfigs-%(version)s easybuild-easyconfigs-%(version)s",
-    },
-]
-checksums = [
-    {'easybuild_framework-4.9.3.tar.gz': '43bbcaa0a7b075eb6483054428ef4b1279a9fc850301171688f86899eaebfff8'},
-    {'easybuild_easyblocks-4.9.3.tar.gz': '4f036be918f88fe2dadba87f15d696e9b4d3f8f06986c675b9fafc77b591649d'},
-    {'easybuild_easyconfigs-4.9.3.tar.gz': 'f7f501c87cb16a8eb393f5e98cb3cd5f8e84314901e81ff50f8140681b415676'},
+    'easybuild-framework-v%(version)s.tar.gz',
+    'easybuild-easyblocks-v%(version)s.tar.gz',
+    'easybuild-easyconfigs-v%(version)s.tar.gz',
 ]
 
-# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
Diff against EasyBuild-4.9.2.eb

easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.2.eb

diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.2.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-5.0.0beta1.eb
index cb476c53d7..ed54b7bbac 100644
--- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.2.eb
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-5.0.0beta1.eb
@@ -1,9 +1,9 @@
 easyblock = 'EB_EasyBuildMeta'
 
 name = 'EasyBuild'
-version = '4.9.2'
+version = '5.0.0beta1'
 
-homepage = 'https://easybuilders.github.io/easybuild'
+homepage = 'https://easybuild.io'
 description = """EasyBuild is a software build and installation framework
  written in Python that allows you to install software in a structured,
  repeatable and robust way."""
@@ -11,37 +11,16 @@ description = """EasyBuild is a software build and installation framework
 toolchain = SYSTEM
 
 source_urls = [
-    # easybuild-framework
-    'https://files.pythonhosted.org/packages/cc/1f/676fc9e29c68e9c39c6dadf150ab4e5bf4907de4b9afd2bc6e0afd24ab7c/',
-    # easybuild-easyblocks
-    'https://files.pythonhosted.org/packages/5d/85/e8593ceeb00c61253204e74d2a8360076ce016f42d83d33841f8e7de57a1/',
-    # easybuild-easyconfigs
-    'https://files.pythonhosted.org/packages/99/b2/d899b4310bc54a10e0fb46995a2abc333857db16d116f22a53b0313d13d7/',
+    'https://github.com/easybuilders/easybuild-framework/archive/',
+    'https://github.com/easybuilders/easybuild-easyblocks/archive/',
+    'https://github.com/easybuilders/easybuild-easyconfigs/archive/',
 ]
-# note: subdirectory for each unpacked source tarball is renamed because custom easyblock in older EasyBuild version
-# that is used for installing EasyBuild with EasyBuild expects subdirectories with '-' rather than '_';
-# see also https://github.com/easybuilders/easybuild-easyblocks/pull/3358
 sources = [
-    {
-        'filename': 'easybuild_framework-%(version)s.tar.gz',
-        'extract_cmd': "tar xfvz %s && mv easybuild_framework-%(version)s easybuild-framework-%(version)s",
-    },
-    {
-        'filename': 'easybuild_easyblocks-%(version)s.tar.gz',
-        'extract_cmd': "tar xfvz %s && mv easybuild_easyblocks-%(version)s easybuild-easyblocks-%(version)s",
-    },
-    {
-        'filename': 'easybuild_easyconfigs-%(version)s.tar.gz',
-        'extract_cmd': "tar xfvz %s && mv easybuild_easyconfigs-%(version)s easybuild-easyconfigs-%(version)s",
-    },
-]
-checksums = [
-    {'easybuild_framework-4.9.2.tar.gz': 'cc6e0fe7bab2a96d424656ed70bf33e3b083eef5ceaa5d5fed88aa7b91dd3d63'},
-    {'easybuild_easyblocks-4.9.2.tar.gz': '48202a89995a3d0a19228a35e409228bb6aa190ec7d7a7560e449303954953df'},
-    {'easybuild_easyconfigs-4.9.2.tar.gz': '52d6f6378fc331cda8a94ff196d5bd6bb74c8029c973ee6a92763c256571eec7'},
+    'easybuild-framework-v%(version)s.tar.gz',
+    'easybuild-easyblocks-v%(version)s.tar.gz',
+    'easybuild-easyconfigs-v%(version)s.tar.gz',
 ]
 
-# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed
 allow_system_deps = [('Python', SYS_PYTHON_VERSION)]

@boegel
Copy link
Member Author

boegel commented Dec 18, 2024

We should try and avoid that --install-latest-eb-release will pick up on this, so we many need to be a bit more creative with the version or the easyconfig filename...

@boegel boegel added this to the release after 4.9.4 milestone Dec 18, 2024
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