Merge branch 'main' into long-as-perf

.azure-pipelines/ci.yml

@@ -1,18 +1,14 @@
 variables:
- manylinux: false
  coverage: false
 
-resources:
- containers:
- - container: manylinux1
- image: pyca/cryptography-manylinux1:x86_64
+trigger: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
  displayName: Pre-build checks
 
  pool:
- vmImage: ubuntu-16.04
+ vmImage: ubuntu-20.04
 
  steps:
  - template: ./prebuild-checks.yml
@@ -24,7 +20,7 @@ jobs:
  condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
  pool:
- vmImage: ubuntu-16.04
+ vmImage: ubuntu-20.04
 
  steps:
  - template: ./docs-steps.yml
@@ -35,14 +31,16 @@ jobs:
 - job: macOS_CI_Tests
  displayName: macOS CI Tests
  dependsOn: Prebuild
- condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
+ #condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
+ # bpo-39837: macOS tests on Azure Pipelines are disabled
+ condition: false
 
  variables:
  testRunTitle: '$(build.sourceBranchName)-macos'
  testRunPlatform: macos
 
  pool:
- vmImage: xcode9-macos10.13
+ vmImage: macos-10.15
 
  steps:
  - template: ./macos-steps.yml
@@ -54,50 +52,19 @@ jobs:
  condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
  pool:
- vmImage: ubuntu-16.04
+ vmImage: ubuntu-20.04
 
  variables:
  testRunTitle: '$(build.sourceBranchName)-linux'
  testRunPlatform: linux
- openssl_version: 1.1.1c
+ openssl_version: 1.1.1n
 
  steps:
  - template: ./posix-steps.yml
  parameters:
  dependencies: apt
 
 
-- job: ManyLinux1_CI_Tests
- displayName: ManyLinux1 CI Tests
- dependsOn: Prebuild
- condition: |
- and(
- and(
- succeeded(),
- eq(variables['manylinux'], 'true')
- ),
- eq(dependencies.Prebuild.outputs['tests.run'], 'true')
- )
-
- pool:
- vmImage: ubuntu-16.04
-
- container: manylinux1
-
- variables:
- testRunTitle: '$(build.sourceBranchName)-manylinux1'
- testRunPlatform: manylinux1
- openssl_version: ''
-
- steps:
- - template: ./posix-steps.yml
- parameters:
- dependencies: yum
- sudo_dependencies: ''
- xvfb: false
- patchcheck: false
-
-
 - job: Ubuntu_Coverage_CI_Tests
  displayName: Ubuntu CI Tests (coverage)
  dependsOn: Prebuild
@@ -111,12 +78,12 @@ jobs:
  )
 
  pool:
- vmImage: ubuntu-16.04
+ vmImage: ubuntu-20.04
 
  variables:
  testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
  testRunPlatform: linux-coverage
- openssl_version: 1.1.1c
+ openssl_version: 1.1.1n
 
  steps:
  - template: ./posix-steps.yml
@@ -131,21 +98,21 @@ jobs:
  condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
  pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2022
 
  strategy:
  matrix:
  win32:
  arch: win32
- buildOpt:
+ buildOpt: '-p Win32'
  testRunTitle: '$(Build.SourceBranchName)-win32'
  testRunPlatform: win32
  win64:
  arch: amd64
  buildOpt: '-p x64'
  testRunTitle: '$(Build.SourceBranchName)-win64'
  testRunPlatform: win64
- maxParallel: 2
+ maxParallel: 4
 
  steps:
  - template: ./windows-steps.yml

.azure-pipelines/docs-steps.yml

@@ -12,16 +12,17 @@ steps:
  inputs:
  versionSpec: '>=3.6'
 
-- script: python -m pip install sphinx==2.0.1 blurb python-docs-theme
+- script: python -m pip install -r requirements.txt
+ workingDirectory: '$(build.sourcesDirectory)/Doc'
  displayName: 'Install build dependencies'
 
 - ${{ if ne(parameters.latex, 'true') }}:
- - script: make check suspicious html PYTHON=python
+ - script: make check html PYTHON=python
  workingDirectory: '$(build.sourcesDirectory)/Doc'
  displayName: 'Build documentation'
 
 - ${{ if eq(parameters.latex, 'true') }}:
- - script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full 
+ - script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full
  displayName: 'Install LaTeX'
 
  - script: make dist PYTHON=python SPHINXBUILD='python -m sphinx' BLURB='python -m blurb'
@@ -31,7 +32,7 @@ steps:
 - ${{ if eq(parameters.upload, 'true') }}:
  - task: PublishBuildArtifacts@1
  displayName: 'Publish docs'
- 
+
  inputs:
  PathToPublish: '$(build.sourcesDirectory)/Doc/build'
  ArtifactName: docs

.azure-pipelines/macos-steps.yml

@@ -6,14 +6,16 @@ steps:
 - script: ./configure --with-pydebug --with-openssl=/usr/local/opt/openssl --prefix=/opt/python-azdev
  displayName: 'Configure CPython (debug)'
 
