Skip to content

Commit f5b28a0

Browse files
committed
Merge branch 'main' into login_tty
2 parents 7b27681 + 91e33ac commit f5b28a0

File tree

601 files changed

+31665
-15854
lines changed

Some content is hidden

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

601 files changed

+31665
-15854
lines changed

.azure-pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
variables:
5858
testRunTitle: '$(build.sourceBranchName)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1l
60+
openssl_version: 1.1.1m
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1l
86+
openssl_version: 1.1.1m
8787

8888
steps:
8989
- template: ./posix-steps.yml

.azure-pipelines/posix-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ steps:
6666
COMMAND: make
6767

6868
- ${{ if eq(parameters.patchcheck, 'true') }}:
69-
- script: ./python Tools/scripts/patchcheck.py --travis true
69+
- script: ./python Tools/scripts/patchcheck.py --ci true
7070
displayName: 'Run patchcheck.py'
7171
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
7272

.azure-pipelines/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
variables:
5858
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1l
60+
openssl_version: 1.1.1m
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1l
86+
openssl_version: 1.1.1m
8787

8888
steps:
8989
- template: ./posix-steps.yml

.github/CODEOWNERS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ Python/ceval.c @markshannon
2121
Python/compile.c @markshannon
2222
Python/ast_opt.c @isidentical
2323

24+
# Exceptions
25+
Lib/traceback.py @iritkatriel
26+
Lib/test/test_except*.py @iritkatriel
27+
Lib/test/test_traceback.py @iritkatriel
28+
Objects/exceptions.c @iritkatriel
29+
Python/traceback.c @iritkatriel
30+
Python/pythonrun.c @iritkatriel
31+
2432
# Hashing
2533
**/*hashlib* @python/crypto-team @tiran
2634
**/*pyhash* @python/crypto-team @tiran
@@ -130,6 +138,8 @@ Lib/ast.py @isidentical
130138

