Skip to content

Commit 6e7bfdb

Browse files
asvetlovasvetlov
committed
Merge branch 'main' into shared-testcase
2 parents 46680b3 + 88b7d86 commit 6e7bfdb

File tree

511 files changed

+15332
-7130
lines changed

Some content is hidden

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

511 files changed

+15332
-7130
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: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Objects/call.c @markshannon
2020
Python/ceval.c @markshannon
2121
Python/compile.c @markshannon
2222
Python/ast_opt.c @isidentical
23+
Lib/test/test_patma.py @brandtbucher
24+
Lib/test/test_peepholer.py @brandtbucher
2325

2426
# Exceptions
2527
Lib/traceback.py @iritkatriel
@@ -30,13 +32,13 @@ Python/traceback.c @iritkatriel
3032
Python/pythonrun.c @iritkatriel
3133

3234
# Hashing
33-
**/*hashlib* @python/crypto-team @tiran
34-
**/*pyhash* @python/crypto-team @tiran
35-
**/*sha* @python/crypto-team @tiran
36-
**/*md5* @python/crypto-team @tiran
37-
**/*blake* @python/crypto-team @tiran
38-
/Modules/_blake2/** @python/crypto-team @tiran
39-
/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
4042

4143
# logging
4244
**/*logging* @vsajip
@@ -59,14 +61,6 @@ Python/pythonrun.c @iritkatriel
5961
**/*import*.c @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
6062
**/*import*.py @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
6163

62-
63-
# SSL
64-
**/*ssl* @python/crypto-team
65-
**/*.pem @python/crypto-team
66-
67-
# CSPRNG
68-
Python/bootstrap_hash.c @python/crypto-team
69-
7064
# Dates and times
7165
**/*datetime* @pganssle @abalkin
7266
**/*str*time* @pganssle @abalkin
@@ -130,13 +124,13 @@ Lib/ast.py @isidentical
130124
**/*bisect* @rhettinger
131125
**/*heapq* @rhettinger
132126
**/*functools* @rhettinger
133-
**/*decimal* @rhettinger @skrah
127+
**/*decimal* @rhettinger
134128

135129
**/*dataclasses* @ericvsmith
136130

137131
**/*idlelib* @terryjreedy
138132

139-
**/*typing* @gvanrossum @Fidget-Spinner
133+
**/*typing* @gvanrossum @Fidget-Spinner @JelleZijlstra
140134

141135
**/*asyncore @giampaolo
142136
**/*asynchat @giampaolo
@@ -147,6 +141,8 @@ Lib/ast.py @isidentical
147141
**/*cgi* @ethanfurman
148142
**/*tarfile* @ethanfurman
149143

144+
**/*tomllib* @encukou
145+
150146
# macOS
151147
/Mac/ @python/macos-team
152148
**/*osx_support* @python/macos-team

‎.github/workflows/build.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ jobs:
100100
run: make smelly
101101
- name: Check limited ABI symbols
102102
run: make check-limited-abi
103-
- name: Check global objects
104-
run: make check-global-objects
105103

106104
build_win32:
107105
name: 'Windows (x86)'
@@ -308,12 +306,4 @@ jobs:
308306
- name: Display build info
309307
run: make pythoninfo
310308
- name: Tests
311-
# Skip test_tools test_peg_generator test_concurrent_futures because
312-
# there are too slow: between 5 and 20 minutes on this CI.
313-
#
314-
# Skip multiprocessing and concurrent.futures tests which are affected by
315-
# bpo-45200 bug: libasan dead lock in pthread_create().
316-
#
317-
# test___all__ is skipped because importing some modules directly can trigger
318-
# known problems with ASAN (like tk or crypt).
319-
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

‎.github/workflows/stale.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,27 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/stale@v4
17+
- name: "Check PRs with 'CLA signed' label"
18+
uses: actions/stale@v4
1819
with:
1920
repo-token: ${{ secrets.GITHUB_TOKEN }}
21+
only-pr-labels: 'CLA signed'
2022
stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity.'
2123
stale-pr-label: 'stale'
2224
days-before-stale: 30
2325
days-before-close: -1
26+
ascending: true
27+
operations-per-run: 120
28+
29+
- name: "Check PRs with 'CLA not signed' label"
30+
uses: actions/stale@v4
31+
with:
32+
repo-token: ${{ secrets.GITHUB_TOKEN }}
33+
only-pr-labels: 'CLA not signed'
34+
stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity. If the CLA is not signed within 14 days, it will be closed. See also https://devguide.python.org/pullrequest/#licensing'
35+
stale-pr-label: 'stale'
36+
close-pr-message: 'Closing this stale PR because the CLA is still not signed.'
37+
days-before-stale: 30
38+
days-before-close: 14
39+
ascending: true
40+
operations-per-run: 120

‎.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

0 commit comments

Comments
 (0)