Mailman 3 December 2021 - Python-checkins

bpo-46088: Automatically detect or install bootstrap Python runtime when building from Visual Studio (GH-30143)
by zooba Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/6fc91daf730c60b08b4b32cdce28ff2650… commit: 6fc91daf730c60b08b4b32cdce28ff26505a0622 branch: main author: Steve Dower <steve.dower(a)python.org> committer: zooba <steve.dower(a)microsoft.com> date: 2021-12-18T13:05:45Z summary: bpo-46088: Automatically detect or install bootstrap Python runtime when building from Visual Studio (GH-30143) files: A Misc/NEWS.d/next/Build/2021-12-16-14-18-07.bpo-46088.8UUuAd.rst M PCbuild/_freeze_module.vcxproj M PCbuild/find_python.bat M PCbuild/pyproject.props M PCbuild/regen.targets diff --git a/Misc/NEWS.d/next/Build/2021-12-16-14-18-07.bpo-46088.8UUuAd.rst b/Misc/NEWS.d/next/Build/2021-12-16-14-18-07.bpo-46088.8UUuAd.rst new file mode 100644 index 0000000000000..408ed53111fd2 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-12-16-14-18-07.bpo-46088.8UUuAd.rst @@ -0,0 +1,2 @@ +Automatically detect or install bootstrap Python runtime when building from +Visual Studio. diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj index 11a6a87daf91b..42798bf8113c7 100644 --- a/PCbuild/_freeze_module.vcxproj +++ b/PCbuild/_freeze_module.vcxproj @@ -432,7 +432,10 @@ <Message Text="Updated files: @(_Updated->'%(Filename)%(Extension)',', ')" Condition="'@(_Updated)' != ''" Importance="high" /> </Target> - <Target Name="_RebuildDeepFrozen" AfterTargets="_RebuildFrozen" Condition="$(Configuration) != 'PGUpdate'"> + <Target Name="_RebuildDeepFrozen" + AfterTargets="_RebuildFrozen" + DependsOnTargets="FindPythonForBuild" + Condition="$(Configuration) != 'PGUpdate'"> <Exec Command='$(PythonForBuild) "$(PySourcePath)Tools\scripts\deepfreeze.py" "%(None.OutFile)" "-m" "%(None.ModName)" -o "%(None.IntFile)"' /> <Copy SourceFiles="%(None.IntFile)" diff --git a/PCbuild/find_python.bat b/PCbuild/find_python.bat index a9bbe5a6279a6..fc1049c550818 100644 --- a/PCbuild/find_python.bat +++ b/PCbuild/find_python.bat @@ -6,6 +6,11 @@ @rem changing any other persistent state. @rem +@set _Py_D=%~dp0 + +@rem First argument -q means only show the command in output +@if '%1' EQU '-q' (shift && set _Py_Quiet=1) + @rem No arguments provided means do full search @if '%1' EQU '' goto :begin_search @@ -28,7 +33,7 @@ @if NOT "%VIRTUAL_ENV%"=="" (set PYTHON="%VIRTUAL_ENV%\Scripts\python.exe") & (set _Py_Python_Source=found in virtual env) & goto :found @set _Py_EXTERNALS_DIR=%EXTERNALS_DIR% -@if "%_Py_EXTERNALS_DIR%"=="" (set _Py_EXTERNALS_DIR=%~dp0\..\externals) +@if "%_Py_EXTERNALS_DIR%"=="" (set _Py_EXTERNALS_DIR=%_Py_D%\..\externals) @rem If we have Python in externals, use that one @if exist "%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe" ("%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe" -Ec "import sys; assert sys.version_info[:2] >= (3, 8)" >nul 2>nul) && (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") && (set _Py_Python_Source=found in externals directory) && goto :found || rmdir /Q /S "%_Py_EXTERNALS_DIR%\pythonx86" @@ -53,15 +58,18 @@ @rem If it fails, retry with any available copy of Python @powershell.exe -Command Invoke-WebRequest %_Py_NUGET_URL% -OutFile '%_Py_NUGET%' @if errorlevel 1 ( - @%_Py_HOST_PYTHON% -E "%~dp0\urlretrieve.py" "%_Py_NUGET_URL%" "%_Py_NUGET%" + @%_Py_HOST_PYTHON% -E "%_Py_D%\urlretrieve.py" "%_Py_NUGET_URL%" "%_Py_NUGET%" ) ) -@echo Installing Python via nuget... + +@if not "%_Py_Quiet%"=="1" @echo Installing Python via nuget... @"%_Py_NUGET%" install pythonx86 -ExcludeVersion -OutputDirectory "%_Py_EXTERNALS_DIR%" @rem Quote it here; it's not quoted later because "py -x.y" wouldn't work @if not errorlevel 1 (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") & (set _Py_Python_Source=found on nuget.org) & goto :found +@set _Py_D= +@set _Py_Quiet= @set _Py_Python_Source= @set _Py_EXTERNALS_DIR= @set _Py_NUGET= @@ -70,7 +78,10 @@ @exit /b 1 :found -@echo Using %PYTHON% (%_Py_Python_Source%) +@if "%_Py_Quiet%"=="1" (@echo %PYTHON%) else @echo Using %PYTHON% (%_Py_Python_Source%) + +@set _Py_D= +@set _Py_Quiet= @set _Py_Python_Source= @set _Py_EXTERNALS_DIR= @set _Py_NUGET= diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index bbcabb5cdb405..3465adec65b9a 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -225,4 +225,17 @@ public override bool Execute() { <Warning Text="vcruntime*.dll not found under $(VCRedistDir)." Condition="@(VCRuntimeDLL) == ''" /> <Message Text="VC Runtime DLL(s):%0A- @(VCRuntimeDLL,'%0A- ')" /> </Target> + + <Target Name="FindPythonForBuild" Condition="$(PythonForBuild) == ''"> + <Exec Command="$(MSBuildThisFileDirectory)\find_python.bat -q" + EchoOff="true" + ConsoleToMsBuild="true"> + <Output TaskParameter="ConsoleOutput" ItemName="_CmdExeLines" /> + </Exec> + <PropertyGroup> + <PythonForBuild>@(_CmdExeLines)</PythonForBuild> + </PropertyGroup> + <Error Text="Failed to locate suitable Python runtime for building from source." Condition="$(PythonForBuild)==''" /> + <Message Text="Using PythonForBuild=$(PythonForBuild)" Importance="high" /> + </Target> </Project> diff --git a/PCbuild/regen.targets b/PCbuild/regen.targets index c0bde1ec6ba51..a49d97190ce20 100644 --- a/PCbuild/regen.targets +++ b/PCbuild/regen.targets @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target Name="_SetPythonForBuild"> - <PropertyGroup> - <PythonForBuild>$(PYTHON)</PythonForBuild> - </PropertyGroup> - </Target> - <ItemGroup> <_PegenSources Include="$(PySourcePath)Grammar\python.gram;$(PySourcePath)Grammar\Tokens" /> <_PegenOutputs Include="$(PySourcePath)Parser\parser.c" /> @@ -44,20 +38,26 @@ AlwaysCreate="False" /> </Target> - <Target Name="_RegenPegen" Inputs="@(_PegenSources)" Outputs="@(_PegenOutputs)"> + <Target Name="_RegenPegen" + Inputs="@(_PegenSources)" Outputs="@(_PegenOutputs)" + DependsOnTargets="FindPythonForBuild"> <Message Text="Regenerate @(_PegenOutputs->'%(Filename)%(Extension)',' ')" Importance="high" />  <Exec Command="set PYTHONPATH=Tools\peg_generator%0D%0A$(PythonForBuild) -m pegen -q c ./Grammar/python.gram Grammar\Tokens -o Parser\parser.c" WorkingDirectory="$(PySourcePath)" /> </Target> - <Target Name="_RegenAST_H" Inputs="@(_ASTSources)" Outputs="@(_ASTOutputs)"> + <Target Name="_RegenAST_H" + Inputs="@(_ASTSources)" Outputs="@(_ASTOutputs)" + DependsOnTargets="FindPythonForBuild"> <Message Text="Regenerate @(_ASTOutputs->'%(Filename)%(Extension)',' ')" Importance="high" /> <Exec Command="$(PythonForBuild) Parser\asdl_c.py Parser\Python.asdl @(_ASTOutputs->'%(Argument) "%(Identity)"',' ')" WorkingDirectory="$(PySourcePath)" /> </Target> - <Target Name="_RegenOpcodes" Inputs="@(_OpcodeSources)" Outputs="@(_OpcodeOutputs)"> + <Target Name="_RegenOpcodes" + Inputs="@(_OpcodeSources)" Outputs="@(_OpcodeOutputs)" + DependsOnTargets="FindPythonForBuild"> <Message Text="Regenerate @(_OpcodeOutputs->'%(Filename)%(Extension)',' ')" Importance="high" /> <Exec Command="$(PythonForBuild) Tools\scripts\generate_opcode_h.py Lib\opcode.py Include\opcode.h" WorkingDirectory="$(PySourcePath)" /> @@ -65,14 +65,18 @@ WorkingDirectory="$(PySourcePath)" /> </Target> - <Target Name="_RegenTokens" Inputs="@(_TokenSources)" Outputs="@(_TokenOutputs)"> + <Target Name="_RegenTokens" + Inputs="@(_TokenSources)" Outputs="@(_TokenOutputs)" + DependsOnTargets="FindPythonForBuild"> <Message Text="Regenerate @(_TokenOutputs->'%(Filename)%(Extension)',' ')" Importance="high" /> <Exec Command="$(PythonForBuild) Tools\scripts\generate_token.py %(_TokenOutputs.Format) Grammar\Tokens "%(_TokenOutputs.Identity)"" WorkingDirectory="$(PySourcePath)" /> <Touch Files="@(_TokenOutputs)" /> </Target> - <Target Name="_RegenKeywords" Inputs="@(_KeywordSources)" Outputs="@(_KeywordOutputs)"> + <Target Name="_RegenKeywords" + Inputs="@(_KeywordSources)" Outputs="@(_KeywordOutputs)" + DependsOnTargets="FindPythonForBuild"> <Message Text="Regenerate @(_KeywordOutputs->'%(Filename)%(Extension)',' ')" Importance="high" /> <Exec Command="set PYTHONPATH=Tools\peg_generator%0D%0A$(PythonForBuild) -m pegen.keywordgen Grammar\python.gram Grammar\Tokens Lib\keyword.py" WorkingDirectory="$(PySourcePath)" />

1 0

bpo-40915: Avoid compiler warnings by fixing mmapmodule conversion from LARGE_INTEGER to Py_ssize_t (GH-30175)
by zooba Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/6214caafbe66e34e84c1809abf0b7aab67… commit: 6214caafbe66e34e84c1809abf0b7aab6791956b branch: main author: neonene <53406459+neonene(a)users.noreply.github.com> committer: zooba <steve.dower(a)microsoft.com> date: 2021-12-18T13:03:43Z summary: bpo-40915: Avoid compiler warnings by fixing mmapmodule conversion from LARGE_INTEGER to Py_ssize_t (GH-30175) files: M Modules/mmapmodule.c diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 21d53365776ab..399cb0a99ad65 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -536,7 +536,8 @@ mmap_resize_method(mmap_object *self, !SetEndOfFile(self->file_handle)) { /* resizing failed. try to remap the file */ file_resize_error = GetLastError(); - new_size = max_size.QuadPart = self->size; + max_size.QuadPart = self->size; + new_size = self->size; } }

