From 339f358e46dd338649939c31042a0faf15f9e532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 19 Apr 2024 13:59:23 +0200
Subject: [PATCH 01/10] add rebuild easystack for setuptools_scm fix

---
 ...move-setuptools_scm-from-hatchling-to-Python.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
new file mode 100644
index 0000000000..56ea7a46a1
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
@@ -0,0 +1,13 @@
+# 2024-04-19
+# Move setuptools_scm extension from hatchling to Python by rebuilding
+# all affected modules with EasyBuild 4.9.1.
+# This solves an issue with pyarrow, which is part of the Arrow installation.
+# https://github.com/easybuilders/easybuild-easyconfigs/pull/19777
+# https://github.com/easybuilders/easybuild-easyconfigs/issues/19849
+easyconfigs:
+  - hatchling-1.18.0-GCCcore-12.3.0.eb
+  - hatchling-1.18.0-GCCcore-13.2.0.eb
+  - Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb
+  - Python-bundle-PyPI-2023.10-GCCcore-13.2.0.eb
+  - Python-3.11.3-GCCcore-12.3.0.eb
+  - Python-3.11.5-GCCcore-13.2.0.eb

From 8cd5d844e872fe58efcdbb49e38689e656f3f9a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Mon, 22 Apr 2024 16:39:45 +0200
Subject: [PATCH 02/10] attempt to fix the hatchling reinstallation issue

---
 EESSI-remove-software.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh
index 446a156cb8..d8a6dae63e 100755
--- a/EESSI-remove-software.sh
+++ b/EESSI-remove-software.sh
@@ -114,6 +114,11 @@ if [ $EUID -eq 0 ]; then
                     echo_yellow "Removing ${app_dir} and ${app_module}..."
                     rm -rf ${app_dir}
                     rm -rf ${app_module}
+                    # if the parent dir of this application is now empty, remove it too to work around a weird issue with the overlay
+                    # see https://github.com/EESSI/software-layer/pull/546#issuecomment-2067018216
+                    if [ ! -n "$(dirname ${app_dir})" ]; then
+                        rmdir "$(dirname ${app_dir})"
+                    fi
                 done
             else
                 fatal_error "Easystack file ${easystack_file} not found!"

From 76ecccf629f6b4dda1b65e4ee1f3f2d9d9b9457c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Mon, 22 Apr 2024 17:13:37 +0200
Subject: [PATCH 03/10] use right if condition for checking if dir is empty

---
 EESSI-remove-software.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh
index d8a6dae63e..f3c4f9e618 100755
--- a/EESSI-remove-software.sh
+++ b/EESSI-remove-software.sh
@@ -116,8 +116,9 @@ if [ $EUID -eq 0 ]; then
                     rm -rf ${app_module}
                     # if the parent dir of this application is now empty, remove it too to work around a weird issue with the overlay
                     # see https://github.com/EESSI/software-layer/pull/546#issuecomment-2067018216
-                    if [ ! -n "$(dirname ${app_dir})" ]; then
-                        rmdir "$(dirname ${app_dir})"
+                    app_dir_parent=$(dirname "${app_dir}")
+                    if [ ! -n "$(ls -A ${app_dir_parent})" ]; then
+                        rmdir "${app_dir_parent}"
                     fi
                 done
             else

From 1642621d1b47b804f689280d7c797824d1662a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 26 Apr 2024 14:24:46 +0200
Subject: [PATCH 04/10] undo parent dir removal, workaround didn't work

---
 EESSI-remove-software.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh
index f3c4f9e618..446a156cb8 100755
--- a/EESSI-remove-software.sh
+++ b/EESSI-remove-software.sh
@@ -114,12 +114,6 @@ if [ $EUID -eq 0 ]; then
                     echo_yellow "Removing ${app_dir} and ${app_module}..."
                     rm -rf ${app_dir}
                     rm -rf ${app_module}
-                    # if the parent dir of this application is now empty, remove it too to work around a weird issue with the overlay
-                    # see https://github.com/EESSI/software-layer/pull/546#issuecomment-2067018216
-                    app_dir_parent=$(dirname "${app_dir}")
-                    if [ ! -n "$(ls -A ${app_dir_parent})" ]; then
-                        rmdir "${app_dir_parent}"
-                    fi
                 done
             else
                 fatal_error "Easystack file ${easystack_file} not found!"

From a5bf9d3da294fad127aef0dc972af323a0488077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 26 Apr 2024 14:26:25 +0200
Subject: [PATCH 05/10] only rebuild 2023a easyconfigs

---
 ...eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
index 56ea7a46a1..76dd37e870 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
@@ -1,13 +1,10 @@
 # 2024-04-19
 # Move setuptools_scm extension from hatchling to Python by rebuilding
-# all affected modules with EasyBuild 4.9.1.
+# the affected modules in the 2023a toolchain with EasyBuild 4.9.1.
 # This solves an issue with pyarrow, which is part of the Arrow installation.
 # https://github.com/easybuilders/easybuild-easyconfigs/pull/19777
 # https://github.com/easybuilders/easybuild-easyconfigs/issues/19849
 easyconfigs:
   - hatchling-1.18.0-GCCcore-12.3.0.eb
-  - hatchling-1.18.0-GCCcore-13.2.0.eb
   - Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb
-  - Python-bundle-PyPI-2023.10-GCCcore-13.2.0.eb
   - Python-3.11.3-GCCcore-12.3.0.eb
