Merge branch 'main' into upgrade-coffea-version

CoffeaTeam · Jul 8, 2024 · c84b23c · c84b23c
2 parents f42c506 + 2b11098
commit c84b23c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/coffea-dask/Dockerfile.almalinux8 b/coffea-dask/Dockerfile.almalinux8
@@ -8,10 +8,9 @@ ENV PYTHON_VERSION=${python}
 RUN yum -y install epel-release \
      && yum -y update \
      && yum -y 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 \
-     #&& conda config --set solver classic \
      && mamba update mamba \
      && mamba clean --all --yes \
      && rpm -e --nodeps curl bzip2 \

diff --git a/coffea-dask/Dockerfile.almalinux9 b/coffea-dask/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 \
      #&& conda config --set solver classic \
      && mamba update mamba \

diff --git a/coffea-dask/environment.yaml b/coffea-dask/environment.yaml
@@ -11,7 +11,7 @@ dependencies:
   - 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==10.8.0
+  - htcondor
   - curl
     # jupyter-related
   - jupyterlab