From e4be1f52cc150c3e4a00dfa8d6dbe6fc39c3c58b Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 9 Dec 2024 15:48:56 -0700 Subject: [PATCH 1/9] remove another reference to distutils --- CIME/code_checker.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CIME/code_checker.py b/CIME/code_checker.py index fdc1eedefd8..08a5a021b0f 100644 --- a/CIME/code_checker.py +++ b/CIME/code_checker.py @@ -4,6 +4,7 @@ import os import json +from shutil import which from CIME.XML.standard_module_setup import * @@ -19,16 +20,13 @@ from multiprocessing.dummy import Pool as ThreadPool -# pylint: disable=import-error -from distutils.spawn import find_executable - logger = logging.getLogger(__name__) ############################################################################### def _run_pylint(all_files, interactive): ############################################################################### - pylint = find_executable("pylint") + pylint = which("pylint") cmd_options = ( " --disable=I,C,R,logging-not-lazy,wildcard-import,unused-wildcard-import" From 2676f2e7b01d824a144746c262743af3077065cc Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Tue, 10 Dec 2024 13:33:02 -0700 Subject: [PATCH 2/9] update artifact action to v4 --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 5a73761c573..6983eea1e9e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -199,7 +199,7 @@ jobs: # https://docs.github.com/en/actions/managing-workflow-runs/downloading-workflow-artifacts - name: Upload testing logs if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: testing-logs-${{ github.run_number }}-${{ matrix.model }}-${{ matrix.driver }} path: /testing-logs-${{ github.run_number}}-${{ matrix.model }}-${{ matrix.driver }}.tar.gz From 7ecf45f701994b7665f699eabea7f498c9640e99 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Tue, 10 Dec 2024 13:48:53 -0700 Subject: [PATCH 3/9] add pkg-config to container --- docker/cime.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/cime.yaml b/docker/cime.yaml index f0f2871a976..cd25a71118e 100644 --- a/docker/cime.yaml +++ b/docker/cime.yaml @@ -8,6 +8,7 @@ dependencies: - curl - subversion - m4 + - pkg-config - pytest - pytest-cov - pyyaml From ab0c40f697cc57689ed48f3f060eddcd166fcfee Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 11 Dec 2024 09:59:56 -0700 Subject: [PATCH 4/9] try to remove perl Switch from docker --- docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5a3cdb295c4..11d7586e90f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,7 +19,9 @@ RUN mamba env update -f /cime.yaml && \ ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ar /opt/conda/bin/ar && \ ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ranlib /opt/conda/bin/ranlib && \ # need compilers - cpan install XML::LibXML Switch + cpan install XML::LibXML + # I think switch was only needed for pop + #cpan install Switch ARG PNETCDF_VERSION=1.12.3 ENV PNETCDF_VERSION=${PNETCDF_VERSION} From 71eaa1846e22bcccd201cd9343a9af335e7f1e85 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 11 Dec 2024 10:15:33 -0700 Subject: [PATCH 5/9] try updating conda --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 11d7586e90f..7ac690f58f0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_TAG=24.3.0-0 +ARG BASE_TAG=24.11.0-0 FROM condaforge/miniforge3:${BASE_TAG} AS base SHELL ["/bin/bash", "-c"] @@ -19,7 +19,7 @@ RUN mamba env update -f /cime.yaml && \ ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ar /opt/conda/bin/ar && \ ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ranlib /opt/conda/bin/ranlib && \ # need compilers - cpan install XML::LibXML + cpan install Alien::Build::Plugin XML::LibXML # I think switch was only needed for pop #cpan install Switch From 12f6394e0bda82b488baa89128d59b1b6338a30a Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 11 Dec 2024 10:20:27 -0700 Subject: [PATCH 6/9] backout conda update --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7ac690f58f0..98bec76d052 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_TAG=24.11.0-0 +ARG BASE_TAG=24.3.0-0 FROM condaforge/miniforge3:${BASE_TAG} AS base SHELL ["/bin/bash", "-c"] From 14e3a5c037b150212fe0b03214cf2569476ff636 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 11 Dec 2024 10:30:59 -0700 Subject: [PATCH 7/9] following the chain of errors --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 98bec76d052..17502dbf899 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,7 +19,7 @@ RUN mamba env update -f /cime.yaml && \ ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ar /opt/conda/bin/ar && \ ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ranlib /opt/conda/bin/ranlib && \ # need compilers - cpan install Alien::Build::Plugin XML::LibXML + cpan install Alien::Base::Wrapper Alien::Build::Plugin XML::LibXML # I think switch was only needed for pop #cpan install Switch From 52757329d902b92f12e3b89b1efe457415fc8c06 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 11 Dec 2024 10:49:26 -0700 Subject: [PATCH 8/9] try just removing perl - do we even need it? --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 17502dbf899..a36297c3ece 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,7 +19,7 @@ RUN mamba env update -f /cime.yaml && \ ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ar /opt/conda/bin/ar && \ ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ranlib /opt/conda/bin/ranlib && \ # need compilers - cpan install Alien::Base::Wrapper Alien::Build::Plugin XML::LibXML + # cpan install Alien::Base::Wrapper Alien::Build::Plugin XML::LibXML # I think switch was only needed for pop #cpan install Switch @@ -83,7 +83,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ curl ca-certificates software-properties-common \ gcc make libtool libhwloc-dev libx11-dev libxt-dev libedit-dev \ - libical-dev ncurses-dev perl python-dev tcl-dev tk-dev swig libexpat-dev libssl-dev \ + libical-dev ncurses-dev python-dev tcl-dev tk-dev swig libexpat-dev libssl-dev \ libxext-dev libxft-dev autoconf automake \ postgresql-12 postgresql-server-dev-all postgresql-contrib \ expat libedit2 python3 sendmail-bin sudo tcl tk && \ From 38e813a284b771d9988431c63fd921227d62cb6d Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 11 Dec 2024 10:56:43 -0700 Subject: [PATCH 9/9] try this --- docker/Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a36297c3ece..58f68286f50 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,11 +17,7 @@ COPY cime.yaml /cime.yaml RUN mamba env update -f /cime.yaml && \ rm -rf /opt/conda/pkgs/* && \ ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ar /opt/conda/bin/ar && \ - ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ranlib /opt/conda/bin/ranlib && \ - # need compilers - # cpan install Alien::Base::Wrapper Alien::Build::Plugin XML::LibXML - # I think switch was only needed for pop - #cpan install Switch + ln -sf /opt/conda/bin/x86_64-conda-linux-gnu-ranlib /opt/conda/bin/ranlib ARG PNETCDF_VERSION=1.12.3 ENV PNETCDF_VERSION=${PNETCDF_VERSION}