1 0

[3.10] bpo-46104: Reduce use of pre-PEP 526 syntax in typing docs (GH-30148) (GH-30179)
by miss-islington Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/a66be9185c6e0299293a06e21a6f599dfe… commit: a66be9185c6e0299293a06e21a6f599dfe6c3f60 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-18T04:14:25-08:00 summary: [3.10] bpo-46104: Reduce use of pre-PEP 526 syntax in typing docs (GH-30148) (GH-30179) Co-authored-by: Andrew Svetlov <andrew.svetlov(a)gmail.com> (cherry picked from commit 6ada013df170b0afb6b61a0d942388c6fd81cbc9) Co-authored-by: Alex Waygood <Alex.Waygood(a)Gmail.com> files: M Doc/library/typing.rst diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 14e5c8fc7efea..c154364ee56ec 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -428,12 +428,12 @@ value of type :data:`Any` and assign it to any variable:: from typing import Any - a = None # type: Any - a = [] # OK - a = 2 # OK + a: Any = None + a = [] # OK + a = 2 # OK - s = '' # type: str - s = a # OK + s = '' # Inferred type of 's' is str + s = a # OK def foo(item: Any) -> int: # Typechecks; 'item' could be any type, @@ -1779,11 +1779,10 @@ Asynchronous programming correspond to those of :class:`Generator`, for example:: from collections.abc import Coroutine - c = None # type: Coroutine[list[str], str, int] - ... - x = c.send('hi') # type: list[str] + c: Coroutine[list[str], str, int] # Some coroutine defined elsewhere + x = c.send('hi') # Inferred type of 'x' is list[str] async def bar() -> None: - x = await c # type: int + y = await c # Inferred type of 'y' is int .. versionadded:: 3.5.3

