From 52eba37e8b654159d80cdcfa912dfcbabdee1827 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Thu, 13 Aug 2026 17:11:49 +0200
Subject: [PATCH 1/4] Import easybuild.easyblocks.python for merge script to
 succeed

---
 scripts/merge_data_files.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/merge_data_files.py b/scripts/merge_data_files.py
index a0b4326..c5326ec 100644
--- a/scripts/merge_data_files.py
+++ b/scripts/merge_data_files.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 import sys
 import yaml
+# EB 5.4.0 brought in a change that required the import below
+import easybuild.easyblocks.python
 from datetime import datetime, timezone
 
 

From 139d80ae2cb4ecf6ec77efb046e71273dfc58aab Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Thu, 13 Aug 2026 17:51:58 +0200
Subject: [PATCH 2/4] Make sure EasyBuild is loaded when we need it in CI

---
 .github/workflows/docs.yml | 6 ++++++
 .github/workflows/prs.yml  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 91201ea..de3adeb 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -57,10 +57,13 @@ jobs:
             exit 1
           fi
           # Merge all these results together
+          module reset
+          module load EESSI-extend  # Loads EasyBuild and we need that for our merge scripts
           python scripts/merge_data_files.py out.yaml eessi*.yaml
           mv out.yaml docs/data/eessi_software_metadata.yaml
 
           # Also do RISC-V repository
+          module --force purge
           rm eessi*.yaml
           # Need to set environment variables to load EESSI module for RISC-V
           (
@@ -76,6 +79,9 @@ jobs:
             echo $MODULEPATH
             python scripts/generate_data_files.py --eessi-version 2025.06-001 --repository "dev.eessi.io/riscv"
           )
+          # Merge all these results together
+          module reset
+          module load EESSI-extend  # Loads EasyBuild and we need that for our merge scripts
           python scripts/merge_data_files.py out_riscv.yaml eessi*.yaml
           mv out_riscv.yaml docs/data/eessi_software_metadata-riscv.yaml
 
diff --git a/.github/workflows/prs.yml b/.github/workflows/prs.yml
index 229c061..9f76d48 100644
--- a/.github/workflows/prs.yml
+++ b/.github/workflows/prs.yml
@@ -25,7 +25,6 @@ jobs:
       - name: Generate API data
         run: |
           echo "Generating data files..."
-          
           # Only do 2023.06 for EB 5 since this is just a test
           (
             module --force purge
@@ -42,6 +41,7 @@ jobs:
           ) &
           # Merge all these results together
           wait
+          module load EESSI-extend  # Loads EasyBuild and we need that for our merge scripts
           python scripts/merge_data_files.py out.yaml eessi*.yaml
           mv out.yaml docs/data/eessi_software_metadata.yaml
 

From 7671e7c2403d724ee17e86ee49c40abcbc752fbb Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Thu, 13 Aug 2026 18:23:07 +0200
Subject: [PATCH 3/4] All scripts that use yaml need the import

---
 .github/workflows/prs.yml                  | 3 +++
 scripts/process_eessi_software_metadata.py | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/prs.yml b/.github/workflows/prs.yml
index 9f76d48..de52a31 100644
--- a/.github/workflows/prs.yml
+++ b/.github/workflows/prs.yml
@@ -41,6 +41,7 @@ jobs:
           ) &
           # Merge all these results together
           wait
+          module reset
           module load EESSI-extend  # Loads EasyBuild and we need that for our merge scripts
           python scripts/merge_data_files.py out.yaml eessi*.yaml
           mv out.yaml docs/data/eessi_software_metadata.yaml
@@ -62,6 +63,8 @@ jobs:
             echo $MODULEPATH
             python scripts/generate_data_files.py --eessi-version 2025.06-001 --repository "dev.eessi.io/riscv"
           )
+          module reset
+          module load EESSI-extend  # Loads EasyBuild and we need that for our merge scripts
           python scripts/merge_data_files.py out_riscv.yaml eessi*.yaml
           mv out_riscv.yaml docs/data/eessi_software_metadata-riscv.yaml
 
diff --git a/scripts/process_eessi_software_metadata.py b/scripts/process_eessi_software_metadata.py
index a413188..d64323a 100644
--- a/scripts/process_eessi_software_metadata.py
+++ b/scripts/process_eessi_software_metadata.py
@@ -6,6 +6,8 @@
 import yaml
 import json
 import subprocess
+# EB 5.4.0 brought in a change that required the import below
+import easybuild.easyblocks.python
 
 ARCHITECTURES = [
     "aarch64/generic",

From e2492c749b0b77043c6b3ec2204427432283f002 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Thu, 13 Aug 2026 18:42:57 +0200
Subject: [PATCH 4/4] All scripts need the import it seems

---
 scripts/calculate_hashes.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/calculate_hashes.py b/scripts/calculate_hashes.py
index 1955e55..578e30d 100644
--- a/scripts/calculate_hashes.py
+++ b/scripts/calculate_hashes.py
@@ -2,6 +2,9 @@
 import json
 import yaml
 import hashlib
+# EB 5.4.0 brought in a change that required the import below
+import easybuild.easyblocks.python
+
 
 # Directory to scan
 directory = "./"  # Change to your target directory