Skip to content

Commit 0cb9191

Browse files
jheivjheiv
committed
resolve merge conflicts from merge upstream/master
2 parents e659cad + 6000087 commit 0cb9191

2,819 files changed

Lines changed: 311861 additions & 132259 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: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
variables:
2+
manylinux: false
3+
coverage: false
4+
5+
resources:
6+
containers:
7+
- container: manylinux1
8+
image: pyca/cryptography-manylinux1:x86_64
9+
10+
jobs:
11+
- job: Prebuild
12+
displayName: Pre-build checks
13+
14+
pool:
15+
vmImage: ubuntu-16.04
16+
17+
steps:
18+
- template: ./prebuild-checks.yml
19+
20+
21+
- job: Docs_PR
22+
displayName: Docs PR
23+
dependsOn: Prebuild
24+
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
25+
26+
pool:
27+
vmImage: ubuntu-16.04
28+
29+
steps:
30+
- template: ./docs-steps.yml
31+
parameters:
32+
upload: true
33+
34+
35+
- job: macOS_CI_Tests
36+
displayName: macOS CI Tests
37+
dependsOn: Prebuild
38+
#condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
39+
# bpo-39837: macOS tests on Azure Pipelines are disabled
40+
condition: false
41+
42+
variables:
43+
testRunTitle: '$(build.sourceBranchName)-macos'
44+
testRunPlatform: macos
45+
46+
pool:
47+
vmImage: macos-10.14
48+
49+
steps:
50+
- template: ./macos-steps.yml
51+
52+
53+
- job: Ubuntu_CI_Tests
54+
displayName: Ubuntu CI Tests
55+
dependsOn: Prebuild
56+
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
57+
58+
pool:
59+
vmImage: ubuntu-16.04
60+
61+
variables:
62+
testRunTitle: '$(build.sourceBranchName)-linux'
63+
testRunPlatform: linux
64+
openssl_version: 1.1.1d
65+
66+
steps:
67+
- template: ./posix-steps.yml
68+
parameters:
69+
dependencies: apt
70+
71+
72+
- job: ManyLinux1_CI_Tests
73+
displayName: ManyLinux1 CI Tests
74+
dependsOn: Prebuild
75+
condition: |
76+
and(
77+
and(
78+
succeeded(),
79+
eq(variables['manylinux'], 'true')
80+
),
81+
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
82+
)
83+
84+
pool:
85+
vmImage: ubuntu-16.04
86+
87+
container: manylinux1
88+
89+
variables:
90+
testRunTitle: '$(build.sourceBranchName)-manylinux1'
91+
testRunPlatform: manylinux1
92+
openssl_version: ''
93+
94+
steps:
95+
- template: ./posix-steps.yml
96+
parameters:
97+
dependencies: yum
98+
sudo_dependencies: ''
99+
xvfb: false
100+
patchcheck: false
101+
102+
103+
- job: Ubuntu_Coverage_CI_Tests
104+
displayName: Ubuntu CI Tests (coverage)
105+
dependsOn: Prebuild
106+
condition: |
107+
and(
108+
and(
109+
succeeded(),
110+
eq(variables['coverage'], 'true')
111+
),
112+
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
113+
)
114+
115+
pool:
116+
vmImage: ubuntu-16.04
117+
118+
variables:
119+
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
120+
testRunPlatform: linux-coverage
121+
openssl_version: 1.1.1d
122+
123+
steps:
124+
- template: ./posix-steps.yml
125+
parameters:
126+
dependencies: apt
127+
coverage: true
128+
129+
130+
- job: Windows_CI_Tests
131+
displayName: Windows CI Tests
132+
dependsOn: Prebuild
133+
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
134+
135+
pool:
136+
vmImage: windows-2019
137+
138+
strategy:
139+
matrix:
140+
win32:
141+
arch: win32
142+
buildOpt:
143+
testRunTitle: '$(Build.SourceBranchName)-win32'
144+
testRunPlatform: win32
145+
win64:
146+
arch: amd64
147+
buildOpt: '-p x64'
148+
testRunTitle: '$(Build.SourceBranchName)-win64'
149+
testRunPlatform: win64
150+
maxParallel: 4
151+
152+
steps:
153+
- template: ./windows-steps.yml
154+
155+
- template: ./windows-layout-steps.yml
156+
parameters:
157+
kind: nuget
158+
- template: ./windows-layout-steps.yml
159+
parameters:
160+
kind: embed
161+
- template: ./windows-layout-steps.yml
162+
parameters:
163+
kind: appx
164+
fulltest: true

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
parameters:
2+
latex: false
3+
upload: false
4+
5+
steps:
6+
- checkout: self
7+
clean: true
8+
fetchDepth: 5
9+
10+
- task: UsePythonVersion@0
11+
displayName: 'Use Python 3.6 or later'
12+
inputs:
13+
versionSpec: '>=3.6'
14+
15+
- script: python -m pip install sphinx==2.2.0 blurb python-docs-theme
16+
displayName: 'Install build dependencies'
17+
18+
- ${{ if ne(parameters.latex, 'true') }}:
19+
- script: make check suspicious html PYTHON=python
20+
workingDirectory: '$(build.sourcesDirectory)/Doc'
21+
displayName: 'Build documentation'
22+
23+
- ${{ if eq(parameters.latex, 'true') }}:
24+
- script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full
25+
displayName: 'Install LaTeX'
26+
27+
- script: make dist PYTHON=python SPHINXBUILD='python -m sphinx' BLURB='python -m blurb'
28+
workingDirectory: '$(build.sourcesDirectory)/Doc'
29+
displayName: 'Build documentation'
30+
31+
- ${{ if eq(parameters.upload, 'true') }}:
32+
- task: PublishBuildArtifacts@1
33+
displayName: 'Publish docs'
34+
35+
inputs:
36+
PathToPublish: '$(build.sourcesDirectory)/Doc/build'
37+
ArtifactName: docs
38+
publishLocation: Container
39+
40+
- ${{ if eq(parameters.latex, 'true') }}:
41+
- task: PublishBuildArtifacts@1
42+
displayName: 'Publish dist'
43+
inputs:
44+
PathToPublish: '$(build.sourcesDirectory)/Doc/dist'
45+
ArtifactName: docs_dist
46+
publishLocation: Container

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
steps:
2+
- checkout: self
3+
clean: true
4+
fetchDepth: 5
5+
6+
- script: ./configure --with-pydebug --with-openssl=/usr/local/opt/openssl --prefix=/opt/python-azdev
7+
displayName: 'Configure CPython (debug)'
8+
9+
- script: make -j4
10+
displayName: 'Build CPython'
11+
12+
- script: make pythoninfo
13+
displayName: 'Display build info'
14+
15+
- script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
16+
displayName: 'Tests'
17+
continueOnError: true
18+
timeoutInMinutes: 30
19+
20+
- task: PublishTestResults@2
21+
displayName: 'Publish Test Results'
22+
inputs:
23+
testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
24+
mergeTestResults: true
25+
testRunTitle: $(testRunTitle)
26+
platform: $(testRunPlatform)
27+
condition: succeededOrFailed()

