8000 Merge branch 'main' into gh-70795-RLock-docs · python/cpython@1c28ee7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1c28ee7

Browse files
CAM-GerlachCAM-Gerlach
authored
Merge branch 'main' into gh-70795-RLock-docs
2 parents 90b3559 + c9073eb commit 1c28ee7

File tree

3,387 files changed

+441774
-280058
lines changed
  • windows.rst
  • faq
  • glossary.rst
  • howto
  • includes
  • install
  • installing
  • library

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    3,387 files changed

    +441774
    -280058
    lines changed

    ‎.azure-pipelines/ci.yml

    Lines changed: 1 addition & 82 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,4 @@
    1-
    variables:
    2-
    coverage: false
    3-
    4-
    trigger: ['main', '3.11', '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
    @@ -14,84 +11,6 @@ jobs:
    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-22.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-22.04
    56-
    57-
    variables:
    58-
    testRunTitle: '$(build.sourceBranchName)-linux'
    59-
    testRunPlatform: linux
    60-
    openssl_version: 1.1.1t
    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-22.04
    82-
    83-
    variables:
    84-
    testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
    85-
    testRunPlatform: linux-coverage
    86-
    openssl_version: 1.1.1 57AE t
    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

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

    ‎.azure-pipelines/macos-steps.yml

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

    ‎.azure-pipelines/posix-steps.yml

    Lines changed: 8 additions & 65 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,10 +1,3 @@
    1-
    parameters:
    2-
    coverage: false
    3-
    sudo_dependencies: sudo
    4-
    dependencies: apt
    5-
    patchcheck: true
    6-
    xvfb: true
    7-
    81
    steps:
    92
    - checkout: self
    103
    clean: true
    @@ -14,7 +7,7 @@ steps:
    147
    - script: sudo setfacl -Rb /home/vsts
    158
    displayName: 'Workaround ACL issue'
    169

    17-
    - script: ${{ parameters.sudo_dependencies }} ./.azure-pipelines/posix-deps-${{ parameters.dependencies }}.sh $(openssl_version)
    10+
    - script: sudo ./.azure-pipelines/posix-deps-apt.sh $(openssl_version)
    1811
    displayName: 'Install dependencies'
    1912

    2013
    - script: ./configure --with-pydebug
    @@ -23,61 +16,11 @@ steps:
    2316
    - script: make -j4
    2417
    displayName: 'Build CPython'
    2518

    26-
    - ${{ if eq(parameters.coverage, 'true') }}:
    27-
    - script: ./python -m venv venv && ./venv/bin/python -m pip install -U coverage
    28-
    displayName: 'Set up virtual environment'
    29-
    30-
    - script: ./venv/bin/python -m test.pythoninfo
    31-
    displayName: 'Display build info'
    32-
    33-
    - script: |
    34-
    $COMMAND -m coverage run --pylib -m test \
    35-
    --fail-env-changed \
    36-
    -uall,-cpu \
    37-
    --junit-xml=$(build.binariesDirectory)/test-results.xml \
    38-
    -x test_multiprocessing_fork \
    39-
    -x test_multiprocessing_forkserver \
    40-
    -x test_multiprocessing_spawn \
    41-
    -x test_concurrent_futures
    42-
    displayName: 'Tests with coverage'
    43-
    env:
    44-
    ${{ if eq(parameters.xvfb, 'true') }}:
    45-
    COMMAND: xvfb-run ./venv/bin/python
    46-
    ${{ if ne(parameters.xvfb, 'true') }}:
    47-
    COMMAND: ./venv/bin/python
    48-
    49-
    - script: ./venv/bin/python -m coverage xml
    50-
    displayName: 'Generate coverage.xml'
    51-
    52-
    - script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash) -y .github/codecov.yml
    53-
    displayName: 'Publish code coverage results'
    54-
    55-
    56-
    - ${{ if ne(parameters.coverage, 'true') }}:
    57-
    - script: make pythoninfo
    58-
    displayName: 'Display build info'
    59-
    60-
    - script: $COMMAND buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
    61-
    displayName: 'Tests'
    62-
    env:
    63-
    ${{ if eq(parameters.xvfb, 'true') }}:
    64-
    COMMAND: xvfb-run make
    65-
    ${{ if ne(parameters.xvfb, 'true') }}:
    66-
    COMMAND: make
    67-
    68-
    - ${{ if eq(parameters.patchcheck, 'true') }}:
    69-
    - script: |
    70-
    git fetch origin
    71-
    ./python Tools/patchcheck/patchcheck.py --ci true
    72-
    displayName: 'Run patchcheck.py'
    73-
    condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
    74-
    19+
    - script: make pythoninfo
    20+
    displayName: 'Display build info'
    7521

    76-
    - task: PublishTestResults@2
    77-
    displayName: 'Publish Test Results'
    78-
    inputs:
    79-
    testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
    80-
    mergeTestResults: true
    81-
    testRunTitle: $(testRunTitle)
    82-
    platform: $(testRunPlatform)
    83-
    condition: succeededOrFailed()
    22+
    - script: |
    23+
    git fetch origin
    24+
    ./python Tools/patchcheck/patchcheck.py --ci true
    25+
    displayName: 'Run patchcheck.py'
    26+
    condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))

    ‎.azure-pipelines/pr.yml

    Lines changed: 4 additions & 99 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,7 +1,4 @@
    1-
    variables:
    2-
    coverage: false
    3-
    4-
    pr: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
    1+
    pr: ['main', '3.12', '3.11', '3.10', '3.9', '3.8', '3.7']
    52

    63
    jobs:
    74
    - job: Prebuild
    @@ -14,40 +11,8 @@ jobs:
    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-22.04
    24-
    25-
    steps:
    26-
    - template: ./docs-steps.yml
    27-
    28-
    29-
    - job: macOS_PR_Tests
    30-
    displayName: macOS PR Tests
    31-
    dependsOn: Prebuild
    32-
    #condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
    33-
    # bpo-39837: macOS tests on Azure Pipelines are disabled
    34-
    condition: false
    35-
    36-
    variables:
    37-
    testRunTitle: '$(system.pullRequest.TargetBranch)-macos'
    38-
    testRunPlatform: macos
    39-
    40-
    pool:
    41-
    vmImage: macos-10.15
    42-
    43-
    steps:
    44-
    - template: ./macos-steps.yml
    45-
    parameters:
    46-
    targetBranch: $(System.PullRequest.TargetBranch)
    47-
    48-
    49-
    - job: Ubuntu_PR_Tests
    50-
    displayName: Ubuntu PR Tests
    14+
    - job: Ubuntu_Patchcheck
    15+
    displayName: Ubuntu patchcheck
    5116
    dependsOn: Prebuild
    5217
    condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
    5318

    @@ -57,67 +22,7 @@ jobs:
    5722
    variables:
    5823
    testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
    5924
    testRunPlatform: linux
    60-
    openssl_version: 1.1.1t
    61-
    62-
    steps:
    63-
    - template: ./posix-steps.yml
    64-
    parameters:
    65-
    dependencies: apt
    66-
    67-
    68-
    - job: Ubuntu_Coverage_PR_Tests
    69-
    displayName: Ubuntu PR 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-22.04
    82-
    83-
    variables:
    84-
    testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
    85-
    testRunPlatform: linux-coverage
    86-
    openssl_version: 1.1.1t
    25+
    openssl_version: 1.1.1u
    8726

    8827
    steps:
    8928
    - template: ./posix-steps.yml
    90-
    parameters:
    91-
    dependencies: apt
    92-
    coverage: true
    93-
    94-
    95-
    - job: Windows_PR_Tests
    96-
    displayName: Windows PR Tests
    97-
    dependsOn: Prebuild
    98-
    condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
    99-
    100-
    pool:
    101-
    vmImage: windows-2022
    102-
    103-
    strategy:
    104-
    matrix:
    105-
    win32:
    106-
    arch: win32
    107-
    buildOpt: '-p Win32'
    108-
    testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
    109-
    testRunPlatform: win32
    110-
    win64:
    111-
    arch: amd64
    112-
    buildOpt: '-p x64'
    113-
    testRunTitle: '$(System.PullRequest.TargetBranch)-win64'
    114-
    testRunPlatform: win64
    115-
    winarm64:
    116-
    arch: arm64
    117-
    buildOpt: '-p arm64'
    118-
    maxParallel: 4
    119-
    120-
    steps:
    121-
    - template: ./windows-steps.yml
    122-
    parameters:
    123-
    targetBranch: $(System.PullRequest.TargetBranch)

    ‎.azure-pipelines/prebuild-checks.yml

    Lines changed: 0 additions & 12 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,18 +11,6 @@ steps:
    1111
    displayName: Fetch comparison tree
    1212
    condition: and(succeeded(), variables['System.PullRequest.TargetBranch'])
    1313

    14-
    - script: |
    15-
    if ! git diff --name-only $(diffTarget) | grep -qE '(\.rst$|^Doc|^Misc)'
    16-
    then
    17-
    echo "No docs were updated: docs.run=false"
    18-
    echo "##vso[task.setvariable variable=run;isOutput=true]false"
    19-
    else
    20-
    echo "Docs were updated: docs.run=true"
    21-
    echo "##vso[task.setvariable variable=run;isOutput=true]true"
    22-
    fi
    23-
    displayName: Detect documentation changes
    24-
    name: docs
    25-
    2614
    - script: |
    2715
    if ! git diff --name-only $(diffTarget) | grep -qvE '(\.rst$|^Doc|^Misc)'
    2816
    then

    0 commit comments

    Comments
     (0)
    0