Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 375b5c6

Browse filesBrowse files
pradyunsgpradyunsg
committed
Merge branch 'main' into remove-setuptools-ensurepip
2 parents 5c3ce99 + eb5fd31 commit 375b5c6
Copy full SHA for 375b5c6

File tree

Expand file treeCollapse file tree

700 files changed

+33090
-17537
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

700 files changed

+33090
-17537
lines changed

‎.devcontainer/Dockerfile

Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM docker.io/library/fedora:37
2+
3+
ENV CC=clang
4+
5+
ENV WASI_SDK_VERSION=19
6+
ENV WASI_SDK_PATH=/opt/wasi-sdk
7+
8+
ENV WASMTIME_HOME=/opt/wasmtime
9+
ENV WASMTIME_VERSION=7.0.0
10+
ENV WASMTIME_CPU_ARCH=x86_64
11+
12+
RUN dnf -y --nodocs install git clang xz python3-blurb dnf-plugins-core && \
13+
dnf -y --nodocs builddep python3 && \
14+
dnf -y clean all
15+
16+
RUN mkdir ${WASI_SDK_PATH} && \
17+
curl --location https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-linux.tar.gz | \
18+
tar --strip-components 1 --directory ${WASI_SDK_PATH} --extract --gunzip
19+
20+
RUN mkdir --parents ${WASMTIME_HOME} && \
21+
curl --location "https://github.com/bytecodealliance/wasmtime/releases/download/v${WASMTIME_VERSION}/wasmtime-v${WASMTIME_VERSION}-${WASMTIME_CPU_ARCH}-linux.tar.xz" | \
22+
xz --decompress | \
23+
tar --strip-components 1 --directory ${WASMTIME_HOME} -x && \
24+
ln -s ${WASMTIME_HOME}/wasmtime /usr/local/bin

‎.devcontainer/devcontainer.json

Copy file name to clipboard
+81Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"build": {
3+
"dockerfile": "Dockerfile"
4+
},
5+
"onCreateCommand": [
6+
// Install common tooling.
7+
"dnf",
8+
"install",
9+
"-y",
10+
"which",
11+
"zsh",
12+
"fish"
13+
],
14+
"updateContentCommand": {
15+
// Using the shell for `nproc` usage.
16+
"python": "./configure --config-cache --with-pydebug && make -s -j `nproc`",
17+
"docs": [
18+
"make",
19+
"--directory",
20+
"Doc",
21+
"venv",
22+
"html"
23+
]
24+
},
25+
"customizations": {
26+
"vscode": {
27+
"extensions": [
28+
// Highlighting for Parser/Python.asdl.
29+
"brettcannon.zephyr-asdl",
30+
// Highlighting for configure.ac.
31+
"maelvalais.autoconf",
32+
// C auto-complete.
33+
"ms-vscode.cpptools",
34+
// To view built docs.
35+
"ms-vscode.live-server"
36+
// https://github.com/microsoft/vscode-python/issues/18073
37+
// "ms-python.python"
38+
],
39+
"settings": {
40+
"C_Cpp.default.compilerPath": "/usr/bin/clang",
41+
"C_Cpp.default.cStandard": "c11",
42+
"C_Cpp.default.defines": [
43+
"CONFIG_64",
44+
"Py_BUILD_CORE"
45+
],
46+
"C_Cpp.default.includePath": [
47+
"${workspaceFolder}/*",
48+
"${workspaceFolder}/Include/**"
49+
],
50+
// https://github.com/microsoft/vscode-cpptools/issues/10732
51+
"C_Cpp.errorSquiggles": "disabled",
52+
"editor.insertSpaces": true,
53+
"editor.rulers": [
54+
80
55+
],
56+
"editor.tabSize": 4,
57+
"editor.trimAutoWhitespace": true,
58+
"files.associations": {
59+
"*.h": "c"
60+
},
61+
"files.encoding": "utf8",
62+
"files.eol": "\n",
63+
"files.insertFinalNewline": true,
64+
"files.trimTrailingWhitespace": true,
65+
"python.analysis.diagnosticSeverityOverrides": {
66+
// Complains about shadowing the stdlib w/ the stdlib.
67+
"reportShadowedImports": "none",
68+
// Doesn't like _frozen_importlib.
69+
"reportMissingImports": "none"
70+
},
71+
"python.analysis.extraPaths": [
72+
"Lib"
73+
],
74+
"python.defaultInterpreterPath": "./python",
75+
"[restructuredtext]": {
76+
"editor.tabSize": 3
77+
}
78+
}
79+
}
80+
}
81+
}

