From 564747d91b08a0c53cfec6def85b7b3edb9c65e7 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 19 Sep 2017 14:40:48 -0700 Subject: Fix build issues in Doc/make.bat (#3663) --- Doc/make.bat | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Doc/make.bat b/Doc/make.bat index 0472a3d..6cb315f 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -58,7 +58,7 @@ if "%1" EQU "help" goto help if "%1" EQU "check" goto check if "%1" EQU "serve" goto serve if "%1" == "clean" ( - rmdir /q /s %BUILDDIR% + rmdir /q /s "%BUILDDIR%" goto end ) @@ -107,6 +107,8 @@ echo.be passed by setting the SPHINXOPTS environment variable. goto end :build +if not exist "%BUILDDIR%" mkdir "%BUILDDIR%" + if exist ..\Misc\NEWS ( echo.Copying Misc\NEWS to build\NEWS copy ..\Misc\NEWS build\NEWS > nul @@ -123,10 +125,10 @@ if exist ..\Misc\NEWS ( if NOT "%PAPER%" == "" ( set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS% ) -cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%* +cmd /S /C "%SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . "%BUILDDIR%\%1" %2 %3 %4 %5 %6 %7 %8 %9" if "%1" EQU "htmlhelp" ( - cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp + "%HTMLHELP%" "%BUILDDIR%\htmlhelp\python%DISTVERSION:.=%.hhp" rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2 if not errorlevel 2 cmd /C exit /b 0 ) @@ -146,19 +148,19 @@ if NOT "%2" EQU "" ( ) cmd /C %this% html -if EXIST %BUILDDIR%\html\index.html ( - echo.Opening %BUILDDIR%\html\index.html in the default web browser... - start %BUILDDIR%\html\index.html +if EXIST "%BUILDDIR%\html\index.html" ( + echo.Opening "%BUILDDIR%\html\index.html" in the default web browser... + start "%BUILDDIR%\html\index.html" ) goto end :check -cmd /C %PYTHON% tools\rstlint.py -i tools +cmd /S /C "%PYTHON% tools\rstlint.py -i tools" goto end :serve -cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html +cmd /S /C "%PYTHON% ..\Tools\scripts\serve.py "%BUILDDIR%\html"" goto end :end -- cgit v0.12 From a74ce09c738c3e3aa89994bf31049cb914dca389 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Fri, 22 Sep 2017 13:26:19 -0500 Subject: [3.6] bpo-31423: Fix building the PDF documentation (GH-3693) (GH-3699) Use prefixed macro names for the `authoraddress` function, add T2A to the font encoding in LaTeX sources to support Cyrillic characters in the PDF documentation, and replace the deprecated `font_size` config option with `pointsize`. (cherry picked from commit da9b4cfb488119f2493a762fcb1d85c58494f51d) --- Doc/conf.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Doc/conf.py b/Doc/conf.py index 18aebb6..d4ee50d 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -89,13 +89,17 @@ html_split_index = True # ------------------------ # Get LaTeX to handle Unicode correctly -latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}', 'utf8extra': ''} +latex_elements = { + 'inputenc': r'\usepackage[utf8x]{inputenc}', + 'utf8extra': '', + 'fontenc': r'\usepackage[T1,T2A]{fontenc}', +} # Additional stuff for the LaTeX preamble. latex_elements['preamble'] = r''' \authoraddress{ - \strong{Python Software Foundation}\\ - Email: \email{docs@python.org} + \sphinxstrong{Python Software Foundation}\\ + Email: \sphinxemail{docs@python.org} } \let\Verbatim=\OriginalVerbatim \let\endVerbatim=\endOriginalVerbatim @@ -105,7 +109,7 @@ latex_elements['preamble'] = r''' latex_elements['papersize'] = 'a4' # The font size ('10pt', '11pt' or '12pt'). -latex_elements['font_size'] = '10pt' +latex_elements['pointsize'] = '10pt' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, document class [howto/manual]). -- cgit v0.12 From 2e3fd03796528a9f88f79d38e1d890af153c8e61 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Fri, 29 Sep 2017 15:07:01 -0700 Subject: [3.6] bpo-31641: Allow arbitrary iterables in `concurrent.futures.as_completed()` (GH-3830) (#3831) This was possible before. GH-1560 introduced a regression after 3.6.2 got released where only sequences were accepted now. This commit addresses this problem. (cherry picked from commit 574562c5ddb2f0429aab9af762442e6f9a3f26ab) --- Lib/concurrent/futures/_base.py | 3 +-- Lib/test/test_concurrent_futures.py | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py index 70c7b61..6bace6c 100644 --- a/Lib/concurrent/futures/_base.py +++ b/Lib/concurrent/futures/_base.py @@ -214,9 +214,8 @@ def as_completed(fs, timeout=None): if timeout is not None: end_time = timeout + time.time() - total_futures = len(fs) - fs = set(fs) + total_futures = len(fs) with _AcquireFutures(fs): finished = set( f for f in fs diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index 6678784..5ddce09 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -11,6 +11,7 @@ test.support.import_module('threading') from test.support.script_helper import assert_python_ok +import itertools import os import sys import threading @@ -399,8 +400,11 @@ class AsCompletedTests: def test_duplicate_futures(self): # Issue 20367. Duplicate futures should not raise exceptions or give # duplicate responses. + # Issue #31641: accept arbitrary iterables. future1 = self.executor.submit(time.sleep, 2) - completed = [f for f in futures.as_completed([future1,future1])] + completed = [ + f for f in futures.as_completed(itertools.repeat(future1, 3)) + ] self.assertEqual(len(completed), 1) def test_free_reference_yielded_future(self): -- cgit v0.12 From a51c760ddd7ad2513202e419cde90670283a6bc9 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 2 Oct 2017 09:20:28 -0700 Subject: [3.6] bpo-31662: Fix typos in uploadrelease.bat script (#3858) (cherry picked from commit efb560eee28b6b2418e1231573ca62574d6dc07b) --- Tools/msi/uploadrelease.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat index 610b092..6441db9 100644 --- a/Tools/msi/uploadrelease.bat +++ b/Tools/msi/uploadrelease.bat @@ -22,9 +22,9 @@ if "%1" EQU "-t" (set TARGET=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--target" (set TARGET=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--dry-run" (set DRYRUN=true) && shift && goto CheckOpts if "%1" EQU "--skip-gpg" (set NOGPG=true) && shift && goto CheckOpts -if "%1" EQU "--skip-purge" (set PURGE_OPTION=) && shift && godo CheckOpts -if "%1" EQU "--skip-test" (set NOTEST=true) && shift && godo CheckOpts -if "%1" EQU "-T" (set NOTEST=true) && shift && godo CheckOpts +if "%1" EQU "--skip-purge" (set PURGE_OPTION=) && shift && goto CheckOpts +if "%1" EQU "--skip-test" (set NOTEST=true) && shift && goto CheckOpts +if "%1" EQU "-T" (set NOTEST=true) && shift && goto CheckOpts if "%1" NEQ "" echo Unexpected argument "%1" & exit /B 1 if not defined PLINK where plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" -- cgit v0.12 From 22b131305ae1055ba71024d689cc867f1bb226f6 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Tue, 3 Oct 2017 01:07:42 -0400 Subject: Add NEWS entries for 3.6.3 final cherrypicks. --- Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst | 1 + Misc/NEWS.d/next/Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst | 1 + Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst | 1 + Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst | 2 ++ 4 files changed, 5 insertions(+) create mode 100644 Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst create mode 100644 Misc/NEWS.d/next/Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst create mode 100644 Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst create mode 100644 Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst diff --git a/Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst b/Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst new file mode 100644 index 0000000..6de903d --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst @@ -0,0 +1 @@ +Fix Windows doc build issues in Doc/make.bat diff --git a/Misc/NEWS.d/next/Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst b/Misc/NEWS.d/next/Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst new file mode 100644 index 0000000..bc91a9b --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst @@ -0,0 +1 @@ +Fix building the PDF documentation with newer versions of Sphinx. diff --git a/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst b/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst new file mode 100644 index 0000000..3b873ed --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst @@ -0,0 +1 @@ +Fix typos in Windows uploadrelease.bat script. diff --git a/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst b/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst new file mode 100644 index 0000000..5d6bcbd --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst @@ -0,0 +1,2 @@ +Re-allow arbitrary iterables in `concurrent.futures.as_completed()`. Fixes +regression in 3.6.2rc1. -- cgit v0.12 From fa8421dbb452a2f36e0ec3640e21ea5ce0924b08 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Tue, 3 Oct 2017 01:26:32 -0400 Subject: Improve/fix some Misc/NEWS entries --- Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst | 1 - Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst | 3 ++- Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst diff --git a/Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst b/Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst deleted file mode 100644 index 6de903d..0000000 --- a/Misc/NEWS.d/next/Build/2017-10-03-00-58-07.bpo-9.1OL-ls.rst +++ /dev/null @@ -1 +0,0 @@ -Fix Windows doc build issues in Doc/make.bat diff --git a/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst b/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst index 3b873ed..273f815 100644 --- a/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst +++ b/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst @@ -1 +1,2 @@ -Fix typos in Windows uploadrelease.bat script. +Fix typos in Windows ``uploadrelease.bat`` script. +Fix Windows Doc build issues in ``Doc/make.bat``. diff --git a/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst b/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst index 5d6bcbd..4b67f02 100644 --- a/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst +++ b/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst @@ -1,2 +1,2 @@ Re-allow arbitrary iterables in `concurrent.futures.as_completed()`. Fixes -regression in 3.6.2rc1. +regression in 3.6.3rc1. -- cgit v0.12 From 33bd6fdf3fed0e515dbc39b3518c732250d901d9 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Tue, 3 Oct 2017 01:36:12 -0400 Subject: Update NEWS blurbs for 3.6.3 final --- Misc/NEWS.d/3.6.3.rst | 27 ++++++++++++++++++++++ .../Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst | 1 - .../Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst | 2 -- .../2017-10-03-01-05-11.bpo-31641.vlQEq5.rst | 2 -- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 Misc/NEWS.d/3.6.3.rst delete mode 100644 Misc/NEWS.d/next/Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst delete mode 100644 Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst delete mode 100644 Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst 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. diff --git a/Misc/NEWS.d/next/Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst b/Misc/NEWS.d/next/Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst deleted file mode 100644 index bc91a9b..0000000 --- a/Misc/NEWS.d/next/Build/2017-10-03-01-01-52.bpo-31423.uKvPYA.rst +++ /dev/null @@ -1 +0,0 @@ -Fix building the PDF documentation with newer versions of Sphinx. diff --git a/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst b/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst deleted file mode 100644 index 273f815..0000000 --- a/Misc/NEWS.d/next/Build/2017-10-03-01-06-24.bpo-31662.8l2jEz.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fix typos in Windows ``uploadrelease.bat`` script. -Fix Windows Doc build issues in ``Doc/make.bat``. diff --git a/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst b/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst deleted file mode 100644 index 4b67f02..0000000 --- a/Misc/NEWS.d/next/Library/2017-10-03-01-05-11.bpo-31641.vlQEq5.rst +++ /dev/null @@ -1,2 +0,0 @@ -Re-allow arbitrary iterables in `concurrent.futures.as_completed()`. Fixes -regression in 3.6.3rc1. -- cgit v0.12 From 2c5fed86e0cbba5a4e34792b0083128ce659909d Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Tue, 3 Oct 2017 01:52:02 -0400 Subject: Bump to 3.6.3 --- Doc/copyright.rst | 2 +- Include/patchlevel.h | 6 +++--- README.rst | 7 ++++--- 3 files changed, 8 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 90bdc2e..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/README.rst b/README.rst index 2cb06d3..88a7200 100644 --- a/README.rst +++ b/README.rst @@ -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. -- cgit v0.12