From f4cd155ec5d922feac44bd29dccd69e701c20313 Mon Sep 17 00:00:00 2001 From: mauzey1 Date: Wed, 28 Aug 2024 11:15:47 -0700 Subject: [PATCH 1/5] Update version numbers from 3.8.0 to 3.9.0 --- .circleci/config.yml | 2 +- .github/workflows/nightly-build.yml | 2 +- INSTALL | 4 ++-- Src/cmor_fortran_interface.f90 | 2 +- configure | 18 +++++++++--------- configure.ac | 2 +- include/cmor.h | 2 +- setup.py.in | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 597bb333..4533cf1f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -140,7 +140,7 @@ jobs: executor: << parameters.os >> environment: PKG_NAME: "cmor" - VERSION: "3.8.0" + VERSION: "3.9.0" PYTHON_VERSION: << parameters.python_version >> CHANNELS: "-c conda-forge" steps: diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 6192a1e8..d89a4623 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -32,7 +32,7 @@ jobs: runs-on: ${{ matrix.runner.RUNNER_OS }} env: PACKAGE_NAME: cmor - PACKAGE_VERSION: 3.8.0 + PACKAGE_VERSION: 3.9.0 PYTHON_VERSION: ${{ matrix.python_version }} CONDA_FORGE_CHANNEL: conda-forge CONDA_USER: pcmdi diff --git a/INSTALL b/INSTALL index 1ac44685..09de0f1b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ INSTALLATION INSTRUCTIONS ------------------------- -Climate Model Output Rewriter (CMOR) version 3.8.0 installation instructions. +Climate Model Output Rewriter (CMOR) version 3.9.0 installation instructions. DOWNLOAD @@ -13,7 +13,7 @@ cd CMOR INSTALLATION ------------ -CMOR 3.8.0 requires external packages that need to be installed first. +CMOR 3.9.0 requires external packages that need to be installed first. It can be compiled/linked against either NetCDF3 or NetCDF4. If you decide to go with NetCDF4 be sure to build NetCDF4 with the --enable-netcdf-4 option! diff --git a/Src/cmor_fortran_interface.f90 b/Src/cmor_fortran_interface.f90 index b4812548..48c4f19d 100644 --- a/Src/cmor_fortran_interface.f90 +++ b/Src/cmor_fortran_interface.f90 @@ -825,7 +825,7 @@ end function cmor_close_cff integer, parameter:: CMOR_EXIT_ON_MAJOR = 0 integer, parameter:: CMOR_EXIT_ON_WARNING = 2 - real, parameter:: CMOR_VERSION = 3.8 + real, parameter:: CMOR_VERSION = 3.9 real, parameter:: CMOR_CF_VERSION = 1.7 integer, parameter:: CMOR_WARNING = 20 diff --git a/configure b/configure index b5af230d..97d9cf67 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for cmor 3.8.0. +# Generated by GNU Autoconf 2.71 for cmor 3.9.0. # # Report bugs to . # @@ -611,8 +611,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='cmor' PACKAGE_TARNAME='cmor' -PACKAGE_VERSION='3.8.0' -PACKAGE_STRING='cmor 3.8.0' +PACKAGE_VERSION='3.9.0' +PACKAGE_STRING='cmor 3.9.0' PACKAGE_BUGREPORT='mauzey1@llnl.gov' PACKAGE_URL='' @@ -1293,7 +1293,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures cmor 3.8.0 to adapt to many kinds of systems. +\`configure' configures cmor 3.9.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1360,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cmor 3.8.0:";; + short | recursive ) echo "Configuration of cmor 3.9.0:";; esac cat <<\_ACEOF @@ -1464,7 +1464,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cmor configure 3.8.0 +cmor configure 3.9.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1707,7 +1707,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cmor $as_me 3.8.0, which was +It was created by cmor $as_me 3.9.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -5741,7 +5741,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cmor $as_me 3.8.0, which was +This file was extended by cmor $as_me 3.9.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5796,7 +5796,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -cmor config.status 3.8.0 +cmor config.status 3.9.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e426a7c2..2b2bfc19 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl dnl Process this file with autoconf to produce a configure script. dnl AC_PREREQ([2.71]) -AC_INIT([cmor],[3.8.0],[mauzey1@llnl.gov]) +AC_INIT([cmor],[3.9.0],[mauzey1@llnl.gov]) GIT_TAG=`cd $srcdir ; ./get_git_version.sh` diff --git a/include/cmor.h b/include/cmor.h index 278dfe64..c96be84c 100644 --- a/include/cmor.h +++ b/include/cmor.h @@ -2,7 +2,7 @@ #define CMOR_H #define CMOR_VERSION_MAJOR 3 -#define CMOR_VERSION_MINOR 8 +#define CMOR_VERSION_MINOR 9 #define CMOR_VERSION_PATCH 0 #define CMOR_CF_VERSION_MAJOR 1 diff --git a/setup.py.in b/setup.py.in index 4372c2c8..a84ba703 100755 --- a/setup.py.in +++ b/setup.py.in @@ -52,7 +52,7 @@ print('src:',srcfiles) print('macros:',macros) setup (name = "CMOR", - version='3.8.0', + version='3.9.0', author='Chris Mauzey, AIMS', description = "Python Interface to CMOR output library", url = "http://cmor.llnl.gov/", From 55112ea678eb44471c1d6d44f75a22b0a384be7c Mon Sep 17 00:00:00 2001 From: mauzey1 Date: Wed, 28 Aug 2024 11:17:26 -0700 Subject: [PATCH 2/5] Update publication date in zenodo --- .zenodo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zenodo.json b/.zenodo.json index 43ed773c..093b8462 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -5,7 +5,7 @@ "title": "PCMDI/CMOR: CMOR v3.9.0", "version": "v3.9.0", "upload_type": "software", - "publication_date": "2024-08-xx", + "publication_date": "2024-08-28", "creators": [ { "name": "Mauzey, Chris", From 9a23051c1d439b4d6a7f4bd2b11aa92126e763e8 Mon Sep 17 00:00:00 2001 From: mauzey1 Date: Wed, 28 Aug 2024 11:18:54 -0700 Subject: [PATCH 3/5] Update publication date in CITATION.cff --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index d9e2ec31..23ef6484 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -67,5 +67,5 @@ authors: title: "The Climate Model Output Rewriter (CMOR)" version: 3.9.0 doi: 10.5281/zenodo.592733 -date-released: 2024-08-xx +date-released: 2024-08-28 url: "https://github.com/PCMDI/cmor" From 3781d15b3f116aca13bf48087bd344fcfdc7e9f0 Mon Sep 17 00:00:00 2001 From: mauzey1 Date: Wed, 28 Aug 2024 11:38:53 -0700 Subject: [PATCH 4/5] Update cmip6-cmor-tables and mip-cmor-tables --- cmip6-cmor-tables | 2 +- mip-cmor-tables | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmip6-cmor-tables b/cmip6-cmor-tables index a8e21b89..6a30acae 160000 --- a/cmip6-cmor-tables +++ b/cmip6-cmor-tables @@ -1 +1 @@ -Subproject commit a8e21b89d7308e0fc4c7131a63e5ed3eb8e6ecac +Subproject commit 6a30acaea9b63fdecbe08894d7e50ef36879a993 diff --git a/mip-cmor-tables b/mip-cmor-tables index e3f04c60..4c03efac 160000 --- a/mip-cmor-tables +++ b/mip-cmor-tables @@ -1 +1 @@ -Subproject commit e3f04c60dc21a3dac6f4ccb95f22f40b77690c2f +Subproject commit 4c03efacd612941a3adc56f2e1100748325b4df4 From 586495aa4f3e5ae71925a2d3107178a9244436a8 Mon Sep 17 00:00:00 2001 From: mauzey1 Date: Wed, 28 Aug 2024 11:55:25 -0700 Subject: [PATCH 5/5] Remove Python 3.8 --- .circleci/config.yml | 2 +- .github/workflows/nightly-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4533cf1f..8a5b12af 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -197,7 +197,7 @@ workflows: matrix: parameters: os: [ linux ] - python_version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] + python_version: [ "3.9", "3.10", "3.11", "3.12" ] name: build-<< matrix.os >>-<< matrix.python_version >> - upload: diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index d89a4623..f6a7f735 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -28,7 +28,7 @@ jobs: C_COMPILER: clang_osx-64 FORTRAN_COMPILER: gfortran_osx-64 PROJECT_DIR: workdir/macos_64 - python_version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python_version: ['3.9', '3.10', '3.11', '3.12'] runs-on: ${{ matrix.runner.RUNNER_OS }} env: PACKAGE_NAME: cmor