Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 03ca24c

Browse filesBrowse files
mjpietersmjpieters
committed
Merge branch 'master' into bpo38364_partialmethod_inspect
Updated the `versionadded` references to 3.9.
2 parents e089c72 + 9a669d5 commit 03ca24c
Copy full SHA for 03ca24c

File tree

1,256 files changed

+28773
-15114
lines changed
Filter options

Some content is hidden

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

1,256 files changed

+28773
-15114
lines changed

‎.azure-pipelines/ci.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/ci.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
buildOpt: '-p x64'
146146
testRunTitle: '$(Build.SourceBranchName)-win64'
147147
testRunPlatform: win64
148-
maxParallel: 2
148+
maxParallel: 4
149149

150150
steps:
151151
- template: ./windows-steps.yml

‎.azure-pipelines/docs-steps.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/docs-steps.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
inputs:
1313
versionSpec: '>=3.6'
1414

15-
- script: python -m pip install sphinx==2.0.1 blurb python-docs-theme
15+
- script: python -m pip install sphinx==2.2.0 blurb python-docs-theme
1616
displayName: 'Install build dependencies'
1717

1818
- ${{ if ne(parameters.latex, 'true') }}:
@@ -21,7 +21,7 @@ steps:
2121
displayName: 'Build documentation'
2222

2323
- ${{ if eq(parameters.latex, 'true') }}:
24-
- script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full
24+
- script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full
2525
displayName: 'Install LaTeX'
2626

2727
- script: make dist PYTHON=python SPHINXBUILD='python -m sphinx' BLURB='python -m blurb'

‎.azure-pipelines/pr.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/pr.yml
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,10 @@ jobs:
145145
buildOpt: '-p x64'
146146
testRunTitle: '$(System.PullRequest.TargetBranch)-win64'
147147
testRunPlatform: win64
148-
maxParallel: 2
148+
winarm64:
149+
arch: arm64
150+
buildOpt: '-p arm64'
151+
maxParallel: 4
149152

150153
steps:
151154
- template: ./windows-steps.yml

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

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/build-steps.yml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ steps:
4343

