Skip to content

Commit d2925e6

Browse files
serhiy-storchakaserhiy-storchaka
authored
Merge branch 'master' into randrange-index
2 parents 2e8cfda + 73607be commit d2925e6

791 files changed

Lines changed: 37477 additions & 19607 deletions

File tree

Some content is hidden

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

‎.azure-pipelines/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
matrix:
105105
win32:
106106
arch: win32
107-
buildOpt:
107+
buildOpt: '-p Win32'
108108
testRunTitle: '$(Build.SourceBranchName)-win32'
109109
testRunPlatform: win32
110110
win64:

‎.azure-pipelines/docs-steps.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ steps:
1212
inputs:
1313
versionSpec: '>=3.6'
1414

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

1818
- ${{ if ne(parameters.latex, 'true') }}:
19-
- script: make check suspicious html PYTHON=python
19+
- script: make check html PYTHON=python
2020
workingDirectory: '$(build.sourcesDirectory)/Doc'
2121
displayName: 'Build documentation'
2222

@@ -31,7 +31,7 @@ steps:
3131
- ${{ if eq(parameters.upload, 'true') }}:
3232
- task: PublishBuildArtifacts@1
3333
displayName: 'Publish docs'
34-
34+
3535
inputs:
3636
PathToPublish: '$(build.sourcesDirectory)/Doc/build'
3737
ArtifactName: docs

‎.azure-pipelines/pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
matrix:
105105
win32:
106106
arch: win32
107-
buildOpt:
107+
buildOpt: '-p Win32'
108108
testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
109109
testRunPlatform: win32
110110
win64:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,11 @@ jobs:
120120
artifactName: unsigned_msix
121121
downloadPath: $(Build.BinariesDirectory)
122122

123+
# MSIX must be signed and timestamped simultaneously
123124
- powershell: |
124125
$failed = $true
125126
foreach ($retry in 1..3) {
126-
signtool sign /a /n "$(SigningCertificate)" /fd sha256 /t http://timestamp.verisign.com/scripts/timestamp.dll /d "$(SigningDescription)" (gi *.msix)
127+
signtool sign /a /n "$(SigningCertificate)" /fd sha256 /tr http://timestamp.digicert.com/ /td sha256 /d "$(SigningDescription)" (gi *.msix)
127128
if ($?) {
128129
$failed = $false
129130
break

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
condition: and(succeeded(), eq(variables['DoNuget'], 'true'))
55

66
pool:
7-
vmImage: windows-2019
7+
name: 'Windows Release'
88

99
workspace:
1010
clean: all
@@ -36,6 +36,14 @@ jobs:
3636
nuget pack "$(Build.BinariesDirectory)\layout\python.nuspec" -OutputDirectory $(Build.ArtifactStagingDirectory) -NoPackageAnalysis -NonInteractive
3737
displayName: 'Create nuget package'
3838
39+
- powershell: |
40+
gci *.nupkg | %{
41+
nuget sign "$_" -CertificateSubjectName "$(SigningCertificate)" -Timestamper http://timestamp.digicert.com/ -Overwrite
42+
}
43+
displayName: 'Sign nuget package'
44+
workingDirectory: $(Build.ArtifactStagingDirectory)
45+
condition: and(succeeded(), variables['SigningCertificate'])
46+
3947
- task: PublishBuildArtifacts@1
4048
displayName: 'Publish Artifact: nuget'
4149
inputs:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
$files = (gi ${{ parameters.Include }} -Exclude ${{ parameters.Exclude }})
5858
$failed = $true
5959
foreach ($retry in 1..10) {
60-
signtool timestamp /t http://timestamp.verisign.com/scripts/timestamp.dll $files
60+
signtool timestamp /tr http://timestamp.digicert.com/ /td sha256 $files
6161
if ($?) {
6262
$failed = $false
6363
break

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ updates:
77
labels:
88
- "skip issue"
99
- "skip news"
10+
target_branch:
11+
- "master"
12+
- "3.9"
13+
- "3.8"

‎.github/workflows/build.yml‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,37 @@ jobs:
4747
# https://github.com/python/core-workflow/issues/373
4848
git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc)' && echo '::set-output name=run_tests::true' || true
4949
fi
50+
51+
check_generated_files:
52+
name: 'Check if generated files are up to date'
53+
runs-on: ubuntu-latest
54+
needs: check_source
55+
if: needs.check_source.outputs.run_tests == 'true'
56+
steps:
57+
- uses: actions/checkout@v2
58+
- uses: actions/setup-python@v2
59+
- name: Install Dependencies
60+
run: sudo ./.github/workflows/posix-deps-apt.sh
61+
- name: Build CPython
62+
run: |
63+
# Build Python with the libpython dynamic library
64+
./configure --with-pydebug --enable-shared
65+
make -j4 regen-all
66+
- name: Check for changes
67+
run: |
68+
changes=$(git status --porcelain)
69+
# Check for changes in regenerated files
70+
if ! test -z "$changes"
71+
then
72+
echo "Generated files not up to date. Perhaps you forgot to run make regen-all ;)"
73+
echo "$changes"
74+
exit 1
75+
fi
76+
- name: Check exported libpython symbols
77+
run: make smelly
78+
- name: Check limited ABI symbols
79+
run: make check-limited-abi
80+
5081
build_win32:
5182
name: 'Windows (x86)'
5283
runs-on: windows-latest
@@ -59,7 +90,7 @@ jobs:
5990
- name: Display build info
6091
run: .\python.bat -m test.pythoninfo
6192
- name: Tests
62-
run: .\PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
93+
run: .\PCbuild\rt.bat -p Win32 -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
6394

6495
build_win_amd64:
6596
name: 'Windows (x64)'
@@ -73,7 +104,7 @@ jobs:
73104
- name: Display build info
74105
run: .\python.bat -m test.pythoninfo
75106
- name: Tests
76-
run: .\PCbuild\rt.bat -x64 -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
107+
run: .\PCbuild\rt.bat -p x64 -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
77108

78109
build_macos:
79110
name: 'macOS'
@@ -106,7 +137,7 @@ jobs:
106137
run: sudo ./.github/workflows/posix-deps-apt.sh
107138
- name: 'Restore OpenSSL build'
108139
id: cache-openssl
109-
uses: actions/cache@v2.1.2
140+
uses: actions/cache@v2.1.3
110141
with:
111142
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
112143
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

‎.github/workflows/coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: sudo ./.github/workflows/posix-deps-apt.sh
3333
- name: 'Restore OpenSSL build'
3434
id: cache-openssl
35-
uses: actions/cache@v2.1.2
35+
uses: actions/cache@v2.1.3
3636
with:
3737
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
3838
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

‎.github/workflows/doc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
- name: 'Install build dependencies'
3737
run: make -C Doc/ PYTHON=../python venv
3838
- name: 'Build documentation'
39-
run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W --keep-going -j4" doctest suspicious html
39+
run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W --keep-going -j4" doctest html
4040
- name: 'Upload'
41-
uses: actions/upload-artifact@v2.2.0
41+
uses: actions/upload-artifact@v2.2.1
4242
with:
4343
name: doc-html
4444
path: Doc/build/html

0 commit comments

Comments
 (0)