Skip to content

Commit

Permalink
Merge pull request #683 from PCMDI/cmor_3.7.1
Browse files Browse the repository at this point in the history
CMOR 3.7.1 Release
  • Loading branch information
mauzey1 authored Nov 29, 2022
2 parents dc868f8 + 6c2a93e commit 4232e26
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
executor: << parameters.os >>
environment:
PKG_NAME: "cmor"
VERSION: "3.7.0"
VERSION: "3.7.1"
PYTHON_VERSION: << parameters.python_version >>
CHANNELS: "-c conda-forge -c cdat/label/nightly -c cdat"
PKGS: " lazy-object-proxy testsrunner"
Expand Down
4 changes: 2 additions & 2 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"description": "<p>Climate Model Output Rewriter</p>",
"access_right": "open",
"license": "BSD-3-Clause",
"title": "PCMDI/CMOR: CMOR v3.7.0",
"version": "v3.7.0",
"title": "PCMDI/CMOR: CMOR v3.7.1",
"version": "v3.7.1",
"upload_type": "software",
"publication_date": "2022-08-22",
"creators": [
Expand Down
4 changes: 2 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
INSTALLATION INSTRUCTIONS
-------------------------
Climate Model Output Rewriter (CMOR) version 3.7.0 installation instructions.
Climate Model Output Rewriter (CMOR) version 3.7.1 installation instructions.


DOWNLOAD
Expand All @@ -13,7 +13,7 @@ cd CMOR

INSTALLATION
------------
CMOR 3.7.0 requires external packages that need to be installed first.
CMOR 3.7.1 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!
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CMOR 3.7 documentation can be found here: http://cmor.llnl.gov


[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7015697.svg)](https://doi.org/10.5281/zenodo.7015697)
[![stable version](https://img.shields.io/badge/stable%20version-3.7.0-brightgreen.svg)](https://github.com/PCMDI/cmor/releases/tag/3.7.0)
![platforms](https://img.shields.io/badge/platforms-linux%20|%20osx-lightgrey.svg)
[![Anaconda-Server Badge](https://anaconda.org/pcmdi/cmor/badges/installer/conda.svg)](https://conda.anaconda.org/pcmdi)
[![stable version](https://img.shields.io/github/v/release/pcmdi/cmor.svg)](https://github.com/PCMDI/cmor/releases/latest)
![platforms](https://anaconda.org/pcmdi/cmor/badges/platforms.svg)
[![Anaconda-Server Badge](https://anaconda.org/pcmdi/cmor/badges/version.svg)](https://conda.anaconda.org/pcmdi)
[![Anaconda-Server Badge](https://anaconda.org/pcmdi/cmor/badges/downloads.svg)](https://anaconda.org/pcmdi)
2 changes: 1 addition & 1 deletion cmip6-cmor-tables
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for cmor 3.7.0.
# Generated by GNU Autoconf 2.69 for cmor 3.7.1.
#
# Report bugs to <mauzey1@llnl.gov>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cmor'
PACKAGE_TARNAME='cmor'
PACKAGE_VERSION='3.7.0'
PACKAGE_STRING='cmor 3.7.0'
PACKAGE_VERSION='3.7.1'
PACKAGE_STRING='cmor 3.7.1'
PACKAGE_BUGREPORT='mauzey1@llnl.gov'
PACKAGE_URL=''

Expand Down Expand Up @@ -1253,7 +1253,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.7.0 to adapt to many kinds of systems.
\`configure' configures cmor 3.7.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1319,7 +1319,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cmor 3.7.0:";;
short | recursive ) echo "Configuration of cmor 3.7.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1422,7 +1422,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cmor configure 3.7.0
cmor configure 3.7.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1640,7 +1640,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.7.0, which was
It was created by cmor $as_me 3.7.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -5067,7 +5067,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.7.0, which was
This file was extended by cmor $as_me 3.7.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5120,7 +5120,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
cmor config.status 3.7.0
cmor config.status 3.7.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.

dnl AC_PREREQ(2.59)
AC_INIT(cmor, 3.7.0, mauzey1@llnl.gov)
AC_INIT(cmor, 3.7.1, mauzey1@llnl.gov)

GIT_TAG=`cd $srcdir ; ./get_git_version.sh`

Expand Down
2 changes: 1 addition & 1 deletion include/cmor.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#define CMOR_VERSION_MAJOR 3
#define CMOR_VERSION_MINOR 7
#define CMOR_VERSION_PATCH 0
#define CMOR_VERSION_PATCH 1

#define CMOR_CF_VERSION_MAJOR 1
#define CMOR_CF_VERSION_MINOR 7
Expand Down
2 changes: 1 addition & 1 deletion setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ print('src:',srcfiles)
print('macros:',macros)

setup (name = "CMOR",
version='3.7.0',
version='3.7.1',
author='Chris Mauzey, AIMS',
description = "Python Interface to CMOR output library",
url = "http://cmor.llnl.gov/",
Expand Down

0 comments on commit 4232e26

Please sign in to comment.