1 0

[3.9] bpo-46104: Reduce use of pre-PEP 526 syntax in typing docs (GH-30148) (GH-30180)
by miss-islington Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/43cb8f483b9f815abf9801e05ec70ae55c… commit: 43cb8f483b9f815abf9801e05ec70ae55ca3c5a5 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-18T04:14:19-08:00 summary: [3.9] bpo-46104: Reduce use of pre-PEP 526 syntax in typing docs (GH-30148) (GH-30180) Co-authored-by: Andrew Svetlov <andrew.svetlov(a)gmail.com> (cherry picked from commit 6ada013df170b0afb6b61a0d942388c6fd81cbc9) Co-authored-by: Alex Waygood <Alex.Waygood(a)Gmail.com> files: M Doc/library/typing.rst diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 0eeaffb4352bf..34aaa1fac3077 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -358,12 +358,12 @@ value of type :data:`Any` and assign it to any variable:: from typing import Any - a = None # type: Any - a = [] # OK - a = 2 # OK + a: Any = None + a = [] # OK + a = 2 # OK - s = '' # type: str - s = a # OK + s = '' # Inferred type of 's' is str + s = a # OK def foo(item: Any) -> int: # Typechecks; 'item' could be any type, @@ -1445,11 +1445,10 @@ Asynchronous programming correspond to those of :class:`Generator`, for example:: from collections.abc import Coroutine - c = None # type: Coroutine[list[str], str, int] - ... - x = c.send('hi') # type: list[str] + c: Coroutine[list[str], str, int] # Some coroutine defined elsewhere + x = c.send('hi') # Inferred type of 'x' is list[str] async def bar() -> None: - x = await c # type: int + y = await c # Inferred type of 'y' is int .. versionadded:: 3.5.3

