From eedae282ee9d5cbcda42bb728656ab14dde66fd8 Mon Sep 17 00:00:00 2001 From: Adrien Perrin Date: Wed, 6 Dec 2023 12:32:59 +0100 Subject: [PATCH] install gcc and libxau using conda since conda has its own gcc compiled version --- Dockerfile | 8 -------- environment-3.10.yml | 2 ++ environment-3.11.yml | 2 ++ environment-3.7.yml | 3 +++ environment-3.8.yml | 3 +++ environment-3.9.yml | 3 +++ 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e4edf48..15692e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,14 +9,6 @@ ENV PYTHONUNBUFFERED=1 \ PYTHONPATH=/src \ MOD44WPATH=/usr/share/MOD44W/ -RUN apt-get update \ -&& apt-get install -y --no-install-recommends \ - build-essential \ - gcc \ - libxau6 \ -&& apt clean \ -&& rm -rf /var/lib/apt/lists/* - COPY environment-${PYTHON_VERSION}.yml /tmp/environment.yml RUN conda env update -n base --file /tmp/environment.yml --prune \ diff --git a/environment-3.10.yml b/environment-3.10.yml index 5fde9c6..877a434 100644 --- a/environment-3.10.yml +++ b/environment-3.10.yml @@ -7,6 +7,8 @@ dependencies: - python=3.10.13 - conda=23.10.0 - nomkl + - gcc=13.2.0 + - xorg-libxau=1.0.11 - cartopy=0.22.0 - coverage=7.2.2 diff --git a/environment-3.11.yml b/environment-3.11.yml index cf98aa0..8cef4e7 100644 --- a/environment-3.11.yml +++ b/environment-3.11.yml @@ -7,6 +7,8 @@ dependencies: - python=3.11.5 - conda=23.10.0 - nomkl + - gcc=13.2.0 + - xorg-libxau=1.0.11 - cartopy=0.22.0 - coverage=7.2.2 diff --git a/environment-3.7.yml b/environment-3.7.yml index 1f4647a..31060c3 100644 --- a/environment-3.7.yml +++ b/environment-3.7.yml @@ -2,10 +2,13 @@ name: environment channels: - defaults + - conda-forge dependencies: - python=3.7.16 - conda=23.1.0 - nomkl + - gcc=13.2.0 + - xorg-libxau=1.0.11 - cartopy=0.18.0 - coverage=6.3.2 diff --git a/environment-3.8.yml b/environment-3.8.yml index 67b8765..1ea554f 100644 --- a/environment-3.8.yml +++ b/environment-3.8.yml @@ -2,10 +2,13 @@ name: environment channels: - defaults + - conda-forge dependencies: - python=3.8.18 - conda=23.9.0 - nomkl + - gcc=13.2.0 + - xorg-libxau=1.0.11 - cartopy=0.18.0 - coverage=5.5 diff --git a/environment-3.9.yml b/environment-3.9.yml index 59af0f2..5bad7a7 100644 --- a/environment-3.9.yml +++ b/environment-3.9.yml @@ -2,10 +2,13 @@ name: environment channels: - defaults + - conda-forge dependencies: - python=3.9.18 - conda=23.10.0 - nomkl + - gcc=13.2.0 + - xorg-libxau=1.0.11 - cartopy=0.18.0 - coverage=7.2.2