Skip to content

{phys,vis}[gfbf/2023b,iimkl/2023b] CHERAB v1.5.0, Raysect v0.8.1.post1#21501

Open
SimonPinches wants to merge 9 commits intoeasybuilders:developfrom
SimonPinches:20240930141601_new_pr_CHERAB150
Open

{phys,vis}[gfbf/2023b,iimkl/2023b] CHERAB v1.5.0, Raysect v0.8.1.post1#21501
SimonPinches wants to merge 9 commits intoeasybuilders:developfrom
SimonPinches:20240930141601_new_pr_CHERAB150

Conversation

@SimonPinches
Copy link
Copy Markdown
Contributor

(created using eb --new-pr)

…23b.eb, Raysect-0.8.1.post1-gfbf-2023b.eb, Raysect-0.8.1.post1-iimkl-2023b.eb
@SimonPinches
Copy link
Copy Markdown
Contributor Author

Depends upon PR #20262

@Louwrensth Louwrensth added this to the 4.x milestone Nov 6, 2024
@Louwrensth
Copy link
Copy Markdown
Collaborator

@boegelbot please test @ generoso
EB_ARGS="--from-pr 20262"

@boegelbot
Copy link
Copy Markdown
Collaborator

@Louwrensth: Request for testing this PR well received on login1

PR test command 'EB_PR=21501 EB_ARGS="--from-pr 20262" EB_CONTAINER= EB_REPO=easybuild-easyconfigs /opt/software/slurm/bin/sbatch --job-name test_PR_21501 --ntasks=4 ~/boegelbot/eb_from_pr_upload_generoso.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 14632

Test results coming soon (I hope)...

Details

- notification for comment with ID 2459792956 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@Thyre Thyre added the 2023b label Aug 18, 2025
@github-actions
Copy link
Copy Markdown

github-actions bot commented Feb 16, 2026

Updated software CHERAB-1.5.0-gfbf-2023b.eb

Diff against CHERAB-1.3.0-intel-2022a.eb

easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-intel-2022a.eb

diff --git a/easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-intel-2022a.eb b/easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-gfbf-2023b.eb
index a70e5b4563..ad4329c2d4 100644
--- a/easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-intel-2022a.eb
+++ b/easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-gfbf-2023b.eb
@@ -1,23 +1,23 @@
 easyblock = 'PythonPackage'
 
 name = 'CHERAB'
-version = '1.3.0'
+version = '1.5.0'
 
 homepage = 'https://cherab.github.io/documentation/index.html'
 
 description = """CHERAB is a python library for forward modelling diagnostics
  based on spectroscopic plasma emission."""
 
-toolchain = {'name': 'intel', 'version': '2022a'}
+toolchain = {'name': 'gfbf', 'version': '2023b'}
 
 sources = [SOURCELOWER_TAR_GZ]
-checksums = ['2ce0ee3784863cc281c4f8ca402eb43d491f39d6269619161da09508e36eda45']
+checksums = ['e6b8928f6911b607851d946abf2f1e71628269504cf028e50fb74c8a94c86600']
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('matplotlib', '3.5.2'),
-    ('Raysect', '0.7.1')
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('matplotlib', '3.8.2'),
+    ('Raysect', '0.8.1.post1')
 ]
 
 moduleclass = 'phys'
Diff against CHERAB-1.3.0-foss-2022a.eb

easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-foss-2022a.eb

diff --git a/easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-foss-2022a.eb b/easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-gfbf-2023b.eb
index 231ae6d28b..ad4329c2d4 100644
--- a/easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-foss-2022a.eb
+++ b/easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-gfbf-2023b.eb
@@ -1,23 +1,23 @@
 easyblock = 'PythonPackage'
 
 name = 'CHERAB'
-version = '1.3.0'
+version = '1.5.0'
 
 homepage = 'https://cherab.github.io/documentation/index.html'
 
 description = """CHERAB is a python library for forward modelling diagnostics
  based on spectroscopic plasma emission."""
 
-toolchain = {'name': 'foss', 'version': '2022a'}
+toolchain = {'name': 'gfbf', 'version': '2023b'}
 
 sources = [SOURCELOWER_TAR_GZ]
