10000 Merge branch 'python:main' into fix-issue-43352 · python/cpython@cc64b69 · GitHub
[go: up one dir, main page]
Skip to content

Commit cc64b69

Browse files
YvesDupYvesDup
authored
Merge branch 'python:main' into fix-issue-43352
2 parents f7dbf9b + 105b9ac commit cc64b69

File tree

358 files changed

+7150
-4723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

358 files changed

+7150
-4723
lines changed

‎.azure-pipelines/tcltk-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ jobs:
6060
& "$(msbuild)" PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=x64 /p:tcltkDir="$(OutDir)\amd64"
6161
displayName: 'Build for amd64'
6262
63+
- powershell: |
64+
& "$(msbuild)" PCbuild\tcl.vcxproj "@msbuild.rsp" /p:Platform=ARM64 /p:tcltkDir="$(OutDir)\arm64"
65+
& "$(msbuild)" PCbuild\tk.vcxproj "@msbuild.rsp" /p:Platform=ARM64 /p:tcltkDir="$(OutDir)\arm64"
66+
& "$(msbuild)" PCbuild\tix.vcxproj "@msbuild.rsp" /p:Platform=ARM64 /p:tcltkDir="$(OutDir)\arm64"
67+
displayName: 'Build for arm64'
68+
6369
- publish: '$(OutDir)'
6470
artifact: 'tcltk'
6571
displayName: 'Publishing tcltk'

‎.azure-pipelines/windows-release/msi-steps.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@ steps:
7171
artifactName: tcltk_lib_amd64
7272
targetPath: $(Build.BinariesDirectory)\tcltk_lib_amd64
7373

74+
- task: DownloadPipelineArtifact@1
75+
displayName: 'Download artifact: tcltk_lib_arm64'
76+
condition: and(succeeded(), eq(variables['PublishARM64'], 'true'))
77+
inputs:
78+
artifactName: tcltk_lib_arm64
79+
targetPath: $(Build.BinariesDirectory)\tcltk_lib_arm64
80+
7481
- powershell: |
7582
copy $(Build.BinariesDirectory)\amd64\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
7683
displayName: 'Copy signed files into sources'
@@ -107,7 +114,6 @@ steps:
107114
PYTHONHOME: $(Build.SourcesDirectory)
108115
TclTkLibraryDir: $(Build.BinariesDirectory)\tcltk_lib_win32
109116
BuildForRelease: true
110-
SuppressMinGWLib: true
111117
112118
- script: |
113119
%MSBUILD% Tools\msi\bundle\releaselocal.wixproj /t:Rebuild /p:RebuildAll=true
@@ -120,7 +126,6 @@ steps:
120126
PYTHONHOME: $(Build.SourcesDirectory)
121127
TclTkLibraryDir: $(Build.BinariesDirectory)\tcltk_lib_amd64
122128
BuildForRelease: true
123-
SuppressMinGWLib: true
124129
125130
- script: |
126131
%MSBUILD% Tools\msi\bundle\releaselocal.wixproj /t:Rebuild /p:RebuildAll=true
@@ -132,8 +137,8 @@ steps:
132137
PYTHON: $(Build.BinariesDirectory)\win32\python.exe
133138
PythonForBuild: $(Build.BinariesDirectory)\win32\python.exe
134139
PYTHONHOME: $(Build.SourcesDirectory)
140+
TclTkLibraryDir: $(Build.BinariesDirectory)\tcltk_lib_arm64
135141
BuildForRelease: true
136-
SuppressMinGWLib: true
137142
138143
- task: CopyFiles@2
139144
displayName: 'Assemble artifact: msi (win32)'

‎.azure-pipelines/windows-release/stage-build.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,13 @@ jobs:
166166
platform: x64
167167
msbuildArguments: /t:CopyTclTkLib /p:OutDir="$(Build.ArtifactStagingDirectory)\tcl_amd64"
168168

169+
- task: MSBuild@1
170+
displayName: 'Copy Tcl/Tk lib for publish'
171+
inputs:
172+
solution: PCbuild\tcltk.props
173+
platform: ARM64
174+
msbuildArguments: /t:CopyTclTkLib /p:OutDir="$(Build.ArtifactStagingDirectory)\tcl_arm64"
175+
169176
- task: PublishPipelineArtifact@0
170177
displayName: 'Publish artifact: tcltk_lib_win32'
171178
inputs:
@@ -177,3 +184,9 @@ jobs:
177184
inputs:
178185
targetPath: '$(Build.ArtifactStagingDirectory)\tcl_amd64'
179186
artifactName: tcltk_lib_amd64
187+
188+
- task: PublishPipelineArtifact@0
189+
displayName: 'Publish artifact: tcltk_lib_arm64'
190+
inputs:
191+
targetPath: '$(Build.ArtifactStagingDirectory)\tcl_arm64'
192+
artifactName: tcltk_lib_arm64

‎.azure-pipelines/windows-release/stage-layout-full.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
HostArch: amd64
2727
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
2828
PYTHONHOME: $(Build.SourcesDirectory)
29+
TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
2930

