NotificationsYou must be signed in to change notification settings
Fork33.3k
Star69.7k

Commit8ef2e9e

authored

Merge branch 'main' into fix-issue-29847

2 parents7bbc2a3 +abbe448 commit8ef2e9eCopy full SHA for 8ef2e9e

File tree

3,664 files changed

+684307

-319127

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,664 files changed

+684307

-319127

lines changed

`‎.azure-pipelines/ci.yml‎`

Lines changed: 10 additions & 45 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,14 @@`
`1`	`1`	`variables:`
`2`		`-manylinux:false`
`3`	`2`	`coverage:false`
`4`	`3`
`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']`
`9`	`5`
`10`	`6`	`jobs:`
`11`	`7`	`-job:Prebuild`
`12`	`8`	`displayName:Pre-build checks`
`13`	`9`
`14`	`10`	`pool:`
`15`		`-vmImage:ubuntu-16.04`
	`11`	`+vmImage:ubuntu-20.04`
`16`	`12`
`17`	`13`	`steps:`
`18`	`14`	`-template:./prebuild-checks.yml`
`@@ -24,7 +20,7 @@ jobs:`
`24`	`20`	`condition:and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))`
`25`	`21`
`26`	`22`	`pool:`
`27`		`-vmImage:ubuntu-16.04`
	`23`	`+vmImage:ubuntu-20.04`
`28`	`24`
`29`	`25`	`steps:`
`30`	`26`	`-template:./docs-steps.yml`
`@@ -44,7 +40,7 @@ jobs:`
`44`	`40`	`testRunPlatform:macos`
`45`	`41`
`46`	`42`	`pool:`
`47`		`-vmImage:macos-10.14`
	`43`	`+vmImage:macos-10.15`
`48`	`44`
`49`	`45`	`steps:`
`50`	`46`	`-template:./macos-steps.yml`
`@@ -56,50 +52,19 @@ jobs:`
`56`	`52`	`condition:and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))`
`57`	`53`
`58`	`54`	`pool:`
`59`		`-vmImage:ubuntu-16.04`
	`55`	`+vmImage:ubuntu-20.04`
`60`	`56`
`61`	`57`	`variables:`
`62`	`58`	`testRunTitle:'$(build.sourceBranchName)-linux'`
`63`	`59`	`testRunPlatform:linux`
`64`		`-openssl_version:1.1.1f`
	`60`	`+openssl_version:1.1.1q`
`65`	`61`
`66`	`62`	`steps:`
`67`	`63`	`-template:./posix-steps.yml`
`68`	`64`	`parameters:`
`69`	`65`	`dependencies:apt`
`70`	`66`
`71`	`67`
`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`		`-`
`103`	`68`	`-job:Ubuntu_Coverage_CI_Tests`
`104`	`69`	`displayName:Ubuntu CI Tests (coverage)`
`105`	`70`	`dependsOn:Prebuild`
`@@ -113,12 +78,12 @@ jobs:`
`113`	`78`	`)`
`114`	`79`
`115`	`80`	`pool:`
`116`		`-vmImage:ubuntu-16.04`
	`81`	`+vmImage:ubuntu-20.04`
`117`	`82`
`118`	`83`	`variables:`
`119`	`84`	`testRunTitle:'$(Build.SourceBranchName)-linux-coverage'`
`120`	`85`	`testRunPlatform:linux-coverage`
`121`		`-openssl_version:1.1.1f`
	`86`	`+openssl_version:1.1.1q`
`122`	`87`
`123`	`88`	`steps:`
`124`	`89`	`-template:./posix-steps.yml`
`@@ -133,13 +98,13 @@ jobs:`
`133`	`98`	`condition:and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))`
`134`	`99`
`135`	`100`	`pool:`
`136`		`-vmImage:windows-2019`
	`101`	`+vmImage:windows-2022`
`137`	`102`
`138`	`103`	`strategy:`
`139`	`104`	`matrix:`
`140`	`105`	`win32:`
`141`	`106`	`arch:win32`
`142`		`-buildOpt:`
	`107`	`+buildOpt:'-p Win32'`
`143`	`108`	`testRunTitle:'$(Build.SourceBranchName)-win32'`
`144`	`109`	`testRunPlatform:win32`
`145`	`110`	`win64:`

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

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,12 @@ steps:`
`12`	`12`	`inputs:`
`13`	`13`	`versionSpec:'>=3.6'`
`14`	`14`
`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'`
`16`	`17`	`displayName:'Install build dependencies'`
`17`	`18`
`18`	`19`	`-${{ if ne(parameters.latex, 'true') }}:`
`19`		`- -script:make checksuspicioushtml PYTHON=python`
	`20`	`+ -script:make check html PYTHON=python`