-checksums = ['2ce0ee3784863cc281c4f8ca402eb43d491f39d6269619161da09508e36eda45']
+checksums = ['e6b8928f6911b607851d946abf2f1e71628269504cf028e50fb74c8a94c86600']
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('matplotlib', '3.5.2'),
-    ('Raysect', '0.7.1')
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('matplotlib', '3.8.2'),
+    ('Raysect', '0.8.1.post1')
 ]
 
 moduleclass = 'phys'

Updated software CHERAB-1.5.0-iimkl-2023b.eb

Diff against CHERAB-1.3.0-intel-2022a.eb

easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-intel-2022a.eb

diff --git a/easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-intel-2022a.eb b/easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-iimkl-2023b.eb
index a70e5b4563..5036e2a200 100644
--- a/easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-intel-2022a.eb
+++ b/easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-iimkl-2023b.eb
@@ -1,23 +1,23 @@
 easyblock = 'PythonPackage'
 
 name = 'CHERAB'
-version = '1.3.0'
+version = '1.5.0'
 
 homepage = 'https://cherab.github.io/documentation/index.html'
 
 description = """CHERAB is a python library for forward modelling diagnostics
  based on spectroscopic plasma emission."""
 
-toolchain = {'name': 'intel', 'version': '2022a'}
+toolchain = {'name': 'iimkl', 'version': '2023b'}
 
 sources = [SOURCELOWER_TAR_GZ]
-checksums = ['2ce0ee3784863cc281c4f8ca402eb43d491f39d6269619161da09508e36eda45']
+checksums = ['e6b8928f6911b607851d946abf2f1e71628269504cf028e50fb74c8a94c86600']
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('matplotlib', '3.5.2'),
-    ('Raysect', '0.7.1')
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('matplotlib', '3.8.2'),
+    ('Raysect', '0.8.1.post1')
 ]
 
 moduleclass = 'phys'
Diff against CHERAB-1.3.0-foss-2022a.eb

easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-foss-2022a.eb

diff --git a/easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-foss-2022a.eb b/easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-iimkl-2023b.eb
index 231ae6d28b..5036e2a200 100644
--- a/easybuild/easyconfigs/c/CHERAB/CHERAB-1.3.0-foss-2022a.eb
+++ b/easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-iimkl-2023b.eb
@@ -1,23 +1,23 @@
 easyblock = 'PythonPackage'
 
 name = 'CHERAB'
-version = '1.3.0'
+version = '1.5.0'
 
 homepage = 'https://cherab.github.io/documentation/index.html'
 
 description = """CHERAB is a python library for forward modelling diagnostics
  based on spectroscopic plasma emission."""
 
-toolchain = {'name': 'foss', 'version': '2022a'}
+toolchain = {'name': 'iimkl', 'version': '2023b'}
 
 sources = [SOURCELOWER_TAR_GZ]
-checksums = ['2ce0ee3784863cc281c4f8ca402eb43d491f39d6269619161da09508e36eda45']
+checksums = ['e6b8928f6911b607851d946abf2f1e71628269504cf028e50fb74c8a94c86600']
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('matplotlib', '3.5.2'),
-    ('Raysect', '0.7.1')
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('matplotlib', '3.8.2'),
+    ('Raysect', '0.8.1.post1')
 ]
 
 moduleclass = 'phys'

Updated software matplotlib-3.8.2-iimkl-2023b.eb

Diff against matplotlib-3.10.5-iimkl-2025b.eb

easybuild/easyconfigs/m/matplotlib/matplotlib-3.10.5-iimkl-2025b.eb

diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-3.10.5-iimkl-2025b.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-3.8.2-iimkl-2023b.eb
index a7531eef49..f0643c3c90 100644
--- a/easybuild/easyconfigs/m/matplotlib/matplotlib-3.10.5-iimkl-2025b.eb
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-3.8.2-iimkl-2023b.eb
@@ -1,58 +1,74 @@
 easyblock = 'PythonBundle'
 
 name = 'matplotlib'