3031
steps:
3132
- template: ./checkout.yml

‎.azure-pipelines/windows-release/stage-layout-msix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
HostArch: amd64
2626
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
2727
PYTHONHOME: $(Build.SourcesDirectory)
28+
TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
2829

2930
steps:
3031
- template: ./checkout.yml

‎.github/CODEOWNERS

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ Python/traceback.c @iritkatriel
3232
Python/pythonrun.c @iritkatriel
3333

3434
# Hashing
35-
**/*hashlib* @python/crypto-team @tiran
36-
**/*pyhash* @python/crypto-team @tiran
37-
**/*sha* @python/crypto-team @tiran
38-
**/*md5* @python/crypto-team @tiran
39-
**/*blake* @python/crypto-team @tiran
40-
/Modules/_blake2/** @python/crypto-team @tiran
41-
/Modules/_sha3/** @python/crypto-team @tiran
35+
**/*hashlib* @tiran
36+
**/*pyhash* @tiran
37+
**/*sha* @tiran
38+
**/*md5* @tiran
39+
**/*blake* @tiran
40+
/Modules/_blake2/** @tiran
41+
/Modules/_sha3/** @tiran
4242

4343
# logging
4444
**/*logging* @vsajip
@@ -61,14 +61,6 @@ Python/pythonrun.c @iritkatriel
6161
**/*import*.c @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
6262
**/*import*.py @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
6363

64-
65-
# SSL
66-
**/*ssl* @python/crypto-team
67-
**/*.pem @python/crypto-team
68-
69-
# CSPRNG
70-
Python/bootstrap_hash.c @python/crypto-team
71-
7264
# Dates and times
7365
**/*datetime* @pganssle @abalkin
7466
**/*str*time* @pganssle @abalkin
@@ -132,7 +124,7 @@ Lib/ast.py @isidentical
132124
**/*bisect* @rhettinger
133125
**/*heapq* @rhettinger
134126
**/*functools* @rhettinger
135-
**/*decimal* @rhettinger @skrah
127+
**/*decimal* @rhettinger
136128

137129
**/*dataclasses* @ericvsmith
138130

‎.github/workflows/build.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -306,12 +306,4 @@ jobs:
306306
- name: Display build info
307307
run: make pythoninfo
308308
- name: Tests
309-
# Skip test_tools test_peg_generator test_concurrent_futures because
310-
# there are too slow: between 5 and 20 minutes on this CI.
311-
#
312-
# Skip multiprocessing and concurrent.futures tests which are affected by
313-
# bpo-45200 bug: libasan dead lock in pthread_create().
314-
#
315-
# test___all__ is skipped because importing some modules directly can trigger
316-
# known problems with ASAN (like tk or crypt).
317-
run: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu -x test___all__ test_multiprocessing_fork test_multiprocessing_forkserver test_multiprocessing_spawn test_tools test_peg_generator test_concurrent_futures"
309+
run: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu"

‎.github/workflows/doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: 'Build HTML documentation'
4949
run: make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W --keep-going -j4" html
5050
- name: 'Upload'
51-
uses: actions/upload-artifact@v2.2.4
51+
uses: actions/upload-artifact@v2.3.1
5252
with:
5353
name: doc-html
5454
path: Doc/build/html

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ Mac/pythonw
7575
Misc/python.pc
7676
Misc/python-embed.pc
7777
Misc/python-config.sh
78+
Modules/Setup.bootstrap
7879
Modules/Setup.config
7980
Modules/Setup.local
8081
Modules/Setup.stdlib

‎Doc/c-api/exceptions.rst

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,14 @@ For convenience, some of these functions will always return a
253253
.. versionadded:: 3.3
254254
255255
256+
.. c:function:: PyObject* PyErr_SetImportErrorSubclass(PyObject *exception, PyObject *msg, PyObject *name, PyObject *path)
257+
258+
Much like :c:func:`PyErr_SetImportError` but this function allows for
259+
specifying a subclass of :exc:`ImportError` to raise.
260+
261+
.. versionadded:: 3.6
262+
263+
256264
.. c:function:: void PyErr_SyntaxLocationObject(PyObject *filename, int lineno, int col_offset)
257265
258266
Set file, line, and offset information for the current exception. If the
@@ -320,13 +328,6 @@ an error value).
320328
:mod:`warnings` module and the :option:`-W` option in the command line
321329
documentation. There is no C API for warning control.
322330
323-
.. c:function:: PyObject* PyErr_SetImportErrorSubclass(PyObject *exception, PyObject *msg, PyObject *name, PyObject *path)
324-
325-
Much like :c:func:`PyErr_SetImportError` but this function allows for
326-
specifying a subclass of :exc:`ImportError` to raise.
327-
328-
.. versionadded:: 3.6
329-
330331
331332
.. c:function:: int PyErr_WarnExplicitObject(PyObject *category, PyObject *message, PyObject *filename, int lineno, PyObject *module, PyObject *registry)
332333

0 commit comments

Comments
 (0)
0