`20`	`21`	`workingDirectory:'$(build.sourcesDirectory)/Doc'`
`21`	`22`	`displayName:'Build documentation'`
`22`	`23`
`@@ -31,7 +32,7 @@ steps:`
`31`	`32`	`-${{ if eq(parameters.upload, 'true') }}:`
`32`	`33`	`-task:PublishBuildArtifacts@1`
`33`	`34`	`displayName:'Publish docs'`
`34`		`-`
	`35`	`+`
`35`	`36`	`inputs:`
`36`	`37`	`PathToPublish:'$(build.sourcesDirectory)/Doc/build'`
`37`	`38`	`ArtifactName:docs`

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

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,9 @@ steps:`
`66`	`66`	`COMMAND:make`
`67`	`67`
`68`	`68`	`-${{ 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 --citrue`
`70`	`72`	`displayName: 'Run patchcheck.py'`
`71`	`73`	`condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))`
`72`	`74`

`‎.azure-pipelines/pr.yml‎`

Lines changed: 10 additions & 45 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,14 @@`
`1`	`1`	`variables:`
`2`		`-manylinux:false`
`3`	`2`	`coverage:false`
`4`	`3`
`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']`
`9`	`5`
`10`	`6`	`jobs:`
`11`	`7`	`-job:Prebuild`
`12`	`8`	`displayName:Pre-build checks`
`13`	`9`
`14`	`10`	`pool:`
`15`		`-vmImage:ubuntu-16.04`
	`11`	`+vmImage:ubuntu-20.04`
`16`	`12`
`17`	`13`	`steps:`
`18`	`14`	`-template:./prebuild-checks.yml`
`@@ -24,7 +20,7 @@ jobs:`
`24`	`20`	`condition:and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))`
`25`	`21`
`26`	`22`	`pool:`
`27`		`-vmImage:ubuntu-16.04`
	`23`	`+vmImage:ubuntu-20.04`
`28`	`24`
`29`	`25`	`steps:`
`30`	`26`	`-template:./docs-steps.yml`
`@@ -42,7 +38,7 @@ jobs:`
`42`	`38`	`testRunPlatform:macos`
`43`	`39`
`44`	`40`	`pool:`
`45`		`-vmImage:macos-10.14`
	`41`	`+vmImage:macos-10.15`
`46`	`42`
`47`	`43`	`steps:`
`48`	`44`	`-template:./macos-steps.yml`
`@@ -56,50 +52,19 @@ jobs:`
`56`	`52`	`condition:and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))`
`57`	`53`
`58`	`54`	`pool:`
`59`		`-vmImage:ubuntu-16.04`
	`55`	`+vmImage:ubuntu-20.04`
`60`	`56`
`61`	`57`	`variables:`
`62`	`58`	`testRunTitle:'$(system.pullRequest.TargetBranch)-linux'`
`63`	`59`	`testRunPlatform:linux`
`64`		`-openssl_version:1.1.1f`
	`60`	`+openssl_version:1.1.1q`
`65`	`61`
`66`	`62`	`steps:`
`67`	`63`	`-template:./posix-steps.yml`
`68`	`64`	`parameters:`
`69`	`65`	`dependencies:apt`
`70`	`66`
`71`	`67`
`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`		`-`
`103`	`68`	`-job:Ubuntu_Coverage_PR_Tests`
`104`	`69`	`displayName:Ubuntu PR Tests (coverage)`
`105`	`70`	`dependsOn:Prebuild`
`@@ -113,12 +78,12 @@ jobs:`
`113`	`78`	`)`
`114`	`79`
`115`	`80`	`pool:`
`116`		`-vmImage:ubuntu-16.04`
	`81`	`+vmImage:ubuntu-20.04`
`117`	`82`
`118`	`83`	`variables:`
`119`	`84`	`testRunTitle:'$(Build.SourceBranchName)-linux-coverage'`
`120`	`85`	`testRunPlatform:linux-coverage`
`121`		`-openssl_version:1.1.1f`
	`86`	`+openssl_version:1.1.1q`
`122`	`87`
`123`	`88`	`steps:`
`124`	`89`	`-template:./posix-steps.yml`
`@@ -133,13 +98,13 @@ jobs:`
`133`	`98`	`condition:and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))`
`134`	`99`
`135`	`100`	`pool:`
`136`		`-vmImage:windows-2019`
	`101`	`+vmImage:windows-2022`
`137`	`102`
`138`	`103`	`strategy:`
`139`	`104`	`matrix:`
`140`	`105`	`win32:`
`141`	`106`	`arch:win32`
`142`		`-buildOpt:`
	`107`	`+buildOpt:'-p Win32'`
`143`	`108`	`testRunTitle:'$(System.PullRequest.TargetBranch)-win32'`
`144`	`109`	`testRunPlatform:win32`
`145`	`110`	`win64:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit8ef2e9e

File tree

3,664 files changed

Some content is hidden

3,664 files changed

`‎.azure-pipelines/ci.yml‎`

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

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

`‎.azure-pipelines/pr.yml‎`

0 commit comments