From 6bae7aa3be6598e788723f7b5d0e144ee8b84a13 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Sun, 15 May 2022 19:59:10 -0600 Subject: [PATCH 1/2] Switch Chrysalis OS centos8-->rhel8 This seems to have changed in the latest maintenance. --- mache/spack/chrysalis_gnu_openmpi.yaml | 2 +- mache/spack/chrysalis_intel_impi.yaml | 2 +- mache/spack/chrysalis_intel_openmpi.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mache/spack/chrysalis_gnu_openmpi.yaml b/mache/spack/chrysalis_gnu_openmpi.yaml index b6689fae..7d9f0c86 100644 --- a/mache/spack/chrysalis_gnu_openmpi.yaml +++ b/mache/spack/chrysalis_gnu_openmpi.yaml @@ -138,7 +138,7 @@ spack: f77: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-9.2.0-ugetvbp/bin/gfortran fc: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-9.2.0-ugetvbp/bin/gfortran flags: {} - operating_system: centos8 + operating_system: rhel8 target: x86_64 modules: [] environment: {} diff --git a/mache/spack/chrysalis_intel_impi.yaml b/mache/spack/chrysalis_intel_impi.yaml index 1d12ca08..295533a0 100644 --- a/mache/spack/chrysalis_intel_impi.yaml +++ b/mache/spack/chrysalis_intel_impi.yaml @@ -138,7 +138,7 @@ spack: f77: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort fc: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort flags: {} - operating_system: centos8 + operating_system: rhel8 target: x86_64 modules: [] environment: {} diff --git a/mache/spack/chrysalis_intel_openmpi.yaml b/mache/spack/chrysalis_intel_openmpi.yaml index 5c8dbeb5..c9ef33b5 100644 --- a/mache/spack/chrysalis_intel_openmpi.yaml +++ b/mache/spack/chrysalis_intel_openmpi.yaml @@ -138,7 +138,7 @@ spack: f77: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort fc: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort flags: {} - operating_system: centos8 + operating_system: rhel8 target: x86_64 modules: [] environment: {} From aeaacdcce5af7617ecd9eecfdf655b2a7652ee4f Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Sun, 15 May 2022 20:09:41 -0600 Subject: [PATCH 2/2] Update to v1.4.1 --- conda/meta.yaml | 2 +- mache/version.py | 2 +- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 426b2668..e4e08c72 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,5 +1,5 @@ {% set name = "mache" %} -{% set version = "1.4.0" %} +{% set version = "1.4.1" %} package: name: {{ name|lower }} diff --git a/mache/version.py b/mache/version.py index db386a85..65bd2509 100644 --- a/mache/version.py +++ b/mache/version.py @@ -1,2 +1,2 @@ -__version_info__ = (1, 4, 0) +__version_info__ = (1, 4, 1) __version__ = '.'.join(str(vi) for vi in __version_info__) diff --git a/setup.cfg b/setup.cfg index bcddd225..f61e12e2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = mache -version = 1.4.0 +version = 1.4.1 author = Xylar Asay-Davis author_email = xylar@lanl.gov description = A package for providing configuration data relate to E3SM supported machines