-- script: make -s -j4
+- script: make -j4
  displayName: 'Build CPython'
 
 - script: make pythoninfo
  displayName: 'Display build info'
 
 - script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
  displayName: 'Tests'
+ continueOnError: true
+ timeoutInMinutes: 30
 
 - task: PublishTestResults@2
  displayName: 'Publish Test Results'

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

@@ -1,3 +1,4 @@
+#!/bin/sh
 apt-get update
 
 apt-get -yq install \

.azure-pipelines/posix-steps.yml

@@ -20,7 +20,7 @@ steps:
 - script: ./configure --with-pydebug
  displayName: 'Configure CPython (debug)'
 
-- script: make -s -j4
+- script: make -j4
  displayName: 'Build CPython'
 
 - ${{ if eq(parameters.coverage, 'true') }}:
@@ -49,7 +49,7 @@ steps:
  - script: ./venv/bin/python -m coverage xml
  displayName: 'Generate coverage.xml'
 
- - script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash)
+ - script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash) -y .github/codecov.yml
  displayName: 'Publish code coverage results'
 
 
@@ -66,7 +66,9 @@ steps:
  COMMAND: make
 
 - ${{ if eq(parameters.patchcheck, 'true') }}:
- - script: ./python Tools/scripts/patchcheck.py --travis true
+ - script: |
+ git fetch origin
+ ./python Tools/scripts/patchcheck.py --ci true
  displayName: 'Run patchcheck.py'
  condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
 

.azure-pipelines/pr.yml

@@ -1,18 +1,14 @@
 variables:
- manylinux: false
  coverage: false
 
-resources:
- containers:
- - container: manylinux1
- image: pyca/cryptography-manylinux1:x86_64
+pr: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
  displayName: Pre-build checks
 
  pool:
- vmImage: ubuntu-16.04
+ vmImage: ubuntu-20.04
 
  steps:
  - template: ./prebuild-checks.yml
@@ -24,7 +20,7 @@ jobs:
  condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
 
  pool:
- vmImage: ubuntu-16.04
+ vmImage: ubuntu-20.04
 
  steps:
  - template: ./docs-steps.yml
@@ -33,14 +29,16 @@ jobs:
 - job: macOS_PR_Tests
  displayName: macOS PR Tests
  dependsOn: Prebuild
- condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
+ #condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
+ # bpo-39837: macOS tests on Azure Pipelines are disabled
+ condition: false
 
  variables:
  testRunTitle: '$(system.pullRequest.TargetBranch)-macos'
  testRunPlatform: macos
 
  pool:
- vmImage: xcode9-macos10.13
+ vmImage: macos-10.15
 
  steps:
  - template: ./macos-steps.yml
@@ -54,50 +52,19 @@ jobs:
  condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
  pool:
- vmImage: ubuntu-16.04
+ vmImage: ubuntu-20.04
 
  variables:
  testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
  testRunPlatform: linux
- openssl_version: 1.1.1c
+ openssl_version: 1.1.1n
 
  steps:
  - template: ./posix-steps.yml
  parameters:
  dependencies: apt
 
 
-- job: ManyLinux1_PR_Tests
- displayName: ManyLinux1 PR Tests
- dependsOn: Prebuild
- condition: |
- and(
- and(
- succeeded(),
- eq(variables['manylinux'], 'true')
- ),
- eq(dependencies.Prebuild.outputs['tests.run'], 'true')
- )
-
- pool:
- vmImage: ubuntu-16.04
-
- container: manylinux1
-
- variables:
- testRunTitle: '$(system.pullRequest.TargetBranch)-manylinux1'
- testRunPlatform: manylinux1
- openssl_version: ''
-
- steps:
- - template: ./posix-steps.yml
- parameters:
- dependencies: yum
- sudo_dependencies: ''
- xvfb: false
- patchcheck: false
-
-
 - job: Ubuntu_Coverage_PR_Tests
  displayName: Ubuntu PR Tests (coverage)
  dependsOn: Prebuild
@@ -111,12 +78,12 @@ jobs:
  )
 
  pool:
- vmImage: ubuntu-16.04
+ vmImage: ubuntu-20.04
 
  variables:
  testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
  testRunPlatform: linux-coverage
- openssl_version: 1.1.1c
+ openssl_version: 1.1.1n
 
  steps:
  - template: ./posix-steps.yml
@@ -131,21 +98,24 @@ jobs:
  condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
  pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2022
 
  strategy:
  matrix:
  win32:
  arch: win32
- buildOpt:
+ buildOpt: '-p Win32'
  testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
  testRunPlatform: win32
  win64:
  arch: amd64
  buildOpt: '-p x64'
  testRunTitle: '$(System.PullRequest.TargetBranch)-win64'
  testRunPlatform: win64
- maxParallel: 2
+ winarm64:
+ arch: arm64
+ buildOpt: '-p arm64'
+ maxParallel: 4
 
  steps:
  - template: ./windows-steps.yml