1 0

bpo-46104: Reduce use of pre-PEP 526 syntax in typing docs (GH-30148)
by Fidget-Spinner Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/6ada013df170b0afb6b61a0d942388c6fd… commit: 6ada013df170b0afb6b61a0d942388c6fd81cbc9 branch: main author: Alex Waygood <Alex.Waygood(a)Gmail.com> committer: Fidget-Spinner <28750310+Fidget-Spinner(a)users.noreply.github.com> date: 2021-12-18T18:23:51+08:00 summary: bpo-46104: Reduce use of pre-PEP 526 syntax in typing docs (GH-30148) Co-authored-by: Andrew Svetlov <andrew.svetlov(a)gmail.com> files: M Doc/library/typing.rst diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 735d477db4371..ec1b8d1a5ebcc 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -428,12 +428,12 @@ value of type :data:`Any` and assign it to any variable:: from typing import Any - a = None # type: Any - a = [] # OK - a = 2 # OK + a: Any = None + a = [] # OK + a = 2 # OK - s = '' # type: str - s = a # OK + s = '' # Inferred type of 's' is str + s = a # OK def foo(item: Any) -> int: # Typechecks; 'item' could be any type, @@ -1779,11 +1779,10 @@ Asynchronous programming correspond to those of :class:`Generator`, for example:: from collections.abc import Coroutine - c = None # type: Coroutine[list[str], str, int] - ... - x = c.send('hi') # type: list[str] + c: Coroutine[list[str], str, int] # Some coroutine defined elsewhere + x = c.send('hi') # Inferred type of 'x' is list[str] async def bar() -> None: - x = await c # type: int + y = await c # Inferred type of 'y' is int .. versionadded:: 3.5.3

