8000 Merge remote-tracking branch 'upstream/main' into pep688v2 · python/cpython@de3a4bc · GitHub
[go: up one dir, main page]
Skip to content

Commit de3a4bc

Browse files
JelleZijlstraJelleZijlstra
committed
Merge remote-tracking branch 'upstream/main' into pep688v2
2 parents 530a160 + f5d7107 commit de3a4bc

File tree

347 files changed

+6443
-4843
lines changed

Some content is hidden

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

347 files changed

+6443
-4843
lines changed

‎.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# It uses the same pattern rule for gitignore file
55
# https://git-scm.com/docs/gitignore#_pattern_format
66

7+
# GitHub
8+
.github/** @ezio-melotti
9+
710
# asyncio
811
**/*asyncio* @1st1 @asvetlov @gvanrossum
912

‎.github/CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ also suggestions on how you can most effectively help the project.
3838

3939
Please be aware that our workflow does deviate slightly from the typical GitHub
4040
project. Details on how to properly submit a pull request are covered in
41-
`Lifecycle of a Pull Request <https://devguide.python.org/pullrequest/>`_.
41+
`Lifecycle of a Pull Request <https://devguide.python.org/getting-started/pull-request-lifecycle.html>`_.
4242
We utilize various bots and status checks to help with this, so do follow the
4343
comments they leave and their "Details" links, respectively. The key points of
4444
our workflow that are not covered by a bot or status check are:

‎.github/workflows/build.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,23 @@ on:
2525
permissions:
2626
contents: read
2727

28+
concurrency:
29+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
30+
cancel-in-progress: true
31+
2832
jobs:
2933
check_source:
3034
name: 'Check for source changes'
3135
runs-on: ubuntu-latest
3236
outputs:
3337
run_tests: ${{ steps.check.outputs.run_tests }}
34-
run_ssl_tests: ${{ steps.check.outputs.run_ssl_tests }}
3538
steps:
3639
- uses: actions/checkout@v3
3740
- name: Check for source changes
3841
id: check
3942
run: |
4043
if [ -z "$GITHUB_BASE_REF" ]; then
4144
echo '::set-output name=run_tests::true'
42-
echo '::set-output name=run_ssl_tests::true'
4345
else
4446
git fetch origin $GITHUB_BASE_REF --depth=1
4547
# git diff "origin/$GITHUB_BASE_REF..." (3 dots) may be more
@@ -56,7 +58,6 @@ jobs:
5658
#
5759
# https://github.com/python/core-workflow/issues/373
5860
git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc)' && echo '::set-output name=run_tests::true' || true
59-
git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qE '(ssl|hashlib|hmac|^.github)' && echo '::set-output name=run_ssl_tests::true' || true
6061
fi
6162
6263
check_generated_files:
@@ -72,7 +73,7 @@ jobs:
7273
- name: Add ccache to PATH
7374
run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
7475
- name: Configure ccache action
75-
uses: hendrikmuhs/ccache-action@v1
76+
uses: hendrikmuhs/ccache-action@v1.2
7677
- name: Check Autoconf version 2.69 and aclocal 1.16.3
7778
run: |
7879
grep "Generated by GNU Autoconf 2.69" configure
@@ -201,7 +202,7 @@ jobs:
201202
run: |
202203
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
203204
- name: Configure ccache action
204-
uses: hendrikmuhs/ccache-action@v1
205+
uses: hendrikmuhs/ccache-action@v1.2
205206
- name: Setup directory envs for out-of-tree builds
206207
run: |
207208
echo "CPYTHON_RO_SRCDIR=$(realpath -m ${GITHUB_WORKSPACE}/../cpython-ro-srcdir)" >> $GITHUB_ENV
@@ -230,7 +231,7 @@ jobs:
230231
name: 'Ubuntu SSL tests with OpenSSL'
231232
runs-on: ubuntu-20.04
232233
needs: check_source
233-
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_ssl_tests == 'true'
234+
if: needs.check_source.outputs.run_tests == 'true'
234235
strategy:
235236
fail-fast: false
236237
matrix:
@@ -264,7 +265,7 @@ jobs:
264265
run: |
265266
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
266267
- name: Configure ccache action
267-
uses: hendrikmuhs/ccache-action@v1
268+
uses: hendrikmuhs/ccache-action@v1.2
268269
- name: Configure CPython
269270
run: ./configure --with-pydebug --with-openssl=$OPENSSL_DIR
270271
- name: Build CPython
@@ -308,7 +309,7 @@ jobs:
308309
run: |
309310
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
310311
- name: Configure ccache action
311-
uses: hendrikmuhs/ccache-action@v1
312+
uses: hendrikmuhs/ccache-action@v1.2
312313
- name: Configure CPython
313314
run: ./configure --with-address-sanitizer --without-pymalloc
314315
- name: Build CPython

