Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vendoring updates for 22.3 (distlib, pep517, idna, tenacity) #11504

Merged
merged 4 commits into from
Oct 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/distlib.vendor.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade distlib to 0.3.6
1 change: 1 addition & 0 deletions news/idna.vendor.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade idna to 3.4
1 change: 1 addition & 0 deletions news/pep517.vendor.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade pep517 to 0.13.0
1 change: 1 addition & 0 deletions news/tenacity.vendor.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade tenacity to 8.1.0
4 changes: 2 additions & 2 deletions src/pip/_vendor/distlib/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2012-2019 Vinay Sajip.
# Copyright (C) 2012-2022 Vinay Sajip.
# Licensed to the Python Software Foundation under a contributor agreement.
# See LICENSE.txt and CONTRIBUTORS.txt.
#
import logging

__version__ = '0.3.5'
__version__ = '0.3.6'

class DistlibException(Exception):
pass
Expand Down
Binary file modified src/pip/_vendor/distlib/t32.exe
Binary file not shown.
Binary file modified src/pip/_vendor/distlib/t64-arm.exe
Binary file not shown.
Binary file modified src/pip/_vendor/distlib/t64.exe
Binary file not shown.
Binary file modified src/pip/_vendor/distlib/w32.exe
Binary file not shown.
Binary file modified src/pip/_vendor/distlib/w64-arm.exe
Binary file not shown.
Binary file modified src/pip/_vendor/distlib/w64.exe
Binary file not shown.
5 changes: 4 additions & 1 deletion src/pip/_vendor/idna/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,10 @@ def uts46_remap(domain: str, std3_rules: bool = True, transitional: bool = False

def encode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool = False, std3_rules: bool = False, transitional: bool = False) -> bytes:
if isinstance(s, (bytes, bytearray)):
s = s.decode('ascii')
try:
s = s.decode('ascii')
except UnicodeDecodeError:
raise IDNAError('should pass a unicode string to the function rather than a byte string.')
if uts46:
s = uts46_remap(s, std3_rules, transitional)
trailing_dot = False
Expand Down
34 changes: 24 additions & 10 deletions src/pip/_vendor/idna/idnadata.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is automatically generated by tools/idna-data

__version__ = '14.0.0'
__version__ = '15.0.0'
scripts = {
'Greek': (
0x37000000374,
Expand Down Expand Up @@ -55,12 +55,13 @@
0x16fe200016fe4,
0x16ff000016ff2,
0x200000002a6e0,
0x2a7000002b739,
0x2a7000002b73a,
0x2b7400002b81e,
0x2b8200002cea2,
0x2ceb00002ebe1,
0x2f8000002fa1e,
0x300000003134b,
0x31350000323b0,
),
'Hebrew': (
0x591000005c8,
Expand All @@ -77,6 +78,7 @@
0x304100003097,
0x309d000030a0,
0x1b0010001b120,
0x1b1320001b133,
0x1b1500001b153,
0x1f2000001f201,
),
Expand All @@ -93,6 +95,7 @@
0x1affd0001afff,
0x1b0000001b001,
0x1b1200001b123,
0x1b1550001b156,
0x1b1640001b168,
),
}
Expand Down Expand Up @@ -1331,7 +1334,7 @@
0xcdd00000cdf,
0xce000000ce4,
0xce600000cf0,
0xcf100000cf3,
0xcf100000cf4,
0xd0000000d0d,
0xd0e00000d11,
0xd1200000d45,
Expand Down Expand Up @@ -1366,7 +1369,7 @@
0xeb400000ebe,
0xec000000ec5,
0xec600000ec7,
0xec800000ece,
0xec800000ecf,
0xed000000eda,
0xede00000ee0,
0xf0000000f01,
Expand Down Expand Up @@ -1859,7 +1862,7 @@
0xab200000ab27,
0xab280000ab2f,
0xab300000ab5b,
0xab600000ab6a,
0xab600000ab69,
0xabc00000abeb,
0xabec0000abee,
0xabf00000abfa,
Expand Down Expand Up @@ -1943,7 +1946,7 @@
0x10e8000010eaa,
0x10eab00010ead,
0x10eb000010eb2,
0x10f0000010f1d,
0x10efd00010f1d,
0x10f2700010f28,
0x10f3000010f51,
0x10f7000010f86,
Expand All @@ -1966,7 +1969,7 @@
0x111dc000111dd,
0x1120000011212,
0x1121300011238,
0x1123e0001123f,
0x1123e00011242,
0x1128000011287,
0x1128800011289,
0x1128a0001128e,
Expand Down Expand Up @@ -2047,11 +2050,16 @@
0x11d9300011d99,
0x11da000011daa,
0x11ee000011ef7,
0x11f0000011f11,
0x11f1200011f3b,
0x11f3e00011f43,
0x11f5000011f5a,
0x11fb000011fb1,
0x120000001239a,
0x1248000012544,
0x12f9000012ff1,
0x130000001342f,
0x1300000013430,
0x1344000013456,
0x1440000014647,
0x1680000016a39,
0x16a4000016a5f,
Expand Down Expand Up @@ -2079,7 +2087,9 @@
0x1aff50001affc,
0x1affd0001afff,
0x1b0000001b123,
0x1b1320001b133,
0x1b1500001b153,
0x1b1550001b156,
0x1b1640001b168,
0x1b1700001b2fc,
0x1bc000001bc6b,
Expand All @@ -2096,17 +2106,21 @@
0x1da9b0001daa0,
0x1daa10001dab0,
0x1df000001df1f,
0x1df250001df2b,
0x1e0000001e007,
0x1e0080001e019,
0x1e01b0001e022,
0x1e0230001e025,
0x1e0260001e02b,
0x1e0300001e06e,
0x1e08f0001e090,
0x1e1000001e12d,
0x1e1300001e13e,
0x1e1400001e14a,
0x1e14e0001e14f,
0x1e2900001e2af,
0x1e2c00001e2fa,
0x1e4d00001e4fa,
0x1e7e00001e7e7,
0x1e7e80001e7ec,
0x1e7ed0001e7ef,
Expand All @@ -2115,13 +2129,13 @@
0x1e8d00001e8d7,
0x1e9220001e94c,
0x1e9500001e95a,
0x1fbf00001fbfa,
0x200000002a6e0,
0x2a7000002b739,
0x2a7000002b73a,
0x2b7400002b81e,
0x2b8200002cea2,
0x2ceb00002ebe1,
0x300000003134b,
0x31350000323b0,
),
'CONTEXTJ': (
0x200c0000200e,
Expand Down
2 changes: 1 addition & 1 deletion src/pip/_vendor/idna/package_data.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = '3.3'
__version__ = '3.4'

Loading