Merge branch 'master' into fix_dc_introspect · python/cpython@e38de43 · GitHub
Skip to content

Commit e38de43

Browse files
author
Yury Selivanov
authored
Merge branch 'master' into fix_dc_introspect
2 parents 8400415 + b0e0877 commit e38de43

1,173 files changed

Lines changed: 35380 additions & 21372 deletions

File tree

Some content is hidden

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

‎.azure-pipelines/ci.yml‎

Lines changed: 136 additions & 0 deletions

‎.azure-pipelines/docker-steps.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
steps:
2+
- checkout: self
3+
clean: true
4+
fetchDepth: 5
5+
6+
- ${{ if ne(parameters.targetBranch, '') }}:
7+
- script: |
8+
git fetch -q origin ${{ parameters.targetbranch }}
9+
if ! git diff --name-only HEAD $(git merge-base HEAD FETCH_HEAD) | grep -qvE '(\.rst$|^Doc|^Misc)'
10+
then
11+
echo "Only docs were updated, stopping build process."
12+
echo "##vso[task.setvariable variable=DocOnly]true"
13+
exit
14+
fi
15+
displayName: Detect doc-only changes
16+
17+
- task: docker@0
18+
displayName: 'Configure CPython (debug)'
19+
inputs:
20+
action: 'Run an image'
21+
imageName: $(imageName)
22+
volumes: |
23+
$(build.sourcesDirectory):/src
24+
$(build.binariesDirectory):/build
25+
workDir: '/src'
26+
containerCommand: './configure --with-pydebug'
27+
detached: false
28+
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
29+
30+
- task: docker@0
31+
displayName: 'Build CPython'
32+
inputs:
33+
action: 'Run an image'
34+
imageName: $(imageName)
35+
volumes: |
36+
$(build.sourcesDirectory):/src
37+
$(build.binariesDirectory):/build
38+
workDir: '/src'
39+
containerCommand: 'make -s -j4'
40+
detached: false
41+
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
42+
43+
- task: docker@0
44+
displayName: 'Display build info'
45+
inputs:
46+
action: 'Run an image'
47+
imageName: $(imageName)
48+
volumes: |
49+
$(build.sourcesDirectory):/src
50+
$(build.binariesDirectory):/build
51+
workDir: '/src'
52+
containerCommand: 'make pythoninfo'
53+
detached: false
54+
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
55+
56+
- task: docker@0
57+
displayName: 'Tests'
58+
inputs:
59+
action: 'Run an image'
60+
imageName: $(imageName)
61+
volumes: |
62+
$(build.sourcesDirectory):/src
63+
$(build.binariesDirectory):/build
64+
workDir: '/src'
65+
containerCommand: 'make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=/build/test-results.xml"'
66+
detached: false
67+
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
68+
69+
- task: PublishTestResults@2
70+
displayName: 'Publish Test Results'
71+
inputs:
72+
testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
73+
mergeTestResults: true
74+
testRunTitle: $(testRunTitle)
75+
platform: $(testRunPlatform)
76+
condition: and(succeededOrFailed(), ne(variables['DocOnly'], 'true'))

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
parameters:
2+
latex: false
3+
upload: false
4+
5+
steps:
6+
- checkout: self
7+
clean: true
8+
fetchDepth: 5
9+
10+
- task: UsePythonVersion@0
11+
displayName: 'Use Python 3.6 or later'
12+
inputs:
13+
versionSpec: '>=3.6'
14+
15+
- script: python -m pip install sphinx==1.8.2 blurb python-docs-theme
16+
displayName: 'Install build dependencies'
17+
18+
- ${{ if ne(parameters.latex, 'true') }}:
19+
- script: make check suspicious html PYTHON=python
20+
workingDirectory: '$(build.sourcesDirectory)/Doc'
21+
displayName: 'Build documentation'
22+
23+
- ${{ if eq(parameters.latex, 'true') }}:
24+
- script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full
25+
displayName: 'Install LaTeX'
26+
27+
- script: make dist PYTHON=python SPHINXBUILD='python -m sphinx' BLURB='python -m blurb'
28+
workingDirectory: '$(build.sourcesDirectory)/Doc'
29+
displayName: 'Build documentation'
30+
31+
- ${{ if eq(parameters.upload, 'true') }}:
32+
- task: PublishBuildArtifacts@1
33+
displayName: 'Publish docs'
34+
35+
inputs:
36+
PathToPublish: '$(build.sourcesDirectory)/Doc/build'
37+
ArtifactName: docs
38+
publishLocation: Container
39+
40+
- ${{ if eq(parameters.latex, 'true') }}:
41+
- task: PublishBuildArtifacts@1
42+
displayName: 'Publish dist'
43+
inputs:
44+
PathToPublish: '$(build.sourcesDirectory)/Doc/dist'
45+
ArtifactName: docs_dist
46+
publishLocation: Container

.vsts/macos-buildbot.yml renamed to .azure-pipelines/macos-steps.yml

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,9 @@
1-
# Current docs for the syntax of this file are at:
2-
# https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted.md
3-
4-
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
5-
6-
queue:
7-
name: Hosted macOS
8-
9-
trigger:
10-
branches:
11-
include:
12-
- master
13-
- 3.7
14-
- 3.6
15-
paths:
16-
exclude:
17-
- Doc/*
18-
- Tools/*
19-
20-
#variables:
21-
221
steps:
232
- checkout: self
243
clean: true
254
fetchDepth: 5
265

27-
- script: ./configure --with-pydebug --with-openssl=/usr/local/opt/openssl --prefix=/opt/python-vsts
6+
- script: ./configure --with-pydebug --with-openssl=/usr/local/opt/openssl --prefix=/opt/python-azdev
287
displayName: 'Configure CPython (debug)'
298

309
- script: make -s -j4
@@ -41,6 +20,6 @@ steps:
4120
inputs:
4221
testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
4322
mergeTestResults: true
44-
testRunTitle: '$(build.sourceBranchName)-macOS'
45-
platform: macOS
23+
testRunTitle: $(testRunTitle)
24+
platform: $(testRunPlatform)
4625
condition: succeededOrFailed()

.vsts/install_deps.sh renamed to .azure-pipelines/posix-deps.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sudo apt-get update || true
1+
sudo apt-get update
22

33
sudo apt-get -yq install \
44
build-essential \
@@ -17,3 +17,10 @@ sudo apt-get -yq install \
1717
libffi-dev \
1818
uuid-dev \
1919
xvfb
20+
21+
if [ ! -z "$1" ]
22+
then
23+
echo ##vso[task.prependpath]$PWD/multissl/openssl/$1
24+
echo ##vso[task.setvariable variable=OPENSSL_DIR]$PWD/multissl/openssl/$1
25+
python3 Tools/ssl/multissltests.py --steps=library --base-directory $PWD/multissl --openssl $1 --system Linux
26+
fi

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

Lines changed: 63 additions & 0 deletions

0 commit comments

Comments
 (0)