‎.github/workflows/build_msi.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ on:
1818
permissions:
1919
contents: read
2020

21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
23+
cancel-in-progress: true
24+
2125
jobs:
2226
build:
2327
name: Windows Installer

‎.github/workflows/doc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ on:
2828
permissions:
2929
contents: read
3030

31+
concurrency:
32+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
33+
cancel-in-progress: true
34+
3135
jobs:
3236
build_doc:
3337
name: 'Docs'

‎.github/workflows/project-updater.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- opened
77
- labeled
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
add-to-project:
1114
name: Add issues to projects

‎.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: "Check PRs"
18-
uses: actions/stale@v5
18+
uses: actions/stale@v6
1919
with:
2020
repo-token: ${{ secrets.GITHUB_TOKEN }}
2121
stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity.'

‎.github/workflows/verify-ensurepip-wheels.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ on:
1616
permissions:
1717
contents: read
1818

19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
21+
cancel-in-progress: true
22+
1923
jobs:
2024
verify:
2125
runs-on: ubuntu-latest

‎Doc/Makefile

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees $(PAPEROPT_$(PAPER)) -j auto \
2222
$(SPHINXOPTS) $(SPHINXERRORHANDLING) . build/$(BUILDER) $(SOURCES)
2323

2424
.PHONY: help build html htmlhelp latex text texinfo changes linkcheck \
25-
suspicious coverage doctest pydoc-topics htmlview clean dist check serve \
25+
coverage doctest pydoc-topics htmlview clean dist check serve \
2626
autobuild-dev autobuild-stable venv
2727

2828
help:
@@ -42,7 +42,6 @@ help:
4242
@echo " doctest to run doctests in the documentation"
4343
@echo " pydoc-topics to regenerate the pydoc topics file"
4444
@echo " dist to create a \"dist\" directory with archived docs for download"
45-
@echo " suspicious to check for suspicious markup in output text"
4645
@echo " check to run a check for frequent markup errors"
4746

4847
build:
@@ -110,18 +109,6 @@ linkcheck:
110109
"or in build/$(BUILDER)/output.txt"; \
111110
false; }
112111

113-
suspicious: BUILDER = suspicious
114-
suspicious:
115-
@$(MAKE) build BUILDER=$(BUILDER) || { \
116-
echo "Suspicious check complete; look for any errors in the above output" \
117-
"or in build/$(BUILDER)/suspicious.csv. If all issues are false" \
118- C4FE
"positives, append that file to tools/susp-ignored.csv."; \
119-
false; }
120-
@echo "⚠ make suspicious is deprecated and will be removed soon."
121-
@echo "⚠ Use:"
122-
@echo "⚠ make check"
123-
@echo "⚠ instead."
124-
125112
coverage: BUILDER = coverage
126113
coverage: build
127114
@echo "Coverage finished; see c.txt and python.txt in build/coverage"

‎Doc/README.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ Available make targets are:
9393
plain text documentation for the labels defined in
9494
``tools/pyspecific.py`` -- pydoc needs these to show topic and keyword help.
9595

96-
* "suspicious", which checks the parsed markup for text that looks like
97-
malformed and thus unconverted reST.
98-
9996
* "check", which checks for frequent markup errors.
10097

10198
* "serve", which serves the build/html directory on port 8000.

0 commit comments

Comments
 (0)
0