From 9360d6d636a8f786493a4eeea33bdfcb3f761f00 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 3 Oct 2024 02:52:48 +0000
Subject: [PATCH] feat: install py-rucio-clients in xl
---
containers/debian/base.Dockerfile | 2 +-
spack-environment/xl/spack.yaml | 1 +
spack.sh | 8 ++++++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/containers/debian/base.Dockerfile b/containers/debian/base.Dockerfile
index 0c3055376..e05fad6db 100644
--- a/containers/debian/base.Dockerfile
+++ b/containers/debian/base.Dockerfile
@@ -154,9 +154,9 @@ RUN <<EOF
git config --global user.email "gitlab@eicweb.phy.anl.gov"
git config --global user.name "EIC Container Build Service"
git config --global advice.detachedHead false
+git config --global gc.autoDetach false
git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT}
git -C ${SPACK_ROOT} checkout ${SPACK_VERSION}
-git -C ${SPACK_ROOT} gc --no-auto
if [ -n "${SPACK_CHERRYPICKS}" ] ; then
SPACK_CHERRYPICKS=$(git -C ${SPACK_ROOT} rev-list --topo-order ${SPACK_CHERRYPICKS} | grep -m $(echo ${SPACK_CHERRYPICKS} | wc -w) "${SPACK_CHERRYPICKS}" | tac)
eval "declare -A SPACK_CHERRYPICKS_FILES_ARRAY=(${SPACK_CHERRYPICKS_FILES})"
diff --git a/spack-environment/xl/spack.yaml b/spack-environment/xl/spack.yaml
index 5f9856429..96b50cb89 100644
--- a/spack-environment/xl/spack.yaml
+++ b/spack-environment/xl/spack.yaml
@@ -90,6 +90,7 @@ spack:
- py-pre-commit
- py-pycairo
- py-pyyaml
+ - py-rucio-clients
- py-scipy
- py-seaborn
- py-toml
diff --git a/spack.sh b/spack.sh
index 9f68b578b..111eb4217 100644
--- a/spack.sh
+++ b/spack.sh
@@ -40,6 +40,10 @@ f8f01c336c882f29ac364995423b9f69ac365462
43d1cdb0bd4780bff369dafa681a8a7939313784
5bc105c01c0e458924df40d51f7111ba507689f9
dce2f4ca7cb0c96d1be94ef6ee7a3f0c45207af0
+fbceae7773c51198a775efffd7a9e21d0fe1e05c
+e91a69a7564dfe54718541954607d89c086caf12
+26bc91fe9bde4549fb39062e1dd838b612205717
+ddf1a1a74ba2ee99377edc2100e0478c1ddd3653
---
## Optional hash table with comma-separated file list
read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
@@ -81,3 +85,7 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
## 43d1cdb0bd4780bff369dafa681a8a7939313784: dd4hep: Add tag for version 1.30
## 5bc105c01c0e458924df40d51f7111ba507689f9: gfal2: new package (and dependencies)
## dce2f4ca7cb0c96d1be94ef6ee7a3f0c45207af0: strace: add v6.11 and mpers variant (disabed by default)
+## fbceae7773c51198a775efffd7a9e21d0fe1e05c: [py-datasets] Add py-datasets version 2.20.0
+## e91a69a7564dfe54718541954607d89c086caf12: py-tabulate: add v0.8.10, v0.9.0
+## 26bc91fe9bde4549fb39062e1dd838b612205717: py-rucio-clients: new package (and dependencies)
+## ddf1a1a74ba2ee99377edc2100e0478c1ddd3653: py-urllib3: add v1.26.20
\ No newline at end of file
--
GitLab