Skip to content

Commit cc44f01

Browse files
committed
Merge remote-tracking branch 'upstream/main' into namespaces
2 parents ff7f961 + c062764 commit cc44f01

File tree

854 files changed

+103130
-51478
lines changed

Some content is hidden

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

854 files changed

+103130
-51478
lines changed

.azure-pipelines/ci.yml

Lines 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.1n
60+
openssl_version: 1.1.1q
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.1n
86+
openssl_version: 1.1.1q
8787

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

.azure-pipelines/find-tools.yml

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

.azure-pipelines/libffi-build.yml

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

.azure-pipelines/openssl-build.yml

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

.azure-pipelines/pr.yml

Lines 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.1n
60+
openssl_version: 1.1.1q
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.1n
86+
openssl_version: 1.1.1q
8787

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

.azure-pipelines/tcltk-build.yml

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

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ Include/internal/pycore_runtime_init_generated.h generated
7373
Include/opcode.h generated
7474
Include/token.h generated
7575
Lib/keyword.py generated
76+
Lib/test/levenshtein_examples.json generated
7677
Lib/test/test_stable_abi_ctypes.py generated
7778
Lib/token.py generated
7879
Objects/typeslots.inc generated

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
# https://git-scm.com/docs/gitignore#_pattern_format
66

77
# asyncio
8-
**/*asyncio* @1st1 @asvetlov
8+
**/*asyncio* @1st1 @asvetlov @gvanrossum
99

1010
# Core
1111
**/*context* @1st1
12-
**/*genobject* @1st1 @markshannon
12+
**/*genobject* @markshannon
1313
**/*hamt* @1st1
1414
Objects/set* @rhettinger
1515
Objects/dict* @methane @markshannon

0 commit comments

Comments
 (0)