1 0

[3.9] bpo-46044: Annotate deprecated sdists formats (GH-30043) (GH-30155)
by brettcannon Dec. 17, 2021

Dec. 17, 2021

https://github.com/python/cpython/commit/8202a7e3dd55d551906390742fc748d074… commit: 8202a7e3dd55d551906390742fc748d0747256b8 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: brettcannon <brett(a)python.org> date: 2021-12-17T15:32:22-08:00 summary: [3.9] bpo-46044: Annotate deprecated sdists formats (GH-30043) (GH-30155) Co-authored-by: Matthias Bussonnier <bussonniermatthias(a)gmail.com> Co-authored-by: Brett Cannon <brett(a)python.org> Co-authored-by: Éric <merwok(a)netwok.org> files: M Doc/distutils/sourcedist.rst diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 0600663d00e9d..7b1e22f824e8c 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -23,25 +23,25 @@ option, for example:: to create a gzipped tarball and a zip file. The available formats are: -+-----------+-------------------------+---------+ -| Format | Description | Notes | -+===========+=========================+=========+ -| ``zip`` | zip file (:file:`.zip`) | (1),(3) | -+-----------+-------------------------+---------+ -| ``gztar`` | gzip'ed tar file | \(2) | -| | (:file:`.tar.gz`) | | -+-----------+-------------------------+---------+ -| ``bztar`` | bzip2'ed tar file | | -| | (:file:`.tar.bz2`) | | -+-----------+-------------------------+---------+ -| ``xztar`` | xz'ed tar file | | -| | (:file:`.tar.xz`) | | -+-----------+-------------------------+---------+ -| ``ztar`` | compressed tar file | \(4) | -| | (:file:`.tar.Z`) | | -+-----------+-------------------------+---------+ -| ``tar`` | tar file (:file:`.tar`) | | -+-----------+-------------------------+---------+ ++-----------+-------------------------+-------------+ +| Format | Description | Notes | ++===========+=========================+=============+ +| ``zip`` | zip file (:file:`.zip`) | (1),(3) | ++-----------+-------------------------+-------------+ +| ``gztar`` | gzip'ed tar file | \(2) | +| | (:file:`.tar.gz`) | | ++-----------+-------------------------+-------------+ +| ``bztar`` | bzip2'ed tar file | \(5) | +| | (:file:`.tar.bz2`) | | ++-----------+-------------------------+-------------+ +| ``xztar`` | xz'ed tar file | \(5) | +| | (:file:`.tar.xz`) | | ++-----------+-------------------------+-------------+ +| ``ztar`` | compressed tar file | (4),(5) | +| | (:file:`.tar.Z`) | | ++-----------+-------------------------+-------------+ +| ``tar`` | tar file (:file:`.tar`) | \(5) | ++-----------+-------------------------+-------------+ .. versionchanged:: 3.5 Added support for the ``xztar`` format. @@ -61,6 +61,9 @@ Notes: (4) requires the :program:`compress` program. Notice that this format is now pending for deprecation and will be removed in the future versions of Python. +(5) + deprecated by `PEP 527 <https://www.python.org/dev/peps/pep-0527/>`_; + `PyPI <https://pypi.org>`_ only accepts ``.zip`` and ``.tar.gz`` files. When using any ``tar`` format (``gztar``, ``bztar``, ``xztar``, ``ztar`` or ``tar``), under Unix you can specify the ``owner`` and ``group`` names

1 0

