summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2017-12-19 07:46:01 (GMT)
committerNed Deily <nad@python.org>2017-12-19 07:46:01 (GMT)
commitfb301cb703c233b79f7f2e890ae9d63b7653f72e (patch)
tree6ded17010663df5cf17f2d8762cff2e4b103f499
parent5659743b5693c9e23313a74117948294e35013f4 (diff)
parentd48ecebad5ac78a1783e09b0d32c211d9754edf4 (diff)
downloadcpython-fb301cb703c233b79f7f2e890ae9d63b7653f72e.zip
cpython-fb301cb703c233b79f7f2e890ae9d63b7653f72e.tar.gz
cpython-fb301cb703c233b79f7f2e890ae9d63b7653f72e.tar.bz2
Merge tag 'v3.6.4' into 3.6
-rw-r--r--Include/patchlevel.h6
-rw-r--r--Misc/NEWS.d/3.6.4.rst8
-rw-r--r--README.rst4
3 files changed, 13 insertions, 5 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 131323d..e909bb2 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 4
-#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.4rc1+"
+#define PY_VERSION "3.6.4"
/*--end constants--*/
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Misc/NEWS.d/3.6.4.rst b/Misc/NEWS.d/3.6.4.rst
new file mode 100644
index 0000000..cf23101
--- /dev/null
+++ b/Misc/NEWS.d/3.6.4.rst
@@ -0,0 +1,8 @@
+.. bpo: 0
+.. date: 2017-12-18
+.. no changes: True
+.. nonce: qH8KPG
+.. release date: 2017-12-18
+.. section: Library
+
+There were no new code changes in version 3.6.4 since v3.6.4rc1.
diff --git a/README.rst b/README.rst
index b608dc8..05c31da 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-This is Python version 3.6.4 candidate 1
-========================================
+This is Python version 3.6.4
+============================
.. image:: https://travis-ci.org/python/cpython.svg?branch=3.6
:alt: CPython build status on Travis CI