‎.gitattributes

Copy file name to clipboardExpand all lines: .gitattributes
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ Lib/test/test_importlib/resources/data01/* noeol
3232
Lib/test/test_importlib/resources/namespacedata01/* noeol
3333
Lib/test/xmltestdata/* noeol
3434

35+
# Shell scripts should have LF even on Windows because of Cygwin
36+
Lib/venv/scripts/common/activate text eol=lf
37+
Lib/venv/scripts/posix/* text eol=lf
38+
3539
# CRLF files
3640
[attr]dos text eol=crlf
3741

‎.github/CODEOWNERS

Copy file name to clipboardExpand all lines: .github/CODEOWNERS
+2-6Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# https://git-scm.com/docs/gitignore#_pattern_format
66

77
# GitHub
8-
.github/** @ezio-melotti
8+
.github/** @ezio-melotti @hugovk
99

1010
# Build system
1111
configure* @erlend-aasland @corona10
@@ -61,11 +61,7 @@ Python/traceback.c @iritkatriel
6161
/Tools/build/parse_html5_entities.py @ezio-melotti
6262

6363
# Import (including importlib).
64-
# Ignoring importlib.h so as to not get flagged on
65-
# all pull requests that change the emitted
66-
# bytecode.
67-
**/*import*.c @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
68-
**/*import*.py @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
64+
**/*import* @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
6965
**/*importlib/resources/* @jaraco @warsaw @FFY00
7066
**/importlib/metadata/* @jaraco @warsaw
7167

‎.github/workflows/build.yml

Copy file name to clipboardExpand all lines: .github/workflows/build.yml
+11-2Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
check_source:
3434
name: 'Check for source changes'
3535
runs-on: ubuntu-latest
36+
timeout-minutes: 10
3637
outputs:
3738
run_tests: ${{ steps.check.outputs.run_tests }}
3839
steps:
@@ -63,6 +64,7 @@ jobs:
6364
check_generated_files:
6465
name: 'Check if generated files are up to date'
6566
runs-on: ubuntu-latest
67+
timeout-minutes: 60
6668
needs: check_source
6769
if: needs.check_source.outputs.run_tests == 'true'
6870
steps:
@@ -111,10 +113,14 @@ jobs:
111113
run: make smelly
112114
- name: Check limited ABI symbols
113115
run: make check-limited-abi
116+
- name: Check for unsupported C global variables
117+
if: github.event_name == 'pull_request' # $GITHUB_EVENT_NAME
118+
run: make check-c-globals
114119

115120
build_win32:
116121
name: 'Windows (x86)'
117122
runs-on: windows-latest
123+
timeout-minutes: 60
118124
needs: check_source
119125
if: needs.check_source.outputs.run_tests == 'true'
120126
env:
@@ -123,7 +129,6 @@ jobs:
123129
- uses: actions/checkout@v3
124130
- name: Build CPython
125131
run: .\PCbuild\build.bat -e -d -p Win32
126-
timeout-minutes: 30
127132
- name: Display build info
128133
run: .\python.bat -m test.pythoninfo
129134
- name: Tests
@@ -132,6 +137,7 @@ jobs:
132137
build_win_amd64:
133138
name: 'Windows (x64)'
134139
runs-on: windows-latest
140+
timeout-minutes: 60
135141
needs: check_source
136142
if: needs.check_source.outputs.run_tests == 'true'
137143
env:
@@ -142,7 +148,6 @@ jobs:
142148
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
143149
- name: Build CPython
144150
run: .\PCbuild\build.bat -e -d -p x64
145-
timeout-minutes: 30
146151
- name: Display build info
147152
run: .\python.bat -m test.pythoninfo
148153
- name: Tests
@@ -151,6 +156,7 @@ jobs:
151156
build_macos:
152157
name: 'macOS'
153158
runs-on: macos-latest
159+
timeout-minutes: 60
154160
needs: check_source
155161
if: needs.check_source.outputs.run_tests == 'true'
156162
env:
@@ -181,6 +187,7 @@ jobs:
181187
build_ubuntu:
182188
name: 'Ubuntu'
183189
runs-on: ubuntu-20.04
190+
timeout-minutes: 60
184191
needs: check_source
185192
if: needs.check_source.outputs.run_tests == 'true'
186193
env:
@@ -238,6 +245,7 @@ jobs:
238245
build_ubuntu_ssltests:
239246
name: 'Ubuntu SSL tests with OpenSSL'
240247
runs-on: ubuntu-20.04
248+
timeout-minutes: 60
241249
needs: check_source
242250
if: needs.check_source.outputs.run_tests == 'true'
243251
strategy:
@@ -287,6 +295,7 @@ jobs:
287295
build_asan:
288296
name: 'Address sanitizer'
289297
runs-on: ubuntu-20.04
298+
timeout-minutes: 60
290299
needs: check_source
291300
if: needs.check_source.outputs.run_tests == 'true'
292301
env:

‎.github/workflows/build_msi.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_msi.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
build:
2727
name: Windows Installer
2828
runs-on: windows-latest
29+
timeout-minutes: 60
2930
strategy:
3031
matrix:
3132
type: [x86, x64, arm64]

‎.github/workflows/doc.yml

Copy file name to clipboardExpand all lines: .github/workflows/doc.yml
+25Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
build_doc:
3737
name: 'Docs'
3838
runs-on: ubuntu-latest
39+
timeout-minutes: 60
3940
steps:
4041
- uses: actions/checkout@v3
4142
- name: Register Sphinx problem matcher
@@ -53,10 +54,34 @@ jobs:
5354
- name: 'Build HTML documentation'
5455
run: make -C Doc/ SPHINXOPTS="-q" SPHINXERRORHANDLING="-W --keep-going" html
5556

57+
# Add pull request annotations for Sphinx nitpicks (missing references)
58+
- name: 'Get list of changed files'
59+
id: changed_files
60+
uses: Ana06/get-changed-files@v2.2.0
61+
with:
62+
filter: "Doc/**"
63+
- name: 'Build changed files in nit-picky mode'
64+
continue-on-error: true
65+
run: |
66+
# Mark files the pull request modified
67+
touch ${{ steps.changed_files.outputs.added_modified }}
68+
# Build docs with the '-n' (nit-picky) option; convert warnings to annotations
69+
make -C Doc/ PYTHON=../python SPHINXOPTS="-q -n --keep-going" html 2>&1 |
70+
python Doc/tools/warnings-to-gh-actions.py
71+
72+
# Ensure some files always pass Sphinx nit-picky mode (no missing references)
73+
- name: 'Build known-good files in nit-picky mode'
74+
run: |
75+
# Mark files that must pass nit-picky
76+
python Doc/tools/touch-clean-files.py
77+
# Build docs with the '-n' (nit-picky) option, convert warnings to errors (-W)
78+
make -C Doc/ PYTHON=../python SPHINXOPTS="-q -n -W --keep-going" html 2>&1
79+
5680
# Run "doctest" on HEAD as new syntax doesn't exist in the latest stable release
5781
doctest:
5882
name: 'Doctest'
5983
runs-on: ubuntu-latest
84+
timeout-minutes: 60
6085
steps:
6186
- uses: actions/checkout@v3
6287
- name: Register Sphinx problem matcher

‎.github/workflows/new-bugs-announce-notifier.yml

Copy file name to clipboardExpand all lines: .github/workflows/new-bugs-announce-notifier.yml
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ permissions:
1111
jobs:
1212
notify-new-bugs-announce:
1313
runs-on: ubuntu-latest
14+
timeout-minutes: 10
1415
steps:
1516
- uses: actions/setup-node@v3
1617
with:
@@ -19,13 +20,13 @@ jobs:
1920
- name: Send notification
2021
uses: actions/github-script@v6
2122
env:
22-
MAILGUN_API_KEY: ${{ secrets.PSF_MAILGUN_KEY }}
23+
MAILGUN_API_KEY: ${{ secrets.MAILGUN_PYTHON_ORG_MAILGUN_KEY }}
2324
with:
2425
script: |
2526
const Mailgun = require("mailgun.js");
2627
const formData = require('form-data');
2728
const mailgun = new Mailgun(formData);
28-
const DOMAIN = "mg.python.org";
29+
const DOMAIN = "mailgun.python.org";
2930
const mg = mailgun.client({username: 'api', key: process.env.MAILGUN_API_KEY});
3031
github.rest.issues.get({
3132
issue_number: context.issue.number,
@@ -44,7 +45,7 @@ jobs:
4445
};
4546
4647
const data = {
47-
from: "CPython Issues <github@mg.python.org>",
48+
from: "CPython Issues <github@mailgun.python.org>",
4849
to: "new-bugs-announce@python.org",
4950
subject: `[Issue ${issue.data.number}] ${issue.data.title}`,
5051
template: "new-github-issue",

‎.github/workflows/project-updater.yml

Copy file name to clipboardExpand all lines: .github/workflows/project-updater.yml
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ jobs:
1313
add-to-project:
1414
name: Add issues to projects
1515
runs-on: ubuntu-latest
16+
timeout-minutes: 10
1617
strategy:
1718
matrix:
1819
include:
1920
# if an issue has any of these labels, it will be added
2021
# to the corresponding project
2122
- { project: 2, label: "release-blocker, deferred-blocker" }
22-
- { project: 3, label: expert-subinterpreters }
23-
- { project: 29, label: expert-asyncio }
2423
- { project: 32, label: sprint }
25-
24+
2625
steps:
2726
- uses: actions/add-to-project@v0.1.0
2827
with:

‎.github/workflows/require-pr-label.yml

Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Check labels
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened, labeled, unlabeled, synchronize]
6+
7+
jobs:
8+
label:
9+
name: DO-NOT-MERGE
10+
runs-on: ubuntu-latest
11+
timeout-minutes: 10
12+
13+
steps:
14+
- uses: mheap/github-action-required-labels@v4
15+
with:
16+
mode: exactly
17+
count: 0
18+
labels: "DO-NOT-MERGE"

‎.github/workflows/stale.yml

Copy file name to clipboardExpand all lines: .github/workflows/stale.yml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ jobs:
1212
if: github.repository_owner == 'python'
1313

1414
runs-on: ubuntu-latest
15+
timeout-minutes: 10
1516

1617
steps:
1718
- name: "Check PRs"
18-
uses: actions/stale@v7
19+
uses: actions/stale@v8
1920
with:
2021
repo-token: ${{ secrets.GITHUB_TOKEN }}
2122
stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity.'

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

Copy file name to clipboardExpand all lines: .github/workflows/verify-ensurepip-wheels.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ concurrency:
2323
jobs:
2424
verify:
2525
runs-on: ubuntu-latest
26+
timeout-minutes: 10
2627
steps:
2728
- uses: actions/checkout@v3
2829
- uses: actions/setup-python@v4

‎Doc/bugs.rst

Copy file name to clipboardExpand all lines: Doc/bugs.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Click on the "New issue" button in the top bar to report a new issue.
7070
The submission form has two fields, "Title" and "Comment".
7171

7272
For the "Title" field, enter a *very* short description of the problem;
73-
less than ten words is good.
73+
fewer than ten words is good.
7474

7575
In the "Comment" field, describe the problem in detail, including what you
7676
expected to happen and what did happen. Be sure to include whether any

‎Doc/c-api/buffer.rst

Copy file name to clipboardExpand all lines: Doc/c-api/buffer.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ Buffer-related functions
499499
This function fails if *len* != *src->len*.
500500
501501
502-
.. c:function:: int PyObject_CopyData(Py_buffer *dest, Py_buffer *src)
502+
.. c:function:: int PyObject_CopyData(PyObject *dest, PyObject *src)
503503
504504
Copy data from *src* to *dest* buffer. Can convert between C-style and
505505
or Fortran-style buffers.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.