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 4f69c68

Browse filesBrowse files
erlend-aaslanderlend-aasland
committed
Pull in main
2 parents b0f5a4e + 41de543 commit 4f69c68
Copy full SHA for 4f69c68

File tree

Expand file treeCollapse file tree

1,005 files changed

+34156
-83419
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

1,005 files changed

+34156
-83419
lines changed

‎.azure-pipelines/ci.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/ci.yml
+2-2Lines 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.1t
60+
openssl_version: 1.1.1u
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.1t
86+
openssl_version: 1.1.1u
8787

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

‎.azure-pipelines/pr.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/pr.yml
+2-2Lines 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.1t
60+
openssl_version: 1.1.1u
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.1t
86+
openssl_version: 1.1.1u
8787

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

‎.devcontainer/Dockerfile

Copy file name to clipboardExpand all lines: .devcontainer/Dockerfile
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ FROM docker.io/library/fedora:37
22

33
ENV CC=clang
44

5-
ENV WASI_SDK_VERSION=19
5+
ENV WASI_SDK_VERSION=20
66
ENV WASI_SDK_PATH=/opt/wasi-sdk
77

88
ENV WASMTIME_HOME=/opt/wasmtime
9-
ENV WASMTIME_VERSION=7.0.0
9+
ENV WASMTIME_VERSION=9.0.1
1010
ENV WASMTIME_CPU_ARCH=x86_64
1111

1212
RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf-command(builddep)' && \

‎.devcontainer/devcontainer.json

