Skip to content

Commit 185d5a6

Browse files
Merge branch 'main' into threading-fix-failed-thread-state-cleanup
2 parents 1f3ecd9 + 615abb9 commit 185d5a6

File tree

2,624 files changed

+319517
-144608
lines changed

Some content is hidden

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

2,624 files changed

+319517
-144608
lines changed

.azure-pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
trigger: ['main', '3.12', '3.11', '3.10', '3.9', '3.8', '3.7']
1+
trigger: ['main', '3.13', '3.12', '3.11', '3.10', '3.9', '3.8']
22

33
jobs:
44
- job: Prebuild
55
displayName: Pre-build checks
66

77
pool:
8-
vmImage: ubuntu-22.04
8+
vmImage: ubuntu-24.04
99

1010
steps:
1111
- template: ./prebuild-checks.yml

.azure-pipelines/posix-deps-apt.sh

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

.azure-pipelines/posix-steps.yml

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

.azure-pipelines/pr.yml

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

.devcontainer/Dockerfile

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

.devcontainer/devcontainer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"build": {
3-
"dockerfile": "Dockerfile"
4-
},
2+
"image": "ghcr.io/python/devcontainer:2024.09.25.11038928730",
53
"onCreateCommand": [
64
// Install common tooling.
75
"dnf",

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
root = true
22

3-
[*.{py,c,cpp,h,rst,md,yml}]
3+
[*.{py,c,cpp,h,js,rst,md,yml}]
44
trim_trailing_whitespace = true
55
insert_final_newline = true
66
indent_style = space
@@ -11,5 +11,5 @@ indent_size = 4
1111
[*.rst]
1212
indent_size = 3
1313

14-
[*.yml]
14+
[*.{js,yml}]
1515
indent_size = 2

.gitattributes

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ Lib/test/cjkencodings/* noeol
2727
Lib/test/tokenizedata/coding20731.py noeol
2828
Lib/test/decimaltestdata/*.decTest noeol
2929
Lib/test/test_email/data/*.txt noeol
30-
Lib/test/test_importlib/resources/data01/* noeol
31-
Lib/test/test_importlib/resources/namespacedata01/* noeol
3230
Lib/test/xmltestdata/* noeol
3331

3432
# Shell scripts should have LF even on Windows because of Cygwin
@@ -77,11 +75,14 @@ Include/internal/pycore_opcode.h generated
7775
Include/internal/pycore_opcode_metadata.h generated
7876
Include/internal/pycore_*_generated.h generated
7977
Include/internal/pycore_uop_ids.h generated
78+
Include/internal/pycore_uop_metadata.h generated
8079
Include/opcode.h generated
8180
Include/opcode_ids.h generated
8281
Include/token.h generated
8382
Lib/_opcode_metadata.py generated
8483
Lib/keyword.py generated
84+
Lib/test/certdata/*.pem generated
85+
Lib/test/certdata/*.0 generated
8586
Lib/test/levenshtein_examples.json generated
8687
Lib/test/test_stable_abi_ctypes.py generated
8788
Lib/token.py generated
@@ -94,6 +95,7 @@ Programs/test_frozenmain.h generated
9495
Python/Python-ast.c generated
9596
Python/executor_cases.c.h generated
9697
Python/generated_cases.c.h generated
98+
Python/optimizer_cases.c.h generated
9799
Python/opcode_targets.h generated
98100
Python/stdlib_module_names.h generated
99101
Tools/peg_generator/pegen/grammar_parser.py generated

0 commit comments

Comments
 (0)