From b3a6cc97e996c6ece30ca457ce3880ef0cd8ce7e Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 10 Aug 2026 16:05:15 +0200 Subject: [PATCH 1/4] Update EESSI repository versions page and make available software page searchable by URL --- .gitignore | 1 + .../javascripts/software-filter.js | 15 ++++++++++++++- docs/repositories/versions.md | 13 +++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0ad8de66b3..a6f8d1d7c8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ site/ venv* scripts/available_software/__pycache__ scripts/available_software/tests/__pycache__ +docs/available_software/__pycache__ test-suite diff --git a/docs/available_software/javascripts/software-filter.js b/docs/available_software/javascripts/software-filter.js index 727d58f895..ac44acded0 100644 --- a/docs/available_software/javascripts/software-filter.js +++ b/docs/available_software/javascripts/software-filter.js @@ -13,6 +13,19 @@ document.addEventListener("DOMContentLoaded", () => { const text = card.dataset.search.toLowerCase(); li.style.display = text.includes(q) ? "" : "none"; }); + + const url = new URL(window.location); + if (input.value) { + url.searchParams.set("search", input.value); + } else { + url.searchParams.delete("search"); + } + history.replaceState(null, "", url); }); -}); + const search = new URLSearchParams(window.location.search).get("search"); + if (search) { + input.value = search; + input.dispatchEvent(new Event("input")); + } +}); diff --git a/docs/repositories/versions.md b/docs/repositories/versions.md index 09dc4217b7..2c91421fd5 100644 --- a/docs/repositories/versions.md +++ b/docs/repositories/versions.md @@ -8,15 +8,16 @@ Going forward, EESSI aims to have yearly version releases, which will target a m ## Current EESSI versions -| EESSI Version | Included toolchains | Software list | -| ------------------- | -------------------------------------- | ----------------------------------------------------------------- | -| 2023.06 (default) | `foss/2022b` `foss/2023a` `foss/2023b` | [2023.06](https://www.eessi.io/docs/available_software/overview/) | -| 2025.06 | `foss/2024a` `foss/2025a` | Coming Soon | +| EESSI Version | Included toolchains | Software list | +| ------------------- | -------------------------------------- | ----------------------------------------------------------------------- | +| 2023.06 (default) | `foss/2022b` `foss/2023a` `foss/2023b` | [2023.06](../../available_software/?search=2023.06) | +| 2025.06 | `foss/2024a` `foss/2025a` `foss/2025b` | [2025.06](../../available_software/?search=2025.06) | -The current default EESSI version is `2023.06`. Version `2025.06` is already fully available and will be made the default soon, once it contains more software. +The current default EESSI version is `2023.06`. However such a default for EESSI has little real meaning, version `2025.06` is already fully available +with new software added regularly. Development effort for EESSI `2026.06` is already underway. ## Switching between EESSI versions * The simplest way to load a specific EESSI version or to switch between them, is to load the appropriate environment module. To access version `2023.06` one can simply do `module load EESSI/2023.06` and switching to the `2025.06` version is just as easy with: `module load EESSI/2025.06`. This will automatically set up the environment and avoid conflicts between versions. -[^1]: technically: a specific commit, since Gentoo Prefix doesn't have versioned releases. \ No newline at end of file +[^1]: technically: a specific commit, since Gentoo Prefix doesn't have versioned releases. From 91423ef8bed8fc1ec936daa52d409c76c782ee42 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 10 Aug 2026 16:08:22 +0200 Subject: [PATCH 2/4] Align columns --- docs/repositories/versions.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/repositories/versions.md b/docs/repositories/versions.md index 2c91421fd5..51ef838470 100644 --- a/docs/repositories/versions.md +++ b/docs/repositories/versions.md @@ -8,8 +8,8 @@ Going forward, EESSI aims to have yearly version releases, which will target a m ## Current EESSI versions -| EESSI Version | Included toolchains | Software list | -| ------------------- | -------------------------------------- | ----------------------------------------------------------------------- | +| EESSI Version | Included toolchains | Software list | +| ------------------- | -------------------------------------- | --------------------------------------------------- | | 2023.06 (default) | `foss/2022b` `foss/2023a` `foss/2023b` | [2023.06](../../available_software/?search=2023.06) | | 2025.06 | `foss/2024a` `foss/2025a` `foss/2025b` | [2025.06](../../available_software/?search=2025.06) | From 9e17b75b2d322c6dd148b7040baff7cb169930f3 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 10 Aug 2026 16:25:10 +0200 Subject: [PATCH 3/4] Improve search capabilities --- docs/available_software/javascripts/software-filter.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/available_software/javascripts/software-filter.js b/docs/available_software/javascripts/software-filter.js index ac44acded0..eea3663e7e 100644 --- a/docs/available_software/javascripts/software-filter.js +++ b/docs/available_software/javascripts/software-filter.js @@ -6,12 +6,13 @@ document.addEventListener("DOMContentLoaded", () => { const cards = document.querySelectorAll(".software-card"); input.addEventListener("input", () => { - const q = input.value.toLowerCase(); + const q = [...input.value.matchAll(/"([^"]+)"|(\S+)/g)] + .map(m => (m[1] || m[2]).toLowerCase()); cards.forEach(card => { const li = card.closest("li"); const text = card.dataset.search.toLowerCase(); - li.style.display = text.includes(q) ? "" : "none"; + li.style.display = q.every(term => text.includes(term)) ? "" : "none"; }); const url = new URL(window.location); From a1832a9a8bd1d9dfc0cf334786cb5cdd08308429 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Mon, 10 Aug 2026 21:08:47 +0200 Subject: [PATCH 4/4] Add 2026.06 to the table --- docs/repositories/versions.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/repositories/versions.md b/docs/repositories/versions.md index 51ef838470..f5053747aa 100644 --- a/docs/repositories/versions.md +++ b/docs/repositories/versions.md @@ -12,9 +12,10 @@ Going forward, EESSI aims to have yearly version releases, which will target a m | ------------------- | -------------------------------------- | --------------------------------------------------- | | 2023.06 (default) | `foss/2022b` `foss/2023a` `foss/2023b` | [2023.06](../../available_software/?search=2023.06) | | 2025.06 | `foss/2024a` `foss/2025a` `foss/2025b` | [2025.06](../../available_software/?search=2025.06) | +| 2026.06 | `foss/2026.1` | (under development) | The current default EESSI version is `2023.06`. However such a default for EESSI has little real meaning, version `2025.06` is already fully available -with new software added regularly. Development effort for EESSI `2026.06` is already underway. +with new software added regularly and the development effort for EESSI `2026.06` is already underway. ## Switching between EESSI versions