Skip to content

Commit 23ed5e3

Browse files
committed
Merge branch 'main' of github.com:python/cpython
2 parents c7c9c0f + 8e76d7e commit 23ed5e3

File tree

349 files changed

+7260
-6061
lines changed

Some content is hidden

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

349 files changed

+7260
-6061
lines changed

.gitattributes

+19-15
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,27 @@ Lib/test/sndhdrdata/sndhdr.* binary
2222
PC/classicAppCompat.* binary
2323

2424
# Text files that should not be subject to eol conversion
25-
Lib/test/cjkencodings/* -text
26-
Lib/test/decimaltestdata/*.decTest -text
27-
Lib/test/test_email/data/*.txt -text
28-
Lib/test/xmltestdata/* -text
29-
Lib/test/coding20731.py -text
30-
Lib/test/test_importlib/data01/* -text
31-
Lib/test/test_importlib/namespacedata01/* -text
25+
[attr]noeol -text
26+
27+
Lib/test/cjkencodings/* noeol
28+
Lib/test/coding20731.py noeol
29+
Lib/test/decimaltestdata/*.decTest noeol
30+
Lib/test/test_email/data/*.txt noeol
31+
Lib/test/test_importlib/data01/* noeol
32+
Lib/test/test_importlib/namespacedata01/* noeol
33+
Lib/test/xmltestdata/* noeol
3234

3335
# CRLF files
34-
*.bat text eol=crlf
35-
*.ps1 text eol=crlf
36-
*.sln text eol=crlf
37-
*.vcxproj* text eol=crlf
38-
*.props text eol=crlf
39-
*.proj text eol=crlf
40-
PCbuild/readme.txt text eol=crlf
41-
PC/readme.txt text eol=crlf
36+
[attr]dos text eol=crlf
37+
38+
*.bat dos
39+
*.proj dos
40+
*.props dos
41+
*.ps1 dos
42+
*.sln dos
43+
*.vcxproj* dos
44+
PC/readme.txt dos
45+
PCbuild/readme.txt dos
4246

4347
# Language aware diff headers
4448
# https://tekin.co.uk/2020/10/better-git-diff-output-for-ruby-python-elixir-and-more

.github/CONTRIBUTING.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ 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:
4545

4646
- All discussions that are not directly related to the code in the pull request
47-
should happen on bugs.python.org
47+
should happen on `GitHub Issues <https://github.com/python/cpython/issues>`_.
4848
- Upon your first non-trivial pull request (which includes documentation changes),
4949
feel free to add yourself to ``Misc/ACKS``
5050

.github/ISSUE_TEMPLATE/bug.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Bug report
3+
about: Submit a bug report
4+
labels: "type-bug"
5+
---
6+
7+
<!--
8+
If you're new to Python and you're not sure whether what you're experiencing is a bug, the CPython issue tracker is not
9+
the right place to seek help. Consider the following options instead:
10+
11+
- reading the Python tutorial: https://docs.python.org/3/tutorial/
12+
- posting in the "Users" category on discuss.python.org: https://discuss.python.org/c/users/7
13+
- emailing the Python-list mailing list: https://mail.python.org/mailman/listinfo/python-list
14+
- searching our issue tracker (https://github.com/python/cpython/issues) to see if
15+
your problem has already been reported
16+
-->
17+
18+
**Bug report**
19+
20+
A clear and concise description of what the bug is.
21+
Include a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example), if possible.
22+
23+
**Your environment**
24+
25+
<!-- Include as many relevant details as possible about the environment you experienced the bug in -->
26+
27+
- CPython versions tested on:
28+
- Operating system and architecture:
29+
30+
<!--
31+
You can freely edit this text. Remove any lines you believe are unnecessary.
32+
-->

.github/ISSUE_TEMPLATE/config.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
blank_issues_enabled: false
21
contact_links:
3-
- name: ⚠ GitHub Issues Migration in progress ⚠
4-
url: https://discuss.python.org/t/github-issues-migration-status-update/14573
5-
about: Check status updates on the migration
2+
- name: "Getting help"
3+
about: "Ask questions about using Python and debugging errors on Discourse."
4+
url: "https://discuss.python.org/c/users/7"
5+
- name: "Proposing new features"
6+
about: "Submit major feature proposal (e.g. syntax changes) to an ideas forum first."
7+
url: "https://discuss.python.org/c/ideas/6"

.github/ISSUE_TEMPLATE/crash.md

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Crash report
3+
about: A hard crash of the interpreter, possibly with a core dump
4+
labels: "type-crash"
5+
---
6+
7+
<!--
8+
Use this template for hard crashes of the interpreter, segmentation faults, failed C-level assertions, and similar.
9+
Do not submit this form if you encounter an exception being unexpectedly raised from a Python function.
10+
Most of the time, these should be filed as bugs, rather than crashes.
11+
12+
The CPython interpreter is itself written in a different programming language, C.
13+
For CPython, a "crash" is when Python itself fails, leading to a traceback in the C stack.
14+
-->
15+
16+
**Crash report**
17+
18+
Tell us what happened, ideally including a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example).
19+
20+
**Error messages**
21+
22+
Enter any relevant error message caused by the crash, including a core dump if there is one.
23+
24+
**Your environment**
25+
26+
<!-- Include as many relevant details as possible about the environment you experienced the bug in -->
27+
28+
- CPython versions tested on:
29+
- Operating system and architecture:
30+
31+
<!--
32+
You can freely edit this text. Remove any lines you believe are unnecessary.
33+
-->
+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: Documentation
3+
about: Report a problem with the documentation
4+
labels: "docs"
5+
---
6+
7+
**Documentation**
8+
9+
(A clear and concise description of the issue.)

.github/ISSUE_TEMPLATE/feature.md

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: Feature or enhancement
3+
about: Submit a proposal for a new CPython feature or enhancement
4+
labels: "type-feature"
5+
---
6+
7+
**Feature or enhancement**
8+
9+
(A clear and concise description of your proposal.)
10+
11+
**Pitch**
12+
13+
(Explain why this feature or enhacement should be implemented and how it would be used.
14+
Add examples, if applicable.)
15+
16+
**Previous discussion**
17+
18+
<!--
19+
New features to Python should first be discussed elsewhere before creating issues on GitHub,
20+
for example in the "ideas" category (https://discuss.python.org/c/ideas/6) of discuss.python.org,
21+
or the python-ideas mailing list (https://mail.python.org/mailman3/lists/python-ideas.python.org/).
22+
Use this space to post links to the places where you have already discussed this feature proposal:
23+
-->
24+
25+
26+
<!--
27+
You can freely edit this text. Remove any lines you believe are unnecessary.
28+
-->

.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Please read this comment in its entirety. It's quite important.
77
It should be in the following format:
88
99
```
10-
bpo-NNNN: Summary of the changes made
10+
gh-NNNNN: Summary of the changes made
1111
```
1212
13-
Where: bpo-NNNN refers to the issue number in the https://bugs.python.org.
13+
Where: gh-NNNNN refers to the GitHub issue number.
1414
1515
Most PRs will require an issue number. Trivial changes, like fixing a typo, do not need an issue.
1616

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Tests
22

3-
# bpo-40548: "paths-ignore" is not used to skip documentation-only PRs, because
3+
# gh-84728: "paths-ignore" is not used to skip documentation-only PRs, because
44
# it prevents to mark a job as mandatory. A PR cannot be merged if a job is
55
# mandatory but not scheduled because of "paths-ignore".
66
on:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: new-bugs-announce notifier
2+
3+
on:
4+
issues:
5+
types:
6+
- opened
7+
8+
jobs:
9+
notify-new-bugs-announce:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/setup-node@v2
13+
with:
14+
node-version: 14
15+
- run: npm install mailgun.js form-data
16+
- name: Send notification
17+
uses: actions/github-script@v5
18+
env:
19+
MAILGUN_API_KEY: ${{ secrets.PSF_MAILGUN_KEY }}
20+
with:
21+
script: |
22+
const Mailgun = require("mailgun.js");
23+
const formData = require('form-data');
24+
const mailgun = new Mailgun(formData);
25+
const DOMAIN = "mg.python.org";
26+
const mg = mailgun.client({username: 'api', key: process.env.MAILGUN_API_KEY});
27+
github.rest.issues.get({
28+
issue_number: context.issue.number,
29+
owner: context.repo.owner,
30+
repo: context.repo.repo,
31+
})
32+
.then(function(issue) {
33+
const payload = {
34+
author : issue.data.user.login,
35+
issue : issue.data.number,
36+
title : issue.data.title,
37+
url : issue.data.html_url,
38+
labels : issue.data.labels.map(label => { return label.name }).join(", "),
39+
assignee : issue.data.assignees.map(assignee => { return assignee.login }),
40+
body : issue.data.body
41+
};
42+
43+
const data = {
44+
from: "CPython Issues <[email protected]>",
45+
46+
subject: `[Issue ${issue.data.number}] ${issue.data.title}`,
47+
template: "new-github-issue",
48+
'o:tracking-clicks': 'no',
49+
'h:X-Mailgun-Variables': JSON.stringify(payload)
50+
};
51+
return mg.messages.create(DOMAIN, data)
52+
})
53+
.then(msg => console.log(msg));

.github/workflows/stale.yml

+1-15
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,13 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- name: "Check PRs with 'CLA signed' label"
17+
- name: "Check PRs"
1818
uses: actions/stale@v4
1919
with:
2020
repo-token: ${{ secrets.GITHUB_TOKEN }}
21-
only-pr-labels: 'CLA signed'
2221
stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity.'
2322
stale-pr-label: 'stale'
2423
days-before-stale: 30
2524
days-before-close: -1
2625
ascending: true
2726
operations-per-run: 120
28-
29-
- name: "Check PRs with 'CLA not signed' label"
30-
uses: actions/stale@v4
31-
with:
32-
repo-token: ${{ secrets.GITHUB_TOKEN }}
33-
only-pr-labels: 'CLA not signed'
34-
stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity. If the CLA is not signed within 14 days, it will be closed. See also https://devguide.python.org/pullrequest/#licensing'
35-
stale-pr-label: 'stale'
36-
close-pr-message: 'Closing this stale PR because the CLA is still not signed.'
37-
days-before-stale: 30
38-
days-before-close: 14
39-
ascending: true
40-
operations-per-run: 120

Doc/bugs.rst

+24-19
Original file line numberDiff line numberDiff line change
@@ -35,43 +35,48 @@ though it may take a while to be processed.
3535
`Helping with Documentation <https://devguide.python.org/docquality/#helping-with-documentation>`_
3636
Comprehensive guide for individuals that are interested in contributing to Python documentation.
3737

38+
`Documentation Translations <https://devguide.python.org/documenting/#translating>`_
39+
A list of GitHub pages for documentation translation and their primary contacts.
40+
41+
3842
.. _using-the-tracker:
3943

4044
Using the Python issue tracker
4145
==============================
4246

43-
Bug reports for Python itself should be submitted via the Python Bug Tracker
44-
(https://bugs.python.org/). The bug tracker offers a web form which allows
45-
pertinent information to be entered and submitted to the developers.
47+
Issue reports for Python itself should be submitted via the GitHub issues
48+
tracker (https://github.com/python/cpython/issues).
49+
The GitHub issues tracker offers a web form which allows pertinent information
50+
to be entered and submitted to the developers.
4651

4752
The first step in filing a report is to determine whether the problem has
4853
already been reported. The advantage in doing so, aside from saving the
49-
developers time, is that you learn what has been done to fix it; it may be that
54+
developers' time, is that you learn what has been done to fix it; it may be that
5055
the problem has already been fixed for the next release, or additional
5156
information is needed (in which case you are welcome to provide it if you can!).
52-
To do this, search the bug database using the search box on the top of the page.
57+
To do this, search the tracker using the search box at the top of the page.
58+
59+
If the problem you're reporting is not already in the list, log in to GitHub.
60+
If you don't already have a GitHub account, create a new account using the
61+
"Sign up" link.
62+
It is not possible to submit a bug report anonymously.
5363

54-
If the problem you're reporting is not already in the bug tracker, go back to
55-
the Python Bug Tracker and log in. If you don't already have a tracker account,
56-
select the "Register" link or, if you use OpenID, one of the OpenID provider
57-
logos in the sidebar. It is not possible to submit a bug report anonymously.
64+
Being now logged in, you can submit an issue.
65+
Click on the "New issue" button in the top bar to report a new issue.
5866

59-
Being now logged in, you can submit a bug. Select the "Create New" link in the
60-
sidebar to open the bug reporting form.
67+
The submission form has two fields, "Title" and "Comment".
6168

62-
The submission form has a number of fields. For the "Title" field, enter a
63-
*very* short description of the problem; less than ten words is good. In the
64-
"Type" field, select the type of your problem; also select the "Component" and
65-
"Versions" to which the bug relates.
69+
For the "Title" field, enter a *very* short description of the problem;
70+
less than ten words is good.
6671

6772
In the "Comment" field, describe the problem in detail, including what you
6873
expected to happen and what did happen. Be sure to include whether any
6974
extension modules were involved, and what hardware and software platform you
7075
were using (including version information as appropriate).
7176

72-
Each bug report will be assigned to a developer who will determine what needs to
73-
be done to correct the problem. You will receive an update each time action is
74-
taken on the bug.
77+
Each issue report will be reviewed by a developer who will determine what needs to
78+
be done to correct the problem. You will receive an update each time an action is
79+
taken on the issue.
7580

7681

7782
.. seealso::
@@ -95,6 +100,6 @@ patching Python in the `Python Developer's Guide`_. If you have questions,
95100
the `core-mentorship mailing list`_ is a friendly place to get answers to
96101
any and all questions pertaining to the process of fixing issues in Python.
97102

98-
.. _Documentation bugs: https://bugs.python.org/issue?@filter=status&@filter=components&components=4&status=1&@columns=id,activity,title,status&@sort=-activity
103+
.. _Documentation bugs: https://github.com/python/cpython/issues?q=is%3Aissue+is%3Aopen+label%3Adocs
99104
.. _Python Developer's Guide: https://devguide.python.org/
100105
.. _core-mentorship mailing list: https://mail.python.org/mailman3/lists/core-mentorship.python.org/

0 commit comments

Comments
 (0)