4444
- powershell: |
4545
$env:SigningCertificate = $null
46-
.\python.bat PC\layout -vv -t "$(Build.BinariesDirectory)\catalog" --catalog "${env:CAT}.cdf" --preset-default
46+
$(_HostPython) PC\layout -vv -b "$(Build.BinariesDirectory)\bin" -t "$(Build.BinariesDirectory)\catalog" --catalog "${env:CAT}.cdf" --preset-default --arch $(Arch)
4747
makecat "${env:CAT}.cdf"
4848
del "${env:CAT}.cdf"
4949
if (-not (Test-Path "${env:CAT}.cat")) {
@@ -52,6 +52,7 @@ steps:
5252
displayName: 'Generate catalog'
5353
env:
5454
CAT: $(Build.BinariesDirectory)\bin\$(Arch)\python
55+
PYTHON_HEXVERSION: $(VersionHex)
5556

5657
- task: PublishPipelineArtifact@0
5758
displayName: 'Publish binaries'

‎.azure-pipelines/windows-release/layout-command.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/layout-command.yml
+9-1Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
steps:
2+
- task: DownloadPipelineArtifact@1
3+
displayName: 'Download artifact: bin_$(HostArch)'
4+
condition: and(succeeded(), variables['HostArch'])
5+
inputs:
6+
artifactName: bin_$(HostArch)
7+
targetPath: $(Build.BinariesDirectory)\bin_$(HostArch)
8+
29
- powershell: >
310
Write-Host (
411
'##vso[task.setvariable variable=LayoutCmd]&
5-
"{0}\bin\python.exe"
12+
"$(Python)"
613
"{1}\PC\layout"
714
-vv
815
--source "{1}"
916
--build "{0}\bin"
17+
--arch "$(Name)"
1018
--temp "{0}\layout-temp"
1119
--include-cat "{0}\bin\python.cat"
1220
--doc-build "{0}\doc"'

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

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/msi-steps.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ steps:
5454
- powershell: |
5555
copy $(Build.BinariesDirectory)\amd64\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
5656
displayName: 'Copy signed files into sources'
57+
condition: and(succeeded(), variables['SigningCertificate'])
5758
5859
- script: |
5960
call Tools\msi\get_externals.bat

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

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-build.yml
+22-3Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ jobs:
1616
env:
1717
BUILDDIR: $(Build.BinariesDirectory)\Doc
1818

19-
#- powershell: iwr "https://www.python.org/ftp/python/3.7.3/python373.chm" -OutFile "$(Build.BinariesDirectory)\python390a0.chm"
20-
# displayName: 'Cheat at building CHM docs'
21-
2219
- script: Doc\make.bat htmlhelp
2320
displayName: 'Build CHM docs'
2421
env:
2522
BUILDDIR: $(Build.BinariesDirectory)\Doc
2623

24+
#- powershell: |
25+
# mkdir -Force "$(Build.BinariesDirectory)\Doc\htmlhelp"
26+
# iwr "https://www.python.org/ftp/python/3.8.0/python380.chm" -OutFile "$(Build.BinariesDirectory)\Doc\htmlhelp\python390a0.chm"
27+
# displayName: 'Cheat at building CHM docs'
28+
2729
- task: CopyFiles@2
2830
displayName: 'Assemble artifact: Doc'
2931
inputs:
@@ -55,16 +57,31 @@ jobs:
5557
Arch: win32
5658
Platform: x86
5759
Configuration: Release
60+
_HostPython: .\python
5861
win32_d:
5962
Name: win32_d
6063
Arch: win32
6164
Platform: x86
6265
Configuration: Debug
66+
_HostPython: .\python
6367
amd64_d:
6468
Name: amd64_d
6569
Arch: amd64
6670
Platform: x64
6771
Configuration: Debug
72+
_HostPython: .\python
73+
arm64:
74+
Name: arm64
75+
Arch: arm64
76+
Platform: ARM64
77+
Configuration: Release
78+
_HostPython: python
79+
arm64_d:
80+
Name: arm64_d
81+
Arch: arm64
82+
Platform: ARM64
83+
Configuration: Debug
84+
_HostPython: python
6885

6986
steps:
7087
- template: ./build-steps.yml
@@ -86,6 +103,7 @@ jobs:
86103
Arch: amd64
87104
Platform: x64
88105
Configuration: Release
106+
_HostPython: .\python
89107

90108
steps:
91109
- template: ./build-steps.yml
@@ -111,6 +129,7 @@ jobs:
111129
Arch: amd64
112130
Platform: x64
113131
Configuration: Release
132+
_HostPython: .\python
114133

115134
steps:
116135
- template: ./build-steps.yml

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

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-layout-embed.yml
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ jobs:
1919
Name: amd64
2020
Python: $(Build.BinariesDirectory)\bin\python.exe
2121
PYTHONHOME: $(Build.SourcesDirectory)
22+
arm64:
23+
Name: arm64
24+
HostArch: amd64
25+
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
26+
PYTHONHOME: $(Build.SourcesDirectory)
2227

2328
steps:
2429
- template: ./checkout.yml

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

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-layout-full.yml
+13-4Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,18 @@ jobs:
1313
matrix:
1414
win32:
1515
Name: win32
16-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
16+
Python: $(Build.BinariesDirectory)\bin\python.exe
1717
PYTHONHOME: $(Build.SourcesDirectory)
18+
TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
1819
amd64:
1920
Name: amd64
20-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
21+
Python: $(Build.BinariesDirectory)\bin\python.exe
22+
PYTHONHOME: $(Build.SourcesDirectory)
23+
TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
24+
arm64:
25+
Name: arm64
26+
HostArch: amd64
27+
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
2128
PYTHONHOME: $(Build.SourcesDirectory)
2229

2330
steps:
@@ -43,21 +50,23 @@ jobs:
4350

4451
- task: DownloadPipelineArtifact@1
4552
displayName: 'Download artifact: tcltk_lib_$(Name)'
53+
condition: and(succeeded(), variables['TclLibrary'])
4654
inputs:
4755
artifactName: tcltk_lib_$(Name)
4856
targetPath: $(Build.BinariesDirectory)\tcltk_lib
4957

5058
- powershell: |
51-
copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
59+
copy "$(Build.BinariesDirectory)\bin\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
5260
displayName: 'Copy signed files into sources'
61+
condition: and(succeeded(), variables['SigningCertificate'])
5362
5463
- template: ./layout-command.yml
5564

5665
- powershell: |
5766
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\layout" --preset-default
5867
displayName: 'Generate full layout'
5968
env:
60-
TCL_LIBRARY: $(Build.BinariesDirectory)\tcltk_lib\tcl8
69+
TCL_LIBRARY: $(TclLibrary)
6170
6271
- task: PublishPipelineArtifact@0
6372
displayName: 'Publish Artifact: layout_full_$(Name)'

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

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-layout-msix.yml
+14-5Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,18 @@ jobs:
1212
matrix:
1313
#win32:
1414
# Name: win32
15-
# Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
15+
# Python: $(Build.BinariesDirectory)\bin\python.exe
1616
# PYTHONHOME: $(Build.SourcesDirectory)
17+
# TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
1718
amd64:
1819
Name: amd64
19-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
20+
Python: $(Build.BinariesDirectory)\bin\python.exe
21+
PYTHONHOME: $(Build.SourcesDirectory)
22+
TclLibrary: $(Build.BinariesDirectory)\tcltk_lib\tcl8
23+
arm64:
24+
Name: arm64
25+
HostArch: amd64
26+
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
2027
PYTHONHOME: $(Build.SourcesDirectory)
2128

2229
steps:
@@ -36,13 +43,15 @@ jobs:
3643

3744
- task: DownloadPipelineArtifact@1
3845
displayName: 'Download artifact: tcltk_lib_$(Name)'
46+
condition: and(succeeded(), variables['TclLibrary'])
3947
inputs:
4048
artifactName: tcltk_lib_$(Name)
4149
targetPath: $(Build.BinariesDirectory)\tcltk_lib
4250

4351
- powershell: |
44-
copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
52+
copy "$(Build.BinariesDirectory)\bin\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
4553
displayName: 'Copy signed files into sources'
54+
condition: and(succeeded(), variables['SigningCertificate'])
4655
4756
- template: ./layout-command.yml
4857

@@ -51,7 +60,7 @@ jobs:
5160
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\appx-store" --preset-appx --precompile
5261
displayName: 'Generate store APPX layout'
5362
env:
54-
TCL_LIBRARY: $(Build.BinariesDirectory)\tcltk_lib\tcl8
63+
TCL_LIBRARY: $(TclLibrary)
5564
5665
- task: PublishPipelineArtifact@0
5766
displayName: 'Publish Artifact: layout_appxstore_$(Name)'
@@ -79,7 +88,7 @@ jobs:
7988
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\appx" --preset-appx --precompile --include-symbols --include-tests
8089
displayName: 'Generate sideloading APPX layout'
8190
env:
82-
TCL_LIBRARY: $(Build.BinariesDirectory)\tcltk_lib\tcl8
91+
TCL_LIBRARY: $(TclLibrary)
8392
8493
- task: PublishPipelineArtifact@0
8594
displayName: 'Publish Artifact: layout_appx_$(Name)'

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

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-layout-nuget.yml
+8-4Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ jobs:
1313
matrix:
1414
win32:
1515
Name: win32
16-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
16+
Python: $(Build.BinariesDirectory)\bin\python.exe
1717
PYTHONHOME: $(Build.SourcesDirectory)
1818
amd64:
1919
Name: amd64
20-
Python: $(Build.BinariesDirectory)\bin_$(Name)\python.exe
20+
Python: $(Build.BinariesDirectory)\bin\python.exe
21+
PYTHONHOME: $(Build.SourcesDirectory)
22+
arm64:
23+
Name: arm64
24+
HostArch: amd64
25+
Python: $(Build.BinariesDirectory)\bin_amd64\python.exe
2126
PYTHONHOME: $(Build.SourcesDirectory)
2227

2328
steps:
@@ -32,14 +37,13 @@ jobs:
3237
- powershell: |
3338
copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
3439
displayName: 'Copy signed files into sources'
40+
condition: and(succeeded(), variables['SigningCertificate'])
3541
3642
- template: ./layout-command.yml
3743

3844
- powershell: |
3945
$(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\nuget" --preset-nuget
4046
displayName: 'Generate nuget layout'
41-
env:
42-
TCL_LIBRARY: $(Build.BinariesDirectory)\bin_$(Name)\tcl\tcl8
4347
4448
- task: PublishPipelineArtifact@0
4549
displayName: 'Publish Artifact: layout_nuget_$(Name)'

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

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-pack-msix.yml
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@ jobs:
2020
Artifact: appxstore
2121
Suffix: -store
2222
Upload: true
23+
arm64:
24+
Name: arm64
25+
Artifact: appx
26+
Suffix:
27+
ShouldSign: true
28+
arm64_store:
29+
Name: arm64
30+
Artifact: appxstore
31+
Suffix: -store
32+
Upload: true
2333

2434
steps:
2535
- template: ./checkout.yml

‎.azure-pipelines/windows-release/stage-pack-nuget.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-pack-nuget.yml
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
Name: amd64
1616
win32:
1717
Name: win32
18+
arm64:
19+
Name: arm64
1820

1921
steps:
2022
- checkout: none

‎.azure-pipelines/windows-release/stage-publish-nugetorg.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-publish-nugetorg.yml
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ jobs:
3131
buildVersionToDownload: specific
3232
buildId: $(BuildToPublish)
3333

34+
- powershell: 'gci pythonarm*.nupkg | %{ Write-Host "Not publishing: $($_.Name)"; gi $_ } | del'
35+
displayName: 'Prevent publishing ARM/ARM64 packages'
36+
workingDirectory: '$(Build.BinariesDirectory)\nuget'
37+
condition: and(succeeded(), not(variables['PublishArmPackages']))
38+
3439
- task: NuGetCommand@2
3540
displayName: Push packages
3641
condition: and(succeeded(), eq(variables['SigningCertificate'], variables['__RealSigningCertificate']))

‎.azure-pipelines/windows-release/stage-publish-pythonorg.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-publish-pythonorg.yml
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ jobs:
3939
artifactName: embed
4040
downloadPath: $(Build.BinariesDirectory)
4141

42+
- powershell: 'gci *embed-arm*.zip | %{ Write-Host "Not publishing: $($_.Name)"; gi $_ } | del'
43+
displayName: 'Prevent publishing ARM/ARM64 packages'
44+
workingDirectory: '$(Build.BinariesDirectory)\embed'
45+
condition: and(succeeded(), not(variables['PublishArmPackages']))
4246

4347
- task: DownloadPipelineArtifact@1
4448
displayName: 'Download artifact from $(BuildToPublish): Doc'

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

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-release/stage-sign.yml
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
Name: win32
2020
amd64:
2121
Name: amd64
22+
arm64:
23+
Name: arm64
2224

2325
steps:
2426
- template: ./checkout.yml

‎.azure-pipelines/windows-steps.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-steps.yml
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ steps:
1919

2020
- script: python.bat -m test.pythoninfo
2121
displayName: 'Display build info'
22+
condition: and(succeeded(), variables['testRunPlatform'])
2223

2324
- script: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results.xml" --tempdir="$(Build.BinariesDirectory)\test"
2425
displayName: 'Tests'
26+
condition: and(succeeded(), variables['testRunPlatform'])
2527
env:
2628
PREFIX: $(Py_OutDir)\$(arch)
2729

@@ -32,4 +34,4 @@ steps:
3234
mergeTestResults: true
3335
testRunTitle: $(testRunTitle)
3436
platform: $(testRunPlatform)
35-
condition: succeededOrFailed()
37+
condition: and(succeededOrFailed(), variables['testRunPlatform'])

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.