Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5aab3dc

Browse files
serhiy-storchakaserhiy-storchaka
committed
Merge branch 'master' into accept-bool
2 parents c74f20a + 8e19c8b commit 5aab3dc

File tree

2,546 files changed

+283276
-111639
lines changed

Some content is hidden

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

2,546 files changed

+283276
-111639
lines changed

‎.azure-pipelines/ci.yml‎

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
variables:
2-
manylinux: false
32
coverage: false
43

5-
resources:
6-
containers:
7-
- container: manylinux1
8-
image: pyca/cryptography-manylinux1:x86_64
4+
trigger: ['master', '3.9', '3.8', '3.7']
95

106
jobs:
117
- job: Prebuild
128
displayName: Pre-build checks
139

1410
pool:
15-
vmImage: ubuntu-16.04
11+
vmImage: ubuntu-18.04
1612

1713
steps:
1814
- template: ./prebuild-checks.yml
@@ -24,7 +20,7 @@ jobs:
2420
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
2521

2622
pool:
27-
vmImage: ubuntu-16.04
23+
vmImage: ubuntu-18.04
2824

2925
steps:
3026
- template: ./docs-steps.yml
@@ -35,14 +31,16 @@ jobs:
3531
- job: macOS_CI_Tests
3632
displayName: macOS CI Tests
3733
dependsOn: Prebuild
38-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
34+
#condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
35+
# bpo-39837: macOS tests on Azure Pipelines are disabled
36+
condition: false
3937

4038
variables:
4139
testRunTitle: '$(build.sourceBranchName)-macos'
4240
testRunPlatform: macos
4341

4442
pool:
45-
vmImage: xcode9-macos10.13
43+
vmImage: macos-10.14
4644

4745
steps:
4846
- template: ./macos-steps.yml
@@ -54,50 +52,19 @@ jobs:
5452
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5553

5654
pool:
57-
vmImage: ubuntu-16.04
55+
vmImage: ubuntu-18.04
5856

5957
variables:
6058
testRunTitle: '$(build.sourceBranchName)-linux'
6159
testRunPlatform: linux
62-
openssl_version: 1.1.1c
60+
openssl_version: 1.1.1g
6361

6462
steps:
6563
- template: ./posix-steps.yml
6664
parameters:
6765
dependencies: apt
6866

6967

70-
- job: ManyLinux1_CI_Tests
71-
displayName: ManyLinux1 CI Tests
72-
dependsOn: Prebuild
73-
condition: |
74-
and(
75-
and(
76-
succeeded(),
77-
eq(variables['manylinux'], 'true')
78-
),
79-
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
80-
)
81-
82-
pool:
83-
vmImage: ubuntu-16.04
84-
85-
container: manylinux1
86-
87-
variables:
88-
testRunTitle: '$(build.sourceBranchName)-manylinux1'
89-
testRunPlatform: manylinux1
90-
openssl_version: ''
91-
92-
steps:
93-
- template: ./posix-steps.yml
94-
parameters:
95-
dependencies: yum
96-
sudo_dependencies: ''
97-
xvfb: false
98-
patchcheck: false
99-
100-
10168
- job: Ubuntu_Coverage_CI_Tests
10269
displayName: Ubuntu CI Tests (coverage)
10370
dependsOn: Prebuild
@@ -111,12 +78,12 @@ jobs:
11178
)
11279
11380
pool:
114-
vmImage: ubuntu-16.04
81+
vmImage: ubuntu-18.04
11582

11683
variables:
11784
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
11885
testRunPlatform: linux-coverage
119-
openssl_version: 1.1.1c
86+
openssl_version: 1.1.1g
12087

12188
steps:
12289
- template: ./posix-steps.yml
@@ -131,7 +98,7 @@ jobs:
13198
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
13299

133100
pool:
134-
vmImage: vs2017-win2016
101+
vmImage: windows-2019
135102

136103
strategy:
137104
matrix:
@@ -145,7 +112,7 @@ jobs:
145112
buildOpt: '-p x64'
146113
testRunTitle: '$(Build.SourceBranchName)-win64'
147114
testRunPlatform: win64
148-
maxParallel: 2
115+
maxParallel: 4
149116

150117
steps:
151118
- template: ./windows-steps.yml

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

Lines 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/macos-steps.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ steps:
66
- script: ./configure --with-pydebug --with-openssl=/usr/local/opt/openssl --prefix=/opt/python-azdev
77
displayName: 'Configure CPython (debug)'
88

9-
- script: make -s -j4
9+
- script: make -j4
1010
displayName: 'Build CPython'
1111

1212
- script: make pythoninfo
1313
displayName: 'Display build info'
1414

1515
- script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
1616
displayName: 'Tests'
17+
continueOnError: true
18+
timeoutInMinutes: 30
1719

1820
- task: PublishTestResults@2
1921
displayName: 'Publish Test Results'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
- script: ./configure --with-pydebug
2121
displayName: 'Configure CPython (debug)'
2222

23-
- script: make -s -j4
23+
- script: make -j4
2424
displayName: 'Build CPython'
2525

2626
- ${{ if eq(parameters.coverage, 'true') }}:
@@ -49,7 +49,7 @@ steps:
4949
- script: ./venv/bin/python -m coverage xml
5050
displayName: 'Generate coverage.xml'
5151