[3.10] bpo-46044: Annotate deprecated sdists formats (GH-30043) (#30154)
by brettcannon Dec. 17, 2021

Dec. 17, 2021

https://github.com/python/cpython/commit/dbd1dc23f60a6883adf1d18e660f163fa7… commit: dbd1dc23f60a6883adf1d18e660f163fa76b8ba9 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: brettcannon <brett(a)python.org> date: 2021-12-17T15:32:02-08:00 summary: [3.10] bpo-46044: Annotate deprecated sdists formats (GH-30043) (#30154) (cherry picked from commit ecdc0ccede5f9ac4042ff56f295d81df2f428950) Co-authored-by: Matthias Bussonnier <bussonniermatthias(a)gmail.com> Co-authored-by: Brett Cannon <brett(a)python.org> Co-authored-by: Éric <merwok(a)netwok.org> files: M Doc/distutils/sourcedist.rst diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 0600663d00e9d..7b1e22f824e8c 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -23,25 +23,25 @@ option, for example:: to create a gzipped tarball and a zip file. The available formats are: -+-----------+-------------------------+---------+ -| Format | Description | Notes | -+===========+=========================+=========+ -| ``zip`` | zip file (:file:`.zip`) | (1),(3) | -+-----------+-------------------------+---------+ -| ``gztar`` | gzip'ed tar file | \(2) | -| | (:file:`.tar.gz`) | | -+-----------+-------------------------+---------+ -| ``bztar`` | bzip2'ed tar file | | -| | (:file:`.tar.bz2`) | | -+-----------+-------------------------+---------+ -| ``xztar`` | xz'ed tar file | | -| | (:file:`.tar.xz`) | | -+-----------+-------------------------+---------+ -| ``ztar`` | compressed tar file | \(4) | -| | (:file:`.tar.Z`) | | -+-----------+-------------------------+---------+ -| ``tar`` | tar file (:file:`.tar`) | | -+-----------+-------------------------+---------+ ++-----------+-------------------------+-------------+ +| Format | Description | Notes | ++===========+=========================+=============+ +| ``zip`` | zip file (:file:`.zip`) | (1),(3) | ++-----------+-------------------------+-------------+ +| ``gztar`` | gzip'ed tar file | \(2) | +| | (:file:`.tar.gz`) | | ++-----------+-------------------------+-------------+ +| ``bztar`` | bzip2'ed tar file | \(5) | +| | (:file:`.tar.bz2`) | | ++-----------+-------------------------+-------------+ +| ``xztar`` | xz'ed tar file | \(5) | +| | (:file:`.tar.xz`) | | ++-----------+-------------------------+-------------+ +| ``ztar`` | compressed tar file | (4),(5) | +| | (:file:`.tar.Z`) | | ++-----------+-------------------------+-------------+ +| ``tar`` | tar file (:file:`.tar`) | \(5) | ++-----------+-------------------------+-------------+ .. versionchanged:: 3.5 Added support for the ``xztar`` format. @@ -61,6 +61,9 @@ Notes: (4) requires the :program:`compress` program. Notice that this format is now pending for deprecation and will be removed in the future versions of Python. +(5) + deprecated by `PEP 527 <https://www.python.org/dev/peps/pep-0527/>`_; + `PyPI <https://pypi.org>`_ only accepts ``.zip`` and ``.tar.gz`` files. When using any ``tar`` format (``gztar``, ``bztar``, ``xztar``, ``ztar`` or ``tar``), under Unix you can specify the ``owner`` and ``group`` names

1 0

[3.9] bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170) (GH-30173)
by tiran Dec. 17, 2021

Dec. 17, 2021