‎.azure-pipelines/posix-deps-apt.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/sh
2+
apt-get update
3+
4+
apt-get -yq install \
5+
build-essential \
6+
zlib1g-dev \
7+
libbz2-dev \
8+
liblzma-dev \
9+
libncurses5-dev \
10+
libreadline6-dev \
11+
libsqlite3-dev \
12+
libssl-dev \
13+
libgdbm-dev \
14+
tk-dev \
15+
lzma \
16+
lzma-dev \
17+
liblzma-dev \
18+
libffi-dev \
19+
uuid-dev \
20+
xvfb
21+
22+
if [ ! -z "$1" ]
23+
then
24+
echo ##vso[task.prependpath]$PWD/multissl/openssl/$1
25+
echo ##vso[task.setvariable variable=OPENSSL_DIR]$PWD/multissl/openssl/$1
26+
python3 Tools/ssl/multissltests.py --steps=library --base-directory $PWD/multissl --openssl $1 --system Linux
27+
fi

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

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
parameters:
2+
coverage: false
3+
sudo_dependencies: sudo
4+
dependencies: apt
5+
patchcheck: true
6+
xvfb: true
7+
8+
steps:
9+
- checkout: self
10+
clean: true
11+
fetchDepth: 5
12+
13+
# Work around a known issue affecting Ubuntu VMs on Pipelines
14+
- script: sudo setfacl -Rb /home/vsts
15+
displayName: 'Workaround ACL issue'
16+
17+
- script: ${{ parameters.sudo_dependencies }} ./.azure-pipelines/posix-deps-${{ parameters.dependencies }}.sh $(openssl_version)
18+
displayName: 'Install dependencies'
19+
20+
- script: ./configure --with-pydebug
21+
displayName: 'Configure CPython (debug)'
22+
23+
- script: make -j4
24+
displayName: 'Build CPython'
25+
26+
- ${{ if eq(parameters.coverage, 'true') }}:
27+
- script: ./python -m venv venv && ./venv/bin/python -m pip install -U coverage
28+
displayName: 'Set up virtual environment'
29+
30+
- script: ./venv/bin/python -m test.pythoninfo
31+
displayName: 'Display build info'
32+
33+
- script: |
34+
$COMMAND -m coverage run --pylib -m test \
35+
--fail-env-changed \
36+
-uall,-cpu \
37+
--junit-xml=$(build.binariesDirectory)/test-results.xml \
38+
-x test_multiprocessing_fork \
39+
-x test_multiprocessing_forkserver \
40+
-x test_multiprocessing_spawn \
41+
-x test_concurrent_futures
42+
displayName: 'Tests with coverage'
43+
env:
44+
${{ if eq(parameters.xvfb, 'true') }}:
45+
COMMAND: xvfb-run ./venv/bin/python
46+
${{ if ne(parameters.xvfb, 'true') }}:
47+
COMMAND: ./venv/bin/python
48+
49+
- script: ./venv/bin/python -m coverage xml
50+
displayName: 'Generate coverage.xml'
51+
52+
- script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash) -y .github/codecov.yml
53+
displayName: 'Publish code coverage results'
54+
55+
56+
- ${{ if ne(parameters.coverage, 'true') }}:
57+
- script: make pythoninfo
58+
displayName: 'Display build info'
59+
60+
- script: $COMMAND buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
61+
displayName: 'Tests'
62+
env:
63+
${{ if eq(parameters.xvfb, 'true') }}:
64+
COMMAND: xvfb-run make
65+
${{ if ne(parameters.xvfb, 'true') }}:
66+
COMMAND: make
67+
68+
- ${{ if eq(parameters.patchcheck, 'true') }}:
69+
- script: ./python Tools/scripts/patchcheck.py --travis true
70+
displayName: 'Run patchcheck.py'
71+
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
72+
73+
74+
- task: PublishTestResults@2
75+
displayName: 'Publish Test Results'
76+
inputs:
77+
testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
78+
mergeTestResults: true
79+
testRunTitle: $(testRunTitle)
80+
platform: $(testRunPlatform)
81+
condition: succeededOrFailed()

0 commit comments

Comments
 (0)