Merge branch 'main' into upgrade-coffea-version

CoffeaTeam · Jul 8, 2024 · 799896c · 799896c
2 parents bc23dc1 + 454d179
commit 799896c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/coffea-base/Dockerfile.almalinux9 b/coffea-base/Dockerfile.almalinux9
@@ -8,8 +8,8 @@ ENV PYTHON_VERSION=${python}
 RUN yum -y install epel-release \
      && yum -y update \
      && yum -y --allowerasing install wget git bzip2 libgfortran which zsh emacs vim htop man man-pages \
-     && wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" \
-     && bash Miniforge3.sh -bfp /usr/local \
+     && curl -sSL https://github.com/conda-forge/miniforge/releases/download/23.3.1-1/Mambaforge-Linux-x86_64.sh -o /tmp/mambaforge.sh \
+     && bash /tmp/mambaforge.sh -bfp /usr/local \
      && rm -rf /tmp/mambaforge.sh \
      && mamba update mamba \
      && mamba clean --all --yes \

diff --git a/coffea-dask/environment.yaml b/coffea-dask/environment.yaml
@@ -8,7 +8,7 @@ dependencies:
   - gxx
   - voms # x509 proxy system
   - ca-policy-lcg # WLCG trusted CAs
-  - xrootd==5.6.8
+  - xrootd
   # we have issues with conflicting openssl version and htcondor 10.8.0 version is last one
   # which we able to resolve in this environment.yaml
   - htcondor