diff options
| author | Ned Deily <nad@python.org> | 2017-10-03 08:38:31 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2017-10-03 08:42:24 (GMT) |
| commit | e925c4f299f7e93c0d96e320a7fbd2748c53618a (patch) | |
| tree | b5903315ec6dde783014986638f9d68ed89d44b6 | |
| parent | d6201cb0e865dad116ffe46e5ea3d02e8eeb42c1 (diff) | |
| parent | 2c5fed86e0cbba5a4e34792b0083128ce659909d (diff) | |
| download | cpython-e925c4f299f7e93c0d96e320a7fbd2748c53618a.zip cpython-e925c4f299f7e93c0d96e320a7fbd2748c53618a.tar.gz cpython-e925c4f299f7e93c0d96e320a7fbd2748c53618a.tar.bz2 | |
Merge v3.6.3 into 3.6 branch
| -rw-r--r-- | Doc/copyright.rst | 2 | ||||
| -rw-r--r-- | Include/patchlevel.h | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/3.6.3.rst | 27 | ||||
| -rw-r--r-- | README.rst | 7 |
4 files changed, 35 insertions, 7 deletions
diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 22d7705..2b5400c 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2016 Python Software Foundation. All rights reserved. +Copyright © 2001-2017 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Include/patchlevel.h b/Include/patchlevel.h index c7dff54..f06b654 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 3 -#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.3rc1+" +#define PY_VERSION "3.6.3" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Misc/NEWS.d/3.6.3.rst b/Misc/NEWS.d/3.6.3.rst new file mode 100644 index 0000000..4d591d7 --- /dev/null +++ b/Misc/NEWS.d/3.6.3.rst @@ -0,0 +1,27 @@ +.. bpo: 31641 +.. date: 2017-10-03-01-05-11 +.. nonce: vlQEq5 +.. release date: 2017-10-03 +.. section: Library + +Re-allow arbitrary iterables in `concurrent.futures.as_completed()`. Fixes +regression in 3.6.3rc1. + +.. + +.. bpo: 31662 +.. date: 2017-10-03-01-06-24 +.. nonce: 8l2jEz +.. section: Build + +Fix typos in Windows ``uploadrelease.bat`` script. Fix Windows Doc build +issues in ``Doc/make.bat``. + +.. + +.. bpo: 31423 +.. date: 2017-10-03-01-01-52 +.. nonce: uKvPYA +.. section: Build + +Fix building the PDF documentation with newer versions of Sphinx. @@ -1,5 +1,5 @@ -This is Python version 3.6.3 release candidate 1 -================================================ +This is Python version 3.6.3 +============================ .. image:: https://travis-ci.org/python/cpython.svg?branch=3.6 :alt: CPython build status on Travis CI @@ -232,7 +232,8 @@ Copyright and License Information --------------------------------- Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013, 2014, 2015, 2016 Python Software Foundation. All rights reserved. +2012, 2013, 2014, 2015, 2016, 2017 Python Software Foundation. All rights +reserved. Copyright (c) 2000 BeOpen.com. All rights reserved. |