Skip to content

Commit 473c81d

Browse files
HassanAbouelelaHassanAbouelela
committed
Merge branch 'main' into bpo-25567-shlex-bytestrings
2 parents bfb76be + 679cb47 commit 473c81d

File tree

1,503 files changed

+68308
-38874
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,503 files changed

+68308
-38874
lines changed

‎.azure-pipelines/ci.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
variables:
22
coverage: false
33

4-
trigger: ['master', '3.9', '3.8', '3.7']
4+
trigger: ['main', '3.10', '3.9', '3.8', '3.7']
55

66
jobs:
77
- job: Prebuild
88
displayName: Pre-build checks
99

1010
pool:
11-
vmImage: ubuntu-18.04
11+
vmImage: ubuntu-20.04
1212

1313
steps:
1414
- template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
2020
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
2121

2222
pool:
23-
vmImage: ubuntu-18.04
23+
vmImage: ubuntu-20.04
2424

2525
steps:
2626
- template: ./docs-steps.yml
@@ -40,7 +40,7 @@ jobs:
4040
testRunPlatform: macos
4141

4242
pool:
43-
vmImage: macos-10.14
43+
vmImage: macos-10.15
4444

4545
steps:
4646
- template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
5252
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5353

5454
pool:
55-
vmImage: ubuntu-18.04
55+
vmImage: ubuntu-20.04
5656

5757
variables:
5858
testRunTitle: '$(build.sourceBranchName)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1k
60+
openssl_version: 1.1.1l
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
7878
)
7979
8080
pool:
81-
vmImage: ubuntu-18.04
81+
vmImage: ubuntu-20.04
8282

8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1k
86+
openssl_version: 1.1.1l
8787

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

‎.azure-pipelines/pr.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
variables:
22
coverage: false
33

4-
pr: ['master', '3.9', '3.8', '3.7']
4+
pr: ['main', '3.10', '3.9', '3.8', '3.7']
55

66
jobs:
77
- job: Prebuild
88
displayName: Pre-build checks
99

1010
pool:
11-
vmImage: ubuntu-18.04
11+
vmImage: ubuntu-20.04
1212

1313
steps:
1414
- template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
2020
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
2121

2222
pool:
23-
vmImage: ubuntu-18.04
23+
vmImage: ubuntu-20.04
2424

2525
steps:
2626
- template: ./docs-steps.yml
@@ -38,7 +38,7 @@ jobs:
3838
testRunPlatform: macos
3939

4040
pool:
41-
vmImage: macos-10.14
41+
vmImage: macos-10.15
4242

4343
steps:
4444
- template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
5252
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5353

5454
pool:
55-
vmImage: ubuntu-18.04
55+
vmImage: ubuntu-20.04
5656

5757
variables:
5858
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1k
60+
openssl_version: 1.1.1l
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
7878
)
7979
8080
pool:
81-
vmImage: ubuntu-18.04
81+
vmImage: ubuntu-20.04
8282

8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1k
86+
openssl_version: 1.1.1l
8787

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

‎.editorconfig

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*.{py,c,cpp,h,rst,md,yml}]
4+
trim_trailing_whitespace = true
5+
insert_final_newline = true
6+
indent_style = space
7+
8+
[*.{py,c,cpp,h}]
9+
indent_size = 4
10+
11+
[*.yml]
12+
indent_size = 2

‎.gitattributes

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Lib/test/test_email/data/*.txt -text
2828
Lib/test/xmltestdata/* -text
2929
Lib/test/coding20731.py -text
3030
Lib/test/test_importlib/data01/* -text
31+
Lib/test/test_importlib/namespacedata01/* -text
3132

3233
# CRLF files
3334
*.bat text eol=crlf
@@ -45,8 +46,7 @@ Modules/clinic/*.h linguist-generated=true
4546
Objects/clinic/*.h linguist-generated=true
4647
PC/clinic/*.h linguist-generated=true
4748
Python/clinic/*.h linguist-generated=true
48-
Python/importlib.h linguist-generated=true
49-
Python/importlib_external.h linguist-generated=true
49+
Python/frozen_modules/*.h linguist-generated=true
5050
Include/internal/pycore_ast.h linguist-generated=true
5151
Python/Python-ast.c linguist-generated=true
5252
Include/opcode.h linguist-generated=true
@@ -57,6 +57,7 @@ Doc/library/token-list.inc linguist-generated=true
5757
Include/token.h linguist-generated=true
5858
Lib/token.py linguist-generated=true
5959
Parser/token.c linguist-generated=true
60+
Programs/test_frozenmain.h linguist-generated=true
6061

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

‎.github/CODEOWNERS

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ Python/ast_opt.c @isidentical
5353

5454

5555
# SSL
56-
**/*ssl* @python/crypto-team @tiran
57-
**/*.pem @python/crypto-team @tiran
56+
**/*ssl* @python/crypto-team
57+
**/*.pem @python/crypto-team
5858

5959
# CSPRNG
60-
Python/bootstrap_hash.c @python/crypto-team @tiran
60+
Python/bootstrap_hash.c @python/crypto-team
6161

6262
# Dates and times
6363
**/*datetime* @pganssle @abalkin
@@ -128,7 +128,7 @@ Lib/ast.py @isidentical
128128

129129
**/*idlelib* @terryjreedy
130130

131-
**/*typing* @gvanrossum @ilevkivskyi
131+
**/*typing* @gvanrossum @Fidget-Spinner
132132

133133
**/*asyncore @giampaolo
134134
**/*asynchat @giampaolo

‎.github/CONTRIBUTING.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Contributing to Python
44
Build Status
55
------------
66

7-
- master
7+
- main
88

99
+ `Stable buildbots <http://buildbot.python.org/3.x.stable/>`_
1010

‎.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Most PRs will require an issue number. Trivial changes, like fixing a typo, do n
1616
1717
# Backport Pull Request title
1818
19-
If this is a backport PR (PR made against branches other than `master`),
19+
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
```
@@ -25,6 +25,6 @@ please ensure that the PR title is in the following format:
2525
2626
Where: [X.Y] is the branch name, e.g. [3.6].
2727
28-
GH-NNNN refers to the PR number from `master`.
28+
GH-NNNN refers to the PR number from `main`.
2929
3030
-->

‎.github/SECURITY.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ https://devguide.python.org/#status-of-python-branches
1010
## Reporting a Vulnerability
1111

1212
Please read the guidelines on reporting security issues [on the
13-
official website](
14-
https://www.python.org/news/security/#reporting-security-issues-in-python
15-
) for instructions on how to report a security-related problem to
13+
official website](https://www.python.org/dev/security/) for
14+
instructions on how to report a security-related problem to
1615
the Python team responsibly.
1716

18-
To reach the response team, email `security at python dot org`.
17+
To reach the response team, email `security at python dot org`.

‎.github/codecov.yml

-30
This file was deleted.

‎.github/problem-matchers/sphinx.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"line": 2,
3535
"message": 3
3636
}
37-
]
37+
]
3838
}
3939
]
4040
}

0 commit comments

Comments
 (0)