Skip to content

Commit d4bc711

Browse files
Merge branch 'main' into typing-namedtuple-multiple-inheritance
2 parents 64f0c5f + 140d9ec commit d4bc711

File tree

3,894 files changed

+605453
-380686
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,894 files changed

+605453
-380686
lines changed

.azure-pipelines/ci.yml

+2-83
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,16 @@
1-
variables:
2-
coverage: false
3-
4-
trigger: ['main', '3.10', '3.9', '3.8', '3.7']
1+
trigger: ['main', '3.12', '3.11', '3.10', '3.9', '3.8', '3.7']
52

63
jobs:
74
- job: Prebuild
85
displayName: Pre-build checks
96

107
pool:
11-
vmImage: ubuntu-20.04
8+
vmImage: ubuntu-22.04
129

1310
steps:
1411
- template: ./prebuild-checks.yml
1512

1613

17-
- job: Docs_PR
18-
displayName: Docs PR
19-
dependsOn: Prebuild
20-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
21-
22-
pool:
23-
vmImage: ubuntu-20.04
24-
25-
steps:
26-
- template: ./docs-steps.yml
27-
parameters:
28-
upload: true
29-
30-
31-
- job: macOS_CI_Tests
32-
displayName: macOS CI Tests
33-
dependsOn: Prebuild
34-
#condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
35-
# bpo-39837: macOS tests on Azure Pipelines are disabled
36-
condition: false
37-
38-
variables:
39-
testRunTitle: '$(build.sourceBranchName)-macos'
40-
testRunPlatform: macos
41-
42-
pool:
43-
vmImage: macos-10.15
44-
45-
steps:
46-
- template: ./macos-steps.yml
47-
48-
49-
- job: Ubuntu_CI_Tests
50-
displayName: Ubuntu CI Tests
51-
dependsOn: Prebuild
52-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
53-
54-
pool:
55-
vmImage: ubuntu-20.04
56-
57-
variables:
58-
testRunTitle: '$(build.sourceBranchName)-linux'
59-
testRunPlatform: linux
60-
openssl_version: 1.1.1n
61-
62-
steps:
63-
- template: ./posix-steps.yml
64-
parameters:
65-
dependencies: apt
66-
67-
68-
- job: Ubuntu_Coverage_CI_Tests
69-
displayName: Ubuntu CI Tests (coverage)
70-
dependsOn: Prebuild
71-
condition: |
72-
and(
73-
and(
74-
succeeded(),
75-
eq(variables['coverage'], 'true')
76-
),
77-
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
78-
)
79-
80-
pool:
81-
vmImage: ubuntu-20.04
82-
83-
variables:
84-
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
85-
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1n
87-
88-
steps:
89-
- template: ./posix-steps.yml
90-
parameters:
91-
dependencies: apt
92-
coverage: true
93-
94-
9514
- job: Windows_CI_Tests
9615
displayName: Windows CI Tests
9716
dependsOn: Prebuild

.azure-pipelines/docs-steps.yml

-47
This file was deleted.

.azure-pipelines/find-tools.yml

-26
This file was deleted.

.azure-pipelines/libffi-build.yml

-86
This file was deleted.

.azure-pipelines/macos-steps.yml

-27
This file was deleted.

0 commit comments

Comments
 (0)