131139
**/*typing* @gvanrossum @Fidget-Spinner
132140

141+
**/*asyncore @giampaolo
142+
**/*asynchat @giampaolo
133143
**/*ftplib @giampaolo
134144
**/*shutil @giampaolo
135145

.github/FUNDING.yml

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

.github/workflows/build.yml

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@ jobs:
6464
- uses: actions/setup-python@v2
6565
- name: Install Dependencies
6666
run: sudo ./.github/workflows/posix-deps-apt.sh
67+
- name: Add ccache to PATH
68+
run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
69+
- name: Configure ccache action
70+
uses: hendrikmuhs/ccache-action@v1
71+
- name: Check Autoconf version 2.69 and aclocal 1.16.3
72+
run: |
73+
grep "Generated by GNU Autoconf 2.69" configure
74+
grep "aclocal 1.16.3" aclocal.m4
75+
grep -q "runstatedir" configure
76+
grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4
77+
- name: Regenerate autoconf files
78+
run: docker run --rm -v $(pwd):/src quay.io/tiran/cpython_autoconf:269
6779
- name: Build CPython
6880
run: |
6981
# Build Python with the libpython dynamic library
@@ -75,20 +87,19 @@ jobs:
7587
git add -u
7688
changes=$(git status --porcelain)
7789
# Check for changes in regenerated files
78-
if ! test -z "$changes"
79-
then
80-
echo "Generated files not up to date. Perhaps you forgot to run make regen-all or build.bat --regen ;)"
90+
if test -n "$changes"; then
91+
echo "Generated files not up to date."
92+
echo "Perhaps you forgot to run make regen-all or build.bat --regen. ;)"
93+
echo "configure files must be regenerated with a specific version of autoconf."
8194
echo "$changes"
95+
echo ""
96+
git diff --staged || true
8297
exit 1
8398
fi
8499
- name: Check exported libpython symbols
85100
run: make smelly
86101
- name: Check limited ABI symbols
87102
run: make check-limited-abi
88-
- name: Check Autoconf version 2.69
89-
run: |
90-
grep "Generated by GNU Autoconf 2.69" configure
91-
grep "PKG_PROG_PKG_CONFIG" aclocal.m4
92103

93104
build_win32:
94105
name: 'Windows (x86)'
@@ -101,6 +112,7 @@ jobs:
101112
- uses: actions/checkout@v2
102113
- name: Build CPython
103114
run: .\PCbuild\build.bat -e -p Win32
115+
timeout-minutes: 30
104116
- name: Display build info
105117
run: .\python.bat -m test.pythoninfo
106118
- name: Tests
@@ -119,6 +131,7 @@ jobs:
119131
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
120132
- name: Build CPython
121133
run: .\PCbuild\build.bat -e -p x64
134+
timeout-minutes: 30
122135
- name: Display build info
123136
run: .\python.bat -m test.pythoninfo
124137
- name: Tests
@@ -152,7 +165,7 @@ jobs:
152165
needs: check_source
153166
if: needs.check_source.outputs.run_tests == 'true'
154167
env:
155-
OPENSSL_VER: 1.1.1l
168+
OPENSSL_VER: 1.1.1m
156169
PYTHONSTRICTEXTENSIONBUILD: 1
157170
steps:
158171
- uses: actions/checkout@v2
@@ -167,7 +180,7 @@ jobs:
167180
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
168181
- name: 'Restore OpenSSL build'
169182
id: cache-openssl
170-
uses: actions/cache@v2.1.6
183+
uses: actions/cache@v2.1.7
171184
with:
172185
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
173186
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -211,7 +224,7 @@ jobs:
211224
strategy:
212225
fail-fast: false
213226
matrix:
214-
openssl_ver: [1.1.1l, 3.0.0]
227+
openssl_ver: [1.1.1m, 3.0.1]
215228
env:
216229
OPENSSL_VER: ${{ matrix.openssl_ver }}
217230
MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -230,7 +243,7 @@ jobs:
230243
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
231244
- name: 'Restore OpenSSL build'
232245
id: cache-openssl
233-
uses: actions/cache@v2.1.6
246+
uses: actions/cache@v2.1.7
234247
with:
235248
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
236249
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -258,7 +271,7 @@ jobs:
258271
needs: check_source
259272
if: needs.check_source.outputs.run_tests == 'true'
260273
env:
261-
OPENSSL_VER: 1.1.1l
274+
OPENSSL_VER: 1.1.1m
262275
PYTHONSTRICTEXTENSIONBUILD: 1
263276
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
264277
steps:
@@ -274,7 +287,7 @@ jobs:
274287
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
275288
- name: 'Restore OpenSSL build'
276289
id: cache-openssl
277-
uses: actions/cache@v2.1.6
290+
uses: actions/cache@v2.1.7
278291
with:
279292
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
280293
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

.github/workflows/doc.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,15 @@ jobs:
3838
run: make -j4
3939
- name: 'Install build dependencies'
4040
run: make -C Doc/ PYTHON=../python venv
41-
- name: 'Build documentation'
42-
run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W --keep-going -j4" doctest html
41+
# Run "check doctest html" as 3 steps to get a more readable output
42+
# in the web UI
43+
- name: 'Check documentation'
44+
run: make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W --keep-going -j4" check
45+
# Use "xvfb-run" since some doctest tests open GUI windows
46+
- name: 'Run documentation doctest'
47+
run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W --keep-going -j4" doctest
48+
- name: 'Build HTML documentation'
49+
run: make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W --keep-going -j4" html
4350
- name: 'Upload'
4451
uses: actions/upload-artifact@v2.2.4
4552
with:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ Tools/unicode/data/
115115
/config.log
116116
/config.status
117117
/config.status.lineno
118+
# hendrikmuhs/ccache-action@v1
119+
/.ccache
118120
/platform
119121
/profile-clean-stamp
120122
/profile-run-stamp

.travis.yml

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

CODE_OF_CONDUCT.md

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

0 commit comments

Comments
 (0)