[Python-checkins] cpython (merge 3.6 -> 3.6): Merge 3.6 releasing branch
ned.deily
python-checkins at python.org
Mon Oct 10 20:58:42 EDT 2016
https://hg.python.org/cpython/rev/cd5f20f75857
changeset: 104445:cd5f20f75857
branch: 3.6
parent: 104439:f7bf01d91abf
parent: 104444:32598eb8861a
user: Ned Deily <nad at python.org>
date: Mon Oct 10 20:53:33 2016 -0400
summary:
Merge 3.6 releasing branch
files:
.hgtags | 1 +
Include/patchlevel.h | 4 ++--
Lib/pydoc_data/topics.py | 2 +-
Misc/NEWS | 16 +++++++++++++++-
README | 2 +-
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -171,3 +171,4 @@
f3edf13dc339b8942ae6b309771ab197dd8ce6fa v3.6.0a3
017cf260936b444788c9b671d195b7bfd83dbd25 v3.6.0a4
5b0ca4ed5e2f0669d76ece7ef975c544580f12b4 v3.6.0b1
+b9fadc7d1c3f9c3c77f32f35afbe1a1cc38070e6 v3.6.0b2
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
#define PY_MINOR_VERSION 6
#define PY_MICRO_VERSION 0
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_BETA
-#define PY_RELEASE_SERIAL 1
+#define PY_RELEASE_SERIAL 2
/* Version as a string */
-#define PY_VERSION "3.6.0b1+"
+#define PY_VERSION "3.6.0b2+"
/*--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
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Mon Sep 12 10:47:11 2016
+# Autogenerated by Sphinx on Mon Oct 10 15:59:17 2016
topics = {'assert': '\n'
'The "assert" statement\n'
'**********************\n'
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,10 +2,22 @@
Python News
+++++++++++
+What's New in Python 3.6.0 beta 3
+=================================
+
+*Release date: XXXX-XX-XX*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
What's New in Python 3.6.0 beta 2
=================================
-*Release date: XXXX-XX-XX*
+*Release date: 2016-10-10*
Core and Builtins
-----------------
@@ -266,6 +278,7 @@
- Issue #28217: Adds _testconsole module to test console input.
+
What's New in Python 3.6.0 beta 1
=================================
@@ -1001,6 +1014,7 @@
- Issue #10910: Avoid C++ compilation errors on FreeBSD and OS X.
Also update FreedBSD version checks for the original ctype UTF-8 workaround.
+
What's New in Python 3.6.0 alpha 3
==================================
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 3.6.0 beta 1
+This is Python version 3.6.0 beta 2
===================================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list