From 3d5643fb36ac8e8f62554ef6058e38d224fe8896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 21 Jun 2024 14:15:11 +0200 Subject: [PATCH 1/3] let ReFrame install PyYAML 6.0.1 instead of 6.0 to fix Cython issue --- easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb | 3 ++- easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb index b8237231c173..36bc2418b05e 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb @@ -28,7 +28,8 @@ exts_list = [ 'checksums': ['4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a'], }), ('reframe', version, { - 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + 'preinstallopts': "sed -i 's@PyYAML==6.0@PyYAML==6.0.1@' requirements.txt && " + "export PATH=%(installdir)s/bin:$PATH && " "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz', diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb index af6b22f48468..6b8b0c7eb657 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb @@ -29,7 +29,8 @@ exts_list = [ 'checksums': ['4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a'], }), ('reframe', version, { - 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + 'preinstallopts': "sed -i 's@PyYAML==6.0@PyYAML==6.0.1@' requirements.txt && " + "export PATH=%(installdir)s/bin:$PATH && " "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz', From 830385da1e520c3f75e1b50e01af987df9f79213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 21 Jun 2024 14:20:33 +0200 Subject: [PATCH 2/3] add comment about sed command --- easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb | 3 ++- easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb index 36bc2418b05e..4efd476b8d77 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb @@ -28,7 +28,8 @@ exts_list = [ 'checksums': ['4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a'], }), ('reframe', version, { - 'preinstallopts': "sed -i 's@PyYAML==6.0@PyYAML==6.0.1@' requirements.txt && " + 'preinstallopts': # use PyYAML 6.0.1 to solve Cython 3 incompatibility issues + "sed -i 's@PyYAML==6.0@PyYAML==6.0.1@' requirements.txt && " "export PATH=%(installdir)s/bin:$PATH && " "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb index 6b8b0c7eb657..a6dafff3207f 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb @@ -29,7 +29,8 @@ exts_list = [ 'checksums': ['4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a'], }), ('reframe', version, { - 'preinstallopts': "sed -i 's@PyYAML==6.0@PyYAML==6.0.1@' requirements.txt && " + 'preinstallopts': # use PyYAML 6.0.1 to solve Cython 3 incompatibility issues + "sed -i 's@PyYAML==6.0@PyYAML==6.0.1@' requirements.txt && " "export PATH=%(installdir)s/bin:$PATH && " "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", From 859aac55d1b0803f074e68f3002d14cba1205837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 21 Jun 2024 14:45:34 +0200 Subject: [PATCH 3/3] switch order of lines to make CI happy about comment --- easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb | 4 ++-- easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb index 4efd476b8d77..7e01526d78c9 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.2.eb @@ -28,9 +28,9 @@ exts_list = [ 'checksums': ['4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a'], }), ('reframe', version, { - 'preinstallopts': # use PyYAML 6.0.1 to solve Cython 3 incompatibility issues + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + # use PyYAML 6.0.1 to solve Cython 3 incompatibility issues "sed -i 's@PyYAML==6.0@PyYAML==6.0.1@' requirements.txt && " - "export PATH=%(installdir)s/bin:$PATH && " "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz', diff --git a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb index a6dafff3207f..f4319b13ae56 100644 --- a/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb +++ b/easybuild/easyconfigs/r/ReFrame/ReFrame-4.3.3.eb @@ -29,9 +29,9 @@ exts_list = [ 'checksums': ['4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a'], }), ('reframe', version, { - 'preinstallopts': # use PyYAML 6.0.1 to solve Cython 3 incompatibility issues + 'preinstallopts': "export PATH=%(installdir)s/bin:$PATH && " + # use PyYAML 6.0.1 to solve Cython 3 incompatibility issues "sed -i 's@PyYAML==6.0@PyYAML==6.0.1@' requirements.txt && " - "export PATH=%(installdir)s/bin:$PATH && " "./bootstrap.sh +docs +pygelf && cp -r external %(installdir)s && " "PYTHONPATH=%(builddir)s/reframe/reframe-%(version)s/external:$PYTHONPATH ", 'source_tmpl': 'v%(version)s.tar.gz',