Copy file name to clipboardExpand all lines: .devcontainer/devcontainer.json
+12-5Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
"-y",
1010
"which",
1111
"zsh",
12-
"fish"
12+
"fish",
13+
// For umask fix below.
14+
"/usr/bin/setfacl"
1315
],
1416
"updateContentCommand": {
1517
// Using the shell for `nproc` usage.
@@ -22,6 +24,11 @@
2224
"html"
2325
]
2426
},
27+
"postCreateCommand": {
28+
// https://github.com/orgs/community/discussions/26026
29+
"umask fix: workspace": ["sudo", "setfacl", "-bnR", "."],
30+
"umask fix: /tmp": ["sudo", "setfacl", "-bnR", "/tmp"]
31+
},
2532
"customizations": {
2633
"vscode": {
2734
"extensions": [
@@ -31,10 +38,10 @@
3138
"maelvalais.autoconf",
3239
// C auto-complete.
3340
"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"
41+
// To view HTML build of docs.
42+
"ms-vscode.live-server",
43+
// Python auto-complete.
44+
"ms-python.python"
3845
],
3946
"settings": {
4047
"C_Cpp.default.compilerPath": "/usr/bin/clang",

‎.gitattributes

Copy file name to clipboardExpand all lines: .gitattributes
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*.zip binary
1919

2020
# Specific binary files
21-
Lib/test/sndhdrdata/sndhdr.* binary
2221
PC/classicAppCompat.* binary
2322

2423
# Text files that should not be subject to eol conversion

‎.github/CODEOWNERS

Copy file name to clipboardExpand all lines: .github/CODEOWNERS
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ Include/pytime.h @pganssle @abalkin
9797
/Tools/peg_generator/ @pablogsal @lysnikolaou
9898
/Lib/test/test_peg_generator/ @pablogsal @lysnikolaou
9999
/Grammar/python.gram @pablogsal @lysnikolaou
100+
/Lib/tokenize.py @pablogsal @lysnikolaou
101+
/Lib/test/test_tokenize.py @pablogsal @lysnikolaou
100102

101103
# AST
102104
Python/ast.c @isidentical

‎.github/workflows/build.yml

Copy file name to clipboardExpand all lines: .github/workflows/build.yml
+96-14Lines changed: 96 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
push:
99
branches:
1010
- 'main'
11+
- '3.12'
1112
- '3.11'
1213
- '3.10'
1314
- '3.9'
@@ -16,6 +17,7 @@ on:
1617
pull_request:
1718
branches:
1819
- 'main'
20+
- '3.12'
1921
- '3.11'
2022
- '3.10'
2123
- '3.9'
@@ -26,7 +28,7 @@ permissions:
2628
contents: read
2729

2830
concurrency:
29-
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
31+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-reusable
3032
cancel-in-progress: true
3133

3234
jobs:
@@ -35,8 +37,10 @@ jobs:
3537
runs-on: ubuntu-latest
3638
timeout-minutes: 10
3739
outputs:
40+
run-docs: ${{ steps.docs-changes.outputs.run-docs || false }}
3841
run_tests: ${{ steps.check.outputs.run_tests }}
3942
run_hypothesis: ${{ steps.check.outputs.run_hypothesis }}
43+
config_hash: ${{ steps.config_hash.outputs.hash }}
4044
steps:
4145
- uses: actions/checkout@v3
4246
- name: Check for source changes
@@ -72,6 +76,45 @@ jobs:
7276
echo "Run hypothesis tests"
7377
echo "run_hypothesis=true" >> $GITHUB_OUTPUT
7478
fi
79+
- name: Compute hash for config cache key
80+
id: config_hash
81+
run: |
82+
echo "hash=${{ hashFiles('configure', 'configure.ac', '.github/workflows/build.yml') }}" >> $GITHUB_OUTPUT
83+
- name: Get a list of the changed documentation-related files
84+
if: github.event_name == 'pull_request'
85+
id: changed-docs-files
86+
uses: Ana06/get-changed-files@v2.2.0
87+
with:
88+
filter: |
89+
Doc/**
90+
# Temporarily skip paths with spaces
91+
# (i.e. "C API", "Core and Builtins")
92+
# to avoid "Error: One of your files includes a space".
93+
# Pending https://github.com/python/core-workflow/issues/186
94+
# Misc/**
95+
Misc/NEWS.d/next/Build/**
96+
Misc/NEWS.d/next/Documentation/**
97+
Misc/NEWS.d/next/IDLE/**
98+
Misc/NEWS.d/next/Library/**
99+
Misc/NEWS.d/next/Security/**
100+
Misc/NEWS.d/next/Tests/**
101+
Misc/NEWS.d/next/Tools-Demos/**
102+
Misc/NEWS.d/next/Windows/**
103+
Misc/NEWS.d/next/macOS/**
104+
.github/workflows/reusable-docs.yml
105+
- name: Check for docs changes
106+
if: >-
107+
github.event_name == 'pull_request'
108+
&& steps.changed-docs-files.outputs.added_modified_renamed != ''
109+
id: docs-changes
110+
run: |
111+
echo "run-docs=true" >> "${GITHUB_OUTPUT}"
112+
113+
check-docs:
114+
name: Docs
115+
needs: check_source
116+
if: fromJSON(needs.check_source.outputs.run-docs)
117+
uses: ./.github/workflows/reusable-docs.yml
75118

76119
check_generated_files:
77120
name: 'Check if generated files are up to date'
@@ -81,23 +124,28 @@ jobs:
81124
if: needs.check_source.outputs.run_tests == 'true'
82125
steps:
83126
- uses: actions/checkout@v3
127+
- name: Restore config.cache
128+
uses: actions/cache@v3
129+
with:
130+
path: config.cache
131+
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
84132
- uses: actions/setup-python@v3
85133
- name: Install Dependencies
86134
run: sudo ./.github/workflows/posix-deps-apt.sh
87135
- name: Add ccache to PATH
88136
run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
89137
- name: Configure ccache action
90138
uses: hendrikmuhs/ccache-action@v1.2
91-
- name: Check Autoconf version 2.69 and aclocal 1.16.3
139+
- name: Check Autoconf and aclocal versions
92140
run: |
93-
grep "Generated by GNU Autoconf 2.69" configure
94-
grep "aclocal 1.16.3" aclocal.m4
141+
grep "Generated by GNU Autoconf 2.71" configure
142+
grep "aclocal 1.16.4" aclocal.m4
95143
grep -q "runstatedir" configure
96144
grep -q "PKG_PROG_PKG_CONFIG" aclocal.m4
97145
- name: Configure CPython
98146
run: |
99147
# Build Python with the libpython dynamic library
100-
./configure --with-pydebug --enable-shared
148+
./configure --config-cache --with-pydebug --enable-shared
101149
- name: Regenerate autoconf files with container image
102150
run: make regen-configure
103151
- name: Build CPython
@@ -178,6 +226,11 @@ jobs:
178226
PYTHONSTRICTEXTENSIONBUILD: 1
179227
steps:
180228
- uses: actions/checkout@v3
229+
- name: Restore config.cache
230+
uses: actions/cache@v3
231+
with:
232+
path: config.cache
233+
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
181234
- name: Install Homebrew dependencies
182235
run: brew install pkg-config openssl@1.1 xz gdbm tcl-tk
183236
- name: Configure CPython
@@ -186,6 +239,7 @@ jobs:
186239
LDFLAGS="-L$(brew --prefix gdbm)/lib -I$(brew --prefix xz)/lib" \
187240
PKG_CONFIG_PATH="$(brew --prefix tcl-tk)/lib/pkgconfig" \
188241
./configure \
242+
--config-cache \
189243
--with-pydebug \
190244
--prefix=/opt/python-dev \
191245
--with-openssl="$(brew --prefix openssl@1.1)"
@@ -203,7 +257,7 @@ jobs:
203257
needs: check_source
204258
if: needs.check_source.outputs.run_tests == 'true'
205259
env:
206-
OPENSSL_VER: 1.1.1t
260+
OPENSSL_VER: 1.1.1u
207261
PYTHONSTRICTEXTENSIONBUILD: 1
208262
steps:
209263
- uses: actions/checkout@v3
@@ -238,9 +292,18 @@ jobs:
238292
run: mkdir -p $CPYTHON_RO_SRCDIR $CPYTHON_BUILDDIR
239293
- name: Bind mount sources read-only
240294
run: sudo mount --bind -o ro $GITHUB_WORKSPACE $CPYTHON_RO_SRCDIR
295+
- name: Restore config.cache
296+
uses: actions/cache@v3
297+
with:
298+
path: ${{ env.CPYTHON_BUILDDIR }}/config.cache
299+
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
241300
- name: Configure CPython out-of-tree
242301
working-directory: ${{ env.CPYTHON_BUILDDIR }}
243-
run: ../cpython-ro-srcdir/configure --with-pydebug --with-openssl=$OPENSSL_DIR
302+
run: |
303+
../cpython-ro-srcdir/configure \
304+
--config-cache \
305+
--with-pydebug \
306+
--with-openssl=$OPENSSL_DIR
244307
- name: Build CPython out-of-tree
245308
working-directory: ${{ env.CPYTHON_BUILDDIR }}
246309
run: make -j4
@@ -263,14 +326,19 @@ jobs:
263326
strategy:
264327
fail-fast: false
265328
matrix:
266-
openssl_ver: [1.1.1t, 3.0.8, 3.1.0-beta1]
329+
openssl_ver: [1.1.1u, 3.0.9, 3.1.1]
267330
env:
268331
OPENSSL_VER: ${{ matrix.openssl_ver }}
269332
MULTISSL_DIR: ${{ github.workspace }}/multissl
270333
OPENSSL_DIR: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}
271334
LD_LIBRARY_PATH: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib
272335
steps:
273336
- uses: actions/checkout@v3
337+
- name: Restore config.cache
338+
uses: actions/cache@v3
339+
with:
340+
path: config.cache
341+
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
274342
- name: Register gcc problem matcher
275343
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
276344
- name: Install Dependencies
@@ -295,7 +363,7 @@ jobs:
295363
- name: Configure ccache action
296364
uses: hendrikmuhs/ccache-action@v1.2
297365
- name: Configure CPython
298-
run: ./configure --with-pydebug --with-openssl=$OPENSSL_DIR
366+
run: ./configure --config-cache --with-pydebug --with-openssl=$OPENSSL_DIR
299367
- name: Build CPython
300368
run: make -j4
301369
- name: Display build info
@@ -304,13 +372,13 @@ jobs:
304372
run: ./python Lib/test/ssltests.py
305373

306374
test_hypothesis:
307-
name: "Hypothesis Tests on Ubuntu"
375+
name: "Hypothesis tests on Ubuntu"
308376
runs-on: ubuntu-20.04
309377
timeout-minutes: 60
310378
needs: check_source
311379
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
312380
env:
313-
OPENSSL_VER: 1.1.1t
381+
OPENSSL_VER: 1.1.1u
314382
PYTHONSTRICTEXTENSIONBUILD: 1
315383
steps:
316384
- uses: actions/checkout@v3
@@ -345,9 +413,18 @@ jobs:
345413
run: mkdir -p $CPYTHON_RO_SRCDIR $CPYTHON_BUILDDIR
346414
- name: Bind mount sources read-only
347415
run: sudo mount --bind -o ro $GITHUB_WORKSPACE $CPYTHON_RO_SRCDIR
416+
- name: Restore config.cache
417+
uses: actions/cache@v3
418+
with:
419+
path: ${{ env.CPYTHON_BUILDDIR }}/config.cache
420+
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
348421
- name: Configure CPython out-of-tree
349422
working-directory: ${{ env.CPYTHON_BUILDDIR }}
350-
run: ../cpython-ro-srcdir/configure --with-pydebug --with-openssl=$OPENSSL_DIR
423+
run: |
424+
../cpython-ro-srcdir/configure \
425+
--config-cache \
426+
--with-pydebug \
427+
--with-openssl=$OPENSSL_DIR
351428
- name: Build CPython out-of-tree
352429
working-directory: ${{ env.CPYTHON_BUILDDIR }}
353430
run: make -j4
@@ -410,11 +487,16 @@ jobs:
410487
needs: check_source
411488
if: needs.check_source.outputs.run_tests == 'true'
412489
env:
413-
OPENSSL_VER: 1.1.1t
490+
OPENSSL_VER: 1.1.1u
414491
PYTHONSTRICTEXTENSIONBUILD: 1
415492
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
416493
steps:
417494
- uses: actions/checkout@v3
495+
- name: Restore config.cache
496+
uses: actions/cache@v3
497+
with:
498+
path: config.cache
499+
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
418500
- name: Register gcc problem matcher
419501
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
420502
- name: Install Dependencies
@@ -443,7 +525,7 @@ jobs:
443525
- name: Configure ccache action
444526
uses: hendrikmuhs/ccache-action@v1.2
445527
- name: Configure CPython
446-
run: ./configure --with-address-sanitizer --without-pymalloc
528+
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc
447529
- name: Build CPython
448530
run: make -j4
449531
- name: Display build info

‎.github/workflows/build_msi.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_msi.yml
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ on:
88
- '3.*'
99
paths:
1010
- 'Tools/msi/**'
11+
- '.github/workflows/build_msi.yml'
1112
pull_request:
1213
branches:
1314
- 'main'
1415
- '3.*'
1516
paths:
1617
- 'Tools/msi/**'
18+
- '.github/workflows/build_msi.yml'
1719

1820
permissions:
1921
contents: read
@@ -33,4 +35,4 @@ jobs:
3335
steps:
3436
- uses: actions/checkout@v3
3537
- name: Build CPython installer
36-
run: .\Tools\msi\build.bat -${{ matrix.type }}
38+
run: .\Tools\msi\build.bat --doc -${{ matrix.type }}

0 commit comments

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