-  - Python-3.11.5-GCCcore-13.2.0.eb

From c4af218d2c7dd604f10cea7454d1f672b00498ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 26 Apr 2024 15:04:02 +0200
Subject: [PATCH 06/10] only try 2023b versions

---
 ...4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
index 76dd37e870..f3484a3486 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
@@ -1,10 +1,10 @@
 # 2024-04-19
 # Move setuptools_scm extension from hatchling to Python by rebuilding
-# the affected modules in the 2023a toolchain with EasyBuild 4.9.1.
+# the affected modules in the 2023b toolchain with EasyBuild 4.9.1.
 # This solves an issue with pyarrow, which is part of the Arrow installation.
 # https://github.com/easybuilders/easybuild-easyconfigs/pull/19777
 # https://github.com/easybuilders/easybuild-easyconfigs/issues/19849
 easyconfigs:
-  - hatchling-1.18.0-GCCcore-12.3.0.eb
-  - Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb
-  - Python-3.11.3-GCCcore-12.3.0.eb
+  - hatchling-1.18.0-GCCcore-13.2.0.eb
+  - Python-bundle-PyPI-2023.10-GCCcore-13.2.0.eb
+  - Python-3.11.5-GCCcore-13.2.0.eb

From 33cb74f5e2f4f63cd286e0d1b71818ccb1eca1a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 26 Apr 2024 15:33:15 +0200
Subject: [PATCH 07/10] try adding write permissions instead of removing

---
 EESSI-remove-software.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh
index 446a156cb8..1a488dcb67 100755
--- a/EESSI-remove-software.sh
+++ b/EESSI-remove-software.sh
@@ -112,8 +112,9 @@ if [ $EUID -eq 0 ]; then
                     app_dir=${EASYBUILD_INSTALLPATH}/software/${app}
                     app_module=${EASYBUILD_INSTALLPATH}/modules/all/${app}.lua
                     echo_yellow "Removing ${app_dir} and ${app_module}..."
-                    rm -rf ${app_dir}
-                    rm -rf ${app_module}
+                    #rm -rf ${app_dir}
+                    #rm -rf ${app_module}
+                    chmod -R u+w ${app_dir} ${app_module}
                 done
             else
                 fatal_error "Easystack file ${easystack_file} not found!"

From 1e92daf31bca8a879b2888cefc5156c76774f7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 26 Apr 2024 16:12:21 +0200
Subject: [PATCH 08/10] do remove the module to make sure it gets rebuilt

---
 EESSI-remove-software.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh
index 1a488dcb67..9d82dd8aa6 100755
--- a/EESSI-remove-software.sh
+++ b/EESSI-remove-software.sh
@@ -113,8 +113,8 @@ if [ $EUID -eq 0 ]; then
                     app_module=${EASYBUILD_INSTALLPATH}/modules/all/${app}.lua
                     echo_yellow "Removing ${app_dir} and ${app_module}..."
                     #rm -rf ${app_dir}
-                    #rm -rf ${app_module}
-                    chmod -R u+w ${app_dir} ${app_module}
+                    rm -rf ${app_module}
+                    chmod -R u+w ${app_dir}
                 done
             else
                 fatal_error "Easystack file ${easystack_file} not found!"

From b94fa6262a2845a03d58a9095b5da4fb84b8e710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Tue, 30 Apr 2024 15:13:53 +0200
Subject: [PATCH 09/10] restore easystack, rebuild all required versions

---
 ...eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
index f3484a3486..56ea7a46a1 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240419-eb-4.9.1-move-setuptools_scm-from-hatchling-to-Python.yml
@@ -1,10 +1,13 @@
 # 2024-04-19
 # Move setuptools_scm extension from hatchling to Python by rebuilding
-# the affected modules in the 2023b toolchain with EasyBuild 4.9.1.
+# all affected modules with EasyBuild 4.9.1.
 # This solves an issue with pyarrow, which is part of the Arrow installation.
 # https://github.com/easybuilders/easybuild-easyconfigs/pull/19777
 # https://github.com/easybuilders/easybuild-easyconfigs/issues/19849
 easyconfigs:
+  - hatchling-1.18.0-GCCcore-12.3.0.eb
   - hatchling-1.18.0-GCCcore-13.2.0.eb
+  - Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb
   - Python-bundle-PyPI-2023.10-GCCcore-13.2.0.eb
+  - Python-3.11.3-GCCcore-12.3.0.eb
   - Python-3.11.5-GCCcore-13.2.0.eb

From 66724f282e405579021811813721aaf79dc35a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Tue, 30 Apr 2024 15:14:50 +0200
Subject: [PATCH 10/10] undo changes

---
 EESSI-remove-software.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh
index 9d82dd8aa6..446a156cb8 100755
--- a/EESSI-remove-software.sh
+++ b/EESSI-remove-software.sh
@@ -112,9 +112,8 @@ if [ $EUID -eq 0 ]; then
                     app_dir=${EASYBUILD_INSTALLPATH}/software/${app}
                     app_module=${EASYBUILD_INSTALLPATH}/modules/all/${app}.lua
                     echo_yellow "Removing ${app_dir} and ${app_module}..."
-                    #rm -rf ${app_dir}
+                    rm -rf ${app_dir}
                     rm -rf ${app_module}
-                    chmod -R u+w ${app_dir}
                 done
             else
                 fatal_error "Easystack file ${easystack_file} not found!"