52-
- script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash)
52+
- script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash) -y .github/codecov.yml
5353
displayName: 'Publish code coverage results'
5454

5555

‎.azure-pipelines/pr.yml‎

Lines changed: 16 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
variables:
2-
manylinux: false
32
coverage: false
43

5-
resources:
6-
containers:
7-
- container: manylinux1
8-
image: pyca/cryptography-manylinux1:x86_64
4+
pr: ['master', '3.9', '3.8', '3.7']
95

106
jobs:
117
- job: Prebuild
128
displayName: Pre-build checks
139

1410
pool:
15-
vmImage: ubuntu-16.04
11+
vmImage: ubuntu-18.04
1612

1713
steps:
1814
- template: ./prebuild-checks.yml
@@ -24,7 +20,7 @@ jobs:
2420
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
2521

2622
pool:
27-
vmImage: ubuntu-16.04
23+
vmImage: ubuntu-18.04
2824

2925
steps:
3026
- template: ./docs-steps.yml
@@ -33,14 +29,16 @@ jobs:
3329
- job: macOS_PR_Tests
3430
displayName: macOS PR Tests
3531
dependsOn: Prebuild
36-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
32+
#condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
33+
# bpo-39837: macOS tests on Azure Pipelines are disabled
34+
condition: false
3735

3836
variables:
3937
testRunTitle: '$(system.pullRequest.TargetBranch)-macos'
4038
testRunPlatform: macos
4139

4240
pool:
43-
vmImage: xcode9-macos10.13
41+
vmImage: macos-10.14
4442

4543
steps:
4644
- template: ./macos-steps.yml
@@ -54,50 +52,19 @@ jobs:
5452
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5553

5654
pool:
57-
vmImage: ubuntu-16.04
55+
vmImage: ubuntu-18.04
5856

5957
variables:
6058
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
6159
testRunPlatform: linux
62-
openssl_version: 1.1.1c
60+
openssl_version: 1.1.1g
6361

6462
steps:
6563
- template: ./posix-steps.yml
6664
parameters:
6765
dependencies: apt
6866

6967

70-
- job: ManyLinux1_PR_Tests
71-
displayName: ManyLinux1 PR Tests
72-
dependsOn: Prebuild
73-
condition: |
74-
and(
75-
and(
76-
succeeded(),
77-
eq(variables['manylinux'], 'true')
78-
),
79-
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
80-
)
81-
82-
pool:
83-
vmImage: ubuntu-16.04
84-
85-
container: manylinux1
86-
87-
variables:
88-
testRunTitle: '$(system.pullRequest.TargetBranch)-manylinux1'
89-
testRunPlatform: manylinux1
90-
openssl_version: ''
91-
92-
steps:
93-
- template: ./posix-steps.yml
94-
parameters:
95-
dependencies: yum
96-
sudo_dependencies: ''
97-
xvfb: false
98-
patchcheck: false
99-
100-
10168
- job: Ubuntu_Coverage_PR_Tests
10269
displayName: Ubuntu PR Tests (coverage)
10370
dependsOn: Prebuild
@@ -111,12 +78,12 @@ jobs:
11178
)
11279
11380
pool:
114-
vmImage: ubuntu-16.04
81+
vmImage: ubuntu-18.04
11582

11683
variables:
11784
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
11885
testRunPlatform: linux-coverage
119-
openssl_version: 1.1.1c
86+
openssl_version: 1.1.1g
12087

12188
steps:
12289
- template: ./posix-steps.yml
@@ -131,7 +98,7 @@ jobs:
13198
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
13299

133100
pool:
134-
vmImage: vs2017-win2016
101+
vmImage: windows-2019
135102

136103
strategy:
137104
matrix:
@@ -145,7 +112,10 @@ jobs:
145112
buildOpt: '-p x64'
146113
testRunTitle: '$(System.PullRequest.TargetBranch)-win64'
147114
testRunPlatform: win64
148-
maxParallel: 2
115+
winarm64:
116+
arch: arm64
117+
buildOpt: '-p arm64'
118+
maxParallel: 4
149119

150120
steps:
151121
- template: ./windows-steps.yml

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

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

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
steps:
22
- template: ./checkout.yml
33

4+
- powershell: |
5+
$d = (.\PCbuild\build.bat -V) | %{ if($_ -match '\s+(\w+):\s*(.+)\s*$') { @{$Matches[1] = $Matches[2];} }};
6+
Write-Host "##vso[task.setvariable variable=SigningDescription]Python $($d.PythonVersion)"
7+
displayName: 'Update signing description'
8+
condition: and(succeeded(), not(variables['SigningDescription']))
9+
410
- task: DownloadPipelineArtifact@1
511
displayName: 'Download artifact: doc'
612
inputs:
@@ -54,6 +60,7 @@ steps:
5460
- powershell: |
5561
copy $(Build.BinariesDirectory)\amd64\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
5662
displayName: 'Copy signed files into sources'
63+
condition: and(succeeded(), variables['SigningCertificate'])
5764
5865
- script: |
5966
call Tools\msi\get_externals.bat

0 commit comments

Comments
 (0)