-version = '3.10.5'
+version = '3.8.2'
 
 homepage = 'https://matplotlib.org'
 description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
  hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
  and ipython shell, web application servers, and six graphical user interface toolkits."""
 
-toolchain = {'name': 'iimkl', 'version': '2025b'}
+toolchain = {'name': 'iimkl', 'version': '2023b'}
 
 builddependencies = [
-    ('pkgconf', '2.4.3'),
-    ('cppy', '1.3.1'),
-    ('meson-python', '0.18.0'),
-    ('pybind11', '3.0.0'),
+    ('pkgconf', '2.0.3'),
+    ('cppy', '1.2.1'),
+    ('meson-python', '0.15.0'),
 ]
 
 dependencies = [
-    ('Python', '3.13.5'),
-    ('SciPy-bundle', '2025.07'),
-    ('libpng', '1.6.50'),
-    ('freetype', '2.13.3'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('libpng', '1.6.40'),
+    ('freetype', '2.13.2'),
     ('Tkinter', '%(pyver)s'),
-    ('Pillow', '11.3.0'),
+    ('Pillow', '10.2.0'),
     ('Qhull', '2020.2'),
-    ('fonttools', '4.58.5'),
 ]
 
-local_installopts = "--config-settings=setup-args='-Dsystem-qhull=true' "
-local_installopts += " --config-settings=setup-args='-Dsystem-freetype=true' "
-# Prevent crash using library, see https://github.com/matplotlib/matplotlib/issues/28813
-local_installopts += " --config-settings=setup-args='-Db_lto=false'"
+# avoid that matplotlib downloads and builds its own copies of freetype and qhull
+_fix_setup = "sed -e 's/#system_freetype = False/system_freetype = True/g' "
+# _fix_setup += "-e 's/#system_qhull = False/system_qhull = True/g' mplsetup.cfg.template >mplsetup.cfg && "
+_fix_setup += " mplsetup.cfg.template >mplsetup.cfg && "
+
+_include_path = "export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && "
+
+local_preinstallopts = "sed -e 's/#system_freetype = False/system_freetype = True/g' -e "
+# local_preinstallopts += "'s/#system_qhull = False/system_qhull = True/g' mplsetup.cfg.template >mplsetup.cfg"
+local_preinstallopts += " mplsetup.cfg.template >mplsetup.cfg"
+local_preinstallopts += "&& export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && "
 
 exts_list = [
-    ('cycler', '0.12.1', {
+    ('fonttools', '4.47.0', {
+        'modulename': 'fontTools',
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'checksums': ['ec13a10715eef0e031858c1c23bfaee6cba02b97558e4a7bfa089dba4a8c2ebf'],
+    }),
+    ('Cycler', '0.12.1', {
+        'modulename': 'cycler',
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
         'checksums': ['88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c'],
     }),
-    ('kiwisolver', '1.4.8', {
+    ('kiwisolver', '1.4.5', {
+        'patches': ['kiwisolver-1.4.4-fix_version.patch'],
         'checksums': [
-            {'kiwisolver-1.4.8.tar.gz': '23d5f023bdc8c7e54eb65f03ca5d5bb25b601eac4d7f1a042888a1f45237987e'},
+            {'kiwisolver-1.4.5.tar.gz': 'e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec'},
+            {'kiwisolver-1.4.4-fix_version.patch': '6753afbb3a88856493fcfa0b33989f35742f57bfd41ff3b7f71a98797e1bfbd0'},
         ],
     }),
-    ('contourpy', '1.3.3', {
-        'patches': ['matplotlib-3.9.2-contourpy-fix-pybind-module.patch'],
-        'checksums': [
-            {'contourpy-1.3.3.tar.gz': '083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880'},
-            {'matplotlib-3.9.2-contourpy-fix-pybind-module.patch':
-             'a998438a1048524a550bf3bb607197658b13dce56e8e54169e24ce7c3c022a8f'},
-        ],
+    ('contourpy', '1.2.0', {
+        'checksums': ['171f311cb758de7da13fc53af221ae47a5877be5a0843a9fe150818c51ed276a'],
     }),
     (name, version, {
-        'install_opts': local_installopts,
-        'checksums': ['352ed6ccfb7998a00881692f38b4ca083c691d3e275b4145423704c34c909076'],
+        'patches': ['matplotlib-3.8.2-fix_setup.patch'],
+        'preinstallopts': "sed -e 's/#system_freetype = False/system_freetype = True/g' "
+                          # "-e 's/#system_qhull = False/system_qhull = True/g' mplsetup.cfg.template >mplsetup.cfg"
+                          " mplsetup.cfg.template >mplsetup.cfg"
+                          "&& export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && ",
+        'checksums': [
+            {'matplotlib-3.8.2.tar.gz': '01a978b871b881ee76017152f1f1a0cbf6bd5f7b8ff8c96df0df1bd57d8755a1'},
+            {'matplotlib-3.8.2-fix_setup.patch': '16e1610aec49af402e324e0b71c69d6b7ae106732088318e727b48282492a932'},
+        ],
     }),
 ]
 
Diff against matplotlib-3.10.5-gfbf-2025b.eb

easybuild/easyconfigs/m/matplotlib/matplotlib-3.10.5-gfbf-2025b.eb

diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-3.10.5-gfbf-2025b.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-3.8.2-iimkl-2023b.eb
index 534da7abf9..f0643c3c90 100644
--- a/easybuild/easyconfigs/m/matplotlib/matplotlib-3.10.5-gfbf-2025b.eb
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-3.8.2-iimkl-2023b.eb
@@ -1,56 +1,74 @@
 easyblock = 'PythonBundle'
 
 name = 'matplotlib'
-version = '3.10.5'
+version = '3.8.2'
 
 homepage = 'https://matplotlib.org'
 description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
  hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
  and ipython shell, web application servers, and six graphical user interface toolkits."""
 
