Skip to content

Commit e03b993

Browse files
terryjreedyterryjreedy
authored
Merge branch 'main' into bpo-27620-IDLE-escape-key-config
2 parents 71c0f7a + 670007a commit e03b993

File tree

3,947 files changed

+573629
-280660
lines changed

Some content is hidden

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

3,947 files changed

+573629
-280660
lines changed

‎.azure-pipelines/ci.yml‎

Lines changed: 10 additions & 45 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: ['main', '3.11', '3.10', '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-20.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-20.04
2824

2925
steps:
3026
- template: ./docs-steps.yml
@@ -44,7 +40,7 @@ jobs:
4440
testRunPlatform: macos
4541

4642
pool:
47-
vmImage: macos-10.14
43+
vmImage: macos-10.15
4844

4945
steps:
5046
- template: ./macos-steps.yml
@@ -56,50 +52,19 @@ jobs:
5652
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5753

5854
pool:
59-
vmImage: ubuntu-16.04
55+
vmImage: ubuntu-20.04
6056

6157
variables:
6258
testRunTitle: '$(build.sourceBranchName)-linux'
6359
testRunPlatform: linux
64-
openssl_version: 1.1.1f
60+
openssl_version: 1.1.1q
6561

6662
steps:
6763
- template: ./posix-steps.yml
6864
parameters:
6965
dependencies: apt
7066

7167

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-
10368
- job: Ubuntu_Coverage_CI_Tests
10469
displayName: Ubuntu CI Tests (coverage)
10570
dependsOn: Prebuild
@@ -113,12 +78,12 @@ jobs:
11378
)
11479
11580
pool:
116-
vmImage: ubuntu-16.04
81+
vmImage: ubuntu-20.04
11782

11883
variables:
11984
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
12085
testRunPlatform: linux-coverage
121-
openssl_version: 1.1.1f
86+
openssl_version: 1.1.1q
12287

12388
steps:
12489
- template: ./posix-steps.yml
@@ -133,13 +98,13 @@ jobs:
13398
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
13499

135100
pool:
136-
vmImage: windows-2019
101+
vmImage: windows-2022
137102

138103
strategy:
139104
matrix:
140105
win32:
141106
arch: win32
142-
buildOpt:
107+
buildOpt: '-p Win32'
143108
testRunTitle: '$(Build.SourceBranchName)-win32'
144109
testRunPlatform: win32
145110
win64:

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ 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 -r requirements.txt
16+
workingDirectory: '$(build.sourcesDirectory)/Doc'
1617
displayName: 'Install build dependencies'
1718

1819
- ${{ if ne(parameters.latex, 'true') }}:
19-
- script: make check suspicious html PYTHON=python
20+
- script: make check html PYTHON=python
2021
workingDirectory: '$(build.sourcesDirectory)/Doc'
2122
displayName: 'Build documentation'
2223

@@ -31,7 +32,7 @@ steps:
3132
- ${{ if eq(parameters.upload, 'true') }}:
3233
- task: PublishBuildArtifacts@1
3334
displayName: 'Publish docs'
34-
35+
3536
inputs:
3637
PathToPublish: '$(build.sourcesDirectory)/Doc/build'
3738
ArtifactName: docs

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ steps:
6666
COMMAND: make
6767

6868
- ${{ if eq(parameters.patchcheck, 'true') }}:
69-
- script: ./python Tools/scripts/patchcheck.py --travis true
69+
- script: |
70+
git fetch origin
71+
./python Tools/scripts/patchcheck.py --ci true
7072
displayName: 'Run patchcheck.py'
7173
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
7274

‎.azure-pipelines/pr.yml‎

Lines changed: 10 additions & 45 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: ['main', '3.11', '3.10', '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-20.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-20.04
2824

2925
steps:
3026
- template: ./docs-steps.yml
@@ -42,7 +38,7 @@ jobs:
4238
testRunPlatform: macos
4339

4440
pool:
45-
vmImage: macos-10.14
41+
vmImage: macos-10.15
4642

4743
steps:
4844
- template: ./macos-steps.yml
@@ -56,50 +52,19 @@ jobs:
5652
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5753

5854
pool:
59-
vmImage: ubuntu-16.04
55+
vmImage: ubuntu-20.04
6056

6157
variables:
6258
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
6359
testRunPlatform: linux
64-
openssl_version: 1.1.1f
60+
openssl_version: 1.1.1q
6561

6662
steps:
6763
- template: ./posix-steps.yml
6864
parameters:
6965
dependencies: apt
7066

7167

72-
- job: ManyLinux1_PR_Tests
73-
displayName: ManyLinux1 PR 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: '$(system.pullRequest.TargetBranch)-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-
10368
- job: Ubuntu_Coverage_PR_Tests
10469
displayName: Ubuntu PR Tests (coverage)
10570
dependsOn: Prebuild
@@ -113,12 +78,12 @@ jobs:
11378
)
11479
11580
pool:
116-
vmImage: ubuntu-16.04
81+
vmImage: ubuntu-20.04
11782

11883
variables:
11984
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
12085
testRunPlatform: linux-coverage
121-
openssl_version: 1.1.1f
86+
openssl_version: 1.1.1q
12287

12388
steps:
12489
- template: ./posix-steps.yml
@@ -133,13 +98,13 @@ jobs:
13398
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
13499

135100
pool:
136-
vmImage: windows-2019
101+
vmImage: windows-2022
137102

138103
strategy:
139104
matrix:
140105
win32:
141106
arch: win32
142-
buildOpt:
107+
buildOpt: '-p Win32'
143108
testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
144109
testRunPlatform: win32
145110
win64:

0 commit comments

Comments
 (0)