Skip to content

Commit 2cb5fd7

Browse files
CuriousLearnerCuriousLearner
committed
Merge branch 'master' into fix-25439
* master: (1204 commits) bpo-31855: unittest.mock.mock_open() results now respects the argument of read([size]) (pythonGH-11521) Forbid creating of stream objects outside of asyncio (python#13101) bpo-35925: Skip SSL tests that fail due to weak external certs. (pythonGH-13124) Fix rst formatting for several links in ssl documentation (pythonGH-13133) bpo-36542: Allow to overwrite the signature for Python functions. (pythonGH-12705) bpo-36793: Remove unneeded __str__ definitions. (pythonGH-13081) bpo-36766: Typos in docs and code comments (pythonGH-13116) bpo-36275: enhance documentation for venv.create() (pythonGH-13114) Clarify the download unit in the download section (pythonGH-13122) bpo-30668: add missing word in license.rst (pythonGH-13115) Unroll import-team in CODEOWNERS (python#13118) bpo-36594: Fix incorrect use of %p in format strings (pythonGH-12769) bpo-36798: Updating f-string docs for := use case (pythonGH-13107) Update wsgiref.rst (python#10488) Doc/c-api/exceptions.rst: fix grammar (python#12091) bpo-36811: Fix a C compiler warning in _elementtree.c. (pythonGH-13109) Only count number of members once (python#12691) bpo-16024: Doc cleanup regarding path_fd, dir_fd, follow_symlinks (pythonGH-5505) bpo-36791: Safer detection of integer overflow in sum(). (pythonGH-13080) bpo-33530: Implement Happy Eyeballs in asyncio, v2 (pythonGH-7237) ...
2 parents 514106a + 11a8832 commit 2cb5fd7

2,147 files changed

Lines changed: 122018 additions & 67644 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: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ variables:
22
manylinux: false
33
coverage: false
44

5+
resources:
6+
containers:
7+
- container: manylinux1
8+
image: pyca/cryptography-manylinux1:x86_64
9+
510
jobs:
611
- job: Prebuild
712
displayName: Pre-build checks
@@ -54,10 +59,12 @@ jobs:
5459
variables:
5560
testRunTitle: '$(build.sourceBranchName)-linux'
5661
testRunPlatform: linux
57-
openssl_version: 1.1.0g
62+
openssl_version: 1.1.0j
5863

5964
steps:
6065
- template: ./posix-steps.yml
66+
parameters:
67+
dependencies: apt
6168

6269

6370
- job: ManyLinux1_CI_Tests
@@ -75,13 +82,20 @@ jobs:
7582
pool:
7683
vmImage: ubuntu-16.04
7784

85+
container: manylinux1
86+
7887
variables:
7988
testRunTitle: '$(build.sourceBranchName)-manylinux1'
8089
testRunPlatform: manylinux1
81-
imageName: 'dockcross/manylinux-x64'
90+
openssl_version: ''
8291

8392
steps:
84-
- template: ./docker-steps.yml
93+
- template: ./posix-steps.yml
94+
parameters:
95+
dependencies: yum
96+
sudo_dependencies: ''
97+
xvfb: false
98+
patchcheck: false
8599

86100

87101
- job: Ubuntu_Coverage_CI_Tests
@@ -102,11 +116,12 @@ jobs:
102116
variables:
103117
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
104118
testRunPlatform: linux-coverage
105-
openssl_version: 1.1.0g
119+
openssl_version: 1.1.0j
106120

107121
steps:
108122
- template: ./posix-steps.yml
109123
parameters:
124+
dependencies: apt
110125
coverage: true
111126

112127

@@ -134,3 +149,14 @@ jobs:
134149

135150
steps:
136151
- template: ./windows-steps.yml
152+
153+
- template: ./windows-layout-steps.yml
154+
parameters:
155+
kind: nuget
156+
- template: ./windows-layout-steps.yml
157+
parameters:
158+
kind: embed
159+
- template: ./windows-layout-steps.yml
160+
parameters:
161+
kind: appx
162+
fulltest: true

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

Lines changed: 0 additions & 76 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
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==1.8.1 blurb python-docs-theme
15+
- script: python -m pip install sphinx==1.8.2 blurb python-docs-theme
1616
displayName: 'Install build dependencies'
1717

1818
- ${{ if ne(parameters.latex, 'true') }}:

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

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

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
parameters:
22
coverage: false
3+
sudo_dependencies: sudo
4+
dependencies: apt
5+
patchcheck: true
6+
xvfb: true
37

48
steps:
59
- checkout: self
610
clean: true
711
fetchDepth: 5
812

9-
- script: ./.azure-pipelines/posix-deps.sh $(openssl_version)
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)
1018
displayName: 'Install dependencies'
1119

1220
- script: ./configure --with-pydebug
@@ -23,15 +31,20 @@ steps:
2331
displayName: 'Display build info'
2432

2533
- script: |
26-
xvfb-run ./venv/bin/python -m coverage run --pylib -m test \
34+
$COMMAND -m coverage run --pylib -m test \
2735
--fail-env-changed \
2836
-uall,-cpu \
29-
--junit-xml=$(build.binariesDirectory)/test-results.xml" \
37+
--junit-xml=$(build.binariesDirectory)/test-results.xml \
3038
-x test_multiprocessing_fork \
3139
-x test_multiprocessing_forkserver \
3240
-x test_multiprocessing_spawn \
3341
-x test_concurrent_futures
3442
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
3548
3649
- script: ./venv/bin/python -m coverage xml
3750
displayName: 'Generate coverage.xml'
@@ -44,13 +57,18 @@ steps:
4457
- script: make pythoninfo
4558
displayName: 'Display build info'
4659

47-
- script: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
60+
- script: $COMMAND buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
4861
displayName: 'Tests'
49-
50-
51-
- script: ./python Tools/scripts/patchcheck.py --travis true
52-
displayName: 'Run patchcheck.py'
53-
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
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'))
5472

5573

5674
- task: PublishTestResults@2

‎.azure-pipelines/pr.yml‎

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
variables:
2+
manylinux: false
3+
coverage: false
4+
5+
resources:
6+
containers:
7+
- container: manylinux1
8+
image: pyca/cryptography-manylinux1:x86_64
9+
110
jobs:
211
- job: Prebuild
312
displayName: Pre-build checks
@@ -50,12 +59,70 @@ jobs:
5059
variables:
5160
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5261
testRunPlatform: linux
53-
openssl_version: 1.1.0g
62+
openssl_version: 1.1.0j
5463

5564
steps:
5665
- template: ./posix-steps.yml
5766
parameters:
58-
targetBranch: $(System.PullRequest.TargetBranch)
67+
dependencies: apt
68+
69+
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+
101+
- job: Ubuntu_Coverage_PR_Tests
102+
displayName: Ubuntu PR Tests (coverage)
103+
dependsOn: Prebuild
104+
condition: |
105+
and(
106+
and(
107+
succeeded(),
108+
eq(variables['coverage'], 'true')
109+
),
110+
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
111+
)
112+
113+
pool:
114+
vmImage: ubuntu-16.04
115+
116+
variables:
117+
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
118+
testRunPlatform: linux-coverage
119+
openssl_version: 1.1.0j
120+
121+
steps:
122+
- template: ./posix-steps.yml
123+
parameters:
124+
dependencies: apt
125+
coverage: true
59126

60127

61128
- job: Windows_PR_Tests

0 commit comments

Comments
 (0)