-toolchain = {'name': 'gfbf', 'version': '2025b'}
+toolchain = {'name': 'iimkl', 'version': '2023b'}
 
 builddependencies = [
-    ('pkgconf', '2.4.3'),
-    ('cppy', '1.3.1'),
-    ('meson-python', '0.18.0'),
-    ('pybind11', '3.0.0'),
+    ('pkgconf', '2.0.3'),
+    ('cppy', '1.2.1'),
+    ('meson-python', '0.15.0'),
 ]
 
 dependencies = [
-    ('Python', '3.13.5'),
-    ('SciPy-bundle', '2025.07'),
-    ('libpng', '1.6.50'),
-    ('freetype', '2.13.3'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('libpng', '1.6.40'),
+    ('freetype', '2.13.2'),
     ('Tkinter', '%(pyver)s'),
-    ('Pillow', '11.3.0'),
+    ('Pillow', '10.2.0'),
     ('Qhull', '2020.2'),
-    ('fonttools', '4.58.5'),
 ]
 
-local_installopts = "--config-settings=setup-args='-Dsystem-qhull=true' "
-local_installopts += " --config-settings=setup-args='-Dsystem-freetype=true' "
+# avoid that matplotlib downloads and builds its own copies of freetype and qhull
+_fix_setup = "sed -e 's/#system_freetype = False/system_freetype = True/g' "
+# _fix_setup += "-e 's/#system_qhull = False/system_qhull = True/g' mplsetup.cfg.template >mplsetup.cfg && "
+_fix_setup += " mplsetup.cfg.template >mplsetup.cfg && "
+
+_include_path = "export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && "
+
+local_preinstallopts = "sed -e 's/#system_freetype = False/system_freetype = True/g' -e "
+# local_preinstallopts += "'s/#system_qhull = False/system_qhull = True/g' mplsetup.cfg.template >mplsetup.cfg"
+local_preinstallopts += " mplsetup.cfg.template >mplsetup.cfg"
+local_preinstallopts += "&& export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && "
 
 exts_list = [
-    ('cycler', '0.12.1', {
+    ('fonttools', '4.47.0', {
+        'modulename': 'fontTools',
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'checksums': ['ec13a10715eef0e031858c1c23bfaee6cba02b97558e4a7bfa089dba4a8c2ebf'],
+    }),
+    ('Cycler', '0.12.1', {
+        'modulename': 'cycler',
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
         'checksums': ['88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c'],
     }),
-    ('kiwisolver', '1.4.8', {
+    ('kiwisolver', '1.4.5', {
+        'patches': ['kiwisolver-1.4.4-fix_version.patch'],
         'checksums': [
-            {'kiwisolver-1.4.8.tar.gz': '23d5f023bdc8c7e54eb65f03ca5d5bb25b601eac4d7f1a042888a1f45237987e'},
+            {'kiwisolver-1.4.5.tar.gz': 'e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec'},
+            {'kiwisolver-1.4.4-fix_version.patch': '6753afbb3a88856493fcfa0b33989f35742f57bfd41ff3b7f71a98797e1bfbd0'},
         ],
     }),
-    ('contourpy', '1.3.3', {
-        'patches': ['matplotlib-3.9.2-contourpy-fix-pybind-module.patch'],
-        'checksums': [
-            {'contourpy-1.3.3.tar.gz': '083e12155b210502d0bca491432bb04d56dc3432f95a979b429f2848c3dbe880'},
-            {'matplotlib-3.9.2-contourpy-fix-pybind-module.patch':
-             'a998438a1048524a550bf3bb607197658b13dce56e8e54169e24ce7c3c022a8f'},
-        ],
+    ('contourpy', '1.2.0', {
+        'checksums': ['171f311cb758de7da13fc53af221ae47a5877be5a0843a9fe150818c51ed276a'],
     }),
     (name, version, {
-        'install_opts': local_installopts,
-        'checksums': ['352ed6ccfb7998a00881692f38b4ca083c691d3e275b4145423704c34c909076'],
+        'patches': ['matplotlib-3.8.2-fix_setup.patch'],
+        'preinstallopts': "sed -e 's/#system_freetype = False/system_freetype = True/g' "
+                          # "-e 's/#system_qhull = False/system_qhull = True/g' mplsetup.cfg.template >mplsetup.cfg"
+                          " mplsetup.cfg.template >mplsetup.cfg"
+                          "&& export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && ",
+        'checksums': [
+            {'matplotlib-3.8.2.tar.gz': '01a978b871b881ee76017152f1f1a0cbf6bd5f7b8ff8c96df0df1bd57d8755a1'},
+            {'matplotlib-3.8.2-fix_setup.patch': '16e1610aec49af402e324e0b71c69d6b7ae106732088318e727b48282492a932'},
+        ],
     }),
 ]
 
Diff against matplotlib-3.10.3-gfbf-2025a.eb

easybuild/easyconfigs/m/matplotlib/matplotlib-3.10.3-gfbf-2025a.eb

diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-3.10.3-gfbf-2025a.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-3.8.2-iimkl-2023b.eb
index 797bd9f78e..f0643c3c90 100644
--- a/easybuild/easyconfigs/m/matplotlib/matplotlib-3.10.3-gfbf-2025a.eb
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-3.8.2-iimkl-2023b.eb
@@ -1,55 +1,74 @@
 easyblock = 'PythonBundle'
 
 name = 'matplotlib'
-version = '3.10.3'
+version = '3.8.2'
 
 homepage = 'https://matplotlib.org'
 description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
  hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
  and ipython shell, web application servers, and six graphical user interface toolkits."""
 
-toolchain = {'name': 'gfbf', 'version': '2025a'}
+toolchain = {'name': 'iimkl', 'version': '2023b'}
 
 builddependencies = [
-    ('pkgconf', '2.3.0'),
-    ('cppy', '1.3.1'),
-    ('meson-python', '0.18.0'),
-    ('pybind11', '2.13.6'),
+    ('pkgconf', '2.0.3'),
+    ('cppy', '1.2.1'),
+    ('meson-python', '0.15.0'),
 ]
 
 dependencies = [
-    ('Python', '3.13.1'),
-    ('SciPy-bundle', '2025.06'),
-    ('libpng', '1.6.48'),
-    ('freetype', '2.13.3'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('libpng', '1.6.40'),
+    ('freetype', '2.13.2'),
     ('Tkinter', '%(pyver)s'),
-    ('Pillow', '11.3.0'),
+    ('Pillow', '10.2.0'),
     ('Qhull', '2020.2'),
-    ('fonttools', '4.58.4'),
 ]
 
-local_installopts = "--config-settings=setup-args='-Dsystem-qhull=true' "
-local_installopts += " --config-settings=setup-args='-Dsystem-freetype=true' "
+# avoid that matplotlib downloads and builds its own copies of freetype and qhull
+_fix_setup = "sed -e 's/#system_freetype = False/system_freetype = True/g' "
+# _fix_setup += "-e 's/#system_qhull = False/system_qhull = True/g' mplsetup.cfg.template >mplsetup.cfg && "
+_fix_setup += " mplsetup.cfg.template >mplsetup.cfg && "
+
+_include_path = "export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && "
+
+local_preinstallopts = "sed -e 's/#system_freetype = False/system_freetype = True/g' -e "
+# local_preinstallopts += "'s/#system_qhull = False/system_qhull = True/g' mplsetup.cfg.template >mplsetup.cfg"
+local_preinstallopts += " mplsetup.cfg.template >mplsetup.cfg"
+local_preinstallopts += "&& export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && "
 
 exts_list = [
-    ('cycler', '0.12.1', {
+    ('fonttools', '4.47.0', {
+        'modulename': 'fontTools',
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'checksums': ['ec13a10715eef0e031858c1c23bfaee6cba02b97558e4a7bfa089dba4a8c2ebf'],
+    }),
+    ('Cycler', '0.12.1', {
+        'modulename': 'cycler',
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
         'checksums': ['88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c'],
     }),
     ('kiwisolver', '1.4.5', {
-        'checksums': ['e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec'],
-        'preinstallopts': """sed 's/^dynamic.*version/version = "%(version)s"/g' pyproject.toml && """,
-    }),
-    ('contourpy', '1.3.2', {
-        'patches': ['matplotlib-3.9.2-contourpy-fix-pybind-module.patch'],
+        'patches': ['kiwisolver-1.4.4-fix_version.patch'],
         'checksums': [
-            {'contourpy-1.3.2.tar.gz': 'b6945942715a034c671b7fc54f9588126b0b8bf23db2696e3ca8328f3ff0ab54'},
-            {'matplotlib-3.9.2-contourpy-fix-pybind-module.patch':
-             'a998438a1048524a550bf3bb607197658b13dce56e8e54169e24ce7c3c022a8f'},
+            {'kiwisolver-1.4.5.tar.gz': 'e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec'},
+            {'kiwisolver-1.4.4-fix_version.patch': '6753afbb3a88856493fcfa0b33989f35742f57bfd41ff3b7f71a98797e1bfbd0'},
         ],
     }),
+    ('contourpy', '1.2.0', {
+        'checksums': ['171f311cb758de7da13fc53af221ae47a5877be5a0843a9fe150818c51ed276a'],
+    }),
     (name, version, {
-        'install_opts': local_installopts,
-        'checksums': ['2f82d2c5bb7ae93aaaa4cd42aca65d76ce6376f83304fa3a630b569aca274df0'],
+        'patches': ['matplotlib-3.8.2-fix_setup.patch'],
+        'preinstallopts': "sed -e 's/#system_freetype = False/system_freetype = True/g' "
+                          # "-e 's/#system_qhull = False/system_qhull = True/g' mplsetup.cfg.template >mplsetup.cfg"
+                          " mplsetup.cfg.template >mplsetup.cfg"
+                          "&& export CPLUS_INCLUDE_PATH=$EBROOTFREETYPE/include/freetype2:${CPLUS_INCLUDE_PATH} && ",
+        'checksums': [
+            {'matplotlib-3.8.2.tar.gz': '01a978b871b881ee76017152f1f1a0cbf6bd5f7b8ff8c96df0df1bd57d8755a1'},
+            {'matplotlib-3.8.2-fix_setup.patch': '16e1610aec49af402e324e0b71c69d6b7ae106732088318e727b48282492a932'},
+        ],
     }),
 ]
 

Updated software Raysect-0.8.1.post1-gfbf-2023b.eb

Diff against Raysect-0.7.1-intel-2022a.eb

easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-intel-2022a.eb

diff --git a/easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-intel-2022a.eb b/easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-gfbf-2023b.eb
index ae1f2d09db..ede1a2f9ff 100644
--- a/easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-intel-2022a.eb
+++ b/easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-gfbf-2023b.eb
@@ -1,21 +1,21 @@
 easyblock = 'PythonPackage'
 
 name = 'Raysect'
-version = '0.7.1'
+version = '0.8.1.post1'
 
 homepage = 'https://raysect.org'
 
 description = """Raysect is an OOP ray-tracing framework for Python"""
 
-toolchain = {'name': 'intel', 'version': '2022a'}
+toolchain = {'name': 'gfbf', 'version': '2023b'}
 
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['5c91f7dc406fd64dfaa4096b259c31250ac50881a301a46b2a1d607a2746f968']
+sources = ['%(namelower)s-%(version)s-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl']
+checksums = ['cc1d45eb7eb9238bd89643bda2a9a89706ff1f6c571f219c66d57835d1e9bc23']
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('matplotlib', '3.5.2'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('matplotlib', '3.8.2'),
 ]
 
 moduleclass = 'vis'
Diff against Raysect-0.7.1-foss-2022a.eb

easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-foss-2022a.eb

diff --git a/easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-foss-2022a.eb b/easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-gfbf-2023b.eb
index 91ebb053a6..ede1a2f9ff 100644
--- a/easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-foss-2022a.eb
+++ b/easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-gfbf-2023b.eb
@@ -1,21 +1,21 @@
 easyblock = 'PythonPackage'
 
 name = 'Raysect'
-version = '0.7.1'
+version = '0.8.1.post1'
 
 homepage = 'https://raysect.org'
 
 description = """Raysect is an OOP ray-tracing framework for Python"""
 
-toolchain = {'name': 'foss', 'version': '2022a'}
+toolchain = {'name': 'gfbf', 'version': '2023b'}
 
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['5c91f7dc406fd64dfaa4096b259c31250ac50881a301a46b2a1d607a2746f968']
+sources = ['%(namelower)s-%(version)s-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl']
+checksums = ['cc1d45eb7eb9238bd89643bda2a9a89706ff1f6c571f219c66d57835d1e9bc23']
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('matplotlib', '3.5.2'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('matplotlib', '3.8.2'),
 ]
 
 moduleclass = 'vis'

Updated software Raysect-0.8.1.post1-iimkl-2023b.eb

Diff against Raysect-0.7.1-intel-2022a.eb

easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-intel-2022a.eb

diff --git a/easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-intel-2022a.eb b/easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-iimkl-2023b.eb
index ae1f2d09db..6e6d7ee653 100644
--- a/easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-intel-2022a.eb
+++ b/easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-iimkl-2023b.eb
@@ -1,21 +1,21 @@
 easyblock = 'PythonPackage'
 
 name = 'Raysect'
-version = '0.7.1'
+version = '0.8.1.post1'
 
 homepage = 'https://raysect.org'
 
 description = """Raysect is an OOP ray-tracing framework for Python"""
 
-toolchain = {'name': 'intel', 'version': '2022a'}
+toolchain = {'name': 'iimkl', 'version': '2023b'}
 
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['5c91f7dc406fd64dfaa4096b259c31250ac50881a301a46b2a1d607a2746f968']
+sources = ['%(namelower)s-%(version)s-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl']
+checksums = ['cc1d45eb7eb9238bd89643bda2a9a89706ff1f6c571f219c66d57835d1e9bc23']
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('matplotlib', '3.5.2'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('matplotlib', '3.8.2'),
 ]
 
 moduleclass = 'vis'
Diff against Raysect-0.7.1-foss-2022a.eb

easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-foss-2022a.eb

diff --git a/easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-foss-2022a.eb b/easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-iimkl-2023b.eb
index 91ebb053a6..6e6d7ee653 100644
--- a/easybuild/easyconfigs/r/Raysect/Raysect-0.7.1-foss-2022a.eb
+++ b/easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-iimkl-2023b.eb
@@ -1,21 +1,21 @@
 easyblock = 'PythonPackage'
 
 name = 'Raysect'
-version = '0.7.1'
+version = '0.8.1.post1'
 
 homepage = 'https://raysect.org'
 
 description = """Raysect is an OOP ray-tracing framework for Python"""
 
-toolchain = {'name': 'foss', 'version': '2022a'}
+toolchain = {'name': 'iimkl', 'version': '2023b'}
 
-sources = [SOURCELOWER_TAR_GZ]
-checksums = ['5c91f7dc406fd64dfaa4096b259c31250ac50881a301a46b2a1d607a2746f968']
+sources = ['%(namelower)s-%(version)s-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl']
+checksums = ['cc1d45eb7eb9238bd89643bda2a9a89706ff1f6c571f219c66d57835d1e9bc23']
 
 dependencies = [
-    ('Python', '3.10.4'),
-    ('SciPy-bundle', '2022.05'),
-    ('matplotlib', '3.5.2'),
+    ('Python', '3.11.5'),
+    ('SciPy-bundle', '2023.11'),
+    ('matplotlib', '3.8.2'),
 ]
 
 moduleclass = 'vis'

Comment thread easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-iimkl-2023b.eb Outdated
Comment thread easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-iimkl-2023b.eb
Comment thread easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-iimkl-2023b.eb Outdated
Comment thread easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-iimkl-2023b.eb
Comment thread easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-iimkl-2023b.eb Outdated
Comment thread easybuild/easyconfigs/r/Raysect/Raysect-0.8.1.post1-gfbf-2023b.eb Outdated
Comment thread easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-iimkl-2023b.eb Outdated
Comment thread easybuild/easyconfigs/c/CHERAB/CHERAB-1.5.0-gfbf-2023b.eb Outdated
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.

6 participants