From d458f579d88d1e41fcbf4413887d8d4f56baf715 Mon Sep 17 00:00:00 2001
From: Cheryl Craig <cacraig@ucar.edu>
Date: Fri, 2 Jul 2021 12:44:10 -0600
Subject: [PATCH 1/3] Update to python3

---
 cime_config/buildcpp | 2 +-
 cime_config/buildlib | 2 +-
 cime_config/buildnml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cime_config/buildcpp b/cime_config/buildcpp
index 8d4f3216da..83b0548703 100644
--- a/cime_config/buildcpp
+++ b/cime_config/buildcpp
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 API for cam's configure
diff --git a/cime_config/buildlib b/cime_config/buildlib
index c868340f84..12c1c4f9b9 100755
--- a/cime_config/buildlib
+++ b/cime_config/buildlib
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 create the cam library
diff --git a/cime_config/buildnml b/cime_config/buildnml
index 692e3f7d65..efd022d9f9 100755
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 CAM namelist creator

From 18187fba64a104de03905db387568fa7f1d59fe4 Mon Sep 17 00:00:00 2001
From: Cheryl Craig <cacraig@ucar.edu>
Date: Fri, 2 Jul 2021 13:13:14 -0600
Subject: [PATCH 2/3] preliminary update for ChangeLog

---
 doc/ChangeLog | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 79461bf7d5..aecfd44405 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,48 @@
+
+===============================================================
+
+Tag name: cam6_3_025
+Originator(s): cacraig
+Date: July 6, 2021
+One-line Summary: Update cime_config scripts to python3
+Github PR URL:
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+ - Update cime_config/buildlib, buildnml and buildcpp to use python3 https://github.com/ESCOMP/CAM/issues/394
+
+Describe any changes made to build system:
+ - cime_config scripts now use python3
+
+Describe any changes made to the namelist:
+
+List any changes to the defaults for the boundary datasets:
+
+Describe any substantial timing or memory changes:
+
+Code reviewed by:
+
+List all files eliminated:
+
+List all files added and what they do:
+
+List all existing files that have been modified, and describe the changes:
+M       cime_config/buildcpp
+M       cime_config/buildlib
+M       cime_config/buildnml
+    - update to use python3
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+cheyenne/intel/aux_cam:
+
+izumi/nag/aux_cam:
+
+izumi/pgi/aux_cam:
+
+===============================================================
 ===============================================================
 
 Tag name: cam6_3_024

From 52984a2d3a61763f88f04f32139edfedb978321a Mon Sep 17 00:00:00 2001
From: Cheryl Craig <cacraig@ucar.edu>
Date: Mon, 5 Jul 2021 20:49:07 -0600
Subject: [PATCH 3/3] ChangeLog edits

---
 doc/ChangeLog | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index aecfd44405..01aecd5273 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,11 +1,10 @@
-
 ===============================================================
 
 Tag name: cam6_3_025
 Originator(s): cacraig
-Date: July 6, 2021
+Date: July 5, 2021
 One-line Summary: Update cime_config scripts to python3
-Github PR URL:
+Github PR URL: https://github.com/ESCOMP/CAM/pull/397
 
 Purpose of changes (include the issue number and title text for each relevant GitHub issue):
  - Update cime_config/buildlib, buildnml and buildcpp to use python3 https://github.com/ESCOMP/CAM/issues/394
@@ -19,7 +18,7 @@ List any changes to the defaults for the boundary datasets:
 
 Describe any substantial timing or memory changes:
 
-Code reviewed by:
+Code reviewed by: nusbaume, courtneyp
 
 List all files eliminated:
 
@@ -36,11 +35,13 @@ platform, and checkin with these failures has been OK'd by the gatekeeper,
 then copy the lines from the td.*.status files for the failed tests to the
 appropriate machine below.  All failed tests must be justified.
 
-cheyenne/intel/aux_cam:
+cheyenne/intel/aux_cam:all BFB
 
-izumi/nag/aux_cam:
+izumi/nag/aux_cam: all BFB except:
+    FAIL DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae COMPARE_base_da
+      - pre-existing failure
 
-izumi/pgi/aux_cam:
+izumi/pgi/aux_cam: all BFB
 
 ===============================================================
 ===============================================================