3.6.8finalv3.6.8

8 files changed, 44 insertions, 14 deletions

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 50ae6cb345d..065b0cc66b6 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	8
-#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.8rc1+"
+#define PY_VERSION      	"3.6.8"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 2d34529e813..e4c63058087 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Tue Dec 11 16:32:37 2018
+# Autogenerated by Sphinx on Sun Dec 23 16:24:21 2018
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
diff --git a/Misc/NEWS.d/3.6.8.rst b/Misc/NEWS.d/3.6.8.rst
new file mode 100644
index 00000000000..fc510142bee
--- /dev/null
+++ b/Misc/NEWS.d/3.6.8.rst
@@ -0,0 +1,38 @@
+.. bpo: 31715
+.. date: 2018-08-15-16-22-30
+.. nonce: Iw8jS8
+.. release date: 2018-12-23
+.. section: Library
+
+Associate ``.mjs`` file extension with ``application/javascript`` MIME Type.
+
+..
+
+.. bpo: 35499
+.. date: 2018-12-14-19-36-05
+.. nonce: 9yAldM
+.. section: Build
+
+``make profile-opt`` no longer replaces ``CFLAGS_NODIST`` with ``CFLAGS``.
+It now adds profile-guided optimization (PGO) flags to ``CFLAGS_NODIST``:
+existing ``CFLAGS_NODIST`` flags are kept.
+
+..
+
+.. bpo: 35257
+.. date: 2018-12-05-22-28-40
+.. nonce: dmcd_s
+.. section: Build
+
+Avoid leaking the linker flags from Link Time Optimizations (LTO) into
+distutils when compiling C extensions.
+
+..
+
+.. bpo: 35259
+.. date: 2018-11-22-13-52-36
+.. nonce: p07c61
+.. section: C API
+
+Conditionally declare :c:func:`Py_FinalizeEx()` (new in 3.6) based on
+Py_LIMITED_API. Patch by Arthur Neufeld.
diff --git a/Misc/NEWS.d/next/Build/2018-12-05-22-28-40.bpo-35257.dmcd_s.rst b/Misc/NEWS.d/next/Build/2018-12-05-22-28-40.bpo-35257.dmcd_s.rst
deleted file mode 100644
index fad25257829..00000000000
--- a/Misc/NEWS.d/next/Build/2018-12-05-22-28-40.bpo-35257.dmcd_s.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Avoid leaking the linker flags from Link Time Optimizations (LTO)
-into distutils when compiling C extensions.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Build/2018-12-14-19-36-05.bpo-35499.9yAldM.rst b/Misc/NEWS.d/next/Build/2018-12-14-19-36-05.bpo-35499.9yAldM.rst
deleted file mode 100644
index ed730b9d9b4..00000000000
--- a/Misc/NEWS.d/next/Build/2018-12-14-19-36-05.bpo-35499.9yAldM.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-``make profile-opt`` no longer replaces ``CFLAGS_NODIST`` with ``CFLAGS``. It
-now adds profile-guided optimization (PGO) flags to ``CFLAGS_NODIST``: existing
-``CFLAGS_NODIST`` flags are kept.
diff --git a/Misc/NEWS.d/next/C API/2018-11-22-13-52-36.bpo-35259.p07c61.rst b/Misc/NEWS.d/next/C API/2018-11-22-13-52-36.bpo-35259.p07c61.rst
deleted file mode 100644
index 1f4801cbfb7..00000000000
--- a/Misc/NEWS.d/next/C API/2018-11-22-13-52-36.bpo-35259.p07c61.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Conditionally declare :c:func:`Py_FinalizeEx()` (new in 3.6) based on
-Py_LIMITED_API. Patch by Arthur Neufeld.
diff --git a/Misc/NEWS.d/next/Library/2018-08-15-16-22-30.bpo-31715.Iw8jS8.rst b/Misc/NEWS.d/next/Library/2018-08-15-16-22-30.bpo-31715.Iw8jS8.rst
deleted file mode 100644
index eacba28f9fd..00000000000
--- a/Misc/NEWS.d/next/Library/2018-08-15-16-22-30.bpo-31715.Iw8jS8.rst
+++ /dev/null
@@ -1 +0,0 @@
-Associate ``.mjs`` file extension with ``application/javascript`` MIME Type.
diff --git a/README.rst b/README.rst
index 3e392b7efc3..0531cb57030 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-This is Python version 3.6.8 candidate 1+
-=========================================
+This is Python version 3.6.8
+============================
 
 .. image:: https://travis-ci.org/python/cpython.svg?branch=3.6
    :alt: CPython build status on Travis CI