From f59c0932b4e160f279fb98de4cdad2f58269e0a5 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@python.org>
Date: Wed, 28 Mar 2018 05:19:31 -0400
Subject: [PATCH] 3.6.5final

---
 Include/patchlevel.h                             |  6 +++---
 Misc/NEWS.d/3.6.5.rst                            | 16 ++++++++++++++++
 .../2018-03-28-04-15-03.bpo-33163.hfpWuU.rst     |  1 -
 .../2018-03-28-01-35-02.bpo-32872.J5NDUj.rst     |  1 -
 README.rst                                       |  4 ++--
 5 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 Misc/NEWS.d/3.6.5.rst
 delete mode 100644 Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst
 delete mode 100644 Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 7ed3ea08a31..3dd89f6b2b6 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	6
 #define PY_MICRO_VERSION	5
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.6.5rc1"
+#define PY_VERSION      	"3.6.5"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Misc/NEWS.d/3.6.5.rst b/Misc/NEWS.d/3.6.5.rst
new file mode 100644
index 00000000000..ded13aebd56
--- /dev/null
+++ b/Misc/NEWS.d/3.6.5.rst
@@ -0,0 +1,16 @@
+.. bpo: 32872
+.. date: 2018-03-28-01-35-02
+.. nonce: J5NDUj
+.. release date: 2018-03-28
+.. section: Tests
+
+Avoid regrtest compatibility issue with namespace packages.
+
+..
+
+.. bpo: 33163
+.. date: 2018-03-28-04-15-03
+.. nonce: hfpWuU
+.. section: Build
+
+Upgrade pip to 9.0.3 and setuptools to v39.0.1.
diff --git a/Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst b/Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst
deleted file mode 100644
index b3f04e3f800..00000000000
--- a/Misc/NEWS.d/next/Build/2018-03-28-04-15-03.bpo-33163.hfpWuU.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade pip to 9.0.3 and setuptools to v39.0.1.
diff --git a/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst b/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst
deleted file mode 100644
index 06d656bbfd6..00000000000
--- a/Misc/NEWS.d/next/Tests/2018-03-28-01-35-02.bpo-32872.J5NDUj.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid regrtest compatibility issue with namespace packages.
diff --git a/README.rst b/README.rst
index 248fe27921c..21b6084b0ae 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-This is Python version 3.6.5 release candidate 1
-================================================
+This is Python version 3.6.5
+============================
 
 .. image:: https://travis-ci.org/python/cpython.svg?branch=3.6
    :alt: CPython build status on Travis CI