Skip to content

Commit f712b65

Browse files
authored
Merge branch 'main' into fix-issue-107545
2 parents ddcdb0d + 02cd6d7 commit f712b65

File tree

3,983 files changed

+644647
-293296
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,983 files changed

+644647
-293296
lines changed

.azure-pipelines/ci.yml

Lines changed: 2 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,16 @@
1-
variables:
2-
coverage: false
3-
4-
trigger: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
1+
trigger: ['main', '3.*']
52

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

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

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

1613

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

.azure-pipelines/macos-steps.yml

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

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

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

.azure-pipelines/posix-steps.yml

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

.azure-pipelines/pr.yml

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

.coveragerc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ exclude_lines =
77
# Don't complain if non-runnable code isn't run:
88
if 0:
99
if __name__ == .__main__.:
10+
raise AssertionError\(
11+
12+
# Empty bodies in protocols or abstract methods
13+
^\s*def [a-zA-Z0-9_]+\(.*\)(\s*->.*)?:\s*\.\.\.(\s*#.*)?$
14+
^\s*\.\.\.(\s*#.*)?$
1015

1116
.*# pragma: no cover
1217
.*# pragma: no branch

.devcontainer/Dockerfile

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

.devcontainer/devcontainer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"build": {
3-
"dockerfile": "Dockerfile"
4-
},
2+
"image": "ghcr.io/python/devcontainer:2024.09.25.11038928730",
53
"onCreateCommand": [
64
// Install common tooling.
75
"dnf",

0 commit comments

Comments
 (0)