summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-12-07 06:59:27 (GMT)
committerNed Deily <nad@python.org>2016-12-07 06:59:27 (GMT)
commit3ca43ed956d0806523751a6ec3858b3065fa96cb (patch)
tree582f0b96add7d36c17956cd53eeef837d6912730
parent5dd9ca9c315b9c2a08dcaab8583236c6859f1472 (diff)
downloadcpython-3ca43ed956d0806523751a6ec3858b3065fa96cb.zip
cpython-3ca43ed956d0806523751a6ec3858b3065fa96cb.tar.gz
cpython-3ca43ed956d0806523751a6ec3858b3065fa96cb.tar.bz2
Prepare for 3.6.1. Any further 3.6.0 release candidates and 3.6.0 final will be cherrypicked and merged here.
-rw-r--r--Include/patchlevel.h6
-rw-r--r--Misc/NEWS12
2 files changed, 15 insertions, 3 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index e2a9ace..49930e8 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 0
-#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.0rc1"
+#define PY_VERSION "3.6.0+"
/*--end constants--*/
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Misc/NEWS b/Misc/NEWS
index 770c8a9..fe8cb97 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,18 @@
Python News
+++++++++++
+What's New in Python 3.6.1 release candidate 1
+==============================================
+
+*Release date: XXXX-XX-XX*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
What's New in Python 3.6.0 release candidate 1
==============================================