Merge pull request #622 from PCMDI/cmor_3.6.1

CMOR 3.6.1

.circleci/config.yml

@@ -154,7 +154,7 @@ jobs:
  executor: << parameters.os >>
  environment:
  PKG_NAME: "cmor"
- VERSION: "3.6.0"
+ VERSION: "3.6.1"
  PYTHON_VERSION: << parameters.python_version >>
  CHANNELS: "-c cdat/label/nightly -c conda-forge -c cdat"
  PKGS: " lazy-object-proxy testsrunner"

INSTALL

@@ -1,6 +1,6 @@
 INSTALLATION INSTRUCTIONS 
 ------------------------- 
-Climate Model Output Rewriter (CMOR) version 3.6.0 installation instructions.
+Climate Model Output Rewriter (CMOR) version 3.6.1 installation instructions.
 
 
 DOWNLOAD 
@@ -13,7 +13,7 @@ cd CMOR
 
 INSTALLATION
 ------------ 
-CMOR 3.6.0 requires external packages that need to be installed first. 
+CMOR 3.6.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! 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cmor 3.6.0.
+# Generated by GNU Autoconf 2.69 for cmor 3.6.1.
 #
 # Report bugs to <[email protected]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cmor'
 PACKAGE_TARNAME='cmor'
-PACKAGE_VERSION='3.6.0'
-PACKAGE_STRING='cmor 3.6.0'
+PACKAGE_VERSION='3.6.1'
+PACKAGE_STRING='cmor 3.6.1'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -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.6.0 to adapt to many kinds of systems.
+\`configure' configures cmor 3.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1319,7 +1319,7 @@ fi
 
 if test -n "$ac_init_help"; then
  case $ac_init_help in
- short | recursive ) echo "Configuration of cmor 3.6.0:";;
+ short | recursive ) echo "Configuration of cmor 3.6.1:";;
  esac
  cat <<\_ACEOF
 
@@ -1422,7 +1422,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-cmor configure 3.6.0
+cmor configure 3.6.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -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.6.0, which was
+It was created by cmor $as_me 3.6.1, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
  $ $0 $@
@@ -5045,7 +5045,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.6.0, which was
+This file was extended by cmor $as_me 3.6.1, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
  CONFIG_FILES = $CONFIG_FILES
@@ -5098,7 +5098,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.6.0
+cmor config.status 3.6.1
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -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.6.0, [email protected])
+AC_INIT(cmor, 3.6.1, [email protected])
 
 GIT_TAG=`cd $srcdir ; ./get_git_version.sh`
 

include/cmor.h

@@ -3,7 +3,7 @@
 
 #define CMOR_VERSION_MAJOR 3
 #define CMOR_VERSION_MINOR 6
-#define CMOR_VERSION_PATCH 0
+#define CMOR_VERSION_PATCH 1
 
 #define CMOR_CF_VERSION_MAJOR 1
 #define CMOR_CF_VERSION_MINOR 6

setup.py.in

@@ -55,7 +55,7 @@ print('src:',srcfiles)
 print('macros:',macros)
 
 setup (name = "CMOR",
- version='3.6.0',
+ version='3.6.1',
  author='Denis Nadeau, AIMS',
  description = "Python Interface to CMOR output library",
  url = "http://cmor.llnl.gov/",