From b90d4bea25988dfde5badd1b68800fae5e8723bc Mon Sep 17 00:00:00 2001
From: mauzey1 <mauzey1@llnl.gov>
Date: Mon, 14 Dec 2020 13:19:43 -0800
Subject: [PATCH 1/4] Change configure.ac to 3.6.1 and rerun autoconf

---
 configure    | 18 +++++++++---------
 configure.ac |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index b0bf5a1c..55658ef1 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.69 for cmor 3.6.0.
+# Generated by GNU Autoconf 2.69 for cmor 3.6.1.
 #
 # Report bugs to <mauzey1@llnl.gov>.
 #
@@ -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='mauzey1@llnl.gov'
 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\\"
 
diff --git a/configure.ac b/configure.ac
index 5332335c..5eca9b44 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.59)
-AC_INIT(cmor, 3.6.0, mauzey1@llnl.gov)
+AC_INIT(cmor, 3.6.1, mauzey1@llnl.gov)
 
 GIT_TAG=`cd $srcdir ; ./get_git_version.sh`
 

From 175298343abb719bbbbb58843e9484e39e6c6392 Mon Sep 17 00:00:00 2001
From: mauzey1 <mauzey1@llnl.gov>
Date: Mon, 14 Dec 2020 13:56:36 -0800
Subject: [PATCH 2/4] Increment version to 3.6.1

---
 .circleci/config.yml | 2 +-
 INSTALL              | 4 ++--
 include/cmor.h       | 2 +-
 setup.py.in          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c1a65809..cf0c7497 100644
--- a/.circleci/config.yml
+++ b/.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"
diff --git a/INSTALL b/INSTALL
index 11f0b50f..ef97fe03 100644
--- a/INSTALL
+++ b/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! 
diff --git a/include/cmor.h b/include/cmor.h
index 2623b4bf..d082f227 100644
--- a/include/cmor.h
+++ b/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
diff --git a/setup.py.in b/setup.py.in
index e749f5d9..ed03b4ad 100755
--- a/setup.py.in
+++ b/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/",

From 8bdf0ab1c60322d442d4cc3443020394c10b1b4c Mon Sep 17 00:00:00 2001
From: mauzey1 <mauzey1@llnl.gov>
Date: Tue, 15 Dec 2020 11:50:04 -0800
Subject: [PATCH 3/4] Remove Travis CI

---
 .travis.yml | 55 -----------------------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c7206d36..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-os:
-  - linux
-python:
-  - 3.8
-env:
-  - CMOR_PYTHON_VERSION='3.6'
-  - CMOR_PYTHON_VERSION='3.7'
-  - CMOR_PYTHON_VERSION='3.8'
-  - CMOR_PYTHON_VERSION='3.9'
-services:
-  - docker
-
-sudo: false
-
-before_install:
-  - export MINICONDA_VERSION=3
-  - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export MINICONDA_OS="Linux"; fi
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then export MINICONDA_OS="MacOSX"; fi
-  - wget https://repo.continuum.io/miniconda/Miniconda${MINICONDA_VERSION}-latest-${MINICONDA_OS}-x86_64.sh -O miniconda.sh; 
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - export UVCDAT_ANONYMOUS_LOG=no
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - conda config --set always_yes yes --set changeps1 no
-  - conda update -y -q conda
-  - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export CONDA_COMPILERS="gcc_linux-64 gfortran_linux-64"; fi
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then export CONDA_COMPILERS="clang_osx-64 gfortran_osx-64"; fi
-  - conda create -q -n py${CMOR_PYTHON_VERSION} -c cdat/label/nightly -c conda-forge -c cdat six libuuid json-c udunits2 hdf5 openblas==0.3.6 libnetcdf=*=nompi_* netcdf4 numpy openssl lazy-object-proxy python=${CMOR_PYTHON_VERSION} $CONDA_COMPILERS testsrunner
-  - source activate py${CMOR_PYTHON_VERSION}
-install:
-  - export PREFIX=$(python -c "import sys; print(sys.prefix)")
-  - ln -s cmip6-cmor-tables/Tables Tables
-  - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export LDSHARED_FLAGS="-shared -pthread"; fi
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then export LDSHARED_FLAGS="-bundle -undefined dynamic_lookup"; fi
-  - "./configure --prefix=$PREFIX --with-python --with-uuid=$PREFIX --with-json-c=$PREFIX --with-udunits2=$PREFIX
-    --with-netcdf=$PREFIX  --enable-verbose-test"
-  - make install
-
-script:
-  - make test
-  - conda install -q -n py${CMOR_PYTHON_VERSION} -c cdat/label/nightly -c conda-forge cdms2
-  - make test
-  - export PYTHONPATH=Test/:$PYTHONPATH
-  - python run_tests.py -v2 -n1 -H Test/test_python_CMIP6_CV*.py
-
-after_failure:
-  - ulimit -a
-  - free -m
-  - find CMIP6/
-  - df -kh ./
-  - ls -lR
-  - cat ~/build.sh
-
-after_success:
-  - if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_OS_NAME == "osx" ]]; then CMOR_RECIPE_DIR=recipes bash scripts/conda_upload.sh ${TRAVIS_BRANCH} ; fi
-  - if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_OS_NAME == "linux" ]]; then docker run -v `pwd`:/travis_home -e CONDA_UPLOAD_TOKEN=${CONDA_UPLOAD_TOKEN} -e CMOR_RECIPE_DIR=/travis_home/recipes -e CMOR_PYTHON_VERSION=${CMOR_PYTHON_VERSION} -a STDOUT -a STDERR centos:6.8 /travis_home/scripts/conda_upload.sh ${TRAVIS_BRANCH} ; fi

From 9bb1cce23f64a55143213f4f1a5e41ff49547a7c Mon Sep 17 00:00:00 2001
From: mauzey1 <mauzey1@llnl.gov>
Date: Tue, 15 Dec 2020 12:46:44 -0800
Subject: [PATCH 4/4] Update tables

---
 cmip6-cmor-tables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmip6-cmor-tables b/cmip6-cmor-tables
index 1746d197..f1f9be8a 160000
--- a/cmip6-cmor-tables
+++ b/cmip6-cmor-tables
@@ -1 +1 @@
-Subproject commit 1746d197789cdbde5d36e3715e65a9f9506bd100
+Subproject commit f1f9be8afb56a7998925b1623d269b465d47daed