8000 Fix merge conflicts. · python/cpython@4feaf09 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4feaf09

Browse files
ZeroIntensityZeroIntensity
committed
Fix merge conflicts.
2 parents 58b3580 + c7f6535 commit 4feaf09

File tree

1,418 files changed

+94931
-42072
lines changed

Some content is hidden

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

1,418 files changed

+94931
-42072
lines changed

‎.azure-pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
trigger: ['main', '3.13', '3.12', '3.11', '3.10', '3.9', '3.8']
1+
trigger: ['main', '3.*']
22

33
jobs:
44
- job: Prebuild

‎.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,js,rst,md,yml}]
3+
[*.{py,c,cpp,h,js,rst,md,yml,yaml}]
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-
[*.{js,yml}]
14+
[*.{js,yml,yaml}]
1515
indent_size = 2

‎.github/CODEOWNERS

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,17 @@ Objects/exceptions.c @iritkatriel
106106

107107
# Hashing & cryptographic primitives
108108
**/*hashlib* @gpshead @tiran @picnixz
109-
**/*pyhash* @gpshead @tiran
110-
**/sha* @gpshead @tiran @picnixz
111-
Modules/md5* @gpshead @tiran @picnixz
112-
**/*blake* @gpshead @tiran @picnixz
113-
Modules/_hacl/** @gpshead
109+
**/*hashopenssl* @gpshead @tiran @picnixz
110+
**/*pyhash* @gpshead @tiran @picnixz
111 10000 +
Modules/*blake* @gpshead @tiran @picnixz
112+
Modules/*md5* @gpshead @tiran @picnixz
113+
Modules/*sha* @gpshead @tiran @picnixz
114+
Modules/_hacl/** @gpshead @picnixz
114115
**/*hmac* @gpshead @picnixz
115116

117+
# libssl
118+
**/*ssl* @gpshead @picnixz
119+
116120
# logging
117121
**/*logging* @vsajip
118122

@@ -184,6 +188,7 @@ Python/ast_opt.c @isidentical @eclips4
184188
Parser/asdl.py @isidentical @JelleZijlstra @eclips4
185189
Parser/asdl_c.py @isidentical @JelleZijlstra @eclips4
186190
Lib/ast.py @isidentical @JelleZijlstra @eclips4
191+
Lib/_ast_unparse.py @isidentical @JelleZijlstra @eclips4
187192
Lib/test/test_ast/ @eclips4
188193

189194
# Mock
@@ -308,3 +313,6 @@ Doc/reference/ @willingc @AA-Turner
308313
# Colorize
309314
Lib/_colorize.py @hugovk
310315
Lib/test/test__colorize.py @hugovk
316+
317+
# Fuzzing
318+
Modules/_xxtestfuzz/ @ammaraskar

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 5 deletions
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-
gh-NNNNN: Summary of the changes made
10+
gh-NNNNNN: Summary of the changes made
1111
```
1212
13-
Where: gh-NNNNN refers to the GitHub issue number.
13+
Where: gh-NNNNNN 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
@@ -20,11 +20,11 @@ If this is a backport PR (PR made against branches other than `main`),
2020
please ensure that the PR title is in the following format:
2121
2222
```
23-
[X.Y] <title from the original PR> (GH-NNNN)
23+
[X.Y] <title from the original PR> (GH-NNNNNN)
2424
```
2525
26-
Where: [X.Y] is the branch name, e.g. [3.6].
26+
Where: [X.Y] is the branch name, for example: [3.13].
2727
28-
GH-NNNN refers to the PR number from `main`.
28+
GH-NNNNNN refers to the PR number from `main`.
2929
3030
-->

‎.github/workflows/add-issue-header.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
permissions:
2020
issues: write
21+
timeout-minutes: 5
2122
steps:
2223
- uses: actions/github-script@v7
2324
with:

0 commit comments

Comments
 (0)
0