Merge pull request #599 from PCMDI/cmor_3.6.0

Update version number to 3.6.0

.circleci/config.yml

@@ -95,7 +95,7 @@ aliases:
        cd recipes
        export PKG_NAME=cmor
        export USER=pcmdi
-       export VERSION=3.5.0
+       export VERSION=3.6.0
        export LABEL=nightly
        python ./prep_for_build.py -l $VERSION
        conda build $PKG_NAME -c cdat/label/nightly -c conda-forge -c cdat --python=$PYTHON_VERSION

INSTALL

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

configure

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cmor 3.5.0.
+# Generated by GNU Autoconf 2.69 for cmor 3.6.0.
 #
-# Report bugs to <doutriaux1@llnl.gov>.
+# Report bugs to <mauzey1@llnl.gov>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -266,11 +266,11 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell [email protected] and
-$0: [email protected] about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+    $as_echo "$0: Please tell [email protected] and [email protected]
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
   fi
   exit 1
 fi
@@ -580,9 +580,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cmor'
 PACKAGE_TARNAME='cmor'
-PACKAGE_VERSION='3.5.0'
-PACKAGE_STRING='cmor 3.5.0'
-PACKAGE_BUGREPORT='doutriaux1@llnl.gov'
+PACKAGE_VERSION='3.6.0'
+PACKAGE_STRING='cmor 3.6.0'
+PACKAGE_BUGREPORT='mauzey1@llnl.gov'
 PACKAGE_URL=''
 
 ac_default_prefix=/usr/local/cmor
@@ -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.5.0 to adapt to many kinds of systems.
+\`configure' configures cmor 3.6.0 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.5.0:";;
+     short | recursive ) echo "Configuration of cmor 3.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1359,7 +1359,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <doutriaux1@llnl.gov>.
+Report bugs to <mauzey1@llnl.gov>.
 _ACEOF
 ac_status=$?
 fi
@@ -1422,7 +1422,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cmor configure 3.5.0
+cmor configure 3.6.0
 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.5.0, which was
+It was created by cmor $as_me 3.6.0, 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.5.0, which was
+This file was extended by cmor $as_me 3.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5092,13 +5092,13 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Report bugs to <doutriaux1@llnl.gov>."
+Report bugs to <mauzey1@llnl.gov>."
 
 _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.5.0
+cmor config.status 3.6.0
 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.5.0, doutriaux1@llnl.gov)
+AC_INIT(cmor, 3.6.0, mauzey1@llnl.gov)
 
 GIT_TAG=`cd $srcdir ; ./get_git_version.sh`
 

include/cmor.h

@@ -2,7 +2,7 @@
 #define CMOR_H
 
 #define CMOR_VERSION_MAJOR 3
-#define CMOR_VERSION_MINOR 5
+#define CMOR_VERSION_MINOR 6
 #define CMOR_VERSION_PATCH 0
 
 #define CMOR_CF_VERSION_MAJOR 1

setup.py.in

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