Skip to content

Commit c08602b

Browse files
barneygalebarneygale
committed
Merge branch 'main' into pythongh-80486-ntfs-alt-stream-path
2 parents 86c0408 + 6716254 commit c08602b

File tree

3,767 files changed

+740455
-345830
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,767 files changed

+740455
-345830
lines changed

‎.azure-pipelines/ci.yml

Lines changed: 13 additions & 46 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-22.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-22.04
2824

2925
steps:
3026
- template: ./docs-steps.yml
@@ -35,14 +31,16 @@ jobs:
3531
- job: macOS_CI_Tests
3632
displayName: macOS CI Tests
3733
dependsOn: Prebuild
38-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
34+
#condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
35+
# bpo-39837: macOS tests on Azure Pipelines are disabled
36+
condition: false
3937

4038
variables:
4139
testRunTitle: '$(build.sourceBranchName)-macos'
4240
testRunPlatform: macos
4341

4442
pool:
45-
vmImage: macos-10.14
43+
vmImage: macos-10.15
4644

4745
steps:
4846
- template: ./macos-steps.yml
@@ -54,50 +52,19 @@ jobs:
5452
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5553

5654
pool:
57-
vmImage: ubuntu-16.04
55+
vmImage: ubuntu-22.04
5856

5957
variables:
6058
testRunTitle: '$(build.sourceBranchName)-linux'
6159
testRunPlatform: linux
62-
openssl_version: 1.1.1d
60+
openssl_version: 1.1.1t
6361

6462
steps:
6563
- template: ./posix-steps.yml
6664
parameters:
6765
dependencies: apt
6866

6967

70-
- job: ManyLinux1_CI_Tests
71-
displayName: ManyLinux1 CI 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: '$(build.sourceBranchName)-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-
10168
- job: Ubuntu_Coverage_CI_Tests
10269
displayName: Ubuntu CI Tests (coverage)
10370
dependsOn: Prebuild
@@ -111,12 +78,12 @@ jobs:
11178
)
11279
11380
pool:
114-
vmImage: ubuntu-16.04
81+
vmImage: ubuntu-22.04
11582

11683
variables:
11784
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
11885
testRunPlatform: linux-coverage
119-
openssl_version: 1.1.1d
86+
openssl_version: 1.1.1t
12087

12188
steps:
12289
- template: ./posix-steps.yml
@@ -131,13 +98,13 @@ jobs:
13198
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
13299

133100
pool:
134-
vmImage: windows-2019
101+
vmImage: windows-2022
135102

136103
strategy:
137104
matrix:
138105
win32:
139106
arch: win32
140-
buildOpt:
107+
buildOpt: '-p Win32'
141108
testRunTitle: '$(Build.SourceBranchName)-win32'
142109
testRunPlatform: win32
143110
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/patchcheck/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: 13 additions & 46 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-22.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-22.04
2824

2925
steps:
3026
- template: ./docs-steps.yml
@@ -33,14 +29,16 @@ jobs:
3329
- job: macOS_PR_Tests
3430
displayName: macOS PR Tests
3531
dependsOn: Prebuild
36-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
32+
#condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
33+
# bpo-39837: macOS tests on Azure Pipelines are disabled
34+
condition: false
3735

3836
variables:
3937
testRunTitle: '$(system.pullRequest.TargetBranch)-macos'
4038
testRunPlatform: macos
4139

4240
pool:
43-
vmImage: macos-10.14
41+
vmImage: macos-10.15
4442

4543
steps:
4644
- template: ./macos-steps.yml
@@ -54,50 +52,19 @@ jobs:
5452
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5553

5654
pool:
57-
vmImage: ubuntu-16.04
55+
vmImage: ubuntu-22.04
5856

5957
variables:
6058
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
6159
testRunPlatform: linux
62-
openssl_version: 1.1.1d
60+
openssl_version: 1.1.1t
6361

6462
steps:
6563
- template: ./posix-steps.yml
6664
parameters:
6765
dependencies: apt
6866

6967

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-
10168
- job: Ubuntu_Coverage_PR_Tests
10269
displayName: Ubuntu PR Tests (coverage)
10370
dependsOn: Prebuild
@@ -111,12 +78,12 @@ jobs:
11178
)
11279
11380
pool:
114-
vmImage: ubuntu-16.04
81+
vmImage: ubuntu-22.04
11582

11683
variables:
11784
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
11885
testRunPlatform: linux-coverage
119-
openssl_version: 1.1.1d
86+
openssl_version: 1.1.1t
12087

12188
steps:
12289
- template: ./posix-steps.yml
@@ -131,13 +98,13 @@ jobs:
13198
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
13299

133100
pool:
134-
vmImage: windows-2019
101+
vmImage: windows-2022
135102

136103
strategy:
137104
matrix:
138105
win32:
139106
arch: win32
140-
buildOpt:
107+
buildOpt: '-p Win32'
141108
testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
142109
testRunPlatform: win32
143110
win64:

‎.azure-pipelines/windows-layout-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
displayName: Show layout info (${{ parameters.kind }})
1313

1414
- ${{ if eq(parameters.fulltest, 'true') }}:
15-
- script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)"
15+
- script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)" -i test_launcher
1616
workingDirectory: $(Build.BinariesDirectory)\layout-${{ parameters.kind }}-$(arch)
1717
displayName: ${{ parameters.kind }} Tests
1818
env:

0 commit comments

Comments
 (0)