https://github.com/python/cpython/commit/a9b3edb66f2976a5895b6399ee905ac2f2… commit: a9b3edb66f2976a5895b6399ee905ac2f27718ac branch: 3.9 author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2021-12-17T17:02:38+01:00 summary: [3.9] bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170) (GH-30173) Co-authored-by: Christian Heimes <christian(a)python.org> files: A Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst M .github/workflows/build.yml M Lib/test/test_ssl.py M Tools/ssl/multissltests.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 295b24c2cf136..e7f37f57e9a95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -207,7 +207,7 @@ jobs: strategy: fail-fast: false matrix: - openssl_ver: [1.0.2u, 1.1.0l, 1.1.1l, 3.0.0] + openssl_ver: [1.0.2u, 1.1.0l, 1.1.1l, 3.0.1] env: OPENSSL_VER: ${{ matrix.openssl_ver }} MULTISSL_DIR: ${{ github.workspace }}/multissl diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 42ebcc04dc2b8..b5eb40f869709 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -589,13 +589,16 @@ def test_openssl_version(self): self.assertLessEqual(patch, 63) self.assertGreaterEqual(status, 0) self.assertLessEqual(status, 15) - # Version string as returned by {Open,Libre}SSL, the format might change - if IS_LIBRESSL: - self.assertTrue(s.startswith("LibreSSL {:d}".format(major)), - (s, t, hex(n))) + libressl_ver = f"LibreSSL {major:d}" + if major >= 3: + # 3.x uses 0xMNN00PP0L + openssl_ver = f"OpenSSL {major:d}.{minor:d}.{patch:d}" else: - self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)), - (s, t, hex(n))) + openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}" + self.assertTrue( + s.startswith((openssl_ver, libressl_ver)), + (s, t, hex(n)) + ) @support.cpython_only def test_refcycle(self): diff --git a/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst b/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst new file mode 100644 index 0000000000000..6878cea032387 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst @@ -0,0 +1 @@ +Fix test case for OpenSSL 3.0.1 version. OpenSSL 3.0 uses ``0xMNN00PP0L``. diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index 8888c4a6e5850..8732d01e51be0 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -50,7 +50,7 @@ OPENSSL_RECENT_VERSIONS = [ "1.1.1l", - "3.0.0" + "3.0.1" ] LIBRESSL_OLD_VERSIONS = [

1 0

bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170)
by miss-islington Dec. 17, 2021

Dec. 17, 2021

https://github.com/python/cpython/commit/251d2eadc7f5b4042245709f41c38169a2… commit: 251d2eadc7f5b4042245709f41c38169a284e146 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-17T07:38:11-08:00 summary: bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170) (cherry picked from commit 2985feac4e02d590bb78bcce9e30864be53280ac) Co-authored-by: Christian Heimes <christian(a)python.org> files: A Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst M .github/workflows/build.yml M Lib/test/test_ssl.py M Tools/ssl/multissltests.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c91fcc6d05fdb..b85cf17df33d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -225,7 +225,7 @@ jobs: strategy: fail-fast: false matrix: - openssl_ver: [1.1.1l, 3.0.0] + openssl_ver: [1.1.1l, 3.0.1] env: OPENSSL_VER: ${{ matrix.openssl_ver }} MULTISSL_DIR: ${{ github.workspace }}/multissl diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index a485f7d4c3c0c..873db6403d1a0 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -539,7 +539,11 @@ def test_openssl_version(self): self.assertLessEqual(status, 15) libressl_ver = f"LibreSSL {major:d}" - openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}" + if major >= 3: + # 3.x uses 0xMNN00PP0L + openssl_ver = f"OpenSSL {major:d}.{minor:d}.{patch:d}" + else: + openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}" self.assertTrue( s.startswith((openssl_ver, libressl_ver)), (s, t, hex(n)) diff --git a/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst b/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst new file mode 100644 index 0000000000000..6878cea032387 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst @@ -0,0 +1 @@ +Fix test case for OpenSSL 3.0.1 version. OpenSSL 3.0 uses ``0xMNN00PP0L``. diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index ba2663e9a399b..8fe5b5d0c2629 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -48,7 +48,7 @@ OPENSSL_RECENT_VERSIONS = [ "1.1.1l", - "3.0.0" + "3.0.1" ] LIBRESSL_OLD_VERSIONS = [

1 0

bpo-44035: Show git diff after autoreconf and regen (GH-30117)
by tiran Dec. 17, 2021

Dec. 17, 2021

https://github.com/python/cpython/commit/da8cf8a74714f4cc34fb768345cb1caf9d… commit: da8cf8a74714f4cc34fb768345cb1caf9dcddd62 branch: main author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2021-12-17T16:17:56+01:00 summary: bpo-44035: Show git diff after autoreconf and regen (GH-30117) files: M .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4504b29432cd2..e02e9ade1ae13 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -90,8 +90,10 @@ jobs: if test -n "$changes"; then echo "Generated files not up to date." echo "Perhaps you forgot to run make regen-all or build.bat --regen. ;)" - echo "configure files must be regenerated with a specific, unpatched version of autoconf." + echo "configure files must be regenerated with a specific version of autoconf." echo "$changes" + echo "" + git diff --staged || true exit 1 fi - name: Check exported libpython symbols

1 0