From 577f8cb8aa0f3d77549965097c68a937b517284d Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 30 May 2014 11:01:15 -0700 Subject: Issue #21462 PEP 466: upgrade OpenSSL in the Python 2.7 Windows builds --- PCbuild/pyproject.vsprops | 2 +- Tools/buildbot/external-common.bat | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 024bfa8..dfdc556 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -82,7 +82,7 @@ /> Date: Sat, 31 May 2014 11:01:37 -0700 Subject: openssl requires nasm (#21462) --- PCbuild/build_ssl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 526eba3..151aa54 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -207,9 +207,9 @@ def main(): # Now run make. if arch == "amd64": - rc = os.system(r"ml64 -c -Foms\uptable.obj ms\uptable.asm") + rc = os.system("nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm") if rc: - print("ml64 assembler has failed.") + print("nasm assembler has failed.") sys.exit(rc) shutil.copy(r"crypto\buildinf_%s.h" % arch, r"crypto\buildinf.h") -- cgit v0.12 From 9c70397ea392b62244f4215f59ffd535029239d8 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 31 May 2014 11:17:34 -0700 Subject: bump to 2.7.7 final --- Include/patchlevel.h | 6 +++--- Lib/distutils/__init__.py | 2 +- Lib/idlelib/idlever.py | 2 +- Misc/NEWS | 14 ++++++++++++++ Misc/RPM/python-2.7.spec | 2 +- README | 4 ++-- 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h index ece0fea..441c499 100644 --- 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 7 -#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.7rc1" +#define PY_VERSION "2.7.7" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository). Empty diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py index 79fd8d7..fe729e7 100644 --- a/Lib/distutils/__init__.py +++ b/Lib/distutils/__init__.py @@ -15,5 +15,5 @@ __revision__ = "$Id$" # Updated automatically by the Python release process. # #--start constants-- -__version__ = "2.7.7rc1" +__version__ = "2.7.7" #--end constants-- diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index e2cd470..55bfe1c 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "2.7.7rc1" +IDLE_VERSION = "2.7.7" diff --git a/Misc/NEWS b/Misc/NEWS index 020dc6e..f91003d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -5,6 +5,20 @@ Python News What's New in Python 2.7.7 release candidate 1? =============================================== +*Release date: 2014-05-31* + +Build +----- + +- Issue #21462: Build the Windows installers with OpenSSL 1.0.1g. + +- Issue #19866: Include some test data in the Windows installers, so tests don't + fail. + + +What's New in Python 2.7.7 release candidate 1? +=============================================== + *Release date: 2014-05-17* Core and Builtins diff --git a/Misc/RPM/python-2.7.spec b/Misc/RPM/python-2.7.spec index 2a6bba5..fb0775c 100644 --- a/Misc/RPM/python-2.7.spec +++ b/Misc/RPM/python-2.7.spec @@ -39,7 +39,7 @@ %define name python #--start constants-- -%define version 2.7.7rc1 +%define version 2.7.7 %define libvers 2.7 #--end constants-- %define release 1pydotorg diff --git a/README b/README index 3eb4415..7699ec6 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -This is Python version 2.7.7 release candidate 1 -================================================ +This is Python version 2.7.7 +============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Python Software Foundation. All rights reserved. -- cgit v0.12 From de50cdfcf9e3ba415fa09a3c9203d4d95a14e5b3 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 31 May 2014 11:22:47 -0700 Subject: fix news header --- Misc/NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index f91003d..ba0a4ef 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2,8 +2,8 @@ Python News +++++++++++ -What's New in Python 2.7.7 release candidate 1? -=============================================== +What's New in Python 2.7.7 +========================== *Release date: 2014-05-31* -- cgit v0.12 From 253b7c8dda018892ac08eb60848966d2ab6939e2 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 31 May 2014 11:22:51 -0700 Subject: Added tag v2.7.7 for changeset f89216059edf --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 123d16c..b8f9029 100644 --- a/.hgtags +++ b/.hgtags @@ -164,3 +164,4 @@ fcb3ec2842f99454322492dd0ec2cf01322df093 v2.6.9 4913d0e9be30666218cc4d713937e81c0e7f346a v2.7.6rc1 3a1db0d2747ec2d47a8693ed5650f3567161a200 v2.7.6 e32e3a9f390212463c22509d0f9aead8051cee63 v2.7.7rc1 +f89216059edf77660ef1eb2a98e88352551da1d6 v2.7.7 -- cgit v0.12