From 88f4dd64513a9738eaec6a1228c62dd4ab3dbafe Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 12 May 2013 12:51:38 +0200 Subject: bump to 3.3.2 --- Include/patchlevel.h | 4 ++-- Lib/distutils/__init__.py | 2 +- Lib/idlelib/idlever.py | 2 +- Misc/NEWS | 4 ++-- Misc/RPM/python-3.3.spec | 2 +- README | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 09a4859..357a6f5 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -18,12 +18,12 @@ /*--start constants--*/ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 3 -#define PY_MICRO_VERSION 1 +#define PY_MICRO_VERSION 2 #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL #define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.3.1+" +#define PY_VERSION "3.3.2" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py index f8af1b3..83d7cb7 100644 --- a/Lib/distutils/__init__.py +++ b/Lib/distutils/__init__.py @@ -13,5 +13,5 @@ used from a setup script as # Updated automatically by the Python release process. # #--start constants-- -__version__ = "3.3.1" +__version__ = "3.3.2" #--end constants-- diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index 13b2b9b..b7ff0f8 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "3.3.1" +IDLE_VERSION = "3.3.2" diff --git a/Misc/NEWS b/Misc/NEWS index 0d7700f..be3b5a5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -5,9 +5,9 @@ Python News What's New in Python 3.3.2? =========================== -.. *Release date: XXXX-XX-XX* +*Release date: 13-May-2013* -*Not yet released, see sections below for changes released in 3.3.1* +.. *Not yet released, see sections below for changes released in 3.3.1* Core and Builtins ----------------- diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec index 7eb1cc6..a9b489b 100644 --- a/Misc/RPM/python-3.3.spec +++ b/Misc/RPM/python-3.3.spec @@ -39,7 +39,7 @@ %define name python #--start constants-- -%define version 3.3.1 +%define version 3.3.2 %define libvers 3.3 #--end constants-- %define release 1pydotorg diff --git a/README b/README index 156c2c5..5d6b3d7 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This is Python version 3.3.1 +This is Python version 3.3.2 ============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -- cgit v0.12 From 84fc4ba67eedd249ae7643930eacd0058303b95c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 12 May 2013 19:50:34 +0200 Subject: Closes #17962: Build with OpenSSL 1.0.1e on Windows. --- Misc/NEWS | 2 ++ PC/VC6/readme.txt | 4 ++-- PC/VS8.0/pyproject.vsprops | 2 +- PC/VS9.0/pyproject.vsprops | 2 +- PCbuild/pyproject.props | 2 +- PCbuild/readme.txt | 2 +- Tools/buildbot/external-common.bat | 8 ++++---- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index c266b1e..c81aeb4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -250,6 +250,8 @@ Build - Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC 4.8. +- Issue #17962: Build with OpenSSL 1.0.1e on Windows. + What's New in Python 3.3.1? =========================== diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index e204d2f..f978f85 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -153,9 +153,9 @@ _ssl Unpack into the "dist" directory, retaining the folder name from the archive - for example, the latest stable OpenSSL will install as - dist/openssl-1.0.1d + dist/openssl-1.0.1e - You need to use version 1.0.1d of OpenSSL. + You need to use version 1.0.1e of OpenSSL. You can install the NASM assembler from http://www.nasm.us/ diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index 43555a6..131bd3f 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -58,7 +58,7 @@ /> $(externalsDir)\sqlite-3.7.12 $(externalsDir)\bzip2-1.0.6 $(externalsDir)\xz-5.0.3 - $(externalsDir)\openssl-1.0.1d + $(externalsDir)\openssl-1.0.1e $(externalsDir)\tcltk $(externalsDir)\tcltk64 $(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 08aa0f7..2efe249 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -142,7 +142,7 @@ _ssl Get the source code through - svn export http://svn.python.org/projects/external/openssl-1.0.1d + svn export http://svn.python.org/projects/external/openssl-1.0.1e ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for obtaining external sources then you don't need to manually get the source diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index ef61157..c6278b2 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -14,7 +14,7 @@ cd .. @rem if exist tk8.4.16 rd /s/q tk8.4.16 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1 @rem if exist db-4.4.20 rd /s/q db-4.4.20 -@rem if exist openssl-1.0.1d rd /s/q openssl-1.0.1d +@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1e @rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12 @rem bzip @@ -24,9 +24,9 @@ if not exist bzip2-1.0.6 ( ) @rem OpenSSL -if not exist openssl-1.0.1d ( - rd /s/q openssl-1.0.1c - svn export http://svn.python.org/projects/external/openssl-1.0.1d +if not exist openssl-1.0.1e ( + rd /s/q openssl-1.0.1d + svn export http://svn.python.org/projects/external/openssl-1.0.1e ) @rem tcl/tk -- cgit v0.12 From 0ab18e4f4b93649031911099c6b2387a5098fd0e Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 12 May 2013 19:55:55 +0200 Subject: Added tag v3.3.2 for changeset d047928ae3f6 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 219362d..1bcb10e 100644 --- a/.hgtags +++ b/.hgtags @@ -113,3 +113,4 @@ c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3 bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0 92c2cfb924055ce68c4f78f836dcfe688437ceb8 v3.3.1rc1 d9893d13c6289aa03d33559ec67f97dcbf5c9e3c v3.3.1 +d047928ae3f6314a13b6137051315453d0ae89b6 v3.3.2 -- cgit v0.12