[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.12 release branch

benjamin.peterson python-checkins at python.org
Sat Jun 25 17:04:54 EDT 2016


https://hg.python.org/cpython/rev/b97d1ec156f9
changeset:   102175:b97d1ec156f9
branch:      2.7
parent:      102159:1ed74994c3e3
parent:      102174:82579a698756
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jun 25 14:04:11 2016 -0700
summary:
  merge 2.7.12 release branch

files:
  .hgtags              |  1 +
  Include/patchlevel.h |  6 +++---
  Misc/NEWS            |  2 ++
  3 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -173,3 +173,4 @@
 82dd9545bd93d6e7a9821e1dabc7b25508d0fa3a v2.7.11rc1
 6d1b6a68f775fada9877d295e62958bafa1ca11e v2.7.11
 13912cd1e7e8fc6986f42822f5439ae1f2bc0d7d v2.7.12rc1
+d33e0cf91556723fb8cebefdad1f3bce43b2244d v2.7.12
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,11 +23,11 @@
 #define PY_MAJOR_VERSION	2
 #define PY_MINOR_VERSION	7
 #define PY_MICRO_VERSION	12
-#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      	"2.7.12rc1+"
+#define PY_VERSION      	"2.7.12"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -38,6 +38,8 @@
 What's New in Python 2.7.12?
 ============================
 
+*Release date: 2016-06-25*
+
 Build
 -----
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list