From 68029650bea6b3fbb5ae286d505b7e5f960df8af Mon Sep 17 00:00:00 2001 From: Arnon Yaari Date: Tue, 28 Dec 2021 12:57:11 +0200 Subject: [PATCH 001/992] Fix inconsistency in dependency resolution documentation --- docs/html/topics/dependency-resolution.md | 54 ++++++++++++----------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/docs/html/topics/dependency-resolution.md b/docs/html/topics/dependency-resolution.md index 6deb71366e5..a1e7dee8d33 100644 --- a/docs/html/topics/dependency-resolution.md +++ b/docs/html/topics/dependency-resolution.md @@ -173,22 +173,24 @@ When you get a `ResolutionImpossible` error, you might see something like this: ```{pip-cli} -$ pip install "pytest < 4.6" pytest-cov==2.12.1 +$ pip install package_coffee==0.44.1 package_tea==4.3.0 [regular pip output] -ERROR: Cannot install pytest-cov==2.12.1 and pytest<4.6 because these package versions have conflicting dependencies. +ERROR: Cannot install package_coffee==0.44.1 and package_tea==4.3.0 because these package versions have conflicting dependencies. The conflict is caused by: - The user requested pytest<4.6 - pytest-cov 2.12.1 depends on pytest>=4.6 + package_coffee 0.44.1 depends on package_water<3.0.0,>=2.4.2 + package_tea 4.3.0 depends on package_water==2.3.1 ``` -In this example, pip cannot install the packages requested because they are -asking for conflicting versions of pytest. +In this example, pip cannot install the packages you have requested, +because they each depend on different versions of the same package +(``package_water``): -- `pytest-cov` version `2.12.1`, requires `pytest` with a version or equal to - `4.6`. -- `package_tea` version `4.3.0` depends on version `2.3.1` of - `package_water` +- ``package_coffee`` version ``0.44.1`` depends on a version of + ``package_water`` that is less than ``3.0.0`` but greater than or equal to + ``2.4.2`` +- ``package_tea`` version ``4.3.0`` depends on version ``2.3.1`` of + ``package_water`` Sometimes these messages are straightforward to read, because they use commonly understood comparison operators to specify the required version @@ -197,16 +199,16 @@ commonly understood comparison operators to specify the required version However, Python packaging also supports some more complex ways for specifying package versions (e.g. `~=` or `*`): -| Operator | Description | Example | -| -------- | -------------------------------------------------------------- | --------------------------------------------------- | -| `>` | Any version greater than the specified version. | `>3.1`: any version greater than `3.1`. | -| `<` | Any version less than the specified version. | `<3.1`: any version less than `3.1`. | -| `<=` | Any version less than or equal to the specified version. | `<=3.1`: any version less than or equal to `3.1`. | -| `>=` | Any version greater than or equal to the specified version. | `>=3.1`: version `3.1` and greater. | -| `==` | Exactly the specified version. | `==3.1`: only `3.1`. | -| `!=` | Any version not equal to the specified version. | `!=3.1`: any version other than `3.1`. | -| `~=` | Any compatible{sup}`1` version. | `~=3.1`: any version compatible{sup}`1` with `3.1`. | -| `*` | Can be used at the end of a version number to represent _all_. | `==3.1.*`: any version that starts with `3.1`. | +| Operator | Description | Example | +| -------- | -------------------------------------------------------------- | ---------------------------------------------------- | +| `>` | Any version greater than the specified version. | `>3.1`: any version greater than `3.1`. | +| `<` | Any version less than the specified version. | `<3.1`: any version less than `3.1`. | +| `<=` | Any version less than or equal to the specified version. | `<=3.1`: any version less than or equal to `3.1`. | +| `>=` | Any version greater than or equal to the specified version. | `>=3.1`: any version greater than or equal to `3.1`. | +| `==` | Exactly the specified version. | `==3.1`: only version `3.1`. | +| `!=` | Any version not equal to the specified version. | `!=3.1`: any version other than `3.1`. | +| `~=` | Any compatible{sup}`1` version. | `~=3.1`: any version compatible{sup}`1` with `3.1`. | +| `*` | Can be used at the end of a version number to represent _all_. | `==3.1.*`: any version that starts with `3.1`. | {sup}`1` Compatible versions are higher versions that only differ in the final segment. `~=3.1.2` is equivalent to `>=3.1.2, ==3.1.*`. `~=3.1` is equivalent to `>=3.1, ==3.*`. @@ -235,7 +237,7 @@ package version. In our first example both `package_coffee` and `package_tea` have been _pinned_ to use specific versions -(`package_coffee==0.44.1b0 package_tea==4.3.0`). +(`package_coffee==0.44.1 package_tea==4.3.0`). To find a version of both `package_coffee` and `package_tea` that depend on the same version of `package_water`, you might consider: @@ -250,20 +252,20 @@ In the second case, pip will automatically find a version of both `package_coffee` and `package_tea` that depend on the same version of `package_water`, installing: -- `package_coffee 0.46.0b0`, which depends on `package_water 2.6.1` -- `package_tea 4.3.0` which _also_ depends on `package_water 2.6.1` +- `package_coffee 0.44.1`, which depends on `package_water 2.6.1` +- `package_tea 4.4.3` which _also_ depends on `package_water 2.6.1` If you want to prioritize one package over another, you can add version specifiers to _only_ the more important package: ```{pip-cli} -$ pip install package_coffee==0.44.1b0 package_tea +$ pip install package_coffee==0.44.1 package_tea ``` This will result in: -- `package_coffee 0.44.1b0`, which depends on `package_water 2.6.1` -- `package_tea 4.1.3` which also depends on `package_water 2.6.1` +- `package_coffee 0.44.1`, which depends on `package_water 2.6.1` +- `package_tea 4.4.3` which _also_ depends on `package_water 2.6.1` Now that you have resolved the issue, you can repin the compatible package versions as required. From 932d83e747d3cf3dacadcc257354b6d38954724c Mon Sep 17 00:00:00 2001 From: Arnon Yaari Date: Tue, 28 Dec 2021 14:48:43 +0200 Subject: [PATCH 002/992] add trivial news entry --- news/10751.trivial.rst | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 news/10751.trivial.rst diff --git a/news/10751.trivial.rst b/news/10751.trivial.rst new file mode 100644 index 00000000000..e69de29bb2d From 8802ce9ed6a1f77f69b95ca653683e71159ff8e3 Mon Sep 17 00:00:00 2001 From: Ikko Ashimine Date: Thu, 29 Sep 2022 12:29:42 +0900 Subject: [PATCH 003/992] Fix typo in test_provider.py transative -> transitive --- tests/unit/resolution_resolvelib/test_provider.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py index ab1dc74caa3..77d1d299a0e 100644 --- a/tests/unit/resolution_resolvelib/test_provider.py +++ b/tests/unit/resolution_resolvelib/test_provider.py @@ -50,29 +50,29 @@ def test_provider_known_depths(factory: Factory) -> None: ) assert provider._known_depths == {root_requirement_name: 1.0} - # Transative requirement is a dependency of root requirement + # Transitive requirement is a dependency of root requirement # theforefore has an inferred depth of 2 root_package_candidate = InstallationCandidate( root_requirement_name, "1.0", Link("https://{root_requirement_name}.com"), ) - transative_requirement_name = "my-transitive-package" + transitive_requirement_name = "my-transitive-package" - transative_package_information = build_requirement_information( - name=transative_requirement_name, parent=root_package_candidate + transitive_package_information = build_requirement_information( + name=transitive_requirement_name, parent=root_package_candidate ) provider.get_preference( - identifier=transative_requirement_name, + identifier=transitive_requirement_name, resolutions={}, candidates={}, information={ root_requirement_name: root_requirement_information, - transative_requirement_name: transative_package_information, + transitive_requirement_name: transitive_package_information, }, backtrack_causes=[], ) assert provider._known_depths == { - transative_requirement_name: 2.0, + transitive_requirement_name: 2.0, root_requirement_name: 1.0, } From 5229322fe2cfa0b4cfaf7968e5f3396f6c1cc28d Mon Sep 17 00:00:00 2001 From: q0w <43147888+q0w@users.noreply.github.com> Date: Fri, 6 May 2022 07:16:59 +0300 Subject: [PATCH 004/992] Make proxy parameter override environment proxy --- news/10685.bugfix.rst | 1 + src/pip/_internal/cli/req_command.py | 1 + tests/functional/test_proxy.py | 37 ++++++++++++++++++++++++++++ tests/requirements.txt | 1 + 4 files changed, 40 insertions(+) create mode 100644 news/10685.bugfix.rst create mode 100644 tests/functional/test_proxy.py diff --git a/news/10685.bugfix.rst b/news/10685.bugfix.rst new file mode 100644 index 00000000000..a0bc7ed5285 --- /dev/null +++ b/news/10685.bugfix.rst @@ -0,0 +1 @@ +Make the ``--proxy`` parameter take precedence over environment variables. diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index 1044809f040..c0f06b9aaa4 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -148,6 +148,7 @@ def _build_session( "http": options.proxy, "https": options.proxy, } + session.trust_env = False # Determine if we can prompt the user for authentication or not session.auth.prompting = not options.no_input diff --git a/tests/functional/test_proxy.py b/tests/functional/test_proxy.py new file mode 100644 index 00000000000..9ebca2e1d3b --- /dev/null +++ b/tests/functional/test_proxy.py @@ -0,0 +1,37 @@ +from typing import Any, Dict, Optional + +import proxy +import pytest +from proxy.http.proxy import HttpProxyBasePlugin + +from tests.lib import PipTestEnvironment +from tests.lib.path import Path + + +class AccessLogPlugin(HttpProxyBasePlugin): + def on_access_log(self, context: Dict[str, Any]) -> Optional[Dict[str, Any]]: + print(context) + return super().on_access_log(context) + + +@pytest.mark.network +def test_proxy_overrides_env( + script: PipTestEnvironment, monkeypatch: pytest.MonkeyPatch +) -> None: + monkeypatch.setenv("http_proxy", "127:0.0.1:8888") + monkeypatch.setenv("https_proxy", "127:0.0.1:8888") + with proxy.Proxy( + port=8899, + ), proxy.Proxy(plugins=[AccessLogPlugin], port=8888): + result = script.pip( + "download", + "--proxy", + "http://127.0.0.1:8899", + "--trusted-host", + "127.0.0.1", + "-d", + "pip_downloads", + "INITools==0.1", + ) + result.did_create(Path("scratch") / "pip_downloads" / "INITools-0.1.tar.gz") + assert "CONNECT" not in result.stdout diff --git a/tests/requirements.txt b/tests/requirements.txt index 9ce6d62078a..1251ec5d38c 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -11,3 +11,4 @@ virtualenv < 20.0 werkzeug wheel tomli-w +proxy.py From 759c4770ca3a842c56c05c5f559c3e66c2f99a39 Mon Sep 17 00:00:00 2001 From: q0w <43147888+q0w@users.noreply.github.com> Date: Tue, 31 May 2022 11:32:44 +0300 Subject: [PATCH 005/992] Test against netrc env --- tests/functional/test_proxy.py | 66 ++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 7 deletions(-) diff --git a/tests/functional/test_proxy.py b/tests/functional/test_proxy.py index 9ebca2e1d3b..0d8415f2c9f 100644 --- a/tests/functional/test_proxy.py +++ b/tests/functional/test_proxy.py @@ -1,11 +1,19 @@ +import ssl +from pathlib import Path from typing import Any, Dict, Optional import proxy import pytest from proxy.http.proxy import HttpProxyBasePlugin -from tests.lib import PipTestEnvironment -from tests.lib.path import Path +from tests.conftest import CertFactory +from tests.lib import PipTestEnvironment, TestData +from tests.lib.server import ( + authorization_response, + make_mock_server, + package_page, + server_running, +) class AccessLogPlugin(HttpProxyBasePlugin): @@ -15,14 +23,12 @@ def on_access_log(self, context: Dict[str, Any]) -> Optional[Dict[str, Any]]: @pytest.mark.network -def test_proxy_overrides_env( - script: PipTestEnvironment, monkeypatch: pytest.MonkeyPatch -) -> None: - monkeypatch.setenv("http_proxy", "127:0.0.1:8888") - monkeypatch.setenv("https_proxy", "127:0.0.1:8888") +def test_proxy_overrides_env(script: PipTestEnvironment) -> None: with proxy.Proxy( port=8899, ), proxy.Proxy(plugins=[AccessLogPlugin], port=8888): + script.environ["http_proxy"] = "127:0.0.1:8888" + script.environ["https_proxy"] = "127:0.0.1:8888" result = script.pip( "download", "--proxy", @@ -35,3 +41,49 @@ def test_proxy_overrides_env( ) result.did_create(Path("scratch") / "pip_downloads" / "INITools-0.1.tar.gz") assert "CONNECT" not in result.stdout + + +def test_proxy_does_not_override_netrc( + script: PipTestEnvironment, + data: TestData, + cert_factory: CertFactory, +) -> None: + cert_path = cert_factory() + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ctx.load_cert_chain(cert_path, cert_path) + ctx.load_verify_locations(cafile=cert_path) + ctx.verify_mode = ssl.CERT_REQUIRED + + server = make_mock_server(ssl_context=ctx) + server.mock.side_effect = [ + package_page( + { + "simple-3.0.tar.gz": "/files/simple-3.0.tar.gz", + } + ), + authorization_response(data.packages / "simple-3.0.tar.gz"), + authorization_response(data.packages / "simple-3.0.tar.gz"), + ] + + url = f"https://{server.host}:{server.port}/simple" + + netrc = script.scratch_path / ".netrc" + netrc.write_text(f"machine {server.host} login USERNAME password PASSWORD") + with proxy.Proxy(port=8888), server_running(server): + script.environ["NETRC"] = netrc + script.pip( + "install", + "--proxy", + "http://127.0.0.1:8888", + "--trusted-host", + "127.0.0.1", + "--no-cache-dir", + "--index-url", + url, + "--cert", + cert_path, + "--client-cert", + cert_path, + "simple", + ) + script.assert_installed(simple="3.0") From b64d1f798018ca8b77baf3ea1796adc9ccadd910 Mon Sep 17 00:00:00 2001 From: q0w <43147888+q0w@users.noreply.github.com> Date: Wed, 15 Jun 2022 22:10:25 +0300 Subject: [PATCH 006/992] Test proxy --- tests/functional/test_proxy.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/functional/test_proxy.py b/tests/functional/test_proxy.py index 0d8415f2c9f..f85c83bd1a3 100644 --- a/tests/functional/test_proxy.py +++ b/tests/functional/test_proxy.py @@ -1,6 +1,6 @@ import ssl from pathlib import Path -from typing import Any, Dict, Optional +from typing import Any, Dict import proxy import pytest @@ -17,18 +17,18 @@ class AccessLogPlugin(HttpProxyBasePlugin): - def on_access_log(self, context: Dict[str, Any]) -> Optional[Dict[str, Any]]: + def on_access_log(self, context: Dict[str, Any]) -> None: print(context) - return super().on_access_log(context) @pytest.mark.network def test_proxy_overrides_env(script: PipTestEnvironment) -> None: with proxy.Proxy( port=8899, - ), proxy.Proxy(plugins=[AccessLogPlugin], port=8888): - script.environ["http_proxy"] = "127:0.0.1:8888" - script.environ["https_proxy"] = "127:0.0.1:8888" + num_acceptors=1, + ), proxy.Proxy(plugins=[AccessLogPlugin], port=8888, num_acceptors=1): + script.environ["http_proxy"] = "127.0.0.1:8888" + script.environ["https_proxy"] = "127.0.0.1:8888" result = script.pip( "download", "--proxy", @@ -69,7 +69,7 @@ def test_proxy_does_not_override_netrc( netrc = script.scratch_path / ".netrc" netrc.write_text(f"machine {server.host} login USERNAME password PASSWORD") - with proxy.Proxy(port=8888), server_running(server): + with proxy.Proxy(port=8888, num_acceptors=1), server_running(server): script.environ["NETRC"] = netrc script.pip( "install", From 07e51e7e3cde179ca14310370f807ea8cc5958af Mon Sep 17 00:00:00 2001 From: q0w <43147888+q0w@users.noreply.github.com> Date: Fri, 7 Oct 2022 21:40:49 +0300 Subject: [PATCH 007/992] Capture stdout by capfd --- tests/functional/test_proxy.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/functional/test_proxy.py b/tests/functional/test_proxy.py index f85c83bd1a3..ab53637900f 100644 --- a/tests/functional/test_proxy.py +++ b/tests/functional/test_proxy.py @@ -22,7 +22,9 @@ def on_access_log(self, context: Dict[str, Any]) -> None: @pytest.mark.network -def test_proxy_overrides_env(script: PipTestEnvironment) -> None: +def test_proxy_overrides_env( + script: PipTestEnvironment, capfd: pytest.CaptureFixture[str] +) -> None: with proxy.Proxy( port=8899, num_acceptors=1, @@ -40,7 +42,8 @@ def test_proxy_overrides_env(script: PipTestEnvironment) -> None: "INITools==0.1", ) result.did_create(Path("scratch") / "pip_downloads" / "INITools-0.1.tar.gz") - assert "CONNECT" not in result.stdout + out, _ = capfd.readouterr() + assert "CONNECT" not in out def test_proxy_does_not_override_netrc( From 99d13226e44fef23d04cbd2f364ce57cbde1ecef Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Mon, 10 Apr 2023 11:37:50 +0300 Subject: [PATCH 008/992] Drop support for EOL Python 3.7 --- .github/workflows/ci.yml | 4 +- docs/html/development/ci.rst | 42 ++++++++++--------- docs/html/installation.md | 4 +- noxfile.py | 2 +- setup.py | 3 +- src/pip/__pip-runner__.py | 2 +- src/pip/_internal/commands/search.py | 3 +- src/pip/_internal/distributions/sdist.py | 2 +- src/pip/_internal/exceptions.py | 3 +- src/pip/_internal/index/collector.py | 7 +--- src/pip/_internal/locations/__init__.py | 11 ----- src/pip/_internal/metadata/__init__.py | 7 +--- src/pip/_internal/metadata/base.py | 21 +++------- src/pip/_internal/operations/install/wheel.py | 2 +- src/pip/_internal/req/req_file.py | 5 +-- src/pip/_internal/req/req_install.py | 6 +-- .../resolution/resolvelib/factory.py | 2 +- src/pip/_internal/utils/hashes.py | 6 +-- src/pip/_internal/utils/subprocess.py | 17 +------- src/pip/_internal/vcs/versioncontrol.py | 9 +--- src/pip/_internal/wheel_builder.py | 2 +- tests/conftest.py | 11 +---- tests/functional/test_completion.py | 10 +---- tests/functional/test_install.py | 4 -- tests/functional/test_install_config.py | 13 ------ tests/functional/test_install_reqs.py | 7 +--- tests/functional/test_new_resolver.py | 5 +-- tests/lib/__init__.py | 10 +---- tests/lib/venv.py | 10 +---- tests/unit/test_req_file.py | 8 +--- tests/unit/test_wheel_builder.py | 1 + 31 files changed, 59 insertions(+), 180 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b35e93b21f..667f0c86f98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,6 @@ jobs: matrix: os: [Ubuntu, MacOS] python: - - "3.7" - "3.8" - "3.9" - "3.10" @@ -153,9 +152,8 @@ jobs: matrix: os: [Windows] python: - - "3.7" + - "3.8" # Commented out, since Windows tests are expensively slow. - # - "3.8" # - "3.9" # - "3.10" - "3.11" diff --git a/docs/html/development/ci.rst b/docs/html/development/ci.rst index ac65f816594..e96110fc5f3 100644 --- a/docs/html/development/ci.rst +++ b/docs/html/development/ci.rst @@ -18,10 +18,10 @@ Supported interpreters pip support a variety of Python interpreters: -- CPython 3.7 - CPython 3.8 - CPython 3.9 - CPython 3.10 +- CPython 3.11 - Latest PyPy3 on different operating systems: @@ -88,61 +88,63 @@ Actual testing +------------------------------+---------------+-----------------+ | **interpreter** | **unit** | **integration** | +-----------+----------+-------+---------------+-----------------+ -| | x86 | CP3.7 | | | -| | +-------+---------------+-----------------+ -| | | CP3.8 | | | +| | x86 | CP3.8 | | | | | +-------+---------------+-----------------+ | | | CP3.9 | | | | | +-------+---------------+-----------------+ | | | CP3.10| | | | | +-------+---------------+-----------------+ +| | | CP3.11| | | +| | +-------+---------------+-----------------+ | | | PyPy3 | | | | Windows +----------+-------+---------------+-----------------+ -| | x64 | CP3.7 | GitHub | GitHub | -| | +-------+---------------+-----------------+ -| | | CP3.8 | | | +| | x64 | CP3.8 | GitHub | GitHub | | | +-------+---------------+-----------------+ | | | CP3.9 | | | | | +-------+---------------+-----------------+ -| | | CP3.10| GitHub | GitHub | +| | | CP3.10| | | +| | +-------+---------------+-----------------+ +| | | CP3.11| GitHub | GitHub | | | +-------+---------------+-----------------+ | | | PyPy3 | | | +-----------+----------+-------+---------------+-----------------+ -| | x86 | CP3.7 | | | -| | +-------+---------------+-----------------+ -| | | CP3.8 | | | +| | x86 | CP3.8 | | | | | +-------+---------------+-----------------+ | | | CP3.9 | | | | | +-------+---------------+-----------------+ +| | | CP3.10| | | +| | +-------+---------------+-----------------+ +| | | CP3.11| | | +| | +-------+---------------+-----------------+ | | | PyPy3 | | | | Linux +----------+-------+---------------+-----------------+ -| | x64 | CP3.7 | GitHub | GitHub | -| | +-------+---------------+-----------------+ -| | | CP3.8 | GitHub | GitHub | +| | x64 | CP3.8 | GitHub | GitHub | | | +-------+---------------+-----------------+ | | | CP3.9 | GitHub | GitHub | | | +-------+---------------+-----------------+ | | | CP3.10| GitHub | GitHub | | | +-------+---------------+-----------------+ +| | | CP3.11| GitHub | GitHub | +| | +-------+---------------+-----------------+ | | | PyPy3 | | | +-----------+----------+-------+---------------+-----------------+ -| | arm64 | CP3.7 | | | -| | +-------+---------------+-----------------+ -| | | CP3.8 | | | +| | arm64 | CP3.8 | | | | | +-------+---------------+-----------------+ | | | CP3.9 | | | | | +-------+---------------+-----------------+ | | | CP3.10| | | | | +-------+---------------+-----------------+ +| | | CP3.11| | | +| | +-------+---------------+-----------------+ | | | PyPy3 | | | | macOS +----------+-------+---------------+-----------------+ -| | x64 | CP3.7 | GitHub | GitHub | -| | +-------+---------------+-----------------+ -| | | CP3.8 | GitHub | GitHub | +| | x64 | CP3.8 | GitHub | GitHub | | | +-------+---------------+-----------------+ | | | CP3.9 | GitHub | GitHub | | | +-------+---------------+-----------------+ | | | CP3.10| GitHub | GitHub | | | +-------+---------------+-----------------+ +| | | CP3.11| GitHub | GitHub | +| | +-------+---------------+-----------------+ | | | PyPy3 | | | +-----------+----------+-------+---------------+-----------------+ diff --git a/docs/html/installation.md b/docs/html/installation.md index 036a91397a5..d0a0985c9be 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -102,8 +102,8 @@ $ pip install --upgrade pip The current version of pip works on: -- Windows, Linux and MacOS. -- CPython 3.7, 3.8, 3.9, 3.10 and latest PyPy3. +- Windows, Linux and macOS. +- CPython 3.8, 3.9, 3.10, 3.11 and latest PyPy3. pip is tested to work on the latest patch version of the Python interpreter, for each of the minor versions listed above. Previous patch versions are diff --git a/noxfile.py b/noxfile.py index 565a5039955..2e0db97ff9f 100644 --- a/noxfile.py +++ b/noxfile.py @@ -67,7 +67,7 @@ def should_update_common_wheels() -> bool: # ----------------------------------------------------------------------------- # Development Commands # ----------------------------------------------------------------------------- -@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3"]) +@nox.session(python=["3.8", "3.9", "3.10", "3.11", "pypy3"]) def test(session: nox.Session) -> None: # Get the common wheels. if should_update_common_wheels(): diff --git a/setup.py b/setup.py index 2179d34d2bf..1a31610a2d6 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,6 @@ def get_version(rel_path: str) -> str: "Programming Language :: Python", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -83,5 +82,5 @@ def get_version(rel_path: str) -> str: zip_safe=False, # NOTE: python_requires is duplicated in __pip-runner__.py. # When changing this value, please change the other copy as well. - python_requires=">=3.7", + python_requires=">=3.8", ) diff --git a/src/pip/__pip-runner__.py b/src/pip/__pip-runner__.py index 49a148a097e..dbb69954769 100644 --- a/src/pip/__pip-runner__.py +++ b/src/pip/__pip-runner__.py @@ -9,7 +9,7 @@ import sys # Copied from setup.py -PYTHON_REQUIRES = (3, 7) +PYTHON_REQUIRES = (3, 8) def version_str(version): # type: ignore diff --git a/src/pip/_internal/commands/search.py b/src/pip/_internal/commands/search.py index 03ed925b246..55880a155e5 100644 --- a/src/pip/_internal/commands/search.py +++ b/src/pip/_internal/commands/search.py @@ -5,7 +5,7 @@ import xmlrpc.client from collections import OrderedDict from optparse import Values -from typing import TYPE_CHECKING, Dict, List, Optional +from typing import TYPE_CHECKING, Dict, List, Optional, TypedDict from pip._vendor.packaging.version import parse as parse_version @@ -20,7 +20,6 @@ from pip._internal.utils.misc import write_output if TYPE_CHECKING: - from typing import TypedDict class TransformedHit(TypedDict): name: str diff --git a/src/pip/_internal/distributions/sdist.py b/src/pip/_internal/distributions/sdist.py index 4c25647930c..6ba5961cb83 100644 --- a/src/pip/_internal/distributions/sdist.py +++ b/src/pip/_internal/distributions/sdist.py @@ -111,7 +111,7 @@ def _install_build_reqs(self, finder: PackageFinder) -> None: if ( self.req.editable and self.req.permit_editable_wheels - and self.req.supports_pyproject_editable() + and self.req.supports_pyproject_editable ): build_reqs = self._get_build_requires_editable() else: diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py index 7d92ba69983..2716151a064 100644 --- a/src/pip/_internal/exceptions.py +++ b/src/pip/_internal/exceptions.py @@ -13,7 +13,7 @@ import re import sys from itertools import chain, groupby, repeat -from typing import TYPE_CHECKING, Dict, Iterator, List, Optional, Union +from typing import TYPE_CHECKING, Dict, Iterator, List, Literal, Optional, Union from pip._vendor.requests.models import Request, Response from pip._vendor.rich.console import Console, ConsoleOptions, RenderResult @@ -22,7 +22,6 @@ if TYPE_CHECKING: from hashlib import _Hash - from typing import Literal from pip._internal.metadata import BaseDistribution from pip._internal.req.req_install import InstallRequirement diff --git a/src/pip/_internal/index/collector.py b/src/pip/_internal/index/collector.py index b3e293ea3a5..643e87544f1 100644 --- a/src/pip/_internal/index/collector.py +++ b/src/pip/_internal/index/collector.py @@ -14,7 +14,6 @@ from html.parser import HTMLParser from optparse import Values from typing import ( - TYPE_CHECKING, Callable, Dict, Iterable, @@ -22,6 +21,7 @@ MutableMapping, NamedTuple, Optional, + Protocol, Sequence, Tuple, Union, @@ -42,11 +42,6 @@ from .sources import CandidatesFromPage, LinkSource, build_source -if TYPE_CHECKING: - from typing import Protocol -else: - Protocol = object - logger = logging.getLogger(__name__) ResponseHeaders = MutableMapping[str, str] diff --git a/src/pip/_internal/locations/__init__.py b/src/pip/_internal/locations/__init__.py index d54bc63eba3..32382be7fe5 100644 --- a/src/pip/_internal/locations/__init__.py +++ b/src/pip/_internal/locations/__init__.py @@ -336,17 +336,6 @@ def get_scheme( if skip_linux_system_special_case: continue - # On Python 3.7 and earlier, sysconfig does not include sys.abiflags in - # the "pythonX.Y" part of the path, but distutils does. - skip_sysconfig_abiflag_bug = ( - sys.version_info < (3, 8) - and not WINDOWS - and k in ("headers", "platlib", "purelib") - and tuple(_fix_abiflags(old_v.parts)) == new_v.parts - ) - if skip_sysconfig_abiflag_bug: - continue - # MSYS2 MINGW's sysconfig patch does not include the "site-packages" # part of the path. This is incorrect and will be fixed in MSYS. skip_msys2_mingw_bug = ( diff --git a/src/pip/_internal/metadata/__init__.py b/src/pip/_internal/metadata/__init__.py index 9f73ca7105f..4f04ff9a1d9 100644 --- a/src/pip/_internal/metadata/__init__.py +++ b/src/pip/_internal/metadata/__init__.py @@ -2,17 +2,12 @@ import functools import os import sys -from typing import TYPE_CHECKING, List, Optional, Type, cast +from typing import List, Optional, Protocol, Type, cast from pip._internal.utils.misc import strtobool from .base import BaseDistribution, BaseEnvironment, FilesystemWheel, MemoryWheel, Wheel -if TYPE_CHECKING: - from typing import Protocol -else: - Protocol = object - __all__ = [ "BaseDistribution", "BaseEnvironment", diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py index cafb79fb3dc..1c7acb599df 100644 --- a/src/pip/_internal/metadata/base.py +++ b/src/pip/_internal/metadata/base.py @@ -8,7 +8,6 @@ import zipfile from typing import ( IO, - TYPE_CHECKING, Any, Collection, Container, @@ -18,6 +17,7 @@ List, NamedTuple, Optional, + Protocol, Tuple, Union, ) @@ -42,11 +42,6 @@ from ._json import msg_to_json -if TYPE_CHECKING: - from typing import Protocol -else: - Protocol = object - DistributionVersion = Union[LegacyVersion, Version] InfoPath = Union[str, pathlib.PurePath] @@ -386,15 +381,7 @@ def iter_entry_points(self) -> Iterable[BaseEntryPoint]: def _metadata_impl(self) -> email.message.Message: raise NotImplementedError() - @functools.lru_cache(maxsize=1) - def _metadata_cached(self) -> email.message.Message: - # When we drop python 3.7 support, move this to the metadata property and use - # functools.cached_property instead of lru_cache. - metadata = self._metadata_impl() - self._add_egg_info_requires(metadata) - return metadata - - @property + @functools.cached_property def metadata(self) -> email.message.Message: """Metadata of distribution parsed from e.g. METADATA or PKG-INFO. @@ -403,7 +390,9 @@ def metadata(self) -> email.message.Message: :raises NoneMetadataError: If the metadata file is available, but does not contain valid metadata. """ - return self._metadata_cached() + metadata = self._metadata_impl() + self._add_egg_info_requires(metadata) + return metadata @property def metadata_dict(self) -> Dict[str, Any]: diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py index a8cd1330f0f..9ae6bad6265 100644 --- a/src/pip/_internal/operations/install/wheel.py +++ b/src/pip/_internal/operations/install/wheel.py @@ -28,6 +28,7 @@ List, NewType, Optional, + Protocol, Sequence, Set, Tuple, @@ -60,7 +61,6 @@ from pip._internal.utils.wheel import parse_wheel if TYPE_CHECKING: - from typing import Protocol class File(Protocol): src_record_path: "RecordPath" diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py index f717c1ccc79..a52519e1b95 100644 --- a/src/pip/_internal/req/req_file.py +++ b/src/pip/_internal/req/req_file.py @@ -17,6 +17,7 @@ Generator, Iterable, List, + NoReturn, Optional, Tuple, ) @@ -30,10 +31,6 @@ from pip._internal.utils.urls import get_url_scheme if TYPE_CHECKING: - # NoReturn introduced in 3.6.2; imported only for type checking to maintain - # pip compatibility with older patch versions of Python 3.6 - from typing import NoReturn - from pip._internal.index.package_finder import PackageFinder __all__ = ["parse_requirements"] diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py index baa6716381c..b34e04903c6 100644 --- a/src/pip/_internal/req/req_install.py +++ b/src/pip/_internal/req/req_install.py @@ -224,7 +224,7 @@ def name(self) -> Optional[str]: return None return self.req.name - @functools.lru_cache() # use cached_property in python 3.8+ + @functools.cached_property def supports_pyproject_editable(self) -> bool: if not self.use_pep517: return False @@ -494,7 +494,7 @@ def isolated_editable_sanity_check(self) -> None: if ( self.editable and self.use_pep517 - and not self.supports_pyproject_editable() + and not self.supports_pyproject_editable and not os.path.isfile(self.setup_py_path) and not os.path.isfile(self.setup_cfg_path) ): @@ -520,7 +520,7 @@ def prepare_metadata(self) -> None: if ( self.editable and self.permit_editable_wheels - and self.supports_pyproject_editable() + and self.supports_pyproject_editable ): self.metadata_directory = generate_editable_metadata( build_env=self.build_env, diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 0ad4641b1b1..a3a7d8db568 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -11,6 +11,7 @@ Mapping, NamedTuple, Optional, + Protocol, Sequence, Set, Tuple, @@ -66,7 +67,6 @@ ) if TYPE_CHECKING: - from typing import Protocol class ConflictCause(Protocol): requirement: RequiresPythonRequirement diff --git a/src/pip/_internal/utils/hashes.py b/src/pip/_internal/utils/hashes.py index 76727306a4c..9ed109c61db 100644 --- a/src/pip/_internal/utils/hashes.py +++ b/src/pip/_internal/utils/hashes.py @@ -1,5 +1,5 @@ import hashlib -from typing import TYPE_CHECKING, BinaryIO, Dict, Iterable, List, Optional +from typing import TYPE_CHECKING, BinaryIO, Dict, Iterable, List, NoReturn, Optional from pip._internal.exceptions import HashMismatch, HashMissing, InstallationError from pip._internal.utils.misc import read_chunks @@ -7,10 +7,6 @@ if TYPE_CHECKING: from hashlib import _Hash - # NoReturn introduced in 3.6.2; imported only for type checking to maintain - # pip compatibility with older patch versions of Python 3.6 - from typing import NoReturn - # The recommended hash algo of the moment. Change this whenever the state of # the art changes; it won't hurt backward compatibility. diff --git a/src/pip/_internal/utils/subprocess.py b/src/pip/_internal/utils/subprocess.py index 1e8ff50edfb..4ed7c504c87 100644 --- a/src/pip/_internal/utils/subprocess.py +++ b/src/pip/_internal/utils/subprocess.py @@ -2,16 +2,7 @@ import os import shlex import subprocess -from typing import ( - TYPE_CHECKING, - Any, - Callable, - Iterable, - List, - Mapping, - Optional, - Union, -) +from typing import Any, Callable, Iterable, List, Literal, Mapping, Optional, Union from pip._vendor.rich.markup import escape @@ -20,12 +11,6 @@ from pip._internal.utils.logging import VERBOSE, subprocess_logger from pip._internal.utils.misc import HiddenText -if TYPE_CHECKING: - # Literal was introduced in Python 3.8. - # - # TODO: Remove `if TYPE_CHECKING` when dropping support for Python 3.7. - from typing import Literal - CommandArgs = List[Union[str, HiddenText]] diff --git a/src/pip/_internal/vcs/versioncontrol.py b/src/pip/_internal/vcs/versioncontrol.py index 02bbf68e7ad..eb155740df8 100644 --- a/src/pip/_internal/vcs/versioncontrol.py +++ b/src/pip/_internal/vcs/versioncontrol.py @@ -6,12 +6,12 @@ import sys import urllib.parse from typing import ( - TYPE_CHECKING, Any, Dict, Iterable, Iterator, List, + Literal, Mapping, Optional, Tuple, @@ -39,13 +39,6 @@ ) from pip._internal.utils.urls import get_url_scheme -if TYPE_CHECKING: - # Literal was introduced in Python 3.8. - # - # TODO: Remove `if TYPE_CHECKING` when dropping support for Python 3.7. - from typing import Literal - - __all__ = ["vcs"] diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py index 60d75dd18ef..1ad9eef0130 100644 --- a/src/pip/_internal/wheel_builder.py +++ b/src/pip/_internal/wheel_builder.py @@ -70,7 +70,7 @@ def _should_build( if req.editable: # we only build PEP 660 editable requirements - return req.supports_pyproject_editable() + return req.supports_pyproject_editable return True diff --git a/tests/conftest.py b/tests/conftest.py index 57dd7e68a2b..a5ef631ea04 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -17,6 +17,7 @@ Iterator, List, Optional, + Protocol, Union, ) from unittest.mock import patch @@ -47,13 +48,7 @@ from .lib.compat import nullcontext if TYPE_CHECKING: - from typing import Protocol - from wsgi import WSGIApplication -else: - # TODO: Protocol was introduced in Python 3.8. Remove this branch when - # dropping support for Python 3.7. - Protocol = object def pytest_addoption(parser: Parser) -> None: @@ -724,9 +719,7 @@ def stop(self) -> None: def get_requests(self) -> List[Dict[str, str]]: """Get environ for each received request.""" assert not self._running, "cannot get mock from running server" - # Legacy: replace call[0][0] with call.args[0] - # when pip drops support for python3.7 - return [call[0][0] for call in self._server.mock.call_args_list] + return [call.args[0] for call in self._server.mock.call_args_list] @pytest.fixture diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py index b02cd4fa317..46ba338a4f1 100644 --- a/tests/functional/test_completion.py +++ b/tests/functional/test_completion.py @@ -1,21 +1,13 @@ import os import sys from pathlib import Path -from typing import TYPE_CHECKING, Tuple, Union +from typing import Protocol, Tuple, Union import pytest from tests.conftest import ScriptFactory from tests.lib import PipTestEnvironment, TestData, TestPipResult -if TYPE_CHECKING: - from typing import Protocol -else: - # TODO: Protocol was introduced in Python 3.8. Remove this branch when - # dropping support for Python 3.7. - Protocol = object - - COMPLETION_FOR_SUPPORTED_SHELLS_TESTS = ( ( "bash", diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 72c72f35c5d..01e8d0a5ece 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -2096,10 +2096,6 @@ def test_error_all_yanked_files_and_no_pin( ), str(result) -@pytest.mark.skipif( - sys.platform == "linux" and sys.version_info < (3, 8), - reason="Custom SSL certification not running well in CI", -) @pytest.mark.parametrize( "install_args", [ diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py index 563b5604a8e..ed0297b61ab 100644 --- a/tests/functional/test_install_config.py +++ b/tests/functional/test_install_config.py @@ -1,6 +1,5 @@ import os import ssl -import sys import tempfile import textwrap from pathlib import Path @@ -270,10 +269,6 @@ def test_install_no_binary_via_config_disables_cached_wheels( assert "Building wheel for upper" in str(res), str(res) -@pytest.mark.skipif( - sys.platform == "linux" and sys.version_info < (3, 8), - reason="Custom SSL certification not running well in CI", -) def test_prompt_for_authentication( script: PipTestEnvironment, data: TestData, cert_factory: CertFactory ) -> None: @@ -314,10 +309,6 @@ def test_prompt_for_authentication( assert f"User for {server.host}:{server.port}" in result.stdout, str(result) -@pytest.mark.skipif( - sys.platform == "linux" and sys.version_info < (3, 8), - reason="Custom SSL certification not running well in CI", -) def test_do_not_prompt_for_authentication( script: PipTestEnvironment, data: TestData, cert_factory: CertFactory ) -> None: @@ -405,10 +396,6 @@ def flags( return flags -@pytest.mark.skipif( - sys.platform == "linux" and sys.version_info < (3, 8), - reason="Custom SSL certification not running well in CI", -) def test_prompt_for_keyring_if_needed( data: TestData, cert_factory: CertFactory, diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py index 96cff0dc5da..ec4553fecf1 100644 --- a/tests/functional/test_install_reqs.py +++ b/tests/functional/test_install_reqs.py @@ -2,7 +2,7 @@ import os import textwrap from pathlib import Path -from typing import TYPE_CHECKING, Any +from typing import Any, Protocol import pytest @@ -18,11 +18,6 @@ ) from tests.lib.local_repos import local_checkout -if TYPE_CHECKING: - from typing import Protocol -else: - Protocol = object - class ArgRecordingSdist: def __init__(self, sdist_path: Path, args_path: Path) -> None: diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index fc52ab9c8d8..ac4364c6065 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -2,7 +2,7 @@ import pathlib import sys import textwrap -from typing import TYPE_CHECKING, Callable, Dict, List, Tuple +from typing import TYPE_CHECKING, Callable, Dict, List, Protocol, Tuple import pytest @@ -15,9 +15,6 @@ from tests.lib.direct_url import get_created_direct_url from tests.lib.wheel import make_wheel -if TYPE_CHECKING: - from typing import Protocol - MakeFakeWheel = Callable[[str, str, str], pathlib.Path] diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index 7410072f50e..b6108292eb6 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -13,13 +13,13 @@ from io import BytesIO from textwrap import dedent from typing import ( - TYPE_CHECKING, Any, Callable, Dict, Iterable, Iterator, List, + Literal, Mapping, Optional, Tuple, @@ -42,13 +42,7 @@ from tests.lib.venv import VirtualEnvironment from tests.lib.wheel import make_wheel -if TYPE_CHECKING: - # Literal was introduced in Python 3.8. - from typing import Literal - - ResolverVariant = Literal["resolvelib", "legacy"] -else: - ResolverVariant = str +ResolverVariant = Literal["resolvelib", "legacy"] DATA_DIR = pathlib.Path(__file__).parent.parent.joinpath("data").resolve() SRC_DIR = pathlib.Path(__file__).resolve().parent.parent.parent diff --git a/tests/lib/venv.py b/tests/lib/venv.py index e65a3291230..0af0dff8237 100644 --- a/tests/lib/venv.py +++ b/tests/lib/venv.py @@ -7,17 +7,11 @@ import textwrap import venv as _venv from pathlib import Path -from typing import TYPE_CHECKING, Dict, Optional, Union +from typing import Dict, Literal, Optional, Union import virtualenv as _virtualenv -if TYPE_CHECKING: - # Literal was introduced in Python 3.8. - from typing import Literal - - VirtualEnvironmentType = Literal["virtualenv", "venv"] -else: - VirtualEnvironmentType = str +VirtualEnvironmentType = Literal["virtualenv", "venv"] class VirtualEnvironment: diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py index 439c41563b7..da5a4f11782 100644 --- a/tests/unit/test_req_file.py +++ b/tests/unit/test_req_file.py @@ -4,7 +4,7 @@ import textwrap from optparse import Values from pathlib import Path -from typing import TYPE_CHECKING, Any, Iterator, List, Optional, Tuple, Union +from typing import Any, Iterator, List, Optional, Protocol, Tuple, Union from unittest import mock import pytest @@ -29,12 +29,6 @@ from pip._internal.req.req_install import InstallRequirement from tests.lib import TestData, make_test_finder, requirements_file -if TYPE_CHECKING: - from typing import Protocol -else: - # Protocol was introduced in Python 3.8. - Protocol = object - @pytest.fixture def session() -> PipSession: diff --git a/tests/unit/test_wheel_builder.py b/tests/unit/test_wheel_builder.py index 9044f945307..a0c16d9b288 100644 --- a/tests/unit/test_wheel_builder.py +++ b/tests/unit/test_wheel_builder.py @@ -52,6 +52,7 @@ def __init__( self.use_pep517 = use_pep517 self._supports_pyproject_editable = supports_pyproject_editable + @property def supports_pyproject_editable(self) -> bool: return self._supports_pyproject_editable From 38d254662ffadedbb6cf59097590503f1098c09a Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Mon, 10 Apr 2023 16:31:20 +0300 Subject: [PATCH 009/992] Add news entry --- news/11934.removal.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/11934.removal.rst diff --git a/news/11934.removal.rst b/news/11934.removal.rst new file mode 100644 index 00000000000..bf146d23baa --- /dev/null +++ b/news/11934.removal.rst @@ -0,0 +1 @@ +Drop support for EOL Python 3.7. From 21857784d6d7a9139711cf77f77da925fe9189ee Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Wed, 26 Apr 2023 12:53:24 -0600 Subject: [PATCH 010/992] Implement PEP 685 extra normalization in resolver All extras from user input or dependant package metadata are properly normalized for comparison and resolution. This ensures requests for extras from a dependant can always correctly find the normalized extra in the dependency, even if the requested extra name is not normalized. Note that this still relies on the declaration of extra names in the dependency's package metadata to be properly normalized when the package is built, since correct comparison between an extra name's normalized and non-normalized forms requires change to the metadata parsing logic, which is only available in packaging 22.0 and up, which pip does not use at the moment. --- news/11649.bugfix.rst | 5 ++++ .../_internal/resolution/resolvelib/base.py | 2 +- .../resolution/resolvelib/candidates.py | 2 +- .../resolution/resolvelib/factory.py | 20 +++++++++------- .../resolution/resolvelib/requirements.py | 2 +- tests/functional/test_install_extras.py | 24 ++++++++++++++++++- 6 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 news/11649.bugfix.rst diff --git a/news/11649.bugfix.rst b/news/11649.bugfix.rst new file mode 100644 index 00000000000..65511711f59 --- /dev/null +++ b/news/11649.bugfix.rst @@ -0,0 +1,5 @@ +Normalize extras according to :pep:`685` from package metadata in the resolver +for comparison. This ensures extras are correctly compared and merged as long +as the package providing the extra(s) is built with values normalized according +to the standard. Note, however, that this *does not* solve cases where the +package itself contains unnormalized extra values in the metadata. diff --git a/src/pip/_internal/resolution/resolvelib/base.py b/src/pip/_internal/resolution/resolvelib/base.py index b206692a0a9..0275385db71 100644 --- a/src/pip/_internal/resolution/resolvelib/base.py +++ b/src/pip/_internal/resolution/resolvelib/base.py @@ -12,7 +12,7 @@ CandidateVersion = Union[LegacyVersion, Version] -def format_name(project: str, extras: FrozenSet[str]) -> str: +def format_name(project: NormalizedName, extras: FrozenSet[NormalizedName]) -> str: if not extras: return project canonical_extras = sorted(canonicalize_name(e) for e in extras) diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py index 31020e27ad1..48ef9a16daa 100644 --- a/src/pip/_internal/resolution/resolvelib/candidates.py +++ b/src/pip/_internal/resolution/resolvelib/candidates.py @@ -423,7 +423,7 @@ class ExtrasCandidate(Candidate): def __init__( self, base: BaseCandidate, - extras: FrozenSet[str], + extras: FrozenSet[NormalizedName], ) -> None: self.base = base self.extras = extras diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 0331297b85b..6d1ec31631e 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -112,7 +112,7 @@ def __init__( self._editable_candidate_cache: Cache[EditableCandidate] = {} self._installed_candidate_cache: Dict[str, AlreadyInstalledCandidate] = {} self._extras_candidate_cache: Dict[ - Tuple[int, FrozenSet[str]], ExtrasCandidate + Tuple[int, FrozenSet[NormalizedName]], ExtrasCandidate ] = {} if not ignore_installed: @@ -138,7 +138,9 @@ def _fail_if_link_is_unsupported_wheel(self, link: Link) -> None: raise UnsupportedWheel(msg) def _make_extras_candidate( - self, base: BaseCandidate, extras: FrozenSet[str] + self, + base: BaseCandidate, + extras: FrozenSet[NormalizedName], ) -> ExtrasCandidate: cache_key = (id(base), extras) try: @@ -151,7 +153,7 @@ def _make_extras_candidate( def _make_candidate_from_dist( self, dist: BaseDistribution, - extras: FrozenSet[str], + extras: FrozenSet[NormalizedName], template: InstallRequirement, ) -> Candidate: try: @@ -166,7 +168,7 @@ def _make_candidate_from_dist( def _make_candidate_from_link( self, link: Link, - extras: FrozenSet[str], + extras: FrozenSet[NormalizedName], template: InstallRequirement, name: Optional[NormalizedName], version: Optional[CandidateVersion], @@ -244,12 +246,12 @@ def _iter_found_candidates( assert template.req, "Candidates found on index must be PEP 508" name = canonicalize_name(template.req.name) - extras: FrozenSet[str] = frozenset() + extras: FrozenSet[NormalizedName] = frozenset() for ireq in ireqs: assert ireq.req, "Candidates found on index must be PEP 508" specifier &= ireq.req.specifier hashes &= ireq.hashes(trust_internet=False) - extras |= frozenset(ireq.extras) + extras |= frozenset(canonicalize_name(e) for e in ireq.extras) def _get_installed_candidate() -> Optional[Candidate]: """Get the candidate for the currently-installed version.""" @@ -325,7 +327,7 @@ def is_pinned(specifier: SpecifierSet) -> bool: def _iter_explicit_candidates_from_base( self, base_requirements: Iterable[Requirement], - extras: FrozenSet[str], + extras: FrozenSet[NormalizedName], ) -> Iterator[Candidate]: """Produce explicit candidates from the base given an extra-ed package. @@ -392,7 +394,7 @@ def find_candidates( explicit_candidates.update( self._iter_explicit_candidates_from_base( requirements.get(parsed_requirement.name, ()), - frozenset(parsed_requirement.extras), + frozenset(canonicalize_name(e) for e in parsed_requirement.extras), ), ) @@ -452,7 +454,7 @@ def _make_requirement_from_install_req( self._fail_if_link_is_unsupported_wheel(ireq.link) cand = self._make_candidate_from_link( ireq.link, - extras=frozenset(ireq.extras), + extras=frozenset(canonicalize_name(e) for e in ireq.extras), template=ireq, name=canonicalize_name(ireq.name) if ireq.name else None, version=None, diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index 06addc0ddce..7d244c6937a 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -43,7 +43,7 @@ class SpecifierRequirement(Requirement): def __init__(self, ireq: InstallRequirement) -> None: assert ireq.link is None, "This is a link, not a specifier" self._ireq = ireq - self._extras = frozenset(ireq.extras) + self._extras = frozenset(canonicalize_name(e) for e in ireq.extras) def __str__(self) -> str: return str(self._ireq.req) diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py index c6cef00fa9c..6f2a6bf435f 100644 --- a/tests/functional/test_install_extras.py +++ b/tests/functional/test_install_extras.py @@ -4,7 +4,12 @@ import pytest -from tests.lib import PipTestEnvironment, ResolverVariant, TestData +from tests.lib import ( + PipTestEnvironment, + ResolverVariant, + TestData, + create_basic_wheel_for_package, +) @pytest.mark.network @@ -223,3 +228,20 @@ def test_install_extra_merging( if not fails_on_legacy or resolver_variant == "2020-resolver": expected = f"Successfully installed pkga-0.1 simple-{simple_version}" assert expected in result.stdout + + +def test_install_extras(script: PipTestEnvironment) -> None: + create_basic_wheel_for_package(script, "a", "1", depends=["b", "dep[x-y]"]) + create_basic_wheel_for_package(script, "b", "1", depends=["dep[x_y]"]) + create_basic_wheel_for_package(script, "dep", "1", extras={"x-y": ["meh"]}) + create_basic_wheel_for_package(script, "meh", "1") + + script.pip( + "install", + "--no-cache-dir", + "--no-index", + "--find-links", + script.scratch_path, + "a", + ) + script.assert_installed(a="1", b="1", dep="1", meh="1") From c3160c5423e778b0dc334a677ae865befd222021 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Tue, 9 May 2023 15:39:58 +0800 Subject: [PATCH 011/992] Avoid importing things from conftest It is generally discouraged to import from conftest. Things are now moved to tests.lib and imported from there instead. Also did some cleanup to remove the no-longer-needed nullcontext shim. --- tests/conftest.py | 109 +++--------------------- tests/functional/test_completion.py | 3 +- tests/functional/test_download.py | 4 +- tests/functional/test_help.py | 3 +- tests/functional/test_inspect.py | 3 +- tests/functional/test_install.py | 2 +- tests/functional/test_install_config.py | 4 +- tests/functional/test_list.py | 2 +- tests/lib/__init__.py | 48 +++++++++-- tests/lib/compat.py | 23 +---- tests/lib/server.py | 51 ++++++++++- 11 files changed, 114 insertions(+), 138 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 57dd7e68a2b..5b189443f25 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,23 +1,21 @@ import compileall +import contextlib import fnmatch -import io import os import re import shutil import subprocess import sys -from contextlib import ExitStack, contextmanager from pathlib import Path from typing import ( - TYPE_CHECKING, AnyStr, Callable, + ContextManager, Dict, Iterable, Iterator, List, Optional, - Union, ) from unittest.mock import patch from zipfile import ZipFile @@ -36,25 +34,20 @@ from installer.sources import WheelFile from pip import __file__ as pip_location -from pip._internal.cli.main import main as pip_entry_point from pip._internal.locations import _USE_SYSCONFIG from pip._internal.utils.temp_dir import global_tempdir_manager -from tests.lib import DATA_DIR, SRC_DIR, PipTestEnvironment, TestData -from tests.lib.server import MockServer as _MockServer -from tests.lib.server import make_mock_server, server_running +from tests.lib import ( + DATA_DIR, + SRC_DIR, + CertFactory, + InMemoryPip, + PipTestEnvironment, + ScriptFactory, + TestData, +) +from tests.lib.server import MockServer, make_mock_server from tests.lib.venv import VirtualEnvironment, VirtualEnvironmentType -from .lib.compat import nullcontext - -if TYPE_CHECKING: - from typing import Protocol - - from wsgi import WSGIApplication -else: - # TODO: Protocol was introduced in Python 3.8. Remove this branch when - # dropping support for Python 3.7. - Protocol = object - def pytest_addoption(parser: Parser) -> None: parser.addoption( @@ -325,7 +318,7 @@ def scoped_global_tempdir_manager(request: pytest.FixtureRequest) -> Iterator[No temporary directories in the application. """ if "no_auto_tempdir_manager" in request.keywords: - ctx = nullcontext + ctx: Callable[[], ContextManager[None]] = contextlib.nullcontext else: ctx = global_tempdir_manager @@ -502,16 +495,6 @@ def virtualenv( yield virtualenv_factory(tmpdir.joinpath("workspace", "venv")) -class ScriptFactory(Protocol): - def __call__( - self, - tmpdir: Path, - virtualenv: Optional[VirtualEnvironment] = None, - environ: Optional[Dict[AnyStr, AnyStr]] = None, - ) -> PipTestEnvironment: - ... - - @pytest.fixture(scope="session") def script_factory( virtualenv_factory: Callable[[Path], VirtualEnvironment], @@ -631,26 +614,6 @@ def data(tmpdir: Path) -> TestData: return TestData.copy(tmpdir.joinpath("data")) -class InMemoryPipResult: - def __init__(self, returncode: int, stdout: str) -> None: - self.returncode = returncode - self.stdout = stdout - - -class InMemoryPip: - def pip(self, *args: Union[str, Path]) -> InMemoryPipResult: - orig_stdout = sys.stdout - stdout = io.StringIO() - sys.stdout = stdout - try: - returncode = pip_entry_point([os.fspath(a) for a in args]) - except SystemExit as e: - returncode = e.code or 0 - finally: - sys.stdout = orig_stdout - return InMemoryPipResult(returncode, stdout.getvalue()) - - @pytest.fixture def in_memory_pip() -> InMemoryPip: return InMemoryPip() @@ -662,9 +625,6 @@ def deprecated_python() -> bool: return sys.version_info[:2] in [] -CertFactory = Callable[[], str] - - @pytest.fixture(scope="session") def cert_factory(tmpdir_factory: pytest.TempPathFactory) -> CertFactory: # Delay the import requiring cryptography in order to make it possible @@ -686,49 +646,6 @@ def factory() -> str: return factory -class MockServer: - def __init__(self, server: _MockServer) -> None: - self._server = server - self._running = False - self.context = ExitStack() - - @property - def port(self) -> int: - return self._server.port - - @property - def host(self) -> str: - return self._server.host - - def set_responses(self, responses: Iterable["WSGIApplication"]) -> None: - assert not self._running, "responses cannot be set on running server" - self._server.mock.side_effect = responses - - def start(self) -> None: - assert not self._running, "running server cannot be started" - self.context.enter_context(server_running(self._server)) - self.context.enter_context(self._set_running()) - - @contextmanager - def _set_running(self) -> Iterator[None]: - self._running = True - try: - yield - finally: - self._running = False - - def stop(self) -> None: - assert self._running, "idle server cannot be stopped" - self.context.close() - - def get_requests(self) -> List[Dict[str, str]]: - """Get environ for each received request.""" - assert not self._running, "cannot get mock from running server" - # Legacy: replace call[0][0] with call.args[0] - # when pip drops support for python3.7 - return [call[0][0] for call in self._server.mock.call_args_list] - - @pytest.fixture def mock_server() -> Iterator[MockServer]: server = make_mock_server() diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py index b02cd4fa317..28381c2097e 100644 --- a/tests/functional/test_completion.py +++ b/tests/functional/test_completion.py @@ -5,8 +5,7 @@ import pytest -from tests.conftest import ScriptFactory -from tests.lib import PipTestEnvironment, TestData, TestPipResult +from tests.lib import PipTestEnvironment, ScriptFactory, TestData, TestPipResult if TYPE_CHECKING: from typing import Protocol diff --git a/tests/functional/test_download.py b/tests/functional/test_download.py index 31418ca8c2b..8c00dc09edf 100644 --- a/tests/functional/test_download.py +++ b/tests/functional/test_download.py @@ -14,15 +14,15 @@ from pip._internal.cli.status_codes import ERROR from pip._internal.utils.urls import path_to_url -from tests.conftest import MockServer, ScriptFactory from tests.lib import ( PipTestEnvironment, + ScriptFactory, TestData, TestPipResult, create_basic_sdist_for_package, create_really_basic_wheel, ) -from tests.lib.server import file_response +from tests.lib.server import MockServer, file_response def fake_wheel(data: TestData, wheel_path: str) -> None: diff --git a/tests/functional/test_help.py b/tests/functional/test_help.py index dba41af5f79..69419b8d9a3 100644 --- a/tests/functional/test_help.py +++ b/tests/functional/test_help.py @@ -5,8 +5,7 @@ from pip._internal.cli.status_codes import ERROR, SUCCESS from pip._internal.commands import commands_dict, create_command from pip._internal.exceptions import CommandError -from tests.conftest import InMemoryPip -from tests.lib import PipTestEnvironment +from tests.lib import InMemoryPip, PipTestEnvironment def test_run_method_should_return_success_when_finds_command_name() -> None: diff --git a/tests/functional/test_inspect.py b/tests/functional/test_inspect.py index c9f43134624..f6690fb1fb1 100644 --- a/tests/functional/test_inspect.py +++ b/tests/functional/test_inspect.py @@ -2,8 +2,7 @@ import pytest -from tests.conftest import ScriptFactory -from tests.lib import PipTestEnvironment, TestData +from tests.lib import PipTestEnvironment, ScriptFactory, TestData @pytest.fixture(scope="session") diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 63712827479..c29880e611a 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -15,8 +15,8 @@ from pip._internal.models.index import PyPI, TestPyPI from pip._internal.utils.misc import rmtree from pip._internal.utils.urls import path_to_url -from tests.conftest import CertFactory from tests.lib import ( + CertFactory, PipTestEnvironment, ResolverVariant, TestData, diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py index 9f8a8067787..ecaf2f705a2 100644 --- a/tests/functional/test_install_config.py +++ b/tests/functional/test_install_config.py @@ -8,9 +8,9 @@ import pytest -from tests.conftest import CertFactory, MockServer, ScriptFactory -from tests.lib import PipTestEnvironment, TestData +from tests.lib import CertFactory, PipTestEnvironment, ScriptFactory, TestData from tests.lib.server import ( + MockServer, authorization_response, file_response, make_mock_server, diff --git a/tests/functional/test_list.py b/tests/functional/test_list.py index bd45f82df7f..a960f3c4e71 100644 --- a/tests/functional/test_list.py +++ b/tests/functional/test_list.py @@ -5,9 +5,9 @@ import pytest from pip._internal.models.direct_url import DirectUrl, DirInfo -from tests.conftest import ScriptFactory from tests.lib import ( PipTestEnvironment, + ScriptFactory, TestData, _create_test_package, create_test_package_with_setup, diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index 7410072f50e..cd0b83d1292 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -10,11 +10,12 @@ from base64 import urlsafe_b64encode from contextlib import contextmanager from hashlib import sha256 -from io import BytesIO +from io import BytesIO, StringIO from textwrap import dedent from typing import ( TYPE_CHECKING, Any, + AnyStr, Callable, Dict, Iterable, @@ -32,6 +33,7 @@ from pip._vendor.packaging.utils import canonicalize_name from scripttest import FoundDir, FoundFile, ProcResult, TestFileEnvironment +from pip._internal.cli.main import main as pip_entry_point from pip._internal.index.collector import LinkCollector from pip._internal.index.package_finder import PackageFinder from pip._internal.locations import get_major_minor_version @@ -43,12 +45,12 @@ from tests.lib.wheel import make_wheel if TYPE_CHECKING: - # Literal was introduced in Python 3.8. - from typing import Literal + from typing import Literal, Protocol ResolverVariant = Literal["resolvelib", "legacy"] -else: - ResolverVariant = str +else: # TODO: Remove this branch when dropping support for Python 3.7. + Protocol = object # Protocol was introduced in Python 3.8. + ResolverVariant = str # Literal was introduced in Python 3.8. DATA_DIR = pathlib.Path(__file__).parent.parent.joinpath("data").resolve() SRC_DIR = pathlib.Path(__file__).resolve().parent.parent.parent @@ -1336,3 +1338,39 @@ def need_svn(fn: _Test) -> _Test: def need_mercurial(fn: _Test) -> _Test: return pytest.mark.mercurial(need_executable("Mercurial", ("hg", "version"))(fn)) + + +class InMemoryPipResult: + def __init__(self, returncode: int, stdout: str) -> None: + self.returncode = returncode + self.stdout = stdout + + +class InMemoryPip: + def pip(self, *args: Union[str, pathlib.Path]) -> InMemoryPipResult: + orig_stdout = sys.stdout + stdout = StringIO() + sys.stdout = stdout + try: + returncode = pip_entry_point([os.fspath(a) for a in args]) + except SystemExit as e: + if isinstance(e.code, int): + returncode = e.code + else: + returncode = int(bool(e.code)) + finally: + sys.stdout = orig_stdout + return InMemoryPipResult(returncode, stdout.getvalue()) + + +class ScriptFactory(Protocol): + def __call__( + self, + tmpdir: pathlib.Path, + virtualenv: Optional[VirtualEnvironment] = None, + environ: Optional[Dict[AnyStr, AnyStr]] = None, + ) -> PipTestEnvironment: + ... + + +CertFactory = Callable[[], str] diff --git a/tests/lib/compat.py b/tests/lib/compat.py index 4d44cbddbbc..866ac7a7734 100644 --- a/tests/lib/compat.py +++ b/tests/lib/compat.py @@ -2,32 +2,13 @@ import contextlib import signal -from typing import Iterable, Iterator - - -@contextlib.contextmanager -def nullcontext() -> Iterator[None]: - """ - Context manager that does no additional processing. - - Used as a stand-in for a normal context manager, when a particular block of - code is only sometimes used with a normal context manager: - - cm = optional_cm if condition else nullcontext() - with cm: - # Perform operation, using optional_cm if condition is True - - TODO: Replace with contextlib.nullcontext after dropping Python 3.6 - support. - """ - yield - +from typing import Callable, ContextManager, Iterable, Iterator # Applies on Windows. if not hasattr(signal, "pthread_sigmask"): # We're not relying on this behavior anywhere currently, it's just best # practice. - blocked_signals = nullcontext + blocked_signals: Callable[[], ContextManager[None]] = contextlib.nullcontext else: @contextlib.contextmanager diff --git a/tests/lib/server.py b/tests/lib/server.py index 4cc18452cb5..1048a173d40 100644 --- a/tests/lib/server.py +++ b/tests/lib/server.py @@ -2,9 +2,9 @@ import ssl import threading from base64 import b64encode -from contextlib import contextmanager +from contextlib import ExitStack, contextmanager from textwrap import dedent -from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, Iterator +from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, Iterator, List from unittest.mock import Mock from werkzeug.serving import BaseWSGIServer, WSGIRequestHandler @@ -18,7 +18,7 @@ Body = Iterable[bytes] -class MockServer(BaseWSGIServer): +class _MockServer(BaseWSGIServer): mock: Mock = Mock() @@ -64,7 +64,7 @@ def adapter(environ: "WSGIEnvironment", start_response: "StartResponse") -> Body return adapter -def make_mock_server(**kwargs: Any) -> MockServer: +def make_mock_server(**kwargs: Any) -> _MockServer: """Creates a mock HTTP(S) server listening on a random port on localhost. The `mock` property of the returned server provides and records all WSGI @@ -189,3 +189,46 @@ def responder(environ: "WSGIEnvironment", start_response: "StartResponse") -> Bo return [path.read_bytes()] return responder + + +class MockServer: + def __init__(self, server: _MockServer) -> None: + self._server = server + self._running = False + self.context = ExitStack() + + @property + def port(self) -> int: + return self._server.port + + @property + def host(self) -> str: + return self._server.host + + def set_responses(self, responses: Iterable["WSGIApplication"]) -> None: + assert not self._running, "responses cannot be set on running server" + self._server.mock.side_effect = responses + + def start(self) -> None: + assert not self._running, "running server cannot be started" + self.context.enter_context(server_running(self._server)) + self.context.enter_context(self._set_running()) + + @contextmanager + def _set_running(self) -> Iterator[None]: + self._running = True + try: + yield + finally: + self._running = False + + def stop(self) -> None: + assert self._running, "idle server cannot be stopped" + self.context.close() + + def get_requests(self) -> List[Dict[str, str]]: + """Get environ for each received request.""" + assert not self._running, "cannot get mock from running server" + # Legacy: replace call[0][0] with call.args[0] + # when pip drops support for python3.7 + return [call[0][0] for call in self._server.mock.call_args_list] From b9066d4b00a2fa2cc6529ecb0b5920465e0fb812 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Thu, 11 May 2023 13:00:47 +0800 Subject: [PATCH 012/992] Add test cases for normalized weird extra --- tests/functional/test_install_extras.py | 33 ++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py index 6f2a6bf435f..21da9d50e1b 100644 --- a/tests/functional/test_install_extras.py +++ b/tests/functional/test_install_extras.py @@ -155,25 +155,50 @@ def test_install_fails_if_extra_at_end( assert "Extras after version" in result.stderr -def test_install_special_extra(script: PipTestEnvironment) -> None: +@pytest.mark.parametrize( + "specified_extra, requested_extra", + [ + ("Hop_hOp-hoP", "Hop_hOp-hoP"), + pytest.param( + "Hop_hOp-hoP", + "hop-hop-hop", + marks=pytest.mark.xfail( + reason=( + "matching a normalized extra request against an" + "unnormalized extra in metadata requires PEP 685 support " + "in packaging (see pypa/pip#11445)." + ), + ), + ), + ("hop-hop-hop", "Hop_hOp-hoP"), + ], +) +def test_install_special_extra( + script: PipTestEnvironment, + specified_extra: str, + requested_extra: str, +) -> None: # Check that uppercase letters and '-' are dealt with # make a dummy project pkga_path = script.scratch_path / "pkga" pkga_path.mkdir() pkga_path.joinpath("setup.py").write_text( textwrap.dedent( - """ + f""" from setuptools import setup setup(name='pkga', version='0.1', - extras_require={'Hop_hOp-hoP': ['missing_pkg']}, + extras_require={{'{specified_extra}': ['missing_pkg']}}, ) """ ) ) result = script.pip( - "install", "--no-index", f"{pkga_path}[Hop_hOp-hoP]", expect_error=True + "install", + "--no-index", + f"{pkga_path}[{requested_extra}]", + expect_error=True, ) assert ( "Could not find a version that satisfies the requirement missing_pkg" From d64190c5fbbf38cf40215ef7122f1b8c6847afc9 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Thu, 11 May 2023 14:32:41 +0800 Subject: [PATCH 013/992] Try to find dependencies from unnormalized extras When an unnormalized extra is requested, try to look up dependencies with both its raw and normalized forms, to maintain compatibility when an extra is both specified and requested in a non-standard form. --- .../resolution/resolvelib/candidates.py | 62 ++++++++++++++----- .../resolution/resolvelib/factory.py | 18 +++--- 2 files changed, 57 insertions(+), 23 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py index 48ef9a16daa..b737bffc9c9 100644 --- a/src/pip/_internal/resolution/resolvelib/candidates.py +++ b/src/pip/_internal/resolution/resolvelib/candidates.py @@ -423,10 +423,17 @@ class ExtrasCandidate(Candidate): def __init__( self, base: BaseCandidate, - extras: FrozenSet[NormalizedName], + extras: FrozenSet[str], ) -> None: self.base = base - self.extras = extras + self.extras = frozenset(canonicalize_name(e) for e in extras) + # If any extras are requested in their non-normalized forms, keep track + # of their raw values. This is needed when we look up dependencies + # since PEP 685 has not been implemented for marker-matching, and using + # the non-normalized extra for lookup ensures the user can select a + # non-normalized extra in a package with its non-normalized form. + # TODO: Remove this when packaging is upgraded to support PEP 685. + self._unnormalized_extras = extras.difference(self.extras) def __str__(self) -> str: name, rest = str(self.base).split(" ", 1) @@ -477,6 +484,44 @@ def is_editable(self) -> bool: def source_link(self) -> Optional[Link]: return self.base.source_link + def _warn_invalid_extras( + self, + requested: FrozenSet[str], + provided: FrozenSet[str], + ) -> None: + """Emit warnings for invalid extras being requested. + + This emits a warning for each requested extra that is not in the + candidate's ``Provides-Extra`` list. + """ + invalid_extras_to_warn = requested.difference( + provided, + # If an extra is requested in an unnormalized form, skip warning + # about the normalized form being missing. + (canonicalize_name(e) for e in self._unnormalized_extras), + ) + if not invalid_extras_to_warn: + return + for extra in sorted(invalid_extras_to_warn): + logger.warning( + "%s %s does not provide the extra '%s'", + self.base.name, + self.version, + extra, + ) + + def _calculate_valid_requested_extras(self) -> FrozenSet[str]: + """Get a list of valid extras requested by this candidate. + + The user (or upstream dependant) may have specified extras that the + candidate doesn't support. Any unsupported extras are dropped, and each + cause a warning to be logged here. + """ + requested_extras = self.extras.union(self._unnormalized_extras) + provided_extras = frozenset(self.base.dist.iter_provided_extras()) + self._warn_invalid_extras(requested_extras, provided_extras) + return requested_extras.intersection(provided_extras) + def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]: factory = self.base._factory @@ -486,18 +531,7 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen if not with_requires: return - # The user may have specified extras that the candidate doesn't - # support. We ignore any unsupported extras here. - valid_extras = self.extras.intersection(self.base.dist.iter_provided_extras()) - invalid_extras = self.extras.difference(self.base.dist.iter_provided_extras()) - for extra in sorted(invalid_extras): - logger.warning( - "%s %s does not provide the extra '%s'", - self.base.name, - self.version, - extra, - ) - + valid_extras = self._calculate_valid_requested_extras() for r in self.base.dist.iter_dependencies(valid_extras): requirement = factory.make_requirement_from_spec( str(r), self.base._ireq, valid_extras diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 6d1ec31631e..ff916236c97 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -140,9 +140,9 @@ def _fail_if_link_is_unsupported_wheel(self, link: Link) -> None: def _make_extras_candidate( self, base: BaseCandidate, - extras: FrozenSet[NormalizedName], + extras: FrozenSet[str], ) -> ExtrasCandidate: - cache_key = (id(base), extras) + cache_key = (id(base), frozenset(canonicalize_name(e) for e in extras)) try: candidate = self._extras_candidate_cache[cache_key] except KeyError: @@ -153,7 +153,7 @@ def _make_extras_candidate( def _make_candidate_from_dist( self, dist: BaseDistribution, - extras: FrozenSet[NormalizedName], + extras: FrozenSet[str], template: InstallRequirement, ) -> Candidate: try: @@ -168,7 +168,7 @@ def _make_candidate_from_dist( def _make_candidate_from_link( self, link: Link, - extras: FrozenSet[NormalizedName], + extras: FrozenSet[str], template: InstallRequirement, name: Optional[NormalizedName], version: Optional[CandidateVersion], @@ -246,12 +246,12 @@ def _iter_found_candidates( assert template.req, "Candidates found on index must be PEP 508" name = canonicalize_name(template.req.name) - extras: FrozenSet[NormalizedName] = frozenset() + extras: FrozenSet[str] = frozenset() for ireq in ireqs: assert ireq.req, "Candidates found on index must be PEP 508" specifier &= ireq.req.specifier hashes &= ireq.hashes(trust_internet=False) - extras |= frozenset(canonicalize_name(e) for e in ireq.extras) + extras |= frozenset(ireq.extras) def _get_installed_candidate() -> Optional[Candidate]: """Get the candidate for the currently-installed version.""" @@ -327,7 +327,7 @@ def is_pinned(specifier: SpecifierSet) -> bool: def _iter_explicit_candidates_from_base( self, base_requirements: Iterable[Requirement], - extras: FrozenSet[NormalizedName], + extras: FrozenSet[str], ) -> Iterator[Candidate]: """Produce explicit candidates from the base given an extra-ed package. @@ -394,7 +394,7 @@ def find_candidates( explicit_candidates.update( self._iter_explicit_candidates_from_base( requirements.get(parsed_requirement.name, ()), - frozenset(canonicalize_name(e) for e in parsed_requirement.extras), + frozenset(parsed_requirement.extras), ), ) @@ -454,7 +454,7 @@ def _make_requirement_from_install_req( self._fail_if_link_is_unsupported_wheel(ireq.link) cand = self._make_candidate_from_link( ireq.link, - extras=frozenset(canonicalize_name(e) for e in ireq.extras), + extras=frozenset(ireq.extras), template=ireq, name=canonicalize_name(ireq.name) if ireq.name else None, version=None, From 4aa6d88ddcccde3e0f189b447f0c8886ceebe008 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Thu, 11 May 2023 15:12:30 +0800 Subject: [PATCH 014/992] Remove extra normalization from format_name util Since this function now always take normalized names, additional normalization is no longer needed. --- src/pip/_internal/resolution/resolvelib/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/base.py b/src/pip/_internal/resolution/resolvelib/base.py index 0275385db71..9c0ef5ca7b9 100644 --- a/src/pip/_internal/resolution/resolvelib/base.py +++ b/src/pip/_internal/resolution/resolvelib/base.py @@ -1,7 +1,7 @@ from typing import FrozenSet, Iterable, Optional, Tuple, Union from pip._vendor.packaging.specifiers import SpecifierSet -from pip._vendor.packaging.utils import NormalizedName, canonicalize_name +from pip._vendor.packaging.utils import NormalizedName from pip._vendor.packaging.version import LegacyVersion, Version from pip._internal.models.link import Link, links_equivalent @@ -15,8 +15,8 @@ def format_name(project: NormalizedName, extras: FrozenSet[NormalizedName]) -> str: if not extras: return project - canonical_extras = sorted(canonicalize_name(e) for e in extras) - return "{}[{}]".format(project, ",".join(canonical_extras)) + extras_expr = ",".join(sorted(extras)) + return f"{project}[{extras_expr}]" class Constraint: From 66903a32ff62fe5b51265ef49f01ce8fb1ec74dc Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 21 May 2023 00:01:30 +0200 Subject: [PATCH 015/992] Fix direct usage of pip.pyz example --- docs/html/installation.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index 036a91397a5..126d7fdbd1e 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -67,9 +67,17 @@ $ python pip.pyz --help If run directly: -```{pip-cli} -$ pip.pyz --help +````{tab} Unix/macOS +```shell +./pip.pyz +``` +```` + +````{tab} Windows +```shell +.\pip.pyz ``` +```` then the currently active Python interpreter will be used. From 5102ca458a23c1945c99f96b25c50c9ac8be6a31 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 21 May 2023 00:10:59 +0200 Subject: [PATCH 016/992] Create 12043.doc.rst --- news/12043.doc.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/12043.doc.rst diff --git a/news/12043.doc.rst b/news/12043.doc.rst new file mode 100644 index 00000000000..2c77f9b59dc --- /dev/null +++ b/news/12043.doc.rst @@ -0,0 +1 @@ +Fix the direct usage of zipapp showing up as ``python -m pip.pyz`` rather than ``./pip.pyz`` / ``.\pip.pyz`` From 881da76e64923234b93a795b80f06356e266b90c Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 21 May 2023 00:16:12 +0200 Subject: [PATCH 017/992] Update installation.md --- docs/html/installation.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index 126d7fdbd1e..e047b70158b 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -68,14 +68,14 @@ $ python pip.pyz --help If run directly: ````{tab} Unix/macOS -```shell -./pip.pyz +```console +$ ./pip.pyz ``` ```` ````{tab} Windows -```shell -.\pip.pyz +```console +C:\> .\pip.pyz ``` ```` From 3db673f31e694f8b1eafb6126d0bf43bf79ddd22 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 21 May 2023 15:29:51 +0200 Subject: [PATCH 018/992] Update installation.md --- docs/html/installation.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index e047b70158b..a179e145a92 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -67,8 +67,16 @@ $ python pip.pyz --help If run directly: -````{tab} Unix/macOS +````{tab} Linux ```console +$ chmod +x ./pip.pyz +$ ./pip.pyz +``` +```` + +````{tab} MacOS +```console +$ chmod +x ./pip.pyz $ ./pip.pyz ``` ```` From 39431b5db17dbd49e453ee78922b1ec271964f4d Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 28 May 2023 21:49:41 +0200 Subject: [PATCH 019/992] Use a single tab for both commands --- docs/html/installation.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index a179e145a92..fee8a24807f 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -61,34 +61,40 @@ also zip applications for specific pip versions, named `pip-X.Y.Z.pyz`. The zip application can be run using any supported version of Python: -```{pip-cli} +````{tab} Linux +```console $ python pip.pyz --help ``` If run directly: - -````{tab} Linux ```console $ chmod +x ./pip.pyz $ ./pip.pyz ``` + +then the currently active Python interpreter will be used. ```` ````{tab} MacOS ```console +$ python pip.pyz --help +``` + +If run directly: +```console $ chmod +x ./pip.pyz $ ./pip.pyz ``` + +then the currently active Python interpreter will be used. ```` ````{tab} Windows ```console -C:\> .\pip.pyz +C:> py pip.pyz --help ``` ```` -then the currently active Python interpreter will be used. - ## Alternative Methods Depending on how you installed Python, there might be other mechanisms From b1ea8c149905ec28956a54f4f11a13c5d8234ca3 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 28 May 2023 22:47:30 +0200 Subject: [PATCH 020/992] Revert "Use a single tab for both commands" This reverts commit 39431b5db17dbd49e453ee78922b1ec271964f4d. --- docs/html/installation.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index fee8a24807f..a179e145a92 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -61,40 +61,34 @@ also zip applications for specific pip versions, named `pip-X.Y.Z.pyz`. The zip application can be run using any supported version of Python: -````{tab} Linux -```console +```{pip-cli} $ python pip.pyz --help ``` If run directly: + +````{tab} Linux ```console $ chmod +x ./pip.pyz $ ./pip.pyz ``` - -then the currently active Python interpreter will be used. ```` ````{tab} MacOS ```console -$ python pip.pyz --help -``` - -If run directly: -```console $ chmod +x ./pip.pyz $ ./pip.pyz ``` - -then the currently active Python interpreter will be used. ```` ````{tab} Windows ```console -C:> py pip.pyz --help +C:\> .\pip.pyz ``` ```` +then the currently active Python interpreter will be used. + ## Alternative Methods Depending on how you installed Python, there might be other mechanisms From cebb9f1bf9361fe5b569a2ffc4e6a1b48737d1a8 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 28 May 2023 22:49:17 +0200 Subject: [PATCH 021/992] Add a note to Windows invocation --- docs/html/installation.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index a179e145a92..6403c9e564b 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -72,6 +72,8 @@ If run directly: $ chmod +x ./pip.pyz $ ./pip.pyz ``` + +then the currently active Python interpreter will be used. ```` ````{tab} MacOS @@ -79,15 +81,19 @@ $ ./pip.pyz $ chmod +x ./pip.pyz $ ./pip.pyz ``` + +then the currently active Python interpreter will be used. ```` ````{tab} Windows ```console C:\> .\pip.pyz ``` -```` then the currently active Python interpreter will be used. +You may need to configure your system to recognise the ``.pyz`` extension +before this will work. +```` ## Alternative Methods From b96b21de1e0015ed40fe81925a33269fa48cd0cd Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 28 May 2023 23:12:24 +0200 Subject: [PATCH 022/992] Add newline to make it look less weird when changing tabs? --- docs/html/installation.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/html/installation.md b/docs/html/installation.md index 6403c9e564b..91f4c9cf8b4 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -91,6 +91,7 @@ C:\> .\pip.pyz ``` then the currently active Python interpreter will be used. + You may need to configure your system to recognise the ``.pyz`` extension before this will work. ```` From 8fe45a1e08c4b4de8d86d584dff06bc801639be6 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 28 May 2023 23:15:32 +0200 Subject: [PATCH 023/992] Try fixing italics *again* --- docs/html/installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index 91f4c9cf8b4..3502f87e7a1 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -86,8 +86,8 @@ then the currently active Python interpreter will be used. ```` ````{tab} Windows -```console -C:\> .\pip.pyz +```shell +C:> .\pip.pyz ``` then the currently active Python interpreter will be used. From 8901f8750c90c92c6722ab49771efc69927d61a4 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 28 May 2023 23:19:11 +0200 Subject: [PATCH 024/992] Remove the code block syntax altogether --- docs/html/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index 3502f87e7a1..24fb3f8694b 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -86,7 +86,7 @@ then the currently active Python interpreter will be used. ```` ````{tab} Windows -```shell +``` C:> .\pip.pyz ``` From a3ce5aa1deb78c3e94bb58df42d61db50067fa45 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 28 May 2023 23:26:38 +0200 Subject: [PATCH 025/992] Try doscon --- docs/html/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index 24fb3f8694b..2fc550dfdb6 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -86,7 +86,7 @@ then the currently active Python interpreter will be used. ```` ````{tab} Windows -``` +```doscon C:> .\pip.pyz ``` From 2d6e6bec03156784c9275316a42fa2bab0f8d98d Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 28 May 2023 23:29:48 +0200 Subject: [PATCH 026/992] Check one thing about the prompt --- docs/html/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index 2fc550dfdb6..07973ab6cde 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -87,7 +87,7 @@ then the currently active Python interpreter will be used. ````{tab} Windows ```doscon -C:> .\pip.pyz +C:\> .\pip.pyz ``` then the currently active Python interpreter will be used. From 67f79f2a3944218b87db9600a251a858d948889a Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Sun, 28 May 2023 23:32:35 +0200 Subject: [PATCH 027/992] Revert "Check one thing about the prompt" This reverts commit 2d6e6bec03156784c9275316a42fa2bab0f8d98d. --- docs/html/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/html/installation.md b/docs/html/installation.md index 07973ab6cde..2fc550dfdb6 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -87,7 +87,7 @@ then the currently active Python interpreter will be used. ````{tab} Windows ```doscon -C:\> .\pip.pyz +C:> .\pip.pyz ``` then the currently active Python interpreter will be used. From 5bebe850ea1db6ff165e4b95bafb1ee44e4a69e8 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Tue, 20 Jun 2023 17:13:18 +0200 Subject: [PATCH 028/992] take non-extra requirements into account for extra installs --- src/pip/_internal/resolution/resolvelib/factory.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 0331297b85b..c117a30c81c 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -385,8 +385,8 @@ def find_candidates( if ireq is not None: ireqs.append(ireq) - # If the current identifier contains extras, add explicit candidates - # from entries from extra-less identifier. + # If the current identifier contains extras, add requires and explicit + # candidates from entries from extra-less identifier. with contextlib.suppress(InvalidRequirement): parsed_requirement = get_requirement(identifier) explicit_candidates.update( @@ -395,6 +395,10 @@ def find_candidates( frozenset(parsed_requirement.extras), ), ) + for req in requirements.get(parsed_requirement.name, []): + _, ireq = req.get_candidate_lookup() + if ireq is not None: + ireqs.append(ireq) # Add explicit candidates from constraints. We only do this if there are # known ireqs, which represent requirements not already explicit. If From 937d8f0b61dbf41f23db9ba62586a6bf6d45c828 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 21 Jun 2023 17:34:30 +0200 Subject: [PATCH 029/992] partial improvement --- src/pip/_internal/req/constructors.py | 32 +++++++++++- .../resolution/resolvelib/candidates.py | 9 ++-- .../resolution/resolvelib/factory.py | 51 ++++++++++++++----- .../resolution/resolvelib/provider.py | 2 + .../resolution/resolvelib/requirements.py | 28 ++++++++-- .../resolution_resolvelib/test_requirement.py | 22 ++++---- 6 files changed, 109 insertions(+), 35 deletions(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index c5ca2d85d51..f04a4cbbdbd 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -15,7 +15,7 @@ from pip._vendor.packaging.markers import Marker from pip._vendor.packaging.requirements import InvalidRequirement, Requirement -from pip._vendor.packaging.specifiers import Specifier +from pip._vendor.packaging.specifiers import Specifier, SpecifierSet from pip._internal.exceptions import InstallationError from pip._internal.models.index import PyPI, TestPyPI @@ -504,3 +504,33 @@ def install_req_from_link_and_ireq( config_settings=ireq.config_settings, user_supplied=ireq.user_supplied, ) + + +def install_req_without( + ireq: InstallRequirement, + *, + without_extras: bool = False, + without_specifier: bool = False, +) -> InstallRequirement: + # TODO: clean up hack + req = Requirement(str(ireq.req)) + if without_extras: + req.extras = {} + if without_specifier: + req.specifier = SpecifierSet(prereleases=req.specifier.prereleases) + return InstallRequirement( + req=req, + comes_from=ireq.comes_from, + editable=ireq.editable, + link=ireq.link, + markers=ireq.markers, + use_pep517=ireq.use_pep517, + isolated=ireq.isolated, + global_options=ireq.global_options, + hash_options=ireq.hash_options, + constraint=ireq.constraint, + extras=ireq.extras if not without_extras else [], + config_settings=ireq.config_settings, + user_supplied=ireq.user_supplied, + permit_editable_wheels=ireq.permit_editable_wheels, + ) diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py index de04e1d73f2..5bac3d6df1f 100644 --- a/src/pip/_internal/resolution/resolvelib/candidates.py +++ b/src/pip/_internal/resolution/resolvelib/candidates.py @@ -237,10 +237,11 @@ def _prepare(self) -> BaseDistribution: self._check_metadata_consistency(dist) return dist + # TODO: add Explicit dependency on self to extra reqs can benefit from it? def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]: requires = self.dist.iter_dependencies() if with_requires else () for r in requires: - yield self._factory.make_requirement_from_spec(str(r), self._ireq) + yield from self._factory.make_requirements_from_spec(str(r), self._ireq) yield self._factory.make_requires_python_requirement(self.dist.requires_python) def get_install_requirement(self) -> Optional[InstallRequirement]: @@ -392,7 +393,7 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen if not with_requires: return for r in self.dist.iter_dependencies(): - yield self._factory.make_requirement_from_spec(str(r), self._ireq) + yield from self._factory.make_requirements_from_spec(str(r), self._ireq) def get_install_requirement(self) -> Optional[InstallRequirement]: return None @@ -502,11 +503,9 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen ) for r in self.base.dist.iter_dependencies(valid_extras): - requirement = factory.make_requirement_from_spec( + yield from factory.make_requirements_from_spec( str(r), self.base._ireq, valid_extras ) - if requirement: - yield requirement def get_install_requirement(self) -> Optional[InstallRequirement]: # We don't return anything here, because we always diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index c117a30c81c..4c088209b29 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -441,18 +441,35 @@ def find_candidates( and all(req.is_satisfied_by(c) for req in requirements[identifier]) ) - def _make_requirement_from_install_req( + def _make_requirements_from_install_req( self, ireq: InstallRequirement, requested_extras: Iterable[str] - ) -> Optional[Requirement]: + ) -> list[Requirement]: + # TODO: docstring + """ + Returns requirement objects associated with the given InstallRequirement. In + most cases this will be a single object but the following special cases exist: + - the InstallRequirement has markers that do not apply -> result is empty + - the InstallRequirement has both a constraint and extras -> result is split + in two requirement objects: one with the constraint and one with the + extra. This allows centralized constraint handling for the base, + resulting in fewer candidate rejections. + """ + # TODO: implement -> split in base req with constraint and extra req without if not ireq.match_markers(requested_extras): logger.info( "Ignoring %s: markers '%s' don't match your environment", ireq.name, ireq.markers, ) - return None + return [] if not ireq.link: - return SpecifierRequirement(ireq) + if ireq.extras and ireq.req.specifier: + return [ + SpecifierRequirement(ireq, drop_extras=True), + SpecifierRequirement(ireq, drop_specifier=True), + ] + else: + return [SpecifierRequirement(ireq)] self._fail_if_link_is_unsupported_wheel(ireq.link) cand = self._make_candidate_from_link( ireq.link, @@ -470,8 +487,9 @@ def _make_requirement_from_install_req( # ResolutionImpossible eventually. if not ireq.name: raise self._build_failures[ireq.link] - return UnsatisfiableRequirement(canonicalize_name(ireq.name)) - return self.make_requirement_from_candidate(cand) + return [UnsatisfiableRequirement(canonicalize_name(ireq.name))] + # TODO: here too + return [self.make_requirement_from_candidate(cand)] def collect_root_requirements( self, root_ireqs: List[InstallRequirement] @@ -492,15 +510,17 @@ def collect_root_requirements( else: collected.constraints[name] = Constraint.from_ireq(ireq) else: - req = self._make_requirement_from_install_req( + reqs = self._make_requirements_from_install_req( ireq, requested_extras=(), ) - if req is None: + if not reqs: continue - if ireq.user_supplied and req.name not in collected.user_requested: - collected.user_requested[req.name] = i - collected.requirements.append(req) + + # TODO: clean up reqs[0]? + if ireq.user_supplied and reqs[0].name not in collected.user_requested: + collected.user_requested[reqs[0].name] = i + collected.requirements.extend(reqs) return collected def make_requirement_from_candidate( @@ -508,14 +528,17 @@ def make_requirement_from_candidate( ) -> ExplicitRequirement: return ExplicitRequirement(candidate) - def make_requirement_from_spec( + def make_requirements_from_spec( self, specifier: str, comes_from: Optional[InstallRequirement], requested_extras: Iterable[str] = (), - ) -> Optional[Requirement]: + ) -> list[Requirement]: + # TODO: docstring + """ + """ ireq = self._make_install_req_from_spec(specifier, comes_from) - return self._make_requirement_from_install_req(ireq, requested_extras) + return self._make_requirements_from_install_req(ireq, requested_extras) def make_requires_python_requirement( self, diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py index 315fb9c8902..121e48d071b 100644 --- a/src/pip/_internal/resolution/resolvelib/provider.py +++ b/src/pip/_internal/resolution/resolvelib/provider.py @@ -184,6 +184,8 @@ def get_preference( # the backtracking backtrack_cause = self.is_backtrack_cause(identifier, backtrack_causes) + # TODO: finally prefer base over extra for the same package + return ( not requires_python, not direct, diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index 06addc0ddce..fe9ae6ba661 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -2,6 +2,7 @@ from pip._vendor.packaging.utils import NormalizedName, canonicalize_name from pip._internal.req.req_install import InstallRequirement +from pip._internal.req.constructors import install_req_without from .base import Candidate, CandidateLookup, Requirement, format_name @@ -39,14 +40,27 @@ def is_satisfied_by(self, candidate: Candidate) -> bool: return candidate == self.candidate +# TODO: add some comments class SpecifierRequirement(Requirement): - def __init__(self, ireq: InstallRequirement) -> None: + # TODO: document additional options + def __init__( + self, + ireq: InstallRequirement, + *, + drop_extras: bool = False, + drop_specifier: bool = False, + ) -> None: assert ireq.link is None, "This is a link, not a specifier" - self._ireq = ireq - self._extras = frozenset(ireq.extras) + self._drop_extras: bool = drop_extras + self._original_extras = frozenset(ireq.extras) + # TODO: name + self._original_req = ireq.req + self._ireq = install_req_without( + ireq, without_extras=self._drop_extras, without_specifier=drop_specifier + ) def __str__(self) -> str: - return str(self._ireq.req) + return str(self._original_req) def __repr__(self) -> str: return "{class_name}({requirement!r})".format( @@ -59,9 +73,13 @@ def project_name(self) -> NormalizedName: assert self._ireq.req, "Specifier-backed ireq is always PEP 508" return canonicalize_name(self._ireq.req.name) + # TODO: make sure this can still be identified for error reporting purposes @property def name(self) -> str: - return format_name(self.project_name, self._extras) + return format_name( + self.project_name, + self._original_extras if not self._drop_extras else frozenset(), + ) def format_for_error(self) -> str: # Convert comma-separated specifiers into "A, B, ..., F and G" diff --git a/tests/unit/resolution_resolvelib/test_requirement.py b/tests/unit/resolution_resolvelib/test_requirement.py index 6864e70ea0a..ce48ab16c49 100644 --- a/tests/unit/resolution_resolvelib/test_requirement.py +++ b/tests/unit/resolution_resolvelib/test_requirement.py @@ -61,9 +61,9 @@ def test_new_resolver_requirement_has_name( ) -> None: """All requirements should have a name""" for spec, name, _ in test_cases: - req = factory.make_requirement_from_spec(spec, comes_from=None) - assert req is not None - assert req.name == name + reqs = factory.make_requirements_from_spec(spec, comes_from=None) + assert len(reqs) == 1 + assert reqs[0].name == name def test_new_resolver_correct_number_of_matches( @@ -71,8 +71,9 @@ def test_new_resolver_correct_number_of_matches( ) -> None: """Requirements should return the correct number of candidates""" for spec, _, match_count in test_cases: - req = factory.make_requirement_from_spec(spec, comes_from=None) - assert req is not None + reqs = factory.make_requirements_from_spec(spec, comes_from=None) + assert len(reqs) == 1 + req = reqs[0] matches = factory.find_candidates( req.name, {req.name: [req]}, @@ -88,8 +89,9 @@ def test_new_resolver_candidates_match_requirement( ) -> None: """Candidates returned from find_candidates should satisfy the requirement""" for spec, _, _ in test_cases: - req = factory.make_requirement_from_spec(spec, comes_from=None) - assert req is not None + reqs = factory.make_requirements_from_spec(spec, comes_from=None) + assert len(reqs) == 1 + req = reqs[0] candidates = factory.find_candidates( req.name, {req.name: [req]}, @@ -104,8 +106,8 @@ def test_new_resolver_candidates_match_requirement( def test_new_resolver_full_resolve(factory: Factory, provider: PipProvider) -> None: """A very basic full resolve""" - req = factory.make_requirement_from_spec("simplewheel", comes_from=None) - assert req is not None + reqs = factory.make_requirements_from_spec("simplewheel", comes_from=None) + assert len(reqs) == 1 r: Resolver[Requirement, Candidate, str] = Resolver(provider, BaseReporter()) - result = r.resolve([req]) + result = r.resolve([reqs[0]]) assert set(result.mapping.keys()) == {"simplewheel"} From 5f8f40eb1d0610e530d5e035ba8c7f99d9af9df1 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 22 Jun 2023 11:08:33 +0200 Subject: [PATCH 030/992] refinements --- src/pip/_internal/req/constructors.py | 3 +- .../resolution/resolvelib/candidates.py | 15 +++++++- .../resolution/resolvelib/factory.py | 38 +++++++++++-------- .../resolution/resolvelib/requirements.py | 18 ++++----- 4 files changed, 46 insertions(+), 28 deletions(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index f04a4cbbdbd..908876c4cde 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -520,7 +520,8 @@ def install_req_without( req.specifier = SpecifierSet(prereleases=req.specifier.prereleases) return InstallRequirement( req=req, - comes_from=ireq.comes_from, + # TODO: document this!!!! + comes_from=ireq, editable=ireq.editable, link=ireq.link, markers=ireq.markers, diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py index 5bac3d6df1f..23883484139 100644 --- a/src/pip/_internal/resolution/resolvelib/candidates.py +++ b/src/pip/_internal/resolution/resolvelib/candidates.py @@ -237,7 +237,6 @@ def _prepare(self) -> BaseDistribution: self._check_metadata_consistency(dist) return dist - # TODO: add Explicit dependency on self to extra reqs can benefit from it? def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]: requires = self.dist.iter_dependencies() if with_requires else () for r in requires: @@ -428,9 +427,19 @@ def __init__( self, base: BaseCandidate, extras: FrozenSet[str], + ireq: Optional[InstallRequirement] = None, ) -> None: + """ + :param ireq: the InstallRequirement that led to this candidate, if it + differs from the base's InstallRequirement. This will often be the + case in the sense that this candidate's requirement has the extras + while the base's does not. Unlike the InstallRequirement backed + candidates, this requirement is used solely for reporting purposes, + it does not do any leg work. + """ self.base = base self.extras = extras + self._ireq = ireq def __str__(self) -> str: name, rest = str(self.base).split(" ", 1) @@ -504,7 +513,9 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen for r in self.base.dist.iter_dependencies(valid_extras): yield from factory.make_requirements_from_spec( - str(r), self.base._ireq, valid_extras + str(r), + self._ireq if self._ireq is not None else self.base._ireq, + valid_extras, ) def get_install_requirement(self) -> Optional[InstallRequirement]: diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 4c088209b29..45b8133878b 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -138,13 +138,16 @@ def _fail_if_link_is_unsupported_wheel(self, link: Link) -> None: raise UnsupportedWheel(msg) def _make_extras_candidate( - self, base: BaseCandidate, extras: FrozenSet[str] + self, + base: BaseCandidate, + extras: FrozenSet[str], + ireq: Optional[InstallRequirement] = None, ) -> ExtrasCandidate: cache_key = (id(base), extras) try: candidate = self._extras_candidate_cache[cache_key] except KeyError: - candidate = ExtrasCandidate(base, extras) + candidate = ExtrasCandidate(base, extras, ireq=ireq) self._extras_candidate_cache[cache_key] = candidate return candidate @@ -161,7 +164,7 @@ def _make_candidate_from_dist( self._installed_candidate_cache[dist.canonical_name] = base if not extras: return base - return self._make_extras_candidate(base, extras) + return self._make_extras_candidate(base, extras, ireq=template) def _make_candidate_from_link( self, @@ -223,7 +226,7 @@ def _make_candidate_from_link( if not extras: return base - return self._make_extras_candidate(base, extras) + return self._make_extras_candidate(base, extras, ireq=template) def _iter_found_candidates( self, @@ -389,16 +392,17 @@ def find_candidates( # candidates from entries from extra-less identifier. with contextlib.suppress(InvalidRequirement): parsed_requirement = get_requirement(identifier) - explicit_candidates.update( - self._iter_explicit_candidates_from_base( - requirements.get(parsed_requirement.name, ()), - frozenset(parsed_requirement.extras), - ), - ) - for req in requirements.get(parsed_requirement.name, []): - _, ireq = req.get_candidate_lookup() - if ireq is not None: - ireqs.append(ireq) + if parsed_requirement.name != identifier: + explicit_candidates.update( + self._iter_explicit_candidates_from_base( + requirements.get(parsed_requirement.name, ()), + frozenset(parsed_requirement.extras), + ), + ) + for req in requirements.get(parsed_requirement.name, []): + _, ireq = req.get_candidate_lookup() + if ireq is not None: + ireqs.append(ireq) # Add explicit candidates from constraints. We only do this if there are # known ireqs, which represent requirements not already explicit. If @@ -444,7 +448,6 @@ def find_candidates( def _make_requirements_from_install_req( self, ireq: InstallRequirement, requested_extras: Iterable[str] ) -> list[Requirement]: - # TODO: docstring """ Returns requirement objects associated with the given InstallRequirement. In most cases this will be a single object but the following special cases exist: @@ -454,7 +457,6 @@ def _make_requirements_from_install_req( extra. This allows centralized constraint handling for the base, resulting in fewer candidate rejections. """ - # TODO: implement -> split in base req with constraint and extra req without if not ireq.match_markers(requested_extras): logger.info( "Ignoring %s: markers '%s' don't match your environment", @@ -466,6 +468,10 @@ def _make_requirements_from_install_req( if ireq.extras and ireq.req.specifier: return [ SpecifierRequirement(ireq, drop_extras=True), + # TODO: put this all the way at the back to have even fewer candidates? + # TODO: probably best to keep specifier as it makes the report + # slightly more readable -> should also update SpecReq constructor + # and req.constructors.install_req_without SpecifierRequirement(ireq, drop_specifier=True), ] else: diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index fe9ae6ba661..180158128af 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -40,7 +40,6 @@ def is_satisfied_by(self, candidate: Candidate) -> bool: return candidate == self.candidate -# TODO: add some comments class SpecifierRequirement(Requirement): # TODO: document additional options def __init__( @@ -52,15 +51,17 @@ def __init__( ) -> None: assert ireq.link is None, "This is a link, not a specifier" self._drop_extras: bool = drop_extras - self._original_extras = frozenset(ireq.extras) - # TODO: name - self._original_req = ireq.req - self._ireq = install_req_without( - ireq, without_extras=self._drop_extras, without_specifier=drop_specifier + self._extras = frozenset(ireq.extras if not drop_extras else ()) + self._ireq = ( + ireq + if not drop_extras and not drop_specifier + else install_req_without( + ireq, without_extras=self._drop_extras, without_specifier=drop_specifier + ) ) def __str__(self) -> str: - return str(self._original_req) + return str(self._ireq) def __repr__(self) -> str: return "{class_name}({requirement!r})".format( @@ -73,12 +74,11 @@ def project_name(self) -> NormalizedName: assert self._ireq.req, "Specifier-backed ireq is always PEP 508" return canonicalize_name(self._ireq.req.name) - # TODO: make sure this can still be identified for error reporting purposes @property def name(self) -> str: return format_name( self.project_name, - self._original_extras if not self._drop_extras else frozenset(), + self._extras, ) def format_for_error(self) -> str: From d09431feb5049ec5e7a9b4ecb5d338a38a14ffc4 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 22 Jun 2023 14:42:05 +0200 Subject: [PATCH 031/992] fixes --- src/pip/_internal/req/constructors.py | 20 +++++++++++++++++-- .../resolution/resolvelib/resolver.py | 15 +++++++++++++- tests/functional/test_install.py | 6 +++--- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index 908876c4cde..9bf1c98440b 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -8,10 +8,11 @@ InstallRequirement. """ +import copy import logging import os import re -from typing import Dict, List, Optional, Set, Tuple, Union +from typing import Collection, Dict, List, Optional, Set, Tuple, Union from pip._vendor.packaging.markers import Marker from pip._vendor.packaging.requirements import InvalidRequirement, Requirement @@ -512,7 +513,6 @@ def install_req_without( without_extras: bool = False, without_specifier: bool = False, ) -> InstallRequirement: - # TODO: clean up hack req = Requirement(str(ireq.req)) if without_extras: req.extras = {} @@ -535,3 +535,19 @@ def install_req_without( user_supplied=ireq.user_supplied, permit_editable_wheels=ireq.permit_editable_wheels, ) + + +def install_req_extend_extras( + ireq: InstallRequirement, + extras: Collection[str], +) -> InstallRequirement: + """ + Returns a copy of an installation requirement with some additional extras. + Makes a shallow copy of the ireq object. + """ + result = copy.copy(ireq) + req = Requirement(str(ireq.req)) + req.extras.update(extras) + result.req = req + result.extras = {*ireq.extras, *extras} + return result diff --git a/src/pip/_internal/resolution/resolvelib/resolver.py b/src/pip/_internal/resolution/resolvelib/resolver.py index 47bbfecce36..c5de0e822c9 100644 --- a/src/pip/_internal/resolution/resolvelib/resolver.py +++ b/src/pip/_internal/resolution/resolvelib/resolver.py @@ -1,3 +1,4 @@ +import contextlib import functools import logging import os @@ -11,6 +12,7 @@ from pip._internal.cache import WheelCache from pip._internal.index.package_finder import PackageFinder from pip._internal.operations.prepare import RequirementPreparer +from pip._internal.req.constructors import install_req_extend_extras from pip._internal.req.req_install import InstallRequirement from pip._internal.req.req_set import RequirementSet from pip._internal.resolution.base import BaseResolver, InstallRequirementProvider @@ -19,6 +21,7 @@ PipDebuggingReporter, PipReporter, ) +from pip._internal.utils.packaging import get_requirement from .base import Candidate, Requirement from .factory import Factory @@ -101,9 +104,19 @@ def resolve( raise error from e req_set = RequirementSet(check_supported_wheels=check_supported_wheels) - for candidate in result.mapping.values(): + # sort to ensure base candidates come before candidates with extras + for candidate in sorted(result.mapping.values(), key=lambda c: c.name): ireq = candidate.get_install_requirement() if ireq is None: + if candidate.name != candidate.project_name: + # extend existing req's extras + with contextlib.suppress(KeyError): + req = req_set.get_requirement(candidate.project_name) + req_set.add_named_requirement( + install_req_extend_extras( + req, get_requirement(candidate.name).extras + ) + ) continue # Check if there is already an installation under the same name, diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 8559d93684b..f5ac31a8e8c 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -2465,6 +2465,6 @@ def test_install_pip_prints_req_chain_pypi(script: PipTestEnvironment) -> None: ) assert ( - f"Collecting python-openid " - f"(from Paste[openid]==1.7.5.1->-r {req_path} (line 1))" in result.stdout - ) + "Collecting python-openid " + f"(from Paste[openid]->Paste[openid]==1.7.5.1->-r {req_path} (line 1))" + ) in result.stdout From 49027d7de3c9441b612c65ac68ec39e893a8385f Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 22 Jun 2023 14:59:43 +0200 Subject: [PATCH 032/992] cleanup --- src/pip/_internal/req/constructors.py | 20 +++++------ .../resolution/resolvelib/factory.py | 34 ++++++++++++------- .../resolution/resolvelib/requirements.py | 18 ++++------ 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index 9bf1c98440b..8b1438afe1e 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -507,20 +507,16 @@ def install_req_from_link_and_ireq( ) -def install_req_without( - ireq: InstallRequirement, - *, - without_extras: bool = False, - without_specifier: bool = False, -) -> InstallRequirement: +def install_req_drop_extras(ireq: InstallRequirement) -> InstallRequirement: + """ + Creates a new InstallationRequirement using the given template but without + any extras. Sets the original requirement as the new one's parent + (comes_from). + """ req = Requirement(str(ireq.req)) - if without_extras: - req.extras = {} - if without_specifier: - req.specifier = SpecifierSet(prereleases=req.specifier.prereleases) + req.extras = {} return InstallRequirement( req=req, - # TODO: document this!!!! comes_from=ireq, editable=ireq.editable, link=ireq.link, @@ -530,7 +526,7 @@ def install_req_without( global_options=ireq.global_options, hash_options=ireq.hash_options, constraint=ireq.constraint, - extras=ireq.extras if not without_extras else [], + extras=[], config_settings=ireq.config_settings, user_supplied=ireq.user_supplied, permit_editable_wheels=ireq.permit_editable_wheels, diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 45b8133878b..0c2c6ab793d 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -468,18 +468,18 @@ def _make_requirements_from_install_req( if ireq.extras and ireq.req.specifier: return [ SpecifierRequirement(ireq, drop_extras=True), - # TODO: put this all the way at the back to have even fewer candidates? - # TODO: probably best to keep specifier as it makes the report - # slightly more readable -> should also update SpecReq constructor - # and req.constructors.install_req_without - SpecifierRequirement(ireq, drop_specifier=True), + # TODO: put this all the way at the back to have even fewer + # candidates? + SpecifierRequirement(ireq), ] else: return [SpecifierRequirement(ireq)] self._fail_if_link_is_unsupported_wheel(ireq.link) cand = self._make_candidate_from_link( ireq.link, - extras=frozenset(ireq.extras), + # make just the base candidate so the corresponding requirement can be split + # in case of extras (see docstring) + extras=frozenset(), template=ireq, name=canonicalize_name(ireq.name) if ireq.name else None, version=None, @@ -494,8 +494,12 @@ def _make_requirements_from_install_req( if not ireq.name: raise self._build_failures[ireq.link] return [UnsatisfiableRequirement(canonicalize_name(ireq.name))] - # TODO: here too - return [self.make_requirement_from_candidate(cand)] + return [ + self.make_requirement_from_candidate(cand), + self.make_requirement_from_candidate( + self._make_extras_candidate(cand, frozenset(ireq.extras), ireq) + ), + ] def collect_root_requirements( self, root_ireqs: List[InstallRequirement] @@ -523,9 +527,9 @@ def collect_root_requirements( if not reqs: continue - # TODO: clean up reqs[0]? - if ireq.user_supplied and reqs[0].name not in collected.user_requested: - collected.user_requested[reqs[0].name] = i + template = reqs[0] + if ireq.user_supplied and template.name not in collected.user_requested: + collected.user_requested[template.name] = i collected.requirements.extend(reqs) return collected @@ -540,8 +544,14 @@ def make_requirements_from_spec( comes_from: Optional[InstallRequirement], requested_extras: Iterable[str] = (), ) -> list[Requirement]: - # TODO: docstring """ + Returns requirement objects associated with the given specifier. In most cases + this will be a single object but the following special cases exist: + - the specifier has markers that do not apply -> result is empty + - the specifier has both a constraint and extras -> result is split + in two requirement objects: one with the constraint and one with the + extra. This allows centralized constraint handling for the base, + resulting in fewer candidate rejections. """ ireq = self._make_install_req_from_spec(specifier, comes_from) return self._make_requirements_from_install_req(ireq, requested_extras) diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index 180158128af..31a515da9ac 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -2,7 +2,7 @@ from pip._vendor.packaging.utils import NormalizedName, canonicalize_name from pip._internal.req.req_install import InstallRequirement -from pip._internal.req.constructors import install_req_without +from pip._internal.req.constructors import install_req_drop_extras from .base import Candidate, CandidateLookup, Requirement, format_name @@ -41,24 +41,20 @@ def is_satisfied_by(self, candidate: Candidate) -> bool: class SpecifierRequirement(Requirement): - # TODO: document additional options def __init__( self, ireq: InstallRequirement, *, drop_extras: bool = False, - drop_specifier: bool = False, ) -> None: + """ + :param drop_extras: Ignore any extras that are part of the install requirement, + making this a requirement on the base only. + """ assert ireq.link is None, "This is a link, not a specifier" self._drop_extras: bool = drop_extras - self._extras = frozenset(ireq.extras if not drop_extras else ()) - self._ireq = ( - ireq - if not drop_extras and not drop_specifier - else install_req_without( - ireq, without_extras=self._drop_extras, without_specifier=drop_specifier - ) - ) + self._ireq = ireq if not drop_extras else install_req_drop_extras(ireq) + self._extras = frozenset(self._ireq.extras) def __str__(self) -> str: return str(self._ireq) From cb0f97f70e8b7fbc89e63ed1d2fb5b2dd233fafb Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 22 Jun 2023 15:56:23 +0200 Subject: [PATCH 033/992] reverted troublesome changes --- src/pip/_internal/resolution/resolvelib/factory.py | 11 ++--------- tests/functional/test_install.py | 6 +++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 0c2c6ab793d..847cbee8dc8 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -477,9 +477,7 @@ def _make_requirements_from_install_req( self._fail_if_link_is_unsupported_wheel(ireq.link) cand = self._make_candidate_from_link( ireq.link, - # make just the base candidate so the corresponding requirement can be split - # in case of extras (see docstring) - extras=frozenset(), + extras=frozenset(ireq.extras), template=ireq, name=canonicalize_name(ireq.name) if ireq.name else None, version=None, @@ -494,12 +492,7 @@ def _make_requirements_from_install_req( if not ireq.name: raise self._build_failures[ireq.link] return [UnsatisfiableRequirement(canonicalize_name(ireq.name))] - return [ - self.make_requirement_from_candidate(cand), - self.make_requirement_from_candidate( - self._make_extras_candidate(cand, frozenset(ireq.extras), ireq) - ), - ] + return [self.make_requirement_from_candidate(cand)] def collect_root_requirements( self, root_ireqs: List[InstallRequirement] diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index f5ac31a8e8c..8559d93684b 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -2465,6 +2465,6 @@ def test_install_pip_prints_req_chain_pypi(script: PipTestEnvironment) -> None: ) assert ( - "Collecting python-openid " - f"(from Paste[openid]->Paste[openid]==1.7.5.1->-r {req_path} (line 1))" - ) in result.stdout + f"Collecting python-openid " + f"(from Paste[openid]==1.7.5.1->-r {req_path} (line 1))" in result.stdout + ) From 3160293193d947eecb16c2d69d754b04d98b2bab Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 22 Jun 2023 16:10:09 +0200 Subject: [PATCH 034/992] improvement --- src/pip/_internal/resolution/resolvelib/factory.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 847cbee8dc8..03820edde6a 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -468,8 +468,6 @@ def _make_requirements_from_install_req( if ireq.extras and ireq.req.specifier: return [ SpecifierRequirement(ireq, drop_extras=True), - # TODO: put this all the way at the back to have even fewer - # candidates? SpecifierRequirement(ireq), ] else: @@ -524,6 +522,15 @@ def collect_root_requirements( if ireq.user_supplied and template.name not in collected.user_requested: collected.user_requested[template.name] = i collected.requirements.extend(reqs) + # Put requirements with extras at the end of the root requires. This does not + # affect resolvelib's picking preference but it does affect its initial criteria + # population: by putting extras at the end we enable the candidate finder to + # present resolvelib with a smaller set of candidates to resolvelib, already + # taking into account any non-transient constraints on the associated base. This + # means resolvelib will have fewer candidates to visit and reject. + # Python's list sort is stable, meaning relative order is kept for objects with + # the same key. + collected.requirements.sort(key=lambda r: r.name != r.project_name) return collected def make_requirement_from_candidate( From 1038f15496f037181a18e5d67d8a0f33e5cb7cc9 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 22 Jun 2023 16:24:26 +0200 Subject: [PATCH 035/992] stray todo --- src/pip/_internal/resolution/resolvelib/provider.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py index 121e48d071b..315fb9c8902 100644 --- a/src/pip/_internal/resolution/resolvelib/provider.py +++ b/src/pip/_internal/resolution/resolvelib/provider.py @@ -184,8 +184,6 @@ def get_preference( # the backtracking backtrack_cause = self.is_backtrack_cause(identifier, backtrack_causes) - # TODO: finally prefer base over extra for the same package - return ( not requires_python, not direct, From c1ead0aa37d5f3526820fcbec1c89011c5063236 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 23 May 2022 11:14:16 -0400 Subject: [PATCH 036/992] Switch to new cache format and new cache location. --- news/2984.bugfix | 1 + src/pip/_internal/cli/req_command.py | 2 +- src/pip/_internal/commands/cache.py | 21 ++++++++++++------ src/pip/_internal/network/cache.py | 32 +++++++++++++++++++++------- tests/functional/test_cache.py | 4 ++-- 5 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 news/2984.bugfix diff --git a/news/2984.bugfix b/news/2984.bugfix new file mode 100644 index 00000000000..d75974349ed --- /dev/null +++ b/news/2984.bugfix @@ -0,0 +1 @@ +pip uses less memory when caching large packages. As a result, there is a new on-disk cache format stored in a new directory ($PIP_CACHE_DIR/http-v2). \ No newline at end of file diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index c2f4e38bed8..c9c2019591e 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -123,7 +123,7 @@ def _build_session( ssl_context = None session = PipSession( - cache=os.path.join(cache_dir, "http") if cache_dir else None, + cache=os.path.join(cache_dir, "http-v2") if cache_dir else None, retries=retries if retries is not None else options.retries, trusted_hosts=options.trusted_hosts, index_urls=self._get_index_urls(options), diff --git a/src/pip/_internal/commands/cache.py b/src/pip/_internal/commands/cache.py index e96d2b4924c..a11e151f3c8 100644 --- a/src/pip/_internal/commands/cache.py +++ b/src/pip/_internal/commands/cache.py @@ -93,17 +93,21 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None: num_http_files = len(self._find_http_files(options)) num_packages = len(self._find_wheels(options, "*")) - http_cache_location = self._cache_dir(options, "http") + http_cache_location = self._cache_dir(options, "http-v2") + old_http_cache_location = self._cache_dir(options, "http") wheels_cache_location = self._cache_dir(options, "wheels") http_cache_size = filesystem.format_directory_size(http_cache_location) + old_http_cache_size = filesystem.format_directory_size(old_http_cache_location) wheels_cache_size = filesystem.format_directory_size(wheels_cache_location) message = ( textwrap.dedent( """ - Package index page cache location: {http_cache_location} - Package index page cache size: {http_cache_size} - Number of HTTP files: {num_http_files} + Package index page cache location (new): {http_cache_location} + Package index page cache location (old): {old_http_cache_location} + Package index page cache size (new): {http_cache_size} + Package index page cache size (old): {old_http_cache_size} + Number of HTTP files (old+new cache): {num_http_files} Locally built wheels location: {wheels_cache_location} Locally built wheels size: {wheels_cache_size} Number of locally built wheels: {package_count} @@ -111,7 +115,9 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None: ) .format( http_cache_location=http_cache_location, + old_http_cache_location=old_http_cache_location, http_cache_size=http_cache_size, + old_http_cache_size=old_http_cache_size, num_http_files=num_http_files, wheels_cache_location=wheels_cache_location, package_count=num_packages, @@ -195,8 +201,11 @@ def _cache_dir(self, options: Values, subdir: str) -> str: return os.path.join(options.cache_dir, subdir) def _find_http_files(self, options: Values) -> List[str]: - http_dir = self._cache_dir(options, "http") - return filesystem.find_files(http_dir, "*") + old_http_dir = self._cache_dir(options, "http") + new_http_dir = self._cache_dir(options, "http-v2") + return filesystem.find_files(old_http_dir, "*") + filesystem.find_files( + new_http_dir, "*" + ) def _find_wheels(self, options: Values, pattern: str) -> List[str]: wheel_dir = self._cache_dir(options, "wheels") diff --git a/src/pip/_internal/network/cache.py b/src/pip/_internal/network/cache.py index a81a2398519..b85be2e487b 100644 --- a/src/pip/_internal/network/cache.py +++ b/src/pip/_internal/network/cache.py @@ -3,10 +3,10 @@ import os from contextlib import contextmanager -from typing import Generator, Optional +from typing import BinaryIO, Generator, Optional -from pip._vendor.cachecontrol.cache import BaseCache -from pip._vendor.cachecontrol.caches import FileCache +from pip._vendor.cachecontrol.cache import SeparateBodyBaseCache +from pip._vendor.cachecontrol.caches import SeparateBodyFileCache from pip._vendor.requests.models import Response from pip._internal.utils.filesystem import adjacent_tmp_file, replace @@ -28,7 +28,7 @@ def suppressed_cache_errors() -> Generator[None, None, None]: pass -class SafeFileCache(BaseCache): +class SafeFileCache(SeparateBodyBaseCache): """ A file based cache which is safe to use even when the target directory may not be accessible or writable. @@ -43,7 +43,7 @@ def _get_cache_path(self, name: str) -> str: # From cachecontrol.caches.file_cache.FileCache._fn, brought into our # class for backwards-compatibility and to avoid using a non-public # method. - hashed = FileCache.encode(name) + hashed = SeparateBodyFileCache.encode(name) parts = list(hashed[:5]) + [hashed] return os.path.join(self.directory, *parts) @@ -53,17 +53,33 @@ def get(self, key: str) -> Optional[bytes]: with open(path, "rb") as f: return f.read() - def set(self, key: str, value: bytes, expires: Optional[int] = None) -> None: - path = self._get_cache_path(key) + def _write(self, path: str, data: bytes) -> None: with suppressed_cache_errors(): ensure_dir(os.path.dirname(path)) with adjacent_tmp_file(path) as f: - f.write(value) + f.write(data) replace(f.name, path) + def set(self, key: str, value: bytes, expires: Optional[int] = None) -> None: + path = self._get_cache_path(key) + self._write(path, value) + def delete(self, key: str) -> None: path = self._get_cache_path(key) with suppressed_cache_errors(): os.remove(path) + os.remove(path + ".body") + + def get_body(self, key: str) -> Optional[BinaryIO]: + path = self._get_cache_path(key) + ".body" + with suppressed_cache_errors(): + return open(path, "rb") + + def set_body(self, key: str, body: Optional[bytes]) -> None: + if body is None: + # Workaround for https://github.com/ionrock/cachecontrol/issues/276 + return + path = self._get_cache_path(key) + ".body" + self._write(path, body) diff --git a/tests/functional/test_cache.py b/tests/functional/test_cache.py index 788abdd2be5..5eea6a96e99 100644 --- a/tests/functional/test_cache.py +++ b/tests/functional/test_cache.py @@ -20,7 +20,7 @@ def cache_dir(script: PipTestEnvironment) -> str: @pytest.fixture def http_cache_dir(cache_dir: str) -> str: - return os.path.normcase(os.path.join(cache_dir, "http")) + return os.path.normcase(os.path.join(cache_dir, "http-v2")) @pytest.fixture @@ -211,7 +211,7 @@ def test_cache_info( ) -> None: result = script.pip("cache", "info") - assert f"Package index page cache location: {http_cache_dir}" in result.stdout + assert f"Package index page cache location (new): {http_cache_dir}" in result.stdout assert f"Locally built wheels location: {wheel_cache_dir}" in result.stdout num_wheels = len(wheel_cache_files) assert f"Number of locally built wheels: {num_wheels}" in result.stdout From fa87c9eb23dd25ad5cb03fe480a3fc4b92deb7a6 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 23 May 2022 13:06:38 -0400 Subject: [PATCH 037/992] Testing for body methods of network cache. --- src/pip/_internal/network/cache.py | 1 + tests/unit/test_network_cache.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/pip/_internal/network/cache.py b/src/pip/_internal/network/cache.py index b85be2e487b..11c76bf0f93 100644 --- a/src/pip/_internal/network/cache.py +++ b/src/pip/_internal/network/cache.py @@ -70,6 +70,7 @@ def delete(self, key: str) -> None: path = self._get_cache_path(key) with suppressed_cache_errors(): os.remove(path) + with suppressed_cache_errors(): os.remove(path + ".body") def get_body(self, key: str) -> Optional[BinaryIO]: diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py index a5519864f4c..88597e4c186 100644 --- a/tests/unit/test_network_cache.py +++ b/tests/unit/test_network_cache.py @@ -31,6 +31,14 @@ def test_cache_roundtrip(self, cache_tmpdir: Path) -> None: cache.delete("test key") assert cache.get("test key") is None + def test_cache_roundtrip_body(self, cache_tmpdir: Path) -> None: + cache = SafeFileCache(os.fspath(cache_tmpdir)) + assert cache.get_body("test key") is None + cache.set_body("test key", b"a test string") + assert cache.get_body("test key").read() == b"a test string" + cache.delete("test key") + assert cache.get_body("test key") is None + @pytest.mark.skipif("sys.platform == 'win32'") def test_safe_get_no_perms( self, cache_tmpdir: Path, monkeypatch: pytest.MonkeyPatch From fde34fdf8416a9692c07a899d2668f3f6ccf9df7 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 24 May 2022 12:06:15 -0400 Subject: [PATCH 038/992] Temporary workaround for https://github.com/ionrock/cachecontrol/issues/276 until it's fixed upstream. --- src/pip/_vendor/cachecontrol/controller.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pip/_vendor/cachecontrol/controller.py b/src/pip/_vendor/cachecontrol/controller.py index 7f23529f115..14ba629768c 100644 --- a/src/pip/_vendor/cachecontrol/controller.py +++ b/src/pip/_vendor/cachecontrol/controller.py @@ -407,7 +407,17 @@ def update_cached_response(self, request, response): """ cache_url = self.cache_url(request.url) - cached_response = self.serializer.loads(request, self.cache.get(cache_url)) + # NOTE: This is a hot-patch for + # https://github.com/ionrock/cachecontrol/issues/276 until it's fixed + # upstream. + if isinstance(self.cache, SeparateBodyBaseCache): + body_file = self.cache.get_body(cache_url) + else: + body_file = None + + cached_response = self.serializer.loads( + request, self.cache.get(cache_url), body_file + ) if not cached_response: # we didn't have a cached response From 5b7c999581e1b892a8048f6bd1275e8501614911 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 24 May 2022 12:10:05 -0400 Subject: [PATCH 039/992] Whitespace fix. --- news/2984.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/2984.bugfix b/news/2984.bugfix index d75974349ed..cce561815c9 100644 --- a/news/2984.bugfix +++ b/news/2984.bugfix @@ -1 +1 @@ -pip uses less memory when caching large packages. As a result, there is a new on-disk cache format stored in a new directory ($PIP_CACHE_DIR/http-v2). \ No newline at end of file +pip uses less memory when caching large packages. As a result, there is a new on-disk cache format stored in a new directory ($PIP_CACHE_DIR/http-v2). From 7a609bfdd5a23d404124a0ace5e3598966fe2466 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 24 May 2022 12:11:34 -0400 Subject: [PATCH 040/992] Mypy fix. --- tests/unit/test_network_cache.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py index 88597e4c186..d62d1ab696c 100644 --- a/tests/unit/test_network_cache.py +++ b/tests/unit/test_network_cache.py @@ -35,7 +35,9 @@ def test_cache_roundtrip_body(self, cache_tmpdir: Path) -> None: cache = SafeFileCache(os.fspath(cache_tmpdir)) assert cache.get_body("test key") is None cache.set_body("test key", b"a test string") - assert cache.get_body("test key").read() == b"a test string" + body = cache.get_body("test key") + assert body is not None + assert body.read() == b"a test string" cache.delete("test key") assert cache.get_body("test key") is None From 3dbba12132b55a937c095c1c5537baf8652533ad Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 24 May 2022 12:12:29 -0400 Subject: [PATCH 041/992] Correct name. --- news/{2984.bugfix => 2984.bugfix.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{2984.bugfix => 2984.bugfix.rst} (100%) diff --git a/news/2984.bugfix b/news/2984.bugfix.rst similarity index 100% rename from news/2984.bugfix rename to news/2984.bugfix.rst From bff05e5622b1dcf66c1556fb421441086b93456c Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 24 May 2022 14:50:29 -0400 Subject: [PATCH 042/992] Switch to proposed upstream fix. --- src/pip/_internal/network/cache.py | 3 -- src/pip/_vendor/cachecontrol/controller.py | 57 +++++++++++----------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/src/pip/_internal/network/cache.py b/src/pip/_internal/network/cache.py index 11c76bf0f93..f52e9974fc2 100644 --- a/src/pip/_internal/network/cache.py +++ b/src/pip/_internal/network/cache.py @@ -79,8 +79,5 @@ def get_body(self, key: str) -> Optional[BinaryIO]: return open(path, "rb") def set_body(self, key: str, body: Optional[bytes]) -> None: - if body is None: - # Workaround for https://github.com/ionrock/cachecontrol/issues/276 - return path = self._get_cache_path(key) + ".body" self._write(path, body) diff --git a/src/pip/_vendor/cachecontrol/controller.py b/src/pip/_vendor/cachecontrol/controller.py index 14ba629768c..7af0e002da0 100644 --- a/src/pip/_vendor/cachecontrol/controller.py +++ b/src/pip/_vendor/cachecontrol/controller.py @@ -122,6 +122,26 @@ def parse_cache_control(self, headers): return retval + def _load_from_cache(self, request): + """ + Load a cached response, or return None if it's not available. + """ + cache_url = request.url + cache_data = self.cache.get(cache_url) + if cache_data is None: + logger.debug("No cache entry available") + return None + + if isinstance(self.cache, SeparateBodyBaseCache): + body_file = self.cache.get_body(cache_url) + else: + body_file = None + + result = self.serializer.loads(request, cache_data, body_file) + if result is None: + logger.warning("Cache entry deserialization failed, entry ignored") + return result + def cached_request(self, request): """ Return a cached response if it exists in the cache, otherwise @@ -140,21 +160,9 @@ def cached_request(self, request): logger.debug('Request header has "max_age" as 0, cache bypassed') return False - # Request allows serving from the cache, let's see if we find something - cache_data = self.cache.get(cache_url) - if cache_data is None: - logger.debug("No cache entry available") - return False - - if isinstance(self.cache, SeparateBodyBaseCache): - body_file = self.cache.get_body(cache_url) - else: - body_file = None - - # Check whether it can be deserialized - resp = self.serializer.loads(request, cache_data, body_file) + # Check whether we can load the response from the cache: + resp = self._load_from_cache(request) if not resp: - logger.warning("Cache entry deserialization failed, entry ignored") return False # If we have a cached permanent redirect, return it immediately. We @@ -240,8 +248,7 @@ def cached_request(self, request): return False def conditional_headers(self, request): - cache_url = self.cache_url(request.url) - resp = self.serializer.loads(request, self.cache.get(cache_url)) + resp = self._load_from_cache(request) new_headers = {} if resp: @@ -267,7 +274,10 @@ def _cache_set(self, cache_url, request, response, body=None, expires_time=None) self.serializer.dumps(request, response, b""), expires=expires_time, ) - self.cache.set_body(cache_url, body) + # body is None can happen when, for example, we're only updating + # headers, as is the case in update_cached_response(). + if body is not None: + self.cache.set_body(cache_url, body) else: self.cache.set( cache_url, @@ -406,18 +416,7 @@ def update_cached_response(self, request, response): gotten a 304 as the response. """ cache_url = self.cache_url(request.url) - - # NOTE: This is a hot-patch for - # https://github.com/ionrock/cachecontrol/issues/276 until it's fixed - # upstream. - if isinstance(self.cache, SeparateBodyBaseCache): - body_file = self.cache.get_body(cache_url) - else: - body_file = None - - cached_response = self.serializer.loads( - request, self.cache.get(cache_url), body_file - ) + cached_response = self._load_from_cache(request) if not cached_response: # we didn't have a cached response From 46f9154daecffa52966f6e917f0819cfabb112ad Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 24 May 2022 15:11:16 -0400 Subject: [PATCH 043/992] Make sure the file gets closed. --- tests/unit/test_network_cache.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py index d62d1ab696c..aa849f3b03a 100644 --- a/tests/unit/test_network_cache.py +++ b/tests/unit/test_network_cache.py @@ -37,7 +37,8 @@ def test_cache_roundtrip_body(self, cache_tmpdir: Path) -> None: cache.set_body("test key", b"a test string") body = cache.get_body("test key") assert body is not None - assert body.read() == b"a test string" + with body: + assert body.read() == b"a test string" cache.delete("test key") assert cache.get_body("test key") is None From bada6316dfcb16d50f214b88f8d2424f0e9d990b Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 24 May 2022 15:13:46 -0400 Subject: [PATCH 044/992] More accurate type. --- src/pip/_internal/network/cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pip/_internal/network/cache.py b/src/pip/_internal/network/cache.py index f52e9974fc2..d6b8ccdcf36 100644 --- a/src/pip/_internal/network/cache.py +++ b/src/pip/_internal/network/cache.py @@ -78,6 +78,6 @@ def get_body(self, key: str) -> Optional[BinaryIO]: with suppressed_cache_errors(): return open(path, "rb") - def set_body(self, key: str, body: Optional[bytes]) -> None: + def set_body(self, key: str, body: bytes) -> None: path = self._get_cache_path(key) + ".body" self._write(path, body) From ca08c16b9e81ce21021831fb1bdfe3a76387fd25 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Fri, 2 Jun 2023 13:56:56 -0400 Subject: [PATCH 045/992] Vendor latest version of CacheControl. --- src/pip/_vendor/cachecontrol.pyi | 1 - src/pip/_vendor/cachecontrol/__init__.py | 18 ++- src/pip/_vendor/cachecontrol/_cmd.py | 24 ++- src/pip/_vendor/cachecontrol/adapter.py | 83 +++++++---- src/pip/_vendor/cachecontrol/cache.py | 31 ++-- .../_vendor/cachecontrol/caches/__init__.py | 5 +- .../_vendor/cachecontrol/caches/file_cache.py | 78 +++++----- .../cachecontrol/caches/redis_cache.py | 29 ++-- src/pip/_vendor/cachecontrol/compat.py | 32 ---- src/pip/_vendor/cachecontrol/controller.py | 116 ++++++++++----- src/pip/_vendor/cachecontrol/filewrapper.py | 27 ++-- src/pip/_vendor/cachecontrol/heuristics.py | 54 ++++--- src/pip/_vendor/cachecontrol/py.typed | 0 src/pip/_vendor/cachecontrol/serialize.py | 139 ++++++++++++------ src/pip/_vendor/cachecontrol/wrapper.py | 33 +++-- src/pip/_vendor/vendor.txt | 2 +- 16 files changed, 407 insertions(+), 265 deletions(-) delete mode 100644 src/pip/_vendor/cachecontrol.pyi delete mode 100644 src/pip/_vendor/cachecontrol/compat.py create mode 100644 src/pip/_vendor/cachecontrol/py.typed diff --git a/src/pip/_vendor/cachecontrol.pyi b/src/pip/_vendor/cachecontrol.pyi deleted file mode 100644 index 636a66bacaf..00000000000 --- a/src/pip/_vendor/cachecontrol.pyi +++ /dev/null @@ -1 +0,0 @@ -from cachecontrol import * \ No newline at end of file diff --git a/src/pip/_vendor/cachecontrol/__init__.py b/src/pip/_vendor/cachecontrol/__init__.py index f631ae6df47..3701cdd6be8 100644 --- a/src/pip/_vendor/cachecontrol/__init__.py +++ b/src/pip/_vendor/cachecontrol/__init__.py @@ -8,11 +8,21 @@ """ __author__ = "Eric Larson" __email__ = "eric@ionrock.org" -__version__ = "0.12.11" +__version__ = "0.13.0" -from .wrapper import CacheControl -from .adapter import CacheControlAdapter -from .controller import CacheController +from pip._vendor.cachecontrol.adapter import CacheControlAdapter +from pip._vendor.cachecontrol.controller import CacheController +from pip._vendor.cachecontrol.wrapper import CacheControl + +__all__ = [ + "__author__", + "__email__", + "__version__", + "CacheControlAdapter", + "CacheController", + "CacheControl", +] import logging + logging.getLogger(__name__).addHandler(logging.NullHandler()) diff --git a/src/pip/_vendor/cachecontrol/_cmd.py b/src/pip/_vendor/cachecontrol/_cmd.py index 4266b5ee92a..ab4dac3dde1 100644 --- a/src/pip/_vendor/cachecontrol/_cmd.py +++ b/src/pip/_vendor/cachecontrol/_cmd.py @@ -3,6 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 import logging +from argparse import ArgumentParser +from typing import TYPE_CHECKING from pip._vendor import requests @@ -10,16 +12,19 @@ from pip._vendor.cachecontrol.cache import DictCache from pip._vendor.cachecontrol.controller import logger -from argparse import ArgumentParser +if TYPE_CHECKING: + from argparse import Namespace + from pip._vendor.cachecontrol.controller import CacheController -def setup_logging(): + +def setup_logging() -> None: logger.setLevel(logging.DEBUG) handler = logging.StreamHandler() logger.addHandler(handler) -def get_session(): +def get_session() -> requests.Session: adapter = CacheControlAdapter( DictCache(), cache_etags=True, serializer=None, heuristic=None ) @@ -27,17 +32,17 @@ def get_session(): sess.mount("http://", adapter) sess.mount("https://", adapter) - sess.cache_controller = adapter.controller + sess.cache_controller = adapter.controller # type: ignore[attr-defined] return sess -def get_args(): +def get_args() -> "Namespace": parser = ArgumentParser() parser.add_argument("url", help="The URL to try and cache") return parser.parse_args() -def main(args=None): +def main() -> None: args = get_args() sess = get_session() @@ -48,10 +53,13 @@ def main(args=None): setup_logging() # try setting the cache - sess.cache_controller.cache_response(resp.request, resp.raw) + cache_controller: "CacheController" = ( + sess.cache_controller # type: ignore[attr-defined] + ) + cache_controller.cache_response(resp.request, resp.raw) # Now try to get it - if sess.cache_controller.cached_request(resp.request): + if cache_controller.cached_request(resp.request): print("Cached!") else: print("Not cached :(") diff --git a/src/pip/_vendor/cachecontrol/adapter.py b/src/pip/_vendor/cachecontrol/adapter.py index 94c75e1a05b..83c08e003fe 100644 --- a/src/pip/_vendor/cachecontrol/adapter.py +++ b/src/pip/_vendor/cachecontrol/adapter.py @@ -2,15 +2,24 @@ # # SPDX-License-Identifier: Apache-2.0 -import types import functools +import types import zlib +from typing import TYPE_CHECKING, Any, Collection, Mapping, Optional, Tuple, Type, Union from pip._vendor.requests.adapters import HTTPAdapter -from .controller import CacheController, PERMANENT_REDIRECT_STATUSES -from .cache import DictCache -from .filewrapper import CallbackFileWrapper +from pip._vendor.cachecontrol.cache import DictCache +from pip._vendor.cachecontrol.controller import PERMANENT_REDIRECT_STATUSES, CacheController +from pip._vendor.cachecontrol.filewrapper import CallbackFileWrapper + +if TYPE_CHECKING: + from pip._vendor.requests import PreparedRequest, Response + from pip._vendor.urllib3 import HTTPResponse + + from pip._vendor.cachecontrol.cache import BaseCache + from pip._vendor.cachecontrol.heuristics import BaseHeuristic + from pip._vendor.cachecontrol.serialize import Serializer class CacheControlAdapter(HTTPAdapter): @@ -18,15 +27,15 @@ class CacheControlAdapter(HTTPAdapter): def __init__( self, - cache=None, - cache_etags=True, - controller_class=None, - serializer=None, - heuristic=None, - cacheable_methods=None, - *args, - **kw - ): + cache: Optional["BaseCache"] = None, + cache_etags: bool = True, + controller_class: Optional[Type[CacheController]] = None, + serializer: Optional["Serializer"] = None, + heuristic: Optional["BaseHeuristic"] = None, + cacheable_methods: Optional[Collection[str]] = None, + *args: Any, + **kw: Any, + ) -> None: super(CacheControlAdapter, self).__init__(*args, **kw) self.cache = DictCache() if cache is None else cache self.heuristic = heuristic @@ -37,7 +46,18 @@ def __init__( self.cache, cache_etags=cache_etags, serializer=serializer ) - def send(self, request, cacheable_methods=None, **kw): + def send( + self, + request: "PreparedRequest", + stream: bool = False, + timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = None, + verify: Union[bool, str] = True, + cert: Union[ + None, bytes, str, Tuple[Union[bytes, str], Union[bytes, str]] + ] = None, + proxies: Optional[Mapping[str, str]] = None, + cacheable_methods: Optional[Collection[str]] = None, + ) -> "Response": """ Send a request. Use the request information to see if it exists in the cache and cache the response if we need to and can. @@ -54,13 +74,19 @@ def send(self, request, cacheable_methods=None, **kw): # check for etags and add headers if appropriate request.headers.update(self.controller.conditional_headers(request)) - resp = super(CacheControlAdapter, self).send(request, **kw) + resp = super(CacheControlAdapter, self).send( + request, stream, timeout, verify, cert, proxies + ) return resp def build_response( - self, request, response, from_cache=False, cacheable_methods=None - ): + self, + request: "PreparedRequest", + response: "HTTPResponse", + from_cache: bool = False, + cacheable_methods: Optional[Collection[str]] = None, + ) -> "Response": """ Build a response by making a request or using the cache. @@ -102,36 +128,39 @@ def build_response( else: # Wrap the response file with a wrapper that will cache the # response when the stream has been consumed. - response._fp = CallbackFileWrapper( - response._fp, + response._fp = CallbackFileWrapper( # type: ignore[attr-defined] + response._fp, # type: ignore[attr-defined] functools.partial( self.controller.cache_response, request, response ), ) if response.chunked: - super_update_chunk_length = response._update_chunk_length + super_update_chunk_length = response._update_chunk_length # type: ignore[attr-defined] - def _update_chunk_length(self): + def _update_chunk_length(self: "HTTPResponse") -> None: super_update_chunk_length() if self.chunk_left == 0: - self._fp._close() + self._fp._close() # type: ignore[attr-defined] - response._update_chunk_length = types.MethodType( + response._update_chunk_length = types.MethodType( # type: ignore[attr-defined] _update_chunk_length, response ) - resp = super(CacheControlAdapter, self).build_response(request, response) + resp: "Response" = super( # type: ignore[no-untyped-call] + CacheControlAdapter, self + ).build_response(request, response) # See if we should invalidate the cache. if request.method in self.invalidating_methods and resp.ok: + assert request.url is not None cache_url = self.controller.cache_url(request.url) self.cache.delete(cache_url) # Give the request a from_cache attr to let people use it - resp.from_cache = from_cache + resp.from_cache = from_cache # type: ignore[attr-defined] return resp - def close(self): + def close(self) -> None: self.cache.close() - super(CacheControlAdapter, self).close() + super(CacheControlAdapter, self).close() # type: ignore[no-untyped-call] diff --git a/src/pip/_vendor/cachecontrol/cache.py b/src/pip/_vendor/cachecontrol/cache.py index 2a965f595ff..61031d23441 100644 --- a/src/pip/_vendor/cachecontrol/cache.py +++ b/src/pip/_vendor/cachecontrol/cache.py @@ -7,37 +7,43 @@ safe in-memory dictionary. """ from threading import Lock +from typing import IO, TYPE_CHECKING, MutableMapping, Optional, Union +if TYPE_CHECKING: + from datetime import datetime -class BaseCache(object): - def get(self, key): +class BaseCache(object): + def get(self, key: str) -> Optional[bytes]: raise NotImplementedError() - def set(self, key, value, expires=None): + def set( + self, key: str, value: bytes, expires: Optional[Union[int, "datetime"]] = None + ) -> None: raise NotImplementedError() - def delete(self, key): + def delete(self, key: str) -> None: raise NotImplementedError() - def close(self): + def close(self) -> None: pass class DictCache(BaseCache): - - def __init__(self, init_dict=None): + def __init__(self, init_dict: Optional[MutableMapping[str, bytes]] = None) -> None: self.lock = Lock() self.data = init_dict or {} - def get(self, key): + def get(self, key: str) -> Optional[bytes]: return self.data.get(key, None) - def set(self, key, value, expires=None): + def set( + self, key: str, value: bytes, expires: Optional[Union[int, "datetime"]] = None + ) -> None: with self.lock: self.data.update({key: value}) - def delete(self, key): + def delete(self, key: str) -> None: with self.lock: if key in self.data: self.data.pop(key) @@ -55,10 +61,11 @@ class SeparateBodyBaseCache(BaseCache): Similarly, the body should be loaded separately via ``get_body()``. """ - def set_body(self, key, body): + + def set_body(self, key: str, body: bytes) -> None: raise NotImplementedError() - def get_body(self, key): + def get_body(self, key: str) -> Optional["IO[bytes]"]: """ Return the body as file-like object. """ diff --git a/src/pip/_vendor/cachecontrol/caches/__init__.py b/src/pip/_vendor/cachecontrol/caches/__init__.py index 37827291fb5..24ff469ff98 100644 --- a/src/pip/_vendor/cachecontrol/caches/__init__.py +++ b/src/pip/_vendor/cachecontrol/caches/__init__.py @@ -2,8 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -from .file_cache import FileCache, SeparateBodyFileCache -from .redis_cache import RedisCache - +from pip._vendor.cachecontrol.caches.file_cache import FileCache, SeparateBodyFileCache +from pip._vendor.cachecontrol.caches.redis_cache import RedisCache __all__ = ["FileCache", "SeparateBodyFileCache", "RedisCache"] diff --git a/src/pip/_vendor/cachecontrol/caches/file_cache.py b/src/pip/_vendor/cachecontrol/caches/file_cache.py index f1ddb2ebdf9..0437c4e8a13 100644 --- a/src/pip/_vendor/cachecontrol/caches/file_cache.py +++ b/src/pip/_vendor/cachecontrol/caches/file_cache.py @@ -5,18 +5,18 @@ import hashlib import os from textwrap import dedent +from typing import IO, TYPE_CHECKING, Optional, Type, Union -from ..cache import BaseCache, SeparateBodyBaseCache -from ..controller import CacheController +from pip._vendor.cachecontrol.cache import BaseCache, SeparateBodyBaseCache +from pip._vendor.cachecontrol.controller import CacheController -try: - FileNotFoundError -except NameError: - # py2.X - FileNotFoundError = (IOError, OSError) +if TYPE_CHECKING: + from datetime import datetime + from filelock import BaseFileLock -def _secure_open_write(filename, fmode): + +def _secure_open_write(filename: str, fmode: int) -> "IO[bytes]": # We only want to write to this file, so open it in write only mode flags = os.O_WRONLY @@ -62,37 +62,27 @@ class _FileCacheMixin: def __init__( self, - directory, - forever=False, - filemode=0o0600, - dirmode=0o0700, - use_dir_lock=None, - lock_class=None, - ): - - if use_dir_lock is not None and lock_class is not None: - raise ValueError("Cannot use use_dir_lock and lock_class together") - + directory: str, + forever: bool = False, + filemode: int = 0o0600, + dirmode: int = 0o0700, + lock_class: Optional[Type["BaseFileLock"]] = None, + ) -> None: try: - from lockfile import LockFile - from lockfile.mkdirlockfile import MkdirLockFile + if lock_class is None: + from filelock import FileLock + + lock_class = FileLock except ImportError: notice = dedent( """ NOTE: In order to use the FileCache you must have - lockfile installed. You can install it via pip: - pip install lockfile + filelock installed. You can install it via pip: + pip install filelock """ ) raise ImportError(notice) - else: - if use_dir_lock: - lock_class = MkdirLockFile - - elif lock_class is None: - lock_class = LockFile - self.directory = directory self.forever = forever self.filemode = filemode @@ -100,17 +90,17 @@ def __init__( self.lock_class = lock_class @staticmethod - def encode(x): + def encode(x: str) -> str: return hashlib.sha224(x.encode()).hexdigest() - def _fn(self, name): + def _fn(self, name: str) -> str: # NOTE: This method should not change as some may depend on it. # See: https://github.com/ionrock/cachecontrol/issues/63 hashed = self.encode(name) parts = list(hashed[:5]) + [hashed] return os.path.join(self.directory, *parts) - def get(self, key): + def get(self, key: str) -> Optional[bytes]: name = self._fn(key) try: with open(name, "rb") as fh: @@ -119,11 +109,13 @@ def get(self, key): except FileNotFoundError: return None - def set(self, key, value, expires=None): + def set( + self, key: str, value: bytes, expires: Optional[Union[int, "datetime"]] = None + ) -> None: name = self._fn(key) self._write(name, value) - def _write(self, path, data: bytes): + def _write(self, path: str, data: bytes) -> None: """ Safely write the data to the given path. """ @@ -133,12 +125,12 @@ def _write(self, path, data: bytes): except (IOError, OSError): pass - with self.lock_class(path) as lock: + with self.lock_class(path + ".lock"): # Write our actual file - with _secure_open_write(lock.path, self.filemode) as fh: + with _secure_open_write(path, self.filemode) as fh: fh.write(data) - def _delete(self, key, suffix): + def _delete(self, key: str, suffix: str) -> None: name = self._fn(key) + suffix if not self.forever: try: @@ -153,7 +145,7 @@ class FileCache(_FileCacheMixin, BaseCache): downloads. """ - def delete(self, key): + def delete(self, key: str) -> None: self._delete(key, "") @@ -163,23 +155,23 @@ class SeparateBodyFileCache(_FileCacheMixin, SeparateBodyBaseCache): peak memory usage. """ - def get_body(self, key): + def get_body(self, key: str) -> Optional["IO[bytes]"]: name = self._fn(key) + ".body" try: return open(name, "rb") except FileNotFoundError: return None - def set_body(self, key, body): + def set_body(self, key: str, body: bytes) -> None: name = self._fn(key) + ".body" self._write(name, body) - def delete(self, key): + def delete(self, key: str) -> None: self._delete(key, "") self._delete(key, ".body") -def url_to_file_path(url, filecache): +def url_to_file_path(url: str, filecache: FileCache) -> str: """Return the file cache path based on the URL. This does not ensure the file exists! diff --git a/src/pip/_vendor/cachecontrol/caches/redis_cache.py b/src/pip/_vendor/cachecontrol/caches/redis_cache.py index 2cba4b07080..f7ae45d3828 100644 --- a/src/pip/_vendor/cachecontrol/caches/redis_cache.py +++ b/src/pip/_vendor/cachecontrol/caches/redis_cache.py @@ -4,36 +4,45 @@ from __future__ import division -from datetime import datetime +from datetime import datetime, timezone +from typing import TYPE_CHECKING, Optional, Union + from pip._vendor.cachecontrol.cache import BaseCache +if TYPE_CHECKING: + from redis import Redis -class RedisCache(BaseCache): - def __init__(self, conn): +class RedisCache(BaseCache): + def __init__(self, conn: "Redis[bytes]") -> None: self.conn = conn - def get(self, key): + def get(self, key: str) -> Optional[bytes]: return self.conn.get(key) - def set(self, key, value, expires=None): + def set( + self, key: str, value: bytes, expires: Optional[Union[int, datetime]] = None + ) -> None: if not expires: self.conn.set(key, value) elif isinstance(expires, datetime): - expires = expires - datetime.utcnow() - self.conn.setex(key, int(expires.total_seconds()), value) + now_utc = datetime.now(timezone.utc) + if expires.tzinfo is None: + now_utc = now_utc.replace(tzinfo=None) + delta = expires - now_utc + self.conn.setex(key, int(delta.total_seconds()), value) else: self.conn.setex(key, expires, value) - def delete(self, key): + def delete(self, key: str) -> None: self.conn.delete(key) - def clear(self): + def clear(self) -> None: """Helper for clearing all the keys in a database. Use with caution!""" for key in self.conn.keys(): self.conn.delete(key) - def close(self): + def close(self) -> None: """Redis uses connection pooling, no need to close the connection.""" pass diff --git a/src/pip/_vendor/cachecontrol/compat.py b/src/pip/_vendor/cachecontrol/compat.py deleted file mode 100644 index ccec9379dba..00000000000 --- a/src/pip/_vendor/cachecontrol/compat.py +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: 2015 Eric Larson -# -# SPDX-License-Identifier: Apache-2.0 - -try: - from urllib.parse import urljoin -except ImportError: - from urlparse import urljoin - - -try: - import cPickle as pickle -except ImportError: - import pickle - -# Handle the case where the requests module has been patched to not have -# urllib3 bundled as part of its source. -try: - from pip._vendor.requests.packages.urllib3.response import HTTPResponse -except ImportError: - from pip._vendor.urllib3.response import HTTPResponse - -try: - from pip._vendor.requests.packages.urllib3.util import is_fp_closed -except ImportError: - from pip._vendor.urllib3.util import is_fp_closed - -# Replicate some six behaviour -try: - text_type = unicode -except NameError: - text_type = str diff --git a/src/pip/_vendor/cachecontrol/controller.py b/src/pip/_vendor/cachecontrol/controller.py index 7af0e002da0..3365d962130 100644 --- a/src/pip/_vendor/cachecontrol/controller.py +++ b/src/pip/_vendor/cachecontrol/controller.py @@ -5,17 +5,25 @@ """ The httplib2 algorithms ported for use with requests. """ +import calendar import logging import re -import calendar import time from email.utils import parsedate_tz +from typing import TYPE_CHECKING, Collection, Dict, Mapping, Optional, Tuple, Union from pip._vendor.requests.structures import CaseInsensitiveDict -from .cache import DictCache, SeparateBodyBaseCache -from .serialize import Serializer +from pip._vendor.cachecontrol.cache import DictCache, SeparateBodyBaseCache +from pip._vendor.cachecontrol.serialize import Serializer + +if TYPE_CHECKING: + from typing import Literal + from pip._vendor.requests import PreparedRequest + from pip._vendor.urllib3 import HTTPResponse + + from pip._vendor.cachecontrol.cache import BaseCache logger = logging.getLogger(__name__) @@ -24,12 +32,14 @@ PERMANENT_REDIRECT_STATUSES = (301, 308) -def parse_uri(uri): +def parse_uri(uri: str) -> Tuple[str, str, str, str, str]: """Parses a URI using the regex given in Appendix B of RFC 3986. (scheme, authority, path, query, fragment) = parse_uri(uri) """ - groups = URI.match(uri).groups() + match = URI.match(uri) + assert match is not None + groups = match.groups() return (groups[1], groups[3], groups[4], groups[6], groups[8]) @@ -37,7 +47,11 @@ class CacheController(object): """An interface to see if request should cached or not.""" def __init__( - self, cache=None, cache_etags=True, serializer=None, status_codes=None + self, + cache: Optional["BaseCache"] = None, + cache_etags: bool = True, + serializer: Optional[Serializer] = None, + status_codes: Optional[Collection[int]] = None, ): self.cache = DictCache() if cache is None else cache self.cache_etags = cache_etags @@ -45,7 +59,7 @@ def __init__( self.cacheable_status_codes = status_codes or (200, 203, 300, 301, 308) @classmethod - def _urlnorm(cls, uri): + def _urlnorm(cls, uri: str) -> str: """Normalize the URL to create a safe key for the cache""" (scheme, authority, path, query, fragment) = parse_uri(uri) if not scheme or not authority: @@ -65,10 +79,12 @@ def _urlnorm(cls, uri): return defrag_uri @classmethod - def cache_url(cls, uri): + def cache_url(cls, uri: str) -> str: return cls._urlnorm(uri) - def parse_cache_control(self, headers): + def parse_cache_control( + self, headers: Mapping[str, str] + ) -> Dict[str, Optional[int]]: known_directives = { # https://tools.ietf.org/html/rfc7234#section-5.2 "max-age": (int, True), @@ -87,7 +103,7 @@ def parse_cache_control(self, headers): cc_headers = headers.get("cache-control", headers.get("Cache-Control", "")) - retval = {} + retval: Dict[str, Optional[int]] = {} for cc_directive in cc_headers.split(","): if not cc_directive.strip(): @@ -122,11 +138,12 @@ def parse_cache_control(self, headers): return retval - def _load_from_cache(self, request): + def _load_from_cache(self, request: "PreparedRequest") -> Optional["HTTPResponse"]: """ Load a cached response, or return None if it's not available. """ cache_url = request.url + assert cache_url is not None cache_data = self.cache.get(cache_url) if cache_data is None: logger.debug("No cache entry available") @@ -142,11 +159,14 @@ def _load_from_cache(self, request): logger.warning("Cache entry deserialization failed, entry ignored") return result - def cached_request(self, request): + def cached_request( + self, request: "PreparedRequest" + ) -> Union["HTTPResponse", "Literal[False]"]: """ Return a cached response if it exists in the cache, otherwise return False. """ + assert request.url is not None cache_url = self.cache_url(request.url) logger.debug('Looking up "%s" in the cache', cache_url) cc = self.parse_cache_control(request.headers) @@ -182,7 +202,7 @@ def cached_request(self, request): logger.debug(msg) return resp - headers = CaseInsensitiveDict(resp.headers) + headers: CaseInsensitiveDict[str] = CaseInsensitiveDict(resp.headers) if not headers or "date" not in headers: if "etag" not in headers: # Without date or etag, the cached response can never be used @@ -193,7 +213,9 @@ def cached_request(self, request): return False now = time.time() - date = calendar.timegm(parsedate_tz(headers["date"])) + time_tuple = parsedate_tz(headers["date"]) + assert time_tuple is not None + date = calendar.timegm(time_tuple[:6]) current_age = max(0, now - date) logger.debug("Current age based on date: %i", current_age) @@ -207,28 +229,30 @@ def cached_request(self, request): freshness_lifetime = 0 # Check the max-age pragma in the cache control header - if "max-age" in resp_cc: - freshness_lifetime = resp_cc["max-age"] + max_age = resp_cc.get("max-age") + if max_age is not None: + freshness_lifetime = max_age logger.debug("Freshness lifetime from max-age: %i", freshness_lifetime) # If there isn't a max-age, check for an expires header elif "expires" in headers: expires = parsedate_tz(headers["expires"]) if expires is not None: - expire_time = calendar.timegm(expires) - date + expire_time = calendar.timegm(expires[:6]) - date freshness_lifetime = max(0, expire_time) logger.debug("Freshness lifetime from expires: %i", freshness_lifetime) # Determine if we are setting freshness limit in the # request. Note, this overrides what was in the response. - if "max-age" in cc: - freshness_lifetime = cc["max-age"] + max_age = cc.get("max-age") + if max_age is not None: + freshness_lifetime = max_age logger.debug( "Freshness lifetime from request max-age: %i", freshness_lifetime ) - if "min-fresh" in cc: - min_fresh = cc["min-fresh"] + min_fresh = cc.get("min-fresh") + if min_fresh is not None: # adjust our current age by our min fresh current_age += min_fresh logger.debug("Adjusted current age from min-fresh: %i", current_age) @@ -247,12 +271,12 @@ def cached_request(self, request): # return the original handler return False - def conditional_headers(self, request): + def conditional_headers(self, request: "PreparedRequest") -> Dict[str, str]: resp = self._load_from_cache(request) new_headers = {} if resp: - headers = CaseInsensitiveDict(resp.headers) + headers: CaseInsensitiveDict[str] = CaseInsensitiveDict(resp.headers) if "etag" in headers: new_headers["If-None-Match"] = headers["ETag"] @@ -262,7 +286,14 @@ def conditional_headers(self, request): return new_headers - def _cache_set(self, cache_url, request, response, body=None, expires_time=None): + def _cache_set( + self, + cache_url: str, + request: "PreparedRequest", + response: "HTTPResponse", + body: Optional[bytes] = None, + expires_time: Optional[int] = None, + ) -> None: """ Store the data in the cache. """ @@ -285,7 +316,13 @@ def _cache_set(self, cache_url, request, response, body=None, expires_time=None) expires=expires_time, ) - def cache_response(self, request, response, body=None, status_codes=None): + def cache_response( + self, + request: "PreparedRequest", + response: "HTTPResponse", + body: Optional[bytes] = None, + status_codes: Optional[Collection[int]] = None, + ) -> None: """ Algorithm for caching requests. @@ -300,10 +337,14 @@ def cache_response(self, request, response, body=None, status_codes=None): ) return - response_headers = CaseInsensitiveDict(response.headers) + response_headers: CaseInsensitiveDict[str] = CaseInsensitiveDict( + response.headers + ) if "date" in response_headers: - date = calendar.timegm(parsedate_tz(response_headers["date"])) + time_tuple = parsedate_tz(response_headers["date"]) + assert time_tuple is not None + date = calendar.timegm(time_tuple[:6]) else: date = 0 @@ -322,6 +363,7 @@ def cache_response(self, request, response, body=None, status_codes=None): cc_req = self.parse_cache_control(request.headers) cc = self.parse_cache_control(response_headers) + assert request.url is not None cache_url = self.cache_url(request.url) logger.debug('Updating cache with response from "%s"', cache_url) @@ -354,7 +396,7 @@ def cache_response(self, request, response, body=None, status_codes=None): if response_headers.get("expires"): expires = parsedate_tz(response_headers["expires"]) if expires is not None: - expires_time = calendar.timegm(expires) - date + expires_time = calendar.timegm(expires[:6]) - date expires_time = max(expires_time, 14 * 86400) @@ -372,11 +414,14 @@ def cache_response(self, request, response, body=None, status_codes=None): # is no date header then we can't do anything about expiring # the cache. elif "date" in response_headers: - date = calendar.timegm(parsedate_tz(response_headers["date"])) + time_tuple = parsedate_tz(response_headers["date"]) + assert time_tuple is not None + date = calendar.timegm(time_tuple[:6]) # cache when there is a max-age > 0 - if "max-age" in cc and cc["max-age"] > 0: + max_age = cc.get("max-age") + if max_age is not None and max_age > 0: logger.debug("Caching b/c date exists and max-age > 0") - expires_time = cc["max-age"] + expires_time = max_age self._cache_set( cache_url, request, @@ -391,7 +436,7 @@ def cache_response(self, request, response, body=None, status_codes=None): if response_headers["expires"]: expires = parsedate_tz(response_headers["expires"]) if expires is not None: - expires_time = calendar.timegm(expires) - date + expires_time = calendar.timegm(expires[:6]) - date else: expires_time = None @@ -408,13 +453,16 @@ def cache_response(self, request, response, body=None, status_codes=None): expires_time, ) - def update_cached_response(self, request, response): + def update_cached_response( + self, request: "PreparedRequest", response: "HTTPResponse" + ) -> "HTTPResponse": """On a 304 we will get a new set of headers that we want to update our cached value with, assuming we have one. This should only ever be called when we've sent an ETag and gotten a 304 as the response. """ + assert request.url is not None cache_url = self.cache_url(request.url) cached_response = self._load_from_cache(request) @@ -434,7 +482,7 @@ def update_cached_response(self, request, response): cached_response.headers.update( dict( (k, v) - for k, v in response.headers.items() + for k, v in response.headers.items() # type: ignore[no-untyped-call] if k.lower() not in excluded_headers ) ) diff --git a/src/pip/_vendor/cachecontrol/filewrapper.py b/src/pip/_vendor/cachecontrol/filewrapper.py index f5ed5f6f6ec..472ba600161 100644 --- a/src/pip/_vendor/cachecontrol/filewrapper.py +++ b/src/pip/_vendor/cachecontrol/filewrapper.py @@ -2,8 +2,12 @@ # # SPDX-License-Identifier: Apache-2.0 -from tempfile import NamedTemporaryFile import mmap +from tempfile import NamedTemporaryFile +from typing import TYPE_CHECKING, Any, Callable, Optional + +if TYPE_CHECKING: + from http.client import HTTPResponse class CallbackFileWrapper(object): @@ -25,12 +29,14 @@ class CallbackFileWrapper(object): performance impact. """ - def __init__(self, fp, callback): + def __init__( + self, fp: "HTTPResponse", callback: Optional[Callable[[bytes], None]] + ) -> None: self.__buf = NamedTemporaryFile("rb+", delete=True) self.__fp = fp self.__callback = callback - def __getattr__(self, name): + def __getattr__(self, name: str) -> Any: # The vaguaries of garbage collection means that self.__fp is # not always set. By using __getattribute__ and the private # name[0] allows looking up the attribute value and raising an @@ -42,7 +48,7 @@ def __getattr__(self, name): fp = self.__getattribute__("_CallbackFileWrapper__fp") return getattr(fp, name) - def __is_fp_closed(self): + def __is_fp_closed(self) -> bool: try: return self.__fp.fp is None @@ -50,7 +56,8 @@ def __is_fp_closed(self): pass try: - return self.__fp.closed + closed: bool = self.__fp.closed + return closed except AttributeError: pass @@ -59,7 +66,7 @@ def __is_fp_closed(self): # TODO: Add some logging here... return False - def _close(self): + def _close(self) -> None: if self.__callback: if self.__buf.tell() == 0: # Empty file: @@ -86,8 +93,8 @@ def _close(self): # Important when caching big files. self.__buf.close() - def read(self, amt=None): - data = self.__fp.read(amt) + def read(self, amt: Optional[int] = None) -> bytes: + data: bytes = self.__fp.read(amt) if data: # We may be dealing with b'', a sign that things are over: # it's passed e.g. after we've already closed self.__buf. @@ -97,8 +104,8 @@ def read(self, amt=None): return data - def _safe_read(self, amt): - data = self.__fp._safe_read(amt) + def _safe_read(self, amt: int) -> bytes: + data: bytes = self.__fp._safe_read(amt) # type: ignore[attr-defined] if amt == 2 and data == b"\r\n": # urllib executes this read to toss the CRLF at the end # of the chunk. diff --git a/src/pip/_vendor/cachecontrol/heuristics.py b/src/pip/_vendor/cachecontrol/heuristics.py index ebe4a96f589..1e88ada68f2 100644 --- a/src/pip/_vendor/cachecontrol/heuristics.py +++ b/src/pip/_vendor/cachecontrol/heuristics.py @@ -4,26 +4,27 @@ import calendar import time - +from datetime import datetime, timedelta, timezone from email.utils import formatdate, parsedate, parsedate_tz +from typing import TYPE_CHECKING, Any, Dict, Mapping, Optional -from datetime import datetime, timedelta +if TYPE_CHECKING: + from pip._vendor.urllib3 import HTTPResponse TIME_FMT = "%a, %d %b %Y %H:%M:%S GMT" -def expire_after(delta, date=None): - date = date or datetime.utcnow() +def expire_after(delta: timedelta, date: Optional[datetime] = None) -> datetime: + date = date or datetime.now(timezone.utc) return date + delta -def datetime_to_header(dt): +def datetime_to_header(dt: datetime) -> str: return formatdate(calendar.timegm(dt.timetuple())) class BaseHeuristic(object): - - def warning(self, response): + def warning(self, response: "HTTPResponse") -> Optional[str]: """ Return a valid 1xx warning header value describing the cache adjustments. @@ -34,7 +35,7 @@ def warning(self, response): """ return '110 - "Response is Stale"' - def update_headers(self, response): + def update_headers(self, response: "HTTPResponse") -> Dict[str, str]: """Update the response headers with any new headers. NOTE: This SHOULD always include some Warning header to @@ -43,7 +44,7 @@ def update_headers(self, response): """ return {} - def apply(self, response): + def apply(self, response: "HTTPResponse") -> "HTTPResponse": updated_headers = self.update_headers(response) if updated_headers: @@ -61,12 +62,12 @@ class OneDayCache(BaseHeuristic): future. """ - def update_headers(self, response): + def update_headers(self, response: "HTTPResponse") -> Dict[str, str]: headers = {} if "expires" not in response.headers: date = parsedate(response.headers["date"]) - expires = expire_after(timedelta(days=1), date=datetime(*date[:6])) + expires = expire_after(timedelta(days=1), date=datetime(*date[:6], tzinfo=timezone.utc)) # type: ignore[misc] headers["expires"] = datetime_to_header(expires) headers["cache-control"] = "public" return headers @@ -77,14 +78,14 @@ class ExpiresAfter(BaseHeuristic): Cache **all** requests for a defined time period. """ - def __init__(self, **kw): + def __init__(self, **kw: Any) -> None: self.delta = timedelta(**kw) - def update_headers(self, response): + def update_headers(self, response: "HTTPResponse") -> Dict[str, str]: expires = expire_after(self.delta) return {"expires": datetime_to_header(expires), "cache-control": "public"} - def warning(self, response): + def warning(self, response: "HTTPResponse") -> Optional[str]: tmpl = "110 - Automatically cached for %s. Response might be stale" return tmpl % self.delta @@ -101,12 +102,23 @@ class LastModified(BaseHeuristic): http://lxr.mozilla.org/mozilla-release/source/netwerk/protocol/http/nsHttpResponseHead.cpp#397 Unlike mozilla we limit this to 24-hr. """ + cacheable_by_default_statuses = { - 200, 203, 204, 206, 300, 301, 404, 405, 410, 414, 501 + 200, + 203, + 204, + 206, + 300, + 301, + 404, + 405, + 410, + 414, + 501, } - def update_headers(self, resp): - headers = resp.headers + def update_headers(self, resp: "HTTPResponse") -> Dict[str, str]: + headers: Mapping[str, str] = resp.headers if "expires" in headers: return {} @@ -120,9 +132,11 @@ def update_headers(self, resp): if "date" not in headers or "last-modified" not in headers: return {} - date = calendar.timegm(parsedate_tz(headers["date"])) + time_tuple = parsedate_tz(headers["date"]) + assert time_tuple is not None + date = calendar.timegm(time_tuple[:6]) last_modified = parsedate(headers["last-modified"]) - if date is None or last_modified is None: + if last_modified is None: return {} now = time.time() @@ -135,5 +149,5 @@ def update_headers(self, resp): expires = date + freshness_lifetime return {"expires": time.strftime(TIME_FMT, time.gmtime(expires))} - def warning(self, resp): + def warning(self, resp: "HTTPResponse") -> Optional[str]: return None diff --git a/src/pip/_vendor/cachecontrol/py.typed b/src/pip/_vendor/cachecontrol/py.typed new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/pip/_vendor/cachecontrol/serialize.py b/src/pip/_vendor/cachecontrol/serialize.py index 7fe1a3e33a3..f21eaea6f39 100644 --- a/src/pip/_vendor/cachecontrol/serialize.py +++ b/src/pip/_vendor/cachecontrol/serialize.py @@ -5,19 +5,23 @@ import base64 import io import json +import pickle import zlib +from typing import IO, TYPE_CHECKING, Any, Mapping, Optional from pip._vendor import msgpack from pip._vendor.requests.structures import CaseInsensitiveDict +from pip._vendor.urllib3 import HTTPResponse -from .compat import HTTPResponse, pickle, text_type +if TYPE_CHECKING: + from pip._vendor.requests import PreparedRequest, Request -def _b64_decode_bytes(b): +def _b64_decode_bytes(b: str) -> bytes: return base64.b64decode(b.encode("ascii")) -def _b64_decode_str(s): +def _b64_decode_str(s: str) -> str: return _b64_decode_bytes(s).decode("utf8") @@ -25,54 +29,57 @@ def _b64_decode_str(s): class Serializer(object): - def dumps(self, request, response, body=None): - response_headers = CaseInsensitiveDict(response.headers) + def dumps( + self, + request: "PreparedRequest", + response: HTTPResponse, + body: Optional[bytes] = None, + ) -> bytes: + response_headers: CaseInsensitiveDict[str] = CaseInsensitiveDict( + response.headers + ) if body is None: # When a body isn't passed in, we'll read the response. We # also update the response with a new file handler to be # sure it acts as though it was never read. body = response.read(decode_content=False) - response._fp = io.BytesIO(body) - - # NOTE: This is all a bit weird, but it's really important that on - # Python 2.x these objects are unicode and not str, even when - # they contain only ascii. The problem here is that msgpack - # understands the difference between unicode and bytes and we - # have it set to differentiate between them, however Python 2 - # doesn't know the difference. Forcing these to unicode will be - # enough to have msgpack know the difference. + response._fp = io.BytesIO(body) # type: ignore[attr-defined] + response.length_remaining = len(body) + data = { - u"response": { - u"body": body, # Empty bytestring if body is stored separately - u"headers": dict( - (text_type(k), text_type(v)) for k, v in response.headers.items() - ), - u"status": response.status, - u"version": response.version, - u"reason": text_type(response.reason), - u"strict": response.strict, - u"decode_content": response.decode_content, + "response": { + "body": body, # Empty bytestring if body is stored separately + "headers": dict((str(k), str(v)) for k, v in response.headers.items()), # type: ignore[no-untyped-call] + "status": response.status, + "version": response.version, + "reason": str(response.reason), + "decode_content": response.decode_content, } } # Construct our vary headers - data[u"vary"] = {} - if u"vary" in response_headers: - varied_headers = response_headers[u"vary"].split(",") + data["vary"] = {} + if "vary" in response_headers: + varied_headers = response_headers["vary"].split(",") for header in varied_headers: - header = text_type(header).strip() + header = str(header).strip() header_value = request.headers.get(header, None) if header_value is not None: - header_value = text_type(header_value) - data[u"vary"][header] = header_value + header_value = str(header_value) + data["vary"][header] = header_value return b",".join([b"cc=4", msgpack.dumps(data, use_bin_type=True)]) - def loads(self, request, data, body_file=None): + def loads( + self, + request: "PreparedRequest", + data: bytes, + body_file: Optional["IO[bytes]"] = None, + ) -> Optional[HTTPResponse]: # Short circuit if we've been given an empty set of data if not data: - return + return None # Determine what version of the serializer the data was serialized # with @@ -88,18 +95,23 @@ def loads(self, request, data, body_file=None): ver = b"cc=0" # Get the version number out of the cc=N - ver = ver.split(b"=", 1)[-1].decode("ascii") + verstr = ver.split(b"=", 1)[-1].decode("ascii") # Dispatch to the actual load method for the given version try: - return getattr(self, "_loads_v{}".format(ver))(request, data, body_file) + return getattr(self, "_loads_v{}".format(verstr))(request, data, body_file) # type: ignore[no-any-return] except AttributeError: # This is a version we don't have a loads function for, so we'll # just treat it as a miss and return None - return - - def prepare_response(self, request, cached, body_file=None): + return None + + def prepare_response( + self, + request: "Request", + cached: Mapping[str, Any], + body_file: Optional["IO[bytes]"] = None, + ) -> Optional[HTTPResponse]: """Verify our vary headers match and construct a real urllib3 HTTPResponse object. """ @@ -108,23 +120,26 @@ def prepare_response(self, request, cached, body_file=None): # This case is also handled in the controller code when creating # a cache entry, but is left here for backwards compatibility. if "*" in cached.get("vary", {}): - return + return None # Ensure that the Vary headers for the cached response match our # request for header, value in cached.get("vary", {}).items(): if request.headers.get(header, None) != value: - return + return None body_raw = cached["response"].pop("body") - headers = CaseInsensitiveDict(data=cached["response"]["headers"]) + headers: CaseInsensitiveDict[str] = CaseInsensitiveDict( + data=cached["response"]["headers"] + ) if headers.get("transfer-encoding", "") == "chunked": headers.pop("transfer-encoding") cached["response"]["headers"] = headers try: + body: "IO[bytes]" if body_file is None: body = io.BytesIO(body_raw) else: @@ -138,28 +153,46 @@ def prepare_response(self, request, cached, body_file=None): # TypeError: 'str' does not support the buffer interface body = io.BytesIO(body_raw.encode("utf8")) + # Discard any `strict` parameter serialized by older version of cachecontrol. + cached["response"].pop("strict", None) + return HTTPResponse(body=body, preload_content=False, **cached["response"]) - def _loads_v0(self, request, data, body_file=None): + def _loads_v0( + self, + request: "Request", + data: bytes, + body_file: Optional["IO[bytes]"] = None, + ) -> None: # The original legacy cache data. This doesn't contain enough # information to construct everything we need, so we'll treat this as # a miss. return - def _loads_v1(self, request, data, body_file=None): + def _loads_v1( + self, + request: "Request", + data: bytes, + body_file: Optional["IO[bytes]"] = None, + ) -> Optional[HTTPResponse]: try: cached = pickle.loads(data) except ValueError: - return + return None return self.prepare_response(request, cached, body_file) - def _loads_v2(self, request, data, body_file=None): + def _loads_v2( + self, + request: "Request", + data: bytes, + body_file: Optional["IO[bytes]"] = None, + ) -> Optional[HTTPResponse]: assert body_file is None try: cached = json.loads(zlib.decompress(data).decode("utf8")) except (ValueError, zlib.error): - return + return None # We need to decode the items that we've base64 encoded cached["response"]["body"] = _b64_decode_bytes(cached["response"]["body"]) @@ -175,16 +208,26 @@ def _loads_v2(self, request, data, body_file=None): return self.prepare_response(request, cached, body_file) - def _loads_v3(self, request, data, body_file): + def _loads_v3( + self, + request: "Request", + data: bytes, + body_file: Optional["IO[bytes]"] = None, + ) -> None: # Due to Python 2 encoding issues, it's impossible to know for sure # exactly how to load v3 entries, thus we'll treat these as a miss so # that they get rewritten out as v4 entries. return - def _loads_v4(self, request, data, body_file=None): + def _loads_v4( + self, + request: "Request", + data: bytes, + body_file: Optional["IO[bytes]"] = None, + ) -> Optional[HTTPResponse]: try: cached = msgpack.loads(data, raw=False) except ValueError: - return + return None return self.prepare_response(request, cached, body_file) diff --git a/src/pip/_vendor/cachecontrol/wrapper.py b/src/pip/_vendor/cachecontrol/wrapper.py index b6ee7f20398..293e69fe7d4 100644 --- a/src/pip/_vendor/cachecontrol/wrapper.py +++ b/src/pip/_vendor/cachecontrol/wrapper.py @@ -2,21 +2,30 @@ # # SPDX-License-Identifier: Apache-2.0 -from .adapter import CacheControlAdapter -from .cache import DictCache +from typing import TYPE_CHECKING, Collection, Optional, Type +from pip._vendor.cachecontrol.adapter import CacheControlAdapter +from pip._vendor.cachecontrol.cache import DictCache -def CacheControl( - sess, - cache=None, - cache_etags=True, - serializer=None, - heuristic=None, - controller_class=None, - adapter_class=None, - cacheable_methods=None, -): +if TYPE_CHECKING: + from pip._vendor import requests + + from pip._vendor.cachecontrol.cache import BaseCache + from pip._vendor.cachecontrol.controller import CacheController + from pip._vendor.cachecontrol.heuristics import BaseHeuristic + from pip._vendor.cachecontrol.serialize import Serializer + +def CacheControl( + sess: "requests.Session", + cache: Optional["BaseCache"] = None, + cache_etags: bool = True, + serializer: Optional["Serializer"] = None, + heuristic: Optional["BaseHeuristic"] = None, + controller_class: Optional[Type["CacheController"]] = None, + adapter_class: Optional[Type[CacheControlAdapter]] = None, + cacheable_methods: Optional[Collection[str]] = None, +) -> "requests.Session": cache = DictCache() if cache is None else cache adapter_class = adapter_class or CacheControlAdapter adapter = adapter_class( diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt index dcf89dc04c5..d0f4c71cccc 100644 --- a/src/pip/_vendor/vendor.txt +++ b/src/pip/_vendor/vendor.txt @@ -1,4 +1,4 @@ -CacheControl==0.12.11 # Make sure to update the license in pyproject.toml for this. +CacheControl==0.13.0 # Make sure to update the license in pyproject.toml for this. colorama==0.4.6 distlib==0.3.6 distro==1.8.0 From 9fb93c478ef7d5e1423cc66467bb63c686864828 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Fri, 2 Jun 2023 14:00:15 -0400 Subject: [PATCH 046/992] mypy fix. --- src/pip/_internal/network/cache.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/network/cache.py b/src/pip/_internal/network/cache.py index d6b8ccdcf36..a4d13620532 100644 --- a/src/pip/_internal/network/cache.py +++ b/src/pip/_internal/network/cache.py @@ -3,7 +3,8 @@ import os from contextlib import contextmanager -from typing import BinaryIO, Generator, Optional +from datetime import datetime +from typing import BinaryIO, Generator, Optional, Union from pip._vendor.cachecontrol.cache import SeparateBodyBaseCache from pip._vendor.cachecontrol.caches import SeparateBodyFileCache @@ -62,7 +63,9 @@ def _write(self, path: str, data: bytes) -> None: replace(f.name, path) - def set(self, key: str, value: bytes, expires: Optional[int] = None) -> None: + def set( + self, key: str, value: bytes, expires: Union[int, datetime, None] = None + ) -> None: path = self._get_cache_path(key) self._write(path, value) From 28590a0a0809b3bb8999b4d08aa93bd9ffb3458d Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 12 Jun 2023 09:29:35 -0400 Subject: [PATCH 047/992] Improve documentation of caching and the cache subcommand. --- docs/html/topics/caching.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/html/topics/caching.md b/docs/html/topics/caching.md index 954cebe402d..19bd064a74c 100644 --- a/docs/html/topics/caching.md +++ b/docs/html/topics/caching.md @@ -27,6 +27,12 @@ While this cache attempts to minimize network activity, it does not prevent network access altogether. If you want a local install solution that circumvents accessing PyPI, see {ref}`Installing from local packages`. +In versions prior to 23.2, this cache was stored in a directory called `http` in +the main cache directory (see below for its location). In 23.2 and later, a new +cache format is used, stored in a directory called `http-v2`. If you have +completely switched to newer versions of `pip`, you may wish to delete the old +directory. + (wheel-caching)= ### Locally built wheels @@ -124,11 +130,11 @@ The {ref}`pip cache` command can be used to manage pip's cache. ### Removing a single package -`pip cache remove setuptools` removes all wheel files related to setuptools from pip's cache. +`pip cache remove setuptools` removes all wheel files related to setuptools from pip's cache. HTTP cache files are not removed at this time. ### Removing the cache -`pip cache purge` will clear all wheel files from pip's cache. +`pip cache purge` will clear all files from pip's wheel and HTTP caches. ### Listing cached files From dcd2d5e344f27149789f05edb9da45994eac2473 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 12 Jun 2023 09:30:30 -0400 Subject: [PATCH 048/992] Update CacheControl to 0.13.1. --- src/pip/_vendor/cachecontrol/__init__.py | 2 +- src/pip/_vendor/cachecontrol/_cmd.py | 5 +- src/pip/_vendor/cachecontrol/adapter.py | 51 ++++---- src/pip/_vendor/cachecontrol/cache.py | 18 +-- .../_vendor/cachecontrol/caches/file_cache.py | 17 +-- .../cachecontrol/caches/redis_cache.py | 10 +- src/pip/_vendor/cachecontrol/controller.py | 58 +++++---- src/pip/_vendor/cachecontrol/filewrapper.py | 9 +- src/pip/_vendor/cachecontrol/heuristics.py | 23 ++-- src/pip/_vendor/cachecontrol/serialize.py | 111 +++++++----------- src/pip/_vendor/cachecontrol/wrapper.py | 19 +-- src/pip/_vendor/vendor.txt | 2 +- 12 files changed, 149 insertions(+), 176 deletions(-) diff --git a/src/pip/_vendor/cachecontrol/__init__.py b/src/pip/_vendor/cachecontrol/__init__.py index 3701cdd6be8..4d20bc9b12a 100644 --- a/src/pip/_vendor/cachecontrol/__init__.py +++ b/src/pip/_vendor/cachecontrol/__init__.py @@ -8,7 +8,7 @@ """ __author__ = "Eric Larson" __email__ = "eric@ionrock.org" -__version__ = "0.13.0" +__version__ = "0.13.1" from pip._vendor.cachecontrol.adapter import CacheControlAdapter from pip._vendor.cachecontrol.controller import CacheController diff --git a/src/pip/_vendor/cachecontrol/_cmd.py b/src/pip/_vendor/cachecontrol/_cmd.py index ab4dac3dde1..2c84208a5d8 100644 --- a/src/pip/_vendor/cachecontrol/_cmd.py +++ b/src/pip/_vendor/cachecontrol/_cmd.py @@ -1,6 +1,7 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations import logging from argparse import ArgumentParser @@ -36,7 +37,7 @@ def get_session() -> requests.Session: return sess -def get_args() -> "Namespace": +def get_args() -> Namespace: parser = ArgumentParser() parser.add_argument("url", help="The URL to try and cache") return parser.parse_args() @@ -53,7 +54,7 @@ def main() -> None: setup_logging() # try setting the cache - cache_controller: "CacheController" = ( + cache_controller: CacheController = ( sess.cache_controller # type: ignore[attr-defined] ) cache_controller.cache_response(resp.request, resp.raw) diff --git a/src/pip/_vendor/cachecontrol/adapter.py b/src/pip/_vendor/cachecontrol/adapter.py index 83c08e003fe..3e83e308dba 100644 --- a/src/pip/_vendor/cachecontrol/adapter.py +++ b/src/pip/_vendor/cachecontrol/adapter.py @@ -1,11 +1,12 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations import functools import types import zlib -from typing import TYPE_CHECKING, Any, Collection, Mapping, Optional, Tuple, Type, Union +from typing import TYPE_CHECKING, Any, Collection, Mapping from pip._vendor.requests.adapters import HTTPAdapter @@ -27,16 +28,16 @@ class CacheControlAdapter(HTTPAdapter): def __init__( self, - cache: Optional["BaseCache"] = None, + cache: BaseCache | None = None, cache_etags: bool = True, - controller_class: Optional[Type[CacheController]] = None, - serializer: Optional["Serializer"] = None, - heuristic: Optional["BaseHeuristic"] = None, - cacheable_methods: Optional[Collection[str]] = None, + controller_class: type[CacheController] | None = None, + serializer: Serializer | None = None, + heuristic: BaseHeuristic | None = None, + cacheable_methods: Collection[str] | None = None, *args: Any, **kw: Any, ) -> None: - super(CacheControlAdapter, self).__init__(*args, **kw) + super().__init__(*args, **kw) self.cache = DictCache() if cache is None else cache self.heuristic = heuristic self.cacheable_methods = cacheable_methods or ("GET",) @@ -48,16 +49,14 @@ def __init__( def send( self, - request: "PreparedRequest", + request: PreparedRequest, stream: bool = False, - timeout: Union[None, float, Tuple[float, float], Tuple[float, None]] = None, - verify: Union[bool, str] = True, - cert: Union[ - None, bytes, str, Tuple[Union[bytes, str], Union[bytes, str]] - ] = None, - proxies: Optional[Mapping[str, str]] = None, - cacheable_methods: Optional[Collection[str]] = None, - ) -> "Response": + timeout: None | float | tuple[float, float] | tuple[float, None] = None, + verify: bool | str = True, + cert: (None | bytes | str | tuple[bytes | str, bytes | str]) = None, + proxies: Mapping[str, str] | None = None, + cacheable_methods: Collection[str] | None = None, + ) -> Response: """ Send a request. Use the request information to see if it exists in the cache and cache the response if we need to and can. @@ -74,19 +73,17 @@ def send( # check for etags and add headers if appropriate request.headers.update(self.controller.conditional_headers(request)) - resp = super(CacheControlAdapter, self).send( - request, stream, timeout, verify, cert, proxies - ) + resp = super().send(request, stream, timeout, verify, cert, proxies) return resp def build_response( self, - request: "PreparedRequest", - response: "HTTPResponse", + request: PreparedRequest, + response: HTTPResponse, from_cache: bool = False, - cacheable_methods: Optional[Collection[str]] = None, - ) -> "Response": + cacheable_methods: Collection[str] | None = None, + ) -> Response: """ Build a response by making a request or using the cache. @@ -137,7 +134,7 @@ def build_response( if response.chunked: super_update_chunk_length = response._update_chunk_length # type: ignore[attr-defined] - def _update_chunk_length(self: "HTTPResponse") -> None: + def _update_chunk_length(self: HTTPResponse) -> None: super_update_chunk_length() if self.chunk_left == 0: self._fp._close() # type: ignore[attr-defined] @@ -146,9 +143,7 @@ def _update_chunk_length(self: "HTTPResponse") -> None: _update_chunk_length, response ) - resp: "Response" = super( # type: ignore[no-untyped-call] - CacheControlAdapter, self - ).build_response(request, response) + resp: Response = super().build_response(request, response) # type: ignore[no-untyped-call] # See if we should invalidate the cache. if request.method in self.invalidating_methods and resp.ok: @@ -163,4 +158,4 @@ def _update_chunk_length(self: "HTTPResponse") -> None: def close(self) -> None: self.cache.close() - super(CacheControlAdapter, self).close() # type: ignore[no-untyped-call] + super().close() # type: ignore[no-untyped-call] diff --git a/src/pip/_vendor/cachecontrol/cache.py b/src/pip/_vendor/cachecontrol/cache.py index 61031d23441..3293b0057c7 100644 --- a/src/pip/_vendor/cachecontrol/cache.py +++ b/src/pip/_vendor/cachecontrol/cache.py @@ -6,19 +6,21 @@ The cache object API for implementing caches. The default is a thread safe in-memory dictionary. """ +from __future__ import annotations + from threading import Lock -from typing import IO, TYPE_CHECKING, MutableMapping, Optional, Union +from typing import IO, TYPE_CHECKING, MutableMapping if TYPE_CHECKING: from datetime import datetime -class BaseCache(object): - def get(self, key: str) -> Optional[bytes]: +class BaseCache: + def get(self, key: str) -> bytes | None: raise NotImplementedError() def set( - self, key: str, value: bytes, expires: Optional[Union[int, "datetime"]] = None + self, key: str, value: bytes, expires: int | datetime | None = None ) -> None: raise NotImplementedError() @@ -30,15 +32,15 @@ def close(self) -> None: class DictCache(BaseCache): - def __init__(self, init_dict: Optional[MutableMapping[str, bytes]] = None) -> None: + def __init__(self, init_dict: MutableMapping[str, bytes] | None = None) -> None: self.lock = Lock() self.data = init_dict or {} - def get(self, key: str) -> Optional[bytes]: + def get(self, key: str) -> bytes | None: return self.data.get(key, None) def set( - self, key: str, value: bytes, expires: Optional[Union[int, "datetime"]] = None + self, key: str, value: bytes, expires: int | datetime | None = None ) -> None: with self.lock: self.data.update({key: value}) @@ -65,7 +67,7 @@ class SeparateBodyBaseCache(BaseCache): def set_body(self, key: str, body: bytes) -> None: raise NotImplementedError() - def get_body(self, key: str) -> Optional["IO[bytes]"]: + def get_body(self, key: str) -> IO[bytes] | None: """ Return the body as file-like object. """ diff --git a/src/pip/_vendor/cachecontrol/caches/file_cache.py b/src/pip/_vendor/cachecontrol/caches/file_cache.py index 0437c4e8a13..1fd28013084 100644 --- a/src/pip/_vendor/cachecontrol/caches/file_cache.py +++ b/src/pip/_vendor/cachecontrol/caches/file_cache.py @@ -1,11 +1,12 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations import hashlib import os from textwrap import dedent -from typing import IO, TYPE_CHECKING, Optional, Type, Union +from typing import IO, TYPE_CHECKING from pip._vendor.cachecontrol.cache import BaseCache, SeparateBodyBaseCache from pip._vendor.cachecontrol.controller import CacheController @@ -16,7 +17,7 @@ from filelock import BaseFileLock -def _secure_open_write(filename: str, fmode: int) -> "IO[bytes]": +def _secure_open_write(filename: str, fmode: int) -> IO[bytes]: # We only want to write to this file, so open it in write only mode flags = os.O_WRONLY @@ -39,7 +40,7 @@ def _secure_open_write(filename: str, fmode: int) -> "IO[bytes]": # there try: os.remove(filename) - except (IOError, OSError): + except OSError: # The file must not exist already, so we can just skip ahead to opening pass @@ -66,7 +67,7 @@ def __init__( forever: bool = False, filemode: int = 0o0600, dirmode: int = 0o0700, - lock_class: Optional[Type["BaseFileLock"]] = None, + lock_class: type[BaseFileLock] | None = None, ) -> None: try: if lock_class is None: @@ -100,7 +101,7 @@ def _fn(self, name: str) -> str: parts = list(hashed[:5]) + [hashed] return os.path.join(self.directory, *parts) - def get(self, key: str) -> Optional[bytes]: + def get(self, key: str) -> bytes | None: name = self._fn(key) try: with open(name, "rb") as fh: @@ -110,7 +111,7 @@ def get(self, key: str) -> Optional[bytes]: return None def set( - self, key: str, value: bytes, expires: Optional[Union[int, "datetime"]] = None + self, key: str, value: bytes, expires: int | datetime | None = None ) -> None: name = self._fn(key) self._write(name, value) @@ -122,7 +123,7 @@ def _write(self, path: str, data: bytes) -> None: # Make sure the directory exists try: os.makedirs(os.path.dirname(path), self.dirmode) - except (IOError, OSError): + except OSError: pass with self.lock_class(path + ".lock"): @@ -155,7 +156,7 @@ class SeparateBodyFileCache(_FileCacheMixin, SeparateBodyBaseCache): peak memory usage. """ - def get_body(self, key: str) -> Optional["IO[bytes]"]: + def get_body(self, key: str) -> IO[bytes] | None: name = self._fn(key) + ".body" try: return open(name, "rb") diff --git a/src/pip/_vendor/cachecontrol/caches/redis_cache.py b/src/pip/_vendor/cachecontrol/caches/redis_cache.py index f7ae45d3828..f4f68c47bf6 100644 --- a/src/pip/_vendor/cachecontrol/caches/redis_cache.py +++ b/src/pip/_vendor/cachecontrol/caches/redis_cache.py @@ -1,11 +1,11 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations -from __future__ import division from datetime import datetime, timezone -from typing import TYPE_CHECKING, Optional, Union +from typing import TYPE_CHECKING from pip._vendor.cachecontrol.cache import BaseCache @@ -14,14 +14,14 @@ class RedisCache(BaseCache): - def __init__(self, conn: "Redis[bytes]") -> None: + def __init__(self, conn: Redis[bytes]) -> None: self.conn = conn - def get(self, key: str) -> Optional[bytes]: + def get(self, key: str) -> bytes | None: return self.conn.get(key) def set( - self, key: str, value: bytes, expires: Optional[Union[int, datetime]] = None + self, key: str, value: bytes, expires: int | datetime | None = None ) -> None: if not expires: self.conn.set(key, value) diff --git a/src/pip/_vendor/cachecontrol/controller.py b/src/pip/_vendor/cachecontrol/controller.py index 3365d962130..586b9f97b80 100644 --- a/src/pip/_vendor/cachecontrol/controller.py +++ b/src/pip/_vendor/cachecontrol/controller.py @@ -5,12 +5,14 @@ """ The httplib2 algorithms ported for use with requests. """ +from __future__ import annotations + import calendar import logging import re import time from email.utils import parsedate_tz -from typing import TYPE_CHECKING, Collection, Dict, Mapping, Optional, Tuple, Union +from typing import TYPE_CHECKING, Collection, Mapping from pip._vendor.requests.structures import CaseInsensitiveDict @@ -32,7 +34,7 @@ PERMANENT_REDIRECT_STATUSES = (301, 308) -def parse_uri(uri: str) -> Tuple[str, str, str, str, str]: +def parse_uri(uri: str) -> tuple[str, str, str, str, str]: """Parses a URI using the regex given in Appendix B of RFC 3986. (scheme, authority, path, query, fragment) = parse_uri(uri) @@ -43,15 +45,15 @@ def parse_uri(uri: str) -> Tuple[str, str, str, str, str]: return (groups[1], groups[3], groups[4], groups[6], groups[8]) -class CacheController(object): +class CacheController: """An interface to see if request should cached or not.""" def __init__( self, - cache: Optional["BaseCache"] = None, + cache: BaseCache | None = None, cache_etags: bool = True, - serializer: Optional[Serializer] = None, - status_codes: Optional[Collection[int]] = None, + serializer: Serializer | None = None, + status_codes: Collection[int] | None = None, ): self.cache = DictCache() if cache is None else cache self.cache_etags = cache_etags @@ -82,9 +84,7 @@ def _urlnorm(cls, uri: str) -> str: def cache_url(cls, uri: str) -> str: return cls._urlnorm(uri) - def parse_cache_control( - self, headers: Mapping[str, str] - ) -> Dict[str, Optional[int]]: + def parse_cache_control(self, headers: Mapping[str, str]) -> dict[str, int | None]: known_directives = { # https://tools.ietf.org/html/rfc7234#section-5.2 "max-age": (int, True), @@ -103,7 +103,7 @@ def parse_cache_control( cc_headers = headers.get("cache-control", headers.get("Cache-Control", "")) - retval: Dict[str, Optional[int]] = {} + retval: dict[str, int | None] = {} for cc_directive in cc_headers.split(","): if not cc_directive.strip(): @@ -138,7 +138,7 @@ def parse_cache_control( return retval - def _load_from_cache(self, request: "PreparedRequest") -> Optional["HTTPResponse"]: + def _load_from_cache(self, request: PreparedRequest) -> HTTPResponse | None: """ Load a cached response, or return None if it's not available. """ @@ -159,9 +159,7 @@ def _load_from_cache(self, request: "PreparedRequest") -> Optional["HTTPResponse logger.warning("Cache entry deserialization failed, entry ignored") return result - def cached_request( - self, request: "PreparedRequest" - ) -> Union["HTTPResponse", "Literal[False]"]: + def cached_request(self, request: PreparedRequest) -> HTTPResponse | Literal[False]: """ Return a cached response if it exists in the cache, otherwise return False. @@ -271,7 +269,7 @@ def cached_request( # return the original handler return False - def conditional_headers(self, request: "PreparedRequest") -> Dict[str, str]: + def conditional_headers(self, request: PreparedRequest) -> dict[str, str]: resp = self._load_from_cache(request) new_headers = {} @@ -289,10 +287,10 @@ def conditional_headers(self, request: "PreparedRequest") -> Dict[str, str]: def _cache_set( self, cache_url: str, - request: "PreparedRequest", - response: "HTTPResponse", - body: Optional[bytes] = None, - expires_time: Optional[int] = None, + request: PreparedRequest, + response: HTTPResponse, + body: bytes | None = None, + expires_time: int | None = None, ) -> None: """ Store the data in the cache. @@ -318,10 +316,10 @@ def _cache_set( def cache_response( self, - request: "PreparedRequest", - response: "HTTPResponse", - body: Optional[bytes] = None, - status_codes: Optional[Collection[int]] = None, + request: PreparedRequest, + response: HTTPResponse, + body: bytes | None = None, + status_codes: Collection[int] | None = None, ) -> None: """ Algorithm for caching requests. @@ -400,7 +398,7 @@ def cache_response( expires_time = max(expires_time, 14 * 86400) - logger.debug("etag object cached for {0} seconds".format(expires_time)) + logger.debug(f"etag object cached for {expires_time} seconds") logger.debug("Caching due to etag") self._cache_set(cache_url, request, response, body, expires_time) @@ -441,7 +439,7 @@ def cache_response( expires_time = None logger.debug( - "Caching b/c of expires header. expires in {0} seconds".format( + "Caching b/c of expires header. expires in {} seconds".format( expires_time ) ) @@ -454,8 +452,8 @@ def cache_response( ) def update_cached_response( - self, request: "PreparedRequest", response: "HTTPResponse" - ) -> "HTTPResponse": + self, request: PreparedRequest, response: HTTPResponse + ) -> HTTPResponse: """On a 304 we will get a new set of headers that we want to update our cached value with, assuming we have one. @@ -480,11 +478,11 @@ def update_cached_response( excluded_headers = ["content-length"] cached_response.headers.update( - dict( - (k, v) + { + k: v for k, v in response.headers.items() # type: ignore[no-untyped-call] if k.lower() not in excluded_headers - ) + } ) # we want a 200 b/c we have content via the cache diff --git a/src/pip/_vendor/cachecontrol/filewrapper.py b/src/pip/_vendor/cachecontrol/filewrapper.py index 472ba600161..25143902a26 100644 --- a/src/pip/_vendor/cachecontrol/filewrapper.py +++ b/src/pip/_vendor/cachecontrol/filewrapper.py @@ -1,16 +1,17 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations import mmap from tempfile import NamedTemporaryFile -from typing import TYPE_CHECKING, Any, Callable, Optional +from typing import TYPE_CHECKING, Any, Callable if TYPE_CHECKING: from http.client import HTTPResponse -class CallbackFileWrapper(object): +class CallbackFileWrapper: """ Small wrapper around a fp object which will tee everything read into a buffer, and when that file is closed it will execute a callback with the @@ -30,7 +31,7 @@ class CallbackFileWrapper(object): """ def __init__( - self, fp: "HTTPResponse", callback: Optional[Callable[[bytes], None]] + self, fp: HTTPResponse, callback: Callable[[bytes], None] | None ) -> None: self.__buf = NamedTemporaryFile("rb+", delete=True) self.__fp = fp @@ -93,7 +94,7 @@ def _close(self) -> None: # Important when caching big files. self.__buf.close() - def read(self, amt: Optional[int] = None) -> bytes: + def read(self, amt: int | None = None) -> bytes: data: bytes = self.__fp.read(amt) if data: # We may be dealing with b'', a sign that things are over: diff --git a/src/pip/_vendor/cachecontrol/heuristics.py b/src/pip/_vendor/cachecontrol/heuristics.py index 1e88ada68f2..b9d72ca4ac5 100644 --- a/src/pip/_vendor/cachecontrol/heuristics.py +++ b/src/pip/_vendor/cachecontrol/heuristics.py @@ -1,12 +1,13 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations import calendar import time from datetime import datetime, timedelta, timezone from email.utils import formatdate, parsedate, parsedate_tz -from typing import TYPE_CHECKING, Any, Dict, Mapping, Optional +from typing import TYPE_CHECKING, Any, Mapping if TYPE_CHECKING: from pip._vendor.urllib3 import HTTPResponse @@ -14,7 +15,7 @@ TIME_FMT = "%a, %d %b %Y %H:%M:%S GMT" -def expire_after(delta: timedelta, date: Optional[datetime] = None) -> datetime: +def expire_after(delta: timedelta, date: datetime | None = None) -> datetime: date = date or datetime.now(timezone.utc) return date + delta @@ -23,8 +24,8 @@ def datetime_to_header(dt: datetime) -> str: return formatdate(calendar.timegm(dt.timetuple())) -class BaseHeuristic(object): - def warning(self, response: "HTTPResponse") -> Optional[str]: +class BaseHeuristic: + def warning(self, response: HTTPResponse) -> str | None: """ Return a valid 1xx warning header value describing the cache adjustments. @@ -35,7 +36,7 @@ def warning(self, response: "HTTPResponse") -> Optional[str]: """ return '110 - "Response is Stale"' - def update_headers(self, response: "HTTPResponse") -> Dict[str, str]: + def update_headers(self, response: HTTPResponse) -> dict[str, str]: """Update the response headers with any new headers. NOTE: This SHOULD always include some Warning header to @@ -44,7 +45,7 @@ def update_headers(self, response: "HTTPResponse") -> Dict[str, str]: """ return {} - def apply(self, response: "HTTPResponse") -> "HTTPResponse": + def apply(self, response: HTTPResponse) -> HTTPResponse: updated_headers = self.update_headers(response) if updated_headers: @@ -62,7 +63,7 @@ class OneDayCache(BaseHeuristic): future. """ - def update_headers(self, response: "HTTPResponse") -> Dict[str, str]: + def update_headers(self, response: HTTPResponse) -> dict[str, str]: headers = {} if "expires" not in response.headers: @@ -81,11 +82,11 @@ class ExpiresAfter(BaseHeuristic): def __init__(self, **kw: Any) -> None: self.delta = timedelta(**kw) - def update_headers(self, response: "HTTPResponse") -> Dict[str, str]: + def update_headers(self, response: HTTPResponse) -> dict[str, str]: expires = expire_after(self.delta) return {"expires": datetime_to_header(expires), "cache-control": "public"} - def warning(self, response: "HTTPResponse") -> Optional[str]: + def warning(self, response: HTTPResponse) -> str | None: tmpl = "110 - Automatically cached for %s. Response might be stale" return tmpl % self.delta @@ -117,7 +118,7 @@ class LastModified(BaseHeuristic): 501, } - def update_headers(self, resp: "HTTPResponse") -> Dict[str, str]: + def update_headers(self, resp: HTTPResponse) -> dict[str, str]: headers: Mapping[str, str] = resp.headers if "expires" in headers: @@ -149,5 +150,5 @@ def update_headers(self, resp: "HTTPResponse") -> Dict[str, str]: expires = date + freshness_lifetime return {"expires": time.strftime(TIME_FMT, time.gmtime(expires))} - def warning(self, resp: "HTTPResponse") -> Optional[str]: + def warning(self, resp: HTTPResponse) -> str | None: return None diff --git a/src/pip/_vendor/cachecontrol/serialize.py b/src/pip/_vendor/cachecontrol/serialize.py index f21eaea6f39..f9e967c3c34 100644 --- a/src/pip/_vendor/cachecontrol/serialize.py +++ b/src/pip/_vendor/cachecontrol/serialize.py @@ -1,39 +1,27 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations -import base64 import io -import json -import pickle -import zlib -from typing import IO, TYPE_CHECKING, Any, Mapping, Optional +from typing import IO, TYPE_CHECKING, Any, Mapping, cast from pip._vendor import msgpack from pip._vendor.requests.structures import CaseInsensitiveDict from pip._vendor.urllib3 import HTTPResponse if TYPE_CHECKING: - from pip._vendor.requests import PreparedRequest, Request + from pip._vendor.requests import PreparedRequest -def _b64_decode_bytes(b: str) -> bytes: - return base64.b64decode(b.encode("ascii")) +class Serializer: + serde_version = "4" - -def _b64_decode_str(s: str) -> str: - return _b64_decode_bytes(s).decode("utf8") - - -_default_body_read = object() - - -class Serializer(object): def dumps( self, - request: "PreparedRequest", + request: PreparedRequest, response: HTTPResponse, - body: Optional[bytes] = None, + body: bytes | None = None, ) -> bytes: response_headers: CaseInsensitiveDict[str] = CaseInsensitiveDict( response.headers @@ -50,7 +38,7 @@ def dumps( data = { "response": { "body": body, # Empty bytestring if body is stored separately - "headers": dict((str(k), str(v)) for k, v in response.headers.items()), # type: ignore[no-untyped-call] + "headers": {str(k): str(v) for k, v in response.headers.items()}, # type: ignore[no-untyped-call] "status": response.status, "version": response.version, "reason": str(response.reason), @@ -69,14 +57,17 @@ def dumps( header_value = str(header_value) data["vary"][header] = header_value - return b",".join([b"cc=4", msgpack.dumps(data, use_bin_type=True)]) + return b",".join([f"cc={self.serde_version}".encode(), self.serialize(data)]) + + def serialize(self, data: dict[str, Any]) -> bytes: + return cast(bytes, msgpack.dumps(data, use_bin_type=True)) def loads( self, - request: "PreparedRequest", + request: PreparedRequest, data: bytes, - body_file: Optional["IO[bytes]"] = None, - ) -> Optional[HTTPResponse]: + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: # Short circuit if we've been given an empty set of data if not data: return None @@ -99,7 +90,7 @@ def loads( # Dispatch to the actual load method for the given version try: - return getattr(self, "_loads_v{}".format(verstr))(request, data, body_file) # type: ignore[no-any-return] + return getattr(self, f"_loads_v{verstr}")(request, data, body_file) # type: ignore[no-any-return] except AttributeError: # This is a version we don't have a loads function for, so we'll @@ -108,10 +99,10 @@ def loads( def prepare_response( self, - request: "Request", + request: PreparedRequest, cached: Mapping[str, Any], - body_file: Optional["IO[bytes]"] = None, - ) -> Optional[HTTPResponse]: + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: """Verify our vary headers match and construct a real urllib3 HTTPResponse object. """ @@ -139,7 +130,7 @@ def prepare_response( cached["response"]["headers"] = headers try: - body: "IO[bytes]" + body: IO[bytes] if body_file is None: body = io.BytesIO(body_raw) else: @@ -160,71 +151,53 @@ def prepare_response( def _loads_v0( self, - request: "Request", + request: PreparedRequest, data: bytes, - body_file: Optional["IO[bytes]"] = None, + body_file: IO[bytes] | None = None, ) -> None: # The original legacy cache data. This doesn't contain enough # information to construct everything we need, so we'll treat this as # a miss. - return + return None def _loads_v1( self, - request: "Request", + request: PreparedRequest, data: bytes, - body_file: Optional["IO[bytes]"] = None, - ) -> Optional[HTTPResponse]: - try: - cached = pickle.loads(data) - except ValueError: - return None - - return self.prepare_response(request, cached, body_file) + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: + # The "v1" pickled cache format. This is no longer supported + # for security reasons, so we treat it as a miss. + return None def _loads_v2( self, - request: "Request", + request: PreparedRequest, data: bytes, - body_file: Optional["IO[bytes]"] = None, - ) -> Optional[HTTPResponse]: - assert body_file is None - try: - cached = json.loads(zlib.decompress(data).decode("utf8")) - except (ValueError, zlib.error): - return None - - # We need to decode the items that we've base64 encoded - cached["response"]["body"] = _b64_decode_bytes(cached["response"]["body"]) - cached["response"]["headers"] = dict( - (_b64_decode_str(k), _b64_decode_str(v)) - for k, v in cached["response"]["headers"].items() - ) - cached["response"]["reason"] = _b64_decode_str(cached["response"]["reason"]) - cached["vary"] = dict( - (_b64_decode_str(k), _b64_decode_str(v) if v is not None else v) - for k, v in cached["vary"].items() - ) - - return self.prepare_response(request, cached, body_file) + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: + # The "v2" compressed base64 cache format. + # This has been removed due to age and poor size/performance + # characteristics, so we treat it as a miss. + return None def _loads_v3( self, - request: "Request", + request: PreparedRequest, data: bytes, - body_file: Optional["IO[bytes]"] = None, + body_file: IO[bytes] | None = None, ) -> None: # Due to Python 2 encoding issues, it's impossible to know for sure # exactly how to load v3 entries, thus we'll treat these as a miss so # that they get rewritten out as v4 entries. - return + return None def _loads_v4( self, - request: "Request", + request: PreparedRequest, data: bytes, - body_file: Optional["IO[bytes]"] = None, - ) -> Optional[HTTPResponse]: + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: try: cached = msgpack.loads(data, raw=False) except ValueError: diff --git a/src/pip/_vendor/cachecontrol/wrapper.py b/src/pip/_vendor/cachecontrol/wrapper.py index 293e69fe7d4..f618bc363f1 100644 --- a/src/pip/_vendor/cachecontrol/wrapper.py +++ b/src/pip/_vendor/cachecontrol/wrapper.py @@ -1,8 +1,9 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations -from typing import TYPE_CHECKING, Collection, Optional, Type +from typing import TYPE_CHECKING, Collection from pip._vendor.cachecontrol.adapter import CacheControlAdapter from pip._vendor.cachecontrol.cache import DictCache @@ -17,15 +18,15 @@ def CacheControl( - sess: "requests.Session", - cache: Optional["BaseCache"] = None, + sess: requests.Session, + cache: BaseCache | None = None, cache_etags: bool = True, - serializer: Optional["Serializer"] = None, - heuristic: Optional["BaseHeuristic"] = None, - controller_class: Optional[Type["CacheController"]] = None, - adapter_class: Optional[Type[CacheControlAdapter]] = None, - cacheable_methods: Optional[Collection[str]] = None, -) -> "requests.Session": + serializer: Serializer | None = None, + heuristic: BaseHeuristic | None = None, + controller_class: type[CacheController] | None = None, + adapter_class: type[CacheControlAdapter] | None = None, + cacheable_methods: Collection[str] | None = None, +) -> requests.Session: cache = DictCache() if cache is None else cache adapter_class = adapter_class or CacheControlAdapter adapter = adapter_class( diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt index d0f4c71cccc..c6809dfd6c3 100644 --- a/src/pip/_vendor/vendor.txt +++ b/src/pip/_vendor/vendor.txt @@ -1,4 +1,4 @@ -CacheControl==0.13.0 # Make sure to update the license in pyproject.toml for this. +CacheControl==0.13.1 # Make sure to update the license in pyproject.toml for this. colorama==0.4.6 distlib==0.3.6 distro==1.8.0 From 57af702500e30c3b592e7c6cc9eff8ea742de779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 2 Jul 2023 14:37:02 +0200 Subject: [PATCH 049/992] Add a warning to "Fallback behavior" doc snippet Add a warning noting that the "Fallback behavior" doc snippet does not provide a good example of what projects put in `pyproject.toml` and instead link to the respective setuptools documentation. In my experience, more than one project has either copied the snippets verbatim, or incorrectly included `wheel` in their `requires` based on it. --- docs/html/reference/build-system/pyproject-toml.md | 7 +++++++ news/12122.doc.rst | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 news/12122.doc.rst diff --git a/docs/html/reference/build-system/pyproject-toml.md b/docs/html/reference/build-system/pyproject-toml.md index a42a3b8c484..525bca5021f 100644 --- a/docs/html/reference/build-system/pyproject-toml.md +++ b/docs/html/reference/build-system/pyproject-toml.md @@ -130,6 +130,13 @@ dealing with [the same challenges as pip has for legacy builds](build-output). ## Fallback Behaviour +```{warning} +The following snippet merely describes the fallback behavior. For valid +examples of `pyproject.toml` to use with setuptools, please refer to +[the setuptools documentation]( +https://setuptools.pypa.io/en/stable/userguide/quickstart.html#basic-use). +``` + If a project does not have a `pyproject.toml` file containing a `build-system` section, it will be assumed to have the following backend settings: diff --git a/news/12122.doc.rst b/news/12122.doc.rst new file mode 100644 index 00000000000..dbc0ebb53fd --- /dev/null +++ b/news/12122.doc.rst @@ -0,0 +1,3 @@ +Add a warning explaining that the snippet in "Fallback behavior" is not a valid +``pyproject.toml`` snippet for projects, and link to setuptools documentation +instead. From 8aa17580ed623d926795e0cfb8885b4a4b4e044e Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 13 Jul 2023 14:57:18 +0200 Subject: [PATCH 050/992] dropped unused attribute --- src/pip/_internal/resolution/resolvelib/requirements.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index 31a515da9ac..e23b948ffc2 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -52,7 +52,6 @@ def __init__( making this a requirement on the base only. """ assert ireq.link is None, "This is a link, not a specifier" - self._drop_extras: bool = drop_extras self._ireq = ireq if not drop_extras else install_req_drop_extras(ireq) self._extras = frozenset(self._ireq.extras) From faa3289a94c59cdf647ce9d9c9277714c9363a62 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 13 Jul 2023 16:40:56 +0200 Subject: [PATCH 051/992] use regex for requirement update --- src/pip/_internal/req/constructors.py | 28 +++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index 8b1438afe1e..ee38b9a6183 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -58,6 +58,26 @@ def convert_extras(extras: Optional[str]) -> Set[str]: return get_requirement("placeholder" + extras.lower()).extras +def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requirement: + """ + Returns a new requirement based on the given one, with the supplied extras. If the + given requirement already has extras those are replaced (or dropped if no new extras + are given). + """ + match: re.Match = re.fullmatch(r"([^;\[<>~=]+)(\[[^\]]*\])?(.*)", str(req)) + # ireq.req is a valid requirement so the regex should match + assert match is not None + pre: Optional[str] = match.group(1) + post: Optional[str] = match.group(3) + assert pre is not None and post is not None + extras: str = ( + "[%s]" % ",".join(sorted(new_extras)) + if new_extras + else "" + ) + return Requirement(pre + extras + post) + + def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]: """Parses an editable requirement into: - a requirement name @@ -513,10 +533,8 @@ def install_req_drop_extras(ireq: InstallRequirement) -> InstallRequirement: any extras. Sets the original requirement as the new one's parent (comes_from). """ - req = Requirement(str(ireq.req)) - req.extras = {} return InstallRequirement( - req=req, + req=_set_requirement_extras(ireq.req, set()), comes_from=ireq, editable=ireq.editable, link=ireq.link, @@ -542,8 +560,6 @@ def install_req_extend_extras( Makes a shallow copy of the ireq object. """ result = copy.copy(ireq) - req = Requirement(str(ireq.req)) - req.extras.update(extras) - result.req = req result.extras = {*ireq.extras, *extras} + result.req = _set_requirement_extras(ireq.req, result.extras) return result From 7e8da6176f9da32e44b8a1515e450ca8158a356a Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 13 Jul 2023 17:02:53 +0200 Subject: [PATCH 052/992] clarification --- src/pip/_internal/req/constructors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index ee38b9a6183..f97bded9887 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -65,7 +65,7 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme are given). """ match: re.Match = re.fullmatch(r"([^;\[<>~=]+)(\[[^\]]*\])?(.*)", str(req)) - # ireq.req is a valid requirement so the regex should match + # ireq.req is a valid requirement so the regex should always match assert match is not None pre: Optional[str] = match.group(1) post: Optional[str] = match.group(3) From ff9aeae0d2e39720e40e8fffae942d659495fd84 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Tue, 25 Jul 2023 15:36:33 +0200 Subject: [PATCH 053/992] added resolver test case --- tests/functional/test_new_resolver.py | 82 +++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index fc52ab9c8d8..88dd635ae26 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -2272,6 +2272,88 @@ def test_new_resolver_dont_backtrack_on_extra_if_base_constrained( script.assert_installed(pkg="1.0", dep="1.0") +@pytest.mark.parametrize("swap_order", (True, False)) +@pytest.mark.parametrize("two_extras", (True, False)) +def test_new_resolver_dont_backtrack_on_extra_if_base_constrained_in_requirement( + script: PipTestEnvironment, swap_order: bool, two_extras: bool +) -> None: + """ + Verify that a requirement with a constraint on a package (either on the base + on the base with an extra) causes the resolver to infer the same constraint for + any (other) extras with the same base. + + :param swap_order: swap the order the install specifiers appear in + :param two_extras: also add an extra for the constrained specifier + """ + create_basic_wheel_for_package(script, "dep", "1.0") + create_basic_wheel_for_package( + script, "pkg", "1.0", extras={"ext1": ["dep"], "ext2": ["dep"]} + ) + create_basic_wheel_for_package( + script, "pkg", "2.0", extras={"ext1": ["dep"], "ext2": ["dep"]} + ) + + to_install: tuple[str, str] = ( + "pkg[ext1]", "pkg[ext2]==1.0" if two_extras else "pkg==1.0" + ) + + result = script.pip( + "install", + "--no-cache-dir", + "--no-index", + "--find-links", + script.scratch_path, + *(to_install if not swap_order else reversed(to_install)), + ) + assert "pkg-2.0" not in result.stdout, "Should not try 2.0 due to constraint" + script.assert_installed(pkg="1.0", dep="1.0") + + +@pytest.mark.parametrize("swap_order", (True, False)) +@pytest.mark.parametrize("two_extras", (True, False)) +def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras( + script: PipTestEnvironment, swap_order: bool, two_extras: bool +) -> None: + """ + Verify that conflicting constraints on the same package with different + extras cause the resolver to trivially reject the request rather than + trying any candidates. + + :param swap_order: swap the order the install specifiers appear in + :param two_extras: also add an extra for the second specifier + """ + create_basic_wheel_for_package(script, "dep", "1.0") + create_basic_wheel_for_package( + script, "pkg", "1.0", extras={"ext1": ["dep"], "ext2": ["dep"]} + ) + create_basic_wheel_for_package( + script, "pkg", "2.0", extras={"ext1": ["dep"], "ext2": ["dep"]} + ) + + to_install: tuple[str, str] = ( + "pkg[ext1]>1", "pkg[ext2]==1.0" if two_extras else "pkg==1.0" + ) + + result = script.pip( + "install", + "--no-cache-dir", + "--no-index", + "--find-links", + script.scratch_path, + *(to_install if not swap_order else reversed(to_install)), + expect_error=True, + ) + assert "pkg-2.0" not in result.stdout or "pkg-1.0" not in result.stdout, ( + "Should only try one of 1.0, 2.0 depending on order" + ) + assert "looking at multiple versions" not in result.stdout, ( + "Should not have to look at multiple versions to conclude conflict" + ) + assert "conflict is caused by" in result.stdout, ( + "Resolver should be trivially able to find conflict cause" + ) + + def test_new_resolver_respect_user_requested_if_extra_is_installed( script: PipTestEnvironment, ) -> None: From 3fa373c0789699233726c02c2e72643d66da26e0 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Tue, 25 Jul 2023 15:59:20 +0200 Subject: [PATCH 054/992] added test for comes-from reporting --- tests/functional/test_new_resolver.py | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index 88dd635ae26..e597669b3a2 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -2429,3 +2429,31 @@ def test_new_resolver_works_when_failing_package_builds_are_disallowed( ) script.assert_installed(pkg2="1.0", pkg1="1.0") + + +@pytest.mark.parametrize("swap_order", (True, False)) +def test_new_resolver_comes_from_with_extra( + script: PipTestEnvironment, swap_order: bool +) -> None: + """ + Verify that reporting where a dependency comes from is accurate when it comes + from a package with an extra. + + :param swap_order: swap the order the install specifiers appear in + """ + create_basic_wheel_for_package(script, "dep", "1.0") + create_basic_wheel_for_package(script, "pkg", "1.0", extras={"ext": ["dep"]}) + + to_install: tuple[str, str] = ("pkg", "pkg[ext]") + + result = script.pip( + "install", + "--no-cache-dir", + "--no-index", + "--find-links", + script.scratch_path, + *(to_install if not swap_order else reversed(to_install)), + ) + assert "(from pkg[ext])" in result.stdout + assert "(from pkg)" not in result.stdout + script.assert_installed(pkg="1.0", dep="1.0") From e5690173515ce0dc82bcbc254d9211ca4124031c Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Tue, 25 Jul 2023 16:34:23 +0200 Subject: [PATCH 055/992] added test case for report bugfix --- tests/functional/test_install_report.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/functional/test_install_report.py b/tests/functional/test_install_report.py index 003b29d3821..1c3ffe80b70 100644 --- a/tests/functional/test_install_report.py +++ b/tests/functional/test_install_report.py @@ -64,14 +64,26 @@ def test_install_report_dep( assert _install_dict(report)["simple"]["requested"] is False +@pytest.mark.parametrize( + "specifiers", + [ + # result should be the same regardless of the method and order in which + # extras are specified + ("Paste[openid]==1.7.5.1",), + ("Paste==1.7.5.1", "Paste[openid]==1.7.5.1"), + ("Paste[openid]==1.7.5.1", "Paste==1.7.5.1"), + ], +) @pytest.mark.network -def test_install_report_index(script: PipTestEnvironment, tmp_path: Path) -> None: +def test_install_report_index( + script: PipTestEnvironment, tmp_path: Path, specifiers: tuple[str, ...] +) -> None: """Test report for sdist obtained from index.""" report_path = tmp_path / "report.json" script.pip( "install", "--dry-run", - "Paste[openid]==1.7.5.1", + *specifiers, "--report", str(report_path), ) From cc6a2bded22001a6a3996f741b674ab1bab835ff Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Tue, 25 Jul 2023 16:38:51 +0200 Subject: [PATCH 056/992] added second report test case --- tests/functional/test_install_report.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/functional/test_install_report.py b/tests/functional/test_install_report.py index 1c3ffe80b70..f9a2e27c033 100644 --- a/tests/functional/test_install_report.py +++ b/tests/functional/test_install_report.py @@ -105,6 +105,26 @@ def test_install_report_index( assert "requires_dist" in paste_report["metadata"] +@pytest.mark.network +def test_install_report_index_multiple_extras( + script: PipTestEnvironment, tmp_path: Path +) -> None: + """Test report for sdist obtained from index, with multiple extras requested.""" + report_path = tmp_path / "report.json" + script.pip( + "install", + "--dry-run", + "Paste[openid]", + "Paste[subprocess]", + "--report", + str(report_path), + ) + report = json.loads(report_path.read_text()) + install_dict = _install_dict(report) + assert "paste" in install_dict + assert install_dict["paste"]["requested_extras"] == ["openid", "subprocess"] + + @pytest.mark.network def test_install_report_direct_archive( script: PipTestEnvironment, tmp_path: Path, shared_data: TestData From 4ae829cb3f40d6a64c86988e2f591c3344123bcd Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Tue, 25 Jul 2023 17:14:50 +0200 Subject: [PATCH 057/992] news entries --- news/11924.bugfix.rst | 1 + news/12095.bugfix.rst | 1 + 2 files changed, 2 insertions(+) create mode 100644 news/11924.bugfix.rst create mode 100644 news/12095.bugfix.rst diff --git a/news/11924.bugfix.rst b/news/11924.bugfix.rst new file mode 100644 index 00000000000..30bc60e6bce --- /dev/null +++ b/news/11924.bugfix.rst @@ -0,0 +1 @@ +Improve extras resolution for multiple constraints on same base package. diff --git a/news/12095.bugfix.rst b/news/12095.bugfix.rst new file mode 100644 index 00000000000..1f5018326ba --- /dev/null +++ b/news/12095.bugfix.rst @@ -0,0 +1 @@ +Consistently report whether a dependency comes from an extra. From dc01a40d413351085410a39dc6f616c5e1e21002 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Tue, 25 Jul 2023 17:19:21 +0200 Subject: [PATCH 058/992] py38 compatibility --- src/pip/_internal/resolution/resolvelib/factory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 03820edde6a..fdb5c4987ae 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -447,7 +447,7 @@ def find_candidates( def _make_requirements_from_install_req( self, ireq: InstallRequirement, requested_extras: Iterable[str] - ) -> list[Requirement]: + ) -> List[Requirement]: """ Returns requirement objects associated with the given InstallRequirement. In most cases this will be a single object but the following special cases exist: @@ -543,7 +543,7 @@ def make_requirements_from_spec( specifier: str, comes_from: Optional[InstallRequirement], requested_extras: Iterable[str] = (), - ) -> list[Requirement]: + ) -> List[Requirement]: """ Returns requirement objects associated with the given specifier. In most cases this will be a single object but the following special cases exist: From 292387f20b8c6e0d57e9eec940621ef0932499c8 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Tue, 25 Jul 2023 17:25:05 +0200 Subject: [PATCH 059/992] py37 compatibility --- tests/functional/test_install_report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/test_install_report.py b/tests/functional/test_install_report.py index f9a2e27c033..d7553ec0352 100644 --- a/tests/functional/test_install_report.py +++ b/tests/functional/test_install_report.py @@ -1,7 +1,7 @@ import json import textwrap from pathlib import Path -from typing import Any, Dict +from typing import Any, Dict, Tuple import pytest from packaging.utils import canonicalize_name @@ -76,7 +76,7 @@ def test_install_report_dep( ) @pytest.mark.network def test_install_report_index( - script: PipTestEnvironment, tmp_path: Path, specifiers: tuple[str, ...] + script: PipTestEnvironment, tmp_path: Path, specifiers: Tuple[str, ...] ) -> None: """Test report for sdist obtained from index.""" report_path = tmp_path / "report.json" From 39e1102800af8be86ed385aed7f93f6535262d29 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Tue, 25 Jul 2023 17:33:06 +0200 Subject: [PATCH 060/992] fixed minor type errors --- src/pip/_internal/req/constructors.py | 16 +++++++++++++--- .../_internal/resolution/resolvelib/factory.py | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index f97bded9887..3b7243f8256 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -64,7 +64,9 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme given requirement already has extras those are replaced (or dropped if no new extras are given). """ - match: re.Match = re.fullmatch(r"([^;\[<>~=]+)(\[[^\]]*\])?(.*)", str(req)) + match: Optional[re.Match[str]] = re.fullmatch( + r"([^;\[<>~=]+)(\[[^\]]*\])?(.*)", str(req) + ) # ireq.req is a valid requirement so the regex should always match assert match is not None pre: Optional[str] = match.group(1) @@ -534,7 +536,11 @@ def install_req_drop_extras(ireq: InstallRequirement) -> InstallRequirement: (comes_from). """ return InstallRequirement( - req=_set_requirement_extras(ireq.req, set()), + req=( + _set_requirement_extras(ireq.req, set()) + if ireq.req is not None + else None + ), comes_from=ireq, editable=ireq.editable, link=ireq.link, @@ -561,5 +567,9 @@ def install_req_extend_extras( """ result = copy.copy(ireq) result.extras = {*ireq.extras, *extras} - result.req = _set_requirement_extras(ireq.req, result.extras) + result.req = ( + _set_requirement_extras(ireq.req, result.extras) + if ireq.req is not None + else None + ) return result diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index fdb5c4987ae..2812fab57d9 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -465,7 +465,7 @@ def _make_requirements_from_install_req( ) return [] if not ireq.link: - if ireq.extras and ireq.req.specifier: + if ireq.extras and ireq.req is not None and ireq.req.specifier: return [ SpecifierRequirement(ireq, drop_extras=True), SpecifierRequirement(ireq), From e6333bb4d18edc8aec9b38601f81867ad1036807 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 10:32:58 +0200 Subject: [PATCH 061/992] linting --- src/pip/_internal/req/constructors.py | 12 +++------- .../resolution/resolvelib/requirements.py | 2 +- tests/functional/test_new_resolver.py | 24 ++++++++++--------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index 3b7243f8256..b5f176e6b38 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -16,7 +16,7 @@ from pip._vendor.packaging.markers import Marker from pip._vendor.packaging.requirements import InvalidRequirement, Requirement -from pip._vendor.packaging.specifiers import Specifier, SpecifierSet +from pip._vendor.packaging.specifiers import Specifier from pip._internal.exceptions import InstallationError from pip._internal.models.index import PyPI, TestPyPI @@ -72,11 +72,7 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme pre: Optional[str] = match.group(1) post: Optional[str] = match.group(3) assert pre is not None and post is not None - extras: str = ( - "[%s]" % ",".join(sorted(new_extras)) - if new_extras - else "" - ) + extras: str = "[%s]" % ",".join(sorted(new_extras)) if new_extras else "" return Requirement(pre + extras + post) @@ -537,9 +533,7 @@ def install_req_drop_extras(ireq: InstallRequirement) -> InstallRequirement: """ return InstallRequirement( req=( - _set_requirement_extras(ireq.req, set()) - if ireq.req is not None - else None + _set_requirement_extras(ireq.req, set()) if ireq.req is not None else None ), comes_from=ireq, editable=ireq.editable, diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index e23b948ffc2..ad9892a17a2 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -1,8 +1,8 @@ from pip._vendor.packaging.specifiers import SpecifierSet from pip._vendor.packaging.utils import NormalizedName, canonicalize_name -from pip._internal.req.req_install import InstallRequirement from pip._internal.req.constructors import install_req_drop_extras +from pip._internal.req.req_install import InstallRequirement from .base import Candidate, CandidateLookup, Requirement, format_name diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index e597669b3a2..77dede2fc5a 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -2294,7 +2294,8 @@ def test_new_resolver_dont_backtrack_on_extra_if_base_constrained_in_requirement ) to_install: tuple[str, str] = ( - "pkg[ext1]", "pkg[ext2]==1.0" if two_extras else "pkg==1.0" + "pkg[ext1]", + "pkg[ext2]==1.0" if two_extras else "pkg==1.0", ) result = script.pip( @@ -2331,7 +2332,8 @@ def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras( ) to_install: tuple[str, str] = ( - "pkg[ext1]>1", "pkg[ext2]==1.0" if two_extras else "pkg==1.0" + "pkg[ext1]>1", + "pkg[ext2]==1.0" if two_extras else "pkg==1.0", ) result = script.pip( @@ -2343,15 +2345,15 @@ def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras( *(to_install if not swap_order else reversed(to_install)), expect_error=True, ) - assert "pkg-2.0" not in result.stdout or "pkg-1.0" not in result.stdout, ( - "Should only try one of 1.0, 2.0 depending on order" - ) - assert "looking at multiple versions" not in result.stdout, ( - "Should not have to look at multiple versions to conclude conflict" - ) - assert "conflict is caused by" in result.stdout, ( - "Resolver should be trivially able to find conflict cause" - ) + assert ( + "pkg-2.0" not in result.stdout or "pkg-1.0" not in result.stdout + ), "Should only try one of 1.0, 2.0 depending on order" + assert ( + "looking at multiple versions" not in result.stdout + ), "Should not have to look at multiple versions to conclude conflict" + assert ( + "conflict is caused by" in result.stdout + ), "Resolver should be trivially able to find conflict cause" def test_new_resolver_respect_user_requested_if_extra_is_installed( From 12073891776472dd3517106da1c26483d64e1557 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 10:33:43 +0200 Subject: [PATCH 062/992] made primary news fragment of type feature --- news/{11924.bugfix.rst => 11924.feature.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{11924.bugfix.rst => 11924.feature.rst} (100%) diff --git a/news/11924.bugfix.rst b/news/11924.feature.rst similarity index 100% rename from news/11924.bugfix.rst rename to news/11924.feature.rst From 6663b89a4d465f675b88bce52d4ad7cef9164c6a Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 10:37:00 +0200 Subject: [PATCH 063/992] added final bugfix news entry --- news/11924.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/11924.bugfix.rst diff --git a/news/11924.bugfix.rst b/news/11924.bugfix.rst new file mode 100644 index 00000000000..7a9ee3151a4 --- /dev/null +++ b/news/11924.bugfix.rst @@ -0,0 +1 @@ +Include all requested extras in the install report (``--report``). From 314d7c12549a60c8460b1e2a8dac82fe0cca848a Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 10:52:42 +0200 Subject: [PATCH 064/992] simplified regex --- src/pip/_internal/req/constructors.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index b5f176e6b38..c03ae718e90 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -65,7 +65,10 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme are given). """ match: Optional[re.Match[str]] = re.fullmatch( - r"([^;\[<>~=]+)(\[[^\]]*\])?(.*)", str(req) + # see https://peps.python.org/pep-0508/#complete-grammar + r"([\w\t .-]+)(\[[^\]]*\])?(.*)", + str(req), + flags=re.ASCII, ) # ireq.req is a valid requirement so the regex should always match assert match is not None From cc909e87e5ccada46b4eb8a2a90c329614dc9b01 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 11:06:24 +0200 Subject: [PATCH 065/992] reverted unnecessary changes --- src/pip/_internal/resolution/resolvelib/requirements.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index ad9892a17a2..becbd6c4bcc 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -56,7 +56,7 @@ def __init__( self._extras = frozenset(self._ireq.extras) def __str__(self) -> str: - return str(self._ireq) + return str(self._ireq.req) def __repr__(self) -> str: return "{class_name}({requirement!r})".format( @@ -71,10 +71,7 @@ def project_name(self) -> NormalizedName: @property def name(self) -> str: - return format_name( - self.project_name, - self._extras, - ) + return format_name(self.project_name, self._extras) def format_for_error(self) -> str: # Convert comma-separated specifiers into "A, B, ..., F and G" From 6ed231a52be89295e3cecdb4f41eaf63f3152941 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 11:34:37 +0200 Subject: [PATCH 066/992] added unit tests for install req manipulation --- tests/unit/test_req.py | 87 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py index 545828f8eea..b4819d8320a 100644 --- a/tests/unit/test_req.py +++ b/tests/unit/test_req.py @@ -6,7 +6,7 @@ import tempfile from functools import partial from pathlib import Path -from typing import Iterator, Optional, Tuple, cast +from typing import Iterator, Optional, Set, Tuple, cast from unittest import mock import pytest @@ -33,6 +33,8 @@ from pip._internal.req.constructors import ( _get_url_from_path, _looks_like_path, + install_req_drop_extras, + install_req_extend_extras, install_req_from_editable, install_req_from_line, install_req_from_parsed_requirement, @@ -763,6 +765,89 @@ def test_requirement_file(self) -> None: assert "appears to be a requirements file." in err_msg assert "If that is the case, use the '-r' flag to install" in err_msg + @pytest.mark.parametrize( + "inp, out", + [ + ("pkg", "pkg"), + ("pkg==1.0", "pkg==1.0"), + ("pkg ; python_version<='3.6'", "pkg"), + ("pkg[ext]", "pkg"), + ("pkg [ ext1, ext2 ]", "pkg"), + ("pkg [ ext1, ext2 ] @ https://example.com/", "pkg@ https://example.com/"), + ("pkg [ext] == 1.0; python_version<='3.6'", "pkg==1.0"), + ("pkg-all.allowed_chars0 ~= 2.0", "pkg-all.allowed_chars0~=2.0"), + ("pkg-all.allowed_chars0 [ext] ~= 2.0", "pkg-all.allowed_chars0~=2.0"), + ], + ) + def test_install_req_drop_extras(self, inp: str, out: str) -> None: + """ + Test behavior of install_req_drop_extras + """ + req = install_req_from_line(inp) + without_extras = install_req_drop_extras(req) + assert not without_extras.extras + assert str(without_extras.req) == out + # should always be a copy + assert req is not without_extras + assert req.req is not without_extras.req + # comes_from should point to original + assert without_extras.comes_from is req + # all else should be the same + assert without_extras.link == req.link + assert without_extras.markers == req.markers + assert without_extras.use_pep517 == req.use_pep517 + assert without_extras.isolated == req.isolated + assert without_extras.global_options == req.global_options + assert without_extras.hash_options == req.hash_options + assert without_extras.constraint == req.constraint + assert without_extras.config_settings == req.config_settings + assert without_extras.user_supplied == req.user_supplied + assert without_extras.permit_editable_wheels == req.permit_editable_wheels + + @pytest.mark.parametrize( + "inp, extras, out", + [ + ("pkg", {}, "pkg"), + ("pkg==1.0", {}, "pkg==1.0"), + ("pkg[ext]", {}, "pkg[ext]"), + ("pkg", {"ext"}, "pkg[ext]"), + ("pkg==1.0", {"ext"}, "pkg[ext]==1.0"), + ("pkg==1.0", {"ext1", "ext2"}, "pkg[ext1,ext2]==1.0"), + ("pkg; python_version<='3.6'", {"ext"}, "pkg[ext]"), + ("pkg[ext1,ext2]==1.0", {"ext2", "ext3"}, "pkg[ext1,ext2,ext3]==1.0"), + ( + "pkg-all.allowed_chars0 [ ext1 ] @ https://example.com/", + {"ext2"}, + "pkg-all.allowed_chars0[ext1,ext2]@ https://example.com/", + ), + ], + ) + def test_install_req_extend_extras( + self, inp: str, extras: Set[str], out: str + ) -> None: + """ + Test behavior of install_req_extend_extras + """ + req = install_req_from_line(inp) + extended = install_req_extend_extras(req, extras) + assert str(extended.req) == out + assert extended.req is not None + assert set(extended.extras) == set(extended.req.extras) + # should always be a copy + assert req is not extended + assert req.req is not extended.req + # all else should be the same + assert extended.link == req.link + assert extended.markers == req.markers + assert extended.use_pep517 == req.use_pep517 + assert extended.isolated == req.isolated + assert extended.global_options == req.global_options + assert extended.hash_options == req.hash_options + assert extended.constraint == req.constraint + assert extended.config_settings == req.config_settings + assert extended.user_supplied == req.user_supplied + assert extended.permit_editable_wheels == req.permit_editable_wheels + @mock.patch("pip._internal.req.req_install.os.path.abspath") @mock.patch("pip._internal.req.req_install.os.path.exists") From 55e9762873d824608ae52570ef3dcbb65e75f833 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 14:02:50 +0200 Subject: [PATCH 067/992] windows compatibility --- tests/lib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index 7c06feaf38c..d424a5e8dae 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -645,7 +645,7 @@ def run( cwd = cwd or self.cwd if sys.platform == "win32": # Partial fix for ScriptTest.run using `shell=True` on Windows. - args = tuple(str(a).replace("^", "^^").replace("&", "^&") for a in args) + args = tuple(str(a).replace("^", "^^").replace("&", "^&").replace(">", "^>") for a in args) if allow_error: kw["expect_error"] = True From 504485c27644f7a8b44cec179bfc0fac181b0d9e Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 14:03:26 +0200 Subject: [PATCH 068/992] lint --- tests/lib/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index d424a5e8dae..b6996f31d91 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -645,7 +645,10 @@ def run( cwd = cwd or self.cwd if sys.platform == "win32": # Partial fix for ScriptTest.run using `shell=True` on Windows. - args = tuple(str(a).replace("^", "^^").replace("&", "^&").replace(">", "^>") for a in args) + args = tuple( + str(a).replace("^", "^^").replace("&", "^&").replace(">", "^>") + for a in args + ) if allow_error: kw["expect_error"] = True From f4a7c0c569caf665c11379cd9629e5a5163867f5 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 14:12:38 +0200 Subject: [PATCH 069/992] cleaned up windows fix --- tests/lib/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index b6996f31d91..a7f2ade1a1d 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -645,10 +645,7 @@ def run( cwd = cwd or self.cwd if sys.platform == "win32": # Partial fix for ScriptTest.run using `shell=True` on Windows. - args = tuple( - str(a).replace("^", "^^").replace("&", "^&").replace(">", "^>") - for a in args - ) + args = tuple(re.sub("([&|()<>^])", r"^\1", str(a)) for a in args) if allow_error: kw["expect_error"] = True From 32e95be2130333e4f543778302fdc4d0c47043ad Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 26 Jul 2023 14:31:12 +0200 Subject: [PATCH 070/992] exclude brackets --- tests/lib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index a7f2ade1a1d..018152930c2 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -645,7 +645,7 @@ def run( cwd = cwd or self.cwd if sys.platform == "win32": # Partial fix for ScriptTest.run using `shell=True` on Windows. - args = tuple(re.sub("([&|()<>^])", r"^\1", str(a)) for a in args) + args = tuple(re.sub("([&|<>^])", r"^\1", str(a)) for a in args) if allow_error: kw["expect_error"] = True From d65ba2f6b6f446058b289b35373b0a6c36720fba Mon Sep 17 00:00:00 2001 From: Jeff Widman Date: Wed, 2 Aug 2023 13:54:12 -0700 Subject: [PATCH 071/992] Replace python2 deprecation with a badge of supported python versions The python world has (mostly) moved on from Python 2. Anyone not already aware of the py2->py3 migration is probably new to the ecosystem and started on Python 3. Additionally, it's convenient to see at a glance what versions of Python are supported by the current release. This pulls from PyPI versions, so will not immediately match `main` (we can probably change this to match `main` if preferred). So by doing this it's both more useful going forward, and also lets us drop the explicit notice about dropping Python 2 support. --- README.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index c2d5c969397..6ff117db5d2 100644 --- a/README.rst +++ b/README.rst @@ -3,9 +3,15 @@ pip - The Python Package Installer .. image:: https://img.shields.io/pypi/v/pip.svg :target: https://pypi.org/project/pip/ + :alt: PyPI + +.. image:: https://img.shields.io/pypi/pyversions/pip + :target: https://pypi.org/project/pip + :alt: PyPI - Python Version .. image:: https://readthedocs.org/projects/pip/badge/?version=latest :target: https://pip.pypa.io/en/latest + :alt: Documentation pip is the `package installer`_ for Python. You can use pip to install packages from the `Python Package Index`_ and other indexes. @@ -19,8 +25,6 @@ We release updates regularly, with a new version every 3 months. Find more detai * `Release notes`_ * `Release process`_ -**Note**: pip 21.0, in January 2021, removed Python 2 support, per pip's `Python 2 support policy`_. Please migrate to Python 3. - If you find bugs, need help, or want to talk to the developers, please use our mailing lists or chat rooms: * `Issue tracking`_ @@ -47,7 +51,6 @@ rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_. .. _Release process: https://pip.pypa.io/en/latest/development/release-process/ .. _GitHub page: https://github.com/pypa/pip .. _Development documentation: https://pip.pypa.io/en/latest/development -.. _Python 2 support policy: https://pip.pypa.io/en/latest/development/release-process/#python-2-support .. _Issue tracking: https://github.com/pypa/pip/issues .. _Discourse channel: https://discuss.python.org/c/packaging .. _User IRC: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa From 21bfe401a96ddecb2a827b9b3cd5ff1b833b151f Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 6 Sep 2023 11:50:10 +0200 Subject: [PATCH 072/992] use more stable sort key --- src/pip/_internal/resolution/resolvelib/resolver.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/resolver.py b/src/pip/_internal/resolution/resolvelib/resolver.py index 4c53dfb25c1..2e4941da814 100644 --- a/src/pip/_internal/resolution/resolvelib/resolver.py +++ b/src/pip/_internal/resolution/resolvelib/resolver.py @@ -104,8 +104,9 @@ def resolve( raise error from e req_set = RequirementSet(check_supported_wheels=check_supported_wheels) - # sort to ensure base candidates come before candidates with extras - for candidate in sorted(result.mapping.values(), key=lambda c: c.name): + # process candidates with extras last to ensure their base equivalent is already in the req_set if appropriate + # Python's sort is stable so using a binary key function keeps relative order within both subsets + for candidate in sorted(result.mapping.values(), key=lambda c: c.name != c.project_name): ireq = candidate.get_install_requirement() if ireq is None: if candidate.name != candidate.project_name: From 0de374e4df5707955fc6bf9602ee86ea21c8f258 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 6 Sep 2023 13:52:41 +0200 Subject: [PATCH 073/992] review comment: return iterator instead of list --- .../resolution/resolvelib/factory.py | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 0eb7a1c662e..81f482c8626 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -1,4 +1,5 @@ import contextlib +import itertools import functools import logging from typing import ( @@ -447,7 +448,7 @@ def find_candidates( def _make_requirements_from_install_req( self, ireq: InstallRequirement, requested_extras: Iterable[str] - ) -> List[Requirement]: + ) -> Iterator[Requirement]: """ Returns requirement objects associated with the given InstallRequirement. In most cases this will be a single object but the following special cases exist: @@ -463,34 +464,32 @@ def _make_requirements_from_install_req( ireq.name, ireq.markers, ) - return [] - if not ireq.link: + yield from () + elif not ireq.link: if ireq.extras and ireq.req is not None and ireq.req.specifier: - return [ - SpecifierRequirement(ireq, drop_extras=True), - SpecifierRequirement(ireq), - ] + yield SpecifierRequirement(ireq, drop_extras=True), + yield SpecifierRequirement(ireq) + else: + self._fail_if_link_is_unsupported_wheel(ireq.link) + cand = self._make_candidate_from_link( + ireq.link, + extras=frozenset(ireq.extras), + template=ireq, + name=canonicalize_name(ireq.name) if ireq.name else None, + version=None, + ) + if cand is None: + # There's no way we can satisfy a URL requirement if the underlying + # candidate fails to build. An unnamed URL must be user-supplied, so + # we fail eagerly. If the URL is named, an unsatisfiable requirement + # can make the resolver do the right thing, either backtrack (and + # maybe find some other requirement that's buildable) or raise a + # ResolutionImpossible eventually. + if not ireq.name: + raise self._build_failures[ireq.link] + yield UnsatisfiableRequirement(canonicalize_name(ireq.name)) else: - return [SpecifierRequirement(ireq)] - self._fail_if_link_is_unsupported_wheel(ireq.link) - cand = self._make_candidate_from_link( - ireq.link, - extras=frozenset(ireq.extras), - template=ireq, - name=canonicalize_name(ireq.name) if ireq.name else None, - version=None, - ) - if cand is None: - # There's no way we can satisfy a URL requirement if the underlying - # candidate fails to build. An unnamed URL must be user-supplied, so - # we fail eagerly. If the URL is named, an unsatisfiable requirement - # can make the resolver do the right thing, either backtrack (and - # maybe find some other requirement that's buildable) or raise a - # ResolutionImpossible eventually. - if not ireq.name: - raise self._build_failures[ireq.link] - return [UnsatisfiableRequirement(canonicalize_name(ireq.name))] - return [self.make_requirement_from_candidate(cand)] + yield self.make_requirement_from_candidate(cand) def collect_root_requirements( self, root_ireqs: List[InstallRequirement] @@ -511,13 +510,14 @@ def collect_root_requirements( else: collected.constraints[name] = Constraint.from_ireq(ireq) else: - reqs = self._make_requirements_from_install_req( - ireq, - requested_extras=(), + reqs = list( + self._make_requirements_from_install_req( + ireq, + requested_extras=(), + ) ) if not reqs: continue - template = reqs[0] if ireq.user_supplied and template.name not in collected.user_requested: collected.user_requested[template.name] = i @@ -543,7 +543,7 @@ def make_requirements_from_spec( specifier: str, comes_from: Optional[InstallRequirement], requested_extras: Iterable[str] = (), - ) -> List[Requirement]: + ) -> Iterator[Requirement]: """ Returns requirement objects associated with the given specifier. In most cases this will be a single object but the following special cases exist: From 5a0167902261b97df768cbcf4757b665cd39229e Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 6 Sep 2023 13:54:28 +0200 Subject: [PATCH 074/992] Update src/pip/_internal/req/constructors.py Co-authored-by: Tzu-ping Chung --- src/pip/_internal/req/constructors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index c03ae718e90..a40191954f8 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -76,7 +76,7 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme post: Optional[str] = match.group(3) assert pre is not None and post is not None extras: str = "[%s]" % ",".join(sorted(new_extras)) if new_extras else "" - return Requirement(pre + extras + post) + return Requirement(f"{pre}{extras}{post}") def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]: From 4e73e3e96e99f79d8458517278f67e33796a7fd0 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 6 Sep 2023 14:39:51 +0200 Subject: [PATCH 075/992] review comment: subclass instead of constructor flag --- .../resolution/resolvelib/factory.py | 4 ++-- .../resolution/resolvelib/requirements.py | 24 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 81f482c8626..af13a33215b 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -1,5 +1,4 @@ import contextlib -import itertools import functools import logging from typing import ( @@ -63,6 +62,7 @@ ExplicitRequirement, RequiresPythonRequirement, SpecifierRequirement, + SpecifierWithoutExtrasRequirement, UnsatisfiableRequirement, ) @@ -467,7 +467,7 @@ def _make_requirements_from_install_req( yield from () elif not ireq.link: if ireq.extras and ireq.req is not None and ireq.req.specifier: - yield SpecifierRequirement(ireq, drop_extras=True), + yield SpecifierWithoutExtrasRequirement(ireq), yield SpecifierRequirement(ireq) else: self._fail_if_link_is_unsupported_wheel(ireq.link) diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index becbd6c4bcc..9c2512823a3 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -41,18 +41,9 @@ def is_satisfied_by(self, candidate: Candidate) -> bool: class SpecifierRequirement(Requirement): - def __init__( - self, - ireq: InstallRequirement, - *, - drop_extras: bool = False, - ) -> None: - """ - :param drop_extras: Ignore any extras that are part of the install requirement, - making this a requirement on the base only. - """ + def __init__(self, ireq: InstallRequirement) -> None: assert ireq.link is None, "This is a link, not a specifier" - self._ireq = ireq if not drop_extras else install_req_drop_extras(ireq) + self._ireq = ireq self._extras = frozenset(self._ireq.extras) def __str__(self) -> str: @@ -102,6 +93,17 @@ def is_satisfied_by(self, candidate: Candidate) -> bool: return spec.contains(candidate.version, prereleases=True) +class SpecifierWithoutExtrasRequirement(SpecifierRequirement): + """ + Requirement backed by an install requirement on a base package. Trims extras from its install requirement if there are any. + """ + + def __init__(self, ireq: InstallRequirement) -> None: + assert ireq.link is None, "This is a link, not a specifier" + self._ireq = install_req_drop_extras(ireq) + self._extras = frozenset(self._ireq.extras) + + class RequiresPythonRequirement(Requirement): """A requirement representing Requires-Python metadata.""" From 50cd318cefcdd2a451b0a70a3bf3f31a3ecc6b99 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 6 Sep 2023 15:06:19 +0200 Subject: [PATCH 076/992] review comment: renamed and moved up ExtrasCandidate._ireq --- src/pip/_internal/resolution/resolvelib/candidates.py | 9 +++++---- src/pip/_internal/resolution/resolvelib/factory.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py index 23883484139..d658be37284 100644 --- a/src/pip/_internal/resolution/resolvelib/candidates.py +++ b/src/pip/_internal/resolution/resolvelib/candidates.py @@ -427,10 +427,11 @@ def __init__( self, base: BaseCandidate, extras: FrozenSet[str], - ireq: Optional[InstallRequirement] = None, + *, + comes_from: Optional[InstallRequirement] = None, ) -> None: """ - :param ireq: the InstallRequirement that led to this candidate, if it + :param ireq: the InstallRequirement that led to this candidate if it differs from the base's InstallRequirement. This will often be the case in the sense that this candidate's requirement has the extras while the base's does not. Unlike the InstallRequirement backed @@ -439,7 +440,7 @@ def __init__( """ self.base = base self.extras = extras - self._ireq = ireq + self._comes_from = comes_from if comes_from is not None else self.base._ireq def __str__(self) -> str: name, rest = str(self.base).split(" ", 1) @@ -514,7 +515,7 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen for r in self.base.dist.iter_dependencies(valid_extras): yield from factory.make_requirements_from_spec( str(r), - self._ireq if self._ireq is not None else self.base._ireq, + self._comes_from, valid_extras, ) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index af13a33215b..8c5a779911f 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -142,13 +142,14 @@ def _make_extras_candidate( self, base: BaseCandidate, extras: FrozenSet[str], - ireq: Optional[InstallRequirement] = None, + *, + comes_from: Optional[InstallRequirement] = None, ) -> ExtrasCandidate: cache_key = (id(base), extras) try: candidate = self._extras_candidate_cache[cache_key] except KeyError: - candidate = ExtrasCandidate(base, extras, ireq=ireq) + candidate = ExtrasCandidate(base, extras, comes_from=comes_from) self._extras_candidate_cache[cache_key] = candidate return candidate @@ -165,7 +166,7 @@ def _make_candidate_from_dist( self._installed_candidate_cache[dist.canonical_name] = base if not extras: return base - return self._make_extras_candidate(base, extras, ireq=template) + return self._make_extras_candidate(base, extras, comes_from=template) def _make_candidate_from_link( self, @@ -227,7 +228,7 @@ def _make_candidate_from_link( if not extras: return base - return self._make_extras_candidate(base, extras, ireq=template) + return self._make_extras_candidate(base, extras, comes_from=template) def _iter_found_candidates( self, From f5602fa0b8a26733cc144b5e1449730fdf620c31 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 6 Sep 2023 15:12:17 +0200 Subject: [PATCH 077/992] added message to invariant assertions --- src/pip/_internal/req/constructors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index a40191954f8..f0f043b0021 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -71,10 +71,10 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme flags=re.ASCII, ) # ireq.req is a valid requirement so the regex should always match - assert match is not None + assert match is not None, f"regex match on requirement {req} failed, this should never happen" pre: Optional[str] = match.group(1) post: Optional[str] = match.group(3) - assert pre is not None and post is not None + assert pre is not None and post is not None, f"regex group selection for requirement {req} failed, this should never happen" extras: str = "[%s]" % ",".join(sorted(new_extras)) if new_extras else "" return Requirement(f"{pre}{extras}{post}") From 449522a8286d28d2c88776dca3cc67b3064982d3 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 6 Sep 2023 15:16:22 +0200 Subject: [PATCH 078/992] minor fixes and linting --- src/pip/_internal/req/constructors.py | 8 ++++++-- src/pip/_internal/resolution/resolvelib/factory.py | 2 +- .../_internal/resolution/resolvelib/requirements.py | 3 ++- src/pip/_internal/resolution/resolvelib/resolver.py | 10 +++++++--- tests/unit/resolution_resolvelib/test_requirement.py | 8 ++++---- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index f0f043b0021..b52c9a456bb 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -71,10 +71,14 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme flags=re.ASCII, ) # ireq.req is a valid requirement so the regex should always match - assert match is not None, f"regex match on requirement {req} failed, this should never happen" + assert ( + match is not None + ), f"regex match on requirement {req} failed, this should never happen" pre: Optional[str] = match.group(1) post: Optional[str] = match.group(3) - assert pre is not None and post is not None, f"regex group selection for requirement {req} failed, this should never happen" + assert ( + pre is not None and post is not None + ), f"regex group selection for requirement {req} failed, this should never happen" extras: str = "[%s]" % ",".join(sorted(new_extras)) if new_extras else "" return Requirement(f"{pre}{extras}{post}") diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 8c5a779911f..905449f68db 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -468,7 +468,7 @@ def _make_requirements_from_install_req( yield from () elif not ireq.link: if ireq.extras and ireq.req is not None and ireq.req.specifier: - yield SpecifierWithoutExtrasRequirement(ireq), + yield SpecifierWithoutExtrasRequirement(ireq) yield SpecifierRequirement(ireq) else: self._fail_if_link_is_unsupported_wheel(ireq.link) diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index 9c2512823a3..02cdf65f144 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -95,7 +95,8 @@ def is_satisfied_by(self, candidate: Candidate) -> bool: class SpecifierWithoutExtrasRequirement(SpecifierRequirement): """ - Requirement backed by an install requirement on a base package. Trims extras from its install requirement if there are any. + Requirement backed by an install requirement on a base package. + Trims extras from its install requirement if there are any. """ def __init__(self, ireq: InstallRequirement) -> None: diff --git a/src/pip/_internal/resolution/resolvelib/resolver.py b/src/pip/_internal/resolution/resolvelib/resolver.py index 2e4941da814..c12beef0b2a 100644 --- a/src/pip/_internal/resolution/resolvelib/resolver.py +++ b/src/pip/_internal/resolution/resolvelib/resolver.py @@ -104,9 +104,13 @@ def resolve( raise error from e req_set = RequirementSet(check_supported_wheels=check_supported_wheels) - # process candidates with extras last to ensure their base equivalent is already in the req_set if appropriate - # Python's sort is stable so using a binary key function keeps relative order within both subsets - for candidate in sorted(result.mapping.values(), key=lambda c: c.name != c.project_name): + # process candidates with extras last to ensure their base equivalent is + # already in the req_set if appropriate. + # Python's sort is stable so using a binary key function keeps relative order + # within both subsets. + for candidate in sorted( + result.mapping.values(), key=lambda c: c.name != c.project_name + ): ireq = candidate.get_install_requirement() if ireq is None: if candidate.name != candidate.project_name: diff --git a/tests/unit/resolution_resolvelib/test_requirement.py b/tests/unit/resolution_resolvelib/test_requirement.py index ce48ab16c49..642136a54fd 100644 --- a/tests/unit/resolution_resolvelib/test_requirement.py +++ b/tests/unit/resolution_resolvelib/test_requirement.py @@ -61,7 +61,7 @@ def test_new_resolver_requirement_has_name( ) -> None: """All requirements should have a name""" for spec, name, _ in test_cases: - reqs = factory.make_requirements_from_spec(spec, comes_from=None) + reqs = list(factory.make_requirements_from_spec(spec, comes_from=None)) assert len(reqs) == 1 assert reqs[0].name == name @@ -71,7 +71,7 @@ def test_new_resolver_correct_number_of_matches( ) -> None: """Requirements should return the correct number of candidates""" for spec, _, match_count in test_cases: - reqs = factory.make_requirements_from_spec(spec, comes_from=None) + reqs = list(factory.make_requirements_from_spec(spec, comes_from=None)) assert len(reqs) == 1 req = reqs[0] matches = factory.find_candidates( @@ -89,7 +89,7 @@ def test_new_resolver_candidates_match_requirement( ) -> None: """Candidates returned from find_candidates should satisfy the requirement""" for spec, _, _ in test_cases: - reqs = factory.make_requirements_from_spec(spec, comes_from=None) + reqs = list(factory.make_requirements_from_spec(spec, comes_from=None)) assert len(reqs) == 1 req = reqs[0] candidates = factory.find_candidates( @@ -106,7 +106,7 @@ def test_new_resolver_candidates_match_requirement( def test_new_resolver_full_resolve(factory: Factory, provider: PipProvider) -> None: """A very basic full resolve""" - reqs = factory.make_requirements_from_spec("simplewheel", comes_from=None) + reqs = list(factory.make_requirements_from_spec("simplewheel", comes_from=None)) assert len(reqs) == 1 r: Resolver[Requirement, Candidate, str] = Resolver(provider, BaseReporter()) result = r.resolve([reqs[0]]) From d5e3f0c4b4d6aa4b432cd5480abb234e2e3332fb Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Wed, 6 Sep 2023 11:54:00 -0400 Subject: [PATCH 079/992] Use versionchanged syntax --- docs/html/topics/caching.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/html/topics/caching.md b/docs/html/topics/caching.md index 19bd064a74c..8d6c40f112d 100644 --- a/docs/html/topics/caching.md +++ b/docs/html/topics/caching.md @@ -27,11 +27,12 @@ While this cache attempts to minimize network activity, it does not prevent network access altogether. If you want a local install solution that circumvents accessing PyPI, see {ref}`Installing from local packages`. -In versions prior to 23.2, this cache was stored in a directory called `http` in -the main cache directory (see below for its location). In 23.2 and later, a new -cache format is used, stored in a directory called `http-v2`. If you have -completely switched to newer versions of `pip`, you may wish to delete the old -directory. +```{versionchanged} 23.3 +A new cache format is now used, stored in a directory called `http-v2` (see +below for this directory's location). Previously this cache was stored in a +directory called `http` in the main cache directory. If you have completely +switched to newer versions of `pip`, you may wish to delete the old directory. +``` (wheel-caching)= From b273cee6c5b3572390a3fe9316b2e86661934ce9 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Wed, 6 Sep 2023 16:42:38 -0400 Subject: [PATCH 080/992] Combine one entry, explain difference between entries better. --- src/pip/_internal/commands/cache.py | 16 ++++++++-------- tests/functional/test_cache.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pip/_internal/commands/cache.py b/src/pip/_internal/commands/cache.py index 83efabe8785..0b3380da006 100644 --- a/src/pip/_internal/commands/cache.py +++ b/src/pip/_internal/commands/cache.py @@ -96,18 +96,19 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None: http_cache_location = self._cache_dir(options, "http-v2") old_http_cache_location = self._cache_dir(options, "http") wheels_cache_location = self._cache_dir(options, "wheels") - http_cache_size = filesystem.format_directory_size(http_cache_location) - old_http_cache_size = filesystem.format_directory_size(old_http_cache_location) + http_cache_size = ( + filesystem.format_directory_size(http_cache_location) + + filesystem.format_directory_size(old_http_cache_location) + ) wheels_cache_size = filesystem.format_directory_size(wheels_cache_location) message = ( textwrap.dedent( """ - Package index page cache location (new): {http_cache_location} - Package index page cache location (old): {old_http_cache_location} - Package index page cache size (new): {http_cache_size} - Package index page cache size (old): {old_http_cache_size} - Number of HTTP files (old+new cache): {num_http_files} + Package index page cache location (pip v23.3+): {http_cache_location} + Package index page cache location (older pips): {old_http_cache_location} + Package index page cache size: {http_cache_size} + Number of HTTP files: {num_http_files} Locally built wheels location: {wheels_cache_location} Locally built wheels size: {wheels_cache_size} Number of locally built wheels: {package_count} @@ -117,7 +118,6 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None: http_cache_location=http_cache_location, old_http_cache_location=old_http_cache_location, http_cache_size=http_cache_size, - old_http_cache_size=old_http_cache_size, num_http_files=num_http_files, wheels_cache_location=wheels_cache_location, package_count=num_packages, diff --git a/tests/functional/test_cache.py b/tests/functional/test_cache.py index ddafd7332d6..c5d910d453f 100644 --- a/tests/functional/test_cache.py +++ b/tests/functional/test_cache.py @@ -203,7 +203,7 @@ def test_cache_info( ) -> None: result = script.pip("cache", "info") - assert f"Package index page cache location (new): {http_cache_dir}" in result.stdout + assert f"Package index page cache location (pip v23.3+): {http_cache_dir}" in result.stdout assert f"Locally built wheels location: {wheel_cache_dir}" in result.stdout num_wheels = len(wheel_cache_files) assert f"Number of locally built wheels: {num_wheels}" in result.stdout From 2951666df5042dc6a329e017e9befcf2b54c25d4 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Thu, 7 Sep 2023 01:17:57 +0200 Subject: [PATCH 081/992] Exclude PR #9634 reformatting from Git blame --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index c7644d0e6e6..f09b08660e7 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -33,3 +33,4 @@ c7ee560e00b85f7486b452c14ff49e4737996eda # Blacken tools/ 1897784d59e0d5fcda2dd75fea54ddd8be3d502a # Blacken src/pip/_internal/index 94999255d5ede440c37137d210666fdf64302e75 # Reformat the codebase, with black 585037a80a1177f1fa92e159a7079855782e543e # Cleanup implicit string concatenation +8a6f6ac19b80a6dc35900a47016c851d9fcd2ee2 # Blacken src/pip/_internal/resolution directory From 952ab6d837fbece1a221a1d0409eb27f2bb8c544 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Thu, 7 Sep 2023 10:31:49 +0200 Subject: [PATCH 082/992] Update src/pip/_internal/resolution/resolvelib/factory.py Co-authored-by: Tzu-ping Chung --- src/pip/_internal/resolution/resolvelib/factory.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 905449f68db..2b51aab67df 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -465,7 +465,6 @@ def _make_requirements_from_install_req( ireq.name, ireq.markers, ) - yield from () elif not ireq.link: if ireq.extras and ireq.req is not None and ireq.req.specifier: yield SpecifierWithoutExtrasRequirement(ireq) From ab9f6f37f125401f547cd5df84c66d1fb50e4203 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Thu, 7 Sep 2023 12:07:50 -0400 Subject: [PATCH 083/992] Fix formatting, combine numbers not strings! Co-authored-by: Pradyun Gedam --- src/pip/_internal/commands/cache.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/commands/cache.py b/src/pip/_internal/commands/cache.py index 0b3380da006..32d1a221d1e 100644 --- a/src/pip/_internal/commands/cache.py +++ b/src/pip/_internal/commands/cache.py @@ -97,8 +97,8 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None: old_http_cache_location = self._cache_dir(options, "http") wheels_cache_location = self._cache_dir(options, "wheels") http_cache_size = ( - filesystem.format_directory_size(http_cache_location) + - filesystem.format_directory_size(old_http_cache_location) + filesystem.format_size(filesystem.directory_size(http_cache_location) + + filesystem.directory_size(old_http_cache_location)) ) wheels_cache_size = filesystem.format_directory_size(wheels_cache_location) From fbda0a2ba7e6676f286e515c11b77ded8de996b0 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Fri, 8 Sep 2023 16:32:42 +0200 Subject: [PATCH 084/992] Update tests/unit/resolution_resolvelib/test_requirement.py Co-authored-by: Pradyun Gedam --- tests/unit/resolution_resolvelib/test_requirement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/resolution_resolvelib/test_requirement.py b/tests/unit/resolution_resolvelib/test_requirement.py index 642136a54fd..b8cd13cb566 100644 --- a/tests/unit/resolution_resolvelib/test_requirement.py +++ b/tests/unit/resolution_resolvelib/test_requirement.py @@ -109,5 +109,5 @@ def test_new_resolver_full_resolve(factory: Factory, provider: PipProvider) -> N reqs = list(factory.make_requirements_from_spec("simplewheel", comes_from=None)) assert len(reqs) == 1 r: Resolver[Requirement, Candidate, str] = Resolver(provider, BaseReporter()) - result = r.resolve([reqs[0]]) + result = r.resolve(reqs) assert set(result.mapping.keys()) == {"simplewheel"} From 83ca10ab6012bab3654728b335d3d3b56ac6da06 Mon Sep 17 00:00:00 2001 From: Shahar Epstein <60007259+shahar1@users.noreply.github.com> Date: Sun, 10 Sep 2023 11:25:34 +0300 Subject: [PATCH 085/992] Update search command docs (#12271) --- docs/html/cli/pip_search.rst | 6 ++++++ news/12059.doc.rst | 1 + 2 files changed, 7 insertions(+) create mode 100644 news/12059.doc.rst diff --git a/docs/html/cli/pip_search.rst b/docs/html/cli/pip_search.rst index 9905a1bafac..93ddab3fa78 100644 --- a/docs/html/cli/pip_search.rst +++ b/docs/html/cli/pip_search.rst @@ -21,6 +21,12 @@ Usage Description =========== +.. attention:: + PyPI no longer supports ``pip search`` (or XML-RPC search). Please use https://pypi.org/search (via a browser) + instead. See https://warehouse.pypa.io/api-reference/xml-rpc.html#deprecated-methods for more information. + + However, XML-RPC search (and this command) may still be supported by indexes other than PyPI. + .. pip-command-description:: search diff --git a/news/12059.doc.rst b/news/12059.doc.rst new file mode 100644 index 00000000000..bf3a8d3e662 --- /dev/null +++ b/news/12059.doc.rst @@ -0,0 +1 @@ +Document that ``pip search`` support has been removed from PyPI From dc188a87e43d7ce1debfe4ed3557ed4023d32504 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Tue, 12 Sep 2023 14:11:48 +0800 Subject: [PATCH 086/992] Skip test failing on new Python/setuptools combo This is a temporary measure until we fix the importlib.metadata backend. --- tests/functional/test_install_extras.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py index c6cef00fa9c..db4a811e0fd 100644 --- a/tests/functional/test_install_extras.py +++ b/tests/functional/test_install_extras.py @@ -150,6 +150,10 @@ def test_install_fails_if_extra_at_end( assert "Extras after version" in result.stderr +@pytest.mark.skipif( + "sys.version_info >= (3, 11)", + reason="Setuptools incompatibility with importlib.metadata; see GH-12267", +) def test_install_special_extra(script: PipTestEnvironment) -> None: # Check that uppercase letters and '-' are dealt with # make a dummy project From c94d81a36de643d2a1176430452a06862a77f58d Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Tue, 12 Sep 2023 16:00:40 +0800 Subject: [PATCH 087/992] Setuptools now implements proper normalization --- tests/functional/test_install_extras.py | 12 +----------- tests/requirements-common_wheels.txt | 3 ++- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py index 21da9d50e1b..20942939763 100644 --- a/tests/functional/test_install_extras.py +++ b/tests/functional/test_install_extras.py @@ -159,17 +159,7 @@ def test_install_fails_if_extra_at_end( "specified_extra, requested_extra", [ ("Hop_hOp-hoP", "Hop_hOp-hoP"), - pytest.param( - "Hop_hOp-hoP", - "hop-hop-hop", - marks=pytest.mark.xfail( - reason=( - "matching a normalized extra request against an" - "unnormalized extra in metadata requires PEP 685 support " - "in packaging (see pypa/pip#11445)." - ), - ), - ), + ("Hop_hOp-hoP", "hop-hop-hop"), ("hop-hop-hop", "Hop_hOp-hoP"), ], ) diff --git a/tests/requirements-common_wheels.txt b/tests/requirements-common_wheels.txt index 6403ed73898..939a111a071 100644 --- a/tests/requirements-common_wheels.txt +++ b/tests/requirements-common_wheels.txt @@ -5,7 +5,8 @@ # 4. Replacing the `setuptools` entry below with a `file:///...` URL # (Adjust artifact directory used based on preference and operating system) -setuptools >= 40.8.0, != 60.6.0 +# Implements new extra normalization. +setuptools >= 68.2 wheel # As required by pytest-cov. coverage >= 4.4 From 9ee4b8ce36ce3f0f57615db017334a43a97d2dea Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Mon, 26 Jun 2023 22:18:08 -0500 Subject: [PATCH 088/992] Vendor truststore --- docs/html/topics/https-certificates.md | 12 +- news/truststore.vendor.rst | 1 + src/pip/_internal/cli/req_command.py | 2 +- src/pip/_vendor/__init__.py | 1 + src/pip/_vendor/truststore/LICENSE | 21 + src/pip/_vendor/truststore/__init__.py | 13 + src/pip/_vendor/truststore/_api.py | 302 ++++++++++ src/pip/_vendor/truststore/_macos.py | 501 +++++++++++++++++ src/pip/_vendor/truststore/_openssl.py | 66 +++ src/pip/_vendor/truststore/_ssl_constants.py | 12 + src/pip/_vendor/truststore/_windows.py | 554 +++++++++++++++++++ src/pip/_vendor/truststore/py.typed | 0 src/pip/_vendor/vendor.txt | 1 + tests/functional/test_truststore.py | 15 - 14 files changed, 1474 insertions(+), 27 deletions(-) create mode 100644 news/truststore.vendor.rst create mode 100644 src/pip/_vendor/truststore/LICENSE create mode 100644 src/pip/_vendor/truststore/__init__.py create mode 100644 src/pip/_vendor/truststore/_api.py create mode 100644 src/pip/_vendor/truststore/_macos.py create mode 100644 src/pip/_vendor/truststore/_openssl.py create mode 100644 src/pip/_vendor/truststore/_ssl_constants.py create mode 100644 src/pip/_vendor/truststore/_windows.py create mode 100644 src/pip/_vendor/truststore/py.typed diff --git a/docs/html/topics/https-certificates.md b/docs/html/topics/https-certificates.md index b42c463e6cc..341cfc632de 100644 --- a/docs/html/topics/https-certificates.md +++ b/docs/html/topics/https-certificates.md @@ -28,19 +28,9 @@ It is possible to use the system trust store, instead of the bundled certifi certificates for verifying HTTPS certificates. This approach will typically support corporate proxy certificates without additional configuration. -In order to use system trust stores, you need to: - -- Use Python 3.10 or newer. -- Install the {pypi}`truststore` package, in the Python environment you're - running pip in. - - This is typically done by installing this package using a system package - manager or by using pip in {ref}`Hash-checking mode` for this package and - trusting the network using the `--trusted-host` flag. +In order to use system trust stores, you need to use Python 3.10 or newer. ```{pip-cli} - $ python -m pip install truststore - [...] $ python -m pip install SomePackage --use-feature=truststore [...] Successfully installed SomePackage diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst new file mode 100644 index 00000000000..ee974728d92 --- /dev/null +++ b/news/truststore.vendor.rst @@ -0,0 +1 @@ +Add truststore 0.7.0 diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index 86070f10c14..80b35a80aae 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -58,7 +58,7 @@ def _create_truststore_ssl_context() -> Optional["SSLContext"]: return None try: - import truststore + from ..._vendor import truststore except ImportError: raise CommandError( "To use the truststore feature, 'truststore' must be installed into " diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py index b22f7abb93b..c1884baf3d1 100644 --- a/src/pip/_vendor/__init__.py +++ b/src/pip/_vendor/__init__.py @@ -117,4 +117,5 @@ def vendored(modulename): vendored("rich.traceback") vendored("tenacity") vendored("tomli") + vendored("truststore") vendored("urllib3") diff --git a/src/pip/_vendor/truststore/LICENSE b/src/pip/_vendor/truststore/LICENSE new file mode 100644 index 00000000000..7ec568c1136 --- /dev/null +++ b/src/pip/_vendor/truststore/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2022 Seth Michael Larson + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/pip/_vendor/truststore/__init__.py b/src/pip/_vendor/truststore/__init__.py new file mode 100644 index 00000000000..0f3a4d9e1e1 --- /dev/null +++ b/src/pip/_vendor/truststore/__init__.py @@ -0,0 +1,13 @@ +"""Verify certificates using native system trust stores""" + +import sys as _sys + +if _sys.version_info < (3, 10): + raise ImportError("truststore requires Python 3.10 or later") + +from ._api import SSLContext, extract_from_ssl, inject_into_ssl # noqa: E402 + +del _api, _sys # type: ignore[name-defined] # noqa: F821 + +__all__ = ["SSLContext", "inject_into_ssl", "extract_from_ssl"] +__version__ = "0.7.0" diff --git a/src/pip/_vendor/truststore/_api.py b/src/pip/_vendor/truststore/_api.py new file mode 100644 index 00000000000..2647042418f --- /dev/null +++ b/src/pip/_vendor/truststore/_api.py @@ -0,0 +1,302 @@ +import array +import ctypes +import mmap +import os +import pickle +import platform +import socket +import ssl +import typing + +import _ssl # type: ignore[import] + +from ._ssl_constants import _original_SSLContext, _original_super_SSLContext + +if platform.system() == "Windows": + from ._windows import _configure_context, _verify_peercerts_impl +elif platform.system() == "Darwin": + from ._macos import _configure_context, _verify_peercerts_impl +else: + from ._openssl import _configure_context, _verify_peercerts_impl + +# From typeshed/stdlib/ssl.pyi +_StrOrBytesPath: typing.TypeAlias = str | bytes | os.PathLike[str] | os.PathLike[bytes] +_PasswordType: typing.TypeAlias = str | bytes | typing.Callable[[], str | bytes] + +# From typeshed/stdlib/_typeshed/__init__.py +_ReadableBuffer: typing.TypeAlias = typing.Union[ + bytes, + memoryview, + bytearray, + "array.array[typing.Any]", + mmap.mmap, + "ctypes._CData", + pickle.PickleBuffer, +] + + +def inject_into_ssl() -> None: + """Injects the :class:`truststore.SSLContext` into the ``ssl`` + module by replacing :class:`ssl.SSLContext`. + """ + setattr(ssl, "SSLContext", SSLContext) + # urllib3 holds on to its own reference of ssl.SSLContext + # so we need to replace that reference too. + try: + import pip._vendor.urllib3.util.ssl_ as urllib3_ssl + + setattr(urllib3_ssl, "SSLContext", SSLContext) + except ImportError: + pass + + +def extract_from_ssl() -> None: + """Restores the :class:`ssl.SSLContext` class to its original state""" + setattr(ssl, "SSLContext", _original_SSLContext) + try: + import pip._vendor.urllib3.util.ssl_ as urllib3_ssl + + urllib3_ssl.SSLContext = _original_SSLContext + except ImportError: + pass + + +class SSLContext(ssl.SSLContext): + """SSLContext API that uses system certificates on all platforms""" + + def __init__(self, protocol: int = None) -> None: # type: ignore[assignment] + self._ctx = _original_SSLContext(protocol) + + class TruststoreSSLObject(ssl.SSLObject): + # This object exists because wrap_bio() doesn't + # immediately do the handshake so we need to do + # certificate verifications after SSLObject.do_handshake() + + def do_handshake(self) -> None: + ret = super().do_handshake() + _verify_peercerts(self, server_hostname=self.server_hostname) + return ret + + self._ctx.sslobject_class = TruststoreSSLObject + + def wrap_socket( + self, + sock: socket.socket, + server_side: bool = False, + do_handshake_on_connect: bool = True, + suppress_ragged_eofs: bool = True, + server_hostname: str | None = None, + session: ssl.SSLSession | None = None, + ) -> ssl.SSLSocket: + # Use a context manager here because the + # inner SSLContext holds on to our state + # but also does the actual handshake. + with _configure_context(self._ctx): + ssl_sock = self._ctx.wrap_socket( + sock, + server_side=server_side, + server_hostname=server_hostname, + do_handshake_on_connect=do_handshake_on_connect, + suppress_ragged_eofs=suppress_ragged_eofs, + session=session, + ) + try: + _verify_peercerts(ssl_sock, server_hostname=server_hostname) + except Exception: + ssl_sock.close() + raise + return ssl_sock + + def wrap_bio( + self, + incoming: ssl.MemoryBIO, + outgoing: ssl.MemoryBIO, + server_side: bool = False, + server_hostname: str | None = None, + session: ssl.SSLSession | None = None, + ) -> ssl.SSLObject: + with _configure_context(self._ctx): + ssl_obj = self._ctx.wrap_bio( + incoming, + outgoing, + server_hostname=server_hostname, + server_side=server_side, + session=session, + ) + return ssl_obj + + def load_verify_locations( + self, + cafile: str | bytes | os.PathLike[str] | os.PathLike[bytes] | None = None, + capath: str | bytes | os.PathLike[str] | os.PathLike[bytes] | None = None, + cadata: str | _ReadableBuffer | None = None, + ) -> None: + return self._ctx.load_verify_locations( + cafile=cafile, capath=capath, cadata=cadata + ) + + def load_cert_chain( + self, + certfile: _StrOrBytesPath, + keyfile: _StrOrBytesPath | None = None, + password: _PasswordType | None = None, + ) -> None: + return self._ctx.load_cert_chain( + certfile=certfile, keyfile=keyfile, password=password + ) + + def load_default_certs( + self, purpose: ssl.Purpose = ssl.Purpose.SERVER_AUTH + ) -> None: + return self._ctx.load_default_certs(purpose) + + def set_alpn_protocols(self, alpn_protocols: typing.Iterable[str]) -> None: + return self._ctx.set_alpn_protocols(alpn_protocols) + + def set_npn_protocols(self, npn_protocols: typing.Iterable[str]) -> None: + return self._ctx.set_npn_protocols(npn_protocols) + + def set_ciphers(self, __cipherlist: str) -> None: + return self._ctx.set_ciphers(__cipherlist) + + def get_ciphers(self) -> typing.Any: + return self._ctx.get_ciphers() + + def session_stats(self) -> dict[str, int]: + return self._ctx.session_stats() + + def cert_store_stats(self) -> dict[str, int]: + raise NotImplementedError() + + @typing.overload + def get_ca_certs( + self, binary_form: typing.Literal[False] = ... + ) -> list[typing.Any]: + ... + + @typing.overload + def get_ca_certs(self, binary_form: typing.Literal[True] = ...) -> list[bytes]: + ... + + @typing.overload + def get_ca_certs(self, binary_form: bool = ...) -> typing.Any: + ... + + def get_ca_certs(self, binary_form: bool = False) -> list[typing.Any] | list[bytes]: + raise NotImplementedError() + + @property + def check_hostname(self) -> bool: + return self._ctx.check_hostname + + @check_hostname.setter + def check_hostname(self, value: bool) -> None: + self._ctx.check_hostname = value + + @property + def hostname_checks_common_name(self) -> bool: + return self._ctx.hostname_checks_common_name + + @hostname_checks_common_name.setter + def hostname_checks_common_name(self, value: bool) -> None: + self._ctx.hostname_checks_common_name = value + + @property + def keylog_filename(self) -> str: + return self._ctx.keylog_filename + + @keylog_filename.setter + def keylog_filename(self, value: str) -> None: + self._ctx.keylog_filename = value + + @property + def maximum_version(self) -> ssl.TLSVersion: + return self._ctx.maximum_version + + @maximum_version.setter + def maximum_version(self, value: ssl.TLSVersion) -> None: + _original_super_SSLContext.maximum_version.__set__( # type: ignore[attr-defined] + self._ctx, value + ) + + @property + def minimum_version(self) -> ssl.TLSVersion: + return self._ctx.minimum_version + + @minimum_version.setter + def minimum_version(self, value: ssl.TLSVersion) -> None: + _original_super_SSLContext.minimum_version.__set__( # type: ignore[attr-defined] + self._ctx, value + ) + + @property + def options(self) -> ssl.Options: + return self._ctx.options + + @options.setter + def options(self, value: ssl.Options) -> None: + _original_super_SSLContext.options.__set__( # type: ignore[attr-defined] + self._ctx, value + ) + + @property + def post_handshake_auth(self) -> bool: + return self._ctx.post_handshake_auth + + @post_handshake_auth.setter + def post_handshake_auth(self, value: bool) -> None: + self._ctx.post_handshake_auth = value + + @property + def protocol(self) -> ssl._SSLMethod: + return self._ctx.protocol + + @property + def security_level(self) -> int: # type: ignore[override] + return self._ctx.security_level + + @property + def verify_flags(self) -> ssl.VerifyFlags: + return self._ctx.verify_flags + + @verify_flags.setter + def verify_flags(self, value: ssl.VerifyFlags) -> None: + _original_super_SSLContext.verify_flags.__set__( # type: ignore[attr-defined] + self._ctx, value + ) + + @property + def verify_mode(self) -> ssl.VerifyMode: + return self._ctx.verify_mode + + @verify_mode.setter + def verify_mode(self, value: ssl.VerifyMode) -> None: + _original_super_SSLContext.verify_mode.__set__( # type: ignore[attr-defined] + self._ctx, value + ) + + +def _verify_peercerts( + sock_or_sslobj: ssl.SSLSocket | ssl.SSLObject, server_hostname: str | None +) -> None: + """ + Verifies the peer certificates from an SSLSocket or SSLObject + against the certificates in the OS trust store. + """ + sslobj: ssl.SSLObject = sock_or_sslobj # type: ignore[assignment] + try: + while not hasattr(sslobj, "get_unverified_chain"): + sslobj = sslobj._sslobj # type: ignore[attr-defined] + except AttributeError: + pass + + # SSLObject.get_unverified_chain() returns 'None' + # if the peer sends no certificates. This is common + # for the server-side scenario. + unverified_chain: typing.Sequence[_ssl.Certificate] = ( + sslobj.get_unverified_chain() or () # type: ignore[attr-defined] + ) + cert_bytes = [cert.public_bytes(_ssl.ENCODING_DER) for cert in unverified_chain] + _verify_peercerts_impl( + sock_or_sslobj.context, cert_bytes, server_hostname=server_hostname + ) diff --git a/src/pip/_vendor/truststore/_macos.py b/src/pip/_vendor/truststore/_macos.py new file mode 100644 index 00000000000..7dc440bf362 --- /dev/null +++ b/src/pip/_vendor/truststore/_macos.py @@ -0,0 +1,501 @@ +import contextlib +import ctypes +import platform +import ssl +import typing +from ctypes import ( + CDLL, + POINTER, + c_bool, + c_char_p, + c_int32, + c_long, + c_uint32, + c_ulong, + c_void_p, +) +from ctypes.util import find_library + +from ._ssl_constants import _set_ssl_context_verify_mode + +_mac_version = platform.mac_ver()[0] +_mac_version_info = tuple(map(int, _mac_version.split("."))) +if _mac_version_info < (10, 8): + raise ImportError( + f"Only OS X 10.8 and newer are supported, not {_mac_version_info[0]}.{_mac_version_info[1]}" + ) + + +def _load_cdll(name: str, macos10_16_path: str) -> CDLL: + """Loads a CDLL by name, falling back to known path on 10.16+""" + try: + # Big Sur is technically 11 but we use 10.16 due to the Big Sur + # beta being labeled as 10.16. + path: str | None + if _mac_version_info >= (10, 16): + path = macos10_16_path + else: + path = find_library(name) + if not path: + raise OSError # Caught and reraised as 'ImportError' + return CDLL(path, use_errno=True) + except OSError: + raise ImportError(f"The library {name} failed to load") from None + + +Security = _load_cdll( + "Security", "/System/Library/Frameworks/Security.framework/Security" +) +CoreFoundation = _load_cdll( + "CoreFoundation", + "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation", +) + +Boolean = c_bool +CFIndex = c_long +CFStringEncoding = c_uint32 +CFData = c_void_p +CFString = c_void_p +CFArray = c_void_p +CFMutableArray = c_void_p +CFError = c_void_p +CFType = c_void_p +CFTypeID = c_ulong +CFTypeRef = POINTER(CFType) +CFAllocatorRef = c_void_p + +OSStatus = c_int32 + +CFErrorRef = POINTER(CFError) +CFDataRef = POINTER(CFData) +CFStringRef = POINTER(CFString) +CFArrayRef = POINTER(CFArray) +CFMutableArrayRef = POINTER(CFMutableArray) +CFArrayCallBacks = c_void_p +CFOptionFlags = c_uint32 + +SecCertificateRef = POINTER(c_void_p) +SecPolicyRef = POINTER(c_void_p) +SecTrustRef = POINTER(c_void_p) +SecTrustResultType = c_uint32 +SecTrustOptionFlags = c_uint32 + +try: + Security.SecCertificateCreateWithData.argtypes = [CFAllocatorRef, CFDataRef] + Security.SecCertificateCreateWithData.restype = SecCertificateRef + + Security.SecCertificateCopyData.argtypes = [SecCertificateRef] + Security.SecCertificateCopyData.restype = CFDataRef + + Security.SecCopyErrorMessageString.argtypes = [OSStatus, c_void_p] + Security.SecCopyErrorMessageString.restype = CFStringRef + + Security.SecTrustSetAnchorCertificates.argtypes = [SecTrustRef, CFArrayRef] + Security.SecTrustSetAnchorCertificates.restype = OSStatus + + Security.SecTrustSetAnchorCertificatesOnly.argtypes = [SecTrustRef, Boolean] + Security.SecTrustSetAnchorCertificatesOnly.restype = OSStatus + + Security.SecTrustEvaluate.argtypes = [SecTrustRef, POINTER(SecTrustResultType)] + Security.SecTrustEvaluate.restype = OSStatus + + Security.SecPolicyCreateRevocation.argtypes = [CFOptionFlags] + Security.SecPolicyCreateRevocation.restype = SecPolicyRef + + Security.SecPolicyCreateSSL.argtypes = [Boolean, CFStringRef] + Security.SecPolicyCreateSSL.restype = SecPolicyRef + + Security.SecTrustCreateWithCertificates.argtypes = [ + CFTypeRef, + CFTypeRef, + POINTER(SecTrustRef), + ] + Security.SecTrustCreateWithCertificates.restype = OSStatus + + Security.SecTrustGetTrustResult.argtypes = [ + SecTrustRef, + POINTER(SecTrustResultType), + ] + Security.SecTrustGetTrustResult.restype = OSStatus + + Security.SecTrustRef = SecTrustRef # type: ignore[attr-defined] + Security.SecTrustResultType = SecTrustResultType # type: ignore[attr-defined] + Security.OSStatus = OSStatus # type: ignore[attr-defined] + + kSecRevocationUseAnyAvailableMethod = 3 + kSecRevocationRequirePositiveResponse = 8 + + CoreFoundation.CFRelease.argtypes = [CFTypeRef] + CoreFoundation.CFRelease.restype = None + + CoreFoundation.CFGetTypeID.argtypes = [CFTypeRef] + CoreFoundation.CFGetTypeID.restype = CFTypeID + + CoreFoundation.CFStringCreateWithCString.argtypes = [ + CFAllocatorRef, + c_char_p, + CFStringEncoding, + ] + CoreFoundation.CFStringCreateWithCString.restype = CFStringRef + + CoreFoundation.CFStringGetCStringPtr.argtypes = [CFStringRef, CFStringEncoding] + CoreFoundation.CFStringGetCStringPtr.restype = c_char_p + + CoreFoundation.CFStringGetCString.argtypes = [ + CFStringRef, + c_char_p, + CFIndex, + CFStringEncoding, + ] + CoreFoundation.CFStringGetCString.restype = c_bool + + CoreFoundation.CFDataCreate.argtypes = [CFAllocatorRef, c_char_p, CFIndex] + CoreFoundation.CFDataCreate.restype = CFDataRef + + CoreFoundation.CFDataGetLength.argtypes = [CFDataRef] + CoreFoundation.CFDataGetLength.restype = CFIndex + + CoreFoundation.CFDataGetBytePtr.argtypes = [CFDataRef] + CoreFoundation.CFDataGetBytePtr.restype = c_void_p + + CoreFoundation.CFArrayCreate.argtypes = [ + CFAllocatorRef, + POINTER(CFTypeRef), + CFIndex, + CFArrayCallBacks, + ] + CoreFoundation.CFArrayCreate.restype = CFArrayRef + + CoreFoundation.CFArrayCreateMutable.argtypes = [ + CFAllocatorRef, + CFIndex, + CFArrayCallBacks, + ] + CoreFoundation.CFArrayCreateMutable.restype = CFMutableArrayRef + + CoreFoundation.CFArrayAppendValue.argtypes = [CFMutableArrayRef, c_void_p] + CoreFoundation.CFArrayAppendValue.restype = None + + CoreFoundation.CFArrayGetCount.argtypes = [CFArrayRef] + CoreFoundation.CFArrayGetCount.restype = CFIndex + + CoreFoundation.CFArrayGetValueAtIndex.argtypes = [CFArrayRef, CFIndex] + CoreFoundation.CFArrayGetValueAtIndex.restype = c_void_p + + CoreFoundation.CFErrorGetCode.argtypes = [CFErrorRef] + CoreFoundation.CFErrorGetCode.restype = CFIndex + + CoreFoundation.CFErrorCopyDescription.argtypes = [CFErrorRef] + CoreFoundation.CFErrorCopyDescription.restype = CFStringRef + + CoreFoundation.kCFAllocatorDefault = CFAllocatorRef.in_dll( # type: ignore[attr-defined] + CoreFoundation, "kCFAllocatorDefault" + ) + CoreFoundation.kCFTypeArrayCallBacks = c_void_p.in_dll( # type: ignore[attr-defined] + CoreFoundation, "kCFTypeArrayCallBacks" + ) + + CoreFoundation.CFTypeRef = CFTypeRef # type: ignore[attr-defined] + CoreFoundation.CFArrayRef = CFArrayRef # type: ignore[attr-defined] + CoreFoundation.CFStringRef = CFStringRef # type: ignore[attr-defined] + CoreFoundation.CFErrorRef = CFErrorRef # type: ignore[attr-defined] + +except AttributeError: + raise ImportError("Error initializing ctypes") from None + + +def _handle_osstatus(result: OSStatus, _: typing.Any, args: typing.Any) -> typing.Any: + """ + Raises an error if the OSStatus value is non-zero. + """ + if int(result) == 0: + return args + + # Returns a CFString which we need to transform + # into a UTF-8 Python string. + error_message_cfstring = None + try: + error_message_cfstring = Security.SecCopyErrorMessageString(result, None) + + # First step is convert the CFString into a C string pointer. + # We try the fast no-copy way first. + error_message_cfstring_c_void_p = ctypes.cast( + error_message_cfstring, ctypes.POINTER(ctypes.c_void_p) + ) + message = CoreFoundation.CFStringGetCStringPtr( + error_message_cfstring_c_void_p, CFConst.kCFStringEncodingUTF8 + ) + + # Quoting the Apple dev docs: + # + # "A pointer to a C string or NULL if the internal + # storage of theString does not allow this to be + # returned efficiently." + # + # So we need to get our hands dirty. + if message is None: + buffer = ctypes.create_string_buffer(1024) + result = CoreFoundation.CFStringGetCString( + error_message_cfstring_c_void_p, + buffer, + 1024, + CFConst.kCFStringEncodingUTF8, + ) + if not result: + raise OSError("Error copying C string from CFStringRef") + message = buffer.value + + finally: + if error_message_cfstring is not None: + CoreFoundation.CFRelease(error_message_cfstring) + + # If no message can be found for this status we come + # up with a generic one that forwards the status code. + if message is None or message == "": + message = f"SecureTransport operation returned a non-zero OSStatus: {result}" + + raise ssl.SSLError(message) + + +Security.SecTrustCreateWithCertificates.errcheck = _handle_osstatus # type: ignore[assignment] +Security.SecTrustSetAnchorCertificates.errcheck = _handle_osstatus # type: ignore[assignment] +Security.SecTrustGetTrustResult.errcheck = _handle_osstatus # type: ignore[assignment] + + +class CFConst: + """CoreFoundation constants""" + + kCFStringEncodingUTF8 = CFStringEncoding(0x08000100) + + errSecIncompleteCertRevocationCheck = -67635 + errSecHostNameMismatch = -67602 + errSecCertificateExpired = -67818 + errSecNotTrusted = -67843 + + +def _bytes_to_cf_data_ref(value: bytes) -> CFDataRef: # type: ignore[valid-type] + return CoreFoundation.CFDataCreate( # type: ignore[no-any-return] + CoreFoundation.kCFAllocatorDefault, value, len(value) + ) + + +def _bytes_to_cf_string(value: bytes) -> CFString: + """ + Given a Python binary data, create a CFString. + The string must be CFReleased by the caller. + """ + c_str = ctypes.c_char_p(value) + cf_str = CoreFoundation.CFStringCreateWithCString( + CoreFoundation.kCFAllocatorDefault, + c_str, + CFConst.kCFStringEncodingUTF8, + ) + return cf_str # type: ignore[no-any-return] + + +def _cf_string_ref_to_str(cf_string_ref: CFStringRef) -> str | None: # type: ignore[valid-type] + """ + Creates a Unicode string from a CFString object. Used entirely for error + reporting. + Yes, it annoys me quite a lot that this function is this complex. + """ + + string = CoreFoundation.CFStringGetCStringPtr( + cf_string_ref, CFConst.kCFStringEncodingUTF8 + ) + if string is None: + buffer = ctypes.create_string_buffer(1024) + result = CoreFoundation.CFStringGetCString( + cf_string_ref, buffer, 1024, CFConst.kCFStringEncodingUTF8 + ) + if not result: + raise OSError("Error copying C string from CFStringRef") + string = buffer.value + if string is not None: + string = string.decode("utf-8") + return string # type: ignore[no-any-return] + + +def _der_certs_to_cf_cert_array(certs: list[bytes]) -> CFMutableArrayRef: # type: ignore[valid-type] + """Builds a CFArray of SecCertificateRefs from a list of DER-encoded certificates. + Responsibility of the caller to call CoreFoundation.CFRelease on the CFArray. + """ + cf_array = CoreFoundation.CFArrayCreateMutable( + CoreFoundation.kCFAllocatorDefault, + 0, + ctypes.byref(CoreFoundation.kCFTypeArrayCallBacks), + ) + if not cf_array: + raise MemoryError("Unable to allocate memory!") + + for cert_data in certs: + cf_data = None + sec_cert_ref = None + try: + cf_data = _bytes_to_cf_data_ref(cert_data) + sec_cert_ref = Security.SecCertificateCreateWithData( + CoreFoundation.kCFAllocatorDefault, cf_data + ) + CoreFoundation.CFArrayAppendValue(cf_array, sec_cert_ref) + finally: + if cf_data: + CoreFoundation.CFRelease(cf_data) + if sec_cert_ref: + CoreFoundation.CFRelease(sec_cert_ref) + + return cf_array # type: ignore[no-any-return] + + +@contextlib.contextmanager +def _configure_context(ctx: ssl.SSLContext) -> typing.Iterator[None]: + check_hostname = ctx.check_hostname + verify_mode = ctx.verify_mode + ctx.check_hostname = False + _set_ssl_context_verify_mode(ctx, ssl.CERT_NONE) + try: + yield + finally: + ctx.check_hostname = check_hostname + _set_ssl_context_verify_mode(ctx, verify_mode) + + +def _verify_peercerts_impl( + ssl_context: ssl.SSLContext, + cert_chain: list[bytes], + server_hostname: str | None = None, +) -> None: + certs = None + policies = None + trust = None + cf_error = None + try: + if server_hostname is not None: + cf_str_hostname = None + try: + cf_str_hostname = _bytes_to_cf_string(server_hostname.encode("ascii")) + ssl_policy = Security.SecPolicyCreateSSL(True, cf_str_hostname) + finally: + if cf_str_hostname: + CoreFoundation.CFRelease(cf_str_hostname) + else: + ssl_policy = Security.SecPolicyCreateSSL(True, None) + + policies = ssl_policy + if ssl_context.verify_flags & ssl.VERIFY_CRL_CHECK_CHAIN: + # Add explicit policy requiring positive revocation checks + policies = CoreFoundation.CFArrayCreateMutable( + CoreFoundation.kCFAllocatorDefault, + 0, + ctypes.byref(CoreFoundation.kCFTypeArrayCallBacks), + ) + CoreFoundation.CFArrayAppendValue(policies, ssl_policy) + CoreFoundation.CFRelease(ssl_policy) + revocation_policy = Security.SecPolicyCreateRevocation( + kSecRevocationUseAnyAvailableMethod + | kSecRevocationRequirePositiveResponse + ) + CoreFoundation.CFArrayAppendValue(policies, revocation_policy) + CoreFoundation.CFRelease(revocation_policy) + elif ssl_context.verify_flags & ssl.VERIFY_CRL_CHECK_LEAF: + raise NotImplementedError("VERIFY_CRL_CHECK_LEAF not implemented for macOS") + + certs = None + try: + certs = _der_certs_to_cf_cert_array(cert_chain) + + # Now that we have certificates loaded and a SecPolicy + # we can finally create a SecTrust object! + trust = Security.SecTrustRef() + Security.SecTrustCreateWithCertificates( + certs, policies, ctypes.byref(trust) + ) + + finally: + # The certs are now being held by SecTrust so we can + # release our handles for the array. + if certs: + CoreFoundation.CFRelease(certs) + + # If there are additional trust anchors to load we need to transform + # the list of DER-encoded certificates into a CFArray. Otherwise + # pass 'None' to signal that we only want system / fetched certificates. + ctx_ca_certs_der: list[bytes] | None = ssl_context.get_ca_certs( + binary_form=True + ) + if ctx_ca_certs_der: + ctx_ca_certs = None + try: + ctx_ca_certs = _der_certs_to_cf_cert_array(cert_chain) + Security.SecTrustSetAnchorCertificates(trust, ctx_ca_certs) + finally: + if ctx_ca_certs: + CoreFoundation.CFRelease(ctx_ca_certs) + else: + Security.SecTrustSetAnchorCertificates(trust, None) + + cf_error = CoreFoundation.CFErrorRef() + sec_trust_eval_result = Security.SecTrustEvaluateWithError( + trust, ctypes.byref(cf_error) + ) + # sec_trust_eval_result is a bool (0 or 1) + # where 1 means that the certs are trusted. + if sec_trust_eval_result == 1: + is_trusted = True + elif sec_trust_eval_result == 0: + is_trusted = False + else: + raise ssl.SSLError( + f"Unknown result from Security.SecTrustEvaluateWithError: {sec_trust_eval_result!r}" + ) + + cf_error_code = 0 + if not is_trusted: + cf_error_code = CoreFoundation.CFErrorGetCode(cf_error) + + # If the error is a known failure that we're + # explicitly okay with from SSLContext configuration + # we can set is_trusted accordingly. + if ssl_context.verify_mode != ssl.CERT_REQUIRED and ( + cf_error_code == CFConst.errSecNotTrusted + or cf_error_code == CFConst.errSecCertificateExpired + ): + is_trusted = True + elif ( + not ssl_context.check_hostname + and cf_error_code == CFConst.errSecHostNameMismatch + ): + is_trusted = True + + # If we're still not trusted then we start to + # construct and raise the SSLCertVerificationError. + if not is_trusted: + cf_error_string_ref = None + try: + cf_error_string_ref = CoreFoundation.CFErrorCopyDescription(cf_error) + + # Can this ever return 'None' if there's a CFError? + cf_error_message = ( + _cf_string_ref_to_str(cf_error_string_ref) + or "Certificate verification failed" + ) + + # TODO: Not sure if we need the SecTrustResultType for anything? + # We only care whether or not it's a success or failure for now. + sec_trust_result_type = Security.SecTrustResultType() + Security.SecTrustGetTrustResult( + trust, ctypes.byref(sec_trust_result_type) + ) + + err = ssl.SSLCertVerificationError(cf_error_message) + err.verify_message = cf_error_message + err.verify_code = cf_error_code + raise err + finally: + if cf_error_string_ref: + CoreFoundation.CFRelease(cf_error_string_ref) + + finally: + if policies: + CoreFoundation.CFRelease(policies) + if trust: + CoreFoundation.CFRelease(trust) diff --git a/src/pip/_vendor/truststore/_openssl.py b/src/pip/_vendor/truststore/_openssl.py new file mode 100644 index 00000000000..9951cf75c40 --- /dev/null +++ b/src/pip/_vendor/truststore/_openssl.py @@ -0,0 +1,66 @@ +import contextlib +import os +import re +import ssl +import typing + +# candidates based on https://github.com/tiran/certifi-system-store by Christian Heimes +_CA_FILE_CANDIDATES = [ + # Alpine, Arch, Fedora 34+, OpenWRT, RHEL 9+, BSD + "/etc/ssl/cert.pem", + # Fedora <= 34, RHEL <= 9, CentOS <= 9 + "/etc/pki/tls/cert.pem", + # Debian, Ubuntu (requires ca-certificates) + "/etc/ssl/certs/ca-certificates.crt", + # SUSE + "/etc/ssl/ca-bundle.pem", +] + +_HASHED_CERT_FILENAME_RE = re.compile(r"^[0-9a-fA-F]{8}\.[0-9]$") + + +@contextlib.contextmanager +def _configure_context(ctx: ssl.SSLContext) -> typing.Iterator[None]: + # First, check whether the default locations from OpenSSL + # seem like they will give us a usable set of CA certs. + # ssl.get_default_verify_paths already takes care of: + # - getting cafile from either the SSL_CERT_FILE env var + # or the path configured when OpenSSL was compiled, + # and verifying that that path exists + # - getting capath from either the SSL_CERT_DIR env var + # or the path configured when OpenSSL was compiled, + # and verifying that that path exists + # In addition we'll check whether capath appears to contain certs. + defaults = ssl.get_default_verify_paths() + if defaults.cafile or (defaults.capath and _capath_contains_certs(defaults.capath)): + ctx.set_default_verify_paths() + else: + # cafile from OpenSSL doesn't exist + # and capath from OpenSSL doesn't contain certs. + # Let's search other common locations instead. + for cafile in _CA_FILE_CANDIDATES: + if os.path.isfile(cafile): + ctx.load_verify_locations(cafile=cafile) + break + + yield + + +def _capath_contains_certs(capath: str) -> bool: + """Check whether capath exists and contains certs in the expected format.""" + if not os.path.isdir(capath): + return False + for name in os.listdir(capath): + if _HASHED_CERT_FILENAME_RE.match(name): + return True + return False + + +def _verify_peercerts_impl( + ssl_context: ssl.SSLContext, + cert_chain: list[bytes], + server_hostname: str | None = None, +) -> None: + # This is a no-op because we've enabled SSLContext's built-in + # verification via verify_mode=CERT_REQUIRED, and don't need to repeat it. + pass diff --git a/src/pip/_vendor/truststore/_ssl_constants.py b/src/pip/_vendor/truststore/_ssl_constants.py new file mode 100644 index 00000000000..be60f8301ec --- /dev/null +++ b/src/pip/_vendor/truststore/_ssl_constants.py @@ -0,0 +1,12 @@ +import ssl + +# Hold on to the original class so we can create it consistently +# even if we inject our own SSLContext into the ssl module. +_original_SSLContext = ssl.SSLContext +_original_super_SSLContext = super(_original_SSLContext, _original_SSLContext) + + +def _set_ssl_context_verify_mode( + ssl_context: ssl.SSLContext, verify_mode: ssl.VerifyMode +) -> None: + _original_super_SSLContext.verify_mode.__set__(ssl_context, verify_mode) # type: ignore[attr-defined] diff --git a/src/pip/_vendor/truststore/_windows.py b/src/pip/_vendor/truststore/_windows.py new file mode 100644 index 00000000000..3de4960a1b0 --- /dev/null +++ b/src/pip/_vendor/truststore/_windows.py @@ -0,0 +1,554 @@ +import contextlib +import ssl +import typing +from ctypes import WinDLL # type: ignore +from ctypes import WinError # type: ignore +from ctypes import ( + POINTER, + Structure, + c_char_p, + c_ulong, + c_void_p, + c_wchar_p, + cast, + create_unicode_buffer, + pointer, + sizeof, +) +from ctypes.wintypes import ( + BOOL, + DWORD, + HANDLE, + LONG, + LPCSTR, + LPCVOID, + LPCWSTR, + LPFILETIME, + LPSTR, + LPWSTR, +) +from typing import TYPE_CHECKING, Any + +from ._ssl_constants import _set_ssl_context_verify_mode + +HCERTCHAINENGINE = HANDLE +HCERTSTORE = HANDLE +HCRYPTPROV_LEGACY = HANDLE + + +class CERT_CONTEXT(Structure): + _fields_ = ( + ("dwCertEncodingType", DWORD), + ("pbCertEncoded", c_void_p), + ("cbCertEncoded", DWORD), + ("pCertInfo", c_void_p), + ("hCertStore", HCERTSTORE), + ) + + +PCERT_CONTEXT = POINTER(CERT_CONTEXT) +PCCERT_CONTEXT = POINTER(PCERT_CONTEXT) + + +class CERT_ENHKEY_USAGE(Structure): + _fields_ = ( + ("cUsageIdentifier", DWORD), + ("rgpszUsageIdentifier", POINTER(LPSTR)), + ) + + +PCERT_ENHKEY_USAGE = POINTER(CERT_ENHKEY_USAGE) + + +class CERT_USAGE_MATCH(Structure): + _fields_ = ( + ("dwType", DWORD), + ("Usage", CERT_ENHKEY_USAGE), + ) + + +class CERT_CHAIN_PARA(Structure): + _fields_ = ( + ("cbSize", DWORD), + ("RequestedUsage", CERT_USAGE_MATCH), + ("RequestedIssuancePolicy", CERT_USAGE_MATCH), + ("dwUrlRetrievalTimeout", DWORD), + ("fCheckRevocationFreshnessTime", BOOL), + ("dwRevocationFreshnessTime", DWORD), + ("pftCacheResync", LPFILETIME), + ("pStrongSignPara", c_void_p), + ("dwStrongSignFlags", DWORD), + ) + + +if TYPE_CHECKING: + PCERT_CHAIN_PARA = pointer[CERT_CHAIN_PARA] # type: ignore[misc] +else: + PCERT_CHAIN_PARA = POINTER(CERT_CHAIN_PARA) + + +class CERT_TRUST_STATUS(Structure): + _fields_ = ( + ("dwErrorStatus", DWORD), + ("dwInfoStatus", DWORD), + ) + + +class CERT_CHAIN_ELEMENT(Structure): + _fields_ = ( + ("cbSize", DWORD), + ("pCertContext", PCERT_CONTEXT), + ("TrustStatus", CERT_TRUST_STATUS), + ("pRevocationInfo", c_void_p), + ("pIssuanceUsage", PCERT_ENHKEY_USAGE), + ("pApplicationUsage", PCERT_ENHKEY_USAGE), + ("pwszExtendedErrorInfo", LPCWSTR), + ) + + +PCERT_CHAIN_ELEMENT = POINTER(CERT_CHAIN_ELEMENT) + + +class CERT_SIMPLE_CHAIN(Structure): + _fields_ = ( + ("cbSize", DWORD), + ("TrustStatus", CERT_TRUST_STATUS), + ("cElement", DWORD), + ("rgpElement", POINTER(PCERT_CHAIN_ELEMENT)), + ("pTrustListInfo", c_void_p), + ("fHasRevocationFreshnessTime", BOOL), + ("dwRevocationFreshnessTime", DWORD), + ) + + +PCERT_SIMPLE_CHAIN = POINTER(CERT_SIMPLE_CHAIN) + + +class CERT_CHAIN_CONTEXT(Structure): + _fields_ = ( + ("cbSize", DWORD), + ("TrustStatus", CERT_TRUST_STATUS), + ("cChain", DWORD), + ("rgpChain", POINTER(PCERT_SIMPLE_CHAIN)), + ("cLowerQualityChainContext", DWORD), + ("rgpLowerQualityChainContext", c_void_p), + ("fHasRevocationFreshnessTime", BOOL), + ("dwRevocationFreshnessTime", DWORD), + ) + + +PCERT_CHAIN_CONTEXT = POINTER(CERT_CHAIN_CONTEXT) +PCCERT_CHAIN_CONTEXT = POINTER(PCERT_CHAIN_CONTEXT) + + +class SSL_EXTRA_CERT_CHAIN_POLICY_PARA(Structure): + _fields_ = ( + ("cbSize", DWORD), + ("dwAuthType", DWORD), + ("fdwChecks", DWORD), + ("pwszServerName", LPCWSTR), + ) + + +class CERT_CHAIN_POLICY_PARA(Structure): + _fields_ = ( + ("cbSize", DWORD), + ("dwFlags", DWORD), + ("pvExtraPolicyPara", c_void_p), + ) + + +PCERT_CHAIN_POLICY_PARA = POINTER(CERT_CHAIN_POLICY_PARA) + + +class CERT_CHAIN_POLICY_STATUS(Structure): + _fields_ = ( + ("cbSize", DWORD), + ("dwError", DWORD), + ("lChainIndex", LONG), + ("lElementIndex", LONG), + ("pvExtraPolicyStatus", c_void_p), + ) + + +PCERT_CHAIN_POLICY_STATUS = POINTER(CERT_CHAIN_POLICY_STATUS) + + +class CERT_CHAIN_ENGINE_CONFIG(Structure): + _fields_ = ( + ("cbSize", DWORD), + ("hRestrictedRoot", HCERTSTORE), + ("hRestrictedTrust", HCERTSTORE), + ("hRestrictedOther", HCERTSTORE), + ("cAdditionalStore", DWORD), + ("rghAdditionalStore", c_void_p), + ("dwFlags", DWORD), + ("dwUrlRetrievalTimeout", DWORD), + ("MaximumCachedCertificates", DWORD), + ("CycleDetectionModulus", DWORD), + ("hExclusiveRoot", HCERTSTORE), + ("hExclusiveTrustedPeople", HCERTSTORE), + ("dwExclusiveFlags", DWORD), + ) + + +PCERT_CHAIN_ENGINE_CONFIG = POINTER(CERT_CHAIN_ENGINE_CONFIG) +PHCERTCHAINENGINE = POINTER(HCERTCHAINENGINE) + +X509_ASN_ENCODING = 0x00000001 +PKCS_7_ASN_ENCODING = 0x00010000 +CERT_STORE_PROV_MEMORY = b"Memory" +CERT_STORE_ADD_USE_EXISTING = 2 +USAGE_MATCH_TYPE_OR = 1 +OID_PKIX_KP_SERVER_AUTH = c_char_p(b"1.3.6.1.5.5.7.3.1") +CERT_CHAIN_REVOCATION_CHECK_END_CERT = 0x10000000 +CERT_CHAIN_REVOCATION_CHECK_CHAIN = 0x20000000 +CERT_CHAIN_POLICY_IGNORE_ALL_NOT_TIME_VALID_FLAGS = 0x00000007 +CERT_CHAIN_POLICY_IGNORE_INVALID_BASIC_CONSTRAINTS_FLAG = 0x00000008 +CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG = 0x00000010 +CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG = 0x00000040 +CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG = 0x00000020 +CERT_CHAIN_POLICY_IGNORE_INVALID_POLICY_FLAG = 0x00000080 +CERT_CHAIN_POLICY_IGNORE_ALL_REV_UNKNOWN_FLAGS = 0x00000F00 +CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG = 0x00008000 +CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG = 0x00004000 +AUTHTYPE_SERVER = 2 +CERT_CHAIN_POLICY_SSL = 4 +FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000 +FORMAT_MESSAGE_IGNORE_INSERTS = 0x00000200 + +# Flags to set for SSLContext.verify_mode=CERT_NONE +CERT_CHAIN_POLICY_VERIFY_MODE_NONE_FLAGS = ( + CERT_CHAIN_POLICY_IGNORE_ALL_NOT_TIME_VALID_FLAGS + | CERT_CHAIN_POLICY_IGNORE_INVALID_BASIC_CONSTRAINTS_FLAG + | CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG + | CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG + | CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG + | CERT_CHAIN_POLICY_IGNORE_INVALID_POLICY_FLAG + | CERT_CHAIN_POLICY_IGNORE_ALL_REV_UNKNOWN_FLAGS + | CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG + | CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG +) + +wincrypt = WinDLL("crypt32.dll") +kernel32 = WinDLL("kernel32.dll") + + +def _handle_win_error(result: bool, _: Any, args: Any) -> Any: + if not result: + # Note, actually raises OSError after calling GetLastError and FormatMessage + raise WinError() + return args + + +CertCreateCertificateChainEngine = wincrypt.CertCreateCertificateChainEngine +CertCreateCertificateChainEngine.argtypes = ( + PCERT_CHAIN_ENGINE_CONFIG, + PHCERTCHAINENGINE, +) +CertCreateCertificateChainEngine.errcheck = _handle_win_error + +CertOpenStore = wincrypt.CertOpenStore +CertOpenStore.argtypes = (LPCSTR, DWORD, HCRYPTPROV_LEGACY, DWORD, c_void_p) +CertOpenStore.restype = HCERTSTORE +CertOpenStore.errcheck = _handle_win_error + +CertAddEncodedCertificateToStore = wincrypt.CertAddEncodedCertificateToStore +CertAddEncodedCertificateToStore.argtypes = ( + HCERTSTORE, + DWORD, + c_char_p, + DWORD, + DWORD, + PCCERT_CONTEXT, +) +CertAddEncodedCertificateToStore.restype = BOOL + +CertCreateCertificateContext = wincrypt.CertCreateCertificateContext +CertCreateCertificateContext.argtypes = (DWORD, c_char_p, DWORD) +CertCreateCertificateContext.restype = PCERT_CONTEXT +CertCreateCertificateContext.errcheck = _handle_win_error + +CertGetCertificateChain = wincrypt.CertGetCertificateChain +CertGetCertificateChain.argtypes = ( + HCERTCHAINENGINE, + PCERT_CONTEXT, + LPFILETIME, + HCERTSTORE, + PCERT_CHAIN_PARA, + DWORD, + c_void_p, + PCCERT_CHAIN_CONTEXT, +) +CertGetCertificateChain.restype = BOOL +CertGetCertificateChain.errcheck = _handle_win_error + +CertVerifyCertificateChainPolicy = wincrypt.CertVerifyCertificateChainPolicy +CertVerifyCertificateChainPolicy.argtypes = ( + c_ulong, + PCERT_CHAIN_CONTEXT, + PCERT_CHAIN_POLICY_PARA, + PCERT_CHAIN_POLICY_STATUS, +) +CertVerifyCertificateChainPolicy.restype = BOOL + +CertCloseStore = wincrypt.CertCloseStore +CertCloseStore.argtypes = (HCERTSTORE, DWORD) +CertCloseStore.restype = BOOL +CertCloseStore.errcheck = _handle_win_error + +CertFreeCertificateChain = wincrypt.CertFreeCertificateChain +CertFreeCertificateChain.argtypes = (PCERT_CHAIN_CONTEXT,) + +CertFreeCertificateContext = wincrypt.CertFreeCertificateContext +CertFreeCertificateContext.argtypes = (PCERT_CONTEXT,) + +CertFreeCertificateChainEngine = wincrypt.CertFreeCertificateChainEngine +CertFreeCertificateChainEngine.argtypes = (HCERTCHAINENGINE,) + +FormatMessageW = kernel32.FormatMessageW +FormatMessageW.argtypes = ( + DWORD, + LPCVOID, + DWORD, + DWORD, + LPWSTR, + DWORD, + c_void_p, +) +FormatMessageW.restype = DWORD + + +def _verify_peercerts_impl( + ssl_context: ssl.SSLContext, + cert_chain: list[bytes], + server_hostname: str | None = None, +) -> None: + """Verify the cert_chain from the server using Windows APIs.""" + pCertContext = None + hIntermediateCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, None, 0, None) + try: + # Add intermediate certs to an in-memory cert store + for cert_bytes in cert_chain[1:]: + CertAddEncodedCertificateToStore( + hIntermediateCertStore, + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + cert_bytes, + len(cert_bytes), + CERT_STORE_ADD_USE_EXISTING, + None, + ) + + # Cert context for leaf cert + leaf_cert = cert_chain[0] + pCertContext = CertCreateCertificateContext( + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, leaf_cert, len(leaf_cert) + ) + + # Chain params to match certs for serverAuth extended usage + cert_enhkey_usage = CERT_ENHKEY_USAGE() + cert_enhkey_usage.cUsageIdentifier = 1 + cert_enhkey_usage.rgpszUsageIdentifier = (c_char_p * 1)(OID_PKIX_KP_SERVER_AUTH) + cert_usage_match = CERT_USAGE_MATCH() + cert_usage_match.Usage = cert_enhkey_usage + chain_params = CERT_CHAIN_PARA() + chain_params.RequestedUsage = cert_usage_match + chain_params.cbSize = sizeof(chain_params) + pChainPara = pointer(chain_params) + + if ssl_context.verify_flags & ssl.VERIFY_CRL_CHECK_CHAIN: + chain_flags = CERT_CHAIN_REVOCATION_CHECK_CHAIN + elif ssl_context.verify_flags & ssl.VERIFY_CRL_CHECK_LEAF: + chain_flags = CERT_CHAIN_REVOCATION_CHECK_END_CERT + else: + chain_flags = 0 + + try: + # First attempt to verify using the default Windows system trust roots + # (default chain engine). + _get_and_verify_cert_chain( + ssl_context, + None, + hIntermediateCertStore, + pCertContext, + pChainPara, + server_hostname, + chain_flags=chain_flags, + ) + except ssl.SSLCertVerificationError: + # If that fails but custom CA certs have been added + # to the SSLContext using load_verify_locations, + # try verifying using a custom chain engine + # that trusts the custom CA certs. + custom_ca_certs: list[bytes] | None = ssl_context.get_ca_certs( + binary_form=True + ) + if custom_ca_certs: + _verify_using_custom_ca_certs( + ssl_context, + custom_ca_certs, + hIntermediateCertStore, + pCertContext, + pChainPara, + server_hostname, + chain_flags=chain_flags, + ) + else: + raise + finally: + CertCloseStore(hIntermediateCertStore, 0) + if pCertContext: + CertFreeCertificateContext(pCertContext) + + +def _get_and_verify_cert_chain( + ssl_context: ssl.SSLContext, + hChainEngine: HCERTCHAINENGINE | None, + hIntermediateCertStore: HCERTSTORE, + pPeerCertContext: c_void_p, + pChainPara: PCERT_CHAIN_PARA, # type: ignore[valid-type] + server_hostname: str | None, + chain_flags: int, +) -> None: + ppChainContext = None + try: + # Get cert chain + ppChainContext = pointer(PCERT_CHAIN_CONTEXT()) + CertGetCertificateChain( + hChainEngine, # chain engine + pPeerCertContext, # leaf cert context + None, # current system time + hIntermediateCertStore, # additional in-memory cert store + pChainPara, # chain-building parameters + chain_flags, + None, # reserved + ppChainContext, # the resulting chain context + ) + pChainContext = ppChainContext.contents + + # Verify cert chain + ssl_extra_cert_chain_policy_para = SSL_EXTRA_CERT_CHAIN_POLICY_PARA() + ssl_extra_cert_chain_policy_para.cbSize = sizeof( + ssl_extra_cert_chain_policy_para + ) + ssl_extra_cert_chain_policy_para.dwAuthType = AUTHTYPE_SERVER + ssl_extra_cert_chain_policy_para.fdwChecks = 0 + if server_hostname: + ssl_extra_cert_chain_policy_para.pwszServerName = c_wchar_p(server_hostname) + + chain_policy = CERT_CHAIN_POLICY_PARA() + chain_policy.pvExtraPolicyPara = cast( + pointer(ssl_extra_cert_chain_policy_para), c_void_p + ) + if ssl_context.verify_mode == ssl.CERT_NONE: + chain_policy.dwFlags |= CERT_CHAIN_POLICY_VERIFY_MODE_NONE_FLAGS + if not ssl_context.check_hostname: + chain_policy.dwFlags |= CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG + chain_policy.cbSize = sizeof(chain_policy) + + pPolicyPara = pointer(chain_policy) + policy_status = CERT_CHAIN_POLICY_STATUS() + policy_status.cbSize = sizeof(policy_status) + pPolicyStatus = pointer(policy_status) + CertVerifyCertificateChainPolicy( + CERT_CHAIN_POLICY_SSL, + pChainContext, + pPolicyPara, + pPolicyStatus, + ) + + # Check status + error_code = policy_status.dwError + if error_code: + # Try getting a human readable message for an error code. + error_message_buf = create_unicode_buffer(1024) + error_message_chars = FormatMessageW( + FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + None, + error_code, + 0, + error_message_buf, + sizeof(error_message_buf), + None, + ) + + # See if we received a message for the error, + # otherwise we use a generic error with the + # error code and hope that it's search-able. + if error_message_chars <= 0: + error_message = f"Certificate chain policy error {error_code:#x} [{policy_status.lElementIndex}]" + else: + error_message = error_message_buf.value.strip() + + err = ssl.SSLCertVerificationError(error_message) + err.verify_message = error_message + err.verify_code = error_code + raise err from None + finally: + if ppChainContext: + CertFreeCertificateChain(ppChainContext.contents) + + +def _verify_using_custom_ca_certs( + ssl_context: ssl.SSLContext, + custom_ca_certs: list[bytes], + hIntermediateCertStore: HCERTSTORE, + pPeerCertContext: c_void_p, + pChainPara: PCERT_CHAIN_PARA, # type: ignore[valid-type] + server_hostname: str | None, + chain_flags: int, +) -> None: + hChainEngine = None + hRootCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, None, 0, None) + try: + # Add custom CA certs to an in-memory cert store + for cert_bytes in custom_ca_certs: + CertAddEncodedCertificateToStore( + hRootCertStore, + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + cert_bytes, + len(cert_bytes), + CERT_STORE_ADD_USE_EXISTING, + None, + ) + + # Create a custom cert chain engine which exclusively trusts + # certs from our hRootCertStore + cert_chain_engine_config = CERT_CHAIN_ENGINE_CONFIG() + cert_chain_engine_config.cbSize = sizeof(cert_chain_engine_config) + cert_chain_engine_config.hExclusiveRoot = hRootCertStore + pConfig = pointer(cert_chain_engine_config) + phChainEngine = pointer(HCERTCHAINENGINE()) + CertCreateCertificateChainEngine( + pConfig, + phChainEngine, + ) + hChainEngine = phChainEngine.contents + + # Get and verify a cert chain using the custom chain engine + _get_and_verify_cert_chain( + ssl_context, + hChainEngine, + hIntermediateCertStore, + pPeerCertContext, + pChainPara, + server_hostname, + chain_flags, + ) + finally: + if hChainEngine: + CertFreeCertificateChainEngine(hChainEngine) + CertCloseStore(hRootCertStore, 0) + + +@contextlib.contextmanager +def _configure_context(ctx: ssl.SSLContext) -> typing.Iterator[None]: + check_hostname = ctx.check_hostname + verify_mode = ctx.verify_mode + ctx.check_hostname = False + _set_ssl_context_verify_mode(ctx, ssl.CERT_NONE) + try: + yield + finally: + ctx.check_hostname = check_hostname + _set_ssl_context_verify_mode(ctx, verify_mode) diff --git a/src/pip/_vendor/truststore/py.typed b/src/pip/_vendor/truststore/py.typed new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt index 08e1acb016c..56cf7551727 100644 --- a/src/pip/_vendor/vendor.txt +++ b/src/pip/_vendor/vendor.txt @@ -20,4 +20,5 @@ setuptools==68.0.0 six==1.16.0 tenacity==8.2.2 tomli==2.0.1 +truststore==0.7.0 webencodings==0.5.1 diff --git a/tests/functional/test_truststore.py b/tests/functional/test_truststore.py index 33153d0fbf9..cc90343b52d 100644 --- a/tests/functional/test_truststore.py +++ b/tests/functional/test_truststore.py @@ -27,20 +27,6 @@ def test_truststore_error_on_old_python(pip: PipRunner) -> None: assert "The truststore feature is only available for Python 3.10+" in result.stderr -@pytest.mark.skipif(sys.version_info < (3, 10), reason="3.10+ required for truststore") -def test_truststore_error_without_preinstalled(pip: PipRunner) -> None: - result = pip( - "install", - "--no-index", - "does-not-matter", - expect_error=True, - ) - assert ( - "To use the truststore feature, 'truststore' must be installed into " - "pip's current environment." - ) in result.stderr - - @pytest.mark.skipif(sys.version_info < (3, 10), reason="3.10+ required for truststore") @pytest.mark.network @pytest.mark.parametrize( @@ -56,6 +42,5 @@ def test_trustore_can_install( pip: PipRunner, package: str, ) -> None: - script.pip("install", "truststore") result = pip("install", package) assert "Successfully installed" in result.stdout From 9a65b887a44555ba6b1ad19b8b81c834472ce3b8 Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Mon, 26 Jun 2023 22:49:06 -0500 Subject: [PATCH 089/992] Use absolute instead of relative imports for vendored modules Co-authored-by: Tzu-ping Chung --- src/pip/_internal/cli/req_command.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index 80b35a80aae..a2395d68c54 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -58,7 +58,7 @@ def _create_truststore_ssl_context() -> Optional["SSLContext"]: return None try: - from ..._vendor import truststore + from pip._vendor import truststore except ImportError: raise CommandError( "To use the truststore feature, 'truststore' must be installed into " From 44857c6e82c3219b39d55c61aded270a480b4f5d Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Mon, 26 Jun 2023 22:52:57 -0500 Subject: [PATCH 090/992] Update error message to forward platform-specific error --- src/pip/_internal/cli/req_command.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index a2395d68c54..080739aa979 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -59,10 +59,9 @@ def _create_truststore_ssl_context() -> Optional["SSLContext"]: try: from pip._vendor import truststore - except ImportError: + except ImportError as e: raise CommandError( - "To use the truststore feature, 'truststore' must be installed into " - "pip's current environment." + f"The truststore feature is unavailable: {e}" ) return truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT) From 63f19b5eade3891d98fbc419e2a0b686e11752b4 Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Sat, 19 Aug 2023 11:49:32 -0500 Subject: [PATCH 091/992] Explicitly require Python 3.10+ for vendoring task --- noxfile.py | 6 ++++++ src/pip/_internal/cli/req_command.py | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/noxfile.py b/noxfile.py index 041d9039974..a3e7ceab4cc 100644 --- a/noxfile.py +++ b/noxfile.py @@ -184,6 +184,12 @@ def lint(session: nox.Session) -> None: # git reset --hard origin/main @nox.session def vendoring(session: nox.Session) -> None: + # Ensure that the session Python is running 3.10+ + # so that truststore can be installed correctly. + session.run( + "python", "-c", "import sys; sys.exit(1 if sys.version_info < (3, 10) else 0)" + ) + session.install("vendoring~=1.2.0") parser = argparse.ArgumentParser(prog="nox -s vendoring") diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index 080739aa979..7a53d510586 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -60,9 +60,7 @@ def _create_truststore_ssl_context() -> Optional["SSLContext"]: try: from pip._vendor import truststore except ImportError as e: - raise CommandError( - f"The truststore feature is unavailable: {e}" - ) + raise CommandError(f"The truststore feature is unavailable: {e}") return truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT) From fca773ccde9a95df9ff8c9153e3497fc13571912 Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Tue, 22 Aug 2023 20:43:54 -0500 Subject: [PATCH 092/992] Allow truststore to not import on Python 3.9 and earlier --- src/pip/_internal/commands/debug.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/pip/_internal/commands/debug.py b/src/pip/_internal/commands/debug.py index 1b1fd3ea5cc..ab8280db48d 100644 --- a/src/pip/_internal/commands/debug.py +++ b/src/pip/_internal/commands/debug.py @@ -46,22 +46,29 @@ def create_vendor_txt_map() -> Dict[str, str]: return dict(line.split("==", 1) for line in lines) -def get_module_from_module_name(module_name: str) -> ModuleType: +def get_module_from_module_name(module_name: str) -> Optional[ModuleType]: # Module name can be uppercase in vendor.txt for some reason... module_name = module_name.lower().replace("-", "_") # PATCH: setuptools is actually only pkg_resources. if module_name == "setuptools": module_name = "pkg_resources" - __import__(f"pip._vendor.{module_name}", globals(), locals(), level=0) - return getattr(pip._vendor, module_name) + try: + __import__(f"pip._vendor.{module_name}", globals(), locals(), level=0) + return getattr(pip._vendor, module_name) + except ImportError: + # We allow 'truststore' to fail to import due + # to being unavailable on Python 3.9 and earlier. + if module_name == "truststore" and sys.version_info < (3, 10): + return None + raise def get_vendor_version_from_module(module_name: str) -> Optional[str]: module = get_module_from_module_name(module_name) version = getattr(module, "__version__", None) - if not version: + if module and not version: # Try to find version in debundled module info. assert module.__file__ is not None env = get_environment([os.path.dirname(module.__file__)]) From bff1e6a67be0545dd7e2ac1cb5189463370c3b55 Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Tue, 12 Sep 2023 15:55:51 -0500 Subject: [PATCH 093/992] Vendor truststore 0.8.0 --- news/truststore.vendor.rst | 2 +- src/pip/_vendor/truststore/__init__.py | 2 +- src/pip/_vendor/truststore/_api.py | 38 ++++++++++---------- src/pip/_vendor/truststore/_ssl_constants.py | 19 ++++++++++ src/pip/_vendor/vendor.txt | 2 +- 5 files changed, 41 insertions(+), 22 deletions(-) diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst index ee974728d92..63c71d72d2f 100644 --- a/news/truststore.vendor.rst +++ b/news/truststore.vendor.rst @@ -1 +1 @@ -Add truststore 0.7.0 +Add truststore 0.8.0 diff --git a/src/pip/_vendor/truststore/__init__.py b/src/pip/_vendor/truststore/__init__.py index 0f3a4d9e1e1..59930f455b0 100644 --- a/src/pip/_vendor/truststore/__init__.py +++ b/src/pip/_vendor/truststore/__init__.py @@ -10,4 +10,4 @@ del _api, _sys # type: ignore[name-defined] # noqa: F821 __all__ = ["SSLContext", "inject_into_ssl", "extract_from_ssl"] -__version__ = "0.7.0" +__version__ = "0.8.0" diff --git a/src/pip/_vendor/truststore/_api.py b/src/pip/_vendor/truststore/_api.py index 2647042418f..829aff72672 100644 --- a/src/pip/_vendor/truststore/_api.py +++ b/src/pip/_vendor/truststore/_api.py @@ -1,8 +1,4 @@ -import array -import ctypes -import mmap import os -import pickle import platform import socket import ssl @@ -10,7 +6,12 @@ import _ssl # type: ignore[import] -from ._ssl_constants import _original_SSLContext, _original_super_SSLContext +from ._ssl_constants import ( + _original_SSLContext, + _original_super_SSLContext, + _truststore_SSLContext_dunder_class, + _truststore_SSLContext_super_class, +) if platform.system() == "Windows": from ._windows import _configure_context, _verify_peercerts_impl @@ -19,21 +20,13 @@ else: from ._openssl import _configure_context, _verify_peercerts_impl +if typing.TYPE_CHECKING: + from pip._vendor.typing_extensions import Buffer + # From typeshed/stdlib/ssl.pyi _StrOrBytesPath: typing.TypeAlias = str | bytes | os.PathLike[str] | os.PathLike[bytes] _PasswordType: typing.TypeAlias = str | bytes | typing.Callable[[], str | bytes] -# From typeshed/stdlib/_typeshed/__init__.py -_ReadableBuffer: typing.TypeAlias = typing.Union[ - bytes, - memoryview, - bytearray, - "array.array[typing.Any]", - mmap.mmap, - "ctypes._CData", - pickle.PickleBuffer, -] - def inject_into_ssl() -> None: """Injects the :class:`truststore.SSLContext` into the ``ssl`` @@ -61,9 +54,16 @@ def extract_from_ssl() -> None: pass -class SSLContext(ssl.SSLContext): +class SSLContext(_truststore_SSLContext_super_class): # type: ignore[misc] """SSLContext API that uses system certificates on all platforms""" + @property # type: ignore[misc] + def __class__(self) -> type: + # Dirty hack to get around isinstance() checks + # for ssl.SSLContext instances in aiohttp/trustme + # when using non-CPython implementations. + return _truststore_SSLContext_dunder_class or SSLContext + def __init__(self, protocol: int = None) -> None: # type: ignore[assignment] self._ctx = _original_SSLContext(protocol) @@ -129,7 +129,7 @@ def load_verify_locations( self, cafile: str | bytes | os.PathLike[str] | os.PathLike[bytes] | None = None, capath: str | bytes | os.PathLike[str] | os.PathLike[bytes] | None = None, - cadata: str | _ReadableBuffer | None = None, + cadata: typing.Union[str, "Buffer", None] = None, ) -> None: return self._ctx.load_verify_locations( cafile=cafile, capath=capath, cadata=cadata @@ -252,7 +252,7 @@ def protocol(self) -> ssl._SSLMethod: return self._ctx.protocol @property - def security_level(self) -> int: # type: ignore[override] + def security_level(self) -> int: return self._ctx.security_level @property diff --git a/src/pip/_vendor/truststore/_ssl_constants.py b/src/pip/_vendor/truststore/_ssl_constants.py index be60f8301ec..b1ee7a3cb13 100644 --- a/src/pip/_vendor/truststore/_ssl_constants.py +++ b/src/pip/_vendor/truststore/_ssl_constants.py @@ -1,10 +1,29 @@ import ssl +import sys +import typing # Hold on to the original class so we can create it consistently # even if we inject our own SSLContext into the ssl module. _original_SSLContext = ssl.SSLContext _original_super_SSLContext = super(_original_SSLContext, _original_SSLContext) +# CPython is known to be good, but non-CPython implementations +# may implement SSLContext differently so to be safe we don't +# subclass the SSLContext. + +# This is returned by truststore.SSLContext.__class__() +_truststore_SSLContext_dunder_class: typing.Optional[type] + +# This value is the superclass of truststore.SSLContext. +_truststore_SSLContext_super_class: type + +if sys.implementation.name == "cpython": + _truststore_SSLContext_super_class = _original_SSLContext + _truststore_SSLContext_dunder_class = None +else: + _truststore_SSLContext_super_class = object + _truststore_SSLContext_dunder_class = _original_SSLContext + def _set_ssl_context_verify_mode( ssl_context: ssl.SSLContext, verify_mode: ssl.VerifyMode diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt index 56cf7551727..ade8512e25a 100644 --- a/src/pip/_vendor/vendor.txt +++ b/src/pip/_vendor/vendor.txt @@ -20,5 +20,5 @@ setuptools==68.0.0 six==1.16.0 tenacity==8.2.2 tomli==2.0.1 -truststore==0.7.0 +truststore==0.8.0 webencodings==0.5.1 From 90c4a4230d0dff833e5e087cd85cebde1c134233 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Wed, 13 Sep 2023 12:23:59 +0800 Subject: [PATCH 094/992] Manually build package and revert xfail marker --- tests/functional/test_install_extras.py | 26 ++++++++----------------- tests/requirements-common_wheels.txt | 6 +----- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py index 813c95bfa34..8ccbcf1998d 100644 --- a/tests/functional/test_install_extras.py +++ b/tests/functional/test_install_extras.py @@ -163,12 +163,10 @@ def test_install_fails_if_extra_at_end( "Hop_hOp-hoP", "hop-hop-hop", marks=pytest.mark.xfail( - "sys.version_info < (3, 8)", reason=( "matching a normalized extra request against an" "unnormalized extra in metadata requires PEP 685 support " - "in either packaging or the build tool. Setuptools " - "implements this in 68.2, which requires 3.8+" + "in packaging (see pypa/pip#11445)." ), ), ), @@ -180,26 +178,18 @@ def test_install_special_extra( specified_extra: str, requested_extra: str, ) -> None: - # Check that uppercase letters and '-' are dealt with - # make a dummy project - pkga_path = script.scratch_path / "pkga" - pkga_path.mkdir() - pkga_path.joinpath("setup.py").write_text( - textwrap.dedent( - f""" - from setuptools import setup - setup(name='pkga', - version='0.1', - extras_require={{'{specified_extra}': ['missing_pkg']}}, - ) - """ - ) + """Check extra normalization is implemented according to specification.""" + pkga_path = create_basic_wheel_for_package( + script, + name="pkga", + version="0.1", + extras={specified_extra: ["missing_pkg"]}, ) result = script.pip( "install", "--no-index", - f"{pkga_path}[{requested_extra}]", + f"pkga[{requested_extra}] @ {pkga_path.as_uri()}", expect_error=True, ) assert ( diff --git a/tests/requirements-common_wheels.txt b/tests/requirements-common_wheels.txt index 8963e333757..6403ed73898 100644 --- a/tests/requirements-common_wheels.txt +++ b/tests/requirements-common_wheels.txt @@ -5,11 +5,7 @@ # 4. Replacing the `setuptools` entry below with a `file:///...` URL # (Adjust artifact directory used based on preference and operating system) -# Implements new extra normalization. -setuptools >= 68.2 ; python_version >= '3.8' -setuptools >= 40.8.0, != 60.6.0 ; python_version < '3.8' - +setuptools >= 40.8.0, != 60.6.0 wheel - # As required by pytest-cov. coverage >= 4.4 From 7127fc96f4dfd7ab9b873664b57318c9fc693e3a Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Wed, 13 Sep 2023 13:27:11 +0800 Subject: [PATCH 095/992] Prevent eager extra normalization This removes extra normalization when metadata is loaded into the data structures, so we can obtain the raw values later in the process during resolution. The change in match_markers is needed because this is relied on by the legacy resolver. Since we removed eager normalization, we need to do that when the extras are used instead to maintain compatibility. --- src/pip/_internal/metadata/importlib/_dists.py | 7 ++----- src/pip/_internal/req/req_install.py | 5 +++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py index 65c043c87ef..c43ef8d01f9 100644 --- a/src/pip/_internal/metadata/importlib/_dists.py +++ b/src/pip/_internal/metadata/importlib/_dists.py @@ -27,7 +27,6 @@ Wheel, ) from pip._internal.utils.misc import normalize_path -from pip._internal.utils.packaging import safe_extra from pip._internal.utils.temp_dir import TempDirectory from pip._internal.utils.wheel import parse_wheel, read_wheel_metadata_file @@ -208,12 +207,10 @@ def _metadata_impl(self) -> email.message.Message: return cast(email.message.Message, self._dist.metadata) def iter_provided_extras(self) -> Iterable[str]: - return ( - safe_extra(extra) for extra in self.metadata.get_all("Provides-Extra", []) - ) + return (extra for extra in self.metadata.get_all("Provides-Extra", [])) def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]: - contexts: Sequence[Dict[str, str]] = [{"extra": safe_extra(e)} for e in extras] + contexts: Sequence[Dict[str, str]] = [{"extra": e} for e in extras] for req_string in self.metadata.get_all("Requires-Dist", []): req = Requirement(req_string) if not req.marker: diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py index 8110114ca14..84f337d6e5b 100644 --- a/src/pip/_internal/req/req_install.py +++ b/src/pip/_internal/req/req_install.py @@ -128,7 +128,7 @@ def __init__( if extras: self.extras = extras elif req: - self.extras = {safe_extra(extra) for extra in req.extras} + self.extras = req.extras else: self.extras = set() if markers is None and req: @@ -272,7 +272,8 @@ def match_markers(self, extras_requested: Optional[Iterable[str]] = None) -> boo extras_requested = ("",) if self.markers is not None: return any( - self.markers.evaluate({"extra": extra}) for extra in extras_requested + self.markers.evaluate({"extra": safe_extra(extra)}) + for extra in extras_requested ) else: return True From 9ba2bb90fb57e4ee5f624ecd39eade207863c21a Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Wed, 13 Sep 2023 16:35:59 +0800 Subject: [PATCH 096/992] Straighten up extra comps across metadata backends The importlib.metadata and pkg_resources backends unfortunately normalize extras differently, and we don't really want to continue using the latter's logic (being partially lossy while still not compliant to standards), so we add a new abstraction for the purpose. --- src/pip/_internal/metadata/__init__.py | 3 +- src/pip/_internal/metadata/base.py | 32 +++++++++++++------ .../_internal/metadata/importlib/__init__.py | 4 ++- .../_internal/metadata/importlib/_dists.py | 8 ++++- src/pip/_internal/metadata/pkg_resources.py | 10 +++++- src/pip/_internal/req/req_install.py | 6 +++- .../resolution/resolvelib/candidates.py | 23 ++++++++----- 7 files changed, 64 insertions(+), 22 deletions(-) diff --git a/src/pip/_internal/metadata/__init__.py b/src/pip/_internal/metadata/__init__.py index 9f73ca7105f..aa232b6cabd 100644 --- a/src/pip/_internal/metadata/__init__.py +++ b/src/pip/_internal/metadata/__init__.py @@ -9,7 +9,7 @@ from .base import BaseDistribution, BaseEnvironment, FilesystemWheel, MemoryWheel, Wheel if TYPE_CHECKING: - from typing import Protocol + from typing import Literal, Protocol else: Protocol = object @@ -50,6 +50,7 @@ def _should_use_importlib_metadata() -> bool: class Backend(Protocol): + NAME: 'Literal["importlib", "pkg_resources"]' Distribution: Type[BaseDistribution] Environment: Type[BaseEnvironment] diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py index cafb79fb3dc..92491244108 100644 --- a/src/pip/_internal/metadata/base.py +++ b/src/pip/_internal/metadata/base.py @@ -24,7 +24,7 @@ from pip._vendor.packaging.requirements import Requirement from pip._vendor.packaging.specifiers import InvalidSpecifier, SpecifierSet -from pip._vendor.packaging.utils import NormalizedName +from pip._vendor.packaging.utils import NormalizedName, canonicalize_name from pip._vendor.packaging.version import LegacyVersion, Version from pip._internal.exceptions import NoneMetadataError @@ -37,7 +37,6 @@ from pip._internal.utils.compat import stdlib_pkgs # TODO: Move definition here. from pip._internal.utils.egg_link import egg_link_path_from_sys_path from pip._internal.utils.misc import is_local, normalize_path -from pip._internal.utils.packaging import safe_extra from pip._internal.utils.urls import url_to_path from ._json import msg_to_json @@ -460,6 +459,19 @@ def iter_provided_extras(self) -> Iterable[str]: For modern .dist-info distributions, this is the collection of "Provides-Extra:" entries in distribution metadata. + + The return value of this function is not particularly useful other than + display purposes due to backward compatibility issues and the extra + names being poorly normalized prior to PEP 685. If you want to perform + logic operations on extras, use :func:`is_extra_provided` instead. + """ + raise NotImplementedError() + + def is_extra_provided(self, extra: str) -> bool: + """Check whether an extra is provided by this distribution. + + This is needed mostly for compatibility issues with pkg_resources not + following the extra normalization rules defined in PEP 685. """ raise NotImplementedError() @@ -537,10 +549,11 @@ def _iter_egg_info_extras(self) -> Iterable[str]: """Get extras from the egg-info directory.""" known_extras = {""} for entry in self._iter_requires_txt_entries(): - if entry.extra in known_extras: + extra = canonicalize_name(entry.extra) + if extra in known_extras: continue - known_extras.add(entry.extra) - yield entry.extra + known_extras.add(extra) + yield extra def _iter_egg_info_dependencies(self) -> Iterable[str]: """Get distribution dependencies from the egg-info directory. @@ -556,10 +569,11 @@ def _iter_egg_info_dependencies(self) -> Iterable[str]: all currently available PEP 517 backends, although not standardized. """ for entry in self._iter_requires_txt_entries(): - if entry.extra and entry.marker: - marker = f'({entry.marker}) and extra == "{safe_extra(entry.extra)}"' - elif entry.extra: - marker = f'extra == "{safe_extra(entry.extra)}"' + extra = canonicalize_name(entry.extra) + if extra and entry.marker: + marker = f'({entry.marker}) and extra == "{extra}"' + elif extra: + marker = f'extra == "{extra}"' elif entry.marker: marker = entry.marker else: diff --git a/src/pip/_internal/metadata/importlib/__init__.py b/src/pip/_internal/metadata/importlib/__init__.py index 5e7af9fe521..a779138db10 100644 --- a/src/pip/_internal/metadata/importlib/__init__.py +++ b/src/pip/_internal/metadata/importlib/__init__.py @@ -1,4 +1,6 @@ from ._dists import Distribution from ._envs import Environment -__all__ = ["Distribution", "Environment"] +__all__ = ["NAME", "Distribution", "Environment"] + +NAME = "importlib" diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py index c43ef8d01f9..26370facf28 100644 --- a/src/pip/_internal/metadata/importlib/_dists.py +++ b/src/pip/_internal/metadata/importlib/_dists.py @@ -207,7 +207,13 @@ def _metadata_impl(self) -> email.message.Message: return cast(email.message.Message, self._dist.metadata) def iter_provided_extras(self) -> Iterable[str]: - return (extra for extra in self.metadata.get_all("Provides-Extra", [])) + return self.metadata.get_all("Provides-Extra", []) + + def is_extra_provided(self, extra: str) -> bool: + return any( + canonicalize_name(provided_extra) == canonicalize_name(extra) + for provided_extra in self.metadata.get_all("Provides-Extra", []) + ) def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]: contexts: Sequence[Dict[str, str]] = [{"extra": e} for e in extras] diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py index f330ef12a2c..bb11e5bd8a5 100644 --- a/src/pip/_internal/metadata/pkg_resources.py +++ b/src/pip/_internal/metadata/pkg_resources.py @@ -24,8 +24,12 @@ Wheel, ) +__all__ = ["NAME", "Distribution", "Environment"] + logger = logging.getLogger(__name__) +NAME = "pkg_resources" + class EntryPoint(NamedTuple): name: str @@ -212,12 +216,16 @@ def _metadata_impl(self) -> email.message.Message: def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]: if extras: # pkg_resources raises on invalid extras, so we sanitize. - extras = frozenset(extras).intersection(self._dist.extras) + extras = frozenset(pkg_resources.safe_extra(e) for e in extras) + extras = extras.intersection(self._dist.extras) return self._dist.requires(extras) def iter_provided_extras(self) -> Iterable[str]: return self._dist.extras + def is_extra_provided(self, extra: str) -> bool: + return pkg_resources.safe_extra(extra) in self._dist.extras + class Environment(BaseEnvironment): def __init__(self, ws: pkg_resources.WorkingSet) -> None: diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py index 84f337d6e5b..f8957e5d994 100644 --- a/src/pip/_internal/req/req_install.py +++ b/src/pip/_internal/req/req_install.py @@ -272,7 +272,11 @@ def match_markers(self, extras_requested: Optional[Iterable[str]] = None) -> boo extras_requested = ("",) if self.markers is not None: return any( - self.markers.evaluate({"extra": safe_extra(extra)}) + self.markers.evaluate({"extra": extra}) + # TODO: Remove these two variants when packaging is upgraded to + # support the marker comparison logic specified in PEP 685. + or self.markers.evaluate({"extra": safe_extra(extra)}) + or self.markers.evaluate({"extra": canonicalize_name(extra)}) for extra in extras_requested ) else: diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py index 13204b9f1a8..67737a5092f 100644 --- a/src/pip/_internal/resolution/resolvelib/candidates.py +++ b/src/pip/_internal/resolution/resolvelib/candidates.py @@ -435,7 +435,8 @@ def __init__( # since PEP 685 has not been implemented for marker-matching, and using # the non-normalized extra for lookup ensures the user can select a # non-normalized extra in a package with its non-normalized form. - # TODO: Remove this when packaging is upgraded to support PEP 685. + # TODO: Remove this attribute when packaging is upgraded to support the + # marker comparison logic specified in PEP 685. self._unnormalized_extras = extras.difference(self.extras) def __str__(self) -> str: @@ -490,18 +491,20 @@ def source_link(self) -> Optional[Link]: def _warn_invalid_extras( self, requested: FrozenSet[str], - provided: FrozenSet[str], + valid: FrozenSet[str], ) -> None: """Emit warnings for invalid extras being requested. This emits a warning for each requested extra that is not in the candidate's ``Provides-Extra`` list. """ - invalid_extras_to_warn = requested.difference( - provided, + invalid_extras_to_warn = frozenset( + extra + for extra in requested + if extra not in valid # If an extra is requested in an unnormalized form, skip warning # about the normalized form being missing. - (canonicalize_name(e) for e in self._unnormalized_extras), + and extra in self.extras ) if not invalid_extras_to_warn: return @@ -521,9 +524,13 @@ def _calculate_valid_requested_extras(self) -> FrozenSet[str]: cause a warning to be logged here. """ requested_extras = self.extras.union(self._unnormalized_extras) - provided_extras = frozenset(self.base.dist.iter_provided_extras()) - self._warn_invalid_extras(requested_extras, provided_extras) - return requested_extras.intersection(provided_extras) + valid_extras = frozenset( + extra + for extra in requested_extras + if self.base.dist.is_extra_provided(extra) + ) + self._warn_invalid_extras(requested_extras, valid_extras) + return valid_extras def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]: factory = self.base._factory From ce949466c96086a36aefb8ed1106113fca731fa6 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 13 Sep 2023 15:14:07 +0200 Subject: [PATCH 097/992] fixed argument name in docstring --- src/pip/_internal/resolution/resolvelib/candidates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py index d658be37284..bf89a515da4 100644 --- a/src/pip/_internal/resolution/resolvelib/candidates.py +++ b/src/pip/_internal/resolution/resolvelib/candidates.py @@ -431,7 +431,7 @@ def __init__( comes_from: Optional[InstallRequirement] = None, ) -> None: """ - :param ireq: the InstallRequirement that led to this candidate if it + :param comes_from: the InstallRequirement that led to this candidate if it differs from the base's InstallRequirement. This will often be the case in the sense that this candidate's requirement has the extras while the base's does not. Unlike the InstallRequirement backed From 0f543e3c7e05d40e1ecf684cade068fed1c200f9 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Wed, 13 Sep 2023 16:48:16 +0200 Subject: [PATCH 098/992] made assertions more robust --- tests/functional/test_new_resolver.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index 77dede2fc5a..b5945edf89b 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -6,6 +6,7 @@ import pytest +from tests.conftest import ScriptFactory from tests.lib import ( PipTestEnvironment, create_basic_sdist_for_package, @@ -13,6 +14,7 @@ create_test_package_with_setup, ) from tests.lib.direct_url import get_created_direct_url +from tests.lib.venv import VirtualEnvironment from tests.lib.wheel import make_wheel if TYPE_CHECKING: @@ -2313,7 +2315,11 @@ def test_new_resolver_dont_backtrack_on_extra_if_base_constrained_in_requirement @pytest.mark.parametrize("swap_order", (True, False)) @pytest.mark.parametrize("two_extras", (True, False)) def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras( - script: PipTestEnvironment, swap_order: bool, two_extras: bool + tmpdir: pathlib.Path, + virtualenv: VirtualEnvironment, + script_factory: ScriptFactory, + swap_order: bool, + two_extras: bool, ) -> None: """ Verify that conflicting constraints on the same package with different @@ -2323,6 +2329,11 @@ def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras( :param swap_order: swap the order the install specifiers appear in :param two_extras: also add an extra for the second specifier """ + script: PipTestEnvironment = script_factory( + tmpdir.joinpath("workspace"), + virtualenv, + {**os.environ, "PIP_RESOLVER_DEBUG": "1"}, + ) create_basic_wheel_for_package(script, "dep", "1.0") create_basic_wheel_for_package( script, "pkg", "1.0", extras={"ext1": ["dep"], "ext2": ["dep"]} @@ -2348,9 +2359,13 @@ def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras( assert ( "pkg-2.0" not in result.stdout or "pkg-1.0" not in result.stdout ), "Should only try one of 1.0, 2.0 depending on order" + assert "Reporter.starting()" in result.stdout, ( + "This should never fail unless the debug reporting format has changed," + " in which case the other assertions in this test need to be reviewed." + ) assert ( - "looking at multiple versions" not in result.stdout - ), "Should not have to look at multiple versions to conclude conflict" + "Reporter.rejecting_candidate" not in result.stdout + ), "Should be able to conclude conflict before even selecting a candidate" assert ( "conflict is caused by" in result.stdout ), "Resolver should be trivially able to find conflict cause" From 3b4738cf9aba08b9fe6dc9a2ac667bff2a2585a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 17 Sep 2023 20:02:47 +0200 Subject: [PATCH 099/992] Fix git version parsing issue --- news/12280.bugfix.rst | 1 + src/pip/_internal/vcs/git.py | 2 +- tests/unit/test_vcs.py | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 news/12280.bugfix.rst diff --git a/news/12280.bugfix.rst b/news/12280.bugfix.rst new file mode 100644 index 00000000000..77de283d398 --- /dev/null +++ b/news/12280.bugfix.rst @@ -0,0 +1 @@ +Fix crash when the git version number contains something else than digits and dots. diff --git a/src/pip/_internal/vcs/git.py b/src/pip/_internal/vcs/git.py index 8d1d4993767..8c242cf8956 100644 --- a/src/pip/_internal/vcs/git.py +++ b/src/pip/_internal/vcs/git.py @@ -101,7 +101,7 @@ def get_git_version(self) -> Tuple[int, ...]: if not match: logger.warning("Can't parse git version: %s", version) return () - return tuple(int(c) for c in match.groups()) + return (int(match.group(1)), int(match.group(2))) @classmethod def get_current_branch(cls, location: str) -> Optional[str]: diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py index 3ecc69abfcb..fb6c3ea31ce 100644 --- a/tests/unit/test_vcs.py +++ b/tests/unit/test_vcs.py @@ -598,6 +598,21 @@ def test_get_git_version() -> None: assert git_version >= (1, 0, 0) +@pytest.mark.parametrize( + ("version", "expected"), + [ + ("git version 2.17", (2, 17)), + ("git version 2.18.1", (2, 18)), + ("git version 2.35.GIT", (2, 35)), # gh:12280 + ("oh my git version 2.37.GIT", ()), # invalid version + ("git version 2.GIT", ()), # invalid version + ], +) +def test_get_git_version_parser(version: str, expected: Tuple[int, int]) -> None: + with mock.patch("pip._internal.vcs.git.Git.run_command", return_value=version): + assert Git().get_git_version() == expected + + @pytest.mark.parametrize( "use_interactive,is_atty,expected", [ From 184e4826269da5caa73c8f4114fb00cd1678c075 Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Wed, 20 Sep 2023 18:48:52 -0400 Subject: [PATCH 100/992] Clarify --prefer-binary --- src/pip/_internal/cli/cmdoptions.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py index 64bc59bbd66..84b40a8fc52 100644 --- a/src/pip/_internal/cli/cmdoptions.py +++ b/src/pip/_internal/cli/cmdoptions.py @@ -670,7 +670,10 @@ def prefer_binary() -> Option: dest="prefer_binary", action="store_true", default=False, - help="Prefer older binary packages over newer source packages.", + help=( + "Prefer binary packages over source packages, even if the " + "source packages are newer." + ), ) From 677c3eed9fd6c150d9ea3781442da781f1d65f2e Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Wed, 20 Sep 2023 18:53:33 -0400 Subject: [PATCH 101/992] Add news --- news/12122.doc.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/12122.doc.rst diff --git a/news/12122.doc.rst b/news/12122.doc.rst new file mode 100644 index 00000000000..49a3308a25c --- /dev/null +++ b/news/12122.doc.rst @@ -0,0 +1 @@ +Clarify --prefer-binary in CLI and docs From 3d6b0be901d5e8296b3d1303c70cbc38600f9cd6 Mon Sep 17 00:00:00 2001 From: Lukas Geiger Date: Thu, 21 Sep 2023 01:00:34 +0100 Subject: [PATCH 102/992] Remove outdated noqa comments --- news/80291DF4-7B0F-4268-B682-E1FCA1C3ACED.trivial.rst | 0 pyproject.toml | 1 + src/pip/_internal/cli/cmdoptions.py | 6 +++--- src/pip/_internal/cli/parser.py | 4 ++-- src/pip/_internal/commands/debug.py | 4 +--- src/pip/_internal/commands/install.py | 2 +- tests/functional/test_install_compat.py | 2 +- tests/functional/test_wheel.py | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 news/80291DF4-7B0F-4268-B682-E1FCA1C3ACED.trivial.rst diff --git a/news/80291DF4-7B0F-4268-B682-E1FCA1C3ACED.trivial.rst b/news/80291DF4-7B0F-4268-B682-E1FCA1C3ACED.trivial.rst new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pyproject.toml b/pyproject.toml index 7a4fe62463f..b720c460297 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -101,6 +101,7 @@ select = [ "PLE", "PLR0", "W", + "RUF100", ] [tool.ruff.isort] diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py index 84b40a8fc52..8fb16dc4a6a 100644 --- a/src/pip/_internal/cli/cmdoptions.py +++ b/src/pip/_internal/cli/cmdoptions.py @@ -826,7 +826,7 @@ def _handle_config_settings( ) -> None: key, sep, val = value.partition("=") if sep != "=": - parser.error(f"Arguments to {opt_str} must be of the form KEY=VAL") # noqa + parser.error(f"Arguments to {opt_str} must be of the form KEY=VAL") dest = getattr(parser.values, option.dest) if dest is None: dest = {} @@ -921,13 +921,13 @@ def _handle_merge_hash( algo, digest = value.split(":", 1) except ValueError: parser.error( - "Arguments to {} must be a hash name " # noqa + "Arguments to {} must be a hash name " "followed by a value, like --hash=sha256:" "abcde...".format(opt_str) ) if algo not in STRONG_HASHES: parser.error( - "Allowed hash algorithms for {} are {}.".format( # noqa + "Allowed hash algorithms for {} are {}.".format( opt_str, ", ".join(STRONG_HASHES) ) ) diff --git a/src/pip/_internal/cli/parser.py b/src/pip/_internal/cli/parser.py index c762cf2781d..64cf9719730 100644 --- a/src/pip/_internal/cli/parser.py +++ b/src/pip/_internal/cli/parser.py @@ -229,7 +229,7 @@ def _update_defaults(self, defaults: Dict[str, Any]) -> Dict[str, Any]: val = strtobool(val) except ValueError: self.error( - "{} is not a valid value for {} option, " # noqa + "{} is not a valid value for {} option, " "please specify a boolean value like yes/no, " "true/false or 1/0 instead.".format(val, key) ) @@ -240,7 +240,7 @@ def _update_defaults(self, defaults: Dict[str, Any]) -> Dict[str, Any]: val = int(val) if not isinstance(val, int) or val < 0: self.error( - "{} is not a valid value for {} option, " # noqa + "{} is not a valid value for {} option, " "please instead specify either a non-negative integer " "or a boolean value like yes/no or false/true " "which is equivalent to 1/0.".format(val, key) diff --git a/src/pip/_internal/commands/debug.py b/src/pip/_internal/commands/debug.py index 1b1fd3ea5cc..a29c625e81a 100644 --- a/src/pip/_internal/commands/debug.py +++ b/src/pip/_internal/commands/debug.py @@ -134,9 +134,7 @@ def show_tags(options: Values) -> None: def ca_bundle_info(config: Configuration) -> str: - # Ruff misidentifies config as a dict. - # Configuration does not have support the mapping interface. - levels = {key.split(".", 1)[0] for key, _ in config.items()} # noqa: PERF102 + levels = {key.split(".", 1)[0] for key, _ in config.items()} if not levels: return "Not specified" diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py index f6a300804f4..d88cafe5a4b 100644 --- a/src/pip/_internal/commands/install.py +++ b/src/pip/_internal/commands/install.py @@ -501,7 +501,7 @@ def run(self, options: Values, args: List[str]) -> int: show_traceback, options.use_user_site, ) - logger.error(message, exc_info=show_traceback) # noqa + logger.error(message, exc_info=show_traceback) return ERROR diff --git a/tests/functional/test_install_compat.py b/tests/functional/test_install_compat.py index 8374d487b1f..6c809e75307 100644 --- a/tests/functional/test_install_compat.py +++ b/tests/functional/test_install_compat.py @@ -11,7 +11,7 @@ PipTestEnvironment, TestData, assert_all_changes, - pyversion, # noqa: F401 + pyversion, ) diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py index c0e27949256..042f5824613 100644 --- a/tests/functional/test_wheel.py +++ b/tests/functional/test_wheel.py @@ -10,7 +10,7 @@ from tests.lib import ( PipTestEnvironment, TestData, - pyversion, # noqa: F401 + pyversion, ) From eddd9ddb66e6a3b74d7d2f3187fd246c955e00b7 Mon Sep 17 00:00:00 2001 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Date: Sat, 23 Sep 2023 09:10:13 -0700 Subject: [PATCH 103/992] Enable mypy's strict equality checks (#12209) This makes mypy check more behaviours within the codebase. Co-authored-by: Pradyun Gedam --- news/E2B261CA-A0CF-4309-B808-1210C0B54632.trivial.rst | 0 setup.cfg | 11 +++++++---- src/pip/_internal/utils/temp_dir.py | 4 ++-- tests/functional/test_list.py | 3 +-- tests/lib/__init__.py | 4 +++- tests/unit/test_network_auth.py | 2 +- tests/unit/test_options.py | 4 ++-- tests/unit/test_target_python.py | 10 +++++----- 8 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 news/E2B261CA-A0CF-4309-B808-1210C0B54632.trivial.rst diff --git a/news/E2B261CA-A0CF-4309-B808-1210C0B54632.trivial.rst b/news/E2B261CA-A0CF-4309-B808-1210C0B54632.trivial.rst new file mode 100644 index 00000000000..e69de29bb2d diff --git a/setup.cfg b/setup.cfg index 2e35be30dd6..08a1795eb93 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,11 +36,14 @@ per-file-ignores = [mypy] mypy_path = $MYPY_CONFIG_FILE_DIR/src + +strict = True + +no_implicit_reexport = False +allow_subclassing_any = True +allow_untyped_calls = True +warn_return_any = False ignore_missing_imports = True -disallow_untyped_defs = True -disallow_any_generics = True -warn_unused_ignores = True -no_implicit_optional = True [mypy-pip._internal.utils._jaraco_text] ignore_errors = True diff --git a/src/pip/_internal/utils/temp_dir.py b/src/pip/_internal/utils/temp_dir.py index 38c5f7c7c94..4eec5f37f76 100644 --- a/src/pip/_internal/utils/temp_dir.py +++ b/src/pip/_internal/utils/temp_dir.py @@ -6,9 +6,9 @@ import traceback from contextlib import ExitStack, contextmanager from pathlib import Path -from types import FunctionType from typing import ( Any, + Callable, Dict, Generator, List, @@ -187,7 +187,7 @@ def cleanup(self) -> None: errors: List[BaseException] = [] def onerror( - func: FunctionType, + func: Callable[..., Any], path: Path, exc_val: BaseException, ) -> None: diff --git a/tests/functional/test_list.py b/tests/functional/test_list.py index cf8900a32bd..03dce41e740 100644 --- a/tests/functional/test_list.py +++ b/tests/functional/test_list.py @@ -595,8 +595,7 @@ def test_outdated_formats(script: PipTestEnvironment, data: TestData) -> None: "--outdated", "--format=json", ) - data = json.loads(result.stdout) - assert data == [ + assert json.loads(result.stdout) == [ { "name": "simple", "version": "1.0", diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index a48423570c4..2e8b239ac91 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -46,7 +46,9 @@ # Literal was introduced in Python 3.8. from typing import Literal - ResolverVariant = Literal["resolvelib", "legacy"] + ResolverVariant = Literal[ + "resolvelib", "legacy", "2020-resolver", "legacy-resolver" + ] else: ResolverVariant = str diff --git a/tests/unit/test_network_auth.py b/tests/unit/test_network_auth.py index e3cb772bb05..5bd85f8cd95 100644 --- a/tests/unit/test_network_auth.py +++ b/tests/unit/test_network_auth.py @@ -352,7 +352,7 @@ def get_credential(self, system: str, username: str) -> Optional[Credential]: ), ) def test_keyring_get_credential( - monkeypatch: pytest.MonkeyPatch, url: str, expect: str + monkeypatch: pytest.MonkeyPatch, url: str, expect: Tuple[str, str] ) -> None: monkeypatch.setitem(sys.modules, "keyring", KeyringModuleV2()) auth = MultiDomainBasicAuth( diff --git a/tests/unit/test_options.py b/tests/unit/test_options.py index 43d5fdd3d75..22ff7f721d7 100644 --- a/tests/unit/test_options.py +++ b/tests/unit/test_options.py @@ -2,7 +2,7 @@ from contextlib import contextmanager from optparse import Values from tempfile import NamedTemporaryFile -from typing import Any, Dict, Iterator, List, Tuple, Union, cast +from typing import Any, Dict, Iterator, List, Tuple, Type, Union, cast import pytest @@ -605,7 +605,7 @@ def test_config_file_options( self, monkeypatch: pytest.MonkeyPatch, args: List[str], - expect: Union[None, str, PipError], + expect: Union[None, str, Type[PipError]], ) -> None: cmd = cast(ConfigurationCommand, create_command("config")) # Replace a handler with a no-op to avoid side effects diff --git a/tests/unit/test_target_python.py b/tests/unit/test_target_python.py index bc171376941..31df5935ee3 100644 --- a/tests/unit/test_target_python.py +++ b/tests/unit/test_target_python.py @@ -99,17 +99,17 @@ def test_get_sorted_tags( py_version_info: Optional[Tuple[int, ...]], expected_version: Optional[str], ) -> None: - mock_get_supported.return_value = ["tag-1", "tag-2"] + dummy_tags = [Tag("py4", "none", "any"), Tag("py5", "none", "any")] + mock_get_supported.return_value = dummy_tags target_python = TargetPython(py_version_info=py_version_info) actual = target_python.get_sorted_tags() - assert actual == ["tag-1", "tag-2"] + assert actual == dummy_tags - actual = mock_get_supported.call_args[1]["version"] - assert actual == expected_version + assert mock_get_supported.call_args[1]["version"] == expected_version # Check that the value was cached. - assert target_python._valid_tags == ["tag-1", "tag-2"] + assert target_python._valid_tags == dummy_tags def test_get_unsorted_tags__uses_cached_value(self) -> None: """ From 666be3544b3a4f663f77399e5f82af55e72dbaae Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Sat, 23 Sep 2023 13:33:18 -0700 Subject: [PATCH 104/992] Avoid use of 2020-resolver and legacy-resolver --- ...69-21F3-49F6-B938-AB16E326F82C.trivial.rst | 0 src/pip/_internal/cli/req_command.py | 6 +-- src/pip/_internal/commands/install.py | 4 +- tests/conftest.py | 4 +- tests/functional/test_freeze.py | 2 +- tests/functional/test_install.py | 8 ++-- tests/functional/test_install_extras.py | 2 +- tests/functional/test_install_reqs.py | 38 ++++++++----------- tests/functional/test_install_upgrade.py | 2 +- tests/lib/__init__.py | 4 +- tests/unit/test_req_file.py | 4 +- 11 files changed, 32 insertions(+), 42 deletions(-) create mode 100644 news/1F54AB69-21F3-49F6-B938-AB16E326F82C.trivial.rst diff --git a/news/1F54AB69-21F3-49F6-B938-AB16E326F82C.trivial.rst b/news/1F54AB69-21F3-49F6-B938-AB16E326F82C.trivial.rst new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index 86070f10c14..96d8efaf585 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -268,7 +268,7 @@ def determine_resolver_variant(options: Values) -> str: if "legacy-resolver" in options.deprecated_features_enabled: return "legacy" - return "2020-resolver" + return "resolvelib" @classmethod def make_requirement_preparer( @@ -290,7 +290,7 @@ def make_requirement_preparer( legacy_resolver = False resolver_variant = cls.determine_resolver_variant(options) - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": lazy_wheel = "fast-deps" in options.features_enabled if lazy_wheel: logger.warning( @@ -352,7 +352,7 @@ def make_resolver( # The long import name and duplicated invocation is needed to convince # Mypy into correctly typechecking. Otherwise it would complain the # "Resolver" class being redefined. - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": import pip._internal.resolution.resolvelib.resolver return pip._internal.resolution.resolvelib.resolver.Resolver( diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py index f6a300804f4..d53bbd059c3 100644 --- a/src/pip/_internal/commands/install.py +++ b/src/pip/_internal/commands/install.py @@ -595,7 +595,7 @@ def _warn_about_conflicts( "source of the following dependency conflicts." ) else: - assert resolver_variant == "2020-resolver" + assert resolver_variant == "resolvelib" parts.append( "pip's dependency resolver does not currently take into account " "all the packages that are installed. This behaviour is the " @@ -628,7 +628,7 @@ def _warn_about_conflicts( requirement=req, dep_name=dep_name, dep_version=dep_version, - you=("you" if resolver_variant == "2020-resolver" else "you'll"), + you=("you" if resolver_variant == "resolvelib" else "you'll"), ) parts.append(message) diff --git a/tests/conftest.py b/tests/conftest.py index cd9931c66d9..07cd468c15d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -76,8 +76,8 @@ def pytest_addoption(parser: Parser) -> None: parser.addoption( "--resolver", action="store", - default="2020-resolver", - choices=["2020-resolver", "legacy"], + default="resolvelib", + choices=["resolvelib", "legacy"], help="use given resolver in tests", ) parser.addoption( diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py index d6122308a69..9a5937df3de 100644 --- a/tests/functional/test_freeze.py +++ b/tests/functional/test_freeze.py @@ -629,7 +629,7 @@ def test_freeze_nested_vcs( --extra-index-url http://ignore --find-links http://ignore --index-url http://ignore - --use-feature 2020-resolver + --use-feature resolvelib """ ) diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index bf051294338..485710eaa85 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -1209,9 +1209,9 @@ def test_install_nonlocal_compatible_wheel_path( "--no-index", "--only-binary=:all:", Path(data.packages) / "simplewheel-2.0-py3-fakeabi-fakeplat.whl", - expect_error=(resolver_variant == "2020-resolver"), + expect_error=(resolver_variant == "resolvelib"), ) - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": assert result.returncode == ERROR else: assert result.returncode == SUCCESS @@ -1825,14 +1825,14 @@ def test_install_editable_with_wrong_egg_name( "install", "--editable", f"file://{pkga_path}#egg=pkgb", - expect_error=(resolver_variant == "2020-resolver"), + expect_error=(resolver_variant == "resolvelib"), ) assert ( "Generating metadata for package pkgb produced metadata " "for project name pkga. Fix your #egg=pkgb " "fragments." ) in result.stderr - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": assert "has inconsistent" in result.stdout, str(result) else: assert "Successfully installed pkga" in str(result), str(result) diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py index 8ccbcf1998d..1dd67be0a0c 100644 --- a/tests/functional/test_install_extras.py +++ b/tests/functional/test_install_extras.py @@ -242,7 +242,7 @@ def test_install_extra_merging( expect_error=(fails_on_legacy and resolver_variant == "legacy"), ) - if not fails_on_legacy or resolver_variant == "2020-resolver": + if not fails_on_legacy or resolver_variant == "resolvelib": expected = f"Successfully installed pkga-0.1 simple-{simple_version}" assert expected in result.stdout diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py index 96cff0dc5da..c21b9ba83de 100644 --- a/tests/functional/test_install_reqs.py +++ b/tests/functional/test_install_reqs.py @@ -392,11 +392,8 @@ def test_constraints_local_editable_install_causes_error( to_install, expect_error=True, ) - if resolver_variant == "legacy-resolver": - assert "Could not satisfy constraints" in result.stderr, str(result) - else: - # Because singlemodule only has 0.0.1 available. - assert "Cannot install singlemodule 0.0.1" in result.stderr, str(result) + # Because singlemodule only has 0.0.1 available. + assert "Cannot install singlemodule 0.0.1" in result.stderr, str(result) @pytest.mark.network @@ -426,11 +423,8 @@ def test_constraints_local_install_causes_error( to_install, expect_error=True, ) - if resolver_variant == "legacy-resolver": - assert "Could not satisfy constraints" in result.stderr, str(result) - else: - # Because singlemodule only has 0.0.1 available. - assert "Cannot install singlemodule 0.0.1" in result.stderr, str(result) + # Because singlemodule only has 0.0.1 available. + assert "Cannot install singlemodule 0.0.1" in result.stderr, str(result) def test_constraints_constrain_to_local_editable( @@ -451,9 +445,9 @@ def test_constraints_constrain_to_local_editable( script.scratch_path / "constraints.txt", "singlemodule", allow_stderr_warning=True, - expect_error=(resolver_variant == "2020-resolver"), + expect_error=(resolver_variant == "resolvelib"), ) - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": assert "Editable requirements are not allowed as constraints" in result.stderr else: assert "Running setup.py develop for singlemodule" in result.stdout @@ -551,9 +545,9 @@ def test_install_with_extras_from_constraints( script.scratch_path / "constraints.txt", "LocalExtras", allow_stderr_warning=True, - expect_error=(resolver_variant == "2020-resolver"), + expect_error=(resolver_variant == "resolvelib"), ) - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": assert "Constraints cannot have extras" in result.stderr else: result.did_create(script.site_packages / "simple") @@ -589,9 +583,9 @@ def test_install_with_extras_joined( script.scratch_path / "constraints.txt", "LocalExtras[baz]", allow_stderr_warning=True, - expect_error=(resolver_variant == "2020-resolver"), + expect_error=(resolver_variant == "resolvelib"), ) - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": assert "Constraints cannot have extras" in result.stderr else: result.did_create(script.site_packages / "simple") @@ -610,9 +604,9 @@ def test_install_with_extras_editable_joined( script.scratch_path / "constraints.txt", "LocalExtras[baz]", allow_stderr_warning=True, - expect_error=(resolver_variant == "2020-resolver"), + expect_error=(resolver_variant == "resolvelib"), ) - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": assert "Editable requirements are not allowed as constraints" in result.stderr else: result.did_create(script.site_packages / "simple") @@ -654,9 +648,9 @@ def test_install_distribution_union_with_constraints( script.scratch_path / "constraints.txt", f"{to_install}[baz]", allow_stderr_warning=True, - expect_error=(resolver_variant == "2020-resolver"), + expect_error=(resolver_variant == "resolvelib"), ) - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": msg = "Unnamed requirements are not allowed as constraints" assert msg in result.stderr else: @@ -674,9 +668,9 @@ def test_install_distribution_union_with_versions( result = script.pip_install_local( f"{to_install_001}[bar]", f"{to_install_002}[baz]", - expect_error=(resolver_variant == "2020-resolver"), + expect_error=(resolver_variant == "resolvelib"), ) - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": assert "Cannot install localextras[bar]" in result.stderr assert ("localextras[bar] 0.0.1 depends on localextras 0.0.1") in result.stdout assert ("localextras[baz] 0.0.2 depends on localextras 0.0.2") in result.stdout diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py index 09c01d7eb18..6556fcdf599 100644 --- a/tests/functional/test_install_upgrade.py +++ b/tests/functional/test_install_upgrade.py @@ -172,7 +172,7 @@ def test_upgrade_with_newest_already_installed( "install", "--upgrade", "-f", data.find_links, "--no-index", "simple" ) assert not result.files_created, "simple upgraded when it should not have" - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": msg = "Requirement already satisfied" else: msg = "already up-to-date" diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index 2e8b239ac91..a48423570c4 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -46,9 +46,7 @@ # Literal was introduced in Python 3.8. from typing import Literal - ResolverVariant = Literal[ - "resolvelib", "legacy", "2020-resolver", "legacy-resolver" - ] + ResolverVariant = Literal["resolvelib", "legacy"] else: ResolverVariant = str diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py index 439c41563b7..7a196eb8dd6 100644 --- a/tests/unit/test_req_file.py +++ b/tests/unit/test_req_file.py @@ -471,9 +471,7 @@ def test_use_feature_with_error( ) -> None: """--use-feature triggers error when parsing requirements files.""" with pytest.raises(RequirementsFileParseError): - line_processor( - "--use-feature=2020-resolver", "filename", 1, options=options - ) + line_processor("--use-feature=resolvelib", "filename", 1, options=options) def test_relative_local_find_links( self, From ac19f79049dea400ae1c3ddd7937c1a3ba90f507 Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Sat, 23 Sep 2023 17:47:57 -0700 Subject: [PATCH 105/992] Follow imports for more vendored dependencies This will allow mypy to notice if you e.g. try to call a colorama function that does not exist. Note we won't report any errors in vendored code due to the ignore_errors config above. It would also be quite easy to let mypy look at pkg_resources code, but this would involve the addition of like three type ignores. --- news/12AE57EC-683C-4A8E-BCCB-851FCD0730B4.trivial.rst | 0 setup.cfg | 4 ---- 2 files changed, 4 deletions(-) create mode 100644 news/12AE57EC-683C-4A8E-BCCB-851FCD0730B4.trivial.rst diff --git a/news/12AE57EC-683C-4A8E-BCCB-851FCD0730B4.trivial.rst b/news/12AE57EC-683C-4A8E-BCCB-851FCD0730B4.trivial.rst new file mode 100644 index 00000000000..e69de29bb2d diff --git a/setup.cfg b/setup.cfg index 08a1795eb93..b87fec7ef73 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,12 +54,8 @@ ignore_errors = True # These vendored libraries use runtime magic to populate things and don't sit # well with static typing out of the box. Eventually we should provide correct # typing information for their public interface and remove these configs. -[mypy-pip._vendor.colorama] -follow_imports = skip [mypy-pip._vendor.pkg_resources] follow_imports = skip -[mypy-pip._vendor.progress.*] -follow_imports = skip [mypy-pip._vendor.requests.*] follow_imports = skip From 170b2c18ae08e4f174fec539e3992e8f0c2c825d Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Sat, 23 Sep 2023 17:53:13 -0700 Subject: [PATCH 106/992] Use strict optional checking in legacy resolver The assert in _set_req_to_reinstall is definitely correct, the three call sites have guards The assert in _populate_link is a little trickier. It's not obvious to me how to prove it will never trigger. Note that if link were ever None, it could potentially cause AttributeError in Cache._get_cache_path_parts and direct_url_from_link The assert in _resolve_one is safe, if req_to_install.name was None it would raise TypeError in canonicalize_name I can't prove that req.name is not None in get_installation_order and the code would work fine if that were the case (since it's a defaultdict), so I opted to just ignore --- news/4CCE4788-B8B3-402E-9A88-2981AD074999.trivial.rst | 0 src/pip/_internal/resolution/legacy/resolver.py | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 news/4CCE4788-B8B3-402E-9A88-2981AD074999.trivial.rst diff --git a/news/4CCE4788-B8B3-402E-9A88-2981AD074999.trivial.rst b/news/4CCE4788-B8B3-402E-9A88-2981AD074999.trivial.rst new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py index b17b7e4530b..9277e960dd3 100644 --- a/src/pip/_internal/resolution/legacy/resolver.py +++ b/src/pip/_internal/resolution/legacy/resolver.py @@ -11,7 +11,6 @@ """ # The following comment should be removed at some point in the future. -# mypy: strict-optional=False import logging import sys @@ -325,6 +324,7 @@ def _set_req_to_reinstall(self, req: InstallRequirement) -> None: """ # Don't uninstall the conflict if doing a user install and the # conflict is not a user install. + assert req.satisfied_by is not None if not self.use_user_site or req.satisfied_by.in_usersite: req.should_reinstall = True req.satisfied_by = None @@ -423,6 +423,8 @@ def _populate_link(self, req: InstallRequirement) -> None: if self.wheel_cache is None or self.preparer.require_hashes: return + + assert req.link is not None, "_find_requirement_link unexpectedly returned None" cache_entry = self.wheel_cache.get_cache_entry( link=req.link, package_name=req.name, @@ -536,6 +538,7 @@ def add_req(subreq: Requirement, extras_requested: Iterable[str]) -> None: with indent_log(): # We add req_to_install before its dependencies, so that we # can refer to it when adding dependencies. + assert req_to_install.name is not None if not requirement_set.has_requirement(req_to_install.name): # 'unnamed' requirements will get added here # 'unnamed' requirements can only come from being directly @@ -591,7 +594,7 @@ def schedule(req: InstallRequirement) -> None: if req.constraint: return ordered_reqs.add(req) - for dep in self._discovered_dependencies[req.name]: + for dep in self._discovered_dependencies[req.name]: # type: ignore[index] schedule(dep) order.append(req) From e261330e65e8f24ca412710dd78af0d4d26d577d Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Mon, 25 Sep 2023 12:00:51 -0700 Subject: [PATCH 107/992] old comment --- src/pip/_internal/resolution/legacy/resolver.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py index 9277e960dd3..b0fe2323b49 100644 --- a/src/pip/_internal/resolution/legacy/resolver.py +++ b/src/pip/_internal/resolution/legacy/resolver.py @@ -10,8 +10,6 @@ a. "first found, wins" (where the order is breadth first) """ -# The following comment should be removed at some point in the future. - import logging import sys from collections import defaultdict From 64d2dc3253e4a81e437931fb9b30d636556461d1 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Tue, 26 Sep 2023 10:28:27 -0400 Subject: [PATCH 108/992] Fix lints --- src/pip/_internal/commands/cache.py | 8 ++++---- tests/functional/test_cache.py | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/pip/_internal/commands/cache.py b/src/pip/_internal/commands/cache.py index 32d1a221d1e..1f3b5fe142b 100644 --- a/src/pip/_internal/commands/cache.py +++ b/src/pip/_internal/commands/cache.py @@ -96,9 +96,9 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None: http_cache_location = self._cache_dir(options, "http-v2") old_http_cache_location = self._cache_dir(options, "http") wheels_cache_location = self._cache_dir(options, "wheels") - http_cache_size = ( - filesystem.format_size(filesystem.directory_size(http_cache_location) + - filesystem.directory_size(old_http_cache_location)) + http_cache_size = filesystem.format_size( + filesystem.directory_size(http_cache_location) + + filesystem.directory_size(old_http_cache_location) ) wheels_cache_size = filesystem.format_directory_size(wheels_cache_location) @@ -112,7 +112,7 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None: Locally built wheels location: {wheels_cache_location} Locally built wheels size: {wheels_cache_size} Number of locally built wheels: {package_count} - """ + """ # noqa: E501 ) .format( http_cache_location=http_cache_location, diff --git a/tests/functional/test_cache.py b/tests/functional/test_cache.py index c5d910d453f..a744dbbb9bc 100644 --- a/tests/functional/test_cache.py +++ b/tests/functional/test_cache.py @@ -203,7 +203,10 @@ def test_cache_info( ) -> None: result = script.pip("cache", "info") - assert f"Package index page cache location (pip v23.3+): {http_cache_dir}" in result.stdout + assert ( + f"Package index page cache location (pip v23.3+): {http_cache_dir}" + in result.stdout + ) assert f"Locally built wheels location: {wheel_cache_dir}" in result.stdout num_wheels = len(wheel_cache_files) assert f"Number of locally built wheels: {num_wheels}" in result.stdout From 9aed5b2ab7ddee1acc672c8a253f3e208a1ab45a Mon Sep 17 00:00:00 2001 From: chrysle Date: Sat, 23 Sep 2023 15:05:57 +0200 Subject: [PATCH 109/992] Deduplicate `pip show` output in `Requires` field --- news/12165.bugfix.rst | 1 + src/pip/_internal/commands/show.py | 7 ++++++- tests/functional/test_show.py | 25 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 news/12165.bugfix.rst diff --git a/news/12165.bugfix.rst b/news/12165.bugfix.rst new file mode 100644 index 00000000000..dd09baf60dc --- /dev/null +++ b/news/12165.bugfix.rst @@ -0,0 +1 @@ +This change will deduplicate entries in the ``Requires`` field of ``pip show``. diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py index 3f10701f6b2..ff235b0357c 100644 --- a/src/pip/_internal/commands/show.py +++ b/src/pip/_internal/commands/show.py @@ -100,7 +100,12 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]: except KeyError: continue - requires = sorted((req.name for req in dist.iter_dependencies()), key=str.lower) + requires = [] + # Avoid duplicates in requirements due to environment markers + for req in dist.iter_dependencies(): + if req.name not in requires: + requires.append(req.name) + requires = sorted(requires, key=str.lower) required_by = sorted(_get_requiring_packages(dist), key=str.lower) try: diff --git a/tests/functional/test_show.py b/tests/functional/test_show.py index b8ec0510a1e..5ca8cc8f145 100644 --- a/tests/functional/test_show.py +++ b/tests/functional/test_show.py @@ -350,3 +350,28 @@ def test_show_include_work_dir_pkg(script: PipTestEnvironment) -> None: result = script.pip("show", "simple", cwd=pkg_path) lines = result.stdout.splitlines() assert "Name: simple" in lines + + +def test_show_deduplicate_requirements(script: PipTestEnvironment) -> None: + """ + Test that show should deduplicate requirements + for a package + """ + + # Create a test package and create .egg-info dir + pkg_path = create_test_package_with_setup( + script, + name="simple", + version="1.0", + install_requires=[ + 'pip >= 19.3.1; python_version < "3.8"', + 'pip >= 23.0.1; python_version < "3.9"', + ], + ) + script.run("python", "setup.py", "egg_info", expect_stderr=True, cwd=pkg_path) + + script.environ.update({"PYTHONPATH": pkg_path}) + + result = script.pip("show", "simple", cwd=pkg_path) + lines = result.stdout.splitlines() + assert "Requires: pip" in lines From e9bc5f322b2545138ad024246d866f2a003f28c4 Mon Sep 17 00:00:00 2001 From: chrysle Date: Tue, 26 Sep 2023 20:57:24 +0200 Subject: [PATCH 110/992] Use set instead of list --- src/pip/_internal/commands/show.py | 4 ++-- tests/functional/test_show.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py index ff235b0357c..69fcc446692 100644 --- a/src/pip/_internal/commands/show.py +++ b/src/pip/_internal/commands/show.py @@ -100,11 +100,11 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]: except KeyError: continue - requires = [] + requires = set() # Avoid duplicates in requirements due to environment markers for req in dist.iter_dependencies(): if req.name not in requires: - requires.append(req.name) + requires.add(req.name) requires = sorted(requires, key=str.lower) required_by = sorted(_get_requiring_packages(dist), key=str.lower) diff --git a/tests/functional/test_show.py b/tests/functional/test_show.py index 5ca8cc8f145..1f2e2f7ae9f 100644 --- a/tests/functional/test_show.py +++ b/tests/functional/test_show.py @@ -364,6 +364,7 @@ def test_show_deduplicate_requirements(script: PipTestEnvironment) -> None: name="simple", version="1.0", install_requires=[ + "pip >= 19.0.1", 'pip >= 19.3.1; python_version < "3.8"', 'pip >= 23.0.1; python_version < "3.9"', ], From 267716fea4f8f89e079c718de47c0868a390d6c7 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Wed, 27 Sep 2023 15:34:15 +0800 Subject: [PATCH 111/992] Use comprehension instead of builder pattern --- src/pip/_internal/commands/show.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py index 69fcc446692..cfd67420d0a 100644 --- a/src/pip/_internal/commands/show.py +++ b/src/pip/_internal/commands/show.py @@ -100,12 +100,11 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]: except KeyError: continue - requires = set() - # Avoid duplicates in requirements due to environment markers - for req in dist.iter_dependencies(): - if req.name not in requires: - requires.add(req.name) - requires = sorted(requires, key=str.lower) + requires = sorted( + # Avoid duplicates in requirements (e.g. due to environment markers). + {req.name for req in dist.iter_dependencies()}, + key=str.lower, + ) required_by = sorted(_get_requiring_packages(dist), key=str.lower) try: From 9692d48822187d3b0107cc4b1333d74cf3374222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 1 Oct 2023 11:51:37 +0200 Subject: [PATCH 112/992] Drop isort and flake8 settings from setup.cfg Since we use ruff, these are not used anymore. --- setup.cfg | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/setup.cfg b/setup.cfg index b87fec7ef73..0be3ef08b82 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,39 +1,3 @@ -[isort] -profile = black -skip = - ./build, - .nox, - .tox, - .scratch, - _vendor, - data -known_third_party = - pip._vendor - -[flake8] -max-line-length = 88 -exclude = - ./build, - .nox, - .tox, - .scratch, - _vendor, - data -enable-extensions = G -extend-ignore = - G200, G202, - # black adds spaces around ':' - E203, - # using a cache - B019, - # reassigning variables in a loop - B020, -per-file-ignores = - # G: The plugin logging-format treats every .log and .error as logging. - noxfile.py: G - # B011: Do not call assert False since python -O removes these calls - tests/*: B011 - [mypy] mypy_path = $MYPY_CONFIG_FILE_DIR/src From 3f6e81694f8cce0866d934e1deedbdccdd0deb6b Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sun, 1 Oct 2023 12:22:41 +0100 Subject: [PATCH 113/992] Rework how the logging stack handles rich objects This makes it possible to render content via rich without a magic string and relies on a proper mechanism supported by the logging stack. --- src/pip/_internal/cli/base_command.py | 2 +- src/pip/_internal/self_outdated_check.py | 2 +- src/pip/_internal/utils/logging.py | 4 ++-- src/pip/_internal/utils/subprocess.py | 2 +- tests/unit/test_utils_subprocess.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py index 6a3b8e6c213..db9d5cc6624 100644 --- a/src/pip/_internal/cli/base_command.py +++ b/src/pip/_internal/cli/base_command.py @@ -181,7 +181,7 @@ def exc_logging_wrapper(*args: Any) -> int: assert isinstance(status, int) return status except DiagnosticPipError as exc: - logger.error("[present-rich] %s", exc) + logger.error("%s", exc, extra={"rich": True}) logger.debug("Exception information:", exc_info=True) return ERROR diff --git a/src/pip/_internal/self_outdated_check.py b/src/pip/_internal/self_outdated_check.py index eefbc498b3f..cb18edbed8e 100644 --- a/src/pip/_internal/self_outdated_check.py +++ b/src/pip/_internal/self_outdated_check.py @@ -233,7 +233,7 @@ def pip_self_version_check(session: PipSession, options: optparse.Values) -> Non ), ) if upgrade_prompt is not None: - logger.warning("[present-rich] %s", upgrade_prompt) + logger.warning("%s", upgrade_prompt, extra={"rich": True}) except Exception: logger.warning("There was an error checking the latest version of pip.") logger.debug("See below for error", exc_info=True) diff --git a/src/pip/_internal/utils/logging.py b/src/pip/_internal/utils/logging.py index c10e1f4ced6..95982dfb691 100644 --- a/src/pip/_internal/utils/logging.py +++ b/src/pip/_internal/utils/logging.py @@ -155,8 +155,8 @@ def emit(self, record: logging.LogRecord) -> None: # If we are given a diagnostic error to present, present it with indentation. assert isinstance(record.args, tuple) - if record.msg == "[present-rich] %s" and len(record.args) == 1: - rich_renderable = record.args[0] + if getattr(record, "rich", False): + (rich_renderable,) = record.args assert isinstance( rich_renderable, (ConsoleRenderable, RichCast, str) ), f"{rich_renderable} is not rich-console-renderable" diff --git a/src/pip/_internal/utils/subprocess.py b/src/pip/_internal/utils/subprocess.py index 1e8ff50edfb..79580b05320 100644 --- a/src/pip/_internal/utils/subprocess.py +++ b/src/pip/_internal/utils/subprocess.py @@ -209,7 +209,7 @@ def call_subprocess( output_lines=all_output if not showing_subprocess else None, ) if log_failed_cmd: - subprocess_logger.error("[present-rich] %s", error) + subprocess_logger.error("%s", error, extra={"rich": True}) subprocess_logger.verbose( "[bold magenta]full command[/]: [blue]%s[/]", escape(format_command_args(cmd)), diff --git a/tests/unit/test_utils_subprocess.py b/tests/unit/test_utils_subprocess.py index a694b717fcb..2dbd5d77e4b 100644 --- a/tests/unit/test_utils_subprocess.py +++ b/tests/unit/test_utils_subprocess.py @@ -260,9 +260,9 @@ def test_info_logging__subprocess_error( expected = ( None, [ - # pytest's caplog overrides th formatter, which means that we + # pytest's caplog overrides the formatter, which means that we # won't see the message formatted through our formatters. - ("pip.subprocessor", ERROR, "[present-rich]"), + ("pip.subprocessor", ERROR, "subprocess error exited with 1"), ], ) # The spinner should spin three times in this case since the From ccc4bbcdfd06b1903af3b4cf6bf845be3b3c8b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 1 Oct 2023 15:05:20 +0200 Subject: [PATCH 114/992] Postpone some deprecation removals --- src/pip/_internal/req/req_install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py index f8957e5d994..dd8a0db2792 100644 --- a/src/pip/_internal/req/req_install.py +++ b/src/pip/_internal/req/req_install.py @@ -514,7 +514,7 @@ def load_pyproject_toml(self) -> None: "to use --use-pep517 or add a " "pyproject.toml file to the project" ), - gone_in="23.3", + gone_in="24.0", ) self.use_pep517 = False return @@ -904,7 +904,7 @@ def check_legacy_setup_py_options( reason="--build-option and --global-option are deprecated.", issue=11859, replacement="to use --config-settings", - gone_in="23.3", + gone_in="24.0", ) logger.warning( "Implying --no-binary=:all: due to the presence of " From 389cb799d0da9a840749fcd14878928467ed49b4 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sun, 1 Oct 2023 14:10:25 +0100 Subject: [PATCH 115/992] Use `-r=...` instead of `-r ...` for hg This ensures that the resulting revision can not be misinterpreted as an option. --- src/pip/_internal/vcs/mercurial.py | 2 +- tests/unit/test_vcs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pip/_internal/vcs/mercurial.py b/src/pip/_internal/vcs/mercurial.py index 4595960b5bf..e440c122169 100644 --- a/src/pip/_internal/vcs/mercurial.py +++ b/src/pip/_internal/vcs/mercurial.py @@ -31,7 +31,7 @@ class Mercurial(VersionControl): @staticmethod def get_base_rev_args(rev: str) -> List[str]: - return ["-r", rev] + return [f"-r={rev}"] def fetch_new( self, dest: str, url: HiddenText, rev_options: RevOptions, verbosity: int diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py index fb6c3ea31ce..4a3750f2d36 100644 --- a/tests/unit/test_vcs.py +++ b/tests/unit/test_vcs.py @@ -66,7 +66,7 @@ def test_rev_options_repr() -> None: # First check VCS-specific RevOptions behavior. (Bazaar, [], ["-r", "123"], {}), (Git, ["HEAD"], ["123"], {}), - (Mercurial, [], ["-r", "123"], {}), + (Mercurial, [], ["-r=123"], {}), (Subversion, [], ["-r", "123"], {}), # Test extra_args. For this, test using a single VersionControl class. ( From 408b5248dc8934af50811190cb7df913116031b0 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sun, 1 Oct 2023 13:49:06 +0100 Subject: [PATCH 116/992] :newspaper: --- news/12306.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/12306.bugfix.rst diff --git a/news/12306.bugfix.rst b/news/12306.bugfix.rst new file mode 100644 index 00000000000..eb6eecaaf1b --- /dev/null +++ b/news/12306.bugfix.rst @@ -0,0 +1 @@ +Use ``-r=...`` instead of ``-r ...`` to specify references with Mercurial. From dcb9dc03698b8c59451b98d236ae44b4959c0343 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 3 Oct 2023 09:01:40 +0200 Subject: [PATCH 117/992] Wrap long lines --- .pre-commit-config.yaml | 3 +-- tests/conftest.py | 5 ++++- tests/unit/test_collector.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8d81deed7a..2c576d90a5b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,8 +22,7 @@ repos: - id: black - repo: https://github.com/astral-sh/ruff-pre-commit - # Ruff version. - rev: v0.0.287 + rev: v0.0.292 hooks: - id: ruff diff --git a/tests/conftest.py b/tests/conftest.py index 07cd468c15d..62191f99c56 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1031,7 +1031,10 @@ def html_index_with_onetime_server( class InDirectoryServer(http.server.ThreadingHTTPServer): def finish_request(self, request: Any, client_address: Any) -> None: self.RequestHandlerClass( - request, client_address, self, directory=str(html_index_for_packages) # type: ignore[call-arg] # noqa: E501 + request, + client_address, + self, + directory=str(html_index_for_packages), # type: ignore[call-arg] ) class Handler(OneTimeDownloadHandler): diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py index 5410a4afc03..3c8b81de44d 100644 --- a/tests/unit/test_collector.py +++ b/tests/unit/test_collector.py @@ -625,7 +625,7 @@ def test_parse_links__yanked_reason(anchor_html: str, expected: Optional[str]) - ), # Test with a provided hash value. ( - '', # noqa: E501 + '', MetadataFile({"sha256": "aa113592bbe"}), {}, ), From 003c7ac56b4da80235d4a147fbcef84b6fbc8248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=94=D0=BE=D0=BD=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Sun, 19 Mar 2023 18:50:47 +0300 Subject: [PATCH 118/992] Migrate project metadata to `pyproject.toml` Since setuptools defaults `include_package_data` to `True` if it sees a `project` table, explicitly set it to `False` to prevent unnecessary files from being added. Due to differences between the semantics of `pyproject.toml` and `setup.py` settings, there are some minor changes in the resulting metadata: diff -Nur dist-old/whl/pip-23.1.dev0.dist-info/METADATA dist/whl/pip-23.1.dev0.dist-info/METADATA --- dist-old/whl/pip-23.1.dev0.dist-info/METADATA 2023-03-28 18:46:48.000000000 +0300 +++ dist/whl/pip-23.1.dev0.dist-info/METADATA 2023-03-28 18:43:28.000000000 +0300 @@ -2,10 +2,9 @@ Name: pip Version: 23.1.dev0 Summary: The PyPA recommended tool for installing Python packages. -Home-page: https://pip.pypa.io/ -Author: The pip developers -Author-email: distutils-sig@python.org +Author-email: The pip developers License: MIT +Project-URL: Homepage, https://pip.pypa.io/ Project-URL: Documentation, https://pip.pypa.io Project-URL: Source, https://github.com/pypa/pip Project-URL: Changelog, https://pip.pypa.io/en/stable/news/ @@ -24,6 +23,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Requires-Python: >=3.7 +Description-Content-Type: text/x-rst License-File: LICENSE.txt License-File: AUTHORS.txt black uses the `project.requires-python` setting to infer the target Python version. Reformat one file in which this actually changes the formatting. --- news/11909.process.rst | 1 + pyproject.toml | 41 ++++++++++++++++++++++++++++++++- setup.py | 35 +--------------------------- tests/unit/test_network_auth.py | 2 +- 4 files changed, 43 insertions(+), 36 deletions(-) create mode 100644 news/11909.process.rst diff --git a/news/11909.process.rst b/news/11909.process.rst new file mode 100644 index 00000000000..a396d93d963 --- /dev/null +++ b/news/11909.process.rst @@ -0,0 +1 @@ +Most project metadata is now defined statically via pip's ``pyproject.toml`` file. diff --git a/pyproject.toml b/pyproject.toml index b720c460297..3e85ea37156 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,44 @@ +[project] +dynamic = ["version", "scripts"] + +name = "pip" +description = "The PyPA recommended tool for installing Python packages." +readme = "README.rst" +license = {text = "MIT"} +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Topic :: Software Development :: Build Tools", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", +] +authors = [ + {name = "The pip developers", email = "distutils-sig@python.org"}, +] + +# NOTE: requires-python is duplicated in __pip-runner__.py. +# When changing this value, please change the other copy as well. +requires-python = ">=3.7" + +[project.urls] +Homepage = "https://pip.pypa.io/" +Documentation = "https://pip.pypa.io" +Source = "https://github.com/pypa/pip" +Changelog = "https://pip.pypa.io/en/stable/news/" + [build-system] -requires = ["setuptools", "wheel"] +# The lower bound is for . +requires = ["setuptools>=67.6.1", "wheel"] build-backend = "setuptools.build_meta" [tool.towncrier] diff --git a/setup.py b/setup.py index d73c77b7346..19175c995e3 100644 --- a/setup.py +++ b/setup.py @@ -21,44 +21,14 @@ def get_version(rel_path: str) -> str: raise RuntimeError("Unable to find version string.") -long_description = read("README.rst") - setup( - name="pip", version=get_version("src/pip/__init__.py"), - description="The PyPA recommended tool for installing Python packages.", - long_description=long_description, - license="MIT", - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", - "Topic :: Software Development :: Build Tools", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", - ], - url="https://pip.pypa.io/", - project_urls={ - "Documentation": "https://pip.pypa.io", - "Source": "https://github.com/pypa/pip", - "Changelog": "https://pip.pypa.io/en/stable/news/", - }, - author="The pip developers", - author_email="distutils-sig@python.org", package_dir={"": "src"}, packages=find_packages( where="src", exclude=["contrib", "docs", "tests*", "tasks"], ), + include_package_data=False, package_data={ "pip": ["py.typed"], "pip._vendor": ["vendor.txt"], @@ -82,7 +52,4 @@ def get_version(rel_path: str) -> str: ], }, zip_safe=False, - # NOTE: python_requires is duplicated in __pip-runner__.py. - # When changing this value, please change the other copy as well. - python_requires=">=3.7", ) diff --git a/tests/unit/test_network_auth.py b/tests/unit/test_network_auth.py index 5bd85f8cd95..5c12d870156 100644 --- a/tests/unit/test_network_auth.py +++ b/tests/unit/test_network_auth.py @@ -406,7 +406,7 @@ def __call__( stdin: Optional[Any] = None, stdout: Optional[Any] = None, input: Optional[bytes] = None, - check: Optional[bool] = None + check: Optional[bool] = None, ) -> Any: if cmd[1] == "get": assert stdin == -3 # subprocess.DEVNULL From 21c7cb4c30fa8fe42db31acc3e94113a04fb2e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=94=D0=BE=D0=BD=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Sun, 1 Oct 2023 00:59:16 +0300 Subject: [PATCH 119/992] Move the setuptools settings into pyproject.toml Except for `zip_safe`. It's not especially relevant nowadays, so just delete it. --- pyproject.toml | 26 ++++++++++++++++++++++++++ setup.py | 44 +------------------------------------------- 2 files changed, 27 insertions(+), 43 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3e85ea37156..a65d79e9f11 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,6 +41,32 @@ Changelog = "https://pip.pypa.io/en/stable/news/" requires = ["setuptools>=67.6.1", "wheel"] build-backend = "setuptools.build_meta" +[tool.setuptools] +package-dir = {"" = "src"} +include-package-data = false + +[tool.setuptools.dynamic] +version = {attr = "pip.__version__"} + +[tool.setuptools.packages.find] +where = ["src"] +exclude = ["contrib", "docs", "tests*", "tasks"] + +[tool.setuptools.package-data] +"pip" = ["py.typed"] +"pip._vendor" = ["vendor.txt"] +"pip._vendor.certifi" = ["*.pem"] +"pip._vendor.requests" = ["*.pem"] +"pip._vendor.distlib._backport" = ["sysconfig.cfg"] +"pip._vendor.distlib" = [ + "t32.exe", + "t64.exe", + "t64-arm.exe", + "w32.exe", + "w64.exe", + "w64-arm.exe", +] + [tool.towncrier] # For finding the __version__ package = "pip" diff --git a/setup.py b/setup.py index 19175c995e3..b15e60549cb 100644 --- a/setup.py +++ b/setup.py @@ -1,49 +1,8 @@ -import os import sys -from setuptools import find_packages, setup - - -def read(rel_path: str) -> str: - here = os.path.abspath(os.path.dirname(__file__)) - # intentionally *not* adding an encoding option to open, See: - # https://github.com/pypa/virtualenv/issues/201#issuecomment-3145690 - with open(os.path.join(here, rel_path)) as fp: - return fp.read() - - -def get_version(rel_path: str) -> str: - for line in read(rel_path).splitlines(): - if line.startswith("__version__"): - # __version__ = "0.9" - delim = '"' if '"' in line else "'" - return line.split(delim)[1] - raise RuntimeError("Unable to find version string.") - +from setuptools import setup setup( - version=get_version("src/pip/__init__.py"), - package_dir={"": "src"}, - packages=find_packages( - where="src", - exclude=["contrib", "docs", "tests*", "tasks"], - ), - include_package_data=False, - package_data={ - "pip": ["py.typed"], - "pip._vendor": ["vendor.txt"], - "pip._vendor.certifi": ["*.pem"], - "pip._vendor.requests": ["*.pem"], - "pip._vendor.distlib._backport": ["sysconfig.cfg"], - "pip._vendor.distlib": [ - "t32.exe", - "t64.exe", - "t64-arm.exe", - "w32.exe", - "w64.exe", - "w64-arm.exe", - ], - }, entry_points={ "console_scripts": [ "pip=pip._internal.cli.main:main", @@ -51,5 +10,4 @@ def get_version(rel_path: str) -> str: "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]), ], }, - zip_safe=False, ) From ac962890b513253376f543febbe189a1aca26ef9 Mon Sep 17 00:00:00 2001 From: Kurt McKee Date: Wed, 24 May 2023 20:43:20 -0500 Subject: [PATCH 120/992] Add a dependabot config to update CI actions monthly --- .github/dependabot.yml | 6 ++++++ news/d7179b28-bc23-46aa-9175-834117a42dbd.trivial.rst | 0 2 files changed, 6 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 news/d7179b28-bc23-46aa-9175-834117a42dbd.trivial.rst diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..8ac6b8c4984 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" diff --git a/news/d7179b28-bc23-46aa-9175-834117a42dbd.trivial.rst b/news/d7179b28-bc23-46aa-9175-834117a42dbd.trivial.rst new file mode 100644 index 00000000000..e69de29bb2d From dba399fe6a41615d0a59899f7ac6dfdd26a42731 Mon Sep 17 00:00:00 2001 From: Wu Zhenyu Date: Sat, 22 Jul 2023 15:31:12 +0800 Subject: [PATCH 121/992] Fix #12166 - tests expected results indendation was off - add bugfix news entry --- news/12166.bugfix.rst | 1 + src/pip/_internal/commands/completion.py | 15 ++++++++++++--- tests/functional/test_completion.py | 15 ++++++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 news/12166.bugfix.rst diff --git a/news/12166.bugfix.rst b/news/12166.bugfix.rst new file mode 100644 index 00000000000..491597c7f1a --- /dev/null +++ b/news/12166.bugfix.rst @@ -0,0 +1 @@ +Fix completion script for zsh diff --git a/src/pip/_internal/commands/completion.py b/src/pip/_internal/commands/completion.py index 30233fc7ad2..9e89e279883 100644 --- a/src/pip/_internal/commands/completion.py +++ b/src/pip/_internal/commands/completion.py @@ -23,9 +23,18 @@ """, "zsh": """ #compdef -P pip[0-9.]# - compadd $( COMP_WORDS="$words[*]" \\ - COMP_CWORD=$((CURRENT-1)) \\ - PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null ) + __pip() {{ + compadd $( COMP_WORDS="$words[*]" \\ + COMP_CWORD=$((CURRENT-1)) \\ + PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null ) + }} + if [[ $zsh_eval_context[-1] == loadautofunc ]]; then + # autoload from fpath, call function directly + __pip "$@" + else + # eval/source/. command, register function for later + compdef __pip -P 'pip[0-9.]#' + fi """, "fish": """ function __fish_complete_pip diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py index 2e3f31729d7..2aa861aacb7 100644 --- a/tests/functional/test_completion.py +++ b/tests/functional/test_completion.py @@ -44,9 +44,18 @@ "zsh", """\ #compdef -P pip[0-9.]# -compadd $( COMP_WORDS="$words[*]" \\ - COMP_CWORD=$((CURRENT-1)) \\ - PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null )""", +__pip() { + compadd $( COMP_WORDS="$words[*]" \\ + COMP_CWORD=$((CURRENT-1)) \\ + PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null ) +} +if [[ $zsh_eval_context[-1] == loadautofunc ]]; then + # autoload from fpath, call function directly + __pip "$@" +else + # eval/source/. command, register function for later + compdef __pip -P 'pip[0-9.]#' +fi""", ), ( "powershell", From 431cf5af82f43431b75fa495b114c1177ab97f8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Oct 2023 19:00:48 +0000 Subject: [PATCH 122/992] Bump dessant/lock-threads from 3 to 4 Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 3 to 4. - [Release notes](https://github.com/dessant/lock-threads/releases) - [Changelog](https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md) - [Commits](https://github.com/dessant/lock-threads/compare/v3...v4) --- updated-dependencies: - dependency-name: dessant/lock-threads dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/lock-threads.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock-threads.yml b/.github/workflows/lock-threads.yml index 990440dd6c8..dc68b683bef 100644 --- a/.github/workflows/lock-threads.yml +++ b/.github/workflows/lock-threads.yml @@ -17,7 +17,7 @@ jobs: if: github.repository_owner == 'pypa' runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v3 + - uses: dessant/lock-threads@v4 with: issue-inactive-days: '30' pr-inactive-days: '15' From 0042cc94cc6d9b74307343107b3812fb9c56fda8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Oct 2023 19:00:51 +0000 Subject: [PATCH 123/992] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/news-file.yml | 2 +- .github/workflows/update-rtd-redirects.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41d3ab9463a..5f7cd942bf4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.x" @@ -57,7 +57,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.x" @@ -81,7 +81,7 @@ jobs: github.event_name != 'pull_request' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.x" @@ -112,7 +112,7 @@ jobs: - "3.12" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} @@ -164,7 +164,7 @@ jobs: group: [1, 2] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} @@ -215,7 +215,7 @@ jobs: github.event_name != 'pull_request' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.10" diff --git a/.github/workflows/news-file.yml b/.github/workflows/news-file.yml index 371e12fd755..398ad1b7e67 100644 --- a/.github/workflows/news-file.yml +++ b/.github/workflows/news-file.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # `towncrier check` runs `git diff --name-only origin/main...`, which # needs a non-shallow clone. diff --git a/.github/workflows/update-rtd-redirects.yml b/.github/workflows/update-rtd-redirects.yml index 8259b6c0b6a..c333a09a30d 100644 --- a/.github/workflows/update-rtd-redirects.yml +++ b/.github/workflows/update-rtd-redirects.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest environment: RTD Deploys steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.11" From d9b47d0173b5d531a1c5a10172c73c37f43d8f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 8 Oct 2023 17:19:09 +0200 Subject: [PATCH 124/992] Update egg deprecation message --- src/pip/_internal/metadata/importlib/_envs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pip/_internal/metadata/importlib/_envs.py b/src/pip/_internal/metadata/importlib/_envs.py index 3850ddaf412..048dc55dcb2 100644 --- a/src/pip/_internal/metadata/importlib/_envs.py +++ b/src/pip/_internal/metadata/importlib/_envs.py @@ -151,7 +151,8 @@ def _emit_egg_deprecation(location: Optional[str]) -> None: deprecated( reason=f"Loading egg at {location} is deprecated.", replacement="to use pip for package installation.", - gone_in="23.3", + gone_in="24.3", + issue=12330, ) From 76a8c0f2652027b4938a13e9abef500c5f43b185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 8 Oct 2023 18:17:05 +0200 Subject: [PATCH 125/992] Postpone deprecation of legacy versions and specifiers --- src/pip/_internal/operations/check.py | 4 ++-- src/pip/_internal/req/req_set.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pip/_internal/operations/check.py b/src/pip/_internal/operations/check.py index 2610459228f..1b7fd7ab7fd 100644 --- a/src/pip/_internal/operations/check.py +++ b/src/pip/_internal/operations/check.py @@ -168,7 +168,7 @@ def warn_legacy_versions_and_specifiers(package_set: PackageSet) -> None: f"release a version with a conforming version number" ), issue=12063, - gone_in="23.3", + gone_in="24.0", ) for dep in package_details.dependencies: if any(isinstance(spec, LegacySpecifier) for spec in dep.specifier): @@ -183,5 +183,5 @@ def warn_legacy_versions_and_specifiers(package_set: PackageSet) -> None: f"release a version with a conforming dependency specifiers" ), issue=12063, - gone_in="23.3", + gone_in="24.0", ) diff --git a/src/pip/_internal/req/req_set.py b/src/pip/_internal/req/req_set.py index cff67601737..1bf73d595f6 100644 --- a/src/pip/_internal/req/req_set.py +++ b/src/pip/_internal/req/req_set.py @@ -99,7 +99,7 @@ def warn_legacy_versions_and_specifiers(self) -> None: "or contact the package author to fix the version number" ), issue=12063, - gone_in="23.3", + gone_in="24.0", ) for dep in req.get_dist().iter_dependencies(): if any(isinstance(spec, LegacySpecifier) for spec in dep.specifier): @@ -115,5 +115,5 @@ def warn_legacy_versions_and_specifiers(self) -> None: "or contact the package author to fix the version number" ), issue=12063, - gone_in="23.3", + gone_in="24.0", ) From 496b268c1b9ce3466c08eb4819e5460a943d1793 Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Wed, 11 Oct 2023 11:36:40 -0400 Subject: [PATCH 126/992] Update "Running Tests" documentation (#12334) Co-authored-by: Paul Moore Co-authored-by: Pradyun Gedam --- docs/html/development/getting-started.rst | 14 +++++++++++++- news/12334.doc.rst | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 news/12334.doc.rst diff --git a/docs/html/development/getting-started.rst b/docs/html/development/getting-started.rst index e248259f08d..34d647fc231 100644 --- a/docs/html/development/getting-started.rst +++ b/docs/html/development/getting-started.rst @@ -73,7 +73,7 @@ pip's tests are written using the :pypi:`pytest` test framework and :mod:`unittest.mock`. :pypi:`nox` is used to automate the setup and execution of pip's tests. -It is preferable to run the tests in parallel for better experience during development, +It is preferable to run the tests in parallel for a better experience during development, since the tests can take a long time to finish when run sequentially. To run tests: @@ -104,6 +104,15 @@ can select tests using the various ways that pytest provides: $ # Using keywords $ nox -s test-3.10 -- -k "install and not wheel" +.. note:: + + When running pip's tests with OS distribution Python versions, be aware that some + functional tests may fail due to potential patches introduced by the distribution. + For all tests to pass consider: + + - Installing Python from `python.org`_ or compile from source + - Or, using `pyenv`_ to assist with source compilation + Running pip's entire test suite requires supported version control tools (subversion, bazaar, git, and mercurial) to be installed. If you are missing any of these VCS, those tests should be skipped automatically. You can also @@ -114,6 +123,9 @@ explicitly tell pytest to skip those tests: $ nox -s test-3.10 -- -k "not svn" $ nox -s test-3.10 -- -k "not (svn or git)" +.. _python.org: https://www.python.org/downloads/ +.. _pyenv: https://github.com/pyenv/pyenv + Running Linters =============== diff --git a/news/12334.doc.rst b/news/12334.doc.rst new file mode 100644 index 00000000000..ff3d877e5e8 --- /dev/null +++ b/news/12334.doc.rst @@ -0,0 +1 @@ +Document that using OS-provided Python can cause pip's test suite to report false failures. From 2333ef3b53a71fb7acc9e76d6ff90409576b2250 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Thu, 12 Oct 2023 12:12:06 +0100 Subject: [PATCH 127/992] Upgrade urllib3 to 1.26.17 (#12343) --- news/urllib3.vendor.rst | 1 + src/pip/_vendor/urllib3/_version.py | 2 +- src/pip/_vendor/urllib3/request.py | 21 +++++++++++++++++++++ src/pip/_vendor/urllib3/util/retry.py | 2 +- src/pip/_vendor/vendor.txt | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 news/urllib3.vendor.rst diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst new file mode 100644 index 00000000000..37032f67a0e --- /dev/null +++ b/news/urllib3.vendor.rst @@ -0,0 +1 @@ +Upgrade urllib3 to 1.26.17 diff --git a/src/pip/_vendor/urllib3/_version.py b/src/pip/_vendor/urllib3/_version.py index d69ca314570..cad75fb5df8 100644 --- a/src/pip/_vendor/urllib3/_version.py +++ b/src/pip/_vendor/urllib3/_version.py @@ -1,2 +1,2 @@ # This file is protected via CODEOWNERS -__version__ = "1.26.16" +__version__ = "1.26.17" diff --git a/src/pip/_vendor/urllib3/request.py b/src/pip/_vendor/urllib3/request.py index 398386a5b9f..3b4cf999225 100644 --- a/src/pip/_vendor/urllib3/request.py +++ b/src/pip/_vendor/urllib3/request.py @@ -1,6 +1,9 @@ from __future__ import absolute_import +import sys + from .filepost import encode_multipart_formdata +from .packages import six from .packages.six.moves.urllib.parse import urlencode __all__ = ["RequestMethods"] @@ -168,3 +171,21 @@ def request_encode_body( extra_kw.update(urlopen_kw) return self.urlopen(method, url, **extra_kw) + + +if not six.PY2: + + class RequestModule(sys.modules[__name__].__class__): + def __call__(self, *args, **kwargs): + """ + If user tries to call this module directly urllib3 v2.x style raise an error to the user + suggesting they may need urllib3 v2 + """ + raise TypeError( + "'module' object is not callable\n" + "urllib3.request() method is not supported in this release, " + "upgrade to urllib3 v2 to use it\n" + "see https://urllib3.readthedocs.io/en/stable/v2-migration-guide.html" + ) + + sys.modules[__name__].__class__ = RequestModule diff --git a/src/pip/_vendor/urllib3/util/retry.py b/src/pip/_vendor/urllib3/util/retry.py index 2490d5e5b63..60ef6c4f3f9 100644 --- a/src/pip/_vendor/urllib3/util/retry.py +++ b/src/pip/_vendor/urllib3/util/retry.py @@ -235,7 +235,7 @@ class Retry(object): RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503]) #: Default headers to be used for ``remove_headers_on_redirect`` - DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Authorization"]) + DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"]) #: Maximum backoff time. DEFAULT_BACKOFF_MAX = 120 diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt index 43ced2a4b89..8dbe1341377 100644 --- a/src/pip/_vendor/vendor.txt +++ b/src/pip/_vendor/vendor.txt @@ -11,7 +11,7 @@ requests==2.31.0 certifi==2023.7.22 chardet==5.1.0 idna==3.4 - urllib3==1.26.16 + urllib3==1.26.17 rich==13.4.2 pygments==2.15.1 typing_extensions==4.7.1 From d1659b87e46abd0a2dcc74f2160dd52e6190e13b Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Tue, 10 Oct 2023 21:49:43 +0100 Subject: [PATCH 128/992] Correct issue number for NEWS entry added by #12197 The NEWS entry added in PR #12197 referenced issue #12191, however, the issue it actually fixed was #11847. --- news/{12191.bugfix.rst => 11847.bugfix.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{12191.bugfix.rst => 11847.bugfix.rst} (100%) diff --git a/news/12191.bugfix.rst b/news/11847.bugfix.rst similarity index 100% rename from news/12191.bugfix.rst rename to news/11847.bugfix.rst From 8f0ed32413daa411a728b50cd7776b9c02b010d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 14 Oct 2023 13:50:49 +0200 Subject: [PATCH 129/992] Redact URLs in Collecting... logs --- news/12350.bugfix.rst | 1 + src/pip/_internal/operations/prepare.py | 3 ++- src/pip/_internal/req/req_install.py | 3 ++- src/pip/_internal/utils/misc.py | 8 ++++++++ tests/unit/test_utils.py | 26 +++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 news/12350.bugfix.rst diff --git a/news/12350.bugfix.rst b/news/12350.bugfix.rst new file mode 100644 index 00000000000..3fb16b4ed6a --- /dev/null +++ b/news/12350.bugfix.rst @@ -0,0 +1 @@ +Redact password from URLs in some additional places. diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py index 1b32d7eec3e..488e76358be 100644 --- a/src/pip/_internal/operations/prepare.py +++ b/src/pip/_internal/operations/prepare.py @@ -47,6 +47,7 @@ display_path, hash_file, hide_url, + redact_auth_from_requirement, ) from pip._internal.utils.temp_dir import TempDirectory from pip._internal.utils.unpacking import unpack_file @@ -277,7 +278,7 @@ def _log_preparing_link(self, req: InstallRequirement) -> None: information = str(display_path(req.link.file_path)) else: message = "Collecting %s" - information = str(req.req or req) + information = redact_auth_from_requirement(req.req) if req.req else str(req) # If we used req.req, inject requirement source if available (this # would already be included if we used req directly) diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py index dd8a0db2792..e556be2b40b 100644 --- a/src/pip/_internal/req/req_install.py +++ b/src/pip/_internal/req/req_install.py @@ -49,6 +49,7 @@ display_path, hide_url, is_installable_dir, + redact_auth_from_requirement, redact_auth_from_url, ) from pip._internal.utils.packaging import safe_extra @@ -188,7 +189,7 @@ def __init__( def __str__(self) -> str: if self.req: - s = str(self.req) + s = redact_auth_from_requirement(self.req) if self.link: s += " from {}".format(redact_auth_from_url(self.link.url)) elif self.link: diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py index 9a6353fc8d3..78060e86417 100644 --- a/src/pip/_internal/utils/misc.py +++ b/src/pip/_internal/utils/misc.py @@ -35,6 +35,7 @@ cast, ) +from pip._vendor.packaging.requirements import Requirement from pip._vendor.pyproject_hooks import BuildBackendHookCaller from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed @@ -578,6 +579,13 @@ def redact_auth_from_url(url: str) -> str: return _transform_url(url, _redact_netloc)[0] +def redact_auth_from_requirement(req: Requirement) -> str: + """Replace the password in a given requirement url with ****.""" + if not req.url: + return str(req) + return str(req).replace(req.url, redact_auth_from_url(req.url)) + + class HiddenText: def __init__(self, secret: str, redacted: str) -> None: self.secret = secret diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index d3b0d32d12f..1352b766481 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -14,6 +14,7 @@ from unittest.mock import Mock, patch import pytest +from pip._vendor.packaging.requirements import Requirement from pip._internal.exceptions import HashMismatch, HashMissing, InstallationError from pip._internal.utils.deprecation import PipDeprecationWarning, deprecated @@ -37,6 +38,7 @@ normalize_path, normalize_version_info, parse_netloc, + redact_auth_from_requirement, redact_auth_from_url, redact_netloc, remove_auth_from_url, @@ -765,6 +767,30 @@ def test_redact_auth_from_url(auth_url: str, expected_url: str) -> None: assert url == expected_url +@pytest.mark.parametrize( + "req, expected", + [ + ("pkga", "pkga"), + ( + "resolvelib@ " + " git+https://test-user:test-pass@github.com/sarugaku/resolvelib@1.0.1", + "resolvelib@" + " git+https://test-user:****@github.com/sarugaku/resolvelib@1.0.1", + ), + ( + "resolvelib@" + " git+https://test-user:test-pass@github.com/sarugaku/resolvelib@1.0.1" + " ; python_version>='3.6'", + "resolvelib@" + " git+https://test-user:****@github.com/sarugaku/resolvelib@1.0.1" + ' ; python_version >= "3.6"', + ), + ], +) +def test_redact_auth_from_requirement(req: str, expected: str) -> None: + assert redact_auth_from_requirement(Requirement(req)) == expected + + class TestHiddenText: def test_basic(self) -> None: """ From 8ff33edfc5824472c275be22bb0ea64c335fe651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 Oct 2023 10:08:24 +0200 Subject: [PATCH 130/992] Don't mention setuptools in release process docs --- docs/html/development/release-process.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/html/development/release-process.rst b/docs/html/development/release-process.rst index b71e2820bd2..65ed567070e 100644 --- a/docs/html/development/release-process.rst +++ b/docs/html/development/release-process.rst @@ -145,8 +145,8 @@ Creating a new release #. Push the tag created by ``prepare-release``. #. Regenerate the ``get-pip.py`` script in the `get-pip repository`_ (as documented there) and commit the results. -#. Submit a Pull Request to `CPython`_ adding the new version of pip (and upgrading - setuptools) to ``Lib/ensurepip/_bundled``, removing the existing version, and +#. Submit a Pull Request to `CPython`_ adding the new version of pip + to ``Lib/ensurepip/_bundled``, removing the existing version, and adjusting the versions listed in ``Lib/ensurepip/__init__.py``. From bf9a9cbdae96ab99dd167a7c212c6076eceb7128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 Oct 2023 10:20:24 +0200 Subject: [PATCH 131/992] Mention 'skip news' label in docs --- docs/html/development/contributing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/html/development/contributing.rst b/docs/html/development/contributing.rst index 87734ee4d55..b2f6f1d1378 100644 --- a/docs/html/development/contributing.rst +++ b/docs/html/development/contributing.rst @@ -112,7 +112,7 @@ the ``news/`` directory with the extension of ``.trivial.rst``. If you are on a POSIX like operating system, one can be added by running ``touch news/$(uuidgen).trivial.rst``. On Windows, the same result can be achieved in Powershell using ``New-Item "news/$([guid]::NewGuid()).trivial.rst"``. -Core committers may also add a "trivial" label to the PR which will accomplish +Core committers may also add a "skip news" label to the PR which will accomplish the same thing. Upgrading, removing, or adding a new vendored library gets a special mention From 8d0278771c7325b04f02cb073c8ef02827cbeb93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 Oct 2023 10:22:52 +0200 Subject: [PATCH 132/992] Reclassify news fragment This is not for the process category, and probably not significant enough for a feature news entry. --- news/{12155.process.rst => 12155.trivial.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{12155.process.rst => 12155.trivial.rst} (100%) diff --git a/news/12155.process.rst b/news/12155.trivial.rst similarity index 100% rename from news/12155.process.rst rename to news/12155.trivial.rst From 3e85558b10722598fb3353126e2f19979f7cf7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 Oct 2023 10:23:01 +0200 Subject: [PATCH 133/992] Update AUTHORS.txt --- AUTHORS.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 77eb39a427d..49e30f69678 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -20,6 +20,7 @@ Albert-Guan albertg Alberto Sottile Aleks Bunin +Ales Erjavec Alethea Flowers Alex Gaynor Alex Grönholm @@ -30,6 +31,7 @@ Alex Stachowiak Alexander Shtyrov Alexandre Conrad Alexey Popravka +Aleš Erjavec Alli Ami Fischman Ananya Maiti @@ -196,9 +198,11 @@ David Runge David Tucker David Wales Davidovich +ddelange Deepak Sharma Deepyaman Datta Denise Yu +dependabot[bot] derwolfe Desetude Devesh Kumar Singh @@ -312,6 +316,7 @@ Ilya Baryshev Inada Naoki Ionel Cristian Mărieș Ionel Maries Cristian +Itamar Turner-Trauring Ivan Pozdeev Jacob Kim Jacob Walls @@ -338,6 +343,7 @@ Jay Graves Jean-Christophe Fillion-Robin Jeff Barber Jeff Dairiki +Jeff Widman Jelmer Vernooij jenix21 Jeremy Stanley @@ -367,6 +373,7 @@ Joseph Long Josh Bronson Josh Hansen Josh Schneier +Joshua Juan Luis Cano Rodríguez Juanjo Bazán Judah Rand @@ -397,6 +404,7 @@ KOLANICH kpinc Krishna Oza Kumar McMillan +Kurt McKee Kyle Persohn lakshmanaram Laszlo Kiss-Kollar @@ -413,6 +421,7 @@ lorddavidiii Loren Carvalho Lucas Cimon Ludovic Gasc +Lukas Geiger Lukas Juhrich Luke Macken Luo Jiebin @@ -529,6 +538,7 @@ Patrick Jenkins Patrick Lawson patricktokeeffe Patrik Kopkan +Paul Ganssle Paul Kehrer Paul Moore Paul Nasrat @@ -609,6 +619,7 @@ ryneeverett Sachi King Salvatore Rinchiera sandeepkiran-js +Sander Van Balen Savio Jomton schlamar Scott Kitterman @@ -621,6 +632,7 @@ SeongSoo Cho Sergey Vasilyev Seth Michael Larson Seth Woodworth +Shahar Epstein Shantanu shireenrao Shivansh-007 @@ -648,6 +660,7 @@ Steve Kowalik Steven Myint Steven Silvester stonebig +studioj Stéphane Bidoul Stéphane Bidoul (ACSONE) Stéphane Klein From e3dc91dad93a020b3034a87ebe59027f63370fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 Oct 2023 10:23:02 +0200 Subject: [PATCH 134/992] Bump for release --- NEWS.rst | 57 +++++++++++++++++++ news/11394.bugfix.rst | 1 - news/11649.bugfix.rst | 5 -- news/11847.bugfix.rst | 1 - news/11924.bugfix.rst | 1 - news/11924.feature.rst | 1 - news/12005.bugfix.rst | 1 - news/12059.doc.rst | 1 - news/12095.bugfix.rst | 1 - news/12122.doc.rst | 1 - news/12155.trivial.rst | 6 -- news/12166.bugfix.rst | 1 - news/12175.removal.rst | 1 - news/12183.trivial.rst | 1 - news/12187.bugfix.rst | 1 - news/12194.trivial.rst | 1 - news/12204.feature.rst | 1 - news/12215.feature.rst | 1 - news/12224.feature.rst | 1 - news/12225.bugfix.rst | 1 - news/12252.trivial.rst | 0 news/12254.process.rst | 1 - news/12261.trivial.rst | 0 news/12280.bugfix.rst | 1 - news/12306.bugfix.rst | 1 - news/12334.doc.rst | 1 - news/12350.bugfix.rst | 1 - ...EC-683C-4A8E-BCCB-851FCD0730B4.trivial.rst | 0 ...69-21F3-49F6-B938-AB16E326F82C.trivial.rst | 0 news/2984.bugfix.rst | 1 - ...FF-ABE1-48C7-954C-7C3EB229135F.trivial.rst | 1 - ...DE-8011-4146-8CAD-85D7756D88A6.trivial.rst | 0 ...F4-7B0F-4268-B682-E1FCA1C3ACED.trivial.rst | 0 ...60-68FF-4C1E-A2CB-CF8634829D2D.trivial.rst | 0 ...CA-A0CF-4309-B808-1210C0B54632.trivial.rst | 0 news/certifi.vendor.rst | 1 - ...28-bc23-46aa-9175-834117a42dbd.trivial.rst | 0 news/truststore.vendor.rst | 1 - news/urllib3.vendor.rst | 1 - news/zhsdgdlsjgksdfj.trivial.rst | 0 src/pip/__init__.py | 2 +- 41 files changed, 58 insertions(+), 39 deletions(-) delete mode 100644 news/11394.bugfix.rst delete mode 100644 news/11649.bugfix.rst delete mode 100644 news/11847.bugfix.rst delete mode 100644 news/11924.bugfix.rst delete mode 100644 news/11924.feature.rst delete mode 100644 news/12005.bugfix.rst delete mode 100644 news/12059.doc.rst delete mode 100644 news/12095.bugfix.rst delete mode 100644 news/12122.doc.rst delete mode 100644 news/12155.trivial.rst delete mode 100644 news/12166.bugfix.rst delete mode 100644 news/12175.removal.rst delete mode 100644 news/12183.trivial.rst delete mode 100644 news/12187.bugfix.rst delete mode 100644 news/12194.trivial.rst delete mode 100644 news/12204.feature.rst delete mode 100644 news/12215.feature.rst delete mode 100644 news/12224.feature.rst delete mode 100644 news/12225.bugfix.rst delete mode 100644 news/12252.trivial.rst delete mode 100644 news/12254.process.rst delete mode 100644 news/12261.trivial.rst delete mode 100644 news/12280.bugfix.rst delete mode 100644 news/12306.bugfix.rst delete mode 100644 news/12334.doc.rst delete mode 100644 news/12350.bugfix.rst delete mode 100644 news/12AE57EC-683C-4A8E-BCCB-851FCD0730B4.trivial.rst delete mode 100644 news/1F54AB69-21F3-49F6-B938-AB16E326F82C.trivial.rst delete mode 100644 news/2984.bugfix.rst delete mode 100644 news/4A0C40FF-ABE1-48C7-954C-7C3EB229135F.trivial.rst delete mode 100644 news/732404DE-8011-4146-8CAD-85D7756D88A6.trivial.rst delete mode 100644 news/80291DF4-7B0F-4268-B682-E1FCA1C3ACED.trivial.rst delete mode 100644 news/85F7E260-68FF-4C1E-A2CB-CF8634829D2D.trivial.rst delete mode 100644 news/E2B261CA-A0CF-4309-B808-1210C0B54632.trivial.rst delete mode 100644 news/certifi.vendor.rst delete mode 100644 news/d7179b28-bc23-46aa-9175-834117a42dbd.trivial.rst delete mode 100644 news/truststore.vendor.rst delete mode 100644 news/urllib3.vendor.rst delete mode 100644 news/zhsdgdlsjgksdfj.trivial.rst diff --git a/NEWS.rst b/NEWS.rst index fc3bb6697ad..27ac69d793a 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -9,6 +9,63 @@ .. towncrier release notes start +23.3 (2023-10-15) +================= + +Process +------- + +- Added reference to `vulnerability reporting guidelines `_ to pip's security policy. + +Deprecations and Removals +------------------------- + +- Drop a fallback to using SecureTransport on macOS. It was useful when pip detected OpenSSL older than 1.0.1, but the current pip does not support any Python version supporting such old OpenSSL versions. (`#12175 `_) + +Features +-------- + +- Improve extras resolution for multiple constraints on same base package. (`#11924 `_) +- Improve use of datastructures to make candidate selection 1.6x faster (`#12204 `_) +- Allow ``pip install --dry-run`` to use platform and ABI overriding options similar to ``--target``. (`#12215 `_) +- Add ``is_yanked`` boolean entry to the installation report (``--report``) to indicate whether the requirement was yanked from the index, but was still selected by pip conform to PEP 592. (`#12224 `_) + +Bug Fixes +--------- + +- Ignore errors in temporary directory cleanup (show a warning instead). (`#11394 `_) +- Normalize extras according to :pep:`685` from package metadata in the resolver + for comparison. This ensures extras are correctly compared and merged as long + as the package providing the extra(s) is built with values normalized according + to the standard. Note, however, that this *does not* solve cases where the + package itself contains unnormalized extra values in the metadata. (`#11649 `_) +- Prevent downloading sdists twice when PEP 658 metadata is present. (`#11847 `_) +- Include all requested extras in the install report (``--report``). (`#11924 `_) +- Removed uses of ``datetime.datetime.utcnow`` from non-vendored code. (`#12005 `_) +- Consistently report whether a dependency comes from an extra. (`#12095 `_) +- Fix completion script for zsh (`#12166 `_) +- Fix improper handling of the new onexc argument of ``shutil.rmtree()`` in Python 3.12. (`#12187 `_) +- Filter out yanked links from the available versions error message: "(from versions: 1.0, 2.0, 3.0)" will not contain yanked versions conform PEP 592. The yanked versions (if any) will be mentioned in a separate error message. (`#12225 `_) +- Fix crash when the git version number contains something else than digits and dots. (`#12280 `_) +- Use ``-r=...`` instead of ``-r ...`` to specify references with Mercurial. (`#12306 `_) +- Redact password from URLs in some additional places. (`#12350 `_) +- pip uses less memory when caching large packages. As a result, there is a new on-disk cache format stored in a new directory ($PIP_CACHE_DIR/http-v2). (`#2984 `_) + +Vendored Libraries +------------------ + +- Upgrade certifi to 2023.7.22 +- Add truststore 0.8.0 +- Upgrade urllib3 to 1.26.17 + +Improved Documentation +---------------------- + +- Document that ``pip search`` support has been removed from PyPI (`#12059 `_) +- Clarify --prefer-binary in CLI and docs (`#12122 `_) +- Document that using OS-provided Python can cause pip's test suite to report false failures. (`#12334 `_) + + 23.2.1 (2023-07-22) =================== diff --git a/news/11394.bugfix.rst b/news/11394.bugfix.rst deleted file mode 100644 index 9f2501db46c..00000000000 --- a/news/11394.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Ignore errors in temporary directory cleanup (show a warning instead). diff --git a/news/11649.bugfix.rst b/news/11649.bugfix.rst deleted file mode 100644 index 65511711f59..00000000000 --- a/news/11649.bugfix.rst +++ /dev/null @@ -1,5 +0,0 @@ -Normalize extras according to :pep:`685` from package metadata in the resolver -for comparison. This ensures extras are correctly compared and merged as long -as the package providing the extra(s) is built with values normalized according -to the standard. Note, however, that this *does not* solve cases where the -package itself contains unnormalized extra values in the metadata. diff --git a/news/11847.bugfix.rst b/news/11847.bugfix.rst deleted file mode 100644 index 1f384835fef..00000000000 --- a/news/11847.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Prevent downloading sdists twice when PEP 658 metadata is present. diff --git a/news/11924.bugfix.rst b/news/11924.bugfix.rst deleted file mode 100644 index 7a9ee3151a4..00000000000 --- a/news/11924.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Include all requested extras in the install report (``--report``). diff --git a/news/11924.feature.rst b/news/11924.feature.rst deleted file mode 100644 index 30bc60e6bce..00000000000 --- a/news/11924.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Improve extras resolution for multiple constraints on same base package. diff --git a/news/12005.bugfix.rst b/news/12005.bugfix.rst deleted file mode 100644 index 98a3e5112df..00000000000 --- a/news/12005.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Removed uses of ``datetime.datetime.utcnow`` from non-vendored code. diff --git a/news/12059.doc.rst b/news/12059.doc.rst deleted file mode 100644 index bf3a8d3e662..00000000000 --- a/news/12059.doc.rst +++ /dev/null @@ -1 +0,0 @@ -Document that ``pip search`` support has been removed from PyPI diff --git a/news/12095.bugfix.rst b/news/12095.bugfix.rst deleted file mode 100644 index 1f5018326ba..00000000000 --- a/news/12095.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Consistently report whether a dependency comes from an extra. diff --git a/news/12122.doc.rst b/news/12122.doc.rst deleted file mode 100644 index 49a3308a25c..00000000000 --- a/news/12122.doc.rst +++ /dev/null @@ -1 +0,0 @@ -Clarify --prefer-binary in CLI and docs diff --git a/news/12155.trivial.rst b/news/12155.trivial.rst deleted file mode 100644 index 5f77231c864..00000000000 --- a/news/12155.trivial.rst +++ /dev/null @@ -1,6 +0,0 @@ -The metadata-fetching log message is moved to the VERBOSE level and now hidden -by default. The more significant information in this message to most users are -already available in surrounding logs (the package name and version of the -metadata being fetched), while the URL to the exact metadata file is generally -too long and clutters the output. The message can be brought back with -``--verbose``. diff --git a/news/12166.bugfix.rst b/news/12166.bugfix.rst deleted file mode 100644 index 491597c7f1a..00000000000 --- a/news/12166.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix completion script for zsh diff --git a/news/12175.removal.rst b/news/12175.removal.rst deleted file mode 100644 index bf3500f351a..00000000000 --- a/news/12175.removal.rst +++ /dev/null @@ -1 +0,0 @@ -Drop a fallback to using SecureTransport on macOS. It was useful when pip detected OpenSSL older than 1.0.1, but the current pip does not support any Python version supporting such old OpenSSL versions. diff --git a/news/12183.trivial.rst b/news/12183.trivial.rst deleted file mode 100644 index c22e854c9a5..00000000000 --- a/news/12183.trivial.rst +++ /dev/null @@ -1 +0,0 @@ -Add test cases for some behaviors of ``install --dry-run`` and ``--use-feature=fast-deps``. diff --git a/news/12187.bugfix.rst b/news/12187.bugfix.rst deleted file mode 100644 index b4d106b974f..00000000000 --- a/news/12187.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix improper handling of the new onexc argument of ``shutil.rmtree()`` in Python 3.12. diff --git a/news/12194.trivial.rst b/news/12194.trivial.rst deleted file mode 100644 index dfe5bbf1f06..00000000000 --- a/news/12194.trivial.rst +++ /dev/null @@ -1 +0,0 @@ -Add lots of comments to the ``BuildTracker``. diff --git a/news/12204.feature.rst b/news/12204.feature.rst deleted file mode 100644 index 6ffdf5123b1..00000000000 --- a/news/12204.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Improve use of datastructures to make candidate selection 1.6x faster diff --git a/news/12215.feature.rst b/news/12215.feature.rst deleted file mode 100644 index 407dc903ed9..00000000000 --- a/news/12215.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Allow ``pip install --dry-run`` to use platform and ABI overriding options similar to ``--target``. diff --git a/news/12224.feature.rst b/news/12224.feature.rst deleted file mode 100644 index d874265787a..00000000000 --- a/news/12224.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Add ``is_yanked`` boolean entry to the installation report (``--report``) to indicate whether the requirement was yanked from the index, but was still selected by pip conform to PEP 592. diff --git a/news/12225.bugfix.rst b/news/12225.bugfix.rst deleted file mode 100644 index e1e0c323dc3..00000000000 --- a/news/12225.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Filter out yanked links from the available versions error message: "(from versions: 1.0, 2.0, 3.0)" will not contain yanked versions conform PEP 592. The yanked versions (if any) will be mentioned in a separate error message. diff --git a/news/12252.trivial.rst b/news/12252.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/news/12254.process.rst b/news/12254.process.rst deleted file mode 100644 index e546902685b..00000000000 --- a/news/12254.process.rst +++ /dev/null @@ -1 +0,0 @@ -Added reference to `vulnerability reporting guidelines `_ to pip's security policy. diff --git a/news/12261.trivial.rst b/news/12261.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/news/12280.bugfix.rst b/news/12280.bugfix.rst deleted file mode 100644 index 77de283d398..00000000000 --- a/news/12280.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix crash when the git version number contains something else than digits and dots. diff --git a/news/12306.bugfix.rst b/news/12306.bugfix.rst deleted file mode 100644 index eb6eecaaf1b..00000000000 --- a/news/12306.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Use ``-r=...`` instead of ``-r ...`` to specify references with Mercurial. diff --git a/news/12334.doc.rst b/news/12334.doc.rst deleted file mode 100644 index ff3d877e5e8..00000000000 --- a/news/12334.doc.rst +++ /dev/null @@ -1 +0,0 @@ -Document that using OS-provided Python can cause pip's test suite to report false failures. diff --git a/news/12350.bugfix.rst b/news/12350.bugfix.rst deleted file mode 100644 index 3fb16b4ed6a..00000000000 --- a/news/12350.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Redact password from URLs in some additional places. diff --git a/news/12AE57EC-683C-4A8E-BCCB-851FCD0730B4.trivial.rst b/news/12AE57EC-683C-4A8E-BCCB-851FCD0730B4.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/news/1F54AB69-21F3-49F6-B938-AB16E326F82C.trivial.rst b/news/1F54AB69-21F3-49F6-B938-AB16E326F82C.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/news/2984.bugfix.rst b/news/2984.bugfix.rst deleted file mode 100644 index cce561815c9..00000000000 --- a/news/2984.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -pip uses less memory when caching large packages. As a result, there is a new on-disk cache format stored in a new directory ($PIP_CACHE_DIR/http-v2). diff --git a/news/4A0C40FF-ABE1-48C7-954C-7C3EB229135F.trivial.rst b/news/4A0C40FF-ABE1-48C7-954C-7C3EB229135F.trivial.rst deleted file mode 100644 index 7f6c1d5612e..00000000000 --- a/news/4A0C40FF-ABE1-48C7-954C-7C3EB229135F.trivial.rst +++ /dev/null @@ -1 +0,0 @@ -Add ruff rules ASYNC,C4,C90,PERF,PLE,PLR for minor optimizations and to set upper limits on code complexity. diff --git a/news/732404DE-8011-4146-8CAD-85D7756D88A6.trivial.rst b/news/732404DE-8011-4146-8CAD-85D7756D88A6.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/news/80291DF4-7B0F-4268-B682-E1FCA1C3ACED.trivial.rst b/news/80291DF4-7B0F-4268-B682-E1FCA1C3ACED.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/news/85F7E260-68FF-4C1E-A2CB-CF8634829D2D.trivial.rst b/news/85F7E260-68FF-4C1E-A2CB-CF8634829D2D.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/news/E2B261CA-A0CF-4309-B808-1210C0B54632.trivial.rst b/news/E2B261CA-A0CF-4309-B808-1210C0B54632.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst deleted file mode 100644 index aacd17183f1..00000000000 --- a/news/certifi.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade certifi to 2023.7.22 diff --git a/news/d7179b28-bc23-46aa-9175-834117a42dbd.trivial.rst b/news/d7179b28-bc23-46aa-9175-834117a42dbd.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst deleted file mode 100644 index 63c71d72d2f..00000000000 --- a/news/truststore.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Add truststore 0.8.0 diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst deleted file mode 100644 index 37032f67a0e..00000000000 --- a/news/urllib3.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade urllib3 to 1.26.17 diff --git a/news/zhsdgdlsjgksdfj.trivial.rst b/news/zhsdgdlsjgksdfj.trivial.rst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/pip/__init__.py b/src/pip/__init__.py index 00ce8ad456d..62498a779d5 100644 --- a/src/pip/__init__.py +++ b/src/pip/__init__.py @@ -1,6 +1,6 @@ from typing import List, Optional -__version__ = "23.3.dev0" +__version__ = "23.3" def main(args: Optional[List[str]] = None) -> int: From c0cce3ca6048b27d80b78a88d6af1b25b10a2a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 Oct 2023 10:23:09 +0200 Subject: [PATCH 135/992] Bump for development --- src/pip/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pip/__init__.py b/src/pip/__init__.py index 62498a779d5..46e56014998 100644 --- a/src/pip/__init__.py +++ b/src/pip/__init__.py @@ -1,6 +1,6 @@ from typing import List, Optional -__version__ = "23.3" +__version__ = "24.0.dev0" def main(args: Optional[List[str]] = None) -> int: From 9b0abc8c40459dd16a9c1205e15f6d3363bf202e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 Oct 2023 18:44:34 +0200 Subject: [PATCH 136/992] Build using `build` Update the build-release nox session to build using `build` instead of a direct setup.py call. --- noxfile.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/noxfile.py b/noxfile.py index a3e7ceab4cc..878dbbd0ad6 100644 --- a/noxfile.py +++ b/noxfile.py @@ -322,7 +322,7 @@ def build_release(session: nox.Session) -> None: ) session.log("# Install dependencies") - session.install("setuptools", "wheel", "twine") + session.install("build", "twine") with release.isolated_temporary_checkout(session, version) as build_dir: session.log( @@ -358,8 +358,7 @@ def build_dists(session: nox.Session) -> List[str]: ) session.log("# Build distributions") - session.install("setuptools", "wheel") - session.run("python", "setup.py", "sdist", "bdist_wheel", silent=True) + session.run("python", "-m", "build", silent=True) produced_dists = glob.glob("dist/*") session.log(f"# Verify distributions: {', '.join(produced_dists)}") From e1e227d7d6b5ae04ae3a2104bf8185622201f5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 Oct 2023 18:48:53 +0200 Subject: [PATCH 137/992] Clarify changelog --- NEWS.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 27ac69d793a..5004bd9f79c 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -26,8 +26,8 @@ Features -------- - Improve extras resolution for multiple constraints on same base package. (`#11924 `_) -- Improve use of datastructures to make candidate selection 1.6x faster (`#12204 `_) -- Allow ``pip install --dry-run`` to use platform and ABI overriding options similar to ``--target``. (`#12215 `_) +- Improve use of datastructures to make candidate selection 1.6x faster. (`#12204 `_) +- Allow ``pip install --dry-run`` to use platform and ABI overriding options. (`#12215 `_) - Add ``is_yanked`` boolean entry to the installation report (``--report``) to indicate whether the requirement was yanked from the index, but was still selected by pip conform to PEP 592. (`#12224 `_) Bug Fixes From a982c7bc3550afb27a3a792d84fe91bf7c3254ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 15 Oct 2023 19:17:15 +0200 Subject: [PATCH 138/992] Add a few PEP links in the changelog --- NEWS.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 5004bd9f79c..4f496273ca0 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -28,7 +28,7 @@ Features - Improve extras resolution for multiple constraints on same base package. (`#11924 `_) - Improve use of datastructures to make candidate selection 1.6x faster. (`#12204 `_) - Allow ``pip install --dry-run`` to use platform and ABI overriding options. (`#12215 `_) -- Add ``is_yanked`` boolean entry to the installation report (``--report``) to indicate whether the requirement was yanked from the index, but was still selected by pip conform to PEP 592. (`#12224 `_) +- Add ``is_yanked`` boolean entry to the installation report (``--report``) to indicate whether the requirement was yanked from the index, but was still selected by pip conform to :pep:`592`. (`#12224 `_) Bug Fixes --------- @@ -39,7 +39,7 @@ Bug Fixes as the package providing the extra(s) is built with values normalized according to the standard. Note, however, that this *does not* solve cases where the package itself contains unnormalized extra values in the metadata. (`#11649 `_) -- Prevent downloading sdists twice when PEP 658 metadata is present. (`#11847 `_) +- Prevent downloading sdists twice when :pep:`658` metadata is present. (`#11847 `_) - Include all requested extras in the install report (``--report``). (`#11924 `_) - Removed uses of ``datetime.datetime.utcnow`` from non-vendored code. (`#12005 `_) - Consistently report whether a dependency comes from an extra. (`#12095 `_) @@ -72,7 +72,7 @@ Improved Documentation Bug Fixes --------- -- Disable PEP 658 metadata fetching with the legacy resolver. (`#12156 `_) +- Disable :pep:`658` metadata fetching with the legacy resolver. (`#12156 `_) 23.2 (2023-07-15) @@ -102,11 +102,11 @@ Bug Fixes --------- - Fix ``pip completion --zsh``. (`#11417 `_) -- Prevent downloading files twice when PEP 658 metadata is present (`#11847 `_) +- Prevent downloading files twice when :pep:`658` metadata is present (`#11847 `_) - Add permission check before configuration (`#11920 `_) - Fix deprecation warnings in Python 3.12 for usage of shutil.rmtree (`#11957 `_) - Ignore invalid or unreadable ``origin.json`` files in the cache of locally built wheels. (`#11985 `_) -- Fix installation of packages with PEP658 metadata using non-canonicalized names (`#12038 `_) +- Fix installation of packages with :pep:`658` metadata using non-canonicalized names (`#12038 `_) - Correctly parse ``dist-info-metadata`` values from JSON-format index data. (`#12042 `_) - Fail with an error if the ``--python`` option is specified after the subcommand name. (`#12067 `_) - Fix slowness when using ``importlib.metadata`` (the default way for pip to read metadata in Python 3.11+) and there is a large overlap between already installed and to-be-installed packages. (`#12079 `_) @@ -277,7 +277,7 @@ Features - Change the hashes in the installation report to be a mapping. Emit the ``archive_info.hashes`` dictionary in ``direct_url.json``. (`#11312 `_) -- Implement logic to read the ``EXTERNALLY-MANAGED`` file as specified in PEP 668. +- Implement logic to read the ``EXTERNALLY-MANAGED`` file as specified in :pep:`668`. This allows a downstream Python distributor to prevent users from using pip to modify the externally managed environment. (`#11381 `_) - Enable the use of ``keyring`` found on ``PATH``. This allows ``keyring`` @@ -293,7 +293,7 @@ Bug Fixes - Use the "venv" scheme if available to obtain prefixed lib paths. (`#11598 `_) - Deprecated a historical ambiguity in how ``egg`` fragments in URL-style requirements are formatted and handled. ``egg`` fragments that do not look - like PEP 508 names now produce a deprecation warning. (`#11617 `_) + like :pep:`508` names now produce a deprecation warning. (`#11617 `_) - Fix scripts path in isolated build environment on Debian. (`#11623 `_) - Make ``pip show`` show the editable location if package is editable (`#11638 `_) - Stop checking that ``wheel`` is present when ``build-system.requires`` From fb06d12d5a32581ae531fc26143c14ac6c8ea8fe Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Tue, 17 Oct 2023 11:04:34 +0100 Subject: [PATCH 139/992] Handle ISO formats with a trailing Z --- news/12338.bugfix.rst | 1 + src/pip/_internal/self_outdated_check.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 news/12338.bugfix.rst diff --git a/news/12338.bugfix.rst b/news/12338.bugfix.rst new file mode 100644 index 00000000000..cd9a8c10baa --- /dev/null +++ b/news/12338.bugfix.rst @@ -0,0 +1 @@ +Handle a timezone indicator of Z when parsing dates in the self check. diff --git a/src/pip/_internal/self_outdated_check.py b/src/pip/_internal/self_outdated_check.py index cb18edbed8e..0f64ae0e614 100644 --- a/src/pip/_internal/self_outdated_check.py +++ b/src/pip/_internal/self_outdated_check.py @@ -39,6 +39,15 @@ def _get_statefile_name(key: str) -> str: return name +def _convert_date(isodate: str) -> datetime.datetime: + """Convert an ISO format string to a date. + + Handles the format 2020-01-22T14:24:01Z (trailing Z) + which is not supported by older versions of fromisoformat. + """ + return datetime.datetime.fromisoformat(isodate.replace("Z", "+00:00")) + + class SelfCheckState: def __init__(self, cache_dir: str) -> None: self._state: Dict[str, Any] = {} @@ -73,7 +82,7 @@ def get(self, current_time: datetime.datetime) -> Optional[str]: return None # Determine if we need to refresh the state - last_check = datetime.datetime.fromisoformat(self._state["last_check"]) + last_check = _convert_date(self._state["last_check"]) time_since_last_check = current_time - last_check if time_since_last_check > _WEEK: return None From 5e7cc16c3b4442055a4a9892e9231758b6714e28 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Wed, 18 Oct 2023 18:14:22 -0400 Subject: [PATCH 140/992] Fix parallel pip cache downloads causing crash (#12364) Co-authored-by: Itamar Turner-Trauring --- news/12361.bugfix.rst | 1 + src/pip/_internal/network/cache.py | 28 ++++++++++++++++++++++++---- tests/unit/test_network_cache.py | 11 +++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 news/12361.bugfix.rst diff --git a/news/12361.bugfix.rst b/news/12361.bugfix.rst new file mode 100644 index 00000000000..59575e80bc8 --- /dev/null +++ b/news/12361.bugfix.rst @@ -0,0 +1 @@ +Fix bug where installing the same package at the same time with multiple pip processes could fail. diff --git a/src/pip/_internal/network/cache.py b/src/pip/_internal/network/cache.py index a4d13620532..4d0fb545dc2 100644 --- a/src/pip/_internal/network/cache.py +++ b/src/pip/_internal/network/cache.py @@ -33,6 +33,18 @@ class SafeFileCache(SeparateBodyBaseCache): """ A file based cache which is safe to use even when the target directory may not be accessible or writable. + + There is a race condition when two processes try to write and/or read the + same entry at the same time, since each entry consists of two separate + files (https://github.com/psf/cachecontrol/issues/324). We therefore have + additional logic that makes sure that both files to be present before + returning an entry; this fixes the read side of the race condition. + + For the write side, we assume that the server will only ever return the + same data for the same URL, which ought to be the case for files pip is + downloading. PyPI does not have a mechanism to swap out a wheel for + another wheel, for example. If this assumption is not true, the + CacheControl issue will need to be fixed. """ def __init__(self, directory: str) -> None: @@ -49,9 +61,13 @@ def _get_cache_path(self, name: str) -> str: return os.path.join(self.directory, *parts) def get(self, key: str) -> Optional[bytes]: - path = self._get_cache_path(key) + # The cache entry is only valid if both metadata and body exist. + metadata_path = self._get_cache_path(key) + body_path = metadata_path + ".body" + if not (os.path.exists(metadata_path) and os.path.exists(body_path)): + return None with suppressed_cache_errors(): - with open(path, "rb") as f: + with open(metadata_path, "rb") as f: return f.read() def _write(self, path: str, data: bytes) -> None: @@ -77,9 +93,13 @@ def delete(self, key: str) -> None: os.remove(path + ".body") def get_body(self, key: str) -> Optional[BinaryIO]: - path = self._get_cache_path(key) + ".body" + # The cache entry is only valid if both metadata and body exist. + metadata_path = self._get_cache_path(key) + body_path = metadata_path + ".body" + if not (os.path.exists(metadata_path) and os.path.exists(body_path)): + return None with suppressed_cache_errors(): - return open(path, "rb") + return open(body_path, "rb") def set_body(self, key: str, body: bytes) -> None: path = self._get_cache_path(key) + ".body" diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py index aa849f3b03a..6a816b30090 100644 --- a/tests/unit/test_network_cache.py +++ b/tests/unit/test_network_cache.py @@ -27,6 +27,11 @@ def test_cache_roundtrip(self, cache_tmpdir: Path) -> None: cache = SafeFileCache(os.fspath(cache_tmpdir)) assert cache.get("test key") is None cache.set("test key", b"a test string") + # Body hasn't been stored yet, so the entry isn't valid yet + assert cache.get("test key") is None + + # With a body, the cache entry is valid: + cache.set_body("test key", b"body") assert cache.get("test key") == b"a test string" cache.delete("test key") assert cache.get("test key") is None @@ -35,6 +40,12 @@ def test_cache_roundtrip_body(self, cache_tmpdir: Path) -> None: cache = SafeFileCache(os.fspath(cache_tmpdir)) assert cache.get_body("test key") is None cache.set_body("test key", b"a test string") + # Metadata isn't available, so the entry isn't valid yet (this + # shouldn't happen, but just in case) + assert cache.get_body("test key") is None + + # With metadata, the cache entry is valid: + cache.set("test key", b"metadata") body = cache.get_body("test key") assert body is not None with body: From 5364f26f9631dc07ed1bdfc88e1bec1bead2bce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 21 Oct 2023 12:57:31 +0200 Subject: [PATCH 141/992] Bump for release --- NEWS.rst | 10 ++++++++++ news/12338.bugfix.rst | 1 - news/12361.bugfix.rst | 1 - src/pip/__init__.py | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 news/12338.bugfix.rst delete mode 100644 news/12361.bugfix.rst diff --git a/NEWS.rst b/NEWS.rst index 4f496273ca0..26d00a3f144 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -9,6 +9,16 @@ .. towncrier release notes start +23.3.1 (2023-10-21) +=================== + +Bug Fixes +--------- + +- Handle a timezone indicator of Z when parsing dates in the self check. (`#12338 `_) +- Fix bug where installing the same package at the same time with multiple pip processes could fail. (`#12361 `_) + + 23.3 (2023-10-15) ================= diff --git a/news/12338.bugfix.rst b/news/12338.bugfix.rst deleted file mode 100644 index cd9a8c10baa..00000000000 --- a/news/12338.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Handle a timezone indicator of Z when parsing dates in the self check. diff --git a/news/12361.bugfix.rst b/news/12361.bugfix.rst deleted file mode 100644 index 59575e80bc8..00000000000 --- a/news/12361.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix bug where installing the same package at the same time with multiple pip processes could fail. diff --git a/src/pip/__init__.py b/src/pip/__init__.py index 46e56014998..f1263cdc1b6 100644 --- a/src/pip/__init__.py +++ b/src/pip/__init__.py @@ -1,6 +1,6 @@ from typing import List, Optional -__version__ = "24.0.dev0" +__version__ = "23.3.1" def main(args: Optional[List[str]] = None) -> int: From 576dbd813c3a0e989c14a36f6d214ad66309ff97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 21 Oct 2023 12:57:41 +0200 Subject: [PATCH 142/992] Bump for development --- src/pip/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pip/__init__.py b/src/pip/__init__.py index f1263cdc1b6..46e56014998 100644 --- a/src/pip/__init__.py +++ b/src/pip/__init__.py @@ -1,6 +1,6 @@ from typing import List, Optional -__version__ = "23.3.1" +__version__ = "24.0.dev0" def main(args: Optional[List[str]] = None) -> int: From 3fb263701829541db79529369da3a129264dd5bc Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Wed, 18 Oct 2023 18:58:38 -0400 Subject: [PATCH 143/992] Optimize _FlatDirectorySource to only scan each path once --- src/pip/_internal/index/collector.py | 2 + src/pip/_internal/index/sources.py | 84 ++++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 11 deletions(-) diff --git a/src/pip/_internal/index/collector.py b/src/pip/_internal/index/collector.py index b3e293ea3a5..08c8bddcb69 100644 --- a/src/pip/_internal/index/collector.py +++ b/src/pip/_internal/index/collector.py @@ -473,6 +473,7 @@ def collect_sources( page_validator=self.session.is_secure_origin, expand_dir=False, cache_link_parsing=False, + project_name=project_name, ) for loc in self.search_scope.get_index_urls_locations(project_name) ).values() @@ -483,6 +484,7 @@ def collect_sources( page_validator=self.session.is_secure_origin, expand_dir=True, cache_link_parsing=True, + project_name=project_name, ) for loc in self.find_links ).values() diff --git a/src/pip/_internal/index/sources.py b/src/pip/_internal/index/sources.py index cd9cb8d40f1..f4626d71ab4 100644 --- a/src/pip/_internal/index/sources.py +++ b/src/pip/_internal/index/sources.py @@ -1,8 +1,17 @@ import logging import mimetypes import os -import pathlib -from typing import Callable, Iterable, Optional, Tuple +from collections import defaultdict +from typing import Callable, Dict, Iterable, List, Optional, Tuple + +from pip._vendor.packaging.utils import ( + InvalidSdistFilename, + InvalidVersion, + InvalidWheelFilename, + canonicalize_name, + parse_sdist_filename, + parse_wheel_filename, +) from pip._internal.models.candidate import InstallationCandidate from pip._internal.models.link import Link @@ -36,6 +45,53 @@ def _is_html_file(file_url: str) -> bool: return mimetypes.guess_type(file_url, strict=False)[0] == "text/html" +class _FlatDirectoryToUrls: + """Scans directory and caches results""" + + def __init__(self, path: str) -> None: + self._path = path + self._page_candidates: List[str] = [] + self._project_name_to_urls: Dict[str, List[str]] = defaultdict(list) + self._scanned_directory = False + + def _scan_directory(self) -> None: + """Scans directory once and populates both page_candidates + and project_name_to_urls at the same time + """ + for entry in os.scandir(self._path): + url = path_to_url(entry.path) + if _is_html_file(url): + self._page_candidates.append(url) + continue + + # File must have a valid wheel or sdist name, + # otherwise not worth considering as a package + try: + project_filename = parse_wheel_filename(entry.name)[0] + except (InvalidWheelFilename, InvalidVersion): + try: + project_filename = parse_sdist_filename(entry.name)[0] + except (InvalidSdistFilename, InvalidVersion): + continue + + self._project_name_to_urls[project_filename].append(url) + self._scanned_directory = True + + @property + def page_candidates(self) -> List[str]: + if not self._scanned_directory: + self._scan_directory() + + return self._page_candidates + + @property + def project_name_to_urls(self) -> Dict[str, List[str]]: + if not self._scanned_directory: + self._scan_directory() + + return self._project_name_to_urls + + class _FlatDirectorySource(LinkSource): """Link source specified by ``--find-links=``. @@ -45,30 +101,34 @@ class _FlatDirectorySource(LinkSource): * ``file_candidates``: Archives in the directory. """ + _paths_to_urls: Dict[str, _FlatDirectoryToUrls] = {} + def __init__( self, candidates_from_page: CandidatesFromPage, path: str, + project_name: str, ) -> None: self._candidates_from_page = candidates_from_page - self._path = pathlib.Path(os.path.realpath(path)) + self._project_name = canonicalize_name(project_name) + + # Get existing instance of _FlatDirectoryToUrls if it exists + if path in self._paths_to_urls: + self._path_to_urls = self._paths_to_urls[path] + else: + self._path_to_urls = _FlatDirectoryToUrls(path=path) + self._paths_to_urls[path] = self._path_to_urls @property def link(self) -> Optional[Link]: return None def page_candidates(self) -> FoundCandidates: - for path in self._path.iterdir(): - url = path_to_url(str(path)) - if not _is_html_file(url): - continue + for url in self._path_to_urls.page_candidates: yield from self._candidates_from_page(Link(url)) def file_links(self) -> FoundLinks: - for path in self._path.iterdir(): - url = path_to_url(str(path)) - if _is_html_file(url): - continue + for url in self._path_to_urls.project_name_to_urls[self._project_name]: yield Link(url) @@ -170,6 +230,7 @@ def build_source( page_validator: PageValidator, expand_dir: bool, cache_link_parsing: bool, + project_name: str, ) -> Tuple[Optional[str], Optional[LinkSource]]: path: Optional[str] = None url: Optional[str] = None @@ -203,6 +264,7 @@ def build_source( source = _FlatDirectorySource( candidates_from_page=candidates_from_page, path=path, + project_name=project_name, ) else: source = _IndexDirectorySource( From 125ce542cc77d20a65f39a05f828fa38aff1d094 Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Wed, 18 Oct 2023 18:58:53 -0400 Subject: [PATCH 144/992] Fix and add tests for optimized _FlatDirectorySource --- tests/functional/test_install_config.py | 6 --- tests/unit/test_collector.py | 55 ++++++++++++++++++++++--- tests/unit/test_finder.py | 5 ++- 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py index ecaf2f705a2..5c7b23ed7cb 100644 --- a/tests/functional/test_install_config.py +++ b/tests/functional/test_install_config.py @@ -125,9 +125,6 @@ def test_command_line_append_flags( "Fetching project page and analyzing links: https://test.pypi.org" in result.stdout ) - assert ( - f"Skipping link: not a file: {data.find_links}" in result.stdout - ), f"stdout: {result.stdout}" @pytest.mark.network @@ -151,9 +148,6 @@ def test_command_line_appends_correctly( "Fetching project page and analyzing links: https://test.pypi.org" in result.stdout ), result.stdout - assert ( - f"Skipping link: not a file: {data.find_links}" in result.stdout - ), f"stdout: {result.stdout}" def test_config_file_override_stack( diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py index 3c8b81de44d..1ad431e39a4 100644 --- a/tests/unit/test_collector.py +++ b/tests/unit/test_collector.py @@ -862,7 +862,7 @@ def test_collect_sources__file_expand_dir(data: TestData) -> None: ) sources = collector.collect_sources( # Shouldn't be used. - project_name=None, # type: ignore[arg-type] + project_name="", candidates_from_page=None, # type: ignore[arg-type] ) assert ( @@ -960,7 +960,7 @@ def test_fetch_response(self, mock_get_simple_response: mock.Mock) -> None: session=link_collector.session, ) - def test_collect_sources( + def test_collect_page_sources( self, caplog: pytest.LogCaptureFixture, data: TestData ) -> None: caplog.set_level(logging.DEBUG) @@ -993,9 +993,8 @@ def test_collect_sources( files = list(files_it) pages = list(pages_it) - # Spot-check the returned sources. - assert len(files) > 20 - check_links_include(files, names=["simple-1.0.tar.gz"]) + # Only "twine" should return from collecting sources + assert len(files) == 1 assert [page.link for page in pages] == [Link("https://pypi.org/simple/twine/")] # Check that index URLs are marked as *un*cacheable. @@ -1010,6 +1009,52 @@ def test_collect_sources( ("pip._internal.index.collector", logging.DEBUG, expected_message), ] + def test_collect_file_sources( + self, caplog: pytest.LogCaptureFixture, data: TestData + ) -> None: + caplog.set_level(logging.DEBUG) + + link_collector = make_test_link_collector( + find_links=[data.find_links], + # Include two copies of the URL to check that the second one + # is skipped. + index_urls=[PyPI.simple_url, PyPI.simple_url], + ) + collected_sources = link_collector.collect_sources( + "singlemodule", + candidates_from_page=lambda link: [ + InstallationCandidate("singlemodule", "0.0.1", link) + ], + ) + + files_it = itertools.chain.from_iterable( + source.file_links() + for sources in collected_sources + for source in sources + if source is not None + ) + pages_it = itertools.chain.from_iterable( + source.page_candidates() + for sources in collected_sources + for source in sources + if source is not None + ) + files = list(files_it) + _ = list(pages_it) + + # singlemodule should return files + assert len(files) > 0 + check_links_include(files, names=["singlemodule-0.0.1.tar.gz"]) + + expected_message = dedent( + """\ + 1 location(s) to search for versions of singlemodule: + * https://pypi.org/simple/singlemodule/""" + ) + assert caplog.record_tuples == [ + ("pip._internal.index.collector", logging.DEBUG, expected_message), + ] + @pytest.mark.parametrize( "find_links, no_index, suppress_no_index, expected", diff --git a/tests/unit/test_finder.py b/tests/unit/test_finder.py index 3404d1498e3..35c7e89b765 100644 --- a/tests/unit/test_finder.py +++ b/tests/unit/test_finder.py @@ -128,7 +128,10 @@ def test_skip_invalid_wheel_link( with pytest.raises(DistributionNotFound): finder.find_requirement(req, True) - assert "Skipping link: invalid wheel filename:" in caplog.text + assert ( + "Could not find a version that satisfies the requirement invalid" + " (from versions:" in caplog.text + ) def test_not_find_wheel_not_supported(self, data: TestData) -> None: """ From dc0b3138e89aa6ec8a8a8361f62482d2e41c1856 Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Wed, 18 Oct 2023 18:59:02 -0400 Subject: [PATCH 145/992] Add news entry --- news/12327.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/12327.bugfix.rst diff --git a/news/12327.bugfix.rst b/news/12327.bugfix.rst new file mode 100644 index 00000000000..b07ef130a2e --- /dev/null +++ b/news/12327.bugfix.rst @@ -0,0 +1 @@ +Optimized usage of ``--find-links=``, by only scanning the relevant directory once, only considering file names that are valid wheel or sdist names, and only considering files in the directory that are related to the install. From 6dbd9c68f085c5bf304247bf7c7933842092efb2 Mon Sep 17 00:00:00 2001 From: efflamlemaillet <6533295+efflamlemaillet@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:08:17 +0200 Subject: [PATCH 146/992] Fix hg: "parse error at 0: not a prefix:" (#12373) Use two hypen argument `--rev=` instead of `-r=` Co-authored-by: Efflam Lemaillet Co-authored-by: Pradyun Gedam --- news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst | 1 + src/pip/_internal/vcs/mercurial.py | 2 +- tests/unit/test_vcs.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst diff --git a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst b/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst new file mode 100644 index 00000000000..76a8e6b96db --- /dev/null +++ b/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst @@ -0,0 +1 @@ +Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` diff --git a/src/pip/_internal/vcs/mercurial.py b/src/pip/_internal/vcs/mercurial.py index e440c122169..c183d41d09c 100644 --- a/src/pip/_internal/vcs/mercurial.py +++ b/src/pip/_internal/vcs/mercurial.py @@ -31,7 +31,7 @@ class Mercurial(VersionControl): @staticmethod def get_base_rev_args(rev: str) -> List[str]: - return [f"-r={rev}"] + return [f"--rev={rev}"] def fetch_new( self, dest: str, url: HiddenText, rev_options: RevOptions, verbosity: int diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py index 4a3750f2d36..5291f129cf7 100644 --- a/tests/unit/test_vcs.py +++ b/tests/unit/test_vcs.py @@ -66,7 +66,7 @@ def test_rev_options_repr() -> None: # First check VCS-specific RevOptions behavior. (Bazaar, [], ["-r", "123"], {}), (Git, ["HEAD"], ["123"], {}), - (Mercurial, [], ["-r=123"], {}), + (Mercurial, [], ["--rev=123"], {}), (Subversion, [], ["-r", "123"], {}), # Test extra_args. For this, test using a single VersionControl class. ( From fd77ebfc742de4d76ff976de22e86d116e0faad3 Mon Sep 17 00:00:00 2001 From: Dale <70705126+dalebrydon@users.noreply.github.com> Date: Fri, 27 Oct 2023 08:59:56 -0400 Subject: [PATCH 147/992] Rework the functionality of PIP_CONFIG_FILE (#11850) --- docs/html/topics/configuration.md | 19 ++++++++++++------- news/11815.doc.rst | 1 + src/pip/_internal/configuration.py | 26 ++++++++++++++------------ 3 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 news/11815.doc.rst diff --git a/docs/html/topics/configuration.md b/docs/html/topics/configuration.md index e4aafcd2b98..8b54db56ce6 100644 --- a/docs/html/topics/configuration.md +++ b/docs/html/topics/configuration.md @@ -19,8 +19,8 @@ and how they are related to pip's various command line options. ## Configuration Files -Configuration files can change the default values for command line option. -They are written using a standard INI style configuration files. +Configuration files can change the default values for command line options. +The files are written using standard INI format. pip has 3 "levels" of configuration files: @@ -28,11 +28,15 @@ pip has 3 "levels" of configuration files: - `user`: per-user configuration file. - `site`: per-environment configuration file; i.e. per-virtualenv. +Additionally, environment variables can be specified which will override any of the above. + ### Location pip's configuration files are located in fairly standard locations. This location is different on different operating systems, and has some additional -complexity for backwards compatibility reasons. +complexity for backwards compatibility reasons. Note that if user config files +exist in both the legacy and current locations, values in the current file +will override values in the legacy file. ```{tab} Unix @@ -88,9 +92,10 @@ Site ### `PIP_CONFIG_FILE` Additionally, the environment variable `PIP_CONFIG_FILE` can be used to specify -a configuration file that's loaded first, and whose values are overridden by -the values set in the aforementioned files. Setting this to {any}`os.devnull` -disables the loading of _all_ configuration files. +a configuration file that's loaded last, and whose values override the values +set in the aforementioned files. Setting this to {any}`os.devnull` +disables the loading of _all_ configuration files. Note that if a file exists +at the location that this is set to, the user config file will not be loaded. (config-precedence)= @@ -99,10 +104,10 @@ disables the loading of _all_ configuration files. When multiple configuration files are found, pip combines them in the following order: -- `PIP_CONFIG_FILE`, if given. - Global - User - Site +- `PIP_CONFIG_FILE`, if given. Each file read overrides any values read from previous files, so if the global timeout is specified in both the global file and the per-user file diff --git a/news/11815.doc.rst b/news/11815.doc.rst new file mode 100644 index 00000000000..8e7e8d21bef --- /dev/null +++ b/news/11815.doc.rst @@ -0,0 +1 @@ +Fix explanation of how PIP_CONFIG_FILE works diff --git a/src/pip/_internal/configuration.py b/src/pip/_internal/configuration.py index 96f824955bf..124a7ca5db7 100644 --- a/src/pip/_internal/configuration.py +++ b/src/pip/_internal/configuration.py @@ -327,33 +327,35 @@ def get_environ_vars(self) -> Iterable[Tuple[str, str]]: def iter_config_files(self) -> Iterable[Tuple[Kind, List[str]]]: """Yields variant and configuration files associated with it. - This should be treated like items of a dictionary. + This should be treated like items of a dictionary. The order + here doesn't affect what gets overridden. That is controlled + by OVERRIDE_ORDER. However this does control the order they are + displayed to the user. It's probably most ergononmic to display + things in the same order as OVERRIDE_ORDER """ # SMELL: Move the conditions out of this function - # environment variables have the lowest priority - config_file = os.environ.get("PIP_CONFIG_FILE", None) - if config_file is not None: - yield kinds.ENV, [config_file] - else: - yield kinds.ENV, [] - + env_config_file = os.environ.get("PIP_CONFIG_FILE", None) config_files = get_configuration_files() - # at the base we have any global configuration yield kinds.GLOBAL, config_files[kinds.GLOBAL] - # per-user configuration next + # per-user config is not loaded when env_config_file exists should_load_user_config = not self.isolated and not ( - config_file and os.path.exists(config_file) + env_config_file and os.path.exists(env_config_file) ) if should_load_user_config: # The legacy config file is overridden by the new config file yield kinds.USER, config_files[kinds.USER] - # finally virtualenv configuration first trumping others + # virtualenv config yield kinds.SITE, config_files[kinds.SITE] + if env_config_file is not None: + yield kinds.ENV, [env_config_file] + else: + yield kinds.ENV, [] + def get_values_in_config(self, variant: Kind) -> Dict[str, Any]: """Get values present in a config file""" return self._config[variant] From 9685f64fe8c78e1e39cd9b32e5615f42e0a01f1c Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Mon, 6 Nov 2023 04:30:05 -0500 Subject: [PATCH 148/992] Update ruff and config (#12390) --- .pre-commit-config.yaml | 3 ++- news/12390.trivial.rst | 1 + pyproject.toml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 news/12390.trivial.rst diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2c576d90a5b..999bd8b1d68 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,9 +22,10 @@ repos: - id: black - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.292 + rev: v0.1.4 hooks: - id: ruff + args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/pre-commit/mirrors-mypy rev: v0.961 diff --git a/news/12390.trivial.rst b/news/12390.trivial.rst new file mode 100644 index 00000000000..52b21413ca0 --- /dev/null +++ b/news/12390.trivial.rst @@ -0,0 +1 @@ +Update ruff versions and config for dev diff --git a/pyproject.toml b/pyproject.toml index b720c460297..d22e5c66896 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,8 +84,8 @@ ignore = [ "B020", "B904", # Ruff enables opinionated warnings by default "B905", # Ruff enables opinionated warnings by default - "G202", ] +target-version = "py37" line-length = 88 select = [ "ASYNC", From 9ec7e36dd6e1ef80c80c9fefde69bf97631f51c9 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Mon, 6 Nov 2023 17:13:58 +0100 Subject: [PATCH 149/992] Fixed bug in extras handling for link requirements --- news/12372.bugfix.rst | 1 + .../resolution/resolvelib/factory.py | 53 +++++++++++++------ tests/functional/test_install_reqs.py | 6 +-- tests/functional/test_new_resolver.py | 21 ++++++++ 4 files changed, 62 insertions(+), 19 deletions(-) create mode 100644 news/12372.bugfix.rst diff --git a/news/12372.bugfix.rst b/news/12372.bugfix.rst new file mode 100644 index 00000000000..6c0b48dec3c --- /dev/null +++ b/news/12372.bugfix.rst @@ -0,0 +1 @@ +Fix a bug in extras handling for link requirements diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 38c199448a1..241b74b59bb 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -36,7 +36,10 @@ from pip._internal.models.link import Link from pip._internal.models.wheel import Wheel from pip._internal.operations.prepare import RequirementPreparer -from pip._internal.req.constructors import install_req_from_link_and_ireq +from pip._internal.req.constructors import ( + install_req_drop_extras, + install_req_from_link_and_ireq, +) from pip._internal.req.req_install import ( InstallRequirement, check_invalid_constraint_type, @@ -176,6 +179,20 @@ def _make_candidate_from_link( name: Optional[NormalizedName], version: Optional[CandidateVersion], ) -> Optional[Candidate]: + base: Optional[BaseCandidate] = self._make_base_candidate_from_link( + link, template, name, version + ) + if not extras or base is None: + return base + return self._make_extras_candidate(base, extras, comes_from=template) + + def _make_base_candidate_from_link( + self, + link: Link, + template: InstallRequirement, + name: Optional[NormalizedName], + version: Optional[CandidateVersion], + ) -> Optional[BaseCandidate]: # TODO: Check already installed candidate, and use it if the link and # editable flag match. @@ -204,7 +221,7 @@ def _make_candidate_from_link( self._build_failures[link] = e return None - base: BaseCandidate = self._editable_candidate_cache[link] + return self._editable_candidate_cache[link] else: if link not in self._link_candidate_cache: try: @@ -224,11 +241,7 @@ def _make_candidate_from_link( ) self._build_failures[link] = e return None - base = self._link_candidate_cache[link] - - if not extras: - return base - return self._make_extras_candidate(base, extras, comes_from=template) + return self._link_candidate_cache[link] def _iter_found_candidates( self, @@ -362,9 +375,8 @@ def _iter_candidates_from_constraints( """ for link in constraint.links: self._fail_if_link_is_unsupported_wheel(link) - candidate = self._make_candidate_from_link( + candidate = self._make_base_candidate_from_link( link, - extras=frozenset(), template=install_req_from_link_and_ireq(link, template), name=canonicalize_name(identifier), version=None, @@ -454,10 +466,10 @@ def _make_requirements_from_install_req( Returns requirement objects associated with the given InstallRequirement. In most cases this will be a single object but the following special cases exist: - the InstallRequirement has markers that do not apply -> result is empty - - the InstallRequirement has both a constraint and extras -> result is split - in two requirement objects: one with the constraint and one with the - extra. This allows centralized constraint handling for the base, - resulting in fewer candidate rejections. + - the InstallRequirement has both a constraint (or link) and extras + -> result is split in two requirement objects: one with the constraint + (or link) and one with the extra. This allows centralized constraint + handling for the base, resulting in fewer candidate rejections. """ if not ireq.match_markers(requested_extras): logger.info( @@ -471,10 +483,13 @@ def _make_requirements_from_install_req( yield SpecifierRequirement(ireq) else: self._fail_if_link_is_unsupported_wheel(ireq.link) - cand = self._make_candidate_from_link( + # Always make the link candidate for the base requirement to make it + # available to `find_candidates` for explicit candidate lookup for any + # set of extras. + # The extras are required separately via a second requirement. + cand = self._make_base_candidate_from_link( ireq.link, - extras=frozenset(ireq.extras), - template=ireq, + template=install_req_drop_extras(ireq) if ireq.extras else ireq, name=canonicalize_name(ireq.name) if ireq.name else None, version=None, ) @@ -489,7 +504,13 @@ def _make_requirements_from_install_req( raise self._build_failures[ireq.link] yield UnsatisfiableRequirement(canonicalize_name(ireq.name)) else: + # require the base from the link yield self.make_requirement_from_candidate(cand) + if ireq.extras: + # require the extras on top of the base candidate + yield self.make_requirement_from_candidate( + self._make_extras_candidate(cand, frozenset(ireq.extras)) + ) def collect_root_requirements( self, root_ireqs: List[InstallRequirement] diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py index c21b9ba83de..f649be00090 100644 --- a/tests/functional/test_install_reqs.py +++ b/tests/functional/test_install_reqs.py @@ -671,9 +671,9 @@ def test_install_distribution_union_with_versions( expect_error=(resolver_variant == "resolvelib"), ) if resolver_variant == "resolvelib": - assert "Cannot install localextras[bar]" in result.stderr - assert ("localextras[bar] 0.0.1 depends on localextras 0.0.1") in result.stdout - assert ("localextras[baz] 0.0.2 depends on localextras 0.0.2") in result.stdout + assert "Cannot install localextras" in result.stderr + assert ("The user requested localextras 0.0.1") in result.stdout + assert ("The user requested localextras 0.0.2") in result.stdout else: assert ( "Successfully installed LocalExtras-0.0.1 simple-3.0 singlemodule-0.0.1" diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index b5945edf89b..1e7672a46ae 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -2406,6 +2406,27 @@ def test_new_resolver_respect_user_requested_if_extra_is_installed( script.assert_installed(pkg3="1.0", pkg2="2.0", pkg1="1.0") +def test_new_resolver_constraint_on_link_with_extra( + script: PipTestEnvironment, +) -> None: + """ + Verify that installing works from a link with both an extra and a constraint. + """ + wheel: pathlib.Path = create_basic_wheel_for_package( + script, "pkg", "1.0", extras={"ext": []} + ) + + script.pip( + "install", + "--no-cache-dir", + # no index, no --find-links: only the explicit path + "--no-index", + f"{wheel}[ext]", + "pkg==1", + ) + script.assert_installed(pkg="1.0") + + def test_new_resolver_do_not_backtrack_on_build_failure( script: PipTestEnvironment, ) -> None: From 68529081c27e2372971f114d5464c0850837405b Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Tue, 7 Nov 2023 04:14:56 -0500 Subject: [PATCH 150/992] Enforce f-strings via Ruff (#12393) --- docs/pip_sphinxext.py | 11 +--- news/12393.trivial.rst | 1 + pyproject.toml | 1 + setup.py | 2 +- src/pip/_internal/cli/cmdoptions.py | 9 +-- src/pip/_internal/cli/parser.py | 8 +-- src/pip/_internal/commands/cache.py | 2 +- src/pip/_internal/commands/configuration.py | 10 ++- src/pip/_internal/commands/debug.py | 8 +-- src/pip/_internal/commands/index.py | 4 +- src/pip/_internal/commands/install.py | 6 +- src/pip/_internal/configuration.py | 4 +- src/pip/_internal/exceptions.py | 13 ++-- src/pip/_internal/index/package_finder.py | 8 +-- src/pip/_internal/models/candidate.py | 6 +- src/pip/_internal/models/direct_url.py | 4 +- src/pip/_internal/models/format_control.py | 4 +- src/pip/_internal/models/link.py | 4 +- src/pip/_internal/network/download.py | 2 +- src/pip/_internal/operations/install/wheel.py | 20 +++--- src/pip/_internal/operations/prepare.py | 10 +-- src/pip/_internal/req/constructors.py | 2 +- src/pip/_internal/req/req_install.py | 8 +-- src/pip/_internal/req/req_uninstall.py | 8 +-- .../_internal/resolution/legacy/resolver.py | 14 ++--- .../resolution/resolvelib/candidates.py | 16 +---- .../resolution/resolvelib/factory.py | 4 +- .../resolution/resolvelib/requirements.py | 20 ++---- src/pip/_internal/utils/misc.py | 20 +++--- src/pip/_internal/utils/wheel.py | 6 +- src/pip/_internal/vcs/versioncontrol.py | 10 +-- src/pip/_internal/wheel_builder.py | 11 ++-- tests/conftest.py | 2 +- tests/functional/test_cli.py | 8 +-- tests/functional/test_completion.py | 2 +- tests/functional/test_debug.py | 2 +- tests/functional/test_freeze.py | 28 ++++----- tests/functional/test_install.py | 12 ++-- tests/functional/test_install_config.py | 18 +++--- tests/functional/test_install_index.py | 8 +-- tests/functional/test_install_reqs.py | 8 +-- tests/functional/test_install_wheel.py | 4 +- tests/functional/test_new_resolver.py | 2 +- tests/functional/test_new_resolver_errors.py | 6 +- tests/functional/test_new_resolver_hashes.py | 63 ++++++------------- tests/functional/test_new_resolver_target.py | 7 +-- tests/functional/test_pep517.py | 12 ++-- tests/functional/test_uninstall.py | 4 +- tests/functional/test_wheel.py | 4 +- tests/lib/__init__.py | 30 ++++----- tests/lib/local_repos.py | 2 +- tests/lib/server.py | 2 +- tests/lib/test_lib.py | 4 +- tests/lib/wheel.py | 2 +- tests/unit/test_collector.py | 12 ++-- tests/unit/test_link.py | 5 +- tests/unit/test_network_utils.py | 4 +- tests/unit/test_req.py | 4 +- tests/unit/test_req_file.py | 10 ++- tests/unit/test_resolution_legacy_resolver.py | 4 +- tests/unit/test_wheel.py | 8 +-- tools/release/check_version.py | 2 +- 62 files changed, 201 insertions(+), 334 deletions(-) create mode 100644 news/12393.trivial.rst diff --git a/docs/pip_sphinxext.py b/docs/pip_sphinxext.py index 2e559702294..fe3f41e8b79 100644 --- a/docs/pip_sphinxext.py +++ b/docs/pip_sphinxext.py @@ -194,22 +194,17 @@ def process_options(self) -> None: opt = option() opt_name = opt._long_opts[0] if opt._short_opts: - short_opt_name = "{}, ".format(opt._short_opts[0]) + short_opt_name = f"{opt._short_opts[0]}, " else: short_opt_name = "" if option in cmdoptions.general_group["options"]: prefix = "" else: - prefix = "{}_".format(self.determine_opt_prefix(opt_name)) + prefix = f"{self.determine_opt_prefix(opt_name)}_" self.view_list.append( - "* :ref:`{short}{long}<{prefix}{opt_name}>`".format( - short=short_opt_name, - long=opt_name, - prefix=prefix, - opt_name=opt_name, - ), + f"* :ref:`{short_opt_name}{opt_name}<{prefix}{opt_name}>`", "\n", ) diff --git a/news/12393.trivial.rst b/news/12393.trivial.rst new file mode 100644 index 00000000000..15452737aef --- /dev/null +++ b/news/12393.trivial.rst @@ -0,0 +1 @@ +Enforce and update code to use f-strings via Ruff rule UP032 diff --git a/pyproject.toml b/pyproject.toml index d22e5c66896..0ac70174ad1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,6 +102,7 @@ select = [ "PLR0", "W", "RUF100", + "UP032", ] [tool.ruff.isort] diff --git a/setup.py b/setup.py index d73c77b7346..569389b1ed0 100644 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ def get_version(rel_path: str) -> str: entry_points={ "console_scripts": [ "pip=pip._internal.cli.main:main", - "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]), + f"pip{sys.version_info[0]}=pip._internal.cli.main:main", "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]), ], }, diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py index 8fb16dc4a6a..d05e502f908 100644 --- a/src/pip/_internal/cli/cmdoptions.py +++ b/src/pip/_internal/cli/cmdoptions.py @@ -582,10 +582,7 @@ def _handle_python_version( """ version_info, error_msg = _convert_python_version(value) if error_msg is not None: - msg = "invalid --python-version value: {!r}: {}".format( - value, - error_msg, - ) + msg = f"invalid --python-version value: {value!r}: {error_msg}" raise_option_error(parser, option=option, msg=msg) parser.values.python_version = version_info @@ -921,9 +918,9 @@ def _handle_merge_hash( algo, digest = value.split(":", 1) except ValueError: parser.error( - "Arguments to {} must be a hash name " + f"Arguments to {opt_str} must be a hash name " "followed by a value, like --hash=sha256:" - "abcde...".format(opt_str) + "abcde..." ) if algo not in STRONG_HASHES: parser.error( diff --git a/src/pip/_internal/cli/parser.py b/src/pip/_internal/cli/parser.py index 64cf9719730..ae554b24cae 100644 --- a/src/pip/_internal/cli/parser.py +++ b/src/pip/_internal/cli/parser.py @@ -229,9 +229,9 @@ def _update_defaults(self, defaults: Dict[str, Any]) -> Dict[str, Any]: val = strtobool(val) except ValueError: self.error( - "{} is not a valid value for {} option, " + f"{val} is not a valid value for {key} option, " "please specify a boolean value like yes/no, " - "true/false or 1/0 instead.".format(val, key) + "true/false or 1/0 instead." ) elif option.action == "count": with suppress(ValueError): @@ -240,10 +240,10 @@ def _update_defaults(self, defaults: Dict[str, Any]) -> Dict[str, Any]: val = int(val) if not isinstance(val, int) or val < 0: self.error( - "{} is not a valid value for {} option, " + f"{val} is not a valid value for {key} option, " "please instead specify either a non-negative integer " "or a boolean value like yes/no or false/true " - "which is equivalent to 1/0.".format(val, key) + "which is equivalent to 1/0." ) elif option.action == "append": val = val.split() diff --git a/src/pip/_internal/commands/cache.py b/src/pip/_internal/commands/cache.py index 1f3b5fe142b..328336152cc 100644 --- a/src/pip/_internal/commands/cache.py +++ b/src/pip/_internal/commands/cache.py @@ -175,7 +175,7 @@ def remove_cache_items(self, options: Values, args: List[Any]) -> None: files += self._find_http_files(options) else: # Add the pattern to the log message - no_matching_msg += ' for pattern "{}"'.format(args[0]) + no_matching_msg += f' for pattern "{args[0]}"' if not files: logger.warning(no_matching_msg) diff --git a/src/pip/_internal/commands/configuration.py b/src/pip/_internal/commands/configuration.py index 84b134e490b..1a1dc6b6cd8 100644 --- a/src/pip/_internal/commands/configuration.py +++ b/src/pip/_internal/commands/configuration.py @@ -242,17 +242,15 @@ def open_in_editor(self, options: Values, args: List[str]) -> None: e.filename = editor raise except subprocess.CalledProcessError as e: - raise PipError( - "Editor Subprocess exited with exit code {}".format(e.returncode) - ) + raise PipError(f"Editor Subprocess exited with exit code {e.returncode}") def _get_n_args(self, args: List[str], example: str, n: int) -> Any: """Helper to make sure the command got the right number of arguments""" if len(args) != n: msg = ( - "Got unexpected number of arguments, expected {}. " - '(example: "{} config {}")' - ).format(n, get_prog(), example) + f"Got unexpected number of arguments, expected {n}. " + f'(example: "{get_prog()} config {example}")' + ) raise PipError(msg) if n == 1: diff --git a/src/pip/_internal/commands/debug.py b/src/pip/_internal/commands/debug.py index 5dc91bf4950..7e5271c9886 100644 --- a/src/pip/_internal/commands/debug.py +++ b/src/pip/_internal/commands/debug.py @@ -95,7 +95,7 @@ def show_actual_vendor_versions(vendor_txt_versions: Dict[str, str]) -> None: elif parse_version(actual_version) != parse_version(expected_version): extra_message = ( " (CONFLICT: vendor.txt suggests version should" - " be {})".format(expected_version) + f" be {expected_version})" ) logger.info("%s==%s%s", module_name, actual_version, extra_message) @@ -120,7 +120,7 @@ def show_tags(options: Values) -> None: if formatted_target: suffix = f" (target: {formatted_target})" - msg = "Compatible tags: {}{}".format(len(tags), suffix) + msg = f"Compatible tags: {len(tags)}{suffix}" logger.info(msg) if options.verbose < 1 and len(tags) > tag_limit: @@ -134,9 +134,7 @@ def show_tags(options: Values) -> None: logger.info(str(tag)) if tags_limited: - msg = ( - "...\n[First {tag_limit} tags shown. Pass --verbose to show all.]" - ).format(tag_limit=tag_limit) + msg = f"...\n[First {tag_limit} tags shown. Pass --verbose to show all.]" logger.info(msg) diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py index 7267effed24..f55e9e49974 100644 --- a/src/pip/_internal/commands/index.py +++ b/src/pip/_internal/commands/index.py @@ -128,12 +128,12 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No if not versions: raise DistributionNotFound( - "No matching distribution found for {}".format(query) + f"No matching distribution found for {query}" ) formatted_versions = [str(ver) for ver in sorted(versions, reverse=True)] latest = formatted_versions[0] - write_output("{} ({})".format(query, latest)) + write_output(f"{query} ({latest})") write_output("Available versions: {}".format(", ".join(formatted_versions))) print_dist_installation_info(query, latest) diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py index 365764fc7cb..e944bb95a50 100644 --- a/src/pip/_internal/commands/install.py +++ b/src/pip/_internal/commands/install.py @@ -607,12 +607,8 @@ def _warn_about_conflicts( version = package_set[project_name][0] for dependency in missing[project_name]: message = ( - "{name} {version} requires {requirement}, " + f"{project_name} {version} requires {dependency[1]}, " "which is not installed." - ).format( - name=project_name, - version=version, - requirement=dependency[1], ) parts.append(message) diff --git a/src/pip/_internal/configuration.py b/src/pip/_internal/configuration.py index 124a7ca5db7..c25273d5f0b 100644 --- a/src/pip/_internal/configuration.py +++ b/src/pip/_internal/configuration.py @@ -59,8 +59,8 @@ def _disassemble_key(name: str) -> List[str]: if "." not in name: error_message = ( "Key does not contain dot separated section and key. " - "Perhaps you wanted to use 'global.{}' instead?" - ).format(name) + f"Perhaps you wanted to use 'global.{name}' instead?" + ) raise ConfigurationError(error_message) return name.split(".", 1) diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py index d95fe44b34a..5007a622d82 100644 --- a/src/pip/_internal/exceptions.py +++ b/src/pip/_internal/exceptions.py @@ -247,10 +247,7 @@ def __init__( def __str__(self) -> str: # Use `dist` in the error message because its stringification # includes more information, like the version and location. - return "None {} metadata found for distribution: {}".format( - self.metadata_name, - self.dist, - ) + return f"None {self.metadata_name} metadata found for distribution: {self.dist}" class UserInstallationInvalid(InstallationError): @@ -594,7 +591,7 @@ def __init__(self, allowed: Dict[str, List[str]], gots: Dict[str, "_Hash"]) -> N self.gots = gots def body(self) -> str: - return " {}:\n{}".format(self._requirement_name(), self._hash_comparison()) + return f" {self._requirement_name()}:\n{self._hash_comparison()}" def _hash_comparison(self) -> str: """ @@ -616,11 +613,9 @@ def hash_then_or(hash_name: str) -> "chain[str]": lines: List[str] = [] for hash_name, expecteds in self.allowed.items(): prefix = hash_then_or(hash_name) - lines.extend( - (" Expected {} {}".format(next(prefix), e)) for e in expecteds - ) + lines.extend((f" Expected {next(prefix)} {e}") for e in expecteds) lines.append( - " Got {}\n".format(self.gots[hash_name].hexdigest()) + f" Got {self.gots[hash_name].hexdigest()}\n" ) return "\n".join(lines) diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py index 2121ca327e6..ec9ebc36718 100644 --- a/src/pip/_internal/index/package_finder.py +++ b/src/pip/_internal/index/package_finder.py @@ -533,8 +533,8 @@ def _sort_key(self, candidate: InstallationCandidate) -> CandidateSortingKey: ) except ValueError: raise UnsupportedWheel( - "{} is not a supported wheel for this platform. It " - "can't be sorted.".format(wheel.filename) + f"{wheel.filename} is not a supported wheel for this platform. It " + "can't be sorted." ) if self._prefer_binary: binary_preference = 1 @@ -939,9 +939,7 @@ def _format_versions(cand_iter: Iterable[InstallationCandidate]) -> str: _format_versions(best_candidate_result.iter_all()), ) - raise DistributionNotFound( - "No matching distribution found for {}".format(req) - ) + raise DistributionNotFound(f"No matching distribution found for {req}") def _should_install_candidate( candidate: Optional[InstallationCandidate], diff --git a/src/pip/_internal/models/candidate.py b/src/pip/_internal/models/candidate.py index a4963aec638..9184a902aef 100644 --- a/src/pip/_internal/models/candidate.py +++ b/src/pip/_internal/models/candidate.py @@ -27,8 +27,4 @@ def __repr__(self) -> str: ) def __str__(self) -> str: - return "{!r} candidate (version {} at {})".format( - self.name, - self.version, - self.link, - ) + return f"{self.name!r} candidate (version {self.version} at {self.link})" diff --git a/src/pip/_internal/models/direct_url.py b/src/pip/_internal/models/direct_url.py index e219d73849b..0af884bd8e3 100644 --- a/src/pip/_internal/models/direct_url.py +++ b/src/pip/_internal/models/direct_url.py @@ -31,9 +31,7 @@ def _get( value = d[key] if not isinstance(value, expected_type): raise DirectUrlValidationError( - "{!r} has unexpected type for {} (expected {})".format( - value, key, expected_type - ) + f"{value!r} has unexpected type for {key} (expected {expected_type})" ) return value diff --git a/src/pip/_internal/models/format_control.py b/src/pip/_internal/models/format_control.py index db3995eac9f..ccd11272c03 100644 --- a/src/pip/_internal/models/format_control.py +++ b/src/pip/_internal/models/format_control.py @@ -33,9 +33,7 @@ def __eq__(self, other: object) -> bool: return all(getattr(self, k) == getattr(other, k) for k in self.__slots__) def __repr__(self) -> str: - return "{}({}, {})".format( - self.__class__.__name__, self.no_binary, self.only_binary - ) + return f"{self.__class__.__name__}({self.no_binary}, {self.only_binary})" @staticmethod def handle_mutual_excludes(value: str, target: Set[str], other: Set[str]) -> None: diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py index 4453519ad02..73041b864c3 100644 --- a/src/pip/_internal/models/link.py +++ b/src/pip/_internal/models/link.py @@ -368,9 +368,7 @@ def __str__(self) -> str: else: rp = "" if self.comes_from: - return "{} (from {}){}".format( - redact_auth_from_url(self._url), self.comes_from, rp - ) + return f"{redact_auth_from_url(self._url)} (from {self.comes_from}){rp}" else: return redact_auth_from_url(str(self._url)) diff --git a/src/pip/_internal/network/download.py b/src/pip/_internal/network/download.py index 79b82a570e5..d1d43541e6b 100644 --- a/src/pip/_internal/network/download.py +++ b/src/pip/_internal/network/download.py @@ -42,7 +42,7 @@ def _prepare_download( logged_url = redact_auth_from_url(url) if total_length: - logged_url = "{} ({})".format(logged_url, format_size(total_length)) + logged_url = f"{logged_url} ({format_size(total_length)})" if is_from_cache(resp): logger.info("Using cached %s", logged_url) diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py index 58a7730597b..f67180c9e65 100644 --- a/src/pip/_internal/operations/install/wheel.py +++ b/src/pip/_internal/operations/install/wheel.py @@ -164,16 +164,14 @@ def message_about_scripts_not_on_PATH(scripts: Sequence[str]) -> Optional[str]: for parent_dir, dir_scripts in warn_for.items(): sorted_scripts: List[str] = sorted(dir_scripts) if len(sorted_scripts) == 1: - start_text = "script {} is".format(sorted_scripts[0]) + start_text = f"script {sorted_scripts[0]} is" else: start_text = "scripts {} are".format( ", ".join(sorted_scripts[:-1]) + " and " + sorted_scripts[-1] ) msg_lines.append( - "The {} installed in '{}' which is not on PATH.".format( - start_text, parent_dir - ) + f"The {start_text} installed in '{parent_dir}' which is not on PATH." ) last_line_fmt = ( @@ -321,9 +319,7 @@ def get_console_script_specs(console: Dict[str, str]) -> List[str]: scripts_to_generate.append("pip = " + pip_script) if os.environ.get("ENSUREPIP_OPTIONS", "") != "altinstall": - scripts_to_generate.append( - "pip{} = {}".format(sys.version_info[0], pip_script) - ) + scripts_to_generate.append(f"pip{sys.version_info[0]} = {pip_script}") scripts_to_generate.append(f"pip{get_major_minor_version()} = {pip_script}") # Delete any other versioned pip entry points @@ -336,9 +332,7 @@ def get_console_script_specs(console: Dict[str, str]) -> List[str]: scripts_to_generate.append("easy_install = " + easy_install_script) scripts_to_generate.append( - "easy_install-{} = {}".format( - get_major_minor_version(), easy_install_script - ) + f"easy_install-{get_major_minor_version()} = {easy_install_script}" ) # Delete any other versioned easy_install entry points easy_install_ep = [ @@ -408,10 +402,10 @@ def save(self) -> None: class MissingCallableSuffix(InstallationError): def __init__(self, entry_point: str) -> None: super().__init__( - "Invalid script entry point: {} - A callable " + f"Invalid script entry point: {entry_point} - A callable " "suffix is required. Cf https://packaging.python.org/" "specifications/entry-points/#use-for-scripts for more " - "information.".format(entry_point) + "information." ) @@ -712,7 +706,7 @@ def req_error_context(req_description: str) -> Generator[None, None, None]: try: yield except InstallationError as e: - message = "For req: {}. {}".format(req_description, e.args[0]) + message = f"For req: {req_description}. {e.args[0]}" raise InstallationError(message) from e diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py index 488e76358be..956717d1e52 100644 --- a/src/pip/_internal/operations/prepare.py +++ b/src/pip/_internal/operations/prepare.py @@ -603,8 +603,8 @@ def _prepare_linked_requirement( ) except NetworkConnectionError as exc: raise InstallationError( - "Could not install requirement {} because of HTTP " - "error {} for URL {}".format(req, exc, link) + f"Could not install requirement {req} because of HTTP " + f"error {exc} for URL {link}" ) else: file_path = self._downloaded[link.url] @@ -684,9 +684,9 @@ def prepare_editable_requirement( with indent_log(): if self.require_hashes: raise InstallationError( - "The editable requirement {} cannot be installed when " + f"The editable requirement {req} cannot be installed when " "requiring hashes, because there is no single file to " - "hash.".format(req) + "hash." ) req.ensure_has_source_dir(self.src_dir) req.update_editable() @@ -714,7 +714,7 @@ def prepare_installed_requirement( assert req.satisfied_by, "req should have been satisfied but isn't" assert skip_reason is not None, ( "did not get skip reason skipped but req.satisfied_by " - "is set to {}".format(req.satisfied_by) + f"is set to {req.satisfied_by}" ) logger.info( "Requirement %s: %s (%s)", skip_reason, req, req.satisfied_by.version diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index b52c9a456bb..7e2d0e5b879 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -462,7 +462,7 @@ def install_req_from_req_string( raise InstallationError( "Packages installed from PyPI cannot depend on packages " "which are not also hosted on PyPI.\n" - "{} depends on {} ".format(comes_from.name, req) + f"{comes_from.name} depends on {req} " ) return InstallRequirement( diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py index e556be2b40b..b61a219df68 100644 --- a/src/pip/_internal/req/req_install.py +++ b/src/pip/_internal/req/req_install.py @@ -191,7 +191,7 @@ def __str__(self) -> str: if self.req: s = redact_auth_from_requirement(self.req) if self.link: - s += " from {}".format(redact_auth_from_url(self.link.url)) + s += f" from {redact_auth_from_url(self.link.url)}" elif self.link: s = redact_auth_from_url(self.link.url) else: @@ -221,7 +221,7 @@ def format_debug(self) -> str: attributes = vars(self) names = sorted(attributes) - state = ("{}={!r}".format(attr, attributes[attr]) for attr in sorted(names)) + state = (f"{attr}={attributes[attr]!r}" for attr in sorted(names)) return "<{name} object: {{{state}}}>".format( name=self.__class__.__name__, state=", ".join(state), @@ -754,8 +754,8 @@ def archive(self, build_dir: Optional[str]) -> None: if os.path.exists(archive_path): response = ask_path_exists( - "The file {} exists. (i)gnore, (w)ipe, " - "(b)ackup, (a)bort ".format(display_path(archive_path)), + f"The file {display_path(archive_path)} exists. (i)gnore, (w)ipe, " + "(b)ackup, (a)bort ", ("i", "w", "b", "a"), ) if response == "i": diff --git a/src/pip/_internal/req/req_uninstall.py b/src/pip/_internal/req/req_uninstall.py index 861aa4f2286..3ca10098cf9 100644 --- a/src/pip/_internal/req/req_uninstall.py +++ b/src/pip/_internal/req/req_uninstall.py @@ -71,16 +71,16 @@ def uninstallation_paths(dist: BaseDistribution) -> Generator[str, None, None]: entries = dist.iter_declared_entries() if entries is None: - msg = "Cannot uninstall {dist}, RECORD file not found.".format(dist=dist) + msg = f"Cannot uninstall {dist}, RECORD file not found." installer = dist.installer if not installer or installer == "pip": - dep = "{}=={}".format(dist.raw_name, dist.version) + dep = f"{dist.raw_name}=={dist.version}" msg += ( " You might be able to recover from this via: " - "'pip install --force-reinstall --no-deps {}'.".format(dep) + f"'pip install --force-reinstall --no-deps {dep}'." ) else: - msg += " Hint: The package was installed by {}.".format(installer) + msg += f" Hint: The package was installed by {installer}." raise UninstallationError(msg) for entry in entries: diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py index b17b7e4530b..5ddb848a9bc 100644 --- a/src/pip/_internal/resolution/legacy/resolver.py +++ b/src/pip/_internal/resolution/legacy/resolver.py @@ -231,9 +231,7 @@ def _add_requirement_to_set( tags = compatibility_tags.get_supported() if requirement_set.check_supported_wheels and not wheel.supported(tags): raise InstallationError( - "{} is not a supported wheel on this platform.".format( - wheel.filename - ) + f"{wheel.filename} is not a supported wheel on this platform." ) # This next bit is really a sanity check. @@ -287,9 +285,9 @@ def _add_requirement_to_set( ) if does_not_satisfy_constraint: raise InstallationError( - "Could not satisfy constraints for '{}': " + f"Could not satisfy constraints for '{install_req.name}': " "installation from path or url cannot be " - "constrained to a version".format(install_req.name) + "constrained to a version" ) # If we're now installing a constraint, mark the existing # object for real installation. @@ -398,9 +396,9 @@ def _find_requirement_link(self, req: InstallRequirement) -> Optional[Link]: # "UnicodeEncodeError: 'ascii' codec can't encode character" # in Python 2 when the reason contains non-ascii characters. "The candidate selected for download or install is a " - "yanked version: {candidate}\n" - "Reason for being yanked: {reason}" - ).format(candidate=best_candidate, reason=reason) + f"yanked version: {best_candidate}\n" + f"Reason for being yanked: {reason}" + ) logger.warning(msg) return link diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py index 97541655fa0..4125cda2b7c 100644 --- a/src/pip/_internal/resolution/resolvelib/candidates.py +++ b/src/pip/_internal/resolution/resolvelib/candidates.py @@ -159,10 +159,7 @@ def __str__(self) -> str: return f"{self.name} {self.version}" def __repr__(self) -> str: - return "{class_name}({link!r})".format( - class_name=self.__class__.__name__, - link=str(self._link), - ) + return f"{self.__class__.__name__}({str(self._link)!r})" def __hash__(self) -> int: return hash((self.__class__, self._link)) @@ -354,10 +351,7 @@ def __str__(self) -> str: return str(self.dist) def __repr__(self) -> str: - return "{class_name}({distribution!r})".format( - class_name=self.__class__.__name__, - distribution=self.dist, - ) + return f"{self.__class__.__name__}({self.dist!r})" def __hash__(self) -> int: return hash((self.__class__, self.name, self.version)) @@ -455,11 +449,7 @@ def __str__(self) -> str: return "{}[{}] {}".format(name, ",".join(self.extras), rest) def __repr__(self) -> str: - return "{class_name}(base={base!r}, extras={extras!r})".format( - class_name=self.__class__.__name__, - base=self.base, - extras=self.extras, - ) + return f"{self.__class__.__name__}(base={self.base!r}, extras={self.extras!r})" def __hash__(self) -> int: return hash((self.base, self.extras)) diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 38c199448a1..97137c997c8 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -753,8 +753,8 @@ def describe_trigger(parent: Candidate) -> str: info = "the requested packages" msg = ( - "Cannot install {} because these package versions " - "have conflicting dependencies.".format(info) + f"Cannot install {info} because these package versions " + "have conflicting dependencies." ) logger.critical(msg) msg = "\nThe conflict is caused by:" diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index 7d1e7bfddd1..4af4a9f25a6 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -15,10 +15,7 @@ def __str__(self) -> str: return str(self.candidate) def __repr__(self) -> str: - return "{class_name}({candidate!r})".format( - class_name=self.__class__.__name__, - candidate=self.candidate, - ) + return f"{self.__class__.__name__}({self.candidate!r})" @property def project_name(self) -> NormalizedName: @@ -50,10 +47,7 @@ def __str__(self) -> str: return str(self._ireq.req) def __repr__(self) -> str: - return "{class_name}({requirement!r})".format( - class_name=self.__class__.__name__, - requirement=str(self._ireq.req), - ) + return f"{self.__class__.__name__}({str(self._ireq.req)!r})" @property def project_name(self) -> NormalizedName: @@ -116,10 +110,7 @@ def __str__(self) -> str: return f"Python {self.specifier}" def __repr__(self) -> str: - return "{class_name}({specifier!r})".format( - class_name=self.__class__.__name__, - specifier=str(self.specifier), - ) + return f"{self.__class__.__name__}({str(self.specifier)!r})" @property def project_name(self) -> NormalizedName: @@ -155,10 +146,7 @@ def __str__(self) -> str: return f"{self._name} (unavailable)" def __repr__(self) -> str: - return "{class_name}({name!r})".format( - class_name=self.__class__.__name__, - name=str(self._name), - ) + return f"{self.__class__.__name__}({str(self._name)!r})" @property def project_name(self) -> NormalizedName: diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py index 78060e86417..42a8536cdd3 100644 --- a/src/pip/_internal/utils/misc.py +++ b/src/pip/_internal/utils/misc.py @@ -77,11 +77,7 @@ def get_pip_version() -> str: pip_pkg_dir = os.path.join(os.path.dirname(__file__), "..", "..") pip_pkg_dir = os.path.abspath(pip_pkg_dir) - return "pip {} from {} (python {})".format( - __version__, - pip_pkg_dir, - get_major_minor_version(), - ) + return f"pip {__version__} from {pip_pkg_dir} (python {get_major_minor_version()})" def normalize_version_info(py_version_info: Tuple[int, ...]) -> Tuple[int, int, int]: @@ -279,13 +275,13 @@ def strtobool(val: str) -> int: def format_size(bytes: float) -> str: if bytes > 1000 * 1000: - return "{:.1f} MB".format(bytes / 1000.0 / 1000) + return f"{bytes / 1000.0 / 1000:.1f} MB" elif bytes > 10 * 1000: - return "{} kB".format(int(bytes / 1000)) + return f"{int(bytes / 1000)} kB" elif bytes > 1000: - return "{:.1f} kB".format(bytes / 1000.0) + return f"{bytes / 1000.0:.1f} kB" else: - return "{} bytes".format(int(bytes)) + return f"{int(bytes)} bytes" def tabulate(rows: Iterable[Iterable[Any]]) -> Tuple[List[str], List[int]]: @@ -522,9 +518,7 @@ def redact_netloc(netloc: str) -> str: else: user = urllib.parse.quote(user) password = ":****" - return "{user}{password}@{netloc}".format( - user=user, password=password, netloc=netloc - ) + return f"{user}{password}@{netloc}" def _transform_url( @@ -592,7 +586,7 @@ def __init__(self, secret: str, redacted: str) -> None: self.redacted = redacted def __repr__(self) -> str: - return "".format(str(self)) + return f"" def __str__(self) -> str: return self.redacted diff --git a/src/pip/_internal/utils/wheel.py b/src/pip/_internal/utils/wheel.py index e5e3f34ed81..3551f8f19bc 100644 --- a/src/pip/_internal/utils/wheel.py +++ b/src/pip/_internal/utils/wheel.py @@ -28,7 +28,7 @@ def parse_wheel(wheel_zip: ZipFile, name: str) -> Tuple[str, Message]: metadata = wheel_metadata(wheel_zip, info_dir) version = wheel_version(metadata) except UnsupportedWheel as e: - raise UnsupportedWheel("{} has an invalid wheel, {}".format(name, str(e))) + raise UnsupportedWheel(f"{name} has an invalid wheel, {str(e)}") check_compatibility(version, name) @@ -60,9 +60,7 @@ def wheel_dist_info_dir(source: ZipFile, name: str) -> str: canonical_name = canonicalize_name(name) if not info_dir_name.startswith(canonical_name): raise UnsupportedWheel( - ".dist-info directory {!r} does not start with {!r}".format( - info_dir, canonical_name - ) + f".dist-info directory {info_dir!r} does not start with {canonical_name!r}" ) return info_dir diff --git a/src/pip/_internal/vcs/versioncontrol.py b/src/pip/_internal/vcs/versioncontrol.py index 02bbf68e7ad..46ca2799b76 100644 --- a/src/pip/_internal/vcs/versioncontrol.py +++ b/src/pip/_internal/vcs/versioncontrol.py @@ -405,9 +405,9 @@ def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]: scheme, netloc, path, query, frag = urllib.parse.urlsplit(url) if "+" not in scheme: raise ValueError( - "Sorry, {!r} is a malformed VCS url. " + f"Sorry, {url!r} is a malformed VCS url. " "The format is +://, " - "e.g. svn+http://myrepo/svn/MyApp#egg=MyApp".format(url) + "e.g. svn+http://myrepo/svn/MyApp#egg=MyApp" ) # Remove the vcs prefix. scheme = scheme.split("+", 1)[1] @@ -417,9 +417,9 @@ def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]: path, rev = path.rsplit("@", 1) if not rev: raise InstallationError( - "The URL {!r} has an empty revision (after @) " + f"The URL {url!r} has an empty revision (after @) " "which is not supported. Include a revision after @ " - "or remove @ from the URL.".format(url) + "or remove @ from the URL." ) url = urllib.parse.urlunsplit((scheme, netloc, path, query, "")) return url, rev, user_pass @@ -566,7 +566,7 @@ def obtain(self, dest: str, url: HiddenText, verbosity: int) -> None: self.name, url, ) - response = ask_path_exists("What to do? {}".format(prompt[0]), prompt[1]) + response = ask_path_exists(f"What to do? {prompt[0]}", prompt[1]) if response == "a": sys.exit(-1) diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py index 60d75dd18ef..b1debe3496c 100644 --- a/src/pip/_internal/wheel_builder.py +++ b/src/pip/_internal/wheel_builder.py @@ -140,15 +140,15 @@ def _verify_one(req: InstallRequirement, wheel_path: str) -> None: w = Wheel(os.path.basename(wheel_path)) if canonicalize_name(w.name) != canonical_name: raise InvalidWheelFilename( - "Wheel has unexpected file name: expected {!r}, " - "got {!r}".format(canonical_name, w.name), + f"Wheel has unexpected file name: expected {canonical_name!r}, " + f"got {w.name!r}", ) dist = get_wheel_distribution(FilesystemWheel(wheel_path), canonical_name) dist_verstr = str(dist.version) if canonicalize_version(dist_verstr) != canonicalize_version(w.version): raise InvalidWheelFilename( - "Wheel has unexpected file name: expected {!r}, " - "got {!r}".format(dist_verstr, w.version), + f"Wheel has unexpected file name: expected {dist_verstr!r}, " + f"got {w.version!r}", ) metadata_version_value = dist.metadata_version if metadata_version_value is None: @@ -160,8 +160,7 @@ def _verify_one(req: InstallRequirement, wheel_path: str) -> None: raise UnsupportedWheel(msg) if metadata_version >= Version("1.2") and not isinstance(dist.version, Version): raise UnsupportedWheel( - "Metadata 1.2 mandates PEP 440 version, " - "but {!r} is not".format(dist_verstr) + f"Metadata 1.2 mandates PEP 440 version, but {dist_verstr!r} is not" ) diff --git a/tests/conftest.py b/tests/conftest.py index 6ae2e6d62d8..8e498abd08e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -141,7 +141,7 @@ def pytest_collection_modifyitems(config: Config, items: List[pytest.Function]) if "script" in item.fixturenames: raise RuntimeError( "Cannot use the ``script`` funcarg in a unit test: " - "(filename = {}, item = {})".format(module_path, item) + f"(filename = {module_path}, item = {item})" ) else: raise RuntimeError(f"Unknown test type (filename = {module_path})") diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py index a1b69b72106..3c3f45d51d1 100644 --- a/tests/functional/test_cli.py +++ b/tests/functional/test_cli.py @@ -23,7 +23,7 @@ def test_entrypoints_work(entrypoint: str, script: PipTestEnvironment) -> None: fake_pkg.mkdir() fake_pkg.joinpath("setup.py").write_text( dedent( - """ + f""" from setuptools import setup setup( @@ -31,13 +31,11 @@ def test_entrypoints_work(entrypoint: str, script: PipTestEnvironment) -> None: version="0.1.0", entry_points={{ "console_scripts": [ - {!r} + {entrypoint!r} ] }} ) - """.format( - entrypoint - ) + """ ) ) diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py index 2aa861aacb7..4be033583ca 100644 --- a/tests/functional/test_completion.py +++ b/tests/functional/test_completion.py @@ -400,7 +400,7 @@ def test_completion_path_after_option( def test_completion_uses_same_executable_name( autocomplete_script: PipTestEnvironment, flag: str, deprecated_python: bool ) -> None: - executable_name = "pip{}".format(sys.version_info[0]) + executable_name = f"pip{sys.version_info[0]}" # Deprecated python versions produce an extra deprecation warning result = autocomplete_script.run( executable_name, diff --git a/tests/functional/test_debug.py b/tests/functional/test_debug.py index 77cd732f9f1..77d4bea335f 100644 --- a/tests/functional/test_debug.py +++ b/tests/functional/test_debug.py @@ -68,7 +68,7 @@ def test_debug__tags(script: PipTestEnvironment, args: List[str]) -> None: stdout = result.stdout tags = compatibility_tags.get_supported() - expected_tag_header = "Compatible tags: {}".format(len(tags)) + expected_tag_header = f"Compatible tags: {len(tags)}" assert expected_tag_header in stdout show_verbose_note = "--verbose" not in args diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py index 9a5937df3de..b2fd1d62982 100644 --- a/tests/functional/test_freeze.py +++ b/tests/functional/test_freeze.py @@ -166,13 +166,11 @@ def fake_install(pkgname: str, dest: str) -> None: with open(egg_info_path, "w") as egg_info_file: egg_info_file.write( textwrap.dedent( - """\ + f"""\ Metadata-Version: 1.0 - Name: {} + Name: {pkgname} Version: 1.0 - """.format( - pkgname - ) + """ ) ) @@ -221,12 +219,10 @@ def test_freeze_editable_not_vcs(script: PipTestEnvironment) -> None: # We need to apply os.path.normcase() to the path since that is what # the freeze code does. expected = textwrap.dedent( - """\ + f"""\ ...# Editable install with no version control (version-pkg==0.1) - -e {} - ...""".format( - os.path.normcase(pkg_path) - ) + -e {os.path.normcase(pkg_path)} + ...""" ) _check_output(result.stdout, expected) @@ -248,12 +244,10 @@ def test_freeze_editable_git_with_no_remote( # We need to apply os.path.normcase() to the path since that is what # the freeze code does. expected = textwrap.dedent( - """\ + f"""\ ...# Editable Git install with no remote (version-pkg==0.1) - -e {} - ...""".format( - os.path.normcase(pkg_path) - ) + -e {os.path.normcase(pkg_path)} + ...""" ) _check_output(result.stdout, expected) @@ -653,9 +647,9 @@ def test_freeze_with_requirement_option_file_url_egg_not_installed( expect_stderr=True, ) expected_err = ( - "WARNING: Requirement file [requirements.txt] contains {}, " + f"WARNING: Requirement file [requirements.txt] contains {url}, " "but package 'Does.Not-Exist' is not installed\n" - ).format(url) + ) if deprecated_python: assert expected_err in result.stderr else: diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 140061a17a3..b18fabc84c9 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -106,10 +106,10 @@ def test_pep518_refuses_conflicting_requires( assert ( result.returncode != 0 and ( - "Some build dependencies for {url} conflict " + f"Some build dependencies for {project_dir.as_uri()} conflict " "with PEP 517/518 supported " "requirements: setuptools==1.0 is incompatible with " - "setuptools>=40.8.0.".format(url=project_dir.as_uri()) + "setuptools>=40.8.0." ) in result.stderr ), str(result) @@ -595,8 +595,8 @@ def test_hashed_install_success( with requirements_file( "simple2==1.0 --hash=sha256:9336af72ca661e6336eb87bc7de3e8844d853e" "3848c2b9bbd2e8bf01db88c2c7\n" - "{simple} --hash=sha256:393043e672415891885c9a2a0929b1af95fb866d6c" - "a016b42d2e6ce53619b653".format(simple=file_url), + f"{file_url} --hash=sha256:393043e672415891885c9a2a0929b1af95fb866d6c" + "a016b42d2e6ce53619b653", tmpdir, ) as reqs_file: script.pip_install_local("-r", reqs_file.resolve()) @@ -1735,7 +1735,7 @@ def test_install_builds_wheels(script: PipTestEnvironment, data: TestData) -> No # into the cache assert wheels != [], str(res) assert wheels == [ - "Upper-2.0-py{}-none-any.whl".format(sys.version_info[0]), + f"Upper-2.0-py{sys.version_info[0]}-none-any.whl", ] @@ -2387,7 +2387,7 @@ def test_install_verify_package_name_normalization( assert "Successfully installed simple-package" in result.stdout result = script.pip("install", package_name) - assert "Requirement already satisfied: {}".format(package_name) in result.stdout + assert f"Requirement already satisfied: {package_name}" in result.stdout def test_install_logs_pip_version_in_debug( diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py index ecaf2f705a2..7f418067f97 100644 --- a/tests/functional/test_install_config.py +++ b/tests/functional/test_install_config.py @@ -184,12 +184,10 @@ def test_config_file_override_stack( config_file.write_text( textwrap.dedent( - """\ + f"""\ [global] - index-url = {}/simple1 - """.format( - base_address - ) + index-url = {base_address}/simple1 + """ ) ) script.pip("install", "-vvv", "INITools", expect_error=True) @@ -197,14 +195,12 @@ def test_config_file_override_stack( config_file.write_text( textwrap.dedent( - """\ + f"""\ [global] - index-url = {address}/simple1 + index-url = {base_address}/simple1 [install] - index-url = {address}/simple2 - """.format( - address=base_address - ) + index-url = {base_address}/simple2 + """ ) ) script.pip("install", "-vvv", "INITools", expect_error=True) diff --git a/tests/functional/test_install_index.py b/tests/functional/test_install_index.py index b73e28f4794..72b0b9db7bd 100644 --- a/tests/functional/test_install_index.py +++ b/tests/functional/test_install_index.py @@ -41,13 +41,11 @@ def test_find_links_requirements_file_relative_path( """Test find-links as a relative path to a reqs file.""" script.scratch_path.joinpath("test-req.txt").write_text( textwrap.dedent( - """ + f""" --no-index - --find-links={} + --find-links={data.packages.as_posix()} parent==0.1 - """.format( - data.packages.as_posix() - ) + """ ) ) result = script.pip( diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py index c21b9ba83de..c1325817838 100644 --- a/tests/functional/test_install_reqs.py +++ b/tests/functional/test_install_reqs.py @@ -95,7 +95,7 @@ def test_requirements_file(script: PipTestEnvironment) -> None: result.did_create(script.site_packages / "INITools-0.2.dist-info") result.did_create(script.site_packages / "initools") assert result.files_created[script.site_packages / other_lib_name].dir - fn = "{}-{}.dist-info".format(other_lib_name, other_lib_version) + fn = f"{other_lib_name}-{other_lib_version}.dist-info" assert result.files_created[script.site_packages / fn].dir @@ -260,13 +260,13 @@ def test_respect_order_in_requirements_file( assert ( "parent" in downloaded[0] - ), 'First download should be "parent" but was "{}"'.format(downloaded[0]) + ), f'First download should be "parent" but was "{downloaded[0]}"' assert ( "child" in downloaded[1] - ), 'Second download should be "child" but was "{}"'.format(downloaded[1]) + ), f'Second download should be "child" but was "{downloaded[1]}"' assert ( "simple" in downloaded[2] - ), 'Third download should be "simple" but was "{}"'.format(downloaded[2]) + ), f'Third download should be "simple" but was "{downloaded[2]}"' def test_install_local_editable_with_extras( diff --git a/tests/functional/test_install_wheel.py b/tests/functional/test_install_wheel.py index 4221ae76ae2..7e7aeaf7a81 100644 --- a/tests/functional/test_install_wheel.py +++ b/tests/functional/test_install_wheel.py @@ -169,9 +169,9 @@ def get_header_scheme_path_for_script( ) -> Path: command = ( "from pip._internal.locations import get_scheme;" - "scheme = get_scheme({!r});" + f"scheme = get_scheme({dist_name!r});" "print(scheme.headers);" - ).format(dist_name) + ) result = script.run("python", "-c", command).stdout return Path(result.strip()) diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index b5945edf89b..df82713d0e8 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -1185,7 +1185,7 @@ def test_new_resolver_presents_messages_when_backtracking_a_lot( for index in range(1, N + 1): A_version = f"{index}.0.0" B_version = f"{index}.0.0" - C_version = "{index_minus_one}.0.0".format(index_minus_one=index - 1) + C_version = f"{index - 1}.0.0" depends = ["B == " + B_version] if index != 1: diff --git a/tests/functional/test_new_resolver_errors.py b/tests/functional/test_new_resolver_errors.py index 62304131283..5976de52e39 100644 --- a/tests/functional/test_new_resolver_errors.py +++ b/tests/functional/test_new_resolver_errors.py @@ -71,8 +71,8 @@ def test_new_resolver_conflict_constraints_file( def test_new_resolver_requires_python_error(script: PipTestEnvironment) -> None: - compatible_python = ">={0.major}.{0.minor}".format(sys.version_info) - incompatible_python = "<{0.major}.{0.minor}".format(sys.version_info) + compatible_python = f">={sys.version_info.major}.{sys.version_info.minor}" + incompatible_python = f"<{sys.version_info.major}.{sys.version_info.minor}" pkga = create_test_package_with_setup( script, @@ -99,7 +99,7 @@ def test_new_resolver_requires_python_error(script: PipTestEnvironment) -> None: def test_new_resolver_checks_requires_python_before_dependencies( script: PipTestEnvironment, ) -> None: - incompatible_python = "<{0.major}.{0.minor}".format(sys.version_info) + incompatible_python = f"<{sys.version_info.major}.{sys.version_info.minor}" pkg_dep = create_basic_wheel_for_package( script, diff --git a/tests/functional/test_new_resolver_hashes.py b/tests/functional/test_new_resolver_hashes.py index 6db2efd0e4c..d26def14ae9 100644 --- a/tests/functional/test_new_resolver_hashes.py +++ b/tests/functional/test_new_resolver_hashes.py @@ -24,18 +24,11 @@ def _create_find_links(script: PipTestEnvironment) -> _FindLinks: index_html = script.scratch_path / "index.html" index_html.write_text( - """ + f""" - {sdist_path.stem} - {wheel_path.stem} - """.format( - sdist_url=sdist_path.as_uri(), - sdist_hash=sdist_hash, - sdist_path=sdist_path, - wheel_url=wheel_path.as_uri(), - wheel_hash=wheel_hash, - wheel_path=wheel_path, - ).strip() + {sdist_path.stem} + {wheel_path.stem} + """.strip() ) return _FindLinks(index_html, sdist_hash, wheel_hash) @@ -99,9 +92,7 @@ def test_new_resolver_hash_intersect_from_constraint( constraints_txt = script.scratch_path / "constraints.txt" constraints_txt.write_text( - "base==0.1.0 --hash=sha256:{sdist_hash}".format( - sdist_hash=find_links.sdist_hash, - ), + f"base==0.1.0 --hash=sha256:{find_links.sdist_hash}", ) requirements_txt = script.scratch_path / "requirements.txt" requirements_txt.write_text( @@ -200,13 +191,10 @@ def test_new_resolver_hash_intersect_empty_from_constraint( constraints_txt = script.scratch_path / "constraints.txt" constraints_txt.write_text( - """ - base==0.1.0 --hash=sha256:{sdist_hash} - base==0.1.0 --hash=sha256:{wheel_hash} - """.format( - sdist_hash=find_links.sdist_hash, - wheel_hash=find_links.wheel_hash, - ), + f""" + base==0.1.0 --hash=sha256:{find_links.sdist_hash} + base==0.1.0 --hash=sha256:{find_links.wheel_hash} + """, ) result = script.pip( @@ -240,19 +228,15 @@ def test_new_resolver_hash_requirement_and_url_constraint_can_succeed( requirements_txt = script.scratch_path / "requirements.txt" requirements_txt.write_text( - """ + f""" base==0.1.0 --hash=sha256:{wheel_hash} - """.format( - wheel_hash=wheel_hash, - ), + """, ) constraints_txt = script.scratch_path / "constraints.txt" - constraint_text = "base @ {wheel_url}\n".format(wheel_url=wheel_path.as_uri()) + constraint_text = f"base @ {wheel_path.as_uri()}\n" if constrain_by_hash: - constraint_text += "base==0.1.0 --hash=sha256:{wheel_hash}\n".format( - wheel_hash=wheel_hash, - ) + constraint_text += f"base==0.1.0 --hash=sha256:{wheel_hash}\n" constraints_txt.write_text(constraint_text) script.pip( @@ -280,19 +264,15 @@ def test_new_resolver_hash_requirement_and_url_constraint_can_fail( requirements_txt = script.scratch_path / "requirements.txt" requirements_txt.write_text( - """ + f""" base==0.1.0 --hash=sha256:{other_hash} - """.format( - other_hash=other_hash, - ), + """, ) constraints_txt = script.scratch_path / "constraints.txt" - constraint_text = "base @ {wheel_url}\n".format(wheel_url=wheel_path.as_uri()) + constraint_text = f"base @ {wheel_path.as_uri()}\n" if constrain_by_hash: - constraint_text += "base==0.1.0 --hash=sha256:{other_hash}\n".format( - other_hash=other_hash, - ) + constraint_text += f"base==0.1.0 --hash=sha256:{other_hash}\n" constraints_txt.write_text(constraint_text) result = script.pip( @@ -343,17 +323,12 @@ def test_new_resolver_hash_with_extras(script: PipTestEnvironment) -> None: requirements_txt = script.scratch_path / "requirements.txt" requirements_txt.write_text( - """ + f""" child[extra]==0.1.0 --hash=sha256:{child_hash} parent_with_extra==0.1.0 --hash=sha256:{parent_with_extra_hash} parent_without_extra==0.1.0 --hash=sha256:{parent_without_extra_hash} extra==0.1.0 --hash=sha256:{extra_hash} - """.format( - child_hash=child_hash, - parent_with_extra_hash=parent_with_extra_hash, - parent_without_extra_hash=parent_without_extra_hash, - extra_hash=extra_hash, - ), + """, ) script.pip( diff --git a/tests/functional/test_new_resolver_target.py b/tests/functional/test_new_resolver_target.py index 811ae935aec..a81cfe5e83d 100644 --- a/tests/functional/test_new_resolver_target.py +++ b/tests/functional/test_new_resolver_target.py @@ -58,12 +58,7 @@ def test_new_resolver_target_checks_compatibility_failure( if platform: args += ["--platform", platform] - args_tag = "{}{}-{}-{}".format( - implementation, - python_version, - abi, - platform, - ) + args_tag = f"{implementation}{python_version}-{abi}-{platform}" wheel_tag_matches = args_tag == fake_wheel_tag result = script.pip(*args, expect_error=(not wheel_tag_matches)) diff --git a/tests/functional/test_pep517.py b/tests/functional/test_pep517.py index a642a3f8bfb..78a6c2bbc6c 100644 --- a/tests/functional/test_pep517.py +++ b/tests/functional/test_pep517.py @@ -159,9 +159,9 @@ def test_conflicting_pep517_backend_requirements( expect_error=True, ) msg = ( - "Some build dependencies for {url} conflict with the backend " + f"Some build dependencies for {project_dir.as_uri()} conflict with the backend " "dependencies: simplewheel==1.0 is incompatible with " - "simplewheel==2.0.".format(url=project_dir.as_uri()) + "simplewheel==2.0." ) assert result.returncode != 0 and msg in result.stderr, str(result) @@ -205,8 +205,8 @@ def test_validate_missing_pep517_backend_requirements( expect_error=True, ) msg = ( - "Some build dependencies for {url} are missing: " - "'simplewheel==1.0', 'test_backend'.".format(url=project_dir.as_uri()) + f"Some build dependencies for {project_dir.as_uri()} are missing: " + "'simplewheel==1.0', 'test_backend'." ) assert result.returncode != 0 and msg in result.stderr, str(result) @@ -231,9 +231,9 @@ def test_validate_conflicting_pep517_backend_requirements( expect_error=True, ) msg = ( - "Some build dependencies for {url} conflict with the backend " + f"Some build dependencies for {project_dir.as_uri()} conflict with the backend " "dependencies: simplewheel==2.0 is incompatible with " - "simplewheel==1.0.".format(url=project_dir.as_uri()) + "simplewheel==1.0." ) assert result.returncode != 0 and msg in result.stderr, str(result) diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py index be7fe4c3341..69e340a5675 100644 --- a/tests/functional/test_uninstall.py +++ b/tests/functional/test_uninstall.py @@ -604,9 +604,7 @@ def test_uninstall_without_record_fails( "simple.dist==0.1'." ) elif installer: - expected_error_message += " Hint: The package was installed by {}.".format( - installer - ) + expected_error_message += f" Hint: The package was installed by {installer}." assert result2.stderr.rstrip() == expected_error_message assert_all_changes(result.files_after, result2, ignore_changes) diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py index 042f5824613..b1183fc830b 100644 --- a/tests/functional/test_wheel.py +++ b/tests/functional/test_wheel.py @@ -59,9 +59,7 @@ def test_pip_wheel_success(script: PipTestEnvironment, data: TestData) -> None: wheel_file_path = script.scratch / wheel_file_name assert re.search( r"Created wheel for simple: " - r"filename={filename} size=\d+ sha256=[A-Fa-f0-9]{{64}}".format( - filename=re.escape(wheel_file_name) - ), + rf"filename={re.escape(wheel_file_name)} size=\d+ sha256=[A-Fa-f0-9]{{64}}", result.stdout, ) assert re.search(r"^\s+Stored in directory: ", result.stdout, re.M) diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py index d27c02e25f0..f14837e24ea 100644 --- a/tests/lib/__init__.py +++ b/tests/lib/__init__.py @@ -747,7 +747,7 @@ def assert_installed(self, **kwargs: str) -> None: for val in json.loads(ret.stdout) } expected = {(canonicalize_name(k), v) for k, v in kwargs.items()} - assert expected <= installed, "{!r} not all in {!r}".format(expected, installed) + assert expected <= installed, f"{expected!r} not all in {installed!r}" def assert_not_installed(self, *args: str) -> None: ret = self.pip("list", "--format=json") @@ -755,9 +755,7 @@ def assert_not_installed(self, *args: str) -> None: # None of the given names should be listed as installed, i.e. their # intersection should be empty. expected = {canonicalize_name(k) for k in args} - assert not (expected & installed), "{!r} contained in {!r}".format( - expected, installed - ) + assert not (expected & installed), f"{expected!r} contained in {installed!r}" # FIXME ScriptTest does something similar, but only within a single @@ -1028,7 +1026,7 @@ def _create_test_package_with_srcdir( pkg_path.joinpath("__init__.py").write_text("") subdir_path.joinpath("setup.py").write_text( textwrap.dedent( - """ + f""" from setuptools import setup, find_packages setup( name="{name}", @@ -1036,9 +1034,7 @@ def _create_test_package_with_srcdir( packages=find_packages(), package_dir={{"": "src"}}, ) - """.format( - name=name - ) + """ ) ) return _vcs_add(dir_path, version_pkg_path, vcs) @@ -1052,7 +1048,7 @@ def _create_test_package( _create_main_file(version_pkg_path, name=name, output="0.1") version_pkg_path.joinpath("setup.py").write_text( textwrap.dedent( - """ + f""" from setuptools import setup, find_packages setup( name="{name}", @@ -1061,9 +1057,7 @@ def _create_test_package( py_modules=["{name}"], entry_points=dict(console_scripts=["{name}={name}:main"]), ) - """.format( - name=name - ) + """ ) ) return _vcs_add(dir_path, version_pkg_path, vcs) @@ -1137,7 +1131,7 @@ def urlsafe_b64encode_nopad(data: bytes) -> str: def create_really_basic_wheel(name: str, version: str) -> bytes: def digest(contents: bytes) -> str: - return "sha256={}".format(urlsafe_b64encode_nopad(sha256(contents).digest())) + return f"sha256={urlsafe_b64encode_nopad(sha256(contents).digest())}" def add_file(path: str, text: str) -> None: contents = text.encode("utf-8") @@ -1153,13 +1147,11 @@ def add_file(path: str, text: str) -> None: add_file( f"{dist_info}/METADATA", dedent( - """\ + f"""\ Metadata-Version: 2.1 - Name: {} - Version: {} - """.format( - name, version - ) + Name: {name} + Version: {version} + """ ), ) z.writestr(record_path, "\n".join(",".join(r) for r in records)) diff --git a/tests/lib/local_repos.py b/tests/lib/local_repos.py index a04d1d0fe58..a8cf4aa6c74 100644 --- a/tests/lib/local_repos.py +++ b/tests/lib/local_repos.py @@ -56,7 +56,7 @@ def local_checkout( assert vcs_backend is not None vcs_backend.obtain(repo_url_path, url=hide_url(remote_repo), verbosity=0) - return "{}+{}".format(vcs_name, Path(repo_url_path).as_uri()) + return f"{vcs_name}+{Path(repo_url_path).as_uri()}" def local_repo(remote_repo: str, temp_path: Path) -> str: diff --git a/tests/lib/server.py b/tests/lib/server.py index 1048a173d40..96ac5930dc9 100644 --- a/tests/lib/server.py +++ b/tests/lib/server.py @@ -152,7 +152,7 @@ def html5_page(text: str) -> str: def package_page(spec: Dict[str, str]) -> "WSGIApplication": def link(name: str, value: str) -> str: - return '{}'.format(value, name) + return f'{name}' links = "".join(link(*kv) for kv in spec.items()) return text_html_response(html5_page(links)) diff --git a/tests/lib/test_lib.py b/tests/lib/test_lib.py index a541a0a204d..c01c1beb883 100644 --- a/tests/lib/test_lib.py +++ b/tests/lib/test_lib.py @@ -107,8 +107,8 @@ def run_with_log_command( """ command = ( "import logging; logging.basicConfig(level='INFO'); " - "logging.getLogger().info('sub: {}', 'foo')" - ).format(sub_string) + f"logging.getLogger().info('sub: {sub_string}', 'foo')" + ) args = [sys.executable, "-c", command] script.run(*args, **kwargs) diff --git a/tests/lib/wheel.py b/tests/lib/wheel.py index f2ddfd3b7e1..a4efe53b404 100644 --- a/tests/lib/wheel.py +++ b/tests/lib/wheel.py @@ -190,7 +190,7 @@ def urlsafe_b64encode_nopad(data: bytes) -> str: def digest(contents: bytes) -> str: - return "sha256={}".format(urlsafe_b64encode_nopad(sha256(contents).digest())) + return f"sha256={urlsafe_b64encode_nopad(sha256(contents).digest())}" def record_file_maker_wrapper( diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py index 3c8b81de44d..dae083efee1 100644 --- a/tests/unit/test_collector.py +++ b/tests/unit/test_collector.py @@ -119,8 +119,8 @@ def test_get_index_content_invalid_content_type_archive( assert ( "pip._internal.index.collector", logging.WARNING, - "Skipping page {} because it looks like an archive, and cannot " - "be checked by a HTTP HEAD request.".format(url), + f"Skipping page {url} because it looks like an archive, and cannot " + "be checked by a HTTP HEAD request.", ) in caplog.record_tuples @@ -417,8 +417,8 @@ def _test_parse_links_data_attribute( html = ( "" '' - "{}" - ).format(anchor_html) + f"{anchor_html}" + ) html_bytes = html.encode("utf-8") page = IndexContent( html_bytes, @@ -764,8 +764,8 @@ def test_get_index_content_invalid_scheme( ( "pip._internal.index.collector", logging.WARNING, - "Cannot look at {} URL {} because it does not support " - "lookup as web pages.".format(vcs_scheme, url), + f"Cannot look at {vcs_scheme} URL {url} because it does not support " + "lookup as web pages.", ), ] diff --git a/tests/unit/test_link.py b/tests/unit/test_link.py index 311be588858..a379d877b2c 100644 --- a/tests/unit/test_link.py +++ b/tests/unit/test_link.py @@ -143,10 +143,7 @@ def test_is_yanked(self, yanked_reason: Optional[str], expected: bool) -> None: def test_is_hash_allowed( self, hash_name: str, hex_digest: str, expected: bool ) -> None: - url = "https://example.com/wheel.whl#{hash_name}={hex_digest}".format( - hash_name=hash_name, - hex_digest=hex_digest, - ) + url = f"https://example.com/wheel.whl#{hash_name}={hex_digest}" link = Link(url) hashes_data = { "sha512": [128 * "a", 128 * "b"], diff --git a/tests/unit/test_network_utils.py b/tests/unit/test_network_utils.py index cdc10b2ba6e..380d5741ff6 100644 --- a/tests/unit/test_network_utils.py +++ b/tests/unit/test_network_utils.py @@ -21,8 +21,8 @@ def test_raise_for_status_raises_exception(status_code: int, error_type: str) -> with pytest.raises(NetworkConnectionError) as excinfo: raise_for_status(resp) assert str(excinfo.value) == ( - "{} {}: Network Error for url:" - " http://www.example.com/whatever.tgz".format(status_code, error_type) + f"{status_code} {error_type}: Network Error for url:" + " http://www.example.com/whatever.tgz" ) diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py index 863f070af3c..5e3c640a55e 100644 --- a/tests/unit/test_req.py +++ b/tests/unit/test_req.py @@ -235,8 +235,8 @@ def test_unsupported_hashes(self, data: TestData) -> None: r"file \(line 1\)\)\n" r"Can't verify hashes for these file:// requirements because " r"they point to directories:\n" - r" file://.*{sep}data{sep}packages{sep}FSPkg " - r"\(from -r file \(line 2\)\)".format(sep=sep) + rf" file://.*{sep}data{sep}packages{sep}FSPkg " + r"\(from -r file \(line 2\)\)" ), ): resolver.resolve(reqset.all_requirements, True) diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py index 7a196eb8dd6..94ccfb98d86 100644 --- a/tests/unit/test_req_file.py +++ b/tests/unit/test_req_file.py @@ -297,7 +297,7 @@ def test_yield_pep440_line_requirement(self, line_processor: LineProcessor) -> N def test_yield_line_constraint(self, line_processor: LineProcessor) -> None: line = "SomeProject" filename = "filename" - comes_from = "-c {} (line {})".format(filename, 1) + comes_from = f"-c {filename} (line {1})" req = install_req_from_line(line, comes_from=comes_from, constraint=True) found_req = line_processor(line, filename, 1, constraint=True)[0] assert repr(found_req) == repr(req) @@ -326,7 +326,7 @@ def test_yield_editable_constraint(self, line_processor: LineProcessor) -> None: url = "git+https://url#egg=SomeProject" line = f"-e {url}" filename = "filename" - comes_from = "-c {} (line {})".format(filename, 1) + comes_from = f"-c {filename} (line {1})" req = install_req_from_editable(url, comes_from=comes_from, constraint=True) found_req = line_processor(line, filename, 1, constraint=True)[0] assert repr(found_req) == repr(req) @@ -873,12 +873,10 @@ def test_install_requirements_with_options( ) -> None: global_option = "--dry-run" - content = """ + content = f""" --only-binary :all: INITools==2.0 --global-option="{global_option}" - """.format( - global_option=global_option - ) + """ with requirements_file(content, tmpdir) as reqs_file: req = next( diff --git a/tests/unit/test_resolution_legacy_resolver.py b/tests/unit/test_resolution_legacy_resolver.py index 8b9d1a58a33..133e5922298 100644 --- a/tests/unit/test_resolution_legacy_resolver.py +++ b/tests/unit/test_resolution_legacy_resolver.py @@ -261,8 +261,8 @@ def metadata(self) -> email.message.Message: ignore_requires_python=False, ) assert str(exc.value) == ( - "None {} metadata found for distribution: " - "".format(metadata_name) + f"None {metadata_name} metadata found for distribution: " + "" ) diff --git a/tests/unit/test_wheel.py b/tests/unit/test_wheel.py index 6d6d1a3dc87..33329fbce05 100644 --- a/tests/unit/test_wheel.py +++ b/tests/unit/test_wheel.py @@ -102,15 +102,13 @@ def test_get_legacy_build_wheel_path__multiple_names( ], ) def test_get_entrypoints(tmp_path: pathlib.Path, console_scripts: str) -> None: - entry_points_text = """ + entry_points_text = f""" [console_scripts] - {} + {console_scripts} [section] common:one = module:func common:two = module:other_func - """.format( - console_scripts - ) + """ distribution = make_wheel( "simple", diff --git a/tools/release/check_version.py b/tools/release/check_version.py index e89d1b5bad9..de3658faacd 100644 --- a/tools/release/check_version.py +++ b/tools/release/check_version.py @@ -27,7 +27,7 @@ def is_this_a_good_version_number(string: str) -> Optional[str]: expected_major = datetime.now().year % 100 if len(release) not in [2, 3]: - return "Not of the form: {0}.N or {0}.N.P".format(expected_major) + return f"Not of the form: {expected_major}.N or {expected_major}.N.P" return None From 2a0acb595c4b6394f1f3a4e7ef034ac2e3e8c17e Mon Sep 17 00:00:00 2001 From: Damian Shaw Date: Tue, 7 Nov 2023 04:39:01 -0500 Subject: [PATCH 151/992] Update and provide fixes for mypy pre-commit (#12389) * Update mypy to 1.6.1 * Fix mypy "Source file found twice under different module names" error * Ignore type of intialized abstract class in tests * Use more specific type ignore method-assign * Type ignore for message.get_all * Remove unused type ignore * Add SizedBuffer type for xmlrpc.client.Transport subclass * Add Self type for RequestHandlerClass in test * Add type ignore for shutil.rmtree onexc handler * Quote SizedBuffer * Add news entry * Remove no longer correct comment * Update self import * Also ignore type onerror=handler * Update news entry * Update news entry --- .pre-commit-config.yaml | 16 ++++++++-------- news/12389.bugfix.rst | 1 + src/pip/_internal/locations/_distutils.py | 3 +-- src/pip/_internal/metadata/_json.py | 4 ++-- src/pip/_internal/network/xmlrpc.py | 4 +++- src/pip/_internal/utils/misc.py | 4 ++-- tests/conftest.py | 6 +++++- tests/lib/configuration_helpers.py | 2 +- tests/lib/test_wheel.py | 10 +++++----- tests/unit/metadata/test_metadata.py | 6 +++--- tests/unit/test_base_command.py | 6 +++--- tests/unit/test_configuration.py | 6 +++--- tests/unit/test_resolution_legacy_resolver.py | 2 +- tools/__init__.py | 0 14 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 news/12389.bugfix.rst create mode 100644 tools/__init__.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 999bd8b1d68..18d911256d3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,20 +28,20 @@ repos: args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.961 + rev: v1.6.1 hooks: - id: mypy exclude: tests/data args: ["--pretty", "--show-error-codes"] additional_dependencies: [ - 'keyring==23.0.1', - 'nox==2021.6.12', + 'keyring==24.2.0', + 'nox==2023.4.22', 'pytest', - 'types-docutils==0.18.3', - 'types-setuptools==57.4.14', - 'types-freezegun==1.1.9', - 'types-six==1.16.15', - 'types-pyyaml==6.0.12.2', + 'types-docutils==0.20.0.3', + 'types-setuptools==68.2.0.0', + 'types-freezegun==1.1.10', + 'types-six==1.16.21.9', + 'types-pyyaml==6.0.12.12', ] - repo: https://github.com/pre-commit/pygrep-hooks diff --git a/news/12389.bugfix.rst b/news/12389.bugfix.rst new file mode 100644 index 00000000000..84871873328 --- /dev/null +++ b/news/12389.bugfix.rst @@ -0,0 +1 @@ +Update mypy to 1.6.1 and fix/ignore types diff --git a/src/pip/_internal/locations/_distutils.py b/src/pip/_internal/locations/_distutils.py index 48689f5fbe4..0e18c6e1e14 100644 --- a/src/pip/_internal/locations/_distutils.py +++ b/src/pip/_internal/locations/_distutils.py @@ -56,8 +56,7 @@ def distutils_scheme( try: d.parse_config_files() except UnicodeDecodeError: - # Typeshed does not include find_config_files() for some reason. - paths = d.find_config_files() # type: ignore + paths = d.find_config_files() logger.warning( "Ignore distutils configs in %s due to encoding errors.", ", ".join(os.path.basename(p) for p in paths), diff --git a/src/pip/_internal/metadata/_json.py b/src/pip/_internal/metadata/_json.py index 336b52f1efd..27362fc726c 100644 --- a/src/pip/_internal/metadata/_json.py +++ b/src/pip/_internal/metadata/_json.py @@ -64,10 +64,10 @@ def sanitise_header(h: Union[Header, str]) -> str: key = json_name(field) if multi: value: Union[str, List[str]] = [ - sanitise_header(v) for v in msg.get_all(field) + sanitise_header(v) for v in msg.get_all(field) # type: ignore ] else: - value = sanitise_header(msg.get(field)) + value = sanitise_header(msg.get(field)) # type: ignore if key == "keywords": # Accept both comma-separated and space-separated # forms, for better compatibility with old data. diff --git a/src/pip/_internal/network/xmlrpc.py b/src/pip/_internal/network/xmlrpc.py index 4a7d55d0e50..22ec8d2f4a6 100644 --- a/src/pip/_internal/network/xmlrpc.py +++ b/src/pip/_internal/network/xmlrpc.py @@ -13,6 +13,8 @@ if TYPE_CHECKING: from xmlrpc.client import _HostType, _Marshallable + from _typeshed import SizedBuffer + logger = logging.getLogger(__name__) @@ -33,7 +35,7 @@ def request( self, host: "_HostType", handler: str, - request_body: bytes, + request_body: "SizedBuffer", verbose: bool = False, ) -> Tuple["_Marshallable", ...]: assert isinstance(host, str) diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py index 42a8536cdd3..1ad3f6162a2 100644 --- a/src/pip/_internal/utils/misc.py +++ b/src/pip/_internal/utils/misc.py @@ -141,9 +141,9 @@ def rmtree( ) if sys.version_info >= (3, 12): # See https://docs.python.org/3.12/whatsnew/3.12.html#shutil. - shutil.rmtree(dir, onexc=handler) + shutil.rmtree(dir, onexc=handler) # type: ignore else: - shutil.rmtree(dir, onerror=handler) + shutil.rmtree(dir, onerror=handler) # type: ignore def _onerror_ignore(*_args: Any) -> None: diff --git a/tests/conftest.py b/tests/conftest.py index 8e498abd08e..c5bf4bb9567 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,6 +14,7 @@ from pathlib import Path from textwrap import dedent from typing import ( + TYPE_CHECKING, Any, AnyStr, Callable, @@ -58,6 +59,9 @@ from tests.lib.server import MockServer, make_mock_server from tests.lib.venv import VirtualEnvironment, VirtualEnvironmentType +if TYPE_CHECKING: + from pip._vendor.typing_extensions import Self + def pytest_addoption(parser: Parser) -> None: parser.addoption( @@ -941,7 +945,7 @@ def html_index_with_onetime_server( """ class InDirectoryServer(http.server.ThreadingHTTPServer): - def finish_request(self, request: Any, client_address: Any) -> None: + def finish_request(self: "Self", request: Any, client_address: Any) -> None: self.RequestHandlerClass( request, client_address, diff --git a/tests/lib/configuration_helpers.py b/tests/lib/configuration_helpers.py index ec824ffd3b8..b6e398c5bf1 100644 --- a/tests/lib/configuration_helpers.py +++ b/tests/lib/configuration_helpers.py @@ -38,7 +38,7 @@ def overridden() -> None: old() # https://github.com/python/mypy/issues/2427 - self.configuration._load_config_files = overridden # type: ignore[assignment] + self.configuration._load_config_files = overridden # type: ignore[method-assign] @contextlib.contextmanager def tmpfile(self, contents: str) -> Iterator[str]: diff --git a/tests/lib/test_wheel.py b/tests/lib/test_wheel.py index 86994c28e57..ffe96cc4335 100644 --- a/tests/lib/test_wheel.py +++ b/tests/lib/test_wheel.py @@ -19,12 +19,12 @@ def test_message_from_dict_one_value() -> None: message = message_from_dict({"a": "1"}) - assert set(message.get_all("a")) == {"1"} + assert set(message.get_all("a")) == {"1"} # type: ignore def test_message_from_dict_multiple_values() -> None: message = message_from_dict({"a": ["1", "2"]}) - assert set(message.get_all("a")) == {"1", "2"} + assert set(message.get_all("a")) == {"1", "2"} # type: ignore def message_from_bytes(contents: bytes) -> Message: @@ -67,7 +67,7 @@ def test_make_metadata_file_custom_value_list() -> None: f = default_make_metadata(updates={"a": ["1", "2"]}) assert f is not None message = default_metadata_checks(f) - assert set(message.get_all("a")) == {"1", "2"} + assert set(message.get_all("a")) == {"1", "2"} # type: ignore def test_make_metadata_file_custom_value_overrides() -> None: @@ -101,7 +101,7 @@ def default_wheel_metadata_checks(f: File) -> Message: assert message.get_all("Wheel-Version") == ["1.0"] assert message.get_all("Generator") == ["pip-test-suite"] assert message.get_all("Root-Is-Purelib") == ["true"] - assert set(message.get_all("Tag")) == {"py2-none-any", "py3-none-any"} + assert set(message.get_all("Tag")) == {"py2-none-any", "py3-none-any"} # type: ignore return message @@ -122,7 +122,7 @@ def test_make_wheel_metadata_file_custom_value_list() -> None: f = default_make_wheel_metadata(updates={"a": ["1", "2"]}) assert f is not None message = default_wheel_metadata_checks(f) - assert set(message.get_all("a")) == {"1", "2"} + assert set(message.get_all("a")) == {"1", "2"} # type: ignore def test_make_wheel_metadata_file_custom_value_override() -> None: diff --git a/tests/unit/metadata/test_metadata.py b/tests/unit/metadata/test_metadata.py index 47093fb54d1..ccc8ceb2e75 100644 --- a/tests/unit/metadata/test_metadata.py +++ b/tests/unit/metadata/test_metadata.py @@ -23,7 +23,7 @@ def test_dist_get_direct_url_no_metadata(mock_read_text: mock.Mock) -> None: class FakeDistribution(BaseDistribution): pass - dist = FakeDistribution() + dist = FakeDistribution() # type: ignore assert dist.direct_url is None mock_read_text.assert_called_once_with(DIRECT_URL_METADATA_NAME) @@ -35,7 +35,7 @@ def test_dist_get_direct_url_invalid_json( class FakeDistribution(BaseDistribution): canonical_name = cast(NormalizedName, "whatever") # Needed for error logging. - dist = FakeDistribution() + dist = FakeDistribution() # type: ignore with caplog.at_level(logging.WARNING): assert dist.direct_url is None @@ -84,7 +84,7 @@ def test_dist_get_direct_url_valid_metadata(mock_read_text: mock.Mock) -> None: class FakeDistribution(BaseDistribution): pass - dist = FakeDistribution() + dist = FakeDistribution() # type: ignore direct_url = dist.direct_url assert direct_url is not None mock_read_text.assert_called_once_with(DIRECT_URL_METADATA_NAME) diff --git a/tests/unit/test_base_command.py b/tests/unit/test_base_command.py index daec5fc6c65..44dae384a75 100644 --- a/tests/unit/test_base_command.py +++ b/tests/unit/test_base_command.py @@ -151,7 +151,7 @@ def assert_helpers_set(options: Values, args: List[str]) -> int: c = Command("fake", "fake") # https://github.com/python/mypy/issues/2427 - c.run = Mock(side_effect=assert_helpers_set) # type: ignore[assignment] + c.run = Mock(side_effect=assert_helpers_set) # type: ignore[method-assign] assert c.main(["fake"]) == SUCCESS c.run.assert_called_once() @@ -176,7 +176,7 @@ def create_temp_dirs(options: Values, args: List[str]) -> int: c = Command("fake", "fake") # https://github.com/python/mypy/issues/2427 - c.run = Mock(side_effect=create_temp_dirs) # type: ignore[assignment] + c.run = Mock(side_effect=create_temp_dirs) # type: ignore[method-assign] assert c.main(["fake"]) == SUCCESS c.run.assert_called_once() assert os.path.exists(Holder.value) == exists @@ -200,6 +200,6 @@ def create_temp_dirs(options: Values, args: List[str]) -> int: c = Command("fake", "fake") # https://github.com/python/mypy/issues/2427 - c.run = Mock(side_effect=create_temp_dirs) # type: ignore[assignment] + c.run = Mock(side_effect=create_temp_dirs) # type: ignore[method-assign] assert c.main(["fake"]) == SUCCESS c.run.assert_called_once() diff --git a/tests/unit/test_configuration.py b/tests/unit/test_configuration.py index c6b44d45aad..1a0acb7b411 100644 --- a/tests/unit/test_configuration.py +++ b/tests/unit/test_configuration.py @@ -215,7 +215,7 @@ def test_site_modification(self) -> None: # Mock out the method mymock = MagicMock(spec=self.configuration._mark_as_modified) # https://github.com/python/mypy/issues/2427 - self.configuration._mark_as_modified = mymock # type: ignore[assignment] + self.configuration._mark_as_modified = mymock # type: ignore[method-assign] self.configuration.set_value("test.hello", "10") @@ -231,7 +231,7 @@ def test_user_modification(self) -> None: # Mock out the method mymock = MagicMock(spec=self.configuration._mark_as_modified) # https://github.com/python/mypy/issues/2427 - self.configuration._mark_as_modified = mymock # type: ignore[assignment] + self.configuration._mark_as_modified = mymock # type: ignore[method-assign] self.configuration.set_value("test.hello", "10") @@ -250,7 +250,7 @@ def test_global_modification(self) -> None: # Mock out the method mymock = MagicMock(spec=self.configuration._mark_as_modified) # https://github.com/python/mypy/issues/2427 - self.configuration._mark_as_modified = mymock # type: ignore[assignment] + self.configuration._mark_as_modified = mymock # type: ignore[method-assign] self.configuration.set_value("test.hello", "10") diff --git a/tests/unit/test_resolution_legacy_resolver.py b/tests/unit/test_resolution_legacy_resolver.py index 133e5922298..b2f93b3d4f5 100644 --- a/tests/unit/test_resolution_legacy_resolver.py +++ b/tests/unit/test_resolution_legacy_resolver.py @@ -252,7 +252,7 @@ class NotWorkingFakeDist(FakeDist): def metadata(self) -> email.message.Message: raise FileNotFoundError(metadata_name) - dist = make_fake_dist(klass=NotWorkingFakeDist) + dist = make_fake_dist(klass=NotWorkingFakeDist) # type: ignore with pytest.raises(NoneMetadataError) as exc: _check_dist_requires_python( diff --git a/tools/__init__.py b/tools/__init__.py new file mode 100644 index 00000000000..e69de29bb2d From 03118f7ae2f9b1244dfad54548ad4f5f206b6fe0 Mon Sep 17 00:00:00 2001 From: Tom Forbes Date: Tue, 14 Nov 2023 13:36:36 +0000 Subject: [PATCH 152/992] Handle missing COMP_WORDS and COMP_CWORD in completion script --- news/12401.bugfix.rst | 1 + src/pip/_internal/cli/autocompletion.py | 4 ++++ tests/functional/test_completion.py | 29 +++++++++++++++++++++---- 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 news/12401.bugfix.rst diff --git a/news/12401.bugfix.rst b/news/12401.bugfix.rst new file mode 100644 index 00000000000..371f80011b3 --- /dev/null +++ b/news/12401.bugfix.rst @@ -0,0 +1 @@ +Fix exception with completions when COMP_CWORD is not set diff --git a/src/pip/_internal/cli/autocompletion.py b/src/pip/_internal/cli/autocompletion.py index e5950b90696..f3f70ac8553 100644 --- a/src/pip/_internal/cli/autocompletion.py +++ b/src/pip/_internal/cli/autocompletion.py @@ -17,6 +17,10 @@ def autocomplete() -> None: # Don't complete if user hasn't sourced bash_completion file. if "PIP_AUTO_COMPLETE" not in os.environ: return + # Don't complete if autocompletion environment variables + # are not present + if not os.environ.get("COMP_WORDS") or not os.environ.get("COMP_CWORD"): + return cwords = os.environ["COMP_WORDS"].split()[1:] cword = int(os.environ["COMP_CWORD"]) try: diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py index 4be033583ca..66bb893824e 100644 --- a/tests/functional/test_completion.py +++ b/tests/functional/test_completion.py @@ -128,7 +128,11 @@ def autocomplete_script( class DoAutocomplete(Protocol): def __call__( - self, words: str, cword: str, cwd: Union[Path, str, None] = None + self, + words: str, + cword: str, + cwd: Union[Path, str, None] = None, + include_env: bool = True, ) -> Tuple[TestPipResult, PipTestEnvironment]: ... @@ -141,10 +145,14 @@ def autocomplete( autocomplete_script.environ["PIP_AUTO_COMPLETE"] = "1" def do_autocomplete( - words: str, cword: str, cwd: Union[Path, str, None] = None + words: str, + cword: str, + cwd: Union[Path, str, None] = None, + include_env: bool = True, ) -> Tuple[TestPipResult, PipTestEnvironment]: - autocomplete_script.environ["COMP_WORDS"] = words - autocomplete_script.environ["COMP_CWORD"] = cword + if include_env: + autocomplete_script.environ["COMP_WORDS"] = words + autocomplete_script.environ["COMP_CWORD"] = cword result = autocomplete_script.run( "python", "-c", @@ -409,3 +417,16 @@ def test_completion_uses_same_executable_name( expect_stderr=deprecated_python, ) assert executable_name in result.stdout + + +def test_completion_without_env_vars(autocomplete: DoAutocomplete) -> None: + """ + Test getting completion after options in command + given absolute path + """ + res, env = autocomplete( + words="pip install ", + cword="", + include_env=False, + ) + assert res.stdout == "" From 323a64b5d194b079ae570f16f91ec017a40535c0 Mon Sep 17 00:00:00 2001 From: Tom Forbes Date: Tue, 14 Nov 2023 14:57:06 +0000 Subject: [PATCH 153/992] Handle missing COMP_WORDS and COMP_CWORD in completion script --- tests/functional/test_completion.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py index 66bb893824e..5578b9afd07 100644 --- a/tests/functional/test_completion.py +++ b/tests/functional/test_completion.py @@ -14,7 +14,6 @@ # dropping support for Python 3.7. Protocol = object - COMPLETION_FOR_SUPPORTED_SHELLS_TESTS = ( ( "bash", @@ -133,6 +132,7 @@ def __call__( cword: str, cwd: Union[Path, str, None] = None, include_env: bool = True, + expect_error: bool = True, ) -> Tuple[TestPipResult, PipTestEnvironment]: ... @@ -149,6 +149,7 @@ def do_autocomplete( cword: str, cwd: Union[Path, str, None] = None, include_env: bool = True, + expect_error: bool = True, ) -> Tuple[TestPipResult, PipTestEnvironment]: if include_env: autocomplete_script.environ["COMP_WORDS"] = words @@ -158,7 +159,7 @@ def do_autocomplete( "-c", "from pip._internal.cli.autocompletion import autocomplete;" "autocomplete()", - expect_error=True, + expect_error=expect_error, cwd=cwd, ) @@ -176,6 +177,17 @@ def test_completion_for_unknown_shell(autocomplete_script: PipTestEnvironment) - assert error_msg in result.stderr, "tests for an unknown shell failed" +def test_completion_without_env_vars(autocomplete: DoAutocomplete) -> None: + """ + Test getting completion after options in command + given absolute path + """ + res, env = autocomplete( + words="pip install ", cword="", include_env=False, expect_error=False + ) + assert res.stdout == "", "autocomplete function did not complete" + + def test_completion_alone(autocomplete_script: PipTestEnvironment) -> None: """ Test getting completion for none shell, just pip completion @@ -417,16 +429,3 @@ def test_completion_uses_same_executable_name( expect_stderr=deprecated_python, ) assert executable_name in result.stdout - - -def test_completion_without_env_vars(autocomplete: DoAutocomplete) -> None: - """ - Test getting completion after options in command - given absolute path - """ - res, env = autocomplete( - words="pip install ", - cword="", - include_env=False, - ) - assert res.stdout == "" From 88ac529219f8c1072a3c8e694d59dfa52a4a9f22 Mon Sep 17 00:00:00 2001 From: Qiming Xu <33349132+xqm32@users.noreply.github.com> Date: Tue, 28 Nov 2023 13:15:31 +0800 Subject: [PATCH 154/992] Fix outdated pip install argument description --- docs/html/cli/pip_install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/html/cli/pip_install.rst b/docs/html/cli/pip_install.rst index 951dc2705a3..5569a49c92a 100644 --- a/docs/html/cli/pip_install.rst +++ b/docs/html/cli/pip_install.rst @@ -45,7 +45,7 @@ When looking at the items to be installed, pip checks what type of item each is, in the following order: 1. Project or archive URL. -2. Local directory (which must contain a ``setup.py``, or pip will report +2. Local directory (which must contain a ``pyproject.toml`` or ``setup.py``, otherwise pip will report an error). 3. Local file (a sdist or wheel format archive, following the naming conventions for those formats). From 28250baffbf1d9dae29644717616a224f511fc87 Mon Sep 17 00:00:00 2001 From: Qiming Xu <33349132+xqm32@users.noreply.github.com> Date: Tue, 28 Nov 2023 14:17:51 +0800 Subject: [PATCH 155/992] Fix line wrap length and add news entry --- docs/html/cli/pip_install.rst | 4 ++-- news/12417.doc.rst | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 news/12417.doc.rst diff --git a/docs/html/cli/pip_install.rst b/docs/html/cli/pip_install.rst index 5569a49c92a..35b82c05e09 100644 --- a/docs/html/cli/pip_install.rst +++ b/docs/html/cli/pip_install.rst @@ -45,8 +45,8 @@ When looking at the items to be installed, pip checks what type of item each is, in the following order: 1. Project or archive URL. -2. Local directory (which must contain a ``pyproject.toml`` or ``setup.py``, otherwise pip will report - an error). +2. Local directory (which must contain a ``pyproject.toml`` or ``setup.py``, + otherwise pip will report an error). 3. Local file (a sdist or wheel format archive, following the naming conventions for those formats). 4. A requirement, as specified in :pep:`440`. diff --git a/news/12417.doc.rst b/news/12417.doc.rst new file mode 100644 index 00000000000..6c1d5c6ee76 --- /dev/null +++ b/news/12417.doc.rst @@ -0,0 +1 @@ +Fix outdated pip install argument description \ No newline at end of file From fe10d368f64501cba0c00ad2adb40b846cd02c61 Mon Sep 17 00:00:00 2001 From: Qiming Xu <33349132+xqm32@users.noreply.github.com> Date: Tue, 28 Nov 2023 14:25:56 +0800 Subject: [PATCH 156/992] Add end line --- news/12417.doc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/12417.doc.rst b/news/12417.doc.rst index 6c1d5c6ee76..43b487d26e3 100644 --- a/news/12417.doc.rst +++ b/news/12417.doc.rst @@ -1 +1 @@ -Fix outdated pip install argument description \ No newline at end of file +Fix outdated pip install argument description From d8ab6dc6c1f698d78135f12ebd960f55030679e5 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Tue, 28 Nov 2023 15:03:26 +0800 Subject: [PATCH 157/992] Clarify news fragment --- news/12417.doc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/12417.doc.rst b/news/12417.doc.rst index 43b487d26e3..efde79a5808 100644 --- a/news/12417.doc.rst +++ b/news/12417.doc.rst @@ -1 +1 @@ -Fix outdated pip install argument description +Fix outdated pip install argument description in documentation. From 83e41d90afd2bfe941b48e5f9f3ed22eab7d1146 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Sun, 10 Dec 2023 20:43:20 +0100 Subject: [PATCH 158/992] added second test case --- tests/functional/test_new_resolver.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index 1e7672a46ae..dfcf97ab132 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -2427,6 +2427,30 @@ def test_new_resolver_constraint_on_link_with_extra( script.assert_installed(pkg="1.0") +def test_new_resolver_constraint_on_link_with_extra_indirect( + script: PipTestEnvironment, +) -> None: + """ + Verify that installing works from a link with an extra if there is an indirect + dependency on that same package with the same extra (#12372). + """ + wheel_one: pathlib.Path = create_basic_wheel_for_package( + script, "pkg1", "1.0", extras={"ext": []} + ) + wheel_two: pathlib.Path = create_basic_wheel_for_package( + script, "pkg2", "1.0", depends=["pkg1[ext]==1.0"] + ) + + script.pip( + "install", + "--no-cache-dir", + # no index, no --find-links: only the explicit path + wheel_two, + f"{wheel_one}[ext]", + ) + script.assert_installed(pkg1="1.0", pkg2="1.0") + + def test_new_resolver_do_not_backtrack_on_build_failure( script: PipTestEnvironment, ) -> None: From 47f1d5dc4780d5eabb33adccd0950ab0a47ab481 Mon Sep 17 00:00:00 2001 From: Jean Abou Samra Date: Wed, 13 Dec 2023 23:20:52 +0100 Subject: [PATCH 159/992] Improve documentation usability by turning some PEP numbers into PUG links --- NEWS.rst | 5 +++-- docs/html/cli/pip_install.rst | 21 +++++++++++-------- docs/html/cli/pip_wheel.rst | 3 ++- .../architecture/package-finding.rst | 6 +++--- docs/html/development/getting-started.rst | 1 - docs/html/reference/inspect-report.md | 5 ++--- .../html/topics/more-dependency-resolution.md | 8 +++---- docs/html/topics/vcs-support.md | 5 ++--- docs/html/user_guide.rst | 5 +++-- 9 files changed, 31 insertions(+), 28 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 26d00a3f144..20d3f89dc0d 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -96,8 +96,9 @@ Process Deprecations and Removals ------------------------- -- Deprecate legacy version and version specifiers that don't conform to `PEP 440 - `_ (`#12063 `_) +- Deprecate legacy version and version specifiers that don't conform to the + :ref:`specification `. + (`#12063 `_) - ``freeze`` no longer excludes the ``setuptools``, ``distribute``, and ``wheel`` from the output when running on Python 3.12 or later, where they are not included in a virtual environment by default. Use ``--exclude`` if you wish to diff --git a/docs/html/cli/pip_install.rst b/docs/html/cli/pip_install.rst index 35b82c05e09..2664c75223d 100644 --- a/docs/html/cli/pip_install.rst +++ b/docs/html/cli/pip_install.rst @@ -49,7 +49,7 @@ each is, in the following order: otherwise pip will report an error). 3. Local file (a sdist or wheel format archive, following the naming conventions for those formats). -4. A requirement, as specified in :pep:`440`. +4. A :ref:`version specifier `. Each item identified is added to the set of requirements to be satisfied by the install. @@ -97,7 +97,8 @@ Installation Order .. note:: This section is only about installation order of runtime dependencies, and - does not apply to build dependencies (those are specified using PEP 518). + does not apply to build dependencies (those are specified using the + :ref:`[build-system] table `). As of v6.1.0, pip installs dependencies before their dependents, i.e. in "topological order." This is the only commitment pip currently makes related @@ -181,8 +182,9 @@ Pre-release Versions -------------------- Starting with v1.4, pip will only install stable versions as specified by -`pre-releases`_ by default. If a version cannot be parsed as a compliant :pep:`440` -version then it is assumed to be a pre-release. +`pre-releases`_ by default. If a version cannot be parsed as a +:ref:`compliant ` version then it is assumed to be +a pre-release. If a Requirement specifier includes a pre-release or development version (e.g. ``>=0.0.dev0``) then pip will allow pre-release and development versions @@ -214,8 +216,8 @@ pip looks for packages in a number of places: on PyPI (if not disabled via ``--no-index``), in the local filesystem, and in any additional repositories specified via ``--find-links`` or ``--index-url``. There is no ordering in the locations that are searched. Rather they are all checked, and the "best" -match for the requirements (in terms of version number - see :pep:`440` for -details) is selected. +match for the requirements (in terms of version number - see the +:ref:`specification ` for details) is selected. See the :ref:`pip install Examples`. @@ -380,7 +382,8 @@ Examples py -m pip install -e "git+https://git.repo/some_pkg.git@feature#egg=SomePackage" # from 'feature' branch py -m pip install -e "git+https://git.repo/some_repo.git#egg=subdir&subdirectory=subdir_path" # install a python package from a repo subdirectory -#. Install a package with `extras`_. +#. Install a package with extras, i.e., optional dependencies + (:ref:`specification `). .. tab:: Unix/macOS @@ -418,7 +421,8 @@ Examples py -m pip install "./downloads/SomePackage-1.0.4.tar.gz" py -m pip install "http://my.package.repo/SomePackage-1.0.4.zip" -#. Install a particular source archive file following :pep:`440` direct references. +#. Install a particular source archive file following direct references + (:ref:`specification `). .. tab:: Unix/macOS @@ -539,5 +543,4 @@ Examples py -m pip install SomePackage1 SomePackage2 --no-binary SomePackage1 -.. _extras: https://www.python.org/dev/peps/pep-0508/#extras .. _PyPI: https://pypi.org/ diff --git a/docs/html/cli/pip_wheel.rst b/docs/html/cli/pip_wheel.rst index bfd19a0ccb1..ba749529c0c 100644 --- a/docs/html/cli/pip_wheel.rst +++ b/docs/html/cli/pip_wheel.rst @@ -34,7 +34,8 @@ Differences to ``build`` ------------------------ `build `_ is a simple tool which can among other things build -wheels for projects using PEP 517. It is comparable to the execution of ``pip wheel --no-deps .``. +wheels for projects using the standard ``pyproject.toml``-based build interface. It +is comparable to the execution of ``pip wheel --no-deps .``. It can also build source distributions which is not possible with ``pip``. ``pip wheel`` covers the wheel scope of ``build`` but offers many additional features. diff --git a/docs/html/development/architecture/package-finding.rst b/docs/html/development/architecture/package-finding.rst index 0b64d420d93..4885d925ee3 100644 --- a/docs/html/development/architecture/package-finding.rst +++ b/docs/html/development/architecture/package-finding.rst @@ -182,8 +182,9 @@ example, whether a pre-release is eligible for selection or whether a file whose hash doesn't match is eligible depends on properties of the collection as a whole. -The ``CandidateEvaluator`` class uses information like the list of `PEP 425`_ -tags compatible with the target Python interpreter, hashes provided by the +The ``CandidateEvaluator`` class uses information like the list of +:ref:`platform tags ` +compatible with the target Python interpreter, hashes provided by the user, and other user preferences, etc. Specifically, the class has a ``get_applicable_candidates()`` method. @@ -236,5 +237,4 @@ The class is the return type of both the ``CandidateEvaluator`` class's ``find_best_candidate()`` method. -.. _`PEP 425`: https://www.python.org/dev/peps/pep-0425/ .. _`PEP 503`: https://www.python.org/dev/peps/pep-0503/ diff --git a/docs/html/development/getting-started.rst b/docs/html/development/getting-started.rst index 34d647fc231..bc483997a64 100644 --- a/docs/html/development/getting-started.rst +++ b/docs/html/development/getting-started.rst @@ -206,7 +206,6 @@ in order to start contributing. .. _`open an issue`: https://github.com/pypa/pip/issues/new?title=Trouble+with+pip+development+environment .. _`install Python`: https://realpython.com/installing-python/ -.. _`PEP 484 type-comments`: https://www.python.org/dev/peps/pep-0484/#suggested-syntax-for-python-2-7-and-straddling-code .. _`rich CLI`: https://docs.pytest.org/en/latest/usage.html#specifying-tests-selecting-tests .. _`GitHub`: https://github.com/pypa/pip .. _`good first issues`: https://github.com/pypa/pip/labels/good%20first%20issue diff --git a/docs/html/reference/inspect-report.md b/docs/html/reference/inspect-report.md index 1355e5d4274..ad8263c6742 100644 --- a/docs/html/reference/inspect-report.md +++ b/docs/html/reference/inspect-report.md @@ -27,9 +27,8 @@ The report is a JSON object with the following properties: distribution packages that are installed. - `environment`: an object describing the environment where the installation report was - generated. See [PEP 508 environment - markers](https://peps.python.org/pep-0508/#environment-markers) for more information. - Values have a string type. + generated. See the section on environment markers in the {ref}`pypug:dependency-specifiers` + specification for more information. Values have a string type. (InspectReportItem)= diff --git a/docs/html/topics/more-dependency-resolution.md b/docs/html/topics/more-dependency-resolution.md index 1c7836e5c0f..b955e2ec114 100644 --- a/docs/html/topics/more-dependency-resolution.md +++ b/docs/html/topics/more-dependency-resolution.md @@ -97,10 +97,10 @@ feeding candidates to the resolver, and has a key role to play in selecting suitable candidates. Note that the resolver is *only* relevant for packages fetched from an index. -Candidates coming from other sources (local source directories, PEP 508 -direct URL references) do *not* go through the finder, and are merged with the -candidates provided by the finder as part of the resolver's "provider" -implementation. +Candidates coming from other sources (local source directories, {ref}`direct +URL references `) do *not* go through the finder, +and are merged with the candidates provided by the finder as part of the resolver's +"provider" implementation. As well as determining what versions exist in the index for a given project, the finder selects the best distribution file to use for that candidate. This diff --git a/docs/html/topics/vcs-support.md b/docs/html/topics/vcs-support.md index 465d5ecb78c..c8169dbe24c 100644 --- a/docs/html/topics/vcs-support.md +++ b/docs/html/topics/vcs-support.md @@ -140,9 +140,8 @@ pip also looks at the `egg` fragment specifying the "project name". In practice mode. In all other circumstances, the `egg` fragment is not necessary and its use is discouraged. -The `egg` fragment **should** be a bare -[PEP 508](https://peps.python.org/pep-0508/) project name. Anything else -is not guaranteed to work. +The `egg` fragment **should** be a bare {ref}`project name `. +Anything else is not guaranteed to work. ````{admonition} Example If your repository layout is: diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst index 9a6f2901cd5..f0cbded683d 100644 --- a/docs/html/user_guide.rst +++ b/docs/html/user_guide.rst @@ -264,7 +264,7 @@ Installing from Wheels "Wheel" is a built, archive format that can greatly speed installation compared to building and installing from source archives. For more information, see the -`Wheel docs `_ , :pep:`427`, and :pep:`425`. +:ref:`specification `. pip prefers Wheels where they are available. To disable this, use the :ref:`--no-binary ` flag for :ref:`pip install`. @@ -306,7 +306,8 @@ name: .. note:: In the future, the ``path[extras]`` syntax may become deprecated. It is - recommended to use PEP 508 syntax wherever possible. + recommended to use :ref:`standard ` + syntax wherever possible. For the cases where wheels are not available, pip offers :ref:`pip wheel` as a convenience, to build wheels for all your requirements and dependencies. From 7d10a0d1ca0d22533c6bf3277c328505a02532e7 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 13 Dec 2023 20:45:14 +0000 Subject: [PATCH 160/992] Remove the RAMDisk generation script This is no longer used in CI. --- tools/ci/New-RAMDisk.ps1 | 74 ---------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 tools/ci/New-RAMDisk.ps1 diff --git a/tools/ci/New-RAMDisk.ps1 b/tools/ci/New-RAMDisk.ps1 deleted file mode 100644 index 21b1a573a49..00000000000 --- a/tools/ci/New-RAMDisk.ps1 +++ /dev/null @@ -1,74 +0,0 @@ -[CmdletBinding()] -param( - [Parameter(Mandatory=$true, - HelpMessage="Drive letter to use for the RAMDisk")] - [String]$drive, - [Parameter(HelpMessage="Size to allocate to the RAMDisk")] - [UInt64]$size=1GB -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version Latest - -Write-Output "Installing FS-iSCSITarget-Server" -Install-WindowsFeature -Name FS-iSCSITarget-Server - -Write-Output "Starting MSiSCSI" -Start-Service MSiSCSI -$retry = 10 -do { - $service = Get-Service MSiSCSI - if ($service.Status -eq "Running") { - break; - } - $retry-- - Start-Sleep -Milliseconds 500 -} until ($retry -eq 0) - -$service = Get-Service MSiSCSI -if ($service.Status -ne "Running") { - throw "MSiSCSI is not running" -} - -Write-Output "Configuring Firewall" -Get-NetFirewallServiceFilter -Service MSiSCSI | Enable-NetFirewallRule - -Write-Output "Configuring RAMDisk" -# Must use external-facing IP address, otherwise New-IscsiTargetPortal is -# unable to connect. -$ip = ( - Get-NetIPAddress -AddressFamily IPv4 | - Where-Object {$_.IPAddress -ne "127.0.0.1"} -)[0].IPAddress -if ( - -not (Get-IscsiServerTarget -ComputerName localhost | Where-Object {$_.TargetName -eq "ramdisks"}) -) { - New-IscsiServerTarget ` - -ComputerName localhost ` - -TargetName ramdisks ` - -InitiatorId IPAddress:$ip -} - -$newVirtualDisk = New-IscsiVirtualDisk ` - -ComputerName localhost ` - -Path ramdisk:local$drive.vhdx ` - -Size $size -Add-IscsiVirtualDiskTargetMapping ` - -ComputerName localhost ` - -TargetName ramdisks ` - -Path ramdisk:local$drive.vhdx - -Write-Output "Connecting to iSCSI" -New-IscsiTargetPortal -TargetPortalAddress $ip -Get-IscsiTarget | Where-Object {!$_.IsConnected} | Connect-IscsiTarget - -Write-Output "Configuring disk" -$newDisk = Get-IscsiConnection | - Get-Disk | - Where-Object {$_.SerialNumber -eq $newVirtualDisk.SerialNumber} - -Set-Disk -InputObject $newDisk -IsOffline $false -Initialize-Disk -InputObject $newDisk -PartitionStyle MBR -New-Partition -InputObject $newDisk -UseMaximumSize -DriveLetter $drive - -Format-Volume -DriveLetter $drive -NewFileSystemLabel Temp -FileSystem NTFS From 190334606c92d5e6028b09af5dbb3102a1167035 Mon Sep 17 00:00:00 2001 From: Jean Abou Samra Date: Thu, 14 Dec 2023 22:00:33 +0100 Subject: [PATCH 161/992] Add a news entry --- news/12434.doc.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/12434.doc.rst diff --git a/news/12434.doc.rst b/news/12434.doc.rst new file mode 100644 index 00000000000..49a93a2841d --- /dev/null +++ b/news/12434.doc.rst @@ -0,0 +1 @@ +Replace some links to PEPs with links to the canonical specifications on https://packaging.python.org From 6fd8100bb79c3e44345744dce86d347eb3e8bb57 Mon Sep 17 00:00:00 2001 From: Jean Abou-Samra Date: Sun, 17 Dec 2023 11:35:03 +0100 Subject: [PATCH 162/992] Use intersphinx --- news/12434.doc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/12434.doc.rst b/news/12434.doc.rst index 49a93a2841d..c1d3635df78 100644 --- a/news/12434.doc.rst +++ b/news/12434.doc.rst @@ -1 +1 @@ -Replace some links to PEPs with links to the canonical specifications on https://packaging.python.org +Replace some links to PEPs with links to the canonical specifications on the :doc:`pypug:index` From 3f9c9f919ed5ef845aaf0880e64b73b992b7aab8 Mon Sep 17 00:00:00 2001 From: Efflam Lemaillet Date: Wed, 25 Oct 2023 15:10:21 +0200 Subject: [PATCH 163/992] fix mercurial revision parse error: use two hypen argument --rev= instead of -r= --- news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst | 1 + src/pip/_internal/vcs/mercurial.py | 2 +- tests/unit/test_vcs.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst diff --git a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst b/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst new file mode 100644 index 00000000000..96ef4c66fda --- /dev/null +++ b/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst @@ -0,0 +1 @@ +fix mercurial revision parse error: use two hypen argument --rev= instead of -r= diff --git a/src/pip/_internal/vcs/mercurial.py b/src/pip/_internal/vcs/mercurial.py index e440c122169..c183d41d09c 100644 --- a/src/pip/_internal/vcs/mercurial.py +++ b/src/pip/_internal/vcs/mercurial.py @@ -31,7 +31,7 @@ class Mercurial(VersionControl): @staticmethod def get_base_rev_args(rev: str) -> List[str]: - return [f"-r={rev}"] + return [f"--rev={rev}"] def fetch_new( self, dest: str, url: HiddenText, rev_options: RevOptions, verbosity: int diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py index 4a3750f2d36..5291f129cf7 100644 --- a/tests/unit/test_vcs.py +++ b/tests/unit/test_vcs.py @@ -66,7 +66,7 @@ def test_rev_options_repr() -> None: # First check VCS-specific RevOptions behavior. (Bazaar, [], ["-r", "123"], {}), (Git, ["HEAD"], ["123"], {}), - (Mercurial, [], ["-r=123"], {}), + (Mercurial, [], ["--rev=123"], {}), (Subversion, [], ["-r", "123"], {}), # Test extra_args. For this, test using a single VersionControl class. ( From 7189400275d90953c902addb0a03520adb36bb28 Mon Sep 17 00:00:00 2001 From: efflamlemaillet <6533295+efflamlemaillet@users.noreply.github.com> Date: Thu, 26 Oct 2023 21:44:41 +0200 Subject: [PATCH 164/992] Update news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst Co-authored-by: Pradyun Gedam --- news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst b/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst index 96ef4c66fda..76a8e6b96db 100644 --- a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst +++ b/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst @@ -1 +1 @@ -fix mercurial revision parse error: use two hypen argument --rev= instead of -r= +Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` From 69b58102f522f0e10d2b3bd31e7b9ee074abd16d Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Mon, 6 Nov 2023 17:13:58 +0100 Subject: [PATCH 165/992] Fixed bug in extras handling for link requirements --- news/12372.bugfix.rst | 1 + .../resolution/resolvelib/factory.py | 53 +++++++++++++------ tests/functional/test_install_reqs.py | 6 +-- tests/functional/test_new_resolver.py | 21 ++++++++ 4 files changed, 62 insertions(+), 19 deletions(-) create mode 100644 news/12372.bugfix.rst diff --git a/news/12372.bugfix.rst b/news/12372.bugfix.rst new file mode 100644 index 00000000000..6c0b48dec3c --- /dev/null +++ b/news/12372.bugfix.rst @@ -0,0 +1 @@ +Fix a bug in extras handling for link requirements diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index 38c199448a1..241b74b59bb 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -36,7 +36,10 @@ from pip._internal.models.link import Link from pip._internal.models.wheel import Wheel from pip._internal.operations.prepare import RequirementPreparer -from pip._internal.req.constructors import install_req_from_link_and_ireq +from pip._internal.req.constructors import ( + install_req_drop_extras, + install_req_from_link_and_ireq, +) from pip._internal.req.req_install import ( InstallRequirement, check_invalid_constraint_type, @@ -176,6 +179,20 @@ def _make_candidate_from_link( name: Optional[NormalizedName], version: Optional[CandidateVersion], ) -> Optional[Candidate]: + base: Optional[BaseCandidate] = self._make_base_candidate_from_link( + link, template, name, version + ) + if not extras or base is None: + return base + return self._make_extras_candidate(base, extras, comes_from=template) + + def _make_base_candidate_from_link( + self, + link: Link, + template: InstallRequirement, + name: Optional[NormalizedName], + version: Optional[CandidateVersion], + ) -> Optional[BaseCandidate]: # TODO: Check already installed candidate, and use it if the link and # editable flag match. @@ -204,7 +221,7 @@ def _make_candidate_from_link( self._build_failures[link] = e return None - base: BaseCandidate = self._editable_candidate_cache[link] + return self._editable_candidate_cache[link] else: if link not in self._link_candidate_cache: try: @@ -224,11 +241,7 @@ def _make_candidate_from_link( ) self._build_failures[link] = e return None - base = self._link_candidate_cache[link] - - if not extras: - return base - return self._make_extras_candidate(base, extras, comes_from=template) + return self._link_candidate_cache[link] def _iter_found_candidates( self, @@ -362,9 +375,8 @@ def _iter_candidates_from_constraints( """ for link in constraint.links: self._fail_if_link_is_unsupported_wheel(link) - candidate = self._make_candidate_from_link( + candidate = self._make_base_candidate_from_link( link, - extras=frozenset(), template=install_req_from_link_and_ireq(link, template), name=canonicalize_name(identifier), version=None, @@ -454,10 +466,10 @@ def _make_requirements_from_install_req( Returns requirement objects associated with the given InstallRequirement. In most cases this will be a single object but the following special cases exist: - the InstallRequirement has markers that do not apply -> result is empty - - the InstallRequirement has both a constraint and extras -> result is split - in two requirement objects: one with the constraint and one with the - extra. This allows centralized constraint handling for the base, - resulting in fewer candidate rejections. + - the InstallRequirement has both a constraint (or link) and extras + -> result is split in two requirement objects: one with the constraint + (or link) and one with the extra. This allows centralized constraint + handling for the base, resulting in fewer candidate rejections. """ if not ireq.match_markers(requested_extras): logger.info( @@ -471,10 +483,13 @@ def _make_requirements_from_install_req( yield SpecifierRequirement(ireq) else: self._fail_if_link_is_unsupported_wheel(ireq.link) - cand = self._make_candidate_from_link( + # Always make the link candidate for the base requirement to make it + # available to `find_candidates` for explicit candidate lookup for any + # set of extras. + # The extras are required separately via a second requirement. + cand = self._make_base_candidate_from_link( ireq.link, - extras=frozenset(ireq.extras), - template=ireq, + template=install_req_drop_extras(ireq) if ireq.extras else ireq, name=canonicalize_name(ireq.name) if ireq.name else None, version=None, ) @@ -489,7 +504,13 @@ def _make_requirements_from_install_req( raise self._build_failures[ireq.link] yield UnsatisfiableRequirement(canonicalize_name(ireq.name)) else: + # require the base from the link yield self.make_requirement_from_candidate(cand) + if ireq.extras: + # require the extras on top of the base candidate + yield self.make_requirement_from_candidate( + self._make_extras_candidate(cand, frozenset(ireq.extras)) + ) def collect_root_requirements( self, root_ireqs: List[InstallRequirement] diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py index c21b9ba83de..f649be00090 100644 --- a/tests/functional/test_install_reqs.py +++ b/tests/functional/test_install_reqs.py @@ -671,9 +671,9 @@ def test_install_distribution_union_with_versions( expect_error=(resolver_variant == "resolvelib"), ) if resolver_variant == "resolvelib": - assert "Cannot install localextras[bar]" in result.stderr - assert ("localextras[bar] 0.0.1 depends on localextras 0.0.1") in result.stdout - assert ("localextras[baz] 0.0.2 depends on localextras 0.0.2") in result.stdout + assert "Cannot install localextras" in result.stderr + assert ("The user requested localextras 0.0.1") in result.stdout + assert ("The user requested localextras 0.0.2") in result.stdout else: assert ( "Successfully installed LocalExtras-0.0.1 simple-3.0 singlemodule-0.0.1" diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index b5945edf89b..1e7672a46ae 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -2406,6 +2406,27 @@ def test_new_resolver_respect_user_requested_if_extra_is_installed( script.assert_installed(pkg3="1.0", pkg2="2.0", pkg1="1.0") +def test_new_resolver_constraint_on_link_with_extra( + script: PipTestEnvironment, +) -> None: + """ + Verify that installing works from a link with both an extra and a constraint. + """ + wheel: pathlib.Path = create_basic_wheel_for_package( + script, "pkg", "1.0", extras={"ext": []} + ) + + script.pip( + "install", + "--no-cache-dir", + # no index, no --find-links: only the explicit path + "--no-index", + f"{wheel}[ext]", + "pkg==1", + ) + script.assert_installed(pkg="1.0") + + def test_new_resolver_do_not_backtrack_on_build_failure( script: PipTestEnvironment, ) -> None: From 4513b9cb05346dd45dfe8e4237f2f85df6a93004 Mon Sep 17 00:00:00 2001 From: Sander Van Balen Date: Sun, 10 Dec 2023 20:43:20 +0100 Subject: [PATCH 166/992] added second test case --- tests/functional/test_new_resolver.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index 1e7672a46ae..dfcf97ab132 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -2427,6 +2427,30 @@ def test_new_resolver_constraint_on_link_with_extra( script.assert_installed(pkg="1.0") +def test_new_resolver_constraint_on_link_with_extra_indirect( + script: PipTestEnvironment, +) -> None: + """ + Verify that installing works from a link with an extra if there is an indirect + dependency on that same package with the same extra (#12372). + """ + wheel_one: pathlib.Path = create_basic_wheel_for_package( + script, "pkg1", "1.0", extras={"ext": []} + ) + wheel_two: pathlib.Path = create_basic_wheel_for_package( + script, "pkg2", "1.0", depends=["pkg1[ext]==1.0"] + ) + + script.pip( + "install", + "--no-cache-dir", + # no index, no --find-links: only the explicit path + wheel_two, + f"{wheel_one}[ext]", + ) + script.assert_installed(pkg1="1.0", pkg2="1.0") + + def test_new_resolver_do_not_backtrack_on_build_failure( script: PipTestEnvironment, ) -> None: From b23341dce5fe9df8a6e90f56599e43bbe2e57d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 17 Dec 2023 12:58:55 +0100 Subject: [PATCH 167/992] Update AUTHORS.txt --- AUTHORS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 49e30f69678..e02de32bcf3 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -227,6 +227,8 @@ Dwayne Bailey Ed Morley Edgar Ramírez Ee Durbin +Efflam Lemaillet +efflamlemaillet Eitan Adler ekristina elainechan From fb1be0fe4936e498607c831211ecb04365e949d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 17 Dec 2023 13:19:18 +0100 Subject: [PATCH 168/992] Fix a few typing issues --- tests/functional/test_new_resolver.py | 6 +++--- tools/update-rtd-redirects.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py index dfcf97ab132..feae58a9cd4 100644 --- a/tests/functional/test_new_resolver.py +++ b/tests/functional/test_new_resolver.py @@ -2295,7 +2295,7 @@ def test_new_resolver_dont_backtrack_on_extra_if_base_constrained_in_requirement script, "pkg", "2.0", extras={"ext1": ["dep"], "ext2": ["dep"]} ) - to_install: tuple[str, str] = ( + to_install: Tuple[str, str] = ( "pkg[ext1]", "pkg[ext2]==1.0" if two_extras else "pkg==1.0", ) @@ -2342,7 +2342,7 @@ def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras( script, "pkg", "2.0", extras={"ext1": ["dep"], "ext2": ["dep"]} ) - to_install: tuple[str, str] = ( + to_install: Tuple[str, str] = ( "pkg[ext1]>1", "pkg[ext2]==1.0" if two_extras else "pkg==1.0", ) @@ -2506,7 +2506,7 @@ def test_new_resolver_comes_from_with_extra( create_basic_wheel_for_package(script, "dep", "1.0") create_basic_wheel_for_package(script, "pkg", "1.0", extras={"ext": ["dep"]}) - to_install: tuple[str, str] = ("pkg", "pkg[ext]") + to_install: Tuple[str, str] = ("pkg", "pkg[ext]") result = script.pip( "install", diff --git a/tools/update-rtd-redirects.py b/tools/update-rtd-redirects.py index 8515c026cb7..abb6473e87f 100644 --- a/tools/update-rtd-redirects.py +++ b/tools/update-rtd-redirects.py @@ -6,6 +6,7 @@ import os import sys from pathlib import Path +from typing import Dict, List import httpx import rich @@ -84,8 +85,8 @@ def get_rtd_api() -> httpx.Client: next_step("Compare and determine modifications.") -redirects_to_remove: list[int] = [] -redirects_to_add: dict[str, str] = {} +redirects_to_remove: List[int] = [] +redirects_to_add: Dict[str, str] = {} for redirect in rtd_redirects["results"]: if redirect["type"] != "exact": From 3891d417eaaaa10560b5f07ce830d84f18773211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 17 Dec 2023 13:28:22 +0100 Subject: [PATCH 169/992] Fix news file name --- ...cf-52cd-402c-b402-06d2ff398f89.bugfix.rst => 12373.bugfix.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst => 12373.bugfix.rst} (100%) diff --git a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst b/news/12373.bugfix.rst similarity index 100% rename from news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst rename to news/12373.bugfix.rst From f9fea4096e7a5c0e6068b874e98f7d4d2a57b0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 17 Dec 2023 13:28:42 +0100 Subject: [PATCH 170/992] Bump for release --- NEWS.rst | 10 ++++++++++ news/12372.bugfix.rst | 1 - news/12373.bugfix.rst | 1 - src/pip/__init__.py | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 news/12372.bugfix.rst delete mode 100644 news/12373.bugfix.rst diff --git a/NEWS.rst b/NEWS.rst index 26d00a3f144..6af01e3d6c6 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -9,6 +9,16 @@ .. towncrier release notes start +23.3.2 (2023-12-17) +=================== + +Bug Fixes +--------- + +- Fix a bug in extras handling for link requirements (`#12372 `_) +- Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` (`#12373 `_) + + 23.3.1 (2023-10-21) =================== diff --git a/news/12372.bugfix.rst b/news/12372.bugfix.rst deleted file mode 100644 index 6c0b48dec3c..00000000000 --- a/news/12372.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix a bug in extras handling for link requirements diff --git a/news/12373.bugfix.rst b/news/12373.bugfix.rst deleted file mode 100644 index 76a8e6b96db..00000000000 --- a/news/12373.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` diff --git a/src/pip/__init__.py b/src/pip/__init__.py index f1263cdc1b6..3ae194f10ca 100644 --- a/src/pip/__init__.py +++ b/src/pip/__init__.py @@ -1,6 +1,6 @@ from typing import List, Optional -__version__ = "23.3.1" +__version__ = "23.3.2" def main(args: Optional[List[str]] = None) -> int: From 0e2bd746c97cad71ece589235d4010a36df85dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 17 Dec 2023 13:28:46 +0100 Subject: [PATCH 171/992] Bump for development --- src/pip/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pip/__init__.py b/src/pip/__init__.py index 3ae194f10ca..46e56014998 100644 --- a/src/pip/__init__.py +++ b/src/pip/__init__.py @@ -1,6 +1,6 @@ from typing import List, Optional -__version__ = "23.3.2" +__version__ = "24.0.dev0" def main(args: Optional[List[str]] = None) -> int: From 664553f0a360d90ffc759bfa642bb8d98369c75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 17 Dec 2023 13:29:39 +0100 Subject: [PATCH 172/992] Remove news files included in 23.3.2 --- news/12372.bugfix.rst | 1 - news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst | 1 - 2 files changed, 2 deletions(-) delete mode 100644 news/12372.bugfix.rst delete mode 100644 news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst diff --git a/news/12372.bugfix.rst b/news/12372.bugfix.rst deleted file mode 100644 index 6c0b48dec3c..00000000000 --- a/news/12372.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix a bug in extras handling for link requirements diff --git a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst b/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst deleted file mode 100644 index 76a8e6b96db..00000000000 --- a/news/370392cf-52cd-402c-b402-06d2ff398f89.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` From 6ff621bcfbfc38f4556ea8b843dc6d393186b6ee Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Sat, 23 Dec 2023 01:59:36 +0100 Subject: [PATCH 173/992] Stop injecting `wheel` as a build dep fallback PEP 517 doesn't mandate depending on `wheel` when a `__legacy__` setuptools fallback is used. Historically, it used to be assumed as necessary, but later it turned out to be wrong. The reason is that `setuptools`' `get_requires_for_build_wheel()` hook already injects this dependency when building wheels is requested [[1]]. It also used to have this hint in the docs, but it was corrected earlier [[2]]. It could be argued that this is an optimization as `pip` will request building wheels anyway. However, it also shows up in the docs, giving the readers a wrong impression of what to put into `[build-system].requires` when they start a new project using setuptools. This patch removes `wheel` from said `requires` list fallback in the docs and the actual runtime. [1]: https://github.com/pypa/setuptools/blob/v40.8.0/setuptools/build_meta.py#L130 [2]: https://github.com/pypa/setuptools/pull/3056 --- docs/html/reference/build-system/pyproject-toml.md | 2 +- news/12449.bugfix.rst | 2 ++ src/pip/_internal/pyproject.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 news/12449.bugfix.rst diff --git a/docs/html/reference/build-system/pyproject-toml.md b/docs/html/reference/build-system/pyproject-toml.md index a42a3b8c484..c1e7a68c597 100644 --- a/docs/html/reference/build-system/pyproject-toml.md +++ b/docs/html/reference/build-system/pyproject-toml.md @@ -135,7 +135,7 @@ section, it will be assumed to have the following backend settings: ```toml [build-system] -requires = ["setuptools>=40.8.0", "wheel"] +requires = ["setuptools>=40.8.0"] build-backend = "setuptools.build_meta:__legacy__" ``` diff --git a/news/12449.bugfix.rst b/news/12449.bugfix.rst new file mode 100644 index 00000000000..19f1d9809ac --- /dev/null +++ b/news/12449.bugfix.rst @@ -0,0 +1,2 @@ +Removed ``wheel`` from the ``[build-system].requires`` list fallback +that is used when ``pyproject.toml`` is absent. diff --git a/src/pip/_internal/pyproject.py b/src/pip/_internal/pyproject.py index eb8e12b2dec..8de36b873ed 100644 --- a/src/pip/_internal/pyproject.py +++ b/src/pip/_internal/pyproject.py @@ -123,7 +123,7 @@ def load_pyproject_toml( # a version of setuptools that supports that backend. build_system = { - "requires": ["setuptools>=40.8.0", "wheel"], + "requires": ["setuptools>=40.8.0"], "build-backend": "setuptools.build_meta:__legacy__", } From 3769ad7e0c024952060d76528d64feaf25bc3f15 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Sat, 23 Dec 2023 02:16:48 +0100 Subject: [PATCH 174/992] Stop telling users to use `wheel` as build dep --- docs/html/reference/build-system/pyproject-toml.md | 2 +- news/12449.doc.rst | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 news/12449.doc.rst diff --git a/docs/html/reference/build-system/pyproject-toml.md b/docs/html/reference/build-system/pyproject-toml.md index c1e7a68c597..9719023cced 100644 --- a/docs/html/reference/build-system/pyproject-toml.md +++ b/docs/html/reference/build-system/pyproject-toml.md @@ -141,7 +141,7 @@ build-backend = "setuptools.build_meta:__legacy__" If a project has a `build-system` section but no `build-backend`, then: -- It is expected to include `setuptools` and `wheel` as build requirements. An +- It is expected to include `setuptools` as a build requirement. An error is reported if the available version of `setuptools` is not recent enough. diff --git a/news/12449.doc.rst b/news/12449.doc.rst new file mode 100644 index 00000000000..431475f51eb --- /dev/null +++ b/news/12449.doc.rst @@ -0,0 +1,2 @@ +Updated the ``pyproject.toml`` document to stop suggesting +to depend on ``wheel`` as a build dependency directly. From 946f95d17431f645da8e2e0bf4054a72db5be766 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sat, 23 Dec 2023 23:02:55 +0200 Subject: [PATCH 175/992] Merge remote-tracking branch 'upstream/main' into rm-3.7 --- .git-blame-ignore-revs | 36 + .github/dependabot.yml | 6 + .github/workflows/ci.yml | 47 +- .github/workflows/lock-threads.yml | 2 +- .github/workflows/news-file.yml | 2 +- .github/workflows/no-response.yml | 19 - .github/workflows/update-rtd-redirects.yml | 2 +- .pre-commit-config.yaml | 37 +- .readthedocs.yml | 8 +- AUTHORS.txt | 40 + MANIFEST.in | 1 + NEWS.rst | 266 ++- README.rst | 14 +- SECURITY.md | 11 +- docs/html/cli/pip_install.rst | 25 +- docs/html/cli/pip_search.rst | 6 + docs/html/cli/pip_wheel.rst | 3 +- .../architecture/package-finding.rst | 6 +- docs/html/development/contributing.rst | 2 +- docs/html/development/getting-started.rst | 39 +- docs/html/development/release-process.rst | 4 +- docs/html/installation.md | 2 +- docs/html/reference/inspect-report.md | 5 +- docs/html/reference/installation-report.md | 5 + docs/html/topics/authentication.md | 2 +- docs/html/topics/caching.md | 11 +- docs/html/topics/configuration.md | 34 +- docs/html/topics/https-certificates.md | 12 +- .../html/topics/more-dependency-resolution.md | 14 +- docs/html/topics/secure-installs.md | 12 +- docs/html/topics/vcs-support.md | 5 +- docs/html/user_guide.rst | 13 +- docs/pip_sphinxext.py | 11 +- docs/requirements.txt | 2 +- news/10937.feature.rst | 1 - news/11169.feature.rst | 1 - news/11325.feature.rst | 1 - news/11358.removal.rst | 1 - news/11451.removal.rst | 2 - news/11453.removal.rst | 2 - news/11529.bugfix.rst | 1 - news/11681.feature.rst | 4 - news/11702.trivial.rst | 2 - news/11719.bugfix.rst | 1 - news/11774.bugfix.rst | 1 - news/11775.doc.rst | 2 - news/11786.feature.rst | 1 - news/11809.doc.rst | 1 - news/11815.doc.rst | 1 + news/11837.bugfix.rst | 1 - news/11838.doc.rst | 1 - news/11842.doc.rst | 2 - news/11859.removal.rst | 2 - news/11882.bugfix.rst | 1 - news/11908.feature.rst | 1 - news/11909.process.rst | 1 + news/11935.feature.rst | 1 - news/11941.feature.rst | 4 - news/12389.bugfix.rst | 1 + news/12390.trivial.rst | 1 + news/12393.trivial.rst | 1 + news/12417.doc.rst | 1 + news/12434.doc.rst | 1 + news/8368.removal.rst | 2 - news/8559.removal.rst | 2 - news/8719.feature.rst | 1 - news/9752.feature.rst | 1 - news/msgpack.vendor.rst | 1 - news/pkg_resources.vendor.rst | 1 - news/platformdirs.vendor.rst | 1 - news/pygments.vendor.rst | 1 - news/resolvelib.vendor.rst | 1 - news/rich.vendor.rst | 1 - news/setuptools.vendor.rst | 1 - news/tenacity.vendor.rst | 1 - news/typing_extensions.vendor.rst | 1 - news/urllib3.vendor.rst | 1 - noxfile.py | 15 +- pyproject.toml | 121 +- setup.cfg | 51 +- setup.py | 77 +- src/pip/__init__.py | 2 +- src/pip/__main__.py | 7 - src/pip/_internal/__init__.py | 1 - src/pip/_internal/cache.py | 48 +- src/pip/_internal/cli/autocompletion.py | 5 +- src/pip/_internal/cli/base_command.py | 13 +- src/pip/_internal/cli/cmdoptions.py | 24 +- src/pip/_internal/cli/main.py | 9 + src/pip/_internal/cli/parser.py | 8 +- src/pip/_internal/cli/req_command.py | 20 +- src/pip/_internal/commands/cache.py | 35 +- src/pip/_internal/commands/check.py | 2 + src/pip/_internal/commands/completion.py | 20 +- src/pip/_internal/commands/configuration.py | 10 +- src/pip/_internal/commands/debug.py | 30 +- src/pip/_internal/commands/download.py | 4 + src/pip/_internal/commands/freeze.py | 19 +- src/pip/_internal/commands/index.py | 4 +- src/pip/_internal/commands/install.py | 15 +- src/pip/_internal/commands/list.py | 9 +- src/pip/_internal/commands/wheel.py | 3 + src/pip/_internal/configuration.py | 59 +- src/pip/_internal/distributions/base.py | 12 + src/pip/_internal/distributions/installed.py | 6 + src/pip/_internal/distributions/sdist.py | 8 +- src/pip/_internal/distributions/wheel.py | 6 + src/pip/_internal/exceptions.py | 15 +- src/pip/_internal/index/package_finder.py | 12 +- src/pip/_internal/locations/_distutils.py | 5 +- src/pip/_internal/metadata/__init__.py | 8 +- src/pip/_internal/metadata/_json.py | 4 +- src/pip/_internal/metadata/base.py | 32 +- .../_internal/metadata/importlib/__init__.py | 4 +- .../_internal/metadata/importlib/_dists.py | 11 +- src/pip/_internal/metadata/importlib/_envs.py | 5 +- src/pip/_internal/metadata/pkg_resources.py | 10 +- src/pip/_internal/models/candidate.py | 6 +- src/pip/_internal/models/direct_url.py | 35 +- src/pip/_internal/models/format_control.py | 4 +- .../_internal/models/installation_report.py | 9 +- src/pip/_internal/models/link.py | 123 +- src/pip/_internal/models/target_python.py | 18 +- src/pip/_internal/network/auth.py | 4 +- src/pip/_internal/network/cache.py | 57 +- src/pip/_internal/network/download.py | 2 +- src/pip/_internal/network/session.py | 10 +- src/pip/_internal/network/xmlrpc.py | 4 +- .../operations/build/build_tracker.py | 51 +- src/pip/_internal/operations/check.py | 38 + src/pip/_internal/operations/freeze.py | 7 +- src/pip/_internal/operations/install/wheel.py | 26 +- src/pip/_internal/operations/prepare.py | 137 +- src/pip/_internal/pyproject.py | 2 +- src/pip/_internal/req/constructors.py | 74 +- src/pip/_internal/req/req_install.py | 121 +- src/pip/_internal/req/req_set.py | 37 + src/pip/_internal/req/req_uninstall.py | 34 +- .../_internal/resolution/legacy/resolver.py | 18 +- .../_internal/resolution/resolvelib/base.py | 8 +- .../resolution/resolvelib/candidates.py | 124 +- .../resolution/resolvelib/factory.py | 204 +- .../resolution/resolvelib/reporter.py | 2 +- .../resolution/resolvelib/requirements.py | 35 +- .../resolution/resolvelib/resolver.py | 23 +- src/pip/_internal/self_outdated_check.py | 26 +- src/pip/_internal/utils/glibc.py | 8 +- src/pip/_internal/utils/hashes.py | 7 + .../_internal/utils/inject_securetransport.py | 35 - src/pip/_internal/utils/logging.py | 4 +- src/pip/_internal/utils/misc.py | 129 +- src/pip/_internal/utils/subprocess.py | 2 +- src/pip/_internal/utils/temp_dir.py | 54 +- src/pip/_internal/utils/wheel.py | 6 +- src/pip/_internal/vcs/git.py | 2 +- src/pip/_internal/vcs/mercurial.py | 2 +- src/pip/_internal/vcs/versioncontrol.py | 10 +- src/pip/_internal/wheel_builder.py | 11 +- src/pip/_vendor/__init__.py | 1 + src/pip/_vendor/cachecontrol.pyi | 1 - src/pip/_vendor/cachecontrol/__init__.py | 18 +- src/pip/_vendor/cachecontrol/_cmd.py | 25 +- src/pip/_vendor/cachecontrol/adapter.py | 80 +- src/pip/_vendor/cachecontrol/cache.py | 33 +- .../_vendor/cachecontrol/caches/__init__.py | 5 +- .../_vendor/cachecontrol/caches/file_cache.py | 83 +- .../cachecontrol/caches/redis_cache.py | 31 +- src/pip/_vendor/cachecontrol/compat.py | 32 - src/pip/_vendor/cachecontrol/controller.py | 171 +- src/pip/_vendor/cachecontrol/filewrapper.py | 30 +- src/pip/_vendor/cachecontrol/heuristics.py | 57 +- src/pip/_vendor/cachecontrol/py.typed | 0 src/pip/_vendor/cachecontrol/serialize.py | 196 +- src/pip/_vendor/cachecontrol/wrapper.py | 34 +- src/pip/_vendor/certifi/__init__.py | 2 +- src/pip/_vendor/certifi/cacert.pem | 386 ++-- src/pip/_vendor/pkg_resources/LICENSE | 2 - src/pip/_vendor/pkg_resources/__init__.py | 20 +- src/pip/_vendor/platformdirs/__init__.py | 143 +- src/pip/_vendor/platformdirs/__main__.py | 24 +- src/pip/_vendor/platformdirs/android.py | 112 +- src/pip/_vendor/platformdirs/api.py | 70 +- src/pip/_vendor/platformdirs/macos.py | 33 +- src/pip/_vendor/platformdirs/unix.py | 97 +- src/pip/_vendor/platformdirs/version.py | 4 +- src/pip/_vendor/platformdirs/windows.py | 104 +- src/pip/_vendor/pygments/__init__.py | 24 +- src/pip/_vendor/pygments/__main__.py | 2 +- src/pip/_vendor/pygments/cmdline.py | 4 +- src/pip/_vendor/pygments/console.py | 2 +- src/pip/_vendor/pygments/filter.py | 2 +- src/pip/_vendor/pygments/filters/__init__.py | 2 +- src/pip/_vendor/pygments/formatter.py | 52 +- .../_vendor/pygments/formatters/__init__.py | 54 +- .../_vendor/pygments/formatters/_mapping.py | 4 +- src/pip/_vendor/pygments/formatters/bbcode.py | 2 +- src/pip/_vendor/pygments/formatters/groff.py | 4 +- src/pip/_vendor/pygments/formatters/html.py | 26 +- src/pip/_vendor/pygments/formatters/img.py | 2 +- src/pip/_vendor/pygments/formatters/irc.py | 2 +- src/pip/_vendor/pygments/formatters/latex.py | 2 +- src/pip/_vendor/pygments/formatters/other.py | 2 +- .../pygments/formatters/pangomarkup.py | 2 +- src/pip/_vendor/pygments/formatters/rtf.py | 2 +- src/pip/_vendor/pygments/formatters/svg.py | 2 +- .../_vendor/pygments/formatters/terminal.py | 2 +- .../pygments/formatters/terminal256.py | 2 +- src/pip/_vendor/pygments/lexer.py | 106 +- src/pip/_vendor/pygments/lexers/__init__.py | 90 +- src/pip/_vendor/pygments/lexers/_mapping.py | 10 +- src/pip/_vendor/pygments/lexers/python.py | 146 +- src/pip/_vendor/pygments/modeline.py | 2 +- src/pip/_vendor/pygments/plugin.py | 2 +- src/pip/_vendor/pygments/regexopt.py | 2 +- src/pip/_vendor/pygments/scanner.py | 2 +- src/pip/_vendor/pygments/sphinxext.py | 2 +- src/pip/_vendor/pygments/style.py | 2 +- src/pip/_vendor/pygments/styles/__init__.py | 16 +- src/pip/_vendor/pygments/token.py | 2 +- src/pip/_vendor/pygments/unistring.py | 6 +- src/pip/_vendor/pygments/util.py | 30 +- src/pip/_vendor/pyparsing/__init__.py | 75 +- src/pip/_vendor/pyparsing/actions.py | 34 +- src/pip/_vendor/pyparsing/common.py | 58 +- src/pip/_vendor/pyparsing/core.py | 1197 +++++++----- src/pip/_vendor/pyparsing/diagram/__init__.py | 32 +- src/pip/_vendor/pyparsing/exceptions.py | 64 +- src/pip/_vendor/pyparsing/helpers.py | 196 +- src/pip/_vendor/pyparsing/results.py | 128 +- src/pip/_vendor/pyparsing/testing.py | 24 +- src/pip/_vendor/pyparsing/unicode.py | 101 +- src/pip/_vendor/pyparsing/util.py | 89 +- src/pip/_vendor/requests/__init__.py | 8 +- src/pip/_vendor/requests/__version__.py | 4 +- src/pip/_vendor/requests/_internal_utils.py | 6 +- src/pip/_vendor/requests/adapters.py | 72 +- src/pip/_vendor/requests/api.py | 6 +- src/pip/_vendor/requests/sessions.py | 4 +- src/pip/_vendor/requests/utils.py | 30 +- src/pip/_vendor/rich/console.py | 2 +- src/pip/_vendor/rich/syntax.py | 4 +- src/pip/_vendor/truststore/LICENSE | 21 + src/pip/_vendor/truststore/__init__.py | 13 + src/pip/_vendor/truststore/_api.py | 302 +++ src/pip/_vendor/truststore/_macos.py | 501 +++++ src/pip/_vendor/truststore/_openssl.py | 66 + src/pip/_vendor/truststore/_ssl_constants.py | 31 + src/pip/_vendor/truststore/_windows.py | 554 ++++++ src/pip/_vendor/truststore/py.typed | 0 src/pip/_vendor/typing_extensions.LICENSE | 33 +- src/pip/_vendor/typing_extensions.py | 1642 ++++++++++++----- src/pip/_vendor/urllib3/_version.py | 2 +- src/pip/_vendor/urllib3/connectionpool.py | 38 +- .../packages/backports/weakref_finalize.py | 155 ++ src/pip/_vendor/urllib3/poolmanager.py | 2 +- src/pip/_vendor/urllib3/request.py | 21 + src/pip/_vendor/urllib3/util/retry.py | 2 +- src/pip/_vendor/vendor.txt | 21 +- tests/conftest.py | 405 +++- tests/functional/test_build_env.py | 41 +- tests/functional/test_cache.py | 27 +- tests/functional/test_cli.py | 8 +- tests/functional/test_completion.py | 28 +- tests/functional/test_debug.py | 2 +- tests/functional/test_download.py | 370 ++-- tests/functional/test_fast_deps.py | 35 + tests/functional/test_freeze.py | 70 +- tests/functional/test_help.py | 7 +- tests/functional/test_inspect.py | 3 +- tests/functional/test_install.py | 327 +++- tests/functional/test_install_compat.py | 8 +- tests/functional/test_install_config.py | 38 +- tests/functional/test_install_extras.py | 75 +- tests/functional/test_install_index.py | 8 +- tests/functional/test_install_report.py | 216 ++- tests/functional/test_install_reqs.py | 52 +- tests/functional/test_install_upgrade.py | 11 +- tests/functional/test_install_user.py | 2 +- tests/functional/test_install_vcs_git.py | 2 +- tests/functional/test_install_wheel.py | 4 +- tests/functional/test_list.py | 39 +- tests/functional/test_new_resolver.py | 174 +- tests/functional/test_new_resolver_errors.py | 6 +- tests/functional/test_new_resolver_hashes.py | 63 +- tests/functional/test_new_resolver_target.py | 7 +- tests/functional/test_pep517.py | 12 +- tests/functional/test_python_option.py | 12 + tests/functional/test_truststore.py | 15 - tests/functional/test_uninstall.py | 24 +- tests/functional/test_wheel.py | 20 +- tests/lib/__init__.py | 101 +- tests/lib/certs.py | 6 +- tests/lib/compat.py | 23 +- tests/lib/configuration_helpers.py | 2 +- tests/lib/local_repos.py | 2 +- tests/lib/server.py | 53 +- tests/lib/test_lib.py | 4 +- tests/lib/test_wheel.py | 10 +- tests/lib/venv.py | 2 +- tests/lib/wheel.py | 2 +- tests/unit/metadata/test_metadata.py | 20 +- .../resolution_resolvelib/test_requirement.py | 22 +- tests/unit/test_base_command.py | 6 +- tests/unit/test_collector.py | 123 +- tests/unit/test_configuration.py | 39 +- tests/unit/test_direct_url.py | 30 + tests/unit/test_link.py | 5 +- tests/unit/test_logging.py | 14 +- tests/unit/test_network_auth.py | 18 +- tests/unit/test_network_cache.py | 22 + tests/unit/test_network_utils.py | 4 +- tests/unit/test_options.py | 6 +- tests/unit/test_req.py | 134 +- tests/unit/test_req_file.py | 14 +- tests/unit/test_req_uninstall.py | 39 +- tests/unit/test_resolution_legacy_resolver.py | 6 +- tests/unit/test_self_check_outdated.py | 13 +- tests/unit/test_target_python.py | 44 +- tests/unit/test_utils.py | 44 +- tests/unit/test_utils_subprocess.py | 4 +- tests/unit/test_utils_temp_dir.py | 23 + tests/unit/test_vcs.py | 19 +- tests/unit/test_wheel.py | 8 +- tools/__init__.py | 0 tools/ci/New-RAMDisk.ps1 | 74 - tools/release/check_version.py | 2 +- tools/update-rtd-redirects.py | 5 +- 327 files changed, 9914 insertions(+), 4105 deletions(-) create mode 100644 .git-blame-ignore-revs create mode 100644 .github/dependabot.yml delete mode 100644 .github/workflows/no-response.yml delete mode 100644 news/10937.feature.rst delete mode 100644 news/11169.feature.rst delete mode 100644 news/11325.feature.rst delete mode 100644 news/11358.removal.rst delete mode 100644 news/11451.removal.rst delete mode 100644 news/11453.removal.rst delete mode 100644 news/11529.bugfix.rst delete mode 100644 news/11681.feature.rst delete mode 100644 news/11702.trivial.rst delete mode 100644 news/11719.bugfix.rst delete mode 100644 news/11774.bugfix.rst delete mode 100644 news/11775.doc.rst delete mode 100644 news/11786.feature.rst delete mode 100644 news/11809.doc.rst create mode 100644 news/11815.doc.rst delete mode 100644 news/11837.bugfix.rst delete mode 100644 news/11838.doc.rst delete mode 100644 news/11842.doc.rst delete mode 100644 news/11859.removal.rst delete mode 100644 news/11882.bugfix.rst delete mode 100644 news/11908.feature.rst create mode 100644 news/11909.process.rst delete mode 100644 news/11935.feature.rst delete mode 100644 news/11941.feature.rst create mode 100644 news/12389.bugfix.rst create mode 100644 news/12390.trivial.rst create mode 100644 news/12393.trivial.rst create mode 100644 news/12417.doc.rst create mode 100644 news/12434.doc.rst delete mode 100644 news/8368.removal.rst delete mode 100644 news/8559.removal.rst delete mode 100644 news/8719.feature.rst delete mode 100644 news/9752.feature.rst delete mode 100644 news/msgpack.vendor.rst delete mode 100644 news/pkg_resources.vendor.rst delete mode 100644 news/platformdirs.vendor.rst delete mode 100644 news/pygments.vendor.rst delete mode 100644 news/resolvelib.vendor.rst delete mode 100644 news/rich.vendor.rst delete mode 100644 news/setuptools.vendor.rst delete mode 100644 news/tenacity.vendor.rst delete mode 100644 news/typing_extensions.vendor.rst delete mode 100644 news/urllib3.vendor.rst delete mode 100644 src/pip/_internal/utils/inject_securetransport.py delete mode 100644 src/pip/_vendor/cachecontrol.pyi delete mode 100644 src/pip/_vendor/cachecontrol/compat.py create mode 100644 src/pip/_vendor/cachecontrol/py.typed create mode 100644 src/pip/_vendor/truststore/LICENSE create mode 100644 src/pip/_vendor/truststore/__init__.py create mode 100644 src/pip/_vendor/truststore/_api.py create mode 100644 src/pip/_vendor/truststore/_macos.py create mode 100644 src/pip/_vendor/truststore/_openssl.py create mode 100644 src/pip/_vendor/truststore/_ssl_constants.py create mode 100644 src/pip/_vendor/truststore/_windows.py create mode 100644 src/pip/_vendor/truststore/py.typed create mode 100644 src/pip/_vendor/urllib3/packages/backports/weakref_finalize.py create mode 100644 tools/__init__.py delete mode 100644 tools/ci/New-RAMDisk.ps1 diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000000..f09b08660e7 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,36 @@ +917b41d6d73535c090fc312668dff353cdaef906 # Blacken docs/html/conf.py +ed383dd8afa8fe0250dcf9b8962927ada0e21c89 # Blacken docs/pip_sphinxext.py +228405e62451abe8a66233573035007df4be575f # Blacken noxfile.py +f477a9f490e978177b71c9dbaa5465c51ea21129 # Blacken setup.py +e59ba23468390217479465019f8d78e724a23550 # Blacken src/pip/__main__.py +d7013db084e9a52242354ee5754dc5d19ccf062e # Blacken src/pip/_internal/build_env.py +30e9ffacae75378fc3e3df48f754dabad037edb9 # Blacken src/pip/_internal/cache.py +8341d56b46776a805286218ac5fb0e7850fd9341 # Blacken src/pip/_internal/cli/autocompletion.py +3d3461ed65208656358b3595e25d8c31c5c89470 # Blacken src/pip/_internal/cli/base_command.py +d489b0f1b104bc936b0fb17e6c33633664ebdc0e # Blacken src/pip/_internal/cli/cmdoptions.py +591fe4841aefe9befa0530f2a54f820c4ecbb392 # Blacken src/pip/_internal/cli/command_context.py +9265b28ef7248ae1847a80384dbeeb8119c3e2f5 # Blacken src/pip/_internal/cli/main.py +847a369364878c38d210c90beed2737bb6fb3a85 # Blacken src/pip/_internal/cli/main_parser.py +ec97119067041ae58b963935ff5f0e5d9fead80c # Blacken src/pip/_internal/cli/parser.py +6e3b8de22fa39fa3073599ecf9db61367f4b3b32 # Blacken src/pip/_internal/cli/progress_bars.py +55405227de983c5bd5bf0858ea12dbe537d3e490 # Blacken src/pip/_internal/cli/req_command.py +d5ca5c850cae9a0c64882a8f49d3a318699a7e2e # Blacken src/pip/_internal/cli/spinners.py +9747cb48f8430a7a91b36fe697dd18dbddb319f0 # Blacken src/pip/_internal/commands/__init__.py +1c09fd6f124df08ca36bed68085ad68e89bb1957 # Blacken src/pip/_internal/commands/cache.py +315e93d7eb87cd476afcc4eaf0f01a7b56a5037f # Blacken src/pip/_internal/commands/check.py +8ae3b96ed7d24fd24024ccce4840da0dcf635f26 # Blacken src/pip/_internal/commands/completion.py +42ca4792202f26a293ee48380718743a80bbee37 # Blacken src/pip/_internal/commands/configuration.py +790ad78fcd43d41a5bef9dca34a3c128d05eb02c # Blacken src/pip/_internal/commands/debug.py +a6fcc8f045afe257ce321f4012fc8fcb4be01eb3 # Blacken src/pip/_internal/commands/download.py +920e735dfc60109351fbe2f4c483c2f6ede9e52d # Blacken src/pip/_internal/commands/freeze.py +053004e0fcf0851238b1064fbce13aea87b24e9c # Blacken src/pip/_internal/commands/hash.py +a6b6ae487e52c2242045b64cb8962e0a992cfd76 # Blacken src/pip/_internal/commands/help.py +2495cf95a6c7eb61ccf1f9f0e8b8d736af914e53 # Blacken __main__.py +c7ee560e00b85f7486b452c14ff49e4737996eda # Blacken tools/ +8e2e1964a4f0a060f7299a96a911c9e116b2283d # Blacken src/pip/_internal/commands/ +1bc0eef05679e87f45540ab0a294667cb3c6a88e # Blacken src/pip/_internal/network/ +069b01932a7d64a81c708c6254cc93e1f89e6783 # Blacken src/pip/_internal/req +1897784d59e0d5fcda2dd75fea54ddd8be3d502a # Blacken src/pip/_internal/index +94999255d5ede440c37137d210666fdf64302e75 # Reformat the codebase, with black +585037a80a1177f1fa92e159a7079855782e543e # Cleanup implicit string concatenation +8a6f6ac19b80a6dc35900a47016c851d9fcd2ee2 # Blacken src/pip/_internal/resolution directory diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..8ac6b8c4984 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 667f0c86f98..99d57e57d44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.x" @@ -57,7 +57,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.x" @@ -81,7 +81,7 @@ jobs: github.event_name != 'pull_request' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.x" @@ -91,7 +91,7 @@ jobs: - run: git diff --exit-code tests-unix: - name: tests / ${{ matrix.python }} / ${{ matrix.os }} + name: tests / ${{ matrix.python.key || matrix.python }} / ${{ matrix.os }} runs-on: ${{ matrix.os }}-latest needs: [packaging, determine-changes] @@ -108,12 +108,14 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} + allow-prereleases: true - name: Install Ubuntu dependencies if: matrix.os == 'Ubuntu' @@ -128,12 +130,12 @@ jobs: # Main check - name: Run unit tests run: >- - nox -s test-${{ matrix.python }} -- + nox -s test-${{ matrix.python.key || matrix.python }} -- -m unit --verbose --numprocesses auto --showlocals - name: Run integration tests run: >- - nox -s test-${{ matrix.python }} -- + nox -s test-${{ matrix.python.key || matrix.python }} -- -m integration --verbose --numprocesses auto --showlocals --durations=5 @@ -160,29 +162,18 @@ jobs: group: [1, 2] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} - # We use a RAMDisk on Windows, since filesystem IO is a big slowdown - # for our tests. - - name: Create a RAMDisk - run: ./tools/ci/New-RAMDisk.ps1 -Drive R -Size 1GB - - - name: Setup RAMDisk permissions - run: | - mkdir R:\Temp - $acl = Get-Acl "R:\Temp" - $rule = New-Object System.Security.AccessControl.FileSystemAccessRule( - "Everyone", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow" - ) - $acl.AddAccessRule($rule) - Set-Acl "R:\Temp" $acl - + # We use C:\Temp (which is already available on the worker) + # as a temporary directory for all of the tests because the + # default value (under the user dir) is more deeply nested + # and causes tests to fail with "path too long" errors. - run: pip install nox env: - TEMP: "R:\\Temp" + TEMP: "C:\\Temp" # Main check - name: Run unit tests @@ -192,7 +183,7 @@ jobs: -m unit --verbose --numprocesses auto --showlocals env: - TEMP: "R:\\Temp" + TEMP: "C:\\Temp" - name: Run integration tests (group 1) if: matrix.group == 1 @@ -201,7 +192,7 @@ jobs: -m integration -k "not test_install" --verbose --numprocesses auto --showlocals env: - TEMP: "R:\\Temp" + TEMP: "C:\\Temp" - name: Run integration tests (group 2) if: matrix.group == 2 @@ -210,7 +201,7 @@ jobs: -m integration -k "test_install" --verbose --numprocesses auto --showlocals env: - TEMP: "R:\\Temp" + TEMP: "C:\\Temp" tests-zipapp: name: tests / zipapp @@ -222,7 +213,7 @@ jobs: github.event_name != 'pull_request' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.10" diff --git a/.github/workflows/lock-threads.yml b/.github/workflows/lock-threads.yml index 990440dd6c8..dc68b683bef 100644 --- a/.github/workflows/lock-threads.yml +++ b/.github/workflows/lock-threads.yml @@ -17,7 +17,7 @@ jobs: if: github.repository_owner == 'pypa' runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v3 + - uses: dessant/lock-threads@v4 with: issue-inactive-days: '30' pr-inactive-days: '15' diff --git a/.github/workflows/news-file.yml b/.github/workflows/news-file.yml index 371e12fd755..398ad1b7e67 100644 --- a/.github/workflows/news-file.yml +++ b/.github/workflows/news-file.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # `towncrier check` runs `git diff --name-only origin/main...`, which # needs a non-shallow clone. diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml deleted file mode 100644 index 939290b93e5..00000000000 --- a/.github/workflows/no-response.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: No Response - -# Both `issue_comment` and `scheduled` event types are required for this Action -# to work properly. -on: - issue_comment: - types: [created] - schedule: - # Schedule for five minutes after the hour, every hour - - cron: '5 * * * *' - -jobs: - noResponse: - runs-on: ubuntu-latest - steps: - - uses: lee-dohm/no-response@v0.5.0 - with: - token: ${{ github.token }} - responseRequiredLabel: "S: awaiting response" diff --git a/.github/workflows/update-rtd-redirects.yml b/.github/workflows/update-rtd-redirects.yml index 8259b6c0b6a..c333a09a30d 100644 --- a/.github/workflows/update-rtd-redirects.yml +++ b/.github/workflows/update-rtd-redirects.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest environment: RTD Deploys steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.11" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2fc455b9d64..18d911256d3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,42 +17,31 @@ repos: exclude: .patch - repo: https://github.com/psf/black - rev: 23.1.0 + rev: 23.7.0 hooks: - id: black -- repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 +- repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.1.4 hooks: - - id: flake8 - additional_dependencies: [ - 'flake8-bugbear', - 'flake8-logging-format', - 'flake8-implicit-str-concat', - ] - exclude: tests/data - -- repo: https://github.com/PyCQA/isort - rev: 5.12.0 - hooks: - - id: isort - files: \.py$ + - id: ruff + args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.961 + rev: v1.6.1 hooks: - id: mypy exclude: tests/data args: ["--pretty", "--show-error-codes"] additional_dependencies: [ - 'keyring==23.0.1', - 'nox==2021.6.12', + 'keyring==24.2.0', + 'nox==2023.4.22', 'pytest', - 'types-docutils==0.18.3', - 'types-setuptools==57.4.14', - 'types-freezegun==1.1.9', - 'types-six==1.16.15', - 'types-pyyaml==6.0.12.2', + 'types-docutils==0.20.0.3', + 'types-setuptools==68.2.0.0', + 'types-freezegun==1.1.10', + 'types-six==1.16.21.9', + 'types-pyyaml==6.0.12.12', ] - repo: https://github.com/pre-commit/pygrep-hooks diff --git a/.readthedocs.yml b/.readthedocs.yml index 7d62011a6e3..c0d2bba55e9 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,10 +1,14 @@ version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.11" + sphinx: - builder: htmldir + builder: dirhtml configuration: docs/html/conf.py python: - version: 3.8 install: - requirements: docs/requirements.txt diff --git a/AUTHORS.txt b/AUTHORS.txt index 0f0fb3caf98..e02de32bcf3 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -20,6 +20,7 @@ Albert-Guan albertg Alberto Sottile Aleks Bunin +Ales Erjavec Alethea Flowers Alex Gaynor Alex Grönholm @@ -30,6 +31,7 @@ Alex Stachowiak Alexander Shtyrov Alexandre Conrad Alexey Popravka +Aleš Erjavec Alli Ami Fischman Ananya Maiti @@ -71,6 +73,7 @@ atse Atsushi Odagiri Avinash Karhana Avner Cohen +Awit (Ah-Wit) Ghirmai Baptiste Mispelon Barney Gale barneygale @@ -126,6 +129,7 @@ Chih-Hsuan Yen Chris Brinker Chris Hunt Chris Jerdonek +Chris Kuehl Chris McDonough Chris Pawley Chris Pryer @@ -143,6 +147,7 @@ Clay McClure Cody Cody Soyland Colin Watson +Collin Anderson Connor Osborn Cooper Lees Cooper Ry Lees @@ -193,9 +198,11 @@ David Runge David Tucker David Wales Davidovich +ddelange Deepak Sharma Deepyaman Datta Denise Yu +dependabot[bot] derwolfe Desetude Devesh Kumar Singh @@ -212,6 +219,7 @@ Dominic Davis-Foster Donald Stufft Dongweiming doron zarhi +Dos Moonen Douglas Thor DrFeathers Dustin Ingram @@ -219,6 +227,8 @@ Dwayne Bailey Ed Morley Edgar Ramírez Ee Durbin +Efflam Lemaillet +efflamlemaillet Eitan Adler ekristina elainechan @@ -274,6 +284,7 @@ gpiks Greg Roodt Greg Ward Guilherme Espada +Guillaume Seguin gutsytechster Guy Rozendorn Guy Tuval @@ -288,6 +299,7 @@ Henrich Hartzer Henry Schreiner Herbert Pfennig Holly Stotelmyer +Honnix Hsiaoming Yang Hugo Lopes Tavares Hugo van Kemenade @@ -306,6 +318,7 @@ Ilya Baryshev Inada Naoki Ionel Cristian Mărieș Ionel Maries Cristian +Itamar Turner-Trauring Ivan Pozdeev Jacob Kim Jacob Walls @@ -326,10 +339,13 @@ Jarek Potiuk jarondl Jason Curtis Jason R. Coombs +JasonMo +JasonMo1 Jay Graves Jean-Christophe Fillion-Robin Jeff Barber Jeff Dairiki +Jeff Widman Jelmer Vernooij jenix21 Jeremy Stanley @@ -340,6 +356,7 @@ Jim Fisher Jim Garrison Jiun Bae Jivan Amara +Joe Bylund Joe Michelini John Paton John T. Wodder II @@ -358,6 +375,8 @@ Joseph Long Josh Bronson Josh Hansen Josh Schneier +Joshua +Juan Luis Cano Rodríguez Juanjo Bazán Judah Rand Julian Berman @@ -387,6 +406,7 @@ KOLANICH kpinc Krishna Oza Kumar McMillan +Kurt McKee Kyle Persohn lakshmanaram Laszlo Kiss-Kollar @@ -399,9 +419,11 @@ Leon Sasson Lev Givon Lincoln de Sousa Lipis +lorddavidiii Loren Carvalho Lucas Cimon Ludovic Gasc +Lukas Geiger Lukas Juhrich Luke Macken Luo Jiebin @@ -432,8 +454,10 @@ Matt Maker Matt Robenolt matthew Matthew Einhorn +Matthew Feickert Matthew Gilliard Matthew Iversen +Matthew Treinish Matthew Trumbell Matthew Willson Matthias Bussonnier @@ -451,6 +475,7 @@ Michael Michael Aquilina Michael E. Karpeles Michael Klich +Michael Mintz Michael Williamson michaelpacer Michał Górny @@ -482,6 +507,7 @@ Nick Timkovich Nicolas Bock Nicole Harris Nikhil Benesch +Nikhil Ladha Nikita Chepanov Nikolay Korolev Nipunn Koorapati @@ -514,6 +540,7 @@ Patrick Jenkins Patrick Lawson patricktokeeffe Patrik Kopkan +Paul Ganssle Paul Kehrer Paul Moore Paul Nasrat @@ -539,6 +566,7 @@ Philip Molloy Philippe Ombredanne Pi Delport Pierre-Yves Rofes +Pieter Degroote pip Prabakaran Kumaresshan Prabhjyotsing Surjit Singh Sodhi @@ -546,6 +574,7 @@ Prabhu Marappan Pradyun Gedam Prashant Sharma Pratik Mallya +pre-commit-ci[bot] Preet Thakkar Preston Holmes Przemek Wrzos @@ -571,11 +600,13 @@ Rishi RobberPhex Robert Collins Robert McGibbon +Robert Pollak Robert T. McGibbon robin elisha robinson Roey Berman Rohan Jain Roman Bogorodskiy +Roman Donchenko Romuald Brunet ronaudinho Ronny Pfannschmidt @@ -584,11 +615,13 @@ Ross Brattain Roy Wellington Ⅳ Ruairidh MacLeod Russell Keith-Magee +Ryan Shepherd Ryan Wooden ryneeverett Sachi King Salvatore Rinchiera sandeepkiran-js +Sander Van Balen Savio Jomton schlamar Scott Kitterman @@ -601,6 +634,8 @@ SeongSoo Cho Sergey Vasilyev Seth Michael Larson Seth Woodworth +Shahar Epstein +Shantanu shireenrao Shivansh-007 Shlomi Fish @@ -625,7 +660,9 @@ Steve Barnes Steve Dower Steve Kowalik Steven Myint +Steven Silvester stonebig +studioj Stéphane Bidoul Stéphane Bidoul (ACSONE) Stéphane Klein @@ -652,6 +689,7 @@ Tim Harder Tim Heap tim smith tinruufu +Tobias Hermann Tom Forbes Tom Freudenheim Tom V @@ -685,6 +723,7 @@ Vladimir Rutsky W. Trevor King Wil Tan Wilfred Hughes +William Edwards William ML Leslie William T Olson William Woodruff @@ -692,6 +731,7 @@ Wilson Mo wim glenn Winson Luk Wolfgang Maier +Wu Zhenyu XAMES3 Xavier Fernandez xoviat diff --git a/MANIFEST.in b/MANIFEST.in index 4716f415730..f896c0258e6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -14,6 +14,7 @@ recursive-include src/pip/_vendor *COPYING* include docs/docutils.conf include docs/requirements.txt +exclude .git-blame-ignore-revs exclude .coveragerc exclude .mailmap exclude .appveyor.yml diff --git a/NEWS.rst b/NEWS.rst index 5169dad1d43..8738e181e2e 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -9,6 +9,268 @@ .. towncrier release notes start +23.3.2 (2023-12-17) +=================== + +Bug Fixes +--------- + +- Fix a bug in extras handling for link requirements (`#12372 `_) +- Fix mercurial revision "parse error": use ``--rev={ref}`` instead of ``-r={ref}`` (`#12373 `_) + + +23.3.1 (2023-10-21) +=================== + +Bug Fixes +--------- + +- Handle a timezone indicator of Z when parsing dates in the self check. (`#12338 `_) +- Fix bug where installing the same package at the same time with multiple pip processes could fail. (`#12361 `_) + + +23.3 (2023-10-15) +================= + +Process +------- + +- Added reference to `vulnerability reporting guidelines `_ to pip's security policy. + +Deprecations and Removals +------------------------- + +- Drop a fallback to using SecureTransport on macOS. It was useful when pip detected OpenSSL older than 1.0.1, but the current pip does not support any Python version supporting such old OpenSSL versions. (`#12175 `_) + +Features +-------- + +- Improve extras resolution for multiple constraints on same base package. (`#11924 `_) +- Improve use of datastructures to make candidate selection 1.6x faster. (`#12204 `_) +- Allow ``pip install --dry-run`` to use platform and ABI overriding options. (`#12215 `_) +- Add ``is_yanked`` boolean entry to the installation report (``--report``) to indicate whether the requirement was yanked from the index, but was still selected by pip conform to :pep:`592`. (`#12224 `_) + +Bug Fixes +--------- + +- Ignore errors in temporary directory cleanup (show a warning instead). (`#11394 `_) +- Normalize extras according to :pep:`685` from package metadata in the resolver + for comparison. This ensures extras are correctly compared and merged as long + as the package providing the extra(s) is built with values normalized according + to the standard. Note, however, that this *does not* solve cases where the + package itself contains unnormalized extra values in the metadata. (`#11649 `_) +- Prevent downloading sdists twice when :pep:`658` metadata is present. (`#11847 `_) +- Include all requested extras in the install report (``--report``). (`#11924 `_) +- Removed uses of ``datetime.datetime.utcnow`` from non-vendored code. (`#12005 `_) +- Consistently report whether a dependency comes from an extra. (`#12095 `_) +- Fix completion script for zsh (`#12166 `_) +- Fix improper handling of the new onexc argument of ``shutil.rmtree()`` in Python 3.12. (`#12187 `_) +- Filter out yanked links from the available versions error message: "(from versions: 1.0, 2.0, 3.0)" will not contain yanked versions conform PEP 592. The yanked versions (if any) will be mentioned in a separate error message. (`#12225 `_) +- Fix crash when the git version number contains something else than digits and dots. (`#12280 `_) +- Use ``-r=...`` instead of ``-r ...`` to specify references with Mercurial. (`#12306 `_) +- Redact password from URLs in some additional places. (`#12350 `_) +- pip uses less memory when caching large packages. As a result, there is a new on-disk cache format stored in a new directory ($PIP_CACHE_DIR/http-v2). (`#2984 `_) + +Vendored Libraries +------------------ + +- Upgrade certifi to 2023.7.22 +- Add truststore 0.8.0 +- Upgrade urllib3 to 1.26.17 + +Improved Documentation +---------------------- + +- Document that ``pip search`` support has been removed from PyPI (`#12059 `_) +- Clarify --prefer-binary in CLI and docs (`#12122 `_) +- Document that using OS-provided Python can cause pip's test suite to report false failures. (`#12334 `_) + + +23.2.1 (2023-07-22) +=================== + +Bug Fixes +--------- + +- Disable :pep:`658` metadata fetching with the legacy resolver. (`#12156 `_) + + +23.2 (2023-07-15) +================= + +Process +------- + +- Deprecate support for eggs for Python 3.11 or later, when the new ``importlib.metadata`` backend is used to load distribution metadata. This only affects the egg *distribution format* (with the ``.egg`` extension); distributions using the ``.egg-info`` *metadata format* (but are not actually eggs) are not affected. For more information about eggs, see `relevant section in the setuptools documentation `__. + +Deprecations and Removals +------------------------- + +- Deprecate legacy version and version specifiers that don't conform to the + :ref:`specification `. + (`#12063 `_) +- ``freeze`` no longer excludes the ``setuptools``, ``distribute``, and ``wheel`` + from the output when running on Python 3.12 or later, where they are not + included in a virtual environment by default. Use ``--exclude`` if you wish to + exclude any of these packages. (`#4256 `_) + +Features +-------- + +- make rejection messages slightly different between 1 and 8, so the user can make the difference. (`#12040 `_) + +Bug Fixes +--------- + +- Fix ``pip completion --zsh``. (`#11417 `_) +- Prevent downloading files twice when :pep:`658` metadata is present (`#11847 `_) +- Add permission check before configuration (`#11920 `_) +- Fix deprecation warnings in Python 3.12 for usage of shutil.rmtree (`#11957 `_) +- Ignore invalid or unreadable ``origin.json`` files in the cache of locally built wheels. (`#11985 `_) +- Fix installation of packages with :pep:`658` metadata using non-canonicalized names (`#12038 `_) +- Correctly parse ``dist-info-metadata`` values from JSON-format index data. (`#12042 `_) +- Fail with an error if the ``--python`` option is specified after the subcommand name. (`#12067 `_) +- Fix slowness when using ``importlib.metadata`` (the default way for pip to read metadata in Python 3.11+) and there is a large overlap between already installed and to-be-installed packages. (`#12079 `_) +- Pass the ``-r`` flag to mercurial to be explicit that a revision is passed and protect + against ``hg`` options injection as part of VCS URLs. Users that do not have control on + VCS URLs passed to pip are advised to upgrade. (`#12119 `_) + +Vendored Libraries +------------------ + +- Upgrade certifi to 2023.5.7 +- Upgrade platformdirs to 3.8.1 +- Upgrade pygments to 2.15.1 +- Upgrade pyparsing to 3.1.0 +- Upgrade Requests to 2.31.0 +- Upgrade rich to 13.4.2 +- Upgrade setuptools to 68.0.0 +- Updated typing_extensions to 4.6.0 +- Upgrade typing_extensions to 4.7.1 +- Upgrade urllib3 to 1.26.16 + + +23.1.2 (2023-04-26) +=================== + +Vendored Libraries +------------------ + +- Upgrade setuptools to 67.7.2 + + +23.1.1 (2023-04-22) +=================== + +Bug Fixes +--------- + +- Revert `#11487 `_, as it causes issues with virtualenvs created by the Windows Store distribution of Python. (`#11987 `_) + +Vendored Libraries +------------------ + +- Revert pkg_resources (via setuptools) back to 65.6.3 + +Improved Documentation +---------------------- + +- Update documentation to reflect the new behavior of using the cache of locally + built wheels in hash-checking mode. (`#11967 `_) + + +23.1 (2023-04-15) +================= + +Deprecations and Removals +------------------------- + +- Remove support for the deprecated ``--install-options``. (`#11358 `_) +- ``--no-binary`` does not imply ``setup.py install`` anymore. Instead a wheel will be + built locally and installed. (`#11451 `_) +- ``--no-binary`` does not disable the cache of locally built wheels anymore. It only + means "don't download wheels". (`#11453 `_) +- Deprecate ``--build-option`` and ``--global-option``. Users are invited to switch to + ``--config-settings``. (`#11859 `_) +- Using ``--config-settings`` with projects that don't have a ``pyproject.toml`` now prints + a deprecation warning. In the future the presence of config settings will automatically + enable the default build backend for legacy projects and pass the settings to it. (`#11915 `_) +- Remove ``setup.py install`` fallback when building a wheel failed for projects without + ``pyproject.toml``. (`#8368 `_) +- When the ``wheel`` package is not installed, pip now uses the default build backend + instead of ``setup.py install`` and ``setup.py develop`` for project without + ``pyproject.toml``. (`#8559 `_) + +Features +-------- + +- Specify egg-link location in assertion message when it does not match installed location to provide better error message for debugging. (`#10476 `_) +- Present conflict information during installation after each choice that is rejected (pass ``-vv`` to ``pip install`` to show it) (`#10937 `_) +- Display dependency chain on each Collecting/Processing log line. (`#11169 `_) +- Support a per-requirement ``--config-settings`` option in requirements files. (`#11325 `_) +- The ``--config-settings``/``-C`` option now supports using the same key multiple + times. When the same key is specified multiple times, all values are passed to + the build backend as a list, as opposed to the previous behavior, where pip would + only pass the last value if the same key was used multiple times. (`#11681 `_) +- Add ``-C`` as a short version of the ``--config-settings`` option. (`#11786 `_) +- Reduce the number of resolver rounds, since backjumping makes the resolver more efficient in finding solutions. This also makes pathological cases fail quicker. (`#11908 `_) +- Warn if ``--hash`` is used on a line without requirement in a requirements file. (`#11935 `_) +- Stop propagating CLI ``--config-settings`` to the build dependencies. They already did + not propagate to requirements provided in requirement files. To pass the same config + settings to several requirements, users should provide the requirements as CLI + arguments. (`#11941 `_) +- Support wheel cache when using ``--require-hashes``. (`#5037 `_) +- Add ``--keyring-provider`` flag. See the Authentication page in the documentation for more info. (`#8719 `_) +- In the case of virtual environments, configuration files are now also included from the base installation. (`#9752 `_) + +Bug Fixes +--------- + +- Fix grammar by changing "A new release of pip available:" to "A new release of pip is available:" in the notice used for indicating that. (`#11529 `_) +- Normalize paths before checking if installed scripts are on PATH. (`#11719 `_) +- Correct the way to decide if keyring is available. (`#11774 `_) +- More consistent resolution backtracking by removing legacy hack related to setuptools resolution (`#11837 `_) +- Include ``AUTHORS.txt`` in pip's wheels. (`#11882 `_) +- The ``uninstall`` and ``install --force-reinstall`` commands no longer call + ``normalize_path()`` repeatedly on the same paths. Instead, these results are + cached for the duration of an uninstall operation, resulting in improved + performance, particularly on Windows. (`#11889 `_) +- Fix and improve the parsing of hashes embedded in URL fragments. (`#11936 `_) +- When package A depends on package B provided as a direct URL dependency including a hash + embedded in the link, the ``--require-hashes`` option did not warn when user supplied hashes + were missing for package B. (`#11938 `_) +- Correctly report ``requested_extras`` in the installation report when extras are + specified for a local directory installation. (`#11946 `_) +- When installing an archive from a direct URL or local file, populate + ``download_info.info.hashes`` in the installation report, in addition to the legacy + ``download_info.info.hash`` key. (`#11948 `_) + +Vendored Libraries +------------------ + +- Upgrade msgpack to 1.0.5 +- Patch pkg_resources to remove dependency on ``jaraco.text``. +- Upgrade platformdirs to 3.2.0 +- Upgrade pygments to 2.14.0 +- Upgrade resolvelib to 1.0.1 +- Upgrade rich to 13.3.3 +- Upgrade setuptools to 67.6.1 +- Upgrade tenacity to 8.2.2 +- Upgrade typing_extensions to 4.5.0 +- Upgrade urllib3 to 1.26.15 + +Improved Documentation +---------------------- + +- Cross-reference the ``--python`` flag from the ``--prefix`` flag, + and mention limitations of ``--prefix`` regarding script installation. (`#11775 `_) +- Add SECURITY.md to make the policy offical. (`#11809 `_) +- Add username to Git over SSH example. (`#11838 `_) +- Quote extras in the pip install docs to guard shells with default glob + qualifiers, like zsh. (`#11842 `_) +- Make it clear that requirements/constraints file can be a URL (`#11954 `_) + + 23.0.1 (2023-02-17) =================== @@ -36,7 +298,7 @@ Features - Change the hashes in the installation report to be a mapping. Emit the ``archive_info.hashes`` dictionary in ``direct_url.json``. (`#11312 `_) -- Implement logic to read the ``EXTERNALLY-MANAGED`` file as specified in PEP 668. +- Implement logic to read the ``EXTERNALLY-MANAGED`` file as specified in :pep:`668`. This allows a downstream Python distributor to prevent users from using pip to modify the externally managed environment. (`#11381 `_) - Enable the use of ``keyring`` found on ``PATH``. This allows ``keyring`` @@ -52,7 +314,7 @@ Bug Fixes - Use the "venv" scheme if available to obtain prefixed lib paths. (`#11598 `_) - Deprecated a historical ambiguity in how ``egg`` fragments in URL-style requirements are formatted and handled. ``egg`` fragments that do not look - like PEP 508 names now produce a deprecation warning. (`#11617 `_) + like :pep:`508` names now produce a deprecation warning. (`#11617 `_) - Fix scripts path in isolated build environment on Debian. (`#11623 `_) - Make ``pip show`` show the editable location if package is editable (`#11638 `_) - Stop checking that ``wheel`` is present when ``build-system.requires`` diff --git a/README.rst b/README.rst index 7e08f857c4c..6ff117db5d2 100644 --- a/README.rst +++ b/README.rst @@ -3,9 +3,15 @@ pip - The Python Package Installer .. image:: https://img.shields.io/pypi/v/pip.svg :target: https://pypi.org/project/pip/ + :alt: PyPI + +.. image:: https://img.shields.io/pypi/pyversions/pip + :target: https://pypi.org/project/pip + :alt: PyPI - Python Version .. image:: https://readthedocs.org/projects/pip/badge/?version=latest :target: https://pip.pypa.io/en/latest + :alt: Documentation pip is the `package installer`_ for Python. You can use pip to install packages from the `Python Package Index`_ and other indexes. @@ -19,10 +25,6 @@ We release updates regularly, with a new version every 3 months. Find more detai * `Release notes`_ * `Release process`_ -In pip 20.3, we've `made a big improvement to the heart of pip`_; `learn more`_. We want your input, so `sign up for our user experience research studies`_ to help us do it right. - -**Note**: pip 21.0, in January 2021, removed Python 2 support, per pip's `Python 2 support policy`_. Please migrate to Python 3. - If you find bugs, need help, or want to talk to the developers, please use our mailing lists or chat rooms: * `Issue tracking`_ @@ -49,10 +51,6 @@ rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_. .. _Release process: https://pip.pypa.io/en/latest/development/release-process/ .. _GitHub page: https://github.com/pypa/pip .. _Development documentation: https://pip.pypa.io/en/latest/development -.. _made a big improvement to the heart of pip: https://pyfound.blogspot.com/2020/11/pip-20-3-new-resolver.html -.. _learn more: https://pip.pypa.io/en/latest/user_guide/#changes-to-the-pip-dependency-resolver-in-20-3-2020 -.. _sign up for our user experience research studies: https://pyfound.blogspot.com/2020/03/new-pip-resolver-to-roll-out-this-year.html -.. _Python 2 support policy: https://pip.pypa.io/en/latest/development/release-process/#python-2-support .. _Issue tracking: https://github.com/pypa/pip/issues .. _Discourse channel: https://discuss.python.org/c/packaging .. _User IRC: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa diff --git a/SECURITY.md b/SECURITY.md index 4e423805aee..e75a1c0de68 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,3 +1,10 @@ -# Security and Vulnerability Reporting +# Security Policy -If you find any security issues, please report to [security@python.org](mailto:security@python.org) +## Reporting a Vulnerability + +Please read the guidelines on reporting security issues [on the +official website](https://www.python.org/dev/security/) for +instructions on how to report a security-related problem to +the Python Security Response Team responsibly. + +To reach the response team, email `security at python dot org`. diff --git a/docs/html/cli/pip_install.rst b/docs/html/cli/pip_install.rst index 951dc2705a3..2664c75223d 100644 --- a/docs/html/cli/pip_install.rst +++ b/docs/html/cli/pip_install.rst @@ -45,11 +45,11 @@ When looking at the items to be installed, pip checks what type of item each is, in the following order: 1. Project or archive URL. -2. Local directory (which must contain a ``setup.py``, or pip will report - an error). +2. Local directory (which must contain a ``pyproject.toml`` or ``setup.py``, + otherwise pip will report an error). 3. Local file (a sdist or wheel format archive, following the naming conventions for those formats). -4. A requirement, as specified in :pep:`440`. +4. A :ref:`version specifier `. Each item identified is added to the set of requirements to be satisfied by the install. @@ -97,7 +97,8 @@ Installation Order .. note:: This section is only about installation order of runtime dependencies, and - does not apply to build dependencies (those are specified using PEP 518). + does not apply to build dependencies (those are specified using the + :ref:`[build-system] table `). As of v6.1.0, pip installs dependencies before their dependents, i.e. in "topological order." This is the only commitment pip currently makes related @@ -181,8 +182,9 @@ Pre-release Versions -------------------- Starting with v1.4, pip will only install stable versions as specified by -`pre-releases`_ by default. If a version cannot be parsed as a compliant :pep:`440` -version then it is assumed to be a pre-release. +`pre-releases`_ by default. If a version cannot be parsed as a +:ref:`compliant ` version then it is assumed to be +a pre-release. If a Requirement specifier includes a pre-release or development version (e.g. ``>=0.0.dev0``) then pip will allow pre-release and development versions @@ -214,8 +216,8 @@ pip looks for packages in a number of places: on PyPI (if not disabled via ``--no-index``), in the local filesystem, and in any additional repositories specified via ``--find-links`` or ``--index-url``. There is no ordering in the locations that are searched. Rather they are all checked, and the "best" -match for the requirements (in terms of version number - see :pep:`440` for -details) is selected. +match for the requirements (in terms of version number - see the +:ref:`specification ` for details) is selected. See the :ref:`pip install Examples`. @@ -380,7 +382,8 @@ Examples py -m pip install -e "git+https://git.repo/some_pkg.git@feature#egg=SomePackage" # from 'feature' branch py -m pip install -e "git+https://git.repo/some_repo.git#egg=subdir&subdirectory=subdir_path" # install a python package from a repo subdirectory -#. Install a package with `extras`_. +#. Install a package with extras, i.e., optional dependencies + (:ref:`specification `). .. tab:: Unix/macOS @@ -418,7 +421,8 @@ Examples py -m pip install "./downloads/SomePackage-1.0.4.tar.gz" py -m pip install "http://my.package.repo/SomePackage-1.0.4.zip" -#. Install a particular source archive file following :pep:`440` direct references. +#. Install a particular source archive file following direct references + (:ref:`specification `). .. tab:: Unix/macOS @@ -539,5 +543,4 @@ Examples py -m pip install SomePackage1 SomePackage2 --no-binary SomePackage1 -.. _extras: https://www.python.org/dev/peps/pep-0508/#extras .. _PyPI: https://pypi.org/ diff --git a/docs/html/cli/pip_search.rst b/docs/html/cli/pip_search.rst index 9905a1bafac..93ddab3fa78 100644 --- a/docs/html/cli/pip_search.rst +++ b/docs/html/cli/pip_search.rst @@ -21,6 +21,12 @@ Usage Description =========== +.. attention:: + PyPI no longer supports ``pip search`` (or XML-RPC search). Please use https://pypi.org/search (via a browser) + instead. See https://warehouse.pypa.io/api-reference/xml-rpc.html#deprecated-methods for more information. + + However, XML-RPC search (and this command) may still be supported by indexes other than PyPI. + .. pip-command-description:: search diff --git a/docs/html/cli/pip_wheel.rst b/docs/html/cli/pip_wheel.rst index bfd19a0ccb1..ba749529c0c 100644 --- a/docs/html/cli/pip_wheel.rst +++ b/docs/html/cli/pip_wheel.rst @@ -34,7 +34,8 @@ Differences to ``build`` ------------------------ `build `_ is a simple tool which can among other things build -wheels for projects using PEP 517. It is comparable to the execution of ``pip wheel --no-deps .``. +wheels for projects using the standard ``pyproject.toml``-based build interface. It +is comparable to the execution of ``pip wheel --no-deps .``. It can also build source distributions which is not possible with ``pip``. ``pip wheel`` covers the wheel scope of ``build`` but offers many additional features. diff --git a/docs/html/development/architecture/package-finding.rst b/docs/html/development/architecture/package-finding.rst index 0b64d420d93..4885d925ee3 100644 --- a/docs/html/development/architecture/package-finding.rst +++ b/docs/html/development/architecture/package-finding.rst @@ -182,8 +182,9 @@ example, whether a pre-release is eligible for selection or whether a file whose hash doesn't match is eligible depends on properties of the collection as a whole. -The ``CandidateEvaluator`` class uses information like the list of `PEP 425`_ -tags compatible with the target Python interpreter, hashes provided by the +The ``CandidateEvaluator`` class uses information like the list of +:ref:`platform tags ` +compatible with the target Python interpreter, hashes provided by the user, and other user preferences, etc. Specifically, the class has a ``get_applicable_candidates()`` method. @@ -236,5 +237,4 @@ The class is the return type of both the ``CandidateEvaluator`` class's ``find_best_candidate()`` method. -.. _`PEP 425`: https://www.python.org/dev/peps/pep-0425/ .. _`PEP 503`: https://www.python.org/dev/peps/pep-0503/ diff --git a/docs/html/development/contributing.rst b/docs/html/development/contributing.rst index 87734ee4d55..b2f6f1d1378 100644 --- a/docs/html/development/contributing.rst +++ b/docs/html/development/contributing.rst @@ -112,7 +112,7 @@ the ``news/`` directory with the extension of ``.trivial.rst``. If you are on a POSIX like operating system, one can be added by running ``touch news/$(uuidgen).trivial.rst``. On Windows, the same result can be achieved in Powershell using ``New-Item "news/$([guid]::NewGuid()).trivial.rst"``. -Core committers may also add a "trivial" label to the PR which will accomplish +Core committers may also add a "skip news" label to the PR which will accomplish the same thing. Upgrading, removing, or adding a new vendored library gets a special mention diff --git a/docs/html/development/getting-started.rst b/docs/html/development/getting-started.rst index 730f5ece08f..bc483997a64 100644 --- a/docs/html/development/getting-started.rst +++ b/docs/html/development/getting-started.rst @@ -27,23 +27,35 @@ Development Environment pip is a command line application written in Python. For developing pip, you should `install Python`_ on your computer. -For developing pip, you need to install :pypi:`nox`. Often, you can run -``python -m pip install nox`` to install and use it. +For developing pip, you need to install :pypi:`nox`. The full development setup would then be: +.. tab:: Unix/macOS + + .. code-block:: shell + + python -m venv .venv + source .venv/bin/activate + python -m pip install nox + +.. tab:: Windows + + .. code-block:: shell + + py -m venv .venv + .venv\Scripts\activate + py -m pip install nox Running pip From Source Tree ============================ To run the pip executable from your source tree during development, install pip locally using editable installation (inside a virtualenv). -You can then invoke your local source tree pip normally. +You can then invoke your local source tree pip normally (be sure virtualenv is active). .. tab:: Unix/macOS .. code-block:: shell - python -m venv .venv - source .venv/bin/activate python -m pip install -e . python -m pip --version @@ -51,8 +63,6 @@ You can then invoke your local source tree pip normally. .. code-block:: shell - py -m venv .venv - .venv\Scripts\activate py -m pip install -e . py -m pip --version @@ -63,7 +73,7 @@ pip's tests are written using the :pypi:`pytest` test framework and :mod:`unittest.mock`. :pypi:`nox` is used to automate the setup and execution of pip's tests. -It is preferable to run the tests in parallel for better experience during development, +It is preferable to run the tests in parallel for a better experience during development, since the tests can take a long time to finish when run sequentially. To run tests: @@ -94,6 +104,15 @@ can select tests using the various ways that pytest provides: $ # Using keywords $ nox -s test-3.10 -- -k "install and not wheel" +.. note:: + + When running pip's tests with OS distribution Python versions, be aware that some + functional tests may fail due to potential patches introduced by the distribution. + For all tests to pass consider: + + - Installing Python from `python.org`_ or compile from source + - Or, using `pyenv`_ to assist with source compilation + Running pip's entire test suite requires supported version control tools (subversion, bazaar, git, and mercurial) to be installed. If you are missing any of these VCS, those tests should be skipped automatically. You can also @@ -104,6 +123,9 @@ explicitly tell pytest to skip those tests: $ nox -s test-3.10 -- -k "not svn" $ nox -s test-3.10 -- -k "not (svn or git)" +.. _python.org: https://www.python.org/downloads/ +.. _pyenv: https://github.com/pyenv/pyenv + Running Linters =============== @@ -184,7 +206,6 @@ in order to start contributing. .. _`open an issue`: https://github.com/pypa/pip/issues/new?title=Trouble+with+pip+development+environment .. _`install Python`: https://realpython.com/installing-python/ -.. _`PEP 484 type-comments`: https://www.python.org/dev/peps/pep-0484/#suggested-syntax-for-python-2-7-and-straddling-code .. _`rich CLI`: https://docs.pytest.org/en/latest/usage.html#specifying-tests-selecting-tests .. _`GitHub`: https://github.com/pypa/pip .. _`good first issues`: https://github.com/pypa/pip/labels/good%20first%20issue diff --git a/docs/html/development/release-process.rst b/docs/html/development/release-process.rst index b71e2820bd2..65ed567070e 100644 --- a/docs/html/development/release-process.rst +++ b/docs/html/development/release-process.rst @@ -145,8 +145,8 @@ Creating a new release #. Push the tag created by ``prepare-release``. #. Regenerate the ``get-pip.py`` script in the `get-pip repository`_ (as documented there) and commit the results. -#. Submit a Pull Request to `CPython`_ adding the new version of pip (and upgrading - setuptools) to ``Lib/ensurepip/_bundled``, removing the existing version, and +#. Submit a Pull Request to `CPython`_ adding the new version of pip + to ``Lib/ensurepip/_bundled``, removing the existing version, and adjusting the versions listed in ``Lib/ensurepip/__init__.py``. diff --git a/docs/html/installation.md b/docs/html/installation.md index d0a0985c9be..4b3d4e8888c 100644 --- a/docs/html/installation.md +++ b/docs/html/installation.md @@ -103,7 +103,7 @@ $ pip install --upgrade pip The current version of pip works on: - Windows, Linux and macOS. -- CPython 3.8, 3.9, 3.10, 3.11 and latest PyPy3. +- CPython 3.8, 3.9, 3.10, 3.11, 3.12, and latest PyPy3. pip is tested to work on the latest patch version of the Python interpreter, for each of the minor versions listed above. Previous patch versions are diff --git a/docs/html/reference/inspect-report.md b/docs/html/reference/inspect-report.md index 1355e5d4274..ad8263c6742 100644 --- a/docs/html/reference/inspect-report.md +++ b/docs/html/reference/inspect-report.md @@ -27,9 +27,8 @@ The report is a JSON object with the following properties: distribution packages that are installed. - `environment`: an object describing the environment where the installation report was - generated. See [PEP 508 environment - markers](https://peps.python.org/pep-0508/#environment-markers) for more information. - Values have a string type. + generated. See the section on environment markers in the {ref}`pypug:dependency-specifiers` + specification for more information. Values have a string type. (InspectReportItem)= diff --git a/docs/html/reference/installation-report.md b/docs/html/reference/installation-report.md index 5823205f977..e0cfcd97e8b 100644 --- a/docs/html/reference/installation-report.md +++ b/docs/html/reference/installation-report.md @@ -56,6 +56,9 @@ package with the following properties: URL reference. `false` if the requirements was provided as a name and version specifier. +- `is_yanked`: `true` if the requirement was yanked from the index, but was still + selected by pip conform to [PEP 592](https://peps.python.org/pep-0592/#installers). + - `download_info`: Information about the artifact (to be) downloaded for installation, using the [direct URL data structure](https://packaging.python.org/en/latest/specifications/direct-url-data-structure/). @@ -106,6 +109,7 @@ will produce an output similar to this (metadata abriged for brevity): } }, "is_direct": false, + "is_yanked": false, "requested": true, "metadata": { "name": "pydantic", @@ -133,6 +137,7 @@ will produce an output similar to this (metadata abriged for brevity): } }, "is_direct": true, + "is_yanked": false, "requested": true, "metadata": { "name": "packaging", diff --git a/docs/html/topics/authentication.md b/docs/html/topics/authentication.md index 966ac3e7a0d..a2649071762 100644 --- a/docs/html/topics/authentication.md +++ b/docs/html/topics/authentication.md @@ -68,7 +68,7 @@ man pages][netrc-docs]. pip supports loading credentials stored in your keyring using the {pypi}`keyring` library, which can be enabled py passing `--keyring-provider` with a value of `auto`, `disabled`, `import`, or `subprocess`. The default -value `auto` respects `--no-input` and not query keyring at all if the option +value `auto` respects `--no-input` and does not query keyring at all if the option is used; otherwise it tries the `import`, `subprocess`, and `disabled` providers (in this order) and uses the first one that works. diff --git a/docs/html/topics/caching.md b/docs/html/topics/caching.md index 954cebe402d..8d6c40f112d 100644 --- a/docs/html/topics/caching.md +++ b/docs/html/topics/caching.md @@ -27,6 +27,13 @@ While this cache attempts to minimize network activity, it does not prevent network access altogether. If you want a local install solution that circumvents accessing PyPI, see {ref}`Installing from local packages`. +```{versionchanged} 23.3 +A new cache format is now used, stored in a directory called `http-v2` (see +below for this directory's location). Previously this cache was stored in a +directory called `http` in the main cache directory. If you have completely +switched to newer versions of `pip`, you may wish to delete the old directory. +``` + (wheel-caching)= ### Locally built wheels @@ -124,11 +131,11 @@ The {ref}`pip cache` command can be used to manage pip's cache. ### Removing a single package -`pip cache remove setuptools` removes all wheel files related to setuptools from pip's cache. +`pip cache remove setuptools` removes all wheel files related to setuptools from pip's cache. HTTP cache files are not removed at this time. ### Removing the cache -`pip cache purge` will clear all wheel files from pip's cache. +`pip cache purge` will clear all files from pip's wheel and HTTP caches. ### Listing cached files diff --git a/docs/html/topics/configuration.md b/docs/html/topics/configuration.md index 521bc9af4b9..8b54db56ce6 100644 --- a/docs/html/topics/configuration.md +++ b/docs/html/topics/configuration.md @@ -20,20 +20,23 @@ and how they are related to pip's various command line options. ## Configuration Files Configuration files can change the default values for command line options. -They are written using standard INI style configuration files. +The files are written using standard INI format. -pip has 4 "levels" of configuration files: +pip has 3 "levels" of configuration files: -- `global`: system-wide configuration file, shared across all users. -- `user`: per-user configuration file, shared across all environments. -- `base` : per-base environment configuration file, shared across all virtualenvs with the same base. (available since pip 23.0) +- `global`: system-wide configuration file, shared across users. +- `user`: per-user configuration file. - `site`: per-environment configuration file; i.e. per-virtualenv. +Additionally, environment variables can be specified which will override any of the above. + ### Location pip's configuration files are located in fairly standard locations. This location is different on different operating systems, and has some additional -complexity for backwards compatibility reasons. +complexity for backwards compatibility reasons. Note that if user config files +exist in both the legacy and current locations, values in the current file +will override values in the legacy file. ```{tab} Unix @@ -48,9 +51,6 @@ User The legacy "per-user" configuration file is also loaded, if it exists: {file}`$HOME/.pip/pip.conf`. -Base -: {file}`\{sys.base_prefix\}/pip.conf` - Site : {file}`$VIRTUAL_ENV/pip.conf` ``` @@ -67,9 +67,6 @@ User The legacy "per-user" configuration file is also loaded, if it exists: {file}`$HOME/.pip/pip.conf`. -Base -: {file}`\{sys.base_prefix\}/pip.conf` - Site : {file}`$VIRTUAL_ENV/pip.conf` ``` @@ -88,9 +85,6 @@ User The legacy "per-user" configuration file is also loaded, if it exists: {file}`%HOME%\\pip\\pip.ini` -Base -: {file}`\{sys.base_prefix\}\\pip.ini` - Site : {file}`%VIRTUAL_ENV%\\pip.ini` ``` @@ -98,9 +92,10 @@ Site ### `PIP_CONFIG_FILE` Additionally, the environment variable `PIP_CONFIG_FILE` can be used to specify -a configuration file that's loaded first, and whose values are overridden by -the values set in the aforementioned files. Setting this to {any}`os.devnull` -disables the loading of _all_ configuration files. +a configuration file that's loaded last, and whose values override the values +set in the aforementioned files. Setting this to {any}`os.devnull` +disables the loading of _all_ configuration files. Note that if a file exists +at the location that this is set to, the user config file will not be loaded. (config-precedence)= @@ -109,11 +104,10 @@ disables the loading of _all_ configuration files. When multiple configuration files are found, pip combines them in the following order: -- `PIP_CONFIG_FILE`, if given. - Global - User -- Base - Site +- `PIP_CONFIG_FILE`, if given. Each file read overrides any values read from previous files, so if the global timeout is specified in both the global file and the per-user file diff --git a/docs/html/topics/https-certificates.md b/docs/html/topics/https-certificates.md index b42c463e6cc..341cfc632de 100644 --- a/docs/html/topics/https-certificates.md +++ b/docs/html/topics/https-certificates.md @@ -28,19 +28,9 @@ It is possible to use the system trust store, instead of the bundled certifi certificates for verifying HTTPS certificates. This approach will typically support corporate proxy certificates without additional configuration. -In order to use system trust stores, you need to: - -- Use Python 3.10 or newer. -- Install the {pypi}`truststore` package, in the Python environment you're - running pip in. - - This is typically done by installing this package using a system package - manager or by using pip in {ref}`Hash-checking mode` for this package and - trusting the network using the `--trusted-host` flag. +In order to use system trust stores, you need to use Python 3.10 or newer. ```{pip-cli} - $ python -m pip install truststore - [...] $ python -m pip install SomePackage --use-feature=truststore [...] Successfully installed SomePackage diff --git a/docs/html/topics/more-dependency-resolution.md b/docs/html/topics/more-dependency-resolution.md index 31967a6a920..b955e2ec114 100644 --- a/docs/html/topics/more-dependency-resolution.md +++ b/docs/html/topics/more-dependency-resolution.md @@ -8,7 +8,7 @@ and this article is intended to help readers understand what is happening ```{note} This document is a work in progress. The details included are accurate (at the time of writing), but there is additional information, in particular around -pip's interface with resolvelib, which have not yet been included. +pip's interface with resolvelib, which has not yet been included. Contributions to improve this document are welcome. ``` @@ -26,7 +26,7 @@ The practical implication of that is that there will always be some situations where pip cannot determine what to install in a reasonable length of time. We make every effort to ensure that such situations happen rarely, but eliminating them altogether isn't even theoretically possible. We'll discuss what options -yopu have if you hit a problem situation like this a little later. +you have if you hit a problem situation like this a little later. ## Python specific issues @@ -97,10 +97,10 @@ feeding candidates to the resolver, and has a key role to play in selecting suitable candidates. Note that the resolver is *only* relevant for packages fetched from an index. -Candidates coming from other sources (local source directories, PEP 508 -direct URL references) do *not* go through the finder, and are merged with the -candidates provided by the finder as part of the resolver's "provider" -implementation. +Candidates coming from other sources (local source directories, {ref}`direct +URL references `) do *not* go through the finder, +and are merged with the candidates provided by the finder as part of the resolver's +"provider" implementation. As well as determining what versions exist in the index for a given project, the finder selects the best distribution file to use for that candidate. This @@ -136,7 +136,7 @@ operations: that satisfy them. This is essentially where the finder interacts with the resolver. * `is_satisfied_by` - checks if a candidate satisfies a requirement. This is - basically the implementation of what a requirement meams. + basically the implementation of what a requirement means. * `get_dependencies` - get the dependency metadata for a candidate. This is the implementation of the process of getting and reading package metadata. diff --git a/docs/html/topics/secure-installs.md b/docs/html/topics/secure-installs.md index f012842b2ac..bda3c4485b0 100644 --- a/docs/html/topics/secure-installs.md +++ b/docs/html/topics/secure-installs.md @@ -59,13 +59,13 @@ It is possible to use multiple hashes for each package. This is important when a ### Interaction with caching -The {ref}`locally-built wheel cache ` is disabled in hash-checking mode to prevent spurious hash mismatch errors. - -These would otherwise occur while installing sdists that had already been automatically built into cached wheels: those wheels would be selected for installation, but their hashes would not match the sdist ones from the requirements file. - -A further complication is that locally built wheels are nondeterministic: contemporary modification times make their way into the archive, making hashes unpredictable across machines and cache flushes. Compilation of C code adds further nondeterminism, as many compilers include random-seeded values in their output. +```{versionchanged} 23.1 +The {ref}`locally-built wheel cache ` is used in hash-checking mode too. +``` -However, wheels fetched from index servers are required to be the same every time. They land in pip's HTTP cache, not its wheel cache, and are used normally in hash-checking mode. The only downside of having the wheel cache disabled is thus extra build time for sdists, and this can be solved by making sure pre-built wheels are available from the index server. +When installing from the cache of locally built wheels in hash-checking mode, pip verifies +the hashes against those of the original source distribution that was used to build the wheel. +These original hashes are obtained from a `origin.json` file stored in each cache entry. ### Using hashes from PyPI (or other index servers) diff --git a/docs/html/topics/vcs-support.md b/docs/html/topics/vcs-support.md index 465d5ecb78c..c8169dbe24c 100644 --- a/docs/html/topics/vcs-support.md +++ b/docs/html/topics/vcs-support.md @@ -140,9 +140,8 @@ pip also looks at the `egg` fragment specifying the "project name". In practice mode. In all other circumstances, the `egg` fragment is not necessary and its use is discouraged. -The `egg` fragment **should** be a bare -[PEP 508](https://peps.python.org/pep-0508/) project name. Anything else -is not guaranteed to work. +The `egg` fragment **should** be a bare {ref}`project name `. +Anything else is not guaranteed to work. ````{admonition} Example If your repository layout is: diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst index 966b200f4f5..f0cbded683d 100644 --- a/docs/html/user_guide.rst +++ b/docs/html/user_guide.rst @@ -127,6 +127,10 @@ Logically, a Requirements file is just a list of :ref:`pip install` arguments placed in a file. Note that you should not rely on the items in the file being installed by pip in any particular order. +Requirements files can also be served via a URL, e.g. +http://example.com/requirements.txt besides as local files, so that they can +be stored and served in a centralized place. + In practice, there are 4 common uses of Requirements files: 1. Requirements files are used to hold the result from :ref:`pip freeze` for the @@ -248,6 +252,10 @@ undocumented and unsupported quirks from the previous implementation, and stripped constraints files down to being purely a way to specify global (version) limits for packages. +Same as requirements files, constraints files can also be served via a URL, +e.g. http://example.com/constraints.txt, so that your organization can store and +serve them in a centralized place. + .. _`Installing from Wheels`: @@ -256,7 +264,7 @@ Installing from Wheels "Wheel" is a built, archive format that can greatly speed installation compared to building and installing from source archives. For more information, see the -`Wheel docs `_ , :pep:`427`, and :pep:`425`. +:ref:`specification `. pip prefers Wheels where they are available. To disable this, use the :ref:`--no-binary ` flag for :ref:`pip install`. @@ -298,7 +306,8 @@ name: .. note:: In the future, the ``path[extras]`` syntax may become deprecated. It is - recommended to use PEP 508 syntax wherever possible. + recommended to use :ref:`standard ` + syntax wherever possible. For the cases where wheels are not available, pip offers :ref:`pip wheel` as a convenience, to build wheels for all your requirements and dependencies. diff --git a/docs/pip_sphinxext.py b/docs/pip_sphinxext.py index 2e559702294..fe3f41e8b79 100644 --- a/docs/pip_sphinxext.py +++ b/docs/pip_sphinxext.py @@ -194,22 +194,17 @@ def process_options(self) -> None: opt = option() opt_name = opt._long_opts[0] if opt._short_opts: - short_opt_name = "{}, ".format(opt._short_opts[0]) + short_opt_name = f"{opt._short_opts[0]}, " else: short_opt_name = "" if option in cmdoptions.general_group["options"]: prefix = "" else: - prefix = "{}_".format(self.determine_opt_prefix(opt_name)) + prefix = f"{self.determine_opt_prefix(opt_name)}_" self.view_list.append( - "* :ref:`{short}{long}<{prefix}{opt_name}>`".format( - short=short_opt_name, - long=opt_name, - prefix=prefix, - opt_name=opt_name, - ), + f"* :ref:`{short_opt_name}{opt_name}<{prefix}{opt_name}>`", "\n", ) diff --git a/docs/requirements.txt b/docs/requirements.txt index ef72c8fb722..debfa632b7a 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ -sphinx ~= 6.0 +sphinx ~= 7.0 towncrier furo myst_parser diff --git a/news/10937.feature.rst b/news/10937.feature.rst deleted file mode 100644 index 2974c577a10..00000000000 --- a/news/10937.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Present conflict information during installation after each choice that is rejected (pass ``-vv`` to ``pip install`` to show it) diff --git a/news/11169.feature.rst b/news/11169.feature.rst deleted file mode 100644 index 54cc6637bc6..00000000000 --- a/news/11169.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Display dependency chain on each Collecting/Processing log line. diff --git a/news/11325.feature.rst b/news/11325.feature.rst deleted file mode 100644 index 282310816b6..00000000000 --- a/news/11325.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Support a per-requirement ``--config-settings`` option in requirements files. diff --git a/news/11358.removal.rst b/news/11358.removal.rst deleted file mode 100644 index 23e388a9a39..00000000000 --- a/news/11358.removal.rst +++ /dev/null @@ -1 +0,0 @@ -Remove support for the deprecated ``--install-options``. diff --git a/news/11451.removal.rst b/news/11451.removal.rst deleted file mode 100644 index c0d1100ed92..00000000000 --- a/news/11451.removal.rst +++ /dev/null @@ -1,2 +0,0 @@ -``--no-binary`` does not imply ``setup.py install`` anymore. Instead a wheel will be -built locally and installed. diff --git a/news/11453.removal.rst b/news/11453.removal.rst deleted file mode 100644 index 91ebfda0438..00000000000 --- a/news/11453.removal.rst +++ /dev/null @@ -1,2 +0,0 @@ -``--no-binary`` does not disable the cache of locally built wheels anymore. It only -means "don't download wheels". diff --git a/news/11529.bugfix.rst b/news/11529.bugfix.rst deleted file mode 100644 index d05e404602e..00000000000 --- a/news/11529.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix grammar by changing "A new release of pip available:" to "A new release of pip is available:" in the notice used for indicating that. diff --git a/news/11681.feature.rst b/news/11681.feature.rst deleted file mode 100644 index 00cd05ee18d..00000000000 --- a/news/11681.feature.rst +++ /dev/null @@ -1,4 +0,0 @@ -The ``--config-settings``/``-C`` option now supports using the same key multiple -times. When the same key is specified multiple times, all values are passed to -the build backend as a list, as opposed to the previous behavior, where pip would -only pass the last value if the same key was used multiple times. diff --git a/news/11702.trivial.rst b/news/11702.trivial.rst deleted file mode 100644 index d27e33d78ce..00000000000 --- a/news/11702.trivial.rst +++ /dev/null @@ -1,2 +0,0 @@ -Strip command line prompts like "$" and "C:>" from the actual command -being copied using the copybutton. diff --git a/news/11719.bugfix.rst b/news/11719.bugfix.rst deleted file mode 100644 index c2ae8bc1d5e..00000000000 --- a/news/11719.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Normalize paths before checking if installed scripts are on PATH. diff --git a/news/11774.bugfix.rst b/news/11774.bugfix.rst deleted file mode 100644 index 771246b0b54..00000000000 --- a/news/11774.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Correct the way to decide if keyring is available. diff --git a/news/11775.doc.rst b/news/11775.doc.rst deleted file mode 100644 index 18274b7692a..00000000000 --- a/news/11775.doc.rst +++ /dev/null @@ -1,2 +0,0 @@ -Cross-reference the ``--python`` flag from the ``--prefix`` flag, -and mention limitations of ``--prefix`` regarding script installation. diff --git a/news/11786.feature.rst b/news/11786.feature.rst deleted file mode 100644 index 0da7f86373e..00000000000 --- a/news/11786.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Add ``-C`` as a short version of the ``--config-settings`` option. diff --git a/news/11809.doc.rst b/news/11809.doc.rst deleted file mode 100644 index 68c49ea50d5..00000000000 --- a/news/11809.doc.rst +++ /dev/null @@ -1 +0,0 @@ -Add SECURITY.md to make the policy offical. diff --git a/news/11815.doc.rst b/news/11815.doc.rst new file mode 100644 index 00000000000..8e7e8d21bef --- /dev/null +++ b/news/11815.doc.rst @@ -0,0 +1 @@ +Fix explanation of how PIP_CONFIG_FILE works diff --git a/news/11837.bugfix.rst b/news/11837.bugfix.rst deleted file mode 100644 index 6d33ed6800c..00000000000 --- a/news/11837.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -More consistent resolution backtracking by removing legacy hack related to setuptools resolution diff --git a/news/11838.doc.rst b/news/11838.doc.rst deleted file mode 100644 index 9630aa59885..00000000000 --- a/news/11838.doc.rst +++ /dev/null @@ -1 +0,0 @@ -Add username to Git over SSH example. diff --git a/news/11842.doc.rst b/news/11842.doc.rst deleted file mode 100644 index bd063996f54..00000000000 --- a/news/11842.doc.rst +++ /dev/null @@ -1,2 +0,0 @@ -Quote extras in the pip install docs to guard shells with default glob -qualifiers, like zsh. diff --git a/news/11859.removal.rst b/news/11859.removal.rst deleted file mode 100644 index b29cedd7557..00000000000 --- a/news/11859.removal.rst +++ /dev/null @@ -1,2 +0,0 @@ -Deprecate ``--build-option`` and ``--global-option``. Users are invited to switch to -``--config-settings``. diff --git a/news/11882.bugfix.rst b/news/11882.bugfix.rst deleted file mode 100644 index 5373487b188..00000000000 --- a/news/11882.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Include ``AUTHORS.txt`` in pip's wheels. diff --git a/news/11908.feature.rst b/news/11908.feature.rst deleted file mode 100644 index 2b9ec18d98f..00000000000 --- a/news/11908.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Reduce the number of resolver rounds, since backjumping makes the resolver more efficient in finding solutions. This also makes pathological cases fail quicker. diff --git a/news/11909.process.rst b/news/11909.process.rst new file mode 100644 index 00000000000..a396d93d963 --- /dev/null +++ b/news/11909.process.rst @@ -0,0 +1 @@ +Most project metadata is now defined statically via pip's ``pyproject.toml`` file. diff --git a/news/11935.feature.rst b/news/11935.feature.rst deleted file mode 100644 index b170ca1d8cd..00000000000 --- a/news/11935.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Warn if ``--hash`` is used on a line without requirement in a requirements file. diff --git a/news/11941.feature.rst b/news/11941.feature.rst deleted file mode 100644 index 404f2cb2de6..00000000000 --- a/news/11941.feature.rst +++ /dev/null @@ -1,4 +0,0 @@ -Stop propagating CLI ``--config-settings`` to the build dependencies. They already did -not propagate to requirements provided in requirement files. To pass the same config -settings to several requirements, users should provide the requirements as CLI -arguments. diff --git a/news/12389.bugfix.rst b/news/12389.bugfix.rst new file mode 100644 index 00000000000..84871873328 --- /dev/null +++ b/news/12389.bugfix.rst @@ -0,0 +1 @@ +Update mypy to 1.6.1 and fix/ignore types diff --git a/news/12390.trivial.rst b/news/12390.trivial.rst new file mode 100644 index 00000000000..52b21413ca0 --- /dev/null +++ b/news/12390.trivial.rst @@ -0,0 +1 @@ +Update ruff versions and config for dev diff --git a/news/12393.trivial.rst b/news/12393.trivial.rst new file mode 100644 index 00000000000..15452737aef --- /dev/null +++ b/news/12393.trivial.rst @@ -0,0 +1 @@ +Enforce and update code to use f-strings via Ruff rule UP032 diff --git a/news/12417.doc.rst b/news/12417.doc.rst new file mode 100644 index 00000000000..efde79a5808 --- /dev/null +++ b/news/12417.doc.rst @@ -0,0 +1 @@ +Fix outdated pip install argument description in documentation. diff --git a/news/12434.doc.rst b/news/12434.doc.rst new file mode 100644 index 00000000000..c1d3635df78 --- /dev/null +++ b/news/12434.doc.rst @@ -0,0 +1 @@ +Replace some links to PEPs with links to the canonical specifications on the :doc:`pypug:index` diff --git a/news/8368.removal.rst b/news/8368.removal.rst deleted file mode 100644 index 44ee33aa78c..00000000000 --- a/news/8368.removal.rst +++ /dev/null @@ -1,2 +0,0 @@ -Remove ``setup.py install`` fallback when building a wheel failed for projects without -``pyproject.toml``. diff --git a/news/8559.removal.rst b/news/8559.removal.rst deleted file mode 100644 index a0953dade6b..00000000000 --- a/news/8559.removal.rst +++ /dev/null @@ -1,2 +0,0 @@ -When the ``wheel`` package is not installed, pip now uses the default build backend -instead of ``setup.py install`` for project without ``pyproject.toml``. diff --git a/news/8719.feature.rst b/news/8719.feature.rst deleted file mode 100644 index 3f3caf2db89..00000000000 --- a/news/8719.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Add ``--keyring-provider`` flag. See the Authentication page in the documentation for more info. diff --git a/news/9752.feature.rst b/news/9752.feature.rst deleted file mode 100644 index d515267be21..00000000000 --- a/news/9752.feature.rst +++ /dev/null @@ -1 +0,0 @@ -In the case of virtual environments, configuration files are now also included from the base installation. diff --git a/news/msgpack.vendor.rst b/news/msgpack.vendor.rst deleted file mode 100644 index 9193b7ce52b..00000000000 --- a/news/msgpack.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade msgpack to 1.0.5 diff --git a/news/pkg_resources.vendor.rst b/news/pkg_resources.vendor.rst deleted file mode 100644 index a20817dfb24..00000000000 --- a/news/pkg_resources.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Patch pkg_resources to remove dependency on ``jaraco.text``. diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst deleted file mode 100644 index 939253e14fc..00000000000 --- a/news/platformdirs.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade platformdirs to 3.2.0 diff --git a/news/pygments.vendor.rst b/news/pygments.vendor.rst deleted file mode 100644 index a6c8edafc69..00000000000 --- a/news/pygments.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade pygments to 2.14.0 diff --git a/news/resolvelib.vendor.rst b/news/resolvelib.vendor.rst deleted file mode 100644 index ad55516edea..00000000000 --- a/news/resolvelib.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade resolvelib to 1.0.1 diff --git a/news/rich.vendor.rst b/news/rich.vendor.rst deleted file mode 100644 index 0bedd3bb4e1..00000000000 --- a/news/rich.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade rich to 13.3.3 diff --git a/news/setuptools.vendor.rst b/news/setuptools.vendor.rst deleted file mode 100644 index 9cf3f49e21c..00000000000 --- a/news/setuptools.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade setuptools to 67.6.1 diff --git a/news/tenacity.vendor.rst b/news/tenacity.vendor.rst deleted file mode 100644 index 493d38d0195..00000000000 --- a/news/tenacity.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade tenacity to 8.2.2 diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst deleted file mode 100644 index e71aeb66309..00000000000 --- a/news/typing_extensions.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade typing_extensions to 4.5.0 diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst deleted file mode 100644 index 09e82a8f2ff..00000000000 --- a/news/urllib3.vendor.rst +++ /dev/null @@ -1 +0,0 @@ -Upgrade urllib3 to 1.26.15 diff --git a/noxfile.py b/noxfile.py index 2e0db97ff9f..e3546e3e9ce 100644 --- a/noxfile.py +++ b/noxfile.py @@ -67,7 +67,7 @@ def should_update_common_wheels() -> bool: # ----------------------------------------------------------------------------- # Development Commands # ----------------------------------------------------------------------------- -@nox.session(python=["3.8", "3.9", "3.10", "3.11", "pypy3"]) +@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3"]) def test(session: nox.Session) -> None: # Get the common wheels. if should_update_common_wheels(): @@ -89,6 +89,7 @@ def test(session: nox.Session) -> None: shutil.rmtree(sdist_dir, ignore_errors=True) # fmt: off + session.install("setuptools") session.run( "python", "setup.py", "sdist", "--formats=zip", "--dist-dir", sdist_dir, silent=True, @@ -183,6 +184,12 @@ def lint(session: nox.Session) -> None: # git reset --hard origin/main @nox.session def vendoring(session: nox.Session) -> None: + # Ensure that the session Python is running 3.10+ + # so that truststore can be installed correctly. + session.run( + "python", "-c", "import sys; sys.exit(1 if sys.version_info < (3, 10) else 0)" + ) + session.install("vendoring~=1.2.0") parser = argparse.ArgumentParser(prog="nox -s vendoring") @@ -219,7 +226,7 @@ def pinned_requirements(path: Path) -> Iterator[Tuple[str, str]]: new_version = old_version for inner_name, inner_version in pinned_requirements(vendor_txt): if inner_name == name: - # this is a dedicated assignment, to make flake8 happy + # this is a dedicated assignment, to make lint happy new_version = inner_version break else: @@ -315,7 +322,7 @@ def build_release(session: nox.Session) -> None: ) session.log("# Install dependencies") - session.install("setuptools", "wheel", "twine") + session.install("build", "twine") with release.isolated_temporary_checkout(session, version) as build_dir: session.log( @@ -351,7 +358,7 @@ def build_dists(session: nox.Session) -> List[str]: ) session.log("# Build distributions") - session.run("python", "setup.py", "sdist", "bdist_wheel", silent=True) + session.run("python", "-m", "build", silent=True) produced_dists = glob.glob("dist/*") session.log(f"# Verify distributions: {', '.join(produced_dists)}") diff --git a/pyproject.toml b/pyproject.toml index 139c37e18d7..7496a08ee2c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,72 @@ +[project] +dynamic = ["version", "scripts"] + +name = "pip" +description = "The PyPA recommended tool for installing Python packages." +readme = "README.rst" +license = {text = "MIT"} +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Topic :: Software Development :: Build Tools", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: Implementation :: CPython", + "Programming Language :: Python :: Implementation :: PyPy", +] +authors = [ + {name = "The pip developers", email = "distutils-sig@python.org"}, +] + +# NOTE: requires-python is duplicated in __pip-runner__.py. +# When changing this value, please change the other copy as well. +requires-python = ">=3.7" + +[project.urls] +Homepage = "https://pip.pypa.io/" +Documentation = "https://pip.pypa.io" +Source = "https://github.com/pypa/pip" +Changelog = "https://pip.pypa.io/en/stable/news/" + [build-system] -requires = ["setuptools", "wheel"] +# The lower bound is for . +requires = ["setuptools>=67.6.1", "wheel"] build-backend = "setuptools.build_meta" +[tool.setuptools] +package-dir = {"" = "src"} +include-package-data = false + +[tool.setuptools.dynamic] +version = {attr = "pip.__version__"} + +[tool.setuptools.packages.find] +where = ["src"] +exclude = ["contrib", "docs", "tests*", "tasks"] + +[tool.setuptools.package-data] +"pip" = ["py.typed"] +"pip._vendor" = ["vendor.txt"] +"pip._vendor.certifi" = ["*.pem"] +"pip._vendor.requests" = ["*.pem"] +"pip._vendor.distlib._backport" = ["sysconfig.cfg"] +"pip._vendor.distlib" = [ + "t32.exe", + "t64.exe", + "t64-arm.exe", + "w32.exe", + "w64.exe", + "w64-arm.exe", +] + [tool.towncrier] # For finding the __version__ package = "pip" @@ -71,3 +136,57 @@ setuptools = "pkg_resources" CacheControl = "https://raw.githubusercontent.com/ionrock/cachecontrol/v0.12.6/LICENSE.txt" distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt" webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE" + +[tool.ruff] +extend-exclude = [ + "_vendor", + "./build", + ".scratch", + "data", +] +ignore = [ + "B019", + "B020", + "B904", # Ruff enables opinionated warnings by default + "B905", # Ruff enables opinionated warnings by default +] +target-version = "py37" +line-length = 88 +select = [ + "ASYNC", + "B", + "C4", + "C90", + "E", + "F", + "G", + "I", + "ISC", + "PERF", + "PLE", + "PLR0", + "W", + "RUF100", + "UP032", +] + +[tool.ruff.isort] +# We need to explicitly make pip "first party" as it's imported by code in +# the docs and tests directories. +known-first-party = ["pip"] +known-third-party = ["pip._vendor"] + +[tool.ruff.mccabe] +max-complexity = 33 # default is 10 + +[tool.ruff.per-file-ignores] +"noxfile.py" = ["G"] +"src/pip/_internal/*" = ["PERF203"] +"tests/*" = ["B011"] +"tests/unit/test_finder.py" = ["C414"] + +[tool.ruff.pylint] +max-args = 15 # default is 5 +max-branches = 28 # default is 12 +max-returns = 13 # default is 6 +max-statements = 134 # default is 50 diff --git a/setup.cfg b/setup.cfg index 2e35be30dd6..0be3ef08b82 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,46 +1,13 @@ -[isort] -profile = black -skip = - ./build, - .nox, - .tox, - .scratch, - _vendor, - data -known_third_party = - pip._vendor - -[flake8] -max-line-length = 88 -exclude = - ./build, - .nox, - .tox, - .scratch, - _vendor, - data -enable-extensions = G -extend-ignore = - G200, G202, - # black adds spaces around ':' - E203, - # using a cache - B019, - # reassigning variables in a loop - B020, -per-file-ignores = - # G: The plugin logging-format treats every .log and .error as logging. - noxfile.py: G - # B011: Do not call assert False since python -O removes these calls - tests/*: B011 - [mypy] mypy_path = $MYPY_CONFIG_FILE_DIR/src + +strict = True + +no_implicit_reexport = False +allow_subclassing_any = True +allow_untyped_calls = True +warn_return_any = False ignore_missing_imports = True -disallow_untyped_defs = True -disallow_any_generics = True -warn_unused_ignores = True -no_implicit_optional = True [mypy-pip._internal.utils._jaraco_text] ignore_errors = True @@ -51,12 +18,8 @@ ignore_errors = True # These vendored libraries use runtime magic to populate things and don't sit # well with static typing out of the box. Eventually we should provide correct # typing information for their public interface and remove these configs. -[mypy-pip._vendor.colorama] -follow_imports = skip [mypy-pip._vendor.pkg_resources] follow_imports = skip -[mypy-pip._vendor.progress.*] -follow_imports = skip [mypy-pip._vendor.requests.*] follow_imports = skip diff --git a/setup.py b/setup.py index 1a31610a2d6..5599ffe142e 100644 --- a/setup.py +++ b/setup.py @@ -1,86 +1,13 @@ -import os import sys -from setuptools import find_packages, setup - - -def read(rel_path: str) -> str: - here = os.path.abspath(os.path.dirname(__file__)) - # intentionally *not* adding an encoding option to open, See: - # https://github.com/pypa/virtualenv/issues/201#issuecomment-3145690 - with open(os.path.join(here, rel_path)) as fp: - return fp.read() - - -def get_version(rel_path: str) -> str: - for line in read(rel_path).splitlines(): - if line.startswith("__version__"): - # __version__ = "0.9" - delim = '"' if '"' in line else "'" - return line.split(delim)[1] - raise RuntimeError("Unable to find version string.") - - -long_description = read("README.rst") +from setuptools import setup setup( - name="pip", - version=get_version("src/pip/__init__.py"), - description="The PyPA recommended tool for installing Python packages.", - long_description=long_description, - license="MIT", - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", - "Topic :: Software Development :: Build Tools", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", - ], - url="https://pip.pypa.io/", - project_urls={ - "Documentation": "https://pip.pypa.io", - "Source": "https://github.com/pypa/pip", - "Changelog": "https://pip.pypa.io/en/stable/news/", - }, - author="The pip developers", - author_email="distutils-sig@python.org", - package_dir={"": "src"}, - packages=find_packages( - where="src", - exclude=["contrib", "docs", "tests*", "tasks"], - ), - package_data={ - "pip": ["py.typed"], - "pip._vendor": ["vendor.txt"], - "pip._vendor.certifi": ["*.pem"], - "pip._vendor.requests": ["*.pem"], - "pip._vendor.distlib._backport": ["sysconfig.cfg"], - "pip._vendor.distlib": [ - "t32.exe", - "t64.exe", - "t64-arm.exe", - "w32.exe", - "w64.exe", - "w64-arm.exe", - ], - }, entry_points={ "console_scripts": [ "pip=pip._internal.cli.main:main", - "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]), + f"pip{sys.version_info[0]}=pip._internal.cli.main:main", "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]), ], }, - zip_safe=False, - # NOTE: python_requires is duplicated in __pip-runner__.py. - # When changing this value, please change the other copy as well. - python_requires=">=3.8", ) diff --git a/src/pip/__init__.py b/src/pip/__init__.py index ce90d06bfd4..46e56014998 100644 --- a/src/pip/__init__.py +++ b/src/pip/__init__.py @@ -1,6 +1,6 @@ from typing import List, Optional -__version__ = "23.1.dev0" +__version__ = "24.0.dev0" def main(args: Optional[List[str]] = None) -> int: diff --git a/src/pip/__main__.py b/src/pip/__main__.py index fe34a7b7772..5991326115f 100644 --- a/src/pip/__main__.py +++ b/src/pip/__main__.py @@ -1,6 +1,5 @@ import os import sys -import warnings # Remove '' and current working directory from the first entry # of sys.path, if present to avoid using current directory @@ -20,12 +19,6 @@ sys.path.insert(0, path) if __name__ == "__main__": - # Work around the error reported in #9540, pending a proper fix. - # Note: It is essential the warning filter is set *before* importing - # pip, as the deprecation happens at import time, not runtime. - warnings.filterwarnings( - "ignore", category=DeprecationWarning, module=".*packaging\\.version" - ) from pip._internal.cli.main import main as _main sys.exit(_main()) diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py index 6afb5c627ce..96c6b88c112 100755 --- a/src/pip/_internal/__init__.py +++ b/src/pip/_internal/__init__.py @@ -1,6 +1,5 @@ from typing import List, Optional -import pip._internal.utils.inject_securetransport # noqa from pip._internal.utils import _log # init_logging() must be called before any call to logging.getLogger() diff --git a/src/pip/_internal/cache.py b/src/pip/_internal/cache.py index 05f0a9acb24..f45ac23e95a 100644 --- a/src/pip/_internal/cache.py +++ b/src/pip/_internal/cache.py @@ -78,12 +78,10 @@ def _get_candidates(self, link: Link, canonical_package_name: str) -> List[Any]: if can_not_cache: return [] - candidates = [] path = self.get_path_for_link(link) if os.path.isdir(path): - for candidate in os.listdir(path): - candidates.append((candidate, path)) - return candidates + return [(candidate, path) for candidate in os.listdir(path)] + return [] def get_path_for_link(self, link: Link) -> str: """Return a directory to store cached items in for link.""" @@ -194,7 +192,17 @@ def __init__( self.origin: Optional[DirectUrl] = None origin_direct_url_path = Path(self.link.file_path).parent / ORIGIN_JSON_NAME if origin_direct_url_path.exists(): - self.origin = DirectUrl.from_json(origin_direct_url_path.read_text()) + try: + self.origin = DirectUrl.from_json( + origin_direct_url_path.read_text(encoding="utf-8") + ) + except Exception as e: + logger.warning( + "Ignoring invalid cache entry origin file %s for %s (%s)", + origin_direct_url_path, + link.filename, + e, + ) class WheelCache(Cache): @@ -257,16 +265,26 @@ def get_cache_entry( @staticmethod def record_download_origin(cache_dir: str, download_info: DirectUrl) -> None: origin_path = Path(cache_dir) / ORIGIN_JSON_NAME - if origin_path.is_file(): - origin = DirectUrl.from_json(origin_path.read_text()) - # TODO: use DirectUrl.equivalent when https://github.com/pypa/pip/pull/10564 - # is merged. - if origin.url != download_info.url: + if origin_path.exists(): + try: + origin = DirectUrl.from_json(origin_path.read_text(encoding="utf-8")) + except Exception as e: logger.warning( - "Origin URL %s in cache entry %s does not match download URL %s. " - "This is likely a pip bug or a cache corruption issue.", - origin.url, - cache_dir, - download_info.url, + "Could not read origin file %s in cache entry (%s). " + "Will attempt to overwrite it.", + origin_path, + e, ) + else: + # TODO: use DirectUrl.equivalent when + # https://github.com/pypa/pip/pull/10564 is merged. + if origin.url != download_info.url: + logger.warning( + "Origin URL %s in cache entry %s does not match download URL " + "%s. This is likely a pip bug or a cache corruption issue. " + "Will overwrite it with the new value.", + origin.url, + cache_dir, + download_info.url, + ) origin_path.write_text(download_info.to_json(), encoding="utf-8") diff --git a/src/pip/_internal/cli/autocompletion.py b/src/pip/_internal/cli/autocompletion.py index 226fe84dc0d..e5950b90696 100644 --- a/src/pip/_internal/cli/autocompletion.py +++ b/src/pip/_internal/cli/autocompletion.py @@ -71,8 +71,9 @@ def autocomplete() -> None: for opt in subcommand.parser.option_list_all: if opt.help != optparse.SUPPRESS_HELP: - for opt_str in opt._long_opts + opt._short_opts: - options.append((opt_str, opt.nargs)) + options += [ + (opt_str, opt.nargs) for opt_str in opt._long_opts + opt._short_opts + ] # filter out previously specified options from available options prev_opts = [x.split("=")[0] for x in cwords[1 : cword - 1]] diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py index 637fba18cfc..db9d5cc6624 100644 --- a/src/pip/_internal/cli/base_command.py +++ b/src/pip/_internal/cli/base_command.py @@ -131,6 +131,17 @@ def _main(self, args: List[str]) -> int: ", ".join(sorted(always_enabled_features)), ) + # Make sure that the --python argument isn't specified after the + # subcommand. We can tell, because if --python was specified, + # we should only reach this point if we're running in the created + # subprocess, which has the _PIP_RUNNING_IN_SUBPROCESS environment + # variable set. + if options.python and "_PIP_RUNNING_IN_SUBPROCESS" not in os.environ: + logger.critical( + "The --python option must be placed before the pip subcommand name" + ) + sys.exit(ERROR) + # TODO: Try to get these passing down from the command? # without resorting to os.environ to hold these. # This also affects isolated builds and it should. @@ -170,7 +181,7 @@ def exc_logging_wrapper(*args: Any) -> int: assert isinstance(status, int) return status except DiagnosticPipError as exc: - logger.error("[present-rich] %s", exc) + logger.error("%s", exc, extra={"rich": True}) logger.debug("Exception information:", exc_info=True) return ERROR diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py index 7f72332db56..d05e502f908 100644 --- a/src/pip/_internal/cli/cmdoptions.py +++ b/src/pip/_internal/cli/cmdoptions.py @@ -92,10 +92,10 @@ def check_dist_restriction(options: Values, check_target: bool = False) -> None: ) if check_target: - if dist_restriction_set and not options.target_dir: + if not options.dry_run and dist_restriction_set and not options.target_dir: raise CommandError( "Can not use any platform or abi specific options unless " - "installing via '--target'" + "installing via '--target' or using '--dry-run'" ) @@ -257,7 +257,7 @@ class PipOption(Option): "--keyring-provider", dest="keyring_provider", choices=["auto", "disabled", "import", "subprocess"], - default="disabled", + default="auto", help=( "Enable the credential lookup via the keyring library if user input is allowed." " Specify which mechanism to use [disabled, import, subprocess]." @@ -582,10 +582,7 @@ def _handle_python_version( """ version_info, error_msg = _convert_python_version(value) if error_msg is not None: - msg = "invalid --python-version value: {!r}: {}".format( - value, - error_msg, - ) + msg = f"invalid --python-version value: {value!r}: {error_msg}" raise_option_error(parser, option=option, msg=msg) parser.values.python_version = version_info @@ -670,7 +667,10 @@ def prefer_binary() -> Option: dest="prefer_binary", action="store_true", default=False, - help="Prefer older binary packages over newer source packages.", + help=( + "Prefer binary packages over source packages, even if the " + "source packages are newer." + ), ) @@ -823,7 +823,7 @@ def _handle_config_settings( ) -> None: key, sep, val = value.partition("=") if sep != "=": - parser.error(f"Arguments to {opt_str} must be of the form KEY=VAL") # noqa + parser.error(f"Arguments to {opt_str} must be of the form KEY=VAL") dest = getattr(parser.values, option.dest) if dest is None: dest = {} @@ -918,13 +918,13 @@ def _handle_merge_hash( algo, digest = value.split(":", 1) except ValueError: parser.error( - "Arguments to {} must be a hash name " # noqa + f"Arguments to {opt_str} must be a hash name " "followed by a value, like --hash=sha256:" - "abcde...".format(opt_str) + "abcde..." ) if algo not in STRONG_HASHES: parser.error( - "Allowed hash algorithms for {} are {}.".format( # noqa + "Allowed hash algorithms for {} are {}.".format( opt_str, ", ".join(STRONG_HASHES) ) ) diff --git a/src/pip/_internal/cli/main.py b/src/pip/_internal/cli/main.py index 0e31221543a..7e061f5b390 100644 --- a/src/pip/_internal/cli/main.py +++ b/src/pip/_internal/cli/main.py @@ -4,6 +4,7 @@ import logging import os import sys +import warnings from typing import List, Optional from pip._internal.cli.autocompletion import autocomplete @@ -46,6 +47,14 @@ def main(args: Optional[List[str]] = None) -> int: if args is None: args = sys.argv[1:] + # Suppress the pkg_resources deprecation warning + # Note - we use a module of .*pkg_resources to cover + # the normal case (pip._vendor.pkg_resources) and the + # devendored case (a bare pkg_resources) + warnings.filterwarnings( + action="ignore", category=DeprecationWarning, module=".*pkg_resources" + ) + # Configure our deprecation warnings to be sent through loggers deprecation.install_warning_logger() diff --git a/src/pip/_internal/cli/parser.py b/src/pip/_internal/cli/parser.py index c762cf2781d..ae554b24cae 100644 --- a/src/pip/_internal/cli/parser.py +++ b/src/pip/_internal/cli/parser.py @@ -229,9 +229,9 @@ def _update_defaults(self, defaults: Dict[str, Any]) -> Dict[str, Any]: val = strtobool(val) except ValueError: self.error( - "{} is not a valid value for {} option, " # noqa + f"{val} is not a valid value for {key} option, " "please specify a boolean value like yes/no, " - "true/false or 1/0 instead.".format(val, key) + "true/false or 1/0 instead." ) elif option.action == "count": with suppress(ValueError): @@ -240,10 +240,10 @@ def _update_defaults(self, defaults: Dict[str, Any]) -> Dict[str, Any]: val = int(val) if not isinstance(val, int) or val < 0: self.error( - "{} is not a valid value for {} option, " # noqa + f"{val} is not a valid value for {key} option, " "please instead specify either a non-negative integer " "or a boolean value like yes/no or false/true " - "which is equivalent to 1/0.".format(val, key) + "which is equivalent to 1/0." ) elif option.action == "append": val = val.split() diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py index c2f4e38bed8..6f2f79c6b3f 100644 --- a/src/pip/_internal/cli/req_command.py +++ b/src/pip/_internal/cli/req_command.py @@ -58,12 +58,9 @@ def _create_truststore_ssl_context() -> Optional["SSLContext"]: return None try: - import truststore - except ImportError: - raise CommandError( - "To use the truststore feature, 'truststore' must be installed into " - "pip's current environment." - ) + from pip._vendor import truststore + except ImportError as e: + raise CommandError(f"The truststore feature is unavailable: {e}") return truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT) @@ -123,7 +120,7 @@ def _build_session( ssl_context = None session = PipSession( - cache=os.path.join(cache_dir, "http") if cache_dir else None, + cache=os.path.join(cache_dir, "http-v2") if cache_dir else None, retries=retries if retries is not None else options.retries, trusted_hosts=options.trusted_hosts, index_urls=self._get_index_urls(options), @@ -268,7 +265,7 @@ def determine_resolver_variant(options: Values) -> str: if "legacy-resolver" in options.deprecated_features_enabled: return "legacy" - return "2020-resolver" + return "resolvelib" @classmethod def make_requirement_preparer( @@ -287,9 +284,10 @@ def make_requirement_preparer( """ temp_build_dir_path = temp_build_dir.path assert temp_build_dir_path is not None + legacy_resolver = False resolver_variant = cls.determine_resolver_variant(options) - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": lazy_wheel = "fast-deps" in options.features_enabled if lazy_wheel: logger.warning( @@ -300,6 +298,7 @@ def make_requirement_preparer( "production." ) else: + legacy_resolver = True lazy_wheel = False if "fast-deps" in options.features_enabled: logger.warning( @@ -320,6 +319,7 @@ def make_requirement_preparer( use_user_site=use_user_site, lazy_wheel=lazy_wheel, verbosity=verbosity, + legacy_resolver=legacy_resolver, ) @classmethod @@ -349,7 +349,7 @@ def make_resolver( # The long import name and duplicated invocation is needed to convince # Mypy into correctly typechecking. Otherwise it would complain the # "Resolver" class being redefined. - if resolver_variant == "2020-resolver": + if resolver_variant == "resolvelib": import pip._internal.resolution.resolvelib.resolver return pip._internal.resolution.resolvelib.resolver.Resolver( diff --git a/src/pip/_internal/commands/cache.py b/src/pip/_internal/commands/cache.py index e96d2b4924c..328336152cc 100644 --- a/src/pip/_internal/commands/cache.py +++ b/src/pip/_internal/commands/cache.py @@ -3,10 +3,10 @@ from optparse import Values from typing import Any, List -import pip._internal.utils.filesystem as filesystem from pip._internal.cli.base_command import Command from pip._internal.cli.status_codes import ERROR, SUCCESS from pip._internal.exceptions import CommandError, PipError +from pip._internal.utils import filesystem from pip._internal.utils.logging import getLogger logger = getLogger(__name__) @@ -93,24 +93,30 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None: num_http_files = len(self._find_http_files(options)) num_packages = len(self._find_wheels(options, "*")) - http_cache_location = self._cache_dir(options, "http") + http_cache_location = self._cache_dir(options, "http-v2") + old_http_cache_location = self._cache_dir(options, "http") wheels_cache_location = self._cache_dir(options, "wheels") - http_cache_size = filesystem.format_directory_size(http_cache_location) + http_cache_size = filesystem.format_size( + filesystem.directory_size(http_cache_location) + + filesystem.directory_size(old_http_cache_location) + ) wheels_cache_size = filesystem.format_directory_size(wheels_cache_location) message = ( textwrap.dedent( """ - Package index page cache location: {http_cache_location} + Package index page cache location (pip v23.3+): {http_cache_location} + Package index page cache location (older pips): {old_http_cache_location} Package index page cache size: {http_cache_size} Number of HTTP files: {num_http_files} Locally built wheels location: {wheels_cache_location} Locally built wheels size: {wheels_cache_size} Number of locally built wheels: {package_count} - """ + """ # noqa: E501 ) .format( http_cache_location=http_cache_location, + old_http_cache_location=old_http_cache_location, http_cache_size=http_cache_size, num_http_files=num_http_files, wheels_cache_location=wheels_cache_location, @@ -151,14 +157,8 @@ def format_for_human(self, files: List[str]) -> None: logger.info("\n".join(sorted(results))) def format_for_abspath(self, files: List[str]) -> None: - if not files: - return - - results = [] - for filename in files: - results.append(filename) - - logger.info("\n".join(sorted(results))) + if files: + logger.info("\n".join(sorted(files))) def remove_cache_items(self, options: Values, args: List[Any]) -> None: if len(args) > 1: @@ -175,7 +175,7 @@ def remove_cache_items(self, options: Values, args: List[Any]) -> None: files += self._find_http_files(options) else: # Add the pattern to the log message - no_matching_msg += ' for pattern "{}"'.format(args[0]) + no_matching_msg += f' for pattern "{args[0]}"' if not files: logger.warning(no_matching_msg) @@ -195,8 +195,11 @@ def _cache_dir(self, options: Values, subdir: str) -> str: return os.path.join(options.cache_dir, subdir) def _find_http_files(self, options: Values) -> List[str]: - http_dir = self._cache_dir(options, "http") - return filesystem.find_files(http_dir, "*") + old_http_dir = self._cache_dir(options, "http") + new_http_dir = self._cache_dir(options, "http-v2") + return filesystem.find_files(old_http_dir, "*") + filesystem.find_files( + new_http_dir, "*" + ) def _find_wheels(self, options: Values, pattern: str) -> List[str]: wheel_dir = self._cache_dir(options, "wheels") diff --git a/src/pip/_internal/commands/check.py b/src/pip/_internal/commands/check.py index 584df9f55c5..5efd0a34160 100644 --- a/src/pip/_internal/commands/check.py +++ b/src/pip/_internal/commands/check.py @@ -7,6 +7,7 @@ from pip._internal.operations.check import ( check_package_set, create_package_set_from_installed, + warn_legacy_versions_and_specifiers, ) from pip._internal.utils.misc import write_output @@ -21,6 +22,7 @@ class CheckCommand(Command): def run(self, options: Values, args: List[str]) -> int: package_set, parsing_probs = create_package_set_from_installed() + warn_legacy_versions_and_specifiers(package_set) missing, conflicting = check_package_set(package_set) for project_name in missing: diff --git a/src/pip/_internal/commands/completion.py b/src/pip/_internal/commands/completion.py index deaa30899e6..9e89e279883 100644 --- a/src/pip/_internal/commands/completion.py +++ b/src/pip/_internal/commands/completion.py @@ -22,15 +22,19 @@ complete -o default -F _pip_completion {prog} """, "zsh": """ - function _pip_completion {{ - local words cword - read -Ac words - read -cn cword - reply=( $( COMP_WORDS="$words[*]" \\ - COMP_CWORD=$(( cword-1 )) \\ - PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null )) + #compdef -P pip[0-9.]# + __pip() {{ + compadd $( COMP_WORDS="$words[*]" \\ + COMP_CWORD=$((CURRENT-1)) \\ + PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null ) }} - compctl -K _pip_completion {prog} + if [[ $zsh_eval_context[-1] == loadautofunc ]]; then + # autoload from fpath, call function directly + __pip "$@" + else + # eval/source/. command, register function for later + compdef __pip -P 'pip[0-9.]#' + fi """, "fish": """ function __fish_complete_pip diff --git a/src/pip/_internal/commands/configuration.py b/src/pip/_internal/commands/configuration.py index 84b134e490b..1a1dc6b6cd8 100644 --- a/src/pip/_internal/commands/configuration.py +++ b/src/pip/_internal/commands/configuration.py @@ -242,17 +242,15 @@ def open_in_editor(self, options: Values, args: List[str]) -> None: e.filename = editor raise except subprocess.CalledProcessError as e: - raise PipError( - "Editor Subprocess exited with exit code {}".format(e.returncode) - ) + raise PipError(f"Editor Subprocess exited with exit code {e.returncode}") def _get_n_args(self, args: List[str], example: str, n: int) -> Any: """Helper to make sure the command got the right number of arguments""" if len(args) != n: msg = ( - "Got unexpected number of arguments, expected {}. " - '(example: "{} config {}")' - ).format(n, get_prog(), example) + f"Got unexpected number of arguments, expected {n}. " + f'(example: "{get_prog()} config {example}")' + ) raise PipError(msg) if n == 1: diff --git a/src/pip/_internal/commands/debug.py b/src/pip/_internal/commands/debug.py index 2a3e7d298f3..7e5271c9886 100644 --- a/src/pip/_internal/commands/debug.py +++ b/src/pip/_internal/commands/debug.py @@ -46,22 +46,29 @@ def create_vendor_txt_map() -> Dict[str, str]: return dict(line.split("==", 1) for line in lines) -def get_module_from_module_name(module_name: str) -> ModuleType: +def get_module_from_module_name(module_name: str) -> Optional[ModuleType]: # Module name can be uppercase in vendor.txt for some reason... module_name = module_name.lower().replace("-", "_") # PATCH: setuptools is actually only pkg_resources. if module_name == "setuptools": module_name = "pkg_resources" - __import__(f"pip._vendor.{module_name}", globals(), locals(), level=0) - return getattr(pip._vendor, module_name) + try: + __import__(f"pip._vendor.{module_name}", globals(), locals(), level=0) + return getattr(pip._vendor, module_name) + except ImportError: + # We allow 'truststore' to fail to import due + # to being unavailable on Python 3.9 and earlier. + if module_name == "truststore" and sys.version_info < (3, 10): + return None + raise def get_vendor_version_from_module(module_name: str) -> Optional[str]: module = get_module_from_module_name(module_name) version = getattr(module, "__version__", None) - if not version: + if module and not version: # Try to find version in debundled module info. assert module.__file__ is not None env = get_environment([os.path.dirname(module.__file__)]) @@ -88,7 +95,7 @@ def show_actual_vendor_versions(vendor_txt_versions: Dict[str, str]) -> None: elif parse_version(actual_version) != parse_version(expected_version): extra_message = ( " (CONFLICT: vendor.txt suggests version should" - " be {})".format(expected_version) + f" be {expected_version})" ) logger.info("%s==%s%s", module_name, actual_version, extra_message) @@ -105,7 +112,7 @@ def show_tags(options: Values) -> None: tag_limit = 10 target_python = make_target_python(options) - tags = target_python.get_tags() + tags = target_python.get_sorted_tags() # Display the target options that were explicitly provided. formatted_target = target_python.format_given() @@ -113,7 +120,7 @@ def show_tags(options: Values) -> None: if formatted_target: suffix = f" (target: {formatted_target})" - msg = "Compatible tags: {}{}".format(len(tags), suffix) + msg = f"Compatible tags: {len(tags)}{suffix}" logger.info(msg) if options.verbose < 1 and len(tags) > tag_limit: @@ -127,17 +134,12 @@ def show_tags(options: Values) -> None: logger.info(str(tag)) if tags_limited: - msg = ( - "...\n[First {tag_limit} tags shown. Pass --verbose to show all.]" - ).format(tag_limit=tag_limit) + msg = f"...\n[First {tag_limit} tags shown. Pass --verbose to show all.]" logger.info(msg) def ca_bundle_info(config: Configuration) -> str: - levels = set() - for key, _ in config.items(): - levels.add(key.split(".")[0]) - + levels = {key.split(".", 1)[0] for key, _ in config.items()} if not levels: return "Not specified" diff --git a/src/pip/_internal/commands/download.py b/src/pip/_internal/commands/download.py index 36e947c8c05..54247a78a65 100644 --- a/src/pip/_internal/commands/download.py +++ b/src/pip/_internal/commands/download.py @@ -137,6 +137,10 @@ def run(self, options: Values, args: List[str]) -> int: assert req.name is not None preparer.save_linked_requirement(req) downloaded.append(req.name) + + preparer.prepare_linked_requirements_more(requirement_set.requirements.values()) + requirement_set.warn_legacy_versions_and_specifiers() + if downloaded: write_output("Successfully downloaded %s", " ".join(downloaded)) diff --git a/src/pip/_internal/commands/freeze.py b/src/pip/_internal/commands/freeze.py index 5fa6d39b2c7..fd9d88a8b01 100644 --- a/src/pip/_internal/commands/freeze.py +++ b/src/pip/_internal/commands/freeze.py @@ -1,6 +1,6 @@ import sys from optparse import Values -from typing import List +from typing import AbstractSet, List from pip._internal.cli import cmdoptions from pip._internal.cli.base_command import Command @@ -8,7 +8,18 @@ from pip._internal.operations.freeze import freeze from pip._internal.utils.compat import stdlib_pkgs -DEV_PKGS = {"pip", "setuptools", "distribute", "wheel"} + +def _should_suppress_build_backends() -> bool: + return sys.version_info < (3, 12) + + +def _dev_pkgs() -> AbstractSet[str]: + pkgs = {"pip"} + + if _should_suppress_build_backends(): + pkgs |= {"setuptools", "distribute", "wheel"} + + return pkgs class FreezeCommand(Command): @@ -61,7 +72,7 @@ def add_options(self) -> None: action="store_true", help=( "Do not skip these packages in the output:" - " {}".format(", ".join(DEV_PKGS)) + " {}".format(", ".join(_dev_pkgs())) ), ) self.cmd_opts.add_option( @@ -77,7 +88,7 @@ def add_options(self) -> None: def run(self, options: Values, args: List[str]) -> int: skip = set(stdlib_pkgs) if not options.freeze_all: - skip.update(DEV_PKGS) + skip.update(_dev_pkgs()) if options.excludes: skip.update(options.excludes) diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py index 7267effed24..f55e9e49974 100644 --- a/src/pip/_internal/commands/index.py +++ b/src/pip/_internal/commands/index.py @@ -128,12 +128,12 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No if not versions: raise DistributionNotFound( - "No matching distribution found for {}".format(query) + f"No matching distribution found for {query}" ) formatted_versions = [str(ver) for ver in sorted(versions, reverse=True)] latest = formatted_versions[0] - write_output("{} ({})".format(query, latest)) + write_output(f"{query} ({latest})") write_output("Available versions: {}".format(", ".join(formatted_versions))) print_dist_installation_info(query, latest) diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py index 3c15ed4158c..e944bb95a50 100644 --- a/src/pip/_internal/commands/install.py +++ b/src/pip/_internal/commands/install.py @@ -387,6 +387,9 @@ def run(self, options: Values, args: List[str]) -> int: json.dump(report.to_dict(), f, indent=2, ensure_ascii=False) if options.dry_run: + # In non dry-run mode, the legacy versions and specifiers check + # will be done as part of conflict detection. + requirement_set.warn_legacy_versions_and_specifiers() would_install_items = sorted( (r.metadata["name"], r.metadata["version"]) for r in requirement_set.requirements_to_install @@ -498,7 +501,7 @@ def run(self, options: Values, args: List[str]) -> int: show_traceback, options.use_user_site, ) - logger.error(message, exc_info=show_traceback) # noqa + logger.error(message, exc_info=show_traceback) return ERROR @@ -592,7 +595,7 @@ def _warn_about_conflicts( "source of the following dependency conflicts." ) else: - assert resolver_variant == "2020-resolver" + assert resolver_variant == "resolvelib" parts.append( "pip's dependency resolver does not currently take into account " "all the packages that are installed. This behaviour is the " @@ -604,12 +607,8 @@ def _warn_about_conflicts( version = package_set[project_name][0] for dependency in missing[project_name]: message = ( - "{name} {version} requires {requirement}, " + f"{project_name} {version} requires {dependency[1]}, " "which is not installed." - ).format( - name=project_name, - version=version, - requirement=dependency[1], ) parts.append(message) @@ -625,7 +624,7 @@ def _warn_about_conflicts( requirement=req, dep_name=dep_name, dep_version=dep_version, - you=("you" if resolver_variant == "2020-resolver" else "you'll"), + you=("you" if resolver_variant == "resolvelib" else "you'll"), ) parts.append(message) diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py index 8e1426dbb6c..e551dda9a96 100644 --- a/src/pip/_internal/commands/list.py +++ b/src/pip/_internal/commands/list.py @@ -103,7 +103,10 @@ def add_options(self) -> None: dest="list_format", default="columns", choices=("columns", "freeze", "json"), - help="Select the output format among: columns (default), freeze, or json", + help=( + "Select the output format among: columns (default), freeze, or json. " + "The 'freeze' format cannot be used with the --outdated option." + ), ) self.cmd_opts.add_option( @@ -157,7 +160,7 @@ def run(self, options: Values, args: List[str]) -> int: if options.outdated and options.list_format == "freeze": raise CommandError( - "List format 'freeze' can not be used with the --outdated option." + "List format 'freeze' cannot be used with the --outdated option." ) cmdoptions.check_list_path_option(options) @@ -294,7 +297,7 @@ def output_package_listing_columns( # Create and add a separator. if len(data) > 0: - pkg_strings.insert(1, " ".join(map(lambda x: "-" * x, sizes))) + pkg_strings.insert(1, " ".join("-" * x for x in sizes)) for val in pkg_strings: write_output(val) diff --git a/src/pip/_internal/commands/wheel.py b/src/pip/_internal/commands/wheel.py index c6a588ff09b..ed578aa2500 100644 --- a/src/pip/_internal/commands/wheel.py +++ b/src/pip/_internal/commands/wheel.py @@ -153,6 +153,9 @@ def run(self, options: Values, args: List[str]) -> int: elif should_build_for_wheel_command(req): reqs_to_build.append(req) + preparer.prepare_linked_requirements_more(requirement_set.requirements.values()) + requirement_set.warn_legacy_versions_and_specifiers() + # build wheels build_successes, build_failures = build( reqs_to_build, diff --git a/src/pip/_internal/configuration.py b/src/pip/_internal/configuration.py index 6cce8bcbcce..c25273d5f0b 100644 --- a/src/pip/_internal/configuration.py +++ b/src/pip/_internal/configuration.py @@ -36,20 +36,12 @@ kinds = enum( USER="user", # User Specific GLOBAL="global", # System Wide - BASE="base", # Base environment specific (e.g. for all venvs with the same base) - SITE="site", # Environment Specific (e.g. per venv) + SITE="site", # [Virtual] Environment Specific ENV="env", # from PIP_CONFIG_FILE ENV_VAR="env-var", # from Environment Variables ) -OVERRIDE_ORDER = ( - kinds.GLOBAL, - kinds.USER, - kinds.BASE, - kinds.SITE, - kinds.ENV, - kinds.ENV_VAR, -) -VALID_LOAD_ONLY = kinds.USER, kinds.GLOBAL, kinds.BASE, kinds.SITE +OVERRIDE_ORDER = kinds.GLOBAL, kinds.USER, kinds.SITE, kinds.ENV, kinds.ENV_VAR +VALID_LOAD_ONLY = kinds.USER, kinds.GLOBAL, kinds.SITE logger = getLogger(__name__) @@ -67,8 +59,8 @@ def _disassemble_key(name: str) -> List[str]: if "." not in name: error_message = ( "Key does not contain dot separated section and key. " - "Perhaps you wanted to use 'global.{}' instead?" - ).format(name) + f"Perhaps you wanted to use 'global.{name}' instead?" + ) raise ConfigurationError(error_message) return name.split(".", 1) @@ -78,7 +70,6 @@ def get_configuration_files() -> Dict[Kind, List[str]]: os.path.join(path, CONFIG_BASENAME) for path in appdirs.site_config_dirs("pip") ] - base_config_file = os.path.join(sys.base_prefix, CONFIG_BASENAME) site_config_file = os.path.join(sys.prefix, CONFIG_BASENAME) legacy_config_file = os.path.join( os.path.expanduser("~"), @@ -87,7 +78,6 @@ def get_configuration_files() -> Dict[Kind, List[str]]: ) new_config_file = os.path.join(appdirs.user_config_dir("pip"), CONFIG_BASENAME) return { - kinds.BASE: [base_config_file], kinds.GLOBAL: global_config_files, kinds.SITE: [site_config_file], kinds.USER: [legacy_config_file, new_config_file], @@ -220,8 +210,15 @@ def save(self) -> None: # Ensure directory exists. ensure_dir(os.path.dirname(fname)) - with open(fname, "w") as f: - parser.write(f) + # Ensure directory's permission(need to be writeable) + try: + with open(fname, "w") as f: + parser.write(f) + except OSError as error: + raise ConfigurationError( + f"An error occurred while writing to the configuration file " + f"{fname}: {error}" + ) # # Private routines @@ -330,35 +327,35 @@ def get_environ_vars(self) -> Iterable[Tuple[str, str]]: def iter_config_files(self) -> Iterable[Tuple[Kind, List[str]]]: """Yields variant and configuration files associated with it. - This should be treated like items of a dictionary. + This should be treated like items of a dictionary. The order + here doesn't affect what gets overridden. That is controlled + by OVERRIDE_ORDER. However this does control the order they are + displayed to the user. It's probably most ergononmic to display + things in the same order as OVERRIDE_ORDER """ # SMELL: Move the conditions out of this function - # environment variables have the lowest priority - config_file = os.environ.get("PIP_CONFIG_FILE", None) - if config_file is not None: - yield kinds.ENV, [config_file] - else: - yield kinds.ENV, [] - + env_config_file = os.environ.get("PIP_CONFIG_FILE", None) config_files = get_configuration_files() - # at the base we have any global configuration yield kinds.GLOBAL, config_files[kinds.GLOBAL] - # per-user configuration next + # per-user config is not loaded when env_config_file exists should_load_user_config = not self.isolated and not ( - config_file and os.path.exists(config_file) + env_config_file and os.path.exists(env_config_file) ) if should_load_user_config: # The legacy config file is overridden by the new config file yield kinds.USER, config_files[kinds.USER] - yield kinds.BASE, config_files[kinds.BASE] - - # finally virtualenv configuration first trumping others + # virtualenv config yield kinds.SITE, config_files[kinds.SITE] + if env_config_file is not None: + yield kinds.ENV, [env_config_file] + else: + yield kinds.ENV, [] + def get_values_in_config(self, variant: Kind) -> Dict[str, Any]: """Get values present in a config file""" return self._config[variant] diff --git a/src/pip/_internal/distributions/base.py b/src/pip/_internal/distributions/base.py index 75ce2dc9057..6fb0d7b7772 100644 --- a/src/pip/_internal/distributions/base.py +++ b/src/pip/_internal/distributions/base.py @@ -1,4 +1,5 @@ import abc +from typing import Optional from pip._internal.index.package_finder import PackageFinder from pip._internal.metadata.base import BaseDistribution @@ -19,12 +20,23 @@ class AbstractDistribution(metaclass=abc.ABCMeta): - we must be able to create a Distribution object exposing the above metadata. + + - if we need to do work in the build tracker, we must be able to generate a unique + string to identify the requirement in the build tracker. """ def __init__(self, req: InstallRequirement) -> None: super().__init__() self.req = req + @abc.abstractproperty + def build_tracker_id(self) -> Optional[str]: + """A string that uniquely identifies this requirement to the build tracker. + + If None, then this dist has no work to do in the build tracker, and + ``.prepare_distribution_metadata()`` will not be called.""" + raise NotImplementedError() + @abc.abstractmethod def get_metadata_distribution(self) -> BaseDistribution: raise NotImplementedError() diff --git a/src/pip/_internal/distributions/installed.py b/src/pip/_internal/distributions/installed.py index edb38aa1a6c..ab8d53be740 100644 --- a/src/pip/_internal/distributions/installed.py +++ b/src/pip/_internal/distributions/installed.py @@ -1,3 +1,5 @@ +from typing import Optional + from pip._internal.distributions.base import AbstractDistribution from pip._internal.index.package_finder import PackageFinder from pip._internal.metadata import BaseDistribution @@ -10,6 +12,10 @@ class InstalledDistribution(AbstractDistribution): been computed. """ + @property + def build_tracker_id(self) -> Optional[str]: + return None + def get_metadata_distribution(self) -> BaseDistribution: assert self.req.satisfied_by is not None, "not actually installed" return self.req.satisfied_by diff --git a/src/pip/_internal/distributions/sdist.py b/src/pip/_internal/distributions/sdist.py index 6ba5961cb83..4cb0e453969 100644 --- a/src/pip/_internal/distributions/sdist.py +++ b/src/pip/_internal/distributions/sdist.py @@ -1,5 +1,5 @@ import logging -from typing import Iterable, Set, Tuple +from typing import Iterable, Optional, Set, Tuple from pip._internal.build_env import BuildEnvironment from pip._internal.distributions.base import AbstractDistribution @@ -18,6 +18,12 @@ class SourceDistribution(AbstractDistribution): generated, either using PEP 517 or using the legacy `setup.py egg_info`. """ + @property + def build_tracker_id(self) -> Optional[str]: + """Identify this requirement uniquely by its link.""" + assert self.req.link + return self.req.link.url_without_fragment + def get_metadata_distribution(self) -> BaseDistribution: return self.req.get_dist() diff --git a/src/pip/_internal/distributions/wheel.py b/src/pip/_internal/distributions/wheel.py index 03aac775b53..eb16e25cbcc 100644 --- a/src/pip/_internal/distributions/wheel.py +++ b/src/pip/_internal/distributions/wheel.py @@ -1,3 +1,5 @@ +from typing import Optional + from pip._vendor.packaging.utils import canonicalize_name from pip._internal.distributions.base import AbstractDistribution @@ -15,6 +17,10 @@ class WheelDistribution(AbstractDistribution): This does not need any preparation as wheels can be directly unpacked. """ + @property + def build_tracker_id(self) -> Optional[str]: + return None + def get_metadata_distribution(self) -> BaseDistribution: """Loads the metadata from the wheel file into memory and returns a Distribution that uses it, not relying on the wheel file or diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py index 2716151a064..29acd9babc6 100644 --- a/src/pip/_internal/exceptions.py +++ b/src/pip/_internal/exceptions.py @@ -246,10 +246,7 @@ def __init__( def __str__(self) -> str: # Use `dist` in the error message because its stringification # includes more information, like the version and location. - return "None {} metadata found for distribution: {}".format( - self.metadata_name, - self.dist, - ) + return f"None {self.metadata_name} metadata found for distribution: {self.dist}" class UserInstallationInvalid(InstallationError): @@ -543,7 +540,7 @@ def body(self) -> str: # so the output can be directly copied into the requirements file. package = ( self.req.original_link - if self.req.original_link + if self.req.is_direct # In case someone feeds something downright stupid # to InstallRequirement's constructor. else getattr(self.req, "req", None) @@ -593,7 +590,7 @@ def __init__(self, allowed: Dict[str, List[str]], gots: Dict[str, "_Hash"]) -> N self.gots = gots def body(self) -> str: - return " {}:\n{}".format(self._requirement_name(), self._hash_comparison()) + return f" {self._requirement_name()}:\n{self._hash_comparison()}" def _hash_comparison(self) -> str: """ @@ -615,11 +612,9 @@ def hash_then_or(hash_name: str) -> "chain[str]": lines: List[str] = [] for hash_name, expecteds in self.allowed.items(): prefix = hash_then_or(hash_name) - lines.extend( - (" Expected {} {}".format(next(prefix), e)) for e in expecteds - ) + lines.extend((f" Expected {next(prefix)} {e}") for e in expecteds) lines.append( - " Got {}\n".format(self.gots[hash_name].hexdigest()) + f" Got {self.gots[hash_name].hexdigest()}\n" ) return "\n".join(lines) diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py index b6f8d57e854..ec9ebc36718 100644 --- a/src/pip/_internal/index/package_finder.py +++ b/src/pip/_internal/index/package_finder.py @@ -198,7 +198,7 @@ def evaluate_link(self, link: Link) -> Tuple[LinkType, str]: reason = f"wrong project name (not {self.project_name})" return (LinkType.different_project, reason) - supported_tags = self._target_python.get_tags() + supported_tags = self._target_python.get_unsorted_tags() if not wheel.supported(supported_tags): # Include the wheel's tags in the reason string to # simplify troubleshooting compatibility issues. @@ -414,7 +414,7 @@ def create( if specifier is None: specifier = specifiers.SpecifierSet() - supported_tags = target_python.get_tags() + supported_tags = target_python.get_sorted_tags() return cls( project_name=project_name, @@ -533,8 +533,8 @@ def _sort_key(self, candidate: InstallationCandidate) -> CandidateSortingKey: ) except ValueError: raise UnsupportedWheel( - "{} is not a supported wheel for this platform. It " - "can't be sorted.".format(wheel.filename) + f"{wheel.filename} is not a supported wheel for this platform. It " + "can't be sorted." ) if self._prefer_binary: binary_preference = 1 @@ -939,9 +939,7 @@ def _format_versions(cand_iter: Iterable[InstallationCandidate]) -> str: _format_versions(best_candidate_result.iter_all()), ) - raise DistributionNotFound( - "No matching distribution found for {}".format(req) - ) + raise DistributionNotFound(f"No matching distribution found for {req}") def _should_install_candidate( candidate: Optional[InstallationCandidate], diff --git a/src/pip/_internal/locations/_distutils.py b/src/pip/_internal/locations/_distutils.py index 92bd93179c5..0e18c6e1e14 100644 --- a/src/pip/_internal/locations/_distutils.py +++ b/src/pip/_internal/locations/_distutils.py @@ -56,8 +56,7 @@ def distutils_scheme( try: d.parse_config_files() except UnicodeDecodeError: - # Typeshed does not include find_config_files() for some reason. - paths = d.find_config_files() # type: ignore + paths = d.find_config_files() logger.warning( "Ignore distutils configs in %s due to encoding errors.", ", ".join(os.path.basename(p) for p in paths), @@ -89,7 +88,7 @@ def distutils_scheme( # finalize_options(); we only want to override here if the user # has explicitly requested it hence going back to the config if "install_lib" in d.get_option_dict("install"): - scheme.update(dict(purelib=i.install_lib, platlib=i.install_lib)) + scheme.update({"purelib": i.install_lib, "platlib": i.install_lib}) if running_under_virtualenv(): if home: diff --git a/src/pip/_internal/metadata/__init__.py b/src/pip/_internal/metadata/__init__.py index 4f04ff9a1d9..aa232b6cabd 100644 --- a/src/pip/_internal/metadata/__init__.py +++ b/src/pip/_internal/metadata/__init__.py @@ -2,12 +2,17 @@ import functools import os import sys -from typing import List, Optional, Protocol, Type, cast +from typing import TYPE_CHECKING, List, Optional, Type, cast from pip._internal.utils.misc import strtobool from .base import BaseDistribution, BaseEnvironment, FilesystemWheel, MemoryWheel, Wheel +if TYPE_CHECKING: + from typing import Literal, Protocol +else: + Protocol = object + __all__ = [ "BaseDistribution", "BaseEnvironment", @@ -45,6 +50,7 @@ def _should_use_importlib_metadata() -> bool: class Backend(Protocol): + NAME: 'Literal["importlib", "pkg_resources"]' Distribution: Type[BaseDistribution] Environment: Type[BaseEnvironment] diff --git a/src/pip/_internal/metadata/_json.py b/src/pip/_internal/metadata/_json.py index 336b52f1efd..27362fc726c 100644 --- a/src/pip/_internal/metadata/_json.py +++ b/src/pip/_internal/metadata/_json.py @@ -64,10 +64,10 @@ def sanitise_header(h: Union[Header, str]) -> str: key = json_name(field) if multi: value: Union[str, List[str]] = [ - sanitise_header(v) for v in msg.get_all(field) + sanitise_header(v) for v in msg.get_all(field) # type: ignore ] else: - value = sanitise_header(msg.get(field)) + value = sanitise_header(msg.get(field)) # type: ignore if key == "keywords": # Accept both comma-separated and space-separated # forms, for better compatibility with old data. diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py index 1c7acb599df..af0412c819c 100644 --- a/src/pip/_internal/metadata/base.py +++ b/src/pip/_internal/metadata/base.py @@ -24,7 +24,7 @@ from pip._vendor.packaging.requirements import Requirement from pip._vendor.packaging.specifiers import InvalidSpecifier, SpecifierSet -from pip._vendor.packaging.utils import NormalizedName +from pip._vendor.packaging.utils import NormalizedName, canonicalize_name from pip._vendor.packaging.version import LegacyVersion, Version from pip._internal.exceptions import NoneMetadataError @@ -37,7 +37,6 @@ from pip._internal.utils.compat import stdlib_pkgs # TODO: Move definition here. from pip._internal.utils.egg_link import egg_link_path_from_sys_path from pip._internal.utils.misc import is_local, normalize_path -from pip._internal.utils.packaging import safe_extra from pip._internal.utils.urls import url_to_path from ._json import msg_to_json @@ -449,6 +448,19 @@ def iter_provided_extras(self) -> Iterable[str]: For modern .dist-info distributions, this is the collection of "Provides-Extra:" entries in distribution metadata. + + The return value of this function is not particularly useful other than + display purposes due to backward compatibility issues and the extra + names being poorly normalized prior to PEP 685. If you want to perform + logic operations on extras, use :func:`is_extra_provided` instead. + """ + raise NotImplementedError() + + def is_extra_provided(self, extra: str) -> bool: + """Check whether an extra is provided by this distribution. + + This is needed mostly for compatibility issues with pkg_resources not + following the extra normalization rules defined in PEP 685. """ raise NotImplementedError() @@ -526,10 +538,11 @@ def _iter_egg_info_extras(self) -> Iterable[str]: """Get extras from the egg-info directory.""" known_extras = {""} for entry in self._iter_requires_txt_entries(): - if entry.extra in known_extras: + extra = canonicalize_name(entry.extra) + if extra in known_extras: continue - known_extras.add(entry.extra) - yield entry.extra + known_extras.add(extra) + yield extra def _iter_egg_info_dependencies(self) -> Iterable[str]: """Get distribution dependencies from the egg-info directory. @@ -545,10 +558,11 @@ def _iter_egg_info_dependencies(self) -> Iterable[str]: all currently available PEP 517 backends, although not standardized. """ for entry in self._iter_requires_txt_entries(): - if entry.extra and entry.marker: - marker = f'({entry.marker}) and extra == "{safe_extra(entry.extra)}"' - elif entry.extra: - marker = f'extra == "{safe_extra(entry.extra)}"' + extra = canonicalize_name(entry.extra) + if extra and entry.marker: + marker = f'({entry.marker}) and extra == "{extra}"' + elif extra: + marker = f'extra == "{extra}"' elif entry.marker: marker = entry.marker else: diff --git a/src/pip/_internal/metadata/importlib/__init__.py b/src/pip/_internal/metadata/importlib/__init__.py index 5e7af9fe521..a779138db10 100644 --- a/src/pip/_internal/metadata/importlib/__init__.py +++ b/src/pip/_internal/metadata/importlib/__init__.py @@ -1,4 +1,6 @@ from ._dists import Distribution from ._envs import Environment -__all__ = ["Distribution", "Environment"] +__all__ = ["NAME", "Distribution", "Environment"] + +NAME = "importlib" diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py index 65c043c87ef..26370facf28 100644 --- a/src/pip/_internal/metadata/importlib/_dists.py +++ b/src/pip/_internal/metadata/importlib/_dists.py @@ -27,7 +27,6 @@ Wheel, ) from pip._internal.utils.misc import normalize_path -from pip._internal.utils.packaging import safe_extra from pip._internal.utils.temp_dir import TempDirectory from pip._internal.utils.wheel import parse_wheel, read_wheel_metadata_file @@ -208,12 +207,16 @@ def _metadata_impl(self) -> email.message.Message: return cast(email.message.Message, self._dist.metadata) def iter_provided_extras(self) -> Iterable[str]: - return ( - safe_extra(extra) for extra in self.metadata.get_all("Provides-Extra", []) + return self.metadata.get_all("Provides-Extra", []) + + def is_extra_provided(self, extra: str) -> bool: + return any( + canonicalize_name(provided_extra) == canonicalize_name(extra) + for provided_extra in self.metadata.get_all("Provides-Extra", []) ) def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]: - contexts: Sequence[Dict[str, str]] = [{"extra": safe_extra(e)} for e in extras] + contexts: Sequence[Dict[str, str]] = [{"extra": e} for e in extras] for req_string in self.metadata.get_all("Requires-Dist", []): req = Requirement(req_string) if not req.marker: diff --git a/src/pip/_internal/metadata/importlib/_envs.py b/src/pip/_internal/metadata/importlib/_envs.py index cbec59e2c6d..048dc55dcb2 100644 --- a/src/pip/_internal/metadata/importlib/_envs.py +++ b/src/pip/_internal/metadata/importlib/_envs.py @@ -151,7 +151,8 @@ def _emit_egg_deprecation(location: Optional[str]) -> None: deprecated( reason=f"Loading egg at {location} is deprecated.", replacement="to use pip for package installation.", - gone_in=None, + gone_in="24.3", + issue=12330, ) @@ -174,7 +175,7 @@ def _iter_distributions(self) -> Iterator[BaseDistribution]: for location in self._paths: yield from finder.find(location) for dist in finder.find_eggs(location): - # _emit_egg_deprecation(dist.location) # TODO: Enable this. + _emit_egg_deprecation(dist.location) yield dist # This must go last because that's how pkg_resources tie-breaks. yield from finder.find_linked(location) diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py index f330ef12a2c..bb11e5bd8a5 100644 --- a/src/pip/_internal/metadata/pkg_resources.py +++ b/src/pip/_internal/metadata/pkg_resources.py @@ -24,8 +24,12 @@ Wheel, ) +__all__ = ["NAME", "Distribution", "Environment"] + logger = logging.getLogger(__name__) +NAME = "pkg_resources" + class EntryPoint(NamedTuple): name: str @@ -212,12 +216,16 @@ def _metadata_impl(self) -> email.message.Message: def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]: if extras: # pkg_resources raises on invalid extras, so we sanitize. - extras = frozenset(extras).intersection(self._dist.extras) + extras = frozenset(pkg_resources.safe_extra(e) for e in extras) + extras = extras.intersection(self._dist.extras) return self._dist.requires(extras) def iter_provided_extras(self) -> Iterable[str]: return self._dist.extras + def is_extra_provided(self, extra: str) -> bool: + return pkg_resources.safe_extra(extra) in self._dist.extras + class Environment(BaseEnvironment): def __init__(self, ws: pkg_resources.WorkingSet) -> None: diff --git a/src/pip/_internal/models/candidate.py b/src/pip/_internal/models/candidate.py index a4963aec638..9184a902aef 100644 --- a/src/pip/_internal/models/candidate.py +++ b/src/pip/_internal/models/candidate.py @@ -27,8 +27,4 @@ def __repr__(self) -> str: ) def __str__(self) -> str: - return "{!r} candidate (version {} at {})".format( - self.name, - self.version, - self.link, - ) + return f"{self.name!r} candidate (version {self.version} at {self.link})" diff --git a/src/pip/_internal/models/direct_url.py b/src/pip/_internal/models/direct_url.py index c3de70a749c..0af884bd8e3 100644 --- a/src/pip/_internal/models/direct_url.py +++ b/src/pip/_internal/models/direct_url.py @@ -31,9 +31,7 @@ def _get( value = d[key] if not isinstance(value, expected_type): raise DirectUrlValidationError( - "{!r} has unexpected type for {} (expected {})".format( - value, key, expected_type - ) + f"{value!r} has unexpected type for {key} (expected {expected_type})" ) return value @@ -105,22 +103,31 @@ def __init__( hash: Optional[str] = None, hashes: Optional[Dict[str, str]] = None, ) -> None: - if hash is not None: + # set hashes before hash, since the hash setter will further populate hashes + self.hashes = hashes + self.hash = hash + + @property + def hash(self) -> Optional[str]: + return self._hash + + @hash.setter + def hash(self, value: Optional[str]) -> None: + if value is not None: # Auto-populate the hashes key to upgrade to the new format automatically. - # We don't back-populate the legacy hash key. + # We don't back-populate the legacy hash key from hashes. try: - hash_name, hash_value = hash.split("=", 1) + hash_name, hash_value = value.split("=", 1) except ValueError: raise DirectUrlValidationError( - f"invalid archive_info.hash format: {hash!r}" + f"invalid archive_info.hash format: {value!r}" ) - if hashes is None: - hashes = {hash_name: hash_value} - elif hash_name not in hash: - hashes = hashes.copy() - hashes[hash_name] = hash_value - self.hash = hash - self.hashes = hashes + if self.hashes is None: + self.hashes = {hash_name: hash_value} + elif hash_name not in self.hashes: + self.hashes = self.hashes.copy() + self.hashes[hash_name] = hash_value + self._hash = value @classmethod def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["ArchiveInfo"]: diff --git a/src/pip/_internal/models/format_control.py b/src/pip/_internal/models/format_control.py index db3995eac9f..ccd11272c03 100644 --- a/src/pip/_internal/models/format_control.py +++ b/src/pip/_internal/models/format_control.py @@ -33,9 +33,7 @@ def __eq__(self, other: object) -> bool: return all(getattr(self, k) == getattr(other, k) for k in self.__slots__) def __repr__(self) -> str: - return "{}({}, {})".format( - self.__class__.__name__, self.no_binary, self.only_binary - ) + return f"{self.__class__.__name__}({self.no_binary}, {self.only_binary})" @staticmethod def handle_mutual_excludes(value: str, target: Set[str], other: Set[str]) -> None: diff --git a/src/pip/_internal/models/installation_report.py b/src/pip/_internal/models/installation_report.py index b54afb109b4..b9c6330df32 100644 --- a/src/pip/_internal/models/installation_report.py +++ b/src/pip/_internal/models/installation_report.py @@ -14,7 +14,7 @@ def __init__(self, install_requirements: Sequence[InstallRequirement]): def _install_req_to_dict(cls, ireq: InstallRequirement) -> Dict[str, Any]: assert ireq.download_info, f"No download_info for {ireq}" res = { - # PEP 610 json for the download URL. download_info.archive_info.hash may + # PEP 610 json for the download URL. download_info.archive_info.hashes may # be absent when the requirement was installed from the wheel cache # and the cache entry was populated by an older pip version that did not # record origin.json. @@ -22,7 +22,10 @@ def _install_req_to_dict(cls, ireq: InstallRequirement) -> Dict[str, Any]: # is_direct is true if the requirement was a direct URL reference (which # includes editable requirements), and false if the requirement was # downloaded from a PEP 503 index or --find-links. - "is_direct": bool(ireq.original_link), + "is_direct": ireq.is_direct, + # is_yanked is true if the requirement was yanked from the index, but + # was still selected by pip to conform to PEP 592. + "is_yanked": ireq.link.is_yanked if ireq.link else False, # requested is true if the requirement was specified by the user (aka # top level requirement), and false if it was installed as a dependency of a # requirement. https://peps.python.org/pep-0376/#requested @@ -33,7 +36,7 @@ def _install_req_to_dict(cls, ireq: InstallRequirement) -> Dict[str, Any]: } if ireq.user_supplied and ireq.extras: # For top level requirements, the list of requested extras, if any. - res["requested_extras"] = list(sorted(ireq.extras)) + res["requested_extras"] = sorted(ireq.extras) return res def to_dict(self) -> Dict[str, Any]: diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py index a1e4d5a08df..73041b864c3 100644 --- a/src/pip/_internal/models/link.py +++ b/src/pip/_internal/models/link.py @@ -55,25 +55,25 @@ class LinkHash: name: str value: str - _hash_re = re.compile( + _hash_url_fragment_re = re.compile( # NB: we do not validate that the second group (.*) is a valid hex # digest. Instead, we simply keep that string in this class, and then check it # against Hashes when hash-checking is needed. This is easier to debug than # proactively discarding an invalid hex digest, as we handle incorrect hashes # and malformed hashes in the same place. - r"({choices})=(.*)".format( + r"[#&]({choices})=([^&]*)".format( choices="|".join(re.escape(hash_name) for hash_name in _SUPPORTED_HASHES) ), ) def __post_init__(self) -> None: - assert self._hash_re.match(f"{self.name}={self.value}") + assert self.name in _SUPPORTED_HASHES @classmethod @functools.lru_cache(maxsize=None) - def split_hash_name_and_value(cls, url: str) -> Optional["LinkHash"]: + def find_hash_url_fragment(cls, url: str) -> Optional["LinkHash"]: """Search a string for a checksum algorithm name and encoded output value.""" - match = cls._hash_re.search(url) + match = cls._hash_url_fragment_re.search(url) if match is None: return None name, value = match.groups() @@ -95,6 +95,28 @@ def is_hash_allowed(self, hashes: Optional[Hashes]) -> bool: return hashes.is_hash_allowed(self.name, hex_digest=self.value) +@dataclass(frozen=True) +class MetadataFile: + """Information about a core metadata file associated with a distribution.""" + + hashes: Optional[Dict[str, str]] + + def __post_init__(self) -> None: + if self.hashes is not None: + assert all(name in _SUPPORTED_HASHES for name in self.hashes) + + +def supported_hashes(hashes: Optional[Dict[str, str]]) -> Optional[Dict[str, str]]: + # Remove any unsupported hash types from the mapping. If this leaves no + # supported hashes, return None + if hashes is None: + return None + hashes = {n: v for n, v in hashes.items() if n in _SUPPORTED_HASHES} + if not hashes: + return None + return hashes + + def _clean_url_path_part(part: str) -> str: """ Clean a "part" of a URL path (i.e. after splitting on "@" characters). @@ -167,7 +189,7 @@ class Link(KeyBasedCompareMixin): "comes_from", "requires_python", "yanked_reason", - "dist_info_metadata", + "metadata_file_data", "cache_link_parsing", "egg_fragment", ] @@ -178,7 +200,7 @@ def __init__( comes_from: Optional[Union[str, "IndexContent"]] = None, requires_python: Optional[str] = None, yanked_reason: Optional[str] = None, - dist_info_metadata: Optional[str] = None, + metadata_file_data: Optional[MetadataFile] = None, cache_link_parsing: bool = True, hashes: Optional[Mapping[str, str]] = None, ) -> None: @@ -196,11 +218,10 @@ def __init__( a simple repository HTML link. If the file has been yanked but no reason was provided, this should be the empty string. See PEP 592 for more information and the specification. - :param dist_info_metadata: the metadata attached to the file, or None if no such - metadata is provided. This is the value of the "data-dist-info-metadata" - attribute, if present, in a simple repository HTML link. This may be parsed - into its own `Link` by `self.metadata_link()`. See PEP 658 for more - information and the specification. + :param metadata_file_data: the metadata attached to the file, or None if + no such metadata is provided. This argument, if not None, indicates + that a separate metadata file exists, and also optionally supplies + hashes for that file. :param cache_link_parsing: A flag that is used elsewhere to determine whether resources retrieved from this link should be cached. PyPI URLs should generally have this set to False, for example. @@ -208,6 +229,10 @@ def __init__( determine the validity of a download. """ + # The comes_from, requires_python, and metadata_file_data arguments are + # only used by classmethods of this class, and are not used in client + # code directly. + # url can be a UNC windows share if url.startswith("\\\\"): url = path_to_url(url) @@ -217,7 +242,7 @@ def __init__( # trying to set a new value. self._url = url - link_hash = LinkHash.split_hash_name_and_value(url) + link_hash = LinkHash.find_hash_url_fragment(url) hashes_from_link = {} if link_hash is None else link_hash.as_dict() if hashes is None: self._hashes = hashes_from_link @@ -227,7 +252,7 @@ def __init__( self.comes_from = comes_from self.requires_python = requires_python if requires_python else None self.yanked_reason = yanked_reason - self.dist_info_metadata = dist_info_metadata + self.metadata_file_data = metadata_file_data super().__init__(key=url, defining_class=Link) @@ -250,9 +275,25 @@ def from_json( url = _ensure_quoted_url(urllib.parse.urljoin(page_url, file_url)) pyrequire = file_data.get("requires-python") yanked_reason = file_data.get("yanked") - dist_info_metadata = file_data.get("dist-info-metadata") hashes = file_data.get("hashes", {}) + # PEP 714: Indexes must use the name core-metadata, but + # clients should support the old name as a fallback for compatibility. + metadata_info = file_data.get("core-metadata") + if metadata_info is None: + metadata_info = file_data.get("dist-info-metadata") + + # The metadata info value may be a boolean, or a dict of hashes. + if isinstance(metadata_info, dict): + # The file exists, and hashes have been supplied + metadata_file_data = MetadataFile(supported_hashes(metadata_info)) + elif metadata_info: + # The file exists, but there are no hashes + metadata_file_data = MetadataFile(None) + else: + # False or not present: the file does not exist + metadata_file_data = None + # The Link.yanked_reason expects an empty string instead of a boolean. if yanked_reason and not isinstance(yanked_reason, str): yanked_reason = "" @@ -266,7 +307,7 @@ def from_json( requires_python=pyrequire, yanked_reason=yanked_reason, hashes=hashes, - dist_info_metadata=dist_info_metadata, + metadata_file_data=metadata_file_data, ) @classmethod @@ -286,14 +327,39 @@ def from_element( url = _ensure_quoted_url(urllib.parse.urljoin(base_url, href)) pyrequire = anchor_attribs.get("data-requires-python") yanked_reason = anchor_attribs.get("data-yanked") - dist_info_metadata = anchor_attribs.get("data-dist-info-metadata") + + # PEP 714: Indexes must use the name data-core-metadata, but + # clients should support the old name as a fallback for compatibility. + metadata_info = anchor_attribs.get("data-core-metadata") + if metadata_info is None: + metadata_info = anchor_attribs.get("data-dist-info-metadata") + # The metadata info value may be the string "true", or a string of + # the form "hashname=hashval" + if metadata_info == "true": + # The file exists, but there are no hashes + metadata_file_data = MetadataFile(None) + elif metadata_info is None: + # The file does not exist + metadata_file_data = None + else: + # The file exists, and hashes have been supplied + hashname, sep, hashval = metadata_info.partition("=") + if sep == "=": + metadata_file_data = MetadataFile(supported_hashes({hashname: hashval})) + else: + # Error - data is wrong. Treat as no hashes supplied. + logger.debug( + "Index returned invalid data-dist-info-metadata value: %s", + metadata_info, + ) + metadata_file_data = MetadataFile(None) return cls( url, comes_from=page_url, requires_python=pyrequire, yanked_reason=yanked_reason, - dist_info_metadata=dist_info_metadata, + metadata_file_data=metadata_file_data, ) def __str__(self) -> str: @@ -302,9 +368,7 @@ def __str__(self) -> str: else: rp = "" if self.comes_from: - return "{} (from {}){}".format( - redact_auth_from_url(self._url), self.comes_from, rp - ) + return f"{redact_auth_from_url(self._url)} (from {self.comes_from}){rp}" else: return redact_auth_from_url(str(self._url)) @@ -395,22 +459,13 @@ def subdirectory_fragment(self) -> Optional[str]: return match.group(1) def metadata_link(self) -> Optional["Link"]: - """Implementation of PEP 658 parsing.""" - # Note that Link.from_element() parsing the "data-dist-info-metadata" attribute - # from an HTML anchor tag is typically how the Link.dist_info_metadata attribute - # gets set. - if self.dist_info_metadata is None: + """Return a link to the associated core metadata file (if any).""" + if self.metadata_file_data is None: return None metadata_url = f"{self.url_without_fragment}.metadata" - # If data-dist-info-metadata="true" is set, then the metadata file exists, - # but there is no information about its checksum or anything else. - if self.dist_info_metadata != "true": - link_hash = LinkHash.split_hash_name_and_value(self.dist_info_metadata) - else: - link_hash = None - if link_hash is None: + if self.metadata_file_data.hashes is None: return Link(metadata_url) - return Link(metadata_url, hashes=link_hash.as_dict()) + return Link(metadata_url, hashes=self.metadata_file_data.hashes) def as_hashes(self) -> Hashes: return Hashes({k: [v] for k, v in self._hashes.items()}) diff --git a/src/pip/_internal/models/target_python.py b/src/pip/_internal/models/target_python.py index 744bd7ef58b..67ea5da73a5 100644 --- a/src/pip/_internal/models/target_python.py +++ b/src/pip/_internal/models/target_python.py @@ -1,5 +1,5 @@ import sys -from typing import List, Optional, Tuple +from typing import List, Optional, Set, Tuple from pip._vendor.packaging.tags import Tag @@ -22,6 +22,7 @@ class TargetPython: "py_version", "py_version_info", "_valid_tags", + "_valid_tags_set", ] def __init__( @@ -61,8 +62,9 @@ def __init__( self.py_version = py_version self.py_version_info = py_version_info - # This is used to cache the return value of get_tags(). + # This is used to cache the return value of get_(un)sorted_tags. self._valid_tags: Optional[List[Tag]] = None + self._valid_tags_set: Optional[Set[Tag]] = None def format_given(self) -> str: """ @@ -84,7 +86,7 @@ def format_given(self) -> str: f"{key}={value!r}" for key, value in key_values if value is not None ) - def get_tags(self) -> List[Tag]: + def get_sorted_tags(self) -> List[Tag]: """ Return the supported PEP 425 tags to check wheel candidates against. @@ -108,3 +110,13 @@ def get_tags(self) -> List[Tag]: self._valid_tags = tags return self._valid_tags + + def get_unsorted_tags(self) -> Set[Tag]: + """Exactly the same as get_sorted_tags, but returns a set. + + This is important for performance. + """ + if self._valid_tags_set is None: + self._valid_tags_set = set(self.get_sorted_tags()) + + return self._valid_tags_set diff --git a/src/pip/_internal/network/auth.py b/src/pip/_internal/network/auth.py index c0efa765c85..94a82fa6618 100644 --- a/src/pip/_internal/network/auth.py +++ b/src/pip/_internal/network/auth.py @@ -514,7 +514,9 @@ def handle_401(self, resp: Response, **kwargs: Any) -> Response: # Consume content and release the original connection to allow our new # request to reuse the same one. - resp.content + # The result of the assignment isn't used, it's just needed to consume + # the content. + _ = resp.content resp.raw.release_conn() # Add our new username and password to the request diff --git a/src/pip/_internal/network/cache.py b/src/pip/_internal/network/cache.py index a81a2398519..4d0fb545dc2 100644 --- a/src/pip/_internal/network/cache.py +++ b/src/pip/_internal/network/cache.py @@ -3,10 +3,11 @@ import os from contextlib import contextmanager -from typing import Generator, Optional +from datetime import datetime +from typing import BinaryIO, Generator, Optional, Union -from pip._vendor.cachecontrol.cache import BaseCache -from pip._vendor.cachecontrol.caches import FileCache +from pip._vendor.cachecontrol.cache import SeparateBodyBaseCache +from pip._vendor.cachecontrol.caches import SeparateBodyFileCache from pip._vendor.requests.models import Response from pip._internal.utils.filesystem import adjacent_tmp_file, replace @@ -28,10 +29,22 @@ def suppressed_cache_errors() -> Generator[None, None, None]: pass -class SafeFileCache(BaseCache): +class SafeFileCache(SeparateBodyBaseCache): """ A file based cache which is safe to use even when the target directory may not be accessible or writable. + + There is a race condition when two processes try to write and/or read the + same entry at the same time, since each entry consists of two separate + files (https://github.com/psf/cachecontrol/issues/324). We therefore have + additional logic that makes sure that both files to be present before + returning an entry; this fixes the read side of the race condition. + + For the write side, we assume that the server will only ever return the + same data for the same URL, which ought to be the case for files pip is + downloading. PyPI does not have a mechanism to swap out a wheel for + another wheel, for example. If this assumption is not true, the + CacheControl issue will need to be fixed. """ def __init__(self, directory: str) -> None: @@ -43,27 +56,51 @@ def _get_cache_path(self, name: str) -> str: # From cachecontrol.caches.file_cache.FileCache._fn, brought into our # class for backwards-compatibility and to avoid using a non-public # method. - hashed = FileCache.encode(name) + hashed = SeparateBodyFileCache.encode(name) parts = list(hashed[:5]) + [hashed] return os.path.join(self.directory, *parts) def get(self, key: str) -> Optional[bytes]: - path = self._get_cache_path(key) + # The cache entry is only valid if both metadata and body exist. + metadata_path = self._get_cache_path(key) + body_path = metadata_path + ".body" + if not (os.path.exists(metadata_path) and os.path.exists(body_path)): + return None with suppressed_cache_errors(): - with open(path, "rb") as f: + with open(metadata_path, "rb") as f: return f.read() - def set(self, key: str, value: bytes, expires: Optional[int] = None) -> None: - path = self._get_cache_path(key) + def _write(self, path: str, data: bytes) -> None: with suppressed_cache_errors(): ensure_dir(os.path.dirname(path)) with adjacent_tmp_file(path) as f: - f.write(value) + f.write(data) replace(f.name, path) + def set( + self, key: str, value: bytes, expires: Union[int, datetime, None] = None + ) -> None: + path = self._get_cache_path(key) + self._write(path, value) + def delete(self, key: str) -> None: path = self._get_cache_path(key) with suppressed_cache_errors(): os.remove(path) + with suppressed_cache_errors(): + os.remove(path + ".body") + + def get_body(self, key: str) -> Optional[BinaryIO]: + # The cache entry is only valid if both metadata and body exist. + metadata_path = self._get_cache_path(key) + body_path = metadata_path + ".body" + if not (os.path.exists(metadata_path) and os.path.exists(body_path)): + return None + with suppressed_cache_errors(): + return open(body_path, "rb") + + def set_body(self, key: str, body: bytes) -> None: + path = self._get_cache_path(key) + ".body" + self._write(path, body) diff --git a/src/pip/_internal/network/download.py b/src/pip/_internal/network/download.py index 79b82a570e5..d1d43541e6b 100644 --- a/src/pip/_internal/network/download.py +++ b/src/pip/_internal/network/download.py @@ -42,7 +42,7 @@ def _prepare_download( logged_url = redact_auth_from_url(url) if total_length: - logged_url = "{} ({})".format(logged_url, format_size(total_length)) + logged_url = f"{logged_url} ({format_size(total_length)})" if is_from_cache(resp): logger.info("Using cached %s", logged_url) diff --git a/src/pip/_internal/network/session.py b/src/pip/_internal/network/session.py index 6c40ade1595..887dc14e796 100644 --- a/src/pip/_internal/network/session.py +++ b/src/pip/_internal/network/session.py @@ -419,15 +419,17 @@ def add_trusted_host( msg += f" (from {source})" logger.info(msg) - host_port = parse_netloc(host) - if host_port not in self.pip_trusted_origins: - self.pip_trusted_origins.append(host_port) + parsed_host, parsed_port = parse_netloc(host) + if parsed_host is None: + raise ValueError(f"Trusted host URL must include a host part: {host!r}") + if (parsed_host, parsed_port) not in self.pip_trusted_origins: + self.pip_trusted_origins.append((parsed_host, parsed_port)) self.mount( build_url_from_netloc(host, scheme="http") + "/", self._trusted_host_adapter ) self.mount(build_url_from_netloc(host) + "/", self._trusted_host_adapter) - if not host_port[1]: + if not parsed_port: self.mount( build_url_from_netloc(host, scheme="http") + ":", self._trusted_host_adapter, diff --git a/src/pip/_internal/network/xmlrpc.py b/src/pip/_internal/network/xmlrpc.py index 4a7d55d0e50..22ec8d2f4a6 100644 --- a/src/pip/_internal/network/xmlrpc.py +++ b/src/pip/_internal/network/xmlrpc.py @@ -13,6 +13,8 @@ if TYPE_CHECKING: from xmlrpc.client import _HostType, _Marshallable + from _typeshed import SizedBuffer + logger = logging.getLogger(__name__) @@ -33,7 +35,7 @@ def request( self, host: "_HostType", handler: str, - request_body: bytes, + request_body: "SizedBuffer", verbose: bool = False, ) -> Tuple["_Marshallable", ...]: assert isinstance(host, str) diff --git a/src/pip/_internal/operations/build/build_tracker.py b/src/pip/_internal/operations/build/build_tracker.py index 6621549b844..37919322b00 100644 --- a/src/pip/_internal/operations/build/build_tracker.py +++ b/src/pip/_internal/operations/build/build_tracker.py @@ -51,10 +51,22 @@ def get_build_tracker() -> Generator["BuildTracker", None, None]: yield tracker +class TrackerId(str): + """Uniquely identifying string provided to the build tracker.""" + + class BuildTracker: + """Ensure that an sdist cannot request itself as a setup requirement. + + When an sdist is prepared, it identifies its setup requirements in the + context of ``BuildTracker.track()``. If a requirement shows up recursively, this + raises an exception. + + This stops fork bombs embedded in malicious packages.""" + def __init__(self, root: str) -> None: self._root = root - self._entries: Set[InstallRequirement] = set() + self._entries: Dict[TrackerId, InstallRequirement] = {} logger.debug("Created build tracker: %s", self._root) def __enter__(self) -> "BuildTracker": @@ -69,16 +81,15 @@ def __exit__( ) -> None: self.cleanup() - def _entry_path(self, link: Link) -> str: - hashed = hashlib.sha224(link.url_without_fragment.encode()).hexdigest() + def _entry_path(self, key: TrackerId) -> str: + hashed = hashlib.sha224(key.encode()).hexdigest() return os.path.join(self._root, hashed) - def add(self, req: InstallRequirement) -> None: + def add(self, req: InstallRequirement, key: TrackerId) -> None: """Add an InstallRequirement to build tracking.""" - assert req.link # Get the file to write information about this requirement. - entry_path = self._entry_path(req.link) + entry_path = self._entry_path(key) # Try reading from the file. If it exists and can be read from, a build # is already in progress, so a LookupError is raised. @@ -92,33 +103,37 @@ def add(self, req: InstallRequirement) -> None: raise LookupError(message) # If we're here, req should really not be building already. - assert req not in self._entries + assert key not in self._entries # Start tracking this requirement. with open(entry_path, "w", encoding="utf-8") as fp: fp.write(str(req)) - self._entries.add(req) + self._entries[key] = req logger.debug("Added %s to build tracker %r", req, self._root) - def remove(self, req: InstallRequirement) -> None: + def remove(self, req: InstallRequirement, key: TrackerId) -> None: """Remove an InstallRequirement from build tracking.""" - assert req.link - # Delete the created file and the corresponding entries. - os.unlink(self._entry_path(req.link)) - self._entries.remove(req) + # Delete the created file and the corresponding entry. + os.unlink(self._entry_path(key)) + del self._entries[key] logger.debug("Removed %s from build tracker %r", req, self._root) def cleanup(self) -> None: - for req in set(self._entries): - self.remove(req) + for key, req in list(self._entries.items()): + self.remove(req, key) logger.debug("Removed build tracker: %r", self._root) @contextlib.contextmanager - def track(self, req: InstallRequirement) -> Generator[None, None, None]: - self.add(req) + def track(self, req: InstallRequirement, key: str) -> Generator[None, None, None]: + """Ensure that `key` cannot install itself as a setup requirement. + + :raises LookupError: If `key` was already provided in a parent invocation of + the context introduced by this method.""" + tracker_id = TrackerId(key) + self.add(req, tracker_id) yield - self.remove(req) + self.remove(req, tracker_id) diff --git a/src/pip/_internal/operations/check.py b/src/pip/_internal/operations/check.py index e3bce69b204..1b7fd7ab7fd 100644 --- a/src/pip/_internal/operations/check.py +++ b/src/pip/_internal/operations/check.py @@ -5,12 +5,15 @@ from typing import Callable, Dict, List, NamedTuple, Optional, Set, Tuple from pip._vendor.packaging.requirements import Requirement +from pip._vendor.packaging.specifiers import LegacySpecifier from pip._vendor.packaging.utils import NormalizedName, canonicalize_name +from pip._vendor.packaging.version import LegacyVersion from pip._internal.distributions import make_distribution_for_install_requirement from pip._internal.metadata import get_default_environment from pip._internal.metadata.base import DistributionVersion from pip._internal.req.req_install import InstallRequirement +from pip._internal.utils.deprecation import deprecated logger = logging.getLogger(__name__) @@ -57,6 +60,8 @@ def check_package_set( package name and returns a boolean. """ + warn_legacy_versions_and_specifiers(package_set) + missing = {} conflicting = {} @@ -147,3 +152,36 @@ def _create_whitelist( break return packages_affected + + +def warn_legacy_versions_and_specifiers(package_set: PackageSet) -> None: + for project_name, package_details in package_set.items(): + if isinstance(package_details.version, LegacyVersion): + deprecated( + reason=( + f"{project_name} {package_details.version} " + f"has a non-standard version number." + ), + replacement=( + f"to upgrade to a newer version of {project_name} " + f"or contact the author to suggest that they " + f"release a version with a conforming version number" + ), + issue=12063, + gone_in="24.0", + ) + for dep in package_details.dependencies: + if any(isinstance(spec, LegacySpecifier) for spec in dep.specifier): + deprecated( + reason=( + f"{project_name} {package_details.version} " + f"has a non-standard dependency specifier {dep}." + ), + replacement=( + f"to upgrade to a newer version of {project_name} " + f"or contact the author to suggest that they " + f"release a version with a conforming dependency specifiers" + ), + issue=12063, + gone_in="24.0", + ) diff --git a/src/pip/_internal/operations/freeze.py b/src/pip/_internal/operations/freeze.py index 930d4c6005e..35445684514 100644 --- a/src/pip/_internal/operations/freeze.py +++ b/src/pip/_internal/operations/freeze.py @@ -145,9 +145,10 @@ def freeze( def _format_as_name_version(dist: BaseDistribution) -> str: - if isinstance(dist.version, Version): - return f"{dist.raw_name}=={dist.version}" - return f"{dist.raw_name}==={dist.version}" + dist_version = dist.version + if isinstance(dist_version, Version): + return f"{dist.raw_name}=={dist_version}" + return f"{dist.raw_name}==={dist_version}" def _get_editable_info(dist: BaseDistribution) -> _EditableInfo: diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py index 9ae6bad6265..6b9d083eb27 100644 --- a/src/pip/_internal/operations/install/wheel.py +++ b/src/pip/_internal/operations/install/wheel.py @@ -164,16 +164,14 @@ def message_about_scripts_not_on_PATH(scripts: Sequence[str]) -> Optional[str]: for parent_dir, dir_scripts in warn_for.items(): sorted_scripts: List[str] = sorted(dir_scripts) if len(sorted_scripts) == 1: - start_text = "script {} is".format(sorted_scripts[0]) + start_text = f"script {sorted_scripts[0]} is" else: start_text = "scripts {} are".format( ", ".join(sorted_scripts[:-1]) + " and " + sorted_scripts[-1] ) msg_lines.append( - "The {} installed in '{}' which is not on PATH.".format( - start_text, parent_dir - ) + f"The {start_text} installed in '{parent_dir}' which is not on PATH." ) last_line_fmt = ( @@ -267,9 +265,9 @@ def get_csv_rows_for_installed( path = _fs_to_record_path(f, lib_dir) digest, length = rehash(f) installed_rows.append((path, digest, length)) - for installed_record_path in installed.values(): - installed_rows.append((installed_record_path, "", "")) - return installed_rows + return installed_rows + [ + (installed_record_path, "", "") for installed_record_path in installed.values() + ] def get_console_script_specs(console: Dict[str, str]) -> List[str]: @@ -321,9 +319,7 @@ def get_console_script_specs(console: Dict[str, str]) -> List[str]: scripts_to_generate.append("pip = " + pip_script) if os.environ.get("ENSUREPIP_OPTIONS", "") != "altinstall": - scripts_to_generate.append( - "pip{} = {}".format(sys.version_info[0], pip_script) - ) + scripts_to_generate.append(f"pip{sys.version_info[0]} = {pip_script}") scripts_to_generate.append(f"pip{get_major_minor_version()} = {pip_script}") # Delete any other versioned pip entry points @@ -336,9 +332,7 @@ def get_console_script_specs(console: Dict[str, str]) -> List[str]: scripts_to_generate.append("easy_install = " + easy_install_script) scripts_to_generate.append( - "easy_install-{} = {}".format( - get_major_minor_version(), easy_install_script - ) + f"easy_install-{get_major_minor_version()} = {easy_install_script}" ) # Delete any other versioned easy_install entry points easy_install_ep = [ @@ -408,10 +402,10 @@ def save(self) -> None: class MissingCallableSuffix(InstallationError): def __init__(self, entry_point: str) -> None: super().__init__( - "Invalid script entry point: {} - A callable " + f"Invalid script entry point: {entry_point} - A callable " "suffix is required. Cf https://packaging.python.org/" "specifications/entry-points/#use-for-scripts for more " - "information.".format(entry_point) + "information." ) @@ -712,7 +706,7 @@ def req_error_context(req_description: str) -> Generator[None, None, None]: try: yield except InstallationError as e: - message = "For req: {}. {}".format(req_description, e.args[0]) + message = f"For req: {req_description}. {e.args[0]}" raise InstallationError(message) from e diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py index 343a01bef4b..956717d1e52 100644 --- a/src/pip/_internal/operations/prepare.py +++ b/src/pip/_internal/operations/prepare.py @@ -4,10 +4,10 @@ # The following comment should be removed at some point in the future. # mypy: strict-optional=False -import logging import mimetypes import os import shutil +from pathlib import Path from typing import Dict, Iterable, List, Optional from pip._vendor.packaging.utils import canonicalize_name @@ -21,7 +21,6 @@ InstallationError, MetadataInconsistent, NetworkConnectionError, - PreviousBuildDirError, VcsHashUnsupported, ) from pip._internal.index.package_finder import PackageFinder @@ -37,6 +36,7 @@ from pip._internal.network.session import PipSession from pip._internal.operations.build.build_tracker import BuildTracker from pip._internal.req.req_install import InstallRequirement +from pip._internal.utils._log import getLogger from pip._internal.utils.direct_url_helpers import ( direct_url_for_editable, direct_url_from_link, @@ -47,13 +47,13 @@ display_path, hash_file, hide_url, - is_installable_dir, + redact_auth_from_requirement, ) from pip._internal.utils.temp_dir import TempDirectory from pip._internal.utils.unpacking import unpack_file from pip._internal.vcs import vcs -logger = logging.getLogger(__name__) +logger = getLogger(__name__) def _get_prepared_distribution( @@ -65,10 +65,12 @@ def _get_prepared_distribution( ) -> BaseDistribution: """Prepare a distribution for installation.""" abstract_dist = make_distribution_for_install_requirement(req) - with build_tracker.track(req): - abstract_dist.prepare_distribution_metadata( - finder, build_isolation, check_build_deps - ) + tracker_id = abstract_dist.build_tracker_id + if tracker_id is not None: + with build_tracker.track(req, tracker_id): + abstract_dist.prepare_distribution_metadata( + finder, build_isolation, check_build_deps + ) return abstract_dist.get_metadata_distribution() @@ -179,7 +181,10 @@ def unpack_url( def _check_download_dir( - link: Link, download_dir: str, hashes: Optional[Hashes] + link: Link, + download_dir: str, + hashes: Optional[Hashes], + warn_on_hash_mismatch: bool = True, ) -> Optional[str]: """Check download_dir for previously downloaded file with correct hash If a correct file is found return its path else None @@ -195,10 +200,11 @@ def _check_download_dir( try: hashes.check_against_path(download_path) except HashMismatch: - logger.warning( - "Previously-downloaded file %s has bad hash. Re-downloading.", - download_path, - ) + if warn_on_hash_mismatch: + logger.warning( + "Previously-downloaded file %s has bad hash. Re-downloading.", + download_path, + ) os.unlink(download_path) return None return download_path @@ -222,6 +228,7 @@ def __init__( use_user_site: bool, lazy_wheel: bool, verbosity: int, + legacy_resolver: bool, ) -> None: super().__init__() @@ -255,6 +262,9 @@ def __init__( # How verbose should underlying tooling be? self.verbosity = verbosity + # Are we using the legacy resolver? + self.legacy_resolver = legacy_resolver + # Memoized downloaded files, as mapping of url: path. self._downloaded: Dict[str, str] = {} @@ -263,12 +273,12 @@ def __init__( def _log_preparing_link(self, req: InstallRequirement) -> None: """Provide context for the requirement being prepared.""" - if req.link.is_file and not req.original_link_is_in_wheel_cache: + if req.link.is_file and not req.is_wheel_from_cache: message = "Processing %s" information = str(display_path(req.link.file_path)) else: message = "Collecting %s" - information = str(req.req or req) + information = redact_auth_from_requirement(req.req) if req.req else str(req) # If we used req.req, inject requirement source if available (this # would already be included if we used req directly) @@ -284,7 +294,7 @@ def _log_preparing_link(self, req: InstallRequirement) -> None: self._previous_requirement_header = (message, information) logger.info(message, information) - if req.original_link_is_in_wheel_cache: + if req.is_wheel_from_cache: with indent_log(): logger.info("Using cached %s", req.link.filename) @@ -309,21 +319,7 @@ def _ensure_link_req_src_dir( autodelete=True, parallel_builds=parallel_builds, ) - - # If a checkout exists, it's unwise to keep going. version - # inconsistencies are logged later, but do not fail the - # installation. - # FIXME: this won't upgrade when there's an existing - # package unpacked in `req.source_dir` - # TODO: this check is now probably dead code - if is_installable_dir(req.source_dir): - raise PreviousBuildDirError( - "pip can't proceed with requirements '{}' due to a" - "pre-existing build directory ({}). This is likely " - "due to a previous installation that failed . pip is " - "being responsible and not assuming it can delete this. " - "Please delete it and try again.".format(req, req.source_dir) - ) + req.ensure_pristine_source_checkout() def _get_linked_req_hashes(self, req: InstallRequirement) -> Hashes: # By the time this is called, the requirement's link should have @@ -348,7 +344,7 @@ def _get_linked_req_hashes(self, req: InstallRequirement) -> Hashes: # a surprising hash mismatch in the future. # file:/// URLs aren't pinnable, so don't complain about them # not being pinned. - if req.original_link is None and not req.is_pinned: + if not req.is_direct and not req.is_pinned: raise HashUnpinned() # If known-good hashes are missing for this requirement, @@ -361,6 +357,11 @@ def _fetch_metadata_only( self, req: InstallRequirement, ) -> Optional[BaseDistribution]: + if self.legacy_resolver: + logger.debug( + "Metadata-only fetching is not used in the legacy resolver", + ) + return None if self.require_hashes: logger.debug( "Metadata-only fetching is not used as hash checking is required", @@ -381,7 +382,7 @@ def _fetch_metadata_using_link_data_attr( if metadata_link is None: return None assert req.req is not None - logger.info( + logger.verbose( "Obtaining dependency information for %s from %s", req.req, metadata_link, @@ -406,7 +407,7 @@ def _fetch_metadata_using_link_data_attr( # NB: raw_name will fall back to the name from the install requirement if # the Name: field is not present, but it's noted in the raw_name docstring # that that should NEVER happen anyway. - if metadata_dist.raw_name != req.req.name: + if canonicalize_name(metadata_dist.raw_name) != canonicalize_name(req.req.name): raise MetadataInconsistent( req, "Name", req.req.name, metadata_dist.raw_name ) @@ -466,7 +467,19 @@ def _complete_partial_requirements( for link, (filepath, _) in batch_download: logger.debug("Downloading link %s to %s", link, filepath) req = links_to_fully_download[link] + # Record the downloaded file path so wheel reqs can extract a Distribution + # in .get_dist(). req.local_file_path = filepath + # Record that the file is downloaded so we don't do it again in + # _prepare_linked_requirement(). + self._downloaded[req.link.url] = filepath + + # If this is an sdist, we need to unpack it after downloading, but the + # .source_dir won't be set up until we are in _prepare_linked_requirement(). + # Add the downloaded archive to the install requirement to unpack after + # preparing the source dir. + if not req.is_wheel: + req.needs_unpacked_archive(Path(filepath)) # This step is necessary to ensure all lazy wheels are processed # successfully by the 'download', 'wheel', and 'install' commands. @@ -485,7 +498,18 @@ def prepare_linked_requirement( file_path = None if self.download_dir is not None and req.link.is_wheel: hashes = self._get_linked_req_hashes(req) - file_path = _check_download_dir(req.link, self.download_dir, hashes) + file_path = _check_download_dir( + req.link, + self.download_dir, + hashes, + # When a locally built wheel has been found in cache, we don't warn + # about re-downloading when the already downloaded wheel hash does + # not match. This is because the hash must be checked against the + # original link, not the cached link. It that case the already + # downloaded file will be removed and re-fetched from cache (which + # implies a hash check against the cache entry's origin.json). + warn_on_hash_mismatch=not req.is_wheel_from_cache, + ) if file_path is not None: # The file is already available, so mark it as downloaded @@ -536,9 +560,35 @@ def _prepare_linked_requirement( assert req.link link = req.link - self._ensure_link_req_src_dir(req, parallel_builds) hashes = self._get_linked_req_hashes(req) + if hashes and req.is_wheel_from_cache: + assert req.download_info is not None + assert link.is_wheel + assert link.is_file + # We need to verify hashes, and we have found the requirement in the cache + # of locally built wheels. + if ( + isinstance(req.download_info.info, ArchiveInfo) + and req.download_info.info.hashes + and hashes.has_one_of(req.download_info.info.hashes) + ): + # At this point we know the requirement was built from a hashable source + # artifact, and we verified that the cache entry's hash of the original + # artifact matches one of the hashes we expect. We don't verify hashes + # against the cached wheel, because the wheel is not the original. + hashes = None + else: + logger.warning( + "The hashes of the source archive found in cache entry " + "don't match, ignoring cached built wheel " + "and re-downloading source." + ) + req.link = req.cached_wheel_source_link + link = req.link + + self._ensure_link_req_src_dir(req, parallel_builds) + if link.is_existing_dir(): local_file = None elif link.url not in self._downloaded: @@ -553,8 +603,8 @@ def _prepare_linked_requirement( ) except NetworkConnectionError as exc: raise InstallationError( - "Could not install requirement {} because of HTTP " - "error {} for URL {}".format(req, exc, link) + f"Could not install requirement {req} because of HTTP " + f"error {exc} for URL {link}" ) else: file_path = self._downloaded[link.url] @@ -571,12 +621,15 @@ def _prepare_linked_requirement( # Make sure we have a hash in download_info. If we got it as part of the # URL, it will have been verified and we can rely on it. Otherwise we # compute it from the downloaded file. + # FIXME: https://github.com/pypa/pip/issues/11943 if ( isinstance(req.download_info.info, ArchiveInfo) - and not req.download_info.info.hash + and not req.download_info.info.hashes and local_file ): hash = hash_file(local_file.path)[0].hexdigest() + # We populate info.hash for backward compatibility. + # This will automatically populate info.hashes. req.download_info.info.hash = f"sha256={hash}" # For use in later processing, @@ -631,9 +684,9 @@ def prepare_editable_requirement( with indent_log(): if self.require_hashes: raise InstallationError( - "The editable requirement {} cannot be installed when " + f"The editable requirement {req} cannot be installed when " "requiring hashes, because there is no single file to " - "hash.".format(req) + "hash." ) req.ensure_has_source_dir(self.src_dir) req.update_editable() @@ -661,7 +714,7 @@ def prepare_installed_requirement( assert req.satisfied_by, "req should have been satisfied but isn't" assert skip_reason is not None, ( "did not get skip reason skipped but req.satisfied_by " - "is set to {}".format(req.satisfied_by) + f"is set to {req.satisfied_by}" ) logger.info( "Requirement %s: %s (%s)", skip_reason, req, req.satisfied_by.version diff --git a/src/pip/_internal/pyproject.py b/src/pip/_internal/pyproject.py index 57fef57077d..eb8e12b2dec 100644 --- a/src/pip/_internal/pyproject.py +++ b/src/pip/_internal/pyproject.py @@ -91,7 +91,7 @@ def load_pyproject_toml( # If we haven't worked out whether to use PEP 517 yet, # and the user hasn't explicitly stated a preference, # we do so if the project has a pyproject.toml file - # or if we cannot import setuptools. + # or if we cannot import setuptools or wheels. # We fallback to PEP 517 when without setuptools or without the wheel package, # so setuptools can be installed as a default build backend. diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py index c5ca2d85d51..7e2d0e5b879 100644 --- a/src/pip/_internal/req/constructors.py +++ b/src/pip/_internal/req/constructors.py @@ -8,10 +8,11 @@ InstallRequirement. """ +import copy import logging import os import re -from typing import Dict, List, Optional, Set, Tuple, Union +from typing import Collection, Dict, List, Optional, Set, Tuple, Union from pip._vendor.packaging.markers import Marker from pip._vendor.packaging.requirements import InvalidRequirement, Requirement @@ -57,6 +58,31 @@ def convert_extras(extras: Optional[str]) -> Set[str]: return get_requirement("placeholder" + extras.lower()).extras +def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requirement: + """ + Returns a new requirement based on the given one, with the supplied extras. If the + given requirement already has extras those are replaced (or dropped if no new extras + are given). + """ + match: Optional[re.Match[str]] = re.fullmatch( + # see https://peps.python.org/pep-0508/#complete-grammar + r"([\w\t .-]+)(\[[^\]]*\])?(.*)", + str(req), + flags=re.ASCII, + ) + # ireq.req is a valid requirement so the regex should always match + assert ( + match is not None + ), f"regex match on requirement {req} failed, this should never happen" + pre: Optional[str] = match.group(1) + post: Optional[str] = match.group(3) + assert ( + pre is not None and post is not None + ), f"regex group selection for requirement {req} failed, this should never happen" + extras: str = "[%s]" % ",".join(sorted(new_extras)) if new_extras else "" + return Requirement(f"{pre}{extras}{post}") + + def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]: """Parses an editable requirement into: - a requirement name @@ -436,7 +462,7 @@ def install_req_from_req_string( raise InstallationError( "Packages installed from PyPI cannot depend on packages " "which are not also hosted on PyPI.\n" - "{} depends on {} ".format(comes_from.name, req) + f"{comes_from.name} depends on {req} " ) return InstallRequirement( @@ -504,3 +530,47 @@ def install_req_from_link_and_ireq( config_settings=ireq.config_settings, user_supplied=ireq.user_supplied, ) + + +def install_req_drop_extras(ireq: InstallRequirement) -> InstallRequirement: + """ + Creates a new InstallationRequirement using the given template but without + any extras. Sets the original requirement as the new one's parent + (comes_from). + """ + return InstallRequirement( + req=( + _set_requirement_extras(ireq.req, set()) if ireq.req is not None else None + ), + comes_from=ireq, + editable=ireq.editable, + link=ireq.link, + markers=ireq.markers, + use_pep517=ireq.use_pep517, + isolated=ireq.isolated, + global_options=ireq.global_options, + hash_options=ireq.hash_options, + constraint=ireq.constraint, + extras=[], + config_settings=ireq.config_settings, + user_supplied=ireq.user_supplied, + permit_editable_wheels=ireq.permit_editable_wheels, + ) + + +def install_req_extend_extras( + ireq: InstallRequirement, + extras: Collection[str], +) -> InstallRequirement: + """ + Returns a copy of an installation requirement with some additional extras. + Makes a shallow copy of the ireq object. + """ + result = copy.copy(ireq) + result.extras = {*ireq.extras, *extras} + result.req = ( + _set_requirement_extras(ireq.req, result.extras) + if ireq.req is not None + else None + ) + return result diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py index b34e04903c6..afc772c6428 100644 --- a/src/pip/_internal/req/req_install.py +++ b/src/pip/_internal/req/req_install.py @@ -1,6 +1,3 @@ -# The following comment should be removed at some point in the future. -# mypy: strict-optional=False - import functools import logging import os @@ -9,6 +6,7 @@ import uuid import zipfile from optparse import Values +from pathlib import Path from typing import Any, Collection, Dict, Iterable, List, Optional, Sequence, Union from pip._vendor.packaging.markers import Marker @@ -20,7 +18,7 @@ from pip._vendor.pyproject_hooks import BuildBackendHookCaller from pip._internal.build_env import BuildEnvironment, NoOpBuildEnvironment -from pip._internal.exceptions import InstallationError +from pip._internal.exceptions import InstallationError, PreviousBuildDirError from pip._internal.locations import get_scheme from pip._internal.metadata import ( BaseDistribution, @@ -50,11 +48,14 @@ backup_dir, display_path, hide_url, + is_installable_dir, + redact_auth_from_requirement, redact_auth_from_url, ) from pip._internal.utils.packaging import safe_extra from pip._internal.utils.subprocess import runner_with_spinner_message from pip._internal.utils.temp_dir import TempDirectory, tempdir_kinds +from pip._internal.utils.unpacking import unpack_file from pip._internal.utils.virtualenv import running_under_virtualenv from pip._internal.vcs import vcs @@ -104,11 +105,17 @@ def __init__( if link.is_file: self.source_dir = os.path.normpath(os.path.abspath(link.file_path)) + # original_link is the direct URL that was provided by the user for the + # requirement, either directly or via a constraints file. if link is None and req and req.url: # PEP 508 URL requirement link = Link(req.url) self.link = self.original_link = link - self.original_link_is_in_wheel_cache = False + + # When this InstallRequirement is a wheel obtained from the cache of locally + # built wheels, this is the source link corresponding to the cache entry, which + # was used to download and build the cached wheel. + self.cached_wheel_source_link: Optional[Link] = None # Information about the location of the artifact that was downloaded . This # property is guaranteed to be set in resolver results. @@ -122,7 +129,7 @@ def __init__( if extras: self.extras = extras elif req: - self.extras = {safe_extra(extra) for extra in req.extras} + self.extras = req.extras else: self.extras = set() if markers is None and req: @@ -177,11 +184,14 @@ def __init__( # This requirement needs more preparation before it can be built self.needs_more_preparation = False + # This requirement needs to be unpacked before it can be installed. + self._archive_source: Optional[Path] = None + def __str__(self) -> str: if self.req: - s = str(self.req) + s = redact_auth_from_requirement(self.req) if self.link: - s += " from {}".format(redact_auth_from_url(self.link.url)) + s += f" from {redact_auth_from_url(self.link.url)}" elif self.link: s = redact_auth_from_url(self.link.url) else: @@ -211,7 +221,7 @@ def format_debug(self) -> str: attributes = vars(self) names = sorted(attributes) - state = ("{}={!r}".format(attr, attributes[attr]) for attr in sorted(names)) + state = (f"{attr}={attributes[attr]!r}" for attr in sorted(names)) return "<{name} object: {{{state}}}>".format( name=self.__class__.__name__, state=", ".join(state), @@ -238,15 +248,22 @@ def supports_pyproject_editable(self) -> bool: @property def specifier(self) -> SpecifierSet: + assert self.req is not None return self.req.specifier + @property + def is_direct(self) -> bool: + """Whether this requirement was specified as a direct URL.""" + return self.original_link is not None + @property def is_pinned(self) -> bool: """Return whether I am pinned to an exact version. For example, some-package==1.2 is pinned; some-package>1.2 is not. """ - specifiers = self.specifier + assert self.req is not None + specifiers = self.req.specifier return len(specifiers) == 1 and next(iter(specifiers)).operator in {"==", "==="} def match_markers(self, extras_requested: Optional[Iterable[str]] = None) -> bool: @@ -256,7 +273,12 @@ def match_markers(self, extras_requested: Optional[Iterable[str]] = None) -> boo extras_requested = ("",) if self.markers is not None: return any( - self.markers.evaluate({"extra": extra}) for extra in extras_requested + self.markers.evaluate({"extra": extra}) + # TODO: Remove these two variants when packaging is upgraded to + # support the marker comparison logic specified in PEP 685. + or self.markers.evaluate({"extra": safe_extra(extra)}) + or self.markers.evaluate({"extra": canonicalize_name(extra)}) + for extra in extras_requested ) else: return True @@ -287,8 +309,14 @@ def hashes(self, trust_internet: bool = True) -> Hashes: """ good_hashes = self.hash_options.copy() - link = self.link if trust_internet else self.original_link + if trust_internet: + link = self.link + elif self.is_direct and self.user_supplied: + link = self.original_link + else: + link = None if link and link.hash: + assert link.hash_name is not None good_hashes.setdefault(link.hash_name, []).append(link.hash) return Hashes(good_hashes) @@ -298,6 +326,7 @@ def from_path(self) -> Optional[str]: return None s = str(self.req) if self.comes_from: + comes_from: Optional[str] if isinstance(self.comes_from, str): comes_from = self.comes_from else: @@ -329,7 +358,7 @@ def ensure_build_location( # When parallel builds are enabled, add a UUID to the build directory # name so multiple builds do not interfere with each other. - dir_name: str = canonicalize_name(self.name) + dir_name: str = canonicalize_name(self.req.name) if parallel_builds: dir_name = f"{dir_name}_{uuid.uuid4().hex}" @@ -372,6 +401,7 @@ def _set_requirement(self) -> None: ) def warn_on_mismatching_name(self) -> None: + assert self.req is not None metadata_name = canonicalize_name(self.metadata["Name"]) if canonicalize_name(self.req.name) == metadata_name: # Everything is fine. @@ -432,9 +462,16 @@ def is_wheel(self) -> bool: return False return self.link.is_wheel + @property + def is_wheel_from_cache(self) -> bool: + # When True, it means that this InstallRequirement is a local wheel file in the + # cache of locally built wheels. + return self.cached_wheel_source_link is not None + # Things valid for sdists @property def unpacked_source_directory(self) -> str: + assert self.source_dir, f"No source dir for {self}" return os.path.join( self.source_dir, self.link and self.link.subdirectory_fragment or "" ) @@ -471,6 +508,15 @@ def load_pyproject_toml(self) -> None: ) if pyproject_toml_data is None: + if self.config_settings: + deprecated( + reason=f"Config settings are ignored for project {self}.", + replacement=( + "to use --use-pep517 or add a " + "pyproject.toml file to the project" + ), + gone_in="24.0", + ) self.use_pep517 = False return @@ -512,7 +558,7 @@ def prepare_metadata(self) -> None: Under PEP 517 and PEP 660, call the backend hook to prepare the metadata. Under legacy processing, call setup.py egg-info. """ - assert self.source_dir + assert self.source_dir, f"No source dir for {self}" details = self.name or f"from {self.link}" if self.use_pep517: @@ -561,8 +607,10 @@ def get_dist(self) -> BaseDistribution: if self.metadata_directory: return get_directory_distribution(self.metadata_directory) elif self.local_file_path and self.is_wheel: + assert self.req is not None return get_wheel_distribution( - FilesystemWheel(self.local_file_path), canonicalize_name(self.name) + FilesystemWheel(self.local_file_path), + canonicalize_name(self.req.name), ) raise AssertionError( f"InstallRequirement {self} has no metadata directory and no wheel: " @@ -570,9 +618,9 @@ def get_dist(self) -> BaseDistribution: ) def assert_source_matches_version(self) -> None: - assert self.source_dir + assert self.source_dir, f"No source dir for {self}" version = self.metadata["version"] - if self.req.specifier and version not in self.req.specifier: + if self.req and self.req.specifier and version not in self.req.specifier: logger.warning( "Requested %s, but installing version %s", self, @@ -609,6 +657,27 @@ def ensure_has_source_dir( parallel_builds=parallel_builds, ) + def needs_unpacked_archive(self, archive_source: Path) -> None: + assert self._archive_source is None + self._archive_source = archive_source + + def ensure_pristine_source_checkout(self) -> None: + """Ensure the source directory has not yet been built in.""" + assert self.source_dir is not None + if self._archive_source is not None: + unpack_file(str(self._archive_source), self.source_dir) + elif is_installable_dir(self.source_dir): + # If a checkout exists, it's unwise to keep going. + # version inconsistencies are logged later, but do not fail + # the installation. + raise PreviousBuildDirError( + f"pip can't proceed with requirements '{self}' due to a " + f"pre-existing build directory ({self.source_dir}). This is likely " + "due to a previous installation that failed . pip is " + "being responsible and not assuming it can delete this. " + "Please delete it and try again." + ) + # For editable installations def update_editable(self) -> None: if not self.link: @@ -665,9 +734,10 @@ def _clean_zip_name(name: str, prefix: str) -> str: name = name.replace(os.path.sep, "/") return name + assert self.req is not None path = os.path.join(parentdir, path) name = _clean_zip_name(path, rootdir) - return self.name + "/" + name + return self.req.name + "/" + name def archive(self, build_dir: Optional[str]) -> None: """Saves archive to provided build_dir. @@ -684,8 +754,8 @@ def archive(self, build_dir: Optional[str]) -> None: if os.path.exists(archive_path): response = ask_path_exists( - "The file {} exists. (i)gnore, (w)ipe, " - "(b)ackup, (a)bort ".format(display_path(archive_path)), + f"The file {display_path(archive_path)} exists. (i)gnore, (w)ipe, " + "(b)ackup, (a)bort ", ("i", "w", "b", "a"), ) if response == "i": @@ -746,8 +816,9 @@ def install( use_user_site: bool = False, pycompile: bool = True, ) -> None: + assert self.req is not None scheme = get_scheme( - self.name, + self.req.name, user=use_user_site, home=home, root=root, @@ -761,7 +832,7 @@ def install( prefix=prefix, home=home, use_user_site=use_user_site, - name=self.name, + name=self.req.name, setup_py_path=self.setup_py_path, isolated=self.isolated, build_env=self.build_env, @@ -774,13 +845,13 @@ def install( assert self.local_file_path install_wheel( - self.name, + self.req.name, self.local_file_path, scheme=scheme, req_description=str(self.req), pycompile=pycompile, warn_script_location=warn_script_location, - direct_url=self.download_info if self.original_link else None, + direct_url=self.download_info if self.is_direct else None, requested=self.user_supplied, ) self.install_succeeded = True @@ -834,7 +905,7 @@ def check_legacy_setup_py_options( reason="--build-option and --global-option are deprecated.", issue=11859, replacement="to use --config-settings", - gone_in="23.3", + gone_in="24.0", ) logger.warning( "Implying --no-binary=:all: due to the presence of " diff --git a/src/pip/_internal/req/req_set.py b/src/pip/_internal/req/req_set.py index ec7a6e07a25..1bf73d595f6 100644 --- a/src/pip/_internal/req/req_set.py +++ b/src/pip/_internal/req/req_set.py @@ -2,9 +2,12 @@ from collections import OrderedDict from typing import Dict, List +from pip._vendor.packaging.specifiers import LegacySpecifier from pip._vendor.packaging.utils import canonicalize_name +from pip._vendor.packaging.version import LegacyVersion from pip._internal.req.req_install import InstallRequirement +from pip._internal.utils.deprecation import deprecated logger = logging.getLogger(__name__) @@ -80,3 +83,37 @@ def requirements_to_install(self) -> List[InstallRequirement]: for install_req in self.all_requirements if not install_req.constraint and not install_req.satisfied_by ] + + def warn_legacy_versions_and_specifiers(self) -> None: + for req in self.requirements_to_install: + version = req.get_dist().version + if isinstance(version, LegacyVersion): + deprecated( + reason=( + f"pip has selected the non standard version {version} " + f"of {req}. In the future this version will be " + f"ignored as it isn't standard compliant." + ), + replacement=( + "set or update constraints to select another version " + "or contact the package author to fix the version number" + ), + issue=12063, + gone_in="24.0", + ) + for dep in req.get_dist().iter_dependencies(): + if any(isinstance(spec, LegacySpecifier) for spec in dep.specifier): + deprecated( + reason=( + f"pip has selected {req} {version} which has non " + f"standard dependency specifier {dep}. " + f"In the future this version of {req} will be " + f"ignored as it isn't standard compliant." + ), + replacement=( + "set or update constraints to select another version " + "or contact the package author to fix the version number" + ), + issue=12063, + gone_in="24.0", + ) diff --git a/src/pip/_internal/req/req_uninstall.py b/src/pip/_internal/req/req_uninstall.py index 15b67385c86..3ca10098cf9 100644 --- a/src/pip/_internal/req/req_uninstall.py +++ b/src/pip/_internal/req/req_uninstall.py @@ -11,8 +11,9 @@ from pip._internal.utils.compat import WINDOWS from pip._internal.utils.egg_link import egg_link_path_from_location from pip._internal.utils.logging import getLogger, indent_log -from pip._internal.utils.misc import ask, is_local, normalize_path, renames, rmtree +from pip._internal.utils.misc import ask, normalize_path, renames, rmtree from pip._internal.utils.temp_dir import AdjacentTempDirectory, TempDirectory +from pip._internal.utils.virtualenv import running_under_virtualenv logger = getLogger(__name__) @@ -70,16 +71,16 @@ def uninstallation_paths(dist: BaseDistribution) -> Generator[str, None, None]: entries = dist.iter_declared_entries() if entries is None: - msg = "Cannot uninstall {dist}, RECORD file not found.".format(dist=dist) + msg = f"Cannot uninstall {dist}, RECORD file not found." installer = dist.installer if not installer or installer == "pip": - dep = "{}=={}".format(dist.raw_name, dist.version) + dep = f"{dist.raw_name}=={dist.version}" msg += ( " You might be able to recover from this via: " - "'pip install --force-reinstall --no-deps {}'.".format(dep) + f"'pip install --force-reinstall --no-deps {dep}'." ) else: - msg += " Hint: The package was installed by {}.".format(installer) + msg += f" Hint: The package was installed by {installer}." raise UninstallationError(msg) for entry in entries: @@ -273,7 +274,7 @@ def stash(self, path: str) -> str: def commit(self) -> None: """Commits the uninstall by removing stashed files.""" - for _, save_dir in self._save_dirs.items(): + for save_dir in self._save_dirs.values(): save_dir.cleanup() self._moves = [] self._save_dirs = {} @@ -312,6 +313,10 @@ def __init__(self, dist: BaseDistribution) -> None: self._pth: Dict[str, UninstallPthEntries] = {} self._dist = dist self._moved_paths = StashedUninstallPathSet() + # Create local cache of normalize_path results. Creating an UninstallPathSet + # can result in hundreds/thousands of redundant calls to normalize_path with + # the same args, which hurts performance. + self._normalize_path_cached = functools.lru_cache()(normalize_path) def _permitted(self, path: str) -> bool: """ @@ -319,14 +324,17 @@ def _permitted(self, path: str) -> bool: remove/modify, False otherwise. """ - return is_local(path) + # aka is_local, but caching normalized sys.prefix + if not running_under_virtualenv(): + return True + return path.startswith(self._normalize_path_cached(sys.prefix)) def add(self, path: str) -> None: head, tail = os.path.split(path) # we normalize the head to resolve parent directory symlinks, but not # the tail, since we only want to uninstall symlinks, not their targets - path = os.path.join(normalize_path(head), os.path.normcase(tail)) + path = os.path.join(self._normalize_path_cached(head), os.path.normcase(tail)) if not os.path.exists(path): return @@ -341,7 +349,7 @@ def add(self, path: str) -> None: self.add(cache_from_source(path)) def add_pth(self, pth_file: str, entry: str) -> None: - pth_file = normalize_path(pth_file) + pth_file = self._normalize_path_cached(pth_file) if self._permitted(pth_file): if pth_file not in self._pth: self._pth[pth_file] = UninstallPthEntries(pth_file) @@ -531,12 +539,14 @@ def from_dist(cls, dist: BaseDistribution) -> "UninstallPathSet": # above, so this only covers the setuptools-style editable. with open(develop_egg_link) as fh: link_pointer = os.path.normcase(fh.readline().strip()) - normalized_link_pointer = normalize_path(link_pointer) + normalized_link_pointer = paths_to_remove._normalize_path_cached( + link_pointer + ) assert os.path.samefile( normalized_link_pointer, normalized_dist_location ), ( - f"Egg-link {link_pointer} does not match installed location of " - f"{dist.raw_name} (at {dist_location})" + f"Egg-link {develop_egg_link} (to {link_pointer}) does not match " + f"installed location of {dist.raw_name} (at {dist_location})" ) paths_to_remove.add(develop_egg_link) easy_install_pth = os.path.join( diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py index fb49d41695f..5ddb848a9bc 100644 --- a/src/pip/_internal/resolution/legacy/resolver.py +++ b/src/pip/_internal/resolution/legacy/resolver.py @@ -231,9 +231,7 @@ def _add_requirement_to_set( tags = compatibility_tags.get_supported() if requirement_set.check_supported_wheels and not wheel.supported(tags): raise InstallationError( - "{} is not a supported wheel on this platform.".format( - wheel.filename - ) + f"{wheel.filename} is not a supported wheel on this platform." ) # This next bit is really a sanity check. @@ -287,9 +285,9 @@ def _add_requirement_to_set( ) if does_not_satisfy_constraint: raise InstallationError( - "Could not satisfy constraints for '{}': " + f"Could not satisfy constraints for '{install_req.name}': " "installation from path or url cannot be " - "constrained to a version".format(install_req.name) + "constrained to a version" ) # If we're now installing a constraint, mark the existing # object for real installation. @@ -398,9 +396,9 @@ def _find_requirement_link(self, req: InstallRequirement) -> Optional[Link]: # "UnicodeEncodeError: 'ascii' codec can't encode character" # in Python 2 when the reason contains non-ascii characters. "The candidate selected for download or install is a " - "yanked version: {candidate}\n" - "Reason for being yanked: {reason}" - ).format(candidate=best_candidate, reason=reason) + f"yanked version: {best_candidate}\n" + f"Reason for being yanked: {reason}" + ) logger.warning(msg) return link @@ -431,12 +429,12 @@ def _populate_link(self, req: InstallRequirement) -> None: if cache_entry is not None: logger.debug("Using cached wheel link: %s", cache_entry.link) if req.link is req.original_link and cache_entry.persistent: - req.original_link_is_in_wheel_cache = True + req.cached_wheel_source_link = req.link if cache_entry.origin is not None: req.download_info = cache_entry.origin else: # Legacy cache entry that does not have origin.json. - # download_info may miss the archive_info.hash field. + # download_info may miss the archive_info.hashes field. req.download_info = direct_url_from_link( req.link, link_is_in_wheel_cache=cache_entry.persistent ) diff --git a/src/pip/_internal/resolution/resolvelib/base.py b/src/pip/_internal/resolution/resolvelib/base.py index b206692a0a9..9c0ef5ca7b9 100644 --- a/src/pip/_internal/resolution/resolvelib/base.py +++ b/src/pip/_internal/resolution/resolvelib/base.py @@ -1,7 +1,7 @@ from typing import FrozenSet, Iterable, Optional, Tuple, Union from pip._vendor.packaging.specifiers import SpecifierSet -from pip._vendor.packaging.utils import NormalizedName, canonicalize_name +from pip._vendor.packaging.utils import NormalizedName from pip._vendor.packaging.version import LegacyVersion, Version from pip._internal.models.link import Link, links_equivalent @@ -12,11 +12,11 @@ CandidateVersion = Union[LegacyVersion, Version] -def format_name(project: str, extras: FrozenSet[str]) -> str: +def format_name(project: NormalizedName, extras: FrozenSet[NormalizedName]) -> str: if not extras: return project - canonical_extras = sorted(canonicalize_name(e) for e in extras) - return "{}[{}]".format(project, ",".join(canonical_extras)) + extras_expr = ",".join(sorted(extras)) + return f"{project}[{extras_expr}]" class Constraint: diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py index fe83a61231f..4125cda2b7c 100644 --- a/src/pip/_internal/resolution/resolvelib/candidates.py +++ b/src/pip/_internal/resolution/resolvelib/candidates.py @@ -71,6 +71,7 @@ def make_install_req_from_link( ) ireq.original_link = template.original_link ireq.link = link + ireq.extras = template.extras return ireq @@ -78,7 +79,7 @@ def make_install_req_from_editable( link: Link, template: InstallRequirement ) -> InstallRequirement: assert template.editable, "template not editable" - return install_req_from_editable( + ireq = install_req_from_editable( link.url, user_supplied=template.user_supplied, comes_from=template.comes_from, @@ -90,6 +91,8 @@ def make_install_req_from_editable( hash_options=template.hash_options, config_settings=template.config_settings, ) + ireq.extras = template.extras + return ireq def _make_install_req_from_dist( @@ -156,10 +159,7 @@ def __str__(self) -> str: return f"{self.name} {self.version}" def __repr__(self) -> str: - return "{class_name}({link!r})".format( - class_name=self.__class__.__name__, - link=str(self._link), - ) + return f"{self.__class__.__name__}({str(self._link)!r})" def __hash__(self) -> int: return hash((self.__class__, self._link)) @@ -237,7 +237,7 @@ def _prepare(self) -> BaseDistribution: def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]: requires = self.dist.iter_dependencies() if with_requires else () for r in requires: - yield self._factory.make_requirement_from_spec(str(r), self._ireq) + yield from self._factory.make_requirements_from_spec(str(r), self._ireq) yield self._factory.make_requires_python_requirement(self.dist.requires_python) def get_install_requirement(self) -> Optional[InstallRequirement]: @@ -256,7 +256,7 @@ def __init__( version: Optional[CandidateVersion] = None, ) -> None: source_link = link - cache_entry = factory.get_wheel_cache_entry(link, name) + cache_entry = factory.get_wheel_cache_entry(source_link, name) if cache_entry is not None: logger.debug("Using cached wheel link: %s", cache_entry.link) link = cache_entry.link @@ -274,13 +274,15 @@ def __init__( ) if cache_entry is not None: + assert ireq.link.is_wheel + assert ireq.link.is_file if cache_entry.persistent and template.link is template.original_link: - ireq.original_link_is_in_wheel_cache = True + ireq.cached_wheel_source_link = source_link if cache_entry.origin is not None: ireq.download_info = cache_entry.origin else: # Legacy cache entry that does not have origin.json. - # download_info may miss the archive_info.hash field. + # download_info may miss the archive_info.hashes field. ireq.download_info = direct_url_from_link( source_link, link_is_in_wheel_cache=cache_entry.persistent ) @@ -336,6 +338,7 @@ def __init__( self.dist = dist self._ireq = _make_install_req_from_dist(dist, template) self._factory = factory + self._version = None # This is just logging some messages, so we can do it eagerly. # The returned dist would be exactly the same as self.dist because we @@ -348,10 +351,7 @@ def __str__(self) -> str: return str(self.dist) def __repr__(self) -> str: - return "{class_name}({distribution!r})".format( - class_name=self.__class__.__name__, - distribution=self.dist, - ) + return f"{self.__class__.__name__}({self.dist!r})" def __hash__(self) -> int: return hash((self.__class__, self.name, self.version)) @@ -371,7 +371,9 @@ def name(self) -> str: @property def version(self) -> CandidateVersion: - return self.dist.version + if self._version is None: + self._version = self.dist.version + return self._version @property def is_editable(self) -> bool: @@ -384,7 +386,7 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen if not with_requires: return for r in self.dist.iter_dependencies(): - yield self._factory.make_requirement_from_spec(str(r), self._ireq) + yield from self._factory.make_requirements_from_spec(str(r), self._ireq) def get_install_requirement(self) -> Optional[InstallRequirement]: return None @@ -419,20 +421,35 @@ def __init__( self, base: BaseCandidate, extras: FrozenSet[str], + *, + comes_from: Optional[InstallRequirement] = None, ) -> None: + """ + :param comes_from: the InstallRequirement that led to this candidate if it + differs from the base's InstallRequirement. This will often be the + case in the sense that this candidate's requirement has the extras + while the base's does not. Unlike the InstallRequirement backed + candidates, this requirement is used solely for reporting purposes, + it does not do any leg work. + """ self.base = base - self.extras = extras + self.extras = frozenset(canonicalize_name(e) for e in extras) + # If any extras are requested in their non-normalized forms, keep track + # of their raw values. This is needed when we look up dependencies + # since PEP 685 has not been implemented for marker-matching, and using + # the non-normalized extra for lookup ensures the user can select a + # non-normalized extra in a package with its non-normalized form. + # TODO: Remove this attribute when packaging is upgraded to support the + # marker comparison logic specified in PEP 685. + self._unnormalized_extras = extras.difference(self.extras) + self._comes_from = comes_from if comes_from is not None else self.base._ireq def __str__(self) -> str: name, rest = str(self.base).split(" ", 1) return "{}[{}] {}".format(name, ",".join(self.extras), rest) def __repr__(self) -> str: - return "{class_name}(base={base!r}, extras={extras!r})".format( - class_name=self.__class__.__name__, - base=self.base, - extras=self.extras, - ) + return f"{self.__class__.__name__}(base={self.base!r}, extras={self.extras!r})" def __hash__(self) -> int: return hash((self.base, self.extras)) @@ -472,6 +489,50 @@ def is_editable(self) -> bool: def source_link(self) -> Optional[Link]: return self.base.source_link + def _warn_invalid_extras( + self, + requested: FrozenSet[str], + valid: FrozenSet[str], + ) -> None: + """Emit warnings for invalid extras being requested. + + This emits a warning for each requested extra that is not in the + candidate's ``Provides-Extra`` list. + """ + invalid_extras_to_warn = frozenset( + extra + for extra in requested + if extra not in valid + # If an extra is requested in an unnormalized form, skip warning + # about the normalized form being missing. + and extra in self.extras + ) + if not invalid_extras_to_warn: + return + for extra in sorted(invalid_extras_to_warn): + logger.warning( + "%s %s does not provide the extra '%s'", + self.base.name, + self.version, + extra, + ) + + def _calculate_valid_requested_extras(self) -> FrozenSet[str]: + """Get a list of valid extras requested by this candidate. + + The user (or upstream dependant) may have specified extras that the + candidate doesn't support. Any unsupported extras are dropped, and each + cause a warning to be logged here. + """ + requested_extras = self.extras.union(self._unnormalized_extras) + valid_extras = frozenset( + extra + for extra in requested_extras + if self.base.dist.is_extra_provided(extra) + ) + self._warn_invalid_extras(requested_extras, valid_extras) + return valid_extras + def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]: factory = self.base._factory @@ -481,24 +542,13 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen if not with_requires: return - # The user may have specified extras that the candidate doesn't - # support. We ignore any unsupported extras here. - valid_extras = self.extras.intersection(self.base.dist.iter_provided_extras()) - invalid_extras = self.extras.difference(self.base.dist.iter_provided_extras()) - for extra in sorted(invalid_extras): - logger.warning( - "%s %s does not provide the extra '%s'", - self.base.name, - self.version, - extra, - ) - + valid_extras = self._calculate_valid_requested_extras() for r in self.base.dist.iter_dependencies(valid_extras): - requirement = factory.make_requirement_from_spec( - str(r), self.base._ireq, valid_extras + yield from factory.make_requirements_from_spec( + str(r), + self._comes_from, + valid_extras, ) - if requirement: - yield requirement def get_install_requirement(self) -> Optional[InstallRequirement]: # We don't return anything here, because we always diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py index a3a7d8db568..14e29472473 100644 --- a/src/pip/_internal/resolution/resolvelib/factory.py +++ b/src/pip/_internal/resolution/resolvelib/factory.py @@ -37,7 +37,10 @@ from pip._internal.models.link import Link from pip._internal.models.wheel import Wheel from pip._internal.operations.prepare import RequirementPreparer -from pip._internal.req.constructors import install_req_from_link_and_ireq +from pip._internal.req.constructors import ( + install_req_drop_extras, + install_req_from_link_and_ireq, +) from pip._internal.req.req_install import ( InstallRequirement, check_invalid_constraint_type, @@ -63,6 +66,7 @@ ExplicitRequirement, RequiresPythonRequirement, SpecifierRequirement, + SpecifierWithoutExtrasRequirement, UnsatisfiableRequirement, ) @@ -112,7 +116,7 @@ def __init__( self._editable_candidate_cache: Cache[EditableCandidate] = {} self._installed_candidate_cache: Dict[str, AlreadyInstalledCandidate] = {} self._extras_candidate_cache: Dict[ - Tuple[int, FrozenSet[str]], ExtrasCandidate + Tuple[int, FrozenSet[NormalizedName]], ExtrasCandidate ] = {} if not ignore_installed: @@ -132,19 +136,23 @@ def _fail_if_link_is_unsupported_wheel(self, link: Link) -> None: if not link.is_wheel: return wheel = Wheel(link.filename) - if wheel.supported(self._finder.target_python.get_tags()): + if wheel.supported(self._finder.target_python.get_unsorted_tags()): return msg = f"{link.filename} is not a supported wheel on this platform." raise UnsupportedWheel(msg) def _make_extras_candidate( - self, base: BaseCandidate, extras: FrozenSet[str] + self, + base: BaseCandidate, + extras: FrozenSet[str], + *, + comes_from: Optional[InstallRequirement] = None, ) -> ExtrasCandidate: - cache_key = (id(base), extras) + cache_key = (id(base), frozenset(canonicalize_name(e) for e in extras)) try: candidate = self._extras_candidate_cache[cache_key] except KeyError: - candidate = ExtrasCandidate(base, extras) + candidate = ExtrasCandidate(base, extras, comes_from=comes_from) self._extras_candidate_cache[cache_key] = candidate return candidate @@ -161,7 +169,7 @@ def _make_candidate_from_dist( self._installed_candidate_cache[dist.canonical_name] = base if not extras: return base - return self._make_extras_candidate(base, extras) + return self._make_extras_candidate(base, extras, comes_from=template) def _make_candidate_from_link( self, @@ -171,6 +179,20 @@ def _make_candidate_from_link( name: Optional[NormalizedName], version: Optional[CandidateVersion], ) -> Optional[Candidate]: + base: Optional[BaseCandidate] = self._make_base_candidate_from_link( + link, template, name, version + ) + if not extras or base is None: + return base + return self._make_extras_candidate(base, extras, comes_from=template) + + def _make_base_candidate_from_link( + self, + link: Link, + template: InstallRequirement, + name: Optional[NormalizedName], + version: Optional[CandidateVersion], + ) -> Optional[BaseCandidate]: # TODO: Check already installed candidate, and use it if the link and # editable flag match. @@ -199,7 +221,7 @@ def _make_candidate_from_link( self._build_failures[link] = e return None - base: BaseCandidate = self._editable_candidate_cache[link] + return self._editable_candidate_cache[link] else: if link not in self._link_candidate_cache: try: @@ -219,11 +241,7 @@ def _make_candidate_from_link( ) self._build_failures[link] = e return None - base = self._link_candidate_cache[link] - - if not extras: - return base - return self._make_extras_candidate(base, extras) + return self._link_candidate_cache[link] def _iter_found_candidates( self, @@ -357,9 +375,8 @@ def _iter_candidates_from_constraints( """ for link in constraint.links: self._fail_if_link_is_unsupported_wheel(link) - candidate = self._make_candidate_from_link( + candidate = self._make_base_candidate_from_link( link, - extras=frozenset(), template=install_req_from_link_and_ireq(link, template), name=canonicalize_name(identifier), version=None, @@ -385,16 +402,21 @@ def find_candidates( if ireq is not None: ireqs.append(ireq) - # If the current identifier contains extras, add explicit candidates - # from entries from extra-less identifier. + # If the current identifier contains extras, add requires and explicit + # candidates from entries from extra-less identifier. with contextlib.suppress(InvalidRequirement): parsed_requirement = get_requirement(identifier) - explicit_candidates.update( - self._iter_explicit_candidates_from_base( - requirements.get(parsed_requirement.name, ()), - frozenset(parsed_requirement.extras), - ), - ) + if parsed_requirement.name != identifier: + explicit_candidates.update( + self._iter_explicit_candidates_from_base( + requirements.get(parsed_requirement.name, ()), + frozenset(parsed_requirement.extras), + ), + ) + for req in requirements.get(parsed_requirement.name, []): + _, ireq = req.get_candidate_lookup() + if ireq is not None: + ireqs.append(ireq) # Add explicit candidates from constraints. We only do this if there are # known ireqs, which represent requirements not already explicit. If @@ -437,37 +459,58 @@ def find_candidates( and all(req.is_satisfied_by(c) for req in requirements[identifier]) ) - def _make_requirement_from_install_req( + def _make_requirements_from_install_req( self, ireq: InstallRequirement, requested_extras: Iterable[str] - ) -> Optional[Requirement]: + ) -> Iterator[Requirement]: + """ + Returns requirement objects associated with the given InstallRequirement. In + most cases this will be a single object but the following special cases exist: + - the InstallRequirement has markers that do not apply -> result is empty + - the InstallRequirement has both a constraint (or link) and extras + -> result is split in two requirement objects: one with the constraint + (or link) and one with the extra. This allows centralized constraint + handling for the base, resulting in fewer candidate rejections. + """ if not ireq.match_markers(requested_extras): logger.info( "Ignoring %s: markers '%s' don't match your environment", ireq.name, ireq.markers, ) - return None - if not ireq.link: - return SpecifierRequirement(ireq) - self._fail_if_link_is_unsupported_wheel(ireq.link) - cand = self._make_candidate_from_link( - ireq.link, - extras=frozenset(ireq.extras), - template=ireq, - name=canonicalize_name(ireq.name) if ireq.name else None, - version=None, - ) - if cand is None: - # There's no way we can satisfy a URL requirement if the underlying - # candidate fails to build. An unnamed URL must be user-supplied, so - # we fail eagerly. If the URL is named, an unsatisfiable requirement - # can make the resolver do the right thing, either backtrack (and - # maybe find some other requirement that's buildable) or raise a - # ResolutionImpossible eventually. - if not ireq.name: - raise self._build_failures[ireq.link] - return UnsatisfiableRequirement(canonicalize_name(ireq.name)) - return self.make_requirement_from_candidate(cand) + elif not ireq.link: + if ireq.extras and ireq.req is not None and ireq.req.specifier: + yield SpecifierWithoutExtrasRequirement(ireq) + yield SpecifierRequirement(ireq) + else: + self._fail_if_link_is_unsupported_wheel(ireq.link) + # Always make the link candidate for the base requirement to make it + # available to `find_candidates` for explicit candidate lookup for any + # set of extras. + # The extras are required separately via a second requirement. + cand = self._make_base_candidate_from_link( + ireq.link, + template=install_req_drop_extras(ireq) if ireq.extras else ireq, + name=canonicalize_name(ireq.name) if ireq.name else None, + version=None, + ) + if cand is None: + # There's no way we can satisfy a URL requirement if the underlying + # candidate fails to build. An unnamed URL must be user-supplied, so + # we fail eagerly. If the URL is named, an unsatisfiable requirement + # can make the resolver do the right thing, either backtrack (and + # maybe find some other requirement that's buildable) or raise a + # ResolutionImpossible eventually. + if not ireq.name: + raise self._build_failures[ireq.link] + yield UnsatisfiableRequirement(canonicalize_name(ireq.name)) + else: + # require the base from the link + yield self.make_requirement_from_candidate(cand) + if ireq.extras: + # require the extras on top of the base candidate + yield self.make_requirement_from_candidate( + self._make_extras_candidate(cand, frozenset(ireq.extras)) + ) def collect_root_requirements( self, root_ireqs: List[InstallRequirement] @@ -488,15 +531,27 @@ def collect_root_requirements( else: collected.constraints[name] = Constraint.from_ireq(ireq) else: - req = self._make_requirement_from_install_req( - ireq, - requested_extras=(), + reqs = list( + self._make_requirements_from_install_req( + ireq, + requested_extras=(), + ) ) - if req is None: + if not reqs: continue - if ireq.user_supplied and req.name not in collected.user_requested: - collected.user_requested[req.name] = i - collected.requirements.append(req) + template = reqs[0] + if ireq.user_supplied and template.name not in collected.user_requested: + collected.user_requested[template.name] = i + collected.requirements.extend(reqs) + # Put requirements with extras at the end of the root requires. This does not + # affect resolvelib's picking preference but it does affect its initial criteria + # population: by putting extras at the end we enable the candidate finder to + # present resolvelib with a smaller set of candidates to resolvelib, already + # taking into account any non-transient constraints on the associated base. This + # means resolvelib will have fewer candidates to visit and reject. + # Python's list sort is stable, meaning relative order is kept for objects with + # the same key. + collected.requirements.sort(key=lambda r: r.name != r.project_name) return collected def make_requirement_from_candidate( @@ -504,14 +559,23 @@ def make_requirement_from_candidate( ) -> ExplicitRequirement: return ExplicitRequirement(candidate) - def make_requirement_from_spec( + def make_requirements_from_spec( self, specifier: str, comes_from: Optional[InstallRequirement], requested_extras: Iterable[str] = (), - ) -> Optional[Requirement]: + ) -> Iterator[Requirement]: + """ + Returns requirement objects associated with the given specifier. In most cases + this will be a single object but the following special cases exist: + - the specifier has markers that do not apply -> result is empty + - the specifier has both a constraint and extras -> result is split + in two requirement objects: one with the constraint and one with the + extra. This allows centralized constraint handling for the base, + resulting in fewer candidate rejections. + """ ireq = self._make_install_req_from_spec(specifier, comes_from) - return self._make_requirement_from_install_req(ireq, requested_extras) + return self._make_requirements_from_install_req(ireq, requested_extras) def make_requires_python_requirement( self, @@ -535,7 +599,7 @@ def get_wheel_cache_entry( hash mismatches. Furthermore, cached wheels at present have nondeterministic contents due to file modification times. """ - if self._wheel_cache is None or self.preparer.require_hashes: + if self._wheel_cache is None: return None return self._wheel_cache.get_cache_entry( link=link, @@ -603,8 +667,26 @@ def _report_single_requirement_conflict( cands = self._finder.find_all_candidates(req.project_name) skipped_by_requires_python = self._finder.requires_python_skipped_reasons() - versions = [str(v) for v in sorted({c.version for c in cands})] + versions_set: Set[CandidateVersion] = set() + yanked_versions_set: Set[CandidateVersion] = set() + for c in cands: + is_yanked = c.link.is_yanked if c.link else False + if is_yanked: + yanked_versions_set.add(c.version) + else: + versions_set.add(c.version) + + versions = [str(v) for v in sorted(versions_set)] + yanked_versions = [str(v) for v in sorted(yanked_versions_set)] + + if yanked_versions: + # Saying "version X is yanked" isn't entirely accurate. + # https://github.com/pypa/pip/issues/11745#issuecomment-1402805842 + logger.critical( + "Ignored the following yanked versions: %s", + ", ".join(yanked_versions) or "none", + ) if skipped_by_requires_python: logger.critical( "Ignored the following versions that require a different python " @@ -692,8 +774,8 @@ def describe_trigger(parent: Candidate) -> str: info = "the requested packages" msg = ( - "Cannot install {} because these package versions " - "have conflicting dependencies.".format(info) + f"Cannot install {info} because these package versions " + "have conflicting dependencies." ) logger.critical(msg) msg = "\nThe conflict is caused by:" diff --git a/src/pip/_internal/resolution/resolvelib/reporter.py b/src/pip/_internal/resolution/resolvelib/reporter.py index 3c724238a1e..12adeff7b6e 100644 --- a/src/pip/_internal/resolution/resolvelib/reporter.py +++ b/src/pip/_internal/resolution/resolvelib/reporter.py @@ -20,7 +20,7 @@ def __init__(self) -> None: "requirements. This could take a while." ), 8: ( - "pip is looking at multiple versions of {package_name} to " + "pip is still looking at multiple versions of {package_name} to " "determine which version is compatible with other " "requirements. This could take a while." ), diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py index 06addc0ddce..4af4a9f25a6 100644 --- a/src/pip/_internal/resolution/resolvelib/requirements.py +++ b/src/pip/_internal/resolution/resolvelib/requirements.py @@ -1,6 +1,7 @@ from pip._vendor.packaging.specifiers import SpecifierSet from pip._vendor.packaging.utils import NormalizedName, canonicalize_name +from pip._internal.req.constructors import install_req_drop_extras from pip._internal.req.req_install import InstallRequirement from .base import Candidate, CandidateLookup, Requirement, format_name @@ -14,10 +15,7 @@ def __str__(self) -> str: return str(self.candidate) def __repr__(self) -> str: - return "{class_name}({candidate!r})".format( - class_name=self.__class__.__name__, - candidate=self.candidate, - ) + return f"{self.__class__.__name__}({self.candidate!r})" @property def project_name(self) -> NormalizedName: @@ -43,16 +41,13 @@ class SpecifierRequirement(Requirement): def __init__(self, ireq: InstallRequirement) -> None: assert ireq.link is None, "This is a link, not a specifier" self._ireq = ireq - self._extras = frozenset(ireq.extras) + self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras) def __str__(self) -> str: return str(self._ireq.req) def __repr__(self) -> str: - return "{class_name}({requirement!r})".format( - class_name=self.__class__.__name__, - requirement=str(self._ireq.req), - ) + return f"{self.__class__.__name__}({str(self._ireq.req)!r})" @property def project_name(self) -> NormalizedName: @@ -92,6 +87,18 @@ def is_satisfied_by(self, candidate: Candidate) -> bool: return spec.contains(candidate.version, prereleases=True) +class SpecifierWithoutExtrasRequirement(SpecifierRequirement): + """ + Requirement backed by an install requirement on a base package. + Trims extras from its install requirement if there are any. + """ + + def __init__(self, ireq: InstallRequirement) -> None: + assert ireq.link is None, "This is a link, not a specifier" + self._ireq = install_req_drop_extras(ireq) + self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras) + + class RequiresPythonRequirement(Requirement): """A requirement representing Requires-Python metadata.""" @@ -103,10 +110,7 @@ def __str__(self) -> str: return f"Python {self.specifier}" def __repr__(self) -> str: - return "{class_name}({specifier!r})".format( - class_name=self.__class__.__name__, - specifier=str(self.specifier), - ) + return f"{self.__class__.__name__}({str(self.specifier)!r})" @property def project_name(self) -> NormalizedName: @@ -142,10 +146,7 @@ def __str__(self) -> str: return f"{self._name} (unavailable)" def __repr__(self) -> str: - return "{class_name}({name!r})".format( - class_name=self.__class__.__name__, - name=str(self._name), - ) + return f"{self.__class__.__name__}({str(self._name)!r})" @property def project_name(self) -> NormalizedName: diff --git a/src/pip/_internal/resolution/resolvelib/resolver.py b/src/pip/_internal/resolution/resolvelib/resolver.py index 47bbfecce36..c12beef0b2a 100644 --- a/src/pip/_internal/resolution/resolvelib/resolver.py +++ b/src/pip/_internal/resolution/resolvelib/resolver.py @@ -1,3 +1,4 @@ +import contextlib import functools import logging import os @@ -11,6 +12,7 @@ from pip._internal.cache import WheelCache from pip._internal.index.package_finder import PackageFinder from pip._internal.operations.prepare import RequirementPreparer +from pip._internal.req.constructors import install_req_extend_extras from pip._internal.req.req_install import InstallRequirement from pip._internal.req.req_set import RequirementSet from pip._internal.resolution.base import BaseResolver, InstallRequirementProvider @@ -19,6 +21,7 @@ PipDebuggingReporter, PipReporter, ) +from pip._internal.utils.packaging import get_requirement from .base import Candidate, Requirement from .factory import Factory @@ -101,9 +104,24 @@ def resolve( raise error from e req_set = RequirementSet(check_supported_wheels=check_supported_wheels) - for candidate in result.mapping.values(): + # process candidates with extras last to ensure their base equivalent is + # already in the req_set if appropriate. + # Python's sort is stable so using a binary key function keeps relative order + # within both subsets. + for candidate in sorted( + result.mapping.values(), key=lambda c: c.name != c.project_name + ): ireq = candidate.get_install_requirement() if ireq is None: + if candidate.name != candidate.project_name: + # extend existing req's extras + with contextlib.suppress(KeyError): + req = req_set.get_requirement(candidate.project_name) + req_set.add_named_requirement( + install_req_extend_extras( + req, get_requirement(candidate.name).extras + ) + ) continue # Check if there is already an installation under the same name, @@ -159,6 +177,9 @@ def resolve( reqs = req_set.all_requirements self.factory.preparer.prepare_linked_requirements_more(reqs) + for req in reqs: + req.prepared = True + req.needs_more_preparation = False return req_set def get_installation_order( diff --git a/src/pip/_internal/self_outdated_check.py b/src/pip/_internal/self_outdated_check.py index 41cc42c5677..0f64ae0e614 100644 --- a/src/pip/_internal/self_outdated_check.py +++ b/src/pip/_internal/self_outdated_check.py @@ -28,8 +28,7 @@ from pip._internal.utils.filesystem import adjacent_tmp_file, check_path_owner, replace from pip._internal.utils.misc import ensure_dir -_DATE_FMT = "%Y-%m-%dT%H:%M:%SZ" - +_WEEK = datetime.timedelta(days=7) logger = logging.getLogger(__name__) @@ -40,6 +39,15 @@ def _get_statefile_name(key: str) -> str: return name +def _convert_date(isodate: str) -> datetime.datetime: + """Convert an ISO format string to a date. + + Handles the format 2020-01-22T14:24:01Z (trailing Z) + which is not supported by older versions of fromisoformat. + """ + return datetime.datetime.fromisoformat(isodate.replace("Z", "+00:00")) + + class SelfCheckState: def __init__(self, cache_dir: str) -> None: self._state: Dict[str, Any] = {} @@ -73,12 +81,10 @@ def get(self, current_time: datetime.datetime) -> Optional[str]: if "pypi_version" not in self._state: return None - seven_days_in_seconds = 7 * 24 * 60 * 60 - # Determine if we need to refresh the state - last_check = datetime.datetime.strptime(self._state["last_check"], _DATE_FMT) - seconds_since_last_check = (current_time - last_check).total_seconds() - if seconds_since_last_check > seven_days_in_seconds: + last_check = _convert_date(self._state["last_check"]) + time_since_last_check = current_time - last_check + if time_since_last_check > _WEEK: return None return self._state["pypi_version"] @@ -100,7 +106,7 @@ def set(self, pypi_version: str, current_time: datetime.datetime) -> None: # Include the key so it's easy to tell which pip wrote the # file. "key": self.key, - "last_check": current_time.strftime(_DATE_FMT), + "last_check": current_time.isoformat(), "pypi_version": pypi_version, } @@ -229,14 +235,14 @@ def pip_self_version_check(session: PipSession, options: optparse.Values) -> Non try: upgrade_prompt = _self_version_check_logic( state=SelfCheckState(cache_dir=options.cache_dir), - current_time=datetime.datetime.utcnow(), + current_time=datetime.datetime.now(datetime.timezone.utc), local_version=installed_dist.version, get_remote_version=functools.partial( _get_current_remote_pip_version, session, options ), ) if upgrade_prompt is not None: - logger.warning("[present-rich] %s", upgrade_prompt) + logger.warning("%s", upgrade_prompt, extra={"rich": True}) except Exception: logger.warning("There was an error checking the latest version of pip.") logger.debug("See below for error", exc_info=True) diff --git a/src/pip/_internal/utils/glibc.py b/src/pip/_internal/utils/glibc.py index 7bd3c20681d..81342afa447 100644 --- a/src/pip/_internal/utils/glibc.py +++ b/src/pip/_internal/utils/glibc.py @@ -1,6 +1,3 @@ -# The following comment should be removed at some point in the future. -# mypy: strict-optional=False - import os import sys from typing import Optional, Tuple @@ -20,8 +17,11 @@ def glibc_version_string_confstr() -> Optional[str]: if sys.platform == "win32": return None try: + gnu_libc_version = os.confstr("CS_GNU_LIBC_VERSION") + if gnu_libc_version is None: + return None # os.confstr("CS_GNU_LIBC_VERSION") returns a string like "glibc 2.17": - _, version = os.confstr("CS_GNU_LIBC_VERSION").split() + _, version = gnu_libc_version.split() except (AttributeError, OSError, ValueError): # os.confstr() or CS_GNU_LIBC_VERSION not available (or a bad value)... return None diff --git a/src/pip/_internal/utils/hashes.py b/src/pip/_internal/utils/hashes.py index 9ed109c61db..c073b09dd98 100644 --- a/src/pip/_internal/utils/hashes.py +++ b/src/pip/_internal/utils/hashes.py @@ -101,6 +101,13 @@ def check_against_path(self, path: str) -> None: with open(path, "rb") as file: return self.check_against_file(file) + def has_one_of(self, hashes: Dict[str, str]) -> bool: + """Return whether any of the given hashes are allowed.""" + for hash_name, hex_digest in hashes.items(): + if self.is_hash_allowed(hash_name, hex_digest): + return True + return False + def __bool__(self) -> bool: """Return whether I know any known-good hashes.""" return bool(self._allowed) diff --git a/src/pip/_internal/utils/inject_securetransport.py b/src/pip/_internal/utils/inject_securetransport.py deleted file mode 100644 index 276aa79bb81..00000000000 --- a/src/pip/_internal/utils/inject_securetransport.py +++ /dev/null @@ -1,35 +0,0 @@ -"""A helper module that injects SecureTransport, on import. - -The import should be done as early as possible, to ensure all requests and -sessions (or whatever) are created after injecting SecureTransport. - -Note that we only do the injection on macOS, when the linked OpenSSL is too -old to handle TLSv1.2. -""" - -import sys - - -def inject_securetransport() -> None: - # Only relevant on macOS - if sys.platform != "darwin": - return - - try: - import ssl - except ImportError: - return - - # Checks for OpenSSL 1.0.1 - if ssl.OPENSSL_VERSION_NUMBER >= 0x1000100F: - return - - try: - from pip._vendor.urllib3.contrib import securetransport - except (ImportError, OSError): - return - - securetransport.inject_into_urllib3() - - -inject_securetransport() diff --git a/src/pip/_internal/utils/logging.py b/src/pip/_internal/utils/logging.py index c10e1f4ced6..95982dfb691 100644 --- a/src/pip/_internal/utils/logging.py +++ b/src/pip/_internal/utils/logging.py @@ -155,8 +155,8 @@ def emit(self, record: logging.LogRecord) -> None: # If we are given a diagnostic error to present, present it with indentation. assert isinstance(record.args, tuple) - if record.msg == "[present-rich] %s" and len(record.args) == 1: - rich_renderable = record.args[0] + if getattr(record, "rich", False): + (rich_renderable,) = record.args assert isinstance( rich_renderable, (ConsoleRenderable, RichCast, str) ), f"{rich_renderable} is not rich-console-renderable" diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py index bfed8270252..1ad3f6162a2 100644 --- a/src/pip/_internal/utils/misc.py +++ b/src/pip/_internal/utils/misc.py @@ -1,6 +1,3 @@ -# The following comment should be removed at some point in the future. -# mypy: strict-optional=False - import contextlib import errno import getpass @@ -14,9 +11,11 @@ import sys import sysconfig import urllib.parse +from functools import partial from io import StringIO from itertools import filterfalse, tee, zip_longest -from types import TracebackType +from pathlib import Path +from types import FunctionType, TracebackType from typing import ( Any, BinaryIO, @@ -36,6 +35,7 @@ cast, ) +from pip._vendor.packaging.requirements import Requirement from pip._vendor.pyproject_hooks import BuildBackendHookCaller from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed @@ -69,17 +69,15 @@ ExcInfo = Tuple[Type[BaseException], BaseException, TracebackType] VersionInfo = Tuple[int, int, int] NetlocTuple = Tuple[str, Tuple[Optional[str], Optional[str]]] +OnExc = Callable[[FunctionType, Path, BaseException], Any] +OnErr = Callable[[FunctionType, Path, ExcInfo], Any] def get_pip_version() -> str: pip_pkg_dir = os.path.join(os.path.dirname(__file__), "..", "..") pip_pkg_dir = os.path.abspath(pip_pkg_dir) - return "pip {} from {} (python {})".format( - __version__, - pip_pkg_dir, - get_major_minor_version(), - ) + return f"pip {__version__} from {pip_pkg_dir} (python {get_major_minor_version()})" def normalize_version_info(py_version_info: Tuple[int, ...]) -> Tuple[int, int, int]: @@ -126,28 +124,75 @@ def get_prog() -> str: # Retry every half second for up to 3 seconds # Tenacity raises RetryError by default, explicitly raise the original exception @retry(reraise=True, stop=stop_after_delay(3), wait=wait_fixed(0.5)) -def rmtree(dir: str, ignore_errors: bool = False) -> None: - shutil.rmtree(dir, ignore_errors=ignore_errors, onerror=rmtree_errorhandler) +def rmtree( + dir: str, + ignore_errors: bool = False, + onexc: Optional[OnExc] = None, +) -> None: + if ignore_errors: + onexc = _onerror_ignore + if onexc is None: + onexc = _onerror_reraise + handler: OnErr = partial( + # `[func, path, Union[ExcInfo, BaseException]] -> Any` is equivalent to + # `Union[([func, path, ExcInfo] -> Any), ([func, path, BaseException] -> Any)]`. + cast(Union[OnExc, OnErr], rmtree_errorhandler), + onexc=onexc, + ) + if sys.version_info >= (3, 12): + # See https://docs.python.org/3.12/whatsnew/3.12.html#shutil. + shutil.rmtree(dir, onexc=handler) # type: ignore + else: + shutil.rmtree(dir, onerror=handler) # type: ignore + + +def _onerror_ignore(*_args: Any) -> None: + pass + + +def _onerror_reraise(*_args: Any) -> None: + raise + + +def rmtree_errorhandler( + func: FunctionType, + path: Path, + exc_info: Union[ExcInfo, BaseException], + *, + onexc: OnExc = _onerror_reraise, +) -> None: + """ + `rmtree` error handler to 'force' a file remove (i.e. like `rm -f`). + * If a file is readonly then it's write flag is set and operation is + retried. -def rmtree_errorhandler(func: Callable[..., Any], path: str, exc_info: ExcInfo) -> None: - """On Windows, the files in .svn are read-only, so when rmtree() tries to - remove them, an exception is thrown. We catch that here, remove the - read-only attribute, and hopefully continue without problems.""" + * `onerror` is the original callback from `rmtree(... onerror=onerror)` + that is chained at the end if the "rm -f" still fails. + """ try: - has_attr_readonly = not (os.stat(path).st_mode & stat.S_IWRITE) + st_mode = os.stat(path).st_mode except OSError: # it's equivalent to os.path.exists return - if has_attr_readonly: + if not st_mode & stat.S_IWRITE: # convert to read/write - os.chmod(path, stat.S_IWRITE) - # use the original function to repeat the operation - func(path) - return - else: - raise + try: + os.chmod(path, st_mode | stat.S_IWRITE) + except OSError: + pass + else: + # use the original function to repeat the operation + try: + func(path) + return + except OSError: + pass + + if not isinstance(exc_info, BaseException): + _, exc_info, _ = exc_info + onexc(func, path, exc_info) def display_path(path: str) -> str: @@ -230,13 +275,13 @@ def strtobool(val: str) -> int: def format_size(bytes: float) -> str: if bytes > 1000 * 1000: - return "{:.1f} MB".format(bytes / 1000.0 / 1000) + return f"{bytes / 1000.0 / 1000:.1f} MB" elif bytes > 10 * 1000: - return "{} kB".format(int(bytes / 1000)) + return f"{int(bytes / 1000)} kB" elif bytes > 1000: - return "{:.1f} kB".format(bytes / 1000.0) + return f"{bytes / 1000.0:.1f} kB" else: - return "{} bytes".format(int(bytes)) + return f"{int(bytes)} bytes" def tabulate(rows: Iterable[Iterable[Any]]) -> Tuple[List[str], List[int]]: @@ -339,17 +384,18 @@ def write_output(msg: Any, *args: Any) -> None: class StreamWrapper(StringIO): - orig_stream: TextIO = None + orig_stream: TextIO @classmethod def from_stream(cls, orig_stream: TextIO) -> "StreamWrapper": - cls.orig_stream = orig_stream - return cls() + ret = cls() + ret.orig_stream = orig_stream + return ret # compileall.compile_dir() needs stdout.encoding to print to stdout - # https://github.com/python/mypy/issues/4125 + # type ignore is because TextIOBase.encoding is writeable @property - def encoding(self): # type: ignore + def encoding(self) -> str: # type: ignore return self.orig_stream.encoding @@ -417,7 +463,7 @@ def build_url_from_netloc(netloc: str, scheme: str = "https") -> str: return f"{scheme}://{netloc}" -def parse_netloc(netloc: str) -> Tuple[str, Optional[int]]: +def parse_netloc(netloc: str) -> Tuple[Optional[str], Optional[int]]: """ Return the host-port pair from a netloc. """ @@ -472,9 +518,7 @@ def redact_netloc(netloc: str) -> str: else: user = urllib.parse.quote(user) password = ":****" - return "{user}{password}@{netloc}".format( - user=user, password=password, netloc=netloc - ) + return f"{user}{password}@{netloc}" def _transform_url( @@ -505,7 +549,9 @@ def _redact_netloc(netloc: str) -> Tuple[str]: return (redact_netloc(netloc),) -def split_auth_netloc_from_url(url: str) -> Tuple[str, str, Tuple[str, str]]: +def split_auth_netloc_from_url( + url: str, +) -> Tuple[str, str, Tuple[Optional[str], Optional[str]]]: """ Parse a url into separate netloc, auth, and url with no auth. @@ -527,13 +573,20 @@ def redact_auth_from_url(url: str) -> str: return _transform_url(url, _redact_netloc)[0] +def redact_auth_from_requirement(req: Requirement) -> str: + """Replace the password in a given requirement url with ****.""" + if not req.url: + return str(req) + return str(req).replace(req.url, redact_auth_from_url(req.url)) + + class HiddenText: def __init__(self, secret: str, redacted: str) -> None: self.secret = secret self.redacted = redacted def __repr__(self) -> str: - return "".format(str(self)) + return f"" def __str__(self) -> str: return self.redacted diff --git a/src/pip/_internal/utils/subprocess.py b/src/pip/_internal/utils/subprocess.py index 4ed7c504c87..cb2e23f007a 100644 --- a/src/pip/_internal/utils/subprocess.py +++ b/src/pip/_internal/utils/subprocess.py @@ -194,7 +194,7 @@ def call_subprocess( output_lines=all_output if not showing_subprocess else None, ) if log_failed_cmd: - subprocess_logger.error("[present-rich] %s", error) + subprocess_logger.error("%s", error, extra={"rich": True}) subprocess_logger.verbose( "[bold magenta]full command[/]: [blue]%s[/]", escape(format_command_args(cmd)), diff --git a/src/pip/_internal/utils/temp_dir.py b/src/pip/_internal/utils/temp_dir.py index 8ee8a1cb180..4eec5f37f76 100644 --- a/src/pip/_internal/utils/temp_dir.py +++ b/src/pip/_internal/utils/temp_dir.py @@ -3,8 +3,19 @@ import logging import os.path import tempfile +import traceback from contextlib import ExitStack, contextmanager -from typing import Any, Dict, Generator, Optional, TypeVar, Union +from pathlib import Path +from typing import ( + Any, + Callable, + Dict, + Generator, + List, + Optional, + TypeVar, + Union, +) from pip._internal.utils.misc import enum, rmtree @@ -106,6 +117,7 @@ def __init__( delete: Union[bool, None, _Default] = _default, kind: str = "temp", globally_managed: bool = False, + ignore_cleanup_errors: bool = True, ): super().__init__() @@ -128,6 +140,7 @@ def __init__( self._deleted = False self.delete = delete self.kind = kind + self.ignore_cleanup_errors = ignore_cleanup_errors if globally_managed: assert _tempdir_manager is not None @@ -170,7 +183,44 @@ def cleanup(self) -> None: self._deleted = True if not os.path.exists(self._path): return - rmtree(self._path) + + errors: List[BaseException] = [] + + def onerror( + func: Callable[..., Any], + path: Path, + exc_val: BaseException, + ) -> None: + """Log a warning for a `rmtree` error and continue""" + formatted_exc = "\n".join( + traceback.format_exception_only(type(exc_val), exc_val) + ) + formatted_exc = formatted_exc.rstrip() # remove trailing new line + if func in (os.unlink, os.remove, os.rmdir): + logger.debug( + "Failed to remove a temporary file '%s' due to %s.\n", + path, + formatted_exc, + ) + else: + logger.debug("%s failed with %s.", func.__qualname__, formatted_exc) + errors.append(exc_val) + + if self.ignore_cleanup_errors: + try: + # first try with tenacity; retrying to handle ephemeral errors + rmtree(self._path, ignore_errors=False) + except OSError: + # last pass ignore/log all errors + rmtree(self._path, onexc=onerror) + if errors: + logger.warning( + "Failed to remove contents in a temporary directory '%s'.\n" + "You can safely remove it manually.", + self._path, + ) + else: + rmtree(self._path) class AdjacentTempDirectory(TempDirectory): diff --git a/src/pip/_internal/utils/wheel.py b/src/pip/_internal/utils/wheel.py index e5e3f34ed81..3551f8f19bc 100644 --- a/src/pip/_internal/utils/wheel.py +++ b/src/pip/_internal/utils/wheel.py @@ -28,7 +28,7 @@ def parse_wheel(wheel_zip: ZipFile, name: str) -> Tuple[str, Message]: metadata = wheel_metadata(wheel_zip, info_dir) version = wheel_version(metadata) except UnsupportedWheel as e: - raise UnsupportedWheel("{} has an invalid wheel, {}".format(name, str(e))) + raise UnsupportedWheel(f"{name} has an invalid wheel, {str(e)}") check_compatibility(version, name) @@ -60,9 +60,7 @@ def wheel_dist_info_dir(source: ZipFile, name: str) -> str: canonical_name = canonicalize_name(name) if not info_dir_name.startswith(canonical_name): raise UnsupportedWheel( - ".dist-info directory {!r} does not start with {!r}".format( - info_dir, canonical_name - ) + f".dist-info directory {info_dir!r} does not start with {canonical_name!r}" ) return info_dir diff --git a/src/pip/_internal/vcs/git.py b/src/pip/_internal/vcs/git.py index 8d1d4993767..8c242cf8956 100644 --- a/src/pip/_internal/vcs/git.py +++ b/src/pip/_internal/vcs/git.py @@ -101,7 +101,7 @@ def get_git_version(self) -> Tuple[int, ...]: if not match: logger.warning("Can't parse git version: %s", version) return () - return tuple(int(c) for c in match.groups()) + return (int(match.group(1)), int(match.group(2))) @classmethod def get_current_branch(cls, location: str) -> Optional[str]: diff --git a/src/pip/_internal/vcs/mercurial.py b/src/pip/_internal/vcs/mercurial.py index 2a005e0aff2..c183d41d09c 100644 --- a/src/pip/_internal/vcs/mercurial.py +++ b/src/pip/_internal/vcs/mercurial.py @@ -31,7 +31,7 @@ class Mercurial(VersionControl): @staticmethod def get_base_rev_args(rev: str) -> List[str]: - return [rev] + return [f"--rev={rev}"] def fetch_new( self, dest: str, url: HiddenText, rev_options: RevOptions, verbosity: int diff --git a/src/pip/_internal/vcs/versioncontrol.py b/src/pip/_internal/vcs/versioncontrol.py index eb155740df8..1e2be8d1acd 100644 --- a/src/pip/_internal/vcs/versioncontrol.py +++ b/src/pip/_internal/vcs/versioncontrol.py @@ -398,9 +398,9 @@ def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]: scheme, netloc, path, query, frag = urllib.parse.urlsplit(url) if "+" not in scheme: raise ValueError( - "Sorry, {!r} is a malformed VCS url. " + f"Sorry, {url!r} is a malformed VCS url. " "The format is +://, " - "e.g. svn+http://myrepo/svn/MyApp#egg=MyApp".format(url) + "e.g. svn+http://myrepo/svn/MyApp#egg=MyApp" ) # Remove the vcs prefix. scheme = scheme.split("+", 1)[1] @@ -410,9 +410,9 @@ def get_url_rev_and_auth(cls, url: str) -> Tuple[str, Optional[str], AuthInfo]: path, rev = path.rsplit("@", 1) if not rev: raise InstallationError( - "The URL {!r} has an empty revision (after @) " + f"The URL {url!r} has an empty revision (after @) " "which is not supported. Include a revision after @ " - "or remove @ from the URL.".format(url) + "or remove @ from the URL." ) url = urllib.parse.urlunsplit((scheme, netloc, path, query, "")) return url, rev, user_pass @@ -559,7 +559,7 @@ def obtain(self, dest: str, url: HiddenText, verbosity: int) -> None: self.name, url, ) - response = ask_path_exists("What to do? {}".format(prompt[0]), prompt[1]) + response = ask_path_exists(f"What to do? {prompt[0]}", prompt[1]) if response == "a": sys.exit(-1) diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py index 1ad9eef0130..93f8e1f5b2f 100644 --- a/src/pip/_internal/wheel_builder.py +++ b/src/pip/_internal/wheel_builder.py @@ -140,15 +140,15 @@ def _verify_one(req: InstallRequirement, wheel_path: str) -> None: w = Wheel(os.path.basename(wheel_path)) if canonicalize_name(w.name) != canonical_name: raise InvalidWheelFilename( - "Wheel has unexpected file name: expected {!r}, " - "got {!r}".format(canonical_name, w.name), + f"Wheel has unexpected file name: expected {canonical_name!r}, " + f"got {w.name!r}", ) dist = get_wheel_distribution(FilesystemWheel(wheel_path), canonical_name) dist_verstr = str(dist.version) if canonicalize_version(dist_verstr) != canonicalize_version(w.version): raise InvalidWheelFilename( - "Wheel has unexpected file name: expected {!r}, " - "got {!r}".format(dist_verstr, w.version), + f"Wheel has unexpected file name: expected {dist_verstr!r}, " + f"got {w.version!r}", ) metadata_version_value = dist.metadata_version if metadata_version_value is None: @@ -160,8 +160,7 @@ def _verify_one(req: InstallRequirement, wheel_path: str) -> None: raise UnsupportedWheel(msg) if metadata_version >= Version("1.2") and not isinstance(dist.version, Version): raise UnsupportedWheel( - "Metadata 1.2 mandates PEP 440 version, " - "but {!r} is not".format(dist_verstr) + f"Metadata 1.2 mandates PEP 440 version, but {dist_verstr!r} is not" ) diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py index b22f7abb93b..c1884baf3d1 100644 --- a/src/pip/_vendor/__init__.py +++ b/src/pip/_vendor/__init__.py @@ -117,4 +117,5 @@ def vendored(modulename): vendored("rich.traceback") vendored("tenacity") vendored("tomli") + vendored("truststore") vendored("urllib3") diff --git a/src/pip/_vendor/cachecontrol.pyi b/src/pip/_vendor/cachecontrol.pyi deleted file mode 100644 index 636a66bacaf..00000000000 --- a/src/pip/_vendor/cachecontrol.pyi +++ /dev/null @@ -1 +0,0 @@ -from cachecontrol import * \ No newline at end of file diff --git a/src/pip/_vendor/cachecontrol/__init__.py b/src/pip/_vendor/cachecontrol/__init__.py index f631ae6df47..4d20bc9b12a 100644 --- a/src/pip/_vendor/cachecontrol/__init__.py +++ b/src/pip/_vendor/cachecontrol/__init__.py @@ -8,11 +8,21 @@ """ __author__ = "Eric Larson" __email__ = "eric@ionrock.org" -__version__ = "0.12.11" +__version__ = "0.13.1" -from .wrapper import CacheControl -from .adapter import CacheControlAdapter -from .controller import CacheController +from pip._vendor.cachecontrol.adapter import CacheControlAdapter +from pip._vendor.cachecontrol.controller import CacheController +from pip._vendor.cachecontrol.wrapper import CacheControl + +__all__ = [ + "__author__", + "__email__", + "__version__", + "CacheControlAdapter", + "CacheController", + "CacheControl", +] import logging + logging.getLogger(__name__).addHandler(logging.NullHandler()) diff --git a/src/pip/_vendor/cachecontrol/_cmd.py b/src/pip/_vendor/cachecontrol/_cmd.py index 4266b5ee92a..2c84208a5d8 100644 --- a/src/pip/_vendor/cachecontrol/_cmd.py +++ b/src/pip/_vendor/cachecontrol/_cmd.py @@ -1,8 +1,11 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations import logging +from argparse import ArgumentParser +from typing import TYPE_CHECKING from pip._vendor import requests @@ -10,16 +13,19 @@ from pip._vendor.cachecontrol.cache import DictCache from pip._vendor.cachecontrol.controller import logger -from argparse import ArgumentParser +if TYPE_CHECKING: + from argparse import Namespace + from pip._vendor.cachecontrol.controller import CacheController -def setup_logging(): + +def setup_logging() -> None: logger.setLevel(logging.DEBUG) handler = logging.StreamHandler() logger.addHandler(handler) -def get_session(): +def get_session() -> requests.Session: adapter = CacheControlAdapter( DictCache(), cache_etags=True, serializer=None, heuristic=None ) @@ -27,17 +33,17 @@ def get_session(): sess.mount("http://", adapter) sess.mount("https://", adapter) - sess.cache_controller = adapter.controller + sess.cache_controller = adapter.controller # type: ignore[attr-defined] return sess -def get_args(): +def get_args() -> Namespace: parser = ArgumentParser() parser.add_argument("url", help="The URL to try and cache") return parser.parse_args() -def main(args=None): +def main() -> None: args = get_args() sess = get_session() @@ -48,10 +54,13 @@ def main(args=None): setup_logging() # try setting the cache - sess.cache_controller.cache_response(resp.request, resp.raw) + cache_controller: CacheController = ( + sess.cache_controller # type: ignore[attr-defined] + ) + cache_controller.cache_response(resp.request, resp.raw) # Now try to get it - if sess.cache_controller.cached_request(resp.request): + if cache_controller.cached_request(resp.request): print("Cached!") else: print("Not cached :(") diff --git a/src/pip/_vendor/cachecontrol/adapter.py b/src/pip/_vendor/cachecontrol/adapter.py index 94c75e1a05b..3e83e308dba 100644 --- a/src/pip/_vendor/cachecontrol/adapter.py +++ b/src/pip/_vendor/cachecontrol/adapter.py @@ -1,16 +1,26 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations -import types import functools +import types import zlib +from typing import TYPE_CHECKING, Any, Collection, Mapping from pip._vendor.requests.adapters import HTTPAdapter -from .controller import CacheController, PERMANENT_REDIRECT_STATUSES -from .cache import DictCache -from .filewrapper import CallbackFileWrapper +from pip._vendor.cachecontrol.cache import DictCache +from pip._vendor.cachecontrol.controller import PERMANENT_REDIRECT_STATUSES, CacheController +from pip._vendor.cachecontrol.filewrapper import CallbackFileWrapper + +if TYPE_CHECKING: + from pip._vendor.requests import PreparedRequest, Response + from pip._vendor.urllib3 import HTTPResponse + + from pip._vendor.cachecontrol.cache import BaseCache + from pip._vendor.cachecontrol.heuristics import BaseHeuristic + from pip._vendor.cachecontrol.serialize import Serializer class CacheControlAdapter(HTTPAdapter): @@ -18,16 +28,16 @@ class CacheControlAdapter(HTTPAdapter): def __init__( self, - cache=None, - cache_etags=True, - controller_class=None, - serializer=None, - heuristic=None, - cacheable_methods=None, - *args, - **kw - ): - super(CacheControlAdapter, self).__init__(*args, **kw) + cache: BaseCache | None = None, + cache_etags: bool = True, + controller_class: type[CacheController] | None = None, + serializer: Serializer | None = None, + heuristic: BaseHeuristic | None = None, + cacheable_methods: Collection[str] | None = None, + *args: Any, + **kw: Any, + ) -> None: + super().__init__(*args, **kw) self.cache = DictCache() if cache is None else cache self.heuristic = heuristic self.cacheable_methods = cacheable_methods or ("GET",) @@ -37,7 +47,16 @@ def __init__( self.cache, cache_etags=cache_etags, serializer=serializer ) - def send(self, request, cacheable_methods=None, **kw): + def send( + self, + request: PreparedRequest, + stream: bool = False, + timeout: None | float | tuple[float, float] | tuple[float, None] = None, + verify: bool | str = True, + cert: (None | bytes | str | tuple[bytes | str, bytes | str]) = None, + proxies: Mapping[str, str] | None = None, + cacheable_methods: Collection[str] | None = None, + ) -> Response: """ Send a request. Use the request information to see if it exists in the cache and cache the response if we need to and can. @@ -54,13 +73,17 @@ def send(self, request, cacheable_methods=None, **kw): # check for etags and add headers if appropriate request.headers.update(self.controller.conditional_headers(request)) - resp = super(CacheControlAdapter, self).send(request, **kw) + resp = super().send(request, stream, timeout, verify, cert, proxies) return resp def build_response( - self, request, response, from_cache=False, cacheable_methods=None - ): + self, + request: PreparedRequest, + response: HTTPResponse, + from_cache: bool = False, + cacheable_methods: Collection[str] | None = None, + ) -> Response: """ Build a response by making a request or using the cache. @@ -102,36 +125,37 @@ def build_response( else: # Wrap the response file with a wrapper that will cache the # response when the stream has been consumed. - response._fp = CallbackFileWrapper( - response._fp, + response._fp = CallbackFileWrapper( # type: ignore[attr-defined] + response._fp, # type: ignore[attr-defined] functools.partial( self.controller.cache_response, request, response ), ) if response.chunked: - super_update_chunk_length = response._update_chunk_length + super_update_chunk_length = response._update_chunk_length # type: ignore[attr-defined] - def _update_chunk_length(self): + def _update_chunk_length(self: HTTPResponse) -> None: super_update_chunk_length() if self.chunk_left == 0: - self._fp._close() + self._fp._close() # type: ignore[attr-defined] - response._update_chunk_length = types.MethodType( + response._update_chunk_length = types.MethodType( # type: ignore[attr-defined] _update_chunk_length, response ) - resp = super(CacheControlAdapter, self).build_response(request, response) + resp: Response = super().build_response(request, response) # type: ignore[no-untyped-call] # See if we should invalidate the cache. if request.method in self.invalidating_methods and resp.ok: + assert request.url is not None cache_url = self.controller.cache_url(request.url) self.cache.delete(cache_url) # Give the request a from_cache attr to let people use it - resp.from_cache = from_cache + resp.from_cache = from_cache # type: ignore[attr-defined] return resp - def close(self): + def close(self) -> None: self.cache.close() - super(CacheControlAdapter, self).close() + super().close() # type: ignore[no-untyped-call] diff --git a/src/pip/_vendor/cachecontrol/cache.py b/src/pip/_vendor/cachecontrol/cache.py index 2a965f595ff..3293b0057c7 100644 --- a/src/pip/_vendor/cachecontrol/cache.py +++ b/src/pip/_vendor/cachecontrol/cache.py @@ -6,38 +6,46 @@ The cache object API for implementing caches. The default is a thread safe in-memory dictionary. """ +from __future__ import annotations + from threading import Lock +from typing import IO, TYPE_CHECKING, MutableMapping +if TYPE_CHECKING: + from datetime import datetime -class BaseCache(object): - def get(self, key): +class BaseCache: + def get(self, key: str) -> bytes | None: raise NotImplementedError() - def set(self, key, value, expires=None): + def set( + self, key: str, value: bytes, expires: int | datetime | None = None + ) -> None: raise NotImplementedError() - def delete(self, key): + def delete(self, key: str) -> None: raise NotImplementedError() - def close(self): + def close(self) -> None: pass class DictCache(BaseCache): - - def __init__(self, init_dict=None): + def __init__(self, init_dict: MutableMapping[str, bytes] | None = None) -> None: self.lock = Lock() self.data = init_dict or {} - def get(self, key): + def get(self, key: str) -> bytes | None: return self.data.get(key, None) - def set(self, key, value, expires=None): + def set( + self, key: str, value: bytes, expires: int | datetime | None = None + ) -> None: with self.lock: self.data.update({key: value}) - def delete(self, key): + def delete(self, key: str) -> None: with self.lock: if key in self.data: self.data.pop(key) @@ -55,10 +63,11 @@ class SeparateBodyBaseCache(BaseCache): Similarly, the body should be loaded separately via ``get_body()``. """ - def set_body(self, key, body): + + def set_body(self, key: str, body: bytes) -> None: raise NotImplementedError() - def get_body(self, key): + def get_body(self, key: str) -> IO[bytes] | None: """ Return the body as file-like object. """ diff --git a/src/pip/_vendor/cachecontrol/caches/__init__.py b/src/pip/_vendor/cachecontrol/caches/__init__.py index 37827291fb5..24ff469ff98 100644 --- a/src/pip/_vendor/cachecontrol/caches/__init__.py +++ b/src/pip/_vendor/cachecontrol/caches/__init__.py @@ -2,8 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -from .file_cache import FileCache, SeparateBodyFileCache -from .redis_cache import RedisCache - +from pip._vendor.cachecontrol.caches.file_cache import FileCache, SeparateBodyFileCache +from pip._vendor.cachecontrol.caches.redis_cache import RedisCache __all__ = ["FileCache", "SeparateBodyFileCache", "RedisCache"] diff --git a/src/pip/_vendor/cachecontrol/caches/file_cache.py b/src/pip/_vendor/cachecontrol/caches/file_cache.py index f1ddb2ebdf9..1fd28013084 100644 --- a/src/pip/_vendor/cachecontrol/caches/file_cache.py +++ b/src/pip/_vendor/cachecontrol/caches/file_cache.py @@ -1,22 +1,23 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations import hashlib import os from textwrap import dedent +from typing import IO, TYPE_CHECKING -from ..cache import BaseCache, SeparateBodyBaseCache -from ..controller import CacheController +from pip._vendor.cachecontrol.cache import BaseCache, SeparateBodyBaseCache +from pip._vendor.cachecontrol.controller import CacheController -try: - FileNotFoundError -except NameError: - # py2.X - FileNotFoundError = (IOError, OSError) +if TYPE_CHECKING: + from datetime import datetime + from filelock import BaseFileLock -def _secure_open_write(filename, fmode): + +def _secure_open_write(filename: str, fmode: int) -> IO[bytes]: # We only want to write to this file, so open it in write only mode flags = os.O_WRONLY @@ -39,7 +40,7 @@ def _secure_open_write(filename, fmode): # there try: os.remove(filename) - except (IOError, OSError): + except OSError: # The file must not exist already, so we can just skip ahead to opening pass @@ -62,37 +63,27 @@ class _FileCacheMixin: def __init__( self, - directory, - forever=False, - filemode=0o0600, - dirmode=0o0700, - use_dir_lock=None, - lock_class=None, - ): - - if use_dir_lock is not None and lock_class is not None: - raise ValueError("Cannot use use_dir_lock and lock_class together") - + directory: str, + forever: bool = False, + filemode: int = 0o0600, + dirmode: int = 0o0700, + lock_class: type[BaseFileLock] | None = None, + ) -> None: try: - from lockfile import LockFile - from lockfile.mkdirlockfile import MkdirLockFile + if lock_class is None: + from filelock import FileLock + + lock_class = FileLock except ImportError: notice = dedent( """ NOTE: In order to use the FileCache you must have - lockfile installed. You can install it via pip: - pip install lockfile + filelock installed. You can install it via pip: + pip install filelock """ ) raise ImportError(notice) - else: - if use_dir_lock: - lock_class = MkdirLockFile - - elif lock_class is None: - lock_class = LockFile - self.directory = directory self.forever = forever self.filemode = filemode @@ -100,17 +91,17 @@ def __init__( self.lock_class = lock_class @staticmethod - def encode(x): + def encode(x: str) -> str: return hashlib.sha224(x.encode()).hexdigest() - def _fn(self, name): + def _fn(self, name: str) -> str: # NOTE: This method should not change as some may depend on it. # See: https://github.com/ionrock/cachecontrol/issues/63 hashed = self.encode(name) parts = list(hashed[:5]) + [hashed] return os.path.join(self.directory, *parts) - def get(self, key): + def get(self, key: str) -> bytes | None: name = self._fn(key) try: with open(name, "rb") as fh: @@ -119,26 +110,28 @@ def get(self, key): except FileNotFoundError: return None - def set(self, key, value, expires=None): + def set( + self, key: str, value: bytes, expires: int | datetime | None = None + ) -> None: name = self._fn(key) self._write(name, value) - def _write(self, path, data: bytes): + def _write(self, path: str, data: bytes) -> None: """ Safely write the data to the given path. """ # Make sure the directory exists try: os.makedirs(os.path.dirname(path), self.dirmode) - except (IOError, OSError): + except OSError: pass - with self.lock_class(path) as lock: + with self.lock_class(path + ".lock"): # Write our actual file - with _secure_open_write(lock.path, self.filemode) as fh: + with _secure_open_write(path, self.filemode) as fh: fh.write(data) - def _delete(self, key, suffix): + def _delete(self, key: str, suffix: str) -> None: name = self._fn(key) + suffix if not self.forever: try: @@ -153,7 +146,7 @@ class FileCache(_FileCacheMixin, BaseCache): downloads. """ - def delete(self, key): + def delete(self, key: str) -> None: self._delete(key, "") @@ -163,23 +156,23 @@ class SeparateBodyFileCache(_FileCacheMixin, SeparateBodyBaseCache): peak memory usage. """ - def get_body(self, key): + def get_body(self, key: str) -> IO[bytes] | None: name = self._fn(key) + ".body" try: return open(name, "rb") except FileNotFoundError: return None - def set_body(self, key, body): + def set_body(self, key: str, body: bytes) -> None: name = self._fn(key) + ".body" self._write(name, body) - def delete(self, key): + def delete(self, key: str) -> None: self._delete(key, "") self._delete(key, ".body") -def url_to_file_path(url, filecache): +def url_to_file_path(url: str, filecache: FileCache) -> str: """Return the file cache path based on the URL. This does not ensure the file exists! diff --git a/src/pip/_vendor/cachecontrol/caches/redis_cache.py b/src/pip/_vendor/cachecontrol/caches/redis_cache.py index 2cba4b07080..f4f68c47bf6 100644 --- a/src/pip/_vendor/cachecontrol/caches/redis_cache.py +++ b/src/pip/_vendor/cachecontrol/caches/redis_cache.py @@ -1,39 +1,48 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations -from __future__ import division -from datetime import datetime +from datetime import datetime, timezone +from typing import TYPE_CHECKING + from pip._vendor.cachecontrol.cache import BaseCache +if TYPE_CHECKING: + from redis import Redis -class RedisCache(BaseCache): - def __init__(self, conn): +class RedisCache(BaseCache): + def __init__(self, conn: Redis[bytes]) -> None: self.conn = conn - def get(self, key): + def get(self, key: str) -> bytes | None: return self.conn.get(key) - def set(self, key, value, expires=None): + def set( + self, key: str, value: bytes, expires: int | datetime | None = None + ) -> None: if not expires: self.conn.set(key, value) elif isinstance(expires, datetime): - expires = expires - datetime.utcnow() - self.conn.setex(key, int(expires.total_seconds()), value) + now_utc = datetime.now(timezone.utc) + if expires.tzinfo is None: + now_utc = now_utc.replace(tzinfo=None) + delta = expires - now_utc + self.conn.setex(key, int(delta.total_seconds()), value) else: self.conn.setex(key, expires, value) - def delete(self, key): + def delete(self, key: str) -> None: self.conn.delete(key) - def clear(self): + def clear(self) -> None: """Helper for clearing all the keys in a database. Use with caution!""" for key in self.conn.keys(): self.conn.delete(key) - def close(self): + def close(self) -> None: """Redis uses connection pooling, no need to close the connection.""" pass diff --git a/src/pip/_vendor/cachecontrol/compat.py b/src/pip/_vendor/cachecontrol/compat.py deleted file mode 100644 index ccec9379dba..00000000000 --- a/src/pip/_vendor/cachecontrol/compat.py +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: 2015 Eric Larson -# -# SPDX-License-Identifier: Apache-2.0 - -try: - from urllib.parse import urljoin -except ImportError: - from urlparse import urljoin - - -try: - import cPickle as pickle -except ImportError: - import pickle - -# Handle the case where the requests module has been patched to not have -# urllib3 bundled as part of its source. -try: - from pip._vendor.requests.packages.urllib3.response import HTTPResponse -except ImportError: - from pip._vendor.urllib3.response import HTTPResponse - -try: - from pip._vendor.requests.packages.urllib3.util import is_fp_closed -except ImportError: - from pip._vendor.urllib3.util import is_fp_closed - -# Replicate some six behaviour -try: - text_type = unicode -except NameError: - text_type = str diff --git a/src/pip/_vendor/cachecontrol/controller.py b/src/pip/_vendor/cachecontrol/controller.py index 7f23529f115..586b9f97b80 100644 --- a/src/pip/_vendor/cachecontrol/controller.py +++ b/src/pip/_vendor/cachecontrol/controller.py @@ -5,17 +5,27 @@ """ The httplib2 algorithms ported for use with requests. """ +from __future__ import annotations + +import calendar import logging import re -import calendar import time from email.utils import parsedate_tz +from typing import TYPE_CHECKING, Collection, Mapping from pip._vendor.requests.structures import CaseInsensitiveDict -from .cache import DictCache, SeparateBodyBaseCache -from .serialize import Serializer +from pip._vendor.cachecontrol.cache import DictCache, SeparateBodyBaseCache +from pip._vendor.cachecontrol.serialize import Serializer + +if TYPE_CHECKING: + from typing import Literal + + from pip._vendor.requests import PreparedRequest + from pip._vendor.urllib3 import HTTPResponse + from pip._vendor.cachecontrol.cache import BaseCache logger = logging.getLogger(__name__) @@ -24,20 +34,26 @@ PERMANENT_REDIRECT_STATUSES = (301, 308) -def parse_uri(uri): +def parse_uri(uri: str) -> tuple[str, str, str, str, str]: """Parses a URI using the regex given in Appendix B of RFC 3986. (scheme, authority, path, query, fragment) = parse_uri(uri) """ - groups = URI.match(uri).groups() + match = URI.match(uri) + assert match is not None + groups = match.groups() return (groups[1], groups[3], groups[4], groups[6], groups[8]) -class CacheController(object): +class CacheController: """An interface to see if request should cached or not.""" def __init__( - self, cache=None, cache_etags=True, serializer=None, status_codes=None + self, + cache: BaseCache | None = None, + cache_etags: bool = True, + serializer: Serializer | None = None, + status_codes: Collection[int] | None = None, ): self.cache = DictCache() if cache is None else cache self.cache_etags = cache_etags @@ -45,7 +61,7 @@ def __init__( self.cacheable_status_codes = status_codes or (200, 203, 300, 301, 308) @classmethod - def _urlnorm(cls, uri): + def _urlnorm(cls, uri: str) -> str: """Normalize the URL to create a safe key for the cache""" (scheme, authority, path, query, fragment) = parse_uri(uri) if not scheme or not authority: @@ -65,10 +81,10 @@ def _urlnorm(cls, uri): return defrag_uri @classmethod - def cache_url(cls, uri): + def cache_url(cls, uri: str) -> str: return cls._urlnorm(uri) - def parse_cache_control(self, headers): + def parse_cache_control(self, headers: Mapping[str, str]) -> dict[str, int | None]: known_directives = { # https://tools.ietf.org/html/rfc7234#section-5.2 "max-age": (int, True), @@ -87,7 +103,7 @@ def parse_cache_control(self, headers): cc_headers = headers.get("cache-control", headers.get("Cache-Control", "")) - retval = {} + retval: dict[str, int | None] = {} for cc_directive in cc_headers.split(","): if not cc_directive.strip(): @@ -122,11 +138,33 @@ def parse_cache_control(self, headers): return retval - def cached_request(self, request): + def _load_from_cache(self, request: PreparedRequest) -> HTTPResponse | None: + """ + Load a cached response, or return None if it's not available. + """ + cache_url = request.url + assert cache_url is not None + cache_data = self.cache.get(cache_url) + if cache_data is None: + logger.debug("No cache entry available") + return None + + if isinstance(self.cache, SeparateBodyBaseCache): + body_file = self.cache.get_body(cache_url) + else: + body_file = None + + result = self.serializer.loads(request, cache_data, body_file) + if result is None: + logger.warning("Cache entry deserialization failed, entry ignored") + return result + + def cached_request(self, request: PreparedRequest) -> HTTPResponse | Literal[False]: """ Return a cached response if it exists in the cache, otherwise return False. """ + assert request.url is not None cache_url = self.cache_url(request.url) logger.debug('Looking up "%s" in the cache', cache_url) cc = self.parse_cache_control(request.headers) @@ -140,21 +178,9 @@ def cached_request(self, request): logger.debug('Request header has "max_age" as 0, cache bypassed') return False - # Request allows serving from the cache, let's see if we find something - cache_data = self.cache.get(cache_url) - if cache_data is None: - logger.debug("No cache entry available") - return False - - if isinstance(self.cache, SeparateBodyBaseCache): - body_file = self.cache.get_body(cache_url) - else: - body_file = None - - # Check whether it can be deserialized - resp = self.serializer.loads(request, cache_data, body_file) + # Check whether we can load the response from the cache: + resp = self._load_from_cache(request) if not resp: - logger.warning("Cache entry deserialization failed, entry ignored") return False # If we have a cached permanent redirect, return it immediately. We @@ -174,7 +200,7 @@ def cached_request(self, request): logger.debug(msg) return resp - headers = CaseInsensitiveDict(resp.headers) + headers: CaseInsensitiveDict[str] = CaseInsensitiveDict(resp.headers) if not headers or "date" not in headers: if "etag" not in headers: # Without date or etag, the cached response can never be used @@ -185,7 +211,9 @@ def cached_request(self, request): return False now = time.time() - date = calendar.timegm(parsedate_tz(headers["date"])) + time_tuple = parsedate_tz(headers["date"]) + assert time_tuple is not None + date = calendar.timegm(time_tuple[:6]) current_age = max(0, now - date) logger.debug("Current age based on date: %i", current_age) @@ -199,28 +227,30 @@ def cached_request(self, request): freshness_lifetime = 0 # Check the max-age pragma in the cache control header - if "max-age" in resp_cc: - freshness_lifetime = resp_cc["max-age"] + max_age = resp_cc.get("max-age") + if max_age is not None: + freshness_lifetime = max_age logger.debug("Freshness lifetime from max-age: %i", freshness_lifetime) # If there isn't a max-age, check for an expires header elif "expires" in headers: expires = parsedate_tz(headers["expires"]) if expires is not None: - expire_time = calendar.timegm(expires) - date + expire_time = calendar.timegm(expires[:6]) - date freshness_lifetime = max(0, expire_time) logger.debug("Freshness lifetime from expires: %i", freshness_lifetime) # Determine if we are setting freshness limit in the # request. Note, this overrides what was in the response. - if "max-age" in cc: - freshness_lifetime = cc["max-age"] + max_age = cc.get("max-age") + if max_age is not None: + freshness_lifetime = max_age logger.debug( "Freshness lifetime from request max-age: %i", freshness_lifetime ) - if "min-fresh" in cc: - min_fresh = cc["min-fresh"] + min_fresh = cc.get("min-fresh") + if min_fresh is not None: # adjust our current age by our min fresh current_age += min_fresh logger.debug("Adjusted current age from min-fresh: %i", current_age) @@ -239,13 +269,12 @@ def cached_request(self, request): # return the original handler return False - def conditional_headers(self, request): - cache_url = self.cache_url(request.url) - resp = self.serializer.loads(request, self.cache.get(cache_url)) + def conditional_headers(self, request: PreparedRequest) -> dict[str, str]: + resp = self._load_from_cache(request) new_headers = {} if resp: - headers = CaseInsensitiveDict(resp.headers) + headers: CaseInsensitiveDict[str] = CaseInsensitiveDict(resp.headers) if "etag" in headers: new_headers["If-None-Match"] = headers["ETag"] @@ -255,7 +284,14 @@ def conditional_headers(self, request): return new_headers - def _cache_set(self, cache_url, request, response, body=None, expires_time=None): + def _cache_set( + self, + cache_url: str, + request: PreparedRequest, + response: HTTPResponse, + body: bytes | None = None, + expires_time: int | None = None, + ) -> None: """ Store the data in the cache. """ @@ -267,7 +303,10 @@ def _cache_set(self, cache_url, request, response, body=None, expires_time=None) self.serializer.dumps(request, response, b""), expires=expires_time, ) - self.cache.set_body(cache_url, body) + # body is None can happen when, for example, we're only updating + # headers, as is the case in update_cached_response(). + if body is not None: + self.cache.set_body(cache_url, body) else: self.cache.set( cache_url, @@ -275,7 +314,13 @@ def _cache_set(self, cache_url, request, response, body=None, expires_time=None) expires=expires_time, ) - def cache_response(self, request, response, body=None, status_codes=None): + def cache_response( + self, + request: PreparedRequest, + response: HTTPResponse, + body: bytes | None = None, + status_codes: Collection[int] | None = None, + ) -> None: """ Algorithm for caching requests. @@ -290,10 +335,14 @@ def cache_response(self, request, response, body=None, status_codes=None): ) return - response_headers = CaseInsensitiveDict(response.headers) + response_headers: CaseInsensitiveDict[str] = CaseInsensitiveDict( + response.headers + ) if "date" in response_headers: - date = calendar.timegm(parsedate_tz(response_headers["date"])) + time_tuple = parsedate_tz(response_headers["date"]) + assert time_tuple is not None + date = calendar.timegm(time_tuple[:6]) else: date = 0 @@ -312,6 +361,7 @@ def cache_response(self, request, response, body=None, status_codes=None): cc_req = self.parse_cache_control(request.headers) cc = self.parse_cache_control(response_headers) + assert request.url is not None cache_url = self.cache_url(request.url) logger.debug('Updating cache with response from "%s"', cache_url) @@ -344,11 +394,11 @@ def cache_response(self, request, response, body=None, status_codes=None): if response_headers.get("expires"): expires = parsedate_tz(response_headers["expires"]) if expires is not None: - expires_time = calendar.timegm(expires) - date + expires_time = calendar.timegm(expires[:6]) - date expires_time = max(expires_time, 14 * 86400) - logger.debug("etag object cached for {0} seconds".format(expires_time)) + logger.debug(f"etag object cached for {expires_time} seconds") logger.debug("Caching due to etag") self._cache_set(cache_url, request, response, body, expires_time) @@ -362,11 +412,14 @@ def cache_response(self, request, response, body=None, status_codes=None): # is no date header then we can't do anything about expiring # the cache. elif "date" in response_headers: - date = calendar.timegm(parsedate_tz(response_headers["date"])) + time_tuple = parsedate_tz(response_headers["date"]) + assert time_tuple is not None + date = calendar.timegm(time_tuple[:6]) # cache when there is a max-age > 0 - if "max-age" in cc and cc["max-age"] > 0: + max_age = cc.get("max-age") + if max_age is not None and max_age > 0: logger.debug("Caching b/c date exists and max-age > 0") - expires_time = cc["max-age"] + expires_time = max_age self._cache_set( cache_url, request, @@ -381,12 +434,12 @@ def cache_response(self, request, response, body=None, status_codes=None): if response_headers["expires"]: expires = parsedate_tz(response_headers["expires"]) if expires is not None: - expires_time = calendar.timegm(expires) - date + expires_time = calendar.timegm(expires[:6]) - date else: expires_time = None logger.debug( - "Caching b/c of expires header. expires in {0} seconds".format( + "Caching b/c of expires header. expires in {} seconds".format( expires_time ) ) @@ -398,16 +451,18 @@ def cache_response(self, request, response, body=None, status_codes=None): expires_time, ) - def update_cached_response(self, request, response): + def update_cached_response( + self, request: PreparedRequest, response: HTTPResponse + ) -> HTTPResponse: """On a 304 we will get a new set of headers that we want to update our cached value with, assuming we have one. This should only ever be called when we've sent an ETag and gotten a 304 as the response. """ + assert request.url is not None cache_url = self.cache_url(request.url) - - cached_response = self.serializer.loads(request, self.cache.get(cache_url)) + cached_response = self._load_from_cache(request) if not cached_response: # we didn't have a cached response @@ -423,11 +478,11 @@ def update_cached_response(self, request, response): excluded_headers = ["content-length"] cached_response.headers.update( - dict( - (k, v) - for k, v in response.headers.items() + { + k: v + for k, v in response.headers.items() # type: ignore[no-untyped-call] if k.lower() not in excluded_headers - ) + } ) # we want a 200 b/c we have content via the cache diff --git a/src/pip/_vendor/cachecontrol/filewrapper.py b/src/pip/_vendor/cachecontrol/filewrapper.py index f5ed5f6f6ec..25143902a26 100644 --- a/src/pip/_vendor/cachecontrol/filewrapper.py +++ b/src/pip/_vendor/cachecontrol/filewrapper.py @@ -1,12 +1,17 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations -from tempfile import NamedTemporaryFile import mmap +from tempfile import NamedTemporaryFile +from typing import TYPE_CHECKING, Any, Callable + +if TYPE_CHECKING: + from http.client import HTTPResponse -class CallbackFileWrapper(object): +class CallbackFileWrapper: """ Small wrapper around a fp object which will tee everything read into a buffer, and when that file is closed it will execute a callback with the @@ -25,12 +30,14 @@ class CallbackFileWrapper(object): performance impact. """ - def __init__(self, fp, callback): + def __init__( + self, fp: HTTPResponse, callback: Callable[[bytes], None] | None + ) -> None: self.__buf = NamedTemporaryFile("rb+", delete=True) self.__fp = fp self.__callback = callback - def __getattr__(self, name): + def __getattr__(self, name: str) -> Any: # The vaguaries of garbage collection means that self.__fp is # not always set. By using __getattribute__ and the private # name[0] allows looking up the attribute value and raising an @@ -42,7 +49,7 @@ def __getattr__(self, name): fp = self.__getattribute__("_CallbackFileWrapper__fp") return getattr(fp, name) - def __is_fp_closed(self): + def __is_fp_closed(self) -> bool: try: return self.__fp.fp is None @@ -50,7 +57,8 @@ def __is_fp_closed(self): pass try: - return self.__fp.closed + closed: bool = self.__fp.closed + return closed except AttributeError: pass @@ -59,7 +67,7 @@ def __is_fp_closed(self): # TODO: Add some logging here... return False - def _close(self): + def _close(self) -> None: if self.__callback: if self.__buf.tell() == 0: # Empty file: @@ -86,8 +94,8 @@ def _close(self): # Important when caching big files. self.__buf.close() - def read(self, amt=None): - data = self.__fp.read(amt) + def read(self, amt: int | None = None) -> bytes: + data: bytes = self.__fp.read(amt) if data: # We may be dealing with b'', a sign that things are over: # it's passed e.g. after we've already closed self.__buf. @@ -97,8 +105,8 @@ def read(self, amt=None): return data - def _safe_read(self, amt): - data = self.__fp._safe_read(amt) + def _safe_read(self, amt: int) -> bytes: + data: bytes = self.__fp._safe_read(amt) # type: ignore[attr-defined] if amt == 2 and data == b"\r\n": # urllib executes this read to toss the CRLF at the end # of the chunk. diff --git a/src/pip/_vendor/cachecontrol/heuristics.py b/src/pip/_vendor/cachecontrol/heuristics.py index ebe4a96f589..b9d72ca4ac5 100644 --- a/src/pip/_vendor/cachecontrol/heuristics.py +++ b/src/pip/_vendor/cachecontrol/heuristics.py @@ -1,29 +1,31 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations import calendar import time - +from datetime import datetime, timedelta, timezone from email.utils import formatdate, parsedate, parsedate_tz +from typing import TYPE_CHECKING, Any, Mapping -from datetime import datetime, timedelta +if TYPE_CHECKING: + from pip._vendor.urllib3 import HTTPResponse TIME_FMT = "%a, %d %b %Y %H:%M:%S GMT" -def expire_after(delta, date=None): - date = date or datetime.utcnow() +def expire_after(delta: timedelta, date: datetime | None = None) -> datetime: + date = date or datetime.now(timezone.utc) return date + delta -def datetime_to_header(dt): +def datetime_to_header(dt: datetime) -> str: return formatdate(calendar.timegm(dt.timetuple())) -class BaseHeuristic(object): - - def warning(self, response): +class BaseHeuristic: + def warning(self, response: HTTPResponse) -> str | None: """ Return a valid 1xx warning header value describing the cache adjustments. @@ -34,7 +36,7 @@ def warning(self, response): """ return '110 - "Response is Stale"' - def update_headers(self, response): + def update_headers(self, response: HTTPResponse) -> dict[str, str]: """Update the response headers with any new headers. NOTE: This SHOULD always include some Warning header to @@ -43,7 +45,7 @@ def update_headers(self, response): """ return {} - def apply(self, response): + def apply(self, response: HTTPResponse) -> HTTPResponse: updated_headers = self.update_headers(response) if updated_headers: @@ -61,12 +63,12 @@ class OneDayCache(BaseHeuristic): future. """ - def update_headers(self, response): + def update_headers(self, response: HTTPResponse) -> dict[str, str]: headers = {} if "expires" not in response.headers: date = parsedate(response.headers["date"]) - expires = expire_after(timedelta(days=1), date=datetime(*date[:6])) + expires = expire_after(timedelta(days=1), date=datetime(*date[:6], tzinfo=timezone.utc)) # type: ignore[misc] headers["expires"] = datetime_to_header(expires) headers["cache-control"] = "public" return headers @@ -77,14 +79,14 @@ class ExpiresAfter(BaseHeuristic): Cache **all** requests for a defined time period. """ - def __init__(self, **kw): + def __init__(self, **kw: Any) -> None: self.delta = timedelta(**kw) - def update_headers(self, response): + def update_headers(self, response: HTTPResponse) -> dict[str, str]: expires = expire_after(self.delta) return {"expires": datetime_to_header(expires), "cache-control": "public"} - def warning(self, response): + def warning(self, response: HTTPResponse) -> str | None: tmpl = "110 - Automatically cached for %s. Response might be stale" return tmpl % self.delta @@ -101,12 +103,23 @@ class LastModified(BaseHeuristic): http://lxr.mozilla.org/mozilla-release/source/netwerk/protocol/http/nsHttpResponseHead.cpp#397 Unlike mozilla we limit this to 24-hr. """ + cacheable_by_default_statuses = { - 200, 203, 204, 206, 300, 301, 404, 405, 410, 414, 501 + 200, + 203, + 204, + 206, + 300, + 301, + 404, + 405, + 410, + 414, + 501, } - def update_headers(self, resp): - headers = resp.headers + def update_headers(self, resp: HTTPResponse) -> dict[str, str]: + headers: Mapping[str, str] = resp.headers if "expires" in headers: return {} @@ -120,9 +133,11 @@ def update_headers(self, resp): if "date" not in headers or "last-modified" not in headers: return {} - date = calendar.timegm(parsedate_tz(headers["date"])) + time_tuple = parsedate_tz(headers["date"]) + assert time_tuple is not None + date = calendar.timegm(time_tuple[:6]) last_modified = parsedate(headers["last-modified"]) - if date is None or last_modified is None: + if last_modified is None: return {} now = time.time() @@ -135,5 +150,5 @@ def update_headers(self, resp): expires = date + freshness_lifetime return {"expires": time.strftime(TIME_FMT, time.gmtime(expires))} - def warning(self, resp): + def warning(self, resp: HTTPResponse) -> str | None: return None diff --git a/src/pip/_vendor/cachecontrol/py.typed b/src/pip/_vendor/cachecontrol/py.typed new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/pip/_vendor/cachecontrol/serialize.py b/src/pip/_vendor/cachecontrol/serialize.py index 7fe1a3e33a3..f9e967c3c34 100644 --- a/src/pip/_vendor/cachecontrol/serialize.py +++ b/src/pip/_vendor/cachecontrol/serialize.py @@ -1,78 +1,76 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations -import base64 import io -import json -import zlib +from typing import IO, TYPE_CHECKING, Any, Mapping, cast from pip._vendor import msgpack from pip._vendor.requests.structures import CaseInsensitiveDict +from pip._vendor.urllib3 import HTTPResponse -from .compat import HTTPResponse, pickle, text_type +if TYPE_CHECKING: + from pip._vendor.requests import PreparedRequest -def _b64_decode_bytes(b): - return base64.b64decode(b.encode("ascii")) +class Serializer: + serde_version = "4" - -def _b64_decode_str(s): - return _b64_decode_bytes(s).decode("utf8") - - -_default_body_read = object() - - -class Serializer(object): - def dumps(self, request, response, body=None): - response_headers = CaseInsensitiveDict(response.headers) + def dumps( + self, + request: PreparedRequest, + response: HTTPResponse, + body: bytes | None = None, + ) -> bytes: + response_headers: CaseInsensitiveDict[str] = CaseInsensitiveDict( + response.headers + ) if body is None: # When a body isn't passed in, we'll read the response. We # also update the response with a new file handler to be # sure it acts as though it was never read. body = response.read(decode_content=False) - response._fp = io.BytesIO(body) - - # NOTE: This is all a bit weird, but it's really important that on - # Python 2.x these objects are unicode and not str, even when - # they contain only ascii. The problem here is that msgpack - # understands the difference between unicode and bytes and we - # have it set to differentiate between them, however Python 2 - # doesn't know the difference. Forcing these to unicode will be - # enough to have msgpack know the difference. + response._fp = io.BytesIO(body) # type: ignore[attr-defined] + response.length_remaining = len(body) + data = { - u"response": { - u"body": body, # Empty bytestring if body is stored separately - u"headers": dict( - (text_type(k), text_type(v)) for k, v in response.headers.items() - ), - u"status": response.status, - u"version": response.version, - u"reason": text_type(response.reason), - u"strict": response.strict, - u"decode_content": response.decode_content, + "response": { + "body": body, # Empty bytestring if body is stored separately + "headers": {str(k): str(v) for k, v in response.headers.items()}, # type: ignore[no-untyped-call] + "status": response.status, + "version": response.version, + "reason": str(response.reason), + "decode_content": response.decode_content, } } # Construct our vary headers - data[u"vary"] = {} - if u"vary" in response_headers: - varied_headers = response_headers[u"vary"].split(",") + data["vary"] = {} + if "vary" in response_headers: + varied_headers = response_headers["vary"].split(",") for header in varied_headers: - header = text_type(header).strip() + header = str(header).strip() header_value = request.headers.get(header, None) if header_value is not None: - header_value = text_type(header_value) - data[u"vary"][header] = header_value + header_value = str(header_value) + data["vary"][header] = header_value + + return b",".join([f"cc={self.serde_version}".encode(), self.serialize(data)]) - return b",".join([b"cc=4", msgpack.dumps(data, use_bin_type=True)]) + def serialize(self, data: dict[str, Any]) -> bytes: + return cast(bytes, msgpack.dumps(data, use_bin_type=True)) - def loads(self, request, data, body_file=None): + def loads( + self, + request: PreparedRequest, + data: bytes, + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: # Short circuit if we've been given an empty set of data if not data: - return + return None # Determine what version of the serializer the data was serialized # with @@ -88,18 +86,23 @@ def loads(self, request, data, body_file=None): ver = b"cc=0" # Get the version number out of the cc=N - ver = ver.split(b"=", 1)[-1].decode("ascii") + verstr = ver.split(b"=", 1)[-1].decode("ascii") # Dispatch to the actual load method for the given version try: - return getattr(self, "_loads_v{}".format(ver))(request, data, body_file) + return getattr(self, f"_loads_v{verstr}")(request, data, body_file) # type: ignore[no-any-return] except AttributeError: # This is a version we don't have a loads function for, so we'll # just treat it as a miss and return None - return - - def prepare_response(self, request, cached, body_file=None): + return None + + def prepare_response( + self, + request: PreparedRequest, + cached: Mapping[str, Any], + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: """Verify our vary headers match and construct a real urllib3 HTTPResponse object. """ @@ -108,23 +111,26 @@ def prepare_response(self, request, cached, body_file=None): # This case is also handled in the controller code when creating # a cache entry, but is left here for backwards compatibility. if "*" in cached.get("vary", {}): - return + return None # Ensure that the Vary headers for the cached response match our # request for header, value in cached.get("vary", {}).items(): if request.headers.get(header, None) != value: - return + return None body_raw = cached["response"].pop("body") - headers = CaseInsensitiveDict(data=cached["response"]["headers"]) + headers: CaseInsensitiveDict[str] = CaseInsensitiveDict( + data=cached["response"]["headers"] + ) if headers.get("transfer-encoding", "") == "chunked": headers.pop("transfer-encoding") cached["response"]["headers"] = headers try: + body: IO[bytes] if body_file is None: body = io.BytesIO(body_raw) else: @@ -138,53 +144,63 @@ def prepare_response(self, request, cached, body_file=None): # TypeError: 'str' does not support the buffer interface body = io.BytesIO(body_raw.encode("utf8")) + # Discard any `strict` parameter serialized by older version of cachecontrol. + cached["response"].pop("strict", None) + return HTTPResponse(body=body, preload_content=False, **cached["response"]) - def _loads_v0(self, request, data, body_file=None): + def _loads_v0( + self, + request: PreparedRequest, + data: bytes, + body_file: IO[bytes] | None = None, + ) -> None: # The original legacy cache data. This doesn't contain enough # information to construct everything we need, so we'll treat this as # a miss. - return - - def _loads_v1(self, request, data, body_file=None): - try: - cached = pickle.loads(data) - except ValueError: - return - - return self.prepare_response(request, cached, body_file) - - def _loads_v2(self, request, data, body_file=None): - assert body_file is None - try: - cached = json.loads(zlib.decompress(data).decode("utf8")) - except (ValueError, zlib.error): - return - - # We need to decode the items that we've base64 encoded - cached["response"]["body"] = _b64_decode_bytes(cached["response"]["body"]) - cached["response"]["headers"] = dict( - (_b64_decode_str(k), _b64_decode_str(v)) - for k, v in cached["response"]["headers"].items() - ) - cached["response"]["reason"] = _b64_decode_str(cached["response"]["reason"]) - cached["vary"] = dict( - (_b64_decode_str(k), _b64_decode_str(v) if v is not None else v) - for k, v in cached["vary"].items() - ) - - return self.prepare_response(request, cached, body_file) - - def _loads_v3(self, request, data, body_file): + return None + + def _loads_v1( + self, + request: PreparedRequest, + data: bytes, + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: + # The "v1" pickled cache format. This is no longer supported + # for security reasons, so we treat it as a miss. + return None + + def _loads_v2( + self, + request: PreparedRequest, + data: bytes, + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: + # The "v2" compressed base64 cache format. + # This has been removed due to age and poor size/performance + # characteristics, so we treat it as a miss. + return None + + def _loads_v3( + self, + request: PreparedRequest, + data: bytes, + body_file: IO[bytes] | None = None, + ) -> None: # Due to Python 2 encoding issues, it's impossible to know for sure # exactly how to load v3 entries, thus we'll treat these as a miss so # that they get rewritten out as v4 entries. - return - - def _loads_v4(self, request, data, body_file=None): + return None + + def _loads_v4( + self, + request: PreparedRequest, + data: bytes, + body_file: IO[bytes] | None = None, + ) -> HTTPResponse | None: try: cached = msgpack.loads(data, raw=False) except ValueError: - return + return None return self.prepare_response(request, cached, body_file) diff --git a/src/pip/_vendor/cachecontrol/wrapper.py b/src/pip/_vendor/cachecontrol/wrapper.py index b6ee7f20398..f618bc363f1 100644 --- a/src/pip/_vendor/cachecontrol/wrapper.py +++ b/src/pip/_vendor/cachecontrol/wrapper.py @@ -1,22 +1,32 @@ # SPDX-FileCopyrightText: 2015 Eric Larson # # SPDX-License-Identifier: Apache-2.0 +from __future__ import annotations -from .adapter import CacheControlAdapter -from .cache import DictCache +from typing import TYPE_CHECKING, Collection +from pip._vendor.cachecontrol.adapter import CacheControlAdapter +from pip._vendor.cachecontrol.cache import DictCache -def CacheControl( - sess, - cache=None, - cache_etags=True, - serializer=None, - heuristic=None, - controller_class=None, - adapter_class=None, - cacheable_methods=None, -): +if TYPE_CHECKING: + from pip._vendor import requests + + from pip._vendor.cachecontrol.cache import BaseCache + from pip._vendor.cachecontrol.controller import CacheController + from pip._vendor.cachecontrol.heuristics import BaseHeuristic + from pip._vendor.cachecontrol.serialize import Serializer + +def CacheControl( + sess: requests.Session, + cache: BaseCache | None = None, + cache_etags: bool = True, + serializer: Serializer | None = None, + heuristic: BaseHeuristic | None = None, + controller_class: type[CacheController] | None = None, + adapter_class: type[CacheControlAdapter] | None = None, + cacheable_methods: Collection[str] | None = None, +) -> requests.Session: cache = DictCache() if cache is None else cache adapter_class = adapter_class or CacheControlAdapter adapter = adapter_class( diff --git a/src/pip/_vendor/certifi/__init__.py b/src/pip/_vendor/certifi/__init__.py index a3546f12555..8ce89cef706 100644 --- a/src/pip/_vendor/certifi/__init__.py +++ b/src/pip/_vendor/certifi/__init__.py @@ -1,4 +1,4 @@ from .core import contents, where __all__ = ["contents", "where"] -__version__ = "2022.12.07" +__version__ = "2023.07.22" diff --git a/src/pip/_vendor/certifi/cacert.pem b/src/pip/_vendor/certifi/cacert.pem index df9e4e3c755..02123695d01 100644 --- a/src/pip/_vendor/certifi/cacert.pem +++ b/src/pip/_vendor/certifi/cacert.pem @@ -791,34 +791,6 @@ uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2 XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E= -----END CERTIFICATE----- -# Issuer: CN=Hongkong Post Root CA 1 O=Hongkong Post -# Subject: CN=Hongkong Post Root CA 1 O=Hongkong Post -# Label: "Hongkong Post Root CA 1" -# Serial: 1000 -# MD5 Fingerprint: a8:0d:6f:39:78:b9:43:6d:77:42:6d:98:5a:cc:23:ca -# SHA1 Fingerprint: d6:da:a8:20:8d:09:d2:15:4d:24:b5:2f:cb:34:6e:b2:58:b2:8a:58 -# SHA256 Fingerprint: f9:e6:7d:33:6c:51:00:2a:c0:54:c6:32:02:2d:66:dd:a2:e7:e3:ff:f1:0a:d0:61:ed:31:d8:bb:b4:10:cf:b2 ------BEGIN CERTIFICATE----- -MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx -FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg -Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG -A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr -b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ -jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn -PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh -ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9 -nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h -q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED -MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC -mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3 -7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB -oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs -EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO -fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi -AmvZWg== ------END CERTIFICATE----- - # Issuer: CN=SecureSign RootCA11 O=Japan Certification Services, Inc. # Subject: CN=SecureSign RootCA11 O=Japan Certification Services, Inc. # Label: "SecureSign RootCA11" @@ -1676,50 +1648,6 @@ HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY= -----END CERTIFICATE----- -# Issuer: CN=E-Tugra Certification Authority O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e. OU=E-Tugra Sertifikasyon Merkezi -# Subject: CN=E-Tugra Certification Authority O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e. OU=E-Tugra Sertifikasyon Merkezi -# Label: "E-Tugra Certification Authority" -# Serial: 7667447206703254355 -# MD5 Fingerprint: b8:a1:03:63:b0:bd:21:71:70:8a:6f:13:3a:bb:79:49 -# SHA1 Fingerprint: 51:c6:e7:08:49:06:6e:f3:92:d4:5c:a0:0d:6d:a3:62:8f:c3:52:39 -# SHA256 Fingerprint: b0:bf:d5:2b:b0:d7:d9:bd:92:bf:5d:4d:c1:3d:a2:55:c0:2c:54:2f:37:83:65:ea:89:39:11:f5:5e:55:f2:3c ------BEGIN CERTIFICATE----- -MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNV -BAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBC -aWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNV -BAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQDDB9FLVR1 -Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMwNTEyMDk0OFoXDTIz -MDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+ -BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhp -em1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN -ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5 -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4vU/kwVRHoViVF56C/UY -B4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vdhQd2h8y/L5VMzH2nPbxH -D5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5KCKpbknSF -Q9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEo -q1+gElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3D -k14opz8n8Y4e0ypQBaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcH -fC425lAcP9tDJMW/hkd5s3kc91r0E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsut -dEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gzrt48Ue7LE3wBf4QOXVGUnhMM -ti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAqjqFGOjGY5RH8 -zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn -rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUX -U8u3Zg5mTPj5dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6 -Jyr+zE7S6E5UMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5 -XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAF -Nzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAKkEh47U6YA5n+KGCR -HTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jOXKqY -GwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c -77NCR807VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3 -+GbHeJAAFS6LrVE1Uweoa2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WK -vJUawSg5TB9D0pH0clmKuVb8P7Sd2nCcdlqMQ1DujjByTd//SffGqWfZbawCEeI6 -FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEVKV0jq9BgoRJP3vQXzTLl -yb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gTDx4JnW2P -AJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpD -y4Q08ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8d -NL/+I5c30jn6PQ0GC7TbO6Orb1wdtn7os4I07QZcJA== ------END CERTIFICATE----- - # Issuer: CN=T-TeleSec GlobalRoot Class 2 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center # Subject: CN=T-TeleSec GlobalRoot Class 2 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center # Label: "T-TeleSec GlobalRoot Class 2" @@ -4397,73 +4325,6 @@ ut6Dacpps6kFtZaSF4fC0urQe87YQVt8rgIwRt7qy12a7DLCZRawTDBcMPPaTnOG BtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR -----END CERTIFICATE----- -# Issuer: CN=E-Tugra Global Root CA RSA v3 O=E-Tugra EBG A.S. OU=E-Tugra Trust Center -# Subject: CN=E-Tugra Global Root CA RSA v3 O=E-Tugra EBG A.S. OU=E-Tugra Trust Center -# Label: "E-Tugra Global Root CA RSA v3" -# Serial: 75951268308633135324246244059508261641472512052 -# MD5 Fingerprint: 22:be:10:f6:c2:f8:03:88:73:5f:33:29:47:28:47:a4 -# SHA1 Fingerprint: e9:a8:5d:22:14:52:1c:5b:aa:0a:b4:be:24:6a:23:8a:c9:ba:e2:a9 -# SHA256 Fingerprint: ef:66:b0:b1:0a:3c:db:9f:2e:36:48:c7:6b:d2:af:18:ea:d2:bf:e6:f1:17:65:5e:28:c4:06:0d:a1:a3:f4:c2 ------BEGIN CERTIFICATE----- -MIIF8zCCA9ugAwIBAgIUDU3FzRYilZYIfrgLfxUGNPt5EDQwDQYJKoZIhvcNAQEL -BQAwgYAxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUt -VHVncmEgRUJHIEEuUy4xHTAbBgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYw -JAYDVQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENBIFJTQSB2MzAeFw0yMDAzMTgw -OTA3MTdaFw00NTAzMTIwOTA3MTdaMIGAMQswCQYDVQQGEwJUUjEPMA0GA1UEBxMG -QW5rYXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1 -Z3JhIFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBD -QSBSU0EgdjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCiZvCJt3J7 -7gnJY9LTQ91ew6aEOErxjYG7FL1H6EAX8z3DeEVypi6Q3po61CBxyryfHUuXCscx -uj7X/iWpKo429NEvx7epXTPcMHD4QGxLsqYxYdE0PD0xesevxKenhOGXpOhL9hd8 -7jwH7eKKV9y2+/hDJVDqJ4GohryPUkqWOmAalrv9c/SF/YP9f4RtNGx/ardLAQO/ -rWm31zLZ9Vdq6YaCPqVmMbMWPcLzJmAy01IesGykNz709a/r4d+ABs8qQedmCeFL -l+d3vSFtKbZnwy1+7dZ5ZdHPOrbRsV5WYVB6Ws5OUDGAA5hH5+QYfERaxqSzO8bG -wzrwbMOLyKSRBfP12baqBqG3q+Sx6iEUXIOk/P+2UNOMEiaZdnDpwA+mdPy70Bt4 -znKS4iicvObpCdg604nmvi533wEKb5b25Y08TVJ2Glbhc34XrD2tbKNSEhhw5oBO -M/J+JjKsBY04pOZ2PJ8QaQ5tndLBeSBrW88zjdGUdjXnXVXHt6woq0bM5zshtQoK -5EpZ3IE1S0SVEgpnpaH/WwAH0sDM+T/8nzPyAPiMbIedBi3x7+PmBvrFZhNb/FAH -nnGGstpvdDDPk1Po3CLW3iAfYY2jLqN4MpBs3KwytQXk9TwzDdbgh3cXTJ2w2Amo -DVf3RIXwyAS+XF1a4xeOVGNpf0l0ZAWMowIDAQABo2MwYTAPBgNVHRMBAf8EBTAD -AQH/MB8GA1UdIwQYMBaAFLK0ruYt9ybVqnUtdkvAG1Mh0EjvMB0GA1UdDgQWBBSy -tK7mLfcm1ap1LXZLwBtTIdBI7zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEL -BQADggIBAImocn+M684uGMQQgC0QDP/7FM0E4BQ8Tpr7nym/Ip5XuYJzEmMmtcyQ -6dIqKe6cLcwsmb5FJ+Sxce3kOJUxQfJ9emN438o2Fi+CiJ+8EUdPdk3ILY7r3y18 -Tjvarvbj2l0Upq7ohUSdBm6O++96SmotKygY/r+QLHUWnw/qln0F7psTpURs+APQ -3SPh/QMSEgj0GDSz4DcLdxEBSL9htLX4GdnLTeqjjO/98Aa1bZL0SmFQhO3sSdPk -vmjmLuMxC1QLGpLWgti2omU8ZgT5Vdps+9u1FGZNlIM7zR6mK7L+d0CGq+ffCsn9 -9t2HVhjYsCxVYJb6CH5SkPVLpi6HfMsg2wY+oF0Dd32iPBMbKaITVaA9FCKvb7jQ -mhty3QUBjYZgv6Rn7rWlDdF/5horYmbDB7rnoEgcOMPpRfunf/ztAmgayncSd6YA -VSgU7NbHEqIbZULpkejLPoeJVF3Zr52XnGnnCv8PWniLYypMfUeUP95L6VPQMPHF -9p5J3zugkaOj/s1YzOrfr28oO6Bpm4/srK4rVJ2bBLFHIK+WEj5jlB0E5y67hscM -moi/dkfv97ALl2bSRM9gUgfh1SxKOidhd8rXj+eHDjD/DLsE4mHDosiXYY60MGo8 -bcIHX0pzLz/5FooBZu+6kcpSV3uu1OYP3Qt6f4ueJiDPO++BcYNZ ------END CERTIFICATE----- - -# Issuer: CN=E-Tugra Global Root CA ECC v3 O=E-Tugra EBG A.S. OU=E-Tugra Trust Center -# Subject: CN=E-Tugra Global Root CA ECC v3 O=E-Tugra EBG A.S. OU=E-Tugra Trust Center -# Label: "E-Tugra Global Root CA ECC v3" -# Serial: 218504919822255052842371958738296604628416471745 -# MD5 Fingerprint: 46:bc:81:bb:f1:b5:1e:f7:4b:96:bc:14:e2:e7:27:64 -# SHA1 Fingerprint: 8a:2f:af:57:53:b1:b0:e6:a1:04:ec:5b:6a:69:71:6d:f6:1c:e2:84 -# SHA256 Fingerprint: 87:3f:46:85:fa:7f:56:36:25:25:2e:6d:36:bc:d7:f1:6f:c2:49:51:f2:64:e4:7e:1b:95:4f:49:08:cd:ca:13 ------BEGIN CERTIFICATE----- -MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMw -gYAxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVn -cmEgRUJHIEEuUy4xHTAbBgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYD -VQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENBIEVDQyB2MzAeFw0yMDAzMTgwOTQ2 -NThaFw00NTAzMTIwOTQ2NThaMIGAMQswCQYDVQQGEwJUUjEPMA0GA1UEBxMGQW5r -YXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1Z3Jh -IFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBF -Q0MgdjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASOmCm/xxAeJ9urA8woLNheSBkQ -KczLWYHMjLiSF4mDKpL2w6QdTGLVn9agRtwcvHbB40fQWxPa56WzZkjnIZpKT4YK -fWzqTTKACrJ6CZtpS5iB4i7sAnCWH/31Rs7K3IKjYzBhMA8GA1UdEwEB/wQFMAMB -Af8wHwYDVR0jBBgwFoAU/4Ixcj75xGZsrTie0bBRiKWQzPUwHQYDVR0OBBYEFP+C -MXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNp -ADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/6 -7W4WAie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFx -vmjkI6TZraE3 ------END CERTIFICATE----- - # Issuer: CN=Security Communication RootCA3 O=SECOM Trust Systems CO.,LTD. # Subject: CN=Security Communication RootCA3 O=SECOM Trust Systems CO.,LTD. # Label: "Security Communication RootCA3" @@ -4525,3 +4386,250 @@ BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu 9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3LsnNdo4gIxwwCMQDAqy0O be0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70eN9k= -----END CERTIFICATE----- + +# Issuer: CN=BJCA Global Root CA1 O=BEIJING CERTIFICATE AUTHORITY +# Subject: CN=BJCA Global Root CA1 O=BEIJING CERTIFICATE AUTHORITY +# Label: "BJCA Global Root CA1" +# Serial: 113562791157148395269083148143378328608 +# MD5 Fingerprint: 42:32:99:76:43:33:36:24:35:07:82:9b:28:f9:d0:90 +# SHA1 Fingerprint: d5:ec:8d:7b:4c:ba:79:f4:e7:e8:cb:9d:6b:ae:77:83:10:03:21:6a +# SHA256 Fingerprint: f3:89:6f:88:fe:7c:0a:88:27:66:a7:fa:6a:d2:74:9f:b5:7a:7f:3e:98:fb:76:9c:1f:a7:b0:9c:2c:44:d5:ae +-----BEGIN CERTIFICATE----- +MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBU +MQswCQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRI +T1JJVFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAz +MTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJF +SUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2Jh +bCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFmCL3Z +xRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZ +spDyRhySsTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O5 +58dnJCNPYwpj9mZ9S1WnP3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgR +at7GGPZHOiJBhyL8xIkoVNiMpTAK+BcWyqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll +5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRjeulumijWML3mG90Vr4Tq +nMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNnMoH1V6XK +V0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/ +pj+bOT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZO +z2nxbkRs1CTqjSShGL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXn +jSXWgXSHRtQpdaJCbPdzied9v3pKH9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+ +WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMBAAGjQjBAMB0GA1UdDgQWBBTF +7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4 +YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3Kli +awLwQ8hOnThJdMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u ++2D2/VnGKhs/I0qUJDAnyIm860Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88 +X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuhTaRjAv04l5U/BXCga99igUOLtFkN +SoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW4AB+dAb/OMRyHdOo +P2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmpGQrI ++pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRz +znfSxqxx4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9 +eVzYH6Eze9mCUAyTF6ps3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2 +YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4SSPfSKcOYKMryMguTjClPPGAyzQWWYezy +r/6zcCwupvI= +-----END CERTIFICATE----- + +# Issuer: CN=BJCA Global Root CA2 O=BEIJING CERTIFICATE AUTHORITY +# Subject: CN=BJCA Global Root CA2 O=BEIJING CERTIFICATE AUTHORITY +# Label: "BJCA Global Root CA2" +# Serial: 58605626836079930195615843123109055211 +# MD5 Fingerprint: 5e:0a:f6:47:5f:a6:14:e8:11:01:95:3f:4d:01:eb:3c +# SHA1 Fingerprint: f4:27:86:eb:6e:b8:6d:88:31:67:02:fb:ba:66:a4:53:00:aa:7a:a6 +# SHA256 Fingerprint: 57:4d:f6:93:1e:27:80:39:66:7b:72:0a:fd:c1:60:0f:c2:7e:b6:6d:d3:09:29:79:fb:73:85:64:87:21:28:82 +-----BEGIN CERTIFICATE----- +MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQsw +CQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJ +VFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgy +MVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJ +TkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2JhbCBS +b290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jlSR9B +IgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK+ ++kpRuDCK/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJK +sVF/BvDRgh9Obl+rg/xI1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD +AgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA +94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8gUXOQwKhbYdDFUDn9hf7B +43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w== +-----END CERTIFICATE----- + +# Issuer: CN=Sectigo Public Server Authentication Root E46 O=Sectigo Limited +# Subject: CN=Sectigo Public Server Authentication Root E46 O=Sectigo Limited +# Label: "Sectigo Public Server Authentication Root E46" +# Serial: 88989738453351742415770396670917916916 +# MD5 Fingerprint: 28:23:f8:b2:98:5c:37:16:3b:3e:46:13:4e:b0:b3:01 +# SHA1 Fingerprint: ec:8a:39:6c:40:f0:2e:bc:42:75:d4:9f:ab:1c:1a:5b:67:be:d2:9a +# SHA256 Fingerprint: c9:0f:26:f0:fb:1b:40:18:b2:22:27:51:9b:5c:a2:b5:3e:2c:a5:b3:be:5c:f1:8e:fe:1b:ef:47:38:0c:53:83 +-----BEGIN CERTIFICATE----- +MIICOjCCAcGgAwIBAgIQQvLM2htpN0RfFf51KBC49DAKBggqhkjOPQQDAzBfMQsw +CQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1T +ZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwHhcN +MjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBfMQswCQYDVQQGEwJHQjEYMBYG +A1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBT +ZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAAR2+pmpbiDt+dd34wc7qNs9Xzjoq1WmVk/WSOrsfy2qw7LFeeyZYX8QeccC +WvkEN/U0NSt3zn8gj1KjAIns1aeibVvjS5KToID1AZTc8GgHHs3u/iVStSBDHBv+ +6xnOQ6OjQjBAMB0GA1UdDgQWBBTRItpMWfFLXyY4qp3W7usNw/upYTAOBgNVHQ8B +Af8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNnADBkAjAn7qRa +qCG76UeXlImldCBteU/IvZNeWBj7LRoAasm4PdCkT0RHlAFWovgzJQxC36oCMB3q +4S6ILuH5px0CMk7yn2xVdOOurvulGu7t0vzCAxHrRVxgED1cf5kDW21USAGKcw== +-----END CERTIFICATE----- + +# Issuer: CN=Sectigo Public Server Authentication Root R46 O=Sectigo Limited +# Subject: CN=Sectigo Public Server Authentication Root R46 O=Sectigo Limited +# Label: "Sectigo Public Server Authentication Root R46" +# Serial: 156256931880233212765902055439220583700 +# MD5 Fingerprint: 32:10:09:52:00:d5:7e:6c:43:df:15:c0:b1:16:93:e5 +# SHA1 Fingerprint: ad:98:f9:f3:e4:7d:75:3b:65:d4:82:b3:a4:52:17:bb:6e:f5:e4:38 +# SHA256 Fingerprint: 7b:b6:47:a6:2a:ee:ac:88:bf:25:7a:a5:22:d0:1f:fe:a3:95:e0:ab:45:c7:3f:93:f6:56:54:ec:38:f2:5a:06 +-----BEGIN CERTIFICATE----- +MIIFijCCA3KgAwIBAgIQdY39i658BwD6qSWn4cetFDANBgkqhkiG9w0BAQwFADBf +MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQD +Ey1TZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYw +HhcNMjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBfMQswCQYDVQQGEwJHQjEY +MBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1Ymxp +YyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQCTvtU2UnXYASOgHEdCSe5jtrch/cSV1UgrJnwUUxDa +ef0rty2k1Cz66jLdScK5vQ9IPXtamFSvnl0xdE8H/FAh3aTPaE8bEmNtJZlMKpnz +SDBh+oF8HqcIStw+KxwfGExxqjWMrfhu6DtK2eWUAtaJhBOqbchPM8xQljeSM9xf +iOefVNlI8JhD1mb9nxc4Q8UBUQvX4yMPFF1bFOdLvt30yNoDN9HWOaEhUTCDsG3X +ME6WW5HwcCSrv0WBZEMNvSE6Lzzpng3LILVCJ8zab5vuZDCQOc2TZYEhMbUjUDM3 +IuM47fgxMMxF/mL50V0yeUKH32rMVhlATc6qu/m1dkmU8Sf4kaWD5QazYw6A3OAS +VYCmO2a0OYctyPDQ0RTp5A1NDvZdV3LFOxxHVp3i1fuBYYzMTYCQNFu31xR13NgE +SJ/AwSiItOkcyqex8Va3e0lMWeUgFaiEAin6OJRpmkkGj80feRQXEgyDet4fsZfu ++Zd4KKTIRJLpfSYFplhym3kT2BFfrsU4YjRosoYwjviQYZ4ybPUHNs2iTG7sijbt +8uaZFURww3y8nDnAtOFr94MlI1fZEoDlSfB1D++N6xybVCi0ITz8fAr/73trdf+L +HaAZBav6+CuBQug4urv7qv094PPK306Xlynt8xhW6aWWrL3DkJiy4Pmi1KZHQ3xt +zwIDAQABo0IwQDAdBgNVHQ4EFgQUVnNYZJX5khqwEioEYnmhQBWIIUkwDgYDVR0P +AQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAC9c +mTz8Bl6MlC5w6tIyMY208FHVvArzZJ8HXtXBc2hkeqK5Duj5XYUtqDdFqij0lgVQ +YKlJfp/imTYpE0RHap1VIDzYm/EDMrraQKFz6oOht0SmDpkBm+S8f74TlH7Kph52 +gDY9hAaLMyZlbcp+nv4fjFg4exqDsQ+8FxG75gbMY/qB8oFM2gsQa6H61SilzwZA +Fv97fRheORKkU55+MkIQpiGRqRxOF3yEvJ+M0ejf5lG5Nkc/kLnHvALcWxxPDkjB +JYOcCj+esQMzEhonrPcibCTRAUH4WAP+JWgiH5paPHxsnnVI84HxZmduTILA7rpX +DhjvLpr3Etiga+kFpaHpaPi8TD8SHkXoUsCjvxInebnMMTzD9joiFgOgyY9mpFui +TdaBJQbpdqQACj7LzTWb4OE4y2BThihCQRxEV+ioratF4yUQvNs+ZUH7G6aXD+u5 +dHn5HrwdVw1Hr8Mvn4dGp+smWg9WY7ViYG4A++MnESLn/pmPNPW56MORcr3Ywx65 +LvKRRFHQV80MNNVIIb/bE/FmJUNS0nAiNs2fxBx1IK1jcmMGDw4nztJqDby1ORrp +0XZ60Vzk50lJLVU3aPAaOpg+VBeHVOmmJ1CJeyAvP/+/oYtKR5j/K3tJPsMpRmAY +QqszKbrAKbkTidOIijlBO8n9pu0f9GBj39ItVQGL +-----END CERTIFICATE----- + +# Issuer: CN=SSL.com TLS RSA Root CA 2022 O=SSL Corporation +# Subject: CN=SSL.com TLS RSA Root CA 2022 O=SSL Corporation +# Label: "SSL.com TLS RSA Root CA 2022" +# Serial: 148535279242832292258835760425842727825 +# MD5 Fingerprint: d8:4e:c6:59:30:d8:fe:a0:d6:7a:5a:2c:2c:69:78:da +# SHA1 Fingerprint: ec:2c:83:40:72:af:26:95:10:ff:0e:f2:03:ee:31:70:f6:78:9d:ca +# SHA256 Fingerprint: 8f:af:7d:2e:2c:b4:70:9b:b8:e0:b3:36:66:bf:75:a5:dd:45:b5:de:48:0f:8e:a8:d4:bf:e6:be:bc:17:f2:ed +-----BEGIN CERTIFICATE----- +MIIFiTCCA3GgAwIBAgIQb77arXO9CEDii02+1PdbkTANBgkqhkiG9w0BAQsFADBO +MQswCQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQD +DBxTU0wuY29tIFRMUyBSU0EgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzQyMloX +DTQ2MDgxOTE2MzQyMVowTjELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBDb3Jw +b3JhdGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgUlNBIFJvb3QgQ0EgMjAyMjCC +AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANCkCXJPQIgSYT41I57u9nTP +L3tYPc48DRAokC+X94xI2KDYJbFMsBFMF3NQ0CJKY7uB0ylu1bUJPiYYf7ISf5OY +t6/wNr/y7hienDtSxUcZXXTzZGbVXcdotL8bHAajvI9AI7YexoS9UcQbOcGV0ins +S657Lb85/bRi3pZ7QcacoOAGcvvwB5cJOYF0r/c0WRFXCsJbwST0MXMwgsadugL3 +PnxEX4MN8/HdIGkWCVDi1FW24IBydm5MR7d1VVm0U3TZlMZBrViKMWYPHqIbKUBO +L9975hYsLfy/7PO0+r4Y9ptJ1O4Fbtk085zx7AGL0SDGD6C1vBdOSHtRwvzpXGk3 +R2azaPgVKPC506QVzFpPulJwoxJF3ca6TvvC0PeoUidtbnm1jPx7jMEWTO6Af77w +dr5BUxIzrlo4QqvXDz5BjXYHMtWrifZOZ9mxQnUjbvPNQrL8VfVThxc7wDNY8VLS ++YCk8OjwO4s4zKTGkH8PnP2L0aPP2oOnaclQNtVcBdIKQXTbYxE3waWglksejBYS +d66UNHsef8JmAOSqg+qKkK3ONkRN0VHpvB/zagX9wHQfJRlAUW7qglFA35u5CCoG +AtUjHBPW6dvbxrB6y3snm/vg1UYk7RBLY0ulBY+6uB0rpvqR4pJSvezrZ5dtmi2f +gTIFZzL7SAg/2SW4BCUvAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j +BBgwFoAU+y437uOEeicuzRk1sTN8/9REQrkwHQYDVR0OBBYEFPsuN+7jhHonLs0Z +NbEzfP/UREK5MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAjYlt +hEUY8U+zoO9opMAdrDC8Z2awms22qyIZZtM7QbUQnRC6cm4pJCAcAZli05bg4vsM +QtfhWsSWTVTNj8pDU/0quOr4ZcoBwq1gaAafORpR2eCNJvkLTqVTJXojpBzOCBvf +R4iyrT7gJ4eLSYwfqUdYe5byiB0YrrPRpgqU+tvT5TgKa3kSM/tKWTcWQA673vWJ +DPFs0/dRa1419dvAJuoSc06pkZCmF8NsLzjUo3KUQyxi4U5cMj29TH0ZR6LDSeeW +P4+a0zvkEdiLA9z2tmBVGKaBUfPhqBVq6+AL8BQx1rmMRTqoENjwuSfr98t67wVy +lrXEj5ZzxOhWc5y8aVFjvO9nHEMaX3cZHxj4HCUp+UmZKbaSPaKDN7EgkaibMOlq +bLQjk2UEqxHzDh1TJElTHaE/nUiSEeJ9DU/1172iWD54nR4fK/4huxoTtrEoZP2w +AgDHbICivRZQIA9ygV/MlP+7mea6kMvq+cYMwq7FGc4zoWtcu358NFcXrfA/rs3q +r5nsLFR+jM4uElZI7xc7P0peYNLcdDa8pUNjyw9bowJWCZ4kLOGGgYz+qxcs+sji +Mho6/4UIyYOf8kpIEFR3N+2ivEC+5BB09+Rbu7nzifmPQdjH5FCQNYA+HLhNkNPU +98OwoX6EyneSMSy4kLGCenROmxMmtNVQZlR4rmA= +-----END CERTIFICATE----- + +# Issuer: CN=SSL.com TLS ECC Root CA 2022 O=SSL Corporation +# Subject: CN=SSL.com TLS ECC Root CA 2022 O=SSL Corporation +# Label: "SSL.com TLS ECC Root CA 2022" +# Serial: 26605119622390491762507526719404364228 +# MD5 Fingerprint: 99:d7:5c:f1:51:36:cc:e9:ce:d9:19:2e:77:71:56:c5 +# SHA1 Fingerprint: 9f:5f:d9:1a:54:6d:f5:0c:71:f0:ee:7a:bd:17:49:98:84:73:e2:39 +# SHA256 Fingerprint: c3:2f:fd:9f:46:f9:36:d1:6c:36:73:99:09:59:43:4b:9a:d6:0a:af:bb:9e:7c:f3:36:54:f1:44:cc:1b:a1:43 +-----BEGIN CERTIFICATE----- +MIICOjCCAcCgAwIBAgIQFAP1q/s3ixdAW+JDsqXRxDAKBggqhkjOPQQDAzBOMQsw +CQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQDDBxT +U0wuY29tIFRMUyBFQ0MgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzM0OFoXDTQ2 +MDgxOTE2MzM0N1owTjELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBDb3Jwb3Jh +dGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgRUNDIFJvb3QgQ0EgMjAyMjB2MBAG +ByqGSM49AgEGBSuBBAAiA2IABEUpNXP6wrgjzhR9qLFNoFs27iosU8NgCTWyJGYm +acCzldZdkkAZDsalE3D07xJRKF3nzL35PIXBz5SQySvOkkJYWWf9lCcQZIxPBLFN +SeR7T5v15wj4A4j3p8OSSxlUgaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSME +GDAWgBSJjy+j6CugFFR781a4Jl9nOAuc0DAdBgNVHQ4EFgQUiY8vo+groBRUe/NW +uCZfZzgLnNAwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2gAMGUCMFXjIlbp +15IkWE8elDIPDAI2wv2sdDJO4fscgIijzPvX6yv/N33w7deedWo1dlJF4AIxAMeN +b0Igj762TVntd00pxCAgRWSGOlDGxK0tk/UYfXLtqc/ErFc2KAhl3zx5Zn6g6g== +-----END CERTIFICATE----- + +# Issuer: CN=Atos TrustedRoot Root CA ECC TLS 2021 O=Atos +# Subject: CN=Atos TrustedRoot Root CA ECC TLS 2021 O=Atos +# Label: "Atos TrustedRoot Root CA ECC TLS 2021" +# Serial: 81873346711060652204712539181482831616 +# MD5 Fingerprint: 16:9f:ad:f1:70:ad:79:d6:ed:29:b4:d1:c5:79:70:a8 +# SHA1 Fingerprint: 9e:bc:75:10:42:b3:02:f3:81:f4:f7:30:62:d4:8f:c3:a7:51:b2:dd +# SHA256 Fingerprint: b2:fa:e5:3e:14:cc:d7:ab:92:12:06:47:01:ae:27:9c:1d:89:88:fa:cb:77:5f:a8:a0:08:91:4e:66:39:88:a8 +-----BEGIN CERTIFICATE----- +MIICFTCCAZugAwIBAgIQPZg7pmY9kGP3fiZXOATvADAKBggqhkjOPQQDAzBMMS4w +LAYDVQQDDCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgRUNDIFRMUyAyMDIxMQ0w +CwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0yMTA0MjIwOTI2MjNaFw00MTA0 +MTcwOTI2MjJaMEwxLjAsBgNVBAMMJUF0b3MgVHJ1c3RlZFJvb3QgUm9vdCBDQSBF +Q0MgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRFMHYwEAYHKoZI +zj0CAQYFK4EEACIDYgAEloZYKDcKZ9Cg3iQZGeHkBQcfl+3oZIK59sRxUM6KDP/X +tXa7oWyTbIOiaG6l2b4siJVBzV3dscqDY4PMwL502eCdpO5KTlbgmClBk1IQ1SQ4 +AjJn8ZQSb+/Xxd4u/RmAo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR2 +KCXWfeBmmnoJsmo7jjPXNtNPojAOBgNVHQ8BAf8EBAMCAYYwCgYIKoZIzj0EAwMD +aAAwZQIwW5kp85wxtolrbNa9d+F851F+uDrNozZffPc8dz7kUK2o59JZDCaOMDtu +CCrCp1rIAjEAmeMM56PDr9NJLkaCI2ZdyQAUEv049OGYa3cpetskz2VAv9LcjBHo +9H1/IISpQuQo +-----END CERTIFICATE----- + +# Issuer: CN=Atos TrustedRoot Root CA RSA TLS 2021 O=Atos +# Subject: CN=Atos TrustedRoot Root CA RSA TLS 2021 O=Atos +# Label: "Atos TrustedRoot Root CA RSA TLS 2021" +# Serial: 111436099570196163832749341232207667876 +# MD5 Fingerprint: d4:d3:46:b8:9a:c0:9c:76:5d:9e:3a:c3:b9:99:31:d2 +# SHA1 Fingerprint: 18:52:3b:0d:06:37:e4:d6:3a:df:23:e4:98:fb:5b:16:fb:86:74:48 +# SHA256 Fingerprint: 81:a9:08:8e:a5:9f:b3:64:c5:48:a6:f8:55:59:09:9b:6f:04:05:ef:bf:18:e5:32:4e:c9:f4:57:ba:00:11:2f +-----BEGIN CERTIFICATE----- +MIIFZDCCA0ygAwIBAgIQU9XP5hmTC/srBRLYwiqipDANBgkqhkiG9w0BAQwFADBM +MS4wLAYDVQQDDCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgUlNBIFRMUyAyMDIx +MQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0yMTA0MjIwOTIxMTBaFw00 +MTA0MTcwOTIxMDlaMEwxLjAsBgNVBAMMJUF0b3MgVHJ1c3RlZFJvb3QgUm9vdCBD +QSBSU0EgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRFMIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtoAOxHm9BYx9sKOdTSJNy/BBl01Z +4NH+VoyX8te9j2y3I49f1cTYQcvyAh5x5en2XssIKl4w8i1mx4QbZFc4nXUtVsYv +Ye+W/CBGvevUez8/fEc4BKkbqlLfEzfTFRVOvV98r61jx3ncCHvVoOX3W3WsgFWZ +kmGbzSoXfduP9LVq6hdKZChmFSlsAvFr1bqjM9xaZ6cF4r9lthawEO3NUDPJcFDs +GY6wx/J0W2tExn2WuZgIWWbeKQGb9Cpt0xU6kGpn8bRrZtkh68rZYnxGEFzedUln +nkL5/nWpo63/dgpnQOPF943HhZpZnmKaau1Fh5hnstVKPNe0OwANwI8f4UDErmwh +3El+fsqyjW22v5MvoVw+j8rtgI5Y4dtXz4U2OLJxpAmMkokIiEjxQGMYsluMWuPD +0xeqqxmjLBvk1cbiZnrXghmmOxYsL3GHX0WelXOTwkKBIROW1527k2gV+p2kHYzy +geBYBr3JtuP2iV2J+axEoctr+hbxx1A9JNr3w+SH1VbxT5Aw+kUJWdo0zuATHAR8 +ANSbhqRAvNncTFd+rrcztl524WWLZt+NyteYr842mIycg5kDcPOvdO3GDjbnvezB +c6eUWsuSZIKmAMFwoW4sKeFYV+xafJlrJaSQOoD0IJ2azsct+bJLKZWD6TWNp0lI +pw9MGZHQ9b8Q4HECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU +dEmZ0f+0emhFdcN+tNzMzjkz2ggwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB +DAUAA4ICAQAjQ1MkYlxt/T7Cz1UAbMVWiLkO3TriJQ2VSpfKgInuKs1l+NsW4AmS +4BjHeJi78+xCUvuppILXTdiK/ORO/auQxDh1MoSf/7OwKwIzNsAQkG8dnK/haZPs +o0UvFJ/1TCplQ3IM98P4lYsU84UgYt1UU90s3BiVaU+DR3BAM1h3Egyi61IxHkzJ +qM7F78PRreBrAwA0JrRUITWXAdxfG/F851X6LWh3e9NpzNMOa7pNdkTWwhWaJuyw +xfW70Xp0wmzNxbVe9kzmWy2B27O3Opee7c9GslA9hGCZcbUztVdF5kJHdWoOsAgM +rr3e97sPWD2PAzHoPYJQyi9eDF20l74gNAf0xBLh7tew2VktafcxBPTy+av5EzH4 +AXcOPUIjJsyacmdRIXrMPIWo6iFqO9taPKU0nprALN+AnCng33eU0aKAQv9qTFsR +0PXNor6uzFFcw9VUewyu1rkGd4Di7wcaaMxZUa1+XGdrudviB0JbuAEFWDlN5LuY +o7Ey7Nmj1m+UI/87tyll5gfp77YZ6ufCOB0yiJA8EytuzO+rdwY0d4RPcuSBhPm5 +dDTedk+SKlOxJTnbPP/lPqYO5Wue/9vsL3SD3460s6neFE3/MaNFcyT6lSnMEpcE +oji2jbDwN/zIIX8/syQbPYtuzE2wFg2WHYMfRsCbvUOZ58SWLs5fyQ== +-----END CERTIFICATE----- diff --git a/src/pip/_vendor/pkg_resources/LICENSE b/src/pip/_vendor/pkg_resources/LICENSE index 353924be0e5..1bb5a44356f 100644 --- a/src/pip/_vendor/pkg_resources/LICENSE +++ b/src/pip/_vendor/pkg_resources/LICENSE @@ -1,5 +1,3 @@ -Copyright Jason R. Coombs - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py index a85aca10f7c..ad2794077b0 100644 --- a/src/pip/_vendor/pkg_resources/__init__.py +++ b/src/pip/_vendor/pkg_resources/__init__.py @@ -13,11 +13,8 @@ .zip files and with custom PEP 302 loaders that support the ``get_data()`` method. -This module is deprecated. Users are directed to -`importlib.resources `_ -and -`importlib.metadata `_ -instead. +This module is deprecated. Users are directed to :mod:`importlib.resources`, +:mod:`importlib.metadata` and :pypi:`packaging` instead. """ import sys @@ -118,7 +115,12 @@ _namespace_packages = None -warnings.warn("pkg_resources is deprecated as an API", DeprecationWarning) +warnings.warn( + "pkg_resources is deprecated as an API. " + "See https://setuptools.pypa.io/en/latest/pkg_resources.html", + DeprecationWarning, + stacklevel=2 +) _PEP440_FALLBACK = re.compile(r"^v?(?P(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I) @@ -1659,10 +1661,9 @@ def _validate_resource_path(path): # for compatibility, warn; in future # raise ValueError(msg) - warnings.warn( + issue_warning( msg[:-1] + " and will raise exceptions in a future release.", DeprecationWarning, - stacklevel=4, ) def _get(self, path): @@ -3046,6 +3047,9 @@ def has_version(self): except ValueError: issue_warning("Unbuilt egg for " + repr(self)) return False + except SystemError: + # TODO: remove this except clause when python/cpython#103632 is fixed. + return False return True def clone(self, **kw): diff --git a/src/pip/_vendor/platformdirs/__init__.py b/src/pip/_vendor/platformdirs/__init__.py index c46a145cdc1..5ebf5957b46 100644 --- a/src/pip/_vendor/platformdirs/__init__.py +++ b/src/pip/_vendor/platformdirs/__init__.py @@ -6,17 +6,20 @@ import os import sys -from pathlib import Path - -if sys.version_info >= (3, 8): # pragma: no cover (py38+) - from typing import Literal -else: # pragma: no cover (py38+) - from pip._vendor.typing_extensions import Literal +from typing import TYPE_CHECKING from .api import PlatformDirsABC from .version import __version__ from .version import __version_tuple__ as __version_info__ +if TYPE_CHECKING: + from pathlib import Path + + if sys.version_info >= (3, 8): # pragma: no cover (py38+) + from typing import Literal + else: # pragma: no cover (py38+) + from pip._vendor.typing_extensions import Literal + def _set_platform_dir_class() -> type[PlatformDirsABC]: if sys.platform == "win32": @@ -48,8 +51,8 @@ def user_data_dir( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - roaming: bool = False, - ensure_exists: bool = False, + roaming: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> str: """ :param appname: See `appname `. @@ -72,8 +75,8 @@ def site_data_dir( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - multipath: bool = False, - ensure_exists: bool = False, + multipath: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> str: """ :param appname: See `appname `. @@ -96,8 +99,8 @@ def user_config_dir( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - roaming: bool = False, - ensure_exists: bool = False, + roaming: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> str: """ :param appname: See `appname `. @@ -120,8 +123,8 @@ def site_config_dir( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - multipath: bool = False, - ensure_exists: bool = False, + multipath: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> str: """ :param appname: See `appname `. @@ -144,8 +147,8 @@ def user_cache_dir( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - opinion: bool = True, - ensure_exists: bool = False, + opinion: bool = True, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> str: """ :param appname: See `appname `. @@ -168,8 +171,8 @@ def site_cache_dir( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - opinion: bool = True, - ensure_exists: bool = False, + opinion: bool = True, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> str: """ :param appname: See `appname `. @@ -192,8 +195,8 @@ def user_state_dir( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - roaming: bool = False, - ensure_exists: bool = False, + roaming: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> str: """ :param appname: See `appname `. @@ -216,8 +219,8 @@ def user_log_dir( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - opinion: bool = True, - ensure_exists: bool = False, + opinion: bool = True, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> str: """ :param appname: See `appname `. @@ -237,18 +240,36 @@ def user_log_dir( def user_documents_dir() -> str: - """ - :returns: documents directory tied to the user - """ + """:returns: documents directory tied to the user""" return PlatformDirs().user_documents_dir +def user_downloads_dir() -> str: + """:returns: downloads directory tied to the user""" + return PlatformDirs().user_downloads_dir + + +def user_pictures_dir() -> str: + """:returns: pictures directory tied to the user""" + return PlatformDirs().user_pictures_dir + + +def user_videos_dir() -> str: + """:returns: videos directory tied to the user""" + return PlatformDirs().user_videos_dir + + +def user_music_dir() -> str: + """:returns: music directory tied to the user""" + return PlatformDirs().user_music_dir + + def user_runtime_dir( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - opinion: bool = True, - ensure_exists: bool = False, + opinion: bool = True, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> str: """ :param appname: See `appname `. @@ -271,8 +292,8 @@ def user_data_path( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - roaming: bool = False, - ensure_exists: bool = False, + roaming: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> Path: """ :param appname: See `appname `. @@ -295,8 +316,8 @@ def site_data_path( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - multipath: bool = False, - ensure_exists: bool = False, + multipath: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> Path: """ :param appname: See `appname `. @@ -319,8 +340,8 @@ def user_config_path( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - roaming: bool = False, - ensure_exists: bool = False, + roaming: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> Path: """ :param appname: See `appname `. @@ -343,8 +364,8 @@ def site_config_path( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - multipath: bool = False, - ensure_exists: bool = False, + multipath: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> Path: """ :param appname: See `appname `. @@ -367,8 +388,8 @@ def site_cache_path( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - opinion: bool = True, - ensure_exists: bool = False, + opinion: bool = True, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> Path: """ :param appname: See `appname `. @@ -391,8 +412,8 @@ def user_cache_path( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - opinion: bool = True, - ensure_exists: bool = False, + opinion: bool = True, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> Path: """ :param appname: See `appname `. @@ -415,8 +436,8 @@ def user_state_path( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - roaming: bool = False, - ensure_exists: bool = False, + roaming: bool = False, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> Path: """ :param appname: See `appname `. @@ -439,8 +460,8 @@ def user_log_path( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - opinion: bool = True, - ensure_exists: bool = False, + opinion: bool = True, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> Path: """ :param appname: See `appname `. @@ -460,18 +481,36 @@ def user_log_path( def user_documents_path() -> Path: - """ - :returns: documents path tied to the user - """ + """:returns: documents path tied to the user""" return PlatformDirs().user_documents_path +def user_downloads_path() -> Path: + """:returns: downloads path tied to the user""" + return PlatformDirs().user_downloads_path + + +def user_pictures_path() -> Path: + """:returns: pictures path tied to the user""" + return PlatformDirs().user_pictures_path + + +def user_videos_path() -> Path: + """:returns: videos path tied to the user""" + return PlatformDirs().user_videos_path + + +def user_music_path() -> Path: + """:returns: music path tied to the user""" + return PlatformDirs().user_music_path + + def user_runtime_path( appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - opinion: bool = True, - ensure_exists: bool = False, + opinion: bool = True, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 ) -> Path: """ :param appname: See `appname `. @@ -502,6 +541,10 @@ def user_runtime_path( "user_state_dir", "user_log_dir", "user_documents_dir", + "user_downloads_dir", + "user_pictures_dir", + "user_videos_dir", + "user_music_dir", "user_runtime_dir", "site_data_dir", "site_config_dir", @@ -512,6 +555,10 @@ def user_runtime_path( "user_state_path", "user_log_path", "user_documents_path", + "user_downloads_path", + "user_pictures_path", + "user_videos_path", + "user_music_path", "user_runtime_path", "site_data_path", "site_config_path", diff --git a/src/pip/_vendor/platformdirs/__main__.py b/src/pip/_vendor/platformdirs/__main__.py index 7171f13114e..6a0d6dd12e3 100644 --- a/src/pip/_vendor/platformdirs/__main__.py +++ b/src/pip/_vendor/platformdirs/__main__.py @@ -1,3 +1,4 @@ +"""Main entry point.""" from __future__ import annotations from pip._vendor.platformdirs import PlatformDirs, __version__ @@ -9,6 +10,10 @@ "user_state_dir", "user_log_dir", "user_documents_dir", + "user_downloads_dir", + "user_pictures_dir", + "user_videos_dir", + "user_music_dir", "user_runtime_dir", "site_data_dir", "site_config_dir", @@ -17,30 +22,31 @@ def main() -> None: + """Run main entry point.""" app_name = "MyApp" app_author = "MyCompany" - print(f"-- platformdirs {__version__} --") + print(f"-- platformdirs {__version__} --") # noqa: T201 - print("-- app dirs (with optional 'version')") + print("-- app dirs (with optional 'version')") # noqa: T201 dirs = PlatformDirs(app_name, app_author, version="1.0") for prop in PROPS: - print(f"{prop}: {getattr(dirs, prop)}") + print(f"{prop}: {getattr(dirs, prop)}") # noqa: T201 - print("\n-- app dirs (without optional 'version')") + print("\n-- app dirs (without optional 'version')") # noqa: T201 dirs = PlatformDirs(app_name, app_author) for prop in PROPS: - print(f"{prop}: {getattr(dirs, prop)}") + print(f"{prop}: {getattr(dirs, prop)}") # noqa: T201 - print("\n-- app dirs (without optional 'appauthor')") + print("\n-- app dirs (without optional 'appauthor')") # noqa: T201 dirs = PlatformDirs(app_name) for prop in PROPS: - print(f"{prop}: {getattr(dirs, prop)}") + print(f"{prop}: {getattr(dirs, prop)}") # noqa: T201 - print("\n-- app dirs (with disabled 'appauthor')") + print("\n-- app dirs (with disabled 'appauthor')") # noqa: T201 dirs = PlatformDirs(app_name, appauthor=False) for prop in PROPS: - print(f"{prop}: {getattr(dirs, prop)}") + print(f"{prop}: {getattr(dirs, prop)}") # noqa: T201 if __name__ == "__main__": diff --git a/src/pip/_vendor/platformdirs/android.py b/src/pip/_vendor/platformdirs/android.py index f6de7451b25..76527dda41f 100644 --- a/src/pip/_vendor/platformdirs/android.py +++ b/src/pip/_vendor/platformdirs/android.py @@ -1,3 +1,4 @@ +"""Android.""" from __future__ import annotations import os @@ -30,7 +31,8 @@ def site_data_dir(self) -> str: @property def user_config_dir(self) -> str: """ - :return: config directory tied to the user, e.g. ``/data/user///shared_prefs/`` + :return: config directory tied to the user, e.g. \ + ``/data/user///shared_prefs/`` """ return self._append_app_name_and_version(cast(str, _android_folder()), "shared_prefs") @@ -62,16 +64,34 @@ def user_log_dir(self) -> str: """ path = self.user_cache_dir if self.opinion: - path = os.path.join(path, "log") + path = os.path.join(path, "log") # noqa: PTH118 return path @property def user_documents_dir(self) -> str: - """ - :return: documents directory tied to the user e.g. ``/storage/emulated/0/Documents`` - """ + """:return: documents directory tied to the user e.g. ``/storage/emulated/0/Documents``""" return _android_documents_folder() + @property + def user_downloads_dir(self) -> str: + """:return: downloads directory tied to the user e.g. ``/storage/emulated/0/Downloads``""" + return _android_downloads_folder() + + @property + def user_pictures_dir(self) -> str: + """:return: pictures directory tied to the user e.g. ``/storage/emulated/0/Pictures``""" + return _android_pictures_folder() + + @property + def user_videos_dir(self) -> str: + """:return: videos directory tied to the user e.g. ``/storage/emulated/0/DCIM/Camera``""" + return _android_videos_folder() + + @property + def user_music_dir(self) -> str: + """:return: music directory tied to the user e.g. ``/storage/emulated/0/Music``""" + return _android_music_folder() + @property def user_runtime_dir(self) -> str: """ @@ -80,20 +100,20 @@ def user_runtime_dir(self) -> str: """ path = self.user_cache_dir if self.opinion: - path = os.path.join(path, "tmp") + path = os.path.join(path, "tmp") # noqa: PTH118 return path @lru_cache(maxsize=1) def _android_folder() -> str | None: - """:return: base folder for the Android OS or None if cannot be found""" + """:return: base folder for the Android OS or None if it cannot be found""" try: # First try to get path to android app via pyjnius from jnius import autoclass - Context = autoclass("android.content.Context") # noqa: N806 - result: str | None = Context.getFilesDir().getParentFile().getAbsolutePath() - except Exception: + context = autoclass("android.content.Context") + result: str | None = context.getFilesDir().getParentFile().getAbsolutePath() + except Exception: # noqa: BLE001 # if fails find an android folder looking path on the sys.path pattern = re.compile(r"/data/(data|user/\d+)/(.+)/files") for path in sys.path: @@ -112,15 +132,79 @@ def _android_documents_folder() -> str: try: from jnius import autoclass - Context = autoclass("android.content.Context") # noqa: N806 - Environment = autoclass("android.os.Environment") # noqa: N806 - documents_dir: str = Context.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS).getAbsolutePath() - except Exception: + context = autoclass("android.content.Context") + environment = autoclass("android.os.Environment") + documents_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DOCUMENTS).getAbsolutePath() + except Exception: # noqa: BLE001 documents_dir = "/storage/emulated/0/Documents" return documents_dir +@lru_cache(maxsize=1) +def _android_downloads_folder() -> str: + """:return: downloads folder for the Android OS""" + # Get directories with pyjnius + try: + from jnius import autoclass + + context = autoclass("android.content.Context") + environment = autoclass("android.os.Environment") + downloads_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DOWNLOADS).getAbsolutePath() + except Exception: # noqa: BLE001 + downloads_dir = "/storage/emulated/0/Downloads" + + return downloads_dir + + +@lru_cache(maxsize=1) +def _android_pictures_folder() -> str: + """:return: pictures folder for the Android OS""" + # Get directories with pyjnius + try: + from jnius import autoclass + + context = autoclass("android.content.Context") + environment = autoclass("android.os.Environment") + pictures_dir: str = context.getExternalFilesDir(environment.DIRECTORY_PICTURES).getAbsolutePath() + except Exception: # noqa: BLE001 + pictures_dir = "/storage/emulated/0/Pictures" + + return pictures_dir + + +@lru_cache(maxsize=1) +def _android_videos_folder() -> str: + """:return: videos folder for the Android OS""" + # Get directories with pyjnius + try: + from jnius import autoclass + + context = autoclass("android.content.Context") + environment = autoclass("android.os.Environment") + videos_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DCIM).getAbsolutePath() + except Exception: # noqa: BLE001 + videos_dir = "/storage/emulated/0/DCIM/Camera" + + return videos_dir + + +@lru_cache(maxsize=1) +def _android_music_folder() -> str: + """:return: music folder for the Android OS""" + # Get directories with pyjnius + try: + from jnius import autoclass + + context = autoclass("android.content.Context") + environment = autoclass("android.os.Environment") + music_dir: str = context.getExternalFilesDir(environment.DIRECTORY_MUSIC).getAbsolutePath() + except Exception: # noqa: BLE001 + music_dir = "/storage/emulated/0/Music" + + return music_dir + + __all__ = [ "Android", ] diff --git a/src/pip/_vendor/platformdirs/api.py b/src/pip/_vendor/platformdirs/api.py index f140e8b6db8..d64ebb9d45c 100644 --- a/src/pip/_vendor/platformdirs/api.py +++ b/src/pip/_vendor/platformdirs/api.py @@ -1,29 +1,33 @@ +"""Base API.""" from __future__ import annotations import os -import sys from abc import ABC, abstractmethod from pathlib import Path +from typing import TYPE_CHECKING -if sys.version_info >= (3, 8): # pragma: no branch - from typing import Literal # pragma: no cover +if TYPE_CHECKING: + import sys + + if sys.version_info >= (3, 8): # pragma: no cover (py38+) + from typing import Literal + else: # pragma: no cover (py38+) + from pip._vendor.typing_extensions import Literal class PlatformDirsABC(ABC): - """ - Abstract base class for platform directories. - """ + """Abstract base class for platform directories.""" - def __init__( + def __init__( # noqa: PLR0913 self, appname: str | None = None, appauthor: str | None | Literal[False] = None, version: str | None = None, - roaming: bool = False, - multipath: bool = False, - opinion: bool = True, - ensure_exists: bool = False, - ): + roaming: bool = False, # noqa: FBT001, FBT002 + multipath: bool = False, # noqa: FBT001, FBT002 + opinion: bool = True, # noqa: FBT001, FBT002 + ensure_exists: bool = False, # noqa: FBT001, FBT002 + ) -> None: """ Create a new platform directory. @@ -70,7 +74,7 @@ def _append_app_name_and_version(self, *base: str) -> str: params.append(self.appname) if self.version: params.append(self.version) - path = os.path.join(base[0], *params) + path = os.path.join(base[0], *params) # noqa: PTH118 self._optionally_create_directory(path) return path @@ -123,6 +127,26 @@ def user_log_dir(self) -> str: def user_documents_dir(self) -> str: """:return: documents directory tied to the user""" + @property + @abstractmethod + def user_downloads_dir(self) -> str: + """:return: downloads directory tied to the user""" + + @property + @abstractmethod + def user_pictures_dir(self) -> str: + """:return: pictures directory tied to the user""" + + @property + @abstractmethod + def user_videos_dir(self) -> str: + """:return: videos directory tied to the user""" + + @property + @abstractmethod + def user_music_dir(self) -> str: + """:return: music directory tied to the user""" + @property @abstractmethod def user_runtime_dir(self) -> str: @@ -173,6 +197,26 @@ def user_documents_path(self) -> Path: """:return: documents path tied to the user""" return Path(self.user_documents_dir) + @property + def user_downloads_path(self) -> Path: + """:return: downloads path tied to the user""" + return Path(self.user_downloads_dir) + + @property + def user_pictures_path(self) -> Path: + """:return: pictures path tied to the user""" + return Path(self.user_pictures_dir) + + @property + def user_videos_path(self) -> Path: + """:return: videos path tied to the user""" + return Path(self.user_videos_dir) + + @property + def user_music_path(self) -> Path: + """:return: music path tied to the user""" + return Path(self.user_music_dir) + @property def user_runtime_path(self) -> Path: """:return: runtime path tied to the user""" diff --git a/src/pip/_vendor/platformdirs/macos.py b/src/pip/_vendor/platformdirs/macos.py index ec9751129c1..a753e2a3aa2 100644 --- a/src/pip/_vendor/platformdirs/macos.py +++ b/src/pip/_vendor/platformdirs/macos.py @@ -1,6 +1,7 @@ +"""macOS.""" from __future__ import annotations -import os +import os.path from .api import PlatformDirsABC @@ -17,7 +18,7 @@ class MacOS(PlatformDirsABC): @property def user_data_dir(self) -> str: """:return: data directory tied to the user, e.g. ``~/Library/Application Support/$appname/$version``""" - return self._append_app_name_and_version(os.path.expanduser("~/Library/Application Support")) + return self._append_app_name_and_version(os.path.expanduser("~/Library/Application Support")) # noqa: PTH111 @property def site_data_dir(self) -> str: @@ -37,7 +38,7 @@ def site_config_dir(self) -> str: @property def user_cache_dir(self) -> str: """:return: cache directory tied to the user, e.g. ``~/Library/Caches/$appname/$version``""" - return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches")) + return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches")) # noqa: PTH111 @property def site_cache_dir(self) -> str: @@ -52,17 +53,37 @@ def user_state_dir(self) -> str: @property def user_log_dir(self) -> str: """:return: log directory tied to the user, e.g. ``~/Library/Logs/$appname/$version``""" - return self._append_app_name_and_version(os.path.expanduser("~/Library/Logs")) + return self._append_app_name_and_version(os.path.expanduser("~/Library/Logs")) # noqa: PTH111 @property def user_documents_dir(self) -> str: """:return: documents directory tied to the user, e.g. ``~/Documents``""" - return os.path.expanduser("~/Documents") + return os.path.expanduser("~/Documents") # noqa: PTH111 + + @property + def user_downloads_dir(self) -> str: + """:return: downloads directory tied to the user, e.g. ``~/Downloads``""" + return os.path.expanduser("~/Downloads") # noqa: PTH111 + + @property + def user_pictures_dir(self) -> str: + """:return: pictures directory tied to the user, e.g. ``~/Pictures``""" + return os.path.expanduser("~/Pictures") # noqa: PTH111 + + @property + def user_videos_dir(self) -> str: + """:return: videos directory tied to the user, e.g. ``~/Movies``""" + return os.path.expanduser("~/Movies") # noqa: PTH111 + + @property + def user_music_dir(self) -> str: + """:return: music directory tied to the user, e.g. ``~/Music``""" + return os.path.expanduser("~/Music") # noqa: PTH111 @property def user_runtime_dir(self) -> str: """:return: runtime directory tied to the user, e.g. ``~/Library/Caches/TemporaryItems/$appname/$version``""" - return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches/TemporaryItems")) + return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches/TemporaryItems")) # noqa: PTH111 __all__ = [ diff --git a/src/pip/_vendor/platformdirs/unix.py b/src/pip/_vendor/platformdirs/unix.py index 17d355da9f4..468b0ab4957 100644 --- a/src/pip/_vendor/platformdirs/unix.py +++ b/src/pip/_vendor/platformdirs/unix.py @@ -1,3 +1,4 @@ +"""Unix.""" from __future__ import annotations import os @@ -7,12 +8,14 @@ from .api import PlatformDirsABC -if sys.platform.startswith("linux"): # pragma: no branch # no op check, only to please the type checker - from os import getuid -else: +if sys.platform == "win32": def getuid() -> int: - raise RuntimeError("should only be used on Linux") + msg = "should only be used on Unix" + raise RuntimeError(msg) + +else: + from os import getuid class Unix(PlatformDirsABC): @@ -36,7 +39,7 @@ def user_data_dir(self) -> str: """ path = os.environ.get("XDG_DATA_HOME", "") if not path.strip(): - path = os.path.expanduser("~/.local/share") + path = os.path.expanduser("~/.local/share") # noqa: PTH111 return self._append_app_name_and_version(path) @property @@ -56,7 +59,7 @@ def _with_multi_path(self, path: str) -> str: path_list = path.split(os.pathsep) if not self.multipath: path_list = path_list[0:1] - path_list = [self._append_app_name_and_version(os.path.expanduser(p)) for p in path_list] + path_list = [self._append_app_name_and_version(os.path.expanduser(p)) for p in path_list] # noqa: PTH111 return os.pathsep.join(path_list) @property @@ -67,7 +70,7 @@ def user_config_dir(self) -> str: """ path = os.environ.get("XDG_CONFIG_HOME", "") if not path.strip(): - path = os.path.expanduser("~/.config") + path = os.path.expanduser("~/.config") # noqa: PTH111 return self._append_app_name_and_version(path) @property @@ -91,15 +94,13 @@ def user_cache_dir(self) -> str: """ path = os.environ.get("XDG_CACHE_HOME", "") if not path.strip(): - path = os.path.expanduser("~/.cache") + path = os.path.expanduser("~/.cache") # noqa: PTH111 return self._append_app_name_and_version(path) @property def site_cache_dir(self) -> str: - """ - :return: cache directory shared by users, e.g. ``/var/tmp/$appname/$version`` - """ - return self._append_app_name_and_version("/var/tmp") + """:return: cache directory shared by users, e.g. ``/var/tmp/$appname/$version``""" + return self._append_app_name_and_version("/var/tmp") # noqa: S108 @property def user_state_dir(self) -> str: @@ -109,41 +110,60 @@ def user_state_dir(self) -> str: """ path = os.environ.get("XDG_STATE_HOME", "") if not path.strip(): - path = os.path.expanduser("~/.local/state") + path = os.path.expanduser("~/.local/state") # noqa: PTH111 return self._append_app_name_and_version(path) @property def user_log_dir(self) -> str: - """ - :return: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it - """ + """:return: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it""" path = self.user_state_dir if self.opinion: - path = os.path.join(path, "log") + path = os.path.join(path, "log") # noqa: PTH118 return path @property def user_documents_dir(self) -> str: - """ - :return: documents directory tied to the user, e.g. ``~/Documents`` - """ - documents_dir = _get_user_dirs_folder("XDG_DOCUMENTS_DIR") - if documents_dir is None: - documents_dir = os.environ.get("XDG_DOCUMENTS_DIR", "").strip() - if not documents_dir: - documents_dir = os.path.expanduser("~/Documents") + """:return: documents directory tied to the user, e.g. ``~/Documents``""" + return _get_user_media_dir("XDG_DOCUMENTS_DIR", "~/Documents") - return documents_dir + @property + def user_downloads_dir(self) -> str: + """:return: downloads directory tied to the user, e.g. ``~/Downloads``""" + return _get_user_media_dir("XDG_DOWNLOAD_DIR", "~/Downloads") + + @property + def user_pictures_dir(self) -> str: + """:return: pictures directory tied to the user, e.g. ``~/Pictures``""" + return _get_user_media_dir("XDG_PICTURES_DIR", "~/Pictures") + + @property + def user_videos_dir(self) -> str: + """:return: videos directory tied to the user, e.g. ``~/Videos``""" + return _get_user_media_dir("XDG_VIDEOS_DIR", "~/Videos") + + @property + def user_music_dir(self) -> str: + """:return: music directory tied to the user, e.g. ``~/Music``""" + return _get_user_media_dir("XDG_MUSIC_DIR", "~/Music") @property def user_runtime_dir(self) -> str: """ :return: runtime directory tied to the user, e.g. ``/run/user/$(id -u)/$appname/$version`` or - ``$XDG_RUNTIME_DIR/$appname/$version`` + ``$XDG_RUNTIME_DIR/$appname/$version``. + + For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/user/$(id -u)/$appname/$version`` if + exists, otherwise ``/tmp/runtime-$(id -u)/$appname/$version``, if``$XDG_RUNTIME_DIR`` + is not set. """ path = os.environ.get("XDG_RUNTIME_DIR", "") if not path.strip(): - path = f"/run/user/{getuid()}" + if sys.platform.startswith(("freebsd", "openbsd", "netbsd")): + path = f"/var/run/user/{getuid()}" + if not Path(path).exists(): + path = f"/tmp/runtime-{getuid()}" # noqa: S108 + else: + path = f"/run/user/{getuid()}" return self._append_app_name_and_version(path) @property @@ -168,13 +188,23 @@ def _first_item_as_path_if_multipath(self, directory: str) -> Path: return Path(directory) +def _get_user_media_dir(env_var: str, fallback_tilde_path: str) -> str: + media_dir = _get_user_dirs_folder(env_var) + if media_dir is None: + media_dir = os.environ.get(env_var, "").strip() + if not media_dir: + media_dir = os.path.expanduser(fallback_tilde_path) # noqa: PTH111 + + return media_dir + + def _get_user_dirs_folder(key: str) -> str | None: - """Return directory from user-dirs.dirs config file. See https://freedesktop.org/wiki/Software/xdg-user-dirs/""" - user_dirs_config_path = os.path.join(Unix().user_config_dir, "user-dirs.dirs") - if os.path.exists(user_dirs_config_path): + """Return directory from user-dirs.dirs config file. See https://freedesktop.org/wiki/Software/xdg-user-dirs/.""" + user_dirs_config_path = Path(Unix().user_config_dir) / "user-dirs.dirs" + if user_dirs_config_path.exists(): parser = ConfigParser() - with open(user_dirs_config_path) as stream: + with user_dirs_config_path.open() as stream: # Add fake section header, so ConfigParser doesn't complain parser.read_string(f"[top]\n{stream.read()}") @@ -183,8 +213,7 @@ def _get_user_dirs_folder(key: str) -> str | None: path = parser["top"][key].strip('"') # Handle relative home paths - path = path.replace("$HOME", os.path.expanduser("~")) - return path + return path.replace("$HOME", os.path.expanduser("~")) # noqa: PTH111 return None diff --git a/src/pip/_vendor/platformdirs/version.py b/src/pip/_vendor/platformdirs/version.py index d906a2c99e6..dc8c44cf7b2 100644 --- a/src/pip/_vendor/platformdirs/version.py +++ b/src/pip/_vendor/platformdirs/version.py @@ -1,4 +1,4 @@ # file generated by setuptools_scm # don't change, don't track in version control -__version__ = version = '3.2.0' -__version_tuple__ = version_tuple = (3, 2, 0) +__version__ = version = '3.8.1' +__version_tuple__ = version_tuple = (3, 8, 1) diff --git a/src/pip/_vendor/platformdirs/windows.py b/src/pip/_vendor/platformdirs/windows.py index e7573c3d6ae..b52c9c6ea89 100644 --- a/src/pip/_vendor/platformdirs/windows.py +++ b/src/pip/_vendor/platformdirs/windows.py @@ -1,16 +1,21 @@ +"""Windows.""" from __future__ import annotations import ctypes import os import sys from functools import lru_cache -from typing import Callable +from typing import TYPE_CHECKING from .api import PlatformDirsABC +if TYPE_CHECKING: + from collections.abc import Callable + class Windows(PlatformDirsABC): - """`MSDN on where to store app data files + """ + `MSDN on where to store app data files `_. Makes use of the `appname `, @@ -43,7 +48,7 @@ def _append_parts(self, path: str, *, opinion_value: str | None = None) -> str: params.append(opinion_value) if self.version: params.append(self.version) - path = os.path.join(path, *params) + path = os.path.join(path, *params) # noqa: PTH118 self._optionally_create_directory(path) return path @@ -85,36 +90,53 @@ def user_state_dir(self) -> str: @property def user_log_dir(self) -> str: - """ - :return: log directory tied to the user, same as `user_data_dir` if not opinionated else ``Logs`` in it - """ + """:return: log directory tied to the user, same as `user_data_dir` if not opinionated else ``Logs`` in it""" path = self.user_data_dir if self.opinion: - path = os.path.join(path, "Logs") + path = os.path.join(path, "Logs") # noqa: PTH118 self._optionally_create_directory(path) return path @property def user_documents_dir(self) -> str: - """ - :return: documents directory tied to the user e.g. ``%USERPROFILE%\\Documents`` - """ + """:return: documents directory tied to the user e.g. ``%USERPROFILE%\\Documents``""" return os.path.normpath(get_win_folder("CSIDL_PERSONAL")) + @property + def user_downloads_dir(self) -> str: + """:return: downloads directory tied to the user e.g. ``%USERPROFILE%\\Downloads``""" + return os.path.normpath(get_win_folder("CSIDL_DOWNLOADS")) + + @property + def user_pictures_dir(self) -> str: + """:return: pictures directory tied to the user e.g. ``%USERPROFILE%\\Pictures``""" + return os.path.normpath(get_win_folder("CSIDL_MYPICTURES")) + + @property + def user_videos_dir(self) -> str: + """:return: videos directory tied to the user e.g. ``%USERPROFILE%\\Videos``""" + return os.path.normpath(get_win_folder("CSIDL_MYVIDEO")) + + @property + def user_music_dir(self) -> str: + """:return: music directory tied to the user e.g. ``%USERPROFILE%\\Music``""" + return os.path.normpath(get_win_folder("CSIDL_MYMUSIC")) + @property def user_runtime_dir(self) -> str: """ :return: runtime directory tied to the user, e.g. ``%USERPROFILE%\\AppData\\Local\\Temp\\$appauthor\\$appname`` """ - path = os.path.normpath(os.path.join(get_win_folder("CSIDL_LOCAL_APPDATA"), "Temp")) + path = os.path.normpath(os.path.join(get_win_folder("CSIDL_LOCAL_APPDATA"), "Temp")) # noqa: PTH118 return self._append_parts(path) def get_win_folder_from_env_vars(csidl_name: str) -> str: """Get folder from environment variables.""" - if csidl_name == "CSIDL_PERSONAL": # does not have an environment name - return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Documents") + result = get_win_folder_if_csidl_name_not_env_var(csidl_name) + if result is not None: + return result env_var_name = { "CSIDL_APPDATA": "APPDATA", @@ -122,28 +144,54 @@ def get_win_folder_from_env_vars(csidl_name: str) -> str: "CSIDL_LOCAL_APPDATA": "LOCALAPPDATA", }.get(csidl_name) if env_var_name is None: - raise ValueError(f"Unknown CSIDL name: {csidl_name}") + msg = f"Unknown CSIDL name: {csidl_name}" + raise ValueError(msg) result = os.environ.get(env_var_name) if result is None: - raise ValueError(f"Unset environment variable: {env_var_name}") + msg = f"Unset environment variable: {env_var_name}" + raise ValueError(msg) return result +def get_win_folder_if_csidl_name_not_env_var(csidl_name: str) -> str | None: + """Get folder for a CSIDL name that does not exist as an environment variable.""" + if csidl_name == "CSIDL_PERSONAL": + return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Documents") # noqa: PTH118 + + if csidl_name == "CSIDL_DOWNLOADS": + return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Downloads") # noqa: PTH118 + + if csidl_name == "CSIDL_MYPICTURES": + return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Pictures") # noqa: PTH118 + + if csidl_name == "CSIDL_MYVIDEO": + return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Videos") # noqa: PTH118 + + if csidl_name == "CSIDL_MYMUSIC": + return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Music") # noqa: PTH118 + return None + + def get_win_folder_from_registry(csidl_name: str) -> str: - """Get folder from the registry. + """ + Get folder from the registry. - This is a fallback technique at best. I'm not sure if using the - registry for this guarantees us the correct answer for all CSIDL_* - names. + This is a fallback technique at best. I'm not sure if using the registry for these guarantees us the correct answer + for all CSIDL_* names. """ shell_folder_name = { "CSIDL_APPDATA": "AppData", "CSIDL_COMMON_APPDATA": "Common AppData", "CSIDL_LOCAL_APPDATA": "Local AppData", "CSIDL_PERSONAL": "Personal", + "CSIDL_DOWNLOADS": "{374DE290-123F-4565-9164-39C4925E467B}", + "CSIDL_MYPICTURES": "My Pictures", + "CSIDL_MYVIDEO": "My Video", + "CSIDL_MYMUSIC": "My Music", }.get(csidl_name) if shell_folder_name is None: - raise ValueError(f"Unknown CSIDL name: {csidl_name}") + msg = f"Unknown CSIDL name: {csidl_name}" + raise ValueError(msg) if sys.platform != "win32": # only needed for mypy type checker to know that this code runs only on Windows raise NotImplementedError import winreg @@ -155,25 +203,37 @@ def get_win_folder_from_registry(csidl_name: str) -> str: def get_win_folder_via_ctypes(csidl_name: str) -> str: """Get folder with ctypes.""" + # There is no 'CSIDL_DOWNLOADS'. + # Use 'CSIDL_PROFILE' (40) and append the default folder 'Downloads' instead. + # https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid + csidl_const = { "CSIDL_APPDATA": 26, "CSIDL_COMMON_APPDATA": 35, "CSIDL_LOCAL_APPDATA": 28, "CSIDL_PERSONAL": 5, + "CSIDL_MYPICTURES": 39, + "CSIDL_MYVIDEO": 14, + "CSIDL_MYMUSIC": 13, + "CSIDL_DOWNLOADS": 40, }.get(csidl_name) if csidl_const is None: - raise ValueError(f"Unknown CSIDL name: {csidl_name}") + msg = f"Unknown CSIDL name: {csidl_name}" + raise ValueError(msg) buf = ctypes.create_unicode_buffer(1024) windll = getattr(ctypes, "windll") # noqa: B009 # using getattr to avoid false positive with mypy type checker windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf) # Downgrade to short path name if it has highbit chars. - if any(ord(c) > 255 for c in buf): + if any(ord(c) > 255 for c in buf): # noqa: PLR2004 buf2 = ctypes.create_unicode_buffer(1024) if windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024): buf = buf2 + if csidl_name == "CSIDL_DOWNLOADS": + return os.path.join(buf.value, "Downloads") # noqa: PTH118 + return buf.value diff --git a/src/pip/_vendor/pygments/__init__.py b/src/pip/_vendor/pygments/__init__.py index d9b0a8dea2e..39c84aae5d8 100644 --- a/src/pip/_vendor/pygments/__init__.py +++ b/src/pip/_vendor/pygments/__init__.py @@ -21,12 +21,12 @@ .. _Pygments master branch: https://github.com/pygments/pygments/archive/master.zip#egg=Pygments-dev - :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ from io import StringIO, BytesIO -__version__ = '2.14.0' +__version__ = '2.15.1' __docformat__ = 'restructuredtext' __all__ = ['lex', 'format', 'highlight'] @@ -34,7 +34,9 @@ def lex(code, lexer): """ - Lex ``code`` with ``lexer`` and return an iterable of tokens. + Lex `code` with the `lexer` (must be a `Lexer` instance) + and return an iterable of tokens. Currently, this only calls + `lexer.get_tokens()`. """ try: return lexer.get_tokens(code) @@ -49,11 +51,12 @@ def lex(code, lexer): def format(tokens, formatter, outfile=None): # pylint: disable=redefined-builtin """ - Format a tokenlist ``tokens`` with the formatter ``formatter``. + Format ``tokens`` (an iterable of tokens) with the formatter ``formatter`` + (a `Formatter` instance). - If ``outfile`` is given and a valid file object (an object - with a ``write`` method), the result will be written to it, otherwise - it is returned as a string. + If ``outfile`` is given and a valid file object (an object with a + ``write`` method), the result will be written to it, otherwise it + is returned as a string. """ try: if not outfile: @@ -73,10 +76,7 @@ def format(tokens, formatter, outfile=None): # pylint: disable=redefined-builti def highlight(code, lexer, formatter, outfile=None): """ - Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``. - - If ``outfile`` is given and a valid file object (an object - with a ``write`` method), the result will be written to it, otherwise - it is returned as a string. + This is the most high-level highlighting function. It combines `lex` and + `format` in one function. """ return format(lex(code, lexer), formatter, outfile) diff --git a/src/pip/_vendor/pygments/__main__.py b/src/pip/_vendor/pygments/__main__.py index 90cafd93426..2f7f8cbad05 100644 --- a/src/pip/_vendor/pygments/__main__.py +++ b/src/pip/_vendor/pygments/__main__.py @@ -4,7 +4,7 @@ Main entry point for ``python -m pygments``. - :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/src/pip/_vendor/pygments/cmdline.py b/src/pip/_vendor/pygments/cmdline.py index de73b06b4cf..eec1775ba5f 100644 --- a/src/pip/_vendor/pygments/cmdline.py +++ b/src/pip/_vendor/pygments/cmdline.py @@ -4,7 +4,7 @@ Command line interface. - :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ @@ -185,7 +185,7 @@ def main_inner(parser, argns): return 0 if argns.V: - print('Pygments version %s, (c) 2006-2022 by Georg Brandl, Matthäus ' + print('Pygments version %s, (c) 2006-2023 by Georg Brandl, Matthäus ' 'Chajdas and contributors.' % __version__) return 0 diff --git a/src/pip/_vendor/pygments/console.py b/src/pip/_vendor/pygments/console.py index 2ada68e03b3..deb4937f74f 100644 --- a/src/pip/_vendor/pygments/console.py +++ b/src/pip/_vendor/pygments/console.py @@ -4,7 +4,7 @@ Format colored console output. - :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/src/pip/_vendor/pygments/filter.py b/src/pip/_vendor/pygments/filter.py index e5c96649382..dafa08d1569 100644 --- a/src/pip/_vendor/pygments/filter.py +++ b/src/pip/_vendor/pygments/filter.py @@ -4,7 +4,7 @@ Module that implements the default filter. - :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/src/pip/_vendor/pygments/filters/__init__.py b/src/pip/_vendor/pygments/filters/__init__.py index c302a6c0c53..5aa9ecbb80c 100644 --- a/src/pip/_vendor/pygments/filters/__init__.py +++ b/src/pip/_vendor/pygments/filters/__init__.py @@ -5,7 +5,7 @@ Module containing filter lookup functions and default filters. - :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ diff --git a/src/pip/_vendor/pygments/formatter.py b/src/pip/_vendor/pygments/formatter.py index a2349ef8652..3ca4892fa31 100644 --- a/src/pip/_vendor/pygments/formatter.py +++ b/src/pip/_vendor/pygments/formatter.py @@ -4,7 +4,7 @@ Base formatter class. - :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ @@ -26,7 +26,21 @@ class Formatter: """ Converts a token stream to text. - Options accepted: + Formatters should have attributes to help selecting them. These + are similar to the corresponding :class:`~pygments.lexer.Lexer` + attributes. + + .. autoattribute:: name + :no-value: + + .. autoattribute:: aliases + :no-value: + + .. autoattribute:: filenames + :no-value: + + You can pass options as keyword arguments to the constructor. + All formatters accept these basic options: ``style`` The style to use, can be a string or a Style subclass @@ -47,15 +61,19 @@ class Formatter: support (default: None). ``outencoding`` Overrides ``encoding`` if given. + """ - #: Name of the formatter + #: Full name for the formatter, in human-readable form. name = None - #: Shortcuts for the formatter + #: A list of short, unique identifiers that can be used to lookup + #: the formatter from a list, e.g. using :func:`.get_formatter_by_name()`. aliases = [] - #: fn match rules + #: A list of fnmatch patterns that match filenames for which this + #: formatter can produce output. The patterns in this list should be unique + #: among all formatters. filenames = [] #: If True, this formatter outputs Unicode strings when no encoding @@ -63,6 +81,11 @@ class Formatter: unicodeoutput = True def __init__(self, **options): + """ + As with lexers, this constructor takes arbitrary optional arguments, + and if you override it, you should first process your own options, then + call the base class implementation. + """ self.style = _lookup_style(options.get('style', 'default')) self.full = get_bool_opt(options, 'full', False) self.title = options.get('title', '') @@ -75,18 +98,25 @@ def __init__(self, **options): def get_style_defs(self, arg=''): """ - Return the style definitions for the current style as a string. + This method must return statements or declarations suitable to define + the current style for subsequent highlighted text (e.g. CSS classes + in the `HTMLFormatter`). - ``arg`` is an additional argument whose meaning depends on the - formatter used. Note that ``arg`` can also be a list or tuple - for some formatters like the html formatter. + The optional argument `arg` can be used to modify the generation and + is formatter dependent (it is standardized because it can be given on + the command line). + + This method is called by the ``-S`` :doc:`command-line option `, + the `arg` is then given by the ``-a`` option. """ return '' def format(self, tokensource, outfile): """ - Format ``tokensource``, an iterable of ``(tokentype, tokenstring)`` - tuples and write it into ``outfile``. + This method must format the tokens from the `tokensource` iterable and + write the formatted version to the file object `outfile`. + + Formatter options can control how exactly the tokens are converted. """ if self.encoding: # wrap the outfile in a StreamWriter diff --git a/src/pip/_vendor/pygments/formatters/__init__.py b/src/pip/_vendor/pygments/formatters/__init__.py index 7ecf7eee35f..39db84262d8 100644 --- a/src/pip/_vendor/pygments/formatters/__init__.py +++ b/src/pip/_vendor/pygments/formatters/__init__.py @@ -4,13 +4,14 @@ Pygments formatters. - :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ +import re import sys import types -from fnmatch import fnmatch +import fnmatch from os.path import basename from pip._vendor.pygments.formatters._mapping import FORMATTERS @@ -21,6 +22,16 @@ 'get_all_formatters', 'load_formatter_from_file'] + list(FORMATTERS) _formatter_cache = {} # classes by name +_pattern_cache = {} + + +def _fn_matches(fn, glob): + """Return whether the supplied file name fn matches pattern filename.""" + if glob not in _pattern_cache: + pattern = _pattern_cache[glob] = re.compile(fnmatch.translate(glob)) + return pattern.match(fn) + return _pattern_cache[glob].match(fn) + def _load_formatters(module_name): """Load a formatter (and all others in the module too).""" @@ -57,9 +68,12 @@ def find_formatter_class(alias): def get_formatter_by_name(_alias, **options): - """Lookup and instantiate a formatter by alias. + """ + Return an instance of a :class:`.Formatter` subclass that has `alias` in its + aliases list. The formatter is given the `options` at its instantiation. - Raises ClassNotFound if not found. + Will raise :exc:`pygments.util.ClassNotFound` if no formatter with that + alias is found. """ cls = find_formatter_class(_alias) if cls is None: @@ -67,19 +81,18 @@ def get_formatter_by_name(_alias, **options): return cls(**options) -def load_formatter_from_file(filename, formattername="CustomFormatter", - **options): - """Load a formatter from a file. - - This method expects a file located relative to the current working - directory, which contains a class named CustomFormatter. By default, - it expects the Formatter to be named CustomFormatter; you can specify - your own class name as the second argument to this function. +def load_formatter_from_file(filename, formattername="CustomFormatter", **options): + """ + Return a `Formatter` subclass instance loaded from the provided file, relative + to the current directory. - Users should be very careful with the input, because this method - is equivalent to running eval on the input file. + The file is expected to contain a Formatter class named ``formattername`` + (by default, CustomFormatter). Users should be very careful with the input, because + this method is equivalent to running ``eval()`` on the input file. The formatter is + given the `options` at its instantiation. - Raises ClassNotFound if there are any problems importing the Formatter. + :exc:`pygments.util.ClassNotFound` is raised if there are any errors loading + the formatter. .. versionadded:: 2.2 """ @@ -104,20 +117,23 @@ def load_formatter_from_file(filename, formattername="CustomFormatter", def get_formatter_for_filename(fn, **options): - """Lookup and instantiate a formatter by filename pattern. + """ + Return a :class:`.Formatter` subclass instance that has a filename pattern + matching `fn`. The formatter is given the `options` at its instantiation. - Raises ClassNotFound if not found. + Will raise :exc:`pygments.util.ClassNotFound` if no formatter for that filename + is found. """ fn = basename(fn) for modname, name, _, filenames, _ in FORMATTERS.values(): for filename in filenames: - if fnmatch(fn, filename): + if _fn_matches(fn, filename): if name not in _formatter_cache: _load_formatters(modname) return _formatter_cache[name](**options) for cls in find_plugin_formatters(): for filename in cls.filenames: - if fnmatch(fn, filename): + if _fn_matches(fn, filename): return cls(**options) raise ClassNotFound("no formatter found for file name %r" % fn) diff --git a/src/pip/_vendor/pygments/formatters/_mapping.py b/src/pip/_vendor/pygments/formatters/_mapping.py index 6e34f960784..72ca84040b6 100644 --- a/src/pip/_vendor/pygments/formatters/_mapping.py +++ b/src/pip/_vendor/pygments/formatters/_mapping.py @@ -1,12 +1,12 @@ # Automatically generated by scripts/gen_mapfiles.py. -# DO NOT EDIT BY HAND; run `make mapfiles` instead. +# DO NOT EDIT BY HAND; run `tox -e mapfiles` instead. FORMATTERS = { 'BBCodeFormatter': ('pygments.formatters.bbcode', 'BBCode', ('bbcode', 'bb'), (), 'Format tokens with BBcodes. These formatting codes are used by many bulletin boards, so you can highlight your sourcecode with pygments before posting it there.'), 'BmpImageFormatter': ('pygments.formatters.img', 'img_bmp', ('bmp', 'bitmap'), ('*.bmp',), 'Create a bitmap image from source code. This uses the Python Imaging Library to generate a pixmap from the source code.'), 'GifImageFormatter': ('pygments.formatters.img', 'img_gif', ('gif',), ('*.gif',), 'Create a GIF image from source code. This uses the Python Imaging Library to generate a pixmap from the source code.'), 'GroffFormatter': ('pygments.formatters.groff', 'groff', ('groff', 'troff', 'roff'), (), 'Format tokens with groff escapes to change their color and font style.'), - 'HtmlFormatter': ('pygments.formatters.html', 'HTML', ('html',), ('*.html', '*.htm'), "Format tokens as HTML 4 ```` tags within a ``
`` tag, wrapped in a ``
`` tag. The ``
``'s CSS class can be set by the `cssclass` option."),
+    'HtmlFormatter': ('pygments.formatters.html', 'HTML', ('html',), ('*.html', '*.htm'), "Format tokens as HTML 4 ```` tags. By default, the content is enclosed in a ``
`` tag, itself wrapped in a ``
`` tag (but see the `nowrap` option). The ``
``'s CSS class can be set by the `cssclass` option."),
     'IRCFormatter': ('pygments.formatters.irc', 'IRC', ('irc', 'IRC'), (), 'Format tokens with IRC color sequences'),
     'ImageFormatter': ('pygments.formatters.img', 'img', ('img', 'IMG', 'png'), ('*.png',), 'Create a PNG image from source code. This uses the Python Imaging Library to generate a pixmap from the source code.'),
     'JpgImageFormatter': ('pygments.formatters.img', 'img_jpg', ('jpg', 'jpeg'), ('*.jpg',), 'Create a JPEG image from source code. This uses the Python Imaging Library to generate a pixmap from the source code.'),
diff --git a/src/pip/_vendor/pygments/formatters/bbcode.py b/src/pip/_vendor/pygments/formatters/bbcode.py
index 2be2b4e3129..c4db8f4ef21 100644
--- a/src/pip/_vendor/pygments/formatters/bbcode.py
+++ b/src/pip/_vendor/pygments/formatters/bbcode.py
@@ -4,7 +4,7 @@
 
     BBcode formatter.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/groff.py b/src/pip/_vendor/pygments/formatters/groff.py
index f3dcbce9b9f..30a528e668f 100644
--- a/src/pip/_vendor/pygments/formatters/groff.py
+++ b/src/pip/_vendor/pygments/formatters/groff.py
@@ -4,7 +4,7 @@
 
     Formatter for groff output.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -84,7 +84,7 @@ def _define_colors(self, outfile):
             if ndef['color'] is not None:
                 colors.add(ndef['color'])
 
-        for color in colors:
+        for color in sorted(colors):
             outfile.write('.defcolor ' + color + ' rgb #' + color + '\n')
 
 
diff --git a/src/pip/_vendor/pygments/formatters/html.py b/src/pip/_vendor/pygments/formatters/html.py
index f22b200c0e6..931d7c3fe29 100644
--- a/src/pip/_vendor/pygments/formatters/html.py
+++ b/src/pip/_vendor/pygments/formatters/html.py
@@ -4,7 +4,7 @@
 
     Formatter for HTML output.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -62,7 +62,7 @@ def _get_ttype_class(ttype):
 CSSFILE_TEMPLATE = '''\
 /*
 generated by Pygments 
-Copyright 2006-2022 by the Pygments team.
+Copyright 2006-2023 by the Pygments team.
 Licensed under the BSD license, see LICENSE for details.
 */
 %(styledefs)s
@@ -73,7 +73,7 @@ def _get_ttype_class(ttype):
    "http://www.w3.org/TR/html4/strict.dtd">
 
 
@@ -112,9 +112,9 @@ def _get_ttype_class(ttype):
 
 class HtmlFormatter(Formatter):
     r"""
-    Format tokens as HTML 4 ```` tags within a ``
`` tag, wrapped
-    in a ``
`` tag. The ``
``'s CSS class can be set by the `cssclass`
-    option.
+    Format tokens as HTML 4 ```` tags. By default, the content is enclosed
+    in a ``
`` tag, itself wrapped in a ``
`` tag (but see the `nowrap` option).
+    The ``
``'s CSS class can be set by the `cssclass` option.
 
     If the `linenos` option is set to ``"table"``, the ``
`` is
     additionally wrapped inside a ```` which has one row and two
@@ -140,8 +140,6 @@ class HtmlFormatter(Formatter):
 
     (whitespace added to improve clarity).
 
-    Wrapping can be disabled using the `nowrap` option.
-
     A list of lines can be specified using the `hl_lines` option to make these
     lines highlighted (as of Pygments 0.11).
 
@@ -187,8 +185,8 @@ class HtmlFormatter(Formatter):
     Additional options accepted:
 
     `nowrap`
-        If set to ``True``, don't wrap the tokens at all, not even inside a ``
``
-        tag. This disables most other options (default: ``False``).
+        If set to ``True``, don't add a ``
`` and a ``
`` tag
+        around the tokens. This disables most other options (default: ``False``).
 
     `full`
         Tells the formatter to output a "full" document, i.e. a complete
@@ -635,7 +633,7 @@ def _wrap_full(self, inner, outfile):
             # write CSS file only if noclobber_cssfile isn't given as an option.
             try:
                 if not os.path.exists(cssfilename) or not self.noclobber_cssfile:
-                    with open(cssfilename, "w") as cf:
+                    with open(cssfilename, "w", encoding="utf-8") as cf:
                         cf.write(CSSFILE_TEMPLATE %
                                  {'styledefs': self.get_style_defs('body')})
             except OSError as err:
@@ -721,7 +719,7 @@ def _wrap_tablelinenos(self, inner):
         yield 0, dummyoutfile.getvalue()
         yield 0, '
'
         yield 0, '
'
-        
+
 
     def _wrap_inlinelinenos(self, inner):
         # need a list of lines since we need the width of a single number :(
@@ -946,9 +944,9 @@ def wrap(self, source):
         output = source
         if self.wrapcode:
             output = self._wrap_code(output)
-        
+
         output = self._wrap_pre(output)
-    
+
         return output
 
     def format_unencoded(self, tokensource, outfile):
diff --git a/src/pip/_vendor/pygments/formatters/img.py b/src/pip/_vendor/pygments/formatters/img.py
index 0f36a32ba33..a338c1588fd 100644
--- a/src/pip/_vendor/pygments/formatters/img.py
+++ b/src/pip/_vendor/pygments/formatters/img.py
@@ -4,7 +4,7 @@
 
     Formatter for Pixmap output.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/irc.py b/src/pip/_vendor/pygments/formatters/irc.py
index 53e19b83d1e..2144d439e0f 100644
--- a/src/pip/_vendor/pygments/formatters/irc.py
+++ b/src/pip/_vendor/pygments/formatters/irc.py
@@ -4,7 +4,7 @@
 
     Formatter for IRC output
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/latex.py b/src/pip/_vendor/pygments/formatters/latex.py
index 4a7375a5ceb..ca539b40f6a 100644
--- a/src/pip/_vendor/pygments/formatters/latex.py
+++ b/src/pip/_vendor/pygments/formatters/latex.py
@@ -4,7 +4,7 @@
 
     Formatter for LaTeX fancyvrb output.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/other.py b/src/pip/_vendor/pygments/formatters/other.py
index 1e39cd42a8c..990ead48021 100644
--- a/src/pip/_vendor/pygments/formatters/other.py
+++ b/src/pip/_vendor/pygments/formatters/other.py
@@ -4,7 +4,7 @@
 
     Other formatters: NullFormatter, RawTokenFormatter.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/pangomarkup.py b/src/pip/_vendor/pygments/formatters/pangomarkup.py
index bd00866b8b9..6bb325d0788 100644
--- a/src/pip/_vendor/pygments/formatters/pangomarkup.py
+++ b/src/pip/_vendor/pygments/formatters/pangomarkup.py
@@ -4,7 +4,7 @@
 
     Formatter for Pango markup output.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/rtf.py b/src/pip/_vendor/pygments/formatters/rtf.py
index 4114d1688c3..125189c6fa5 100644
--- a/src/pip/_vendor/pygments/formatters/rtf.py
+++ b/src/pip/_vendor/pygments/formatters/rtf.py
@@ -4,7 +4,7 @@
 
     A formatter that generates RTF files.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/svg.py b/src/pip/_vendor/pygments/formatters/svg.py
index 075150a4b58..a8727ed8592 100644
--- a/src/pip/_vendor/pygments/formatters/svg.py
+++ b/src/pip/_vendor/pygments/formatters/svg.py
@@ -4,7 +4,7 @@
 
     Formatter for SVG output.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/terminal.py b/src/pip/_vendor/pygments/formatters/terminal.py
index e0bda16a236..abb8770811f 100644
--- a/src/pip/_vendor/pygments/formatters/terminal.py
+++ b/src/pip/_vendor/pygments/formatters/terminal.py
@@ -4,7 +4,7 @@
 
     Formatter for terminal output with ANSI sequences.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/terminal256.py b/src/pip/_vendor/pygments/formatters/terminal256.py
index 201b3c32832..0cfe5d1612e 100644
--- a/src/pip/_vendor/pygments/formatters/terminal256.py
+++ b/src/pip/_vendor/pygments/formatters/terminal256.py
@@ -10,7 +10,7 @@
 
     Formatter version 1.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/lexer.py b/src/pip/_vendor/pygments/lexer.py
index 74ab9b9088f..eb2c1b46b69 100644
--- a/src/pip/_vendor/pygments/lexer.py
+++ b/src/pip/_vendor/pygments/lexer.py
@@ -4,7 +4,7 @@
 
     Base lexer classes.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -50,7 +50,31 @@ class Lexer(metaclass=LexerMeta):
     """
     Lexer for a specific language.
 
-    Basic options recognized:
+    See also :doc:`lexerdevelopment`, a high-level guide to writing
+    lexers.
+
+    Lexer classes have attributes used for choosing the most appropriate
+    lexer based on various criteria.
+
+    .. autoattribute:: name
+       :no-value:
+    .. autoattribute:: aliases
+       :no-value:
+    .. autoattribute:: filenames
+       :no-value:
+    .. autoattribute:: alias_filenames
+    .. autoattribute:: mimetypes
+       :no-value:
+    .. autoattribute:: priority
+
+    Lexers included in Pygments should have an additional attribute:
+
+    .. autoattribute:: url
+       :no-value:
+
+    You can pass options to the constructor. The basic options recognized
+    by all lexers and processed by the base `Lexer` class are:
+
     ``stripnl``
         Strip leading and trailing newlines from the input (default: True).
     ``stripall``
@@ -74,28 +98,55 @@ class Lexer(metaclass=LexerMeta):
         Overrides the ``encoding`` if given.
     """
 
-    #: Name of the lexer
+    #: Full name of the lexer, in human-readable form
     name = None
 
-    #: URL of the language specification/definition
-    url = None
-
-    #: Shortcuts for the lexer
+    #: A list of short, unique identifiers that can be used to look
+    #: up the lexer from a list, e.g., using `get_lexer_by_name()`.
     aliases = []
 
-    #: File name globs
+    #: A list of `fnmatch` patterns that match filenames which contain
+    #: content for this lexer. The patterns in this list should be unique among
+    #: all lexers.
     filenames = []
 
-    #: Secondary file name globs
+    #: A list of `fnmatch` patterns that match filenames which may or may not
+    #: contain content for this lexer. This list is used by the
+    #: :func:`.guess_lexer_for_filename()` function, to determine which lexers
+    #: are then included in guessing the correct one. That means that
+    #: e.g. every lexer for HTML and a template language should include
+    #: ``\*.html`` in this list.
     alias_filenames = []
 
-    #: MIME types
+    #: A list of MIME types for content that can be lexed with this lexer.
     mimetypes = []
 
     #: Priority, should multiple lexers match and no content is provided
     priority = 0
 
+    #: URL of the language specification/definition. Used in the Pygments
+    #: documentation.
+    url = None
+
     def __init__(self, **options):
+        """
+        This constructor takes arbitrary options as keyword arguments.
+        Every subclass must first process its own options and then call
+        the `Lexer` constructor, since it processes the basic
+        options like `stripnl`.
+
+        An example looks like this:
+
+        .. sourcecode:: python
+
+           def __init__(self, **options):
+               self.compress = options.get('compress', '')
+               Lexer.__init__(self, **options)
+
+        As these options must all be specifiable as strings (due to the
+        command line usage), there are various utility functions
+        available to help with that, see `Utilities`_.
+        """
         self.options = options
         self.stripnl = get_bool_opt(options, 'stripnl', True)
         self.stripall = get_bool_opt(options, 'stripall', False)
@@ -124,10 +175,13 @@ def add_filter(self, filter_, **options):
 
     def analyse_text(text):
         """
-        Has to return a float between ``0`` and ``1`` that indicates
-        if a lexer wants to highlight this text. Used by ``guess_lexer``.
-        If this method returns ``0`` it won't highlight it in any case, if
-        it returns ``1`` highlighting with this lexer is guaranteed.
+        A static method which is called for lexer guessing.
+
+        It should analyse the text and return a float in the range
+        from ``0.0`` to ``1.0``.  If it returns ``0.0``, the lexer
+        will not be selected as the most probable one, if it returns
+        ``1.0``, it will be selected immediately.  This is used by
+        `guess_lexer`.
 
         The `LexerMeta` metaclass automatically wraps this function so
         that it works like a static method (no ``self`` or ``cls``
@@ -138,12 +192,17 @@ def analyse_text(text):
 
     def get_tokens(self, text, unfiltered=False):
         """
-        Return an iterable of (tokentype, value) pairs generated from
-        `text`. If `unfiltered` is set to `True`, the filtering mechanism
-        is bypassed even if filters are defined.
+        This method is the basic interface of a lexer. It is called by
+        the `highlight()` function. It must process the text and return an
+        iterable of ``(tokentype, value)`` pairs from `text`.
+
+        Normally, you don't need to override this method. The default
+        implementation processes the options recognized by all lexers
+        (`stripnl`, `stripall` and so on), and then yields all tokens
+        from `get_tokens_unprocessed()`, with the ``index`` dropped.
 
-        Also preprocess the text, i.e. expand tabs and strip it if
-        wanted and applies registered filters.
+        If `unfiltered` is set to `True`, the filtering mechanism is
+        bypassed even if filters are defined.
         """
         if not isinstance(text, str):
             if self.encoding == 'guess':
@@ -197,11 +256,12 @@ def streamer():
 
     def get_tokens_unprocessed(self, text):
         """
-        Return an iterable of (index, tokentype, value) pairs where "index"
-        is the starting position of the token within the input text.
+        This method should process the text and return an iterable of
+        ``(index, tokentype, value)`` tuples where ``index`` is the starting
+        position of the token within the input text.
 
-        In subclasses, implement this method as a generator to
-        maximize effectiveness.
+        It must be overridden by subclasses. It is recommended to
+        implement it as a generator to maximize effectiveness.
         """
         raise NotImplementedError
 
diff --git a/src/pip/_vendor/pygments/lexers/__init__.py b/src/pip/_vendor/pygments/lexers/__init__.py
index e75a05791e2..d97c3e395ed 100644
--- a/src/pip/_vendor/pygments/lexers/__init__.py
+++ b/src/pip/_vendor/pygments/lexers/__init__.py
@@ -4,13 +4,14 @@
 
     Pygments lexers.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+import re
 import sys
 import types
-from fnmatch import fnmatch
+import fnmatch
 from os.path import basename
 
 from pip._vendor.pygments.lexers._mapping import LEXERS
@@ -27,6 +28,16 @@
            'guess_lexer', 'load_lexer_from_file'] + list(LEXERS) + list(COMPAT)
 
 _lexer_cache = {}
+_pattern_cache = {}
+
+
+def _fn_matches(fn, glob):
+    """Return whether the supplied file name fn matches pattern filename."""
+    if glob not in _pattern_cache:
+        pattern = _pattern_cache[glob] = re.compile(fnmatch.translate(glob))
+        return pattern.match(fn)
+    return _pattern_cache[glob].match(fn)
+
 
 def _load_lexers(module_name):
     """Load a lexer (and all others in the module too)."""
@@ -51,9 +62,9 @@ def get_all_lexers(plugins=True):
 
 
 def find_lexer_class(name):
-    """Lookup a lexer class by name.
-
-    Return None if not found.
+    """
+    Return the `Lexer` subclass that with the *name* attribute as given by
+    the *name* argument.
     """
     if name in _lexer_cache:
         return _lexer_cache[name]
@@ -69,10 +80,15 @@ def find_lexer_class(name):
 
 
 def find_lexer_class_by_name(_alias):
-    """Lookup a lexer class by alias.
+    """
+    Return the `Lexer` subclass that has `alias` in its aliases list, without
+    instantiating it.
 
     Like `get_lexer_by_name`, but does not instantiate the class.
 
+    Will raise :exc:`pygments.util.ClassNotFound` if no lexer with that alias is
+    found.
+
     .. versionadded:: 2.2
     """
     if not _alias:
@@ -91,9 +107,13 @@ def find_lexer_class_by_name(_alias):
 
 
 def get_lexer_by_name(_alias, **options):
-    """Get a lexer by an alias.
+    """
+    Return an instance of a `Lexer` subclass that has `alias` in its
+    aliases list. The lexer is given the `options` at its
+    instantiation.
 
-    Raises ClassNotFound if not found.
+    Will raise :exc:`pygments.util.ClassNotFound` if no lexer with that alias is
+    found.
     """
     if not _alias:
         raise ClassNotFound('no lexer for alias %r found' % _alias)
@@ -158,13 +178,13 @@ def find_lexer_class_for_filename(_fn, code=None):
     fn = basename(_fn)
     for modname, name, _, filenames, _ in LEXERS.values():
         for filename in filenames:
-            if fnmatch(fn, filename):
+            if _fn_matches(fn, filename):
                 if name not in _lexer_cache:
                     _load_lexers(modname)
                 matches.append((_lexer_cache[name], filename))
     for cls in find_plugin_lexers():
         for filename in cls.filenames:
-            if fnmatch(fn, filename):
+            if _fn_matches(fn, filename):
                 matches.append((cls, filename))
 
     if isinstance(code, bytes):
@@ -192,10 +212,15 @@ def get_rating(info):
 def get_lexer_for_filename(_fn, code=None, **options):
     """Get a lexer for a filename.
 
-    If multiple lexers match the filename pattern, use ``analyse_text()`` to
-    figure out which one is more appropriate.
+    Return a `Lexer` subclass instance that has a filename pattern
+    matching `fn`. The lexer is given the `options` at its
+    instantiation.
 
-    Raises ClassNotFound if not found.
+    Raise :exc:`pygments.util.ClassNotFound` if no lexer for that filename
+    is found.
+
+    If multiple lexers match the filename pattern, use their ``analyse_text()``
+    methods to figure out which one is more appropriate.
     """
     res = find_lexer_class_for_filename(_fn, code)
     if not res:
@@ -204,9 +229,12 @@ def get_lexer_for_filename(_fn, code=None, **options):
 
 
 def get_lexer_for_mimetype(_mime, **options):
-    """Get a lexer for a mimetype.
+    """
+    Return a `Lexer` subclass instance that has `mime` in its mimetype
+    list. The lexer is given the `options` at its instantiation.
 
-    Raises ClassNotFound if not found.
+    Will raise :exc:`pygments.util.ClassNotFound` if not lexer for that mimetype
+    is found.
     """
     for modname, name, _, _, mimetypes in LEXERS.values():
         if _mime in mimetypes:
@@ -232,30 +260,22 @@ def _iter_lexerclasses(plugins=True):
 
 def guess_lexer_for_filename(_fn, _text, **options):
     """
-    Lookup all lexers that handle those filenames primary (``filenames``)
-    or secondary (``alias_filenames``). Then run a text analysis for those
-    lexers and choose the best result.
-
-    usage::
-
-        >>> from pygments.lexers import guess_lexer_for_filename
-        >>> guess_lexer_for_filename('hello.html', '<%= @foo %>')
-        
-        >>> guess_lexer_for_filename('hello.html', '
{{ title|e }}
')
-        
-        >>> guess_lexer_for_filename('style.css', 'a { color:  }')
-        
+    As :func:`guess_lexer()`, but only lexers which have a pattern in `filenames`
+    or `alias_filenames` that matches `filename` are taken into consideration.
+
+    :exc:`pygments.util.ClassNotFound` is raised if no lexer thinks it can
+    handle the content.
     """
     fn = basename(_fn)
     primary = {}
     matching_lexers = set()
     for lexer in _iter_lexerclasses():
         for filename in lexer.filenames:
-            if fnmatch(fn, filename):
+            if _fn_matches(fn, filename):
                 matching_lexers.add(lexer)
                 primary[lexer] = True
         for filename in lexer.alias_filenames:
-            if fnmatch(fn, filename):
+            if _fn_matches(fn, filename):
                 matching_lexers.add(lexer)
                 primary[lexer] = False
     if not matching_lexers:
@@ -282,7 +302,15 @@ def type_sort(t):
 
 
 def guess_lexer(_text, **options):
-    """Guess a lexer by strong distinctions in the text (eg, shebang)."""
+    """
+    Return a `Lexer` subclass instance that's guessed from the text in
+    `text`. For that, the :meth:`.analyse_text()` method of every known lexer
+    class is called with the text as argument, and the lexer which returned the
+    highest value will be instantiated and returned.
+
+    :exc:`pygments.util.ClassNotFound` is raised if no lexer thinks it can
+    handle the content.
+    """
 
     if not isinstance(_text, str):
         inencoding = options.get('inencoding', options.get('encoding'))
diff --git a/src/pip/_vendor/pygments/lexers/_mapping.py b/src/pip/_vendor/pygments/lexers/_mapping.py
index 1eaaf56e9c2..de6a0153b77 100644
--- a/src/pip/_vendor/pygments/lexers/_mapping.py
+++ b/src/pip/_vendor/pygments/lexers/_mapping.py
@@ -1,5 +1,5 @@
 # Automatically generated by scripts/gen_mapfiles.py.
-# DO NOT EDIT BY HAND; run `make mapfiles` instead.
+# DO NOT EDIT BY HAND; run `tox -e mapfiles` instead.
 
 LEXERS = {
     'ABAPLexer': ('pip._vendor.pygments.lexers.business', 'ABAP', ('abap',), ('*.abap', '*.ABAP'), ('text/x-abap',)),
@@ -71,6 +71,7 @@
     'CadlLexer': ('pip._vendor.pygments.lexers.archetype', 'cADL', ('cadl',), ('*.cadl',), ()),
     'CapDLLexer': ('pip._vendor.pygments.lexers.esoteric', 'CapDL', ('capdl',), ('*.cdl',), ()),
     'CapnProtoLexer': ('pip._vendor.pygments.lexers.capnproto', "Cap'n Proto", ('capnp',), ('*.capnp',), ()),
+    'CarbonLexer': ('pip._vendor.pygments.lexers.carbon', 'Carbon', ('carbon',), ('*.carbon',), ('text/x-carbon',)),
     'CbmBasicV2Lexer': ('pip._vendor.pygments.lexers.basic', 'CBM BASIC V2', ('cbmbas',), ('*.bas',), ()),
     'CddlLexer': ('pip._vendor.pygments.lexers.cddl', 'CDDL', ('cddl',), ('*.cddl',), ('text/x-cddl',)),
     'CeylonLexer': ('pip._vendor.pygments.lexers.jvm', 'Ceylon', ('ceylon',), ('*.ceylon',), ('text/x-ceylon',)),
@@ -121,6 +122,7 @@
     'DarcsPatchLexer': ('pip._vendor.pygments.lexers.diff', 'Darcs Patch', ('dpatch',), ('*.dpatch', '*.darcspatch'), ()),
     'DartLexer': ('pip._vendor.pygments.lexers.javascript', 'Dart', ('dart',), ('*.dart',), ('text/x-dart',)),
     'Dasm16Lexer': ('pip._vendor.pygments.lexers.asm', 'DASM16', ('dasm16',), ('*.dasm16', '*.dasm'), ('text/x-dasm16',)),
+    'DaxLexer': ('pip._vendor.pygments.lexers.dax', 'Dax', ('dax',), ('*.dax',), ()),
     'DebianControlLexer': ('pip._vendor.pygments.lexers.installers', 'Debian Control file', ('debcontrol', 'control'), ('control',), ()),
     'DelphiLexer': ('pip._vendor.pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
     'DevicetreeLexer': ('pip._vendor.pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
@@ -368,6 +370,7 @@
     'PortugolLexer': ('pip._vendor.pygments.lexers.pascal', 'Portugol', ('portugol',), ('*.alg', '*.portugol'), ()),
     'PostScriptLexer': ('pip._vendor.pygments.lexers.graphics', 'PostScript', ('postscript', 'postscr'), ('*.ps', '*.eps'), ('application/postscript',)),
     'PostgresConsoleLexer': ('pip._vendor.pygments.lexers.sql', 'PostgreSQL console (psql)', ('psql', 'postgresql-console', 'postgres-console'), (), ('text/x-postgresql-psql',)),
+    'PostgresExplainLexer': ('pip._vendor.pygments.lexers.sql', 'PostgreSQL EXPLAIN dialect', ('postgres-explain',), ('*.explain',), ('text/x-postgresql-explain',)),
     'PostgresLexer': ('pip._vendor.pygments.lexers.sql', 'PostgreSQL SQL dialect', ('postgresql', 'postgres'), (), ('text/x-postgresql',)),
     'PovrayLexer': ('pip._vendor.pygments.lexers.graphics', 'POVRay', ('pov',), ('*.pov', '*.inc'), ('text/x-povray',)),
     'PowerShellLexer': ('pip._vendor.pygments.lexers.shell', 'PowerShell', ('powershell', 'pwsh', 'posh', 'ps1', 'psm1'), ('*.ps1', '*.psm1'), ('text/x-powershell',)),
@@ -488,7 +491,7 @@
     'TeraTermLexer': ('pip._vendor.pygments.lexers.teraterm', 'Tera Term macro', ('teratermmacro', 'teraterm', 'ttl'), ('*.ttl',), ('text/x-teratermmacro',)),
     'TermcapLexer': ('pip._vendor.pygments.lexers.configs', 'Termcap', ('termcap',), ('termcap', 'termcap.src'), ()),
     'TerminfoLexer': ('pip._vendor.pygments.lexers.configs', 'Terminfo', ('terminfo',), ('terminfo', 'terminfo.src'), ()),
-    'TerraformLexer': ('pip._vendor.pygments.lexers.configs', 'Terraform', ('terraform', 'tf'), ('*.tf',), ('application/x-tf', 'application/x-terraform')),
+    'TerraformLexer': ('pip._vendor.pygments.lexers.configs', 'Terraform', ('terraform', 'tf', 'hcl'), ('*.tf', '*.hcl'), ('application/x-tf', 'application/x-terraform')),
     'TexLexer': ('pip._vendor.pygments.lexers.markup', 'TeX', ('tex', 'latex'), ('*.tex', '*.aux', '*.toc'), ('text/x-tex', 'text/x-latex')),
     'TextLexer': ('pip._vendor.pygments.lexers.special', 'Text only', ('text',), ('*.txt',), ('text/plain',)),
     'ThingsDBLexer': ('pip._vendor.pygments.lexers.thingsdb', 'ThingsDB', ('ti', 'thingsdb'), ('*.ti',), ()),
@@ -528,7 +531,9 @@
     'WDiffLexer': ('pip._vendor.pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
     'WatLexer': ('pip._vendor.pygments.lexers.webassembly', 'WebAssembly', ('wast', 'wat'), ('*.wat', '*.wast'), ()),
     'WebIDLLexer': ('pip._vendor.pygments.lexers.webidl', 'Web IDL', ('webidl',), ('*.webidl',), ()),
+    'WgslLexer': ('pip._vendor.pygments.lexers.wgsl', 'WebGPU Shading Language', ('wgsl',), ('*.wgsl',), ('text/wgsl',)),
     'WhileyLexer': ('pip._vendor.pygments.lexers.whiley', 'Whiley', ('whiley',), ('*.whiley',), ('text/x-whiley',)),
+    'WikitextLexer': ('pip._vendor.pygments.lexers.markup', 'Wikitext', ('wikitext', 'mediawiki'), (), ('text/x-wiki',)),
     'WoWTocLexer': ('pip._vendor.pygments.lexers.wowtoc', 'World of Warcraft TOC', ('wowtoc',), ('*.toc',), ()),
     'WrenLexer': ('pip._vendor.pygments.lexers.wren', 'Wren', ('wren',), ('*.wren',), ()),
     'X10Lexer': ('pip._vendor.pygments.lexers.x10', 'X10', ('x10', 'xten'), ('*.x10',), ('text/x-x10',)),
@@ -540,6 +545,7 @@
     'XmlPhpLexer': ('pip._vendor.pygments.lexers.templates', 'XML+PHP', ('xml+php',), (), ('application/xml+php',)),
     'XmlSmartyLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Smarty', ('xml+smarty',), (), ('application/xml+smarty',)),
     'XorgLexer': ('pip._vendor.pygments.lexers.xorg', 'Xorg', ('xorg.conf',), ('xorg.conf',), ()),
+    'XppLexer': ('pip._vendor.pygments.lexers.dotnet', 'X++', ('xpp', 'x++'), ('*.xpp',), ()),
     'XsltLexer': ('pip._vendor.pygments.lexers.html', 'XSLT', ('xslt',), ('*.xsl', '*.xslt', '*.xpl'), ('application/xsl+xml', 'application/xslt+xml')),
     'XtendLexer': ('pip._vendor.pygments.lexers.jvm', 'Xtend', ('xtend',), ('*.xtend',), ('text/x-xtend',)),
     'XtlangLexer': ('pip._vendor.pygments.lexers.lisp', 'xtlang', ('extempore',), ('*.xtm',), ()),
diff --git a/src/pip/_vendor/pygments/lexers/python.py b/src/pip/_vendor/pygments/lexers/python.py
index 3341a382685..e9bf2d33727 100644
--- a/src/pip/_vendor/pygments/lexers/python.py
+++ b/src/pip/_vendor/pygments/lexers/python.py
@@ -4,15 +4,15 @@
 
     Lexers for Python and related languages.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 import re
 import keyword
 
-from pip._vendor.pygments.lexer import Lexer, RegexLexer, include, bygroups, using, \
-    default, words, combined, do_insertions, this, line_re
+from pip._vendor.pygments.lexer import DelegatingLexer, Lexer, RegexLexer, include, \
+    bygroups, using, default, words, combined, do_insertions, this, line_re
 from pip._vendor.pygments.util import get_bool_opt, shebang_matches
 from pip._vendor.pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Other, Error, Whitespace
@@ -234,16 +234,16 @@ def fstring_rules(ttype):
         ],
         'builtins': [
             (words((
-                '__import__', 'abs', 'all', 'any', 'bin', 'bool', 'bytearray',
-                'breakpoint', 'bytes', 'chr', 'classmethod', 'compile', 'complex',
-                'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'filter',
-                'float', 'format', 'frozenset', 'getattr', 'globals', 'hasattr',
-                'hash', 'hex', 'id', 'input', 'int', 'isinstance', 'issubclass',
-                'iter', 'len', 'list', 'locals', 'map', 'max', 'memoryview',
-                'min', 'next', 'object', 'oct', 'open', 'ord', 'pow', 'print',
-                'property', 'range', 'repr', 'reversed', 'round', 'set', 'setattr',
-                'slice', 'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple',
-                'type', 'vars', 'zip'), prefix=r'(?>> )(.*\n)', bygroups(Generic.Prompt, Other.Code), 'continuations'),
+            # This happens, e.g., when tracebacks are embedded in documentation;
+            # trailing whitespaces are often stripped in such contexts.
+            (r'(>>>)(\n)', bygroups(Generic.Prompt, Whitespace)),
+            (r'(\^C)?Traceback \(most recent call last\):\n', Other.Traceback, 'traceback'),
+            # SyntaxError starts with this
+            (r'  File "[^"]+", line \d+', Other.Traceback, 'traceback'),
+            (r'.*\n', Generic.Output),
+        ],
+        'continuations': [
+            (r'(\.\.\. )(.*\n)', bygroups(Generic.Prompt, Other.Code)),
+            # See above.
+            (r'(\.\.\.)(\n)', bygroups(Generic.Prompt, Whitespace)),
+            default('#pop'),
+        ],
+        'traceback': [
+            # As soon as we see a traceback, consume everything until the next
+            # >>> prompt.
+            (r'(?=>>>( |$))', Text, '#pop'),
+            (r'(KeyboardInterrupt)(\n)', bygroups(Name.Class, Whitespace)),
+            (r'.*\n', Other.Traceback),
+        ],
+    }
 
-class PythonConsoleLexer(Lexer):
+class PythonConsoleLexer(DelegatingLexer):
     """
     For Python console output or doctests, such as:
 
     .. sourcecode:: pycon
 
         >>> a = 'foo'
-        >>> print a
+        >>> print(a)
         foo
         >>> 1 / 0
         Traceback (most recent call last):
@@ -659,70 +694,28 @@ class PythonConsoleLexer(Lexer):
         .. versionchanged:: 2.5
            Now defaults to ``True``.
     """
+
     name = 'Python console session'
     aliases = ['pycon']
     mimetypes = ['text/x-python-doctest']
 
     def __init__(self, **options):
-        self.python3 = get_bool_opt(options, 'python3', True)
-        Lexer.__init__(self, **options)
-
-    def get_tokens_unprocessed(self, text):
-        if self.python3:
-            pylexer = PythonLexer(**self.options)
-            tblexer = PythonTracebackLexer(**self.options)
+        python3 = get_bool_opt(options, 'python3', True)
+        if python3:
+            pylexer = PythonLexer
+            tblexer = PythonTracebackLexer
         else:
-            pylexer = Python2Lexer(**self.options)
-            tblexer = Python2TracebackLexer(**self.options)
-
-        curcode = ''
-        insertions = []
-        curtb = ''
-        tbindex = 0
-        tb = 0
-        for match in line_re.finditer(text):
-            line = match.group()
-            if line.startswith('>>> ') or line.startswith('... '):
-                tb = 0
-                insertions.append((len(curcode),
-                                   [(0, Generic.Prompt, line[:4])]))
-                curcode += line[4:]
-            elif line.rstrip() == '...' and not tb:
-                # only a new >>> prompt can end an exception block
-                # otherwise an ellipsis in place of the traceback frames
-                # will be mishandled
-                insertions.append((len(curcode),
-                                   [(0, Generic.Prompt, '...')]))
-                curcode += line[3:]
-            else:
-                if curcode:
-                    yield from do_insertions(
-                        insertions, pylexer.get_tokens_unprocessed(curcode))
-                    curcode = ''
-                    insertions = []
-                if (line.startswith('Traceback (most recent call last):') or
-                        re.match('  File "[^"]+", line \\d+\\n$', line)):
-                    tb = 1
-                    curtb = line
-                    tbindex = match.start()
-                elif line == 'KeyboardInterrupt\n':
-                    yield match.start(), Name.Class, line
-                elif tb:
-                    curtb += line
-                    if not (line.startswith(' ') or line.strip() == '...'):
-                        tb = 0
-                        for i, t, v in tblexer.get_tokens_unprocessed(curtb):
-                            yield tbindex+i, t, v
-                        curtb = ''
-                else:
-                    yield match.start(), Generic.Output, line
-        if curcode:
-            yield from do_insertions(insertions,
-                                     pylexer.get_tokens_unprocessed(curcode))
-        if curtb:
-            for i, t, v in tblexer.get_tokens_unprocessed(curtb):
-                yield tbindex+i, t, v
-
+            pylexer = Python2Lexer
+            tblexer = Python2TracebackLexer
+        # We have two auxiliary lexers. Use DelegatingLexer twice with
+        # different tokens.  TODO: DelegatingLexer should support this
+        # directly, by accepting a tuplet of auxiliary lexers and a tuple of
+        # distinguishing tokens. Then we wouldn't need this intermediary
+        # class.
+        class _ReplaceInnerCode(DelegatingLexer):
+            def __init__(self, **options):
+                super().__init__(pylexer, _PythonConsoleLexerBase, Other.Code, **options)
+        super().__init__(tblexer, _ReplaceInnerCode, Other.Traceback, **options)
 
 class PythonTracebackLexer(RegexLexer):
     """
@@ -743,7 +736,7 @@ class PythonTracebackLexer(RegexLexer):
     tokens = {
         'root': [
             (r'\n', Whitespace),
-            (r'^Traceback \(most recent call last\):\n', Generic.Traceback, 'intb'),
+            (r'^(\^C)?Traceback \(most recent call last\):\n', Generic.Traceback, 'intb'),
             (r'^During handling of the above exception, another '
              r'exception occurred:\n\n', Generic.Traceback),
             (r'^The above exception was the direct cause of the '
@@ -763,7 +756,8 @@ class PythonTracebackLexer(RegexLexer):
             (r'^([^:]+)(: )(.+)(\n)',
              bygroups(Generic.Error, Text, Name, Whitespace), '#pop'),
             (r'^([a-zA-Z_][\w.]*)(:?\n)',
-             bygroups(Generic.Error, Whitespace), '#pop')
+             bygroups(Generic.Error, Whitespace), '#pop'),
+            default('#pop'),
         ],
         'markers': [
             # Either `PEP 657 `
diff --git a/src/pip/_vendor/pygments/modeline.py b/src/pip/_vendor/pygments/modeline.py
index 43630835ca6..7b6f6a324ba 100644
--- a/src/pip/_vendor/pygments/modeline.py
+++ b/src/pip/_vendor/pygments/modeline.py
@@ -4,7 +4,7 @@
 
     A simple modeline parser (based on pymodeline).
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/plugin.py b/src/pip/_vendor/pygments/plugin.py
index 3590bee8d29..7b722d58db0 100644
--- a/src/pip/_vendor/pygments/plugin.py
+++ b/src/pip/_vendor/pygments/plugin.py
@@ -34,7 +34,7 @@
         yourfilter = yourfilter:YourFilter
 
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/regexopt.py b/src/pip/_vendor/pygments/regexopt.py
index ae0079199b9..45223eccc10 100644
--- a/src/pip/_vendor/pygments/regexopt.py
+++ b/src/pip/_vendor/pygments/regexopt.py
@@ -5,7 +5,7 @@
     An algorithm that generates optimized regexes for matching long lists of
     literal strings.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/scanner.py b/src/pip/_vendor/pygments/scanner.py
index d47ed4828a0..32a2f303296 100644
--- a/src/pip/_vendor/pygments/scanner.py
+++ b/src/pip/_vendor/pygments/scanner.py
@@ -11,7 +11,7 @@
     Have a look at the `DelphiLexer` to get an idea of how to use
     this scanner.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
diff --git a/src/pip/_vendor/pygments/sphinxext.py b/src/pip/_vendor/pygments/sphinxext.py
index 3537ecdb26f..2c7facde830 100644
--- a/src/pip/_vendor/pygments/sphinxext.py
+++ b/src/pip/_vendor/pygments/sphinxext.py
@@ -5,7 +5,7 @@
     Sphinx extension to generate automatic documentation of lexers,
     formatters and filters.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/style.py b/src/pip/_vendor/pygments/style.py
index 84abbc20599..edc19627dba 100644
--- a/src/pip/_vendor/pygments/style.py
+++ b/src/pip/_vendor/pygments/style.py
@@ -4,7 +4,7 @@
 
     Basic style object.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/styles/__init__.py b/src/pip/_vendor/pygments/styles/__init__.py
index 44cc0efb086..7401cf5d3a3 100644
--- a/src/pip/_vendor/pygments/styles/__init__.py
+++ b/src/pip/_vendor/pygments/styles/__init__.py
@@ -4,15 +4,15 @@
 
     Contains built-in styles.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
 from pip._vendor.pygments.plugin import find_plugin_styles
 from pip._vendor.pygments.util import ClassNotFound
 
-
-#: Maps style names to 'submodule::classname'.
+#: A dictionary of built-in styles, mapping style names to
+#: ``'submodule::classname'`` strings.
 STYLE_MAP = {
     'default':  'default::DefaultStyle',
     'emacs':    'emacs::EmacsStyle',
@@ -66,6 +66,13 @@
 
 
 def get_style_by_name(name):
+    """
+    Return a style class by its short name. The names of the builtin styles
+    are listed in :data:`pygments.styles.STYLE_MAP`.
+
+    Will raise :exc:`pygments.util.ClassNotFound` if no style of that name is
+    found.
+    """
     if name in STYLE_MAP:
         mod, cls = STYLE_MAP[name].split('::')
         builtin = "yes"
@@ -90,8 +97,7 @@ def get_style_by_name(name):
 
 
 def get_all_styles():
-    """Return a generator for all styles by name,
-    both builtin and plugin."""
+    """Return a generator for all styles by name, both builtin and plugin."""
     yield from STYLE_MAP
     for name, _ in find_plugin_styles():
         yield name
diff --git a/src/pip/_vendor/pygments/token.py b/src/pip/_vendor/pygments/token.py
index e3e565ad591..7395cb6a620 100644
--- a/src/pip/_vendor/pygments/token.py
+++ b/src/pip/_vendor/pygments/token.py
@@ -4,7 +4,7 @@
 
     Basic token types and the standard tokens.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/unistring.py b/src/pip/_vendor/pygments/unistring.py
index 2e3c80869d9..39f6baeedfb 100644
--- a/src/pip/_vendor/pygments/unistring.py
+++ b/src/pip/_vendor/pygments/unistring.py
@@ -7,7 +7,7 @@
 
     Inspired by chartypes_create.py from the MoinMoin project.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -112,7 +112,7 @@ def _handle_runs(char_list):  # pragma: no cover
 
     categories = {'xid_start': [], 'xid_continue': []}
 
-    with open(__file__) as fp:
+    with open(__file__, encoding='utf-8') as fp:
         content = fp.read()
 
     header = content[:content.find('Cc =')]
@@ -136,7 +136,7 @@ def _handle_runs(char_list):  # pragma: no cover
         if ('a' + c).isidentifier():
             categories['xid_continue'].append(c)
 
-    with open(__file__, 'w') as fp:
+    with open(__file__, 'w', encoding='utf-8') as fp:
         fp.write(header)
 
         for cat in sorted(categories):
diff --git a/src/pip/_vendor/pygments/util.py b/src/pip/_vendor/pygments/util.py
index 8032962dc99..941fdb9ec7a 100644
--- a/src/pip/_vendor/pygments/util.py
+++ b/src/pip/_vendor/pygments/util.py
@@ -4,7 +4,7 @@
 
     Utility functions.
 
-    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -32,10 +32,16 @@ class ClassNotFound(ValueError):
 
 
 class OptionError(Exception):
-    pass
-
+    """
+    This exception will be raised by all option processing functions if
+    the type or value of the argument is not correct.
+    """
 
 def get_choice_opt(options, optname, allowed, default=None, normcase=False):
+    """
+    If the key `optname` from the dictionary is not in the sequence
+    `allowed`, raise an error, otherwise return it.
+    """
     string = options.get(optname, default)
     if normcase:
         string = string.lower()
@@ -46,6 +52,17 @@ def get_choice_opt(options, optname, allowed, default=None, normcase=False):
 
 
 def get_bool_opt(options, optname, default=None):
+    """
+    Intuitively, this is `options.get(optname, default)`, but restricted to
+    Boolean value. The Booleans can be represented as string, in order to accept
+    Boolean value from the command line arguments. If the key `optname` is
+    present in the dictionary `options` and is not associated with a Boolean,
+    raise an `OptionError`. If it is absent, `default` is returned instead.
+
+    The valid string values for ``True`` are ``1``, ``yes``, ``true`` and
+    ``on``, the ones for ``False`` are ``0``, ``no``, ``false`` and ``off``
+    (matched case-insensitively).
+    """
     string = options.get(optname, default)
     if isinstance(string, bool):
         return string
@@ -66,6 +83,7 @@ def get_bool_opt(options, optname, default=None):
 
 
 def get_int_opt(options, optname, default=None):
+    """As :func:`get_bool_opt`, but interpret the value as an integer."""
     string = options.get(optname, default)
     try:
         return int(string)
@@ -78,8 +96,12 @@ def get_int_opt(options, optname, default=None):
                           'must give an integer value' % (
                               string, optname))
 
-
 def get_list_opt(options, optname, default=None):
+    """
+    If the key `optname` from the dictionary `options` is a string,
+    split it at whitespace and return it. If it is already a list
+    or a tuple, it is returned as a list.
+    """
     val = options.get(optname, default)
     if isinstance(val, str):
         return val.split()
diff --git a/src/pip/_vendor/pyparsing/__init__.py b/src/pip/_vendor/pyparsing/__init__.py
index 75372500ed9..88bc10ac18a 100644
--- a/src/pip/_vendor/pyparsing/__init__.py
+++ b/src/pip/_vendor/pyparsing/__init__.py
@@ -56,7 +56,7 @@
 :class:`'|'`, :class:`'^'` and :class:`'&'` operators.
 
 The :class:`ParseResults` object returned from
-:class:`ParserElement.parseString` can be
+:class:`ParserElement.parse_string` can be
 accessed as a nested list, a dictionary, or an object with named
 attributes.
 
@@ -85,11 +85,11 @@
    and :class:`'&'` operators to combine simple expressions into
    more complex ones
  - associate names with your parsed results using
-   :class:`ParserElement.setResultsName`
+   :class:`ParserElement.set_results_name`
  - access the parsed data, which is returned as a :class:`ParseResults`
    object
- - find some helpful expression short-cuts like :class:`delimitedList`
-   and :class:`oneOf`
+ - find some helpful expression short-cuts like :class:`DelimitedList`
+   and :class:`one_of`
  - find more useful common expressions in the :class:`pyparsing_common`
    namespace class
 """
@@ -106,30 +106,22 @@ class version_info(NamedTuple):
     @property
     def __version__(self):
         return (
-            "{}.{}.{}".format(self.major, self.minor, self.micro)
+            f"{self.major}.{self.minor}.{self.micro}"
             + (
-                "{}{}{}".format(
-                    "r" if self.releaselevel[0] == "c" else "",
-                    self.releaselevel[0],
-                    self.serial,
-                ),
+                f"{'r' if self.releaselevel[0] == 'c' else ''}{self.releaselevel[0]}{self.serial}",
                 "",
             )[self.releaselevel == "final"]
         )
 
     def __str__(self):
-        return "{} {} / {}".format(__name__, self.__version__, __version_time__)
+        return f"{__name__} {self.__version__} / {__version_time__}"
 
     def __repr__(self):
-        return "{}.{}({})".format(
-            __name__,
-            type(self).__name__,
-            ", ".join("{}={!r}".format(*nv) for nv in zip(self._fields, self)),
-        )
+        return f"{__name__}.{type(self).__name__}({', '.join('{}={!r}'.format(*nv) for nv in zip(self._fields, self))})"
 
 
-__version_info__ = version_info(3, 0, 9, "final", 0)
-__version_time__ = "05 May 2022 07:02 UTC"
+__version_info__ = version_info(3, 1, 0, "final", 1)
+__version_time__ = "18 Jun 2023 14:05 UTC"
 __version__ = __version_info__.__version__
 __versionTime__ = __version_time__
 __author__ = "Paul McGuire "
@@ -139,9 +131,9 @@ def __repr__(self):
 from .actions import *
 from .core import __diag__, __compat__
 from .results import *
-from .core import *
+from .core import *  # type: ignore[misc, assignment]
 from .core import _builtin_exprs as core_builtin_exprs
-from .helpers import *
+from .helpers import *  # type: ignore[misc, assignment]
 from .helpers import _builtin_exprs as helper_builtin_exprs
 
 from .unicode import unicode_set, UnicodeRangeList, pyparsing_unicode as unicode
@@ -153,11 +145,11 @@ def __repr__(self):
 
 # define backward compat synonyms
 if "pyparsing_unicode" not in globals():
-    pyparsing_unicode = unicode
+    pyparsing_unicode = unicode  # type: ignore[misc]
 if "pyparsing_common" not in globals():
-    pyparsing_common = common
+    pyparsing_common = common  # type: ignore[misc]
 if "pyparsing_test" not in globals():
-    pyparsing_test = testing
+    pyparsing_test = testing  # type: ignore[misc]
 
 core_builtin_exprs += common_builtin_exprs + helper_builtin_exprs
 
@@ -174,7 +166,9 @@ def __repr__(self):
     "CaselessKeyword",
     "CaselessLiteral",
     "CharsNotIn",
+    "CloseMatch",
     "Combine",
+    "DelimitedList",
     "Dict",
     "Each",
     "Empty",
@@ -227,9 +221,11 @@ def __repr__(self):
     "alphas8bit",
     "any_close_tag",
     "any_open_tag",
+    "autoname_elements",
     "c_style_comment",
     "col",
     "common_html_entity",
+    "condition_as_parse_action",
     "counted_array",
     "cpp_style_comment",
     "dbl_quoted_string",
@@ -241,6 +237,7 @@ def __repr__(self):
     "html_comment",
     "identchars",
     "identbodychars",
+    "infix_notation",
     "java_style_comment",
     "line",
     "line_end",
@@ -255,8 +252,12 @@ def __repr__(self):
     "null_debug_action",
     "nums",
     "one_of",
+    "original_text_for",
     "printables",
     "punc8bit",
+    "pyparsing_common",
+    "pyparsing_test",
+    "pyparsing_unicode",
     "python_style_comment",
     "quoted_string",
     "remove_quotes",
@@ -267,28 +268,20 @@ def __repr__(self):
     "srange",
     "string_end",
     "string_start",
+    "token_map",
     "trace_parse_action",
+    "ungroup",
+    "unicode_set",
     "unicode_string",
     "with_attribute",
-    "indentedBlock",
-    "original_text_for",
-    "ungroup",
-    "infix_notation",
-    "locatedExpr",
     "with_class",
-    "CloseMatch",
-    "token_map",
-    "pyparsing_common",
-    "pyparsing_unicode",
-    "unicode_set",
-    "condition_as_parse_action",
-    "pyparsing_test",
     # pre-PEP8 compatibility names
     "__versionTime__",
     "anyCloseTag",
     "anyOpenTag",
     "cStyleComment",
     "commonHTMLEntity",
+    "conditionAsParseAction",
     "countedArray",
     "cppStyleComment",
     "dblQuotedString",
@@ -296,9 +289,12 @@ def __repr__(self):
     "delimitedList",
     "dictOf",
     "htmlComment",
+    "indentedBlock",
+    "infixNotation",
     "javaStyleComment",
     "lineEnd",
     "lineStart",
+    "locatedExpr",
     "makeHTMLTags",
     "makeXMLTags",
     "matchOnlyAtCol",
@@ -308,6 +304,7 @@ def __repr__(self):
     "nullDebugAction",
     "oneOf",
     "opAssoc",
+    "originalTextFor",
     "pythonStyleComment",
     "quotedString",
     "removeQuotes",
@@ -317,15 +314,9 @@ def __repr__(self):
     "sglQuotedString",
     "stringEnd",
     "stringStart",
+    "tokenMap",
     "traceParseAction",
     "unicodeString",
     "withAttribute",
-    "indentedBlock",
-    "originalTextFor",
-    "infixNotation",
-    "locatedExpr",
     "withClass",
-    "tokenMap",
-    "conditionAsParseAction",
-    "autoname_elements",
 ]
diff --git a/src/pip/_vendor/pyparsing/actions.py b/src/pip/_vendor/pyparsing/actions.py
index f72c66e7431..ca6e4c6afb4 100644
--- a/src/pip/_vendor/pyparsing/actions.py
+++ b/src/pip/_vendor/pyparsing/actions.py
@@ -1,7 +1,7 @@
 # actions.py
 
 from .exceptions import ParseException
-from .util import col
+from .util import col, replaced_by_pep8
 
 
 class OnlyOnce:
@@ -38,7 +38,7 @@ def match_only_at_col(n):
 
     def verify_col(strg, locn, toks):
         if col(locn, strg) != n:
-            raise ParseException(strg, locn, "matched token not at column {}".format(n))
+            raise ParseException(strg, locn, f"matched token not at column {n}")
 
     return verify_col
 
@@ -148,15 +148,13 @@ def pa(s, l, tokens):
                 raise ParseException(
                     s,
                     l,
-                    "attribute {!r} has value {!r}, must be {!r}".format(
-                        attrName, tokens[attrName], attrValue
-                    ),
+                    f"attribute {attrName!r} has value {tokens[attrName]!r}, must be {attrValue!r}",
                 )
 
     return pa
 
 
-with_attribute.ANY_VALUE = object()
+with_attribute.ANY_VALUE = object()  # type: ignore [attr-defined]
 
 
 def with_class(classname, namespace=""):
@@ -195,13 +193,25 @@ def with_class(classname, namespace=""):
         1 4 0 1 0
         1,3 2,3 1,1
     """
-    classattr = "{}:class".format(namespace) if namespace else "class"
+    classattr = f"{namespace}:class" if namespace else "class"
     return with_attribute(**{classattr: classname})
 
 
 # pre-PEP8 compatibility symbols
-replaceWith = replace_with
-removeQuotes = remove_quotes
-withAttribute = with_attribute
-withClass = with_class
-matchOnlyAtCol = match_only_at_col
+# fmt: off
+@replaced_by_pep8(replace_with)
+def replaceWith(): ...
+
+@replaced_by_pep8(remove_quotes)
+def removeQuotes(): ...
+
+@replaced_by_pep8(with_attribute)
+def withAttribute(): ...
+
+@replaced_by_pep8(with_class)
+def withClass(): ...
+
+@replaced_by_pep8(match_only_at_col)
+def matchOnlyAtCol(): ...
+
+# fmt: on
diff --git a/src/pip/_vendor/pyparsing/common.py b/src/pip/_vendor/pyparsing/common.py
index 1859fb79cc4..7a666b276df 100644
--- a/src/pip/_vendor/pyparsing/common.py
+++ b/src/pip/_vendor/pyparsing/common.py
@@ -1,6 +1,6 @@
 # common.py
 from .core import *
-from .helpers import delimited_list, any_open_tag, any_close_tag
+from .helpers import DelimitedList, any_open_tag, any_close_tag
 from datetime import datetime
 
 
@@ -22,17 +22,17 @@ class pyparsing_common:
 
     Parse actions:
 
-    - :class:`convertToInteger`
-    - :class:`convertToFloat`
-    - :class:`convertToDate`
-    - :class:`convertToDatetime`
-    - :class:`stripHTMLTags`
-    - :class:`upcaseTokens`
-    - :class:`downcaseTokens`
+    - :class:`convert_to_integer`
+    - :class:`convert_to_float`
+    - :class:`convert_to_date`
+    - :class:`convert_to_datetime`
+    - :class:`strip_html_tags`
+    - :class:`upcase_tokens`
+    - :class:`downcase_tokens`
 
     Example::
 
-        pyparsing_common.number.runTests('''
+        pyparsing_common.number.run_tests('''
             # any int or real number, returned as the appropriate type
             100
             -100
@@ -42,7 +42,7 @@ class pyparsing_common:
             1e-12
             ''')
 
-        pyparsing_common.fnumber.runTests('''
+        pyparsing_common.fnumber.run_tests('''
             # any int or real number, returned as float
             100
             -100
@@ -52,19 +52,19 @@ class pyparsing_common:
             1e-12
             ''')
 
-        pyparsing_common.hex_integer.runTests('''
+        pyparsing_common.hex_integer.run_tests('''
             # hex numbers
             100
             FF
             ''')
 
-        pyparsing_common.fraction.runTests('''
+        pyparsing_common.fraction.run_tests('''
             # fractions
             1/2
             -3/4
             ''')
 
-        pyparsing_common.mixed_integer.runTests('''
+        pyparsing_common.mixed_integer.run_tests('''
             # mixed fractions
             1
             1/2
@@ -73,8 +73,8 @@ class pyparsing_common:
             ''')
 
         import uuid
-        pyparsing_common.uuid.setParseAction(tokenMap(uuid.UUID))
-        pyparsing_common.uuid.runTests('''
+        pyparsing_common.uuid.set_parse_action(token_map(uuid.UUID))
+        pyparsing_common.uuid.run_tests('''
             # uuid
             12345678-1234-5678-1234-567812345678
             ''')
@@ -260,8 +260,8 @@ def convert_to_date(fmt: str = "%Y-%m-%d"):
         Example::
 
             date_expr = pyparsing_common.iso8601_date.copy()
-            date_expr.setParseAction(pyparsing_common.convertToDate())
-            print(date_expr.parseString("1999-12-31"))
+            date_expr.set_parse_action(pyparsing_common.convert_to_date())
+            print(date_expr.parse_string("1999-12-31"))
 
         prints::
 
@@ -287,8 +287,8 @@ def convert_to_datetime(fmt: str = "%Y-%m-%dT%H:%M:%S.%f"):
         Example::
 
             dt_expr = pyparsing_common.iso8601_datetime.copy()
-            dt_expr.setParseAction(pyparsing_common.convertToDatetime())
-            print(dt_expr.parseString("1999-12-31T23:59:59.999"))
+            dt_expr.set_parse_action(pyparsing_common.convert_to_datetime())
+            print(dt_expr.parse_string("1999-12-31T23:59:59.999"))
 
         prints::
 
@@ -326,9 +326,9 @@ def strip_html_tags(s: str, l: int, tokens: ParseResults):
 
             # strip HTML links from normal text
             text = 'More info at the pyparsing wiki page'
-            td, td_end = makeHTMLTags("TD")
-            table_text = td + SkipTo(td_end).setParseAction(pyparsing_common.stripHTMLTags)("body") + td_end
-            print(table_text.parseString(text).body)
+            td, td_end = make_html_tags("TD")
+            table_text = td + SkipTo(td_end).set_parse_action(pyparsing_common.strip_html_tags)("body") + td_end
+            print(table_text.parse_string(text).body)
 
         Prints::
 
@@ -348,7 +348,7 @@ def strip_html_tags(s: str, l: int, tokens: ParseResults):
         .streamline()
         .set_name("commaItem")
     )
-    comma_separated_list = delimited_list(
+    comma_separated_list = DelimitedList(
         Opt(quoted_string.copy() | _commasepitem, default="")
     ).set_name("comma separated list")
     """Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
@@ -363,7 +363,7 @@ def strip_html_tags(s: str, l: int, tokens: ParseResults):
     url = Regex(
         # https://mathiasbynens.be/demo/url-regex
         # https://gist.github.com/dperini/729294
-        r"^" +
+        r"(?P" +
         # protocol identifier (optional)
         # short syntax // still required
         r"(?:(?:(?Phttps?|ftp):)?\/\/)" +
@@ -405,18 +405,26 @@ def strip_html_tags(s: str, l: int, tokens: ParseResults):
         r"(\?(?P[^#]*))?" +
         # fragment (optional)
         r"(#(?P\S*))?" +
-        r"$"
+        r")"
     ).set_name("url")
+    """URL (http/https/ftp scheme)"""
     # fmt: on
 
     # pre-PEP8 compatibility names
     convertToInteger = convert_to_integer
+    """Deprecated - use :class:`convert_to_integer`"""
     convertToFloat = convert_to_float
+    """Deprecated - use :class:`convert_to_float`"""
     convertToDate = convert_to_date
+    """Deprecated - use :class:`convert_to_date`"""
     convertToDatetime = convert_to_datetime
+    """Deprecated - use :class:`convert_to_datetime`"""
     stripHTMLTags = strip_html_tags
+    """Deprecated - use :class:`strip_html_tags`"""
     upcaseTokens = upcase_tokens
+    """Deprecated - use :class:`upcase_tokens`"""
     downcaseTokens = downcase_tokens
+    """Deprecated - use :class:`downcase_tokens`"""
 
 
 _builtin_exprs = [
diff --git a/src/pip/_vendor/pyparsing/core.py b/src/pip/_vendor/pyparsing/core.py
index 6ff3c766f7d..8d5a856ecd6 100644
--- a/src/pip/_vendor/pyparsing/core.py
+++ b/src/pip/_vendor/pyparsing/core.py
@@ -1,19 +1,22 @@
 #
 # core.py
 #
+
+from collections import deque
 import os
 import typing
 from typing import (
-    NamedTuple,
-    Union,
-    Callable,
     Any,
+    Callable,
     Generator,
-    Tuple,
     List,
-    TextIO,
-    Set,
+    NamedTuple,
     Sequence,
+    Set,
+    TextIO,
+    Tuple,
+    Union,
+    cast,
 )
 from abc import ABC, abstractmethod
 from enum import Enum
@@ -40,6 +43,7 @@
     _flatten,
     LRUMemo as _LRUMemo,
     UnboundedMemo as _UnboundedMemo,
+    replaced_by_pep8,
 )
 from .exceptions import *
 from .actions import *
@@ -134,6 +138,7 @@ def enable_all_warnings(cls) -> None:
 class Diagnostics(Enum):
     """
     Diagnostic configuration (all default to disabled)
+
     - ``warn_multiple_tokens_in_named_alternation`` - flag to enable warnings when a results
       name is defined on a :class:`MatchFirst` or :class:`Or` expression with one or more :class:`And` subexpressions
     - ``warn_ungrouped_named_tokens_in_collection`` - flag to enable warnings when a results
@@ -228,6 +233,8 @@ def _should_enable_warnings(
 }
 
 _generatorType = types.GeneratorType
+ParseImplReturnType = Tuple[int, Any]
+PostParseReturnType = Union[ParseResults, Sequence[ParseResults]]
 ParseAction = Union[
     Callable[[], Any],
     Callable[[ParseResults], Any],
@@ -256,7 +263,7 @@ def _should_enable_warnings(
 alphanums = alphas + nums
 printables = "".join([c for c in string.printable if c not in string.whitespace])
 
-_trim_arity_call_line: traceback.StackSummary = None
+_trim_arity_call_line: traceback.StackSummary = None  # type: ignore[assignment]
 
 
 def _trim_arity(func, max_limit=3):
@@ -269,11 +276,6 @@ def _trim_arity(func, max_limit=3):
     limit = 0
     found_arity = False
 
-    def extract_tb(tb, limit=0):
-        frames = traceback.extract_tb(tb, limit=limit)
-        frame_summary = frames[-1]
-        return [frame_summary[:2]]
-
     # synthesize what would be returned by traceback.extract_stack at the call to
     # user's parse action 'func', so that we don't incur call penalty at parse time
 
@@ -297,8 +299,10 @@ def wrapper(*args):
                     raise
                 else:
                     tb = te.__traceback__
+                    frames = traceback.extract_tb(tb, limit=2)
+                    frame_summary = frames[-1]
                     trim_arity_type_error = (
-                        extract_tb(tb, limit=2)[-1][:2] == pa_call_line_synth
+                        [frame_summary[:2]][-1][:2] == pa_call_line_synth
                     )
                     del tb
 
@@ -320,7 +324,7 @@ def wrapper(*args):
 
 
 def condition_as_parse_action(
-    fn: ParseCondition, message: str = None, fatal: bool = False
+    fn: ParseCondition, message: typing.Optional[str] = None, fatal: bool = False
 ) -> ParseAction:
     """
     Function to convert a simple predicate function that returns ``True`` or ``False``
@@ -353,15 +357,9 @@ def _default_start_debug_action(
     cache_hit_str = "*" if cache_hit else ""
     print(
         (
-            "{}Match {} at loc {}({},{})\n  {}\n  {}^".format(
-                cache_hit_str,
-                expr,
-                loc,
-                lineno(loc, instring),
-                col(loc, instring),
-                line(loc, instring),
-                " " * (col(loc, instring) - 1),
-            )
+            f"{cache_hit_str}Match {expr} at loc {loc}({lineno(loc, instring)},{col(loc, instring)})\n"
+            f"  {line(loc, instring)}\n"
+            f"  {' ' * (col(loc, instring) - 1)}^"
         )
     )
 
@@ -375,7 +373,7 @@ def _default_success_debug_action(
     cache_hit: bool = False,
 ):
     cache_hit_str = "*" if cache_hit else ""
-    print("{}Matched {} -> {}".format(cache_hit_str, expr, toks.as_list()))
+    print(f"{cache_hit_str}Matched {expr} -> {toks.as_list()}")
 
 
 def _default_exception_debug_action(
@@ -386,11 +384,7 @@ def _default_exception_debug_action(
     cache_hit: bool = False,
 ):
     cache_hit_str = "*" if cache_hit else ""
-    print(
-        "{}Match {} failed, {} raised: {}".format(
-            cache_hit_str, expr, type(exc).__name__, exc
-        )
-    )
+    print(f"{cache_hit_str}Match {expr} failed, {type(exc).__name__} raised: {exc}")
 
 
 def null_debug_action(*args):
@@ -402,7 +396,7 @@ class ParserElement(ABC):
 
     DEFAULT_WHITE_CHARS: str = " \n\t\r"
     verbose_stacktrace: bool = False
-    _literalStringClass: typing.Optional[type] = None
+    _literalStringClass: type = None  # type: ignore[assignment]
 
     @staticmethod
     def set_default_whitespace_chars(chars: str) -> None:
@@ -447,6 +441,18 @@ def inline_literals_using(cls: type) -> None:
         """
         ParserElement._literalStringClass = cls
 
+    @classmethod
+    def using_each(cls, seq, **class_kwargs):
+        """
+        Yields a sequence of class(obj, **class_kwargs) for obj in seq.
+
+        Example::
+
+            LPAR, RPAR, LBRACE, RBRACE, SEMI = Suppress.using_each("(){};")
+
+        """
+        yield from (cls(obj, **class_kwargs) for obj in seq)
+
     class DebugActions(NamedTuple):
         debug_try: typing.Optional[DebugStartAction]
         debug_match: typing.Optional[DebugSuccessAction]
@@ -455,9 +461,9 @@ class DebugActions(NamedTuple):
     def __init__(self, savelist: bool = False):
         self.parseAction: List[ParseAction] = list()
         self.failAction: typing.Optional[ParseFailAction] = None
-        self.customName = None
-        self._defaultName = None
-        self.resultsName = None
+        self.customName: str = None  # type: ignore[assignment]
+        self._defaultName: typing.Optional[str] = None
+        self.resultsName: str = None  # type: ignore[assignment]
         self.saveAsList = savelist
         self.skipWhitespace = True
         self.whiteChars = set(ParserElement.DEFAULT_WHITE_CHARS)
@@ -490,12 +496,29 @@ def suppress_warning(self, warning_type: Diagnostics) -> "ParserElement":
             base.suppress_warning(Diagnostics.warn_on_parse_using_empty_Forward)
 
             # statement would normally raise a warning, but is now suppressed
-            print(base.parseString("x"))
+            print(base.parse_string("x"))
 
         """
         self.suppress_warnings_.append(warning_type)
         return self
 
+    def visit_all(self):
+        """General-purpose method to yield all expressions and sub-expressions
+        in a grammar. Typically just for internal use.
+        """
+        to_visit = deque([self])
+        seen = set()
+        while to_visit:
+            cur = to_visit.popleft()
+
+            # guard against looping forever through recursive grammars
+            if cur in seen:
+                continue
+            seen.add(cur)
+
+            to_visit.extend(cur.recurse())
+            yield cur
+
     def copy(self) -> "ParserElement":
         """
         Make a copy of this :class:`ParserElement`.  Useful for defining
@@ -585,11 +608,11 @@ def breaker(instring, loc, doActions=True, callPreParse=True):
                 pdb.set_trace()
                 return _parseMethod(instring, loc, doActions, callPreParse)
 
-            breaker._originalParseMethod = _parseMethod
-            self._parse = breaker
+            breaker._originalParseMethod = _parseMethod  # type: ignore [attr-defined]
+            self._parse = breaker  # type: ignore [assignment]
         else:
             if hasattr(self._parse, "_originalParseMethod"):
-                self._parse = self._parse._originalParseMethod
+                self._parse = self._parse._originalParseMethod  # type: ignore [attr-defined, assignment]
         return self
 
     def set_parse_action(self, *fns: ParseAction, **kwargs) -> "ParserElement":
@@ -601,9 +624,9 @@ def set_parse_action(self, *fns: ParseAction, **kwargs) -> "ParserElement":
         Each parse action ``fn`` is a callable method with 0-3 arguments, called as
         ``fn(s, loc, toks)`` , ``fn(loc, toks)`` , ``fn(toks)`` , or just ``fn()`` , where:
 
-        - s   = the original string being parsed (see note below)
-        - loc = the location of the matching substring
-        - toks = a list of the matched tokens, packaged as a :class:`ParseResults` object
+        - ``s``    = the original string being parsed (see note below)
+        - ``loc``  = the location of the matching substring
+        - ``toks`` = a list of the matched tokens, packaged as a :class:`ParseResults` object
 
         The parsed tokens are passed to the parse action as ParseResults. They can be
         modified in place using list-style append, extend, and pop operations to update
@@ -621,7 +644,7 @@ def set_parse_action(self, *fns: ParseAction, **kwargs) -> "ParserElement":
 
         Optional keyword arguments:
 
-        - call_during_try = (default= ``False``) indicate if parse action should be run during
+        - ``call_during_try`` = (default= ``False``) indicate if parse action should be run during
           lookaheads and alternate testing. For parse actions that have side effects, it is
           important to only call the parse action once it is determined that it is being
           called as part of a successful parse. For parse actions that perform additional
@@ -697,10 +720,10 @@ def add_condition(self, *fns: ParseCondition, **kwargs) -> "ParserElement":
 
         Optional keyword arguments:
 
-        - message = define a custom message to be used in the raised exception
-        - fatal = if True, will raise ParseFatalException to stop parsing immediately; otherwise will raise
+        - ``message`` = define a custom message to be used in the raised exception
+        - ``fatal`` = if True, will raise ParseFatalException to stop parsing immediately; otherwise will raise
           ParseException
-        - call_during_try = boolean to indicate if this method should be called during internal tryParse calls,
+        - ``call_during_try`` = boolean to indicate if this method should be called during internal tryParse calls,
           default=False
 
         Example::
@@ -716,7 +739,9 @@ def add_condition(self, *fns: ParseCondition, **kwargs) -> "ParserElement":
         for fn in fns:
             self.parseAction.append(
                 condition_as_parse_action(
-                    fn, message=kwargs.get("message"), fatal=kwargs.get("fatal", False)
+                    fn,
+                    message=str(kwargs.get("message")),
+                    fatal=bool(kwargs.get("fatal", False)),
                 )
             )
 
@@ -731,30 +756,33 @@ def set_fail_action(self, fn: ParseFailAction) -> "ParserElement":
         Fail acton fn is a callable function that takes the arguments
         ``fn(s, loc, expr, err)`` where:
 
-        - s = string being parsed
-        - loc = location where expression match was attempted and failed
-        - expr = the parse expression that failed
-        - err = the exception thrown
+        - ``s`` = string being parsed
+        - ``loc`` = location where expression match was attempted and failed
+        - ``expr`` = the parse expression that failed
+        - ``err`` = the exception thrown
 
         The function returns no value.  It may throw :class:`ParseFatalException`
         if it is desired to stop parsing immediately."""
         self.failAction = fn
         return self
 
-    def _skipIgnorables(self, instring, loc):
+    def _skipIgnorables(self, instring: str, loc: int) -> int:
+        if not self.ignoreExprs:
+            return loc
         exprsFound = True
+        ignore_expr_fns = [e._parse for e in self.ignoreExprs]
         while exprsFound:
             exprsFound = False
-            for e in self.ignoreExprs:
+            for ignore_fn in ignore_expr_fns:
                 try:
                     while 1:
-                        loc, dummy = e._parse(instring, loc)
+                        loc, dummy = ignore_fn(instring, loc)
                         exprsFound = True
                 except ParseException:
                     pass
         return loc
 
-    def preParse(self, instring, loc):
+    def preParse(self, instring: str, loc: int) -> int:
         if self.ignoreExprs:
             loc = self._skipIgnorables(instring, loc)
 
@@ -830,7 +858,7 @@ def _parseNoCache(
                 try:
                     for fn in self.parseAction:
                         try:
-                            tokens = fn(instring, tokens_start, ret_tokens)
+                            tokens = fn(instring, tokens_start, ret_tokens)  # type: ignore [call-arg, arg-type]
                         except IndexError as parse_action_exc:
                             exc = ParseException("exception raised in parse action")
                             raise exc from parse_action_exc
@@ -853,7 +881,7 @@ def _parseNoCache(
             else:
                 for fn in self.parseAction:
                     try:
-                        tokens = fn(instring, tokens_start, ret_tokens)
+                        tokens = fn(instring, tokens_start, ret_tokens)  # type: ignore [call-arg, arg-type]
                     except IndexError as parse_action_exc:
                         exc = ParseException("exception raised in parse action")
                         raise exc from parse_action_exc
@@ -875,17 +903,24 @@ def _parseNoCache(
 
         return loc, ret_tokens
 
-    def try_parse(self, instring: str, loc: int, raise_fatal: bool = False) -> int:
+    def try_parse(
+        self,
+        instring: str,
+        loc: int,
+        *,
+        raise_fatal: bool = False,
+        do_actions: bool = False,
+    ) -> int:
         try:
-            return self._parse(instring, loc, doActions=False)[0]
+            return self._parse(instring, loc, doActions=do_actions)[0]
         except ParseFatalException:
             if raise_fatal:
                 raise
             raise ParseException(instring, loc, self.errmsg, self)
 
-    def can_parse_next(self, instring: str, loc: int) -> bool:
+    def can_parse_next(self, instring: str, loc: int, do_actions: bool = False) -> bool:
         try:
-            self.try_parse(instring, loc)
+            self.try_parse(instring, loc, do_actions=do_actions)
         except (ParseException, IndexError):
             return False
         else:
@@ -897,10 +932,23 @@ def can_parse_next(self, instring: str, loc: int) -> bool:
         Tuple[int, "Forward", bool], Tuple[int, Union[ParseResults, Exception]]
     ] = {}
 
+    class _CacheType(dict):
+        """
+        class to help type checking
+        """
+
+        not_in_cache: bool
+
+        def get(self, *args):
+            ...
+
+        def set(self, *args):
+            ...
+
     # argument cache for optimizing repeated calls when backtracking through recursive expressions
     packrat_cache = (
-        {}
-    )  # this is set later by enabled_packrat(); this is here so that reset_cache() doesn't fail
+        _CacheType()
+    )  # set later by enable_packrat(); this is here so that reset_cache() doesn't fail
     packrat_cache_lock = RLock()
     packrat_cache_stats = [0, 0]
 
@@ -930,24 +978,25 @@ def _parseCache(
                 ParserElement.packrat_cache_stats[HIT] += 1
                 if self.debug and self.debugActions.debug_try:
                     try:
-                        self.debugActions.debug_try(instring, loc, self, cache_hit=True)
+                        self.debugActions.debug_try(instring, loc, self, cache_hit=True)  # type: ignore [call-arg]
                     except TypeError:
                         pass
                 if isinstance(value, Exception):
                     if self.debug and self.debugActions.debug_fail:
                         try:
                             self.debugActions.debug_fail(
-                                instring, loc, self, value, cache_hit=True
+                                instring, loc, self, value, cache_hit=True  # type: ignore [call-arg]
                             )
                         except TypeError:
                             pass
                     raise value
 
+                value = cast(Tuple[int, ParseResults, int], value)
                 loc_, result, endloc = value[0], value[1].copy(), value[2]
                 if self.debug and self.debugActions.debug_match:
                     try:
                         self.debugActions.debug_match(
-                            instring, loc_, endloc, self, result, cache_hit=True
+                            instring, loc_, endloc, self, result, cache_hit=True  # type: ignore [call-arg]
                         )
                     except TypeError:
                         pass
@@ -1009,7 +1058,7 @@ def enable_left_recursion(
 
         Parameters:
 
-        - cache_size_limit - (default=``None``) - memoize at most this many
+        - ``cache_size_limit`` - (default=``None``) - memoize at most this many
           ``Forward`` elements during matching; if ``None`` (the default),
           memoize all ``Forward`` elements.
 
@@ -1022,9 +1071,9 @@ def enable_left_recursion(
         elif ParserElement._packratEnabled:
             raise RuntimeError("Packrat and Bounded Recursion are not compatible")
         if cache_size_limit is None:
-            ParserElement.recursion_memos = _UnboundedMemo()
+            ParserElement.recursion_memos = _UnboundedMemo()  # type: ignore[assignment]
         elif cache_size_limit > 0:
-            ParserElement.recursion_memos = _LRUMemo(capacity=cache_size_limit)
+            ParserElement.recursion_memos = _LRUMemo(capacity=cache_size_limit)  # type: ignore[assignment]
         else:
             raise NotImplementedError("Memo size of %s" % cache_size_limit)
         ParserElement._left_recursion_enabled = True
@@ -1040,7 +1089,7 @@ def enable_packrat(cache_size_limit: int = 128, *, force: bool = False) -> None:
 
         Parameters:
 
-        - cache_size_limit - (default= ``128``) - if an integer value is provided
+        - ``cache_size_limit`` - (default= ``128``) - if an integer value is provided
           will limit the size of the packrat cache; if None is passed, then
           the cache size will be unbounded; if 0 is passed, the cache will
           be effectively disabled.
@@ -1070,7 +1119,7 @@ def enable_packrat(cache_size_limit: int = 128, *, force: bool = False) -> None:
             if cache_size_limit is None:
                 ParserElement.packrat_cache = _UnboundedCache()
             else:
-                ParserElement.packrat_cache = _FifoCache(cache_size_limit)
+                ParserElement.packrat_cache = _FifoCache(cache_size_limit)  # type: ignore[assignment]
             ParserElement._parse = ParserElement._parseCache
 
     def parse_string(
@@ -1088,7 +1137,7 @@ def parse_string(
           an object with attributes if the given parser includes results names.
 
         If the input string is required to match the entire grammar, ``parse_all`` flag must be set to ``True``. This
-        is also equivalent to ending the grammar with :class:`StringEnd`().
+        is also equivalent to ending the grammar with :class:`StringEnd`\\ ().
 
         To report proper column numbers, ``parse_string`` operates on a copy of the input string where all tabs are
         converted to spaces (8 spaces per tab, as per the default in ``string.expandtabs``). If the input string
@@ -1198,7 +1247,9 @@ def scan_string(
         try:
             while loc <= instrlen and matches < maxMatches:
                 try:
-                    preloc = preparseFn(instring, loc)
+                    preloc: int = preparseFn(instring, loc)
+                    nextLoc: int
+                    tokens: ParseResults
                     nextLoc, tokens = parseFn(instring, preloc, callPreParse=False)
                 except ParseException:
                     loc = preloc + 1
@@ -1352,7 +1403,7 @@ def split(
     def __add__(self, other) -> "ParserElement":
         """
         Implementation of ``+`` operator - returns :class:`And`. Adding strings to a :class:`ParserElement`
-        converts them to :class:`Literal`s by default.
+        converts them to :class:`Literal`\\ s by default.
 
         Example::
 
@@ -1364,11 +1415,11 @@ def __add__(self, other) -> "ParserElement":
 
             Hello, World! -> ['Hello', ',', 'World', '!']
 
-        ``...`` may be used as a parse expression as a short form of :class:`SkipTo`.
+        ``...`` may be used as a parse expression as a short form of :class:`SkipTo`::
 
             Literal('start') + ... + Literal('end')
 
-        is equivalent to:
+        is equivalent to::
 
             Literal('start') + SkipTo('end')("_skipped*") + Literal('end')
 
@@ -1382,11 +1433,7 @@ def __add__(self, other) -> "ParserElement":
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return And([self, other])
 
     def __radd__(self, other) -> "ParserElement":
@@ -1399,11 +1446,7 @@ def __radd__(self, other) -> "ParserElement":
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return other + self
 
     def __sub__(self, other) -> "ParserElement":
@@ -1413,11 +1456,7 @@ def __sub__(self, other) -> "ParserElement":
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return self + And._ErrorStop() + other
 
     def __rsub__(self, other) -> "ParserElement":
@@ -1427,11 +1466,7 @@ def __rsub__(self, other) -> "ParserElement":
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return other - self
 
     def __mul__(self, other) -> "ParserElement":
@@ -1440,11 +1475,12 @@ def __mul__(self, other) -> "ParserElement":
         ``expr + expr + expr``.  Expressions may also be multiplied by a 2-integer
         tuple, similar to ``{min, max}`` multipliers in regular expressions.  Tuples
         may also include ``None`` as in:
+
         - ``expr*(n, None)`` or ``expr*(n, )`` is equivalent
-             to ``expr*n + ZeroOrMore(expr)``
-             (read as "at least n instances of ``expr``")
+          to ``expr*n + ZeroOrMore(expr)``
+          (read as "at least n instances of ``expr``")
         - ``expr*(None, n)`` is equivalent to ``expr*(0, n)``
-             (read as "0 to n instances of ``expr``")
+          (read as "0 to n instances of ``expr``")
         - ``expr*(None, None)`` is equivalent to ``ZeroOrMore(expr)``
         - ``expr*(1, None)`` is equivalent to ``OneOrMore(expr)``
 
@@ -1477,17 +1513,9 @@ def __mul__(self, other) -> "ParserElement":
                 minElements, optElements = other
                 optElements -= minElements
             else:
-                raise TypeError(
-                    "cannot multiply ParserElement and ({}) objects".format(
-                        ",".join(type(item).__name__ for item in other)
-                    )
-                )
+                return NotImplemented
         else:
-            raise TypeError(
-                "cannot multiply ParserElement and {} objects".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
 
         if minElements < 0:
             raise ValueError("cannot multiply ParserElement by negative value")
@@ -1531,13 +1559,12 @@ def __or__(self, other) -> "ParserElement":
             return _PendingSkip(self, must_skip=True)
 
         if isinstance(other, str_type):
+            # `expr | ""` is equivalent to `Opt(expr)`
+            if other == "":
+                return Opt(self)
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return MatchFirst([self, other])
 
     def __ror__(self, other) -> "ParserElement":
@@ -1547,11 +1574,7 @@ def __ror__(self, other) -> "ParserElement":
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return other | self
 
     def __xor__(self, other) -> "ParserElement":
@@ -1561,11 +1584,7 @@ def __xor__(self, other) -> "ParserElement":
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return Or([self, other])
 
     def __rxor__(self, other) -> "ParserElement":
@@ -1575,11 +1594,7 @@ def __rxor__(self, other) -> "ParserElement":
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return other ^ self
 
     def __and__(self, other) -> "ParserElement":
@@ -1589,11 +1604,7 @@ def __and__(self, other) -> "ParserElement":
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return Each([self, other])
 
     def __rand__(self, other) -> "ParserElement":
@@ -1603,11 +1614,7 @@ def __rand__(self, other) -> "ParserElement":
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
         if not isinstance(other, ParserElement):
-            raise TypeError(
-                "Cannot combine element of type {} with ParserElement".format(
-                    type(other).__name__
-                )
-            )
+            return NotImplemented
         return other & self
 
     def __invert__(self) -> "ParserElement":
@@ -1636,38 +1643,58 @@ def __getitem__(self, key):
 
         ``None`` may be used in place of ``...``.
 
-        Note that ``expr[..., n]`` and ``expr[m, n]``do not raise an exception
-        if more than ``n`` ``expr``s exist in the input stream.  If this behavior is
+        Note that ``expr[..., n]`` and ``expr[m, n]`` do not raise an exception
+        if more than ``n`` ``expr``\\ s exist in the input stream.  If this behavior is
         desired, then write ``expr[..., n] + ~expr``.
+
+        For repetition with a stop_on expression, use slice notation:
+
+        - ``expr[...: end_expr]`` and ``expr[0, ...: end_expr]`` are equivalent to ``ZeroOrMore(expr, stop_on=end_expr)``
+        - ``expr[1, ...: end_expr]`` is equivalent to ``OneOrMore(expr, stop_on=end_expr)``
+
         """
 
+        stop_on_defined = False
+        stop_on = NoMatch()
+        if isinstance(key, slice):
+            key, stop_on = key.start, key.stop
+            if key is None:
+                key = ...
+            stop_on_defined = True
+        elif isinstance(key, tuple) and isinstance(key[-1], slice):
+            key, stop_on = (key[0], key[1].start), key[1].stop
+            stop_on_defined = True
+
         # convert single arg keys to tuples
+        if isinstance(key, str_type):
+            key = (key,)
         try:
-            if isinstance(key, str_type):
-                key = (key,)
             iter(key)
         except TypeError:
             key = (key, key)
 
         if len(key) > 2:
             raise TypeError(
-                "only 1 or 2 index arguments supported ({}{})".format(
-                    key[:5], "... [{}]".format(len(key)) if len(key) > 5 else ""
-                )
+                f"only 1 or 2 index arguments supported ({key[:5]}{f'... [{len(key)}]' if len(key) > 5 else ''})"
             )
 
         # clip to 2 elements
         ret = self * tuple(key[:2])
+        ret = typing.cast(_MultipleMatch, ret)
+
+        if stop_on_defined:
+            ret.stopOn(stop_on)
+
         return ret
 
-    def __call__(self, name: str = None) -> "ParserElement":
+    def __call__(self, name: typing.Optional[str] = None) -> "ParserElement":
         """
         Shortcut for :class:`set_results_name`, with ``list_all_matches=False``.
 
         If ``name`` is given with a trailing ``'*'`` character, then ``list_all_matches`` will be
         passed as ``True``.
 
-        If ``name` is omitted, same as calling :class:`copy`.
+        If ``name`` is omitted, same as calling :class:`copy`.
 
         Example::
 
@@ -1775,17 +1802,18 @@ def set_debug_actions(
           should have the signature ``fn(input_string: str, location: int, expression: ParserElement, exception: Exception, cache_hit: bool)``
         """
         self.debugActions = self.DebugActions(
-            start_action or _default_start_debug_action,
-            success_action or _default_success_debug_action,
-            exception_action or _default_exception_debug_action,
+            start_action or _default_start_debug_action,  # type: ignore[truthy-function]
+            success_action or _default_success_debug_action,  # type: ignore[truthy-function]
+            exception_action or _default_exception_debug_action,  # type: ignore[truthy-function]
         )
         self.debug = True
         return self
 
-    def set_debug(self, flag: bool = True) -> "ParserElement":
+    def set_debug(self, flag: bool = True, recurse: bool = False) -> "ParserElement":
         """
         Enable display of debugging messages while doing pattern matching.
         Set ``flag`` to ``True`` to enable, ``False`` to disable.
+        Set ``recurse`` to ``True`` to set the debug flag on this expression and all sub-expressions.
 
         Example::
 
@@ -1819,6 +1847,11 @@ def set_debug(self, flag: bool = True) -> "ParserElement":
         which makes debugging and exception messages easier to understand - for instance, the default
         name created for the :class:`Word` expression without calling ``set_name`` is ``"W:(A-Za-z)"``.
         """
+        if recurse:
+            for expr in self.visit_all():
+                expr.set_debug(flag, recurse=False)
+            return self
+
         if flag:
             self.set_debug_actions(
                 _default_start_debug_action,
@@ -1836,7 +1869,7 @@ def default_name(self) -> str:
         return self._defaultName
 
     @abstractmethod
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         """
         Child classes must define this method, which defines how the ``default_name`` is set.
         """
@@ -1844,7 +1877,9 @@ def _generateDefaultName(self):
     def set_name(self, name: str) -> "ParserElement":
         """
         Define name for this expression, makes debugging and exception messages clearer.
+
         Example::
+
             Word(nums).parse_string("ABC")  # -> Exception: Expected W:(0-9) (at char 0), (line:1, col:1)
             Word(nums).set_name("integer").parse_string("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
         """
@@ -1870,7 +1905,7 @@ def streamline(self) -> "ParserElement":
         self._defaultName = None
         return self
 
-    def recurse(self) -> Sequence["ParserElement"]:
+    def recurse(self) -> List["ParserElement"]:
         return []
 
     def _checkRecursion(self, parseElementList):
@@ -1882,6 +1917,11 @@ def validate(self, validateTrace=None) -> None:
         """
         Check defined expressions for valid structure, check for infinite recursive definitions.
         """
+        warnings.warn(
+            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self._checkRecursion([])
 
     def parse_file(
@@ -1899,8 +1939,10 @@ def parse_file(
         """
         parseAll = parseAll or parse_all
         try:
+            file_or_filename = typing.cast(TextIO, file_or_filename)
             file_contents = file_or_filename.read()
         except AttributeError:
+            file_or_filename = typing.cast(str, file_or_filename)
             with open(file_or_filename, "r", encoding=encoding) as f:
                 file_contents = f.read()
         try:
@@ -1932,6 +1974,7 @@ def matches(
         inline microtests of sub expressions while building up larger parser.
 
         Parameters:
+
         - ``test_string`` - to test against this expression for a match
         - ``parse_all`` - (default= ``True``) - flag to pass to :class:`parse_string` when running tests
 
@@ -1955,7 +1998,7 @@ def run_tests(
         full_dump: bool = True,
         print_results: bool = True,
         failure_tests: bool = False,
-        post_parse: Callable[[str, ParseResults], str] = None,
+        post_parse: typing.Optional[Callable[[str, ParseResults], str]] = None,
         file: typing.Optional[TextIO] = None,
         with_line_numbers: bool = False,
         *,
@@ -1963,7 +2006,7 @@ def run_tests(
         fullDump: bool = True,
         printResults: bool = True,
         failureTests: bool = False,
-        postParse: Callable[[str, ParseResults], str] = None,
+        postParse: typing.Optional[Callable[[str, ParseResults], str]] = None,
     ) -> Tuple[bool, List[Tuple[str, Union[ParseResults, Exception]]]]:
         """
         Execute the parse expression on a series of test strings, showing each
@@ -1971,6 +2014,7 @@ def run_tests(
         run a parse expression against a list of sample strings.
 
         Parameters:
+
         - ``tests`` - a list of separate test strings, or a multiline string of test strings
         - ``parse_all`` - (default= ``True``) - flag to pass to :class:`parse_string` when running tests
         - ``comment`` - (default= ``'#'``) - expression for indicating embedded comments in the test
@@ -2067,22 +2111,27 @@ def run_tests(
         failureTests = failureTests or failure_tests
         postParse = postParse or post_parse
         if isinstance(tests, str_type):
+            tests = typing.cast(str, tests)
             line_strip = type(tests).strip
             tests = [line_strip(test_line) for test_line in tests.rstrip().splitlines()]
-        if isinstance(comment, str_type):
-            comment = Literal(comment)
+        comment_specified = comment is not None
+        if comment_specified:
+            if isinstance(comment, str_type):
+                comment = typing.cast(str, comment)
+                comment = Literal(comment)
+        comment = typing.cast(ParserElement, comment)
         if file is None:
             file = sys.stdout
         print_ = file.write
 
         result: Union[ParseResults, Exception]
-        allResults = []
-        comments = []
+        allResults: List[Tuple[str, Union[ParseResults, Exception]]] = []
+        comments: List[str] = []
         success = True
         NL = Literal(r"\n").add_parse_action(replace_with("\n")).ignore(quoted_string)
         BOM = "\ufeff"
         for t in tests:
-            if comment is not None and comment.matches(t, False) or comments and not t:
+            if comment_specified and comment.matches(t, False) or comments and not t:
                 comments.append(
                     pyparsing_test.with_line_numbers(t) if with_line_numbers else t
                 )
@@ -2107,7 +2156,7 @@ def run_tests(
                 success = success and failureTests
                 result = pe
             except Exception as exc:
-                out.append("FAIL-EXCEPTION: {}: {}".format(type(exc).__name__, exc))
+                out.append(f"FAIL-EXCEPTION: {type(exc).__name__}: {exc}")
                 if ParserElement.verbose_stacktrace:
                     out.extend(traceback.format_tb(exc.__traceback__))
                 success = success and failureTests
@@ -2127,9 +2176,7 @@ def run_tests(
                     except Exception as e:
                         out.append(result.dump(full=fullDump))
                         out.append(
-                            "{} failed: {}: {}".format(
-                                postParse.__name__, type(e).__name__, e
-                            )
+                            f"{postParse.__name__} failed: {type(e).__name__}: {e}"
                         )
                 else:
                     out.append(result.dump(full=fullDump))
@@ -2148,19 +2195,28 @@ def create_diagram(
         vertical: int = 3,
         show_results_names: bool = False,
         show_groups: bool = False,
+        embed: bool = False,
         **kwargs,
     ) -> None:
         """
         Create a railroad diagram for the parser.
 
         Parameters:
-        - output_html (str or file-like object) - output target for generated
+
+        - ``output_html`` (str or file-like object) - output target for generated
           diagram HTML
-        - vertical (int) - threshold for formatting multiple alternatives vertically
+        - ``vertical`` (int) - threshold for formatting multiple alternatives vertically
           instead of horizontally (default=3)
-        - show_results_names - bool flag whether diagram should show annotations for
+        - ``show_results_names`` - bool flag whether diagram should show annotations for
           defined results names
-        - show_groups - bool flag whether groups should be highlighted with an unlabeled surrounding box
+        - ``show_groups`` - bool flag whether groups should be highlighted with an unlabeled surrounding box
+        - ``embed`` - bool flag whether generated HTML should omit , , and  tags to embed
+          the resulting HTML in an enclosing HTML source
+        - ``head`` - str containing additional HTML to insert into the  section of the generated code;
+          can be used to insert custom CSS styling
+        - ``body`` - str containing additional HTML to insert at the beginning of the  section of the
+          generated code
+
         Additional diagram-formatting keyword arguments can also be included;
         see railroad.Diagram class.
         """
@@ -2183,38 +2239,93 @@ def create_diagram(
         )
         if isinstance(output_html, (str, Path)):
             with open(output_html, "w", encoding="utf-8") as diag_file:
-                diag_file.write(railroad_to_html(railroad))
+                diag_file.write(railroad_to_html(railroad, embed=embed, **kwargs))
         else:
             # we were passed a file-like object, just write to it
-            output_html.write(railroad_to_html(railroad))
-
-    setDefaultWhitespaceChars = set_default_whitespace_chars
-    inlineLiteralsUsing = inline_literals_using
-    setResultsName = set_results_name
-    setBreak = set_break
-    setParseAction = set_parse_action
-    addParseAction = add_parse_action
-    addCondition = add_condition
-    setFailAction = set_fail_action
-    tryParse = try_parse
+            output_html.write(railroad_to_html(railroad, embed=embed, **kwargs))
+
+    # Compatibility synonyms
+    # fmt: off
+    @staticmethod
+    @replaced_by_pep8(inline_literals_using)
+    def inlineLiteralsUsing(): ...
+
+    @staticmethod
+    @replaced_by_pep8(set_default_whitespace_chars)
+    def setDefaultWhitespaceChars(): ...
+
+    @replaced_by_pep8(set_results_name)
+    def setResultsName(self): ...
+
+    @replaced_by_pep8(set_break)
+    def setBreak(self): ...
+
+    @replaced_by_pep8(set_parse_action)
+    def setParseAction(self): ...
+
+    @replaced_by_pep8(add_parse_action)
+    def addParseAction(self): ...
+
+    @replaced_by_pep8(add_condition)
+    def addCondition(self): ...
+
+    @replaced_by_pep8(set_fail_action)
+    def setFailAction(self): ...
+
+    @replaced_by_pep8(try_parse)
+    def tryParse(self): ...
+
+    @staticmethod
+    @replaced_by_pep8(enable_left_recursion)
+    def enableLeftRecursion(): ...
+
+    @staticmethod
+    @replaced_by_pep8(enable_packrat)
+    def enablePackrat(): ...
+
+    @replaced_by_pep8(parse_string)
+    def parseString(self): ...
+
+    @replaced_by_pep8(scan_string)
+    def scanString(self): ...
+
+    @replaced_by_pep8(transform_string)
+    def transformString(self): ...
+
+    @replaced_by_pep8(search_string)
+    def searchString(self): ...
+
+    @replaced_by_pep8(ignore_whitespace)
+    def ignoreWhitespace(self): ...
+
+    @replaced_by_pep8(leave_whitespace)
+    def leaveWhitespace(self): ...
+
+    @replaced_by_pep8(set_whitespace_chars)
+    def setWhitespaceChars(self): ...
+
+    @replaced_by_pep8(parse_with_tabs)
+    def parseWithTabs(self): ...
+
+    @replaced_by_pep8(set_debug_actions)
+    def setDebugActions(self): ...
+
+    @replaced_by_pep8(set_debug)
+    def setDebug(self): ...
+
+    @replaced_by_pep8(set_name)
+    def setName(self): ...
+
+    @replaced_by_pep8(parse_file)
+    def parseFile(self): ...
+
+    @replaced_by_pep8(run_tests)
+    def runTests(self): ...
+
     canParseNext = can_parse_next
     resetCache = reset_cache
-    enableLeftRecursion = enable_left_recursion
-    enablePackrat = enable_packrat
-    parseString = parse_string
-    scanString = scan_string
-    searchString = search_string
-    transformString = transform_string
-    setWhitespaceChars = set_whitespace_chars
-    parseWithTabs = parse_with_tabs
-    setDebugActions = set_debug_actions
-    setDebug = set_debug
     defaultName = default_name
-    setName = set_name
-    parseFile = parse_file
-    runTests = run_tests
-    ignoreWhitespace = ignore_whitespace
-    leaveWhitespace = leave_whitespace
+    # fmt: on
 
 
 class _PendingSkip(ParserElement):
@@ -2225,7 +2336,7 @@ def __init__(self, expr: ParserElement, must_skip: bool = False):
         self.anchor = expr
         self.must_skip = must_skip
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return str(self.anchor + Empty()).replace("Empty", "...")
 
     def __add__(self, other) -> "ParserElement":
@@ -2266,21 +2377,10 @@ class Token(ParserElement):
     def __init__(self):
         super().__init__(savelist=False)
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return type(self).__name__
 
 
-class Empty(Token):
-    """
-    An empty token, will always match.
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-
-
 class NoMatch(Token):
     """
     A token that will never match.
@@ -2312,25 +2412,33 @@ class Literal(Token):
     use :class:`Keyword` or :class:`CaselessKeyword`.
     """
 
+    def __new__(cls, match_string: str = "", *, matchString: str = ""):
+        # Performance tuning: select a subclass with optimized parseImpl
+        if cls is Literal:
+            match_string = matchString or match_string
+            if not match_string:
+                return super().__new__(Empty)
+            if len(match_string) == 1:
+                return super().__new__(_SingleCharLiteral)
+
+        # Default behavior
+        return super().__new__(cls)
+
+    # Needed to make copy.copy() work correctly if we customize __new__
+    def __getnewargs__(self):
+        return (self.match,)
+
     def __init__(self, match_string: str = "", *, matchString: str = ""):
         super().__init__()
         match_string = matchString or match_string
         self.match = match_string
         self.matchLen = len(match_string)
-        try:
-            self.firstMatchChar = match_string[0]
-        except IndexError:
-            raise ValueError("null string passed to Literal; use Empty() instead")
+        self.firstMatchChar = match_string[:1]
         self.errmsg = "Expected " + self.name
         self.mayReturnEmpty = False
         self.mayIndexError = False
 
-        # Performance tuning: modify __class__ to select
-        # a parseImpl optimized for single-character check
-        if self.matchLen == 1 and type(self) is Literal:
-            self.__class__ = _SingleCharLiteral
-
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return repr(self.match)
 
     def parseImpl(self, instring, loc, doActions=True):
@@ -2341,6 +2449,23 @@ def parseImpl(self, instring, loc, doActions=True):
         raise ParseException(instring, loc, self.errmsg, self)
 
 
+class Empty(Literal):
+    """
+    An empty token, will always match.
+    """
+
+    def __init__(self, match_string="", *, matchString=""):
+        super().__init__("")
+        self.mayReturnEmpty = True
+        self.mayIndexError = False
+
+    def _generateDefaultName(self) -> str:
+        return "Empty"
+
+    def parseImpl(self, instring, loc, doActions=True):
+        return loc, []
+
+
 class _SingleCharLiteral(Literal):
     def parseImpl(self, instring, loc, doActions=True):
         if instring[loc] == self.firstMatchChar:
@@ -2354,8 +2479,8 @@ def parseImpl(self, instring, loc, doActions=True):
 class Keyword(Token):
     """
     Token to exactly match a specified string as a keyword, that is,
-    it must be immediately followed by a non-keyword character.  Compare
-    with :class:`Literal`:
+    it must be immediately preceded and followed by whitespace or
+    non-keyword characters. Compare with :class:`Literal`:
 
     - ``Literal("if")`` will match the leading ``'if'`` in
       ``'ifAndOnlyIf'``.
@@ -2365,7 +2490,7 @@ class Keyword(Token):
     Accepts two optional constructor arguments in addition to the
     keyword string:
 
-    - ``identChars`` is a string of characters that would be valid
+    - ``ident_chars`` is a string of characters that would be valid
       identifier characters, defaulting to all alphanumerics + "_" and
       "$"
     - ``caseless`` allows case-insensitive matching, default is ``False``.
@@ -2400,7 +2525,7 @@ def __init__(
             self.firstMatchChar = match_string[0]
         except IndexError:
             raise ValueError("null string passed to Keyword; use Empty() instead")
-        self.errmsg = "Expected {} {}".format(type(self).__name__, self.name)
+        self.errmsg = f"Expected {type(self).__name__} {self.name}"
         self.mayReturnEmpty = False
         self.mayIndexError = False
         self.caseless = caseless
@@ -2409,7 +2534,7 @@ def __init__(
             identChars = identChars.upper()
         self.identChars = set(identChars)
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return repr(self.match)
 
     def parseImpl(self, instring, loc, doActions=True):
@@ -2559,7 +2684,7 @@ class CloseMatch(Token):
     def __init__(
         self,
         match_string: str,
-        max_mismatches: int = None,
+        max_mismatches: typing.Optional[int] = None,
         *,
         maxMismatches: int = 1,
         caseless=False,
@@ -2568,15 +2693,13 @@ def __init__(
         super().__init__()
         self.match_string = match_string
         self.maxMismatches = maxMismatches
-        self.errmsg = "Expected {!r} (with up to {} mismatches)".format(
-            self.match_string, self.maxMismatches
-        )
+        self.errmsg = f"Expected {self.match_string!r} (with up to {self.maxMismatches} mismatches)"
         self.caseless = caseless
         self.mayIndexError = False
         self.mayReturnEmpty = False
 
-    def _generateDefaultName(self):
-        return "{}:{!r}".format(type(self).__name__, self.match_string)
+    def _generateDefaultName(self) -> str:
+        return f"{type(self).__name__}:{self.match_string!r}"
 
     def parseImpl(self, instring, loc, doActions=True):
         start = loc
@@ -2612,7 +2735,9 @@ def parseImpl(self, instring, loc, doActions=True):
 
 class Word(Token):
     """Token for matching words composed of allowed character sets.
+
     Parameters:
+
     - ``init_chars`` - string of all characters that should be used to
       match as a word; "ABC" will match "AAA", "ABAB", "CBAC", etc.;
       if ``body_chars`` is also specified, then this is the string of
@@ -2697,26 +2822,24 @@ def __init__(
         super().__init__()
         if not initChars:
             raise ValueError(
-                "invalid {}, initChars cannot be empty string".format(
-                    type(self).__name__
-                )
+                f"invalid {type(self).__name__}, initChars cannot be empty string"
             )
 
-        initChars = set(initChars)
-        self.initChars = initChars
+        initChars_set = set(initChars)
         if excludeChars:
-            excludeChars = set(excludeChars)
-            initChars -= excludeChars
+            excludeChars_set = set(excludeChars)
+            initChars_set -= excludeChars_set
             if bodyChars:
-                bodyChars = set(bodyChars) - excludeChars
-        self.initCharsOrig = "".join(sorted(initChars))
+                bodyChars = "".join(set(bodyChars) - excludeChars_set)
+        self.initChars = initChars_set
+        self.initCharsOrig = "".join(sorted(initChars_set))
 
         if bodyChars:
-            self.bodyCharsOrig = "".join(sorted(bodyChars))
             self.bodyChars = set(bodyChars)
+            self.bodyCharsOrig = "".join(sorted(bodyChars))
         else:
-            self.bodyCharsOrig = "".join(sorted(initChars))
-            self.bodyChars = set(initChars)
+            self.bodyChars = initChars_set
+            self.bodyCharsOrig = self.initCharsOrig
 
         self.maxSpecified = max > 0
 
@@ -2725,6 +2848,11 @@ def __init__(
                 "cannot specify a minimum length < 1; use Opt(Word()) if zero-length word is permitted"
             )
 
+        if self.maxSpecified and min > max:
+            raise ValueError(
+                f"invalid args, if min and max both specified min must be <= max (min={min}, max={max})"
+            )
+
         self.minLen = min
 
         if max > 0:
@@ -2733,62 +2861,66 @@ def __init__(
             self.maxLen = _MAX_INT
 
         if exact > 0:
+            min = max = exact
             self.maxLen = exact
             self.minLen = exact
 
         self.errmsg = "Expected " + self.name
         self.mayIndexError = False
         self.asKeyword = asKeyword
+        if self.asKeyword:
+            self.errmsg += " as a keyword"
 
         # see if we can make a regex for this Word
-        if " " not in self.initChars | self.bodyChars and (min == 1 and exact == 0):
+        if " " not in (self.initChars | self.bodyChars):
+            if len(self.initChars) == 1:
+                re_leading_fragment = re.escape(self.initCharsOrig)
+            else:
+                re_leading_fragment = f"[{_collapse_string_to_ranges(self.initChars)}]"
+
             if self.bodyChars == self.initChars:
                 if max == 0:
                     repeat = "+"
                 elif max == 1:
                     repeat = ""
                 else:
-                    repeat = "{{{},{}}}".format(
-                        self.minLen, "" if self.maxLen == _MAX_INT else self.maxLen
-                    )
-                self.reString = "[{}]{}".format(
-                    _collapse_string_to_ranges(self.initChars),
-                    repeat,
-                )
-            elif len(self.initChars) == 1:
-                if max == 0:
-                    repeat = "*"
-                else:
-                    repeat = "{{0,{}}}".format(max - 1)
-                self.reString = "{}[{}]{}".format(
-                    re.escape(self.initCharsOrig),
-                    _collapse_string_to_ranges(self.bodyChars),
-                    repeat,
-                )
+                    if self.minLen != self.maxLen:
+                        repeat = f"{{{self.minLen},{'' if self.maxLen == _MAX_INT else self.maxLen}}}"
+                    else:
+                        repeat = f"{{{self.minLen}}}"
+                self.reString = f"{re_leading_fragment}{repeat}"
             else:
-                if max == 0:
-                    repeat = "*"
-                elif max == 2:
+                if max == 1:
+                    re_body_fragment = ""
                     repeat = ""
                 else:
-                    repeat = "{{0,{}}}".format(max - 1)
-                self.reString = "[{}][{}]{}".format(
-                    _collapse_string_to_ranges(self.initChars),
-                    _collapse_string_to_ranges(self.bodyChars),
-                    repeat,
+                    re_body_fragment = f"[{_collapse_string_to_ranges(self.bodyChars)}]"
+                    if max == 0:
+                        repeat = "*"
+                    elif max == 2:
+                        repeat = "?" if min <= 1 else ""
+                    else:
+                        if min != max:
+                            repeat = f"{{{min - 1 if min > 0 else 0},{max - 1}}}"
+                        else:
+                            repeat = f"{{{min - 1 if min > 0 else 0}}}"
+
+                self.reString = (
+                    f"{re_leading_fragment}" f"{re_body_fragment}" f"{repeat}"
                 )
+
             if self.asKeyword:
-                self.reString = r"\b" + self.reString + r"\b"
+                self.reString = rf"\b{self.reString}\b"
 
             try:
                 self.re = re.compile(self.reString)
             except re.error:
-                self.re = None
+                self.re = None  # type: ignore[assignment]
             else:
                 self.re_match = self.re.match
-                self.__class__ = _WordRegex
+                self.parseImpl = self.parseImpl_regex  # type: ignore[assignment]
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         def charsAsStr(s):
             max_repr_len = 16
             s = _collapse_string_to_ranges(s, re_escape=False)
@@ -2798,11 +2930,9 @@ def charsAsStr(s):
                 return s
 
         if self.initChars != self.bodyChars:
-            base = "W:({}, {})".format(
-                charsAsStr(self.initChars), charsAsStr(self.bodyChars)
-            )
+            base = f"W:({charsAsStr(self.initChars)}, {charsAsStr(self.bodyChars)})"
         else:
-            base = "W:({})".format(charsAsStr(self.initChars))
+            base = f"W:({charsAsStr(self.initChars)})"
 
         # add length specification
         if self.minLen > 1 or self.maxLen != _MAX_INT:
@@ -2810,11 +2940,11 @@ def charsAsStr(s):
                 if self.minLen == 1:
                     return base[2:]
                 else:
-                    return base + "{{{}}}".format(self.minLen)
+                    return base + f"{{{self.minLen}}}"
             elif self.maxLen == _MAX_INT:
-                return base + "{{{},...}}".format(self.minLen)
+                return base + f"{{{self.minLen},...}}"
             else:
-                return base + "{{{},{}}}".format(self.minLen, self.maxLen)
+                return base + f"{{{self.minLen},{self.maxLen}}}"
         return base
 
     def parseImpl(self, instring, loc, doActions=True):
@@ -2849,9 +2979,7 @@ def parseImpl(self, instring, loc, doActions=True):
 
         return loc, instring[start:loc]
 
-
-class _WordRegex(Word):
-    def parseImpl(self, instring, loc, doActions=True):
+    def parseImpl_regex(self, instring, loc, doActions=True):
         result = self.re_match(instring, loc)
         if not result:
             raise ParseException(instring, loc, self.errmsg, self)
@@ -2860,7 +2988,7 @@ def parseImpl(self, instring, loc, doActions=True):
         return loc, result.group()
 
 
-class Char(_WordRegex):
+class Char(Word):
     """A short-cut class for defining :class:`Word` ``(characters, exact=1)``,
     when defining a match of any single character in a string of
     characters.
@@ -2878,13 +3006,8 @@ def __init__(
         asKeyword = asKeyword or as_keyword
         excludeChars = excludeChars or exclude_chars
         super().__init__(
-            charset, exact=1, asKeyword=asKeyword, excludeChars=excludeChars
+            charset, exact=1, as_keyword=asKeyword, exclude_chars=excludeChars
         )
-        self.reString = "[{}]".format(_collapse_string_to_ranges(self.initChars))
-        if asKeyword:
-            self.reString = r"\b{}\b".format(self.reString)
-        self.re = re.compile(self.reString)
-        self.re_match = self.re.match
 
 
 class Regex(Token):
@@ -2954,9 +3077,9 @@ def __init__(
         self.asGroupList = asGroupList
         self.asMatch = asMatch
         if self.asGroupList:
-            self.parseImpl = self.parseImplAsGroupList
+            self.parseImpl = self.parseImplAsGroupList  # type: ignore [assignment]
         if self.asMatch:
-            self.parseImpl = self.parseImplAsMatch
+            self.parseImpl = self.parseImplAsMatch  # type: ignore [assignment]
 
     @cached_property
     def re(self):
@@ -2966,9 +3089,7 @@ def re(self):
             try:
                 return re.compile(self.pattern, self.flags)
             except re.error:
-                raise ValueError(
-                    "invalid pattern ({!r}) passed to Regex".format(self.pattern)
-                )
+                raise ValueError(f"invalid pattern ({self.pattern!r}) passed to Regex")
 
     @cached_property
     def re_match(self):
@@ -2978,7 +3099,7 @@ def re_match(self):
     def mayReturnEmpty(self):
         return self.re_match("") is not None
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return "Re:({})".format(repr(self.pattern).replace("\\\\", "\\"))
 
     def parseImpl(self, instring, loc, doActions=True):
@@ -3024,10 +3145,12 @@ def sub(self, repl: str) -> ParserElement:
             # prints "
main title
"
         """
         if self.asGroupList:
-            raise TypeError("cannot use sub() with Regex(asGroupList=True)")
+            raise TypeError("cannot use sub() with Regex(as_group_list=True)")
 
         if self.asMatch and callable(repl):
-            raise TypeError("cannot use sub() with a callable with Regex(asMatch=True)")
+            raise TypeError(
+                "cannot use sub() with a callable with Regex(as_match=True)"
+            )
 
         if self.asMatch:
 
@@ -3081,7 +3204,7 @@ class QuotedString(Token):
         [['This is the "quote"']]
         [['This is the quote with "embedded" quotes']]
     """
-    ws_map = ((r"\t", "\t"), (r"\n", "\n"), (r"\f", "\f"), (r"\r", "\r"))
+    ws_map = dict(((r"\t", "\t"), (r"\n", "\n"), (r"\f", "\f"), (r"\r", "\r")))
 
     def __init__(
         self,
@@ -3120,57 +3243,54 @@ def __init__(
         else:
             endQuoteChar = endQuoteChar.strip()
             if not endQuoteChar:
-                raise ValueError("endQuoteChar cannot be the empty string")
-
-        self.quoteChar = quote_char
-        self.quoteCharLen = len(quote_char)
-        self.firstQuoteChar = quote_char[0]
-        self.endQuoteChar = endQuoteChar
-        self.endQuoteCharLen = len(endQuoteChar)
-        self.escChar = escChar
-        self.escQuote = escQuote
-        self.unquoteResults = unquoteResults
-        self.convertWhitespaceEscapes = convertWhitespaceEscapes
+                raise ValueError("end_quote_char cannot be the empty string")
+
+        self.quoteChar: str = quote_char
+        self.quoteCharLen: int = len(quote_char)
+        self.firstQuoteChar: str = quote_char[0]
+        self.endQuoteChar: str = endQuoteChar
+        self.endQuoteCharLen: int = len(endQuoteChar)
+        self.escChar: str = escChar or ""
+        self.escQuote: str = escQuote or ""
+        self.unquoteResults: bool = unquoteResults
+        self.convertWhitespaceEscapes: bool = convertWhitespaceEscapes
+        self.multiline = multiline
 
         sep = ""
         inner_pattern = ""
 
         if escQuote:
-            inner_pattern += r"{}(?:{})".format(sep, re.escape(escQuote))
+            inner_pattern += rf"{sep}(?:{re.escape(escQuote)})"
             sep = "|"
 
         if escChar:
-            inner_pattern += r"{}(?:{}.)".format(sep, re.escape(escChar))
+            inner_pattern += rf"{sep}(?:{re.escape(escChar)}.)"
             sep = "|"
-            self.escCharReplacePattern = re.escape(self.escChar) + "(.)"
+            self.escCharReplacePattern = re.escape(escChar) + "(.)"
 
         if len(self.endQuoteChar) > 1:
             inner_pattern += (
-                "{}(?:".format(sep)
+                f"{sep}(?:"
                 + "|".join(
-                    "(?:{}(?!{}))".format(
-                        re.escape(self.endQuoteChar[:i]),
-                        re.escape(self.endQuoteChar[i:]),
-                    )
+                    f"(?:{re.escape(self.endQuoteChar[:i])}(?!{re.escape(self.endQuoteChar[i:])}))"
                     for i in range(len(self.endQuoteChar) - 1, 0, -1)
                 )
                 + ")"
             )
             sep = "|"
 
+        self.flags = re.RegexFlag(0)
+
         if multiline:
             self.flags = re.MULTILINE | re.DOTALL
-            inner_pattern += r"{}(?:[^{}{}])".format(
-                sep,
-                _escape_regex_range_chars(self.endQuoteChar[0]),
-                (_escape_regex_range_chars(escChar) if escChar is not None else ""),
+            inner_pattern += (
+                rf"{sep}(?:[^{_escape_regex_range_chars(self.endQuoteChar[0])}"
+                rf"{(_escape_regex_range_chars(escChar) if escChar is not None else '')}])"
             )
         else:
-            self.flags = 0
-            inner_pattern += r"{}(?:[^{}\n\r{}])".format(
-                sep,
-                _escape_regex_range_chars(self.endQuoteChar[0]),
-                (_escape_regex_range_chars(escChar) if escChar is not None else ""),
+            inner_pattern += (
+                rf"{sep}(?:[^{_escape_regex_range_chars(self.endQuoteChar[0])}\n\r"
+                rf"{(_escape_regex_range_chars(escChar) if escChar is not None else '')}])"
             )
 
         self.pattern = "".join(
@@ -3183,26 +3303,33 @@ def __init__(
             ]
         )
 
+        if self.unquoteResults:
+            if self.convertWhitespaceEscapes:
+                self.unquote_scan_re = re.compile(
+                    rf"({'|'.join(re.escape(k) for k in self.ws_map)})|({re.escape(self.escChar)}.)|(\n|.)",
+                    flags=self.flags,
+                )
+            else:
+                self.unquote_scan_re = re.compile(
+                    rf"({re.escape(self.escChar)}.)|(\n|.)", flags=self.flags
+                )
+
         try:
             self.re = re.compile(self.pattern, self.flags)
             self.reString = self.pattern
             self.re_match = self.re.match
         except re.error:
-            raise ValueError(
-                "invalid pattern {!r} passed to Regex".format(self.pattern)
-            )
+            raise ValueError(f"invalid pattern {self.pattern!r} passed to Regex")
 
         self.errmsg = "Expected " + self.name
         self.mayIndexError = False
         self.mayReturnEmpty = True
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         if self.quoteChar == self.endQuoteChar and isinstance(self.quoteChar, str_type):
-            return "string enclosed in {!r}".format(self.quoteChar)
+            return f"string enclosed in {self.quoteChar!r}"
 
-        return "quoted string, starting with {} ending with {}".format(
-            self.quoteChar, self.endQuoteChar
-        )
+        return f"quoted string, starting with {self.quoteChar} ending with {self.endQuoteChar}"
 
     def parseImpl(self, instring, loc, doActions=True):
         result = (
@@ -3217,19 +3344,24 @@ def parseImpl(self, instring, loc, doActions=True):
         ret = result.group()
 
         if self.unquoteResults:
-
             # strip off quotes
             ret = ret[self.quoteCharLen : -self.endQuoteCharLen]
 
             if isinstance(ret, str_type):
-                # replace escaped whitespace
-                if "\\" in ret and self.convertWhitespaceEscapes:
-                    for wslit, wschar in self.ws_map:
-                        ret = ret.replace(wslit, wschar)
-
-                # replace escaped characters
-                if self.escChar:
-                    ret = re.sub(self.escCharReplacePattern, r"\g<1>", ret)
+                if self.convertWhitespaceEscapes:
+                    ret = "".join(
+                        self.ws_map[match.group(1)]
+                        if match.group(1)
+                        else match.group(2)[-1]
+                        if match.group(2)
+                        else match.group(3)
+                        for match in self.unquote_scan_re.finditer(ret)
+                    )
+                else:
+                    ret = "".join(
+                        match.group(1)[-1] if match.group(1) else match.group(2)
+                        for match in self.unquote_scan_re.finditer(ret)
+                    )
 
                 # replace escaped quotes
                 if self.escQuote:
@@ -3252,7 +3384,7 @@ class CharsNotIn(Token):
 
         # define a comma-separated-value as anything that is not a ','
         csv_value = CharsNotIn(',')
-        print(delimited_list(csv_value).parse_string("dkls,lsdkjf,s12 34,@!#,213"))
+        print(DelimitedList(csv_value).parse_string("dkls,lsdkjf,s12 34,@!#,213"))
 
     prints::
 
@@ -3294,12 +3426,12 @@ def __init__(
         self.mayReturnEmpty = self.minLen == 0
         self.mayIndexError = False
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         not_chars_str = _collapse_string_to_ranges(self.notChars)
         if len(not_chars_str) > 16:
-            return "!W:({}...)".format(self.notChars[: 16 - 3])
+            return f"!W:({self.notChars[: 16 - 3]}...)"
         else:
-            return "!W:({})".format(self.notChars)
+            return f"!W:({self.notChars})"
 
     def parseImpl(self, instring, loc, doActions=True):
         notchars = self.notCharsSet
@@ -3376,7 +3508,7 @@ def __init__(self, ws: str = " \t\r\n", min: int = 1, max: int = 0, exact: int =
             self.maxLen = exact
             self.minLen = exact
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return "".join(White.whiteStrs[c] for c in self.matchWhite)
 
     def parseImpl(self, instring, loc, doActions=True):
@@ -3411,7 +3543,7 @@ def __init__(self, colno: int):
         super().__init__()
         self.col = colno
 
-    def preParse(self, instring, loc):
+    def preParse(self, instring: str, loc: int) -> int:
         if col(loc, instring) != self.col:
             instrlen = len(instring)
             if self.ignoreExprs:
@@ -3446,7 +3578,7 @@ class LineStart(PositionToken):
         B AAA and definitely not this one
         '''
 
-        for t in (LineStart() + 'AAA' + restOfLine).search_string(test):
+        for t in (LineStart() + 'AAA' + rest_of_line).search_string(test):
             print(t)
 
     prints::
@@ -3464,7 +3596,7 @@ def __init__(self):
         self.skipper = Empty().set_whitespace_chars(self.whiteChars)
         self.errmsg = "Expected start of line"
 
-    def preParse(self, instring, loc):
+    def preParse(self, instring: str, loc: int) -> int:
         if loc == 0:
             return loc
         else:
@@ -3624,7 +3756,7 @@ def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False
                 self.exprs = [exprs]
         self.callPreparse = False
 
-    def recurse(self) -> Sequence[ParserElement]:
+    def recurse(self) -> List[ParserElement]:
         return self.exprs[:]
 
     def append(self, other) -> ParserElement:
@@ -3669,8 +3801,8 @@ def ignore(self, other) -> ParserElement:
                 e.ignore(self.ignoreExprs[-1])
         return self
 
-    def _generateDefaultName(self):
-        return "{}:({})".format(self.__class__.__name__, str(self.exprs))
+    def _generateDefaultName(self) -> str:
+        return f"{self.__class__.__name__}:({str(self.exprs)})"
 
     def streamline(self) -> ParserElement:
         if self.streamlined:
@@ -3714,6 +3846,11 @@ def streamline(self) -> ParserElement:
         return self
 
     def validate(self, validateTrace=None) -> None:
+        warnings.warn(
+            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         tmp = (validateTrace if validateTrace is not None else [])[:] + [self]
         for e in self.exprs:
             e.validate(tmp)
@@ -3721,6 +3858,7 @@ def validate(self, validateTrace=None) -> None:
 
     def copy(self) -> ParserElement:
         ret = super().copy()
+        ret = typing.cast(ParseExpression, ret)
         ret.exprs = [e.copy() for e in self.exprs]
         return ret
 
@@ -3750,8 +3888,14 @@ def _setResultsName(self, name, listAllMatches=False):
 
         return super()._setResultsName(name, listAllMatches)
 
-    ignoreWhitespace = ignore_whitespace
-    leaveWhitespace = leave_whitespace
+    # Compatibility synonyms
+    # fmt: off
+    @replaced_by_pep8(leave_whitespace)
+    def leaveWhitespace(self): ...
+
+    @replaced_by_pep8(ignore_whitespace)
+    def ignoreWhitespace(self): ...
+    # fmt: on
 
 
 class And(ParseExpression):
@@ -3777,7 +3921,7 @@ def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)
             self.leave_whitespace()
 
-        def _generateDefaultName(self):
+        def _generateDefaultName(self) -> str:
             return "-"
 
     def __init__(
@@ -3789,7 +3933,9 @@ def __init__(
             for i, expr in enumerate(exprs):
                 if expr is Ellipsis:
                     if i < len(exprs) - 1:
-                        skipto_arg: ParserElement = (Empty() + exprs[i + 1]).exprs[-1]
+                        skipto_arg: ParserElement = typing.cast(
+                            ParseExpression, (Empty() + exprs[i + 1])
+                        ).exprs[-1]
                         tmp.append(SkipTo(skipto_arg)("_skipped*"))
                     else:
                         raise Exception(
@@ -3822,8 +3968,9 @@ def streamline(self) -> ParserElement:
                 and isinstance(e.exprs[-1], _PendingSkip)
                 for e in self.exprs[:-1]
             ):
+                deleted_expr_marker = NoMatch()
                 for i, e in enumerate(self.exprs[:-1]):
-                    if e is None:
+                    if e is deleted_expr_marker:
                         continue
                     if (
                         isinstance(e, ParseExpression)
@@ -3831,17 +3978,19 @@ def streamline(self) -> ParserElement:
                         and isinstance(e.exprs[-1], _PendingSkip)
                     ):
                         e.exprs[-1] = e.exprs[-1] + self.exprs[i + 1]
-                        self.exprs[i + 1] = None
-                self.exprs = [e for e in self.exprs if e is not None]
+                        self.exprs[i + 1] = deleted_expr_marker
+                self.exprs = [e for e in self.exprs if e is not deleted_expr_marker]
 
         super().streamline()
 
         # link any IndentedBlocks to the prior expression
+        prev: ParserElement
+        cur: ParserElement
         for prev, cur in zip(self.exprs, self.exprs[1:]):
             # traverse cur or any first embedded expr of cur looking for an IndentedBlock
             # (but watch out for recursive grammar)
             seen = set()
-            while cur:
+            while True:
                 if id(cur) in seen:
                     break
                 seen.add(id(cur))
@@ -3853,7 +4002,10 @@ def streamline(self) -> ParserElement:
                     )
                     break
                 subs = cur.recurse()
-                cur = next(iter(subs), None)
+                next_first = next(iter(subs), None)
+                if next_first is None:
+                    break
+                cur = typing.cast(ParserElement, next_first)
 
         self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
         return self
@@ -3884,13 +4036,14 @@ def parseImpl(self, instring, loc, doActions=True):
                     )
             else:
                 loc, exprtokens = e._parse(instring, loc, doActions)
-            if exprtokens or exprtokens.haskeys():
-                resultlist += exprtokens
+            resultlist += exprtokens
         return loc, resultlist
 
     def __iadd__(self, other):
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
+        if not isinstance(other, ParserElement):
+            return NotImplemented
         return self.append(other)  # And([self, other])
 
     def _checkRecursion(self, parseElementList):
@@ -3900,7 +4053,7 @@ def _checkRecursion(self, parseElementList):
             if not e.mayReturnEmpty:
                 break
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         inner = " ".join(str(e) for e in self.exprs)
         # strip off redundant inner {}'s
         while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
@@ -3958,7 +4111,7 @@ def parseImpl(self, instring, loc, doActions=True):
                 loc2 = e.try_parse(instring, loc, raise_fatal=True)
             except ParseFatalException as pfe:
                 pfe.__traceback__ = None
-                pfe.parserElement = e
+                pfe.parser_element = e
                 fatals.append(pfe)
                 maxException = None
                 maxExcLoc = -1
@@ -4016,12 +4169,15 @@ def parseImpl(self, instring, loc, doActions=True):
             if len(fatals) > 1:
                 fatals.sort(key=lambda e: -e.loc)
                 if fatals[0].loc == fatals[1].loc:
-                    fatals.sort(key=lambda e: (-e.loc, -len(str(e.parserElement))))
+                    fatals.sort(key=lambda e: (-e.loc, -len(str(e.parser_element))))
             max_fatal = fatals[0]
             raise max_fatal
 
         if maxException is not None:
-            maxException.msg = self.errmsg
+            # infer from this check that all alternatives failed at the current position
+            # so emit this collective error message instead of any single error message
+            if maxExcLoc == loc:
+                maxException.msg = self.errmsg
             raise maxException
         else:
             raise ParseException(
@@ -4031,9 +4187,11 @@ def parseImpl(self, instring, loc, doActions=True):
     def __ixor__(self, other):
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
+        if not isinstance(other, ParserElement):
+            return NotImplemented
         return self.append(other)  # Or([self, other])
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return "{" + " ^ ".join(str(e) for e in self.exprs) + "}"
 
     def _setResultsName(self, name, listAllMatches=False):
@@ -4118,7 +4276,7 @@ def parseImpl(self, instring, loc, doActions=True):
                 )
             except ParseFatalException as pfe:
                 pfe.__traceback__ = None
-                pfe.parserElement = e
+                pfe.parser_element = e
                 raise
             except ParseException as err:
                 if err.loc > maxExcLoc:
@@ -4132,7 +4290,10 @@ def parseImpl(self, instring, loc, doActions=True):
                     maxExcLoc = len(instring)
 
         if maxException is not None:
-            maxException.msg = self.errmsg
+            # infer from this check that all alternatives failed at the current position
+            # so emit this collective error message instead of any individual error message
+            if maxExcLoc == loc:
+                maxException.msg = self.errmsg
             raise maxException
         else:
             raise ParseException(
@@ -4142,9 +4303,11 @@ def parseImpl(self, instring, loc, doActions=True):
     def __ior__(self, other):
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
+        if not isinstance(other, ParserElement):
+            return NotImplemented
         return self.append(other)  # MatchFirst([self, other])
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return "{" + " | ".join(str(e) for e in self.exprs) + "}"
 
     def _setResultsName(self, name, listAllMatches=False):
@@ -4242,6 +4405,13 @@ def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = True)
         self.initExprGroups = True
         self.saveAsList = True
 
+    def __iand__(self, other):
+        if isinstance(other, str_type):
+            other = self._literalStringClass(other)
+        if not isinstance(other, ParserElement):
+            return NotImplemented
+        return self.append(other)  # Each([self, other])
+
     def streamline(self) -> ParserElement:
         super().streamline()
         if self.exprs:
@@ -4296,7 +4466,7 @@ def parseImpl(self, instring, loc, doActions=True):
                     tmpLoc = e.try_parse(instring, tmpLoc, raise_fatal=True)
                 except ParseFatalException as pfe:
                     pfe.__traceback__ = None
-                    pfe.parserElement = e
+                    pfe.parser_element = e
                     fatals.append(pfe)
                     failed.append(e)
                 except ParseException:
@@ -4315,7 +4485,7 @@ def parseImpl(self, instring, loc, doActions=True):
             if len(fatals) > 1:
                 fatals.sort(key=lambda e: -e.loc)
                 if fatals[0].loc == fatals[1].loc:
-                    fatals.sort(key=lambda e: (-e.loc, -len(str(e.parserElement))))
+                    fatals.sort(key=lambda e: (-e.loc, -len(str(e.parser_element))))
             max_fatal = fatals[0]
             raise max_fatal
 
@@ -4324,7 +4494,7 @@ def parseImpl(self, instring, loc, doActions=True):
             raise ParseException(
                 instring,
                 loc,
-                "Missing one or more required elements ({})".format(missing),
+                f"Missing one or more required elements ({missing})",
             )
 
         # add any unmatched Opts, in case they have default values defined
@@ -4337,7 +4507,7 @@ def parseImpl(self, instring, loc, doActions=True):
 
         return loc, total_results
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return "{" + " & ".join(str(e) for e in self.exprs) + "}"
 
 
@@ -4349,12 +4519,14 @@ class ParseElementEnhance(ParserElement):
     def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
         super().__init__(savelist)
         if isinstance(expr, str_type):
+            expr_str = typing.cast(str, expr)
             if issubclass(self._literalStringClass, Token):
-                expr = self._literalStringClass(expr)
+                expr = self._literalStringClass(expr_str)  # type: ignore[call-arg]
             elif issubclass(type(self), self._literalStringClass):
-                expr = Literal(expr)
+                expr = Literal(expr_str)
             else:
-                expr = self._literalStringClass(Literal(expr))
+                expr = self._literalStringClass(Literal(expr_str))  # type: ignore[assignment, call-arg]
+        expr = typing.cast(ParserElement, expr)
         self.expr = expr
         if expr is not None:
             self.mayIndexError = expr.mayIndexError
@@ -4367,12 +4539,16 @@ def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
             self.callPreparse = expr.callPreparse
             self.ignoreExprs.extend(expr.ignoreExprs)
 
-    def recurse(self) -> Sequence[ParserElement]:
+    def recurse(self) -> List[ParserElement]:
         return [self.expr] if self.expr is not None else []
 
     def parseImpl(self, instring, loc, doActions=True):
         if self.expr is not None:
-            return self.expr._parse(instring, loc, doActions, callPreParse=False)
+            try:
+                return self.expr._parse(instring, loc, doActions, callPreParse=False)
+            except ParseBaseException as pbe:
+                pbe.msg = self.errmsg
+                raise
         else:
             raise ParseException(instring, loc, "No expression defined", self)
 
@@ -4380,8 +4556,8 @@ def leave_whitespace(self, recursive: bool = True) -> ParserElement:
         super().leave_whitespace(recursive)
 
         if recursive:
-            self.expr = self.expr.copy()
             if self.expr is not None:
+                self.expr = self.expr.copy()
                 self.expr.leave_whitespace(recursive)
         return self
 
@@ -4389,8 +4565,8 @@ def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
         super().ignore_whitespace(recursive)
 
         if recursive:
-            self.expr = self.expr.copy()
             if self.expr is not None:
+                self.expr = self.expr.copy()
                 self.expr.ignore_whitespace(recursive)
         return self
 
@@ -4420,6 +4596,11 @@ def _checkRecursion(self, parseElementList):
             self.expr._checkRecursion(subRecCheckList)
 
     def validate(self, validateTrace=None) -> None:
+        warnings.warn(
+            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         if validateTrace is None:
             validateTrace = []
         tmp = validateTrace[:] + [self]
@@ -4427,11 +4608,17 @@ def validate(self, validateTrace=None) -> None:
             self.expr.validate(tmp)
         self._checkRecursion([])
 
-    def _generateDefaultName(self):
-        return "{}:({})".format(self.__class__.__name__, str(self.expr))
+    def _generateDefaultName(self) -> str:
+        return f"{self.__class__.__name__}:({str(self.expr)})"
+
+    # Compatibility synonyms
+    # fmt: off
+    @replaced_by_pep8(leave_whitespace)
+    def leaveWhitespace(self): ...
 
-    ignoreWhitespace = ignore_whitespace
-    leaveWhitespace = leave_whitespace
+    @replaced_by_pep8(ignore_whitespace)
+    def ignoreWhitespace(self): ...
+    # fmt: on
 
 
 class IndentedBlock(ParseElementEnhance):
@@ -4443,13 +4630,13 @@ class IndentedBlock(ParseElementEnhance):
     class _Indent(Empty):
         def __init__(self, ref_col: int):
             super().__init__()
-            self.errmsg = "expected indent at column {}".format(ref_col)
+            self.errmsg = f"expected indent at column {ref_col}"
             self.add_condition(lambda s, l, t: col(l, s) == ref_col)
 
     class _IndentGreater(Empty):
         def __init__(self, ref_col: int):
             super().__init__()
-            self.errmsg = "expected indent at column greater than {}".format(ref_col)
+            self.errmsg = f"expected indent at column greater than {ref_col}"
             self.add_condition(lambda s, l, t: col(l, s) > ref_col)
 
     def __init__(
@@ -4469,7 +4656,7 @@ def parseImpl(self, instring, loc, doActions=True):
 
         # see if self.expr matches at the current location - if not it will raise an exception
         # and no further work is necessary
-        self.expr.try_parse(instring, anchor_loc, doActions)
+        self.expr.try_parse(instring, anchor_loc, do_actions=doActions)
 
         indent_col = col(anchor_loc, instring)
         peer_detect_expr = self._Indent(indent_col)
@@ -4532,7 +4719,7 @@ class AtLineStart(ParseElementEnhance):
         B AAA and definitely not this one
         '''
 
-        for t in (AtLineStart('AAA') + restOfLine).search_string(test):
+        for t in (AtLineStart('AAA') + rest_of_line).search_string(test):
             print(t)
 
     prints::
@@ -4598,9 +4785,9 @@ class PrecededBy(ParseElementEnhance):
 
     Parameters:
 
-    - expr - expression that must match prior to the current parse
+    - ``expr`` - expression that must match prior to the current parse
       location
-    - retreat - (default= ``None``) - (int) maximum number of characters
+    - ``retreat`` - (default= ``None``) - (int) maximum number of characters
       to lookbehind prior to the current parse location
 
     If the lookbehind expression is a string, :class:`Literal`,
@@ -4627,6 +4814,7 @@ def __init__(
         self.mayIndexError = False
         self.exact = False
         if isinstance(expr, str_type):
+            expr = typing.cast(str, expr)
             retreat = len(expr)
             self.exact = True
         elif isinstance(expr, (Literal, Keyword)):
@@ -4746,18 +4934,18 @@ def __init__(self, expr: Union[ParserElement, str]):
         self.errmsg = "Found unwanted token, " + str(self.expr)
 
     def parseImpl(self, instring, loc, doActions=True):
-        if self.expr.can_parse_next(instring, loc):
+        if self.expr.can_parse_next(instring, loc, do_actions=doActions):
             raise ParseException(instring, loc, self.errmsg, self)
         return loc, []
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return "~{" + str(self.expr) + "}"
 
 
 class _MultipleMatch(ParseElementEnhance):
     def __init__(
         self,
-        expr: ParserElement,
+        expr: Union[str, ParserElement],
         stop_on: typing.Optional[Union[ParserElement, str]] = None,
         *,
         stopOn: typing.Optional[Union[ParserElement, str]] = None,
@@ -4781,7 +4969,7 @@ def parseImpl(self, instring, loc, doActions=True):
         self_skip_ignorables = self._skipIgnorables
         check_ender = self.not_ender is not None
         if check_ender:
-            try_not_ender = self.not_ender.tryParse
+            try_not_ender = self.not_ender.try_parse
 
         # must be at least one (but first see if we are the stopOn sentinel;
         # if so, fail)
@@ -4798,8 +4986,7 @@ def parseImpl(self, instring, loc, doActions=True):
                 else:
                     preloc = loc
                 loc, tmptokens = self_expr_parse(instring, preloc, doActions)
-                if tmptokens or tmptokens.haskeys():
-                    tokens += tmptokens
+                tokens += tmptokens
         except (ParseException, IndexError):
             pass
 
@@ -4837,10 +5024,11 @@ class OneOrMore(_MultipleMatch):
     Repetition of one or more of the given expression.
 
     Parameters:
-    - expr - expression that must match one or more times
-    - stop_on - (default= ``None``) - expression for a terminating sentinel
-         (only required if the sentinel would ordinarily match the repetition
-         expression)
+
+    - ``expr`` - expression that must match one or more times
+    - ``stop_on`` - (default= ``None``) - expression for a terminating sentinel
+      (only required if the sentinel would ordinarily match the repetition
+      expression)
 
     Example::
 
@@ -4859,7 +5047,7 @@ class OneOrMore(_MultipleMatch):
         (attr_expr * (1,)).parse_string(text).pprint()
     """
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return "{" + str(self.expr) + "}..."
 
 
@@ -4868,6 +5056,7 @@ class ZeroOrMore(_MultipleMatch):
     Optional repetition of zero or more of the given expression.
 
     Parameters:
+
     - ``expr`` - expression that must match zero or more times
     - ``stop_on`` - expression for a terminating sentinel
       (only required if the sentinel would ordinarily match the repetition
@@ -4878,7 +5067,7 @@ class ZeroOrMore(_MultipleMatch):
 
     def __init__(
         self,
-        expr: ParserElement,
+        expr: Union[str, ParserElement],
         stop_on: typing.Optional[Union[ParserElement, str]] = None,
         *,
         stopOn: typing.Optional[Union[ParserElement, str]] = None,
@@ -4892,10 +5081,75 @@ def parseImpl(self, instring, loc, doActions=True):
         except (ParseException, IndexError):
             return loc, ParseResults([], name=self.resultsName)
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         return "[" + str(self.expr) + "]..."
 
 
+class DelimitedList(ParseElementEnhance):
+    def __init__(
+        self,
+        expr: Union[str, ParserElement],
+        delim: Union[str, ParserElement] = ",",
+        combine: bool = False,
+        min: typing.Optional[int] = None,
+        max: typing.Optional[int] = None,
+        *,
+        allow_trailing_delim: bool = False,
+    ):
+        """Helper to define a delimited list of expressions - the delimiter
+        defaults to ','. By default, the list elements and delimiters can
+        have intervening whitespace, and comments, but this can be
+        overridden by passing ``combine=True`` in the constructor. If
+        ``combine`` is set to ``True``, the matching tokens are
+        returned as a single token string, with the delimiters included;
+        otherwise, the matching tokens are returned as a list of tokens,
+        with the delimiters suppressed.
+
+        If ``allow_trailing_delim`` is set to True, then the list may end with
+        a delimiter.
+
+        Example::
+
+            DelimitedList(Word(alphas)).parse_string("aa,bb,cc") # -> ['aa', 'bb', 'cc']
+            DelimitedList(Word(hexnums), delim=':', combine=True).parse_string("AA:BB:CC:DD:EE") # -> ['AA:BB:CC:DD:EE']
+        """
+        if isinstance(expr, str_type):
+            expr = ParserElement._literalStringClass(expr)
+        expr = typing.cast(ParserElement, expr)
+
+        if min is not None:
+            if min < 1:
+                raise ValueError("min must be greater than 0")
+        if max is not None:
+            if min is not None and max < min:
+                raise ValueError("max must be greater than, or equal to min")
+
+        self.content = expr
+        self.raw_delim = str(delim)
+        self.delim = delim
+        self.combine = combine
+        if not combine:
+            self.delim = Suppress(delim)
+        self.min = min or 1
+        self.max = max
+        self.allow_trailing_delim = allow_trailing_delim
+
+        delim_list_expr = self.content + (self.delim + self.content) * (
+            self.min - 1,
+            None if self.max is None else self.max - 1,
+        )
+        if self.allow_trailing_delim:
+            delim_list_expr += Opt(self.delim)
+
+        if self.combine:
+            delim_list_expr = Combine(delim_list_expr)
+
+        super().__init__(delim_list_expr, savelist=True)
+
+    def _generateDefaultName(self) -> str:
+        return "{0} [{1} {0}]...".format(self.content.streamline(), self.raw_delim)
+
+
 class _NullToken:
     def __bool__(self):
         return False
@@ -4909,6 +5163,7 @@ class Opt(ParseElementEnhance):
     Optional matching of the given expression.
 
     Parameters:
+
     - ``expr`` - expression that must match zero or more times
     - ``default`` (optional) - value to be returned if the optional expression is not found.
 
@@ -4969,7 +5224,7 @@ def parseImpl(self, instring, loc, doActions=True):
                 tokens = []
         return loc, tokens
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         inner = str(self.expr)
         # strip off redundant inner {}'s
         while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
@@ -4986,6 +5241,7 @@ class SkipTo(ParseElementEnhance):
     expression is found.
 
     Parameters:
+
     - ``expr`` - target expression marking the end of the data to be skipped
     - ``include`` - if ``True``, the target expression is also parsed
       (the skipped text and target expression are returned as a 2-element
@@ -5045,14 +5301,15 @@ def __init__(
         self,
         other: Union[ParserElement, str],
         include: bool = False,
-        ignore: bool = None,
+        ignore: typing.Optional[Union[ParserElement, str]] = None,
         fail_on: typing.Optional[Union[ParserElement, str]] = None,
         *,
-        failOn: Union[ParserElement, str] = None,
+        failOn: typing.Optional[Union[ParserElement, str]] = None,
     ):
         super().__init__(other)
         failOn = failOn or fail_on
-        self.ignoreExpr = ignore
+        if ignore is not None:
+            self.ignore(ignore)
         self.mayReturnEmpty = True
         self.mayIndexError = False
         self.includeMatch = include
@@ -5070,9 +5327,7 @@ def parseImpl(self, instring, loc, doActions=True):
         self_failOn_canParseNext = (
             self.failOn.canParseNext if self.failOn is not None else None
         )
-        self_ignoreExpr_tryParse = (
-            self.ignoreExpr.tryParse if self.ignoreExpr is not None else None
-        )
+        self_preParse = self.preParse if self.callPreparse else None
 
         tmploc = loc
         while tmploc <= instrlen:
@@ -5081,13 +5336,9 @@ def parseImpl(self, instring, loc, doActions=True):
                 if self_failOn_canParseNext(instring, tmploc):
                     break
 
-            if self_ignoreExpr_tryParse is not None:
-                # advance past ignore expressions
-                while 1:
-                    try:
-                        tmploc = self_ignoreExpr_tryParse(instring, tmploc)
-                    except ParseBaseException:
-                        break
+            if self_preParse is not None:
+                # skip grammar-ignored expressions
+                tmploc = self_preParse(instring, tmploc)
 
             try:
                 self_expr_parse(instring, tmploc, doActions=False, callPreParse=False)
@@ -5145,15 +5396,20 @@ class Forward(ParseElementEnhance):
 
     def __init__(self, other: typing.Optional[Union[ParserElement, str]] = None):
         self.caller_frame = traceback.extract_stack(limit=2)[0]
-        super().__init__(other, savelist=False)
+        super().__init__(other, savelist=False)  # type: ignore[arg-type]
         self.lshift_line = None
 
-    def __lshift__(self, other):
+    def __lshift__(self, other) -> "Forward":
         if hasattr(self, "caller_frame"):
             del self.caller_frame
         if isinstance(other, str_type):
             other = self._literalStringClass(other)
+
+        if not isinstance(other, ParserElement):
+            return NotImplemented
+
         self.expr = other
+        self.streamlined = other.streamlined
         self.mayIndexError = self.expr.mayIndexError
         self.mayReturnEmpty = self.expr.mayReturnEmpty
         self.set_whitespace_chars(
@@ -5162,13 +5418,16 @@ def __lshift__(self, other):
         self.skipWhitespace = self.expr.skipWhitespace
         self.saveAsList = self.expr.saveAsList
         self.ignoreExprs.extend(self.expr.ignoreExprs)
-        self.lshift_line = traceback.extract_stack(limit=2)[-2]
+        self.lshift_line = traceback.extract_stack(limit=2)[-2]  # type: ignore[assignment]
         return self
 
-    def __ilshift__(self, other):
+    def __ilshift__(self, other) -> "Forward":
+        if not isinstance(other, ParserElement):
+            return NotImplemented
+
         return self << other
 
-    def __or__(self, other):
+    def __or__(self, other) -> "ParserElement":
         caller_line = traceback.extract_stack(limit=2)[-2]
         if (
             __diag__.warn_on_match_first_with_lshift_operator
@@ -5205,12 +5464,12 @@ def parseImpl(self, instring, loc, doActions=True):
             not in self.suppress_warnings_
         ):
             # walk stack until parse_string, scan_string, search_string, or transform_string is found
-            parse_fns = [
+            parse_fns = (
                 "parse_string",
                 "scan_string",
                 "search_string",
                 "transform_string",
-            ]
+            )
             tb = traceback.extract_stack(limit=200)
             for i, frm in enumerate(reversed(tb), start=1):
                 if frm.name in parse_fns:
@@ -5308,6 +5567,11 @@ def streamline(self) -> ParserElement:
         return self
 
     def validate(self, validateTrace=None) -> None:
+        warnings.warn(
+            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         if validateTrace is None:
             validateTrace = []
 
@@ -5317,7 +5581,7 @@ def validate(self, validateTrace=None) -> None:
                 self.expr.validate(tmp)
         self._checkRecursion([])
 
-    def _generateDefaultName(self):
+    def _generateDefaultName(self) -> str:
         # Avoid infinite recursion by setting a temporary _defaultName
         self._defaultName = ": ..."
 
@@ -5356,8 +5620,14 @@ def _setResultsName(self, name, list_all_matches=False):
 
         return super()._setResultsName(name, list_all_matches)
 
-    ignoreWhitespace = ignore_whitespace
-    leaveWhitespace = leave_whitespace
+    # Compatibility synonyms
+    # fmt: off
+    @replaced_by_pep8(leave_whitespace)
+    def leaveWhitespace(self): ...
+
+    @replaced_by_pep8(ignore_whitespace)
+    def ignoreWhitespace(self): ...
+    # fmt: on
 
 
 class TokenConverter(ParseElementEnhance):
@@ -5439,11 +5709,11 @@ class Group(TokenConverter):
         ident = Word(alphas)
         num = Word(nums)
         term = ident | num
-        func = ident + Opt(delimited_list(term))
+        func = ident + Opt(DelimitedList(term))
         print(func.parse_string("fn a, b, 100"))
         # -> ['fn', 'a', 'b', '100']
 
-        func = ident + Group(Opt(delimited_list(term)))
+        func = ident + Group(Opt(DelimitedList(term)))
         print(func.parse_string("fn a, b, 100"))
         # -> ['fn', ['a', 'b', '100']]
     """
@@ -5579,7 +5849,7 @@ class Suppress(TokenConverter):
         ['a', 'b', 'c', 'd']
         ['START', 'relevant text ', 'END']
 
-    (See also :class:`delimited_list`.)
+    (See also :class:`DelimitedList`.)
     """
 
     def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
@@ -5638,15 +5908,13 @@ def z(*paArgs):
         s, l, t = paArgs[-3:]
         if len(paArgs) > 3:
             thisFunc = paArgs[0].__class__.__name__ + "." + thisFunc
-        sys.stderr.write(
-            ">>entering {}(line: {!r}, {}, {!r})\n".format(thisFunc, line(l, s), l, t)
-        )
+        sys.stderr.write(f">>entering {thisFunc}(line: {line(l, s)!r}, {l}, {t!r})\n")
         try:
             ret = f(*paArgs)
         except Exception as exc:
-            sys.stderr.write("< str:
     )
     try:
         return "".join(_expanded(part) for part in _reBracketExpr.parse_string(s).body)
-    except Exception:
+    except Exception as e:
         return ""
 
 
@@ -5769,7 +6037,11 @@ def autoname_elements() -> None:
     Utility to simplify mass-naming of parser elements, for
     generating railroad diagram with named subdiagrams.
     """
-    for name, var in sys._getframe().f_back.f_locals.items():
+    calling_frame = sys._getframe().f_back
+    if calling_frame is None:
+        return
+    calling_frame = typing.cast(types.FrameType, calling_frame)
+    for name, var in calling_frame.f_locals.items():
         if isinstance(var, ParserElement) and not var.customName:
             var.set_name(name)
 
@@ -5783,9 +6055,28 @@ def autoname_elements() -> None:
 ).set_name("string enclosed in single quotes")
 
 quoted_string = Combine(
-    Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*') + '"'
-    | Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*") + "'"
-).set_name("quotedString using single or double quotes")
+    (Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*') + '"').set_name(
+        "double quoted string"
+    )
+    | (Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*") + "'").set_name(
+        "single quoted string"
+    )
+).set_name("quoted string using single or double quotes")
+
+python_quoted_string = Combine(
+    (Regex(r'"""(?:[^"\\]|""(?!")|"(?!"")|\\.)*', flags=re.MULTILINE) + '"""').set_name(
+        "multiline double quoted string"
+    )
+    ^ (
+        Regex(r"'''(?:[^'\\]|''(?!')|'(?!'')|\\.)*", flags=re.MULTILINE) + "'''"
+    ).set_name("multiline single quoted string")
+    ^ (Regex(r'"(?:[^"\n\r\\]|(?:\\")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*') + '"').set_name(
+        "double quoted string"
+    )
+    ^ (Regex(r"'(?:[^'\n\r\\]|(?:\\')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*") + "'").set_name(
+        "single quoted string"
+    )
+).set_name("Python quoted string")
 
 unicode_string = Combine("u" + quoted_string.copy()).set_name("unicode string literal")
 
@@ -5800,9 +6091,7 @@ def autoname_elements() -> None:
 ]
 
 # backward compatibility names
-tokenMap = token_map
-conditionAsParseAction = condition_as_parse_action
-nullDebugAction = null_debug_action
+# fmt: off
 sglQuotedString = sgl_quoted_string
 dblQuotedString = dbl_quoted_string
 quotedString = quoted_string
@@ -5811,4 +6100,16 @@ def autoname_elements() -> None:
 lineEnd = line_end
 stringStart = string_start
 stringEnd = string_end
-traceParseAction = trace_parse_action
+
+@replaced_by_pep8(null_debug_action)
+def nullDebugAction(): ...
+
+@replaced_by_pep8(trace_parse_action)
+def traceParseAction(): ...
+
+@replaced_by_pep8(condition_as_parse_action)
+def conditionAsParseAction(): ...
+
+@replaced_by_pep8(token_map)
+def tokenMap(): ...
+# fmt: on
diff --git a/src/pip/_vendor/pyparsing/diagram/__init__.py b/src/pip/_vendor/pyparsing/diagram/__init__.py
index 1506d66bf4e..83f9018ee93 100644
--- a/src/pip/_vendor/pyparsing/diagram/__init__.py
+++ b/src/pip/_vendor/pyparsing/diagram/__init__.py
@@ -1,3 +1,4 @@
+# mypy: ignore-errors
 import railroad
 from pip._vendor import pyparsing
 import typing
@@ -17,11 +18,13 @@
 
 
 jinja2_template_source = """\
+{% if not embed %}
 
 
 
+{% endif %}
     {% if not head %}
-        
 
-
 
-    
{code}

+    
{code}

 
 
 """
diff --git a/src/pip/_vendor/rich/_ratio.py b/src/pip/_vendor/rich/_ratio.py
index e8a3a674e00..95267b0cb6c 100644
--- a/src/pip/_vendor/rich/_ratio.py
+++ b/src/pip/_vendor/rich/_ratio.py
@@ -151,7 +151,6 @@ def ratio_distribute(
 
     @dataclass
     class E:
-
         size: Optional[int] = None
         ratio: int = 1
         minimum_size: int = 1
diff --git a/src/pip/_vendor/rich/_windows.py b/src/pip/_vendor/rich/_windows.py
index 10fc0d7e9f3..7520a9f90a5 100644
--- a/src/pip/_vendor/rich/_windows.py
+++ b/src/pip/_vendor/rich/_windows.py
@@ -30,7 +30,6 @@ class WindowsConsoleFeatures:
     )
 
 except (AttributeError, ImportError, ValueError):
-
     # Fallback if we can't load the Windows DLL
     def get_windows_console_features() -> WindowsConsoleFeatures:
         features = WindowsConsoleFeatures()
diff --git a/src/pip/_vendor/rich/_wrap.py b/src/pip/_vendor/rich/_wrap.py
index c45f193f74a..2e94ff6f43a 100644
--- a/src/pip/_vendor/rich/_wrap.py
+++ b/src/pip/_vendor/rich/_wrap.py
@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 import re
-from typing import Iterable, List, Tuple
+from typing import Iterable
 
 from ._loop import loop_last
 from .cells import cell_len, chop_cells
@@ -7,7 +9,11 @@
 re_word = re.compile(r"\s*\S+\s*")
 
 
-def words(text: str) -> Iterable[Tuple[int, int, str]]:
+def words(text: str) -> Iterable[tuple[int, int, str]]:
+    """Yields each word from the text as a tuple
+    containing (start_index, end_index, word). A "word" in this context may
+    include the actual word and any whitespace to the right.
+    """
     position = 0
     word_match = re_word.match(text, position)
     while word_match is not None:
@@ -17,35 +23,59 @@ def words(text: str) -> Iterable[Tuple[int, int, str]]:
         word_match = re_word.match(text, end)
 
 
-def divide_line(text: str, width: int, fold: bool = True) -> List[int]:
-    divides: List[int] = []
-    append = divides.append
-    line_position = 0
+def divide_line(text: str, width: int, fold: bool = True) -> list[int]:
+    """Given a string of text, and a width (measured in cells), return a list
+    of cell offsets which the string should be split at in order for it to fit
+    within the given width.
+
+    Args:
+        text: The text to examine.
+        width: The available cell width.
+        fold: If True, words longer than `width` will be folded onto a new line.
+
+    Returns:
+        A list of indices to break the line at.
+    """
+    break_positions: list[int] = []  # offsets to insert the breaks at
+    append = break_positions.append
+    cell_offset = 0
     _cell_len = cell_len
+
     for start, _end, word in words(text):
         word_length = _cell_len(word.rstrip())
-        if line_position + word_length > width:
+        remaining_space = width - cell_offset
+        word_fits_remaining_space = remaining_space >= word_length
+
+        if word_fits_remaining_space:
+            # Simplest case - the word fits within the remaining width for this line.
+            cell_offset += _cell_len(word)
+        else:
+            # Not enough space remaining for this word on the current line.
             if word_length > width:
+                # The word doesn't fit on any line, so we can't simply
+                # place it on the next line...
                 if fold:
-                    chopped_words = chop_cells(word, max_size=width, position=0)
-                    for last, line in loop_last(chopped_words):
+                    # Fold the word across multiple lines.
+                    folded_word = chop_cells(word, width=width)
+                    for last, line in loop_last(folded_word):
                         if start:
                             append(start)
-
                         if last:
-                            line_position = _cell_len(line)
+                            cell_offset = _cell_len(line)
                         else:
                             start += len(line)
                 else:
+                    # Folding isn't allowed, so crop the word.
                     if start:
                         append(start)
-                    line_position = _cell_len(word)
-            elif line_position and start:
+                    cell_offset = _cell_len(word)
+            elif cell_offset and start:
+                # The word doesn't fit within the remaining space on the current
+                # line, but it *can* fit on to the next (empty) line.
                 append(start)
-                line_position = _cell_len(word)
-        else:
-            line_position += _cell_len(word)
-    return divides
+                cell_offset = _cell_len(word)
+
+    return break_positions
 
 
 if __name__ == "__main__":  # pragma: no cover
@@ -53,4 +83,11 @@ def divide_line(text: str, width: int, fold: bool = True) -> List[int]:
 
     console = Console(width=10)
     console.print("12345 abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ 12345")
-    print(chop_cells("abcdefghijklmnopqrstuvwxyz", 10, position=2))
+    print(chop_cells("abcdefghijklmnopqrstuvwxyz", 10))
+
+    console = Console(width=20)
+    console.rule()
+    console.print("TextualはPythonの高速アプリケーション開発フレームワークです")
+
+    console.rule()
+    console.print("アプリケーションは1670万色を使用でき")
diff --git a/src/pip/_vendor/rich/align.py b/src/pip/_vendor/rich/align.py
index c310b66e783..f7b734fd728 100644
--- a/src/pip/_vendor/rich/align.py
+++ b/src/pip/_vendor/rich/align.py
@@ -27,7 +27,7 @@ class Align(JupyterMixin):
         renderable (RenderableType): A console renderable.
         align (AlignMethod): One of "left", "center", or "right""
         style (StyleType, optional): An optional style to apply to the background.
-        vertical (Optional[VerticalAlginMethod], optional): Optional vertical align, one of "top", "middle", or "bottom". Defaults to None.
+        vertical (Optional[VerticalAlignMethod], optional): Optional vertical align, one of "top", "middle", or "bottom". Defaults to None.
         pad (bool, optional): Pad the right with spaces. Defaults to True.
         width (int, optional): Restrict contents to given width, or None to use default width. Defaults to None.
         height (int, optional): Set height of align renderable, or None to fit to contents. Defaults to None.
diff --git a/src/pip/_vendor/rich/bar.py b/src/pip/_vendor/rich/bar.py
index ed86a552d1c..022284b5788 100644
--- a/src/pip/_vendor/rich/bar.py
+++ b/src/pip/_vendor/rich/bar.py
@@ -48,7 +48,6 @@ def __repr__(self) -> str:
     def __rich_console__(
         self, console: Console, options: ConsoleOptions
     ) -> RenderResult:
-
         width = min(
             self.width if self.width is not None else options.max_width,
             options.max_width,
diff --git a/src/pip/_vendor/rich/box.py b/src/pip/_vendor/rich/box.py
index 97d2a944457..0511a9e48ba 100644
--- a/src/pip/_vendor/rich/box.py
+++ b/src/pip/_vendor/rich/box.py
@@ -188,260 +188,224 @@ def get_bottom(self, widths: Iterable[int]) -> str:
         return "".join(parts)
 
 
+# fmt: off
 ASCII: Box = Box(
-    """\
-+--+
-| ||
-|-+|
-| ||
-|-+|
-|-+|
-| ||
-+--+
-""",
+    "+--+\n"
+    "| ||\n"
+    "|-+|\n"
+    "| ||\n"
+    "|-+|\n"
+    "|-+|\n"
+    "| ||\n"
+    "+--+\n",
     ascii=True,
 )
 
 ASCII2: Box = Box(
-    """\
-+-++
-| ||
-+-++
-| ||
-+-++
-+-++
-| ||
-+-++
-""",
+    "+-++\n"
+    "| ||\n"
+    "+-++\n"
+    "| ||\n"
+    "+-++\n"
+    "+-++\n"
+    "| ||\n"
+    "+-++\n",
     ascii=True,
 )
 
 ASCII_DOUBLE_HEAD: Box = Box(
-    """\
-+-++
-| ||
-+=++
-| ||
-+-++
-+-++
-| ||
-+-++
-""",
+    "+-++\n"
+    "| ||\n"
+    "+=++\n"
+    "| ||\n"
+    "+-++\n"
+    "+-++\n"
+    "| ||\n"
+    "+-++\n",
     ascii=True,
 )
 
 SQUARE: Box = Box(
-    """\
-┌─┬┐
-│ ││
-├─┼┤
-│ ││
-├─┼┤
-├─┼┤
-│ ││
-└─┴┘
-"""
+    "┌─┬┐\n"
+    "│ ││\n"
+    "├─┼┤\n"
+    "│ ││\n"
+    "├─┼┤\n"
+    "├─┼┤\n"
+    "│ ││\n"
+    "└─┴┘\n"
 )
 
 SQUARE_DOUBLE_HEAD: Box = Box(
-    """\
-┌─┬┐
-│ ││
-╞═╪╡
-│ ││
-├─┼┤
-├─┼┤
-│ ││
-└─┴┘
-"""
+    "┌─┬┐\n"
+    "│ ││\n"
+    "╞═╪╡\n"
+    "│ ││\n"
+    "├─┼┤\n"
+    "├─┼┤\n"
+    "│ ││\n"
+    "└─┴┘\n"
 )
 
 MINIMAL: Box = Box(
-    """\
-  ╷ 
-  │ 
-╶─┼╴
-  │ 
-╶─┼╴
-╶─┼╴
-  │ 
-  ╵ 
-"""
+    "  ╷ \n"
+    "  │ \n"
+    "╶─┼╴\n"
+    "  │ \n"
+    "╶─┼╴\n"
+    "╶─┼╴\n"
+    "  │ \n"
+    "  ╵ \n"
 )
 
 
 MINIMAL_HEAVY_HEAD: Box = Box(
-    """\
-  ╷ 
-  │ 
-╺━┿╸
-  │ 
-╶─┼╴
-╶─┼╴
-  │ 
-  ╵ 
-"""
+    "  ╷ \n"
+    "  │ \n"
+    "╺━┿╸\n"
+    "  │ \n"
+    "╶─┼╴\n"
+    "╶─┼╴\n"
+    "  │ \n"
+    "  ╵ \n"
 )
 
 MINIMAL_DOUBLE_HEAD: Box = Box(
-    """\
-  ╷ 
-  │ 
- ═╪ 
-  │ 
- ─┼ 
- ─┼ 
-  │ 
-  ╵ 
-"""
+    "  ╷ \n"
+    "  │ \n"
+    " ═╪ \n"
+    "  │ \n"
+    " ─┼ \n"
+    " ─┼ \n"
+    "  │ \n"
+    "  ╵ \n"
 )
 
 
 SIMPLE: Box = Box(
-    """\
-    
-    
- ── 
-    
-    
- ── 
-    
-    
-"""
+    "    \n"
+    "    \n"
+    " ── \n"
+    "    \n"
+    "    \n"
+    " ── \n"
+    "    \n"
+    "    \n"
 )
 
 SIMPLE_HEAD: Box = Box(
-    """\
-    
-    
- ── 
-    
-    
-    
-    
-    
-"""
+    "    \n"
+    "    \n"
+    " ── \n"
+    "    \n"
+    "    \n"
+    "    \n"
+    "    \n"
+    "    \n"
 )
 
 
 SIMPLE_HEAVY: Box = Box(
-    """\
-    
-    
- ━━ 
-    
-    
- ━━ 
-    
-    
-"""
+    "    \n"
+    "    \n"
+    " ━━ \n"
+    "    \n"
+    "    \n"
+    " ━━ \n"
+    "    \n"
+    "    \n"
 )
 
 
 HORIZONTALS: Box = Box(
-    """\
- ── 
-    
- ── 
-    
- ── 
- ── 
-    
- ── 
-"""
+    " ── \n"
+    "    \n"
+    " ── \n"
+    "    \n"
+    " ── \n"
+    " ── \n"
+    "    \n"
+    " ── \n"
 )
 
 ROUNDED: Box = Box(
-    """\
-╭─┬╮
-│ ││
-├─┼┤
-│ ││
-├─┼┤
-├─┼┤
-│ ││
-╰─┴╯
-"""
+    "╭─┬╮\n"
+    "│ ││\n"
+    "├─┼┤\n"
+    "│ ││\n"
+    "├─┼┤\n"
+    "├─┼┤\n"
+    "│ ││\n"
+    "╰─┴╯\n"
 )
 
 HEAVY: Box = Box(
-    """\
-┏━┳┓
-┃ ┃┃
-┣━╋┫
-┃ ┃┃
-┣━╋┫
-┣━╋┫
-┃ ┃┃
-┗━┻┛
-"""
+    "┏━┳┓\n"
+    "┃ ┃┃\n"
+    "┣━╋┫\n"
+    "┃ ┃┃\n"
+    "┣━╋┫\n"
+    "┣━╋┫\n"
+    "┃ ┃┃\n"
+    "┗━┻┛\n"
 )
 
 HEAVY_EDGE: Box = Box(
-    """\
-┏━┯┓
-┃ │┃
-┠─┼┨
-┃ │┃
-┠─┼┨
-┠─┼┨
-┃ │┃
-┗━┷┛
-"""
+    "┏━┯┓\n"
+    "┃ │┃\n"
+    "┠─┼┨\n"
+    "┃ │┃\n"
+    "┠─┼┨\n"
+    "┠─┼┨\n"
+    "┃ │┃\n"
+    "┗━┷┛\n"
 )
 
 HEAVY_HEAD: Box = Box(
-    """\
-┏━┳┓
-┃ ┃┃
-┡━╇┩
-│ ││
-├─┼┤
-├─┼┤
-│ ││
-└─┴┘
-"""
+    "┏━┳┓\n"
+    "┃ ┃┃\n"
+    "┡━╇┩\n"
+    "│ ││\n"
+    "├─┼┤\n"
+    "├─┼┤\n"
+    "│ ││\n"
+    "└─┴┘\n"
 )
 
 DOUBLE: Box = Box(
-    """\
-╔═╦╗
-║ ║║
-╠═╬╣
-║ ║║
-╠═╬╣
-╠═╬╣
-║ ║║
-╚═╩╝
-"""
+    "╔═╦╗\n"
+    "║ ║║\n"
+    "╠═╬╣\n"
+    "║ ║║\n"
+    "╠═╬╣\n"
+    "╠═╬╣\n"
+    "║ ║║\n"
+    "╚═╩╝\n"
 )
 
 DOUBLE_EDGE: Box = Box(
-    """\
-╔═╤╗
-║ │║
-╟─┼╢
-║ │║
-╟─┼╢
-╟─┼╢
-║ │║
-╚═╧╝
-"""
+    "╔═╤╗\n"
+    "║ │║\n"
+    "╟─┼╢\n"
+    "║ │║\n"
+    "╟─┼╢\n"
+    "╟─┼╢\n"
+    "║ │║\n"
+    "╚═╧╝\n"
 )
 
 MARKDOWN: Box = Box(
-    """\
-    
-| ||
-|-||
-| ||
-|-||
-|-||
-| ||
-    
-""",
+    "    \n"
+    "| ||\n"
+    "|-||\n"
+    "| ||\n"
+    "|-||\n"
+    "|-||\n"
+    "| ||\n"
+    "    \n",
     ascii=True,
 )
+# fmt: on
 
 # Map Boxes that don't render with raster fonts on to equivalent that do
 LEGACY_WINDOWS_SUBSTITUTIONS = {
@@ -464,7 +428,6 @@ def get_bottom(self, widths: Iterable[int]) -> str:
 
 
 if __name__ == "__main__":  # pragma: no cover
-
     from pip._vendor.rich.columns import Columns
     from pip._vendor.rich.panel import Panel
 
diff --git a/src/pip/_vendor/rich/cells.py b/src/pip/_vendor/rich/cells.py
index 9354f9e3140..f85f928f75e 100644
--- a/src/pip/_vendor/rich/cells.py
+++ b/src/pip/_vendor/rich/cells.py
@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 import re
 from functools import lru_cache
-from typing import Callable, List
+from typing import Callable
 
 from ._cell_widths import CELL_WIDTHS
 
@@ -119,33 +121,44 @@ def set_cell_size(text: str, total: int) -> str:
             start = pos
 
 
-# TODO: This is inefficient
-# TODO: This might not work with CWJ type characters
-def chop_cells(text: str, max_size: int, position: int = 0) -> List[str]:
-    """Break text in to equal (cell) length strings, returning the characters in reverse
-    order"""
+def chop_cells(
+    text: str,
+    width: int,
+) -> list[str]:
+    """Split text into lines such that each line fits within the available (cell) width.
+
+    Args:
+        text: The text to fold such that it fits in the given width.
+        width: The width available (number of cells).
+
+    Returns:
+        A list of strings such that each string in the list has cell width
+        less than or equal to the available width.
+    """
     _get_character_cell_size = get_character_cell_size
-    characters = [
-        (character, _get_character_cell_size(character)) for character in text
-    ]
-    total_size = position
-    lines: List[List[str]] = [[]]
-    append = lines[-1].append
-
-    for character, size in reversed(characters):
-        if total_size + size > max_size:
-            lines.append([character])
-            append = lines[-1].append
-            total_size = size
+    lines: list[list[str]] = [[]]
+
+    append_new_line = lines.append
+    append_to_last_line = lines[-1].append
+
+    total_width = 0
+
+    for character in text:
+        cell_width = _get_character_cell_size(character)
+        char_doesnt_fit = total_width + cell_width > width
+
+        if char_doesnt_fit:
+            append_new_line([character])
+            append_to_last_line = lines[-1].append
+            total_width = cell_width
         else:
-            total_size += size
-            append(character)
+            append_to_last_line(character)
+            total_width += cell_width
 
     return ["".join(line) for line in lines]
 
 
 if __name__ == "__main__":  # pragma: no cover
-
     print(get_character_cell_size("😽"))
     for line in chop_cells("""这是对亚洲语言支持的测试。面对模棱两可的想法，拒绝猜测的诱惑。""", 8):
         print(line)
diff --git a/src/pip/_vendor/rich/color.py b/src/pip/_vendor/rich/color.py
index dfe455937c8..4270a278d59 100644
--- a/src/pip/_vendor/rich/color.py
+++ b/src/pip/_vendor/rich/color.py
@@ -592,7 +592,6 @@ def blend_rgb(
 
 
 if __name__ == "__main__":  # pragma: no cover
-
     from .console import Console
     from .table import Table
     from .text import Text
diff --git a/src/pip/_vendor/rich/console.py b/src/pip/_vendor/rich/console.py
index e559cbb43c1..a11c7c137f0 100644
--- a/src/pip/_vendor/rich/console.py
+++ b/src/pip/_vendor/rich/console.py
@@ -278,6 +278,7 @@ def __rich_console__(
 
 # A type that may be rendered by Console.
 RenderableType = Union[ConsoleRenderable, RichCast, str]
+"""A string or any object that may be rendered by Rich."""
 
 # The result of calling a __rich_console__ method.
 RenderResult = Iterable[Union[RenderableType, Segment]]
@@ -1925,7 +1926,6 @@ def log(
             end (str, optional): String to write at end of print data. Defaults to "\\\\n".
             style (Union[str, Style], optional): A style to apply to output. Defaults to None.
             justify (str, optional): One of "left", "right", "center", or "full". Defaults to ``None``.
-            overflow (str, optional): Overflow method: "crop", "fold", or "ellipsis". Defaults to None.
             emoji (Optional[bool], optional): Enable emoji code, or ``None`` to use console default. Defaults to None.
             markup (Optional[bool], optional): Enable markup, or ``None`` to use console default. Defaults to None.
             highlight (Optional[bool], optional): Enable automatic highlighting, or ``None`` to use console default. Defaults to None.
diff --git a/src/pip/_vendor/rich/containers.py b/src/pip/_vendor/rich/containers.py
index e29cf368991..901ff8ba6ea 100644
--- a/src/pip/_vendor/rich/containers.py
+++ b/src/pip/_vendor/rich/containers.py
@@ -1,13 +1,13 @@
 from itertools import zip_longest
 from typing import (
-    Iterator,
+    TYPE_CHECKING,
     Iterable,
+    Iterator,
     List,
     Optional,
+    TypeVar,
     Union,
     overload,
-    TypeVar,
-    TYPE_CHECKING,
 )
 
 if TYPE_CHECKING:
@@ -119,7 +119,7 @@ def justify(
 
         Args:
             console (Console): Console instance.
-            width (int): Number of characters per line.
+            width (int): Number of cells available per line.
             justify (str, optional): Default justify method for text: "left", "center", "full" or "right". Defaults to "left".
             overflow (str, optional): Default overflow for text: "crop", "fold", or "ellipsis". Defaults to "fold".
 
diff --git a/src/pip/_vendor/rich/highlighter.py b/src/pip/_vendor/rich/highlighter.py
index c2646794a98..27714b25b40 100644
--- a/src/pip/_vendor/rich/highlighter.py
+++ b/src/pip/_vendor/rich/highlighter.py
@@ -98,7 +98,7 @@ class ReprHighlighter(RegexHighlighter):
             r"(?P(?\B(/[-\w._+]+)*\/)(?P[-\w._+]*)?",
             r"(?b?'''.*?(?(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#]*)",
+            r"(?P(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#~]*)",
         ),
     ]
 
diff --git a/src/pip/_vendor/rich/json.py b/src/pip/_vendor/rich/json.py
index ea94493f21e..4087c79bb32 100644
--- a/src/pip/_vendor/rich/json.py
+++ b/src/pip/_vendor/rich/json.py
@@ -103,7 +103,6 @@ def __rich__(self) -> Text:
 
 
 if __name__ == "__main__":
-
     import argparse
     import sys
 
diff --git a/src/pip/_vendor/rich/layout.py b/src/pip/_vendor/rich/layout.py
index 849356ea9a0..a6f1a31b294 100644
--- a/src/pip/_vendor/rich/layout.py
+++ b/src/pip/_vendor/rich/layout.py
@@ -227,7 +227,6 @@ def tree(self) -> "Tree":
         from pip._vendor.rich.tree import Tree
 
         def summary(layout: "Layout") -> Table:
-
             icon = layout.splitter.get_tree_icon()
 
             table = Table.grid(padding=(0, 1, 0, 0))
@@ -403,7 +402,7 @@ def __rich_console__(
             self._render_map = render_map
             layout_lines: List[List[Segment]] = [[] for _ in range(height)]
             _islice = islice
-            for (region, lines) in render_map.values():
+            for region, lines in render_map.values():
                 _x, y, _layout_width, layout_height = region
                 for row, line in zip(
                     _islice(layout_lines, y, y + layout_height), lines
diff --git a/src/pip/_vendor/rich/live.py b/src/pip/_vendor/rich/live.py
index 3ebbbc4ccbe..f0529a781cf 100644
--- a/src/pip/_vendor/rich/live.py
+++ b/src/pip/_vendor/rich/live.py
@@ -362,7 +362,7 @@ def process_renderables(
                 table.add_column("Destination Currency")
                 table.add_column("Exchange Rate")
 
-                for ((source, dest), exchange_rate) in exchange_rate_dict.items():
+                for (source, dest), exchange_rate in exchange_rate_dict.items():
                     table.add_row(
                         source,
                         dest,
diff --git a/src/pip/_vendor/rich/live_render.py b/src/pip/_vendor/rich/live_render.py
index b90fbf7f350..e20745df6bf 100644
--- a/src/pip/_vendor/rich/live_render.py
+++ b/src/pip/_vendor/rich/live_render.py
@@ -82,7 +82,6 @@ def restore_cursor(self) -> Control:
     def __rich_console__(
         self, console: Console, options: ConsoleOptions
     ) -> RenderResult:
-
         renderable = self.renderable
         style = console.get_style(self.style)
         lines = console.render_lines(renderable, options, style=style, pad=False)
diff --git a/src/pip/_vendor/rich/markup.py b/src/pip/_vendor/rich/markup.py
index fd80d8c1129..f6171878f82 100644
--- a/src/pip/_vendor/rich/markup.py
+++ b/src/pip/_vendor/rich/markup.py
@@ -64,6 +64,9 @@ def escape_backslashes(match: Match[str]) -> str:
         return f"{backslashes}{backslashes}\\{text}"
 
     markup = _escape(escape_backslashes, markup)
+    if markup.endswith("\\") and not markup.endswith("\\\\"):
+        return markup + "\\"
+
     return markup
 
 
@@ -110,7 +113,10 @@ def render(
 
     Args:
         markup (str): A string containing console markup.
+        style: (Union[str, Style]): The style to use.
         emoji (bool, optional): Also render emoji code. Defaults to True.
+        emoji_variant (str, optional): Optional emoji variant, either "text" or "emoji". Defaults to None.
+
 
     Raises:
         MarkupError: If there is a syntax error in the markup.
@@ -226,7 +232,6 @@ def pop_style(style_name: str) -> Tuple[int, Tag]:
 
 
 if __name__ == "__main__":  # pragma: no cover
-
     MARKUP = [
         "[red]Hello World[/red]",
         "[magenta]Hello [b]World[/b]",
diff --git a/src/pip/_vendor/rich/panel.py b/src/pip/_vendor/rich/panel.py
index d522d80b518..95f4c84cf0b 100644
--- a/src/pip/_vendor/rich/panel.py
+++ b/src/pip/_vendor/rich/panel.py
@@ -82,7 +82,9 @@ def fit(
         style: StyleType = "none",
         border_style: StyleType = "none",
         width: Optional[int] = None,
+        height: Optional[int] = None,
         padding: PaddingDimensions = (0, 1),
+        highlight: bool = False,
     ) -> "Panel":
         """An alternative constructor that sets expand=False."""
         return cls(
@@ -96,7 +98,9 @@ def fit(
             style=style,
             border_style=border_style,
             width=width,
+            height=height,
             padding=padding,
+            highlight=highlight,
             expand=False,
         )
 
diff --git a/src/pip/_vendor/rich/pretty.py b/src/pip/_vendor/rich/pretty.py
index 2bd9eb0073d..9b9e3ba9086 100644
--- a/src/pip/_vendor/rich/pretty.py
+++ b/src/pip/_vendor/rich/pretty.py
@@ -211,8 +211,11 @@ def display_hook(value: Any) -> None:
             )
             builtins._ = value  # type: ignore[attr-defined]
 
-    if "get_ipython" in globals():
+    try:
         ip = get_ipython()  # type: ignore[name-defined]
+    except NameError:
+        sys.displayhook = display_hook
+    else:
         from IPython.core.formatters import BaseFormatter
 
         class RichFormatter(BaseFormatter):  # type: ignore[misc]
@@ -236,8 +239,6 @@ def __call__(self, value: Any) -> Any:
         # replace plain text formatter with rich formatter
         rich_formatter = RichFormatter()
         ip.display_formatter.formatters["text/plain"] = rich_formatter
-    else:
-        sys.displayhook = display_hook
 
 
 class Pretty(JupyterMixin):
@@ -708,9 +709,9 @@ def iter_rich_args(rich_args: Any) -> Iterable[Union[Any, Tuple[str, Any]]]:
                         last=root,
                     )
 
-                    def iter_attrs() -> Iterable[
-                        Tuple[str, Any, Optional[Callable[[Any], str]]]
-                    ]:
+                    def iter_attrs() -> (
+                        Iterable[Tuple[str, Any, Optional[Callable[[Any], str]]]]
+                    ):
                         """Iterate over attr fields and values."""
                         for attr in attr_fields:
                             if attr.repr:
@@ -985,7 +986,7 @@ class StockKeepingUnit(NamedTuple):
 
     from pip._vendor.rich import print
 
-    # print(Pretty(data, indent_guides=True, max_string=20))
+    print(Pretty(data, indent_guides=True, max_string=20))
 
     class Thing:
         def __repr__(self) -> str:
diff --git a/src/pip/_vendor/rich/progress.py b/src/pip/_vendor/rich/progress.py
index 8b0a315f324..2420c24e646 100644
--- a/src/pip/_vendor/rich/progress.py
+++ b/src/pip/_vendor/rich/progress.py
@@ -681,7 +681,7 @@ def render(self, task: "Task") -> Text:
         elapsed = task.finished_time if task.finished else task.elapsed
         if elapsed is None:
             return Text("-:--:--", style="progress.elapsed")
-        delta = timedelta(seconds=int(elapsed))
+        delta = timedelta(seconds=max(0, int(elapsed)))
         return Text(str(delta), style="progress.elapsed")
 
 
@@ -710,7 +710,6 @@ def __init__(
         table_column: Optional[Column] = None,
         show_speed: bool = False,
     ) -> None:
-
         self.text_format_no_percentage = text_format_no_percentage
         self.show_speed = show_speed
         super().__init__(
@@ -1114,7 +1113,7 @@ def get_default_columns(cls) -> Tuple[ProgressColumn, ...]:
 
             progress = Progress(
                 SpinnerColumn(),
-                *Progress.default_columns(),
+                *Progress.get_default_columns(),
                 "Elapsed:",
                 TimeElapsedColumn(),
             )
@@ -1636,7 +1635,6 @@ def remove_task(self, task_id: TaskID) -> None:
 
 
 if __name__ == "__main__":  # pragma: no coverage
-
     import random
     import time
 
@@ -1689,7 +1687,6 @@ def remove_task(self, task_id: TaskID) -> None:
         console=console,
         transient=False,
     ) as progress:
-
         task1 = progress.add_task("[red]Downloading", total=1000)
         task2 = progress.add_task("[green]Processing", total=1000)
         task3 = progress.add_task("[yellow]Thinking", total=None)
diff --git a/src/pip/_vendor/rich/progress_bar.py b/src/pip/_vendor/rich/progress_bar.py
index 67361df2e49..a2bf326144b 100644
--- a/src/pip/_vendor/rich/progress_bar.py
+++ b/src/pip/_vendor/rich/progress_bar.py
@@ -156,7 +156,6 @@ def _render_pulse(
     def __rich_console__(
         self, console: Console, options: ConsoleOptions
     ) -> RenderResult:
-
         width = min(self.width or options.max_width, options.max_width)
         ascii = options.legacy_windows or options.ascii_only
         should_pulse = self.pulse or self.total is None
diff --git a/src/pip/_vendor/rich/prompt.py b/src/pip/_vendor/rich/prompt.py
index 2bd0a7724f4..75ff0481684 100644
--- a/src/pip/_vendor/rich/prompt.py
+++ b/src/pip/_vendor/rich/prompt.py
@@ -307,7 +307,7 @@ class IntPrompt(PromptBase[int]):
     validate_error_message = "[prompt.invalid]Please enter a valid integer number"
 
 
-class FloatPrompt(PromptBase[int]):
+class FloatPrompt(PromptBase[float]):
     """A prompt that returns a float.
 
     Example:
@@ -346,7 +346,6 @@ def process_response(self, value: str) -> bool:
 
 
 if __name__ == "__main__":  # pragma: no cover
-
     from pip._vendor.rich import print
 
     if Confirm.ask("Run [i]prompt[/i] tests?", default=True):
diff --git a/src/pip/_vendor/rich/repr.py b/src/pip/_vendor/rich/repr.py
index f284bcafa6a..10efc427c35 100644
--- a/src/pip/_vendor/rich/repr.py
+++ b/src/pip/_vendor/rich/repr.py
@@ -76,7 +76,7 @@ def auto_rich_repr(self: Type[T]) -> Result:
                         param.POSITIONAL_OR_KEYWORD,
                         param.KEYWORD_ONLY,
                     ):
-                        if param.default == param.empty:
+                        if param.default is param.empty:
                             yield getattr(self, param.name)
                         else:
                             yield param.name, getattr(self, param.name), param.default
diff --git a/src/pip/_vendor/rich/segment.py b/src/pip/_vendor/rich/segment.py
index e1257984635..93edbbdeb72 100644
--- a/src/pip/_vendor/rich/segment.py
+++ b/src/pip/_vendor/rich/segment.py
@@ -109,7 +109,6 @@ def is_control(self) -> bool:
     @classmethod
     @lru_cache(1024 * 16)
     def _split_cells(cls, segment: "Segment", cut: int) -> Tuple["Segment", "Segment"]:
-
         text, style, control = segment
         _Segment = Segment
 
diff --git a/src/pip/_vendor/rich/status.py b/src/pip/_vendor/rich/status.py
index 09eff405ec1..65744838e3f 100644
--- a/src/pip/_vendor/rich/status.py
+++ b/src/pip/_vendor/rich/status.py
@@ -107,7 +107,6 @@ def __exit__(
 
 
 if __name__ == "__main__":  # pragma: no cover
-
     from time import sleep
 
     from .console import Console
diff --git a/src/pip/_vendor/rich/syntax.py b/src/pip/_vendor/rich/syntax.py
index 57033766483..c26fd8784e8 100644
--- a/src/pip/_vendor/rich/syntax.py
+++ b/src/pip/_vendor/rich/syntax.py
@@ -439,6 +439,16 @@ def lexer(self) -> Optional[Lexer]:
         except ClassNotFound:
             return None
 
+    @property
+    def default_lexer(self) -> Lexer:
+        """A Pygments Lexer to use if one is not specified or invalid."""
+        return get_lexer_by_name(
+            "text",
+            stripnl=False,
+            ensurenl=True,
+            tabsize=self.tab_size,
+        )
+
     def highlight(
         self,
         code: str,
@@ -467,7 +477,7 @@ def highlight(
         )
         _get_theme_style = self._theme.get_style_for_token
 
-        lexer = self.lexer
+        lexer = self.lexer or self.default_lexer
 
         if lexer is None:
             text.append(code)
diff --git a/src/pip/_vendor/rich/table.py b/src/pip/_vendor/rich/table.py
index 17409f2ee8d..43c718ebf59 100644
--- a/src/pip/_vendor/rich/table.py
+++ b/src/pip/_vendor/rich/table.py
@@ -212,7 +212,6 @@ def __init__(
         caption_justify: "JustifyMethod" = "center",
         highlight: bool = False,
     ) -> None:
-
         self.columns: List[Column] = []
         self.rows: List[Row] = []
         self.title = title
@@ -471,7 +470,6 @@ def add_section(self) -> None:
     def __rich_console__(
         self, console: "Console", options: "ConsoleOptions"
     ) -> "RenderResult":
-
         if not self.columns:
             yield Segment("\n")
             return
@@ -685,7 +683,7 @@ def get_padding(first_row: bool, last_row: bool) -> Tuple[int, int, int, int]:
                     getattr(renderable, "vertical", None) or column.vertical,
                 )
         else:
-            for (style, renderable) in raw_cells:
+            for style, renderable in raw_cells:
                 yield _Cell(
                     style,
                     renderable,
diff --git a/src/pip/_vendor/rich/text.py b/src/pip/_vendor/rich/text.py
index 998cb87dab7..09f881e7296 100644
--- a/src/pip/_vendor/rich/text.py
+++ b/src/pip/_vendor/rich/text.py
@@ -38,6 +38,7 @@
 _re_whitespace = re.compile(r"\s+$")
 
 TextType = Union[str, "Text"]
+"""A plain string or a [Text][rich.text.Text] instance."""
 
 GetStyleCallable = Callable[[str], Optional[StyleType]]
 
@@ -97,6 +98,21 @@ def right_crop(self, offset: int) -> "Span":
             return self
         return Span(start, min(offset, end), style)
 
+    def extend(self, cells: int) -> "Span":
+        """Extend the span by the given number of cells.
+
+        Args:
+            cells (int): Additional space to add to end of span.
+
+        Returns:
+            Span: A span.
+        """
+        if cells:
+            start, end, style = self
+            return Span(start, end + cells, style)
+        else:
+            return self
+
 
 class Text(JupyterMixin):
     """Text with color / style.
@@ -108,7 +124,7 @@ class Text(JupyterMixin):
         overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
         no_wrap (bool, optional): Disable text wrapping, or None for default. Defaults to None.
         end (str, optional): Character to end text with. Defaults to "\\\\n".
-        tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
+        tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
         spans (List[Span], optional). A list of predefined style spans. Defaults to None.
     """
 
@@ -133,7 +149,7 @@ def __init__(
         overflow: Optional["OverflowMethod"] = None,
         no_wrap: Optional[bool] = None,
         end: str = "\n",
-        tab_size: Optional[int] = 8,
+        tab_size: Optional[int] = None,
         spans: Optional[List[Span]] = None,
     ) -> None:
         sanitized_text = strip_control_codes(text)
@@ -255,7 +271,9 @@ def from_markup(
 
         Args:
             text (str): A string containing console markup.
+            style (Union[str, Style], optional): Base style for text. Defaults to "".
             emoji (bool, optional): Also render emoji code. Defaults to True.
+            emoji_variant (str, optional): Optional emoji variant, either "text" or "emoji". Defaults to None.
             justify (str, optional): Justify method: "left", "center", "full", "right". Defaults to None.
             overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
             end (str, optional): Character to end text with. Defaults to "\\\\n".
@@ -292,7 +310,7 @@ def from_ansi(
             overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
             no_wrap (bool, optional): Disable text wrapping, or None for default. Defaults to None.
             end (str, optional): Character to end text with. Defaults to "\\\\n".
-            tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
+            tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
         """
         from .ansi import AnsiDecoder
 
@@ -353,8 +371,9 @@ def assemble(
             style (Union[str, Style], optional): Base style for text. Defaults to "".
             justify (str, optional): Justify method: "left", "center", "full", "right". Defaults to None.
             overflow (str, optional): Overflow method: "crop", "fold", "ellipsis". Defaults to None.
+            no_wrap (bool, optional): Disable text wrapping, or None for default. Defaults to None.
             end (str, optional): Character to end text with. Defaults to "\\\\n".
-            tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to 8.
+            tab_size (int): Number of spaces per tab, or ``None`` to use ``console.tab_size``. Defaults to None.
             meta (Dict[str, Any], optional). Meta data to apply to text, or None for no meta data. Default to None
 
         Returns:
@@ -408,7 +427,7 @@ def spans(self, spans: List[Span]) -> None:
         self._spans = spans[:]
 
     def blank_copy(self, plain: str = "") -> "Text":
-        """Return a new Text instance with copied meta data (but not the string or spans)."""
+        """Return a new Text instance with copied metadata (but not the string or spans)."""
         copy_self = Text(
             plain,
             style=self.style,
@@ -489,7 +508,7 @@ def stylize_before(
     def apply_meta(
         self, meta: Dict[str, Any], start: int = 0, end: Optional[int] = None
     ) -> None:
-        """Apply meta data to the text, or a portion of the text.
+        """Apply metadata to the text, or a portion of the text.
 
         Args:
             meta (Dict[str, Any]): A dict of meta information.
@@ -549,6 +568,27 @@ def get_style_at_offset(self, console: "Console", offset: int) -> Style:
                 style += get_style(span_style, default="")
         return style
 
+    def extend_style(self, spaces: int) -> None:
+        """Extend the Text given number of spaces where the spaces have the same style as the last character.
+
+        Args:
+            spaces (int): Number of spaces to add to the Text.
+        """
+        if spaces <= 0:
+            return
+        spans = self.spans
+        new_spaces = " " * spaces
+        if spans:
+            end_offset = len(self)
+            self._spans[:] = [
+                span.extend(spaces) if span.end >= end_offset else span
+                for span in spans
+            ]
+            self._text.append(new_spaces)
+            self._length += spaces
+        else:
+            self.plain += new_spaces
+
     def highlight_regex(
         self,
         re_highlight: str,
@@ -597,9 +637,9 @@ def highlight_words(
         """Highlight words with a style.
 
         Args:
-            words (Iterable[str]): Worlds to highlight.
+            words (Iterable[str]): Words to highlight.
             style (Union[str, Style]): Style to apply.
-            case_sensitive (bool, optional): Enable case sensitive matchings. Defaults to True.
+            case_sensitive (bool, optional): Enable case sensitive matching. Defaults to True.
 
         Returns:
             int: Number of words highlighted.
@@ -646,7 +686,7 @@ def set_length(self, new_length: int) -> None:
     def __rich_console__(
         self, console: "Console", options: "ConsoleOptions"
     ) -> Iterable[Segment]:
-        tab_size: int = console.tab_size or self.tab_size or 8
+        tab_size: int = console.tab_size if self.tab_size is None else self.tab_size
         justify = self.justify or options.justify or DEFAULT_JUSTIFY
 
         overflow = self.overflow or options.overflow or DEFAULT_OVERFLOW
@@ -781,27 +821,35 @@ def expand_tabs(self, tab_size: Optional[int] = None) -> None:
         """
         if "\t" not in self.plain:
             return
-        pos = 0
         if tab_size is None:
             tab_size = self.tab_size
-        assert tab_size is not None
-        result = self.blank_copy()
-        append = result.append
+        if tab_size is None:
+            tab_size = 8
+
+        new_text: List[Text] = []
+        append = new_text.append
 
-        _style = self.style
         for line in self.split("\n", include_separator=True):
-            parts = line.split("\t", include_separator=True)
-            for part in parts:
-                if part.plain.endswith("\t"):
-                    part._text = [part.plain[:-1] + " "]
-                    append(part)
-                    pos += len(part)
-                    spaces = tab_size - ((pos - 1) % tab_size) - 1
-                    if spaces:
-                        append(" " * spaces, _style)
-                        pos += spaces
-                else:
+            if "\t" not in line.plain:
+                append(line)
+            else:
+                cell_position = 0
+                parts = line.split("\t", include_separator=True)
+                for part in parts:
+                    if part.plain.endswith("\t"):
+                        part._text[-1] = part._text[-1][:-1] + " "
+                        cell_position += part.cell_len
+                        tab_remainder = cell_position % tab_size
+                        if tab_remainder:
+                            spaces = tab_size - tab_remainder
+                            part.extend_style(spaces)
+                            cell_position += spaces
+                    else:
+                        cell_position += part.cell_len
                     append(part)
+
+        result = Text("").join(new_text)
+
         self._text = [result.plain]
         self._length = len(self.plain)
         self._spans[:] = result._spans
@@ -852,6 +900,7 @@ def pad(self, count: int, character: str = " ") -> None:
 
         Args:
             count (int): Width of padding.
+            character (str): The character to pad with. Must be a string of length 1.
         """
         assert len(character) == 1, "Character must be a string of length 1"
         if count:
@@ -932,7 +981,7 @@ def append(
                 self._text.append(sanitized_text)
                 offset = len(self)
                 text_length = len(sanitized_text)
-                if style is not None:
+                if style:
                     self._spans.append(Span(offset, offset + text_length, style))
                 self._length += text_length
             elif isinstance(text, Text):
@@ -942,7 +991,7 @@ def append(
                         "style must not be set when appending Text instance"
                     )
                 text_length = self._length
-                if text.style is not None:
+                if text.style:
                     self._spans.append(
                         _Span(text_length, text_length + len(text), text.style)
                     )
@@ -958,12 +1007,15 @@ def append_text(self, text: "Text") -> "Text":
         """Append another Text instance. This method is more performant that Text.append, but
         only works for Text.
 
+        Args:
+            text (Text): The Text instance to append to this instance.
+
         Returns:
             Text: Returns self for chaining.
         """
         _Span = Span
         text_length = self._length
-        if text.style is not None:
+        if text.style:
             self._spans.append(_Span(text_length, text_length + len(text), text.style))
         self._text.append(text.plain)
         self._spans.extend(
@@ -979,7 +1031,7 @@ def append_tokens(
         """Append iterable of str and style. Style may be a Style instance or a str style definition.
 
         Args:
-            pairs (Iterable[Tuple[str, Optional[StyleType]]]): An iterable of tuples containing str content and style.
+            tokens (Iterable[Tuple[str, Optional[StyleType]]]): An iterable of tuples containing str content and style.
 
         Returns:
             Text: Returns self for chaining.
@@ -990,7 +1042,7 @@ def append_tokens(
         offset = len(self)
         for content, style in tokens:
             append_text(content)
-            if style is not None:
+            if style:
                 append_span(_Span(offset, offset + len(content), style))
             offset += len(content)
         self._length = offset
@@ -1088,7 +1140,6 @@ def divide(self, offsets: Iterable[int]) -> Lines:
         _Span = Span
 
         for span_start, span_end, style in self._spans:
-
             lower_bound = 0
             upper_bound = line_count
             start_line_no = (lower_bound + upper_bound) // 2
@@ -1158,8 +1209,7 @@ def wrap(
 
         Args:
             console (Console): Console instance.
-            width (int): Number of characters per line.
-            emoji (bool, optional): Also render emoji code. Defaults to True.
+            width (int): Number of cells available per line.
             justify (str, optional): Justify method: "default", "left", "center", "full", "right". Defaults to "default".
             overflow (str, optional): Overflow method: "crop", "fold", or "ellipsis". Defaults to None.
             tab_size (int, optional): Default tab size. Defaults to 8.
diff --git a/src/pip/_vendor/rich/traceback.py b/src/pip/_vendor/rich/traceback.py
index c4ffe1f99e6..f223ad44bfe 100644
--- a/src/pip/_vendor/rich/traceback.py
+++ b/src/pip/_vendor/rich/traceback.py
@@ -636,7 +636,6 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
 
         excluded = False
         for frame_index, frame in enumerate(stack.frames):
-
             if exclude_frames and frame_index in exclude_frames:
                 excluded = True
                 continue
@@ -720,7 +719,6 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
 
 
 if __name__ == "__main__":  # pragma: no cover
-
     from .console import Console
 
     console = Console()
@@ -744,7 +742,6 @@ def foo(a: Any) -> None:
         bar(a)
 
     def error() -> None:
-
         try:
             try:
                 foo(0)
diff --git a/src/pip/_vendor/rich/tree.py b/src/pip/_vendor/rich/tree.py
index afe8da1a4a3..64bc75d2286 100644
--- a/src/pip/_vendor/rich/tree.py
+++ b/src/pip/_vendor/rich/tree.py
@@ -72,7 +72,6 @@ def add(
     def __rich_console__(
         self, console: "Console", options: "ConsoleOptions"
     ) -> "RenderResult":
-
         stack: List[Iterator[Tuple[bool, Tree]]] = []
         pop = stack.pop
         push = stack.append
@@ -195,7 +194,6 @@ def __rich_measure__(
 
 
 if __name__ == "__main__":  # pragma: no cover
-
     from pip._vendor.rich.console import Group
     from pip._vendor.rich.markdown import Markdown
     from pip._vendor.rich.panel import Panel
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 5554c38ecbf..6479d74803f 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -12,7 +12,7 @@ requests==2.31.0
     chardet==5.1.0
     idna==3.4
     urllib3==1.26.17
-rich==13.4.2
+rich==13.7.0
     pygments==2.15.1
     typing_extensions==4.7.1
 resolvelib==1.0.1

From d83c9e34c8a9c0f81c6bf46db19a59efe960ce00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 11 Feb 2024 20:58:49 +0100
Subject: [PATCH 257/992] Upgrade idna to 3.6

---
 news/idna.vendor.rst                 |   1 +
 src/pip/_vendor/idna/LICENSE.md      |  36 ++-
 src/pip/_vendor/idna/codec.py        |  34 +-
 src/pip/_vendor/idna/core.py         |  10 +-
 src/pip/_vendor/idna/idnadata.py     |   9 +-
 src/pip/_vendor/idna/package_data.py |   2 +-
 src/pip/_vendor/idna/uts46data.py    | 454 +++++++++++++--------------
 src/pip/_vendor/vendor.txt           |   2 +-
 8 files changed, 277 insertions(+), 271 deletions(-)
 create mode 100644 news/idna.vendor.rst

diff --git a/news/idna.vendor.rst b/news/idna.vendor.rst
new file mode 100644
index 00000000000..229b1f3568a
--- /dev/null
+++ b/news/idna.vendor.rst
@@ -0,0 +1 @@
+Upgrade idna to 3.6
diff --git a/src/pip/_vendor/idna/LICENSE.md b/src/pip/_vendor/idna/LICENSE.md
index b6f87326ffb..ce3670186c6 100644
--- a/src/pip/_vendor/idna/LICENSE.md
+++ b/src/pip/_vendor/idna/LICENSE.md
@@ -1,29 +1,31 @@
 BSD 3-Clause License
 
-Copyright (c) 2013-2021, Kim Davies
+Copyright (c) 2013-2023, Kim Davies and contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are
+met:
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 
 3. Neither the name of the copyright holder nor the names of its
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/pip/_vendor/idna/codec.py b/src/pip/_vendor/idna/codec.py
index 1ca9ba62c20..c855a4de6d7 100644
--- a/src/pip/_vendor/idna/codec.py
+++ b/src/pip/_vendor/idna/codec.py
@@ -1,7 +1,7 @@
 from .core import encode, decode, alabel, ulabel, IDNAError
 import codecs
 import re
-from typing import Tuple, Optional
+from typing import Any, Tuple, Optional
 
 _unicode_dots_re = re.compile('[\u002e\u3002\uff0e\uff61]')
 
@@ -26,24 +26,24 @@ def decode(self, data: bytes, errors: str = 'strict') -> Tuple[str, int]:
         return decode(data), len(data)
 
 class IncrementalEncoder(codecs.BufferedIncrementalEncoder):
-    def _buffer_encode(self, data: str, errors: str, final: bool) -> Tuple[str, int]:  # type: ignore
+    def _buffer_encode(self, data: str, errors: str, final: bool) -> Tuple[bytes, int]:
         if errors != 'strict':
             raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
 
         if not data:
-            return "", 0
+            return b'', 0
 
         labels = _unicode_dots_re.split(data)
-        trailing_dot = ''
+        trailing_dot = b''
         if labels:
             if not labels[-1]:
-                trailing_dot = '.'
+                trailing_dot = b'.'
                 del labels[-1]
             elif not final:
                 # Keep potentially unfinished label until the next call
                 del labels[-1]
                 if labels:
-                    trailing_dot = '.'
+                    trailing_dot = b'.'
 
         result = []
         size = 0
@@ -54,18 +54,21 @@ def _buffer_encode(self, data: str, errors: str, final: bool) -> Tuple[str, int]
             size += len(label)
 
         # Join with U+002E
-        result_str = '.'.join(result) + trailing_dot  # type: ignore
+        result_bytes = b'.'.join(result) + trailing_dot
         size += len(trailing_dot)
-        return result_str, size
+        return result_bytes, size
 
 class IncrementalDecoder(codecs.BufferedIncrementalDecoder):
-    def _buffer_decode(self, data: str, errors: str, final: bool) -> Tuple[str, int]:  # type: ignore
+    def _buffer_decode(self, data: Any, errors: str, final: bool) -> Tuple[str, int]:
         if errors != 'strict':
             raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
 
         if not data:
             return ('', 0)
 
+        if not isinstance(data, str):
+            data = str(data, 'ascii')
+
         labels = _unicode_dots_re.split(data)
         trailing_dot = ''
         if labels:
@@ -99,14 +102,17 @@ class StreamReader(Codec, codecs.StreamReader):
     pass
 
 
-def getregentry() -> codecs.CodecInfo:
-    # Compatibility as a search_function for codecs.register()
+def search_function(name: str) -> Optional[codecs.CodecInfo]:
+    if name != 'idna2008':
+        return None
     return codecs.CodecInfo(
-        name='idna',
-        encode=Codec().encode,  # type: ignore
-        decode=Codec().decode,  # type: ignore
+        name=name,
+        encode=Codec().encode,
+        decode=Codec().decode,
         incrementalencoder=IncrementalEncoder,
         incrementaldecoder=IncrementalDecoder,
         streamwriter=StreamWriter,
         streamreader=StreamReader,
     )
+
+codecs.register(search_function)
diff --git a/src/pip/_vendor/idna/core.py b/src/pip/_vendor/idna/core.py
index 4f300371102..aaf7d658ba0 100644
--- a/src/pip/_vendor/idna/core.py
+++ b/src/pip/_vendor/idna/core.py
@@ -318,7 +318,7 @@ def uts46_remap(domain: str, std3_rules: bool = True, transitional: bool = False
             status = uts46row[1]
             replacement = None  # type: Optional[str]
             if len(uts46row) == 3:
-                replacement = uts46row[2]  # type: ignore
+                replacement = uts46row[2]
             if (status == 'V' or
                     (status == 'D' and not transitional) or
                     (status == '3' and not std3_rules and replacement is None)):
@@ -338,9 +338,9 @@ 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)):
+    if not isinstance(s, str):
         try:
-            s = s.decode('ascii')
+            s = str(s, 'ascii')
         except UnicodeDecodeError:
             raise IDNAError('should pass a unicode string to the function rather than a byte string.')
     if uts46:
@@ -372,8 +372,8 @@ def encode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool =
 
 def decode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool = False, std3_rules: bool = False) -> str:
     try:
-        if isinstance(s, (bytes, bytearray)):
-            s = s.decode('ascii')
+        if not isinstance(s, str):
+            s = str(s, 'ascii')
     except UnicodeDecodeError:
         raise IDNAError('Invalid ASCII in A-label')
     if uts46:
diff --git a/src/pip/_vendor/idna/idnadata.py b/src/pip/_vendor/idna/idnadata.py
index 67db4625829..5cd05d9056e 100644
--- a/src/pip/_vendor/idna/idnadata.py
+++ b/src/pip/_vendor/idna/idnadata.py
@@ -1,6 +1,6 @@
 # This file is automatically generated by tools/idna-data
 
-__version__ = '15.0.0'
+__version__ = '15.1.0'
 scripts = {
     'Greek': (
         0x37000000374,
@@ -59,6 +59,7 @@
         0x2b7400002b81e,
         0x2b8200002cea2,
         0x2ceb00002ebe1,
+        0x2ebf00002ee5e,
         0x2f8000002fa1e,
         0x300000003134b,
         0x31350000323b0,
@@ -1834,7 +1835,6 @@
         0xa7d50000a7d6,
         0xa7d70000a7d8,
         0xa7d90000a7da,
-        0xa7f20000a7f5,
         0xa7f60000a7f8,
         0xa7fa0000a828,
         0xa82c0000a82d,
@@ -1907,9 +1907,7 @@
         0x1060000010737,
         0x1074000010756,
         0x1076000010768,
-        0x1078000010786,
-        0x10787000107b1,
-        0x107b2000107bb,
+        0x1078000010781,
         0x1080000010806,
         0x1080800010809,
         0x1080a00010836,
@@ -2134,6 +2132,7 @@
         0x2b7400002b81e,
         0x2b8200002cea2,
         0x2ceb00002ebe1,
+        0x2ebf00002ee5e,
         0x300000003134b,
         0x31350000323b0,
     ),
diff --git a/src/pip/_vendor/idna/package_data.py b/src/pip/_vendor/idna/package_data.py
index 8501893bd15..c5b7220c970 100644
--- a/src/pip/_vendor/idna/package_data.py
+++ b/src/pip/_vendor/idna/package_data.py
@@ -1,2 +1,2 @@
-__version__ = '3.4'
+__version__ = '3.6'
 
diff --git a/src/pip/_vendor/idna/uts46data.py b/src/pip/_vendor/idna/uts46data.py
index 186796c17b2..6a1eddbfd75 100644
--- a/src/pip/_vendor/idna/uts46data.py
+++ b/src/pip/_vendor/idna/uts46data.py
@@ -7,7 +7,7 @@
 """IDNA Mapping Table from UTS46."""
 
 
-__version__ = '15.0.0'
+__version__ = '15.1.0'
 def _seg_0() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
     (0x0, '3'),
@@ -1899,7 +1899,7 @@ def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1E9A, 'M', 'aʾ'),
     (0x1E9B, 'M', 'ṡ'),
     (0x1E9C, 'V'),
-    (0x1E9E, 'M', 'ss'),
+    (0x1E9E, 'M', 'ß'),
     (0x1E9F, 'V'),
     (0x1EA0, 'M', 'ạ'),
     (0x1EA1, 'V'),
@@ -2418,10 +2418,6 @@ def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x222F, 'M', '∮∮'),
     (0x2230, 'M', '∮∮∮'),
     (0x2231, 'V'),
-    (0x2260, '3'),
-    (0x2261, 'V'),
-    (0x226E, '3'),
-    (0x2270, 'V'),
     (0x2329, 'M', '〈'),
     (0x232A, 'M', '〉'),
     (0x232B, 'V'),
@@ -2502,14 +2498,14 @@ def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x24BA, 'M', 'e'),
     (0x24BB, 'M', 'f'),
     (0x24BC, 'M', 'g'),
-    ]
-
-def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x24BD, 'M', 'h'),
     (0x24BE, 'M', 'i'),
     (0x24BF, 'M', 'j'),
     (0x24C0, 'M', 'k'),
+    ]
+
+def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x24C1, 'M', 'l'),
     (0x24C2, 'M', 'm'),
     (0x24C3, 'M', 'n'),
@@ -2606,14 +2602,14 @@ def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2C26, 'M', 'ⱖ'),
     (0x2C27, 'M', 'ⱗ'),
     (0x2C28, 'M', 'ⱘ'),
-    ]
-
-def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x2C29, 'M', 'ⱙ'),
     (0x2C2A, 'M', 'ⱚ'),
     (0x2C2B, 'M', 'ⱛ'),
     (0x2C2C, 'M', 'ⱜ'),
+    ]
+
+def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x2C2D, 'M', 'ⱝ'),
     (0x2C2E, 'M', 'ⱞ'),
     (0x2C2F, 'M', 'ⱟ'),
@@ -2710,14 +2706,14 @@ def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2CC0, 'M', 'ⳁ'),
     (0x2CC1, 'V'),
     (0x2CC2, 'M', 'ⳃ'),
-    ]
-
-def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x2CC3, 'V'),
     (0x2CC4, 'M', 'ⳅ'),
     (0x2CC5, 'V'),
     (0x2CC6, 'M', 'ⳇ'),
+    ]
+
+def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x2CC7, 'V'),
     (0x2CC8, 'M', 'ⳉ'),
     (0x2CC9, 'V'),
@@ -2814,14 +2810,14 @@ def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2F13, 'M', '勹'),
     (0x2F14, 'M', '匕'),
     (0x2F15, 'M', '匚'),
-    ]
-
-def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x2F16, 'M', '匸'),
     (0x2F17, 'M', '十'),
     (0x2F18, 'M', '卜'),
     (0x2F19, 'M', '卩'),
+    ]
+
+def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x2F1A, 'M', '厂'),
     (0x2F1B, 'M', '厶'),
     (0x2F1C, 'M', '又'),
@@ -2918,14 +2914,14 @@ def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2F77, 'M', '糸'),
     (0x2F78, 'M', '缶'),
     (0x2F79, 'M', '网'),
-    ]
-
-def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x2F7A, 'M', '羊'),
     (0x2F7B, 'M', '羽'),
     (0x2F7C, 'M', '老'),
     (0x2F7D, 'M', '而'),
+    ]
+
+def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x2F7E, 'M', '耒'),
     (0x2F7F, 'M', '耳'),
     (0x2F80, 'M', '聿'),
@@ -3022,14 +3018,14 @@ def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x3036, 'M', '〒'),
     (0x3037, 'V'),
     (0x3038, 'M', '十'),
-    ]
-
-def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x3039, 'M', '卄'),
     (0x303A, 'M', '卅'),
     (0x303B, 'V'),
     (0x3040, 'X'),
+    ]
+
+def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x3041, 'V'),
     (0x3097, 'X'),
     (0x3099, 'V'),
@@ -3126,14 +3122,14 @@ def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x3182, 'M', 'ᇱ'),
     (0x3183, 'M', 'ᇲ'),
     (0x3184, 'M', 'ᅗ'),
-    ]
-
-def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x3185, 'M', 'ᅘ'),
     (0x3186, 'M', 'ᅙ'),
     (0x3187, 'M', 'ᆄ'),
     (0x3188, 'M', 'ᆅ'),
+    ]
+
+def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x3189, 'M', 'ᆈ'),
     (0x318A, 'M', 'ᆑ'),
     (0x318B, 'M', 'ᆒ'),
@@ -3230,14 +3226,14 @@ def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x3244, 'M', '問'),
     (0x3245, 'M', '幼'),
     (0x3246, 'M', '文'),
-    ]
-
-def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x3247, 'M', '箏'),
     (0x3248, 'V'),
     (0x3250, 'M', 'pte'),
     (0x3251, 'M', '21'),
+    ]
+
+def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x3252, 'M', '22'),
     (0x3253, 'M', '23'),
     (0x3254, 'M', '24'),
@@ -3334,14 +3330,14 @@ def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x32AF, 'M', '協'),
     (0x32B0, 'M', '夜'),
     (0x32B1, 'M', '36'),
-    ]
-
-def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x32B2, 'M', '37'),
     (0x32B3, 'M', '38'),
     (0x32B4, 'M', '39'),
     (0x32B5, 'M', '40'),
+    ]
+
+def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x32B6, 'M', '41'),
     (0x32B7, 'M', '42'),
     (0x32B8, 'M', '43'),
@@ -3438,14 +3434,14 @@ def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x3313, 'M', 'ギルダー'),
     (0x3314, 'M', 'キロ'),
     (0x3315, 'M', 'キログラム'),
-    ]
-
-def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x3316, 'M', 'キロメートル'),
     (0x3317, 'M', 'キロワット'),
     (0x3318, 'M', 'グラム'),
     (0x3319, 'M', 'グラムトン'),
+    ]
+
+def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x331A, 'M', 'クルゼイロ'),
     (0x331B, 'M', 'クローネ'),
     (0x331C, 'M', 'ケース'),
@@ -3542,14 +3538,14 @@ def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x3377, 'M', 'dm'),
     (0x3378, 'M', 'dm2'),
     (0x3379, 'M', 'dm3'),
-    ]
-
-def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x337A, 'M', 'iu'),
     (0x337B, 'M', '平成'),
     (0x337C, 'M', '昭和'),
     (0x337D, 'M', '大正'),
+    ]
+
+def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x337E, 'M', '明治'),
     (0x337F, 'M', '株式会社'),
     (0x3380, 'M', 'pa'),
@@ -3646,14 +3642,14 @@ def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x33DB, 'M', 'sr'),
     (0x33DC, 'M', 'sv'),
     (0x33DD, 'M', 'wb'),
-    ]
-
-def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x33DE, 'M', 'v∕m'),
     (0x33DF, 'M', 'a∕m'),
     (0x33E0, 'M', '1日'),
     (0x33E1, 'M', '2日'),
+    ]
+
+def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x33E2, 'M', '3日'),
     (0x33E3, 'M', '4日'),
     (0x33E4, 'M', '5日'),
@@ -3750,14 +3746,14 @@ def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xA68B, 'V'),
     (0xA68C, 'M', 'ꚍ'),
     (0xA68D, 'V'),
-    ]
-
-def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xA68E, 'M', 'ꚏ'),
     (0xA68F, 'V'),
     (0xA690, 'M', 'ꚑ'),
     (0xA691, 'V'),
+    ]
+
+def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xA692, 'M', 'ꚓ'),
     (0xA693, 'V'),
     (0xA694, 'M', 'ꚕ'),
@@ -3854,14 +3850,14 @@ def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xA779, 'M', 'ꝺ'),
     (0xA77A, 'V'),
     (0xA77B, 'M', 'ꝼ'),
-    ]
-
-def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xA77C, 'V'),
     (0xA77D, 'M', 'ᵹ'),
     (0xA77E, 'M', 'ꝿ'),
     (0xA77F, 'V'),
+    ]
+
+def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xA780, 'M', 'ꞁ'),
     (0xA781, 'V'),
     (0xA782, 'M', 'ꞃ'),
@@ -3958,14 +3954,14 @@ def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xA878, 'X'),
     (0xA880, 'V'),
     (0xA8C6, 'X'),
-    ]
-
-def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xA8CE, 'V'),
     (0xA8DA, 'X'),
     (0xA8E0, 'V'),
     (0xA954, 'X'),
+    ]
+
+def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xA95F, 'V'),
     (0xA97D, 'X'),
     (0xA980, 'V'),
@@ -4062,14 +4058,14 @@ def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xABA8, 'M', 'Ꮨ'),
     (0xABA9, 'M', 'Ꮩ'),
     (0xABAA, 'M', 'Ꮪ'),
-    ]
-
-def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xABAB, 'M', 'Ꮫ'),
     (0xABAC, 'M', 'Ꮬ'),
     (0xABAD, 'M', 'Ꮭ'),
     (0xABAE, 'M', 'Ꮮ'),
+    ]
+
+def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xABAF, 'M', 'Ꮯ'),
     (0xABB0, 'M', 'Ꮰ'),
     (0xABB1, 'M', 'Ꮱ'),
@@ -4166,14 +4162,14 @@ def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xF943, 'M', '弄'),
     (0xF944, 'M', '籠'),
     (0xF945, 'M', '聾'),
-    ]
-
-def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xF946, 'M', '牢'),
     (0xF947, 'M', '磊'),
     (0xF948, 'M', '賂'),
     (0xF949, 'M', '雷'),
+    ]
+
+def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xF94A, 'M', '壘'),
     (0xF94B, 'M', '屢'),
     (0xF94C, 'M', '樓'),
@@ -4270,14 +4266,14 @@ def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xF9A7, 'M', '獵'),
     (0xF9A8, 'M', '令'),
     (0xF9A9, 'M', '囹'),
-    ]
-
-def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xF9AA, 'M', '寧'),
     (0xF9AB, 'M', '嶺'),
     (0xF9AC, 'M', '怜'),
     (0xF9AD, 'M', '玲'),
+    ]
+
+def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xF9AE, 'M', '瑩'),
     (0xF9AF, 'M', '羚'),
     (0xF9B0, 'M', '聆'),
@@ -4374,14 +4370,14 @@ def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFA0B, 'M', '廓'),
     (0xFA0C, 'M', '兀'),
     (0xFA0D, 'M', '嗀'),
-    ]
-
-def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFA0E, 'V'),
     (0xFA10, 'M', '塚'),
     (0xFA11, 'V'),
     (0xFA12, 'M', '晴'),
+    ]
+
+def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFA13, 'V'),
     (0xFA15, 'M', '凞'),
     (0xFA16, 'M', '猪'),
@@ -4478,14 +4474,14 @@ def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFA76, 'M', '勇'),
     (0xFA77, 'M', '勺'),
     (0xFA78, 'M', '喝'),
-    ]
-
-def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFA79, 'M', '啕'),
     (0xFA7A, 'M', '喙'),
     (0xFA7B, 'M', '嗢'),
     (0xFA7C, 'M', '塚'),
+    ]
+
+def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFA7D, 'M', '墳'),
     (0xFA7E, 'M', '奄'),
     (0xFA7F, 'M', '奔'),
@@ -4582,14 +4578,14 @@ def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFADA, 'X'),
     (0xFB00, 'M', 'ff'),
     (0xFB01, 'M', 'fi'),
-    ]
-
-def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFB02, 'M', 'fl'),
     (0xFB03, 'M', 'ffi'),
     (0xFB04, 'M', 'ffl'),
     (0xFB05, 'M', 'st'),
+    ]
+
+def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFB07, 'X'),
     (0xFB13, 'M', 'մն'),
     (0xFB14, 'M', 'մե'),
@@ -4686,14 +4682,14 @@ def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFBDB, 'M', 'ۈ'),
     (0xFBDD, 'M', 'ۇٴ'),
     (0xFBDE, 'M', 'ۋ'),
-    ]
-
-def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFBE0, 'M', 'ۅ'),
     (0xFBE2, 'M', 'ۉ'),
     (0xFBE4, 'M', 'ې'),
     (0xFBE8, 'M', 'ى'),
+    ]
+
+def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFBEA, 'M', 'ئا'),
     (0xFBEC, 'M', 'ئە'),
     (0xFBEE, 'M', 'ئو'),
@@ -4790,14 +4786,14 @@ def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFC54, 'M', 'هي'),
     (0xFC55, 'M', 'يج'),
     (0xFC56, 'M', 'يح'),
-    ]
-
-def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFC57, 'M', 'يخ'),
     (0xFC58, 'M', 'يم'),
     (0xFC59, 'M', 'يى'),
     (0xFC5A, 'M', 'يي'),
+    ]
+
+def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFC5B, 'M', 'ذٰ'),
     (0xFC5C, 'M', 'رٰ'),
     (0xFC5D, 'M', 'ىٰ'),
@@ -4894,14 +4890,14 @@ def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFCB8, 'M', 'طح'),
     (0xFCB9, 'M', 'ظم'),
     (0xFCBA, 'M', 'عج'),
-    ]
-
-def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFCBB, 'M', 'عم'),
     (0xFCBC, 'M', 'غج'),
     (0xFCBD, 'M', 'غم'),
     (0xFCBE, 'M', 'فج'),
+    ]
+
+def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFCBF, 'M', 'فح'),
     (0xFCC0, 'M', 'فخ'),
     (0xFCC1, 'M', 'فم'),
@@ -4998,14 +4994,14 @@ def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFD1C, 'M', 'حي'),
     (0xFD1D, 'M', 'جى'),
     (0xFD1E, 'M', 'جي'),
-    ]
-
-def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFD1F, 'M', 'خى'),
     (0xFD20, 'M', 'خي'),
     (0xFD21, 'M', 'صى'),
     (0xFD22, 'M', 'صي'),
+    ]
+
+def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFD23, 'M', 'ضى'),
     (0xFD24, 'M', 'ضي'),
     (0xFD25, 'M', 'شج'),
@@ -5102,14 +5098,14 @@ def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFDA4, 'M', 'تمى'),
     (0xFDA5, 'M', 'جمي'),
     (0xFDA6, 'M', 'جحى'),
-    ]
-
-def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFDA7, 'M', 'جمى'),
     (0xFDA8, 'M', 'سخى'),
     (0xFDA9, 'M', 'صحي'),
     (0xFDAA, 'M', 'شحي'),
+    ]
+
+def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFDAB, 'M', 'ضحي'),
     (0xFDAC, 'M', 'لجي'),
     (0xFDAD, 'M', 'لمي'),
@@ -5206,14 +5202,14 @@ def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFE5B, '3', '{'),
     (0xFE5C, '3', '}'),
     (0xFE5D, 'M', '〔'),
-    ]
-
-def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFE5E, 'M', '〕'),
     (0xFE5F, '3', '#'),
     (0xFE60, '3', '&'),
     (0xFE61, '3', '*'),
+    ]
+
+def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFE62, '3', '+'),
     (0xFE63, 'M', '-'),
     (0xFE64, '3', '<'),
@@ -5310,14 +5306,14 @@ def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFF18, 'M', '8'),
     (0xFF19, 'M', '9'),
     (0xFF1A, '3', ':'),
-    ]
-
-def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFF1B, '3', ';'),
     (0xFF1C, '3', '<'),
     (0xFF1D, '3', '='),
     (0xFF1E, '3', '>'),
+    ]
+
+def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFF1F, '3', '?'),
     (0xFF20, '3', '@'),
     (0xFF21, 'M', 'a'),
@@ -5414,14 +5410,14 @@ def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFF7C, 'M', 'シ'),
     (0xFF7D, 'M', 'ス'),
     (0xFF7E, 'M', 'セ'),
-    ]
-
-def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFF7F, 'M', 'ソ'),
     (0xFF80, 'M', 'タ'),
     (0xFF81, 'M', 'チ'),
     (0xFF82, 'M', 'ツ'),
+    ]
+
+def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFF83, 'M', 'テ'),
     (0xFF84, 'M', 'ト'),
     (0xFF85, 'M', 'ナ'),
@@ -5518,14 +5514,14 @@ def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xFFE7, 'X'),
     (0xFFE8, 'M', '│'),
     (0xFFE9, 'M', '←'),
-    ]
-
-def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0xFFEA, 'M', '↑'),
     (0xFFEB, 'M', '→'),
     (0xFFEC, 'M', '↓'),
     (0xFFED, 'M', '■'),
+    ]
+
+def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0xFFEE, 'M', '○'),
     (0xFFEF, 'X'),
     (0x10000, 'V'),
@@ -5622,14 +5618,14 @@ def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x104B3, 'M', '𐓛'),
     (0x104B4, 'M', '𐓜'),
     (0x104B5, 'M', '𐓝'),
-    ]
-
-def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x104B6, 'M', '𐓞'),
     (0x104B7, 'M', '𐓟'),
     (0x104B8, 'M', '𐓠'),
     (0x104B9, 'M', '𐓡'),
+    ]
+
+def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x104BA, 'M', '𐓢'),
     (0x104BB, 'M', '𐓣'),
     (0x104BC, 'M', '𐓤'),
@@ -5726,14 +5722,14 @@ def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x10786, 'X'),
     (0x10787, 'M', 'ʣ'),
     (0x10788, 'M', 'ꭦ'),
-    ]
-
-def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x10789, 'M', 'ʥ'),
     (0x1078A, 'M', 'ʤ'),
     (0x1078B, 'M', 'ɖ'),
     (0x1078C, 'M', 'ɗ'),
+    ]
+
+def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1078D, 'M', 'ᶑ'),
     (0x1078E, 'M', 'ɘ'),
     (0x1078F, 'M', 'ɞ'),
@@ -5830,14 +5826,14 @@ def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x10A60, 'V'),
     (0x10AA0, 'X'),
     (0x10AC0, 'V'),
-    ]
-
-def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x10AE7, 'X'),
     (0x10AEB, 'V'),
     (0x10AF7, 'X'),
     (0x10B00, 'V'),
+    ]
+
+def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x10B36, 'X'),
     (0x10B39, 'V'),
     (0x10B56, 'X'),
@@ -5934,14 +5930,14 @@ def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1107F, 'V'),
     (0x110BD, 'X'),
     (0x110BE, 'V'),
-    ]
-
-def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x110C3, 'X'),
     (0x110D0, 'V'),
     (0x110E9, 'X'),
     (0x110F0, 'V'),
+    ]
+
+def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x110FA, 'X'),
     (0x11100, 'V'),
     (0x11135, 'X'),
@@ -6038,14 +6034,14 @@ def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x118A4, 'M', '𑣄'),
     (0x118A5, 'M', '𑣅'),
     (0x118A6, 'M', '𑣆'),
-    ]
-
-def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x118A7, 'M', '𑣇'),
     (0x118A8, 'M', '𑣈'),
     (0x118A9, 'M', '𑣉'),
     (0x118AA, 'M', '𑣊'),
+    ]
+
+def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x118AB, 'M', '𑣋'),
     (0x118AC, 'M', '𑣌'),
     (0x118AD, 'M', '𑣍'),
@@ -6142,14 +6138,14 @@ def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x11EE0, 'V'),
     (0x11EF9, 'X'),
     (0x11F00, 'V'),
-    ]
-
-def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x11F11, 'X'),
     (0x11F12, 'V'),
     (0x11F3B, 'X'),
     (0x11F3E, 'V'),
+    ]
+
+def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x11F5A, 'X'),
     (0x11FB0, 'V'),
     (0x11FB1, 'X'),
@@ -6246,14 +6242,14 @@ def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x18D00, 'V'),
     (0x18D09, 'X'),
     (0x1AFF0, 'V'),
-    ]
-
-def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1AFF4, 'X'),
     (0x1AFF5, 'V'),
     (0x1AFFC, 'X'),
     (0x1AFFD, 'V'),
+    ]
+
+def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1AFFF, 'X'),
     (0x1B000, 'V'),
     (0x1B123, 'X'),
@@ -6350,14 +6346,14 @@ def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D41E, 'M', 'e'),
     (0x1D41F, 'M', 'f'),
     (0x1D420, 'M', 'g'),
-    ]
-
-def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D421, 'M', 'h'),
     (0x1D422, 'M', 'i'),
     (0x1D423, 'M', 'j'),
     (0x1D424, 'M', 'k'),
+    ]
+
+def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D425, 'M', 'l'),
     (0x1D426, 'M', 'm'),
     (0x1D427, 'M', 'n'),
@@ -6454,14 +6450,14 @@ def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D482, 'M', 'a'),
     (0x1D483, 'M', 'b'),
     (0x1D484, 'M', 'c'),
-    ]
-
-def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D485, 'M', 'd'),
     (0x1D486, 'M', 'e'),
     (0x1D487, 'M', 'f'),
     (0x1D488, 'M', 'g'),
+    ]
+
+def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D489, 'M', 'h'),
     (0x1D48A, 'M', 'i'),
     (0x1D48B, 'M', 'j'),
@@ -6558,14 +6554,14 @@ def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D4E9, 'M', 'z'),
     (0x1D4EA, 'M', 'a'),
     (0x1D4EB, 'M', 'b'),
-    ]
-
-def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D4EC, 'M', 'c'),
     (0x1D4ED, 'M', 'd'),
     (0x1D4EE, 'M', 'e'),
     (0x1D4EF, 'M', 'f'),
+    ]
+
+def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D4F0, 'M', 'g'),
     (0x1D4F1, 'M', 'h'),
     (0x1D4F2, 'M', 'i'),
@@ -6662,14 +6658,14 @@ def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D550, 'M', 'y'),
     (0x1D551, 'X'),
     (0x1D552, 'M', 'a'),
-    ]
-
-def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D553, 'M', 'b'),
     (0x1D554, 'M', 'c'),
     (0x1D555, 'M', 'd'),
     (0x1D556, 'M', 'e'),
+    ]
+
+def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D557, 'M', 'f'),
     (0x1D558, 'M', 'g'),
     (0x1D559, 'M', 'h'),
@@ -6766,14 +6762,14 @@ def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D5B4, 'M', 'u'),
     (0x1D5B5, 'M', 'v'),
     (0x1D5B6, 'M', 'w'),
-    ]
-
-def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D5B7, 'M', 'x'),
     (0x1D5B8, 'M', 'y'),
     (0x1D5B9, 'M', 'z'),
     (0x1D5BA, 'M', 'a'),
+    ]
+
+def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D5BB, 'M', 'b'),
     (0x1D5BC, 'M', 'c'),
     (0x1D5BD, 'M', 'd'),
@@ -6870,14 +6866,14 @@ def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D618, 'M', 'q'),
     (0x1D619, 'M', 'r'),
     (0x1D61A, 'M', 's'),
-    ]
-
-def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D61B, 'M', 't'),
     (0x1D61C, 'M', 'u'),
     (0x1D61D, 'M', 'v'),
     (0x1D61E, 'M', 'w'),
+    ]
+
+def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D61F, 'M', 'x'),
     (0x1D620, 'M', 'y'),
     (0x1D621, 'M', 'z'),
@@ -6974,14 +6970,14 @@ def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D67C, 'M', 'm'),
     (0x1D67D, 'M', 'n'),
     (0x1D67E, 'M', 'o'),
-    ]
-
-def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D67F, 'M', 'p'),
     (0x1D680, 'M', 'q'),
     (0x1D681, 'M', 'r'),
     (0x1D682, 'M', 's'),
+    ]
+
+def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D683, 'M', 't'),
     (0x1D684, 'M', 'u'),
     (0x1D685, 'M', 'v'),
@@ -7078,14 +7074,14 @@ def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D6E2, 'M', 'α'),
     (0x1D6E3, 'M', 'β'),
     (0x1D6E4, 'M', 'γ'),
-    ]
-
-def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D6E5, 'M', 'δ'),
     (0x1D6E6, 'M', 'ε'),
     (0x1D6E7, 'M', 'ζ'),
     (0x1D6E8, 'M', 'η'),
+    ]
+
+def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D6E9, 'M', 'θ'),
     (0x1D6EA, 'M', 'ι'),
     (0x1D6EB, 'M', 'κ'),
@@ -7182,14 +7178,14 @@ def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D747, 'M', 'σ'),
     (0x1D749, 'M', 'τ'),
     (0x1D74A, 'M', 'υ'),
-    ]
-
-def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D74B, 'M', 'φ'),
     (0x1D74C, 'M', 'χ'),
     (0x1D74D, 'M', 'ψ'),
     (0x1D74E, 'M', 'ω'),
+    ]
+
+def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D74F, 'M', '∂'),
     (0x1D750, 'M', 'ε'),
     (0x1D751, 'M', 'θ'),
@@ -7286,14 +7282,14 @@ def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1D7AD, 'M', 'δ'),
     (0x1D7AE, 'M', 'ε'),
     (0x1D7AF, 'M', 'ζ'),
-    ]
-
-def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1D7B0, 'M', 'η'),
     (0x1D7B1, 'M', 'θ'),
     (0x1D7B2, 'M', 'ι'),
     (0x1D7B3, 'M', 'κ'),
+    ]
+
+def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1D7B4, 'M', 'λ'),
     (0x1D7B5, 'M', 'μ'),
     (0x1D7B6, 'M', 'ν'),
@@ -7390,14 +7386,14 @@ def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1E030, 'M', 'а'),
     (0x1E031, 'M', 'б'),
     (0x1E032, 'M', 'в'),
-    ]
-
-def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1E033, 'M', 'г'),
     (0x1E034, 'M', 'д'),
     (0x1E035, 'M', 'е'),
     (0x1E036, 'M', 'ж'),
+    ]
+
+def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1E037, 'M', 'з'),
     (0x1E038, 'M', 'и'),
     (0x1E039, 'M', 'к'),
@@ -7494,14 +7490,14 @@ def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1E907, 'M', '𞤩'),
     (0x1E908, 'M', '𞤪'),
     (0x1E909, 'M', '𞤫'),
-    ]
-
-def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1E90A, 'M', '𞤬'),
     (0x1E90B, 'M', '𞤭'),
     (0x1E90C, 'M', '𞤮'),
     (0x1E90D, 'M', '𞤯'),
+    ]
+
+def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1E90E, 'M', '𞤰'),
     (0x1E90F, 'M', '𞤱'),
     (0x1E910, 'M', '𞤲'),
@@ -7598,14 +7594,14 @@ def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1EE48, 'X'),
     (0x1EE49, 'M', 'ي'),
     (0x1EE4A, 'X'),
-    ]
-
-def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1EE4B, 'M', 'ل'),
     (0x1EE4C, 'X'),
     (0x1EE4D, 'M', 'ن'),
     (0x1EE4E, 'M', 'س'),
+    ]
+
+def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1EE4F, 'M', 'ع'),
     (0x1EE50, 'X'),
     (0x1EE51, 'M', 'ص'),
@@ -7702,14 +7698,14 @@ def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1EEB2, 'M', 'ق'),
     (0x1EEB3, 'M', 'ر'),
     (0x1EEB4, 'M', 'ش'),
-    ]
-
-def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1EEB5, 'M', 'ت'),
     (0x1EEB6, 'M', 'ث'),
     (0x1EEB7, 'M', 'خ'),
     (0x1EEB8, 'M', 'ذ'),
+    ]
+
+def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1EEB9, 'M', 'ض'),
     (0x1EEBA, 'M', 'ظ'),
     (0x1EEBB, 'M', 'غ'),
@@ -7806,14 +7802,14 @@ def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1F150, 'V'),
     (0x1F16A, 'M', 'mc'),
     (0x1F16B, 'M', 'md'),
-    ]
-
-def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1F16C, 'M', 'mr'),
     (0x1F16D, 'V'),
     (0x1F190, 'M', 'dj'),
     (0x1F191, 'V'),
+    ]
+
+def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1F1AE, 'X'),
     (0x1F1E6, 'V'),
     (0x1F200, 'M', 'ほか'),
@@ -7910,14 +7906,14 @@ def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x1FA54, 'X'),
     (0x1FA60, 'V'),
     (0x1FA6E, 'X'),
-    ]
-
-def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
     (0x1FA70, 'V'),
     (0x1FA7D, 'X'),
     (0x1FA80, 'V'),
     (0x1FA89, 'X'),
+    ]
+
+def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
     (0x1FA90, 'V'),
     (0x1FABE, 'X'),
     (0x1FABF, 'V'),
@@ -7953,6 +7949,8 @@ def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2CEA2, 'X'),
     (0x2CEB0, 'V'),
     (0x2EBE1, 'X'),
+    (0x2EBF0, 'V'),
+    (0x2EE5E, 'X'),
     (0x2F800, 'M', '丽'),
     (0x2F801, 'M', '丸'),
     (0x2F802, 'M', '乁'),
@@ -8014,12 +8012,12 @@ def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2F83C, 'M', '咞'),
     (0x2F83D, 'M', '吸'),
     (0x2F83E, 'M', '呈'),
+    (0x2F83F, 'M', '周'),
+    (0x2F840, 'M', '咢'),
     ]
 
 def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F83F, 'M', '周'),
-    (0x2F840, 'M', '咢'),
     (0x2F841, 'M', '哶'),
     (0x2F842, 'M', '唐'),
     (0x2F843, 'M', '啓'),
@@ -8118,12 +8116,12 @@ def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2F8A4, 'M', '𢛔'),
     (0x2F8A5, 'M', '惇'),
     (0x2F8A6, 'M', '慈'),
+    (0x2F8A7, 'M', '慌'),
+    (0x2F8A8, 'M', '慎'),
     ]
 
 def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F8A7, 'M', '慌'),
-    (0x2F8A8, 'M', '慎'),
     (0x2F8A9, 'M', '慌'),
     (0x2F8AA, 'M', '慺'),
     (0x2F8AB, 'M', '憎'),
@@ -8222,12 +8220,12 @@ def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2F908, 'M', '港'),
     (0x2F909, 'M', '湮'),
     (0x2F90A, 'M', '㴳'),
+    (0x2F90B, 'M', '滋'),
+    (0x2F90C, 'M', '滇'),
     ]
 
 def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F90B, 'M', '滋'),
-    (0x2F90C, 'M', '滇'),
     (0x2F90D, 'M', '𣻑'),
     (0x2F90E, 'M', '淹'),
     (0x2F90F, 'M', '潮'),
@@ -8326,12 +8324,12 @@ def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2F96F, 'M', '縂'),
     (0x2F970, 'M', '繅'),
     (0x2F971, 'M', '䌴'),
+    (0x2F972, 'M', '𦈨'),
+    (0x2F973, 'M', '𦉇'),
     ]
 
 def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F972, 'M', '𦈨'),
-    (0x2F973, 'M', '𦉇'),
     (0x2F974, 'M', '䍙'),
     (0x2F975, 'M', '𦋙'),
     (0x2F976, 'M', '罺'),
@@ -8430,12 +8428,12 @@ def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2F9D3, 'M', '𧲨'),
     (0x2F9D4, 'M', '貫'),
     (0x2F9D5, 'M', '賁'),
+    (0x2F9D6, 'M', '贛'),
+    (0x2F9D7, 'M', '起'),
     ]
 
 def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F9D6, 'M', '贛'),
-    (0x2F9D7, 'M', '起'),
     (0x2F9D8, 'M', '𧼯'),
     (0x2F9D9, 'M', '𠠄'),
     (0x2F9DA, 'M', '跋'),
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 6479d74803f..c01dfd20044 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -10,7 +10,7 @@ pyproject-hooks==1.0.0
 requests==2.31.0
     certifi==2023.7.22
     chardet==5.1.0
-    idna==3.4
+    idna==3.6
     urllib3==1.26.17
 rich==13.7.0
     pygments==2.15.1

From f2c07ee23c794b8affeb8a9353356606af494b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 11 Feb 2024 20:59:01 +0100
Subject: [PATCH 258/992] Upgrade chardet to 5.2.0

---
 news/chardet.vendor.rst             | 1 +
 src/pip/_vendor/chardet/__main__.py | 6 ++++++
 src/pip/_vendor/chardet/version.py  | 2 +-
 src/pip/_vendor/vendor.txt          | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 news/chardet.vendor.rst
 create mode 100644 src/pip/_vendor/chardet/__main__.py

diff --git a/news/chardet.vendor.rst b/news/chardet.vendor.rst
new file mode 100644
index 00000000000..8471ff6bb36
--- /dev/null
+++ b/news/chardet.vendor.rst
@@ -0,0 +1 @@
+Upgrade chardet to 5.2.0
diff --git a/src/pip/_vendor/chardet/__main__.py b/src/pip/_vendor/chardet/__main__.py
new file mode 100644
index 00000000000..c19b0d2d7a3
--- /dev/null
+++ b/src/pip/_vendor/chardet/__main__.py
@@ -0,0 +1,6 @@
+"""Wrapper so people can run python -m chardet"""
+
+from .cli.chardetect import main
+
+if __name__ == "__main__":
+    main()
diff --git a/src/pip/_vendor/chardet/version.py b/src/pip/_vendor/chardet/version.py
index c5e9d85cd75..19dd01e0301 100644
--- a/src/pip/_vendor/chardet/version.py
+++ b/src/pip/_vendor/chardet/version.py
@@ -5,5 +5,5 @@
 :author: Dan Blanchard (dan.blanchard@gmail.com)
 """
 
-__version__ = "5.1.0"
+__version__ = "5.2.0"
 VERSION = __version__.split(".")
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index c01dfd20044..6fdb28ea653 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -9,7 +9,7 @@ pyparsing==3.1.0
 pyproject-hooks==1.0.0
 requests==2.31.0
     certifi==2023.7.22
-    chardet==5.1.0
+    chardet==5.2.0
     idna==3.6
     urllib3==1.26.17
 rich==13.7.0

From 448af4db2254e4c426d3a57100c9fe456f12744a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 11 Feb 2024 20:59:21 +0100
Subject: [PATCH 259/992] Upgrade pygments to 2.17.2

---
 news/pygments.vendor.rst                      |  1 +
 src/pip/_vendor/pygments/__init__.py          |  2 +-
 .../_vendor/pygments/formatters/__init__.py   |  2 +-
 .../_vendor/pygments/formatters/_mapping.py   |  0
 src/pip/_vendor/pygments/formatters/html.py   |  3 +-
 src/pip/_vendor/pygments/formatters/img.py    | 41 ++++++++++-
 src/pip/_vendor/pygments/lexer.py             | 42 +++++++----
 src/pip/_vendor/pygments/lexers/__init__.py   |  1 +
 src/pip/_vendor/pygments/lexers/_mapping.py   | 33 +++++++--
 src/pip/_vendor/pygments/lexers/python.py     |  8 +--
 src/pip/_vendor/pygments/sphinxext.py         | 22 ++++++
 src/pip/_vendor/pygments/style.py             |  6 ++
 src/pip/_vendor/pygments/styles/__init__.py   | 70 ++++---------------
 src/pip/_vendor/pygments/styles/_mapping.py   | 53 ++++++++++++++
 src/pip/_vendor/pygments/token.py             |  1 +
 src/pip/_vendor/vendor.txt                    |  2 +-
 16 files changed, 203 insertions(+), 84 deletions(-)
 create mode 100644 news/pygments.vendor.rst
 mode change 100644 => 100755 src/pip/_vendor/pygments/formatters/_mapping.py
 create mode 100644 src/pip/_vendor/pygments/styles/_mapping.py

diff --git a/news/pygments.vendor.rst b/news/pygments.vendor.rst
new file mode 100644
index 00000000000..f3e9a6f67df
--- /dev/null
+++ b/news/pygments.vendor.rst
@@ -0,0 +1 @@
+Upgrade pygments to 2.17.2
diff --git a/src/pip/_vendor/pygments/__init__.py b/src/pip/_vendor/pygments/__init__.py
index 39c84aae5d8..5b8a3f95483 100644
--- a/src/pip/_vendor/pygments/__init__.py
+++ b/src/pip/_vendor/pygments/__init__.py
@@ -26,7 +26,7 @@
 """
 from io import StringIO, BytesIO
 
-__version__ = '2.15.1'
+__version__ = '2.17.2'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff --git a/src/pip/_vendor/pygments/formatters/__init__.py b/src/pip/_vendor/pygments/formatters/__init__.py
index 39db84262d8..6abb45ac71f 100644
--- a/src/pip/_vendor/pygments/formatters/__init__.py
+++ b/src/pip/_vendor/pygments/formatters/__init__.py
@@ -131,7 +131,7 @@ def get_formatter_for_filename(fn, **options):
                 if name not in _formatter_cache:
                     _load_formatters(modname)
                 return _formatter_cache[name](**options)
-    for cls in find_plugin_formatters():
+    for _name, cls in find_plugin_formatters():
         for filename in cls.filenames:
             if _fn_matches(fn, filename):
                 return cls(**options)
diff --git a/src/pip/_vendor/pygments/formatters/_mapping.py b/src/pip/_vendor/pygments/formatters/_mapping.py
old mode 100644
new mode 100755
diff --git a/src/pip/_vendor/pygments/formatters/html.py b/src/pip/_vendor/pygments/formatters/html.py
index 931d7c3fe29..0cadcb228e7 100644
--- a/src/pip/_vendor/pygments/formatters/html.py
+++ b/src/pip/_vendor/pygments/formatters/html.py
@@ -323,6 +323,7 @@ class ``"special"`` (default: ``0``).
         If set to the path of a ctags file, wrap names in anchor tags that
         link to their definitions. `lineanchors` should be used, and the
         tags file should specify line numbers (see the `-n` option to ctags).
+        The tags file is assumed to be encoded in UTF-8.
 
         .. versionadded:: 1.6
 
@@ -908,7 +909,7 @@ def _format_lines(self, tokensource):
     def _lookup_ctag(self, token):
         entry = ctags.TagEntry()
         if self._ctags.find(entry, token.encode(), 0):
-            return entry['file'], entry['lineNumber']
+            return entry['file'].decode(), entry['lineNumber']
         else:
             return None, None
 
diff --git a/src/pip/_vendor/pygments/formatters/img.py b/src/pip/_vendor/pygments/formatters/img.py
index a338c1588fd..9e66b669162 100644
--- a/src/pip/_vendor/pygments/formatters/img.py
+++ b/src/pip/_vendor/pygments/formatters/img.py
@@ -7,7 +7,6 @@
     :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-
 import os
 import sys
 
@@ -68,6 +67,15 @@ def __init__(self, font_name, font_size=14):
         self.font_size = font_size
         self.fonts = {}
         self.encoding = None
+        self.variable = False
+        if hasattr(font_name, 'read') or os.path.isfile(font_name):
+            font = ImageFont.truetype(font_name, self.font_size)
+            self.variable = True
+            for style in STYLES:
+                self.fonts[style] = font
+
+            return
+
         if sys.platform.startswith('win'):
             if not font_name:
                 self.font_name = DEFAULT_FONT_NAME_WIN
@@ -223,14 +231,43 @@ def get_font(self, bold, oblique):
         Get the font based on bold and italic flags.
         """
         if bold and oblique:
+            if self.variable:
+                return self.get_style('BOLDITALIC')
+
             return self.fonts['BOLDITALIC']
         elif bold:
+            if self.variable:
+                return self.get_style('BOLD')
+
             return self.fonts['BOLD']
         elif oblique:
+            if self.variable:
+                return self.get_style('ITALIC')
+
             return self.fonts['ITALIC']
         else:
+            if self.variable:
+                return self.get_style('NORMAL')
+
             return self.fonts['NORMAL']
 
+    def get_style(self, style):
+        """
+        Get the specified style of the font if it is a variable font.
+        If not found, return the normal font.
+        """
+        font = self.fonts[style]
+        for style_name in STYLES[style]:
+            try:
+                font.set_variation_by_name(style_name)
+                return font
+            except ValueError:
+                pass
+            except OSError:
+                return font
+
+        return font
+
 
 class ImageFormatter(Formatter):
     """
@@ -258,6 +295,8 @@ class ImageFormatter(Formatter):
         The font name to be used as the base font from which others, such as
         bold and italic fonts will be generated.  This really should be a
         monospace font to look sane.
+        If a filename or a file-like object is specified, the user must
+        provide different styles of the font.
 
         Default: "Courier New" on Windows, "Menlo" on Mac OS, and
                  "DejaVu Sans Mono" on \\*nix
diff --git a/src/pip/_vendor/pygments/lexer.py b/src/pip/_vendor/pygments/lexer.py
index eb2c1b46b69..c6634c91daa 100644
--- a/src/pip/_vendor/pygments/lexer.py
+++ b/src/pip/_vendor/pygments/lexer.py
@@ -72,6 +72,11 @@ class Lexer(metaclass=LexerMeta):
     .. autoattribute:: url
        :no-value:
 
+    Lexers included in Pygments may have additional attributes:
+
+    .. autoattribute:: _example
+       :no-value:
+
     You can pass options to the constructor. The basic options recognized
     by all lexers and processed by the base `Lexer` class are:
 
@@ -128,6 +133,10 @@ class Lexer(metaclass=LexerMeta):
     #: documentation.
     url = None
 
+    #: Example file name. Relative to the ``tests/examplefiles`` directory.
+    #: This is used by the documentation generator to show an example.
+    _example = None
+
     def __init__(self, **options):
         """
         This constructor takes arbitrary options as keyword arguments.
@@ -190,20 +199,9 @@ def analyse_text(text):
         it's the same as if the return values was ``0.0``.
         """
 
-    def get_tokens(self, text, unfiltered=False):
-        """
-        This method is the basic interface of a lexer. It is called by
-        the `highlight()` function. It must process the text and return an
-        iterable of ``(tokentype, value)`` pairs from `text`.
+    def _preprocess_lexer_input(self, text):
+        """Apply preprocessing such as decoding the input, removing BOM and normalizing newlines."""
 
-        Normally, you don't need to override this method. The default
-        implementation processes the options recognized by all lexers
-        (`stripnl`, `stripall` and so on), and then yields all tokens
-        from `get_tokens_unprocessed()`, with the ``index`` dropped.
-
-        If `unfiltered` is set to `True`, the filtering mechanism is
-        bypassed even if filters are defined.
-        """
         if not isinstance(text, str):
             if self.encoding == 'guess':
                 text, _ = guess_decode(text)
@@ -246,6 +244,24 @@ def get_tokens(self, text, unfiltered=False):
         if self.ensurenl and not text.endswith('\n'):
             text += '\n'
 
+        return text
+
+    def get_tokens(self, text, unfiltered=False):
+        """
+        This method is the basic interface of a lexer. It is called by
+        the `highlight()` function. It must process the text and return an
+        iterable of ``(tokentype, value)`` pairs from `text`.
+
+        Normally, you don't need to override this method. The default
+        implementation processes the options recognized by all lexers
+        (`stripnl`, `stripall` and so on), and then yields all tokens
+        from `get_tokens_unprocessed()`, with the ``index`` dropped.
+
+        If `unfiltered` is set to `True`, the filtering mechanism is
+        bypassed even if filters are defined.
+        """
+        text = self._preprocess_lexer_input(text)
+
         def streamer():
             for _, t, v in self.get_tokens_unprocessed(text):
                 yield t, v
diff --git a/src/pip/_vendor/pygments/lexers/__init__.py b/src/pip/_vendor/pygments/lexers/__init__.py
index d97c3e395ed..0c176dfbfd6 100644
--- a/src/pip/_vendor/pygments/lexers/__init__.py
+++ b/src/pip/_vendor/pygments/lexers/__init__.py
@@ -22,6 +22,7 @@
 COMPAT = {
     'Python3Lexer': 'PythonLexer',
     'Python3TracebackLexer': 'PythonTracebackLexer',
+    'LeanLexer': 'Lean3Lexer',
 }
 
 __all__ = ['get_lexer_by_name', 'get_lexer_for_filename', 'find_lexer_class',
diff --git a/src/pip/_vendor/pygments/lexers/_mapping.py b/src/pip/_vendor/pygments/lexers/_mapping.py
index de6a0153b77..1ff2b282a12 100644
--- a/src/pip/_vendor/pygments/lexers/_mapping.py
+++ b/src/pip/_vendor/pygments/lexers/_mapping.py
@@ -31,7 +31,8 @@
     'ArduinoLexer': ('pip._vendor.pygments.lexers.c_like', 'Arduino', ('arduino',), ('*.ino',), ('text/x-arduino',)),
     'ArrowLexer': ('pip._vendor.pygments.lexers.arrow', 'Arrow', ('arrow',), ('*.arw',), ()),
     'ArturoLexer': ('pip._vendor.pygments.lexers.arturo', 'Arturo', ('arturo', 'art'), ('*.art',), ()),
-    'AscLexer': ('pip._vendor.pygments.lexers.asc', 'ASCII armored', ('asc', 'pem'), ('*.asc', '*.pem', 'id_dsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_ed25519', 'id_ed25519_sk', 'id_rsa'), ('application/pgp-keys', 'application/pgp-encrypted', 'application/pgp-signature')),
+    'AscLexer': ('pip._vendor.pygments.lexers.asc', 'ASCII armored', ('asc', 'pem'), ('*.asc', '*.pem', 'id_dsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_ed25519', 'id_ed25519_sk', 'id_rsa'), ('application/pgp-keys', 'application/pgp-encrypted', 'application/pgp-signature', 'application/pem-certificate-chain')),
+    'Asn1Lexer': ('pip._vendor.pygments.lexers.asn1', 'ASN.1', ('asn1',), ('*.asn1',), ()),
     'AspectJLexer': ('pip._vendor.pygments.lexers.jvm', 'AspectJ', ('aspectj',), ('*.aj',), ('text/x-aspectj',)),
     'AsymptoteLexer': ('pip._vendor.pygments.lexers.graphics', 'Asymptote', ('asymptote', 'asy'), ('*.asy',), ('text/x-asymptote',)),
     'AugeasLexer': ('pip._vendor.pygments.lexers.configs', 'Augeas', ('augeas',), ('*.aug',), ()),
@@ -41,6 +42,7 @@
     'BBCBasicLexer': ('pip._vendor.pygments.lexers.basic', 'BBC Basic', ('bbcbasic',), ('*.bbc',), ()),
     'BBCodeLexer': ('pip._vendor.pygments.lexers.markup', 'BBCode', ('bbcode',), (), ('text/x-bbcode',)),
     'BCLexer': ('pip._vendor.pygments.lexers.algebra', 'BC', ('bc',), ('*.bc',), ()),
+    'BQNLexer': ('pip._vendor.pygments.lexers.bqn', 'BQN', ('bqn',), ('*.bqn',), ()),
     'BSTLexer': ('pip._vendor.pygments.lexers.bibtex', 'BST', ('bst', 'bst-pybtex'), ('*.bst',), ()),
     'BareLexer': ('pip._vendor.pygments.lexers.bare', 'BARE', ('bare',), ('*.bare',), ()),
     'BaseMakefileLexer': ('pip._vendor.pygments.lexers.make', 'Base Makefile', ('basemake',), (), ()),
@@ -53,6 +55,7 @@
     'BibTeXLexer': ('pip._vendor.pygments.lexers.bibtex', 'BibTeX', ('bibtex', 'bib'), ('*.bib',), ('text/x-bibtex',)),
     'BlitzBasicLexer': ('pip._vendor.pygments.lexers.basic', 'BlitzBasic', ('blitzbasic', 'b3d', 'bplus'), ('*.bb', '*.decls'), ('text/x-bb',)),
     'BlitzMaxLexer': ('pip._vendor.pygments.lexers.basic', 'BlitzMax', ('blitzmax', 'bmax'), ('*.bmx',), ('text/x-bmx',)),
+    'BlueprintLexer': ('pip._vendor.pygments.lexers.blueprint', 'Blueprint', ('blueprint',), ('*.blp',), ('text/x-blueprint',)),
     'BnfLexer': ('pip._vendor.pygments.lexers.grammar_notation', 'BNF', ('bnf',), ('*.bnf',), ('text/x-bnf',)),
     'BoaLexer': ('pip._vendor.pygments.lexers.boa', 'Boa', ('boa',), ('*.boa',), ()),
     'BooLexer': ('pip._vendor.pygments.lexers.dotnet', 'Boo', ('boo',), ('*.boo',), ('text/x-boo',)),
@@ -125,10 +128,12 @@
     'DaxLexer': ('pip._vendor.pygments.lexers.dax', 'Dax', ('dax',), ('*.dax',), ()),
     'DebianControlLexer': ('pip._vendor.pygments.lexers.installers', 'Debian Control file', ('debcontrol', 'control'), ('control',), ()),
     'DelphiLexer': ('pip._vendor.pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
+    'DesktopLexer': ('pip._vendor.pygments.lexers.configs', 'Desktop file', ('desktop',), ('*.desktop',), ()),
     'DevicetreeLexer': ('pip._vendor.pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
     'DgLexer': ('pip._vendor.pygments.lexers.python', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
     'DiffLexer': ('pip._vendor.pygments.lexers.diff', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
     'DjangoLexer': ('pip._vendor.pygments.lexers.templates', 'Django/Jinja', ('django', 'jinja'), (), ('application/x-django-templating', 'application/x-jinja')),
+    'DnsZoneLexer': ('pip._vendor.pygments.lexers.dns', 'Zone', ('zone',), ('*.zone',), ('text/dns',)),
     'DockerLexer': ('pip._vendor.pygments.lexers.configs', 'Docker', ('docker', 'dockerfile'), ('Dockerfile', '*.docker'), ('text/x-dockerfile-config',)),
     'DtdLexer': ('pip._vendor.pygments.lexers.html', 'DTD', ('dtd',), ('*.dtd',), ('application/xml-dtd',)),
     'DuelLexer': ('pip._vendor.pygments.lexers.webmisc', 'Duel', ('duel', 'jbst', 'jsonml+bst'), ('*.duel', '*.jbst'), ('text/x-duel', 'text/x-jbst')),
@@ -190,6 +195,7 @@
     'GoodDataCLLexer': ('pip._vendor.pygments.lexers.business', 'GoodData-CL', ('gooddata-cl',), ('*.gdc',), ('text/x-gooddata-cl',)),
     'GosuLexer': ('pip._vendor.pygments.lexers.jvm', 'Gosu', ('gosu',), ('*.gs', '*.gsx', '*.gsp', '*.vark'), ('text/x-gosu',)),
     'GosuTemplateLexer': ('pip._vendor.pygments.lexers.jvm', 'Gosu Template', ('gst',), ('*.gst',), ('text/x-gosu-template',)),
+    'GraphQLLexer': ('pip._vendor.pygments.lexers.graphql', 'GraphQL', ('graphql',), ('*.graphql',), ()),
     'GraphvizLexer': ('pip._vendor.pygments.lexers.graphviz', 'Graphviz', ('graphviz', 'dot'), ('*.gv', '*.dot'), ('text/x-graphviz', 'text/vnd.graphviz')),
     'GroffLexer': ('pip._vendor.pygments.lexers.markup', 'Groff', ('groff', 'nroff', 'man'), ('*.[1-9]', '*.man', '*.1p', '*.3pm'), ('application/x-troff', 'text/troff')),
     'GroovyLexer': ('pip._vendor.pygments.lexers.jvm', 'Groovy', ('groovy',), ('*.groovy', '*.gradle'), ('text/x-groovy',)),
@@ -219,7 +225,7 @@
     'Inform6Lexer': ('pip._vendor.pygments.lexers.int_fiction', 'Inform 6', ('inform6', 'i6'), ('*.inf',), ()),
     'Inform6TemplateLexer': ('pip._vendor.pygments.lexers.int_fiction', 'Inform 6 template', ('i6t',), ('*.i6t',), ()),
     'Inform7Lexer': ('pip._vendor.pygments.lexers.int_fiction', 'Inform 7', ('inform7', 'i7'), ('*.ni', '*.i7x'), ()),
-    'IniLexer': ('pip._vendor.pygments.lexers.configs', 'INI', ('ini', 'cfg', 'dosini'), ('*.ini', '*.cfg', '*.inf', '.editorconfig', '*.service', '*.socket', '*.device', '*.mount', '*.automount', '*.swap', '*.target', '*.path', '*.timer', '*.slice', '*.scope'), ('text/x-ini', 'text/inf')),
+    'IniLexer': ('pip._vendor.pygments.lexers.configs', 'INI', ('ini', 'cfg', 'dosini'), ('*.ini', '*.cfg', '*.inf', '.editorconfig'), ('text/x-ini', 'text/inf')),
     'IoLexer': ('pip._vendor.pygments.lexers.iolang', 'Io', ('io',), ('*.io',), ('text/x-iosrc',)),
     'IokeLexer': ('pip._vendor.pygments.lexers.jvm', 'Ioke', ('ioke', 'ik'), ('*.ik',), ('text/x-iokesrc',)),
     'IrcLogsLexer': ('pip._vendor.pygments.lexers.textfmts', 'IRC logs', ('irc',), ('*.weechatlog',), ('text/x-irclog',)),
@@ -241,9 +247,10 @@
     'JsgfLexer': ('pip._vendor.pygments.lexers.grammar_notation', 'JSGF', ('jsgf',), ('*.jsgf',), ('application/jsgf', 'application/x-jsgf', 'text/jsgf')),
     'JsonBareObjectLexer': ('pip._vendor.pygments.lexers.data', 'JSONBareObject', (), (), ()),
     'JsonLdLexer': ('pip._vendor.pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
-    'JsonLexer': ('pip._vendor.pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', 'Pipfile.lock'), ('application/json', 'application/json-object')),
+    'JsonLexer': ('pip._vendor.pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', '*.jsonl', '*.ndjson', 'Pipfile.lock'), ('application/json', 'application/json-object', 'application/x-ndjson', 'application/jsonl', 'application/json-seq')),
     'JsonnetLexer': ('pip._vendor.pygments.lexers.jsonnet', 'Jsonnet', ('jsonnet',), ('*.jsonnet', '*.libsonnet'), ()),
     'JspLexer': ('pip._vendor.pygments.lexers.templates', 'Java Server Page', ('jsp',), ('*.jsp',), ('application/x-jsp',)),
+    'JsxLexer': ('pip._vendor.pygments.lexers.jsx', 'JSX', ('jsx', 'react'), ('*.jsx', '*.react'), ('text/jsx', 'text/typescript-jsx')),
     'JuliaConsoleLexer': ('pip._vendor.pygments.lexers.julia', 'Julia console', ('jlcon', 'julia-repl'), (), ()),
     'JuliaLexer': ('pip._vendor.pygments.lexers.julia', 'Julia', ('julia', 'jl'), ('*.jl',), ('text/x-julia', 'application/x-julia')),
     'JuttleLexer': ('pip._vendor.pygments.lexers.javascript', 'Juttle', ('juttle',), ('*.juttle',), ('application/juttle', 'application/x-juttle', 'text/x-juttle', 'text/juttle')),
@@ -254,13 +261,16 @@
     'KokaLexer': ('pip._vendor.pygments.lexers.haskell', 'Koka', ('koka',), ('*.kk', '*.kki'), ('text/x-koka',)),
     'KotlinLexer': ('pip._vendor.pygments.lexers.jvm', 'Kotlin', ('kotlin',), ('*.kt', '*.kts'), ('text/x-kotlin',)),
     'KuinLexer': ('pip._vendor.pygments.lexers.kuin', 'Kuin', ('kuin',), ('*.kn',), ()),
+    'KustoLexer': ('pip._vendor.pygments.lexers.kusto', 'Kusto', ('kql', 'kusto'), ('*.kql', '*.kusto', '.csl'), ()),
     'LSLLexer': ('pip._vendor.pygments.lexers.scripting', 'LSL', ('lsl',), ('*.lsl',), ('text/x-lsl',)),
     'LassoCssLexer': ('pip._vendor.pygments.lexers.templates', 'CSS+Lasso', ('css+lasso',), (), ('text/css+lasso',)),
     'LassoHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Lasso', ('html+lasso',), (), ('text/html+lasso', 'application/x-httpd-lasso', 'application/x-httpd-lasso[89]')),
     'LassoJavascriptLexer': ('pip._vendor.pygments.lexers.templates', 'JavaScript+Lasso', ('javascript+lasso', 'js+lasso'), (), ('application/x-javascript+lasso', 'text/x-javascript+lasso', 'text/javascript+lasso')),
     'LassoLexer': ('pip._vendor.pygments.lexers.javascript', 'Lasso', ('lasso', 'lassoscript'), ('*.lasso', '*.lasso[89]'), ('text/x-lasso',)),
     'LassoXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Lasso', ('xml+lasso',), (), ('application/xml+lasso',)),
-    'LeanLexer': ('pip._vendor.pygments.lexers.theorem', 'Lean', ('lean',), ('*.lean',), ('text/x-lean',)),
+    'LdaprcLexer': ('pip._vendor.pygments.lexers.ldap', 'LDAP configuration file', ('ldapconf', 'ldaprc'), ('.ldaprc', 'ldaprc', 'ldap.conf'), ('text/x-ldapconf',)),
+    'LdifLexer': ('pip._vendor.pygments.lexers.ldap', 'LDIF', ('ldif',), ('*.ldif',), ('text/x-ldif',)),
+    'Lean3Lexer': ('pip._vendor.pygments.lexers.lean', 'Lean', ('lean', 'lean3'), ('*.lean',), ('text/x-lean', 'text/x-lean3')),
     'LessCssLexer': ('pip._vendor.pygments.lexers.css', 'LessCss', ('less',), ('*.less',), ('text/x-less-css',)),
     'LighttpdConfLexer': ('pip._vendor.pygments.lexers.configs', 'Lighttpd configuration file', ('lighttpd', 'lighty'), ('lighttpd.conf',), ('text/x-lighttpd-conf',)),
     'LilyPondLexer': ('pip._vendor.pygments.lexers.lilypond', 'LilyPond', ('lilypond',), ('*.ly',), ()),
@@ -351,6 +361,7 @@
     'OocLexer': ('pip._vendor.pygments.lexers.ooc', 'Ooc', ('ooc',), ('*.ooc',), ('text/x-ooc',)),
     'OpaLexer': ('pip._vendor.pygments.lexers.ml', 'Opa', ('opa',), ('*.opa',), ('text/x-opa',)),
     'OpenEdgeLexer': ('pip._vendor.pygments.lexers.business', 'OpenEdge ABL', ('openedge', 'abl', 'progress'), ('*.p', '*.cls'), ('text/x-openedge', 'application/x-openedge')),
+    'OpenScadLexer': ('pip._vendor.pygments.lexers.openscad', 'OpenSCAD', ('openscad',), ('*.scad',), ('application/x-openscad',)),
     'OutputLexer': ('pip._vendor.pygments.lexers.special', 'Text output', ('output',), (), ()),
     'PacmanConfLexer': ('pip._vendor.pygments.lexers.configs', 'PacmanConf', ('pacmanconf',), ('pacman.conf',), ()),
     'PanLexer': ('pip._vendor.pygments.lexers.dsls', 'Pan', ('pan',), ('*.pan',), ()),
@@ -381,14 +392,16 @@
     'PromQLLexer': ('pip._vendor.pygments.lexers.promql', 'PromQL', ('promql',), ('*.promql',), ()),
     'PropertiesLexer': ('pip._vendor.pygments.lexers.configs', 'Properties', ('properties', 'jproperties'), ('*.properties',), ('text/x-java-properties',)),
     'ProtoBufLexer': ('pip._vendor.pygments.lexers.dsls', 'Protocol Buffer', ('protobuf', 'proto'), ('*.proto',), ()),
+    'PrqlLexer': ('pip._vendor.pygments.lexers.prql', 'PRQL', ('prql',), ('*.prql',), ('application/prql', 'application/x-prql')),
     'PsyshConsoleLexer': ('pip._vendor.pygments.lexers.php', 'PsySH console session for PHP', ('psysh',), (), ()),
+    'PtxLexer': ('pip._vendor.pygments.lexers.ptx', 'PTX', ('ptx',), ('*.ptx',), ('text/x-ptx',)),
     'PugLexer': ('pip._vendor.pygments.lexers.html', 'Pug', ('pug', 'jade'), ('*.pug', '*.jade'), ('text/x-pug', 'text/x-jade')),
     'PuppetLexer': ('pip._vendor.pygments.lexers.dsls', 'Puppet', ('puppet',), ('*.pp',), ()),
     'PyPyLogLexer': ('pip._vendor.pygments.lexers.console', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
     'Python2Lexer': ('pip._vendor.pygments.lexers.python', 'Python 2.x', ('python2', 'py2'), (), ('text/x-python2', 'application/x-python2')),
     'Python2TracebackLexer': ('pip._vendor.pygments.lexers.python', 'Python 2.x Traceback', ('py2tb',), ('*.py2tb',), ('text/x-python2-traceback',)),
     'PythonConsoleLexer': ('pip._vendor.pygments.lexers.python', 'Python console session', ('pycon',), (), ('text/x-python-doctest',)),
-    'PythonLexer': ('pip._vendor.pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
+    'PythonLexer': ('pip._vendor.pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
     'PythonTracebackLexer': ('pip._vendor.pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
     'PythonUL4Lexer': ('pip._vendor.pygments.lexers.ul4', 'Python+UL4', ('py+ul4',), ('*.pyul4',), ()),
     'QBasicLexer': ('pip._vendor.pygments.lexers.basic', 'QBasic', ('qbasic', 'basic'), ('*.BAS', '*.bas'), ('text/basic',)),
@@ -477,9 +490,10 @@
     'SwiftLexer': ('pip._vendor.pygments.lexers.objective', 'Swift', ('swift',), ('*.swift',), ('text/x-swift',)),
     'SwigLexer': ('pip._vendor.pygments.lexers.c_like', 'SWIG', ('swig',), ('*.swg', '*.i'), ('text/swig',)),
     'SystemVerilogLexer': ('pip._vendor.pygments.lexers.hdl', 'systemverilog', ('systemverilog', 'sv'), ('*.sv', '*.svh'), ('text/x-systemverilog',)),
+    'SystemdLexer': ('pip._vendor.pygments.lexers.configs', 'Systemd', ('systemd',), ('*.service', '*.socket', '*.device', '*.mount', '*.automount', '*.swap', '*.target', '*.path', '*.timer', '*.slice', '*.scope'), ()),
     'TAPLexer': ('pip._vendor.pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
     'TNTLexer': ('pip._vendor.pygments.lexers.tnt', 'Typographic Number Theory', ('tnt',), ('*.tnt',), ()),
-    'TOMLLexer': ('pip._vendor.pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ()),
+    'TOMLLexer': ('pip._vendor.pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ('application/toml',)),
     'Tads3Lexer': ('pip._vendor.pygments.lexers.int_fiction', 'TADS 3', ('tads3',), ('*.t',), ()),
     'TalLexer': ('pip._vendor.pygments.lexers.tal', 'Tal', ('tal', 'uxntal'), ('*.tal',), ('text/x-uxntal',)),
     'TasmLexer': ('pip._vendor.pygments.lexers.asm', 'TASM', ('tasm',), ('*.asm', '*.ASM', '*.tasm'), ('text/x-tasm',)),
@@ -498,6 +512,7 @@
     'ThriftLexer': ('pip._vendor.pygments.lexers.dsls', 'Thrift', ('thrift',), ('*.thrift',), ('application/x-thrift',)),
     'TiddlyWiki5Lexer': ('pip._vendor.pygments.lexers.markup', 'tiddler', ('tid',), ('*.tid',), ('text/vnd.tiddlywiki',)),
     'TlbLexer': ('pip._vendor.pygments.lexers.tlb', 'Tl-b', ('tlb',), ('*.tlb',), ()),
+    'TlsLexer': ('pip._vendor.pygments.lexers.tls', 'TLS Presentation Language', ('tls',), (), ()),
     'TodotxtLexer': ('pip._vendor.pygments.lexers.textfmts', 'Todotxt', ('todotxt',), ('todo.txt', '*.todotxt'), ('text/x-todo',)),
     'TransactSqlLexer': ('pip._vendor.pygments.lexers.sql', 'Transact-SQL', ('tsql', 't-sql'), ('*.sql',), ('text/x-tsql',)),
     'TreetopLexer': ('pip._vendor.pygments.lexers.parsers', 'Treetop', ('treetop',), ('*.treetop', '*.tt'), ()),
@@ -513,6 +528,7 @@
     'UniconLexer': ('pip._vendor.pygments.lexers.unicon', 'Unicon', ('unicon',), ('*.icn',), ('text/unicon',)),
     'UnixConfigLexer': ('pip._vendor.pygments.lexers.configs', 'Unix/Linux config files', ('unixconfig', 'linuxconfig'), (), ()),
     'UrbiscriptLexer': ('pip._vendor.pygments.lexers.urbi', 'UrbiScript', ('urbiscript',), ('*.u',), ('application/x-urbiscript',)),
+    'UrlEncodedLexer': ('pip._vendor.pygments.lexers.html', 'urlencoded', ('urlencoded',), (), ('application/x-www-form-urlencoded',)),
     'UsdLexer': ('pip._vendor.pygments.lexers.usd', 'USD', ('usd', 'usda'), ('*.usd', '*.usda'), ()),
     'VBScriptLexer': ('pip._vendor.pygments.lexers.basic', 'VBScript', ('vbscript',), ('*.vbs', '*.VBS'), ()),
     'VCLLexer': ('pip._vendor.pygments.lexers.varnish', 'VCL', ('vcl',), ('*.vcl',), ('text/x-vclsrc',)),
@@ -525,9 +541,13 @@
     'VelocityHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Velocity', ('html+velocity',), (), ('text/html+velocity',)),
     'VelocityLexer': ('pip._vendor.pygments.lexers.templates', 'Velocity', ('velocity',), ('*.vm', '*.fhtml'), ()),
     'VelocityXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Velocity', ('xml+velocity',), (), ('application/xml+velocity',)),
+    'VerifpalLexer': ('pip._vendor.pygments.lexers.verifpal', 'Verifpal', ('verifpal',), ('*.vp',), ('text/x-verifpal',)),
     'VerilogLexer': ('pip._vendor.pygments.lexers.hdl', 'verilog', ('verilog', 'v'), ('*.v',), ('text/x-verilog',)),
     'VhdlLexer': ('pip._vendor.pygments.lexers.hdl', 'vhdl', ('vhdl',), ('*.vhdl', '*.vhd'), ('text/x-vhdl',)),
     'VimLexer': ('pip._vendor.pygments.lexers.textedit', 'VimL', ('vim',), ('*.vim', '.vimrc', '.exrc', '.gvimrc', '_vimrc', '_exrc', '_gvimrc', 'vimrc', 'gvimrc'), ('text/x-vim',)),
+    'VisualPrologGrammarLexer': ('pip._vendor.pygments.lexers.vip', 'Visual Prolog Grammar', ('visualprologgrammar',), ('*.vipgrm',), ()),
+    'VisualPrologLexer': ('pip._vendor.pygments.lexers.vip', 'Visual Prolog', ('visualprolog',), ('*.pro', '*.cl', '*.i', '*.pack', '*.ph'), ()),
+    'VyperLexer': ('pip._vendor.pygments.lexers.vyper', 'Vyper', ('vyper',), ('*.vy',), ()),
     'WDiffLexer': ('pip._vendor.pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
     'WatLexer': ('pip._vendor.pygments.lexers.webassembly', 'WebAssembly', ('wast', 'wat'), ('*.wat', '*.wast'), ()),
     'WebIDLLexer': ('pip._vendor.pygments.lexers.webidl', 'Web IDL', ('webidl',), ('*.webidl',), ()),
@@ -552,6 +572,7 @@
     'YamlJinjaLexer': ('pip._vendor.pygments.lexers.templates', 'YAML+Jinja', ('yaml+jinja', 'salt', 'sls'), ('*.sls', '*.yaml.j2', '*.yml.j2', '*.yaml.jinja2', '*.yml.jinja2'), ('text/x-yaml+jinja', 'text/x-sls')),
     'YamlLexer': ('pip._vendor.pygments.lexers.data', 'YAML', ('yaml',), ('*.yaml', '*.yml'), ('text/x-yaml',)),
     'YangLexer': ('pip._vendor.pygments.lexers.yang', 'YANG', ('yang',), ('*.yang',), ('application/yang',)),
+    'YaraLexer': ('pip._vendor.pygments.lexers.yara', 'YARA', ('yara', 'yar'), ('*.yar',), ('text/x-yara',)),
     'ZeekLexer': ('pip._vendor.pygments.lexers.dsls', 'Zeek', ('zeek', 'bro'), ('*.zeek', '*.bro'), ()),
     'ZephirLexer': ('pip._vendor.pygments.lexers.php', 'Zephir', ('zephir',), ('*.zep',), ()),
     'ZigLexer': ('pip._vendor.pygments.lexers.zig', 'Zig', ('zig',), ('*.zig',), ('text/zig',)),
diff --git a/src/pip/_vendor/pygments/lexers/python.py b/src/pip/_vendor/pygments/lexers/python.py
index e9bf2d33727..e2ce58f5a19 100644
--- a/src/pip/_vendor/pygments/lexers/python.py
+++ b/src/pip/_vendor/pygments/lexers/python.py
@@ -35,8 +35,8 @@ class PythonLexer(RegexLexer):
     """
 
     name = 'Python'
-    url = 'http://www.python.org'
-    aliases = ['python', 'py', 'sage', 'python3', 'py3']
+    url = 'https://www.python.org'
+    aliases = ['python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark']
     filenames = [
         '*.py',
         '*.pyw',
@@ -425,7 +425,7 @@ class Python2Lexer(RegexLexer):
     """
 
     name = 'Python 2.x'
-    url = 'http://www.python.org'
+    url = 'https://www.python.org'
     aliases = ['python2', 'py2']
     filenames = []  # now taken over by PythonLexer (3.x)
     mimetypes = ['text/x-python2', 'application/x-python2']
@@ -830,7 +830,7 @@ class CythonLexer(RegexLexer):
     """
 
     name = 'Cython'
-    url = 'http://cython.org'
+    url = 'https://cython.org'
     aliases = ['cython', 'pyx', 'pyrex']
     filenames = ['*.pyx', '*.pxd', '*.pxi']
     mimetypes = ['text/x-cython', 'application/x-cython']
diff --git a/src/pip/_vendor/pygments/sphinxext.py b/src/pip/_vendor/pygments/sphinxext.py
index 2c7facde830..fc0b0270bfd 100644
--- a/src/pip/_vendor/pygments/sphinxext.py
+++ b/src/pip/_vendor/pygments/sphinxext.py
@@ -147,6 +147,10 @@ def write_seperator():
 
     def document_lexers(self):
         from pip._vendor.pygments.lexers._mapping import LEXERS
+        from pip._vendor import pygments
+        import inspect
+        import pathlib
+
         out = []
         modules = {}
         moduledocstrings = {}
@@ -160,6 +164,24 @@ def document_lexers(self):
             docstring = cls.__doc__
             if isinstance(docstring, bytes):
                 docstring = docstring.decode('utf8')
+
+            example_file = getattr(cls, '_example', None)
+            if example_file:
+                p = pathlib.Path(inspect.getabsfile(pygments)).parent.parent /\
+                    'tests' / 'examplefiles' / example_file
+                content = p.read_text(encoding='utf-8')
+                if not content:
+                    raise Exception(
+                        f"Empty example file '{example_file}' for lexer "
+                        f"{classname}")
+
+                if data[2]:
+                    lexer_name = data[2][0]
+                    docstring += '\n\n    .. admonition:: Example\n'
+                    docstring += f'\n      .. code-block:: {lexer_name}\n\n'
+                    for line in content.splitlines():
+                        docstring += f'          {line}\n'
+
             modules.setdefault(module, []).append((
                 classname,
                 ', '.join(data[2]) or 'None',
diff --git a/src/pip/_vendor/pygments/style.py b/src/pip/_vendor/pygments/style.py
index edc19627dba..f2f72d3bc56 100644
--- a/src/pip/_vendor/pygments/style.py
+++ b/src/pip/_vendor/pygments/style.py
@@ -190,6 +190,12 @@ class Style(metaclass=StyleMeta):
     #: Style definitions for individual token types.
     styles = {}
 
+    #: user-friendly style name (used when selecting the style, so this
+    # should be all-lowercase, no spaces, hyphens)
+    name = 'unnamed'
+
+    aliases = []
+
     # Attribute for lexers defined within Pygments. If set
     # to True, the style is not shown in the style gallery
     # on the website. This is intended for language-specific
diff --git a/src/pip/_vendor/pygments/styles/__init__.py b/src/pip/_vendor/pygments/styles/__init__.py
index 7401cf5d3a3..23b55468e2c 100644
--- a/src/pip/_vendor/pygments/styles/__init__.py
+++ b/src/pip/_vendor/pygments/styles/__init__.py
@@ -10,59 +10,15 @@
 
 from pip._vendor.pygments.plugin import find_plugin_styles
 from pip._vendor.pygments.util import ClassNotFound
+from pip._vendor.pygments.styles._mapping import STYLES
 
 #: A dictionary of built-in styles, mapping style names to
 #: ``'submodule::classname'`` strings.
-STYLE_MAP = {
-    'default':  'default::DefaultStyle',
-    'emacs':    'emacs::EmacsStyle',
-    'friendly': 'friendly::FriendlyStyle',
-    'friendly_grayscale': 'friendly_grayscale::FriendlyGrayscaleStyle',
-    'colorful': 'colorful::ColorfulStyle',
-    'autumn':   'autumn::AutumnStyle',
-    'murphy':   'murphy::MurphyStyle',
-    'manni':    'manni::ManniStyle',
-    'material': 'material::MaterialStyle',
-    'monokai':  'monokai::MonokaiStyle',
-    'perldoc':  'perldoc::PerldocStyle',
-    'pastie':   'pastie::PastieStyle',
-    'borland':  'borland::BorlandStyle',
-    'trac':     'trac::TracStyle',
-    'native':   'native::NativeStyle',
-    'fruity':   'fruity::FruityStyle',
-    'bw':       'bw::BlackWhiteStyle',
-    'vim':      'vim::VimStyle',
-    'vs':       'vs::VisualStudioStyle',
-    'tango':    'tango::TangoStyle',
-    'rrt':      'rrt::RrtStyle',
-    'xcode':    'xcode::XcodeStyle',
-    'igor':     'igor::IgorStyle',
-    'paraiso-light': 'paraiso_light::ParaisoLightStyle',
-    'paraiso-dark': 'paraiso_dark::ParaisoDarkStyle',
-    'lovelace': 'lovelace::LovelaceStyle',
-    'algol':    'algol::AlgolStyle',
-    'algol_nu': 'algol_nu::Algol_NuStyle',
-    'arduino':  'arduino::ArduinoStyle',
-    'rainbow_dash': 'rainbow_dash::RainbowDashStyle',
-    'abap':     'abap::AbapStyle',
-    'solarized-dark': 'solarized::SolarizedDarkStyle',
-    'solarized-light': 'solarized::SolarizedLightStyle',
-    'sas':         'sas::SasStyle',
-    'staroffice' : 'staroffice::StarofficeStyle',
-    'stata':       'stata_light::StataLightStyle',
-    'stata-light': 'stata_light::StataLightStyle',
-    'stata-dark':  'stata_dark::StataDarkStyle',
-    'inkpot':      'inkpot::InkPotStyle',
-    'zenburn': 'zenburn::ZenburnStyle',
-    'gruvbox-dark': 'gruvbox::GruvboxDarkStyle',
-    'gruvbox-light': 'gruvbox::GruvboxLightStyle',
-    'dracula': 'dracula::DraculaStyle',
-    'one-dark': 'onedark::OneDarkStyle',
-    'lilypond' : 'lilypond::LilyPondStyle',
-    'nord': 'nord::NordStyle',
-    'nord-darker': 'nord::NordDarkerStyle',
-    'github-dark': 'gh_dark::GhDarkStyle'
-}
+#: This list is deprecated. Use `pygments.styles.STYLES` instead
+STYLE_MAP = {v[1]: v[0].split('.')[-1] + '::' + k for k, v in STYLES.items()}
+
+#: Internal reverse mapping to make `get_style_by_name` more efficient
+_STYLE_NAME_TO_MODULE_MAP = {v[1]: (v[0], k) for k, v in STYLES.items()}
 
 
 def get_style_by_name(name):
@@ -73,8 +29,8 @@ def get_style_by_name(name):
     Will raise :exc:`pygments.util.ClassNotFound` if no style of that name is
     found.
     """
-    if name in STYLE_MAP:
-        mod, cls = STYLE_MAP[name].split('::')
+    if name in _STYLE_NAME_TO_MODULE_MAP:
+        mod, cls = _STYLE_NAME_TO_MODULE_MAP[name]
         builtin = "yes"
     else:
         for found_name, style in find_plugin_styles():
@@ -82,14 +38,15 @@ def get_style_by_name(name):
                 return style
         # perhaps it got dropped into our styles package
         builtin = ""
-        mod = name
+        mod = 'pygments.styles.' + name
         cls = name.title() + "Style"
 
     try:
-        mod = __import__('pygments.styles.' + mod, None, None, [cls])
+        mod = __import__(mod, None, None, [cls])
     except ImportError:
         raise ClassNotFound("Could not find style module %r" % mod +
-                         (builtin and ", though it should be builtin") + ".")
+                            (builtin and ", though it should be builtin")
+                            + ".")
     try:
         return getattr(mod, cls)
     except AttributeError:
@@ -98,6 +55,7 @@ def get_style_by_name(name):
 
 def get_all_styles():
     """Return a generator for all styles by name, both builtin and plugin."""
-    yield from STYLE_MAP
+    for v in STYLES.values():
+        yield v[1]
     for name, _ in find_plugin_styles():
         yield name
diff --git a/src/pip/_vendor/pygments/styles/_mapping.py b/src/pip/_vendor/pygments/styles/_mapping.py
new file mode 100644
index 00000000000..04c7ddfbb04
--- /dev/null
+++ b/src/pip/_vendor/pygments/styles/_mapping.py
@@ -0,0 +1,53 @@
+# Automatically generated by scripts/gen_mapfiles.py.
+# DO NOT EDIT BY HAND; run `tox -e mapfiles` instead.
+
+STYLES = {
+    'AbapStyle': ('pygments.styles.abap', 'abap', ()),
+    'AlgolStyle': ('pygments.styles.algol', 'algol', ()),
+    'Algol_NuStyle': ('pygments.styles.algol_nu', 'algol_nu', ()),
+    'ArduinoStyle': ('pygments.styles.arduino', 'arduino', ()),
+    'AutumnStyle': ('pygments.styles.autumn', 'autumn', ()),
+    'BlackWhiteStyle': ('pygments.styles.bw', 'bw', ()),
+    'BorlandStyle': ('pygments.styles.borland', 'borland', ()),
+    'ColorfulStyle': ('pygments.styles.colorful', 'colorful', ()),
+    'DefaultStyle': ('pygments.styles.default', 'default', ()),
+    'DraculaStyle': ('pygments.styles.dracula', 'dracula', ()),
+    'EmacsStyle': ('pygments.styles.emacs', 'emacs', ()),
+    'FriendlyGrayscaleStyle': ('pygments.styles.friendly_grayscale', 'friendly_grayscale', ()),
+    'FriendlyStyle': ('pygments.styles.friendly', 'friendly', ()),
+    'FruityStyle': ('pygments.styles.fruity', 'fruity', ()),
+    'GhDarkStyle': ('pygments.styles.gh_dark', 'github-dark', ()),
+    'GruvboxDarkStyle': ('pygments.styles.gruvbox', 'gruvbox-dark', ()),
+    'GruvboxLightStyle': ('pygments.styles.gruvbox', 'gruvbox-light', ()),
+    'IgorStyle': ('pygments.styles.igor', 'igor', ()),
+    'InkPotStyle': ('pygments.styles.inkpot', 'inkpot', ()),
+    'LightbulbStyle': ('pygments.styles.lightbulb', 'lightbulb', ()),
+    'LilyPondStyle': ('pygments.styles.lilypond', 'lilypond', ()),
+    'LovelaceStyle': ('pygments.styles.lovelace', 'lovelace', ()),
+    'ManniStyle': ('pygments.styles.manni', 'manni', ()),
+    'MaterialStyle': ('pygments.styles.material', 'material', ()),
+    'MonokaiStyle': ('pygments.styles.monokai', 'monokai', ()),
+    'MurphyStyle': ('pygments.styles.murphy', 'murphy', ()),
+    'NativeStyle': ('pygments.styles.native', 'native', ()),
+    'NordDarkerStyle': ('pygments.styles.nord', 'nord-darker', ()),
+    'NordStyle': ('pygments.styles.nord', 'nord', ()),
+    'OneDarkStyle': ('pygments.styles.onedark', 'one-dark', ()),
+    'ParaisoDarkStyle': ('pygments.styles.paraiso_dark', 'paraiso-dark', ()),
+    'ParaisoLightStyle': ('pygments.styles.paraiso_light', 'paraiso-light', ()),
+    'PastieStyle': ('pygments.styles.pastie', 'pastie', ()),
+    'PerldocStyle': ('pygments.styles.perldoc', 'perldoc', ()),
+    'RainbowDashStyle': ('pygments.styles.rainbow_dash', 'rainbow_dash', ()),
+    'RrtStyle': ('pygments.styles.rrt', 'rrt', ()),
+    'SasStyle': ('pygments.styles.sas', 'sas', ()),
+    'SolarizedDarkStyle': ('pygments.styles.solarized', 'solarized-dark', ()),
+    'SolarizedLightStyle': ('pygments.styles.solarized', 'solarized-light', ()),
+    'StarofficeStyle': ('pygments.styles.staroffice', 'staroffice', ()),
+    'StataDarkStyle': ('pygments.styles.stata_dark', 'stata-dark', ()),
+    'StataLightStyle': ('pygments.styles.stata_light', 'stata-light', ()),
+    'TangoStyle': ('pygments.styles.tango', 'tango', ()),
+    'TracStyle': ('pygments.styles.trac', 'trac', ()),
+    'VimStyle': ('pygments.styles.vim', 'vim', ()),
+    'VisualStudioStyle': ('pygments.styles.vs', 'vs', ()),
+    'XcodeStyle': ('pygments.styles.xcode', 'xcode', ()),
+    'ZenburnStyle': ('pygments.styles.zenburn', 'zenburn', ()),
+}
diff --git a/src/pip/_vendor/pygments/token.py b/src/pip/_vendor/pygments/token.py
index 7395cb6a620..bdf2e8e2e12 100644
--- a/src/pip/_vendor/pygments/token.py
+++ b/src/pip/_vendor/pygments/token.py
@@ -209,5 +209,6 @@ def string_to_tokentype(s):
     Generic.Prompt:                'gp',
     Generic.Strong:                'gs',
     Generic.Subheading:            'gu',
+    Generic.EmphStrong:            'ges',
     Generic.Traceback:             'gt',
 }
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 6fdb28ea653..b247d3dfa7b 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -13,7 +13,7 @@ requests==2.31.0
     idna==3.6
     urllib3==1.26.17
 rich==13.7.0
-    pygments==2.15.1
+    pygments==2.17.2
     typing_extensions==4.7.1
 resolvelib==1.0.1
 setuptools==68.0.0

From b2664c961e0e739f151ac69c8aec09aff9dbf428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 11 Feb 2024 21:00:12 +0100
Subject: [PATCH 260/992] Upgrade setuptools to 69.1.1

---
 news/setuptools.vendor.rst                  |   1 +
 src/pip/_vendor/pkg_resources/__init__.py   | 132 ++++++++------------
 src/pip/_vendor/vendor.txt                  |   2 +-
 tools/vendoring/patches/pkg_resources.patch |   6 +-
 4 files changed, 59 insertions(+), 82 deletions(-)
 create mode 100644 news/setuptools.vendor.rst

diff --git a/news/setuptools.vendor.rst b/news/setuptools.vendor.rst
new file mode 100644
index 00000000000..135850e0a97
--- /dev/null
+++ b/news/setuptools.vendor.rst
@@ -0,0 +1 @@
+Upgrade setuptools to 69.1.1
diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py
index ad2794077b0..89f49570f4a 100644
--- a/src/pip/_vendor/pkg_resources/__init__.py
+++ b/src/pip/_vendor/pkg_resources/__init__.py
@@ -18,11 +18,16 @@
 """
 
 import sys
+
+if sys.version_info < (3, 8):
+    raise RuntimeError("Python 3.8 or later is required")
+
 import os
 import io
 import time
 import re
 import types
+from typing import Protocol
 import zipfile
 import zipimport
 import warnings
@@ -41,18 +46,10 @@
 import ntpath
 import posixpath
 import importlib
+import importlib.machinery
 from pkgutil import get_importer
 
-try:
-    import _imp
-except ImportError:
-    # Python 3.2 compatibility
-    import imp as _imp
-
-try:
-    FileExistsError
-except NameError:
-    FileExistsError = OSError
+import _imp
 
 # capture these to bypass sandboxing
 from os import utime
@@ -68,14 +65,6 @@
 from os import open as os_open
 from os.path import isdir, split
 
-try:
-    import importlib.machinery as importlib_machinery
-
-    # access attribute to force import under delayed import mechanisms.
-    importlib_machinery.__name__
-except ImportError:
-    importlib_machinery = None
-
 from pip._internal.utils._jaraco_text import (
     yield_lines,
     drop_comment,
@@ -91,9 +80,6 @@
 __import__('pip._vendor.packaging.markers')
 __import__('pip._vendor.packaging.utils')
 
-if sys.version_info < (3, 5):
-    raise RuntimeError("Python 3.5 or later is required")
-
 # declare some globals that will be defined later to
 # satisfy the linters.
 require = None
@@ -119,7 +105,7 @@
     "pkg_resources is deprecated as an API. "
     "See https://setuptools.pypa.io/en/latest/pkg_resources.html",
     DeprecationWarning,
-    stacklevel=2
+    stacklevel=2,
 )
 
 
@@ -407,20 +393,18 @@ def get_provider(moduleOrReq):
     return _find_adapter(_provider_factories, loader)(module)
 
 
-def _macos_vers(_cache=[]):
-    if not _cache:
-        version = platform.mac_ver()[0]
-        # fallback for MacPorts
-        if version == '':
-            plist = '/System/Library/CoreServices/SystemVersion.plist'
-            if os.path.exists(plist):
-                if hasattr(plistlib, 'readPlist'):
-                    plist_content = plistlib.readPlist(plist)
-                    if 'ProductVersion' in plist_content:
-                        version = plist_content['ProductVersion']
-
-        _cache.append(version.split('.'))
-    return _cache[0]
+@functools.lru_cache(maxsize=None)
+def _macos_vers():
+    version = platform.mac_ver()[0]
+    # fallback for MacPorts
+    if version == '':
+        plist = '/System/Library/CoreServices/SystemVersion.plist'
+        if os.path.exists(plist):
+            with open(plist, 'rb') as fh:
+                plist_content = plistlib.load(fh)
+            if 'ProductVersion' in plist_content:
+                version = plist_content['ProductVersion']
+    return version.split('.')
 
 
 def _macos_arch(machine):
@@ -546,54 +530,54 @@ def get_entry_info(dist, group, name):
     return get_distribution(dist).get_entry_info(group, name)
 
 
-class IMetadataProvider:
-    def has_metadata(name):
+class IMetadataProvider(Protocol):
+    def has_metadata(self, name):
         """Does the package's distribution contain the named metadata?"""
 
-    def get_metadata(name):
+    def get_metadata(self, name):
         """The named metadata resource as a string"""
 
-    def get_metadata_lines(name):
+    def get_metadata_lines(self, name):
         """Yield named metadata resource as list of non-blank non-comment lines
 
         Leading and trailing whitespace is stripped from each line, and lines
         with ``#`` as the first non-blank character are omitted."""
 
-    def metadata_isdir(name):
+    def metadata_isdir(self, name):
         """Is the named metadata a directory?  (like ``os.path.isdir()``)"""
 
-    def metadata_listdir(name):
+    def metadata_listdir(self, name):
         """List of metadata names in the directory (like ``os.listdir()``)"""
 
-    def run_script(script_name, namespace):
+    def run_script(self, script_name, namespace):
         """Execute the named script in the supplied namespace dictionary"""
 
 
-class IResourceProvider(IMetadataProvider):
+class IResourceProvider(IMetadataProvider, Protocol):
     """An object that provides access to package resources"""
 
-    def get_resource_filename(manager, resource_name):
+    def get_resource_filename(self, manager, resource_name):
         """Return a true filesystem path for `resource_name`
 
         `manager` must be an ``IResourceManager``"""
 
-    def get_resource_stream(manager, resource_name):
+    def get_resource_stream(self, manager, resource_name):
         """Return a readable file-like object for `resource_name`
 
         `manager` must be an ``IResourceManager``"""
 
-    def get_resource_string(manager, resource_name):
+    def get_resource_string(self, manager, resource_name):
         """Return a string containing the contents of `resource_name`
 
         `manager` must be an ``IResourceManager``"""
 
-    def has_resource(resource_name):
+    def has_resource(self, resource_name):
         """Does the package contain the named resource?"""
 
-    def resource_isdir(resource_name):
+    def resource_isdir(self, resource_name):
         """Is the named resource a directory?  (like ``os.path.isdir()``)"""
 
-    def resource_listdir(resource_name):
+    def resource_listdir(self, resource_name):
         """List of resource names in the directory (like ``os.listdir()``)"""
 
 
@@ -1143,8 +1127,7 @@ def obtain(self, requirement, installer=None):
         None is returned instead.  This method is a hook that allows subclasses
         to attempt other ways of obtaining a distribution before falling back
         to the `installer` argument."""
-        if installer is not None:
-            return installer(requirement)
+        return installer(requirement) if installer else None
 
     def __iter__(self):
         """Yield the unique project names of the available distributions"""
@@ -1418,7 +1401,7 @@ def _forgiving_version(version):
     match = _PEP440_FALLBACK.search(version)
     if match:
         safe = match["safe"]
-        rest = version[len(safe):]
+        rest = version[len(safe) :]
     else:
         safe = "0"
         rest = version
@@ -1734,7 +1717,7 @@ def _register(cls):
             'SourcelessFileLoader',
         )
         for name in loader_names:
-            loader_cls = getattr(importlib_machinery, name, type(None))
+            loader_cls = getattr(importlib.machinery, name, type(None))
             register_loader_type(loader_cls, cls)
 
 
@@ -1874,7 +1857,7 @@ def _extract_resource(self, manager, zip_path):  # noqa: C901
         timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
 
         if not WRITE_SUPPORT:
-            raise IOError(
+            raise OSError(
                 '"os.rename" and "os.unlink" are not supported ' 'on this platform'
             )
         try:
@@ -1895,7 +1878,7 @@ def _extract_resource(self, manager, zip_path):  # noqa: C901
             try:
                 rename(tmpnam, real_path)
 
-            except os.error:
+            except OSError:
                 if os.path.isfile(real_path):
                     if self._is_current(real_path, zip_path):
                         # the file became current since it was checked above,
@@ -1908,7 +1891,7 @@ def _extract_resource(self, manager, zip_path):  # noqa: C901
                         return real_path
                 raise
 
-        except os.error:
+        except OSError:
             # report a user-friendly error
             manager.extraction_error()
 
@@ -2001,7 +1984,7 @@ def get_metadata(self, name):
         if name != 'PKG-INFO':
             raise KeyError("No metadata except PKG-INFO is available")
 
-        with io.open(self.path, encoding='utf-8', errors="replace") as f:
+        with open(self.path, encoding='utf-8', errors="replace") as f:
             metadata = f.read()
         self._warn_on_replacement(metadata)
         return metadata
@@ -2095,8 +2078,7 @@ def find_eggs_in_zip(importer, path_item, only=False):
         if _is_egg_path(subitem):
             subpath = os.path.join(path_item, subitem)
             dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath)
-            for dist in dists:
-                yield dist
+            yield from dists
         elif subitem.lower().endswith(('.dist-info', '.egg-info')):
             subpath = os.path.join(path_item, subitem)
             submeta = EggMetadata(zipimport.zipimporter(subpath))
@@ -2131,8 +2113,7 @@ def find_on_path(importer, path_item, only=False):
     for entry in sorted(entries):
         fullpath = os.path.join(path_item, entry)
         factory = dist_factory(path_item, entry, only)
-        for dist in factory(fullpath):
-            yield dist
+        yield from factory(fullpath)
 
 
 def dist_factory(path_item, entry, only):
@@ -2231,7 +2212,7 @@ def resolve_egg_link(path):
 if hasattr(pkgutil, 'ImpImporter'):
     register_finder(pkgutil.ImpImporter, find_on_path)
 
-register_finder(importlib_machinery.FileFinder, find_on_path)
+register_finder(importlib.machinery.FileFinder, find_on_path)
 
 _declare_state('dict', _namespace_handlers={})
 _declare_state('dict', _namespace_packages={})
@@ -2398,7 +2379,7 @@ def file_ns_handler(importer, path_item, packageName, module):
     register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
 
 register_namespace_handler(zipimport.zipimporter, file_ns_handler)
-register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
+register_namespace_handler(importlib.machinery.FileFinder, file_ns_handler)
 
 
 def null_ns_handler(importer, path_item, packageName, module):
@@ -2424,12 +2405,9 @@ def _cygwin_patch(filename):  # pragma: nocover
     return os.path.abspath(filename) if sys.platform == 'cygwin' else filename
 
 
-def _normalize_cached(filename, _cache={}):
-    try:
-        return _cache[filename]
-    except KeyError:
-        _cache[filename] = result = normalize_path(filename)
-        return result
+@functools.lru_cache(maxsize=None)
+def _normalize_cached(filename):
+    return normalize_path(filename)
 
 
 def _is_egg_path(path):
@@ -2850,14 +2828,11 @@ def _get_metadata_path_for_display(self, name):
 
     def _get_metadata(self, name):
         if self.has_metadata(name):
-            for line in self.get_metadata_lines(name):
-                yield line
+            yield from self.get_metadata_lines(name)
 
     def _get_version(self):
         lines = self._get_metadata(self.PKG_INFO)
-        version = _version_from_file(lines)
-
-        return version
+        return _version_from_file(lines)
 
     def activate(self, path=None, replace=False):
         """Ensure distribution is importable on `path` (default=sys.path)"""
@@ -2904,7 +2879,7 @@ def __getattr__(self, attr):
 
     def __dir__(self):
         return list(
-            set(super(Distribution, self).__dir__())
+            set(super().__dir__())
             | set(attr for attr in self._provider.__dir__() if not attr.startswith('_'))
         )
 
@@ -3171,7 +3146,7 @@ class RequirementParseError(packaging.requirements.InvalidRequirement):
 class Requirement(packaging.requirements.Requirement):
     def __init__(self, requirement_string):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
-        super(Requirement, self).__init__(requirement_string)
+        super().__init__(requirement_string)
         self.unsafe_name = self.name
         project_name = safe_name(self.name)
         self.project_name, self.key = project_name, project_name.lower()
@@ -3232,6 +3207,7 @@ def _find_adapter(registry, ob):
     for t in types:
         if t in registry:
             return registry[t]
+    return None
 
 
 def ensure_directory(path):
@@ -3243,7 +3219,7 @@ def ensure_directory(path):
 def _bypass_ensure_directory(path):
     """Sandbox-bypassing version of ensure_directory()"""
     if not WRITE_SUPPORT:
-        raise IOError('"os.mkdir" not supported on this platform.')
+        raise OSError('"os.mkdir" not supported on this platform.')
     dirname, filename = split(path)
     if dirname and filename and not isdir(dirname):
         _bypass_ensure_directory(dirname)
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index b247d3dfa7b..8a21643fe19 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -16,7 +16,7 @@ rich==13.7.0
     pygments==2.17.2
     typing_extensions==4.7.1
 resolvelib==1.0.1
-setuptools==68.0.0
+setuptools==69.1.1
 six==1.16.0
 tenacity==8.2.2
 tomli==2.0.1
diff --git a/tools/vendoring/patches/pkg_resources.patch b/tools/vendoring/patches/pkg_resources.patch
index 48ae954311b..a99b6c63df8 100644
--- a/tools/vendoring/patches/pkg_resources.patch
+++ b/tools/vendoring/patches/pkg_resources.patch
@@ -2,9 +2,9 @@ diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_res
 index 3f2476a0c..8d5727d35 100644
 --- a/src/pip/_vendor/pkg_resources/__init__.py
 +++ b/src/pip/_vendor/pkg_resources/__init__.py
-@@ -71,7 +71,7 @@
- except ImportError:
-     importlib_machinery = None
+@@ -65,7 +65,7 @@
+ from os import open as os_open
+ from os.path import isdir, split
 
 -from pkg_resources.extern.jaraco.text import (
 +from pip._internal.utils._jaraco_text import (

From ca4f45f27fd620c3281e9f0c28e8cd93071e35f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 11 Feb 2024 21:00:26 +0100
Subject: [PATCH 261/992] Upgrade tenacity to 8.2.3

---
 news/tenacity.vendor.rst             | 1 +
 src/pip/_vendor/tenacity/__init__.py | 2 +-
 src/pip/_vendor/vendor.txt           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 news/tenacity.vendor.rst

diff --git a/news/tenacity.vendor.rst b/news/tenacity.vendor.rst
new file mode 100644
index 00000000000..5f37bc3f116
--- /dev/null
+++ b/news/tenacity.vendor.rst
@@ -0,0 +1 @@
+Upgrade tenacity to 8.2.3
diff --git a/src/pip/_vendor/tenacity/__init__.py b/src/pip/_vendor/tenacity/__init__.py
index 4f1603adeb6..c1b0310bdfb 100644
--- a/src/pip/_vendor/tenacity/__init__.py
+++ b/src/pip/_vendor/tenacity/__init__.py
@@ -501,7 +501,7 @@ def retry(func: WrappedFn) -> WrappedFn:
 
 @t.overload
 def retry(
-    sleep: t.Callable[[t.Union[int, float]], None] = sleep,
+    sleep: t.Callable[[t.Union[int, float]], t.Optional[t.Awaitable[None]]] = sleep,
     stop: "StopBaseT" = stop_never,
     wait: "WaitBaseT" = wait_none(),
     retry: "RetryBaseT" = retry_if_exception_type(),
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 8a21643fe19..d7296f9dfed 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -18,7 +18,7 @@ rich==13.7.0
 resolvelib==1.0.1
 setuptools==69.1.1
 six==1.16.0
-tenacity==8.2.2
+tenacity==8.2.3
 tomli==2.0.1
 truststore==0.8.0
 webencodings==0.5.1

From 4716a4e0b4ed97cf0b7119f75628c889fc01b250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 11 Feb 2024 21:04:13 +0100
Subject: [PATCH 262/992] Upgrade distro to 1.9.0

---
 news/distro.vendor.rst           |  1 +
 src/pip/_vendor/distro/distro.py | 12 ++++++++----
 src/pip/_vendor/vendor.txt       |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 news/distro.vendor.rst

diff --git a/news/distro.vendor.rst b/news/distro.vendor.rst
new file mode 100644
index 00000000000..9929155edbe
--- /dev/null
+++ b/news/distro.vendor.rst
@@ -0,0 +1 @@
+Upgrade distro to 1.9.0
diff --git a/src/pip/_vendor/distro/distro.py b/src/pip/_vendor/distro/distro.py
index 89e18680472..78ccdfa402a 100644
--- a/src/pip/_vendor/distro/distro.py
+++ b/src/pip/_vendor/distro/distro.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright 2015,2016,2017 Nir Cohen
+# Copyright 2015-2021 Nir Cohen
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@
     # Python 3.7
     TypedDict = dict
 
-__version__ = "1.8.0"
+__version__ = "1.9.0"
 
 
 class VersionDict(TypedDict):
@@ -125,6 +125,7 @@ class InfoDict(TypedDict):
 # Base file names to be looked up for if _UNIXCONFDIR is not readable.
 _DISTRO_RELEASE_BASENAMES = [
     "SuSE-release",
+    "altlinux-release",
     "arch-release",
     "base-release",
     "centos-release",
@@ -151,6 +152,8 @@ class InfoDict(TypedDict):
     "system-release",
     "plesk-release",
     "iredmail-release",
+    "board-release",
+    "ec2_version",
 )
 
 
@@ -243,6 +246,7 @@ def id() -> str:
     "rocky"         Rocky Linux
     "aix"           AIX
     "guix"          Guix System
+    "altlinux"      ALT Linux
     ==============  =========================================
 
     If you have a need to get distros for reliable IDs added into this set,
@@ -991,10 +995,10 @@ def info(self, pretty: bool = False, best: bool = False) -> InfoDict:
 
         For details, see :func:`distro.info`.
         """
-        return dict(
+        return InfoDict(
             id=self.id(),
             version=self.version(pretty, best),
-            version_parts=dict(
+            version_parts=VersionDict(
                 major=self.major_version(best),
                 minor=self.minor_version(best),
                 build_number=self.build_number(best),
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index d7296f9dfed..468b556d675 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -1,7 +1,7 @@
 CacheControl==0.13.1  # Make sure to update the license in pyproject.toml for this.
 colorama==0.4.6
 distlib==0.3.8
-distro==1.8.0
+distro==1.9.0
 msgpack==1.0.5
 packaging==21.3
 platformdirs==3.8.1

From f756086e82da6223eaa945a408bc11990b7ce004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 18 Feb 2024 18:26:26 +0100
Subject: [PATCH 263/992] Upgrade platformdirs to 4.2.0

---
 news/platformdirs.vendor.rst             |  1 +
 src/pip/_vendor/platformdirs/__init__.py | 69 +++++++++++++++++--
 src/pip/_vendor/platformdirs/__main__.py |  2 +
 src/pip/_vendor/platformdirs/android.py  | 11 +++
 src/pip/_vendor/platformdirs/api.py      | 72 +++++++++++++++++---
 src/pip/_vendor/platformdirs/macos.py    | 44 ++++++++++--
 src/pip/_vendor/platformdirs/unix.py     | 87 ++++++++++++++++++------
 src/pip/_vendor/platformdirs/version.py  | 16 ++++-
 src/pip/_vendor/platformdirs/windows.py  | 14 +++-
 src/pip/_vendor/vendor.txt               |  2 +-
 10 files changed, 277 insertions(+), 41 deletions(-)
 create mode 100644 news/platformdirs.vendor.rst

diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
new file mode 100644
index 00000000000..fb749d1ab8d
--- /dev/null
+++ b/news/platformdirs.vendor.rst
@@ -0,0 +1 @@
+Upgrade platformdirs to 4.2.0
diff --git a/src/pip/_vendor/platformdirs/__init__.py b/src/pip/_vendor/platformdirs/__init__.py
index 5ebf5957b46..3da5ac1474f 100644
--- a/src/pip/_vendor/platformdirs/__init__.py
+++ b/src/pip/_vendor/platformdirs/__init__.py
@@ -2,6 +2,7 @@
 Utilities for determining application-specific dirs. See  for details and
 usage.
 """
+
 from __future__ import annotations
 
 import os
@@ -14,11 +15,7 @@
 
 if TYPE_CHECKING:
     from pathlib import Path
-
-    if sys.version_info >= (3, 8):  # pragma: no cover (py38+)
-        from typing import Literal
-    else:  # pragma: no cover (py38+)
-        from pip._vendor.typing_extensions import Literal
+    from typing import Literal
 
 
 def _set_platform_dir_class() -> type[PlatformDirsABC]:
@@ -264,6 +261,11 @@ def user_music_dir() -> str:
     return PlatformDirs().user_music_dir
 
 
+def user_desktop_dir() -> str:
+    """:returns: desktop directory tied to the user"""
+    return PlatformDirs().user_desktop_dir
+
+
 def user_runtime_dir(
     appname: str | None = None,
     appauthor: str | None | Literal[False] = None,
@@ -288,6 +290,30 @@ def user_runtime_dir(
     ).user_runtime_dir
 
 
+def site_runtime_dir(
+    appname: str | None = None,
+    appauthor: str | None | Literal[False] = None,
+    version: str | None = None,
+    opinion: bool = True,  # noqa: FBT001, FBT002
+    ensure_exists: bool = False,  # noqa: FBT001, FBT002
+) -> str:
+    """
+    :param appname: See `appname `.
+    :param appauthor: See `appauthor `.
+    :param version: See `version `.
+    :param opinion: See `opinion `.
+    :param ensure_exists: See `ensure_exists `.
+    :returns: runtime directory shared by users
+    """
+    return PlatformDirs(
+        appname=appname,
+        appauthor=appauthor,
+        version=version,
+        opinion=opinion,
+        ensure_exists=ensure_exists,
+    ).site_runtime_dir
+
+
 def user_data_path(
     appname: str | None = None,
     appauthor: str | None | Literal[False] = None,
@@ -505,6 +531,11 @@ def user_music_path() -> Path:
     return PlatformDirs().user_music_path
 
 
+def user_desktop_path() -> Path:
+    """:returns: desktop path tied to the user"""
+    return PlatformDirs().user_desktop_path
+
+
 def user_runtime_path(
     appname: str | None = None,
     appauthor: str | None | Literal[False] = None,
@@ -529,6 +560,30 @@ def user_runtime_path(
     ).user_runtime_path
 
 
+def site_runtime_path(
+    appname: str | None = None,
+    appauthor: str | None | Literal[False] = None,
+    version: str | None = None,
+    opinion: bool = True,  # noqa: FBT001, FBT002
+    ensure_exists: bool = False,  # noqa: FBT001, FBT002
+) -> Path:
+    """
+    :param appname: See `appname `.
+    :param appauthor: See `appauthor `.
+    :param version: See `version `.
+    :param opinion: See `opinion `.
+    :param ensure_exists: See `ensure_exists `.
+    :returns: runtime path shared by users
+    """
+    return PlatformDirs(
+        appname=appname,
+        appauthor=appauthor,
+        version=version,
+        opinion=opinion,
+        ensure_exists=ensure_exists,
+    ).site_runtime_path
+
+
 __all__ = [
     "__version__",
     "__version_info__",
@@ -545,10 +600,12 @@ def user_runtime_path(
     "user_pictures_dir",
     "user_videos_dir",
     "user_music_dir",
+    "user_desktop_dir",
     "user_runtime_dir",
     "site_data_dir",
     "site_config_dir",
     "site_cache_dir",
+    "site_runtime_dir",
     "user_data_path",
     "user_config_path",
     "user_cache_path",
@@ -559,8 +616,10 @@ def user_runtime_path(
     "user_pictures_path",
     "user_videos_path",
     "user_music_path",
+    "user_desktop_path",
     "user_runtime_path",
     "site_data_path",
     "site_config_path",
     "site_cache_path",
+    "site_runtime_path",
 ]
diff --git a/src/pip/_vendor/platformdirs/__main__.py b/src/pip/_vendor/platformdirs/__main__.py
index 6a0d6dd12e3..61342265b60 100644
--- a/src/pip/_vendor/platformdirs/__main__.py
+++ b/src/pip/_vendor/platformdirs/__main__.py
@@ -1,4 +1,5 @@
 """Main entry point."""
+
 from __future__ import annotations
 
 from pip._vendor.platformdirs import PlatformDirs, __version__
@@ -18,6 +19,7 @@
     "site_data_dir",
     "site_config_dir",
     "site_cache_dir",
+    "site_runtime_dir",
 )
 
 
diff --git a/src/pip/_vendor/platformdirs/android.py b/src/pip/_vendor/platformdirs/android.py
index 76527dda41f..4acdb63833f 100644
--- a/src/pip/_vendor/platformdirs/android.py
+++ b/src/pip/_vendor/platformdirs/android.py
@@ -1,4 +1,5 @@
 """Android."""
+
 from __future__ import annotations
 
 import os
@@ -92,6 +93,11 @@ def user_music_dir(self) -> str:
         """:return: music directory tied to the user e.g. ``/storage/emulated/0/Music``"""
         return _android_music_folder()
 
+    @property
+    def user_desktop_dir(self) -> str:
+        """:return: desktop directory tied to the user e.g. ``/storage/emulated/0/Desktop``"""
+        return "/storage/emulated/0/Desktop"
+
     @property
     def user_runtime_dir(self) -> str:
         """
@@ -103,6 +109,11 @@ def user_runtime_dir(self) -> str:
             path = os.path.join(path, "tmp")  # noqa: PTH118
         return path
 
+    @property
+    def site_runtime_dir(self) -> str:
+        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
+        return self.user_runtime_dir
+
 
 @lru_cache(maxsize=1)
 def _android_folder() -> str | None:
diff --git a/src/pip/_vendor/platformdirs/api.py b/src/pip/_vendor/platformdirs/api.py
index d64ebb9d45c..031a38a3d36 100644
--- a/src/pip/_vendor/platformdirs/api.py
+++ b/src/pip/_vendor/platformdirs/api.py
@@ -1,4 +1,5 @@
 """Base API."""
+
 from __future__ import annotations
 
 import os
@@ -7,12 +8,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    import sys
-
-    if sys.version_info >= (3, 8):  # pragma: no cover (py38+)
-        from typing import Literal
-    else:  # pragma: no cover (py38+)
-        from pip._vendor.typing_extensions import Literal
+    from typing import Iterator, Literal
 
 
 class PlatformDirsABC(ABC):
@@ -58,8 +54,8 @@ def __init__(  # noqa: PLR0913
         """
         self.multipath = multipath
         """
-        An optional parameter only applicable to Unix/Linux which indicates that the entire list of data dirs should be
-        returned. By default, the first item would only be returned.
+        An optional parameter which indicates that the entire list of data dirs should be returned.
+        By default, the first item would only be returned.
         """
         self.opinion = opinion  #: A flag to indicating to use opinionated values.
         self.ensure_exists = ensure_exists
@@ -147,11 +143,21 @@ def user_videos_dir(self) -> str:
     def user_music_dir(self) -> str:
         """:return: music directory tied to the user"""
 
+    @property
+    @abstractmethod
+    def user_desktop_dir(self) -> str:
+        """:return: desktop directory tied to the user"""
+
     @property
     @abstractmethod
     def user_runtime_dir(self) -> str:
         """:return: runtime directory tied to the user"""
 
+    @property
+    @abstractmethod
+    def site_runtime_dir(self) -> str:
+        """:return: runtime directory shared by users"""
+
     @property
     def user_data_path(self) -> Path:
         """:return: data path tied to the user"""
@@ -217,7 +223,57 @@ def user_music_path(self) -> Path:
         """:return: music path tied to the user"""
         return Path(self.user_music_dir)
 
+    @property
+    def user_desktop_path(self) -> Path:
+        """:return: desktop path tied to the user"""
+        return Path(self.user_desktop_dir)
+
     @property
     def user_runtime_path(self) -> Path:
         """:return: runtime path tied to the user"""
         return Path(self.user_runtime_dir)
+
+    @property
+    def site_runtime_path(self) -> Path:
+        """:return: runtime path shared by users"""
+        return Path(self.site_runtime_dir)
+
+    def iter_config_dirs(self) -> Iterator[str]:
+        """:yield: all user and site configuration directories."""
+        yield self.user_config_dir
+        yield self.site_config_dir
+
+    def iter_data_dirs(self) -> Iterator[str]:
+        """:yield: all user and site data directories."""
+        yield self.user_data_dir
+        yield self.site_data_dir
+
+    def iter_cache_dirs(self) -> Iterator[str]:
+        """:yield: all user and site cache directories."""
+        yield self.user_cache_dir
+        yield self.site_cache_dir
+
+    def iter_runtime_dirs(self) -> Iterator[str]:
+        """:yield: all user and site runtime directories."""
+        yield self.user_runtime_dir
+        yield self.site_runtime_dir
+
+    def iter_config_paths(self) -> Iterator[Path]:
+        """:yield: all user and site configuration paths."""
+        for path in self.iter_config_dirs():
+            yield Path(path)
+
+    def iter_data_paths(self) -> Iterator[Path]:
+        """:yield: all user and site data paths."""
+        for path in self.iter_data_dirs():
+            yield Path(path)
+
+    def iter_cache_paths(self) -> Iterator[Path]:
+        """:yield: all user and site cache paths."""
+        for path in self.iter_cache_dirs():
+            yield Path(path)
+
+    def iter_runtime_paths(self) -> Iterator[Path]:
+        """:yield: all user and site runtime paths."""
+        for path in self.iter_runtime_dirs():
+            yield Path(path)
diff --git a/src/pip/_vendor/platformdirs/macos.py b/src/pip/_vendor/platformdirs/macos.py
index a753e2a3aa2..b7b48808ca7 100644
--- a/src/pip/_vendor/platformdirs/macos.py
+++ b/src/pip/_vendor/platformdirs/macos.py
@@ -1,7 +1,9 @@
 """macOS."""
+
 from __future__ import annotations
 
 import os.path
+import sys
 
 from .api import PlatformDirsABC
 
@@ -22,8 +24,20 @@ def user_data_dir(self) -> str:
 
     @property
     def site_data_dir(self) -> str:
-        """:return: data directory shared by users, e.g. ``/Library/Application Support/$appname/$version``"""
-        return self._append_app_name_and_version("/Library/Application Support")
+        """
+        :return: data directory shared by users, e.g. ``/Library/Application Support/$appname/$version``.
+          If we're using a Python binary managed by `Homebrew `_, the directory
+          will be under the Homebrew prefix, e.g. ``/opt/homebrew/share/$appname/$version``.
+          If `multipath ` is enabled and we're in Homebrew,
+          the response is a multi-path string separated by ":", e.g.
+          ``/opt/homebrew/share/$appname/$version:/Library/Application Support/$appname/$version``
+        """
+        is_homebrew = sys.prefix.startswith("/opt/homebrew")
+        path_list = [self._append_app_name_and_version("/opt/homebrew/share")] if is_homebrew else []
+        path_list.append(self._append_app_name_and_version("/Library/Application Support"))
+        if self.multipath:
+            return os.pathsep.join(path_list)
+        return path_list[0]
 
     @property
     def user_config_dir(self) -> str:
@@ -42,8 +56,20 @@ def user_cache_dir(self) -> str:
 
     @property
     def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, e.g. ``/Library/Caches/$appname/$version``"""
-        return self._append_app_name_and_version("/Library/Caches")
+        """
+        :return: cache directory shared by users, e.g. ``/Library/Caches/$appname/$version``.
+          If we're using a Python binary managed by `Homebrew `_, the directory
+          will be under the Homebrew prefix, e.g. ``/opt/homebrew/var/cache/$appname/$version``.
+          If `multipath ` is enabled and we're in Homebrew,
+          the response is a multi-path string separated by ":", e.g.
+          ``/opt/homebrew/var/cache/$appname/$version:/Library/Caches/$appname/$version``
+        """
+        is_homebrew = sys.prefix.startswith("/opt/homebrew")
+        path_list = [self._append_app_name_and_version("/opt/homebrew/var/cache")] if is_homebrew else []
+        path_list.append(self._append_app_name_and_version("/Library/Caches"))
+        if self.multipath:
+            return os.pathsep.join(path_list)
+        return path_list[0]
 
     @property
     def user_state_dir(self) -> str:
@@ -80,11 +106,21 @@ def user_music_dir(self) -> str:
         """:return: music directory tied to the user, e.g. ``~/Music``"""
         return os.path.expanduser("~/Music")  # noqa: PTH111
 
+    @property
+    def user_desktop_dir(self) -> str:
+        """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
+        return os.path.expanduser("~/Desktop")  # noqa: PTH111
+
     @property
     def user_runtime_dir(self) -> str:
         """:return: runtime directory tied to the user, e.g. ``~/Library/Caches/TemporaryItems/$appname/$version``"""
         return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches/TemporaryItems"))  # noqa: PTH111
 
+    @property
+    def site_runtime_dir(self) -> str:
+        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
+        return self.user_runtime_dir
+
 
 __all__ = [
     "MacOS",
diff --git a/src/pip/_vendor/platformdirs/unix.py b/src/pip/_vendor/platformdirs/unix.py
index 468b0ab4957..ca4728e6079 100644
--- a/src/pip/_vendor/platformdirs/unix.py
+++ b/src/pip/_vendor/platformdirs/unix.py
@@ -1,10 +1,12 @@
 """Unix."""
+
 from __future__ import annotations
 
 import os
 import sys
 from configparser import ConfigParser
 from pathlib import Path
+from typing import Iterator
 
 from .api import PlatformDirsABC
 
@@ -42,25 +44,25 @@ def user_data_dir(self) -> str:
             path = os.path.expanduser("~/.local/share")  # noqa: PTH111
         return self._append_app_name_and_version(path)
 
+    @property
+    def _site_data_dirs(self) -> list[str]:
+        path = os.environ.get("XDG_DATA_DIRS", "")
+        if not path.strip():
+            path = f"/usr/local/share{os.pathsep}/usr/share"
+        return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
+
     @property
     def site_data_dir(self) -> str:
         """
         :return: data directories shared by users (if `multipath ` is
-         enabled and ``XDG_DATA_DIR`` is set and a multi path the response is also a multi path separated by the OS
-         path separator), e.g. ``/usr/local/share/$appname/$version`` or ``/usr/share/$appname/$version``
+         enabled and ``XDG_DATA_DIRS`` is set and a multi path the response is also a multi path separated by the
+         OS path separator), e.g. ``/usr/local/share/$appname/$version`` or ``/usr/share/$appname/$version``
         """
         # XDG default for $XDG_DATA_DIRS; only first, if multipath is False
-        path = os.environ.get("XDG_DATA_DIRS", "")
-        if not path.strip():
-            path = f"/usr/local/share{os.pathsep}/usr/share"
-        return self._with_multi_path(path)
-
-    def _with_multi_path(self, path: str) -> str:
-        path_list = path.split(os.pathsep)
+        dirs = self._site_data_dirs
         if not self.multipath:
-            path_list = path_list[0:1]
-        path_list = [self._append_app_name_and_version(os.path.expanduser(p)) for p in path_list]  # noqa: PTH111
-        return os.pathsep.join(path_list)
+            return dirs[0]
+        return os.pathsep.join(dirs)
 
     @property
     def user_config_dir(self) -> str:
@@ -73,18 +75,25 @@ def user_config_dir(self) -> str:
             path = os.path.expanduser("~/.config")  # noqa: PTH111
         return self._append_app_name_and_version(path)
 
+    @property
+    def _site_config_dirs(self) -> list[str]:
+        path = os.environ.get("XDG_CONFIG_DIRS", "")
+        if not path.strip():
+            path = "/etc/xdg"
+        return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
+
     @property
     def site_config_dir(self) -> str:
         """
         :return: config directories shared by users (if `multipath `
-         is enabled and ``XDG_DATA_DIR`` is set and a multi path the response is also a multi path separated by the OS
-         path separator), e.g. ``/etc/xdg/$appname/$version``
+         is enabled and ``XDG_CONFIG_DIRS`` is set and a multi path the response is also a multi path separated by
+         the OS path separator), e.g. ``/etc/xdg/$appname/$version``
         """
         # XDG default for $XDG_CONFIG_DIRS only first, if multipath is False
-        path = os.environ.get("XDG_CONFIG_DIRS", "")
-        if not path.strip():
-            path = "/etc/xdg"
-        return self._with_multi_path(path)
+        dirs = self._site_config_dirs
+        if not self.multipath:
+            return dirs[0]
+        return os.pathsep.join(dirs)
 
     @property
     def user_cache_dir(self) -> str:
@@ -99,8 +108,8 @@ def user_cache_dir(self) -> str:
 
     @property
     def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, e.g. ``/var/tmp/$appname/$version``"""
-        return self._append_app_name_and_version("/var/tmp")  # noqa: S108
+        """:return: cache directory shared by users, e.g. ``/var/cache/$appname/$version``"""
+        return self._append_app_name_and_version("/var/cache")
 
     @property
     def user_state_dir(self) -> str:
@@ -119,6 +128,7 @@ def user_log_dir(self) -> str:
         path = self.user_state_dir
         if self.opinion:
             path = os.path.join(path, "log")  # noqa: PTH118
+            self._optionally_create_directory(path)
         return path
 
     @property
@@ -146,6 +156,11 @@ def user_music_dir(self) -> str:
         """:return: music directory tied to the user, e.g. ``~/Music``"""
         return _get_user_media_dir("XDG_MUSIC_DIR", "~/Music")
 
+    @property
+    def user_desktop_dir(self) -> str:
+        """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
+        return _get_user_media_dir("XDG_DESKTOP_DIR", "~/Desktop")
+
     @property
     def user_runtime_dir(self) -> str:
         """
@@ -166,6 +181,28 @@ def user_runtime_dir(self) -> str:
                 path = f"/run/user/{getuid()}"
         return self._append_app_name_and_version(path)
 
+    @property
+    def site_runtime_dir(self) -> str:
+        """
+        :return: runtime directory shared by users, e.g. ``/run/$appname/$version`` or \
+        ``$XDG_RUNTIME_DIR/$appname/$version``.
+
+        Note that this behaves almost exactly like `user_runtime_dir` if ``$XDG_RUNTIME_DIR`` is set, but will
+        fall back to paths associated to the root user instead of a regular logged-in user if it's not set.
+
+        If you wish to ensure that a logged-in root user path is returned e.g. ``/run/user/0``, use `user_runtime_dir`
+        instead.
+
+        For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/$appname/$version`` if ``$XDG_RUNTIME_DIR`` is not set.
+        """
+        path = os.environ.get("XDG_RUNTIME_DIR", "")
+        if not path.strip():
+            if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
+                path = "/var/run"
+            else:
+                path = "/run"
+        return self._append_app_name_and_version(path)
+
     @property
     def site_data_path(self) -> Path:
         """:return: data path shared by users. Only return first item, even if ``multipath`` is set to ``True``"""
@@ -187,6 +224,16 @@ def _first_item_as_path_if_multipath(self, directory: str) -> Path:
             directory = directory.split(os.pathsep)[0]
         return Path(directory)
 
+    def iter_config_dirs(self) -> Iterator[str]:
+        """:yield: all user and site configuration directories."""
+        yield self.user_config_dir
+        yield from self._site_config_dirs
+
+    def iter_data_dirs(self) -> Iterator[str]:
+        """:yield: all user and site data directories."""
+        yield self.user_data_dir
+        yield from self._site_data_dirs
+
 
 def _get_user_media_dir(env_var: str, fallback_tilde_path: str) -> str:
     media_dir = _get_user_dirs_folder(env_var)
diff --git a/src/pip/_vendor/platformdirs/version.py b/src/pip/_vendor/platformdirs/version.py
index dc8c44cf7b2..cc1e34568ad 100644
--- a/src/pip/_vendor/platformdirs/version.py
+++ b/src/pip/_vendor/platformdirs/version.py
@@ -1,4 +1,16 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '3.8.1'
-__version_tuple__ = version_tuple = (3, 8, 1)
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple, Union
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '4.2.0'
+__version_tuple__ = version_tuple = (4, 2, 0)
diff --git a/src/pip/_vendor/platformdirs/windows.py b/src/pip/_vendor/platformdirs/windows.py
index b52c9c6ea89..c62d0c8d2ba 100644
--- a/src/pip/_vendor/platformdirs/windows.py
+++ b/src/pip/_vendor/platformdirs/windows.py
@@ -1,4 +1,5 @@
 """Windows."""
+
 from __future__ import annotations
 
 import ctypes
@@ -122,6 +123,11 @@ def user_music_dir(self) -> str:
         """:return: music directory tied to the user e.g. ``%USERPROFILE%\\Music``"""
         return os.path.normpath(get_win_folder("CSIDL_MYMUSIC"))
 
+    @property
+    def user_desktop_dir(self) -> str:
+        """:return: desktop directory tied to the user, e.g. ``%USERPROFILE%\\Desktop``"""
+        return os.path.normpath(get_win_folder("CSIDL_DESKTOPDIRECTORY"))
+
     @property
     def user_runtime_dir(self) -> str:
         """
@@ -131,6 +137,11 @@ def user_runtime_dir(self) -> str:
         path = os.path.normpath(os.path.join(get_win_folder("CSIDL_LOCAL_APPDATA"), "Temp"))  # noqa: PTH118
         return self._append_parts(path)
 
+    @property
+    def site_runtime_dir(self) -> str:
+        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
+        return self.user_runtime_dir
+
 
 def get_win_folder_from_env_vars(csidl_name: str) -> str:
     """Get folder from environment variables."""
@@ -216,6 +227,7 @@ def get_win_folder_via_ctypes(csidl_name: str) -> str:
         "CSIDL_MYVIDEO": 14,
         "CSIDL_MYMUSIC": 13,
         "CSIDL_DOWNLOADS": 40,
+        "CSIDL_DESKTOPDIRECTORY": 16,
     }.get(csidl_name)
     if csidl_const is None:
         msg = f"Unknown CSIDL name: {csidl_name}"
@@ -225,7 +237,7 @@ def get_win_folder_via_ctypes(csidl_name: str) -> str:
     windll = getattr(ctypes, "windll")  # noqa: B009 # using getattr to avoid false positive with mypy type checker
     windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf)
 
-    # Downgrade to short path name if it has highbit chars.
+    # Downgrade to short path name if it has high-bit chars.
     if any(ord(c) > 255 for c in buf):  # noqa: PLR2004
         buf2 = ctypes.create_unicode_buffer(1024)
         if windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024):
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 468b556d675..91523045940 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -4,7 +4,7 @@ distlib==0.3.8
 distro==1.9.0
 msgpack==1.0.5
 packaging==21.3
-platformdirs==3.8.1
+platformdirs==4.2.0
 pyparsing==3.1.0
 pyproject-hooks==1.0.0
 requests==2.31.0

From f325211c4405d3875a8545b5211706ca0b659d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 18 Feb 2024 18:27:14 +0100
Subject: [PATCH 264/992] Upgrade typing_extensions to 4.9.0

---
 news/typing_extensions.vendor.rst    |   1 +
 src/pip/_vendor/typing_extensions.py | 759 +++++++++++++--------------
 src/pip/_vendor/vendor.txt           |   2 +-
 3 files changed, 372 insertions(+), 390 deletions(-)
 create mode 100644 news/typing_extensions.vendor.rst

diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
new file mode 100644
index 00000000000..d23d4bbced0
--- /dev/null
+++ b/news/typing_extensions.vendor.rst
@@ -0,0 +1 @@
+Upgrade typing_extensions to 4.9.0
diff --git a/src/pip/_vendor/typing_extensions.py b/src/pip/_vendor/typing_extensions.py
index 4f93acffbdc..351036faf7f 100644
--- a/src/pip/_vendor/typing_extensions.py
+++ b/src/pip/_vendor/typing_extensions.py
@@ -60,6 +60,7 @@
     'clear_overloads',
     'dataclass_transform',
     'deprecated',
+    'Doc',
     'get_overloads',
     'final',
     'get_args',
@@ -85,6 +86,7 @@
     'TYPE_CHECKING',
     'Never',
     'NoReturn',
+    'ReadOnly',
     'Required',
     'NotRequired',
 
@@ -248,32 +250,7 @@ def __repr__(self):
         return 'typing_extensions.' + self._name
 
 
-# On older versions of typing there is an internal class named "Final".
-# 3.8+
-if hasattr(typing, 'Final') and sys.version_info[:2] >= (3, 7):
-    Final = typing.Final
-# 3.7
-else:
-    class _FinalForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
-            return typing._GenericAlias(self, (item,))
-
-    Final = _FinalForm('Final',
-                       doc="""A special typing construct to indicate that a name
-                       cannot be re-assigned or overridden in a subclass.
-                       For example:
-
-                           MAX_SIZE: Final = 9000
-                           MAX_SIZE += 1  # Error reported by type checker
-
-                           class Connection:
-                               TIMEOUT: Final[int] = 10
-                           class FastConnector(Connection):
-                               TIMEOUT = 1  # Error reported by type checker
-
-                       There is no runtime checking of these properties.""")
+Final = typing.Final
 
 if sys.version_info >= (3, 11):
     final = typing.final
@@ -465,8 +442,6 @@ def clear_overloads():
 
 # Various ABCs mimicking those in collections.abc.
 # A few are simply re-exported for completeness.
-
-
 Awaitable = typing.Awaitable
 Coroutine = typing.Coroutine
 AsyncIterable = typing.AsyncIterable
@@ -475,14 +450,7 @@ def clear_overloads():
 ContextManager = typing.ContextManager
 AsyncContextManager = typing.AsyncContextManager
 DefaultDict = typing.DefaultDict
-
-# 3.7.2+
-if hasattr(typing, 'OrderedDict'):
-    OrderedDict = typing.OrderedDict
-# 3.7.0-3.7.2
-else:
-    OrderedDict = typing._alias(collections.OrderedDict, (KT, VT))
-
+OrderedDict = typing.OrderedDict
 Counter = typing.Counter
 ChainMap = typing.ChainMap
 AsyncGenerator = typing.AsyncGenerator
@@ -506,14 +474,9 @@ def clear_overloads():
     "__orig_bases__", "__module__", "_MutableMapping__marker", "__doc__",
     "__subclasshook__", "__orig_class__", "__init__", "__new__",
     "__protocol_attrs__", "__callable_proto_members_only__",
+    "__match_args__",
 }
 
-if sys.version_info < (3, 8):
-    _EXCLUDED_ATTRS |= {
-        "_gorg", "__next_in_mro__", "__extra__", "__tree_hash__", "__args__",
-        "__origin__"
-    }
-
 if sys.version_info >= (3, 9):
     _EXCLUDED_ATTRS.add("__class_getitem__")
 
@@ -535,46 +498,6 @@ def _get_protocol_attrs(cls):
     return attrs
 
 
-def _maybe_adjust_parameters(cls):
-    """Helper function used in Protocol.__init_subclass__ and _TypedDictMeta.__new__.
-
-    The contents of this function are very similar
-    to logic found in typing.Generic.__init_subclass__
-    on the CPython main branch.
-    """
-    tvars = []
-    if '__orig_bases__' in cls.__dict__:
-        tvars = _collect_type_vars(cls.__orig_bases__)
-        # Look for Generic[T1, ..., Tn] or Protocol[T1, ..., Tn].
-        # If found, tvars must be a subset of it.
-        # If not found, tvars is it.
-        # Also check for and reject plain Generic,
-        # and reject multiple Generic[...] and/or Protocol[...].
-        gvars = None
-        for base in cls.__orig_bases__:
-            if (isinstance(base, typing._GenericAlias) and
-                    base.__origin__ in (typing.Generic, Protocol)):
-                # for error messages
-                the_base = base.__origin__.__name__
-                if gvars is not None:
-                    raise TypeError(
-                        "Cannot inherit from Generic[...]"
-                        " and/or Protocol[...] multiple types.")
-                gvars = base.__parameters__
-        if gvars is None:
-            gvars = tvars
-        else:
-            tvarset = set(tvars)
-            gvarset = set(gvars)
-            if not tvarset <= gvarset:
-                s_vars = ', '.join(str(t) for t in tvars if t not in gvarset)
-                s_args = ', '.join(str(g) for g in gvars)
-                raise TypeError(f"Some type variables ({s_vars}) are"
-                                f" not listed in {the_base}[{s_args}]")
-            tvars = gvars
-    cls.__parameters__ = tuple(tvars)
-
-
 def _caller(depth=2):
     try:
         return sys._getframe(depth).f_globals.get('__name__', '__main__')
@@ -582,9 +505,9 @@ def _caller(depth=2):
         return None
 
 
-# The performance of runtime-checkable protocols is significantly improved on Python 3.12,
-# so we backport the 3.12 version of Protocol to Python <=3.11
-if sys.version_info >= (3, 12):
+# `__match_args__` attribute was removed from protocol members in 3.13,
+# we want to backport this change to older Python versions.
+if sys.version_info >= (3, 13):
     Protocol = typing.Protocol
 else:
     def _allow_reckless_class_checks(depth=3):
@@ -598,17 +521,10 @@ def _no_init(self, *args, **kwargs):
         if type(self)._is_protocol:
             raise TypeError('Protocols cannot be instantiated')
 
-    if sys.version_info >= (3, 8):
-        # Inheriting from typing._ProtocolMeta isn't actually desirable,
-        # but is necessary to allow typing.Protocol and typing_extensions.Protocol
-        # to mix without getting TypeErrors about "metaclass conflict"
-        _typing_Protocol = typing.Protocol
-        _ProtocolMetaBase = type(_typing_Protocol)
-    else:
-        _typing_Protocol = _marker
-        _ProtocolMetaBase = abc.ABCMeta
-
-    class _ProtocolMeta(_ProtocolMetaBase):
+    # Inheriting from typing._ProtocolMeta isn't actually desirable,
+    # but is necessary to allow typing.Protocol and typing_extensions.Protocol
+    # to mix without getting TypeErrors about "metaclass conflict"
+    class _ProtocolMeta(type(typing.Protocol)):
         # This metaclass is somewhat unfortunate,
         # but is necessary for several reasons...
         #
@@ -618,10 +534,10 @@ class _ProtocolMeta(_ProtocolMetaBase):
         def __new__(mcls, name, bases, namespace, **kwargs):
             if name == "Protocol" and len(bases) < 2:
                 pass
-            elif {Protocol, _typing_Protocol} & set(bases):
+            elif {Protocol, typing.Protocol} & set(bases):
                 for base in bases:
                     if not (
-                        base in {object, typing.Generic, Protocol, _typing_Protocol}
+                        base in {object, typing.Generic, Protocol, typing.Protocol}
                         or base.__name__ in _PROTO_ALLOWLIST.get(base.__module__, [])
                         or is_protocol(base)
                     ):
@@ -655,8 +571,13 @@ def __subclasscheck__(cls, other):
                     not cls.__callable_proto_members_only__
                     and cls.__dict__.get("__subclasshook__") is _proto_hook
                 ):
+                    non_method_attrs = sorted(
+                        attr for attr in cls.__protocol_attrs__
+                        if not callable(getattr(cls, attr, None))
+                    )
                     raise TypeError(
-                        "Protocols with non-method members don't support issubclass()"
+                        "Protocols with non-method members don't support issubclass()."
+                        f" Non-method members: {str(non_method_attrs)[1:-1]}."
                     )
                 if not getattr(cls, '_is_runtime_protocol', False):
                     raise TypeError(
@@ -699,12 +620,10 @@ def __instancecheck__(cls, instance):
         def __eq__(cls, other):
             # Hack so that typing.Generic.__class_getitem__
             # treats typing_extensions.Protocol
-            # as equivalent to typing.Protocol on Python 3.8+
+            # as equivalent to typing.Protocol
             if abc.ABCMeta.__eq__(cls, other) is True:
                 return True
-            return (
-                cls is Protocol and other is getattr(typing, "Protocol", object())
-            )
+            return cls is Protocol and other is typing.Protocol
 
         # This has to be defined, or the abc-module cache
         # complains about classes with this metaclass being unhashable,
@@ -737,146 +656,33 @@ def _proto_hook(cls, other):
                 return NotImplemented
         return True
 
-    if sys.version_info >= (3, 8):
-        class Protocol(typing.Generic, metaclass=_ProtocolMeta):
-            __doc__ = typing.Protocol.__doc__
-            __slots__ = ()
-            _is_protocol = True
-            _is_runtime_protocol = False
-
-            def __init_subclass__(cls, *args, **kwargs):
-                super().__init_subclass__(*args, **kwargs)
-
-                # Determine if this is a protocol or a concrete subclass.
-                if not cls.__dict__.get('_is_protocol', False):
-                    cls._is_protocol = any(b is Protocol for b in cls.__bases__)
-
-                # Set (or override) the protocol subclass hook.
-                if '__subclasshook__' not in cls.__dict__:
-                    cls.__subclasshook__ = _proto_hook
-
-                # Prohibit instantiation for protocol classes
-                if cls._is_protocol and cls.__init__ is Protocol.__init__:
-                    cls.__init__ = _no_init
-
-    else:
-        class Protocol(metaclass=_ProtocolMeta):
-            # There is quite a lot of overlapping code with typing.Generic.
-            # Unfortunately it is hard to avoid this on Python <3.8,
-            # as the typing module on Python 3.7 doesn't let us subclass typing.Generic!
-            """Base class for protocol classes. Protocol classes are defined as::
-
-                class Proto(Protocol):
-                    def meth(self) -> int:
-                        ...
-
-            Such classes are primarily used with static type checkers that recognize
-            structural subtyping (static duck-typing), for example::
-
-                class C:
-                    def meth(self) -> int:
-                        return 0
-
-                def func(x: Proto) -> int:
-                    return x.meth()
-
-                func(C())  # Passes static type check
-
-            See PEP 544 for details. Protocol classes decorated with
-            @typing_extensions.runtime_checkable act
-            as simple-minded runtime-checkable protocols that check
-            only the presence of given attributes, ignoring their type signatures.
-
-            Protocol classes can be generic, they are defined as::
-
-                class GenProto(Protocol[T]):
-                    def meth(self) -> T:
-                        ...
-            """
-            __slots__ = ()
-            _is_protocol = True
-            _is_runtime_protocol = False
-
-            def __new__(cls, *args, **kwds):
-                if cls is Protocol:
-                    raise TypeError("Type Protocol cannot be instantiated; "
-                                    "it can only be used as a base class")
-                return super().__new__(cls)
-
-            @typing._tp_cache
-            def __class_getitem__(cls, params):
-                if not isinstance(params, tuple):
-                    params = (params,)
-                if not params and cls is not typing.Tuple:
-                    raise TypeError(
-                        f"Parameter list to {cls.__qualname__}[...] cannot be empty")
-                msg = "Parameters to generic types must be types."
-                params = tuple(typing._type_check(p, msg) for p in params)
-                if cls is Protocol:
-                    # Generic can only be subscripted with unique type variables.
-                    if not all(isinstance(p, typing.TypeVar) for p in params):
-                        i = 0
-                        while isinstance(params[i], typing.TypeVar):
-                            i += 1
-                        raise TypeError(
-                            "Parameters to Protocol[...] must all be type variables."
-                            f" Parameter {i + 1} is {params[i]}")
-                    if len(set(params)) != len(params):
-                        raise TypeError(
-                            "Parameters to Protocol[...] must all be unique")
-                else:
-                    # Subscripting a regular Generic subclass.
-                    _check_generic(cls, params, len(cls.__parameters__))
-                return typing._GenericAlias(cls, params)
-
-            def __init_subclass__(cls, *args, **kwargs):
-                if '__orig_bases__' in cls.__dict__:
-                    error = typing.Generic in cls.__orig_bases__
-                else:
-                    error = typing.Generic in cls.__bases__
-                if error:
-                    raise TypeError("Cannot inherit from plain Generic")
-                _maybe_adjust_parameters(cls)
-
-                # Determine if this is a protocol or a concrete subclass.
-                if not cls.__dict__.get('_is_protocol', None):
-                    cls._is_protocol = any(b is Protocol for b in cls.__bases__)
-
-                # Set (or override) the protocol subclass hook.
-                if '__subclasshook__' not in cls.__dict__:
-                    cls.__subclasshook__ = _proto_hook
+    class Protocol(typing.Generic, metaclass=_ProtocolMeta):
+        __doc__ = typing.Protocol.__doc__
+        __slots__ = ()
+        _is_protocol = True
+        _is_runtime_protocol = False
 
-                # Prohibit instantiation for protocol classes
-                if cls._is_protocol and cls.__init__ is Protocol.__init__:
-                    cls.__init__ = _no_init
+        def __init_subclass__(cls, *args, **kwargs):
+            super().__init_subclass__(*args, **kwargs)
 
+            # Determine if this is a protocol or a concrete subclass.
+            if not cls.__dict__.get('_is_protocol', False):
+                cls._is_protocol = any(b is Protocol for b in cls.__bases__)
 
-if sys.version_info >= (3, 8):
-    runtime_checkable = typing.runtime_checkable
-else:
-    def runtime_checkable(cls):
-        """Mark a protocol class as a runtime protocol, so that it
-        can be used with isinstance() and issubclass(). Raise TypeError
-        if applied to a non-protocol class.
+            # Set (or override) the protocol subclass hook.
+            if '__subclasshook__' not in cls.__dict__:
+                cls.__subclasshook__ = _proto_hook
 
-        This allows a simple-minded structural check very similar to the
-        one-offs in collections.abc such as Hashable.
-        """
-        if not (
-            (isinstance(cls, _ProtocolMeta) or issubclass(cls, typing.Generic))
-            and getattr(cls, "_is_protocol", False)
-        ):
-            raise TypeError('@runtime_checkable can be only applied to protocol classes,'
-                            f' got {cls!r}')
-        cls._is_runtime_protocol = True
-        return cls
+            # Prohibit instantiation for protocol classes
+            if cls._is_protocol and cls.__init__ is Protocol.__init__:
+                cls.__init__ = _no_init
 
 
-# Exists for backwards compatibility.
-runtime = runtime_checkable
+# The "runtime" alias exists for backwards compatibility.
+runtime = runtime_checkable = typing.runtime_checkable
 
 
-# Our version of runtime-checkable protocols is faster on Python 3.7-3.11
+# Our version of runtime-checkable protocols is faster on Python 3.8-3.11
 if sys.version_info >= (3, 12):
     SupportsInt = typing.SupportsInt
     SupportsFloat = typing.SupportsFloat
@@ -968,7 +774,7 @@ def inner(func):
     return inner
 
 
-if sys.version_info >= (3, 13):
+if hasattr(typing, "ReadOnly"):
     # The standard library TypedDict in Python 3.8 does not store runtime information
     # about which (if any) keys are optional.  See https://bugs.python.org/issue38834
     # The standard library TypedDict in Python 3.9.0/1 does not honour the "total"
@@ -979,6 +785,7 @@ def inner(func):
     # Aaaand on 3.12 we add __orig_bases__ to TypedDict
     # to enable better runtime introspection.
     # On 3.13 we deprecate some odd ways of creating TypedDicts.
+    # PEP 705 proposes adding the ReadOnly[] qualifier.
     TypedDict = typing.TypedDict
     _TypedDictMeta = typing._TypedDictMeta
     is_typeddict = typing.is_typeddict
@@ -986,13 +793,29 @@ def inner(func):
     # 3.10.0 and later
     _TAKES_MODULE = "module" in inspect.signature(typing._type_check).parameters
 
-    if sys.version_info >= (3, 8):
-        _fake_name = "Protocol"
-    else:
-        _fake_name = "_Protocol"
+    def _get_typeddict_qualifiers(annotation_type):
+        while True:
+            annotation_origin = get_origin(annotation_type)
+            if annotation_origin is Annotated:
+                annotation_args = get_args(annotation_type)
+                if annotation_args:
+                    annotation_type = annotation_args[0]
+                else:
+                    break
+            elif annotation_origin is Required:
+                yield Required
+                annotation_type, = get_args(annotation_type)
+            elif annotation_origin is NotRequired:
+                yield NotRequired
+                annotation_type, = get_args(annotation_type)
+            elif annotation_origin is ReadOnly:
+                yield ReadOnly
+                annotation_type, = get_args(annotation_type)
+            else:
+                break
 
     class _TypedDictMeta(type):
-        def __new__(cls, name, bases, ns, total=True):
+        def __new__(cls, name, bases, ns, *, total=True):
             """Create new typed dict class object.
 
             This method is called when TypedDict is subclassed,
@@ -1011,10 +834,10 @@ def __new__(cls, name, bases, ns, total=True):
                 generic_base = ()
 
             # typing.py generally doesn't let you inherit from plain Generic, unless
-            # the name of the class happens to be "Protocol" (or "_Protocol" on 3.7).
-            tp_dict = type.__new__(_TypedDictMeta, _fake_name, (*generic_base, dict), ns)
+            # the name of the class happens to be "Protocol"
+            tp_dict = type.__new__(_TypedDictMeta, "Protocol", (*generic_base, dict), ns)
             tp_dict.__name__ = name
-            if tp_dict.__qualname__ == _fake_name:
+            if tp_dict.__qualname__ == "Protocol":
                 tp_dict.__qualname__ = name
 
             if not hasattr(tp_dict, '__orig_bases__'):
@@ -1035,33 +858,46 @@ def __new__(cls, name, bases, ns, total=True):
                 }
             required_keys = set()
             optional_keys = set()
+            readonly_keys = set()
+            mutable_keys = set()
 
             for base in bases:
-                annotations.update(base.__dict__.get('__annotations__', {}))
-                required_keys.update(base.__dict__.get('__required_keys__', ()))
-                optional_keys.update(base.__dict__.get('__optional_keys__', ()))
+                base_dict = base.__dict__
+
+                annotations.update(base_dict.get('__annotations__', {}))
+                required_keys.update(base_dict.get('__required_keys__', ()))
+                optional_keys.update(base_dict.get('__optional_keys__', ()))
+                readonly_keys.update(base_dict.get('__readonly_keys__', ()))
+                mutable_keys.update(base_dict.get('__mutable_keys__', ()))
 
             annotations.update(own_annotations)
             for annotation_key, annotation_type in own_annotations.items():
-                annotation_origin = get_origin(annotation_type)
-                if annotation_origin is Annotated:
-                    annotation_args = get_args(annotation_type)
-                    if annotation_args:
-                        annotation_type = annotation_args[0]
-                        annotation_origin = get_origin(annotation_type)
-
-                if annotation_origin is Required:
+                qualifiers = set(_get_typeddict_qualifiers(annotation_type))
+
+                if Required in qualifiers:
                     required_keys.add(annotation_key)
-                elif annotation_origin is NotRequired:
+                elif NotRequired in qualifiers:
                     optional_keys.add(annotation_key)
                 elif total:
                     required_keys.add(annotation_key)
                 else:
                     optional_keys.add(annotation_key)
+                if ReadOnly in qualifiers:
+                    if annotation_key in mutable_keys:
+                        raise TypeError(
+                            f"Cannot override mutable key {annotation_key!r}"
+                            " with read-only key"
+                        )
+                    readonly_keys.add(annotation_key)
+                else:
+                    mutable_keys.add(annotation_key)
+                    readonly_keys.discard(annotation_key)
 
             tp_dict.__annotations__ = annotations
             tp_dict.__required_keys__ = frozenset(required_keys)
             tp_dict.__optional_keys__ = frozenset(optional_keys)
+            tp_dict.__readonly_keys__ = frozenset(readonly_keys)
+            tp_dict.__mutable_keys__ = frozenset(mutable_keys)
             if not hasattr(tp_dict, '__total__'):
                 tp_dict.__total__ = total
             return tp_dict
@@ -1077,7 +913,7 @@ def __subclasscheck__(cls, other):
     _TypedDict = type.__new__(_TypedDictMeta, 'TypedDict', (), {})
 
     @_ensure_subclassable(lambda bases: (_TypedDict,))
-    def TypedDict(__typename, __fields=_marker, *, total=True, **kwargs):
+    def TypedDict(typename, fields=_marker, /, *, total=True, **kwargs):
         """A simple typed namespace. At runtime it is equivalent to a plain dict.
 
         TypedDict creates a dictionary type such that a type checker will expect all
@@ -1124,24 +960,26 @@ class Point2D(TypedDict):
 
         See PEP 655 for more details on Required and NotRequired.
         """
-        if __fields is _marker or __fields is None:
-            if __fields is _marker:
+        if fields is _marker or fields is None:
+            if fields is _marker:
                 deprecated_thing = "Failing to pass a value for the 'fields' parameter"
             else:
                 deprecated_thing = "Passing `None` as the 'fields' parameter"
 
-            example = f"`{__typename} = TypedDict({__typename!r}, {{}})`"
+            example = f"`{typename} = TypedDict({typename!r}, {{}})`"
             deprecation_msg = (
                 f"{deprecated_thing} is deprecated and will be disallowed in "
                 "Python 3.15. To create a TypedDict class with 0 fields "
                 "using the functional syntax, pass an empty dictionary, e.g. "
             ) + example + "."
             warnings.warn(deprecation_msg, DeprecationWarning, stacklevel=2)
-            __fields = kwargs
+            fields = kwargs
         elif kwargs:
             raise TypeError("TypedDict takes either a dict or keyword arguments,"
                             " but not both")
         if kwargs:
+            if sys.version_info >= (3, 13):
+                raise TypeError("TypedDict takes no keyword arguments")
             warnings.warn(
                 "The kwargs-based syntax for TypedDict definitions is deprecated "
                 "in Python 3.11, will be removed in Python 3.13, and may not be "
@@ -1150,13 +988,13 @@ class Point2D(TypedDict):
                 stacklevel=2,
             )
 
-        ns = {'__annotations__': dict(__fields)}
+        ns = {'__annotations__': dict(fields)}
         module = _caller()
         if module is not None:
             # Setting correct module is necessary to make typed dict classes pickleable.
             ns['__module__'] = module
 
-        td = _TypedDictMeta(__typename, (), ns, total=total)
+        td = _TypedDictMeta(typename, (), ns, total=total)
         td.__orig_bases__ = (TypedDict,)
         return td
 
@@ -1186,7 +1024,7 @@ class Film(TypedDict):
     assert_type = typing.assert_type
 
 else:
-    def assert_type(__val, __typ):
+    def assert_type(val, typ, /):
         """Assert (to the type checker) that the value is of the given type.
 
         When the type checker encounters a call to assert_type(), it
@@ -1199,12 +1037,12 @@ def greet(name: str) -> None:
         At runtime this returns the first argument unchanged and otherwise
         does nothing.
         """
-        return __val
+        return val
 
 
-if hasattr(typing, "Required"):
+if hasattr(typing, "Required"):  # 3.11+
     get_type_hints = typing.get_type_hints
-else:
+else:  # <=3.10
     # replaces _strip_annotations()
     def _strip_extras(t):
         """Strips Annotated, Required and NotRequired from a given type."""
@@ -1262,11 +1100,11 @@ def get_type_hints(obj, globalns=None, localns=None, include_extras=False):
         - If two dict arguments are passed, they specify globals and
           locals, respectively.
         """
-        if hasattr(typing, "Annotated"):
+        if hasattr(typing, "Annotated"):  # 3.9+
             hint = typing.get_type_hints(
                 obj, globalns=globalns, localns=localns, include_extras=True
             )
-        else:
+        else:  # 3.8
             hint = typing.get_type_hints(obj, globalns=globalns, localns=localns)
         if include_extras:
             return hint
@@ -1279,7 +1117,7 @@ def get_type_hints(obj, globalns=None, localns=None, include_extras=False):
     # Not exported and not a public API, but needed for get_origin() and get_args()
     # to work.
     _AnnotatedAlias = typing._AnnotatedAlias
-# 3.7-3.8
+# 3.8
 else:
     class _AnnotatedAlias(typing._GenericAlias, _root=True):
         """Runtime representation of an annotated type.
@@ -1384,7 +1222,7 @@ def __init_subclass__(cls, *args, **kwargs):
 if sys.version_info[:2] >= (3, 10):
     get_origin = typing.get_origin
     get_args = typing.get_args
-# 3.7-3.9
+# 3.8-3.9
 else:
     try:
         # 3.9+
@@ -1462,7 +1300,7 @@ def TypeAlias(self, parameters):
         It's invalid when used anywhere except as in the example above.
         """
         raise TypeError(f"{self} is not subscriptable")
-# 3.7-3.8
+# 3.8
 else:
     TypeAlias = _ExtensionsSpecialForm(
         'TypeAlias',
@@ -1484,7 +1322,10 @@ def _set_default(type_param, default):
         type_param.__default__ = tuple((typing._type_check(d, "Default must be a type")
                                         for d in default))
     elif default != _marker:
-        type_param.__default__ = typing._type_check(default, "Default must be a type")
+        if isinstance(type_param, ParamSpec) and default is ...:  # ... not valid <3.11
+            type_param.__default__ = default
+        else:
+            type_param.__default__ = typing._type_check(default, "Default must be a type")
     else:
         type_param.__default__ = None
 
@@ -1519,7 +1360,7 @@ def __new__(cls, name, *constraints, bound=None,
                 covariant=False, contravariant=False,
                 default=_marker, infer_variance=False):
         if hasattr(typing, "TypeAliasType"):
-            # PEP 695 implemented, can pass infer_variance to typing.TypeVar
+            # PEP 695 implemented (3.12+), can pass infer_variance to typing.TypeVar
             typevar = typing.TypeVar(name, *constraints, bound=bound,
                                      covariant=covariant, contravariant=contravariant,
                                      infer_variance=infer_variance)
@@ -1541,7 +1382,7 @@ def __init_subclass__(cls) -> None:
 if hasattr(typing, 'ParamSpecArgs'):
     ParamSpecArgs = typing.ParamSpecArgs
     ParamSpecKwargs = typing.ParamSpecKwargs
-# 3.7-3.9
+# 3.8-3.9
 else:
     class _Immutable:
         """Mixin to indicate that object should not be copied."""
@@ -1630,7 +1471,7 @@ def __new__(cls, name, *, bound=None,
         def __init_subclass__(cls) -> None:
             raise TypeError(f"type '{__name__}.ParamSpec' is not an acceptable base type")
 
-# 3.7-3.9
+# 3.8-3.9
 else:
 
     # Inherits from list as a workaround for Callable checks in Python < 3.9.2.
@@ -1735,7 +1576,7 @@ def __call__(self, *args, **kwargs):
             pass
 
 
-# 3.7-3.9
+# 3.8-3.9
 if not hasattr(typing, 'Concatenate'):
     # Inherits from list as a workaround for Callable checks in Python < 3.9.2.
     class _ConcatenateGenericAlias(list):
@@ -1770,7 +1611,7 @@ def __parameters__(self):
             )
 
 
-# 3.7-3.9
+# 3.8-3.9
 @typing._tp_cache
 def _concatenate_getitem(self, parameters):
     if parameters == ():
@@ -1804,7 +1645,7 @@ def Concatenate(self, parameters):
         See PEP 612 for detailed information.
         """
         return _concatenate_getitem(self, parameters)
-# 3.7-8
+# 3.8
 else:
     class _ConcatenateForm(_ExtensionsSpecialForm, _root=True):
         def __getitem__(self, parameters):
@@ -1874,7 +1715,7 @@ def is_str(val: Union[str, float]):
         """
         item = typing._type_check(parameters, f'{self} accepts only a single type.')
         return typing._GenericAlias(self, (item,))
-# 3.7-3.8
+# 3.8
 else:
     class _TypeGuardForm(_ExtensionsSpecialForm, _root=True):
         def __getitem__(self, parameters):
@@ -1972,7 +1813,7 @@ def __getitem__(self, parameters):
         return self._getitem(self, parameters)
 
 
-if hasattr(typing, "LiteralString"):
+if hasattr(typing, "LiteralString"):  # 3.11+
     LiteralString = typing.LiteralString
 else:
     @_SpecialForm
@@ -1995,7 +1836,7 @@ def query(sql: LiteralString) -> ...:
         raise TypeError(f"{self} is not subscriptable")
 
 
-if hasattr(typing, "Self"):
+if hasattr(typing, "Self"):  # 3.11+
     Self = typing.Self
 else:
     @_SpecialForm
@@ -2016,7 +1857,7 @@ def parse(self, data: bytes) -> Self:
         raise TypeError(f"{self} is not subscriptable")
 
 
-if hasattr(typing, "Never"):
+if hasattr(typing, "Never"):  # 3.11+
     Never = typing.Never
 else:
     @_SpecialForm
@@ -2046,10 +1887,10 @@ def int_or_str(arg: int | str) -> None:
         raise TypeError(f"{self} is not subscriptable")
 
 
-if hasattr(typing, 'Required'):
+if hasattr(typing, 'Required'):  # 3.11+
     Required = typing.Required
     NotRequired = typing.NotRequired
-elif sys.version_info[:2] >= (3, 9):
+elif sys.version_info[:2] >= (3, 9):  # 3.9-3.10
     @_ExtensionsSpecialForm
     def Required(self, parameters):
         """A special typing construct to mark a key of a total=False TypedDict
@@ -2087,7 +1928,7 @@ class Movie(TypedDict):
         item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
         return typing._GenericAlias(self, (item,))
 
-else:
+else:  # 3.8
     class _RequiredForm(_ExtensionsSpecialForm, _root=True):
         def __getitem__(self, parameters):
             item = typing._type_check(parameters,
@@ -2127,6 +1968,53 @@ class Movie(TypedDict):
         """)
 
 
+if hasattr(typing, 'ReadOnly'):
+    ReadOnly = typing.ReadOnly
+elif sys.version_info[:2] >= (3, 9):  # 3.9-3.12
+    @_ExtensionsSpecialForm
+    def ReadOnly(self, parameters):
+        """A special typing construct to mark an item of a TypedDict as read-only.
+
+        For example:
+
+            class Movie(TypedDict):
+                title: ReadOnly[str]
+                year: int
+
+            def mutate_movie(m: Movie) -> None:
+                m["year"] = 1992  # allowed
+                m["title"] = "The Matrix"  # typechecker error
+
+        There is no runtime checking for this property.
+        """
+        item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
+        return typing._GenericAlias(self, (item,))
+
+else:  # 3.8
+    class _ReadOnlyForm(_ExtensionsSpecialForm, _root=True):
+        def __getitem__(self, parameters):
+            item = typing._type_check(parameters,
+                                      f'{self._name} accepts only a single type.')
+            return typing._GenericAlias(self, (item,))
+
+    ReadOnly = _ReadOnlyForm(
+        'ReadOnly',
+        doc="""A special typing construct to mark a key of a TypedDict as read-only.
+
+        For example:
+
+            class Movie(TypedDict):
+                title: ReadOnly[str]
+                year: int
+
+            def mutate_movie(m: Movie) -> None:
+                m["year"] = 1992  # allowed
+                m["title"] = "The Matrix"  # typechecker error
+
+        There is no runtime checking for this propery.
+        """)
+
+
 _UNPACK_DOC = """\
 Type unpack operator.
 
@@ -2175,7 +2063,7 @@ def foo(**kwargs: Unpack[Movie]): ...
     def _is_unpack(obj):
         return get_origin(obj) is Unpack
 
-elif sys.version_info[:2] >= (3, 9):
+elif sys.version_info[:2] >= (3, 9):  # 3.9+
     class _UnpackSpecialForm(_ExtensionsSpecialForm, _root=True):
         def __init__(self, getitem):
             super().__init__(getitem)
@@ -2192,7 +2080,7 @@ def Unpack(self, parameters):
     def _is_unpack(obj):
         return isinstance(obj, _UnpackAlias)
 
-else:
+else:  # 3.8
     class _UnpackAlias(typing._GenericAlias, _root=True):
         __class__ = typing.TypeVar
 
@@ -2225,7 +2113,7 @@ def __new__(cls, name, *, default=_marker):
         def __init_subclass__(self, *args, **kwds):
             raise TypeError("Cannot subclass special typing classes")
 
-else:
+else:  # <=3.10
     class TypeVarTuple(_DefaultMixin):
         """Type variable tuple.
 
@@ -2304,10 +2192,10 @@ def __init_subclass__(self, *args, **kwds):
                 raise TypeError("Cannot subclass special typing classes")
 
 
-if hasattr(typing, "reveal_type"):
+if hasattr(typing, "reveal_type"):  # 3.11+
     reveal_type = typing.reveal_type
-else:
-    def reveal_type(__obj: T) -> T:
+else:  # <=3.10
+    def reveal_type(obj: T, /) -> T:
         """Reveal the inferred type of a variable.
 
         When a static type checker encounters a call to ``reveal_type()``,
@@ -2323,14 +2211,14 @@ def reveal_type(__obj: T) -> T:
         argument and returns it unchanged.
 
         """
-        print(f"Runtime type is {type(__obj).__name__!r}", file=sys.stderr)
-        return __obj
+        print(f"Runtime type is {type(obj).__name__!r}", file=sys.stderr)
+        return obj
 
 
-if hasattr(typing, "assert_never"):
+if hasattr(typing, "assert_never"):  # 3.11+
     assert_never = typing.assert_never
-else:
-    def assert_never(__arg: Never) -> Never:
+else:  # <=3.10
+    def assert_never(arg: Never, /) -> Never:
         """Assert to the type checker that a line of code is unreachable.
 
         Example::
@@ -2353,10 +2241,10 @@ def int_or_str(arg: int | str) -> None:
         raise AssertionError("Expected code to be unreachable")
 
 
-if sys.version_info >= (3, 12):
+if sys.version_info >= (3, 12):  # 3.12+
     # dataclass_transform exists in 3.11 but lacks the frozen_default parameter
     dataclass_transform = typing.dataclass_transform
-else:
+else:  # <=3.11
     def dataclass_transform(
         *,
         eq_default: bool = True,
@@ -2443,18 +2331,18 @@ def decorator(cls_or_fn):
         return decorator
 
 
-if hasattr(typing, "override"):
+if hasattr(typing, "override"):  # 3.12+
     override = typing.override
-else:
+else:  # <=3.11
     _F = typing.TypeVar("_F", bound=typing.Callable[..., typing.Any])
 
-    def override(__arg: _F) -> _F:
+    def override(arg: _F, /) -> _F:
         """Indicate that a method is intended to override a method in a base class.
 
         Usage:
 
             class Base:
-                def method(self) -> None: ...
+                def method(self) -> None:
                     pass
 
             class Child(Base):
@@ -2475,28 +2363,26 @@ def method(self) -> None:
 
         """
         try:
-            __arg.__override__ = True
+            arg.__override__ = True
         except (AttributeError, TypeError):
             # Skip the attribute silently if it is not writable.
             # AttributeError happens if the object has __slots__ or a
             # read-only property, TypeError if it's a builtin class.
             pass
-        return __arg
+        return arg
 
 
-if hasattr(typing, "deprecated"):
-    deprecated = typing.deprecated
+if hasattr(warnings, "deprecated"):
+    deprecated = warnings.deprecated
 else:
     _T = typing.TypeVar("_T")
 
-    def deprecated(
-        __msg: str,
-        *,
-        category: typing.Optional[typing.Type[Warning]] = DeprecationWarning,
-        stacklevel: int = 1,
-    ) -> typing.Callable[[_T], _T]:
+    class deprecated:
         """Indicate that a class, function or overload is deprecated.
 
+        When this decorator is applied to an object, the type checker
+        will generate a diagnostic on usage of the deprecated object.
+
         Usage:
 
             @deprecated("Use B instead")
@@ -2513,64 +2399,113 @@ def g(x: int) -> int: ...
             @overload
             def g(x: str) -> int: ...
 
-        When this decorator is applied to an object, the type checker
-        will generate a diagnostic on usage of the deprecated object.
-
-        The warning specified by ``category`` will be emitted on use
-        of deprecated objects. For functions, that happens on calls;
-        for classes, on instantiation. If the ``category`` is ``None``,
-        no warning is emitted. The ``stacklevel`` determines where the
+        The warning specified by *category* will be emitted at runtime
+        on use of deprecated objects. For functions, that happens on calls;
+        for classes, on instantiation and on creation of subclasses.
+        If the *category* is ``None``, no warning is emitted at runtime.
+        The *stacklevel* determines where the
         warning is emitted. If it is ``1`` (the default), the warning
         is emitted at the direct caller of the deprecated object; if it
         is higher, it is emitted further up the stack.
+        Static type checker behavior is not affected by the *category*
+        and *stacklevel* arguments.
 
-        The decorator sets the ``__deprecated__``
-        attribute on the decorated object to the deprecation message
-        passed to the decorator. If applied to an overload, the decorator
+        The deprecation message passed to the decorator is saved in the
+        ``__deprecated__`` attribute on the decorated object.
+        If applied to an overload, the decorator
         must be after the ``@overload`` decorator for the attribute to
         exist on the overload as returned by ``get_overloads()``.
 
         See PEP 702 for details.
 
         """
-        def decorator(__arg: _T) -> _T:
+        def __init__(
+            self,
+            message: str,
+            /,
+            *,
+            category: typing.Optional[typing.Type[Warning]] = DeprecationWarning,
+            stacklevel: int = 1,
+        ) -> None:
+            if not isinstance(message, str):
+                raise TypeError(
+                    "Expected an object of type str for 'message', not "
+                    f"{type(message).__name__!r}"
+                )
+            self.message = message
+            self.category = category
+            self.stacklevel = stacklevel
+
+        def __call__(self, arg: _T, /) -> _T:
+            # Make sure the inner functions created below don't
+            # retain a reference to self.
+            msg = self.message
+            category = self.category
+            stacklevel = self.stacklevel
             if category is None:
-                __arg.__deprecated__ = __msg
-                return __arg
-            elif isinstance(__arg, type):
-                original_new = __arg.__new__
-                has_init = __arg.__init__ is not object.__init__
+                arg.__deprecated__ = msg
+                return arg
+            elif isinstance(arg, type):
+                import functools
+                from types import MethodType
+
+                original_new = arg.__new__
 
                 @functools.wraps(original_new)
                 def __new__(cls, *args, **kwargs):
-                    warnings.warn(__msg, category=category, stacklevel=stacklevel + 1)
+                    if cls is arg:
+                        warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
                     if original_new is not object.__new__:
                         return original_new(cls, *args, **kwargs)
                     # Mirrors a similar check in object.__new__.
-                    elif not has_init and (args or kwargs):
+                    elif cls.__init__ is object.__init__ and (args or kwargs):
                         raise TypeError(f"{cls.__name__}() takes no arguments")
                     else:
                         return original_new(cls)
 
-                __arg.__new__ = staticmethod(__new__)
-                __arg.__deprecated__ = __new__.__deprecated__ = __msg
-                return __arg
-            elif callable(__arg):
-                @functools.wraps(__arg)
+                arg.__new__ = staticmethod(__new__)
+
+                original_init_subclass = arg.__init_subclass__
+                # We need slightly different behavior if __init_subclass__
+                # is a bound method (likely if it was implemented in Python)
+                if isinstance(original_init_subclass, MethodType):
+                    original_init_subclass = original_init_subclass.__func__
+
+                    @functools.wraps(original_init_subclass)
+                    def __init_subclass__(*args, **kwargs):
+                        warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
+                        return original_init_subclass(*args, **kwargs)
+
+                    arg.__init_subclass__ = classmethod(__init_subclass__)
+                # Or otherwise, which likely means it's a builtin such as
+                # object's implementation of __init_subclass__.
+                else:
+                    @functools.wraps(original_init_subclass)
+                    def __init_subclass__(*args, **kwargs):
+                        warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
+                        return original_init_subclass(*args, **kwargs)
+
+                    arg.__init_subclass__ = __init_subclass__
+
+                arg.__deprecated__ = __new__.__deprecated__ = msg
+                __init_subclass__.__deprecated__ = msg
+                return arg
+            elif callable(arg):
+                import functools
+
+                @functools.wraps(arg)
                 def wrapper(*args, **kwargs):
-                    warnings.warn(__msg, category=category, stacklevel=stacklevel + 1)
-                    return __arg(*args, **kwargs)
+                    warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
+                    return arg(*args, **kwargs)
 
-                __arg.__deprecated__ = wrapper.__deprecated__ = __msg
+                arg.__deprecated__ = wrapper.__deprecated__ = msg
                 return wrapper
             else:
                 raise TypeError(
                     "@deprecated decorator with non-None category must be applied to "
-                    f"a class or callable, not {__arg!r}"
+                    f"a class or callable, not {arg!r}"
                 )
 
-        return decorator
-
 
 # We have to do some monkey patching to deal with the dual nature of
 # Unpack/TypeVarTuple:
@@ -2584,7 +2519,7 @@ def wrapper(*args, **kwargs):
     typing._check_generic = _check_generic
 
 
-# Backport typing.NamedTuple as it exists in Python 3.12.
+# Backport typing.NamedTuple as it exists in Python 3.13.
 # In 3.11, the ability to define generic `NamedTuple`s was supported.
 # This was explicitly disallowed in 3.9-3.10, and only half-worked in <=3.8.
 # On 3.12, we added __orig_bases__ to call-based NamedTuples
@@ -2639,11 +2574,35 @@ def __new__(cls, typename, bases, ns):
                     class_getitem = typing.Generic.__class_getitem__.__func__
                     nm_tpl.__class_getitem__ = classmethod(class_getitem)
             # update from user namespace without overriding special namedtuple attributes
-            for key in ns:
+            for key, val in ns.items():
                 if key in _prohibited_namedtuple_fields:
                     raise AttributeError("Cannot overwrite NamedTuple attribute " + key)
-                elif key not in _special_namedtuple_fields and key not in nm_tpl._fields:
-                    setattr(nm_tpl, key, ns[key])
+                elif key not in _special_namedtuple_fields:
+                    if key not in nm_tpl._fields:
+                        setattr(nm_tpl, key, ns[key])
+                    try:
+                        set_name = type(val).__set_name__
+                    except AttributeError:
+                        pass
+                    else:
+                        try:
+                            set_name(val, nm_tpl, key)
+                        except BaseException as e:
+                            msg = (
+                                f"Error calling __set_name__ on {type(val).__name__!r} "
+                                f"instance {key!r} in {typename!r}"
+                            )
+                            # BaseException.add_note() existed on py311,
+                            # but the __set_name__ machinery didn't start
+                            # using add_note() until py312.
+                            # Making sure exceptions are raised in the same way
+                            # as in "normal" classes seems most important here.
+                            if sys.version_info >= (3, 12):
+                                e.add_note(msg)
+                                raise
+                            else:
+                                raise RuntimeError(msg) from e
+
             if typing.Generic in bases:
                 nm_tpl.__init_subclass__()
             return nm_tpl
@@ -2655,7 +2614,7 @@ def _namedtuple_mro_entries(bases):
         return (_NamedTuple,)
 
     @_ensure_subclassable(_namedtuple_mro_entries)
-    def NamedTuple(__typename, __fields=_marker, **kwargs):
+    def NamedTuple(typename, fields=_marker, /, **kwargs):
         """Typed version of namedtuple.
 
         Usage::
@@ -2675,7 +2634,7 @@ class Employee(NamedTuple):
 
             Employee = NamedTuple('Employee', [('name', str), ('id', int)])
         """
-        if __fields is _marker:
+        if fields is _marker:
             if kwargs:
                 deprecated_thing = "Creating NamedTuple classes using keyword arguments"
                 deprecation_msg = (
@@ -2684,14 +2643,14 @@ class Employee(NamedTuple):
                 )
             else:
                 deprecated_thing = "Failing to pass a value for the 'fields' parameter"
-                example = f"`{__typename} = NamedTuple({__typename!r}, [])`"
+                example = f"`{typename} = NamedTuple({typename!r}, [])`"
                 deprecation_msg = (
                     "{name} is deprecated and will be disallowed in Python {remove}. "
                     "To create a NamedTuple class with 0 fields "
                     "using the functional syntax, "
                     "pass an empty list, e.g. "
                 ) + example + "."
-        elif __fields is None:
+        elif fields is None:
             if kwargs:
                 raise TypeError(
                     "Cannot pass `None` as the 'fields' parameter "
@@ -2699,7 +2658,7 @@ class Employee(NamedTuple):
                 )
             else:
                 deprecated_thing = "Passing `None` as the 'fields' parameter"
-                example = f"`{__typename} = NamedTuple({__typename!r}, [])`"
+                example = f"`{typename} = NamedTuple({typename!r}, [])`"
                 deprecation_msg = (
                     "{name} is deprecated and will be disallowed in Python {remove}. "
                     "To create a NamedTuple class with 0 fields "
@@ -2709,27 +2668,17 @@ class Employee(NamedTuple):
         elif kwargs:
             raise TypeError("Either list of fields or keywords"
                             " can be provided to NamedTuple, not both")
-        if __fields is _marker or __fields is None:
+        if fields is _marker or fields is None:
             warnings.warn(
                 deprecation_msg.format(name=deprecated_thing, remove="3.15"),
                 DeprecationWarning,
                 stacklevel=2,
             )
-            __fields = kwargs.items()
-        nt = _make_nmtuple(__typename, __fields, module=_caller())
+            fields = kwargs.items()
+        nt = _make_nmtuple(typename, fields, module=_caller())
         nt.__orig_bases__ = (NamedTuple,)
         return nt
 
-    # On 3.8+, alter the signature so that it matches typing.NamedTuple.
-    # The signature of typing.NamedTuple on >=3.8 is invalid syntax in Python 3.7,
-    # so just leave the signature as it is on 3.7.
-    if sys.version_info >= (3, 8):
-        _new_signature = '(typename, fields=None, /, **kwargs)'
-        if isinstance(NamedTuple, _types.FunctionType):
-            NamedTuple.__text_signature__ = _new_signature
-        else:
-            NamedTuple.__call__.__text_signature__ = _new_signature
-
 
 if hasattr(collections.abc, "Buffer"):
     Buffer = collections.abc.Buffer
@@ -2764,7 +2713,7 @@ class Buffer(abc.ABC):
 if hasattr(_types, "get_original_bases"):
     get_original_bases = _types.get_original_bases
 else:
-    def get_original_bases(__cls):
+    def get_original_bases(cls, /):
         """Return the class's "original" bases prior to modification by `__mro_entries__`.
 
         Examples::
@@ -2786,14 +2735,11 @@ class Baz(list[str]): ...
             assert get_original_bases(int) == (object,)
         """
         try:
-            return __cls.__orig_bases__
+            return cls.__dict__.get("__orig_bases__", cls.__bases__)
         except AttributeError:
-            try:
-                return __cls.__bases__
-            except AttributeError:
-                raise TypeError(
-                    f'Expected an instance of type, not {type(__cls).__name__!r}'
-                ) from None
+            raise TypeError(
+                f'Expected an instance of type, not {type(cls).__name__!r}'
+            ) from None
 
 
 # NewType is a class on Python 3.10+, making it pickleable
@@ -2815,7 +2761,7 @@ def name_by_id(user_id: UserId) -> str:
             num = UserId(5) + 1     # type: int
         """
 
-        def __call__(self, obj):
+        def __call__(self, obj, /):
             return obj
 
         def __init__(self, name, tp):
@@ -2920,13 +2866,13 @@ def __init__(self, name: str, value, *, type_params=()):
             # Setting this attribute closes the TypeAliasType from further modification
             self.__name__ = name
 
-        def __setattr__(self, __name: str, __value: object) -> None:
+        def __setattr__(self, name: str, value: object, /) -> None:
             if hasattr(self, "__name__"):
-                self._raise_attribute_error(__name)
-            super().__setattr__(__name, __value)
+                self._raise_attribute_error(name)
+            super().__setattr__(name, value)
 
-        def __delattr__(self, __name: str) -> Never:
-            self._raise_attribute_error(__name)
+        def __delattr__(self, name: str, /) -> Never:
+            self._raise_attribute_error(name)
 
         def _raise_attribute_error(self, name: str) -> Never:
             # Match the Python 3.12 error messages exactly
@@ -2987,7 +2933,7 @@ def __ror__(self, left):
     is_protocol = typing.is_protocol
     get_protocol_members = typing.get_protocol_members
 else:
-    def is_protocol(__tp: type) -> bool:
+    def is_protocol(tp: type, /) -> bool:
         """Return True if the given type is a Protocol.
 
         Example::
@@ -3002,13 +2948,13 @@ def is_protocol(__tp: type) -> bool:
             False
         """
         return (
-            isinstance(__tp, type)
-            and getattr(__tp, '_is_protocol', False)
-            and __tp is not Protocol
-            and __tp is not getattr(typing, "Protocol", object())
+            isinstance(tp, type)
+            and getattr(tp, '_is_protocol', False)
+            and tp is not Protocol
+            and tp is not typing.Protocol
         )
 
-    def get_protocol_members(__tp: type) -> typing.FrozenSet[str]:
+    def get_protocol_members(tp: type, /) -> typing.FrozenSet[str]:
         """Return the set of members defined in a Protocol.
 
         Example::
@@ -3022,11 +2968,46 @@ def get_protocol_members(__tp: type) -> typing.FrozenSet[str]:
 
         Raise a TypeError for arguments that are not Protocols.
         """
-        if not is_protocol(__tp):
-            raise TypeError(f'{__tp!r} is not a Protocol')
-        if hasattr(__tp, '__protocol_attrs__'):
-            return frozenset(__tp.__protocol_attrs__)
-        return frozenset(_get_protocol_attrs(__tp))
+        if not is_protocol(tp):
+            raise TypeError(f'{tp!r} is not a Protocol')
+        if hasattr(tp, '__protocol_attrs__'):
+            return frozenset(tp.__protocol_attrs__)
+        return frozenset(_get_protocol_attrs(tp))
+
+
+if hasattr(typing, "Doc"):
+    Doc = typing.Doc
+else:
+    class Doc:
+        """Define the documentation of a type annotation using ``Annotated``, to be
+         used in class attributes, function and method parameters, return values,
+         and variables.
+
+        The value should be a positional-only string literal to allow static tools
+        like editors and documentation generators to use it.
+
+        This complements docstrings.
+
+        The string value passed is available in the attribute ``documentation``.
+
+        Example::
+
+            >>> from typing_extensions import Annotated, Doc
+            >>> def hi(to: Annotated[str, Doc("Who to say hi to")]) -> None: ...
+        """
+        def __init__(self, documentation: str, /) -> None:
+            self.documentation = documentation
+
+        def __repr__(self) -> str:
+            return f"Doc({self.documentation!r})"
+
+        def __hash__(self) -> int:
+            return hash(self.documentation)
+
+        def __eq__(self, other: object) -> bool:
+            if not isinstance(other, Doc):
+                return NotImplemented
+            return self.documentation == other.documentation
 
 
 # Aliases for items that have always been in typing.
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 91523045940..a9348f80e9e 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -14,7 +14,7 @@ requests==2.31.0
     urllib3==1.26.17
 rich==13.7.0
     pygments==2.17.2
-    typing_extensions==4.7.1
+    typing_extensions==4.9.0
 resolvelib==1.0.1
 setuptools==69.1.1
 six==1.16.0

From b28816e89eb0340ddb8b8dda73e89c7a7bd8f17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 10 Mar 2024 11:33:07 +0100
Subject: [PATCH 265/992] Upgrade msgpack to 1.0.8

---
 news/msgpack.vendor.rst             |   1 +
 src/pip/_vendor/msgpack/__init__.py |   8 +-
 src/pip/_vendor/msgpack/ext.py      |  55 +++--------
 src/pip/_vendor/msgpack/fallback.py | 147 +++++++++-------------------
 src/pip/_vendor/vendor.txt          |   2 +-
 5 files changed, 64 insertions(+), 149 deletions(-)
 create mode 100644 news/msgpack.vendor.rst

diff --git a/news/msgpack.vendor.rst b/news/msgpack.vendor.rst
new file mode 100644
index 00000000000..cc45383eaa4
--- /dev/null
+++ b/news/msgpack.vendor.rst
@@ -0,0 +1 @@
+Upgrade msgpack to 1.0.8
diff --git a/src/pip/_vendor/msgpack/__init__.py b/src/pip/_vendor/msgpack/__init__.py
index 1300b866043..919b86f175f 100644
--- a/src/pip/_vendor/msgpack/__init__.py
+++ b/src/pip/_vendor/msgpack/__init__.py
@@ -1,16 +1,14 @@
-# coding: utf-8
 from .exceptions import *
 from .ext import ExtType, Timestamp
 
 import os
-import sys
 
 
-version = (1, 0, 5)
-__version__ = "1.0.5"
+version = (1, 0, 8)
+__version__ = "1.0.8"
 
 
-if os.environ.get("MSGPACK_PUREPYTHON") or sys.version_info[0] == 2:
+if os.environ.get("MSGPACK_PUREPYTHON"):
     from .fallback import Packer, unpackb, Unpacker
 else:
     try:
diff --git a/src/pip/_vendor/msgpack/ext.py b/src/pip/_vendor/msgpack/ext.py
index 23e0d6b41ce..02c2c43008a 100644
--- a/src/pip/_vendor/msgpack/ext.py
+++ b/src/pip/_vendor/msgpack/ext.py
@@ -1,23 +1,8 @@
-# coding: utf-8
 from collections import namedtuple
 import datetime
-import sys
 import struct
 
 
-PY2 = sys.version_info[0] == 2
-
-if PY2:
-    int_types = (int, long)
-    _utc = None
-else:
-    int_types = int
-    try:
-        _utc = datetime.timezone.utc
-    except AttributeError:
-        _utc = datetime.timezone(datetime.timedelta(0))
-
-
 class ExtType(namedtuple("ExtType", "code data")):
     """ExtType represents ext type in msgpack."""
 
@@ -28,14 +13,15 @@ def __new__(cls, code, data):
             raise TypeError("data must be bytes")
         if not 0 <= code <= 127:
             raise ValueError("code must be 0~127")
-        return super(ExtType, cls).__new__(cls, code, data)
+        return super().__new__(cls, code, data)
 
 
-class Timestamp(object):
+class Timestamp:
     """Timestamp represents the Timestamp extension type in msgpack.
 
-    When built with Cython, msgpack uses C methods to pack and unpack `Timestamp`. When using pure-Python
-    msgpack, :func:`to_bytes` and :func:`from_bytes` are used to pack and unpack `Timestamp`.
+    When built with Cython, msgpack uses C methods to pack and unpack `Timestamp`.
+    When using pure-Python msgpack, :func:`to_bytes` and :func:`from_bytes` are used to pack and
+    unpack `Timestamp`.
 
     This class is immutable: Do not override seconds and nanoseconds.
     """
@@ -53,31 +39,25 @@ def __init__(self, seconds, nanoseconds=0):
             Number of nanoseconds to add to `seconds` to get fractional time.
             Maximum is 999_999_999.  Default is 0.
 
-        Note: Negative times (before the UNIX epoch) are represented as negative seconds + positive ns.
+        Note: Negative times (before the UNIX epoch) are represented as neg. seconds + pos. ns.
         """
-        if not isinstance(seconds, int_types):
+        if not isinstance(seconds, int):
             raise TypeError("seconds must be an integer")
-        if not isinstance(nanoseconds, int_types):
+        if not isinstance(nanoseconds, int):
             raise TypeError("nanoseconds must be an integer")
         if not (0 <= nanoseconds < 10**9):
-            raise ValueError(
-                "nanoseconds must be a non-negative integer less than 999999999."
-            )
+            raise ValueError("nanoseconds must be a non-negative integer less than 999999999.")
         self.seconds = seconds
         self.nanoseconds = nanoseconds
 
     def __repr__(self):
         """String representation of Timestamp."""
-        return "Timestamp(seconds={0}, nanoseconds={1})".format(
-            self.seconds, self.nanoseconds
-        )
+        return f"Timestamp(seconds={self.seconds}, nanoseconds={self.nanoseconds})"
 
     def __eq__(self, other):
         """Check for equality with another Timestamp object"""
         if type(other) is self.__class__:
-            return (
-                self.seconds == other.seconds and self.nanoseconds == other.nanoseconds
-            )
+            return self.seconds == other.seconds and self.nanoseconds == other.nanoseconds
         return False
 
     def __ne__(self, other):
@@ -140,7 +120,7 @@ def from_unix(unix_sec):
         """Create a Timestamp from posix timestamp in seconds.
 
         :param unix_float: Posix timestamp in seconds.
-        :type unix_float: int or float.
+        :type unix_float: int or float
         """
         seconds = int(unix_sec // 1)
         nanoseconds = int((unix_sec % 1) * 10**9)
@@ -174,20 +154,15 @@ def to_unix_nano(self):
     def to_datetime(self):
         """Get the timestamp as a UTC datetime.
 
-        Python 2 is not supported.
-
-        :rtype: datetime.
+        :rtype: `datetime.datetime`
         """
-        return datetime.datetime.fromtimestamp(0, _utc) + datetime.timedelta(
-            seconds=self.to_unix()
-        )
+        utc = datetime.timezone.utc
+        return datetime.datetime.fromtimestamp(0, utc) + datetime.timedelta(seconds=self.to_unix())
 
     @staticmethod
     def from_datetime(dt):
         """Create a Timestamp from datetime with tzinfo.
 
-        Python 2 is not supported.
-
         :rtype: Timestamp
         """
         return Timestamp.from_unix(dt.timestamp())
diff --git a/src/pip/_vendor/msgpack/fallback.py b/src/pip/_vendor/msgpack/fallback.py
index e8cebc1bef7..a174162af8a 100644
--- a/src/pip/_vendor/msgpack/fallback.py
+++ b/src/pip/_vendor/msgpack/fallback.py
@@ -4,39 +4,6 @@
 import struct
 
 
-PY2 = sys.version_info[0] == 2
-if PY2:
-    int_types = (int, long)
-
-    def dict_iteritems(d):
-        return d.iteritems()
-
-else:
-    int_types = int
-    unicode = str
-    xrange = range
-
-    def dict_iteritems(d):
-        return d.items()
-
-
-if sys.version_info < (3, 5):
-    # Ugly hack...
-    RecursionError = RuntimeError
-
-    def _is_recursionerror(e):
-        return (
-            len(e.args) == 1
-            and isinstance(e.args[0], str)
-            and e.args[0].startswith("maximum recursion depth exceeded")
-        )
-
-else:
-
-    def _is_recursionerror(e):
-        return True
-
-
 if hasattr(sys, "pypy_version_info"):
     # StringIO is slow on PyPy, StringIO is faster.  However: PyPy's own
     # StringBuilder is fastest.
@@ -48,7 +15,7 @@ def _is_recursionerror(e):
         from __pypy__.builders import StringBuilder
     USING_STRINGBUILDER = True
 
-    class StringIO(object):
+    class StringIO:
         def __init__(self, s=b""):
             if s:
                 self.builder = StringBuilder(len(s))
@@ -125,24 +92,13 @@ def unpackb(packed, **kwargs):
         ret = unpacker._unpack()
     except OutOfData:
         raise ValueError("Unpack failed: incomplete input")
-    except RecursionError as e:
-        if _is_recursionerror(e):
-            raise StackError
-        raise
+    except RecursionError:
+        raise StackError
     if unpacker._got_extradata():
         raise ExtraData(ret, unpacker._get_extradata())
     return ret
 
 
-if sys.version_info < (2, 7, 6):
-
-    def _unpack_from(f, b, o=0):
-        """Explicit type cast for legacy struct.unpack_from"""
-        return struct.unpack_from(f, bytes(b), o)
-
-else:
-    _unpack_from = struct.unpack_from
-
 _NO_FORMAT_USED = ""
 _MSGPACK_HEADERS = {
     0xC4: (1, _NO_FORMAT_USED, TYPE_BIN),
@@ -176,14 +132,14 @@ def _unpack_from(f, b, o=0):
 }
 
 
-class Unpacker(object):
+class Unpacker:
     """Streaming unpacker.
 
     Arguments:
 
     :param file_like:
         File-like object having `.read(n)` method.
-        If specified, unpacker reads serialized data from it and :meth:`feed()` is not usable.
+        If specified, unpacker reads serialized data from it and `.feed()` is not usable.
 
     :param int read_size:
         Used as `file_like.read(read_size)`. (default: `min(16*1024, max_buffer_size)`)
@@ -202,17 +158,17 @@ class Unpacker(object):
             0 - Timestamp
             1 - float  (Seconds from the EPOCH)
             2 - int  (Nanoseconds from the EPOCH)
-            3 - datetime.datetime  (UTC).  Python 2 is not supported.
+            3 - datetime.datetime  (UTC).
 
     :param bool strict_map_key:
         If true (default), only str or bytes are accepted for map (dict) keys.
 
-    :param callable object_hook:
+    :param object_hook:
         When specified, it should be callable.
         Unpacker calls it with a dict argument after unpacking msgpack map.
         (See also simplejson)
 
-    :param callable object_pairs_hook:
+    :param object_pairs_hook:
         When specified, it should be callable.
         Unpacker calls it with a list of key-value pairs after unpacking msgpack map.
         (See also simplejson)
@@ -359,9 +315,7 @@ def __init__(
         if object_pairs_hook is not None and not callable(object_pairs_hook):
             raise TypeError("`object_pairs_hook` is not callable")
         if object_hook is not None and object_pairs_hook is not None:
-            raise TypeError(
-                "object_pairs_hook and object_hook are mutually " "exclusive"
-            )
+            raise TypeError("object_pairs_hook and object_hook are mutually exclusive")
         if not callable(ext_hook):
             raise TypeError("`ext_hook` is not callable")
 
@@ -453,20 +407,18 @@ def _read_header(self):
             n = b & 0b00011111
             typ = TYPE_RAW
             if n > self._max_str_len:
-                raise ValueError("%s exceeds max_str_len(%s)" % (n, self._max_str_len))
+                raise ValueError(f"{n} exceeds max_str_len({self._max_str_len})")
             obj = self._read(n)
         elif b & 0b11110000 == 0b10010000:
             n = b & 0b00001111
             typ = TYPE_ARRAY
             if n > self._max_array_len:
-                raise ValueError(
-                    "%s exceeds max_array_len(%s)" % (n, self._max_array_len)
-                )
+                raise ValueError(f"{n} exceeds max_array_len({self._max_array_len})")
         elif b & 0b11110000 == 0b10000000:
             n = b & 0b00001111
             typ = TYPE_MAP
             if n > self._max_map_len:
-                raise ValueError("%s exceeds max_map_len(%s)" % (n, self._max_map_len))
+                raise ValueError(f"{n} exceeds max_map_len({self._max_map_len})")
         elif b == 0xC0:
             obj = None
         elif b == 0xC2:
@@ -477,65 +429,61 @@ def _read_header(self):
             size, fmt, typ = _MSGPACK_HEADERS[b]
             self._reserve(size)
             if len(fmt) > 0:
-                n = _unpack_from(fmt, self._buffer, self._buff_i)[0]
+                n = struct.unpack_from(fmt, self._buffer, self._buff_i)[0]
             else:
                 n = self._buffer[self._buff_i]
             self._buff_i += size
             if n > self._max_bin_len:
-                raise ValueError("%s exceeds max_bin_len(%s)" % (n, self._max_bin_len))
+                raise ValueError(f"{n} exceeds max_bin_len({self._max_bin_len})")
             obj = self._read(n)
         elif 0xC7 <= b <= 0xC9:
             size, fmt, typ = _MSGPACK_HEADERS[b]
             self._reserve(size)
-            L, n = _unpack_from(fmt, self._buffer, self._buff_i)
+            L, n = struct.unpack_from(fmt, self._buffer, self._buff_i)
             self._buff_i += size
             if L > self._max_ext_len:
-                raise ValueError("%s exceeds max_ext_len(%s)" % (L, self._max_ext_len))
+                raise ValueError(f"{L} exceeds max_ext_len({self._max_ext_len})")
             obj = self._read(L)
         elif 0xCA <= b <= 0xD3:
             size, fmt = _MSGPACK_HEADERS[b]
             self._reserve(size)
             if len(fmt) > 0:
-                obj = _unpack_from(fmt, self._buffer, self._buff_i)[0]
+                obj = struct.unpack_from(fmt, self._buffer, self._buff_i)[0]
             else:
                 obj = self._buffer[self._buff_i]
             self._buff_i += size
         elif 0xD4 <= b <= 0xD8:
             size, fmt, typ = _MSGPACK_HEADERS[b]
             if self._max_ext_len < size:
-                raise ValueError(
-                    "%s exceeds max_ext_len(%s)" % (size, self._max_ext_len)
-                )
+                raise ValueError(f"{size} exceeds max_ext_len({self._max_ext_len})")
             self._reserve(size + 1)
-            n, obj = _unpack_from(fmt, self._buffer, self._buff_i)
+            n, obj = struct.unpack_from(fmt, self._buffer, self._buff_i)
             self._buff_i += size + 1
         elif 0xD9 <= b <= 0xDB:
             size, fmt, typ = _MSGPACK_HEADERS[b]
             self._reserve(size)
             if len(fmt) > 0:
-                (n,) = _unpack_from(fmt, self._buffer, self._buff_i)
+                (n,) = struct.unpack_from(fmt, self._buffer, self._buff_i)
             else:
                 n = self._buffer[self._buff_i]
             self._buff_i += size
             if n > self._max_str_len:
-                raise ValueError("%s exceeds max_str_len(%s)" % (n, self._max_str_len))
+                raise ValueError(f"{n} exceeds max_str_len({self._max_str_len})")
             obj = self._read(n)
         elif 0xDC <= b <= 0xDD:
             size, fmt, typ = _MSGPACK_HEADERS[b]
             self._reserve(size)
-            (n,) = _unpack_from(fmt, self._buffer, self._buff_i)
+            (n,) = struct.unpack_from(fmt, self._buffer, self._buff_i)
             self._buff_i += size
             if n > self._max_array_len:
-                raise ValueError(
-                    "%s exceeds max_array_len(%s)" % (n, self._max_array_len)
-                )
+                raise ValueError(f"{n} exceeds max_array_len({self._max_array_len})")
         elif 0xDE <= b <= 0xDF:
             size, fmt, typ = _MSGPACK_HEADERS[b]
             self._reserve(size)
-            (n,) = _unpack_from(fmt, self._buffer, self._buff_i)
+            (n,) = struct.unpack_from(fmt, self._buffer, self._buff_i)
             self._buff_i += size
             if n > self._max_map_len:
-                raise ValueError("%s exceeds max_map_len(%s)" % (n, self._max_map_len))
+                raise ValueError(f"{n} exceeds max_map_len({self._max_map_len})")
         else:
             raise FormatError("Unknown header: 0x%x" % b)
         return typ, n, obj
@@ -554,12 +502,12 @@ def _unpack(self, execute=EX_CONSTRUCT):
         # TODO should we eliminate the recursion?
         if typ == TYPE_ARRAY:
             if execute == EX_SKIP:
-                for i in xrange(n):
+                for i in range(n):
                     # TODO check whether we need to call `list_hook`
                     self._unpack(EX_SKIP)
                 return
             ret = newlist_hint(n)
-            for i in xrange(n):
+            for i in range(n):
                 ret.append(self._unpack(EX_CONSTRUCT))
             if self._list_hook is not None:
                 ret = self._list_hook(ret)
@@ -567,25 +515,22 @@ def _unpack(self, execute=EX_CONSTRUCT):
             return ret if self._use_list else tuple(ret)
         if typ == TYPE_MAP:
             if execute == EX_SKIP:
-                for i in xrange(n):
+                for i in range(n):
                     # TODO check whether we need to call hooks
                     self._unpack(EX_SKIP)
                     self._unpack(EX_SKIP)
                 return
             if self._object_pairs_hook is not None:
                 ret = self._object_pairs_hook(
-                    (self._unpack(EX_CONSTRUCT), self._unpack(EX_CONSTRUCT))
-                    for _ in xrange(n)
+                    (self._unpack(EX_CONSTRUCT), self._unpack(EX_CONSTRUCT)) for _ in range(n)
                 )
             else:
                 ret = {}
-                for _ in xrange(n):
+                for _ in range(n):
                     key = self._unpack(EX_CONSTRUCT)
-                    if self._strict_map_key and type(key) not in (unicode, bytes):
-                        raise ValueError(
-                            "%s is not allowed for map key" % str(type(key))
-                        )
-                    if not PY2 and type(key) is str:
+                    if self._strict_map_key and type(key) not in (str, bytes):
+                        raise ValueError("%s is not allowed for map key" % str(type(key)))
+                    if isinstance(key, str):
                         key = sys.intern(key)
                     ret[key] = self._unpack(EX_CONSTRUCT)
                 if self._object_hook is not None:
@@ -659,7 +604,7 @@ def tell(self):
         return self._stream_offset
 
 
-class Packer(object):
+class Packer:
     """
     MessagePack Packer
 
@@ -671,7 +616,8 @@ class Packer(object):
 
     Packer's constructor has some keyword arguments:
 
-    :param callable default:
+    :param default:
+        When specified, it should be callable.
         Convert user type to builtin type that Packer supports.
         See also simplejson's document.
 
@@ -698,7 +644,6 @@ class Packer(object):
         If set to true, datetime with tzinfo is packed into Timestamp type.
         Note that the tzinfo is stripped in the timestamp.
         You can get UTC datetime with `timestamp=3` option of the Unpacker.
-        (Python 2 is not supported).
 
     :param str unicode_errors:
         The error handler for encoding unicode. (default: 'strict')
@@ -743,8 +688,6 @@ def __init__(
         self._autoreset = autoreset
         self._use_bin_type = use_bin_type
         self._buffer = StringIO()
-        if PY2 and datetime:
-            raise ValueError("datetime is not supported in Python 2")
         self._datetime = bool(datetime)
         self._unicode_errors = unicode_errors or "strict"
         if default is not None:
@@ -774,7 +717,7 @@ def _pack(
                 if obj:
                     return self._buffer.write(b"\xc3")
                 return self._buffer.write(b"\xc2")
-            if check(obj, int_types):
+            if check(obj, int):
                 if 0 <= obj < 0x80:
                     return self._buffer.write(struct.pack("B", obj))
                 if -0x20 <= obj < 0:
@@ -806,7 +749,7 @@ def _pack(
                     raise ValueError("%s is too large" % type(obj).__name__)
                 self._pack_bin_header(n)
                 return self._buffer.write(obj)
-            if check(obj, unicode):
+            if check(obj, str):
                 obj = obj.encode("utf-8", self._unicode_errors)
                 n = len(obj)
                 if n >= 2**32:
@@ -855,13 +798,11 @@ def _pack(
             if check(obj, list_types):
                 n = len(obj)
                 self._pack_array_header(n)
-                for i in xrange(n):
+                for i in range(n):
                     self._pack(obj[i], nest_limit - 1)
                 return
             if check(obj, dict):
-                return self._pack_map_pairs(
-                    len(obj), dict_iteritems(obj), nest_limit - 1
-                )
+                return self._pack_map_pairs(len(obj), obj.items(), nest_limit - 1)
 
             if self._datetime and check(obj, _DateTime) and obj.tzinfo is not None:
                 obj = Timestamp.from_datetime(obj)
@@ -874,9 +815,9 @@ def _pack(
                 continue
 
             if self._datetime and check(obj, _DateTime):
-                raise ValueError("Cannot serialize %r where tzinfo=None" % (obj,))
+                raise ValueError(f"Cannot serialize {obj!r} where tzinfo=None")
 
-            raise TypeError("Cannot serialize %r" % (obj,))
+            raise TypeError(f"Cannot serialize {obj!r}")
 
     def pack(self, obj):
         try:
@@ -963,7 +904,7 @@ def _pack_map_header(self, n):
 
     def _pack_map_pairs(self, n, pairs, nest_limit=DEFAULT_RECURSE_LIMIT):
         self._pack_map_header(n)
-        for (k, v) in pairs:
+        for k, v in pairs:
             self._pack(k, nest_limit - 1)
             self._pack(v, nest_limit - 1)
 
@@ -1004,7 +945,7 @@ def reset(self):
 
     def getbuffer(self):
         """Return view of internal buffer."""
-        if USING_STRINGBUILDER or PY2:
+        if USING_STRINGBUILDER:
             return memoryview(self.bytes())
         else:
             return self._buffer.getbuffer()
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index a9348f80e9e..750d7ba787b 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -2,7 +2,7 @@ CacheControl==0.13.1  # Make sure to update the license in pyproject.toml for th
 colorama==0.4.6
 distlib==0.3.8
 distro==1.9.0
-msgpack==1.0.5
+msgpack==1.0.8
 packaging==21.3
 platformdirs==4.2.0
 pyparsing==3.1.0

From d70dc45041652b9169ba2e0cb2060063a9e530a1 Mon Sep 17 00:00:00 2001
From: Matt Wozniski 
Date: Thu, 7 Mar 2024 12:46:22 -0500
Subject: [PATCH 266/992] Improve the error for failed PEP 517 builds

The original message would result in errors like:

    Could not build wheels for xmlsec, which is required to
    install pyproject.toml-based projects

Which could be misinterpreted to mean that xmlsec is required to install
pyproject.toml-based projects, rather than that building wheels is.

This commit aims to make the error message clearer while still working
for a comma-separated list of package names.

Signed-off-by: Matt Wozniski 
---
 news/7f9639a2-df21-4e0c-9023-80f00fd71d20.trivial.rst | 0
 src/pip/_internal/commands/install.py                 | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 news/7f9639a2-df21-4e0c-9023-80f00fd71d20.trivial.rst

diff --git a/news/7f9639a2-df21-4e0c-9023-80f00fd71d20.trivial.rst b/news/7f9639a2-df21-4e0c-9023-80f00fd71d20.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index e944bb95a50..6cf7571e4a6 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -427,8 +427,8 @@ def run(self, options: Values, args: List[str]) -> int:
 
             if build_failures:
                 raise InstallationError(
-                    "Could not build wheels for {}, which is required to "
-                    "install pyproject.toml-based projects".format(
+                    "ERROR: Failed to build installable wheels for some "
+                    "pyproject.toml based projects ({})".format(
                         ", ".join(r.name for r in build_failures)  # type: ignore
                     )
                 )

From b968548f3860b4713180c1a5d2805c932fb915b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 10 Mar 2024 11:41:54 +0100
Subject: [PATCH 267/992] Upgrade urllib3 to 1.26.18

---
 news/urllib3.vendor.rst                        |  1 +
 src/pip/_vendor/urllib3/_collections.py        | 18 ++++++++++++++++++
 src/pip/_vendor/urllib3/_version.py            |  2 +-
 src/pip/_vendor/urllib3/connectionpool.py      |  5 +++++
 .../_vendor/urllib3/contrib/securetransport.py |  3 +--
 src/pip/_vendor/urllib3/poolmanager.py         |  7 +++++--
 src/pip/_vendor/vendor.txt                     |  2 +-
 7 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 news/urllib3.vendor.rst

diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst
new file mode 100644
index 00000000000..87c7ccfa0b5
--- /dev/null
+++ b/news/urllib3.vendor.rst
@@ -0,0 +1 @@
+Upgrade urllib3 to 1.26.18
diff --git a/src/pip/_vendor/urllib3/_collections.py b/src/pip/_vendor/urllib3/_collections.py
index da9857e986d..bceb8451f0e 100644
--- a/src/pip/_vendor/urllib3/_collections.py
+++ b/src/pip/_vendor/urllib3/_collections.py
@@ -268,6 +268,24 @@ def getlist(self, key, default=__marker):
         else:
             return vals[1:]
 
+    def _prepare_for_method_change(self):
+        """
+        Remove content-specific header fields before changing the request
+        method to GET or HEAD according to RFC 9110, Section 15.4.
+        """
+        content_specific_headers = [
+            "Content-Encoding",
+            "Content-Language",
+            "Content-Location",
+            "Content-Type",
+            "Content-Length",
+            "Digest",
+            "Last-Modified",
+        ]
+        for header in content_specific_headers:
+            self.discard(header)
+        return self
+
     # Backwards compatibility for httplib
     getheaders = getlist
     getallmatchingheaders = getlist
diff --git a/src/pip/_vendor/urllib3/_version.py b/src/pip/_vendor/urllib3/_version.py
index cad75fb5df8..85e725eaf4d 100644
--- a/src/pip/_vendor/urllib3/_version.py
+++ b/src/pip/_vendor/urllib3/_version.py
@@ -1,2 +1,2 @@
 # This file is protected via CODEOWNERS
-__version__ = "1.26.17"
+__version__ = "1.26.18"
diff --git a/src/pip/_vendor/urllib3/connectionpool.py b/src/pip/_vendor/urllib3/connectionpool.py
index 96844d93374..5a6adcbdc75 100644
--- a/src/pip/_vendor/urllib3/connectionpool.py
+++ b/src/pip/_vendor/urllib3/connectionpool.py
@@ -9,6 +9,7 @@
 from socket import error as SocketError
 from socket import timeout as SocketTimeout
 
+from ._collections import HTTPHeaderDict
 from .connection import (
     BaseSSLError,
     BrokenPipeError,
@@ -843,7 +844,11 @@ def _is_ssl_error_message_from_http_proxy(ssl_error):
         redirect_location = redirect and response.get_redirect_location()
         if redirect_location:
             if response.status == 303:
+                # Change the method according to RFC 9110, Section 15.4.4.
                 method = "GET"
+                # And lose the body not to transfer anything sensitive.
+                body = None
+                headers = HTTPHeaderDict(headers)._prepare_for_method_change()
 
             try:
                 retries = retries.increment(method, url, response=response, _pool=self)
diff --git a/src/pip/_vendor/urllib3/contrib/securetransport.py b/src/pip/_vendor/urllib3/contrib/securetransport.py
index 4a06bc69d5c..722ee4e1242 100644
--- a/src/pip/_vendor/urllib3/contrib/securetransport.py
+++ b/src/pip/_vendor/urllib3/contrib/securetransport.py
@@ -64,9 +64,8 @@
 import threading
 import weakref
 
-from pip._vendor import six
-
 from .. import util
+from ..packages import six
 from ..util.ssl_ import PROTOCOL_TLS_CLIENT
 from ._securetransport.bindings import CoreFoundation, Security, SecurityConst
 from ._securetransport.low_level import (
diff --git a/src/pip/_vendor/urllib3/poolmanager.py b/src/pip/_vendor/urllib3/poolmanager.py
index 14b10daf3a9..fb51bf7d96b 100644
--- a/src/pip/_vendor/urllib3/poolmanager.py
+++ b/src/pip/_vendor/urllib3/poolmanager.py
@@ -4,7 +4,7 @@
 import functools
 import logging
 
-from ._collections import RecentlyUsedContainer
+from ._collections import HTTPHeaderDict, RecentlyUsedContainer
 from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool, port_by_scheme
 from .exceptions import (
     LocationValueError,
@@ -382,9 +382,12 @@ def urlopen(self, method, url, redirect=True, **kw):
         # Support relative URLs for redirecting.
         redirect_location = urljoin(url, redirect_location)
 
-        # RFC 7231, Section 6.4.4
         if response.status == 303:
+            # Change the method according to RFC 9110, Section 15.4.4.
             method = "GET"
+            # And lose the body not to transfer anything sensitive.
+            kw["body"] = None
+            kw["headers"] = HTTPHeaderDict(kw["headers"])._prepare_for_method_change()
 
         retries = kw.get("retries")
         if not isinstance(retries, Retry):
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 750d7ba787b..49c26a03237 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -11,7 +11,7 @@ requests==2.31.0
     certifi==2023.7.22
     chardet==5.2.0
     idna==3.6
-    urllib3==1.26.17
+    urllib3==1.26.18
 rich==13.7.0
     pygments==2.17.2
     typing_extensions==4.9.0

From 4a4c55f82cfcd690275bd31975a11f6de1500a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 10 Mar 2024 11:54:27 +0100
Subject: [PATCH 268/992] Upgrade certifi to 2024.2.2

---
 news/certifi.vendor.rst               |   1 +
 src/pip/_vendor/certifi/LICENSE       |   1 -
 src/pip/_vendor/certifi/__init__.py   |   2 +-
 src/pip/_vendor/certifi/cacert.pem    | 321 ++++++++++++++++++++------
 src/pip/_vendor/certifi/core.py       |   6 +
 src/pip/_vendor/vendor.txt            |   2 +-
 tools/vendoring/patches/certifi.patch |  10 +-
 7 files changed, 265 insertions(+), 78 deletions(-)
 create mode 100644 news/certifi.vendor.rst

diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
new file mode 100644
index 00000000000..d307502900d
--- /dev/null
+++ b/news/certifi.vendor.rst
@@ -0,0 +1 @@
+Upgrade certifi to 2024.2.2
diff --git a/src/pip/_vendor/certifi/LICENSE b/src/pip/_vendor/certifi/LICENSE
index 0a64774eabe..62b076cdee5 100644
--- a/src/pip/_vendor/certifi/LICENSE
+++ b/src/pip/_vendor/certifi/LICENSE
@@ -2,7 +2,6 @@ This package contains a modified version of ca-bundle.crt:
 
 ca-bundle.crt -- Bundle of CA Root Certificates
 
-Certificate data from Mozilla as of: Thu Nov  3 19:04:19 2011#
 This is a bundle of X.509 certificates of public Certificate Authorities
 (CA). These were automatically extracted from Mozilla's root certificates
 file (certdata.txt).  This file can be found in the mozilla source tree:
diff --git a/src/pip/_vendor/certifi/__init__.py b/src/pip/_vendor/certifi/__init__.py
index 8ce89cef706..1c91f3ec932 100644
--- a/src/pip/_vendor/certifi/__init__.py
+++ b/src/pip/_vendor/certifi/__init__.py
@@ -1,4 +1,4 @@
 from .core import contents, where
 
 __all__ = ["contents", "where"]
-__version__ = "2023.07.22"
+__version__ = "2024.02.02"
diff --git a/src/pip/_vendor/certifi/cacert.pem b/src/pip/_vendor/certifi/cacert.pem
index 02123695d01..fac3c31909b 100644
--- a/src/pip/_vendor/certifi/cacert.pem
+++ b/src/pip/_vendor/certifi/cacert.pem
@@ -245,34 +245,6 @@ mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
 4SVhM7JZG+Ju1zdXtg2pEto=
 -----END CERTIFICATE-----
 
-# Issuer: O=SECOM Trust.net OU=Security Communication RootCA1
-# Subject: O=SECOM Trust.net OU=Security Communication RootCA1
-# Label: "Security Communication Root CA"
-# Serial: 0
-# MD5 Fingerprint: f1:bc:63:6a:54:e0:b5:27:f5:cd:e7:1a:e3:4d:6e:4a
-# SHA1 Fingerprint: 36:b1:2b:49:f9:81:9e:d7:4c:9e:bc:38:0f:c6:56:8f:5d:ac:b2:f7
-# SHA256 Fingerprint: e7:5e:72:ed:9f:56:0e:ec:6e:b4:80:00:73:a4:3f:c3:ad:19:19:5a:39:22:82:01:78:95:97:4a:99:02:6b:6c
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
-MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
-dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
-WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
-VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
-9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
-DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
-Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
-QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
-xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
-A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
-AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
-kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
-Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
-Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
-JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
-RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
------END CERTIFICATE-----
-
 # Issuer: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
 # Subject: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
 # Label: "XRamp Global CA Root"
@@ -881,49 +853,6 @@ Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
 WD9f
 -----END CERTIFICATE-----
 
-# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
-# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
-# Label: "Autoridad de Certificacion Firmaprofesional CIF A62634068"
-# Serial: 6047274297262753887
-# MD5 Fingerprint: 73:3a:74:7a:ec:bb:a3:96:a6:c2:e4:e2:c8:9b:c0:c3
-# SHA1 Fingerprint: ae:c5:fb:3f:c8:e1:bf:c4:e5:4f:03:07:5a:9a:e8:00:b7:f7:b6:fa
-# SHA256 Fingerprint: 04:04:80:28:bf:1f:28:64:d4:8f:9a:d4:d8:32:94:36:6a:82:88:56:55:3f:3b:14:30:3f:90:14:7f:5d:40:ef
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
-BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
-cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
-MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
-Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
-thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
-cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
-L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
-NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
-X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
-m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
-Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
-EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
-KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
-6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
-OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
-VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
-ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
-AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
-661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
-am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
-ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
-PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
-3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
-SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
-3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
-ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
-StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
-Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
-jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
-
 # Issuer: CN=Izenpe.com O=IZENPE S.A.
 # Subject: CN=Izenpe.com O=IZENPE S.A.
 # Label: "Izenpe.com"
@@ -4633,3 +4562,253 @@ o7Ey7Nmj1m+UI/87tyll5gfp77YZ6ufCOB0yiJA8EytuzO+rdwY0d4RPcuSBhPm5
 dDTedk+SKlOxJTnbPP/lPqYO5Wue/9vsL3SD3460s6neFE3/MaNFcyT6lSnMEpcE
 oji2jbDwN/zIIX8/syQbPYtuzE2wFg2WHYMfRsCbvUOZ58SWLs5fyQ==
 -----END CERTIFICATE-----
+
+# Issuer: CN=TrustAsia Global Root CA G3 O=TrustAsia Technologies, Inc.
+# Subject: CN=TrustAsia Global Root CA G3 O=TrustAsia Technologies, Inc.
+# Label: "TrustAsia Global Root CA G3"
+# Serial: 576386314500428537169965010905813481816650257167
+# MD5 Fingerprint: 30:42:1b:b7:bb:81:75:35:e4:16:4f:53:d2:94:de:04
+# SHA1 Fingerprint: 63:cf:b6:c1:27:2b:56:e4:88:8e:1c:23:9a:b6:2e:81:47:24:c3:c7
+# SHA256 Fingerprint: e0:d3:22:6a:eb:11:63:c2:e4:8f:f9:be:3b:50:b4:c6:43:1b:e7:bb:1e:ac:c5:c3:6b:5d:5e:c5:09:03:9a:08
+-----BEGIN CERTIFICATE-----
+MIIFpTCCA42gAwIBAgIUZPYOZXdhaqs7tOqFhLuxibhxkw8wDQYJKoZIhvcNAQEM
+BQAwWjELMAkGA1UEBhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dp
+ZXMsIEluYy4xJDAiBgNVBAMMG1RydXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHMzAe
+Fw0yMTA1MjAwMjEwMTlaFw00NjA1MTkwMjEwMTlaMFoxCzAJBgNVBAYTAkNOMSUw
+IwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDDBtU
+cnVzdEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDAMYJhkuSUGwoqZdC+BqmHO1ES6nBBruL7dOoKjbmzTNyPtxNS
+T1QY4SxzlZHFZjtqz6xjbYdT8PfxObegQ2OwxANdV6nnRM7EoYNl9lA+sX4WuDqK
+AtCWHwDNBSHvBm3dIZwZQ0WhxeiAysKtQGIXBsaqvPPW5vxQfmZCHzyLpnl5hkA1
+nyDvP+uLRx+PjsXUjrYsyUQE49RDdT/VP68czH5GX6zfZBCK70bwkPAPLfSIC7Ep
+qq+FqklYqL9joDiR5rPmd2jE+SoZhLsO4fWvieylL1AgdB4SQXMeJNnKziyhWTXA
+yB1GJ2Faj/lN03J5Zh6fFZAhLf3ti1ZwA0pJPn9pMRJpxx5cynoTi+jm9WAPzJMs
+hH/x/Gr8m0ed262IPfN2dTPXS6TIi/n1Q1hPy8gDVI+lhXgEGvNz8teHHUGf59gX
+zhqcD0r83ERoVGjiQTz+LISGNzzNPy+i2+f3VANfWdP3kXjHi3dqFuVJhZBFcnAv
+kV34PmVACxmZySYgWmjBNb9Pp1Hx2BErW+Canig7CjoKH8GB5S7wprlppYiU5msT
+f9FkPz2ccEblooV7WIQn3MSAPmeamseaMQ4w7OYXQJXZRe0Blqq/DPNL0WP3E1jA
+uPP6Z92bfW1K/zJMtSU7/xxnD4UiWQWRkUF3gdCFTIcQcf+eQxuulXUtgQIDAQAB
+o2MwYTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEDk5PIj7zjKsK5Xf/Ih
+MBY027ySMB0GA1UdDgQWBBRA5OTyI+84yrCuV3/yITAWNNu8kjAOBgNVHQ8BAf8E
+BAMCAQYwDQYJKoZIhvcNAQEMBQADggIBACY7UeFNOPMyGLS0XuFlXsSUT9SnYaP4
+wM8zAQLpw6o1D/GUE3d3NZ4tVlFEbuHGLige/9rsR82XRBf34EzC4Xx8MnpmyFq2
+XFNFV1pF1AWZLy4jVe5jaN/TG3inEpQGAHUNcoTpLrxaatXeL1nHo+zSh2bbt1S1
+JKv0Q3jbSwTEb93mPmY+KfJLaHEih6D4sTNjduMNhXJEIlU/HHzp/LgV6FL6qj6j
+ITk1dImmasI5+njPtqzn59ZW/yOSLlALqbUHM/Q4X6RJpstlcHboCoWASzY9M/eV
+VHUl2qzEc4Jl6VL1XP04lQJqaTDFHApXB64ipCz5xUG3uOyfT0gA+QEEVcys+TIx
+xHWVBqB/0Y0n3bOppHKH/lmLmnp0Ft0WpWIp6zqW3IunaFnT63eROfjXy9mPX1on
+AX1daBli2MjN9LdyR75bl87yraKZk62Uy5P2EgmVtqvXO9A/EcswFi55gORngS1d
+7XB4tmBZrOFdRWOPyN9yaFvqHbgB8X7754qz41SgOAngPN5C8sLtLpvzHzW2Ntjj
+gKGLzZlkD8Kqq7HK9W+eQ42EVJmzbsASZthwEPEGNTNDqJwuuhQxzhB/HIbjj9LV
++Hfsm6vxL2PZQl/gZ4FkkfGXL/xuJvYz+NO1+MRiqzFRJQJ6+N1rZdVtTTDIZbpo
+FGWsJwt0ivKH
+-----END CERTIFICATE-----
+
+# Issuer: CN=TrustAsia Global Root CA G4 O=TrustAsia Technologies, Inc.
+# Subject: CN=TrustAsia Global Root CA G4 O=TrustAsia Technologies, Inc.
+# Label: "TrustAsia Global Root CA G4"
+# Serial: 451799571007117016466790293371524403291602933463
+# MD5 Fingerprint: 54:dd:b2:d7:5f:d8:3e:ed:7c:e0:0b:2e:cc:ed:eb:eb
+# SHA1 Fingerprint: 57:73:a5:61:5d:80:b2:e6:ac:38:82:fc:68:07:31:ac:9f:b5:92:5a
+# SHA256 Fingerprint: be:4b:56:cb:50:56:c0:13:6a:52:6d:f4:44:50:8d:aa:36:a0:b5:4f:42:e4:ac:38:f7:2a:f4:70:e4:79:65:4c
+-----BEGIN CERTIFICATE-----
+MIICVTCCAdygAwIBAgIUTyNkuI6XY57GU4HBdk7LKnQV1tcwCgYIKoZIzj0EAwMw
+WjELMAkGA1UEBhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dpZXMs
+IEluYy4xJDAiBgNVBAMMG1RydXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHNDAeFw0y
+MTA1MjAwMjEwMjJaFw00NjA1MTkwMjEwMjJaMFoxCzAJBgNVBAYTAkNOMSUwIwYD
+VQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDDBtUcnVz
+dEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATx
+s8045CVD5d4ZCbuBeaIVXxVjAd7Cq92zphtnS4CDr5nLrBfbK5bKfFJV4hrhPVbw
+LxYI+hW8m7tH5j/uqOFMjPXTNvk4XatwmkcN4oFBButJ+bAp3TPsUKV/eSm4IJij
+YzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUpbtKl86zK3+kMd6Xg1mD
+pm9xy94wHQYDVR0OBBYEFKW7SpfOsyt/pDHel4NZg6ZvccveMA4GA1UdDwEB/wQE
+AwIBBjAKBggqhkjOPQQDAwNnADBkAjBe8usGzEkxn0AAbbd+NvBNEU/zy4k6LHiR
+UKNbwMp1JvK/kF0LgoxgKJ/GcJpo5PECMFxYDlZ2z1jD1xCMuo6u47xkdUfFVZDj
+/bpV6wfEU6s3qe4hsiFbYI89MvHVI5TWWA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=CommScope Public Trust ECC Root-01 O=CommScope
+# Subject: CN=CommScope Public Trust ECC Root-01 O=CommScope
+# Label: "CommScope Public Trust ECC Root-01"
+# Serial: 385011430473757362783587124273108818652468453534
+# MD5 Fingerprint: 3a:40:a7:fc:03:8c:9c:38:79:2f:3a:a2:6c:b6:0a:16
+# SHA1 Fingerprint: 07:86:c0:d8:dd:8e:c0:80:98:06:98:d0:58:7a:ef:de:a6:cc:a2:5d
+# SHA256 Fingerprint: 11:43:7c:da:7b:b4:5e:41:36:5f:45:b3:9a:38:98:6b:0d:e0:0d:ef:34:8e:0c:7b:b0:87:36:33:80:0b:c3:8b
+-----BEGIN CERTIFICATE-----
+MIICHTCCAaOgAwIBAgIUQ3CCd89NXTTxyq4yLzf39H91oJ4wCgYIKoZIzj0EAwMw
+TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t
+bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMTAeFw0yMTA0MjgxNzM1NDNa
+Fw00NjA0MjgxNzM1NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv
+cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDEw
+djAQBgcqhkjOPQIBBgUrgQQAIgNiAARLNumuV16ocNfQj3Rid8NeeqrltqLxeP0C
+flfdkXmcbLlSiFS8LwS+uM32ENEp7LXQoMPwiXAZu1FlxUOcw5tjnSCDPgYLpkJE
+hRGnSjot6dZoL0hOUysHP029uax3OVejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSOB2LAUN3GGQYARnQE9/OufXVNMDAKBggq
+hkjOPQQDAwNoADBlAjEAnDPfQeMjqEI2Jpc1XHvr20v4qotzVRVcrHgpD7oh2MSg
+2NED3W3ROT3Ek2DS43KyAjB8xX6I01D1HiXo+k515liWpDVfG2XqYZpwI7UNo5uS
+Um9poIyNStDuiw7LR47QjRE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=CommScope Public Trust ECC Root-02 O=CommScope
+# Subject: CN=CommScope Public Trust ECC Root-02 O=CommScope
+# Label: "CommScope Public Trust ECC Root-02"
+# Serial: 234015080301808452132356021271193974922492992893
+# MD5 Fingerprint: 59:b0:44:d5:65:4d:b8:5c:55:19:92:02:b6:d1:94:b2
+# SHA1 Fingerprint: 3c:3f:ef:57:0f:fe:65:93:86:9e:a0:fe:b0:f6:ed:8e:d1:13:c7:e5
+# SHA256 Fingerprint: 2f:fb:7f:81:3b:bb:b3:c8:9a:b4:e8:16:2d:0f:16:d7:15:09:a8:30:cc:9d:73:c2:62:e5:14:08:75:d1:ad:4a
+-----BEGIN CERTIFICATE-----
+MIICHDCCAaOgAwIBAgIUKP2ZYEFHpgE6yhR7H+/5aAiDXX0wCgYIKoZIzj0EAwMw
+TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t
+bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMjAeFw0yMTA0MjgxNzQ0NTRa
+Fw00NjA0MjgxNzQ0NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv
+cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDIw
+djAQBgcqhkjOPQIBBgUrgQQAIgNiAAR4MIHoYx7l63FRD/cHB8o5mXxO1Q/MMDAL
+j2aTPs+9xYa9+bG3tD60B8jzljHz7aRP+KNOjSkVWLjVb3/ubCK1sK9IRQq9qEmU
+v4RDsNuESgMjGWdqb8FuvAY5N9GIIvejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTmGHX/72DehKT1RsfeSlXjMjZ59TAKBggq
+hkjOPQQDAwNnADBkAjAmc0l6tqvmSfR9Uj/UQQSugEODZXW5hYA4O9Zv5JOGq4/n
+ich/m35rChJVYaoR4HkCMHfoMXGsPHED1oQmHhS48zs73u1Z/GtMMH9ZzkXpc2AV
+mkzw5l4lIhVtwodZ0LKOag==
+-----END CERTIFICATE-----
+
+# Issuer: CN=CommScope Public Trust RSA Root-01 O=CommScope
+# Subject: CN=CommScope Public Trust RSA Root-01 O=CommScope
+# Label: "CommScope Public Trust RSA Root-01"
+# Serial: 354030733275608256394402989253558293562031411421
+# MD5 Fingerprint: 0e:b4:15:bc:87:63:5d:5d:02:73:d4:26:38:68:73:d8
+# SHA1 Fingerprint: 6d:0a:5f:f7:b4:23:06:b4:85:b3:b7:97:64:fc:ac:75:f5:33:f2:93
+# SHA256 Fingerprint: 02:bd:f9:6e:2a:45:dd:9b:f1:8f:c7:e1:db:df:21:a0:37:9b:a3:c9:c2:61:03:44:cf:d8:d6:06:fe:c1:ed:81
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIUPgNJgXUWdDGOTKvVxZAplsU5EN0wDQYJKoZIhvcNAQEL
+BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi
+Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMTAeFw0yMTA0MjgxNjQ1
+NTRaFw00NjA0MjgxNjQ1NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t
+U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt
+MDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwSGWjDR1C45FtnYSk
+YZYSwu3D2iM0GXb26v1VWvZVAVMP8syMl0+5UMuzAURWlv2bKOx7dAvnQmtVzslh
+suitQDy6uUEKBU8bJoWPQ7VAtYXR1HHcg0Hz9kXHgKKEUJdGzqAMxGBWBB0HW0al
+DrJLpA6lfO741GIDuZNqihS4cPgugkY4Iw50x2tBt9Apo52AsH53k2NC+zSDO3Oj
+WiE260f6GBfZumbCk6SP/F2krfxQapWsvCQz0b2If4b19bJzKo98rwjyGpg/qYFl
+P8GMicWWMJoKz/TUyDTtnS+8jTiGU+6Xn6myY5QXjQ/cZip8UlF1y5mO6D1cv547
+KI2DAg+pn3LiLCuz3GaXAEDQpFSOm117RTYm1nJD68/A6g3czhLmfTifBSeolz7p
+UcZsBSjBAg/pGG3svZwG1KdJ9FQFa2ww8esD1eo9anbCyxooSU1/ZOD6K9pzg4H/
+kQO9lLvkuI6cMmPNn7togbGEW682v3fuHX/3SZtS7NJ3Wn2RnU3COS3kuoL4b/JO
+Hg9O5j9ZpSPcPYeoKFgo0fEbNttPxP/hjFtyjMcmAyejOQoBqsCyMWCDIqFPEgkB
+Ea801M/XrmLTBQe0MXXgDW1XT2mH+VepuhX2yFJtocucH+X8eKg1mp9BFM6ltM6U
+CBwJrVbl2rZJmkrqYxhTnCwuwwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUN12mmnQywsL5x6YVEFm45P3luG0wDQYJ
+KoZIhvcNAQELBQADggIBAK+nz97/4L1CjU3lIpbfaOp9TSp90K09FlxD533Ahuh6
+NWPxzIHIxgvoLlI1pKZJkGNRrDSsBTtXAOnTYtPZKdVUvhwQkZyybf5Z/Xn36lbQ
+nmhUQo8mUuJM3y+Xpi/SB5io82BdS5pYV4jvguX6r2yBS5KPQJqTRlnLX3gWsWc+
+QgvfKNmwrZggvkN80V4aCRckjXtdlemrwWCrWxhkgPut4AZ9HcpZuPN4KWfGVh2v
+trV0KnahP/t1MJ+UXjulYPPLXAziDslg+MkfFoom3ecnf+slpoq9uC02EJqxWE2a
+aE9gVOX2RhOOiKy8IUISrcZKiX2bwdgt6ZYD9KJ0DLwAHb/WNyVntHKLr4W96ioD
+j8z7PEQkguIBpQtZtjSNMgsSDesnwv1B10A8ckYpwIzqug/xBpMu95yo9GA+o/E4
+Xo4TwbM6l4c/ksp4qRyv0LAbJh6+cOx69TOY6lz/KwsETkPdY34Op054A5U+1C0w
+lREQKC6/oAI+/15Z0wUOlV9TRe9rh9VIzRamloPh37MG88EU26fsHItdkJANclHn
+YfkUyq+Dj7+vsQpZXdxc1+SWrVtgHdqul7I52Qb1dgAT+GhMIbA1xNxVssnBQVoc
+icCMb3SgazNNtQEo/a2tiRc7ppqEvOuM6sRxJKi6KfkIsidWNTJf6jn7MZrVGczw
+-----END CERTIFICATE-----
+
+# Issuer: CN=CommScope Public Trust RSA Root-02 O=CommScope
+# Subject: CN=CommScope Public Trust RSA Root-02 O=CommScope
+# Label: "CommScope Public Trust RSA Root-02"
+# Serial: 480062499834624527752716769107743131258796508494
+# MD5 Fingerprint: e1:29:f9:62:7b:76:e2:96:6d:f3:d4:d7:0f:ae:1f:aa
+# SHA1 Fingerprint: ea:b0:e2:52:1b:89:93:4c:11:68:f2:d8:9a:ac:22:4c:a3:8a:57:ae
+# SHA256 Fingerprint: ff:e9:43:d7:93:42:4b:4f:7c:44:0c:1c:3d:64:8d:53:63:f3:4b:82:dc:87:aa:7a:9f:11:8f:c5:de:e1:01:f1
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIUVBa/O345lXGN0aoApYYNK496BU4wDQYJKoZIhvcNAQEL
+BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi
+Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMjAeFw0yMTA0MjgxNzE2
+NDNaFw00NjA0MjgxNzE2NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t
+U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt
+MDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDh+g77aAASyE3VrCLE
+NQE7xVTlWXZjpX/rwcRqmL0yjReA61260WI9JSMZNRTpf4mnG2I81lDnNJUDMrG0
+kyI9p+Kx7eZ7Ti6Hmw0zdQreqjXnfuU2mKKuJZ6VszKWpCtYHu8//mI0SFHRtI1C
+rWDaSWqVcN3SAOLMV2MCe5bdSZdbkk6V0/nLKR8YSvgBKtJjCW4k6YnS5cciTNxz
+hkcAqg2Ijq6FfUrpuzNPDlJwnZXjfG2WWy09X6GDRl224yW4fKcZgBzqZUPckXk2
+LHR88mcGyYnJ27/aaL8j7dxrrSiDeS/sOKUNNwFnJ5rpM9kzXzehxfCrPfp4sOcs
+n/Y+n2Dg70jpkEUeBVF4GiwSLFworA2iI540jwXmojPOEXcT1A6kHkIfhs1w/tku
+FT0du7jyU1fbzMZ0KZwYszZ1OC4PVKH4kh+Jlk+71O6d6Ts2QrUKOyrUZHk2EOH5
+kQMreyBUzQ0ZGshBMjTRsJnhkB4BQDa1t/qp5Xd1pCKBXbCL5CcSD1SIxtuFdOa3
+wNemKfrb3vOTlycEVS8KbzfFPROvCgCpLIscgSjX74Yxqa7ybrjKaixUR9gqiC6v
+wQcQeKwRoi9C8DfF8rhW3Q5iLc4tVn5V8qdE9isy9COoR+jUKgF4z2rDN6ieZdIs
+5fq6M8EGRPbmz6UNp2YINIos8wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR9DnsSL/nSz12Vdgs7GxcJXvYXowDQYJ
+KoZIhvcNAQELBQADggIBAIZpsU0v6Z9PIpNojuQhmaPORVMbc0RTAIFhzTHjCLqB
+KCh6krm2qMhDnscTJk3C2OVVnJJdUNjCK9v+5qiXz1I6JMNlZFxHMaNlNRPDk7n3
++VGXu6TwYofF1gbTl4MgqX67tiHCpQ2EAOHyJxCDut0DgdXdaMNmEMjRdrSzbyme
+APnCKfWxkxlSaRosTKCL4BWaMS/TiJVZbuXEs1DIFAhKm4sTg7GkcrI7djNB3Nyq
+pgdvHSQSn8h2vS/ZjvQs7rfSOBAkNlEv41xdgSGn2rtO/+YHqP65DSdsu3BaVXoT
+6fEqSWnHX4dXTEN5bTpl6TBcQe7rd6VzEojov32u5cSoHw2OHG1QAk8mGEPej1WF
+sQs3BWDJVTkSBKEqz3EWnzZRSb9wO55nnPt7eck5HHisd5FUmrh1CoFSl+NmYWvt
+PjgelmFV4ZFUjO2MJB+ByRCac5krFk5yAD9UG/iNuovnFNa2RU9g7Jauwy8CTl2d
+lklyALKrdVwPaFsdZcJfMw8eD/A7hvWwTruc9+olBdytoptLFwG+Qt81IR2tq670
+v64fG9PiO/yzcnMcmyiQiRM9HcEARwmWmjgb3bHPDcK0RPOWlc4yOo80nOAXx17O
+rg3bhzjlP1v9mxnhMUF6cKojawHhRUzNlM47ni3niAIi9G7oyOzWPPO5std3eqx7
+-----END CERTIFICATE-----
+
+# Issuer: CN=Telekom Security TLS ECC Root 2020 O=Deutsche Telekom Security GmbH
+# Subject: CN=Telekom Security TLS ECC Root 2020 O=Deutsche Telekom Security GmbH
+# Label: "Telekom Security TLS ECC Root 2020"
+# Serial: 72082518505882327255703894282316633856
+# MD5 Fingerprint: c1:ab:fe:6a:10:2c:03:8d:bc:1c:22:32:c0:85:a7:fd
+# SHA1 Fingerprint: c0:f8:96:c5:a9:3b:01:06:21:07:da:18:42:48:bc:e9:9d:88:d5:ec
+# SHA256 Fingerprint: 57:8a:f4:de:d0:85:3f:4e:59:98:db:4a:ea:f9:cb:ea:8d:94:5f:60:b6:20:a3:8d:1a:3c:13:b2:bc:7b:a8:e1
+-----BEGIN CERTIFICATE-----
+MIICQjCCAcmgAwIBAgIQNjqWjMlcsljN0AFdxeVXADAKBggqhkjOPQQDAzBjMQsw
+CQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBH
+bWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBFQ0MgUm9vdCAyMDIw
+MB4XDTIwMDgyNTA3NDgyMFoXDTQ1MDgyNTIzNTk1OVowYzELMAkGA1UEBhMCREUx
+JzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkGA1UE
+AwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgRUNDIFJvb3QgMjAyMDB2MBAGByqGSM49
+AgEGBSuBBAAiA2IABM6//leov9Wq9xCazbzREaK9Z0LMkOsVGJDZos0MKiXrPk/O
+tdKPD/M12kOLAoC+b1EkHQ9rK8qfwm9QMuU3ILYg/4gND21Ju9sGpIeQkpT0CdDP
+f8iAC8GXs7s1J8nCG6NCMEAwHQYDVR0OBBYEFONyzG6VmUex5rNhTNHLq+O6zd6f
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2cA
+MGQCMHVSi7ekEE+uShCLsoRbQuHmKjYC2qBuGT8lv9pZMo7k+5Dck2TOrbRBR2Di
+z6fLHgIwN0GMZt9Ba9aDAEH9L1r3ULRn0SyocddDypwnJJGDSA3PzfdUga/sf+Rn
+27iQ7t0l
+-----END CERTIFICATE-----
+
+# Issuer: CN=Telekom Security TLS RSA Root 2023 O=Deutsche Telekom Security GmbH
+# Subject: CN=Telekom Security TLS RSA Root 2023 O=Deutsche Telekom Security GmbH
+# Label: "Telekom Security TLS RSA Root 2023"
+# Serial: 44676229530606711399881795178081572759
+# MD5 Fingerprint: bf:5b:eb:54:40:cd:48:71:c4:20:8d:7d:de:0a:42:f2
+# SHA1 Fingerprint: 54:d3:ac:b3:bd:57:56:f6:85:9d:ce:e5:c3:21:e2:d4:ad:83:d0:93
+# SHA256 Fingerprint: ef:c6:5c:ad:bb:59:ad:b6:ef:e8:4d:a2:23:11:b3:56:24:b7:1b:3b:1e:a0:da:8b:66:55:17:4e:c8:97:86:46
+-----BEGIN CERTIFICATE-----
+MIIFszCCA5ugAwIBAgIQIZxULej27HF3+k7ow3BXlzANBgkqhkiG9w0BAQwFADBj
+MQswCQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0
+eSBHbWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBSU0EgUm9vdCAy
+MDIzMB4XDTIzMDMyODEyMTY0NVoXDTQ4MDMyNzIzNTk1OVowYzELMAkGA1UEBhMC
+REUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkG
+A1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgUlNBIFJvb3QgMjAyMzCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAO01oYGA88tKaVvC+1GDrib94W7zgRJ9
+cUD/h3VCKSHtgVIs3xLBGYSJwb3FKNXVS2xE1kzbB5ZKVXrKNoIENqil/Cf2SfHV
+cp6R+SPWcHu79ZvB7JPPGeplfohwoHP89v+1VmLhc2o0mD6CuKyVU/QBoCcHcqMA
+U6DksquDOFczJZSfvkgdmOGjup5czQRxUX11eKvzWarE4GC+j4NSuHUaQTXtvPM6
+Y+mpFEXX5lLRbtLevOP1Czvm4MS9Q2QTps70mDdsipWol8hHD/BeEIvnHRz+sTug
+BTNoBUGCwQMrAcjnj02r6LX2zWtEtefdi+zqJbQAIldNsLGyMcEWzv/9FIS3R/qy
+8XDe24tsNlikfLMR0cN3f1+2JeANxdKz+bi4d9s3cXFH42AYTyS2dTd4uaNir73J
+co4vzLuu2+QVUhkHM/tqty1LkCiCc/4YizWN26cEar7qwU02OxY2kTLvtkCJkUPg
+8qKrBC7m8kwOFjQgrIfBLX7JZkcXFBGk8/ehJImr2BrIoVyxo/eMbcgByU/J7MT8
+rFEz0ciD0cmfHdRHNCk+y7AO+oMLKFjlKdw/fKifybYKu6boRhYPluV75Gp6SG12
+mAWl3G0eQh5C2hrgUve1g8Aae3g1LDj1H/1Joy7SWWO/gLCMk3PLNaaZlSJhZQNg
++y+TS/qanIA7AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtqeX
+gj10hZv3PJ+TmpV5dVKMbUcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS2
+p5eCPXSFm/c8n5OalXl1UoxtRzANBgkqhkiG9w0BAQwFAAOCAgEAqMxhpr51nhVQ
+pGv7qHBFfLp+sVr8WyP6Cnf4mHGCDG3gXkaqk/QeoMPhk9tLrbKmXauw1GLLXrtm
+9S3ul0A8Yute1hTWjOKWi0FpkzXmuZlrYrShF2Y0pmtjxrlO8iLpWA1WQdH6DErw
+M807u20hOq6OcrXDSvvpfeWxm4bu4uB9tPcy/SKE8YXJN3nptT+/XOR0so8RYgDd
+GGah2XsjX/GO1WfoVNpbOms2b/mBsTNHM3dA+VKq3dSDz4V4mZqTuXNnQkYRIer+
+CqkbGmVps4+uFrb2S1ayLfmlyOw7YqPta9BO1UAJpB+Y1zqlklkg5LB9zVtzaL1t
+xKITDmcZuI1CfmwMmm6gJC3VRRvcxAIU/oVbZZfKTpBQCHpCNfnqwmbU+AGuHrS+
+w6jv/naaoqYfRvaE7fzbzsQCzndILIyy7MMAo+wsVRjBfhnu4S/yrYObnqsZ38aK
+L4x35bcF7DvB7L6Gs4a8wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+lj
+X273CXE2whJdV/LItM3z7gLfEdxquVeEHVlNjM7IDiPCtyaaEBRx/pOyiriA8A4Q
+ntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0o82bNSQ3+pCTE4FCxpgm
+dTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
+-----END CERTIFICATE-----
diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
index c3e546604c8..70e0c3bdbd2 100644
--- a/src/pip/_vendor/certifi/core.py
+++ b/src/pip/_vendor/certifi/core.py
@@ -5,6 +5,10 @@
 This module returns the installation location of cacert.pem or its contents.
 """
 import sys
+import atexit
+
+def exit_cacert_ctx() -> None:
+    _CACERT_CTX.__exit__(None, None, None)  # type: ignore[union-attr]
 
 
 if sys.version_info >= (3, 11):
@@ -35,6 +39,7 @@ def where() -> str:
             # we will also store that at the global level as well.
             _CACERT_CTX = as_file(files("pip._vendor.certifi").joinpath("cacert.pem"))
             _CACERT_PATH = str(_CACERT_CTX.__enter__())
+            atexit.register(exit_cacert_ctx)
 
         return _CACERT_PATH
 
@@ -70,6 +75,7 @@ def where() -> str:
             # we will also store that at the global level as well.
             _CACERT_CTX = get_path("pip._vendor.certifi", "cacert.pem")
             _CACERT_PATH = str(_CACERT_CTX.__enter__())
+            atexit.register(exit_cacert_ctx)
 
         return _CACERT_PATH
 
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 49c26a03237..f00a8c02db4 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -8,7 +8,7 @@ platformdirs==4.2.0
 pyparsing==3.1.0
 pyproject-hooks==1.0.0
 requests==2.31.0
-    certifi==2023.7.22
+    certifi==2024.2.2
     chardet==5.2.0
     idna==3.6
     urllib3==1.26.18
diff --git a/tools/vendoring/patches/certifi.patch b/tools/vendoring/patches/certifi.patch
index 4f03c62fbde..7326de77724 100644
--- a/tools/vendoring/patches/certifi.patch
+++ b/tools/vendoring/patches/certifi.patch
@@ -1,14 +1,15 @@
 diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
-index de028981b..c3e546604 100644
+index 91f538bb1..70e0c3bdb 100644
 --- a/src/pip/_vendor/certifi/core.py
 +++ b/src/pip/_vendor/certifi/core.py
-@@ -33,13 +33,13 @@ def where() -> str:
+@@ -37,14 +37,14 @@ if sys.version_info >= (3, 11):
              # We also have to hold onto the actual context manager, because
              # it will do the cleanup whenever it gets garbage collected, so
              # we will also store that at the global level as well.
 -            _CACERT_CTX = as_file(files("certifi").joinpath("cacert.pem"))
 +            _CACERT_CTX = as_file(files("pip._vendor.certifi").joinpath("cacert.pem"))
              _CACERT_PATH = str(_CACERT_CTX.__enter__())
+             atexit.register(exit_cacert_ctx)
  
          return _CACERT_PATH
  
@@ -18,13 +19,14 @@ index de028981b..c3e546604 100644
  
  elif sys.version_info >= (3, 7):
  
-@@ -68,13 +68,13 @@ def where() -> str:
+@@ -73,14 +73,14 @@ elif sys.version_info >= (3, 7):
              # We also have to hold onto the actual context manager, because
              # it will do the cleanup whenever it gets garbage collected, so
              # we will also store that at the global level as well.
 -            _CACERT_CTX = get_path("certifi", "cacert.pem")
 +            _CACERT_CTX = get_path("pip._vendor.certifi", "cacert.pem")
              _CACERT_PATH = str(_CACERT_CTX.__enter__())
+             atexit.register(exit_cacert_ctx)
  
          return _CACERT_PATH
  
@@ -34,7 +36,7 @@ index de028981b..c3e546604 100644
  
  else:
      import os
-@@ -105,4 +105,4 @@ def where() -> str:
+@@ -111,4 +111,4 @@ else:
          return os.path.join(f, "cacert.pem")
  
      def contents() -> str:

From 79a91ab542f914686670fb11e1c0cb2dd6f533c8 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 11 Mar 2024 13:25:51 -0400
Subject: [PATCH 269/992] Guard requests imports in exceptions.py under
 TYPE_CHECKING

Running `pip show packaging` now results in 420 entries in sys.modules
instead of 607.
---
 src/pip/_internal/exceptions.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index 29acd9babc6..0609e450683 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -15,7 +15,6 @@
 from itertools import chain, groupby, repeat
 from typing import TYPE_CHECKING, Dict, Iterator, List, Literal, Optional, Union
 
-from pip._vendor.requests.models import Request, Response
 from pip._vendor.rich.console import Console, ConsoleOptions, RenderResult
 from pip._vendor.rich.markup import escape
 from pip._vendor.rich.text import Text
@@ -23,6 +22,8 @@
 if TYPE_CHECKING:
     from hashlib import _Hash
 
+    from pip._vendor.requests.models import Request, Response
+
     from pip._internal.metadata import BaseDistribution
     from pip._internal.req.req_install import InstallRequirement
 
@@ -293,8 +294,8 @@ class NetworkConnectionError(PipError):
     def __init__(
         self,
         error_msg: str,
-        response: Optional[Response] = None,
-        request: Optional[Request] = None,
+        response: Optional["Response"] = None,
+        request: Optional["Request"] = None,
     ) -> None:
         """
         Initialize NetworkConnectionError with  `request` and `response`

From a7b6ba694caf10d32e1e2bb3fdbb40f841893e4a Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 11 Mar 2024 14:53:51 -0400
Subject: [PATCH 270/992] Lazy import pip.network in req_file.py

This notably helps pip freeze which doesn't need the network unless a
URL is given as a requirement file.
---
 src/pip/_internal/req/req_file.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index 58cf94cd25f..6f474bce49a 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -25,13 +25,12 @@
 from pip._internal.cli import cmdoptions
 from pip._internal.exceptions import InstallationError, RequirementsFileParseError
 from pip._internal.models.search_scope import SearchScope
-from pip._internal.network.session import PipSession
-from pip._internal.network.utils import raise_for_status
 from pip._internal.utils.encoding import auto_decode
 from pip._internal.utils.urls import get_url_scheme
 
 if TYPE_CHECKING:
     from pip._internal.index.package_finder import PackageFinder
+    from pip._internal.network.session import PipSession
 
 __all__ = ["parse_requirements"]
 
@@ -133,7 +132,7 @@ def __init__(
 
 def parse_requirements(
     filename: str,
-    session: PipSession,
+    session: "PipSession",
     finder: Optional["PackageFinder"] = None,
     options: Optional[optparse.Values] = None,
     constraint: bool = False,
@@ -210,7 +209,7 @@ def handle_option_line(
     lineno: int,
     finder: Optional["PackageFinder"] = None,
     options: Optional[optparse.Values] = None,
-    session: Optional[PipSession] = None,
+    session: Optional["PipSession"] = None,
 ) -> None:
     if opts.hashes:
         logger.warning(
@@ -278,7 +277,7 @@ def handle_line(
     line: ParsedLine,
     options: Optional[optparse.Values] = None,
     finder: Optional["PackageFinder"] = None,
-    session: Optional[PipSession] = None,
+    session: Optional["PipSession"] = None,
 ) -> Optional[ParsedRequirement]:
     """Handle a single parsed requirements line; This can result in
     creating/yielding requirements, or updating the finder.
@@ -321,7 +320,7 @@ def handle_line(
 class RequirementsFileParser:
     def __init__(
         self,
-        session: PipSession,
+        session: "PipSession",
         line_parser: LineParser,
     ) -> None:
         self._session = session
@@ -526,7 +525,7 @@ def expand_env_variables(lines_enum: ReqFileLines) -> ReqFileLines:
         yield line_number, line
 
 
-def get_file_content(url: str, session: PipSession) -> Tuple[str, str]:
+def get_file_content(url: str, session: "PipSession") -> Tuple[str, str]:
     """Gets the content of a file; it may be a filename, file: URL, or
     http: URL.  Returns (location, content).  Content is unicode.
     Respects # -*- coding: declarations on the retrieved files.
@@ -538,6 +537,9 @@ def get_file_content(url: str, session: PipSession) -> Tuple[str, str]:
 
     # Pip has special support for file:// URLs (LocalFSAdapter).
     if scheme in ["http", "https", "file"]:
+        # Delay importing heavy network modules until absolutely necessary.
+        from pip._internal.network.utils import raise_for_status
+
         resp = session.get(url)
         raise_for_status(resp)
         return resp.url, resp.text

From e7c66cdd1d0119097ff35a6984935b7b46472cec Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 11 Mar 2024 15:02:12 -0400
Subject: [PATCH 271/992] Guard PackageFinder imports under TYPE_CHECKING in
 distributions

So freeze doesn't need to import the index/network modules.
---
 src/pip/_internal/distributions/base.py  |  8 +++++---
 src/pip/_internal/distributions/sdist.py | 12 +++++++-----
 src/pip/_internal/distributions/wheel.py |  8 +++++---
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/pip/_internal/distributions/base.py b/src/pip/_internal/distributions/base.py
index 6fb0d7b7772..6e4d0c91a90 100644
--- a/src/pip/_internal/distributions/base.py
+++ b/src/pip/_internal/distributions/base.py
@@ -1,10 +1,12 @@
 import abc
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
-from pip._internal.index.package_finder import PackageFinder
 from pip._internal.metadata.base import BaseDistribution
 from pip._internal.req import InstallRequirement
 
+if TYPE_CHECKING:
+    from pip._internal.index.package_finder import PackageFinder
+
 
 class AbstractDistribution(metaclass=abc.ABCMeta):
     """A base class for handling installable artifacts.
@@ -44,7 +46,7 @@ def get_metadata_distribution(self) -> BaseDistribution:
     @abc.abstractmethod
     def prepare_distribution_metadata(
         self,
-        finder: PackageFinder,
+        finder: "PackageFinder",
         build_isolation: bool,
         check_build_deps: bool,
     ) -> None:
diff --git a/src/pip/_internal/distributions/sdist.py b/src/pip/_internal/distributions/sdist.py
index 4cb0e453969..28ea5cea16c 100644
--- a/src/pip/_internal/distributions/sdist.py
+++ b/src/pip/_internal/distributions/sdist.py
@@ -1,13 +1,15 @@
 import logging
-from typing import Iterable, Optional, Set, Tuple
+from typing import TYPE_CHECKING, Iterable, Optional, Set, Tuple
 
 from pip._internal.build_env import BuildEnvironment
 from pip._internal.distributions.base import AbstractDistribution
 from pip._internal.exceptions import InstallationError
-from pip._internal.index.package_finder import PackageFinder
 from pip._internal.metadata import BaseDistribution
 from pip._internal.utils.subprocess import runner_with_spinner_message
 
+if TYPE_CHECKING:
+    from pip._internal.index.package_finder import PackageFinder
+
 logger = logging.getLogger(__name__)
 
 
@@ -29,7 +31,7 @@ def get_metadata_distribution(self) -> BaseDistribution:
 
     def prepare_distribution_metadata(
         self,
-        finder: PackageFinder,
+        finder: "PackageFinder",
         build_isolation: bool,
         check_build_deps: bool,
     ) -> None:
@@ -66,7 +68,7 @@ def prepare_distribution_metadata(
                 self._raise_missing_reqs(missing)
         self.req.prepare_metadata()
 
-    def _prepare_build_backend(self, finder: PackageFinder) -> None:
+    def _prepare_build_backend(self, finder: "PackageFinder") -> None:
         # Isolate in a BuildEnvironment and install the build-time
         # requirements.
         pyproject_requires = self.req.pyproject_requires
@@ -110,7 +112,7 @@ def _get_build_requires_editable(self) -> Iterable[str]:
             with backend.subprocess_runner(runner):
                 return backend.get_requires_for_build_editable()
 
-    def _install_build_reqs(self, finder: PackageFinder) -> None:
+    def _install_build_reqs(self, finder: "PackageFinder") -> None:
         # Install any extra build dependencies that the backend requests.
         # This must be done in a second pass, as the pyproject.toml
         # dependencies must be installed before we can call the backend.
diff --git a/src/pip/_internal/distributions/wheel.py b/src/pip/_internal/distributions/wheel.py
index eb16e25cbcc..bfadd39dcb7 100644
--- a/src/pip/_internal/distributions/wheel.py
+++ b/src/pip/_internal/distributions/wheel.py
@@ -1,15 +1,17 @@
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 from pip._vendor.packaging.utils import canonicalize_name
 
 from pip._internal.distributions.base import AbstractDistribution
-from pip._internal.index.package_finder import PackageFinder
 from pip._internal.metadata import (
     BaseDistribution,
     FilesystemWheel,
     get_wheel_distribution,
 )
 
+if TYPE_CHECKING:
+    from pip._internal.index.package_finder import PackageFinder
+
 
 class WheelDistribution(AbstractDistribution):
     """Represents a wheel distribution.
@@ -33,7 +35,7 @@ def get_metadata_distribution(self) -> BaseDistribution:
 
     def prepare_distribution_metadata(
         self,
-        finder: PackageFinder,
+        finder: "PackageFinder",
         build_isolation: bool,
         check_build_deps: bool,
     ) -> None:

From 17b6a6419681867b605e2b3227c00c7820287310 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 11 Mar 2024 15:12:43 -0400
Subject: [PATCH 272/992] Import Command directly from base_command.py for pip
 inspect

... to avoid importing all of the network/index related modules.
---
 src/pip/_internal/commands/inspect.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/commands/inspect.py b/src/pip/_internal/commands/inspect.py
index 27c8fa3d5b6..e810c13166b 100644
--- a/src/pip/_internal/commands/inspect.py
+++ b/src/pip/_internal/commands/inspect.py
@@ -7,7 +7,7 @@
 
 from pip import __version__
 from pip._internal.cli import cmdoptions
-from pip._internal.cli.req_command import Command
+from pip._internal.cli.base_command import Command
 from pip._internal.cli.status_codes import SUCCESS
 from pip._internal.metadata import BaseDistribution, get_environment
 from pip._internal.utils.compat import stdlib_pkgs

From 428c86b3ac4b6007138f481cfe91aa4934bfeb7f Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 11 Mar 2024 15:50:32 -0400
Subject: [PATCH 273/992] Add test to ensure we don't regress

---
 tests/unit/test_commands.py | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/unit/test_commands.py b/tests/unit/test_commands.py
index 7a5c4e8319d..3fa08586067 100644
--- a/tests/unit/test_commands.py
+++ b/tests/unit/test_commands.py
@@ -1,3 +1,5 @@
+import subprocess
+import sys
 from typing import Callable, List
 from unittest import mock
 
@@ -120,3 +122,35 @@ def is_requirement_command(command: Command) -> bool:
         return isinstance(command, RequirementCommand)
 
     check_commands(is_requirement_command, ["download", "install", "wheel"])
+
+
+@pytest.mark.parametrize(
+    "command", ["cache", "check", "config", "freeze", "hash", "help", "inspect", "show"]
+)
+def test_no_network_imports(command: str) -> None:
+    """
+    Verify that commands that don't access the network do NOT import network code.
+
+    This helps to reduce the startup time of these commands.
+
+    Note: This won't catch lazy network imports, but it'll catch top-level
+    network imports which were accidently added (which is the most likely way
+    to regress anyway).
+    """
+    code = f"""
+import sys
+from pip._internal.commands import create_command
+
+command = create_command("{command}")
+names = sorted(mod.__name__ for mod in sys.modules.values())
+for mod in names:
+    print(mod)
+    """
+    proc = subprocess.run(
+        [sys.executable], encoding="utf-8", input=code, capture_output=True, check=True
+    )
+    imported = proc.stdout.splitlines()
+    assert not any("pip._internal.index" in mod for mod in imported)
+    assert not any("pip._internal.network" in mod for mod in imported)
+    assert not any("requests" in mod for mod in imported)
+    assert not any("urllib3" in mod for mod in imported)

From 72e2366f32a37fad91683777e7723784120db8dd Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 11 Mar 2024 16:32:09 -0400
Subject: [PATCH 274/992] =?UTF-8?q?=F0=9F=93=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 news/4768.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/4768.feature.rst

diff --git a/news/4768.feature.rst b/news/4768.feature.rst
new file mode 100644
index 00000000000..df69a245a65
--- /dev/null
+++ b/news/4768.feature.rst
@@ -0,0 +1 @@
+Reduce startup time of commands (e.g. show, freeze) that do not access the network by 15-30%.

From 0a7e040bb58fe7c7f5cccd0f1e6d3011416a35b4 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 11 Mar 2024 23:59:57 -0400
Subject: [PATCH 275/992] show: populate missing home-page from project-urls if
 possible

---
 news/11221.feature.rst             |  4 ++++
 src/pip/_internal/commands/show.py | 31 ++++++++++++++++++++++++------
 tests/functional/test_show.py      | 22 +++++++++++++++++++++
 3 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 news/11221.feature.rst

diff --git a/news/11221.feature.rst b/news/11221.feature.rst
new file mode 100644
index 00000000000..3d2cf7583ca
--- /dev/null
+++ b/news/11221.feature.rst
@@ -0,0 +1,4 @@
+Fallback to displaying "Home-page" Project-URL when the Home-Page metadata field is not set in ``pip show``.
+
+The Project-URL fallback is case-insensitive and ignores any dashes or
+underscores that may be present.
diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py
index cfd67420d0a..a92ce604409 100644
--- a/src/pip/_internal/commands/show.py
+++ b/src/pip/_internal/commands/show.py
@@ -1,6 +1,6 @@
 import logging
 from optparse import Values
-from typing import Generator, Iterable, Iterator, List, NamedTuple, Optional
+from typing import Dict, Generator, Iterable, Iterator, List, NamedTuple, Optional
 
 from pip._vendor.packaging.utils import canonicalize_name
 
@@ -61,7 +61,7 @@ class _PackageInfo(NamedTuple):
     classifiers: List[str]
     summary: str
     homepage: str
-    project_urls: List[str]
+    project_urls: Dict[str, str]
     author: str
     author_email: str
     license: str
@@ -121,6 +121,25 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
 
         metadata = dist.metadata
 
+        project_urls = {}
+        for url in metadata.get_all("Project-URL", []):
+            url_label, url = url.split(",", maxsplit=1)
+            project_urls[url_label.strip()] = url.strip()
+
+        homepage = metadata.get("Home-page", "")
+        if not homepage:
+            # It's common that there is a "homepage" Project-URL, but Home-page
+            # remains unset (especially as PEP 621 doesn't surface the field).
+            #
+            # This logic was taken from PyPI's codebase.
+            for url_label, url in project_urls.items():
+                normalized_label = (
+                    url_label.casefold().replace("-", "").replace("_", "")
+                )
+                if normalized_label == "homepage":
+                    homepage = url
+                    break
+
         yield _PackageInfo(
             name=dist.raw_name,
             version=str(dist.version),
@@ -132,8 +151,8 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
             metadata_version=dist.metadata_version or "",
             classifiers=metadata.get_all("Classifier", []),
             summary=metadata.get("Summary", ""),
-            homepage=metadata.get("Home-page", ""),
-            project_urls=metadata.get_all("Project-URL", []),
+            homepage=homepage,
+            project_urls=project_urls,
             author=metadata.get("Author", ""),
             author_email=metadata.get("Author-email", ""),
             license=metadata.get("License", ""),
@@ -181,8 +200,8 @@ def print_results(
             for entry in dist.entry_points:
                 write_output("  %s", entry.strip())
             write_output("Project-URLs:")
-            for project_url in dist.project_urls:
-                write_output("  %s", project_url)
+            for label, url in dist.project_urls.items():
+                write_output(f"  {label}, {url}")
         if list_files:
             write_output("Files:")
             if dist.files is None:
diff --git a/tests/functional/test_show.py b/tests/functional/test_show.py
index ad139240b77..7797de9e992 100644
--- a/tests/functional/test_show.py
+++ b/tests/functional/test_show.py
@@ -3,6 +3,8 @@
 import re
 import textwrap
 
+import pytest
+
 from pip import __version__
 from pip._internal.commands.show import search_packages_info
 from pip._internal.utils.unpacking import untar_file
@@ -387,3 +389,23 @@ def test_show_deduplicate_requirements(script: PipTestEnvironment) -> None:
     result = script.pip("show", "simple", cwd=pkg_path)
     lines = result.stdout.splitlines()
     assert "Requires: pip" in lines
+
+
+@pytest.mark.parametrize(
+    "project_url", ["Home-page", "home-page", "Homepage", "homepage"]
+)
+def test_show_populate_homepage_from_project_urls(
+    script: PipTestEnvironment, project_url: str
+) -> None:
+    pkg_path = create_test_package_with_setup(
+        script,
+        name="simple",
+        version="1.0",
+        project_urls={project_url: "https://example.com"},
+    )
+    script.run("python", "setup.py", "egg_info", expect_stderr=True, cwd=pkg_path)
+    script.environ.update({"PYTHONPATH": pkg_path})
+
+    result = script.pip("show", "simple", cwd=pkg_path)
+    lines = result.stdout.splitlines()
+    assert "Home-page: https://example.com" in lines

From 64f09b216698e0290a69152d997958247d5007b3 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 12 Mar 2024 14:42:46 -0400
Subject: [PATCH 276/992] =?UTF-8?q?Update=20=F0=9F=93=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Tzu-ping Chung 
---
 news/11221.feature.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/news/11221.feature.rst b/news/11221.feature.rst
index 3d2cf7583ca..319cc02c4a5 100644
--- a/news/11221.feature.rst
+++ b/news/11221.feature.rst
@@ -1,4 +1,3 @@
-Fallback to displaying "Home-page" Project-URL when the Home-Page metadata field is not set in ``pip show``.
+Display the Project-URL value under key "Home-page" in ``pip show`` when the Home-Page metadata field is not set.
 
-The Project-URL fallback is case-insensitive and ignores any dashes or
-underscores that may be present.
+The Project-URL key detection is case-insensitive, and ignores any dashes and underscores.

From e0cddaa454657c884817ea3a2642692cb2317b90 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 12 Mar 2024 14:43:06 -0400
Subject: [PATCH 277/992] Simplify logic

---
 src/pip/_internal/commands/show.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py
index a92ce604409..b7894ce1f9c 100644
--- a/src/pip/_internal/commands/show.py
+++ b/src/pip/_internal/commands/show.py
@@ -1,6 +1,6 @@
 import logging
 from optparse import Values
-from typing import Dict, Generator, Iterable, Iterator, List, NamedTuple, Optional
+from typing import Generator, Iterable, Iterator, List, NamedTuple, Optional
 
 from pip._vendor.packaging.utils import canonicalize_name
 
@@ -61,7 +61,7 @@ class _PackageInfo(NamedTuple):
     classifiers: List[str]
     summary: str
     homepage: str
-    project_urls: Dict[str, str]
+    project_urls: List[str]
     author: str
     author_email: str
     license: str
@@ -121,23 +121,20 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
 
         metadata = dist.metadata
 
-        project_urls = {}
-        for url in metadata.get_all("Project-URL", []):
-            url_label, url = url.split(",", maxsplit=1)
-            project_urls[url_label.strip()] = url.strip()
-
+        project_urls = metadata.get_all("Project-URL", [])
         homepage = metadata.get("Home-page", "")
         if not homepage:
             # It's common that there is a "homepage" Project-URL, but Home-page
             # remains unset (especially as PEP 621 doesn't surface the field).
             #
             # This logic was taken from PyPI's codebase.
-            for url_label, url in project_urls.items():
+            for url in project_urls:
+                url_label, url = url.split(",", maxsplit=1)
                 normalized_label = (
-                    url_label.casefold().replace("-", "").replace("_", "")
+                    url_label.casefold().replace("-", "").replace("_", "").strip()
                 )
                 if normalized_label == "homepage":
-                    homepage = url
+                    homepage = url.strip()
                     break
 
         yield _PackageInfo(
@@ -200,8 +197,8 @@ def print_results(
             for entry in dist.entry_points:
                 write_output("  %s", entry.strip())
             write_output("Project-URLs:")
-            for label, url in dist.project_urls.items():
-                write_output(f"  {label}, {url}")
+            for project_url in dist.project_urls:
+                write_output("  %s", project_url)
         if list_files:
             write_output("Files:")
             if dist.files is None:

From 734f6e9a2cb3f1d9a5a155c24e5abe4b47874632 Mon Sep 17 00:00:00 2001
From: ctg123 
Date: Thu, 14 Mar 2024 13:39:38 +0100
Subject: [PATCH 278/992] Display env vars for pip options in docs

Co-authored-by: luismedel 
---
 docs/pip_sphinxext.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/docs/pip_sphinxext.py b/docs/pip_sphinxext.py
index fe3f41e8b79..4d5a2f17238 100644
--- a/docs/pip_sphinxext.py
+++ b/docs/pip_sphinxext.py
@@ -14,9 +14,22 @@
 
 from pip._internal.cli import cmdoptions
 from pip._internal.commands import commands_dict, create_command
+from pip._internal.configuration import _normalize_name
 from pip._internal.req.req_file import SUPPORTED_OPTIONS
 
 
+def convert_cli_option_to_envvar(opt_name: str) -> str:
+    undashed_opt_name = _normalize_name(opt_name)
+    normalized_opt_name = undashed_opt_name.upper().replace("-", "_")
+    return f"PIP_{normalized_opt_name}"
+
+
+def convert_cli_opt_names_to_envvars(original_cli_opt_names: List[str]) -> List[str]:
+    return [
+        convert_cli_option_to_envvar(opt_name) for opt_name in original_cli_opt_names
+    ]
+
+
 class PipNewsInclude(rst.Directive):
     required_arguments = 1
 
@@ -130,7 +143,18 @@ def _format_option(
         opt_help = option.help.replace("%default", str(option.default))
         # fix paths with sys.prefix
         opt_help = opt_help.replace(sys.prefix, "")
-        return [bookmark_line, "", line, "", "    " + opt_help, ""]
+        env_var_names = convert_cli_opt_names_to_envvars(option._long_opts)
+        env_var_names_src = ", ".join(f"``{env_var}``" for env_var in env_var_names)
+        return [
+            bookmark_line,
+            "",
+            line,
+            "",
+            "    " + opt_help,
+            "",
+            f"    (environment variable: {env_var_names_src})",
+            "",
+        ]
 
     def _format_options(
         self, options: Iterable[optparse.Option], cmd_name: Optional[str] = None

From 218058b490631aaa7519b0e6b3d81f5904fcf7d1 Mon Sep 17 00:00:00 2001
From: Luis Medel 
Date: Thu, 14 Mar 2024 14:15:18 +0100
Subject: [PATCH 279/992] Add news/ file

---
 news/12576.doc.rst | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 news/12576.doc.rst

diff --git a/news/12576.doc.rst b/news/12576.doc.rst
new file mode 100644
index 00000000000..e69de29bb2d

From c25dbd5188b0ef30ca82252635bd8152211dfefc Mon Sep 17 00:00:00 2001
From: Luis Medel 
Date: Thu, 14 Mar 2024 14:23:06 +0100
Subject: [PATCH 280/992] Add missing text in news/ file :facepalm:

---
 news/12576.doc.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/news/12576.doc.rst b/news/12576.doc.rst
index e69de29bb2d..e60091dce45 100644
--- a/news/12576.doc.rst
+++ b/news/12576.doc.rst
@@ -0,0 +1 @@
+Display env vars for pip options in docs
\ No newline at end of file

From bbef552afcca0e441e52aa311bf2e9c5e6fc87bb Mon Sep 17 00:00:00 2001
From: Luis Medel 
Date: Thu, 14 Mar 2024 16:52:07 +0100
Subject: [PATCH 281/992] Fix EOL issue

---
 news/12576.doc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/12576.doc.rst b/news/12576.doc.rst
index e60091dce45..5a930bea160 100644
--- a/news/12576.doc.rst
+++ b/news/12576.doc.rst
@@ -1 +1 @@
-Display env vars for pip options in docs
\ No newline at end of file
+Display env vars for pip options in docs

From cacc13dbd6c415a617061418cdb82a544d022c81 Mon Sep 17 00:00:00 2001
From: Luis Medel 
Date: Thu, 14 Mar 2024 19:00:45 +0100
Subject: [PATCH 282/992] Apply code suggestion

---
 docs/pip_sphinxext.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pip_sphinxext.py b/docs/pip_sphinxext.py
index 4d5a2f17238..16a3206da50 100644
--- a/docs/pip_sphinxext.py
+++ b/docs/pip_sphinxext.py
@@ -150,7 +150,7 @@ def _format_option(
             "",
             line,
             "",
-            "    " + opt_help,
+            f"    {opt_help}",
             "",
             f"    (environment variable: {env_var_names_src})",
             "",

From f9bbdce7f85ca8f58aaaa46f2fc459d215ca5333 Mon Sep 17 00:00:00 2001
From: Luis Medel 
Date: Thu, 14 Mar 2024 21:29:59 +0100
Subject: [PATCH 283/992] Clarify changelog fragment

---
 news/12576.doc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/12576.doc.rst b/news/12576.doc.rst
index 5a930bea160..2a3984c2481 100644
--- a/news/12576.doc.rst
+++ b/news/12576.doc.rst
@@ -1 +1 @@
-Display env vars for pip options in docs
+Document the environment variables that correspond with CLI options

From effa01d3e006217151ac2d94dbfca9b8e8af17ac Mon Sep 17 00:00:00 2001
From: Luis Medel 
Date: Thu, 14 Mar 2024 22:31:52 +0100
Subject: [PATCH 284/992] Update news/12576.doc.rst

Co-authored-by: Paul Moore 
---
 news/12576.doc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/12576.doc.rst b/news/12576.doc.rst
index 2a3984c2481..6f1acc5c0e5 100644
--- a/news/12576.doc.rst
+++ b/news/12576.doc.rst
@@ -1 +1 @@
-Document the environment variables that correspond with CLI options
+Document the environment variables that correspond to CLI options

From 347fa24eeacbf29d2bedbb319e733dc6b3afd003 Mon Sep 17 00:00:00 2001
From: Luis Medel 
Date: Fri, 15 Mar 2024 00:13:14 +0100
Subject: [PATCH 285/992] Add missing trailing period

---
 news/12576.doc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/12576.doc.rst b/news/12576.doc.rst
index 6f1acc5c0e5..b82dd3d583f 100644
--- a/news/12576.doc.rst
+++ b/news/12576.doc.rst
@@ -1 +1 @@
-Document the environment variables that correspond to CLI options
+Document the environment variables that correspond with CLI options.

From 4614d3926757464635f2720574001186dad13f59 Mon Sep 17 00:00:00 2001
From: wim glenn 
Date: Fri, 15 Mar 2024 21:57:30 -0500
Subject: [PATCH 286/992] Remove duplication from invalid wheel error message

---
 src/pip/_internal/metadata/importlib/_dists.py | 2 --
 src/pip/_internal/utils/wheel.py               | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index 26370facf28..8591029f16e 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -133,8 +133,6 @@ def from_wheel(cls, wheel: Wheel, name: str) -> BaseDistribution:
                 dist = WheelDistribution.from_zipfile(zf, name, wheel.location)
         except zipfile.BadZipFile as e:
             raise InvalidWheel(wheel.location, name) from e
-        except UnsupportedWheel as e:
-            raise UnsupportedWheel(f"{name} has an invalid wheel, {e}")
         return cls(dist, dist.info_location, pathlib.PurePosixPath(wheel.location))
 
     @property
diff --git a/src/pip/_internal/utils/wheel.py b/src/pip/_internal/utils/wheel.py
index 3551f8f19bc..f85aee8a3f9 100644
--- a/src/pip/_internal/utils/wheel.py
+++ b/src/pip/_internal/utils/wheel.py
@@ -28,7 +28,7 @@ def parse_wheel(wheel_zip: ZipFile, name: str) -> Tuple[str, Message]:
         metadata = wheel_metadata(wheel_zip, info_dir)
         version = wheel_version(metadata)
     except UnsupportedWheel as e:
-        raise UnsupportedWheel(f"{name} has an invalid wheel, {str(e)}")
+        raise UnsupportedWheel(f"{name} has an invalid wheel, {e}")
 
     check_compatibility(version, name)
 

From d2f1f9c6e2bd9ba0dc9c249cdfbb963d3289a73d Mon Sep 17 00:00:00 2001
From: wim glenn 
Date: Fri, 15 Mar 2024 22:01:57 -0500
Subject: [PATCH 287/992] news fragment

---
 news/12579.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12579.bugfix.rst

diff --git a/news/12579.bugfix.rst b/news/12579.bugfix.rst
new file mode 100644
index 00000000000..df189e8fbff
--- /dev/null
+++ b/news/12579.bugfix.rst
@@ -0,0 +1 @@
+Remove duplication in invalid wheel error message

From 0a0fe938228d6952296f53ff03f40337677352f4 Mon Sep 17 00:00:00 2001
From: arena 
Date: Tue, 19 Mar 2024 17:31:36 +0800
Subject: [PATCH 288/992] raw progress bar mode

---
 docs/html/user_guide.rst               |  6 ++++++
 src/pip/_internal/cli/cmdoptions.py    |  4 ++--
 src/pip/_internal/cli/progress_bars.py | 25 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index f0cbded683d..a9021097490 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -856,6 +856,12 @@ We are using `freeze`_ here which outputs installed packages in requirements for
 
   reqs = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'])
 
+To programmatically monitor download progress use the ``--progress-bar=raw`` option. 
+This will print lines to stdout in the format ``Progress CURRENT of TOTAL``, where 
+``CURRENT`` and ``TOTAL`` are integers and the unit is bytes. 
+If the real total is unknown then ``TOTAL`` is set to ``0``. Be aware that the 
+specific formatting of pip's outputs are *not* guaranteed to be the same in future versions.
+
 If you don't want to use pip's command line functionality, but are rather
 trying to implement code that works with Python packages, their metadata, or
 PyPI, then you should consider other, supported, packages that offer this type
diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index d05e502f908..7becdd0cbe2 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -226,9 +226,9 @@ class PipOption(Option):
     "--progress-bar",
     dest="progress_bar",
     type="choice",
-    choices=["on", "off"],
+    choices=["on", "off", "raw"],
     default="on",
-    help="Specify whether the progress bar should be used [on, off] (default: on)",
+    help="Specify whether the progress bar should be used [on, off, raw] (default: on)",
 )
 
 log: Callable[..., Option] = partial(
diff --git a/src/pip/_internal/cli/progress_bars.py b/src/pip/_internal/cli/progress_bars.py
index 0ad14031ca5..f1861636252 100644
--- a/src/pip/_internal/cli/progress_bars.py
+++ b/src/pip/_internal/cli/progress_bars.py
@@ -1,4 +1,5 @@
 import functools
+import sys
 from typing import Callable, Generator, Iterable, Iterator, Optional, Tuple
 
 from pip._vendor.rich.progress import (
@@ -14,6 +15,7 @@
     TransferSpeedColumn,
 )
 
+from pip._internal.cli.spinners import RateLimiter
 from pip._internal.utils.logging import get_indentation
 
 DownloadProgressRenderer = Callable[[Iterable[bytes]], Iterator[bytes]]
@@ -54,6 +56,27 @@ def _rich_progress_bar(
             yield chunk
             progress.update(task_id, advance=len(chunk))
 
+def _raw_progress_bar(
+    iterable: Iterable[bytes],
+    *,
+    size: Optional[int],
+) -> Generator[bytes, None, None]:
+
+    def write_progress(current, total):
+        sys.stdout.write("Progress %d of %d\n" % (current, total))
+        sys.stdout.flush()
+
+    current = 0
+    total = size or 0
+    rate_limiter = RateLimiter(0.25)
+
+    write_progress(current, total)
+    for chunk in iterable:
+        current += len(chunk)
+        if rate_limiter.ready() or current == total:
+            write_progress(current, total)
+            rate_limiter.reset()
+        yield chunk
 
 def get_download_progress_renderer(
     *, bar_type: str, size: Optional[int] = None
@@ -64,5 +87,7 @@ def get_download_progress_renderer(
     """
     if bar_type == "on":
         return functools.partial(_rich_progress_bar, bar_type=bar_type, size=size)
+    elif bar_type == "raw":
+        return functools.partial(_raw_progress_bar, size=size)
     else:
         return iter  # no-op, when passed an iterator

From 4019197bdc195c84d04b2a78fcde0c1dc53bc008 Mon Sep 17 00:00:00 2001
From: arena 
Date: Tue, 19 Mar 2024 17:39:00 +0800
Subject: [PATCH 289/992] lint

---
 docs/html/user_guide.rst               | 8 ++++----
 src/pip/_internal/cli/progress_bars.py | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index a9021097490..2fa5552b1c5 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -856,10 +856,10 @@ We are using `freeze`_ here which outputs installed packages in requirements for
 
   reqs = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'])
 
-To programmatically monitor download progress use the ``--progress-bar=raw`` option. 
-This will print lines to stdout in the format ``Progress CURRENT of TOTAL``, where 
-``CURRENT`` and ``TOTAL`` are integers and the unit is bytes. 
-If the real total is unknown then ``TOTAL`` is set to ``0``. Be aware that the 
+To programmatically monitor download progress use the ``--progress-bar=raw`` option.
+This will print lines to stdout in the format ``Progress CURRENT of TOTAL``, where
+``CURRENT`` and ``TOTAL`` are integers and the unit is bytes.
+If the real total is unknown then ``TOTAL`` is set to ``0``. Be aware that the
 specific formatting of pip's outputs are *not* guaranteed to be the same in future versions.
 
 If you don't want to use pip's command line functionality, but are rather
diff --git a/src/pip/_internal/cli/progress_bars.py b/src/pip/_internal/cli/progress_bars.py
index f1861636252..fc2f33eddd4 100644
--- a/src/pip/_internal/cli/progress_bars.py
+++ b/src/pip/_internal/cli/progress_bars.py
@@ -56,12 +56,12 @@ def _rich_progress_bar(
             yield chunk
             progress.update(task_id, advance=len(chunk))
 
+
 def _raw_progress_bar(
     iterable: Iterable[bytes],
     *,
     size: Optional[int],
 ) -> Generator[bytes, None, None]:
-
     def write_progress(current, total):
         sys.stdout.write("Progress %d of %d\n" % (current, total))
         sys.stdout.flush()
@@ -78,6 +78,7 @@ def write_progress(current, total):
             rate_limiter.reset()
         yield chunk
 
+
 def get_download_progress_renderer(
     *, bar_type: str, size: Optional[int] = None
 ) -> DownloadProgressRenderer:

From 2f14e8f57d8c8f8416d0b9945546acc3c7127fde Mon Sep 17 00:00:00 2001
From: arena 
Date: Tue, 19 Mar 2024 17:40:07 +0800
Subject: [PATCH 290/992] type annotation

---
 src/pip/_internal/cli/progress_bars.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/cli/progress_bars.py b/src/pip/_internal/cli/progress_bars.py
index fc2f33eddd4..b842b1b316a 100644
--- a/src/pip/_internal/cli/progress_bars.py
+++ b/src/pip/_internal/cli/progress_bars.py
@@ -62,7 +62,7 @@ def _raw_progress_bar(
     *,
     size: Optional[int],
 ) -> Generator[bytes, None, None]:
-    def write_progress(current, total):
+    def write_progress(current: int, total: int) -> None:
         sys.stdout.write("Progress %d of %d\n" % (current, total))
         sys.stdout.flush()
 

From 8d81de24e72c7d178f6bf518f74ca868eb1fd979 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin 
Date: Thu, 14 Mar 2024 17:34:33 +0000
Subject: [PATCH 291/992] Pass -vv to pip subprocess

Fixes #12577

This looks like it was an oversight in #9450 - we should pass the
correct verbosity level to build env install subprocesses.

Tested with:

```
rm -rf ~/.cache/pip && rm -f *.whl && pip wheel --no-binary :all: hatchling
```

and all three verbosity levels, before and after this change, giving
the following logs:

```
     33 patched-verbosity0.log
   2549 patched-verbosity1.log
  11938 patched-verbosity2.log
     33 unpatched-verbosity0.log
     99 unpatched-verbosity1.log
   1030 unpatched-verbosity2.log
```

i.e. currently a lot of useful logs are being dropped from these install
subprocesess even with -vvv
---
 news/12577.bugfix.rst          | 1 +
 src/pip/_internal/build_env.py | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 news/12577.bugfix.rst

diff --git a/news/12577.bugfix.rst b/news/12577.bugfix.rst
new file mode 100644
index 00000000000..b408be6a8c9
--- /dev/null
+++ b/news/12577.bugfix.rst
@@ -0,0 +1 @@
+Ensure ``-vv`` gets passed to any ``pip install`` build environment subprocesses.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index 4f704a3547d..838de86474f 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -19,6 +19,7 @@
 from pip._internal.cli.spinners import open_spinner
 from pip._internal.locations import get_platlib, get_purelib, get_scheme
 from pip._internal.metadata import get_default_environment, get_environment
+from pip._internal.utils.logging import VERBOSE
 from pip._internal.utils.subprocess import call_subprocess
 from pip._internal.utils.temp_dir import TempDirectory, tempdir_kinds
 
@@ -242,6 +243,8 @@ def _install_requirements(
             "--no-warn-script-location",
         ]
         if logger.getEffectiveLevel() <= logging.DEBUG:
+            args.append("-vv")
+        elif logger.getEffectiveLevel() <= VERBOSE:
             args.append("-v")
         for format_control in ("no_binary", "only_binary"):
             formats = getattr(finder.format_control, format_control)

From eef2e23beb6b6cb38807496a96a8b5ed3f9467cf Mon Sep 17 00:00:00 2001
From: arena 
Date: Fri, 22 Mar 2024 08:05:49 +0800
Subject: [PATCH 292/992] news entry

---
 news/11508.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/11508.feature.rst

diff --git a/news/11508.feature.rst b/news/11508.feature.rst
new file mode 100644
index 00000000000..685426b1dc7
--- /dev/null
+++ b/news/11508.feature.rst
@@ -0,0 +1 @@
+Add a 'raw' progress_bar type for simple and parsable download progress reports
\ No newline at end of file

From 264f6e216c5ad0e3f50269d3de65113135b32f48 Mon Sep 17 00:00:00 2001
From: Matthew Feickert 
Date: Thu, 21 Mar 2024 23:05:31 -0500
Subject: [PATCH 293/992] DOC: Clarify lack of index priority

* Specifically mention the --index-url and --extra-index-url both provide
  locations for pip to look for packages in the 'Finding Packages' section.
  However, explicitly state that there is no priority ordering for the search
  locations.
* This is a recurring point of confusion on the pip GitHub issue tracker as well
  as on https://github.com/pypa/packaging-problems/issues/, so additional
  clarification could help here.

Co-authored-by: Henry Schreiner 
---
 docs/html/cli/pip_install.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/html/cli/pip_install.rst b/docs/html/cli/pip_install.rst
index 2664c75223d..d893fb7c8ef 100644
--- a/docs/html/cli/pip_install.rst
+++ b/docs/html/cli/pip_install.rst
@@ -212,11 +212,12 @@ and `there `_.
 pip offers a number of package index options for modifying how packages are
 found.
 
-pip looks for packages in a number of places: on PyPI (if not disabled via
-``--no-index``), in the local filesystem, and in any additional repositories
-specified via ``--find-links`` or ``--index-url``. There is no ordering in
-the locations that are searched. Rather they are all checked, and the "best"
-match for the requirements (in terms of version number - see the
+pip looks for packages in a number of places: on PyPI (or the index given as
+``--index-url``, if not disabled via ``--no-index``), in the local filesystem,
+and in any additional repositories specified via ``--find-links`` or
+``--extra-index-url``. There is no priority in the locations that are searched.
+Rather they are all checked, and the "best" match for the requirements (in
+terms of version number - see the
 :ref:`specification ` for details) is selected.
 
 See the :ref:`pip install Examples`.

From 4b99130bf87c48e16a0d053437d0f1e6df587bd9 Mon Sep 17 00:00:00 2001
From: Matthew Feickert 
Date: Thu, 21 Mar 2024 23:21:13 -0500
Subject: [PATCH 294/992] Add trivial NEWS entry

---
 news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst

diff --git a/news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst b/news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d

From ea93e2026575a7e9bb57e86e9af7f718b1754c8e Mon Sep 17 00:00:00 2001
From: Mark McLoughlin 
Date: Thu, 14 Mar 2024 17:34:33 +0000
Subject: [PATCH 295/992] Pass -vv to pip subprocess

Fixes #12577

This looks like it was an oversight in #9450 - we should pass the
correct verbosity level to build env install subprocesses.

Tested with:

```
rm -rf ~/.cache/pip && rm -f *.whl && pip wheel --no-binary :all: hatchling
```

and all three verbosity levels, before and after this change, giving
the following logs:

```
     33 patched-verbosity0.log
   2549 patched-verbosity1.log
  11938 patched-verbosity2.log
     33 unpatched-verbosity0.log
     99 unpatched-verbosity1.log
   1030 unpatched-verbosity2.log
```

i.e. currently a lot of useful logs are being dropped from these install
subprocesess even with -vvv
---
 news/12577.bugfix.rst          | 1 +
 src/pip/_internal/build_env.py | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 news/12577.bugfix.rst

diff --git a/news/12577.bugfix.rst b/news/12577.bugfix.rst
new file mode 100644
index 00000000000..b408be6a8c9
--- /dev/null
+++ b/news/12577.bugfix.rst
@@ -0,0 +1 @@
+Ensure ``-vv`` gets passed to any ``pip install`` build environment subprocesses.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index 4f704a3547d..838de86474f 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -19,6 +19,7 @@
 from pip._internal.cli.spinners import open_spinner
 from pip._internal.locations import get_platlib, get_purelib, get_scheme
 from pip._internal.metadata import get_default_environment, get_environment
+from pip._internal.utils.logging import VERBOSE
 from pip._internal.utils.subprocess import call_subprocess
 from pip._internal.utils.temp_dir import TempDirectory, tempdir_kinds
 
@@ -242,6 +243,8 @@ def _install_requirements(
             "--no-warn-script-location",
         ]
         if logger.getEffectiveLevel() <= logging.DEBUG:
+            args.append("-vv")
+        elif logger.getEffectiveLevel() <= VERBOSE:
             args.append("-v")
         for format_control in ("no_binary", "only_binary"):
             formats = getattr(finder.format_control, format_control)

From e2b9b957d259f2c9e20fb21fc2f0688375fe07dd Mon Sep 17 00:00:00 2001
From: Matthew Feickert 
Date: Thu, 21 Mar 2024 23:05:31 -0500
Subject: [PATCH 296/992] DOC: Clarify lack of index priority

* Specifically mention the --index-url and --extra-index-url both provide
  locations for pip to look for packages in the 'Finding Packages' section.
  However, explicitly state that there is no priority ordering for the search
  locations.
* This is a recurring point of confusion on the pip GitHub issue tracker as well
  as on https://github.com/pypa/packaging-problems/issues/, so additional
  clarification could help here.

Co-authored-by: Henry Schreiner 
---
 docs/html/cli/pip_install.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/html/cli/pip_install.rst b/docs/html/cli/pip_install.rst
index 2664c75223d..d893fb7c8ef 100644
--- a/docs/html/cli/pip_install.rst
+++ b/docs/html/cli/pip_install.rst
@@ -212,11 +212,12 @@ and `there `_.
 pip offers a number of package index options for modifying how packages are
 found.
 
-pip looks for packages in a number of places: on PyPI (if not disabled via
-``--no-index``), in the local filesystem, and in any additional repositories
-specified via ``--find-links`` or ``--index-url``. There is no ordering in
-the locations that are searched. Rather they are all checked, and the "best"
-match for the requirements (in terms of version number - see the
+pip looks for packages in a number of places: on PyPI (or the index given as
+``--index-url``, if not disabled via ``--no-index``), in the local filesystem,
+and in any additional repositories specified via ``--find-links`` or
+``--extra-index-url``. There is no priority in the locations that are searched.
+Rather they are all checked, and the "best" match for the requirements (in
+terms of version number - see the
 :ref:`specification ` for details) is selected.
 
 See the :ref:`pip install Examples`.

From db6ccf9b546a710654fd1223d7362bd92eadb408 Mon Sep 17 00:00:00 2001
From: Matthew Feickert 
Date: Thu, 21 Mar 2024 23:21:13 -0500
Subject: [PATCH 297/992] Add trivial NEWS entry

---
 news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst

diff --git a/news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst b/news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d

From 72b6dfaa187df8d821d6b99ef9a3ee8ccb959a95 Mon Sep 17 00:00:00 2001
From: arenasys 
Date: Tue, 26 Mar 2024 10:24:24 +0800
Subject: [PATCH 298/992] news tweak

---
 news/11508.feature.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/11508.feature.rst b/news/11508.feature.rst
index 685426b1dc7..2f0d7e2d04d 100644
--- a/news/11508.feature.rst
+++ b/news/11508.feature.rst
@@ -1 +1 @@
-Add a 'raw' progress_bar type for simple and parsable download progress reports
\ No newline at end of file
+Add a 'raw' progress_bar type for simple and parsable download progress reports

From 9ca8ef479a8ac48dcc304ef8a5d5067479244de4 Mon Sep 17 00:00:00 2001
From: shenxianpeng 
Date: Sun, 7 Apr 2024 14:03:22 +0800
Subject: [PATCH 299/992] fix: uses RST substitution to put badges in 1 line

---
 README.rst             | 8 +++++---
 news/12615.trivial.rst | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 news/12615.trivial.rst

diff --git a/README.rst b/README.rst
index 6ff117db5d2..479ddfd7ba1 100644
--- a/README.rst
+++ b/README.rst
@@ -1,18 +1,20 @@
 pip - The Python Package Installer
 ==================================
 
-.. image:: https://img.shields.io/pypi/v/pip.svg
+.. |pypi-version| image:: https://img.shields.io/pypi/v/pip.svg
    :target: https://pypi.org/project/pip/
    :alt: PyPI
 
-.. image:: https://img.shields.io/pypi/pyversions/pip
+.. |python-versions| image:: https://img.shields.io/pypi/pyversions/pip
    :target: https://pypi.org/project/pip
    :alt: PyPI - Python Version
 
-.. image:: https://readthedocs.org/projects/pip/badge/?version=latest
+.. |docs-badge| image:: https://readthedocs.org/projects/pip/badge/?version=latest
    :target: https://pip.pypa.io/en/latest
    :alt: Documentation
 
+|pypi-version| |python-versions| |docs-badge|
+
 pip is the `package installer`_ for Python. You can use pip to install packages from the `Python Package Index`_ and other indexes.
 
 Please take a look at our documentation for how to install and use pip:
diff --git a/news/12615.trivial.rst b/news/12615.trivial.rst
new file mode 100644
index 00000000000..ace9836ed43
--- /dev/null
+++ b/news/12615.trivial.rst
@@ -0,0 +1 @@
+uses RST substitution to put badges in 1 line.

From 35ccbd1da5e3f294726389df497fd466cb3ecccb Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 7 Apr 2024 20:26:13 -0400
Subject: [PATCH 300/992] Rewrite regression test

---
 tests/functional/test_cli.py | 48 ++++++++++++++++++++++++++++++++++++
 tests/unit/test_commands.py  | 34 -------------------------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index 3c3f45d51d1..27cc26e3585 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -1,9 +1,13 @@
 """Basic CLI functionality checks.
 """
+import subprocess
+import sys
+from pathlib import Path
 from textwrap import dedent
 
 import pytest
 
+from pip._internal.commands import commands_dict
 from tests.lib import PipTestEnvironment
 
 
@@ -45,3 +49,47 @@ def test_entrypoints_work(entrypoint: str, script: PipTestEnvironment) -> None:
     result2 = script.run("fake_pip", "-V", allow_stderr_warning=True)
     assert result.stdout == result2.stdout
     assert "old script wrapper" in result2.stderr
+
+
+@pytest.mark.parametrize(
+    "command",
+    set(commands_dict).symmetric_difference(
+        # Exclude commands that are expected to use the network.
+        # TODO: uninstall and list should only import network modules as needed
+        {"install", "uninstall", "download", "search", "index", "wheel", "list"}
+    ),
+)
+def test_no_network_imports(command: str, tmp_path: Path) -> None:
+    """
+    Verify that commands that don't access the network do NOT import network code.
+
+    This helps to reduce the startup time of these commands.
+
+    Note: This won't catch lazy network imports, but it'll catch top-level
+    network imports which were accidently added (which is the most likely way
+    to regress anyway).
+    """
+    file = Path(tmp_path, f"imported_modules_for_{command}")
+    code = f"""
+import runpy
+import sys
+
+sys.argv[1:] = [{command!r}, "--help"]
+
+try:
+    runpy.run_module("pip", alter_sys=True, run_name="__main__")
+finally:
+    with open({str(file)!r}, "w") as f:
+        print(*sys.modules.keys(), sep="\\n", file=f)
+    """
+    subprocess.run(
+        [sys.executable],
+        input=code,
+        encoding="utf-8",
+        check=True,
+    )
+    imported = file.read_text().splitlines()
+    assert not any("pip._internal.index" in mod for mod in imported)
+    assert not any("pip._internal.network" in mod for mod in imported)
+    assert not any("requests" in mod for mod in imported)
+    assert not any("urllib3" in mod for mod in imported)
diff --git a/tests/unit/test_commands.py b/tests/unit/test_commands.py
index 3fa08586067..7a5c4e8319d 100644
--- a/tests/unit/test_commands.py
+++ b/tests/unit/test_commands.py
@@ -1,5 +1,3 @@
-import subprocess
-import sys
 from typing import Callable, List
 from unittest import mock
 
@@ -122,35 +120,3 @@ def is_requirement_command(command: Command) -> bool:
         return isinstance(command, RequirementCommand)
 
     check_commands(is_requirement_command, ["download", "install", "wheel"])
-
-
-@pytest.mark.parametrize(
-    "command", ["cache", "check", "config", "freeze", "hash", "help", "inspect", "show"]
-)
-def test_no_network_imports(command: str) -> None:
-    """
-    Verify that commands that don't access the network do NOT import network code.
-
-    This helps to reduce the startup time of these commands.
-
-    Note: This won't catch lazy network imports, but it'll catch top-level
-    network imports which were accidently added (which is the most likely way
-    to regress anyway).
-    """
-    code = f"""
-import sys
-from pip._internal.commands import create_command
-
-command = create_command("{command}")
-names = sorted(mod.__name__ for mod in sys.modules.values())
-for mod in names:
-    print(mod)
-    """
-    proc = subprocess.run(
-        [sys.executable], encoding="utf-8", input=code, capture_output=True, check=True
-    )
-    imported = proc.stdout.splitlines()
-    assert not any("pip._internal.index" in mod for mod in imported)
-    assert not any("pip._internal.network" in mod for mod in imported)
-    assert not any("requests" in mod for mod in imported)
-    assert not any("urllib3" in mod for mod in imported)

From d7b1af524c161c0ad5bdf4382f7ba6771e0b4cf9 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 7 Apr 2024 20:42:32 -0400
Subject: [PATCH 301/992] sigh, make the parametrization values deterministic

---
 tests/functional/test_cli.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index 27cc26e3585..64bb9c8c60c 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -53,10 +53,12 @@ def test_entrypoints_work(entrypoint: str, script: PipTestEnvironment) -> None:
 
 @pytest.mark.parametrize(
     "command",
-    set(commands_dict).symmetric_difference(
-        # Exclude commands that are expected to use the network.
-        # TODO: uninstall and list should only import network modules as needed
-        {"install", "uninstall", "download", "search", "index", "wheel", "list"}
+    sorted(
+        set(commands_dict).symmetric_difference(
+            # Exclude commands that are expected to use the network.
+            # TODO: uninstall and list should only import network modules as needed
+            {"install", "uninstall", "download", "search", "index", "wheel", "list"}
+        )
     ),
 )
 def test_no_network_imports(command: str, tmp_path: Path) -> None:

From 23f4ad59d569f88894224d18c70dd50f1f5d4b0f Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 8 Apr 2024 10:21:19 -0400
Subject: [PATCH 302/992] Use more idiomatic path code in
 tests/functional/test_cli.py

Co-authored-by: Pradyun Gedam 
---
 tests/functional/test_cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index 64bb9c8c60c..482ba735f07 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -71,7 +71,7 @@ def test_no_network_imports(command: str, tmp_path: Path) -> None:
     network imports which were accidently added (which is the most likely way
     to regress anyway).
     """
-    file = Path(tmp_path, f"imported_modules_for_{command}")
+    file = tmp_path / f"imported_modules_for_{command}.txt"
     code = f"""
 import runpy
 import sys

From 91a69a58a37f54c18950378f49fa1957e551f137 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Thu, 22 Feb 2024 20:45:32 +0000
Subject: [PATCH 303/992] Cache the user agent

This does not need to be computed multiple times in the same process.
---
 src/pip/_internal/network/session.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pip/_internal/network/session.py b/src/pip/_internal/network/session.py
index e07b795b461..1765b4f6bd7 100644
--- a/src/pip/_internal/network/session.py
+++ b/src/pip/_internal/network/session.py
@@ -3,6 +3,7 @@
 """
 
 import email.utils
+import functools
 import io
 import ipaddress
 import json
@@ -106,6 +107,7 @@ def looks_like_ci() -> bool:
     return any(name in os.environ for name in CI_ENVIRONMENT_VARIABLES)
 
 
+@functools.lru_cache(maxsize=1)
 def user_agent() -> str:
     """
     Return a string representing the user agent.

From 4f2ccfc28d0d666d7728c47eb512b8a3bdd5c0cc Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Mon, 8 Apr 2024 22:21:28 +0100
Subject: [PATCH 304/992] Invalidate the user agent cache in tests

---
 tests/unit/test_network_session.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/unit/test_network_session.py b/tests/unit/test_network_session.py
index 2bb9317b762..3f1a596ad8e 100644
--- a/tests/unit/test_network_session.py
+++ b/tests/unit/test_network_session.py
@@ -10,10 +10,17 @@
 
 from pip import __version__
 from pip._internal.models.link import Link
-from pip._internal.network.session import CI_ENVIRONMENT_VARIABLES, PipSession
+from pip._internal.network.session import (
+    CI_ENVIRONMENT_VARIABLES,
+    PipSession,
+    user_agent,
+)
 
 
 def get_user_agent() -> str:
+    # These tests are testing the computation of the user agent, so we want to
+    # avoid reusing cached values.
+    user_agent.cache_clear()
     return PipSession().headers["User-Agent"]
 
 
@@ -58,7 +65,7 @@ def test_user_agent__ci(
 
 def test_user_agent_user_data(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("PIP_USER_AGENT_USER_DATA", "some_string")
-    assert "some_string" in PipSession().headers["User-Agent"]
+    assert "some_string" in get_user_agent()
 
 
 class TestPipSession:

From f5c5b851d8099b8cfe805a35aa099aaeb591ccd7 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 24 Mar 2024 15:25:57 -0400
Subject: [PATCH 305/992] Update Ruff CI to v0.3.6

---
 .pre-commit-config.yaml | 2 +-
 pyproject.toml          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b932b146f18..e29e1fcf0af 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.2.0
+  rev: v0.3.6
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
diff --git a/pyproject.toml b/pyproject.toml
index bbdbc792d30..74a7f71ca59 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -201,6 +201,7 @@ max-complexity = 33  # default is 10
 "src/pip/_internal/*" = ["PERF203"]
 "tests/*" = ["B011"]
 "tests/unit/test_finder.py" = ["C414"]
+"src/pip/__pip-runner__.py" = ["UP"] # Must be compatible with Python 2.7
 
 [tool.ruff.lint.pylint]
 max-args = 15  # default is 5

From 38cb761b0080d3c0aa1f707df62e905838dc14d4 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 24 Mar 2024 15:26:34 -0400
Subject: [PATCH 306/992] Apply auto fix of rule UP032

---
 src/pip/_internal/commands/search.py                  |  5 +----
 src/pip/_internal/models/candidate.py                 |  6 +-----
 src/pip/_internal/operations/build/wheel_legacy.py    |  8 ++++----
 src/pip/_internal/operations/install/wheel.py         | 10 +++++-----
 src/pip/_internal/req/constructors.py                 |  4 ++--
 src/pip/_internal/req/req_install.py                  |  4 +---
 src/pip/_internal/req/req_uninstall.py                |  6 ++----
 src/pip/_internal/resolution/legacy/resolver.py       |  8 ++------
 src/pip/_internal/resolution/resolvelib/candidates.py | 10 ++--------
 src/pip/_internal/utils/direct_url_helpers.py         |  4 +---
 tests/functional/test_build_env.py                    |  8 +++-----
 tests/functional/test_new_resolver_hashes.py          |  9 +++------
 tests/unit/test_collector.py                          |  4 ++--
 13 files changed, 29 insertions(+), 57 deletions(-)

diff --git a/src/pip/_internal/commands/search.py b/src/pip/_internal/commands/search.py
index 55880a155e5..ea3f866bae4 100644
--- a/src/pip/_internal/commands/search.py
+++ b/src/pip/_internal/commands/search.py
@@ -75,10 +75,7 @@ def search(self, query: List[str], options: Values) -> List[Dict[str, str]]:
         try:
             hits = pypi.search({"name": query, "summary": query}, "or")
         except xmlrpc.client.Fault as fault:
-            message = "XMLRPC request failed [code: {code}]\n{string}".format(
-                code=fault.faultCode,
-                string=fault.faultString,
-            )
+            message = f"XMLRPC request failed [code: {fault.faultCode}]\n{fault.faultString}"
             raise CommandError(message)
         assert isinstance(hits, list)
         return hits
diff --git a/src/pip/_internal/models/candidate.py b/src/pip/_internal/models/candidate.py
index 9184a902aef..9e2c88d65da 100644
--- a/src/pip/_internal/models/candidate.py
+++ b/src/pip/_internal/models/candidate.py
@@ -20,11 +20,7 @@ def __init__(self, name: str, version: str, link: Link) -> None:
         )
 
     def __repr__(self) -> str:
-        return "".format(
-            self.name,
-            self.version,
-            self.link,
-        )
+        return f""
 
     def __str__(self) -> str:
         return f"{self.name!r} candidate (version {self.version} at {self.link})"
diff --git a/src/pip/_internal/operations/build/wheel_legacy.py b/src/pip/_internal/operations/build/wheel_legacy.py
index c5f0492ccbe..190492091e6 100644
--- a/src/pip/_internal/operations/build/wheel_legacy.py
+++ b/src/pip/_internal/operations/build/wheel_legacy.py
@@ -40,16 +40,16 @@ def get_legacy_build_wheel_path(
     # Sort for determinism.
     names = sorted(names)
     if not names:
-        msg = ("Legacy build of wheel for {!r} created no files.\n").format(name)
+        msg = (f"Legacy build of wheel for {name!r} created no files.\n")
         msg += format_command_result(command_args, command_output)
         logger.warning(msg)
         return None
 
     if len(names) > 1:
         msg = (
-            "Legacy build of wheel for {!r} created more than one file.\n"
-            "Filenames (choosing first): {}\n"
-        ).format(name, names)
+            f"Legacy build of wheel for {name!r} created more than one file.\n"
+            f"Filenames (choosing first): {names}\n"
+        )
         msg += format_command_result(command_args, command_output)
         logger.warning(msg)
 
diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index 1a93f3557ca..2ed587de8d8 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -505,9 +505,9 @@ def make_data_scheme_file(record_path: RecordPath) -> "File":
                 _, scheme_key, dest_subpath = normed_path.split(os.path.sep, 2)
             except ValueError:
                 message = (
-                    "Unexpected file in {}: {!r}. .data directory contents"
+                    f"Unexpected file in {wheel_path}: {record_path!r}. .data directory contents"
                     " should be named like: '/'."
-                ).format(wheel_path, record_path)
+                )
                 raise InstallationError(message)
 
             try:
@@ -515,10 +515,10 @@ def make_data_scheme_file(record_path: RecordPath) -> "File":
             except KeyError:
                 valid_scheme_keys = ", ".join(sorted(scheme_paths))
                 message = (
-                    "Unknown scheme key used in {}: {} (for file {!r}). .data"
+                    f"Unknown scheme key used in {wheel_path}: {scheme_key} (for file {record_path!r}). .data"
                     " directory contents should be in subdirectories named"
-                    " with a valid scheme key ({})"
-                ).format(wheel_path, scheme_key, record_path, valid_scheme_keys)
+                    f" with a valid scheme key ({valid_scheme_keys})"
+                )
                 raise InstallationError(message)
 
             dest_path = os.path.join(scheme_path, dest_subpath)
diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
index 7e2d0e5b879..e17da68245d 100644
--- a/src/pip/_internal/req/constructors.py
+++ b/src/pip/_internal/req/constructors.py
@@ -132,8 +132,8 @@ def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]:
     package_name = link.egg_fragment
     if not package_name:
         raise InstallationError(
-            "Could not detect requirement name for '{}', please specify one "
-            "with #egg=your_package_name".format(editable_req)
+            f"Could not detect requirement name for '{editable_req}', please specify one "
+            "with #egg=your_package_name"
         )
     return package_name, url, set()
 
diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index 49c88fca187..7d4c0e42eac 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -222,9 +222,7 @@ def __str__(self) -> str:
         return s
 
     def __repr__(self) -> str:
-        return "<{} object: {} editable={!r}>".format(
-            self.__class__.__name__, str(self), self.editable
-        )
+        return f"<{self.__class__.__name__} object: {str(self)} editable={self.editable!r}>"
 
     def format_debug(self) -> str:
         """An un-tested helper for getting state, for debugging."""
diff --git a/src/pip/_internal/req/req_uninstall.py b/src/pip/_internal/req/req_uninstall.py
index eec9bd8edcd..6a7269924f2 100644
--- a/src/pip/_internal/req/req_uninstall.py
+++ b/src/pip/_internal/req/req_uninstall.py
@@ -510,11 +510,9 @@ def from_dist(cls, dist: BaseDistribution) -> "UninstallPathSet":
 
         elif dist.installed_by_distutils:
             raise UninstallationError(
-                "Cannot uninstall {!r}. It is a distutils installed project "
+                f"Cannot uninstall {dist.raw_name!r}. It is a distutils installed project "
                 "and thus we cannot accurately determine which files belong "
-                "to it which would lead to only a partial uninstall.".format(
-                    dist.raw_name,
-                )
+                "to it which would lead to only a partial uninstall."
             )
 
         elif dist.installed_as_egg:
diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
index 5ddb848a9bc..01c8f163b2f 100644
--- a/src/pip/_internal/resolution/legacy/resolver.py
+++ b/src/pip/_internal/resolution/legacy/resolver.py
@@ -104,9 +104,7 @@ def _check_dist_requires_python(
         return
 
     raise UnsupportedPythonVersion(
-        "Package {!r} requires a different Python: {} not in {!r}".format(
-            dist.raw_name, version, requires_python
-        )
+        f"Package {dist.raw_name!r} requires a different Python: {version} not in {requires_python!r}"
     )
 
 
@@ -263,9 +261,7 @@ def _add_requirement_to_set(
         )
         if has_conflicting_requirement:
             raise InstallationError(
-                "Double requirement given: {} (already in {}, name={!r})".format(
-                    install_req, existing_req, install_req.name
-                )
+                f"Double requirement given: {install_req} (already in {existing_req}, name={install_req.name!r})"
             )
 
         # When no existing requirement exists, add the requirement as a
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 4125cda2b7c..4ffbdaf5919 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -191,11 +191,7 @@ def version(self) -> CandidateVersion:
         return self._version
 
     def format_for_error(self) -> str:
-        return "{} {} (from {})".format(
-            self.name,
-            self.version,
-            self._link.file_path if self._link.is_file else self._link,
-        )
+        return f"{self.name} {self.version} (from {self._link.file_path if self._link.is_file else self._link})"
 
     def _prepare_distribution(self) -> BaseDistribution:
         raise NotImplementedError("Override in subclass")
@@ -269,9 +265,7 @@ def __init__(
             # Version may not be present for PEP 508 direct URLs
             if version is not None:
                 wheel_version = Version(wheel.version)
-                assert version == wheel_version, "{!r} != {!r} for wheel {}".format(
-                    version, wheel_version, name
-                )
+                assert version == wheel_version, f"{version!r} != {wheel_version!r} for wheel {name}"
 
         if cache_entry is not None:
             assert ireq.link.is_wheel
diff --git a/src/pip/_internal/utils/direct_url_helpers.py b/src/pip/_internal/utils/direct_url_helpers.py
index 0e8e5e1608b..e2411374a9a 100644
--- a/src/pip/_internal/utils/direct_url_helpers.py
+++ b/src/pip/_internal/utils/direct_url_helpers.py
@@ -12,9 +12,7 @@ def direct_url_as_pep440_direct_reference(direct_url: DirectUrl, name: str) -> s
     requirement = name + " @ "
     fragments = []
     if isinstance(direct_url.info, VcsInfo):
-        requirement += "{}+{}@{}".format(
-            direct_url.info.vcs, direct_url.url, direct_url.info.commit_id
-        )
+        requirement += f"{direct_url.info.vcs}+{direct_url.url}@{direct_url.info.commit_id}"
     elif isinstance(direct_url.info, ArchiveInfo):
         requirement += direct_url.url
         if direct_url.info.hash:
diff --git a/tests/functional/test_build_env.py b/tests/functional/test_build_env.py
index 20cd181be07..41bbe801f02 100644
--- a/tests/functional/test_build_env.py
+++ b/tests/functional/test_build_env.py
@@ -26,7 +26,7 @@ def run_with_build_env(
     build_env_script = script.scratch_path / "build_env.py"
     build_env_script.write_text(
         dedent(
-            """
+            f"""
             import subprocess
             import sys
 
@@ -42,7 +42,7 @@ def run_with_build_env(
 
             link_collector = LinkCollector(
                 session=PipSession(),
-                search_scope=SearchScope.create([{scratch!r}], [], False),
+                search_scope=SearchScope.create([{str(script.scratch_path)!r}], [], False),
             )
             selection_prefs = SelectionPreferences(
                 allow_yanked=True,
@@ -54,9 +54,7 @@ def run_with_build_env(
 
             with global_tempdir_manager():
                 build_env = BuildEnvironment()
-            """.format(
-                scratch=str(script.scratch_path)
-            )
+            """
         )
         + indent(dedent(setup_script_contents), "    ")
         + indent(
diff --git a/tests/functional/test_new_resolver_hashes.py b/tests/functional/test_new_resolver_hashes.py
index d26def14ae9..7789813bf37 100644
--- a/tests/functional/test_new_resolver_hashes.py
+++ b/tests/functional/test_new_resolver_hashes.py
@@ -96,12 +96,9 @@ def test_new_resolver_hash_intersect_from_constraint(
     )
     requirements_txt = script.scratch_path / "requirements.txt"
     requirements_txt.write_text(
-        """
-        base==0.1.0 --hash=sha256:{sdist_hash} --hash=sha256:{wheel_hash}
-        """.format(
-            sdist_hash=find_links.sdist_hash,
-            wheel_hash=find_links.wheel_hash,
-        ),
+        f"""
+        base==0.1.0 --hash=sha256:{find_links.sdist_hash} --hash=sha256:{find_links.wheel_hash}
+        """,
     )
 
     result = script.pip(
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index 90064776ef3..2a462ff4879 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -802,9 +802,9 @@ def test_get_index_content_invalid_content_type(
     assert (
         "pip._internal.index.collector",
         logging.WARNING,
-        "Skipping page {} because the GET request got Content-Type: {}. "
+        f"Skipping page {url} because the GET request got Content-Type: {content_type}. "
         "The only supported Content-Types are application/vnd.pypi.simple.v1+json, "
-        "application/vnd.pypi.simple.v1+html, and text/html".format(url, content_type),
+        "application/vnd.pypi.simple.v1+html, and text/html",
     ) in caplog.record_tuples
 
 

From 6fbc6ef4906b3f5d7bdf450f9ce5d96b3478deab Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 24 Mar 2024 15:27:03 -0400
Subject: [PATCH 307/992] Auto auto fix of rule F401

---
 src/pip/_internal/operations/build/build_tracker.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pip/_internal/operations/build/build_tracker.py b/src/pip/_internal/operations/build/build_tracker.py
index 85adc1d711a..0ed8dd23596 100644
--- a/src/pip/_internal/operations/build/build_tracker.py
+++ b/src/pip/_internal/operations/build/build_tracker.py
@@ -3,9 +3,8 @@
 import logging
 import os
 from types import TracebackType
-from typing import Dict, Generator, Optional, Set, Type, Union
+from typing import Dict, Generator, Optional, Type, Union
 
-from pip._internal.models.link import Link
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.temp_dir import TempDirectory
 

From 41587f5e0017bcd849f42b314dc8a34a7db75621 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 24 Mar 2024 15:32:17 -0400
Subject: [PATCH 308/992] Manual fix of E501 (line length too long)

---
 src/pip/_internal/commands/search.py                  |  4 +++-
 src/pip/_internal/models/candidate.py                 |  4 +++-
 src/pip/_internal/operations/build/wheel_legacy.py    |  2 +-
 src/pip/_internal/operations/install/wheel.py         | 11 ++++++-----
 src/pip/_internal/req/constructors.py                 |  4 ++--
 src/pip/_internal/req/req_install.py                  |  5 ++++-
 src/pip/_internal/req/req_uninstall.py                |  4 ++--
 src/pip/_internal/resolution/legacy/resolver.py       |  6 ++++--
 src/pip/_internal/resolution/resolvelib/candidates.py |  9 +++++++--
 src/pip/_internal/utils/direct_url_helpers.py         |  4 +++-
 tests/functional/test_build_env.py                    |  3 ++-
 tests/functional/test_new_resolver_hashes.py          |  7 +++----
 tests/unit/test_collector.py                          |  4 ++--
 13 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/pip/_internal/commands/search.py b/src/pip/_internal/commands/search.py
index ea3f866bae4..e0d329d58ad 100644
--- a/src/pip/_internal/commands/search.py
+++ b/src/pip/_internal/commands/search.py
@@ -75,7 +75,9 @@ def search(self, query: List[str], options: Values) -> List[Dict[str, str]]:
         try:
             hits = pypi.search({"name": query, "summary": query}, "or")
         except xmlrpc.client.Fault as fault:
-            message = f"XMLRPC request failed [code: {fault.faultCode}]\n{fault.faultString}"
+            message = (
+                f"XMLRPC request failed [code: {fault.faultCode}]\n{fault.faultString}"
+            )
             raise CommandError(message)
         assert isinstance(hits, list)
         return hits
diff --git a/src/pip/_internal/models/candidate.py b/src/pip/_internal/models/candidate.py
index 9e2c88d65da..b12ffeeac4a 100644
--- a/src/pip/_internal/models/candidate.py
+++ b/src/pip/_internal/models/candidate.py
@@ -20,7 +20,9 @@ def __init__(self, name: str, version: str, link: Link) -> None:
         )
 
     def __repr__(self) -> str:
-        return f""
+        return (
+            f""
+        )
 
     def __str__(self) -> str:
         return f"{self.name!r} candidate (version {self.version} at {self.link})"
diff --git a/src/pip/_internal/operations/build/wheel_legacy.py b/src/pip/_internal/operations/build/wheel_legacy.py
index 190492091e6..3ee2a7058d3 100644
--- a/src/pip/_internal/operations/build/wheel_legacy.py
+++ b/src/pip/_internal/operations/build/wheel_legacy.py
@@ -40,7 +40,7 @@ def get_legacy_build_wheel_path(
     # Sort for determinism.
     names = sorted(names)
     if not names:
-        msg = (f"Legacy build of wheel for {name!r} created no files.\n")
+        msg = f"Legacy build of wheel for {name!r} created no files.\n"
         msg += format_command_result(command_args, command_output)
         logger.warning(msg)
         return None
diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index 2ed587de8d8..f64c3e9c443 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -505,8 +505,8 @@ def make_data_scheme_file(record_path: RecordPath) -> "File":
                 _, scheme_key, dest_subpath = normed_path.split(os.path.sep, 2)
             except ValueError:
                 message = (
-                    f"Unexpected file in {wheel_path}: {record_path!r}. .data directory contents"
-                    " should be named like: '/'."
+                    f"Unexpected file in {wheel_path}: {record_path!r}. .data directory"
+                    " contents should be named like: '/'."
                 )
                 raise InstallationError(message)
 
@@ -515,9 +515,10 @@ def make_data_scheme_file(record_path: RecordPath) -> "File":
             except KeyError:
                 valid_scheme_keys = ", ".join(sorted(scheme_paths))
                 message = (
-                    f"Unknown scheme key used in {wheel_path}: {scheme_key} (for file {record_path!r}). .data"
-                    " directory contents should be in subdirectories named"
-                    f" with a valid scheme key ({valid_scheme_keys})"
+                    f"Unknown scheme key used in {wheel_path}: {scheme_key} "
+                    f"(for file {record_path!r}). .data directory contents "
+                    f"should be in subdirectories named with a valid scheme "
+                    f"key ({valid_scheme_keys})"
                 )
                 raise InstallationError(message)
 
diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
index e17da68245d..74296345620 100644
--- a/src/pip/_internal/req/constructors.py
+++ b/src/pip/_internal/req/constructors.py
@@ -132,8 +132,8 @@ def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]:
     package_name = link.egg_fragment
     if not package_name:
         raise InstallationError(
-            f"Could not detect requirement name for '{editable_req}', please specify one "
-            "with #egg=your_package_name"
+            f"Could not detect requirement name for '{editable_req}', "
+            "please specify one with #egg=your_package_name"
         )
     return package_name, url, set()
 
diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index 7d4c0e42eac..7d527959e81 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -222,7 +222,10 @@ def __str__(self) -> str:
         return s
 
     def __repr__(self) -> str:
-        return f"<{self.__class__.__name__} object: {str(self)} editable={self.editable!r}>"
+        return (
+            f"<{self.__class__.__name__} object: "
+            f"{str(self)} editable={self.editable!r}>"
+        )
 
     def format_debug(self) -> str:
         """An un-tested helper for getting state, for debugging."""
diff --git a/src/pip/_internal/req/req_uninstall.py b/src/pip/_internal/req/req_uninstall.py
index 6a7269924f2..3a9ae2b1097 100644
--- a/src/pip/_internal/req/req_uninstall.py
+++ b/src/pip/_internal/req/req_uninstall.py
@@ -510,8 +510,8 @@ def from_dist(cls, dist: BaseDistribution) -> "UninstallPathSet":
 
         elif dist.installed_by_distutils:
             raise UninstallationError(
-                f"Cannot uninstall {dist.raw_name!r}. It is a distutils installed project "
-                "and thus we cannot accurately determine which files belong "
+                f"Cannot uninstall {dist.raw_name!r}. It is a distutils installed "
+                "project and thus we cannot accurately determine which files belong "
                 "to it which would lead to only a partial uninstall."
             )
 
diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
index 01c8f163b2f..74581a84de6 100644
--- a/src/pip/_internal/resolution/legacy/resolver.py
+++ b/src/pip/_internal/resolution/legacy/resolver.py
@@ -104,7 +104,8 @@ def _check_dist_requires_python(
         return
 
     raise UnsupportedPythonVersion(
-        f"Package {dist.raw_name!r} requires a different Python: {version} not in {requires_python!r}"
+        f"Package {dist.raw_name!r} requires a different Python: "
+        f"{version} not in {requires_python!r}"
     )
 
 
@@ -261,7 +262,8 @@ def _add_requirement_to_set(
         )
         if has_conflicting_requirement:
             raise InstallationError(
-                f"Double requirement given: {install_req} (already in {existing_req}, name={install_req.name!r})"
+                f"Double requirement given: {install_req} "
+                f"(already in {existing_req}, name={install_req.name!r})"
             )
 
         # When no existing requirement exists, add the requirement as a
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 4ffbdaf5919..49a1f660ca6 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -191,7 +191,10 @@ def version(self) -> CandidateVersion:
         return self._version
 
     def format_for_error(self) -> str:
-        return f"{self.name} {self.version} (from {self._link.file_path if self._link.is_file else self._link})"
+        return (
+            f"{self.name} {self.version} "
+            f"(from {self._link.file_path if self._link.is_file else self._link})"
+        )
 
     def _prepare_distribution(self) -> BaseDistribution:
         raise NotImplementedError("Override in subclass")
@@ -265,7 +268,9 @@ def __init__(
             # Version may not be present for PEP 508 direct URLs
             if version is not None:
                 wheel_version = Version(wheel.version)
-                assert version == wheel_version, f"{version!r} != {wheel_version!r} for wheel {name}"
+                assert (
+                    version == wheel_version
+                ), f"{version!r} != {wheel_version!r} for wheel {name}"
 
         if cache_entry is not None:
             assert ireq.link.is_wheel
diff --git a/src/pip/_internal/utils/direct_url_helpers.py b/src/pip/_internal/utils/direct_url_helpers.py
index e2411374a9a..66020d3964a 100644
--- a/src/pip/_internal/utils/direct_url_helpers.py
+++ b/src/pip/_internal/utils/direct_url_helpers.py
@@ -12,7 +12,9 @@ def direct_url_as_pep440_direct_reference(direct_url: DirectUrl, name: str) -> s
     requirement = name + " @ "
     fragments = []
     if isinstance(direct_url.info, VcsInfo):
-        requirement += f"{direct_url.info.vcs}+{direct_url.url}@{direct_url.info.commit_id}"
+        requirement += (
+            f"{direct_url.info.vcs}+{direct_url.url}@{direct_url.info.commit_id}"
+        )
     elif isinstance(direct_url.info, ArchiveInfo):
         requirement += direct_url.url
         if direct_url.info.hash:
diff --git a/tests/functional/test_build_env.py b/tests/functional/test_build_env.py
index 41bbe801f02..11164be0500 100644
--- a/tests/functional/test_build_env.py
+++ b/tests/functional/test_build_env.py
@@ -24,6 +24,7 @@ def run_with_build_env(
     test_script_contents: Optional[str] = None,
 ) -> TestPipResult:
     build_env_script = script.scratch_path / "build_env.py"
+    scratch_path = str(script.scratch_path)
     build_env_script.write_text(
         dedent(
             f"""
@@ -42,7 +43,7 @@ def run_with_build_env(
 
             link_collector = LinkCollector(
                 session=PipSession(),
-                search_scope=SearchScope.create([{str(script.scratch_path)!r}], [], False),
+                search_scope=SearchScope.create([{scratch_path!r}], [], False),
             )
             selection_prefs = SelectionPreferences(
                 allow_yanked=True,
diff --git a/tests/functional/test_new_resolver_hashes.py b/tests/functional/test_new_resolver_hashes.py
index 7789813bf37..5fb1f2bf799 100644
--- a/tests/functional/test_new_resolver_hashes.py
+++ b/tests/functional/test_new_resolver_hashes.py
@@ -89,15 +89,14 @@ def test_new_resolver_hash_intersect_from_constraint(
     script: PipTestEnvironment,
 ) -> None:
     find_links = _create_find_links(script)
+    sdist_hash = find_links.sdist_hash
 
     constraints_txt = script.scratch_path / "constraints.txt"
-    constraints_txt.write_text(
-        f"base==0.1.0 --hash=sha256:{find_links.sdist_hash}",
-    )
+    constraints_txt.write_text(f"base==0.1.0 --hash=sha256:{sdist_hash}")
     requirements_txt = script.scratch_path / "requirements.txt"
     requirements_txt.write_text(
         f"""
-        base==0.1.0 --hash=sha256:{find_links.sdist_hash} --hash=sha256:{find_links.wheel_hash}
+        base==0.1.0 --hash=sha256:{sdist_hash} --hash=sha256:{find_links.wheel_hash}
         """,
     )
 
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index 2a462ff4879..b786454e04d 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -802,8 +802,8 @@ def test_get_index_content_invalid_content_type(
     assert (
         "pip._internal.index.collector",
         logging.WARNING,
-        f"Skipping page {url} because the GET request got Content-Type: {content_type}. "
-        "The only supported Content-Types are application/vnd.pypi.simple.v1+json, "
+        f"Skipping page {url} because the GET request got Content-Type: {content_type}."
+        " The only supported Content-Types are application/vnd.pypi.simple.v1+json, "
         "application/vnd.pypi.simple.v1+html, and text/html",
     ) in caplog.record_tuples
 

From f633c5dfc2a7df8e97469e06c162ae75fc8c79a4 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 24 Mar 2024 15:32:35 -0400
Subject: [PATCH 309/992] NEWS ENTRY

---
 news/12595.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12595.trivial.rst

diff --git a/news/12595.trivial.rst b/news/12595.trivial.rst
new file mode 100644
index 00000000000..3aad5da6745
--- /dev/null
+++ b/news/12595.trivial.rst
@@ -0,0 +1 @@
+Update ruff pre-commit to v0.3.6

From 5da6b2f95c323e78af9bf164c6ccf620b2355ae0 Mon Sep 17 00:00:00 2001
From: Nicole Harris 
Date: Sun, 14 Apr 2024 14:58:29 +0100
Subject: [PATCH 310/992] Expand UX documentation to include 2020 research
 (#10745)

Co-authored-by: Pradyun Gedam 
Co-authored-by: Paul Moore 
---
 docs/html/index.md                            |   2 +-
 docs/html/ux-research-design/contribute.md    |  24 +
 docs/html/ux-research-design/guidance.md      | 412 ++++++++++++++
 docs/html/ux-research-design/index.md         |  15 +
 .../research-results/about-our-users.md       | 291 ++++++++++
 .../research-results/ci-cd.md                 |  42 ++
 .../improving-pips-documentation.md           | 531 ++++++++++++++++++
 .../research-results/index.md                 | 208 +++++++
 .../research-results/mental-models.md         |  70 +++
 .../override-conflicting-dependencies.md      |  62 ++
 .../research-results/personas.md              | 250 +++++++++
 .../research-results/pip-force-reinstall.md   | 102 ++++
 .../research-results/pip-search.md            | 145 +++++
 .../research-results/pip-upgrade-conflict.md  |  68 +++
 .../research-results/prioritizing-features.md | 156 +++++
 .../research-results/users-and-security.md    | 172 ++++++
 docs/html/ux_research_design.rst              |  81 ---
 news/10745.doc.rst                            |   1 +
 18 files changed, 2550 insertions(+), 82 deletions(-)
 create mode 100644 docs/html/ux-research-design/contribute.md
 create mode 100644 docs/html/ux-research-design/guidance.md
 create mode 100644 docs/html/ux-research-design/index.md
 create mode 100644 docs/html/ux-research-design/research-results/about-our-users.md
 create mode 100644 docs/html/ux-research-design/research-results/ci-cd.md
 create mode 100644 docs/html/ux-research-design/research-results/improving-pips-documentation.md
 create mode 100644 docs/html/ux-research-design/research-results/index.md
 create mode 100644 docs/html/ux-research-design/research-results/mental-models.md
 create mode 100644 docs/html/ux-research-design/research-results/override-conflicting-dependencies.md
 create mode 100644 docs/html/ux-research-design/research-results/personas.md
 create mode 100644 docs/html/ux-research-design/research-results/pip-force-reinstall.md
 create mode 100644 docs/html/ux-research-design/research-results/pip-search.md
 create mode 100644 docs/html/ux-research-design/research-results/pip-upgrade-conflict.md
 create mode 100644 docs/html/ux-research-design/research-results/prioritizing-features.md
 create mode 100644 docs/html/ux-research-design/research-results/users-and-security.md
 delete mode 100644 docs/html/ux_research_design.rst
 create mode 100644 news/10745.doc.rst

diff --git a/docs/html/index.md b/docs/html/index.md
index ab0b40dc180..dad5d94f2bf 100644
--- a/docs/html/index.md
+++ b/docs/html/index.md
@@ -23,7 +23,7 @@ cli/index
 :hidden:
 
 development/index
-ux_research_design
+ux-research-design/index
 news
 Code of Conduct 
 GitHub 
diff --git a/docs/html/ux-research-design/contribute.md b/docs/html/ux-research-design/contribute.md
new file mode 100644
index 00000000000..60b982c856e
--- /dev/null
+++ b/docs/html/ux-research-design/contribute.md
@@ -0,0 +1,24 @@
+# How to Contribute
+
+## Participate in UX Research
+
+It is important that we hear from pip users so that we can:
+
+- Understand how pip is currently used by the Python community
+- Understand how pip users _need_ pip to behave
+- Understand how pip users _would like_ pip to behave
+- Understand pip’s strengths and shortcomings
+- Make useful design recommendations for improving pip
+
+If you are interested in participating in pip user research, please [join pip’s user panel](https://mail.python.org/mailman3/lists/pip-ux-studies.python.org/).
+
+## Test New Features
+
+You can help the team by testing new features as they are released to the community.
+
+## Report and Work on UX Issues
+
+If you believe that you have found a user experience bug in pip, or you have ideas for how pip could be made better for all users, please file an issue on the [pip issue tracker](https://github.com/pypa/pip/issues/new).
+
+You can also help improve pip’s user experience by [working on UX issues](https://github.com/pypa/pip/issues?q=is%3Aissue+is%3Aopen+label%3A%22K%3A+UX%22). Issues that are ideal for new contributors are marked with “[good first issue](https://github.com/pypa/pip/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)”. Explore the
+[UX Guidance](guidance) if you have questions.
diff --git a/docs/html/ux-research-design/guidance.md b/docs/html/ux-research-design/guidance.md
new file mode 100644
index 00000000000..188930a9e62
--- /dev/null
+++ b/docs/html/ux-research-design/guidance.md
@@ -0,0 +1,412 @@
+# UX Guidance
+
+This section of the documentation is intended for contributors who wish to work on improving pip's user experience, including pip's documentation.
+
+## What is User Centered Design?
+
+User-centered design (UCD) or human-centered design (HCD) is an iterative process in which design decisions are informed by an understanding of users and their needs. There are many terms used to describe this type of work; in this document we will use "user experience (UX) research and design".
+
+For the pip project, UX research and design can be used to:
+
+- Develop a deeper understanding of pip's users, the context in which they use pip and the challenges that they face
+- Inform the design of new or existing pip features, so that pip us more usable and accessible. This may include improving pip's output (including error messages), controls (e.g. commands and flags) and documentation
+- Help pip's development team prioritize feature requests based on user needs
+
+At a high level, the UX research and design process is comprised of:
+
+1. **[Research](#conducting-research-for-pip)**, where a variety of techniques are used (e.g.[surveys](#surveys) and [interviews](#interviews)) to learn about users and what they want from the tools they use
+2. **[Design](#user-interface-design)**, where solutions are proposed to response to the research conducted. UX research and design is conducted iteratively, with design proposals or prototypes tested with users to validate that they are effective in meeting users' needs. Often, it is necessary to complete several cycles of research, design and validation to find a solution that works:
+
+![Graphic showing an iterative process of Research, Make (Design), Validate, around user goals and needs.](https://user-images.githubusercontent.com/3323703/124515613-c5bae880-ddd7-11eb-99d6-35c0a7522c7a.png)
+
+For more information on how this process has been applied to the pip project, see [research results](research-results/index).
+
+See also:
+
+- [Introduction to user centered design from the interaction design foundation](https://www.interaction-design.org/literature/topics/user-centered-design)
+- [User-Centered Design Basics from usability.gov](https://www.usability.gov/what-and-why/user-centered-design.html)
+- [User-centered design articles and videos from Nielson Norman Group](https://www.nngroup.com/topic/user-centered-design/)
+
+## Conducting Research for pip
+
+User research can be used to answer a few different types of questions:
+
+- _Understanding the context generally_ — e.g. how is pip used by people? What different environments and contexts is pip used in?
+- _Understanding the users more broadly_ — e.g. who uses pip? How much experience do they have typically? How do they learn how to use pip? Are there any common characteristics between pip users? How diverse are the needs of pip's users?
+- _Evaluating a specific need or challenge_ — e.g. how are pip users encountering a given issue? When does it come up? Do pip users regularly encounter this issue? How would a new feature address this issue?
+
+During the research process, it is important to engage users for input, and incorporate their feedback into decision making.
+
+Input and feedback from users is as valuable to an open source project as code contributions; end users may not be ready yet to submit a pull request or make fixes into the code directly, but their feedback can help to shape pip's priorities and direction.
+
+There are many ways to engage users in open source projects, and sometimes input from community members can feel overwhelming! Providing a structure, such as surveys and interviews, can make it easier to collect and understand feedback. Some examples of how to engage users are:
+
+- _Surveys_ — good for targeted feedback about specific issues and broad community context and understanding
+- _Interviews_ — good for in-depth conversations to understand or explore a topic
+- _Testing_ — good to evaluate an issue or validate a design idea
+- _Open issue queues_ (e.g. GitHub issues) & support ticket systems — great data source to understand common challenges
+- _Forums or discussion tools_ — great data source to understand common challenges or engage broader community in open discussion
+- _Conferences and events_ — great opportunity to go lightweight interviews or testing of specific features
+
+When running [UX research on pip in 2020](research-results/index), we found that surveys and interviews were particularly useful tools to engage with pip's users. Some general guidelines, as well as pip-specific recommendations are below.
+
+### Surveys
+
+Surveys are great for collecting broad, large scale input, e.g. learning more about pip's user community as a whole, or for getting targeted feedback about a specific issue.
+
+Surveys can also be leveraged to get in-situ feedback with early releases of new tools, e.g. prompting users on the command line if they are using a beta version of a feature or asking people for feedback on a documentation page.
+
+As an example, in 2020, the pip UX team published several surveys to learn about pip and pip's users. This included:
+
+- Understanding 'who uses pip'
+- Collecting feedback about pip's documentation
+- Collecting feedback about pip's beta release of the 2020 dependency resolver
+- Asking users how specific parts of pip's 2020 dependency resolver should behave
+
+A full list of the surveys published in 2020 and their results [can be found here](research-results/index).
+
+#### Designing Surveys
+
+When designing surveys, it is important to first establish what you want to learn. It can be useful to write this down as research-results/index questions. Example pip research-results/index questions [can be found here](https://github.com/pypa/pip/issues/8518).
+
+If you find that your topic is large, or you have many research-results/index questions, consider publishing several separate surveys, as long surveys risk a low response / high dropoff rate.
+
+Below is a brief guide to building a survey for pip:
+
+
    
+  
  1. 
+    Introduce your survey
    
+    Explain the motivation for the survey, or (for surveys about pip's behaviour) set the scene with a scenario.
+  
    2. 
+  
  2. 
+    Design your questions
    
+    
      
+      
    • 
+        Limit the number of questions you ask to avoid a low response rate. A good rule of thumb is: 3-4 questions about the specific topic, 2-3 questions about users level of experience / what they use Python or pip for.
      
+        When asking about years of experience use the following groupings as options:
+        
        
+          
      • < 1 Year
        • 
+          
      • 1-3 Years
        • 
+          
      • 4-6 Years
        • 
+          
      • 7-10 Years
        • 
+          
      • 11-15 Years
        • 
+          
      • 16+ Years
        • 
+        
      
+      
      • 
+      
    • 
+        Use closed questions with a fixed number of possible responses (e.g. yes/no, multiple choice, checkboxes, or likert scale) for measuring behaviour, opinion or preferences
+      
      • 
+      
    • 
+        Use open questions to learn about reasoning. If you are using a lot of closed questions in your survey, it is useful to include some open questions to "fish" for less expected answers - e.g. asking a user "why?" they chose a particular option
+      
      • 
+    
    
+  
    3. 
+  
  3. 
+    Pilot your survey and modify it based on feedback
    
+    This could be as simple as sharing it with 1-2 people to see if it makes sense.
+  
    4. 
+  
  4. 
+    Determine where to do outreach
    
+    Establish who you want to hear from and where you should post the survey. Are there community members or groups that can help you reach more people?
    
+    
      
+      
    • Does the survey need to be translated into other languages to reach a broader set of the community?
      • 
+      
    • Are you able to compensate people for their time?
      • 
+      
    • Do participants want to be acknowledged as contributors?
      • 
+    
    
+  
    5. 
+  
  5. 
+    Launch and promote your survey
    
+    See survey and interview outreach for recommendations on how to do outreach for pip based on the UX research-results/index conducted in 2020.
+  
    6. 
+

+
+#### Survey Case Study
+
+The process described above was followed in 2020, when we wanted to establish whether pip [should install packages with conflicting dependencies](https://github.com/pypa/pip/issues/8452).
+
+First, we introduced the purpose of the survey, with a scenario:
+
+![survey introduction with scenario with packages that conflict](https://user-images.githubusercontent.com/3323703/124516502-b046be00-ddd9-11eb-830c-62b8a6fb6182.png)
+
+Next, we asked a closed question to establish what the user prefers:
+
+![survey question asking whether pip should allow users to install packages when there are conflicting dependencies](https://user-images.githubusercontent.com/3323703/124516576-e5eba700-ddd9-11eb-8baf-e07773e75742.png)
+
+Following this, we qualified the response with an open question:
+
+![survey question asking respondents why pip should allow users to install packages with conflicting dependencies](https://user-images.githubusercontent.com/3323703/124516646-129fbe80-ddda-11eb-9c8a-da127f19fccd.png)
+
+This was followed by further questions about workarounds, syntax and behaviour preferences.
+
+Finally, we asked survey participants about themselves, including how much Python experience they have, and what they use Python for. This was to find out if different types of Python users answered the questions differently.
+
+This survey was shared with the pip team and improved several times, before it was published and promoted using a variety of [outreach channels](#survey-and-interview-outreach).
+
+In total, we received 415 responses, with [clear results](research-results/override-conflicting-dependencies) that helped us to make strong recommendations on how to move forward with this feature.
+
+#### Analysing Survey Results
+
+Surveys are particularly useful for being able to quickly understand trends from a larger population of responses. If your questions are designed well, then you should be able to easily aggregate the data and make statements such as: `X% of respondents said that Option B was the best option.`
+
+#### Contextualizing the Responses
+
+It's important to remember that the responses to your survey will be biased by the way that you did outreach for your survey, so unless you can be sure that the people who responded to your survey are representative of all of your users, then you need to be sure to contextualize the results to the participants. Within your survey responses it can be helpful to see if there is variation in the responses by different aspects of your users or your user community, e.g.
+
+- By experience level — Are responses consistent across experience level or do they vary? E.g. Do newer or more junior experience users have different responses, needs or challenges?
+- By background/context — Are responses consistent across background or context? E.g. Do users in a corporate context have similar responses to hobbyist/independent users? Do data analysts have similar responses to software engineers?
+
+#### How many responses is enough?
+
+It depends! This is a hard question to answer in research like this — Traditional statistics would suggest that "enough" depends on the total population you need the survey to represent. In UX research, the answer tends to be more around when you see variation in responses level out, and so it's more about signals and trends in the data.
+
+If you are finding that there aren't patterns in the data, it might mean that your questions weren't clear or provided too many options, or it might mean that you need to reach out to more people.
+
+See also:
+
+- [28 Tips for Creating Great Qualitative Surveys from Nielson Norman Group](https://www.nngroup.com/articles/qualitative-surveys/)
+- [Open vs. Closed Questions in User Research from Nielsen Norman Group](https://www.nngroup.com/videos/open-vs-closed-questions/)
+- [Survey questions 101: over 70 survey question examples + types of surveys and FAQs - from HotJar](https://www.hotjar.com/blog/survey-questions/)
+
+### Interviews
+
+Interviews are a great way to have more in-depth conversations with users to better understand or explore a topic. Unlike surveys, they are not a great way to understand overall patterns, as it is hard to engage with a large number of people due to the time involved. It can be particularly useful to plan around conferences and events as a way to connect with many users in a more informal setting.
+
+#### Designing Interviews
+
+As with surveys, it's important to establish what you want to learn before you begin.
+
+Often, interviews are conducted with a script; this helps the interview run smoothly by providing some structure. However, it is also ok to go "off script" if the conversation is moving in an interesting or insightful direction.
+
+Below is a brief guide to running an interview for pip:
+
+
    
+  
  1. 
+    Write your script
    
+    This should include an introduction that sets the scene for the participant, explaining what the interview is about, how you (or observers) will take notes, how long it will take, how their feedback will be used (and shared) and any other pointers you want to share.
    
+    Next, design your questions. Limit the number of questions, so that you have enough time to cover key points and the interview does not run for too long. Like in surveys, a good rule of thumb is 2-3 questions about users' level of experience, and what they use Python/pip for, plus 3-4 questions about the specific topic.
    
+    There are four different types of interview questions:
+    
      
+      
    1. 
+        Descriptive — This type of question gives you concrete, specific stories and details. It also helps your interviewee "arrive" at the interview, resurfacing their relevant experiences and memories. E.g.
      
+        
        
+          
      • Tell me about a time…
        • 
+          
      • Tell me about the first time…
        • 
+          
      • Tell me about the last time…
        • 
+          
      • Tell me about the worst/best time…
        • 
+          
      • Walk me through how you…
        • 
+        
      
+      
      2. 
+      
    2. 
+        Reflective — These questions allow the interviewee to revisit and think more deeply about their experiences. Helping the interviewee reflect is at the heart of your interview. Don't rush – give them lots of space to put their thoughts together.
      
+        
        
+          
      • What do you think about…
        • 
+          
      • How do you feel about…
        • 
+          
      • Why do you do…
        • 
+          
      • Why do you think…
        • 
+          
      • What effects did it have when…
        • 
+          
      • How has ... changed over time?
        • 
+        
      
+      
      3. 
+      
    3. 
+        Clarifying — This type of question gives interviewees the opportunity to expand on key points. Skillful clarifying questions also let you subtly direct the interviewee's storytelling towards the areas you find most intriguing and relevant.
      
+        
        
+          
      • What do you mean when you say…
        • 
+          
      • So, in other words…
        • 
+          
      • It sounds like you're saying [...]. Is that right?
        • 
+          
      • Can you tell me more about that?
        • 
+        
      
+      
      4. 
+      
    4. 
+        Exploratory — These questions are an invitation to the interview-ee to think creatively about their situation, and are best left for the end of the interview. Careful, though – suggestions from a single person are rarely the answer to your design problem, and you need to be clear to them that you're just collecting ideas at this point.
      
+        
        
+          
      • How would you change…
        • 
+          
      • What would happen if…
        • 
+          
      • If you had a magic wand...
        • 
+        
      
+      
      5. 
+    
    
+  
    2. 
+  
  2. 
+    Pilot interview with 1-2 people & modify based on their feedback
+  
    3. 
+  
  3. 
+    Determine how to do outreach for interviews
    
+    
      
+      
    • Who do you want to be sure to hear from? Where do you need to post to contact people for interviews? Are there community members or groups that can help you reach specific people?
      • 
+      
    • Do the interviews need to be translated into other languages to reach a broader set of the community or a specific community?
      • 
+      
    • How will people sign up for your interview?
      • 
+      
    • Are you able to compensate people for their time?
      • 
+      
    • Do participants want to be acknowledged as contributors?
      • 
+    
    
+  
    4. 
+  
  4. 
+    Start outreach!
    
+    See survey and interview outreach for recommendations on how to do outreach for pip based on the UX research conducted in 2020.
+  
    5. 
+

+
+Here is an example user interview script used for speaking to users about pip's documentation:
+
+> **Introduction**
+>
+> - Firstly thank you for giving me your time and for your continued involvement.
+> - The purpose of this interview is to better understand how pip's documentation is perceived and used by Python community members
+> - The interview will take approximately 30 minutes. If you don't understand any of the questions please ask me to repeat or rephrase. If you don't have a good answer, feel free to tell me to skip.
+> - I will be taking notes. These will be shared on GitHub or the pip docs, but we will remove any identifying data to > protect your anonymity
+> - Please be honest - your feedback can help us make pip better. I won't be offended by anything you have to say :)
+> - (optional) Do you mind if I record this session?
+>
+> **Opening questions**
+>
+> - Can you tell me a bit about how you use Python?
+> - How long have you been using pip?
+>
+> **Solving problems**
+>
+> - Can you tell me about a time you had a problem when using pip?
+>   - What happened?
+>   - What did you do?
+>   - Where did you go?
+>   - How did you resolve your problem?
+> - Please go to[ https://pip.pypa.io/en/stable/](https://pip.pypa.io/en/stable/)
+>   - Have you ever used this documentation?
+>   - On a scale of 1-10 how useful was it?
+>   - Why?
+> - Are there any projects that you use that you'd like us to look at when thinking about improving pip's docs?
+>   - What makes that documentation good/useful?
+>
+> **Conclusion**
+>
+> - What one thing could the pip team do to help users troubleshoot pip problems?
+> - Do you have any questions?
+
+#### How many interviews is enough?
+
+This depends on the complexity of the issue you are discussing, and whether or not you feel that you have gained enough insight from the interviews you have conducted. It also depends on whether you feel you have heard from a wide enough range of people. For example, you may wish to stop interviewing only after you have heard from both expert _and_ novice pip users.
+
+Often, conducting just a few interviews will uncover so many problems that there is enough material to make recommendations to the team.
+
+#### Analyzing Interview Data
+
+Formal interview analysis typically uses a process called "coding" where multiple researchers review interview transcripts and label different statements or comments based on a code system or typology that has been developed to align with the research. This is a great practice and a great way to make sure that the researchers' bias is addressed as part of the process, but most teams do not have the staffing or resources to do this practice.
+
+Instead many smaller teams use lightweight processes of capturing interview statements into **themes**, e.g. specific topics or issue areas around needs or challenges. Interviews are also a great source for **quotes**, which can be helpful for providing an example of why something is important or when/how something comes up for users.
+
+Interview analysis is frequently done using sticky notes, where you can write a quote, issue or finding on a sticky note and then move the sticky notes around into clusters that can be labeled or categorized into the themes. Remotely this can be facilitated by any number of tools, e.g. digital sticky board tools like [Miro](https://miro.com/) or [Mural](https://www.mural.co/), or even kanban board tools like [Trello](https://trello.com/), [Wekan](https://wekan.github.io/) or [Cryptpad](https://cryptpad.fr/), or this can be done just with text documents or spreadsheets, using lists and categories. It can be helpful to use a [worksheet for debriefing](https://simplysecure.org/resources/interview_synthesis.pdf) at the end of each interview to capture insights and themes quickly before you forget topics from the specific interview.
+
+See also:
+
+- [User Interviews: How, When, and Why to Conduct Them from Nielson Norman Group](https://www.nngroup.com/articles/user-interviews/)
+- [Interviewing Users from Nielson Norman Group](https://www.nngroup.com/articles/interviewing-users/)
+
+### Survey and Interview Outreach
+
+The following is a list of outreach platforms that the pip team used when conducting research in 2020. Some were more successful than others:
+
+#### Recommended: UX Research Panel
+
+As part of the [2020 UX Work](research-results/index), we published a form that asked people to join a research panel and be regularly contacted about surveys and interview opportunities. This is now a [mailing list that users can sign up for](https://mail.python.org/mailman3/lists/pip-ux-studies.python.org/), and will be used in an ongoing way in addition to broad public outreach.
+
+#### Recommended: Twitter
+
+We found Twitter to be a very effective platform for engaging with the Python community and drive participation in UX research. We recommend:
+
+1. Asking [ThePSF](https://twitter.com/ThePSF), [PyPA](https://twitter.com/ThePyPA) and [PyPI](https://twitter.com/pypi) to retweet calls for survey and interview participation
+2. Asking specific individuals (who have reach within specific communities, or general followings within the Python community) to retweet.
+3. Explicitly asking for retweets within tweets
+4. Responding to users within Twitter
+
+#### Recommended: Specific Interest Groups
+
+We engaged with the [PyLadies](https://pyladies.com/) community via their [Slack channel](https://slackin.pyladies.com/) to drive more participation from women using pip, as we found this demographic more difficult to reach via other channels
+
+#### Recommended: Conference Communities
+
+Due to the 2020 Global Pandemic we were unable to engage with users via PyCon (or other regional conferences) as we would have liked. However, we would still recommend this channel as a fast and insightful way to engage with large groups of interested people.
+
+#### Worth Exploring: Adding a prompt/path into pip's 'help' command
+
+We didn't have a chance to explore this opportunity, but the idea came up during workshops in December 2020 with Pypa Maintainers, and could be a great way to engage users and help point them towards opportunities to contribute.
+
+#### Not recommended: Forums (Discourse, etc)
+
+We used [discuss.python.org](https://discuss.python.org/) several times, posting to the [packaging forum](https://discuss.python.org/c/packaging/14) to ask packaging maintainers about their views on pip's functionality. Unfortunately, this was not as fruitful as we hoped, with very few responses. We found that engaging with packaging maintainers via Twitter was more effective.
+
+Posting surveys on Reddit was also not as useful as we had expected. If the user posting the survey or call for research participation does not have significant credit on Reddit, then the posting process itself can be challenging. Overall we did not see as much engagement in surveys or interviews come from Reddit relative to other outreach means.
+
+## User Interface Design
+
+Many people associate the term "user interface" with websites or applications, however it is important to remember that a CLI is a user interface too, and deserves the same design consideration as graphical user interfaces.
+
+Designing for pip includes:
+
+- Designing pip's _input_ - establishing the best way to group functionality under commands, and how to name those commands so that they make sense to the user
+- Writing pip's _output_ - establishing how pip responds to commands and what information it provides the user. This includes writing success and error messages.
+- Providing supplemental materials - e.g. documentation that helps users understand pip's operation
+
+### Design Principles / Usability Heuristics
+
+There are many interaction design principles that help designers design great experiences. Nielsen Norman's [10 Usability Heuristics for User Interface Design](https://www.nngroup.com/articles/ten-usability-heuristics) is a great place to start. Here are some of the ways these principles apply to pip:
+
+- Visibility of system status: ensure all commands result in clear feedback that is relevant to the user - but do not overload the user with too much information (see "Aesthetic and minimalist design")
+- Consistency and standards: when writing interfaces, strive for consistency with the rest of the Python packaging ecosystem, and (where possible) adopt familiar patterns from other CLI tools
+- Aesthetic and minimalist design: remove noise from CLI output to ensure the user can find the most important information
+- Help users recognize, diagnose, and recover from errors: clearly label and explain errors: what happened, why, and what the user can do to try and fix the error. Link to documentation where you need to provide a detailed explanation.
+- Help and documentation: provide help in context and ensure that documentation is task-focussed
+
+#### Additional Resources
+
+- [Command Line Interface Guidelines](https://clig.dev)
+- [10 design principles for delightful CLIs](https://blog.developer.atlassian.com/10-design-principles-for-delightful-clis/)
+
+### Design Tools
+
+Tools that are frequently used in the design process are personas and guidelines, but also wireframing, prototyping, and testing, as well as creating flow diagrams or models.
+
+#### Personas
+
+_For a more in-depth overview of personas and using them in open source projects, this [resource from Simply Secure](https://simplysecure.org/blog/personas) may be helpful._
+
+Personas are abstractions or archetypes of people who might use your tool. It often takes the form of a quick portrait including things like — name, age range, job title, enough to give you a sense of who this person is. You can capture this information into a [persona template](https://simplysecure.org/resources/persona-template-tech.pdf) and share them with your open source community as a resource see [examples from the Gitlab UX Team](https://about.gitlab.com/handbook/marketing/strategic-marketing/roles-personas/).
+
+Personas are particularly useful to help ground a feature design in priorities for specific needs of specific users. This helps provide useful constraints into the design process, so that you can focus your work, and not try to make every feature a swiss army knife of solutions for every user.
+
+In 2020, the pip UX team developed the following personas for the pip project:
+
+- Python Software User
+- Python Software Maker
+- Python Package Maintainer
+
+An in-depth write up on how the pip personas were created, and how they can be applied to future pip UX work can be [found here](research-results/personas).
+
+#### Prototyping
+
+In any UX project, it is important to prototype and test interfaces with real users. This provides the team with a feedback loop, and ensures that the solution shipped to the end user meets their needs.
+
+Prototyping CLIs can be a challenge. See [Creating rapid CLI prototypes with cli-output](https://www.ei8fdb.org/thoughts/2020/10/prototyping-command-line-interfaces-with-cli-output/) for recommendations.
+
+#### Copywriting Style Guides
+
+Given pip's interface is text, it is particularly important that clear and consistent language is used.
+
+The following copywriting Style Guides may be useful to the pip team:
+
+- [Warehouse (PyPI) copywriting styleguide and glossary of terms](https://warehouse.readthedocs.io/ui-principles.html#write-clearly-with-consistent-style-and-terminology)
+- Firefox:
+  - [Voice and Tone](https://meet.google.com/linkredirect?authuser=0&dest=https%3A%2F%2Fdesign.firefox.com%2Fphoton%2Fcopy%2Fvoice-and-tone.html)
+  - [Writing for users](https://meet.google.com/linkredirect?authuser=0&dest=https%3A%2F%2Fdesign.firefox.com%2Fphoton%2Fcopy%2Fwriting-for-users.html)
+- [Heroku CLI](https://devcenter.heroku.com/articles/cli-style-guide) (very specific to Heroku's CLI tools)
+- [Redhat Pattern Fly style guide](https://www.patternfly.org/v4/ux-writing/about)
+- [Writing for UIs from Simply Secure](https://simplysecure.org/blog/writing-for-uis)
+
+### General Resources
+
+- Heroku talk on design of their CLI tools ([video](https://www.youtube.com/watch?v=PHiDG-_XoRk) transcript)
+- [Simply Secure: UX Starter Pack](https://simplysecure.org/ux-starter-pack/)
+- [Simply Secure: Feedback Gathering Guide](https://simplysecure.org/blog/feedback-gathering-guide)
+- [Simply Secure: Getting Quick Tool Feedback](https://simplysecure.org/blog/design-spot-tool-feedback)
+- [Internews: UX Feedback Collection Guidebook](https://globaltech.internews.org/our-resources/ux-feedback-collection-guidebook)
+- [Simply Secure: Knowledge Base](http://simplysecure.org/knowledge-base/)
+- [Open Source Design](https://opensourcedesign.net/resources/)
+- [Nielsen Norman Group](https://www.nngroup.com/articles/)
+- [Interaction Design Foundation](https://www.interaction-design.org/literature)
diff --git a/docs/html/ux-research-design/index.md b/docs/html/ux-research-design/index.md
new file mode 100644
index 00000000000..0d9efd07ac4
--- /dev/null
+++ b/docs/html/ux-research-design/index.md
@@ -0,0 +1,15 @@
+# UX Research & Design
+
+```{toctree}
+:hidden:
+
+contribute
+guidance
+research-results/index
+```
+
+Welcome to pip’s UX research and design documentation. The purpose of this section of the documentation is to:
+
+- [Identify where new contributors can participate in or lead UX research and design activities](contribute)
+- [Share pip UX guidelines](guidance), including an introduction to User Centered Design practices, and how they can be applied to the pip project
+- Share [results of user research](research-results/index) that the pip team has already conducted
diff --git a/docs/html/ux-research-design/research-results/about-our-users.md b/docs/html/ux-research-design/research-results/about-our-users.md
new file mode 100644
index 00000000000..81a0878d9fe
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/about-our-users.md
@@ -0,0 +1,291 @@
+# About pip's Users
+
+## Problem
+
+We want to understand users' background, their cultural environment, and how they experience the world, so that we can find better ways to serve them.
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+To develop our understanding about pip's users, we published a "Who uses pip?" survey that asked users about:
+
+- Their location in the world
+- Their spoken language
+- If they identified as members of an underrepresented group in the Python community
+- Their disabilities and if those disabilities affected their usage of pip
+
+## Results
+
+164 people responded to the survey, with 40% of these coming from English speaking countries. 80% of participants came from Europe or North America.
+
+Approx. 60% did not identify as members of an underrepresented group. The majority of participants who did identify as underrepresented did so for gender reasons.
+
+The majority of participants (94%) responded that they did not have a disability. Of those that did have a disability, the majority were cognitive disabilities (Attention Deficit Hyperactivity Disorder aka ADHD, Autism, Aspergers, Dyslexia) or a hearing disability.
+
+### Participant Demographics
+
+#### Location
+
+The majority of participants came from North America and Western Europe. Participation from pip users in Africa, Asia, and the Middle-East was low.
+
+![Map of world showing distribution of participants as per table below](https://i.imgur.com/U2MYiK7.png)
+
+Fig. X: Global distribution of pip research participants.
+
+| Country Name             | Number of participants |
+| ------------------------ | ---------------------- |
+| United States of America | 42                     |
+| United Kingdom           | 17                     |
+| France                   | 12                     |
+| Germany                  | 11                     |
+| Canada                   | 10                     |
+| Netherlands              | 8                      |
+| Spain                    | 6                      |
+| Switzerland              | 5                      |
+| Nigeria                  | 4                      |
+| India                    | 4                      |
+| Czech Republic           | 4                      |
+| Argentina                | 4                      |
+| Sweden                   | 3                      |
+| Australia                | 3                      |
+| Ukraine                  | 2                      |
+| Taiwan                   | 2                      |
+| Russia                   | 2                      |
+| Greece                   | 2                      |
+| Colombia                 | 2                      |
+| Chile                    | 2                      |
+| Brazil                   | 2                      |
+| Belgium                  | 2                      |
+| Uganda                   | 1                      |
+| Turkey                   | 1                      |
+| Singapore                | 1                      |
+| Serbia                   | 1                      |
+| Norway                   | 1                      |
+| Luxembourg               | 1                      |
+| Japan                    | 1                      |
+| Italy                    | 1                      |
+| Israel                   | 1                      |
+| Ireland                  | 1                      |
+| Hungary                  | 1                      |
+| Ghana                    | 1                      |
+| Finland                  | 1                      |
+| Bulgaria                 | 1                      |
+| Austria                  | 1                      |
+| Total                    | 164                    |
+
+#### Participant's First Language
+
+Even though the research was carried out mainly in English, 51% of participants spoke languages other than English.
+
+| What spoken language do you feel is your first? | Number of participants |
+| ----------------------------------------------- | ---------------------- |
+| English                                         | 79                     |
+| French                                          | 18                     |
+| Spanish                                         | 12                     |
+| German                                          | 11                     |
+| Russian                                         | 5                      |
+| Czech                                           | 4                      |
+| Italian                                         | 4                      |
+| Portuguese                                      | 3                      |
+| Dutch                                           | 3                      |
+| Ukrainian                                       | 2                      |
+| Swedish                                         | 2                      |
+| Greek                                           | 2                      |
+| Catalan                                         | 2                      |
+| Mandarin                                        | 2                      |
+| Hungarian                                       | 2                      |
+| Bengali                                         | 1                      |
+| Luxembourgish                                   | 1                      |
+| Bulgarian                                       | 1                      |
+| Romanian                                        | 1                      |
+| Chinese                                         | 1                      |
+| Norwegian                                       | 1                      |
+| Serbian                                         | 1                      |
+| Polish                                          | 1                      |
+| Hebrew                                          | 1                      |
+| Indonesian                                      | 1                      |
+| Malayalam                                       | 1                      |
+
+NB: English includes British English and American English. Some participants gave more than one answer, their first answer is included here.
+
+### Participants who identified as underrepresented in the Python community
+
+We asked research participants if they identified as members of an underrepresented group within the Python community.
+
+The wording of this question was deliberately broad to discover participants' understanding of the term "underrepresented" - we listed gender, age, educational background, spoken language, and what they use Python for as a non-exhaustive list of examples.
+
+![Pie chart showing 17.9% answering - I am not sure, 22.6% answering  -yes, 59.4% answering - No to the question - Do you identify as an underrepresented group in the Python community](https://i.imgur.com/ghwzxg9.png)
+
+Of the 22.6% that responded "Yes" the answers were classified as follows :
+
+| Underrepresentation category | Count |
+| ---------------------------- | ----- |
+| Gender                       | 9     |
+| Cultural                     | 3     |
+| Age                          | 3     |
+| Immigration status           | 2     |
+| Neurodiversity               | 3     |
+| Other                        | 6     |
+| No answer                    | 8     |
+
+NB: This question was included after the survey was published. Total participants was 106, as opposed to all other questions which had 164.
+
+The majority of participants did not identify as part of an underrepresented group. However, due to the small sample size these results cannot be seen as representative of the whole pip user base.
+
+#### Participant comments about identifying (or not) as under-represented
+
+Here is a sample of noteworthy comments from these different groups:
+
+##### Related to Gender
+
+> "(I am) LGBTQ/IA+" **- Participant 242608909**
+
+> "I am a 25 year old female Colombian developer." **- Participant 242611698**
+
+> "Female, 39, no computer science background whatsoever, self taught." **- Participant 242614039**
+
+##### Related to Culture
+
+> "The hispanic community is quite underrepresented in the web in general" **- Participant 242599212**
+
+> "I am a 1st generation Dominican-American. My parents are from the Dominican Republic." **- Participant 242769361**
+
+##### Related to Age
+
+> "Older age, I am 50 now." **- Participant 242769743**
+
+##### Related to Neurodiversity
+
+> "I'm a woman. And autistic. But the latter might not be underrepresented ;)" **- Participant 243428773**
+
+##### Other Noteworthy Comments
+
+> "Veterans who entered tech post-military" **- Participant 243524784**
+
+> "I'm a young white cis male, so by far not a minority in those aspects. But at the same time I'm from a third world country, Argentina, and that sometimes (and I emphasize, only sometimes) makes me feel like a minority. When participating in our local communities (Python Argentina), I feel clearly not-minority, and with the responsibility of helping minorities, trying to build a more welcoming and fair environment for them. But when I participate in the broader global community, at times I feel underrepresented, seeing it mostly guided by english-s[p]eaking people from first world countries. But if I have to choose, I would say I mostly feel not-minority, because I mostly interact with people from our local communities, where I'm not part of a minority." **- Participant 242592869**
+
+> "As a CIS male I conform the majoritarian group in the IT world. I'm hopeful that things are changing everywhere, and will keep changing: inclusion is getting bigger and better, more and more people are starting their careers as devs or similar, disregarding ethnicity and/or sexual orientation and that's great! And we need to keep fighting for that." **- Participant 243455292**
+
+### Participant Disabilities
+
+Disabilities - physical, motor, cognitive, hearing, speech - alter how people perceive and interact with the world around them - software included. We asked participants about their disabilities and how it affected their usage of pip.
+
+Understanding these disabilities is important particularly when designing pip command structures, and designing pip output.
+
+The majority of participants (91%) responded that they did not have a disability. Of those that told us that have a disability, the majority were cognitive disabilities (Attention Deficit Hyperactivity Disorder (ADHD), Autism, Aspergers, Dyslexia, or a hearing disability.
+
+#### How many participants identified as having a disability?
+
+| Do you self-identify as someone who has a disability? | Number of responses |
+| ----------------------------------------------------- | ------------------- |
+| No                                                    | 150                 |
+| Yes                                                   | 14                  |
+| Grand Total                                           | 164                 |
+
+#### Vision
+
+Participants who answered yes to this question were partially sighted. Their vision disability was not corrected by glasses, but did not significantly affect their usage of pip.
+
+#### Hearing
+
+Five participants identified as having a hearing impairment, or hearing loss. While this disability made participants lives more difficult, it did not affect their usage of pip:
+
+> "Being hard of hearing/impaired makes my life much harder, but so far it never has impacted my usage of pip. Perhaps because I haven‘t used parts of it that would?" **- Participant 242934019**
+
+> "Not at all given that everything happens by text in my console." **- Participant 243455292**
+
+However it did affect the way they consume pip learning materials: if video is being used for learning or support, they should have captions/subtitles/transcriptions available.
+
+> "any videos released, it is so helpful if there is either a) transcripts, or b) captions." **- Participant 243524784**
+
+#### Cognitive Disabilities
+
+Nine participants expressed cognitive disabilities including undefined mental health conditions, Attention Deficit Hyperactivity Disorder (ADHD), Autism, Aspergers, Dyslexia.
+
+These participants did not explain how their cognitive disabilities affect their usage of pip, however there are guidelines and best practices for designing for people with cognitive disabilities.
+
+#### Physical or Mobility Disability
+
+One participant responded that they had a physical or mobility disability, but did not give detail about it in relation to their usage of pip.
+
+### Participants use of Assistive Technology
+
+The term "assistive technology" (AT) is used to describe products or systems that support and assist individuals with disabilities, restricted mobility or other impairments to perform functions that might otherwise be difficult or impossible. A subset of these are used to make computer technology - hardware and software - more accessible. Common examples of AT used with computer technology are: screen readers, text-to-speech outputs/inputs.
+
+The majority of participants (94%) said that they have never used assistive technology.
+
+| Do you use assistive technology (AT) when using computers? | Number of responses |
+| ---------------------------------------------------------- | ------------------- |
+| No, I have never used it                                   | 128                 |
+| I only use it when needed                                  | 3                   |
+| I use it everyday                                          | 1                   |
+| I have used it in the past, but not anymore                | 4                   |
+
+Of the eight participants who have used assistive technology, one participant uses assistive technology every day with:
+
+- Text-to-speech output as "text to speech allow(s) me to listen and learn when my eyes get strained."
+- Speech-to-text input as they like using their "tablet and makes typing easier"
+- On-screen keyboards
+- Input switches/touch screens
+
+A further seven participants use assistive technology only as needed:
+
+> "I use custom display filter software to do things like colorize key lines of output automatically (to draw my eye/attention), and provide digit dilimination (I.E. help me tell 1000 and 10000 apart) when using a text console application."
+
+> "The standard Mac user interface design contains enough assistive technology without my needing to use any features which are specifically intended solely as assistive functions."
+
+> "I sometimes use it to make sure that my code will work correctly with AT."
+
+#### Operating systems used with assistive technology
+
+Participants use assistive technology across the three most popular desktop operating systems - Linux (most popular), Windows (2nd most popular), and Mac.
+
+![Pie chart showing breakdown of most popular operating systems for pip users using assistive technology](https://i.imgur.com/CD2ev5P.png)
+
+#### Assistive technology when using pip
+
+We asked participants how well their assistive technologies worked when they use pip. All participants using assistive technology with pip said it worked well for them.
+
+We received some feedback about screen readers not coping well with long output, with users experiencing difficulties accessing content at the top of the current terminal window. Therefore, commands or actions (e.g. pip help, pip install, failed builds) that generate a lot of content can be a problem for screenreader users.
+
+## Recommendations
+
+### Supporting languages other than English
+
+As 51% of participants speak a language other than English, we recommend that the pip team add localization support to the pip documentation and reach out to the community to find pip users who might be willing to contribute translations. Translators that have [contributed translations to PyPI](https://hosted.weblate.org/projects/pypa/warehouse/) may be a good starting point.
+
+If this is not possible, we recommend linking to useful resources in languages other than English from the pip documentation, as we know from our other research that users use a mixture of the official documentation, search engine searches, Stack Overflow and blogs/websites to find solutions to their problems.
+
+### Supporting pip users with disabilities
+
+Pip's operation is generally very good for users with disabilities. Being a command line application there are no distracting images or ancillary content, and the user has a large amount of control on how they experience pip via customisation of interface visual preferences (to use contrasting colours, font size and type) and visual and auditory alerts.
+
+To better support pip's users with disabilities, the pip team should:
+
+- Ensure any future video or audio support materials are provided with captions
+- Improve pip's output (see below)
+
+### Improving pip output
+
+Pip's output is currently too verbose, generating an unhelpful amount of output during its operation. This causes usability issues for all users - especially users with cognitive disabilities.
+
+Pip's output should be improved by:
+
+- Retaining only the information that is important to users in their current moment (e.g. at install of a package)
+- Removing unimportant information from the terminal output. The information can still be logged to the log files if needed.
+- Reducing the number of verbosity levels to three. Right now there are seven levels of verbosity, which is overwhelming and in no way useful. We recommend:
+  - Verbosity 0 - shows only what packages are to be installed, notifications identified as important about the operation, any errors and the final outcome
+  - Verbosity 1 - shows more detail about the packages being installed
+  - Verbosity 2 - shows full information which is also logged to logfiles
+
+## Further reading
+
+Designing for people with disabilities:
+
+- [An Introduction to inclusive design](https://www.nomensa.com/blog/2011/introduction-inclusive-design)
+- [How ADHD and dyslexia teach you to do better UX design](https://themasters.io/blog/posts/how-adhd-dyslexia-teach-better-ux-design)
+- [Improve User Experience by Designing with Cognitive Differences in Mind](https://noti.st/elizabethschafer/fg3BR4)
+- [Designing accessible software - guidelines for different disabilities](https://ukhomeoffice.github.io/accessibility-posters/)
+- [Designing for Children with ADHD: The Search for Guidelines for Non-Experts](https://uxpamagazine.org/designing_children_adhd/) (written for children however applicable generally)
+- [Designing for dyslexia](https://uxplanet.org/designing-for-dyslexia-6d12e8c41cd7)
diff --git a/docs/html/ux-research-design/research-results/ci-cd.md b/docs/html/ux-research-design/research-results/ci-cd.md
new file mode 100644
index 00000000000..f136ddb16ab
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/ci-cd.md
@@ -0,0 +1,42 @@
+# How pip is used in interactive environments (i.e. CI, CD)
+
+## Problem
+
+We want to know about the contexts in which pip users use pip - interactively (i.e. typing pip commands at the command line terminal) and in an automated environment (i.e. as part of continuous software integration or continuous software development pipelines).
+
+Different contexts of use mean that users have different important and common tasks; it means when, where and how they complete these tasks are different.
+
+Each of these contexts bring different needs: interactive usage requires the right feedback/output at the right time, whereas an automated environment requires little or no feedback in the moment but detailed feedback after the task has finished.
+
+We also wanted to know what users used pip for - as part of their software development toolchain, or purely as a software installer (analogous to Ubuntu Aptitude or Mac Appstore). We also asked about their need for pip to build packages from source.
+
+## Research
+
+We created a survey and asked users to give answers to the following statements:
+
+- I use pip in an automated environment (e.g. CI/CD pipelines)
+- I have problems with pip in CI/CD pipelines
+- I use pip interactively (e.g. typing pip commands on the commandline)
+- I make software and use pip as part of my software development workflow
+- I use pip only to install and use Python packages
+- I need pip to build software packages from source
+
+## Results
+
+Using pip interactively makes up the majority of pip usage (91%), the majority (73%) of this usage is basic usage - to only install and use Python packages.
+
+Half (51%) of all participants used pip in an automated environment, with only 9% having issues with pip in that automated environment. This points to a good use experience for these users.
+
+71% use pip as part of their software toolchain, only 29% needing pip to build from source.
+
+These results show that the main context of use is interactive - users either writing code, installing software at the command line and we know from other research that interactive usage has its issues e.g. pip output being too verbose.
+
+While it is important to provide automated environment users with a good experience, interactive mode users are being underserved.
+
+![Answer to question - I use pip in an automated environment](https://i.imgur.com/pLHqBpN.png)
+
+![Answer to question - I use pip interactively](https://i.imgur.com/8ETVMYS.png)
+
+91% of users said they used pip interactively. This does not preclude them from automated usage.
+
+![Answer to the question - What do you use Python for?](https://i.imgur.com/ySlo2Es.png)
diff --git a/docs/html/ux-research-design/research-results/improving-pips-documentation.md b/docs/html/ux-research-design/research-results/improving-pips-documentation.md
new file mode 100644
index 00000000000..bec2120cda6
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/improving-pips-documentation.md
@@ -0,0 +1,531 @@
+# Improving pip's Documentation
+
+## Problem
+
+We want to establish whether or not the [official pip documentation](https://pip.pypa.io/en/stable/) helps users to solve their pip problems. We also want to identify possible improvements to the content and structure of the docs.
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+### Interviews
+
+We conducted interviews with pip users specifically discussing documentation. During these interviews we asked about:
+
+- Problems they had experienced while using pip, and how they solved them (with a focus on what information sources they used)
+- How they rate pip's documentation, and what we could do to make the docs more useful
+- What documentation (from other projects or languages) they find valuable, and why
+
+### Surveys
+
+We collected documentation feedback via two surveys:
+
+- In our survey that profiled pip users, we asked "What would be your ideal way of getting help with pip?"
+- We also published a survey specific to pip's docs:
+
+![Screenshot of survey](https://i.imgur.com/dtTnTQJ.png)
+
+### Keyword research
+
+We used keyword research tools to understand what words ("keywords") people use when using search engines to troubleshoot pip problems.
+
+### Other research methods
+
+We also:
+
+1. Asked for volunteers to participate in a diary study, documenting their experience solving pip problems. Unfortunately this was not completed due to lack of interest from the community.
+2. Asked for user feedback on the pip documentation site:
+   ![screenshot of user feedback mechanism on pip docs](https://i.imgur.com/WJVjl8N.png)
+   Unfortunatly, we did not gather any useful feedback via this effort
+3. [Installed analytics on the pip docs](https://github.com/pypa/pip/pull/9146). We are waiting for this to be merged and start providing useful data.
+
+## Results
+
+In total, we:
+
+- Conducted 5 user interviews about pip's documentation
+- Received 141 responses to the question "What would be your ideal way of getting help with pip?"
+- Received 159 responses to the documentation survey
+
+In general, we found that pip's documentation is underutilized by the community, with many users not knowing that it exists. Instead, most users turn to common tools (Google, Stack Overflow) to solve their pip problems.
+
+In response to the question "When you have a problem using pip, what do you do?" (multiselect):
+
+- 81.9% of respondents Google it
+- 56.9% of respondents search or ask on Stack Overflow
+- 33.8% of respondents use pip help from the command line
+- **25.6% of respondents go to the pip docs**
+- 20.6% of respondents go the the Python Packaging User Guide
+- 8.1% of respondents ask on a forum, community board, or chat channel
+
+![screenshot of survey results](https://i.imgur.com/qlt1b4n.png)
+
+Based on survey results, users find pip's docs:
+
+- Marginally more useful than not useful
+- Marginally more clear than unclear
+- Not opinionated enough
+
+Common feedback that emerged from both surveys and user interviews includes:
+
+- The documentation performs poorly in search engine results
+- The style and layout is dated (note: this feedback was collected before the [new theme was deployed](https://github.com/pypa/pip/pull/9012))
+- There is not enough guidance/examples on how to resolve common problems, or achieve specific goals
+- The documentation information architecture is difficult to navigate (the monolithic structure of the user guide is a problem) and does not prioritise the most useful content
+- There should be more instructions specific to each user's different situation (e.g. what operating system they are using)
+- The scope of the documentation is unclear
+- The documentation should recognise that pip exists within an ecosystem of other packaging tools
+- ["There should be one-- and preferably only one --obvious way to do it."](https://www.python.org/dev/peps/pep-0020/) - i.e. the documentation should provide stronger recommendations
+
+While some users mentioned that video would be helpful, more said that video was too long, or inappropriate for the kind of problems they experience using pip.
+
+Some users mentioned that in person support, forums or chat would be helpful, with many unaware of existing support / community channels.
+
+Several users also noted that improving pip's error messages would reduce the need for better documentation.
+
+From our keyword research we identified seven _query types_: "about pip", "install pip", "uninstall pip" "update pip", "using pip", "errors", and "other".
+
+
 See keyword research results
+
+### About pip
+
+- what is pip
+- what is pip in python
+- what is pip python
+- what does pip mean
+- what does pip stand for
+- what does pip stand for python
+- pip meaning
+
+### Install pip
+
+- get pip
+- python install pip
+- install pip
+- installing pip
+- how to install pip python
+- how to install pip
+- how to download pip
+- how to get pip
+- how to check if pip is installed
+- install pip mac
+- how to install pip on mac
+- install pip on mac
+- install pip linux
+- how to install pip linux
+- how to install pip on linux
+- how to install pip in ubuntu
+- how to install pip ubuntu
+- install pip ubuntu
+- ubuntu install pip
+- pip windows
+- install pip windows
+- pip install windows
+- how to install pip windows
+- how to install pip in windows
+- how to install pip on windows
+- how to pip install on windows
+- how to install pip on windows 10
+- how to run pip on windows
+
+### Uninstall pip
+
+- how to uninstall pip
+- uninstall pip
+- pip uninstall
+
+### Update pip
+
+- how to update pip
+- how to upgrade pip
+- pip update
+- pip upgrade
+- upgrade pip
+- how to upgrade pip on windows
+
+### Using pip
+
+- how to use pip
+- how to use pip install
+- how to pip install
+- how to use pip python
+- how to install with pip
+- how to run pip
+- python how to use pip
+- pip install requirements.txt
+- pip requirements.txt
+- pip freeze
+- pip update package
+- pip install specific version
+- pip upgrade package
+- pip uninstall package
+
+### Errors
+
+- no module named pip
+- pip command not found
+- pip is not recognized
+- 'pip' is not recognized as an internal or external command, operable program or batch file.
+- -bash: pip: command not found
+- pip is not recognized as an internal or external command
+- pip install invalid syntax
+
+### Other
+
+- how to add pip to path
+- how to check pip version
+- how does pip work
+- where does pip install packages
+- pip vs pip3
+- where is pip installed
+
+

+

+
+The prevalence of "install pip" queries strongly suggests that the current installation documentation should be improved and that users are searching for solutions specific to their operating system.
+
+The "about pip" queries also suggest that beginners would benefit from documentation that better explains pip basics - e.g. what pip is and what it does.
+
+## Recommendations
+
+Based on our research, we recommend that the pip team:
+
+- Revise the structure of the documentation:
+  - Break monolithic pages into standalone pages on different subjects, with appropriate meta tags. This will help the docs appear higher in search results for the 81.9% of users who use Google to troubleshoot their pip problems.
+  - Prioritise most used features (see "[buy a feature](prioritizing-features)" results for guidance)
+- Add a "troubleshooting" section to the documentation that addresses common questions, explains error messages and tells users where they can find more help
+- Provide more context about pip's role in the Python packaging ecosystem by:
+  - Introducing packaging concepts that users need to understand in order to use pip
+  - Explaining pip's role/scope within the packaging ecosystem
+  - Comparing pip to other tools
+- Develop a beginner's guide that walks new pip users through everything they need to know to use pip's most basic functionality. This should include addressing concepts outside of pip's scope (e.g. how to open and use a terminal, how to set up a virtual environment), that may block users from being successful
+- For each page, (where appropriate), add sections for:
+  - "tips and tricks" - things to know / gotchas
+  - "troubleshooting" - possible error messages and recommended solutions. Where appropriate, this should link to content in the troubleshooting section.
+  - "see also" (links to external resources - e.g. useful stack overflow questions, blog articles, etc.)
+- In general, write content that:
+  - Is opinionated. Prioritize solutions that will work in the majority of cases, while pointing to possible edge cases and workarounds in "tips and tricks", "troubleshooting" and "see also" content
+  - Uses keywords to increase search results visibility
+  - Provides instructions for different contexts - e.g. for users on Windows, Linux, MacOSX
+  - Increases interlinking with external sources, including packaging.python.org
+
+### Suggested site map
+
+Based on the above user input, we have developed a proposed [site map](https://i.imgur.com/UP5q09W.png) (link opens larger format image) to help guide the redevelopment of pip's documentation in line with the above recommendations.
+
+![sitemap. for details see summary below](https://i.imgur.com/UP5q09W.png)
+
+
 See notes for this site map
+
+#### Node 1.0: Quick reference
+
+_Page purpose:_
+
+- To give pip users a quick overview of how to install pip, and use pip's main functionality
+- To link to other (more detailed) areas of the documentation
+
+_Suggested content:_
+
+- Quick installation guide, including how to use a virtual environment. This is necessary for user who want to install more than one Python project on their machine.
+- Common commands / tasks (based on [buy a feature](prioritizing-features) data)
+
+---
+
+#### Node 2.0: About pip
+
+_Page purpose:_
+
+- To introduce pip to new users
+
+_Suggested content:_
+
+- Introduce pip as a command line program
+- Explain what the command line is and how to use it in different operating systems
+- Explain what pip is/does, and what it stands for
+- Link to packaging concepts (node 2.1)
+- Explain pip's scope (e.g. to install and uninstall packages) and link to other tools (node 2.2)
+
+#### Node 2.1: Packaging concepts
+
+_Page purpose:_
+
+- To introduce packaging concepts for new pip users
+
+_Suggested content:_
+
+- What is a package?
+- What types of packages are there? e.g. file types
+- What is package versioning / what are requirement specifiers? (note: talk about potential dependency conflicts here)
+- Where do I get packages from?
+- How should I control how packages are installed on my system (e.g. virtualenv and environment isolation)
+- How can I reproduce an environment / ensure repeatability? (e.g requirements files)
+- What do I need to know about security? (e.g. hash checking, PyPI name squatting)
+- Link to node 2.2 ("pip vs other packaging tools")
+
+#### Node 2.2: pip vs other packaging tools
+
+_Page purpose:_
+
+- To compare pip to other tools with the same scope
+- To highlight that pip exists within a _packaging ecosystem_ and link to other packaging tools
+
+_Suggested content:_
+
+- Compare pip to other installation tools - e.g. poetry, pipenv, conda. What are the features, pros and cons of each? Why do packaging users choose one over the other?
+- Briefly introduce other packaging projects. Link to https://packaging.python.org/key_projects/
+
+---
+
+#### Node 3.0: Installing pip
+
+_Page purpose:_
+
+- To help pip users install pip
+
+_Suggested content:_
+
+- Refactor current page, emphasising pathways for different operating systems
+- Add "tips and tricks", "troubleshooting" and "see also" (link to external resources) sections to provide additional help
+
+---
+
+#### Node 4.0: Tutorials
+
+_Page purpose:_
+
+- To provide a jumping off place into pip's tutorials
+
+_Suggested content:_
+
+- Link to tutorials, including sub pages, where appropriate
+
+#### Node 4.1: Using pip to install your first package
+
+_Page purpose:_
+
+- To help new pip users get started with pip
+
+_Suggested content:_
+Step by step tutorial (possibly broken into several pages) that covers:
+
+- Using the command line
+- Installing pip (or checking pip is installed)
+- Creating/activating a virtual env (use venv for this, but point to alternatives)
+- Installing a package
+- Showing where the package has been installed
+- Deactivating/reactivating virtualenv
+- Uninstalling a package
+
+#### Node 4.2: Advanced tutorial - using pip behind a proxy
+
+_Page purpose:_
+
+- To help advanced pip users achieve specific goals
+
+_Suggested content:_
+
+- Step by step tutorial for using pip behind a proxy
+
+NB: other advanced tutorials should be added as identified by the team and/or requested by the community.
+
+---
+
+#### 5.0: Using pip
+
+_Page purpose:_
+
+- To provide a jumping off point for the user guide and reference guide
+
+_Suggested content:_
+
+- Link to each subject in the user guide
+- Link to reference guide
+
+#### 5.1: User guide
+
+_Page purpose:_
+
+- To provide users with specific detailed instructions on pip's key features
+
+_Suggested content:_
+Break down current user guide into separate pages, or pages linked by subject. Suggested order:
+
+- Running pip
+- Installing Packages
+- Uninstalling Packages
+- Environment recreation with requirements files
+  - sub heading: "pinned version numbers"
+  - sub heading: "hash checking mode"
+- Listing Packages
+- Searching for Packages
+- Installing from local packages
+- Installing from Wheels
+- Wheel bundles
+- “Only if needed” Recursive Upgrade
+- Configuration
+- User Installs
+- Command Completion
+- Basic Authentication Credentials
+- Using a Proxy Server (includes link to tutorial)
+- Constraints Files
+- Using pip from your program
+
+Where possible, each page should include:
+
+- "tips and tricks" for workarounds, common _gotchas_ and edge use cases
+- "troubleshooting" information, linking to content in node 6.2 ("Troubleshooting error messages") where applicable
+- "see also", linking to external resources (e.g. stack overflow questions, useful threads on message boards, blogs posts, etc.
+
+Note: the following content should be moved:
+
+- Fixing conflicting dependencies (move to node 6.2 - "Troubleshooting error messages")
+- Dependency resolution backtracking (move to node 6.2 - "Troubleshooting error messages")
+- Changes to the pip dependency resolver in 20.3 (move to node 7.0 - "News, changelog and roadmap")
+
+#### 5.2: Reference guide
+
+_Page purpose:_
+
+- To document pip's CLI
+
+_Suggested content:_
+
+- https://pip.pypa.io/en/stable/reference/
+
+---
+
+#### 6.0: Help
+
+_Page purpose:_
+
+- To provide a jumping off place for users to find answers to their pip questions
+
+_Suggested content:_
+
+- Links to
+  - 6.1 "FAQs"
+  - 6.2 "Troubleshooting error messages"
+  - 6.3 "Finding more help"
+
+#### 6.1: FAQs
+
+_Page purpose:_
+
+- To answer common pip questions / search terms
+
+_Suggested content:_
+
+- What is the difference between pip and pip3?
+- Where does pip install packages?
+- How can I check pip's version?
+- How can I add pip to my path?
+- Where is pip installed?
+- What does pip stand for?
+
+See [popular questions on Stack Overflow](https://stackoverflow.com/search?q=pip&s=ec4ee117-277a-4c5d-a3f5-c921ca6c5da6) for more examples.
+
+#### 6.2: Troubleshooting error messages
+
+_Page purpose:_
+
+- To help pip users solve their problem when they experience an error using pip
+
+_Suggested content:_
+For each (common) error message:
+
+- Explain what happened
+- Explain why it happened
+- Explain what the user can do to resolve the problem
+
+Note: the [ResolutionImpossible](https://pip.pypa.io/en/stable/user_guide/#fixing-conflicting-dependencies) and [dependency resolution backtracking](https://pip.pypa.io/en/stable/user_guide/#dependency-resolution-backtracking)
+documentation should both be moved here.
+
+#### 6.3: Finding more help
+
+_Page purpose:_
+
+- To point pip users to other resources if they cannot find the information they need within the pip documentation
+
+_Suggested content:_
+
+- See [getting help](https://pip.pypa.io/en/stable/user_guide/#getting-help)
+
+---
+
+#### 7.0: News, changelog and roadmap
+
+_Page purpose:_
+
+- To share information about:
+  - Recent changes to pip
+  - Upcoming changes to pip
+  - Ideas for improving pip, specifically highlighting where funding would be useful
+
+_Suggested content:_
+
+- [Changes to the pip dependency resolver in 20.3 (2020)](https://pip.pypa.io/en/stable/user_guide/#changes-to-the-pip-dependency-resolver-in-20-3-2020)
+- Links to PSF blog posts about pip
+- Link to [fundable packaging improvements](https://github.com/psf/fundable-packaging-improvements/blob/master/FUNDABLES.md)
+
+---
+
+#### 8.0: Contributing
+
+_Page purpose:_
+
+- To encourage new people to contribute to the pip project
+- To demonstrate that the project values different _types_ of contributions, e.g. not just development
+- To recognise past and current contributors
+
+_Suggested content:_
+
+- Introduction to pip as an open source project
+- Contributors code of conduct
+- Recognition of the different types of contributions that are valued
+- Credit list of contributors, including pip maintainers
+
+#### 8.1: Development
+
+_Page purpose:_
+
+- To onboard people who want to contribute code to pip
+
+_Suggested content:_
+
+- https://pip.pypa.io/en/stable/development/
+
+#### 8.2: UX design
+
+_Page purpose:_
+
+- To onboard people who want to contribute UX (research or design) to pip
+- To share UX knowledge and research results with the pip team
+
+_Suggested content:_
+
+- UX guidelines, and how they apply to the pip project
+- Current UX initiatives (e.g. open surveys, interview slots, etc.)
+- Previous research and results, including UX artifacts (e.g. personas)
+
+#### 8.3: Documentation
+
+_Page purpose:_
+
+- To onboard people who want to contribute to pip's docs
+- To share previous research and recommendataions related to pip's docs
+
+_Suggested content:_
+
+- This guide
+- Writing styleguide / glossary of terms - see the [Warehouse documentation](https://warehouse.readthedocs.io/ui-principles.html#write-clearly-with-consistent-style-and-terminology) for an example.
+
+

+
+### Future research suggestions
+
+To continue to improve pip's documentation, we suggest:
+
+- Conducting [card sorting](https://www.nngroup.com/articles/card-sorting-definition/) with pip users to establish the ideal order and grouping of pages
+- Regularly reviewing the documentation analytics, to understand those pages which are most/least visited
+- Regularly reviewing Stack Overflow to identify questions for the FAQ
+- Setting up a mechanism for collecting user feedback while users are on the documentation site
diff --git a/docs/html/ux-research-design/research-results/index.md b/docs/html/ux-research-design/research-results/index.md
new file mode 100644
index 00000000000..588aef397a1
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/index.md
@@ -0,0 +1,208 @@
+# UX Research Results
+
+Over the course of 2020, the pip team worked on improving pip's user experience, developing a better understanding of pip's UX challenges and opportunities, with a particular focus on pip's new dependency resolver. The [Simply Secure](https://simplysecure.org/) team focused on 4 key areas:
+
+- [Understanding who uses pip](https://github.com/pypa/pip/issues/8518)
+- [Understanding how pip compares to other package managers, and supports other Python packaging tools](https://github.com/pypa/pip/issues/8515)
+- [Understanding how pip's functionality is used could be improved](https://github.com/pypa/pip/issues/8516), and
+- [Understanding how pip's documentation is used, and how it could be improved](https://github.com/pypa/pip/issues/8517)
+
+Some key outcomes from the 2020 work are:
+
+- This documentation & resource section!
+- A pip UX research panel ([Sign up here!](https://mail.python.org/mailman3/lists/pip-ux-studies.python.org/))
+- New and expanded GitHub issues
+- UX improvements in 2020
+  - UX work supporting the dependency resolver
+  - Improved error messaging
+  - Supporting Documentation
+- UX Training for the Pypa + pip maintainers
+
+This work was made possible through the [pip donor funded roadmap](https://wiki.python.org/psf/Pip2020DonorFundedRoadmap).
+
+## Outreach
+
+We [recruited participants](https://www.ei8fdb.org/thoughts/2020/03/pip-ux-study-recruitment/) for a user research panel that we could contact when we wanted to run surveys and interviews about pip. In total 472 people signed up to the panel, although some unsubscribed during the research period.
+
+At the end of the 2020 research, we asked users to opt-in to a [long-term panel](https://mail.python.org/mailman3/lists/pip-ux-studies.python.org/), where they can be contacted for future UX studies. Should the pip team wish to continue to build this panel, we recommend translating the sign-up form into multiple languages and better leveraging local communities and outreach groups (e.g. PyLadies) to increase the diversity of the participants.
+
+## User Interviews
+
+In total, we **interviewed 48 pip users**, recruited from the user panel, and through social media channels.
+
+During the interviews, we asked users about:
+
+- How they use Python
+- How long they have been using pip
+- Whether or not they use a virtual environment
+- If and how they address security issues associated with pip
+- Which pip commands they regularly use
+- How they install packages with pip
+- Their experience using pip list, pip show and pip freeze
+- Their experience using pip wheel
+- Whether or not they use other package managers, and how pip compares to their experience with these other tools
+- What the pip team could do to improve pip
+- Problems they have experienced while using pip, and how they solved these problems
+- Their perception and use of the pip documentation
+- What other technical documentation they value, and how the pip docs could take inspiration from these
+- What other resources the pip team could provide to help pip users solve their problems
+
+## Surveys
+
+We **published 10 surveys** to gather feedback about pip's users and their preferences:
+
+

+  
+    
+      
+      
+      
+      
+      
+    
+    
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
+    
+  
TitlePurposeResults

+          Pip research panel survey
+        
+          Recruit pip users to participate in user research, user tests and participate in future surveys. See associated blog post for more information.
+        
+          472 full sign-ups
+        

+          Feedback for testing the new pip resolver
+        
+          Understand use cases where the new resolver fails due to dependency conflicts. See associated blog post for more information.
+        
+          459 responses via the feedback form, approx. 8 issues transferred to issue tracker
+        

+          How should pip handle conflicts with already installed packages when updating other packages?
+        
+          Determine if the way that pip handles package upgrades is in-line with user's expectations/needs. See related blog post and GitHub issue for more information.
+        
+          See write up, including recommendations
+        

+          Learning about our users
+        
+          Learn about pip's users, including:
+          
    
+            
  • their usage of Python and pip
    • 
+            
  • why and how they started using Python
    • 
+            
  • if they are living with any disabilities, and if so what effect (if any) this has on their usage of Python and pip
    • 
+            
  • if they use assistive technologies when using Python and pip and how this work for them
    • 
+            
  • where they get support when you have issues with pip
    • 
+          

+        		
+          See write up
+        

+          Buy a pip feature
+        
+          Establish which features are most important to pip's users
+        
+          See write up
+        

+          Should pip install conflicting dependencies?
+        
+          Establish whether pip should provide an override that allows users to install packages with conflicting dependencies
+        
+          See write up
+        

+          How should pip force reinstall work?
+        
+          Establish whether or not pip force reinstall should continue to behave the way it currently does, if the functionality should be changed, or if the option should be removed
+        
+          See write up
+        

+          Feedback on pip search
+        
+          To establish whether or not to remove or redesign pip search. See this GitHub issue for more information.
+        
+          See write up
+        

+          Feedback on pip's docs
+        
+          To gather feedback on pip's docs, supplementing feedback gathered in user interviews
+        
+          See write up
+        

+

+
+## All Results
+
+```{toctree}
+:maxdepth: 1
+
+about-our-users
+mental-models
+users-and-security
+ci-cd
+personas
+prioritizing-features
+override-conflicting-dependencies
+pip-force-reinstall
+pip-search
+pip-upgrade-conflict
+improving-pips-documentation
+```
+
+## Read More
+
+- [Pip team midyear report (blog, July 2020)](https://pyfound.blogspot.com/2020/07/pip-team-midyear-report.html)
+- [Creating rapid CLI prototypes with cli-output (blog, Oct 2020)](https://www.ei8fdb.org/thoughts/2020/10/prototyping-command-line-interfaces-with-cli-output/)
+- [Changes are coming to pip (video)](https://www.youtube.com/watch?v=B4GQCBBsuNU)
+- [How should pip handle dependency conflicts when updating already installed packages? (blog, July 2020)](https://www.ei8fdb.org/thoughts/2020/07/how-should-pip-handle-conflicts-when-updating-already-installed-packages/)
+- [Test pip's alpha resolver and help us document dependency conflicts (blog, May 2020)](https://www.ei8fdb.org/thoughts/2020/05/test-pips-alpha-resolver-and-help-us-document-dependency-conflicts/)
+- [How do you deal with conflicting dependencies caused by pip installs? (blog, April 2020)](https://www.ei8fdb.org/thoughts/2020/04/how-do-you-deal-with-conflicting-dependencies-caused-by-pip-installs/)
+- [pip UX studies: response data (blog, March 2020)](https://www.ei8fdb.org/thoughts/2020/03/pip-ux-studies-response-data/)
+
+Other PyPA UX work:
+
+- [PyPI User Research (blog, July 2018)](https://whoisnicoleharris.com/2018/07/22/pypi-user-research.html)
+- [Warehouse - The Future of PyPI](https://whoisnicoleharris.com/warehouse/)
+- [Accessibility on Warehouse (PyPI) (blog, May 2018)](https://whoisnicoleharris.com/2018/05/17/warehouse-accessibility.html)
+- [User Testing Warehouse (blog, Mar 2018)](https://whoisnicoleharris.com/2018/03/13/user-testing-warehouse.html)
+- [Designing Warehouse - An Overview (blog, Dec 2015)](https://whoisnicoleharris.com/2015/12/31/designing-warehouse-an-overview.html)
diff --git a/docs/html/ux-research-design/research-results/mental-models.md b/docs/html/ux-research-design/research-results/mental-models.md
new file mode 100644
index 00000000000..0491586efab
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/mental-models.md
@@ -0,0 +1,70 @@
+# How Users Understand pip
+
+## Problem
+
+We want to understand how pip's users understand pip as a tool: what they think it is and what it does.
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+In order to capture participants mental models of pip and how package management works, we asked participants the following questions:
+
+- In your own words, explain what pip is
+- In your own words, explain what happens when pip installs a software package
+- In your own words, explain what a Python package dependency is
+
+When we talk about mental models, we talk about "deep" or "shallow" mental models. When a user has a deep mental models of something, their have a deep understanding with a lot of detail, shallow models are the opposite.
+
+In order to evaluate those mental models - do they match the reality of pip and package management - we worked with the maintainers to identify 1. pip's behaviours and activities (18 aspects), and 2. the aspects of package dependencies (13), and what a Python package dependency is (10). We then scored participants' answers against those.
+
+## Results
+
+The analysis focused on participants with between 2 and 10 years of Python experience.
+
+Over 90% of participants did not have a deep understanding of pip - with limited understanding of what pip is, what it does during the install process, and of package management in general.
+However, while participants' understanding was low, only 4 participants had factually incorrect understandings of what pip is and does.
+
+Participants had a slightly deeper understanding of what happens during a pip install process. The most in depth answer included 7 of the 13 identified aspects. The median was 3. Answers focused on resolving dependencies, finding possible package names, downloading assets and installing the package.
+
+Participants' understanding of software dependencies was again shallow - the most in depth answer included 8 identified aspects. The median was 3. Answers focused on the fact that software dependencies were a result of code reuse, that constraining package versions reduced the possibility of dependency conflicts.
+
+The full data is available in[ this spreadsheet](https://docs.google.com/spreadsheets/d/1HBiNyehaILxhzZKWcBavkKXDzJr6gIt_Y8Jm8RRgJYg/edit#gid=0).
+
+### Responses to "In your own words, explain what pip is"
+
+> "pip is a standard command-line tool for managing python packages. It has three primary functions: (1) obtaining & caching python packages and/or their dependencies from a repository (typically pypi), (2) building (if needed) and installing python packages--and related dependencies--to a 'site-packages' location in the python path, and (optionally) (3) uninstalling previously-installed packages." **- participant 242608909 (Scientist, Professor in the Earth and Atmospheric Sciences Department, using Python for 7 - 10 years)**
+
+> "Pip is a package management system for python. Kind of like apt in linux, it can be used to install packages in public or private repositories into the current version or environment of Python that invoked the pip command." **- participant 240364032 (Professional software developer using Python for 7-10 years)**
+
+> "pip allows to install/update remove python libraries in your environment. pip manage the library. you will need something else to manage your environment. To use it the easiest is pip install `package-name` I recommend using a requirements.txt and add as you go the library and do pip install -r requirements.txt each time. it avoid to forget a library at the end of the project :)" **- participant 241178995 (Data scientist working in software engineering)**
+
+> "python's npm/cargo/opam... dedicated package manager and ecosystem for python libraries and applications" **- participant 240306262 (self-taught Python creative artist and web developer, using Python for 5-6 years)**
+
+> "A tool to download & install packages and resolve dependencies. I see it in the same area as yum, zypper or apt-get install in the Linux world." **- participant 240306204 (Using Python for scientific research and data analysis for 3 - 4 years)**
+
+> "Pip is the tool primarily used in the Python community to install packages. ("Package" means two different things in Python; it can be a target of the `import` statement that includes modules and other packages, or it can mean a collection of code with a defined interface that can be installed for reuse. I'm referring to the second thing here.) Pip's implementation defines what it means for a package to be installed in a Python environment. Any other tool that wishes to install software into a Python environment (e.g. conda) must match Pip's implementation." **- participant 240313922 (Computer security researcher at a university, using Python for 7-10 years)**
+
+### Responses to "In your own words, explain what happens when pip installs a software package"
+
+> "I think pip looks up package "tea" in the repository of packages (PyPI by default, but can be changed). If it doesn't find it, it gives an error. If it exists, it downloads some information about the package, like what form it exists in. This can be a wheel, or a package that needs to be built. If it is a wheel, it checks the dependencies and installs them, then it installs the wheel (not sure what this means, probably it extracts it). The wheel is specific to a python distribution and base OS, so it might be available on certain platforms but not others. If it is a package that needs to be built, pip downloads the package source (or clones the repository), and runs setup.py, which installs dependencies and other packages, then the package itself. I forgot to mention that before installing there is some check for checking compatibility of the version required and the versions required by other packages." **- participant 240426799 (Scientific researcher - data analysis and computer vision models, using Python for 5-6 years)**
+
+> "pip searches for a package source (and for me uses the default, so Pypi), then ask the package source for a package with the given name and versions (if specified), then if the package is available download the package in the most appropriate format (depending on my platform), then unzip the package and runs the installer (most probably calls setuptools with the included setup.py file) which will perform the required installation steps. This installation process may contain dependencies (typically specified in setup.py), which will trigger the same process for the dependencies, and so on until all dependencies are installed (if everything is OK)." **- participant 240670292 (Software developer industrial systems control, using Python for 5-6 years)**
+
+> "Pip checks PyPI (default package index, assuming that wasn't overridden) for the package matching `tea`. It uses the various specifiers (eg. OS compatibility, Python compatibility, etc) to find the latest version of `tea` compatible with my system. Within that version, it finds the best possible installation match (eg. a `wheel`, if supported on my system and my version of `pip` contains the relevant versioned support [eg. most recently manylinux2010], potentially falling back all the way to a source distribution). After downloading the relevant distribution, it performs the same operations recursively up the dependency chain as specified by the `install_requires` of the `setuptools.setup()` method. After grabbing all relevant packages, it performs the installations as specified in their setup methods -- generally, this involves extracting python files to specific system paths, but various levels of complexity may be added as need be such as compilations, system library bindings, etc. I believe the new resolver changes the above by performing all the lookups simultaneously (eg. by building and solving a dependency graph rather than traversing incrementally) but have not yet read the PEP to learn more. I've answered the above with setuptools in mind -- I believe there was a step added recently to check pyproject.toml first to allow for alternate systems here, but I find the added customization to be a net negative to the ecosystem and have not yet played with it -- the entire Poetry/Pipenv/Pipfile.lock/Flit thing just seems to be adding unnecessary complexity; users who know what they're doing have solved all these issues years ago for their packages and users who find the porcelain makes their lives easier are likely going to run into UX trouble no matter the veneer." **- participant 241463652 (Using Python for 5-6 years)**
+
+> "pip accesses the tea package from pypi (guessing that's where, online at least) and downloads a copy of the files into my local venv" **- participant 243434435 (Data analysis & machine learning, using Python for 1-2 years)**
+
+> "Looking up the latest version of of the package from pypi" **- participant 243897973 (Software testing/writing automated tests using Python 3 - 4 years)**
+
+> "Download, unpack, sometimes compile a module for my target arch" **- participant 243428875 (System administration using Python 7 - 10 years)**
+
+## Recommendations
+
+It's difficult to know what to recommend. Some ideas:
+
+- Question: Is it actually necessary for users to know everything that pip is doing?
+- Better documentation:
+  - Describing the "blocks of functionality" that pip carries out and how to deal with them when it breaks
+  - Curating package manager training and help
+  - Improving pip output to expose the different pip functionality blocks
diff --git a/docs/html/ux-research-design/research-results/override-conflicting-dependencies.md b/docs/html/ux-research-design/research-results/override-conflicting-dependencies.md
new file mode 100644
index 00000000000..b087a8070b9
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/override-conflicting-dependencies.md
@@ -0,0 +1,62 @@
+# Providing an override to install packages with conflicting dependencies
+
+## Problem
+
+Currently, when a user has dependency conflicts in their project they may be unaware there is a problem, because pip will install conflicting packages without raising an error.
+
+The new pip resolver is more strict and will no longer allow users to install packages that have conflicting dependencies.
+
+As a result, some users may feel that newer versions of pip are "broken" when pip refuses to install conflicting packages.
+
+For this reason, the pip team wanted to know if they should provide an override that allows users to install conflicting packages.
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+We published a survey with the following introduction:
+
+

+Imagine you have packages tea and coffee:
+
+tea 1.0.0 depends on water <1.12.

+coffee 1.0.0 depends on water>=1.12

+
+Installing tea 1.0.0 and coffee 1.0.0 will cause a conflict because they each rely on different versions of water - this is known as a "dependency conflict".
+
+The pip team has recently changed the way that pip resolves dependency conflicts. The new implementation is stricter than before: pip will no longer install packages where there is a dependency conflict - instead it will show an error.
+
+The purpose of this survey is to gather feedback on providing a way to override this behaviour.
+
+All questions are optional - please provide as much information as you can.
+
+

+
+We then asked users:
+
+- If pip should provide an override that allows users to install packages when there are dependency conflicts
+- Why they answered yes or no
+- For users that answered yes, we asked:
+  - When they would use the override
+  - How often they would use the override
+  - How easy it would be to find a workaround, if pip did not provide an override
+  - What syntax they prefer
+
+## Results
+
+In total, we received 415 responses to the survey.
+
+An overwhelming majority (>70%) of respondents indicated that they want some kind of override that allows them to install packages when there are dependency conflicts. Despite desiring this feature, most respondents said if it exists they would use it "not often" — this indicates that it is an advanced feature that is not critical to day-to-day usage. Nevertheless, because it would be difficult or very difficult to find a workaround (>60%), we suggest that pip should offer a override feature (see recommendations, below).
+
+Over half of the respondents said that `pip install tea coffee --ignore-conflicts` was the most ideal syntax for this command when installing multiple packages at once with a conflicting dependency. When using the `pip install —-ignore-conflicts` command, a majority (>48%) of respondents said they would prefer pip to install to the most recent version of the conflicted dependency.
+
+Most respondents suggested that installing the latest version by default is safer, because it could include security fixes or features that would be difficult to replicate on their own. They also trust that dependencies will be largely backwards-compatible. However, they said it was very important that it is necessary to have a way to override this default behavior, in case they need to use an older version of the conflicted package.
+
+## Recommendations
+
+Based on this research we recommend that the pip team:
+
+- Implement an `--ignore-conflicts` option, that allows users to install packages with conflicting dependencies
+- Ensure that `--ignore-conflicts` installs the most recent version of the conflicting package. For example, for conflicting package `water<1.1.2` and `water≥1.1.2`, pip should prefer to install `water≥1.1.2`.
+- Allow users to override this default behavior by specifying the version of the conflicting packages. For example, `pip install tea coffee water==1.1.1 --ignore-conflicts`
+- Warn users that they used the `--ignore-conflicts` flag and that this may cause unexpected behavior in their program
diff --git a/docs/html/ux-research-design/research-results/personas.md b/docs/html/ux-research-design/research-results/personas.md
new file mode 100644
index 00000000000..06b84a8d4ef
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/personas.md
@@ -0,0 +1,250 @@
+# pip Personas
+
+## Problem
+
+We want to develop personas for pip's user to facilate faster user-centered decision making for the pip development team.
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+From early interviews with pip users, and from desk research into the different communities that use Python, it was our expectation that there were large communities who were not professional software developers. For example the SciPy library is widely used in the science and engineering communities for mathematical analysis, signal and image processing.
+
+Based on this, we expected a lot of these users would have different expectations, challenges and needs from pip.
+
+Our hypothesis was that:
+
+1. Python users fall into 3 main user types - a software user, a software maker and a software/package maintainer
+2. That the majority (over 60%) would define themselves as Python software users
+3. That the minority would define themselves as Python software maintainers
+
+### Usertype definitions
+
+During the research we've met different user types in the Python community. The 3 types of Python users, we proposed were:
+
+#### The Python Software User
+
+"I use Python software mainly as a tool to help me do what I want to do. This might be running scientific experiments, making music or analysing data with Python software I install with pip. I don't write Python software for others."
+
+#### The Python Software Maker
+
+"I use the Python software language and Python software packages to make software for others, mostly for other people. An example might be - building web applications for my customers. To make this web application I might use the Django framework, and a number of Python packages and libraries."
+
+#### The Python Package Maintainer
+
+"I spend a lot of my time creating Python software packages and libraries for other people to use in the software they make. I might make Python packages and libraries and then publish them on pypi.org or other software repositories."
+
+## Results
+
+During our research we found that these user types did fit with participants' sense of their usage of Python. Participants did not identify significantly different Python user types when asked.
+
+Each of these user types is a spectrum. Some Python users after time, and with experience/training, a need to use code more than once, started to make their own Python software.
+
+Identifying as one of these user types does not preclude users from also being another user type. Python users were more likely to Python software makers, but rarely Python software maintainers.
+
+Most (86%) participants identified as being a Python software user. This ranged a) from using Python applications - SciPy, Scikit-Learn - as a tool, with no knowledge, or interest to do more, to b) more advanced usage of Python involving modifying others code/scripts, possibly using libraries to create code specifically for their needs.
+
+75% identified as a Python software maker - as with Python software user, this ranged from writing basic scripts, code, to being a professional software developer.
+
+40% identified as a Python software maintainer - the activities of a maintainer were seen as only available to someone who had many years of Python experience, was heavily involved in a particular package or application, or did it as part of their job.
+
+### I am a Python software user
+
+As expected, almost all participants identified as a Python software user (86%). This was the most fundamental user type - both trained software developers and those who came to Python as a result of their job were users.
+
+Non-software developer users identified Python as a language to get stuff done -
+
+> "Almost everyone falls into the user (category) - that’s the target. It's not an obscure language that's meant for specific domains - it's a broad general purpose language designed to get stuff done. It's used by many who don't know other languages, they just need a language to get what they're doing finished." **- Participant 240312164**
+
+However, "using Python software" meant different things depending on who you ask - participants identified as a Python software user on a spectrum.
+
+
+  
+    
+     
+     
+    
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+  
+
I am a Python software userNumber of responses
I agree50
I disagree4
I have no opinion11
I strongly agree70
I strongly disagree4
Grand Total140

+
+![Pie chart with responses to question - I am a Python software user](https://i.imgur.com/ir3tP3B.png)
+
+#### Low end of the spectrum
+
+Python software applications were identified by some as a tool they use to do their "actual" work - the scientist, the data analyst, the engineer, the journalist.
+
+Here, they were "using" Python applications like SciPy, PsychPi, NumPy, to run scientific experiments, to gather data, to analyse data, with the objective of creating knowledge to make decisions, to identify what to do next.
+
+These were users who 1) who were new to Python software, 2) came across these Python applications in their profession, and used them as tools.
+
+They describe NumPy, or SciPy as a Python software application in itself, analogous to being a Windows user, or a Mac user.
+
+These users are not "classically trained programmers" as one participant identified themselves. As a result, they may not have the training, or knowledge about programming concepts like software dependencies. When they are expected to deal with complex or confusing error messages or instructions they have problems, often stopping them.
+
+#### High-end of the spectrum
+
+Python users who "move up the spectrum" to more advanced Python usage had been using Python for longer periods - many years.
+
+Again they may not have been classically trained developers, but through exposure - from work colleagues and their own usage - they started to experiment. This experimentation was in the form of modifying others scripts, taking classes, reading books so they could use code for other purposes.
+
+This was _making_ software - this software could be used by them as part of their day-job, but it could also be used by many others.
+
+We asked participants to explain the progression on this user spectrum - what is the difference between a user and a maker?
+
+Participants spoke about "are you working on something reusable or are you using the tools to achieve a one time task?"
+
+> "I didn't have classic software development training, more statistical analysis experience. I was clueless to the idea that it was a repository that anyone could upload packages to and become a maintainer." **- Participant \_240396891 (Data scientist at an applied research lab using Python do to network traffic analysis/parsing or Machine Learning)**
+
+> "Firstly I use my own software written in Python, I use Python libraries from pip. I use Django, Flask, libraries like requests." **- Participant 240302171**
+
+> "I am not a classically trained programmer, so it's a great way for me to learn and keep current in techniques. Not being a classically trained programmer, in some cases it detracts, I have a reasonable knowledge of the way to use hashes, but if I wanted to change Python's hash I'd have to read books. I can find information out there." **- Participant 240312164 (Nuclear physicist using Python for computer simulations, designing experimental methods)**
+
+### I am a Python software maker
+
+Being a "Python software maker" was a natural progression for some Python users, particularly those who had software development training - either on the job, personal learning or formal education. This training was important to understand fundamental programming concepts.
+
+As discussed earlier, some participants identified as "advanced" Python users, using Python software to modify or create other software. These users were likely to progress onto being software makers.
+
+55% of participants who identified as a software maker had between 5-20+ years of experience with Python. Only 18% of software makers had less than 2 years of experience.
+
+![Pie chart with responses to question - I am a Python software maker](https://i.imgur.com/aqg1kaL.png)
+
+We did not ask these participants about the "quality" of the software they created, but apart from the professional software developers, the opinion of these users was they were not software developers.
+
+
+  
+    
+     
+     
+    
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+     
+     
+    
+  
+
I am a Python software userNumber of responses
I agree50
I disagree9
I have no opinion14
I strongly agree56
I strongly disagree10
Grand Total140

+
+Making software was as defined earlier as "are you working on something reusable or are you using the tools to achieve a one time task?"
+
+> "I'm using Python software and libraries to make this product I'm working on, it's foundation is based on Python, with React, D3 and all built on Python. The cloud assets are Python and testing is Python." **- Participant 240315927 (a professional IT developer building a Python based data analysis application)**
+
+> "I make software in Python. My day job is making software in python. Mainly Django web design. I work for a retail company, where I write calculating orders, creating data in other inventory management systems. Data analysis." **- Participant 240393825**
+
+> "I have written software, sometimes for business and personal reasons. At one point I worked on a django website project, that was being used by 1000s of people. I don't think any of my live projects are based.
+
+> "Most of it is for sysadmin, automation. I lke to use python instead of shell scripting. I manage a server with wordpress sites. I wrote a script to update these sites, mailman list and sql DB management, and for different utilities." **- Participant 240313542**
+
+> "I use Python for creating things - like outputs for data scientist, software engineer. I make software to look at patterns, and analyse stuff. I think I'm a maker because someone else is using - they are colleagues. Usually its non-technical colleagues. I produce outputs - make data understandable. They use the results, or a package it behind a flask app. Or analyse graphs." **- Participant 240426799**
+
+### I am a Python software maintainer
+
+The Python software/package maintainer user type was seen as requiring a significant amount of time and experience - domain experience as the software could be very specific (e.g. SciKit Learn, SciPy, etc), technical/coding experience, and experience in the community. You need to have spent time in doing the other jobs, before you could become a maintainer.
+
+For large projects it was seen as necessary to have core code contributors, and maintainers. Maintainers did not always write code - they could be more involved with technical architecture, technical design, than writing code.
+
+An aspect of the software maintainer role that wasn’t mentioned a lot was the community management aspect.
+
+![Pie chart with responses to question - I am a Python software maintainer](https://i.imgur.com/gXPc946.png)
+
+
+  
+    
+      
+      
+    
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+      
+      
+    
+    
+     
+     
+    
+  
+
I am a Python package maintainerNumber of responses
I agree39
I disagree24
I have no opinion20
I strongly agree18
I strongly disagree38
Grand Total140

+
+> "You can become a maintainer once you get past a certain level of experience." **- Participant 240278297**
+
+> "To be a package maintainer, you'd have to spend a lot of time fixing issues, e.g. your package is on Github and you'd be looking at issues, reviewing PRs, writing documentation. A package maintainer is someone heavily involved in the project. They deal with more support calls, they do more thinking about issues to get your package into multiple environments. That's the good thing about the Python community - I was trying to use a Python package but there was an issue with the documentation. I said, there's a better way of doing this example. They answered and said "great, do you want to do it? Doing package maintaining, it doesn't interest me, I don't have time for it really - if I have a specific issue I will focus on it. It'd be nice (to do more)." **- Participant 240278297 (professional Python software developer)**
+
+> "I am a core developer of scikit-learn, I spend time writing code. These days strictly speaking - writing code is the least thing I do - mostly I do reviews of other people's code. There is a lot of API design work, it can translate into writing code. I may be the one writing the code or not. I am involved with the CI every now and then. [...] I have been the release manager for the last 2 releases. There are different types of maintainer - writing code maintainers, but you do need core devs writing code. But being a maintainer and building a community -that is about communication and PRs, and mentoring people." **- Participant 240306385 (core maintainer of SciKit-Learn)**
+
+## Recommendations
+
+### Provide documentation recommending "best/recommended ways"
+
+The majority of participants were using Python as a tool, as a participant said: "it's a broad general purpose language designed to get stuff done."
+
+The majority of participants - scientists, product/electronic engineers, data analysts, nuclear physicists - used Python for their work - they may write Python software, for themselves, possibly for colleagues. A smaller number are maintainers of widely used Python packages.
+
+As a result they are not classically trained software developers and so may not have "the right" understanding of important software programming concepts.
+
+Users of all types, and experience struggled with knowing the "right" way to do something. They often spoke about the "recommended way" to do something - to start a new project, to make a package:
+
+> "As a new comer, it's not easy to figure out what should be in the right way to structure a _setup.py_ or _pyproject.toml_. There is a good guide, but it's not easy to figure out what to use. I wish there was a guide like 'Make an application (or library) in 30 minutes'."
diff --git a/docs/html/ux-research-design/research-results/pip-force-reinstall.md b/docs/html/ux-research-design/research-results/pip-force-reinstall.md
new file mode 100644
index 00000000000..4ba84b876d3
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/pip-force-reinstall.md
@@ -0,0 +1,102 @@
+# pip --force-reinstall
+
+## Problem
+
+Currently, when `pip install [package-name] --force-reinstall` is executed, instead of reinstalling the package at the version previously installed, pip installs the package at the newest version available.
+
+i.e. `pip install [package name] --force-reinstall` acts as `pip [package name] --upgrade`
+
+We want to find out if users understand (or desire) this implicit behaviour.
+
+More information can be found on [this GitHub issue](https://github.com/pypa/pip/issues/8238).
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+To help us understand what users want from the `--force-reinstall` option, we launched a survey with the following scenario:
+
+

+You have the requests package and its dependencies installed:
+
+requests==2.22.0

+asgiref==3.2.10

+certifi==2020.6.20

+chardet==3.0.4

+Django==3.1

+idna==2.8

+pytz==2020.1

+sqlparse==0.3.1

+urllib3==1.25.10

+
+You run 'pip install requests --force-reinstall'. What should happen?
+
+

+
+Respondents could choose from one of the following options:
+
+- pip reinstalls the same version of requests. pip does not reinstall request's dependencies.
+- pip reinstalls requests and its dependencies, updating all these packages to the latest compatible versions
+- pip reinstalls requests and its dependencies, keeping every package on the same version
+- pip reinstalls requests, updating it to the latest version. pip updates request's dependencies where necessary to support the newer version.
+- I don't know what pip should do
+- I don't understand the question
+- Other (allows respondent to provide their own answer)
+
+We also asked how useful `pip --force-reinstall` is, and how often it is used.
+
+## Results
+
+In total we received 190 responses to our survey, with 186 people telling us what pip should do when the `--force-reinstall` option is executed.
+
+![pie chart with survey results](https://i.imgur.com/yoN02o9.png)
+
+- **31.7%** (59/186) of respondents said that pip should reinstall requests and its dependencies, keeping every package on the same version
+- **28%** (52/186) of respondents said that pip should reinstall requests, updating it to the latest version, with pip updating request's dependencies where necessary to support the newer version.
+- **15.6%** (29/186) of respondents said that pip should reinstall requests and its dependencies, updating all these packages to the latest compatible versions
+- **14%** (26/186) of respondents said that pip should reinstall the same version of requests, and not reinstall request's dependencies
+
+If we group responses into "upgrade" or "do not upgrade" (ignoring responses that could not be grouped), we find:
+
+- 46.32% (88/186) of respondents thought that pip should install the same version of requests - i.e. that `--force-reinstall` should _not_ implicitly upgrade
+- 43.16% (82/186) of respondents thought that pip should upgrade requests to the latest version - i.e that `--force-reinstall` _should_ implicitly upgrade
+
+Most respondents use `--force-reinstall` "almost never" (65.6%):
+
+![screenshot of survey question of how often users use --force-reinstall](https://i.imgur.com/fjLQUPV.png)
+![bar chart of how often users use --force-reinstall](https://i.imgur.com/Xe1XDkI.png)
+
+Amongst respondents who said they use `--force-resinstall` often or very often:
+
+- 54.54% (6/11) of respondents thought that pip should install the same version of requests - i.e. that `--force-reinstall` should _not_ implicitly upgrade
+- 45.45% (5/11) of respondents thought that pip should upgrade requests to the latest version - i.e that `--force-reinstall` _should_ implicitly upgrade
+
+Respondents find `--force-reinstall` less useful than useful:
+
+![screenshot of survey question of how useful users find --force-reinstall](https://i.imgur.com/6cv4lFn.png)
+![bar chart of how useful users find --force-reinstall](https://i.imgur.com/gMUBDBo.png)
+
+Amongst respondents who said they find `--force-resinstall` useful or very useful:
+
+- 38.46% (20/52) of respondents thought that pip should install the same version of requests - i.e. that `--force-reinstall` should _not_ implicitly upgrade
+- 50% (26/52) of respondents thought that pip should upgrade requests to the latest version - i.e that `--force-reinstall` _should_ implicitly upgrade
+
+## Recommendations
+
+Given that this option is not regularly used and not strongly rated as useful, we recommend that the development team consider removing `--force-reinstall` _should they wish to reduce maintenance overhead_.
+
+In this case, we recommend showing the following message when a user tries to use `--force-reinstall`:
+
+> Error: the pip install --force-reinstall option no longer exists. Use pip uninstall then pip install to replace up-to-date packages, or pip install --upgrade to update your packages to the latest available versions.
+
+Should the pip development team wish to keep `--force-resintall`, we recommend maintaining the current (implicit upgrade) behaviour, as pip's users have not expressed a clear preference for a different behaviour.
+
+In this case, we recommend upgrading the [help text](https://pip.pypa.io/en/stable/reference/pip_install/#cmdoption-force-reinstall) to be more explicit:
+
+Old help text:
+
+> Reinstall all packages even if they are already up-to-date.
+
+New help text:
+
+> Reinstall package(s), and their dependencies, even if they are already up-to-date. Where package(s) are not up-to-date, upgrade these to the latest version (unless version specifiers are used).
diff --git a/docs/html/ux-research-design/research-results/pip-search.md b/docs/html/ux-research-design/research-results/pip-search.md
new file mode 100644
index 00000000000..641b30ca673
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/pip-search.md
@@ -0,0 +1,145 @@
+# pip search
+
+## Problem
+
+By default, `pip search` searches packages on PyPI.org from the command line. However, the team are [considering removing it](https://github.com/pypa/pip/issues/5216), because they think it's not that useful and using too many resources on PyPI ([PyPI XMLRPC search has been disabled](https://status.python.org/incidents/grk0k7sz6zkp) because of abuse/overuse).
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+Prior to PyPI XMLRPC search being disabled, we:
+
+- Gathered feedback on pip search via the "buy a feature" survey
+- Published a survey specifically about pip search, asking users about:
+  - Their current use of pip search
+  - How useful they find pip search results
+  - How clear they find pip search results
+  - Where users expect pip to search (e.g. PyPI vs private index)
+  - What data pip should search _other_ than project name
+  - What changes or additions they would make to pip search
+
+## Results
+
+In total, we received 1070 responses to the buy a feature survey, with 541 (50.4%) respondents selecting "Search pypi.org for packages" in their top 10 features.
+
+However, search ranked lower than the following features:
+
+1. Run pip without requiring any user input (e.g. in CI) _718_
+2. Show information about all installed packages _707_
+3. Show information about a single installed package _596_
+
+We received 302 responses to the pip search survey, with 62 of the 302 (20.5%) respondents either not knowing that the command existed, never using it, or using it "rarely".
+
+We found that the remaining ~80% of respondents who do use pip search use it to:
+
+- Find/search for the right/new/alternate packages to install:
+  - Checking package name (verify correct spelling)
+  - Assessing functionality (check a package's description)
+  - Verifying availability (check if such package exists)
+- Search for the latest version of a package (verify version)
+- Find package libraries and new modules
+
+In general, pip search is regarded as:
+
+- more useful than not useful
+- more clear than not clear
+
+When asked if pip should search on items _other_ than the package name, respondents most commonly asked to search the package description:
+
+![wordcloud of common search terms](https://i.imgur.com/lxS2TG6.png)
+
+Some users also mentioned that they would like the search to be configurable, e.g. by passing flags/options.
+
+When asked how they would improve pip search, users said they would improve:
+
+**1. Search methods:**
+
+- fuzzy search and insensitive case should be acceptable
+- users should have the option to filter/sort by description, name, tag
+
+**2. Search results:**
+
+- relevancy: the results should show both the exact match and closest match
+- order/category: the result should display items in a certain order, e.g highest number of downloads (popularity), development status (last updated/latest version), etc.
+- there should be a limited number of search results
+
+**3. User interface:**
+
+- link package to pypi page
+- use color coding / system for better clarity
+- distinguish exact match search results from others: by highlighting, or using a different color
+- indicate version compatibility
+
+## Recommendations
+
+### Deprecation strategy
+
+Given that the [PyPI](https://pypi.org/pypi) search API is currently disabled (as of 1st Jan, 2021) for technical and sustainability reasons, we recommend that the pip team display a clear error message to users who use the command:
+
+```
+The PyPI search API has been disabled due to unmanageable load.
+To search PyPI, open your browser to search for packages at https://pypi.org
+Alternatively, you can search a different index using the --index command.
+```
+
+In the longer term, **we recommend that the PyPI team investigate alternative methods of serving search results (e.g. via caching)** that would enable pip search to work again. This recommendation is supported by our research which suggests that many pip users find this functionality useful.
+
+If this is not possible, the pip team should create clear instructions that tells users what to use instead. Some suggestions (based on common user flows) are listed below:
+
+#### Finding a new package based on tags and keywords
+
+This is the most common feature that you would expect from `pip search` and likely the hardest to replace after deprecation.
+
+As mentioned above, the pip CLI should - as soon as possible - hide the full-trace error message present when a user types `pip search`. Instead, pip should show a message that encourages users to use the search index on the website itself (in their browser) by providing a link directly to [https://pypi.org](https://pypi.org). Also, pip should provide a short hint on how to use an alternative index.
+
+```
+$ pip search pytest
+
+The PyPI search API has been disabled due to unmanageable load.
+
+Please open your browser to search for packages at https://pypi.org
+
+Alternatively, you can use a different index using the --index command.
+
+   pip search pytest --index 
+```
+
+In addition, the pip team could implement an alternative to the PyPI search API that works without a hard dependency on a centralized service. Similar to other distribution systems like `apt` and `yum`, the metadata of all package names could be downloaded on the user's machine with an opt-in workflow:
+
+```
+$ pip search pytest
+Using pip search on the command line requires you to download the index first.
+Alternatively, you can open your browser to search for packages at https://pypi.org
+
+Download the index to /System/Library/Frameworks/Python.framework/
+Versions/2.7/Resources/Python.app/Contents/MacOS/search.db? (y/n) y
+......... done!
+
+
+
+$ pip search pytest
+
+```
+
+This is a more complex route that will require more engineering time, but can aim to provide command line users with a similar functionality to the old `pip search` command. It can also check the age of the local index and show a warning if it is getting old.
+
+#### Verifying the latest version of a package
+
+Users also use the `pip search` command to find or verify a particular package's version.
+
+As a replacement, the pip team could do either of the following:
+
+1. Extend the `pip show` feature to include known latest versions of the package;
+2. Create a `pip outdated` command which scans the current dependency tree and outputs the packages that are outdated (compared to the latest versions on the configured index).
+
+### UX improvements
+
+Should it be possible to continue to support pip search, we strongly recommend the following UX improvements:
+
+- Adding support for [fuzzy search](https://en.wikipedia.org/wiki/Approximate_string_matching), or suggesting alternative/related search terms
+- Adding support for case insensitive search
+- Searching based on a package's description
+- Linking search results to a package's PyPI page (where appropriate)
+
+Other user feedback (as detailed above) should also be considered by the team on a case-by-case basis.
diff --git a/docs/html/ux-research-design/research-results/pip-upgrade-conflict.md b/docs/html/ux-research-design/research-results/pip-upgrade-conflict.md
new file mode 100644
index 00000000000..6f35a550ca0
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/pip-upgrade-conflict.md
@@ -0,0 +1,68 @@
+# pip Upgrade Conflict
+
+## Problem
+
+Currently, pip does _not_ take into account packages that are already installed when a user asks pip to upgrade a package. This can cause dependency conflicts for pip's users.
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+We published a [survey](https://bit.ly/2ZqJijr) asking users how they would solve the following scenario:
+
+

+Imagine you have package tea and coffee with the following dependencies:
+
+tea 1.0.0 - depends on water<1.12

+tea 2.0.0 - depends on water>=1.12

+coffee 1.0.0 - depends on water<1.12

+coffee 2.0.0 - depends on water>=1.12

+
+You have the following packages installed:
+
+tea 1.0.0

+coffee 1.0.0

+water 1.11.0

+
+You ask pip to upgrade tea. What should pip do?
+
+If pip upgrades tea to 2.0.0, water needs to be upgraded as well, creating a conflict with coffee...
+
+

+
+We gave users four choices:
+
+1. Upgrade tea and water. Show a warning explaining that coffee now has unsatisfied requirements.
+2. Upgrade coffee automatically to 2.0.0
+3. Install nothing. Tell the user that everything is up-to-date (since the version of tea they have installed is the latest version without conflicts).
+4. Install nothing. Show an error explaining that the upgrade would cause incompatibilities.
+
+We allowed users to post their own solution, and asked why they came to their decision.
+
+## Results
+
+In total, we received 693 responses, 407 of which included an explanation of why a particular solution was best.
+
+![](https://i.imgur.com/UdBWkaQ.png)
+
+- 497 responses (71.7%) preferred option 4: that pip should install nothing and raise an error message
+- 102 responses (14.7%) preferred option 2: that pip should upgrade package_coffee
+- 79 responses (11.4%) preferred option 1: that pip should upgrade tea and water
+- 15 responses (2.2%) preferred option 3: that pip should install nothing and tell the user that everything is up to date
+
+From the 407 responses that answered "why" a particular solution was best, the following key themes emerged:
+
+- "explicit is better than implicit" - pip should not create "side effects" that the user does not understand, has not anticipated, and has not consented to
+- pip should do everything in its power to avoid introducing conflicts (pip should not "break" the development environment)
+- Telling the user that everything is up to date (option 3) is misleading / dishonest
+- pip could be more flexible by:
+  - allowing the user to choose how they want to resolve the situation
+  - allowing the user to override the default behaviour (using flags)
+
+## Recommendations
+
+Based on the results of this research, the pip UX team has made the following recommendations to the development team:
+
+- While the current behaviour exists, [warn the user when conflicts are introduced](https://github.com/pypa/pip/issues/7744#issuecomment-717573440)
+- [Change the current behaviour](https://github.com/pypa/pip/issues/9094), so that pip takes into account packages that are already installed when upgrading other packages. Show the user a warning when pip anticipates a depdenency conflict (as per option 4)
+- Explore [the possibility of adding additional flags to the upgrade command](https://github.com/pypa/pip/issues/9095), to give users more control
diff --git a/docs/html/ux-research-design/research-results/prioritizing-features.md b/docs/html/ux-research-design/research-results/prioritizing-features.md
new file mode 100644
index 00000000000..12e6b8b244e
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/prioritizing-features.md
@@ -0,0 +1,156 @@
+# Prioritizing pip Features
+
+## Problem
+
+The pip development team is small, and has limited time and energy to work on issues reported via the [issue tracker](https://github.com/pypa/pip/issues). There is also a significant backlog of issues (782 as of November, 2020) for the team to respond to.
+For the team to prioritize their work based on what will have the most impact, we need to develop a better understanding of what users want from pip.
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+To help answer this question, we developed a "buy a feature" survey, with the following scenario:
+
+

+Help us to understand what's important to you by participating in our "buy a feature" game:
+
+You have an allocated budget of $200 to spend on redesigning pip.
+
+With your $200 budget, "buy" the functionality you'd most like to keep.
+
+You don't have to spend the whole $200, but you should also not overspend your budget!
+
+

+
+We asked users to spend their first $100 on features related to `pip install`, and to spend their remaining $100 on other pip features. We also gave users an additional $10 to suggest a new feature:
+
+![survey question where users are asked to buy features for pip install](https://i.imgur.com/2QShgYo.png)
+
+![survey question where users are asked to buy features other than pip install](https://i.imgur.com/sY8gdXD.png)
+
+![survey question where users are asked to spend an additional ten dollars](https://i.imgur.com/hvgjdEG.png)
+
+## Results
+
+We received 1076 responses, 1070 of which were valid. The most popular features included the core competencies of pip:
+
+- Recreating an environment from a list of installed dependencies;
+- Install, uninstall, and upgrade packages from a virtual control system, file, or local directory;
+- Warn about broken or conflicting dependencies.
+
+### pip install
+
+The top ten features related to pip install were:
+
+![pip install results](https://i.imgur.com/1rNIOB7.png)
+
+1. Install and uninstall packages
+2. Upgrade packages to the latest version
+3. Warn about broken dependencies
+4. Install a package from a version control system (e.g. Git, Mercurial, etc.)
+5. Install packages as specified in a file
+6. Install a package from a local directory
+7. Verify downloaded packages against hashes
+8. Install packages from an alternative package index, or indexes (default is PyPI only)
+9. Install a package from wheels (no need for compiling code)
+10. Control where you want your installed package to live on your computer
+
+### Other pip functionality
+
+The top ten features related to other pip functionality were:
+
+![other pip functionality results](https://i.imgur.com/xrp9XWw.png)
+
+1. Generate a list of installed packages that can be used to recreate the environment
+2. Check that your installed packages do not have dependency conflicts
+3. Run pip without requiring any user input (e.g. in CI)
+4. Show information about all installed packages
+5. Show information about a single installed package
+6. Search pypi.org for packages
+7. Show information about pip (version information, help information, etc.)
+8. Download packages, build wheels and keep them in a directory for offline use
+9. Manage pip's default configuration (e.g. by using configuration files)
+10. Customise pip's output (e.g. reduce or increase verbosity, suppress colors, send output to a log)
+
+Results varied by the amount of Python experience the user had.
+
+

+See how likely users are to select a feature based on their experience level
+
+#### Verify downloaded packages against hashes
+
+![screenshot of verify downloaded packages against hashes](https://i.imgur.com/oVHOGBQ.png)
+
+#### Warn about broken dependencies
+
+![Screenshot of Warn about broken dependencies](https://i.imgur.com/uNv2tnG.png)
+
+#### Upgrade packages to the lastest version
+
+![Screenshot of Upgrade packages to the lastest version](https://i.imgur.com/pQgCLBO.png)
+
+#### Install packages from an alternative package index, or indexes
+
+![Screenshot of Install packages from an alternative package index, or indexes](https://i.imgur.com/E1LnTBt.png)
+
+#### Install packages as specified in a file
+
+![Screenshot of Install packages as specified in a file](https://i.imgur.com/87uh4xp.png)
+
+#### Install and uninstall packages
+
+![Screenshot of Install and uninstall packages](https://i.imgur.com/GRsazBy.png)
+
+#### Install packages from a version control system
+
+![Screenshot of Install packages from a version control system](https://i.imgur.com/iW7d0Sq.png)
+
+#### Install a package from wheels
+
+![Screenshot of Install a package from wheels](https://i.imgur.com/9DMBfNL.png)
+
+#### Install apackage from a local directory
+
+![Screenshot of Install apackage from a local directory](https://i.imgur.com/Jp95rak.png)
+
+#### Control where you want your installed package to live on your computer
+
+![Screenshot of Control where you want your installed package to live on your computer](https://i.imgur.com/32fpww2.png)
+
+

+
+## Recommendations
+
+### Environment recreation
+
+Environment recreation is already included in pip as part of the `requirements.txt` feature; however, with it's popularity and demand, we recommend that **pip should improve it's support of this feature.**
+
+- Improve environment recreation user output and help guides directly in the pip CLI;
+- Improve pip documentation & user guide to prominently feature environment recreation as a core feature of pip;
+- Improve environment recreation process itself by considering virtual environments as a core competency "built-in" to pip.
+
+**Recreating an environment from a list of installed dependencies was the most valued feature request overall** as well as in each user group, _except for those with less than 6 months of experience and those with 16-19 years of experience (for which it was the second most valued)._
+
+When asked to enter a feature request with freetext, users placed the words 'built-in,' 'virtual,' 'automatic,' and 'isolation' alongside the word 'environment,' which suggest that users expect pip to recreate environments with a high level of intelligence and usability.
+
+**Selected direct quotes**
+
+> Make pip warn you when you are not in virtualenv
+
+> Automatic virtual env creation with a command line argument
+
+> Eliminate virtual environments. Just use ./python_modules/ like everyone else
+
+> I would love to see pip manage the python version and virtual env similar to the minicona
+
+> Would spend all my $200 on this: Integrate pipenv or venv into pip so installing an application doesn't install it's dependencies in the system package store. And allow pinning dependency versions for application packages (like how pip-compile does it)
+
+### Dependency management
+
+We recommend that the pip team improve warning and error messages related to dependencies (e.g., conflicts) with practical hints for resolution. This can be rolled out in multiple timescales, including:
+
+- Give hints to the user on how to resolve this issue directly alongside the error message;
+- Prominently include virtual environment creation in the documentation, upon `pip install` conflict errors, and if possible as a built-in feature of pip;
+- Upgrading the dependency resolver (in progress).
+
+It is clear that dependency management, including warning about conflicting packages and upgrades, is important for pip users. By helping users better manage their dependencies through virtual environments, pip can reduce the overall warnings and conflict messages that users encounter.
diff --git a/docs/html/ux-research-design/research-results/users-and-security.md b/docs/html/ux-research-design/research-results/users-and-security.md
new file mode 100644
index 00000000000..d9b79a057ff
--- /dev/null
+++ b/docs/html/ux-research-design/research-results/users-and-security.md
@@ -0,0 +1,172 @@
+# How pip users think about security
+
+## Problem
+
+We wanted to understand how pip users think about security when installing packages with pip.
+
+[Skip to recommendations](#recommendations)
+
+## Research
+
+We asked participants about their behaviours and practices in terms of the security and integrity of the Python packages they install with pip, and of the software they create.
+
+We asked participants to tell us how often they:
+
+1. Carry out a code audit of the Python software they install with pip
+2. Think about the security and integrity of the (Python) software they install (with pip)
+3. Think about the security and integrity of the (Python) code they create
+
+## Results
+
+While the security and integrity of the software users install (51%) and make (71%) is important to research participants, less than 7% do code audits of the packages or code they install with pip.
+
+This is due to lack of time to audit large packages, lack of expertise, reliance on widely adopted Python packages, the expectation that pip automatically checks hashes, and reliance of the wider Python community to act as canary in the coalmine.
+
+This behaviour was common across all user types, and baselines of software development experience.
+
+These results - particularly the lack of expertise in auditing packages fits in with the overall findings that the majority of pip users are not "classically trained" (i.e. having formally learned software development) software developers and so lack the expertise and/or formal training in software development practices.
+
+There is a gulf between what the maintainers expect users to think, and worry about, and what the users actually worry and think about. Right now, pip leaves users to "fend for themselves" in terms of providing them with assurance of the software they install. This isn't meant as a criticism, but an observation.
+
+### Responses to question: before I install any Python software with pip, I carry out a code audit
+
+The vast majority of participants, 82%, do not (rarely or never) do a code audit of the software packages they install using pip, the reasons are explained below.
+
+| Before I install any Python software with pip, I carry out a code audit: | Number of responses |
+| ------------------------------------------------------------------------ | ------------------- |
+| Always                                                                   | 3                   |
+| Frequently                                                               | 9                   |
+| Rarely                                                                   | 66                  |
+| Never                                                                    | 68                  |
+| I'm not sure what this means                                             | 5                   |
+| No opinion                                                               | 13                  |
+| **Total number of participants**                                         | **164**             |
+
+### Responses to question: I think about the security and integrity of the software I install
+
+![screenshot of responses to question about security](https://i.imgur.com/wy4lGwJ.png)
+
+The vast majority of participants did think about the security and integrity of the software they installed - and unlike responses about code audits, in some cases participants made attempts to verify the security and integrity of the software they installed.
+
+Most attempts were made by those who had experience in software development, however in some cases, people gave up.
+
+Those who were not classically trained software developers did not know where to start.
+
+Both of these groups identified their "sphere of influence" and did their best to cover this.
+
+### User thoughts about security
+
+#### Responsibility as author
+
+Participants who spent a lot of their time writing Python code - either for community or as part of their job - expressed a responsibility to their users for the code they wrote - people who wrote code which was made public expressed a stronger responsibility.
+
+They thought about where the software would be used, who would use it, and possible attack surfaces.
+
+> "On the basic point, I have to think about attack surfaces. If I am writing the thing (software), I have to give a crap. I have to answer the emails! In the code I push to[ pypi.org](http://pypi.org/) I think about it doubley. What could people do with this code? Whether I do a good job, that's different! I am aware of it when publishing it or making it publically available. Whether I do a good job, that's different! I am aware of it when publishing it or making it publically available. I rely on community resources - Python security related, I follow security people blogs, Twitter. I use Hypothesis for fuzz-testing. I also rely on having security policies in place and a reporting mechanism. I steer clear of crypto, I rely on other peoples. There's a certain amount of knowledge in the Python community, I am actively involved in it. If something happens, I will hear about it. I use Twitter, if something happens, in the morning it can take me awhile to figure out what's happened. I have a lot of trust in the ecosystem to be self healing. As long as you don't stray too far-off the reservation (into using odd or uncommon or new packages), it's a better sense of security." **- Participant (data scientist turned Python developer)**
+
+> Yes, because I'm liable for that. If the problem is my code, and I deliver something and they get attacked. I'm screwed. **- Participant (professional Python developer and trainer)**
+
+#### Reliance on software packages
+
+Participants also explained they rely on code security scanning and checking software packages.
+
+> "I use linters (Bandit), I scan the code I have created and when there is an issue I raise a red flag."
+
+> "I use Hypothesis for fuzz-testing."
+
+#### Reliance on good software development practices
+
+A small number of participants e### Selected quotes from research participants
+xplained they have good software practices in place, which help with writing secure software.
+
+> "We have a book about ethics of code - we have mandatory certification."
+
+> "I also rely on having security policies in place and a reporting mechanism. I steer clear of crypto, I rely on other peoples."
+
+Of the users who have used pip's hash checking functionality:
+
+- One finds the error messages "too annoying and loud", and has difficulty matching the file name to the hash
+- Another finds the process of explicitly pinning hashes to be too tiresome (especially for dependencies)
+
+One user mentioned that he likes [NPM audit](https://docs.npmjs.com/cli/v6/commands/npm-audit) and would like to see something similar in the Python ecosystem.
+
+#### Lack of time
+
+The lack of time to carry out the audit of the package code, and that of the dependencies, was cited as a very common reason. In most cases participants used Python code as a means to achieving their goal.
+
+#### Lack of expertise to carry out the audit
+
+The lack of expertise or knowledge of auditing software was mainly due to participants expertise not being software development. However, in the case participants were "classically" software developers, lack of expertise was also a commonly given reason for not carrying out audits.
+
+#### Use of only widely used, well-established packages
+
+Use of well-established, high-quality packages was a common reason amongst all types of participants - professional Python software developers and those who used Python as a tool.
+
+"Well-established, high-quality packages" were defined by users as packages that:
+
+- have been in existence for many years
+- are popular, or commonly used by those in their community or industry
+- have responsive maintainers
+- maintained by people the participant has heard of
+- have many hundreds or thousands of users
+- are in active development (many open issues, many forks, Github stars)
+- are developed in the open, and transparently
+- their history is known, or can be found out publicly
+
+#### Reliance on the Python community to find issues
+
+There was a reliance on the community to find issues and make them know publicly - "Many eyes shallow bugs".
+
+> "I rarely do code audits. Most of the time I rely on the opinions of the community. I look at how many maintainers there are. Maybe it's not good practice but I don't have time to go through the code." **- Participant 240315091**
+
+#### Use of only internal packages
+
+> "I only install internal packages, so I don't need to worry about this."
+
+This theme was not that common, mainly in large software development environments or where security was of high importance.
+
+#### Expectation that pip audits packages
+
+Some users expect/assume that pip (and PyPI) should "protect" them from malicious actors - e.g. by automatically checking hashes, or detecting malicious packages.
+
+> "If I was downloading a package on my own I check the hash, if it's installed by pip, then no. I expect pip to do it. If it doesn't do it, it does surprise me. Every package manager checks the hash against what it downloads. The hashes are already known on pypi." **- Participant 240312164 (Nuclear physicist)**
+
+#### Other notable comments
+
+> "Never. I should but I never do [audit code]. I don't stray, I am risk adverse. I install packages that are good already. I consider my risk surface small. I don't have time or resources to audit them. I have sufficient faith in the ecosystem to be self-auditing. If something turned up in a well known package, the community is well known for making a stink. And anyway a code audit wouldn't pick it up." **- Participant 240326752 (professional Python developer)**
+
+> "On the private level (work) the code is developed internally. I don't audit the code on pypi - due to lack of time auditing the dependencies, and I trust it. I know they had a security breach a few years ago, but it doesn't happen that often. I know they don't audit anything but I still don't audit the code."
+
+> "I wouldn't know how to [audit code], also I'm writing this stuff for myself. It'll work or not. Sometimes I end up installing 2 or 3 packages and find out that I need to install something else. I move on if it doesn't work. The last resort is I will write the code myself."
+
+> "I'm quite trusting - Python is open source, I'm assuming that if a package is on[ pypi.org](http://pypi.org/) - it must be alright. I install the package first, then I look at it. I find a package by figuring out - we need to do a certain task, we search for it on the Internet, look at the documentation, we install it and then see if it is what we want" **- Participant 240278297**
+
+> "If I want to install a package, it's for a reason. I want to calculate the azimuth and elevation of the moon with PyEphem. Do a code audit? Pffff. Most of the stuff I do is banal. It needs to meet a dependency, so I install it. I'm not going to do a code audit. I don't care. Never, but this is one of the things - is the package on pypi the exact source I see on Github? You could end up with files that are distributed differently. Probably (I don't do it) because I am too scared to look. There is this thing that pip verifies (the packages) hash - so that is a feature to guard against this. What is the hash of? No idea. It's located in the local python install." **- Participant 240426799 (systems administrator)**
+
+> "No [I don't audit code]. [laughs] Coz, I'm not going to read thousands of lines of code before I install a package. Oh my God. [..] I wouldn't be able to find it. I'm trading off - honestly how popular the package is, number of stars on GH. pypi doesn't have any UI way to tell me how many downloads it has. If it did I would use that." **- Participant 240386315 (IT administrator)**
+
+> "Well, I don't have the background to do a code audit of something like Numerical Python. Most packages I use are huge. Most people aren't doing code of those packages, except the maintainer. I am relying on whatever is built into pip to do package security. I also assume if there is an exploit someone will find it and let the world now. I'm really lazy." **- Participant 240312164 (Nuclear physicist)**
+
+> "I would like some security advisor, [like in npm](https://docs.npmjs.com/auditing-package-dependencies-for-security-vulnerabilities) - it works very well, when you install a package "there are security vulns. with this package - 1 low, 5 medium, 8 high. I haven't come across security issues with Python packages." **- CZI convening research participant**
+
+## Recommendations
+
+### Provide package security guidance or auditing mechanism
+
+A small number of participants (3-4) over the research period mentioned the[ NPM audit command](https://docs.npmjs.com/auditing-package-dependencies-for-security-vulnerabilities) as an example of a good way to assess package security. It may provide a model for how to approach this user need.
+
+### Automatically check package hashes
+
+pip should **by default** check packages hashes during install, providing a way for users to turn this behaviour off.
+
+In the case of no hash being available, pip should warn users and provide recommendations for users - from simplest to most advanced.
+
+### Mechanism to report suspicious packages
+
+Users should have a mechanism to report suspicious, or malicious, packages/behaviour. Where this mechanism should exist is open to discussion. The minimum should be a mechanism for users to flag packages on pypi.org.
+
+### Improve the output of pips activities easier to understand
+
+Right now pip's output is overwhelming and while it contains a lot of information, little of it is perceivable to the user - meaning is lost in "the wall of text".
+
+Pip's output must be redesigned to provide users with the right information - including security warnings - at the right time.
diff --git a/docs/html/ux_research_design.rst b/docs/html/ux_research_design.rst
deleted file mode 100644
index 165b6949670..00000000000
--- a/docs/html/ux_research_design.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-====================
-UX Research & Design
-====================
-
-Over the course of 2020, the pip team has been working on improving pip's user
-experience.
-
-Currently, our focus is on:
-
-1. `Understanding who uses pip`_
-2. `Understanding how pip compares to other package managers, and how pip supports other Python packaging tools`_
-3. `Understanding how pip's functionality is used, and how it could be improved`_
-4. `Understanding how pip's documentation is used, and how it could be improved`_
-
-You can read the `overall plan`_ and the `mid-year update`_ to learn more about
-our work.
-
-How to contribute
------------------
-
-Participate in UX research
-==========================
-
-It is important that we hear from pip users so that we can:
-
-- Understand how pip is currently used by the Python community
-- Understand how pip users *need* pip to behave
-- Understand how pip users *would like* pip to behave
-- Understand pip's strengths and shortcomings
-- Make useful design recommendations for improving pip
-
-If you are interested in participating in pip user research, please
-`join pip's user panel`_.
-You can `read more information about the user panel here`_.
-
-We are also looking for users to:
-
-- `Give us feedback about pip's new resolver`_
-- `Tell us how pip should handle conflicts with already installed packages when updating other packages`_
-
-Report UX issues
-================
-
-If you believe that you have found a user experience bug in pip, or you have
-ideas for how pip could be made better for all users, you please file an issue
-on the `pip issue tracker`_.
-
-Work on UX issues
-=================
-
-You can help improve pip's user experience by `working on UX issues`_.
-Issues that are ideal for new contributors are marked with "good first issue".
-
-Test new features
-=================
-
-You can help the team by testing new features as they are released to the
-community. Currently, we are looking for users to
-`test pip's new dependency resolver`_.
-
-Next steps
-----------
-
-In the coming months we will extend this documentation to include:
-
-1. Summaries of our user research, including recommendations for how to improve pip
-2. Tools for the pip team to continue to practice user centered design (e.g. user personas, etc.)
-
-.. _Understanding who uses pip: https://github.com/pypa/pip/issues/8518
-.. _Understanding how pip compares to other package managers, and how pip supports other Python packaging tools: https://github.com/pypa/pip/issues/8515
-.. _Understanding how pip's functionality is used, and how it could be improved: https://github.com/pypa/pip/issues/8516
-.. _Understanding how pip's documentation is used, and how it could be improved: https://github.com/pypa/pip/issues/8517
-.. _overall plan: https://wiki.python.org/psf/Pip2020DonorFundedRoadmap
-.. _mid-year update: http://pyfound.blogspot.com/2020/07/pip-team-midyear-report.html
-.. _join pip's user panel: https://tools.simplysecure.org/survey/index.php?r=survey/index&sid=827389&lang=en
-.. _read more information about the user panel here: https://bit.ly/pip-ux-studies
-.. _Give us feedback about pip's new resolver: https://tools.simplysecure.org/survey/index.php?r=survey/index&sid=989272&lang=en
-.. _Tell us how pip should handle conflicts with already installed packages when updating other packages: https://docs.google.com/forms/d/1KtejgZnK-6NPTmAJ-7aWox4iktcezQauW-Mh3gbnydQ/edit
-.. _pip issue tracker: https://github.com/pypa/pip/issues/new
-.. _working on UX issues: https://github.com/pypa/pip/issues?q=is%3Aissue+is%3Aopen+label%3A%22K%3A+UX%22
-.. _test pip's new dependency resolver: https://pip.pypa.io/en/latest/user_guide/#changes-to-the-pip-dependency-resolver-in-20-2-2020
diff --git a/news/10745.doc.rst b/news/10745.doc.rst
new file mode 100644
index 00000000000..4094f41405c
--- /dev/null
+++ b/news/10745.doc.rst
@@ -0,0 +1 @@
+Start using Rich for presenting error messages in a consistent format.

From cbdd714083326a6db7d44f6b0b6901a75fc84230 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 24 Mar 2024 13:04:31 -0400
Subject: [PATCH 311/992] Update black in precommit to 24.4.0

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e29e1fcf0af..52650efd54c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
     exclude: .patch
 
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 23.12.1
+  rev: 24.4.0
   hooks:
   - id: black
 

From 4934e774f90a20f8a1d975d7a8c616deeece10a8 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 14 Apr 2024 11:05:56 -0400
Subject: [PATCH 312/992] Apply black formatting

---
 src/pip/_internal/__init__.py                    |  2 +-
 src/pip/_internal/cli/main.py                    |  1 +
 src/pip/_internal/cli/req_command.py             | 10 +++++-----
 src/pip/_internal/index/collector.py             |  4 +---
 src/pip/_internal/index/package_finder.py        |  3 ---
 src/pip/_internal/models/direct_url.py           |  1 +
 src/pip/_internal/models/scheme.py               |  1 -
 src/pip/_internal/models/search_scope.py         |  1 -
 src/pip/_internal/models/target_python.py        |  1 -
 src/pip/_internal/models/wheel.py                |  1 +
 src/pip/_internal/network/auth.py                |  9 +++++----
 src/pip/_internal/network/download.py            |  1 +
 .../operations/install/editable_legacy.py        |  1 +
 src/pip/_internal/resolution/legacy/resolver.py  |  6 +++---
 src/pip/_internal/utils/deprecation.py           | 16 ++++++++++------
 src/pip/_internal/utils/logging.py               |  1 -
 src/pip/_internal/vcs/versioncontrol.py          |  1 -
 tests/functional/test_cli.py                     |  1 +
 tests/functional/test_completion.py              |  3 +--
 tests/functional/test_configuration.py           |  1 +
 tests/functional/test_hash.py                    |  1 +
 tests/functional/test_install_compat.py          |  1 +
 tests/functional/test_install_reqs.py            |  3 +--
 tests/functional/test_install_user.py            |  1 +
 tests/functional/test_new_resolver.py            |  3 +--
 tests/functional/test_no_color.py                |  1 +
 tests/functional/test_uninstall_user.py          |  1 +
 tests/functional/test_vcs_git.py                 |  1 +
 tests/functional/test_wheel.py                   |  1 +
 tests/lib/__init__.py                            |  3 +--
 tests/lib/filesystem.py                          |  1 +
 tests/lib/test_lib.py                            |  1 +
 tests/lib/test_wheel.py                          |  1 +
 tests/lib/wheel.py                               |  1 +
 tests/unit/test_locations.py                     |  1 +
 tests/unit/test_options.py                       |  1 -
 tests/unit/test_req_file.py                      | 11 ++++++-----
 tests/unit/test_utils.py                         |  1 +
 tests/unit/test_utils_subprocess.py              |  1 -
 tests/unit/test_wheel.py                         |  1 +
 tools/update-rtd-redirects.py                    |  1 +
 41 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py
index 96c6b88c112..1a5b7f87f97 100755
--- a/src/pip/_internal/__init__.py
+++ b/src/pip/_internal/__init__.py
@@ -7,7 +7,7 @@
 _log.init_logging()
 
 
-def main(args: (Optional[List[str]]) = None) -> int:
+def main(args: Optional[List[str]] = None) -> int:
     """This is preserved for old console scripts that may still be referencing
     it.
 
diff --git a/src/pip/_internal/cli/main.py b/src/pip/_internal/cli/main.py
index 7e061f5b390..563ac79c984 100644
--- a/src/pip/_internal/cli/main.py
+++ b/src/pip/_internal/cli/main.py
@@ -1,5 +1,6 @@
 """Primary application entrypoint.
 """
+
 import locale
 import logging
 import os
diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
index 1421e664b28..7a5580a8457 100644
--- a/src/pip/_internal/cli/req_command.py
+++ b/src/pip/_internal/cli/req_command.py
@@ -66,7 +66,6 @@ def _create_truststore_ssl_context() -> Optional["SSLContext"]:
 
 
 class SessionCommandMixin(CommandContextMixIn):
-
     """
     A class mixin for command classes needing _build_session().
     """
@@ -155,7 +154,6 @@ def _build_session(
 
 
 class IndexGroupCommand(Command, SessionCommandMixin):
-
     """
     Abstract base class for commands with the index_group options.
 
@@ -442,9 +440,11 @@ def get_requirements(
                     isolated=options.isolated_mode,
                     use_pep517=options.use_pep517,
                     user_supplied=True,
-                    config_settings=parsed_req.options.get("config_settings")
-                    if parsed_req.options
-                    else None,
+                    config_settings=(
+                        parsed_req.options.get("config_settings")
+                        if parsed_req.options
+                        else None
+                    ),
                 )
                 requirements.append(req_to_add)
 
diff --git a/src/pip/_internal/index/collector.py b/src/pip/_internal/index/collector.py
index f4d476abacd..a22e3b91fcb 100644
--- a/src/pip/_internal/index/collector.py
+++ b/src/pip/_internal/index/collector.py
@@ -196,8 +196,7 @@ def __hash__(self) -> int:
 
 
 class ParseLinks(Protocol):
-    def __call__(self, page: "IndexContent") -> Iterable[Link]:
-        ...
+    def __call__(self, page: "IndexContent") -> Iterable[Link]: ...
 
 
 def with_cached_index_content(fn: ParseLinks) -> ParseLinks:
@@ -395,7 +394,6 @@ class CollectedSources(NamedTuple):
 
 
 class LinkCollector:
-
     """
     Responsible for collecting Link objects from all configured locations,
     making network requests as needed.
diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index ec9ebc36718..b5b9679f246 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -106,7 +106,6 @@ class LinkType(enum.Enum):
 
 
 class LinkEvaluator:
-
     """
     Responsible for evaluating links for a particular project.
     """
@@ -324,7 +323,6 @@ def filter_unallowed_hashes(
 
 
 class CandidatePreferences:
-
     """
     Encapsulates some of the preferences for filtering and sorting
     InstallationCandidate objects.
@@ -383,7 +381,6 @@ def iter_applicable(self) -> Iterable[InstallationCandidate]:
 
 
 class CandidateEvaluator:
-
     """
     Responsible for filtering and sorting candidates for installation based
     on what tags are valid.
diff --git a/src/pip/_internal/models/direct_url.py b/src/pip/_internal/models/direct_url.py
index 0af884bd8e3..1063952489a 100644
--- a/src/pip/_internal/models/direct_url.py
+++ b/src/pip/_internal/models/direct_url.py
@@ -1,4 +1,5 @@
 """ PEP 610 """
+
 import json
 import re
 import urllib.parse
diff --git a/src/pip/_internal/models/scheme.py b/src/pip/_internal/models/scheme.py
index f51190ac603..9d804a67371 100644
--- a/src/pip/_internal/models/scheme.py
+++ b/src/pip/_internal/models/scheme.py
@@ -5,7 +5,6 @@
 https://docs.python.org/3/install/index.html#alternate-installation.
 """
 
-
 SCHEME_KEYS = ["platlib", "purelib", "headers", "scripts", "data"]
 
 
diff --git a/src/pip/_internal/models/search_scope.py b/src/pip/_internal/models/search_scope.py
index fe61e8116b7..a96ddcb4096 100644
--- a/src/pip/_internal/models/search_scope.py
+++ b/src/pip/_internal/models/search_scope.py
@@ -15,7 +15,6 @@
 
 
 class SearchScope:
-
     """
     Encapsulates the locations that pip is configured to search.
     """
diff --git a/src/pip/_internal/models/target_python.py b/src/pip/_internal/models/target_python.py
index 67ea5da73a5..88925a9fd01 100644
--- a/src/pip/_internal/models/target_python.py
+++ b/src/pip/_internal/models/target_python.py
@@ -8,7 +8,6 @@
 
 
 class TargetPython:
-
     """
     Encapsulates the properties of a Python interpreter one is targeting
     for a package install, download, etc.
diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index a5dc12bdd63..36d4d2e785c 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -1,6 +1,7 @@
 """Represents a wheel file and provides access to the various parts of the
 name that have meaning.
 """
+
 import re
 from typing import Dict, Iterable, List
 
diff --git a/src/pip/_internal/network/auth.py b/src/pip/_internal/network/auth.py
index e23444ebefa..4705b55a7aa 100644
--- a/src/pip/_internal/network/auth.py
+++ b/src/pip/_internal/network/auth.py
@@ -3,6 +3,7 @@
 Contains interface (MultiDomainBasicAuth) and associated glue code for
 providing credentials in the context of network requests.
 """
+
 import logging
 import os
 import shutil
@@ -47,12 +48,12 @@ class KeyRingBaseProvider(ABC):
     has_keyring: bool
 
     @abstractmethod
-    def get_auth_info(self, url: str, username: Optional[str]) -> Optional[AuthInfo]:
-        ...
+    def get_auth_info(
+        self, url: str, username: Optional[str]
+    ) -> Optional[AuthInfo]: ...
 
     @abstractmethod
-    def save_auth_info(self, url: str, username: str, password: str) -> None:
-        ...
+    def save_auth_info(self, url: str, username: str, password: str) -> None: ...
 
 
 class KeyRingNullProvider(KeyRingBaseProvider):
diff --git a/src/pip/_internal/network/download.py b/src/pip/_internal/network/download.py
index d1d43541e6b..032fdd0314f 100644
--- a/src/pip/_internal/network/download.py
+++ b/src/pip/_internal/network/download.py
@@ -1,5 +1,6 @@
 """Download files with progress indicators.
 """
+
 import email.message
 import logging
 import mimetypes
diff --git a/src/pip/_internal/operations/install/editable_legacy.py b/src/pip/_internal/operations/install/editable_legacy.py
index bebe24e6d3a..9aaa699a645 100644
--- a/src/pip/_internal/operations/install/editable_legacy.py
+++ b/src/pip/_internal/operations/install/editable_legacy.py
@@ -1,5 +1,6 @@
 """Legacy editable installation process, i.e. `setup.py develop`.
 """
+
 import logging
 from typing import Optional, Sequence
 
diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
index 74581a84de6..1d8cb915a83 100644
--- a/src/pip/_internal/resolution/legacy/resolver.py
+++ b/src/pip/_internal/resolution/legacy/resolver.py
@@ -245,9 +245,9 @@ def _add_requirement_to_set(
             return [install_req], None
 
         try:
-            existing_req: Optional[
-                InstallRequirement
-            ] = requirement_set.get_requirement(install_req.name)
+            existing_req: Optional[InstallRequirement] = (
+                requirement_set.get_requirement(install_req.name)
+            )
         except KeyError:
             existing_req = None
 
diff --git a/src/pip/_internal/utils/deprecation.py b/src/pip/_internal/utils/deprecation.py
index 72bd6f25a55..0911147e784 100644
--- a/src/pip/_internal/utils/deprecation.py
+++ b/src/pip/_internal/utils/deprecation.py
@@ -87,9 +87,11 @@ def deprecated(
         (reason, f"{DEPRECATION_MSG_PREFIX}{{}}"),
         (
             gone_in,
-            "pip {} will enforce this behaviour change."
-            if not is_gone
-            else "Since pip {}, this is no longer supported.",
+            (
+                "pip {} will enforce this behaviour change."
+                if not is_gone
+                else "Since pip {}, this is no longer supported."
+            ),
         ),
         (
             replacement,
@@ -97,9 +99,11 @@ def deprecated(
         ),
         (
             feature_flag,
-            "You can use the flag --use-feature={} to test the upcoming behaviour."
-            if not is_gone
-            else None,
+            (
+                "You can use the flag --use-feature={} to test the upcoming behaviour."
+                if not is_gone
+                else None
+            ),
         ),
         (
             issue,
diff --git a/src/pip/_internal/utils/logging.py b/src/pip/_internal/utils/logging.py
index 95982dfb691..90df257821e 100644
--- a/src/pip/_internal/utils/logging.py
+++ b/src/pip/_internal/utils/logging.py
@@ -212,7 +212,6 @@ def filter(self, record: logging.LogRecord) -> bool:
 
 
 class ExcludeLoggerFilter(Filter):
-
     """
     A logging Filter that excludes records from a logger (or its children).
     """
diff --git a/src/pip/_internal/vcs/versioncontrol.py b/src/pip/_internal/vcs/versioncontrol.py
index 1e2be8d1acd..7eef8ec898e 100644
--- a/src/pip/_internal/vcs/versioncontrol.py
+++ b/src/pip/_internal/vcs/versioncontrol.py
@@ -115,7 +115,6 @@ def __init__(self, url: str):
 
 
 class RevOptions:
-
     """
     Encapsulates a VCS-specific revision to install, along with any VCS
     install options.
diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index 482ba735f07..de3b1259f7f 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -1,5 +1,6 @@
 """Basic CLI functionality checks.
 """
+
 import subprocess
 import sys
 from pathlib import Path
diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py
index 94a25eea219..a52b135c8b0 100644
--- a/tests/functional/test_completion.py
+++ b/tests/functional/test_completion.py
@@ -126,8 +126,7 @@ def __call__(
         cwd: Union[Path, str, None] = None,
         include_env: bool = True,
         expect_error: bool = True,
-    ) -> Tuple[TestPipResult, PipTestEnvironment]:
-        ...
+    ) -> Tuple[TestPipResult, PipTestEnvironment]: ...
 
 
 @pytest.fixture
diff --git a/tests/functional/test_configuration.py b/tests/functional/test_configuration.py
index b3de3f697b0..854fb3694b1 100644
--- a/tests/functional/test_configuration.py
+++ b/tests/functional/test_configuration.py
@@ -1,5 +1,6 @@
 """Tests for the config command
 """
+
 import re
 import textwrap
 
diff --git a/tests/functional/test_hash.py b/tests/functional/test_hash.py
index 0422f73ffa5..cf993b6feb7 100644
--- a/tests/functional/test_hash.py
+++ b/tests/functional/test_hash.py
@@ -1,4 +1,5 @@
 """Tests for the ``pip hash`` command"""
+
 from pathlib import Path
 
 from tests.lib import PipTestEnvironment
diff --git a/tests/functional/test_install_compat.py b/tests/functional/test_install_compat.py
index 6c809e75307..7ecacdb8e7a 100644
--- a/tests/functional/test_install_compat.py
+++ b/tests/functional/test_install_compat.py
@@ -2,6 +2,7 @@
 Tests for compatibility workarounds.
 
 """
+
 import os
 from pathlib import Path
 
diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index 3cdc9fec147..1db749b145c 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -29,8 +29,7 @@ def args(self) -> Any:
 
 
 class ArgRecordingSdistMaker(Protocol):
-    def __call__(self, name: str, **kwargs: Any) -> ArgRecordingSdist:
-        ...
+    def __call__(self, name: str, **kwargs: Any) -> ArgRecordingSdist: ...
 
 
 @pytest.fixture()
diff --git a/tests/functional/test_install_user.py b/tests/functional/test_install_user.py
index 3cae4a467e9..604072d765f 100644
--- a/tests/functional/test_install_user.py
+++ b/tests/functional/test_install_user.py
@@ -1,6 +1,7 @@
 """
 tests specific to "pip install --user"
 """
+
 import os
 import textwrap
 from os.path import curdir, isdir, isfile
diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py
index 0207d61aac6..774311a38e8 100644
--- a/tests/functional/test_new_resolver.py
+++ b/tests/functional/test_new_resolver.py
@@ -930,8 +930,7 @@ def __call__(
             version: str,
             requires: List[str],
             extras: Dict[str, List[str]],
-        ) -> str:
-            ...
+        ) -> str: ...
 
 
 def _local_with_setup(
diff --git a/tests/functional/test_no_color.py b/tests/functional/test_no_color.py
index 4094bdd167a..99200c6e4d6 100644
--- a/tests/functional/test_no_color.py
+++ b/tests/functional/test_no_color.py
@@ -1,6 +1,7 @@
 """
 Test specific for the --no-color option
 """
+
 import os
 import shutil
 import subprocess
diff --git a/tests/functional/test_uninstall_user.py b/tests/functional/test_uninstall_user.py
index 0bf2e6d4180..0129d2e46a1 100644
--- a/tests/functional/test_uninstall_user.py
+++ b/tests/functional/test_uninstall_user.py
@@ -1,6 +1,7 @@
 """
 tests specific to uninstalling --user installs
 """
+
 from os.path import isdir, isfile, normcase
 
 import pytest
diff --git a/tests/functional/test_vcs_git.py b/tests/functional/test_vcs_git.py
index da4d9583f0f..1ec09c73e47 100644
--- a/tests/functional/test_vcs_git.py
+++ b/tests/functional/test_vcs_git.py
@@ -1,6 +1,7 @@
 """
 Contains functional tests of the Git class.
 """
+
 import logging
 import os
 import pathlib
diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py
index b1183fc830b..1bddd40dc41 100644
--- a/tests/functional/test_wheel.py
+++ b/tests/functional/test_wheel.py
@@ -1,4 +1,5 @@
 """'pip wheel' tests"""
+
 import os
 import re
 import sys
diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py
index 5488bea4b37..bd31b59ff2f 100644
--- a/tests/lib/__init__.py
+++ b/tests/lib/__init__.py
@@ -1371,8 +1371,7 @@ def __call__(
         tmpdir: pathlib.Path,
         virtualenv: Optional[VirtualEnvironment] = None,
         environ: Optional[Dict[AnyStr, AnyStr]] = None,
-    ) -> PipTestEnvironment:
-        ...
+    ) -> PipTestEnvironment: ...
 
 
 CertFactory = Callable[[], str]
diff --git a/tests/lib/filesystem.py b/tests/lib/filesystem.py
index 5f8fe519d5d..4cf003b3c0b 100644
--- a/tests/lib/filesystem.py
+++ b/tests/lib/filesystem.py
@@ -1,5 +1,6 @@
 """Helpers for filesystem-dependent tests.
 """
+
 import os
 from functools import partial
 from itertools import chain
diff --git a/tests/lib/test_lib.py b/tests/lib/test_lib.py
index c01c1beb883..09a1cc738f9 100644
--- a/tests/lib/test_lib.py
+++ b/tests/lib/test_lib.py
@@ -1,4 +1,5 @@
 """Test the test support."""
+
 import filecmp
 import pathlib
 import re
diff --git a/tests/lib/test_wheel.py b/tests/lib/test_wheel.py
index ffe96cc4335..a171484a549 100644
--- a/tests/lib/test_wheel.py
+++ b/tests/lib/test_wheel.py
@@ -1,5 +1,6 @@
 """Tests for wheel helper.
 """
+
 import csv
 from email import message_from_string
 from email.message import Message
diff --git a/tests/lib/wheel.py b/tests/lib/wheel.py
index a4efe53b404..e63f44e1cad 100644
--- a/tests/lib/wheel.py
+++ b/tests/lib/wheel.py
@@ -1,5 +1,6 @@
 """Helper for building wheels as would be in test cases.
 """
+
 import csv
 import itertools
 from base64 import urlsafe_b64encode
diff --git a/tests/unit/test_locations.py b/tests/unit/test_locations.py
index bd233b22aab..884e0dd51e2 100644
--- a/tests/unit/test_locations.py
+++ b/tests/unit/test_locations.py
@@ -2,6 +2,7 @@
 locations.py tests
 
 """
+
 import getpass
 import os
 import shutil
diff --git a/tests/unit/test_options.py b/tests/unit/test_options.py
index 22ff7f721d7..53074fe047c 100644
--- a/tests/unit/test_options.py
+++ b/tests/unit/test_options.py
@@ -195,7 +195,6 @@ def test_cache_dir__PIP_NO_CACHE_DIR_invalid__with_no_cache_dir(
 
 
 class TestUsePEP517Options:
-
     """
     Test options related to using --use-pep517.
     """
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 19ade8a7fa4..ce751afe258 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -70,9 +70,11 @@ def parse_reqfile(
         yield install_req_from_parsed_requirement(
             parsed_req,
             isolated=isolated,
-            config_settings=parsed_req.options.get("config_settings")
-            if parsed_req.options
-            else None,
+            config_settings=(
+                parsed_req.options.get("config_settings")
+                if parsed_req.options
+                else None
+            ),
         )
 
 
@@ -196,8 +198,7 @@ def __call__(
         options: Optional[Values] = None,
         session: Optional[PipSession] = None,
         constraint: bool = False,
-    ) -> List[InstallRequirement]:
-        ...
+    ) -> List[InstallRequirement]: ...
 
 
 @pytest.fixture
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 1352b766481..102b0340a14 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -2,6 +2,7 @@
 util tests
 
 """
+
 import codecs
 import os
 import shutil
diff --git a/tests/unit/test_utils_subprocess.py b/tests/unit/test_utils_subprocess.py
index 2dbd5d77e4b..5f0c16595a7 100644
--- a/tests/unit/test_utils_subprocess.py
+++ b/tests/unit/test_utils_subprocess.py
@@ -89,7 +89,6 @@ def finish(self, final_status: str) -> None:
 
 
 class TestCallSubprocess:
-
     """
     Test call_subprocess().
     """
diff --git a/tests/unit/test_wheel.py b/tests/unit/test_wheel.py
index 33329fbce05..ed6f5821133 100644
--- a/tests/unit/test_wheel.py
+++ b/tests/unit/test_wheel.py
@@ -1,4 +1,5 @@
 """Tests for wheel binary packages and .dist-info."""
+
 import csv
 import logging
 import os
diff --git a/tools/update-rtd-redirects.py b/tools/update-rtd-redirects.py
index abb6473e87f..2aa90e467e3 100644
--- a/tools/update-rtd-redirects.py
+++ b/tools/update-rtd-redirects.py
@@ -2,6 +2,7 @@
 
 Relevant API reference: https://docs.readthedocs.io/en/stable/api/v3.html#redirects
 """
+
 import operator
 import os
 import sys

From 3bd8a7ee0ae53c05f11fd00b3900e17b891c0907 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 24 Mar 2024 13:15:08 -0400
Subject: [PATCH 313/992] NEWS ENTRY

---
 news/12594.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12594.trivial.rst

diff --git a/news/12594.trivial.rst b/news/12594.trivial.rst
new file mode 100644
index 00000000000..3d4a67b887d
--- /dev/null
+++ b/news/12594.trivial.rst
@@ -0,0 +1 @@
+Update Black pre-commit to 24.4.0

From 800c1245bd7d5b3ad3fd52fd84c17a230bfa28e4 Mon Sep 17 00:00:00 2001
From: Sumana Harihareswara 
Date: Mon, 15 Apr 2024 15:08:44 -0400
Subject: [PATCH 314/992] Fix link for open UX issues (#12624)

---
 docs/html/ux-research-design/contribute.md             |  2 +-
 docs/html/ux-research-design/guidance.md               |  2 +-
 docs/html/ux-research-design/research-results/index.md | 10 +++++-----
 news/5a771372-fb26-11ee-8cc4-f72623cb6607.trivial.rst  |  0
 4 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 news/5a771372-fb26-11ee-8cc4-f72623cb6607.trivial.rst

diff --git a/docs/html/ux-research-design/contribute.md b/docs/html/ux-research-design/contribute.md
index 60b982c856e..48aab68e636 100644
--- a/docs/html/ux-research-design/contribute.md
+++ b/docs/html/ux-research-design/contribute.md
@@ -20,5 +20,5 @@ You can help the team by testing new features as they are released to the commun
 
 If you believe that you have found a user experience bug in pip, or you have ideas for how pip could be made better for all users, please file an issue on the [pip issue tracker](https://github.com/pypa/pip/issues/new).
 
-You can also help improve pip’s user experience by [working on UX issues](https://github.com/pypa/pip/issues?q=is%3Aissue+is%3Aopen+label%3A%22K%3A+UX%22). Issues that are ideal for new contributors are marked with “[good first issue](https://github.com/pypa/pip/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)”. Explore the
+You can also help improve pip’s user experience by [working on UX issues](https://github.com/pypa/pip/issues?q=is%3Aissue+label%3AUX+is%3Aopen). Issues that are ideal for new contributors are marked with “[good first issue](https://github.com/pypa/pip/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)”. Explore the
 [UX Guidance](guidance) if you have questions.
diff --git a/docs/html/ux-research-design/guidance.md b/docs/html/ux-research-design/guidance.md
index 188930a9e62..035df4c734b 100644
--- a/docs/html/ux-research-design/guidance.md
+++ b/docs/html/ux-research-design/guidance.md
@@ -383,7 +383,7 @@ An in-depth write up on how the pip personas were created, and how they can be a
 
 In any UX project, it is important to prototype and test interfaces with real users. This provides the team with a feedback loop, and ensures that the solution shipped to the end user meets their needs.
 
-Prototyping CLIs can be a challenge. See [Creating rapid CLI prototypes with cli-output](https://www.ei8fdb.org/thoughts/2020/10/prototyping-command-line-interfaces-with-cli-output/) for recommendations.
+Prototyping CLIs can be a challenge. See [Creating rapid CLI prototypes with cli-output](https://www.ei8fdb.org/prototyping-command-line-interfaces-with-cli-output/) for recommendations.
 
 #### Copywriting Style Guides
 
diff --git a/docs/html/ux-research-design/research-results/index.md b/docs/html/ux-research-design/research-results/index.md
index 588aef397a1..3cbd73570dd 100644
--- a/docs/html/ux-research-design/research-results/index.md
+++ b/docs/html/ux-research-design/research-results/index.md
@@ -192,12 +192,12 @@ improving-pips-documentation
 ## Read More
 
 - [Pip team midyear report (blog, July 2020)](https://pyfound.blogspot.com/2020/07/pip-team-midyear-report.html)
-- [Creating rapid CLI prototypes with cli-output (blog, Oct 2020)](https://www.ei8fdb.org/thoughts/2020/10/prototyping-command-line-interfaces-with-cli-output/)
+- [Creating rapid CLI prototypes with cli-output (blog, Oct 2020)](https://www.ei8fdb.org/prototyping-command-line-interfaces-with-cli-output/)
 - [Changes are coming to pip (video)](https://www.youtube.com/watch?v=B4GQCBBsuNU)
-- [How should pip handle dependency conflicts when updating already installed packages? (blog, July 2020)](https://www.ei8fdb.org/thoughts/2020/07/how-should-pip-handle-conflicts-when-updating-already-installed-packages/)
-- [Test pip's alpha resolver and help us document dependency conflicts (blog, May 2020)](https://www.ei8fdb.org/thoughts/2020/05/test-pips-alpha-resolver-and-help-us-document-dependency-conflicts/)
-- [How do you deal with conflicting dependencies caused by pip installs? (blog, April 2020)](https://www.ei8fdb.org/thoughts/2020/04/how-do-you-deal-with-conflicting-dependencies-caused-by-pip-installs/)
-- [pip UX studies: response data (blog, March 2020)](https://www.ei8fdb.org/thoughts/2020/03/pip-ux-studies-response-data/)
+- [How should pip handle dependency conflicts when updating already installed packages? (blog, July 2020)](https://www.ei8fdb.org/how-should-pip-handle-conflicts-when-updating-already-installed-packages/)
+- [Test pip's alpha resolver and help us document dependency conflicts (blog, May 2020)](https://www.ei8fdb.org/test-pips-alpha-resolver-and-help-us-document-dependency-conflicts/)
+- [How do you deal with conflicting dependencies caused by pip installs? (blog, April 2020)](https://www.ei8fdb.org/how-do-you-deal-with-conflicting-dependencies-caused-by-pip-installs/)
+- [pip UX studies: response data (blog, March 2020)](https://www.ei8fdb.org/pip-ux-studies-response-data/)
 
 Other PyPA UX work:
 
diff --git a/news/5a771372-fb26-11ee-8cc4-f72623cb6607.trivial.rst b/news/5a771372-fb26-11ee-8cc4-f72623cb6607.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d

From 96424886eb3608fd1844a604bd4bedf04fde42c1 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 15 Apr 2024 20:30:02 -0400
Subject: [PATCH 315/992] Gracefully skip VCS detection on broken PATH

---
 news/12567.bugfix.rst                   | 1 +
 src/pip/_internal/vcs/versioncontrol.py | 2 ++
 tests/unit/test_vcs.py                  | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 news/12567.bugfix.rst

diff --git a/news/12567.bugfix.rst b/news/12567.bugfix.rst
new file mode 100644
index 00000000000..55c6a93d6b9
--- /dev/null
+++ b/news/12567.bugfix.rst
@@ -0,0 +1 @@
+Gracefully skip VCS detection in pip freeze when PATH points to a non-directory path.
diff --git a/src/pip/_internal/vcs/versioncontrol.py b/src/pip/_internal/vcs/versioncontrol.py
index 7eef8ec898e..c0eb12ff428 100644
--- a/src/pip/_internal/vcs/versioncontrol.py
+++ b/src/pip/_internal/vcs/versioncontrol.py
@@ -652,6 +652,8 @@ def run_command(
                 log_failed_cmd=log_failed_cmd,
                 stdout_only=stdout_only,
             )
+        except NotADirectoryError:
+            raise BadCommand(f"Cannot find command {cls.name!r} - invalid PATH")
         except FileNotFoundError:
             # errno.ENOENT = no such file or directory
             # In other words, the VCS executable isn't available
diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py
index a52a6217e77..9fe63cc62e6 100644
--- a/tests/unit/test_vcs.py
+++ b/tests/unit/test_vcs.py
@@ -444,8 +444,9 @@ def test_version_control__get_url_rev_and_auth__no_revision(url: str) -> None:
     [
         (FileNotFoundError, r"Cannot find command '{name}'"),
         (PermissionError, r"No permission to execute '{name}'"),
+        (NotADirectoryError, "Cannot find command '{name}' - invalid PATH"),
     ],
-    ids=["FileNotFoundError", "PermissionError"],
+    ids=["FileNotFoundError", "PermissionError", "NotADirectoryError"],
 )
 def test_version_control__run_command__fails(
     vcs_cls: Type[VersionControl], exc_cls: Type[Exception], msg_re: str

From 516007147dbe2be3f6d391272043300dc627a0ce Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 13 Mar 2024 11:27:03 -0400
Subject: [PATCH 316/992] Add codespell pre-commit hook

---
 .pre-commit-config.yaml                               | 7 +++++++
 news/287f037c-108f-48dd-80a0-489921a6b2f3.trivial.rst | 1 +
 tools/codespell-ignore.txt                            | 0
 3 files changed, 8 insertions(+)
 create mode 100644 news/287f037c-108f-48dd-80a0-489921a6b2f3.trivial.rst
 create mode 100644 tools/codespell-ignore.txt

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b932b146f18..939ddead334 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -54,6 +54,13 @@ repos:
     types: [file]
     exclude: NEWS.rst  # The errors flagged in NEWS.rst are old.
 
+- repo: https://github.com/codespell-project/codespell
+  rev: v2.2.6
+  hooks:
+    - id: codespell
+      exclude: AUTHORS.txt|tests/data
+      args: ["--ignore-words", tools/codespell-ignore.txt]
+
 - repo: local
   hooks:
   - id: news-fragment-filenames
diff --git a/news/287f037c-108f-48dd-80a0-489921a6b2f3.trivial.rst b/news/287f037c-108f-48dd-80a0-489921a6b2f3.trivial.rst
new file mode 100644
index 00000000000..446d4f9fe9a
--- /dev/null
+++ b/news/287f037c-108f-48dd-80a0-489921a6b2f3.trivial.rst
@@ -0,0 +1 @@
+Add codespell pre-commit hook to catch common misspellings.
diff --git a/tools/codespell-ignore.txt b/tools/codespell-ignore.txt
new file mode 100644
index 00000000000..e69de29bb2d

From 75b5cd38857a1a9ec202a7607a9391c345a39423 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 15 Apr 2024 21:28:51 -0400
Subject: [PATCH 317/992] Address current codespell errors

---
 NEWS.rst                                              | 2 +-
 src/pip/_internal/cache.py                            | 2 +-
 src/pip/_internal/resolution/resolvelib/candidates.py | 2 +-
 src/pip/_internal/utils/_jaraco_text.py               | 2 +-
 tests/conftest.py                                     | 2 +-
 tests/functional/test_install.py                      | 4 ++--
 tests/functional/test_new_resolver_user.py            | 2 +-
 tests/unit/test_collector.py                          | 2 +-
 tools/codespell-ignore.txt                            | 8 ++++++++
 9 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/NEWS.rst b/NEWS.rst
index 6b1dff81e80..ce6d8e6dd3d 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -304,7 +304,7 @@ Improved Documentation
 
 - Cross-reference the ``--python`` flag from the ``--prefix`` flag,
   and mention limitations of ``--prefix`` regarding script installation. (`#11775 `_)
-- Add SECURITY.md to make the policy offical. (`#11809 `_)
+- Add SECURITY.md to make the policy official. (`#11809 `_)
 - Add username to Git over SSH example. (`#11838 `_)
 - Quote extras in the pip install docs to guard shells with default glob
   qualifiers, like zsh. (`#11842 `_)
diff --git a/src/pip/_internal/cache.py b/src/pip/_internal/cache.py
index f45ac23e95a..6b4512672db 100644
--- a/src/pip/_internal/cache.py
+++ b/src/pip/_internal/cache.py
@@ -44,7 +44,7 @@ def _get_cache_path_parts(self, link: Link) -> List[str]:
         """Get parts of part that must be os.path.joined with cache_dir"""
 
         # We want to generate an url to use as our cache key, we don't want to
-        # just re-use the URL because it might have other items in the fragment
+        # just reuse the URL because it might have other items in the fragment
         # and we don't care about those.
         key_parts = {"url": link.url_without_fragment}
         if link.hash_name is not None and link.hash is not None:
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 4125cda2b7c..e0fa0bc6986 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -520,7 +520,7 @@ def _warn_invalid_extras(
     def _calculate_valid_requested_extras(self) -> FrozenSet[str]:
         """Get a list of valid extras requested by this candidate.
 
-        The user (or upstream dependant) may have specified extras that the
+        The user (or upstream dependent) may have specified extras that the
         candidate doesn't support. Any unsupported extras are dropped, and each
         cause a warning to be logged here.
         """
diff --git a/src/pip/_internal/utils/_jaraco_text.py b/src/pip/_internal/utils/_jaraco_text.py
index e06947c051a..6ccf53b7ac5 100644
--- a/src/pip/_internal/utils/_jaraco_text.py
+++ b/src/pip/_internal/utils/_jaraco_text.py
@@ -88,7 +88,7 @@ def join_continuation(lines):
     ['foobarbaz']
 
     Not sure why, but...
-    The character preceeding the backslash is also elided.
+    The character preceding the backslash is also elided.
 
     >>> list(join_continuation(['goo\\', 'dly']))
     ['godly']
diff --git a/tests/conftest.py b/tests/conftest.py
index 4ede5c70fc1..35101cef2c3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -495,7 +495,7 @@ def virtualenv_template(
         dist_info, venv.site / dist_info.name, dirs_exist_ok=True, symlinks=True
     )
     # Create placeholder ``easy-install.pth``, as several tests depend on its
-    # existance.  TODO: Ensure ``tests.lib.TestPipResult.files_updated`` correctly
+    # existence.  TODO: Ensure ``tests.lib.TestPipResult.files_updated`` correctly
     # detects changed files.
     venv.site.joinpath("easy-install.pth").touch()
 
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index c013f2eaf72..b65212f929c 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -1731,7 +1731,7 @@ def test_install_builds_wheels(script: PipTestEnvironment, data: TestData) -> No
     assert "Building wheel for wheelb" in str(res), str(res)
     assert "Failed to build wheelbroken" in str(res), str(res)
     # Wheels are built for local directories, but not cached.
-    assert "Building wheel for requir" in str(res), str(res)
+    assert "Building wheel for require" in str(res), str(res)
     # into the cache
     assert wheels != [], str(res)
     assert wheels == [
@@ -1754,7 +1754,7 @@ def test_install_no_binary_builds_wheels(
     )
     # Wheels are built for all requirements
     assert "Building wheel for wheelb" in str(res), str(res)
-    assert "Building wheel for requir" in str(res), str(res)
+    assert "Building wheel for require" in str(res), str(res)
     assert "Building wheel for upper" in str(res), str(res)
     # Wheelbroken failed to build
     assert "Failed to build wheelbroken" in str(res), str(res)
diff --git a/tests/functional/test_new_resolver_user.py b/tests/functional/test_new_resolver_user.py
index 4cd06311348..1660924f28c 100644
--- a/tests/functional/test_new_resolver_user.py
+++ b/tests/functional/test_new_resolver_user.py
@@ -27,7 +27,7 @@ def test_new_resolver_install_user_satisfied_by_global_site(
     script: PipTestEnvironment,
 ) -> None:
     """
-    An install a matching version to user site should re-use a global site
+    An install a matching version to user site should reuse a global site
     installation if it satisfies.
     """
     create_basic_wheel_for_package(script, "base", "1.0.0")
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index 90064776ef3..7e178a20191 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -911,7 +911,7 @@ def test_collect_sources__non_existing_path() -> None:
             index_url="ignored-by-no-index",
             extra_index_urls=[],
             no_index=True,
-            find_links=[os.path.join("this", "doesnt", "exist")],
+            find_links=[os.path.join("this", "does", "not", "exist")],
         ),
     )
     sources = collector.collect_sources(
diff --git a/tools/codespell-ignore.txt b/tools/codespell-ignore.txt
index e69de29bb2d..95d223b73bd 100644
--- a/tools/codespell-ignore.txt
+++ b/tools/codespell-ignore.txt
@@ -0,0 +1,8 @@
+# An actual English word
+lousily
+# A contributor first name
+wil
+# Codebase variable or class names
+uptodate
+afile
+failer

From 38fd2bb224a61812aceeb56c201a30c82dc0f338 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 15 Apr 2024 21:55:43 -0400
Subject: [PATCH 318/992] Address even more codespell errors (after merging in
 main)

---
 .../research-results/improving-pips-documentation.md          | 2 +-
 docs/html/ux-research-design/research-results/personas.md     | 2 +-
 .../research-results/pip-upgrade-conflict.md                  | 2 +-
 .../research-results/prioritizing-features.md                 | 4 ++--
 .../ux-research-design/research-results/users-and-security.md | 2 +-
 tests/functional/test_cli.py                                  | 2 +-
 tools/codespell-ignore.txt                                    | 1 +
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/html/ux-research-design/research-results/improving-pips-documentation.md b/docs/html/ux-research-design/research-results/improving-pips-documentation.md
index bec2120cda6..765a8f1069a 100644
--- a/docs/html/ux-research-design/research-results/improving-pips-documentation.md
+++ b/docs/html/ux-research-design/research-results/improving-pips-documentation.md
@@ -36,7 +36,7 @@ We also:
 1. Asked for volunteers to participate in a diary study, documenting their experience solving pip problems. Unfortunately this was not completed due to lack of interest from the community.
 2. Asked for user feedback on the pip documentation site:
    ![screenshot of user feedback mechanism on pip docs](https://i.imgur.com/WJVjl8N.png)
-   Unfortunatly, we did not gather any useful feedback via this effort
+   Unfortunately, we did not gather any useful feedback via this effort
 3. [Installed analytics on the pip docs](https://github.com/pypa/pip/pull/9146). We are waiting for this to be merged and start providing useful data.
 
 ## Results
diff --git a/docs/html/ux-research-design/research-results/personas.md b/docs/html/ux-research-design/research-results/personas.md
index 06b84a8d4ef..e4f1a3df44b 100644
--- a/docs/html/ux-research-design/research-results/personas.md
+++ b/docs/html/ux-research-design/research-results/personas.md
@@ -180,7 +180,7 @@ Making software was as defined earlier as "are you working on something reusable
 
 > "I have written software, sometimes for business and personal reasons. At one point I worked on a django website project, that was being used by 1000s of people. I don't think any of my live projects are based.
 
-> "Most of it is for sysadmin, automation. I lke to use python instead of shell scripting. I manage a server with wordpress sites. I wrote a script to update these sites, mailman list and sql DB management, and for different utilities." **- Participant 240313542**
+> "Most of it is for sysadmin, automation. I [like] to use python instead of shell scripting. I manage a server with wordpress sites. I wrote a script to update these sites, mailman list and sql DB management, and for different utilities." **- Participant 240313542**
 
 > "I use Python for creating things - like outputs for data scientist, software engineer. I make software to look at patterns, and analyse stuff. I think I'm a maker because someone else is using - they are colleagues. Usually its non-technical colleagues. I produce outputs - make data understandable. They use the results, or a package it behind a flask app. Or analyse graphs." **- Participant 240426799**
 
diff --git a/docs/html/ux-research-design/research-results/pip-upgrade-conflict.md b/docs/html/ux-research-design/research-results/pip-upgrade-conflict.md
index 6f35a550ca0..9261a318518 100644
--- a/docs/html/ux-research-design/research-results/pip-upgrade-conflict.md
+++ b/docs/html/ux-research-design/research-results/pip-upgrade-conflict.md
@@ -64,5 +64,5 @@ From the 407 responses that answered "why" a particular solution was best, the f
 Based on the results of this research, the pip UX team has made the following recommendations to the development team:
 
 - While the current behaviour exists, [warn the user when conflicts are introduced](https://github.com/pypa/pip/issues/7744#issuecomment-717573440)
-- [Change the current behaviour](https://github.com/pypa/pip/issues/9094), so that pip takes into account packages that are already installed when upgrading other packages. Show the user a warning when pip anticipates a depdenency conflict (as per option 4)
+- [Change the current behaviour](https://github.com/pypa/pip/issues/9094), so that pip takes into account packages that are already installed when upgrading other packages. Show the user a warning when pip anticipates a dependency conflict (as per option 4)
 - Explore [the possibility of adding additional flags to the upgrade command](https://github.com/pypa/pip/issues/9095), to give users more control
diff --git a/docs/html/ux-research-design/research-results/prioritizing-features.md b/docs/html/ux-research-design/research-results/prioritizing-features.md
index 12e6b8b244e..3642042f333 100644
--- a/docs/html/ux-research-design/research-results/prioritizing-features.md
+++ b/docs/html/ux-research-design/research-results/prioritizing-features.md
@@ -85,9 +85,9 @@ Results varied by the amount of Python experience the user had.
 
 ![Screenshot of Warn about broken dependencies](https://i.imgur.com/uNv2tnG.png)
 
-#### Upgrade packages to the lastest version
+#### Upgrade packages to the latest version
 
-![Screenshot of Upgrade packages to the lastest version](https://i.imgur.com/pQgCLBO.png)
+![Screenshot of Upgrade packages to the latest version](https://i.imgur.com/pQgCLBO.png)
 
 #### Install packages from an alternative package index, or indexes
 
diff --git a/docs/html/ux-research-design/research-results/users-and-security.md b/docs/html/ux-research-design/research-results/users-and-security.md
index d9b79a057ff..fbc8f492f3c 100644
--- a/docs/html/ux-research-design/research-results/users-and-security.md
+++ b/docs/html/ux-research-design/research-results/users-and-security.md
@@ -62,7 +62,7 @@ Participants who spent a lot of their time writing Python code - either for comm
 
 They thought about where the software would be used, who would use it, and possible attack surfaces.
 
-> "On the basic point, I have to think about attack surfaces. If I am writing the thing (software), I have to give a crap. I have to answer the emails! In the code I push to[ pypi.org](http://pypi.org/) I think about it doubley. What could people do with this code? Whether I do a good job, that's different! I am aware of it when publishing it or making it publically available. Whether I do a good job, that's different! I am aware of it when publishing it or making it publically available. I rely on community resources - Python security related, I follow security people blogs, Twitter. I use Hypothesis for fuzz-testing. I also rely on having security policies in place and a reporting mechanism. I steer clear of crypto, I rely on other peoples. There's a certain amount of knowledge in the Python community, I am actively involved in it. If something happens, I will hear about it. I use Twitter, if something happens, in the morning it can take me awhile to figure out what's happened. I have a lot of trust in the ecosystem to be self healing. As long as you don't stray too far-off the reservation (into using odd or uncommon or new packages), it's a better sense of security." **- Participant (data scientist turned Python developer)**
+> "On the basic point, I have to think about attack surfaces. If I am writing the thing (software), I have to give a crap. I have to answer the emails! In the code I push to[ pypi.org](http://pypi.org/) I think about it doubley. What could people do with this code? Whether I do a good job, that's different! I am aware of it when publishing it or making it [publicly] available. Whether I do a good job, that's different! I am aware of it when publishing it or making it [publicly] available. I rely on community resources - Python security related, I follow security people blogs, Twitter. I use Hypothesis for fuzz-testing. I also rely on having security policies in place and a reporting mechanism. I steer clear of crypto, I rely on other peoples. There's a certain amount of knowledge in the Python community, I am actively involved in it. If something happens, I will hear about it. I use Twitter, if something happens, in the morning it can take me awhile to figure out what's happened. I have a lot of trust in the ecosystem to be self healing. As long as you don't stray too far-off the reservation (into using odd or uncommon or new packages), it's a better sense of security." **- Participant (data scientist turned Python developer)**
 
 > Yes, because I'm liable for that. If the problem is my code, and I deliver something and they get attacked. I'm screwed. **- Participant (professional Python developer and trainer)**
 
diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index de3b1259f7f..3c166152111 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -69,7 +69,7 @@ def test_no_network_imports(command: str, tmp_path: Path) -> None:
     This helps to reduce the startup time of these commands.
 
     Note: This won't catch lazy network imports, but it'll catch top-level
-    network imports which were accidently added (which is the most likely way
+    network imports which were accidentally added (which is the most likely way
     to regress anyway).
     """
     file = tmp_path / f"imported_modules_for_{command}.txt"
diff --git a/tools/codespell-ignore.txt b/tools/codespell-ignore.txt
index 95d223b73bd..288f597353b 100644
--- a/tools/codespell-ignore.txt
+++ b/tools/codespell-ignore.txt
@@ -1,5 +1,6 @@
 # An actual English word
 lousily
+followings
 # A contributor first name
 wil
 # Codebase variable or class names

From de278b1b505e6041fb743c2f233bca4999669e6d Mon Sep 17 00:00:00 2001
From: Xianpeng Shen 
Date: Tue, 16 Apr 2024 15:43:26 +0800
Subject: [PATCH 319/992] add render: shell to bug-report.yml

---
 .github/ISSUE_TEMPLATE/bug-report.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index e28e5408208..200c7e60856 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -66,6 +66,7 @@ body:
         the line containing the command with `$ `. Please also ensure that
         the "How to reproduce" section contains matching instructions for
         reproducing this.
+      render: shell
 
   - type: checkboxes
     attributes:

From a4155610c608c20afdea04a9a68116ff37fd13e5 Mon Sep 17 00:00:00 2001
From: Xianpeng Shen 
Date: Tue, 16 Apr 2024 16:17:09 +0800
Subject: [PATCH 320/992] add news file

---
 news/12630.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12630.trivial.rst

diff --git a/news/12630.trivial.rst b/news/12630.trivial.rst
new file mode 100644
index 00000000000..8beb79ec366
--- /dev/null
+++ b/news/12630.trivial.rst
@@ -0,0 +1 @@
+Add ``render: shell`` to the bug report template to format output as code

From 4d09e3c004857b3ba766cb93cdea8e1fc3c3c677 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 17 Apr 2024 21:49:38 -0400
Subject: [PATCH 321/992] Use dataclasses more liberally throughout the
 codebase (#12571)

---
 ...e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst |  5 +++
 src/pip/_internal/index/collector.py          | 36 +++++++----------
 src/pip/_internal/index/package_finder.py     | 14 ++-----
 src/pip/_internal/locations/_sysconfig.py     |  5 ++-
 src/pip/_internal/models/candidate.py         | 27 ++++++-------
 src/pip/_internal/models/direct_url.py        | 40 +++++++------------
 src/pip/_internal/models/link.py              | 19 +++++++--
 src/pip/_internal/models/scheme.py            | 21 ++++------
 src/pip/_internal/models/search_scope.py      | 16 +++-----
 src/pip/_internal/models/selection_prefs.py   |  2 +
 src/pip/_internal/operations/prepare.py       | 14 ++++---
 src/pip/_internal/req/__init__.py             |  8 ++--
 src/pip/_internal/req/constructors.py         | 17 +++-----
 .../_internal/resolution/resolvelib/base.py   | 11 +++--
 src/pip/_internal/utils/misc.py               |  7 ++--
 src/pip/_internal/utils/models.py             | 39 ------------------
 src/pip/_internal/vcs/git.py                  |  3 +-
 src/pip/_internal/vcs/versioncontrol.py       | 32 +++++----------
 tests/unit/test_models.py                     |  8 ----
 19 files changed, 123 insertions(+), 201 deletions(-)
 create mode 100644 news/f14947e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst
 delete mode 100644 src/pip/_internal/utils/models.py

diff --git a/news/f14947e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst b/news/f14947e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst
new file mode 100644
index 00000000000..001cec34342
--- /dev/null
+++ b/news/f14947e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst
@@ -0,0 +1,5 @@
+Convert numerous internal classes to dataclasses for readability and stricter
+enforcement of immutability across the codebase. A conservative approach was
+taken in selecting which classes to convert. Classes which did not convert
+cleanly into a dataclass or were "too complex" (e.g. maintains interconnected
+state) were left alone.
diff --git a/src/pip/_internal/index/collector.py b/src/pip/_internal/index/collector.py
index a22e3b91fcb..5f8fdee3d46 100644
--- a/src/pip/_internal/index/collector.py
+++ b/src/pip/_internal/index/collector.py
@@ -11,6 +11,7 @@
 import os
 import urllib.parse
 import urllib.request
+from dataclasses import dataclass
 from html.parser import HTMLParser
 from optparse import Values
 from typing import (
@@ -248,29 +249,22 @@ def parse_links(page: "IndexContent") -> Iterable[Link]:
         yield link
 
 
+@dataclass(frozen=True)
 class IndexContent:
-    """Represents one response (or page), along with its URL"""
+    """Represents one response (or page), along with its URL.
 
-    def __init__(
-        self,
-        content: bytes,
-        content_type: str,
-        encoding: Optional[str],
-        url: str,
-        cache_link_parsing: bool = True,
-    ) -> None:
-        """
-        :param encoding: the encoding to decode the given content.
-        :param url: the URL from which the HTML was downloaded.
-        :param cache_link_parsing: whether links parsed from this page's url
-                                   should be cached. PyPI index urls should
-                                   have this set to False, for example.
-        """
-        self.content = content
-        self.content_type = content_type
-        self.encoding = encoding
-        self.url = url
-        self.cache_link_parsing = cache_link_parsing
+    :param encoding: the encoding to decode the given content.
+    :param url: the URL from which the HTML was downloaded.
+    :param cache_link_parsing: whether links parsed from this page's url
+                               should be cached. PyPI index urls should
+                               have this set to False, for example.
+    """
+
+    content: bytes
+    content_type: str
+    encoding: Optional[str]
+    url: str
+    cache_link_parsing: bool = True
 
     def __str__(self) -> str:
         return redact_auth_from_url(self.url)
diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index b5b9679f246..98ee6315567 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -5,6 +5,7 @@
 import itertools
 import logging
 import re
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, FrozenSet, Iterable, List, Optional, Set, Tuple, Union
 
 from pip._vendor.packaging import specifiers
@@ -322,22 +323,15 @@ def filter_unallowed_hashes(
     return filtered
 
 
+@dataclass
 class CandidatePreferences:
     """
     Encapsulates some of the preferences for filtering and sorting
     InstallationCandidate objects.
     """
 
-    def __init__(
-        self,
-        prefer_binary: bool = False,
-        allow_all_prereleases: bool = False,
-    ) -> None:
-        """
-        :param allow_all_prereleases: Whether to allow all pre-releases.
-        """
-        self.allow_all_prereleases = allow_all_prereleases
-        self.prefer_binary = prefer_binary
+    prefer_binary: bool = False
+    allow_all_prereleases: bool = False
 
 
 class BestCandidateResult:
diff --git a/src/pip/_internal/locations/_sysconfig.py b/src/pip/_internal/locations/_sysconfig.py
index 97aef1f1ac2..ca860ea562c 100644
--- a/src/pip/_internal/locations/_sysconfig.py
+++ b/src/pip/_internal/locations/_sysconfig.py
@@ -192,9 +192,10 @@ def get_scheme(
         data=paths["data"],
     )
     if root is not None:
+        converted_keys = {}
         for key in SCHEME_KEYS:
-            value = change_root(root, getattr(scheme, key))
-            setattr(scheme, key, value)
+            converted_keys[key] = change_root(root, getattr(scheme, key))
+        scheme = Scheme(**converted_keys)
     return scheme
 
 
diff --git a/src/pip/_internal/models/candidate.py b/src/pip/_internal/models/candidate.py
index b12ffeeac4a..f27f283154a 100644
--- a/src/pip/_internal/models/candidate.py
+++ b/src/pip/_internal/models/candidate.py
@@ -1,28 +1,25 @@
+from dataclasses import dataclass
+
+from pip._vendor.packaging.version import Version
 from pip._vendor.packaging.version import parse as parse_version
 
 from pip._internal.models.link import Link
-from pip._internal.utils.models import KeyBasedCompareMixin
 
 
-class InstallationCandidate(KeyBasedCompareMixin):
+@dataclass(frozen=True)
+class InstallationCandidate:
     """Represents a potential "candidate" for installation."""
 
     __slots__ = ["name", "version", "link"]
 
+    name: str
+    version: Version
+    link: Link
+
     def __init__(self, name: str, version: str, link: Link) -> None:
-        self.name = name
-        self.version = parse_version(version)
-        self.link = link
-
-        super().__init__(
-            key=(self.name, self.version, self.link),
-            defining_class=InstallationCandidate,
-        )
-
-    def __repr__(self) -> str:
-        return (
-            f""
-        )
+        object.__setattr__(self, "name", name)
+        object.__setattr__(self, "version", parse_version(version))
+        object.__setattr__(self, "link", link)
 
     def __str__(self) -> str:
         return f"{self.name!r} candidate (version {self.version} at {self.link})"
diff --git a/src/pip/_internal/models/direct_url.py b/src/pip/_internal/models/direct_url.py
index 1063952489a..fc5ec8d4aa9 100644
--- a/src/pip/_internal/models/direct_url.py
+++ b/src/pip/_internal/models/direct_url.py
@@ -3,7 +3,8 @@
 import json
 import re
 import urllib.parse
-from typing import Any, Dict, Iterable, Optional, Type, TypeVar, Union
+from dataclasses import dataclass
+from typing import Any, ClassVar, Dict, Iterable, Optional, Type, TypeVar, Union
 
 __all__ = [
     "DirectUrl",
@@ -65,18 +66,13 @@ def _filter_none(**kwargs: Any) -> Dict[str, Any]:
     return {k: v for k, v in kwargs.items() if v is not None}
 
 
+@dataclass
 class VcsInfo:
-    name = "vcs_info"
+    name: ClassVar = "vcs_info"
 
-    def __init__(
-        self,
-        vcs: str,
-        commit_id: str,
-        requested_revision: Optional[str] = None,
-    ) -> None:
-        self.vcs = vcs
-        self.requested_revision = requested_revision
-        self.commit_id = commit_id
+    vcs: str
+    commit_id: str
+    requested_revision: Optional[str] = None
 
     @classmethod
     def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["VcsInfo"]:
@@ -140,14 +136,11 @@ def _to_dict(self) -> Dict[str, Any]:
         return _filter_none(hash=self.hash, hashes=self.hashes)
 
 
+@dataclass
 class DirInfo:
-    name = "dir_info"
+    name: ClassVar = "dir_info"
 
-    def __init__(
-        self,
-        editable: bool = False,
-    ) -> None:
-        self.editable = editable
+    editable: bool = False
 
     @classmethod
     def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["DirInfo"]:
@@ -162,16 +155,11 @@ def _to_dict(self) -> Dict[str, Any]:
 InfoType = Union[ArchiveInfo, DirInfo, VcsInfo]
 
 
+@dataclass
 class DirectUrl:
-    def __init__(
-        self,
-        url: str,
-        info: InfoType,
-        subdirectory: Optional[str] = None,
-    ) -> None:
-        self.url = url
-        self.info = info
-        self.subdirectory = subdirectory
+    url: str
+    info: InfoType
+    subdirectory: Optional[str] = None
 
     def _remove_auth_from_netloc(self, netloc: str) -> str:
         if "@" not in netloc:
diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index 73041b864c3..2f41f2f6a09 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -27,7 +27,6 @@
     split_auth_from_netloc,
     splitext,
 )
-from pip._internal.utils.models import KeyBasedCompareMixin
 from pip._internal.utils.urls import path_to_url, url_to_path
 
 if TYPE_CHECKING:
@@ -179,7 +178,8 @@ def _ensure_quoted_url(url: str) -> str:
     return urllib.parse.urlunparse(result._replace(path=path))
 
 
-class Link(KeyBasedCompareMixin):
+@functools.total_ordering
+class Link:
     """Represents a parsed link from a Package Index's simple URL"""
 
     __slots__ = [
@@ -254,8 +254,6 @@ def __init__(
         self.yanked_reason = yanked_reason
         self.metadata_file_data = metadata_file_data
 
-        super().__init__(key=url, defining_class=Link)
-
         self.cache_link_parsing = cache_link_parsing
         self.egg_fragment = self._egg_fragment()
 
@@ -375,6 +373,19 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return f""
 
+    def __hash__(self) -> int:
+        return hash(self.url)
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, Link):
+            return NotImplemented
+        return self.url == other.url
+
+    def __lt__(self, other: Any) -> bool:
+        if not isinstance(other, Link):
+            return NotImplemented
+        return self.url < other.url
+
     @property
     def url(self) -> str:
         return self._url
diff --git a/src/pip/_internal/models/scheme.py b/src/pip/_internal/models/scheme.py
index 9d804a67371..06a9a550e34 100644
--- a/src/pip/_internal/models/scheme.py
+++ b/src/pip/_internal/models/scheme.py
@@ -5,9 +5,12 @@
 https://docs.python.org/3/install/index.html#alternate-installation.
 """
 
+from dataclasses import dataclass
+
 SCHEME_KEYS = ["platlib", "purelib", "headers", "scripts", "data"]
 
 
+@dataclass(frozen=True)
 class Scheme:
     """A Scheme holds paths which are used as the base directories for
     artifacts associated with a Python package.
@@ -15,16 +18,8 @@ class Scheme:
 
     __slots__ = SCHEME_KEYS
 
-    def __init__(
-        self,
-        platlib: str,
-        purelib: str,
-        headers: str,
-        scripts: str,
-        data: str,
-    ) -> None:
-        self.platlib = platlib
-        self.purelib = purelib
-        self.headers = headers
-        self.scripts = scripts
-        self.data = data
+    platlib: str
+    purelib: str
+    headers: str
+    scripts: str
+    data: str
diff --git a/src/pip/_internal/models/search_scope.py b/src/pip/_internal/models/search_scope.py
index a96ddcb4096..ee7bc86229a 100644
--- a/src/pip/_internal/models/search_scope.py
+++ b/src/pip/_internal/models/search_scope.py
@@ -3,6 +3,7 @@
 import os
 import posixpath
 import urllib.parse
+from dataclasses import dataclass
 from typing import List
 
 from pip._vendor.packaging.utils import canonicalize_name
@@ -14,6 +15,7 @@
 logger = logging.getLogger(__name__)
 
 
+@dataclass(frozen=True)
 class SearchScope:
     """
     Encapsulates the locations that pip is configured to search.
@@ -21,6 +23,10 @@ class SearchScope:
 
     __slots__ = ["find_links", "index_urls", "no_index"]
 
+    find_links: List[str]
+    index_urls: List[str]
+    no_index: bool
+
     @classmethod
     def create(
         cls,
@@ -63,16 +69,6 @@ def create(
             no_index=no_index,
         )
 
-    def __init__(
-        self,
-        find_links: List[str],
-        index_urls: List[str],
-        no_index: bool,
-    ) -> None:
-        self.find_links = find_links
-        self.index_urls = index_urls
-        self.no_index = no_index
-
     def get_formatted_locations(self) -> str:
         lines = []
         redacted_index_urls = []
diff --git a/src/pip/_internal/models/selection_prefs.py b/src/pip/_internal/models/selection_prefs.py
index 977bc4caa75..e9b50aa5175 100644
--- a/src/pip/_internal/models/selection_prefs.py
+++ b/src/pip/_internal/models/selection_prefs.py
@@ -3,6 +3,8 @@
 from pip._internal.models.format_control import FormatControl
 
 
+# TODO: This needs Python 3.10's improved slots support for dataclasses
+# to be converted into a dataclass.
 class SelectionPreferences:
     """
     Encapsulates the candidate selection preferences for downloading
diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py
index 956717d1e52..e6aa3447200 100644
--- a/src/pip/_internal/operations/prepare.py
+++ b/src/pip/_internal/operations/prepare.py
@@ -7,6 +7,7 @@
 import mimetypes
 import os
 import shutil
+from dataclasses import dataclass
 from pathlib import Path
 from typing import Dict, Iterable, List, Optional
 
@@ -80,13 +81,14 @@ def unpack_vcs_link(link: Link, location: str, verbosity: int) -> None:
     vcs_backend.unpack(location, url=hide_url(link.url), verbosity=verbosity)
 
 
+@dataclass
 class File:
-    def __init__(self, path: str, content_type: Optional[str]) -> None:
-        self.path = path
-        if content_type is None:
-            self.content_type = mimetypes.guess_type(path)[0]
-        else:
-            self.content_type = content_type
+    path: str
+    content_type: Optional[str] = None
+
+    def __post_init__(self) -> None:
+        if self.content_type is None:
+            self.content_type = mimetypes.guess_type(self.path)[0]
 
 
 def get_http_url(
diff --git a/src/pip/_internal/req/__init__.py b/src/pip/_internal/req/__init__.py
index 16de903a44c..422d851d729 100644
--- a/src/pip/_internal/req/__init__.py
+++ b/src/pip/_internal/req/__init__.py
@@ -1,5 +1,6 @@
 import collections
 import logging
+from dataclasses import dataclass
 from typing import Generator, List, Optional, Sequence, Tuple
 
 from pip._internal.utils.logging import indent_log
@@ -18,12 +19,9 @@
 logger = logging.getLogger(__name__)
 
 
+@dataclass(frozen=True)
 class InstallationResult:
-    def __init__(self, name: str) -> None:
-        self.name = name
-
-    def __repr__(self) -> str:
-        return f"InstallationResult(name={self.name!r})"
+    name: str
 
 
 def _validate_requirements(
diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
index 74296345620..36f517e599d 100644
--- a/src/pip/_internal/req/constructors.py
+++ b/src/pip/_internal/req/constructors.py
@@ -12,6 +12,7 @@
 import logging
 import os
 import re
+from dataclasses import dataclass
 from typing import Collection, Dict, List, Optional, Set, Tuple, Union
 
 from pip._vendor.packaging.markers import Marker
@@ -191,18 +192,12 @@ def deduce_helpful_msg(req: str) -> str:
     return msg
 
 
+@dataclass(frozen=True)
 class RequirementParts:
-    def __init__(
-        self,
-        requirement: Optional[Requirement],
-        link: Optional[Link],
-        markers: Optional[Marker],
-        extras: Set[str],
-    ):
-        self.requirement = requirement
-        self.link = link
-        self.markers = markers
-        self.extras = extras
+    requirement: Optional[Requirement]
+    link: Optional[Link]
+    markers: Optional[Marker]
+    extras: Set[str]
 
 
 def parse_req_from_editable(editable_req: str) -> RequirementParts:
diff --git a/src/pip/_internal/resolution/resolvelib/base.py b/src/pip/_internal/resolution/resolvelib/base.py
index 9c0ef5ca7b9..4269c7fbecc 100644
--- a/src/pip/_internal/resolution/resolvelib/base.py
+++ b/src/pip/_internal/resolution/resolvelib/base.py
@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 from typing import FrozenSet, Iterable, Optional, Tuple, Union
 
 from pip._vendor.packaging.specifiers import SpecifierSet
@@ -19,13 +20,11 @@ def format_name(project: NormalizedName, extras: FrozenSet[NormalizedName]) -> s
     return f"{project}[{extras_expr}]"
 
 
+@dataclass(frozen=True)
 class Constraint:
-    def __init__(
-        self, specifier: SpecifierSet, hashes: Hashes, links: FrozenSet[Link]
-    ) -> None:
-        self.specifier = specifier
-        self.hashes = hashes
-        self.links = links
+    specifier: SpecifierSet
+    hashes: Hashes
+    links: FrozenSet[Link]
 
     @classmethod
     def empty(cls) -> "Constraint":
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index 1ad3f6162a2..a5d17565812 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -11,6 +11,7 @@
 import sys
 import sysconfig
 import urllib.parse
+from dataclasses import dataclass
 from functools import partial
 from io import StringIO
 from itertools import filterfalse, tee, zip_longest
@@ -580,10 +581,10 @@ def redact_auth_from_requirement(req: Requirement) -> str:
     return str(req).replace(req.url, redact_auth_from_url(req.url))
 
 
+@dataclass(frozen=True)
 class HiddenText:
-    def __init__(self, secret: str, redacted: str) -> None:
-        self.secret = secret
-        self.redacted = redacted
+    secret: str
+    redacted: str
 
     def __repr__(self) -> str:
         return f""
diff --git a/src/pip/_internal/utils/models.py b/src/pip/_internal/utils/models.py
deleted file mode 100644
index b6bb21a8b26..00000000000
--- a/src/pip/_internal/utils/models.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""Utilities for defining models
-"""
-
-import operator
-from typing import Any, Callable, Type
-
-
-class KeyBasedCompareMixin:
-    """Provides comparison capabilities that is based on a key"""
-
-    __slots__ = ["_compare_key", "_defining_class"]
-
-    def __init__(self, key: Any, defining_class: Type["KeyBasedCompareMixin"]) -> None:
-        self._compare_key = key
-        self._defining_class = defining_class
-
-    def __hash__(self) -> int:
-        return hash(self._compare_key)
-
-    def __lt__(self, other: Any) -> bool:
-        return self._compare(other, operator.__lt__)
-
-    def __le__(self, other: Any) -> bool:
-        return self._compare(other, operator.__le__)
-
-    def __gt__(self, other: Any) -> bool:
-        return self._compare(other, operator.__gt__)
-
-    def __ge__(self, other: Any) -> bool:
-        return self._compare(other, operator.__ge__)
-
-    def __eq__(self, other: Any) -> bool:
-        return self._compare(other, operator.__eq__)
-
-    def _compare(self, other: Any, method: Callable[[Any, Any], bool]) -> bool:
-        if not isinstance(other, self._defining_class):
-            return NotImplemented
-
-        return method(self._compare_key, other._compare_key)
diff --git a/src/pip/_internal/vcs/git.py b/src/pip/_internal/vcs/git.py
index 8c242cf8956..0425debb3ae 100644
--- a/src/pip/_internal/vcs/git.py
+++ b/src/pip/_internal/vcs/git.py
@@ -4,6 +4,7 @@
 import re
 import urllib.parse
 import urllib.request
+from dataclasses import replace
 from typing import List, Optional, Tuple
 
 from pip._internal.exceptions import BadCommand, InstallationError
@@ -217,7 +218,7 @@ def resolve_revision(
 
         if sha is not None:
             rev_options = rev_options.make_new(sha)
-            rev_options.branch_name = rev if is_branch else None
+            rev_options = replace(rev_options, branch_name=(rev if is_branch else None))
 
             return rev_options
 
diff --git a/src/pip/_internal/vcs/versioncontrol.py b/src/pip/_internal/vcs/versioncontrol.py
index 7eef8ec898e..ce9cf112d31 100644
--- a/src/pip/_internal/vcs/versioncontrol.py
+++ b/src/pip/_internal/vcs/versioncontrol.py
@@ -5,6 +5,7 @@
 import shutil
 import sys
 import urllib.parse
+from dataclasses import dataclass, field
 from typing import (
     Any,
     Dict,
@@ -114,33 +115,22 @@ def __init__(self, url: str):
         self.url = url
 
 
+@dataclass(frozen=True)
 class RevOptions:
     """
     Encapsulates a VCS-specific revision to install, along with any VCS
     install options.
 
-    Instances of this class should be treated as if immutable.
+    Args:
+        vc_class: a VersionControl subclass.
+        rev: the name of the revision to install.
+        extra_args: a list of extra options.
     """
 
-    def __init__(
-        self,
-        vc_class: Type["VersionControl"],
-        rev: Optional[str] = None,
-        extra_args: Optional[CommandArgs] = None,
-    ) -> None:
-        """
-        Args:
-          vc_class: a VersionControl subclass.
-          rev: the name of the revision to install.
-          extra_args: a list of extra options.
-        """
-        if extra_args is None:
-            extra_args = []
-
-        self.extra_args = extra_args
-        self.rev = rev
-        self.vc_class = vc_class
-        self.branch_name: Optional[str] = None
+    vc_class: Type["VersionControl"]
+    rev: Optional[str] = None
+    extra_args: CommandArgs = field(default_factory=list)
+    branch_name: Optional[str] = None
 
     def __repr__(self) -> str:
         return f""
@@ -354,7 +344,7 @@ def make_rev_options(
           rev: the name of a revision to install.
           extra_args: a list of extra options.
         """
-        return RevOptions(cls, rev, extra_args=extra_args)
+        return RevOptions(cls, rev, extra_args=extra_args or [])
 
     @classmethod
     def _is_local_repository(cls, repo: str) -> bool:
diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py
index c5545e37d01..2550cae412d 100644
--- a/tests/unit/test_models.py
+++ b/tests/unit/test_models.py
@@ -49,11 +49,3 @@ def test_sets_correct_variables(self) -> None:
         assert obj.name == "A"
         assert obj.version == parse_version("1.0.0")
         assert obj.link.url == "https://somewhere.com/path/A-1.0.0.tar.gz"
-
-    # NOTE: This isn't checking the ordering logic; only the data provided to
-    #       it is correct.
-    def test_sets_the_right_key(self) -> None:
-        obj = candidate.InstallationCandidate(
-            "A", "1.0.0", Link("https://somewhere.com/path/A-1.0.0.tar.gz")
-        )
-        assert obj._compare_key == (obj.name, obj.version, obj.link)

From db425ce4b49d9ff59954fb5c506bffc5e42f9c0f Mon Sep 17 00:00:00 2001
From: Peter Shen 
Date: Thu, 18 Apr 2024 10:47:31 +0800
Subject: [PATCH 322/992] update output description

---
 .github/ISSUE_TEMPLATE/bug-report.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 200c7e60856..e593031d559 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -60,7 +60,8 @@ body:
       label: Output
       description: >-
         Provide the output of the steps above, including the commands
-        themselves and pip's output/traceback etc.
+        themselves and pip's output/traceback etc. 
+        (The output will auto-rendered as code, no need for backticks.)
 
         If you want to present output from multiple commands, please prefix
         the line containing the command with `$ `. Please also ensure that

From 7b61a10379169b5f7e8eed042aa16ffd7d76ad7b Mon Sep 17 00:00:00 2001
From: shenxianpeng 
Date: Thu, 18 Apr 2024 03:00:06 +0000
Subject: [PATCH 323/992] fixed trim trailing whitespace

---
 .github/ISSUE_TEMPLATE/bug-report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index e593031d559..20e0a5dd991 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -60,7 +60,7 @@ body:
       label: Output
       description: >-
         Provide the output of the steps above, including the commands
-        themselves and pip's output/traceback etc. 
+        themselves and pip's output/traceback etc.
         (The output will auto-rendered as code, no need for backticks.)
 
         If you want to present output from multiple commands, please prefix

From 77d0ddc82acaeaafbe008f8860f51c146f1d40ee Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 19 Apr 2024 10:27:33 -0400
Subject: [PATCH 324/992] Replace captured_output() and get_url_scheme() with
 stdlib alternatives (#12639)

Co-authored-by: Tzu-ping Chung 
---
 ...e3-4844-4298-a46c-80768b38f652.trivial.rst |  1 +
 src/pip/_internal/operations/install/wheel.py |  6 ++-
 src/pip/_internal/req/req_file.py             |  4 +-
 src/pip/_internal/utils/misc.py               | 37 -------------------
 src/pip/_internal/utils/urls.py               |  7 ----
 src/pip/_internal/vcs/versioncontrol.py       |  5 +--
 tests/unit/test_logging.py                    |  9 +++--
 tests/unit/test_urls.py                       | 16 +-------
 8 files changed, 14 insertions(+), 71 deletions(-)
 create mode 100644 news/c678d9e3-4844-4298-a46c-80768b38f652.trivial.rst

diff --git a/news/c678d9e3-4844-4298-a46c-80768b38f652.trivial.rst b/news/c678d9e3-4844-4298-a46c-80768b38f652.trivial.rst
new file mode 100644
index 00000000000..8837b629849
--- /dev/null
+++ b/news/c678d9e3-4844-4298-a46c-80768b38f652.trivial.rst
@@ -0,0 +1 @@
+Replace ``captured_output()`` and ``get_url_scheme()`` with stdlib alternatives.
diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index f64c3e9c443..a02a193d226 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -51,7 +51,7 @@
 from pip._internal.models.direct_url import DIRECT_URL_METADATA_NAME, DirectUrl
 from pip._internal.models.scheme import SCHEME_KEYS, Scheme
 from pip._internal.utils.filesystem import adjacent_tmp_file, replace
-from pip._internal.utils.misc import captured_stdout, ensure_dir, hash_file, partition
+from pip._internal.utils.misc import StreamWrapper, ensure_dir, hash_file, partition
 from pip._internal.utils.unpacking import (
     current_umask,
     is_within_directory,
@@ -603,7 +603,9 @@ def pyc_output_path(path: str) -> str:
 
     # Compile all of the pyc files for the installed files
     if pycompile:
-        with captured_stdout() as stdout:
+        with contextlib.redirect_stdout(
+            StreamWrapper.from_stream(sys.stdout)
+        ) as stdout:
             with warnings.catch_warnings():
                 warnings.filterwarnings("ignore")
                 for path in pyc_source_file_paths():
diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index 6f474bce49a..53ad8674cd8 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -26,7 +26,6 @@
 from pip._internal.exceptions import InstallationError, RequirementsFileParseError
 from pip._internal.models.search_scope import SearchScope
 from pip._internal.utils.encoding import auto_decode
-from pip._internal.utils.urls import get_url_scheme
 
 if TYPE_CHECKING:
     from pip._internal.index.package_finder import PackageFinder
@@ -533,8 +532,7 @@ def get_file_content(url: str, session: "PipSession") -> Tuple[str, str]:
     :param url:         File path or url.
     :param session:     PipSession instance.
     """
-    scheme = get_url_scheme(url)
-
+    scheme = urllib.parse.urlsplit(url).scheme
     # Pip has special support for file:// URLs (LocalFSAdapter).
     if scheme in ["http", "https", "file"]:
         # Delay importing heavy network modules until absolutely necessary.
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index a5d17565812..82b6261322d 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -1,4 +1,3 @@
-import contextlib
 import errno
 import getpass
 import hashlib
@@ -21,7 +20,6 @@
     Any,
     BinaryIO,
     Callable,
-    ContextManager,
     Dict,
     Generator,
     Iterable,
@@ -57,7 +55,6 @@
     "normalize_path",
     "renames",
     "get_prog",
-    "captured_stdout",
     "ensure_dir",
     "remove_auth_from_url",
     "check_externally_managed",
@@ -400,40 +397,6 @@ def encoding(self) -> str:  # type: ignore
         return self.orig_stream.encoding
 
 
-@contextlib.contextmanager
-def captured_output(stream_name: str) -> Generator[StreamWrapper, None, None]:
-    """Return a context manager used by captured_stdout/stdin/stderr
-    that temporarily replaces the sys stream *stream_name* with a StringIO.
-
-    Taken from Lib/support/__init__.py in the CPython repo.
-    """
-    orig_stdout = getattr(sys, stream_name)
-    setattr(sys, stream_name, StreamWrapper.from_stream(orig_stdout))
-    try:
-        yield getattr(sys, stream_name)
-    finally:
-        setattr(sys, stream_name, orig_stdout)
-
-
-def captured_stdout() -> ContextManager[StreamWrapper]:
-    """Capture the output of sys.stdout:
-
-       with captured_stdout() as stdout:
-           print('hello')
-       self.assertEqual(stdout.getvalue(), 'hello\n')
-
-    Taken from Lib/support/__init__.py in the CPython repo.
-    """
-    return captured_output("stdout")
-
-
-def captured_stderr() -> ContextManager[StreamWrapper]:
-    """
-    See captured_stdout().
-    """
-    return captured_output("stderr")
-
-
 # Simulates an enum
 def enum(*sequential: Any, **named: Any) -> Type[Any]:
     enums = dict(zip(sequential, range(len(sequential))), **named)
diff --git a/src/pip/_internal/utils/urls.py b/src/pip/_internal/utils/urls.py
index 6ba2e04f350..9f34f882a1a 100644
--- a/src/pip/_internal/utils/urls.py
+++ b/src/pip/_internal/utils/urls.py
@@ -2,17 +2,10 @@
 import string
 import urllib.parse
 import urllib.request
-from typing import Optional
 
 from .compat import WINDOWS
 
 
-def get_url_scheme(url: str) -> Optional[str]:
-    if ":" not in url:
-        return None
-    return url.split(":", 1)[0].lower()
-
-
 def path_to_url(path: str) -> str:
     """
     Convert a path to a file: URL.  The path will be made absolute and have
diff --git a/src/pip/_internal/vcs/versioncontrol.py b/src/pip/_internal/vcs/versioncontrol.py
index ce9cf112d31..bd7d509a3ea 100644
--- a/src/pip/_internal/vcs/versioncontrol.py
+++ b/src/pip/_internal/vcs/versioncontrol.py
@@ -38,7 +38,6 @@
     format_command_args,
     make_command,
 )
-from pip._internal.utils.urls import get_url_scheme
 
 __all__ = ["vcs"]
 
@@ -52,8 +51,8 @@ def is_url(name: str) -> bool:
     """
     Return true if the name looks like a URL.
     """
-    scheme = get_url_scheme(name)
-    if scheme is None:
+    scheme = urllib.parse.urlsplit(name).scheme
+    if not scheme:
         return False
     return scheme in ["http", "https", "file", "ftp"] + vcs.all_schemes
 
diff --git a/tests/unit/test_logging.py b/tests/unit/test_logging.py
index 9d507d74277..f673ed29def 100644
--- a/tests/unit/test_logging.py
+++ b/tests/unit/test_logging.py
@@ -1,5 +1,7 @@
 import logging
 import time
+from contextlib import redirect_stderr, redirect_stdout
+from io import StringIO
 from threading import Thread
 from unittest.mock import patch
 
@@ -11,7 +13,6 @@
     RichPipStreamHandler,
     indent_log,
 )
-from pip._internal.utils.misc import captured_stderr, captured_stdout
 
 logger = logging.getLogger(__name__)
 
@@ -140,7 +141,7 @@ def test_broken_pipe_in_stderr_flush(self) -> None:
         """
         record = self._make_log_record()
 
-        with captured_stderr() as stderr:
+        with redirect_stderr(StringIO()) as stderr:
             handler = RichPipStreamHandler(stream=stderr, no_color=True)
             with patch("sys.stderr.flush") as mock_flush:
                 mock_flush.side_effect = BrokenPipeError()
@@ -163,7 +164,7 @@ def test_broken_pipe_in_stdout_write(self) -> None:
         """
         record = self._make_log_record()
 
-        with captured_stdout() as stdout:
+        with redirect_stdout(StringIO()) as stdout:
             handler = RichPipStreamHandler(stream=stdout, no_color=True)
             with patch("sys.stdout.write") as mock_write:
                 mock_write.side_effect = BrokenPipeError()
@@ -178,7 +179,7 @@ def test_broken_pipe_in_stdout_flush(self) -> None:
         """
         record = self._make_log_record()
 
-        with captured_stdout() as stdout:
+        with redirect_stdout(StringIO()) as stdout:
             handler = RichPipStreamHandler(stream=stdout, no_color=True)
             with patch("sys.stdout.flush") as mock_flush:
                 mock_flush.side_effect = BrokenPipeError()
diff --git a/tests/unit/test_urls.py b/tests/unit/test_urls.py
index 56ee80aa802..746d0222425 100644
--- a/tests/unit/test_urls.py
+++ b/tests/unit/test_urls.py
@@ -1,24 +1,10 @@
 import os
 import sys
 import urllib.request
-from typing import Optional
 
 import pytest
 
-from pip._internal.utils.urls import get_url_scheme, path_to_url, url_to_path
-
-
-@pytest.mark.parametrize(
-    "url,expected",
-    [
-        ("http://localhost:8080/", "http"),
-        ("file:c:/path/to/file", "file"),
-        ("file:/dev/null", "file"),
-        ("", None),
-    ],
-)
-def test_get_url_scheme(url: str, expected: Optional[str]) -> None:
-    assert get_url_scheme(url) == expected
+from pip._internal.utils.urls import path_to_url, url_to_path
 
 
 @pytest.mark.skipif("sys.platform == 'win32'")

From e84ffb5ea9b321bd09dd37e0a4ad7744f4766d33 Mon Sep 17 00:00:00 2001
From: "S. Guliaev" 
Date: Wed, 20 Apr 2022 21:11:07 +0300
Subject: [PATCH 325/992] fix svn and bazaar checkout in verbose mode

---
 news/11050.bugfix.rst               |  1 +
 src/pip/_internal/vcs/bazaar.py     | 12 ++++----
 src/pip/_internal/vcs/subversion.py |  6 ++--
 tests/unit/test_vcs.py              | 43 +++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 news/11050.bugfix.rst

diff --git a/news/11050.bugfix.rst b/news/11050.bugfix.rst
new file mode 100644
index 00000000000..f3d1f1ad804
--- /dev/null
+++ b/news/11050.bugfix.rst
@@ -0,0 +1 @@
+Fix error on checkout for vcs and bazaar with verbose mode on.
diff --git a/src/pip/_internal/vcs/bazaar.py b/src/pip/_internal/vcs/bazaar.py
index 20a17ed0927..a67ee3cd447 100644
--- a/src/pip/_internal/vcs/bazaar.py
+++ b/src/pip/_internal/vcs/bazaar.py
@@ -44,14 +44,14 @@ def fetch_new(
             display_path(dest),
         )
         if verbosity <= 0:
-            flag = "--quiet"
+            flags: Tuple[str, ...] = ("--quiet",)
         elif verbosity == 1:
-            flag = ""
+            flags = ()
         else:
-            flag = f"-{'v'*verbosity}"
-        cmd_args = make_command(
-            "checkout", "--lightweight", flag, rev_options.to_args(), url, dest
-        )
+            flags = ("-{'v'*verbosity}",)
+            cmd_args = make_command(
+                "checkout", "--lightweight", *flags, rev_options.to_args(), url, dest
+            )
         self.run_command(cmd_args)
 
     def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
diff --git a/src/pip/_internal/vcs/subversion.py b/src/pip/_internal/vcs/subversion.py
index 16d93a67b7b..1f05cbdecb6 100644
--- a/src/pip/_internal/vcs/subversion.py
+++ b/src/pip/_internal/vcs/subversion.py
@@ -288,12 +288,12 @@ def fetch_new(
             display_path(dest),
         )
         if verbosity <= 0:
-            flag = "--quiet"
+            flags: Tuple[str, ...] = ("--quiet",)
         else:
-            flag = ""
+            flags = ()
         cmd_args = make_command(
             "checkout",
-            flag,
+            *flags,
             self.get_remote_call_options(),
             rev_options.to_args(),
             url,
diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py
index a52a6217e77..af5f348dc2d 100644
--- a/tests/unit/test_vcs.py
+++ b/tests/unit/test_vcs.py
@@ -777,6 +777,22 @@ def assert_call_args(self, args: CommandArgs) -> None:
         assert self.call_subprocess_mock.call_args[0][0] == args
 
     def test_obtain(self) -> None:
+        self.svn.obtain(self.dest, hide_url(self.url), verbosity=1)
+        self.assert_call_args(
+            [
+                "svn",
+                "checkout",
+                "--non-interactive",
+                "--username",
+                "username",
+                "--password",
+                hide_value("password"),
+                hide_url("http://svn.example.com/"),
+                "/tmp/test",
+            ]
+        )
+
+    def test_obtain_quiet(self) -> None:
         self.svn.obtain(self.dest, hide_url(self.url), verbosity=0)
         self.assert_call_args(
             [
@@ -794,6 +810,18 @@ def test_obtain(self) -> None:
         )
 
     def test_fetch_new(self) -> None:
+        self.svn.fetch_new(self.dest, hide_url(self.url), self.rev_options, verbosity=1)
+        self.assert_call_args(
+            [
+                "svn",
+                "checkout",
+                "--non-interactive",
+                hide_url("svn+http://username:password@svn.example.com/"),
+                "/tmp/test",
+            ]
+        )
+
+    def test_fetch_new_quiet(self) -> None:
         self.svn.fetch_new(self.dest, hide_url(self.url), self.rev_options, verbosity=0)
         self.assert_call_args(
             [
@@ -807,6 +835,21 @@ def test_fetch_new(self) -> None:
         )
 
     def test_fetch_new_revision(self) -> None:
+        rev_options = RevOptions(Subversion, "123")
+        self.svn.fetch_new(self.dest, hide_url(self.url), rev_options, verbosity=1)
+        self.assert_call_args(
+            [
+                "svn",
+                "checkout",
+                "--non-interactive",
+                "-r",
+                "123",
+                hide_url("svn+http://username:password@svn.example.com/"),
+                "/tmp/test",
+            ]
+        )
+
+    def test_fetch_new_revision_quiet(self) -> None:
         rev_options = RevOptions(Subversion, "123")
         self.svn.fetch_new(self.dest, hide_url(self.url), rev_options, verbosity=0)
         self.assert_call_args(

From 5a9cc838172ac82e2c68214532202e8ddfaaa4e6 Mon Sep 17 00:00:00 2001
From: "S. Guliaev" 
Date: Wed, 20 Apr 2022 22:29:44 +0300
Subject: [PATCH 326/992] fix typo

---
 news/11050.bugfix.rst => 11051.bugfix.rst | 0
 src/pip/_internal/vcs/bazaar.py           | 5 +++++
 2 files changed, 5 insertions(+)
 rename news/11050.bugfix.rst => 11051.bugfix.rst (100%)

diff --git a/news/11050.bugfix.rst b/11051.bugfix.rst
similarity index 100%
rename from news/11050.bugfix.rst
rename to 11051.bugfix.rst
diff --git a/src/pip/_internal/vcs/bazaar.py b/src/pip/_internal/vcs/bazaar.py
index a67ee3cd447..772852bb8bd 100644
--- a/src/pip/_internal/vcs/bazaar.py
+++ b/src/pip/_internal/vcs/bazaar.py
@@ -48,10 +48,15 @@ def fetch_new(
         elif verbosity == 1:
             flags = ()
         else:
+<<<<<<< HEAD
             flags = ("-{'v'*verbosity}",)
             cmd_args = make_command(
                 "checkout", "--lightweight", *flags, rev_options.to_args(), url, dest
             )
+=======
+            flags = (f"-{'v'*verbosity}",)
+        cmd_args = make_command("branch", *flags, rev_options.to_args(), url, dest)
+>>>>>>> 57d0a77e3 (fix typo)
         self.run_command(cmd_args)
 
     def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:

From 8051eb4699b4b969b22fa839b03e2d293ae906c9 Mon Sep 17 00:00:00 2001
From: devsagul 
Date: Thu, 21 Apr 2022 08:36:03 +0300
Subject: [PATCH 327/992] Fix typo in news entry

---
 11051.bugfix.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/11051.bugfix.rst b/11051.bugfix.rst
index f3d1f1ad804..01aa5ea7b1d 100644
--- a/11051.bugfix.rst
+++ b/11051.bugfix.rst
@@ -1 +1 @@
-Fix error on checkout for vcs and bazaar with verbose mode on.
+Fix error on checkout for subversion and bazaar with verbose mode on.

From eb876640bb9b4bba456d5d48ef376f74255671b1 Mon Sep 17 00:00:00 2001
From: "S. Guliaev" 
Date: Thu, 21 Apr 2022 13:46:26 +0300
Subject: [PATCH 328/992] use lists for args in bazaar and subversion

---
 11051.bugfix.rst => news/11050.bugfix.rst |  0
 src/pip/_internal/vcs/bazaar.py           | 17 ++++++-----------
 src/pip/_internal/vcs/subversion.py       |  4 ++--
 3 files changed, 8 insertions(+), 13 deletions(-)
 rename 11051.bugfix.rst => news/11050.bugfix.rst (100%)

diff --git a/11051.bugfix.rst b/news/11050.bugfix.rst
similarity index 100%
rename from 11051.bugfix.rst
rename to news/11050.bugfix.rst
diff --git a/src/pip/_internal/vcs/bazaar.py b/src/pip/_internal/vcs/bazaar.py
index 772852bb8bd..c754b7cc5c0 100644
--- a/src/pip/_internal/vcs/bazaar.py
+++ b/src/pip/_internal/vcs/bazaar.py
@@ -44,19 +44,14 @@ def fetch_new(
             display_path(dest),
         )
         if verbosity <= 0:
-            flags: Tuple[str, ...] = ("--quiet",)
+            flags = ["--quiet"]
         elif verbosity == 1:
-            flags = ()
+            flags = []
         else:
-<<<<<<< HEAD
-            flags = ("-{'v'*verbosity}",)
-            cmd_args = make_command(
-                "checkout", "--lightweight", *flags, rev_options.to_args(), url, dest
-            )
-=======
-            flags = (f"-{'v'*verbosity}",)
-        cmd_args = make_command("branch", *flags, rev_options.to_args(), url, dest)
->>>>>>> 57d0a77e3 (fix typo)
+            flags = [f"-{'v'*verbosity}"]
+        cmd_args = make_command(
+            "checkout", "--lightweight", *flags, rev_options.to_args(), url, dest
+        )
         self.run_command(cmd_args)
 
     def switch(self, dest: str, url: HiddenText, rev_options: RevOptions) -> None:
diff --git a/src/pip/_internal/vcs/subversion.py b/src/pip/_internal/vcs/subversion.py
index 1f05cbdecb6..f359266d9c0 100644
--- a/src/pip/_internal/vcs/subversion.py
+++ b/src/pip/_internal/vcs/subversion.py
@@ -288,9 +288,9 @@ def fetch_new(
             display_path(dest),
         )
         if verbosity <= 0:
-            flags: Tuple[str, ...] = ("--quiet",)
+            flags = ["--quiet"]
         else:
-            flags = ()
+            flags = []
         cmd_args = make_command(
             "checkout",
             *flags,

From b03b495053e3c38b697bbed4415a4d5400671b95 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 19 Apr 2024 18:01:27 -0400
Subject: [PATCH 329/992] Clearly document the legacy resolver as unsupported

---
 docs/html/user_guide.rst                              | 6 ++++++
 news/b2631650-69cc-4747-8a50-24e574a0ae57.trivial.rst | 0
 2 files changed, 6 insertions(+)
 create mode 100644 news/b2631650-69cc-4747-8a50-24e574a0ae57.trivial.rst

diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index 2fa5552b1c5..1f5019e5c10 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -1140,6 +1140,12 @@ Since this work will not change user-visible behavior described in the
 pip documentation, this change is not covered by the :ref:`Deprecation
 Policy`.
 
+.. attention::
+
+    The legacy resolver is deprecated and unsupported. New features, such
+    as :doc:`reference/installation-report`, may not function correctly
+    with the legacy resolver. **These issues will not be fixed.**
+
 Context and followup
 --------------------
 
diff --git a/news/b2631650-69cc-4747-8a50-24e574a0ae57.trivial.rst b/news/b2631650-69cc-4747-8a50-24e574a0ae57.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d

From 8def0444f7e1fde204a2495ebc0e7d9eeecc7ada Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 19 Apr 2024 19:39:21 -0400
Subject: [PATCH 330/992] Bring attention to its future removal

Co-authored-by: Pradyun Gedam 
---
 docs/html/user_guide.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index 1f5019e5c10..aa2e3ad8e26 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -1143,8 +1143,9 @@ Policy`.
 .. attention::
 
     The legacy resolver is deprecated and unsupported. New features, such
-    as :doc:`reference/installation-report`, may not function correctly
-    with the legacy resolver. **These issues will not be fixed.**
+    as :doc:`reference/installation-report`, will not work with the
+    legacy resolver and this resolver will be removed in a future
+    release.
 
 Context and followup
 --------------------

From 2b97317eb8eff5c79667921bf9d27eaec647b5db Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 14 Apr 2024 13:49:24 -0400
Subject: [PATCH 331/992] Bump pre-commit hooks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There was one new mypy error:

src/pip/_internal/metadata/_json.py:82: error: Incompatible types in assignment
(expression has type "Message | Any | str | list[Message | str]", target has
type "str | list[str]")  [assignment]
            result["description"] = payload
                                    ^~~~~~~
Found 1 error in 1 file (checked 294 source files)

Co-authored-by: Stéphane Bidoul 
---
 .pre-commit-config.yaml                               | 6 +++---
 news/a870a527-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst | 1 +
 src/pip/_internal/metadata/_json.py                   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 news/a870a527-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 52650efd54c..bb46b772b0c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ exclude: 'src/pip/_vendor/'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v4.6.0
   hooks:
   - id: check-builtin-literals
   - id: check-added-large-files
@@ -22,13 +22,13 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.3.6
+  rev: v0.4.1
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.8.0
+  rev: v1.9.0
   hooks:
   - id: mypy
     exclude: tests/data
diff --git a/news/a870a527-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst b/news/a870a527-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst
new file mode 100644
index 00000000000..d9cbf94d387
--- /dev/null
+++ b/news/a870a527-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst
@@ -0,0 +1 @@
+Bump pre-commit hooks.
diff --git a/src/pip/_internal/metadata/_json.py b/src/pip/_internal/metadata/_json.py
index 27362fc726c..9097dd58590 100644
--- a/src/pip/_internal/metadata/_json.py
+++ b/src/pip/_internal/metadata/_json.py
@@ -2,7 +2,7 @@
 
 from email.header import Header, decode_header, make_header
 from email.message import Message
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Union, cast
 
 METADATA_FIELDS = [
     # Name, Multiple-Use
@@ -77,7 +77,7 @@ def sanitise_header(h: Union[Header, str]) -> str:
                     value = value.split()
         result[key] = value
 
-    payload = msg.get_payload()
+    payload = cast(str, msg.get_payload())
     if payload:
         result["description"] = payload
 

From c4e03f35d9397aa1a8dd3f59af3d5d3048ccc5ef Mon Sep 17 00:00:00 2001
From: hauntsaninja 
Date: Sat, 20 Apr 2024 13:39:45 -0700
Subject: [PATCH 332/992] comment

---
 src/pip/_internal/resolution/legacy/resolver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
index b0fe2323b49..cfdbb236468 100644
--- a/src/pip/_internal/resolution/legacy/resolver.py
+++ b/src/pip/_internal/resolution/legacy/resolver.py
@@ -49,7 +49,7 @@
 
 logger = logging.getLogger(__name__)
 
-DiscoveredDependencies = DefaultDict[str, List[InstallRequirement]]
+DiscoveredDependencies = DefaultDict[Optional[str], List[InstallRequirement]]
 
 
 def _check_dist_requires_python(
@@ -592,7 +592,7 @@ def schedule(req: InstallRequirement) -> None:
             if req.constraint:
                 return
             ordered_reqs.add(req)
-            for dep in self._discovered_dependencies[req.name]:  # type: ignore[index]
+            for dep in self._discovered_dependencies[req.name]:
                 schedule(dep)
             order.append(req)
 

From f5480f10c7198bbf74e741e97cb0c6420c0f0ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Thu, 28 Dec 2023 12:42:29 +0100
Subject: [PATCH 333/992] Cache is_satisfied_by

---
 .../resolution/resolvelib/provider.py         |  2 ++
 .../resolution/resolvelib/requirements.py     | 36 +++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index 315fb9c8902..ad9bfb2b97b 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -1,5 +1,6 @@
 import collections
 import math
+from functools import lru_cache
 from typing import (
     TYPE_CHECKING,
     Dict,
@@ -236,6 +237,7 @@ def _eligible_for_upgrade(identifier: str) -> bool:
             incompatibilities=incompatibilities,
         )
 
+    @lru_cache(maxsize=None)
     def is_satisfied_by(self, requirement: Requirement, candidate: Candidate) -> bool:
         return requirement.is_satisfied_by(candidate)
 
diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py
index 4af4a9f25a6..7f6e72bad18 100644
--- a/src/pip/_internal/resolution/resolvelib/requirements.py
+++ b/src/pip/_internal/resolution/resolvelib/requirements.py
@@ -1,8 +1,11 @@
+from typing import Any
+
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
 
 from pip._internal.req.constructors import install_req_drop_extras
 from pip._internal.req.req_install import InstallRequirement
+from pip._internal.utils.models import KeyBasedCompareMixin
 
 from .base import Candidate, CandidateLookup, Requirement, format_name
 
@@ -17,6 +20,14 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.candidate!r})"
 
+    def __hash__(self) -> int:
+        return hash(self.candidate)
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, ExplicitRequirement):
+            return False
+        return self.candidate == other.candidate
+
     @property
     def project_name(self) -> NormalizedName:
         # No need to canonicalize - the candidate did this
@@ -37,11 +48,14 @@ def is_satisfied_by(self, candidate: Candidate) -> bool:
         return candidate == self.candidate
 
 
-class SpecifierRequirement(Requirement):
+class SpecifierRequirement(Requirement, KeyBasedCompareMixin):
     def __init__(self, ireq: InstallRequirement) -> None:
         assert ireq.link is None, "This is a link, not a specifier"
         self._ireq = ireq
         self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras)
+        KeyBasedCompareMixin.__init__(
+            self, key=str(ireq), defining_class=SpecifierRequirement
+        )
 
     def __str__(self) -> str:
         return str(self._ireq.req)
@@ -97,6 +111,9 @@ def __init__(self, ireq: InstallRequirement) -> None:
         assert ireq.link is None, "This is a link, not a specifier"
         self._ireq = install_req_drop_extras(ireq)
         self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras)
+        KeyBasedCompareMixin.__init__(
+            self, key=str(ireq), defining_class=SpecifierRequirement
+        )
 
 
 class RequiresPythonRequirement(Requirement):
@@ -104,6 +121,7 @@ class RequiresPythonRequirement(Requirement):
 
     def __init__(self, specifier: SpecifierSet, match: Candidate) -> None:
         self.specifier = specifier
+        self._specifier_string = str(specifier)  # for faster __eq__
         self._candidate = match
 
     def __str__(self) -> str:
@@ -112,6 +130,17 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({str(self.specifier)!r})"
 
+    def __hash__(self) -> int:
+        return hash((self._specifier_string, self._candidate))
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, RequiresPythonRequirement):
+            return False
+        return (
+            self._specifier_string == other._specifier_string
+            and self._candidate == other._candidate
+        )
+
     @property
     def project_name(self) -> NormalizedName:
         return self._candidate.project_name
@@ -136,11 +165,14 @@ def is_satisfied_by(self, candidate: Candidate) -> bool:
         return self.specifier.contains(candidate.version, prereleases=True)
 
 
-class UnsatisfiableRequirement(Requirement):
+class UnsatisfiableRequirement(Requirement, KeyBasedCompareMixin):
     """A requirement that cannot be satisfied."""
 
     def __init__(self, name: NormalizedName) -> None:
         self._name = name
+        KeyBasedCompareMixin.__init__(
+            self, key=str(name), defining_class=UnsatisfiableRequirement
+        )
 
     def __str__(self) -> str:
         return f"{self._name} (unavailable)"

From e16867e20fcc7a77695fcd95f781d64ac1136638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Thu, 28 Dec 2023 13:18:58 +0100
Subject: [PATCH 334/992] Use the caching variant of is_satified_by in
 Factory.find_candidates

---
 src/pip/_internal/resolution/resolvelib/factory.py   |  4 +++-
 src/pip/_internal/resolution/resolvelib/provider.py  |  1 +
 tests/unit/resolution_resolvelib/test_requirement.py | 10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
index 781c54fd83a..e36df15d459 100644
--- a/src/pip/_internal/resolution/resolvelib/factory.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -3,6 +3,7 @@
 import logging
 from typing import (
     TYPE_CHECKING,
+    Callable,
     Dict,
     FrozenSet,
     Iterable,
@@ -391,6 +392,7 @@ def find_candidates(
         incompatibilities: Mapping[str, Iterator[Candidate]],
         constraint: Constraint,
         prefers_installed: bool,
+        is_satisfied_by: Callable[[Requirement, Candidate], bool],
     ) -> Iterable[Candidate]:
         # Collect basic lookup information from the requirements.
         explicit_candidates: Set[Candidate] = set()
@@ -456,7 +458,7 @@ def find_candidates(
             for c in explicit_candidates
             if id(c) not in incompat_ids
             and constraint.is_satisfied_by(c)
-            and all(req.is_satisfied_by(c) for req in requirements[identifier])
+            and all(is_satisfied_by(req, c) for req in requirements[identifier])
         )
 
     def _make_requirements_from_install_req(
diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index ad9bfb2b97b..fb0dd85f112 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -235,6 +235,7 @@ def _eligible_for_upgrade(identifier: str) -> bool:
             constraint=constraint,
             prefers_installed=(not _eligible_for_upgrade(identifier)),
             incompatibilities=incompatibilities,
+            is_satisfied_by=self.is_satisfied_by,
         )
 
     @lru_cache(maxsize=None)
diff --git a/tests/unit/resolution_resolvelib/test_requirement.py b/tests/unit/resolution_resolvelib/test_requirement.py
index b8cd13cb566..b7b0395b037 100644
--- a/tests/unit/resolution_resolvelib/test_requirement.py
+++ b/tests/unit/resolution_resolvelib/test_requirement.py
@@ -23,6 +23,14 @@
 #   Editables
 
 
+def _is_satisfied_by(requirement: Requirement, candidate: Candidate) -> bool:
+    """A helper function to check if a requirement is satisfied by a candidate.
+
+    Used for mocking PipProvider.is_satified_by.
+    """
+    return requirement.is_satisfied_by(candidate)
+
+
 @pytest.fixture
 def test_cases(data: TestData) -> Iterator[List[Tuple[str, str, int]]]:
     def _data_file(name: str) -> Path:
@@ -80,6 +88,7 @@ def test_new_resolver_correct_number_of_matches(
             {},
             Constraint.empty(),
             prefers_installed=False,
+            is_satisfied_by=_is_satisfied_by,
         )
         assert sum(1 for _ in matches) == match_count
 
@@ -98,6 +107,7 @@ def test_new_resolver_candidates_match_requirement(
             {},
             Constraint.empty(),
             prefers_installed=False,
+            is_satisfied_by=_is_satisfied_by,
         )
         for c in candidates:
             assert isinstance(c, Candidate)

From 705ce7d5cf8300da8abe9456a245c9c4ac1c7173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Thu, 28 Dec 2023 16:33:41 +0100
Subject: [PATCH 335/992] Optimize hashing and comparison of
 AlreadyInstalledCandidate

---
 .../_internal/resolution/resolvelib/candidates.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 49a1f660ca6..034fc343975 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -20,6 +20,7 @@
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.direct_url_helpers import direct_url_from_link
 from pip._internal.utils.misc import normalize_version_info
+from pip._internal.utils.models import KeyBasedCompareMixin
 
 from .base import Candidate, CandidateVersion, Requirement, format_name
 
@@ -324,7 +325,7 @@ def _prepare_distribution(self) -> BaseDistribution:
         return self._factory.preparer.prepare_editable_requirement(self._ireq)
 
 
-class AlreadyInstalledCandidate(Candidate):
+class AlreadyInstalledCandidate(Candidate, KeyBasedCompareMixin):
     is_installed = True
     source_link = None
 
@@ -346,20 +347,16 @@ def __init__(
         skip_reason = "already satisfied"
         factory.preparer.prepare_installed_requirement(self._ireq, skip_reason)
 
+        KeyBasedCompareMixin.__init__(
+            self, key=(self.name, self.version), defining_class=self.__class__
+        )
+
     def __str__(self) -> str:
         return str(self.dist)
 
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.dist!r})"
 
-    def __hash__(self) -> int:
-        return hash((self.__class__, self.name, self.version))
-
-    def __eq__(self, other: Any) -> bool:
-        if isinstance(other, self.__class__):
-            return self.name == other.name and self.version == other.version
-        return False
-
     @property
     def project_name(self) -> NormalizedName:
         return self.dist.canonical_name

From efab55099b400b0fd77a8cac2ace66e6e19d7ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 21 Apr 2024 13:35:49 +0200
Subject: [PATCH 336/992] Add news

---
 news/12453.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12453.feature.rst

diff --git a/news/12453.feature.rst b/news/12453.feature.rst
new file mode 100644
index 00000000000..704cd012a90
--- /dev/null
+++ b/news/12453.feature.rst
@@ -0,0 +1 @@
+Improve performance of resolution of large dependency trees, with more caching.

From 38b56452ad23d68901409da30ee07ad2f0466581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 21 Apr 2024 14:01:47 +0200
Subject: [PATCH 337/992] Don't use KeyBasedCompareMixin

---
 .../resolution/resolvelib/candidates.py       | 15 +++++---
 .../resolution/resolvelib/requirements.py     | 38 +++++++++++++------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 034fc343975..140aaafcb8f 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -20,7 +20,6 @@
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.direct_url_helpers import direct_url_from_link
 from pip._internal.utils.misc import normalize_version_info
-from pip._internal.utils.models import KeyBasedCompareMixin
 
 from .base import Candidate, CandidateVersion, Requirement, format_name
 
@@ -325,7 +324,7 @@ def _prepare_distribution(self) -> BaseDistribution:
         return self._factory.preparer.prepare_editable_requirement(self._ireq)
 
 
-class AlreadyInstalledCandidate(Candidate, KeyBasedCompareMixin):
+class AlreadyInstalledCandidate(Candidate):
     is_installed = True
     source_link = None
 
@@ -347,16 +346,20 @@ def __init__(
         skip_reason = "already satisfied"
         factory.preparer.prepare_installed_requirement(self._ireq, skip_reason)
 
-        KeyBasedCompareMixin.__init__(
-            self, key=(self.name, self.version), defining_class=self.__class__
-        )
-
     def __str__(self) -> str:
         return str(self.dist)
 
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.dist!r})"
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, AlreadyInstalledCandidate):
+            return NotImplemented
+        return self.name == other.name and self.version == other.version
+
+    def __hash__(self) -> int:
+        return hash((self.name, self.version))
+
     @property
     def project_name(self) -> NormalizedName:
         return self.dist.canonical_name
diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py
index 7f6e72bad18..f980a356f18 100644
--- a/src/pip/_internal/resolution/resolvelib/requirements.py
+++ b/src/pip/_internal/resolution/resolvelib/requirements.py
@@ -5,7 +5,6 @@
 
 from pip._internal.req.constructors import install_req_drop_extras
 from pip._internal.req.req_install import InstallRequirement
-from pip._internal.utils.models import KeyBasedCompareMixin
 
 from .base import Candidate, CandidateLookup, Requirement, format_name
 
@@ -48,14 +47,11 @@ def is_satisfied_by(self, candidate: Candidate) -> bool:
         return candidate == self.candidate
 
 
-class SpecifierRequirement(Requirement, KeyBasedCompareMixin):
+class SpecifierRequirement(Requirement):
     def __init__(self, ireq: InstallRequirement) -> None:
         assert ireq.link is None, "This is a link, not a specifier"
         self._ireq = ireq
         self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras)
-        KeyBasedCompareMixin.__init__(
-            self, key=str(ireq), defining_class=SpecifierRequirement
-        )
 
     def __str__(self) -> str:
         return str(self._ireq.req)
@@ -63,6 +59,14 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({str(self._ireq.req)!r})"
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, SpecifierRequirement):
+            return NotImplemented
+        return str(self._ireq) == str(other._ireq)
+
+    def __hash__(self) -> int:
+        return hash(str(self._ireq))
+
     @property
     def project_name(self) -> NormalizedName:
         assert self._ireq.req, "Specifier-backed ireq is always PEP 508"
@@ -111,9 +115,14 @@ def __init__(self, ireq: InstallRequirement) -> None:
         assert ireq.link is None, "This is a link, not a specifier"
         self._ireq = install_req_drop_extras(ireq)
         self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras)
-        KeyBasedCompareMixin.__init__(
-            self, key=str(ireq), defining_class=SpecifierRequirement
-        )
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, SpecifierWithoutExtrasRequirement):
+            return NotImplemented
+        return str(self._ireq) == str(other._ireq)
+
+    def __hash__(self) -> int:
+        return hash(str(self._ireq))
 
 
 class RequiresPythonRequirement(Requirement):
@@ -165,14 +174,11 @@ def is_satisfied_by(self, candidate: Candidate) -> bool:
         return self.specifier.contains(candidate.version, prereleases=True)
 
 
-class UnsatisfiableRequirement(Requirement, KeyBasedCompareMixin):
+class UnsatisfiableRequirement(Requirement):
     """A requirement that cannot be satisfied."""
 
     def __init__(self, name: NormalizedName) -> None:
         self._name = name
-        KeyBasedCompareMixin.__init__(
-            self, key=str(name), defining_class=UnsatisfiableRequirement
-        )
 
     def __str__(self) -> str:
         return f"{self._name} (unavailable)"
@@ -180,6 +186,14 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({str(self._name)!r})"
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, UnsatisfiableRequirement):
+            return NotImplemented
+        return self._name == other._name
+
+    def __hash__(self) -> int:
+        return hash(self._name)
+
     @property
     def project_name(self) -> NormalizedName:
         return self._name

From e42eb57f2ffaf2de3d6babc540e18b08c1088c81 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 12 Apr 2024 20:49:19 -0400
Subject: [PATCH 338/992] Run Python 3.13 in CI tests

---
 .github/workflows/ci.yml | 4 +++-
 noxfile.py               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57273ff45bd..17f6d45a7c8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -114,6 +114,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
 
     steps:
       - uses: actions/checkout@v4
@@ -167,7 +168,8 @@ jobs:
           # - "3.9"
           # - "3.10"
           # - "3.11"
-          - "3.12"
+          - "3.12"  # Comment out when 3.13 is final
+          - "3.13"
         group: [1, 2]
 
     steps:
diff --git a/noxfile.py b/noxfile.py
index dc74654da53..92d0e243838 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -67,7 +67,7 @@ def should_update_common_wheels() -> bool:
 # -----------------------------------------------------------------------------
 # Development Commands
 # -----------------------------------------------------------------------------
-@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3"])
+@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3"])
 def test(session: nox.Session) -> None:
     # Get the common wheels.
     if should_update_common_wheels():

From 6b7592d6f55bdb471b33db8d707fd6159e2bfa04 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 13 Apr 2024 13:53:14 -0400
Subject: [PATCH 339/992] allow-prereleases

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 17f6d45a7c8..c10502b1e6f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -177,6 +177,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
+          allow-prereleases: true # Temporarily required for Python 3.13
 
       # We use C:\Temp (which is already available on the worker)
       # as a temporary directory for all of the tests because the

From 2c77eacecd76124ead6c7178bdb61121a26da5d4 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 13 Apr 2024 14:04:47 -0400
Subject: [PATCH 340/992] Update .github/workflows/ci.yml

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c10502b1e6f..161ee729f04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -177,7 +177,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-          allow-prereleases: true # Temporarily required for Python 3.13
+          allow-prereleases: true
 
       # We use C:\Temp (which is already available on the worker)
       # as a temporary directory for all of the tests because the

From bc4d77d95d91133bf9264ec7cce19b0e9d726ccf Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 14 Apr 2024 14:28:24 -0400
Subject: [PATCH 341/992] For Python 3.13 source cffi from github

---
 tests/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 5ecb21f6bf6..7fba866c745 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,3 +1,4 @@
+cffi @ https://github.com/python-cffi/cffi/archive/refs/heads/main.zip; python_version > "3.12" # Temporary workaround for Python 3.13 until next CFFI release
 cryptography
 freezegun
 installer

From 9c08d7d9d6662f30c22e9e3ddc6cd6dabc92ba5c Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 14 Apr 2024 14:29:41 -0400
Subject: [PATCH 342/992] NEWS ENTRY

---
 news/12620.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12620.trivial.rst

diff --git a/news/12620.trivial.rst b/news/12620.trivial.rst
new file mode 100644
index 00000000000..52fa571ed17
--- /dev/null
+++ b/news/12620.trivial.rst
@@ -0,0 +1 @@
+Enable Python 3.13 CI tests

From 90295fb97ea38966cdb50ca11c284e818f2fad2d Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Wed, 24 Apr 2024 22:05:06 -0400
Subject: [PATCH 343/992] Fix test_subdirectory_fragment test

---
 tests/unit/test_cache.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/test_cache.py b/tests/unit/test_cache.py
index d0fee69c39b..30cdb6ebece 100644
--- a/tests/unit/test_cache.py
+++ b/tests/unit/test_cache.py
@@ -13,11 +13,11 @@ def test_falsey_path_none() -> None:
     assert wc.cache_dir is None
 
 
-def test_subdirectory_fragment() -> None:
+def test_subdirectory_fragment(tmp_path: Path) -> None:
     """
     Test the subdirectory URL fragment is part of the cache key.
     """
-    wc = WheelCache("/tmp/.foo/")
+    wc = WheelCache(os.fspath(tmp_path))
     link1 = Link("git+https://g.c/o/r#subdirectory=d1")
     link2 = Link("git+https://g.c/o/r#subdirectory=d2")
     assert wc.get_path_for_link(link1) != wc.get_path_for_link(link2)

From e884c0021ea6902db9dc316820453fcd9cd42144 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 26 Apr 2024 16:06:54 -0400
Subject: [PATCH 344/992] list: disable pip version self check unless given
 --outdated/--uptodate (#12646)

---
 news/11677.feature.rst             |  1 +
 src/pip/_internal/commands/list.py |  4 ++++
 tests/unit/test_commands.py        | 22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 news/11677.feature.rst

diff --git a/news/11677.feature.rst b/news/11677.feature.rst
new file mode 100644
index 00000000000..b68a0db876b
--- /dev/null
+++ b/news/11677.feature.rst
@@ -0,0 +1 @@
+``pip list`` no longer performs the pip version check unless ``--outdated`` or ``--uptodate`` is given.
diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index e551dda9a96..f510919910e 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -135,6 +135,10 @@ def add_options(self) -> None:
         self.parser.insert_option_group(0, index_opts)
         self.parser.insert_option_group(0, self.cmd_opts)
 
+    def handle_pip_version_check(self, options: Values) -> None:
+        if options.outdated or options.uptodate:
+            super().handle_pip_version_check(options)
+
     def _build_package_finder(
         self, options: Values, session: PipSession
     ) -> PackageFinder:
diff --git a/tests/unit/test_commands.py b/tests/unit/test_commands.py
index 7a5c4e8319d..4f6366513d7 100644
--- a/tests/unit/test_commands.py
+++ b/tests/unit/test_commands.py
@@ -1,3 +1,4 @@
+import os
 from typing import Callable, List
 from unittest import mock
 
@@ -104,6 +105,10 @@ def test_index_group_handle_pip_version_check(
     options.disable_pip_version_check = disable_pip_version_check
     options.no_index = no_index
 
+    # See test test_list_pip_version_check() below.
+    if command_name == "list":
+        expected_called = False
+
     command.handle_pip_version_check(options)
     if expected_called:
         mock_version_check.assert_called_once()
@@ -120,3 +125,20 @@ def is_requirement_command(command: Command) -> bool:
         return isinstance(command, RequirementCommand)
 
     check_commands(is_requirement_command, ["download", "install", "wheel"])
+
+
+@pytest.mark.parametrize("flag", ["", "--outdated", "--uptodate"])
+@mock.patch("pip._internal.cli.req_command.pip_self_version_check")
+@mock.patch.dict(os.environ, {"PIP_DISABLE_PIP_VERSION_CHECK": "no"})
+def test_list_pip_version_check(version_check_mock: mock.Mock, flag: str) -> None:
+    """
+    Ensure that pip list doesn't perform a version self-check unless given
+    --outdated or --uptodate (as they require hitting the network anyway).
+    """
+    command = create_command("list")
+    command.run = lambda *args, **kwargs: 0  # type: ignore[method-assign]
+    command.main([flag])
+    if flag != "":
+        version_check_mock.assert_called_once()
+    else:
+        version_check_mock.assert_not_called()

From f18bebdddbb04372169a617ebdd865974125c196 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Mon, 29 Apr 2024 20:26:17 +0100
Subject: [PATCH 345/992] Pin GHA MacOS jobs to MacOS 12 (#12658)

Co-authored-by: Pradyun Gedam 
---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57273ff45bd..207dc9b717c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
 
   tests-unix:
     name: tests / ${{ matrix.python.key || matrix.python }} / ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
 
     needs: [packaging, determine-changes]
     if: >-
@@ -107,7 +107,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [Ubuntu, MacOS]
+        os: [ubuntu-latest, macos-12]
         python:
           - "3.8"
           - "3.9"
@@ -123,13 +123,13 @@ jobs:
           allow-prereleases: true
 
       - name: Install Ubuntu dependencies
-        if: matrix.os == 'Ubuntu'
+        if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
           sudo apt-get install bzr
 
       - name: Install MacOS dependencies
-        if: matrix.os == 'MacOS'
+        if: matrix.os == 'macos-12'
         run: brew install breezy
 
       - run: pip install nox

From 3b14deb3fac93a5f791d7347c717f6469b629b18 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 5 Jan 2024 14:49:27 -0500
Subject: [PATCH 346/992] Migrate uninstallation errors to diagnostic error
 format

---
 news/10421.feature.rst                 |  1 +
 src/pip/_internal/cli/base_command.py  |  2 --
 src/pip/_internal/exceptions.py        | 46 +++++++++++++++++++++++---
 src/pip/_internal/req/req_uninstall.py | 22 +++---------
 tests/functional/test_uninstall.py     | 22 ++++++------
 5 files changed, 57 insertions(+), 36 deletions(-)
 create mode 100644 news/10421.feature.rst

diff --git a/news/10421.feature.rst b/news/10421.feature.rst
new file mode 100644
index 00000000000..49bb72bc0d8
--- /dev/null
+++ b/news/10421.feature.rst
@@ -0,0 +1 @@
+Reword and improve presentation of uninstallation errors.
diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py
index db9d5cc6624..09f8c75ff87 100644
--- a/src/pip/_internal/cli/base_command.py
+++ b/src/pip/_internal/cli/base_command.py
@@ -28,7 +28,6 @@
     InstallationError,
     NetworkConnectionError,
     PreviousBuildDirError,
-    UninstallationError,
 )
 from pip._internal.utils.filesystem import check_path_owner
 from pip._internal.utils.logging import BrokenStdoutLoggingError, setup_logging
@@ -192,7 +191,6 @@ def exc_logging_wrapper(*args: Any) -> int:
                     return PREVIOUS_BUILD_DIR_ERROR
                 except (
                     InstallationError,
-                    UninstallationError,
                     BadCommand,
                     NetworkConnectionError,
                 ) as exc:
diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index 0609e450683..37d519166ea 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -184,10 +184,6 @@ class InstallationError(PipError):
     """General exception during installation"""
 
 
-class UninstallationError(PipError):
-    """General exception during uninstallation"""
-
-
 class MissingPyProjectBuildRequires(DiagnosticPipError):
     """Raised when pyproject.toml has `build-system`, but no `build-system.requires`."""
 
@@ -726,3 +722,45 @@ def from_config(
             exc_info = logger.isEnabledFor(VERBOSE)
             logger.warning("Failed to read %s", config, exc_info=exc_info)
         return cls(None)
+
+
+class UninstallMissingRecord(DiagnosticPipError):
+    reference = "uninstall-no-record-file"
+
+    def __init__(self, *, distribution: "BaseDistribution") -> None:
+        installer = distribution.installer
+        if not installer or installer == "pip":
+            dep = f"{distribution.raw_name}=={distribution.version}"
+            hint = Text.assemble(
+                "You might be able to recover from this via: ",
+                (f"pip install --force-reinstall --no-deps {dep}", "green"),
+            )
+        else:
+            hint = Text(
+                f"The package was installed by {installer}. "
+                "You should check if it can uninstall the package."
+            )
+
+        super().__init__(
+            message=Text(f"Cannot uninstall {distribution}"),
+            context=(
+                "The package's contents are unknown: "
+                f"no RECORD file was found for {distribution.raw_name}."
+            ),
+            hint_stmt=hint,
+        )
+
+
+class LegacyDistutilsInstall(DiagnosticPipError):
+    reference = "uninstall-distutils-installed-package"
+
+    def __init__(self, *, distribution: "BaseDistribution") -> None:
+        super().__init__(
+            message=Text(f"Cannot uninstall {distribution}"),
+            context=(
+                "It is a distutils installed project and thus we cannot accurately "
+                "determine which files belong to it which would lead to only a partial "
+                "uninstall."
+            ),
+            hint_stmt=None,
+        )
diff --git a/src/pip/_internal/req/req_uninstall.py b/src/pip/_internal/req/req_uninstall.py
index 3a9ae2b1097..9498fe67930 100644
--- a/src/pip/_internal/req/req_uninstall.py
+++ b/src/pip/_internal/req/req_uninstall.py
@@ -5,7 +5,7 @@
 from importlib.util import cache_from_source
 from typing import Any, Callable, Dict, Generator, Iterable, List, Optional, Set, Tuple
 
-from pip._internal.exceptions import UninstallationError
+from pip._internal.exceptions import LegacyDistutilsInstall, UninstallMissingRecord
 from pip._internal.locations import get_bin_prefix, get_bin_user
 from pip._internal.metadata import BaseDistribution
 from pip._internal.utils.compat import WINDOWS
@@ -61,7 +61,7 @@ def uninstallation_paths(dist: BaseDistribution) -> Generator[str, None, None]:
 
     UninstallPathSet.add() takes care of the __pycache__ .py[co].
 
-    If RECORD is not found, raises UninstallationError,
+    If RECORD is not found, raises an error,
     with possible information from the INSTALLER file.
 
     https://packaging.python.org/specifications/recording-installed-packages/
@@ -71,17 +71,7 @@ def uninstallation_paths(dist: BaseDistribution) -> Generator[str, None, None]:
 
     entries = dist.iter_declared_entries()
     if entries is None:
-        msg = f"Cannot uninstall {dist}, RECORD file not found."
-        installer = dist.installer
-        if not installer or installer == "pip":
-            dep = f"{dist.raw_name}=={dist.version}"
-            msg += (
-                " You might be able to recover from this via: "
-                f"'pip install --force-reinstall --no-deps {dep}'."
-            )
-        else:
-            msg += f" Hint: The package was installed by {installer}."
-        raise UninstallationError(msg)
+        raise UninstallMissingRecord(distribution=dist)
 
     for entry in entries:
         path = os.path.join(location, entry)
@@ -509,11 +499,7 @@ def from_dist(cls, dist: BaseDistribution) -> "UninstallPathSet":
                     paths_to_remove.add(f"{path}.pyo")
 
         elif dist.installed_by_distutils:
-            raise UninstallationError(
-                f"Cannot uninstall {dist.raw_name!r}. It is a distutils installed "
-                "project and thus we cannot accurately determine which files belong "
-                "to it which would lead to only a partial uninstall."
-            )
+            raise LegacyDistutilsInstall(distribution=dist)
 
         elif dist.installed_as_egg:
             # package installed by easy_install
diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py
index af140e07159..5bf64119e34 100644
--- a/tests/functional/test_uninstall.py
+++ b/tests/functional/test_uninstall.py
@@ -65,10 +65,10 @@ def test_basic_uninstall_distutils(script: PipTestEnvironment) -> None:
     result = script.pip(
         "uninstall", "distutils_install", "-y", expect_stderr=True, expect_error=True
     )
+    assert "Cannot uninstall distutils-install 0.1" in result.stderr
     assert (
-        "Cannot uninstall 'distutils-install'. It is a distutils installed "
-        "project and thus we cannot accurately determine which files belong "
-        "to it which would lead to only a partial uninstall."
+        "It is a distutils installed project and thus we cannot accurately determine "
+        "which files belong to it which would lead to only a partial uninstall."
     ) in result.stderr
 
 
@@ -590,18 +590,16 @@ def test_uninstall_without_record_fails(
             installer_path.write_text(installer + os.linesep)
 
     result2 = script.pip("uninstall", "simple.dist", "-y", expect_error=True)
-    expected_error_message = (
-        "ERROR: Cannot uninstall simple.dist 0.1, RECORD file not found."
-    )
+    assert "Cannot uninstall simple.dist 0.1" in result2.stderr
+    assert "no RECORD file was found for simple.dist" in result2.stderr
     if not isinstance(installer, str) or not installer.strip() or installer == "pip":
-        expected_error_message += (
-            " You might be able to recover from this via: "
-            "'pip install --force-reinstall --no-deps "
-            "simple.dist==0.1'."
+        hint = (
+            "You might be able to recover from this via: "
+            "pip install --force-reinstall --no-deps simple.dist==0.1"
         )
     elif installer:
-        expected_error_message += f" Hint: The package was installed by {installer}."
-    assert result2.stderr.rstrip() == expected_error_message
+        hint = f"The package was installed by {installer}."
+    assert f"hint: {hint}" in result2.stderr
     assert_all_changes(result.files_after, result2, ignore_changes)
 
 

From f1c1d9778d43545fdf89bac4723b6592ef0eddc2 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 27 Apr 2024 23:02:01 -0400
Subject: [PATCH 347/992] Cache hashes for specifier requirements and
 _InstallRequirementBackedCandidate

---
 .../resolution/resolvelib/candidates.py       |  7 ++-
 .../resolution/resolvelib/requirements.py     | 45 ++++++++++++++++---
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 9d15b8fda0a..019ff60a0a5 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -154,6 +154,7 @@ def __init__(
         self._name = name
         self._version = version
         self.dist = self._prepare()
+        self._hash: Optional[int] = None
 
     def __str__(self) -> str:
         return f"{self.name} {self.version}"
@@ -162,7 +163,11 @@ def __repr__(self) -> str:
         return f"{self.__class__.__name__}({str(self._link)!r})"
 
     def __hash__(self) -> int:
-        return hash((self.__class__, self._link))
+        if self._hash is not None:
+            return self._hash
+
+        self._hash = hash((self.__class__, self._link))
+        return self._hash
 
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, self.__class__):
diff --git a/src/pip/_internal/resolution/resolvelib/requirements.py b/src/pip/_internal/resolution/resolvelib/requirements.py
index f980a356f18..b04f41b2191 100644
--- a/src/pip/_internal/resolution/resolvelib/requirements.py
+++ b/src/pip/_internal/resolution/resolvelib/requirements.py
@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
@@ -51,8 +51,18 @@ class SpecifierRequirement(Requirement):
     def __init__(self, ireq: InstallRequirement) -> None:
         assert ireq.link is None, "This is a link, not a specifier"
         self._ireq = ireq
+        self._equal_cache: Optional[str] = None
+        self._hash: Optional[int] = None
         self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras)
 
+    @property
+    def _equal(self) -> str:
+        if self._equal_cache is not None:
+            return self._equal_cache
+
+        self._equal_cache = str(self._ireq)
+        return self._equal_cache
+
     def __str__(self) -> str:
         return str(self._ireq.req)
 
@@ -62,10 +72,14 @@ def __repr__(self) -> str:
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, SpecifierRequirement):
             return NotImplemented
-        return str(self._ireq) == str(other._ireq)
+        return self._equal == other._equal
 
     def __hash__(self) -> int:
-        return hash(str(self._ireq))
+        if self._hash is not None:
+            return self._hash
+
+        self._hash = hash(self._equal)
+        return self._hash
 
     @property
     def project_name(self) -> NormalizedName:
@@ -114,15 +128,29 @@ class SpecifierWithoutExtrasRequirement(SpecifierRequirement):
     def __init__(self, ireq: InstallRequirement) -> None:
         assert ireq.link is None, "This is a link, not a specifier"
         self._ireq = install_req_drop_extras(ireq)
+        self._equal_cache: Optional[str] = None
+        self._hash: Optional[int] = None
         self._extras = frozenset(canonicalize_name(e) for e in self._ireq.extras)
 
+    @property
+    def _equal(self) -> str:
+        if self._equal_cache is not None:
+            return self._equal_cache
+
+        self._equal_cache = str(self._ireq)
+        return self._equal_cache
+
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, SpecifierWithoutExtrasRequirement):
             return NotImplemented
-        return str(self._ireq) == str(other._ireq)
+        return self._equal == other._equal
 
     def __hash__(self) -> int:
-        return hash(str(self._ireq))
+        if self._hash is not None:
+            return self._hash
+
+        self._hash = hash(self._equal)
+        return self._hash
 
 
 class RequiresPythonRequirement(Requirement):
@@ -131,6 +159,7 @@ class RequiresPythonRequirement(Requirement):
     def __init__(self, specifier: SpecifierSet, match: Candidate) -> None:
         self.specifier = specifier
         self._specifier_string = str(specifier)  # for faster __eq__
+        self._hash: Optional[int] = None
         self._candidate = match
 
     def __str__(self) -> str:
@@ -140,7 +169,11 @@ def __repr__(self) -> str:
         return f"{self.__class__.__name__}({str(self.specifier)!r})"
 
     def __hash__(self) -> int:
-        return hash((self._specifier_string, self._candidate))
+        if self._hash is not None:
+            return self._hash
+
+        self._hash = hash((self._specifier_string, self._candidate))
+        return self._hash
 
     def __eq__(self, other: Any) -> bool:
         if not isinstance(other, RequiresPythonRequirement):

From 1e510e3bb126f22550bb495361ec7e7f58e36f9d Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 27 Apr 2024 23:13:08 -0400
Subject: [PATCH 348/992] NEWS ENTRY

---
 news/12657.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12657.feature.rst

diff --git a/news/12657.feature.rst b/news/12657.feature.rst
new file mode 100644
index 00000000000..27e4966b9a3
--- /dev/null
+++ b/news/12657.feature.rst
@@ -0,0 +1 @@
+Further improve resolution performance of large dependency trees, by caching hash calculations.

From 253b4323494828662aefb05378494ce5b88c0ea8 Mon Sep 17 00:00:00 2001
From: Ofek Lev 
Date: Tue, 30 Apr 2024 19:25:27 -0400
Subject: [PATCH 349/992] Fix specifier in tests/requirements.txt

---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 7fba866c745..8eb02d6ca5b 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,4 @@
-cffi @ https://github.com/python-cffi/cffi/archive/refs/heads/main.zip; python_version > "3.12" # Temporary workaround for Python 3.13 until next CFFI release
+cffi @ https://github.com/python-cffi/cffi/archive/refs/heads/main.zip ; python_version > "3.12" # Temporary workaround for Python 3.13 until next CFFI release
 cryptography
 freezegun
 installer

From 06319f213f004baf82275525284512a201127da5 Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Thu, 2 May 2024 13:27:42 +0100
Subject: [PATCH 350/992] Fix #12666 by pre-loading script wrapper code

---
 src/pip/_vendor/distlib/scripts.py   | 26 ++++++++++++++++++++------
 tests/functional/test_self_update.py | 22 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 tests/functional/test_self_update.py

diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py
index cfa45d2af18..e16292b8330 100644
--- a/src/pip/_vendor/distlib/scripts.py
+++ b/src/pip/_vendor/distlib/scripts.py
@@ -49,6 +49,24 @@
     sys.exit(%(func)s())
 '''
 
+# Pre-fetch the contents of all executable wrapper stubs.
+# This is to address https://github.com/pypa/pip/issues/12666.
+# When updating pip, we rename the old pip in place before installing the
+# new version. If we try to fetch a wrapper *after* that rename, the finder
+# machinery will be confused as the package is no longer available at the
+# location where it was imported from. So we load everything into memory in
+# advance.
+
+# Issue 31: don't hardcode an absolute package name, but
+# determine it relative to the current package
+distlib_package = __name__.rsplit('.', 1)[0]
+
+WRAPPERS = {
+    r.name: r.bytes
+    for r in finder(distlib_package).iterator("")
+    if r.name.endswith(".exe")
+}
+
 
 def enquote_executable(executable):
     if ' ' in executable:
@@ -409,15 +427,11 @@ def _get_launcher(self, kind):
                 bits = '32'
             platform_suffix = '-arm' if get_platform() == 'win-arm64' else ''
             name = '%s%s%s.exe' % (kind, bits, platform_suffix)
-            # Issue 31: don't hardcode an absolute package name, but
-            # determine it relative to the current package
-            distlib_package = __name__.rsplit('.', 1)[0]
-            resource = finder(distlib_package).find(name)
-            if not resource:
+            if name not in WRAPPERS:
                 msg = ('Unable to find resource %s in package %s' %
                        (name, distlib_package))
                 raise ValueError(msg)
-            return resource.bytes
+            return WRAPPERS[name]
 
     # Public API follows
 
diff --git a/tests/functional/test_self_update.py b/tests/functional/test_self_update.py
new file mode 100644
index 00000000000..c507552208a
--- /dev/null
+++ b/tests/functional/test_self_update.py
@@ -0,0 +1,22 @@
+# Check that pip can update itself correctly
+
+from typing import Any
+
+
+def test_self_update_editable(script: Any, pip_src: Any) -> None:
+    # Test that if we have an environment with pip installed in non-editable
+    # mode, that pip can safely update itself to an editable install.
+    # See https://github.com/pypa/pip/issues/12666 for details.
+
+    # Step 1. Install pip as non-editable. This is expected to succeed as
+    # the existing pip in the environment is installed in editable mode, so
+    # it only places a .pth file in the environment.
+    proc = script.pip("install", pip_src)
+    assert proc.returncode == 0
+    # Step 2. Using the pip we just installed, install pip *again*, but
+    # in editable mode. This could fail, as we'll need to uninstall the running
+    # pip in order to install the new copy, and uninstalling pip while it's
+    # running could fail. This test is specifically to ensure that doesn't
+    # happen...
+    proc = script.pip("install", "-e", pip_src)
+    assert proc.returncode == 0

From e5a11b9afceb821adc266f28cbeb8556a2389210 Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Thu, 2 May 2024 13:35:37 +0100
Subject: [PATCH 351/992] Make the distlib changes into a patch

---
 tools/vendoring/patches/distlib.patch | 47 +++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 tools/vendoring/patches/distlib.patch

diff --git a/tools/vendoring/patches/distlib.patch b/tools/vendoring/patches/distlib.patch
new file mode 100644
index 00000000000..de2834710a3
--- /dev/null
+++ b/tools/vendoring/patches/distlib.patch
@@ -0,0 +1,47 @@
+diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py
+index cfa45d2af..e16292b83 100644
+--- a/src/pip/_vendor/distlib/scripts.py
++++ b/src/pip/_vendor/distlib/scripts.py
+@@ -49,6 +49,24 @@ if __name__ == '__main__':
+     sys.exit(%(func)s())
+ '''
+ 
++# Pre-fetch the contents of all executable wrapper stubs.
++# This is to address https://github.com/pypa/pip/issues/12666.
++# When updating pip, we rename the old pip in place before installing the
++# new version. If we try to fetch a wrapper *after* that rename, the finder
++# machinery will be confused as the package is no longer available at the
++# location where it was imported from. So we load everything into memory in
++# advance.
++
++# Issue 31: don't hardcode an absolute package name, but
++# determine it relative to the current package
++distlib_package = __name__.rsplit('.', 1)[0]
++
++WRAPPERS = {
++    r.name: r.bytes
++    for r in finder(distlib_package).iterator("")
++    if r.name.endswith(".exe")
++}
++
+ 
+ def enquote_executable(executable):
+     if ' ' in executable:
+@@ -409,15 +427,11 @@ class ScriptMaker(object):
+                 bits = '32'
+             platform_suffix = '-arm' if get_platform() == 'win-arm64' else ''
+             name = '%s%s%s.exe' % (kind, bits, platform_suffix)
+-            # Issue 31: don't hardcode an absolute package name, but
+-            # determine it relative to the current package
+-            distlib_package = __name__.rsplit('.', 1)[0]
+-            resource = finder(distlib_package).find(name)
+-            if not resource:
++            if name not in WRAPPERS:
+                 msg = ('Unable to find resource %s in package %s' %
+                        (name, distlib_package))
+                 raise ValueError(msg)
+-            return resource.bytes
++            return WRAPPERS[name]
+ 
+     # Public API follows
+ 

From 8fe52159b4182e5658bd15624409e27e1611e655 Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Thu, 2 May 2024 13:51:09 +0100
Subject: [PATCH 352/992] Add a news file

---
 news/12666.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12666.bugfix.rst

diff --git a/news/12666.bugfix.rst b/news/12666.bugfix.rst
new file mode 100644
index 00000000000..72a4a65155e
--- /dev/null
+++ b/news/12666.bugfix.rst
@@ -0,0 +1 @@
+Fix intermittent "cannot locate t64.exe" errors when upgrading pip.

From 80ebc8ae258d13ad2a05d5dfca0b986df1c18830 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 3 May 2024 20:58:44 +0100
Subject: [PATCH 353/992] Upgrade CacheControl to 0.14.0

---
 news/CacheControl.vendor.rst                  |  1 +
 pyproject.toml                                |  1 -
 src/pip/_vendor/cachecontrol/__init__.py      |  2 +-
 src/pip/_vendor/cachecontrol/adapter.py       | 10 +--
 .../_vendor/cachecontrol/caches/file_cache.py |  7 +-
 src/pip/_vendor/cachecontrol/controller.py    |  7 +-
 src/pip/_vendor/cachecontrol/heuristics.py    |  2 +-
 src/pip/_vendor/cachecontrol/serialize.py     | 76 ++-----------------
 src/pip/_vendor/vendor.txt                    |  2 +-
 9 files changed, 27 insertions(+), 81 deletions(-)
 create mode 100644 news/CacheControl.vendor.rst

diff --git a/news/CacheControl.vendor.rst b/news/CacheControl.vendor.rst
new file mode 100644
index 00000000000..f6132b8332e
--- /dev/null
+++ b/news/CacheControl.vendor.rst
@@ -0,0 +1 @@
+Upgrade CacheControl to 0.14.0
diff --git a/pyproject.toml b/pyproject.toml
index 74a7f71ca59..6d1f48c11a2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -144,7 +144,6 @@ distro = []
 setuptools = "pkg_resources"
 
 [tool.vendoring.license.fallback-urls]
-CacheControl = "https://raw.githubusercontent.com/ionrock/cachecontrol/v0.12.6/LICENSE.txt"
 distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
 webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE"
 
diff --git a/src/pip/_vendor/cachecontrol/__init__.py b/src/pip/_vendor/cachecontrol/__init__.py
index 4d20bc9b12a..b34b0fcbd40 100644
--- a/src/pip/_vendor/cachecontrol/__init__.py
+++ b/src/pip/_vendor/cachecontrol/__init__.py
@@ -8,7 +8,7 @@
 """
 __author__ = "Eric Larson"
 __email__ = "eric@ionrock.org"
-__version__ = "0.13.1"
+__version__ = "0.14.0"
 
 from pip._vendor.cachecontrol.adapter import CacheControlAdapter
 from pip._vendor.cachecontrol.controller import CacheController
diff --git a/src/pip/_vendor/cachecontrol/adapter.py b/src/pip/_vendor/cachecontrol/adapter.py
index 3e83e308dba..fbb4ecc8876 100644
--- a/src/pip/_vendor/cachecontrol/adapter.py
+++ b/src/pip/_vendor/cachecontrol/adapter.py
@@ -125,21 +125,21 @@ def build_response(
             else:
                 # Wrap the response file with a wrapper that will cache the
                 #   response when the stream has been consumed.
-                response._fp = CallbackFileWrapper(  # type: ignore[attr-defined]
-                    response._fp,  # type: ignore[attr-defined]
+                response._fp = CallbackFileWrapper(  # type: ignore[assignment]
+                    response._fp,  # type: ignore[arg-type]
                     functools.partial(
                         self.controller.cache_response, request, response
                     ),
                 )
                 if response.chunked:
-                    super_update_chunk_length = response._update_chunk_length  # type: ignore[attr-defined]
+                    super_update_chunk_length = response._update_chunk_length
 
                     def _update_chunk_length(self: HTTPResponse) -> None:
                         super_update_chunk_length()
                         if self.chunk_left == 0:
-                            self._fp._close()  # type: ignore[attr-defined]
+                            self._fp._close()  # type: ignore[union-attr]
 
-                    response._update_chunk_length = types.MethodType(  # type: ignore[attr-defined]
+                    response._update_chunk_length = types.MethodType(  # type: ignore[method-assign]
                         _update_chunk_length, response
                     )
 
diff --git a/src/pip/_vendor/cachecontrol/caches/file_cache.py b/src/pip/_vendor/cachecontrol/caches/file_cache.py
index 1fd28013084..e6e3a57947f 100644
--- a/src/pip/_vendor/cachecontrol/caches/file_cache.py
+++ b/src/pip/_vendor/cachecontrol/caches/file_cache.py
@@ -6,7 +6,8 @@
 import hashlib
 import os
 from textwrap import dedent
-from typing import IO, TYPE_CHECKING
+from typing import IO, TYPE_CHECKING, Union
+from pathlib import Path
 
 from pip._vendor.cachecontrol.cache import BaseCache, SeparateBodyBaseCache
 from pip._vendor.cachecontrol.controller import CacheController
@@ -63,7 +64,7 @@ class _FileCacheMixin:
 
     def __init__(
         self,
-        directory: str,
+        directory: str | Path,
         forever: bool = False,
         filemode: int = 0o0600,
         dirmode: int = 0o0700,
@@ -79,7 +80,7 @@ def __init__(
                 """
             NOTE: In order to use the FileCache you must have
             filelock installed. You can install it via pip:
-              pip install filelock
+              pip install cachecontrol[filecache]
             """
             )
             raise ImportError(notice)
diff --git a/src/pip/_vendor/cachecontrol/controller.py b/src/pip/_vendor/cachecontrol/controller.py
index 586b9f97b80..d7dd86e5f70 100644
--- a/src/pip/_vendor/cachecontrol/controller.py
+++ b/src/pip/_vendor/cachecontrol/controller.py
@@ -142,6 +142,11 @@ def _load_from_cache(self, request: PreparedRequest) -> HTTPResponse | None:
         """
         Load a cached response, or return None if it's not available.
         """
+        # We do not support caching of partial content: so if the request contains a
+        # Range header then we don't want to load anything from the cache.
+        if "Range" in request.headers:
+            return None
+
         cache_url = request.url
         assert cache_url is not None
         cache_data = self.cache.get(cache_url)
@@ -480,7 +485,7 @@ def update_cached_response(
         cached_response.headers.update(
             {
                 k: v
-                for k, v in response.headers.items()  # type: ignore[no-untyped-call]
+                for k, v in response.headers.items()
                 if k.lower() not in excluded_headers
             }
         )
diff --git a/src/pip/_vendor/cachecontrol/heuristics.py b/src/pip/_vendor/cachecontrol/heuristics.py
index b9d72ca4ac5..f6e5634e385 100644
--- a/src/pip/_vendor/cachecontrol/heuristics.py
+++ b/src/pip/_vendor/cachecontrol/heuristics.py
@@ -68,7 +68,7 @@ def update_headers(self, response: HTTPResponse) -> dict[str, str]:
 
         if "expires" not in response.headers:
             date = parsedate(response.headers["date"])
-            expires = expire_after(timedelta(days=1), date=datetime(*date[:6], tzinfo=timezone.utc))  # type: ignore[misc]
+            expires = expire_after(timedelta(days=1), date=datetime(*date[:6], tzinfo=timezone.utc))  # type: ignore[index,misc]
             headers["expires"] = datetime_to_header(expires)
             headers["cache-control"] = "public"
         return headers
diff --git a/src/pip/_vendor/cachecontrol/serialize.py b/src/pip/_vendor/cachecontrol/serialize.py
index f9e967c3c34..a49487a1493 100644
--- a/src/pip/_vendor/cachecontrol/serialize.py
+++ b/src/pip/_vendor/cachecontrol/serialize.py
@@ -32,13 +32,13 @@ def dumps(
             # also update the response with a new file handler to be
             # sure it acts as though it was never read.
             body = response.read(decode_content=False)
-            response._fp = io.BytesIO(body)  # type: ignore[attr-defined]
+            response._fp = io.BytesIO(body)  # type: ignore[assignment]
             response.length_remaining = len(body)
 
         data = {
             "response": {
                 "body": body,  # Empty bytestring if body is stored separately
-                "headers": {str(k): str(v) for k, v in response.headers.items()},  # type: ignore[no-untyped-call]
+                "headers": {str(k): str(v) for k, v in response.headers.items()},
                 "status": response.status,
                 "version": response.version,
                 "reason": str(response.reason),
@@ -72,31 +72,14 @@ def loads(
         if not data:
             return None
 
-        # Determine what version of the serializer the data was serialized
-        # with
-        try:
-            ver, data = data.split(b",", 1)
-        except ValueError:
-            ver = b"cc=0"
-
-        # Make sure that our "ver" is actually a version and isn't a false
-        # positive from a , being in the data stream.
-        if ver[:3] != b"cc=":
-            data = ver + data
-            ver = b"cc=0"
-
-        # Get the version number out of the cc=N
-        verstr = ver.split(b"=", 1)[-1].decode("ascii")
-
-        # Dispatch to the actual load method for the given version
-        try:
-            return getattr(self, f"_loads_v{verstr}")(request, data, body_file)  # type: ignore[no-any-return]
-
-        except AttributeError:
-            # This is a version we don't have a loads function for, so we'll
-            # just treat it as a miss and return None
+        # Previous versions of this library supported other serialization
+        # formats, but these have all been removed.
+        if not data.startswith(f"cc={self.serde_version},".encode()):
             return None
 
+        data = data[5:]
+        return self._loads_v4(request, data, body_file)
+
     def prepare_response(
         self,
         request: PreparedRequest,
@@ -149,49 +132,6 @@ def prepare_response(
 
         return HTTPResponse(body=body, preload_content=False, **cached["response"])
 
-    def _loads_v0(
-        self,
-        request: PreparedRequest,
-        data: bytes,
-        body_file: IO[bytes] | None = None,
-    ) -> None:
-        # The original legacy cache data. This doesn't contain enough
-        # information to construct everything we need, so we'll treat this as
-        # a miss.
-        return None
-
-    def _loads_v1(
-        self,
-        request: PreparedRequest,
-        data: bytes,
-        body_file: IO[bytes] | None = None,
-    ) -> HTTPResponse | None:
-        # The "v1" pickled cache format. This is no longer supported
-        # for security reasons, so we treat it as a miss.
-        return None
-
-    def _loads_v2(
-        self,
-        request: PreparedRequest,
-        data: bytes,
-        body_file: IO[bytes] | None = None,
-    ) -> HTTPResponse | None:
-        # The "v2" compressed base64 cache format.
-        # This has been removed due to age and poor size/performance
-        # characteristics, so we treat it as a miss.
-        return None
-
-    def _loads_v3(
-        self,
-        request: PreparedRequest,
-        data: bytes,
-        body_file: IO[bytes] | None = None,
-    ) -> None:
-        # Due to Python 2 encoding issues, it's impossible to know for sure
-        # exactly how to load v3 entries, thus we'll treat these as a miss so
-        # that they get rewritten out as v4 entries.
-        return None
-
     def _loads_v4(
         self,
         request: PreparedRequest,
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index f00a8c02db4..bb962664d08 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -1,4 +1,4 @@
-CacheControl==0.13.1  # Make sure to update the license in pyproject.toml for this.
+CacheControl==0.14.0
 colorama==0.4.6
 distlib==0.3.8
 distro==1.9.0

From 531bf756080b5b97d8c4601c683b3558dd2414ef Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 3 May 2024 20:59:26 +0100
Subject: [PATCH 354/992] Upgrade platformdirs to 4.2.1

---
 news/platformdirs.vendor.rst             |  2 +-
 src/pip/_vendor/platformdirs/__init__.py | 76 ++++++++++++------------
 src/pip/_vendor/platformdirs/__main__.py |  2 +-
 src/pip/_vendor/platformdirs/android.py  | 27 +++++----
 src/pip/_vendor/platformdirs/api.py      | 33 ++++++----
 src/pip/_vendor/platformdirs/macos.py    | 11 ++--
 src/pip/_vendor/platformdirs/unix.py     | 37 +++++++-----
 src/pip/_vendor/platformdirs/version.py  |  4 +-
 src/pip/_vendor/platformdirs/windows.py  | 35 ++++++-----
 src/pip/_vendor/vendor.txt               |  2 +-
 10 files changed, 129 insertions(+), 100 deletions(-)

diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
index fb749d1ab8d..4c1af68710e 100644
--- a/news/platformdirs.vendor.rst
+++ b/news/platformdirs.vendor.rst
@@ -1 +1 @@
-Upgrade platformdirs to 4.2.0
+Upgrade platformdirs to 4.2.1
diff --git a/src/pip/_vendor/platformdirs/__init__.py b/src/pip/_vendor/platformdirs/__init__.py
index 3da5ac1474f..d58dd2b7dde 100644
--- a/src/pip/_vendor/platformdirs/__init__.py
+++ b/src/pip/_vendor/platformdirs/__init__.py
@@ -1,6 +1,8 @@
 """
-Utilities for determining application-specific dirs. See  for details and
-usage.
+Utilities for determining application-specific dirs.
+
+See  for details and usage.
+
 """
 
 from __future__ import annotations
@@ -20,22 +22,22 @@
 
 def _set_platform_dir_class() -> type[PlatformDirsABC]:
     if sys.platform == "win32":
-        from pip._vendor.platformdirs.windows import Windows as Result
+        from pip._vendor.platformdirs.windows import Windows as Result  # noqa: PLC0415
     elif sys.platform == "darwin":
-        from pip._vendor.platformdirs.macos import MacOS as Result
+        from pip._vendor.platformdirs.macos import MacOS as Result  # noqa: PLC0415
     else:
-        from pip._vendor.platformdirs.unix import Unix as Result
+        from pip._vendor.platformdirs.unix import Unix as Result  # noqa: PLC0415
 
     if os.getenv("ANDROID_DATA") == "/data" and os.getenv("ANDROID_ROOT") == "/system":
         if os.getenv("SHELL") or os.getenv("PREFIX"):
             return Result
 
-        from pip._vendor.platformdirs.android import _android_folder
+        from pip._vendor.platformdirs.android import _android_folder  # noqa: PLC0415
 
         if _android_folder() is not None:
-            from pip._vendor.platformdirs.android import Android
+            from pip._vendor.platformdirs.android import Android  # noqa: PLC0415
 
-            return Android  # return to avoid redefinition of result
+            return Android  # return to avoid redefinition of a result
 
     return Result
 
@@ -507,7 +509,7 @@ def user_log_path(
 
 
 def user_documents_path() -> Path:
-    """:returns: documents path tied to the user"""
+    """:returns: documents a path tied to the user"""
     return PlatformDirs().user_documents_path
 
 
@@ -585,41 +587,41 @@ def site_runtime_path(
 
 
 __all__ = [
-    "__version__",
-    "__version_info__",
-    "PlatformDirs",
     "AppDirs",
+    "PlatformDirs",
     "PlatformDirsABC",
-    "user_data_dir",
-    "user_config_dir",
-    "user_cache_dir",
-    "user_state_dir",
-    "user_log_dir",
-    "user_documents_dir",
-    "user_downloads_dir",
-    "user_pictures_dir",
-    "user_videos_dir",
-    "user_music_dir",
-    "user_desktop_dir",
-    "user_runtime_dir",
-    "site_data_dir",
-    "site_config_dir",
+    "__version__",
+    "__version_info__",
     "site_cache_dir",
+    "site_cache_path",
+    "site_config_dir",
+    "site_config_path",
+    "site_data_dir",
+    "site_data_path",
     "site_runtime_dir",
-    "user_data_path",
-    "user_config_path",
+    "site_runtime_path",
+    "user_cache_dir",
     "user_cache_path",
-    "user_state_path",
-    "user_log_path",
+    "user_config_dir",
+    "user_config_path",
+    "user_data_dir",
+    "user_data_path",
+    "user_desktop_dir",
+    "user_desktop_path",
+    "user_documents_dir",
     "user_documents_path",
+    "user_downloads_dir",
     "user_downloads_path",
-    "user_pictures_path",
-    "user_videos_path",
+    "user_log_dir",
+    "user_log_path",
+    "user_music_dir",
     "user_music_path",
-    "user_desktop_path",
+    "user_pictures_dir",
+    "user_pictures_path",
+    "user_runtime_dir",
     "user_runtime_path",
-    "site_data_path",
-    "site_config_path",
-    "site_cache_path",
-    "site_runtime_path",
+    "user_state_dir",
+    "user_state_path",
+    "user_videos_dir",
+    "user_videos_path",
 ]
diff --git a/src/pip/_vendor/platformdirs/__main__.py b/src/pip/_vendor/platformdirs/__main__.py
index 61342265b60..fa8a677a336 100644
--- a/src/pip/_vendor/platformdirs/__main__.py
+++ b/src/pip/_vendor/platformdirs/__main__.py
@@ -24,7 +24,7 @@
 
 
 def main() -> None:
-    """Run main entry point."""
+    """Run the main entry point."""
     app_name = "MyApp"
     app_author = "MyCompany"
 
diff --git a/src/pip/_vendor/platformdirs/android.py b/src/pip/_vendor/platformdirs/android.py
index 4acdb63833f..fefafd32977 100644
--- a/src/pip/_vendor/platformdirs/android.py
+++ b/src/pip/_vendor/platformdirs/android.py
@@ -13,10 +13,11 @@
 
 class Android(PlatformDirsABC):
     """
-    Follows the guidance `from here `_. Makes use of the
-    `appname `,
-    `version `,
-    `ensure_exists `.
+    Follows the guidance `from here `_.
+
+    Makes use of the `appname `, `version
+    `, `ensure_exists `.
+
     """
 
     @property
@@ -44,7 +45,7 @@ def site_config_dir(self) -> str:
 
     @property
     def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user, e.g. e.g. ``/data/user///cache/``"""
+        """:return: cache directory tied to the user, e.g.,``/data/user///cache/``"""
         return self._append_app_name_and_version(cast(str, _android_folder()), "cache")
 
     @property
@@ -119,13 +120,13 @@ def site_runtime_dir(self) -> str:
 def _android_folder() -> str | None:
     """:return: base folder for the Android OS or None if it cannot be found"""
     try:
-        # First try to get path to android app via pyjnius
-        from jnius import autoclass
+        # First try to get a path to android app via pyjnius
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         result: str | None = context.getFilesDir().getParentFile().getAbsolutePath()
     except Exception:  # noqa: BLE001
-        # if fails find an android folder looking path on the sys.path
+        # if fails find an android folder looking a path on the sys.path
         pattern = re.compile(r"/data/(data|user/\d+)/(.+)/files")
         for path in sys.path:
             if pattern.match(path):
@@ -141,7 +142,7 @@ def _android_documents_folder() -> str:
     """:return: documents folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -157,7 +158,7 @@ def _android_downloads_folder() -> str:
     """:return: downloads folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -173,7 +174,7 @@ def _android_pictures_folder() -> str:
     """:return: pictures folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -189,7 +190,7 @@ def _android_videos_folder() -> str:
     """:return: videos folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -205,7 +206,7 @@ def _android_music_folder() -> str:
     """:return: music folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass
+        from jnius import autoclass  # noqa: PLC0415
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
diff --git a/src/pip/_vendor/platformdirs/api.py b/src/pip/_vendor/platformdirs/api.py
index 031a38a3d36..c50caa648a6 100644
--- a/src/pip/_vendor/platformdirs/api.py
+++ b/src/pip/_vendor/platformdirs/api.py
@@ -11,10 +11,10 @@
     from typing import Iterator, Literal
 
 
-class PlatformDirsABC(ABC):
+class PlatformDirsABC(ABC):  # noqa: PLR0904
     """Abstract base class for platform directories."""
 
-    def __init__(  # noqa: PLR0913
+    def __init__(  # noqa: PLR0913, PLR0917
         self,
         appname: str | None = None,
         appauthor: str | None | Literal[False] = None,
@@ -34,34 +34,47 @@ def __init__(  # noqa: PLR0913
         :param multipath: See `multipath`.
         :param opinion: See `opinion`.
         :param ensure_exists: See `ensure_exists`.
+
         """
         self.appname = appname  #: The name of application.
         self.appauthor = appauthor
         """
-        The name of the app author or distributing body for this application. Typically, it is the owning company name.
-        Defaults to `appname`. You may pass ``False`` to disable it.
+        The name of the app author or distributing body for this application.
+
+        Typically, it is the owning company name. Defaults to `appname`. You may pass ``False`` to disable it.
+
         """
         self.version = version
         """
-        An optional version path element to append to the path. You might want to use this if you want multiple versions
-        of your app to be able to run independently. If used, this would typically be ``.``.
+        An optional version path element to append to the path.
+
+        You might want to use this if you want multiple versions of your app to be able to run independently. If used,
+        this would typically be ``.``.
+
         """
         self.roaming = roaming
         """
-        Whether to use the roaming appdata directory on Windows. That means that for users on a Windows network setup
-        for roaming profiles, this user data will be synced on login (see
-        `here `_).
+        Whether to use the roaming appdata directory on Windows.
+
+        That means that for users on a Windows network setup for roaming profiles, this user data will be synced on
+        login (see
+        `here `_).
+
         """
         self.multipath = multipath
         """
         An optional parameter which indicates that the entire list of data dirs should be returned.
+
         By default, the first item would only be returned.
+
         """
         self.opinion = opinion  #: A flag to indicating to use opinionated values.
         self.ensure_exists = ensure_exists
         """
         Optionally create the directory (and any missing parents) upon access if it does not exist.
+
         By default, no directories are created.
+
         """
 
     def _append_app_name_and_version(self, *base: str) -> str:
@@ -200,7 +213,7 @@ def user_log_path(self) -> Path:
 
     @property
     def user_documents_path(self) -> Path:
-        """:return: documents path tied to the user"""
+        """:return: documents a path tied to the user"""
         return Path(self.user_documents_dir)
 
     @property
diff --git a/src/pip/_vendor/platformdirs/macos.py b/src/pip/_vendor/platformdirs/macos.py
index b7b48808ca7..eb1ba5df1da 100644
--- a/src/pip/_vendor/platformdirs/macos.py
+++ b/src/pip/_vendor/platformdirs/macos.py
@@ -10,11 +10,14 @@
 
 class MacOS(PlatformDirsABC):
     """
-    Platform directories for the macOS operating system. Follows the guidance from `Apple documentation
-    `_.
+    Platform directories for the macOS operating system.
+
+    Follows the guidance from
+    `Apple documentation `_.
     Makes use of the `appname `,
     `version `,
     `ensure_exists `.
+
     """
 
     @property
@@ -28,7 +31,7 @@ def site_data_dir(self) -> str:
         :return: data directory shared by users, e.g. ``/Library/Application Support/$appname/$version``.
           If we're using a Python binary managed by `Homebrew `_, the directory
           will be under the Homebrew prefix, e.g. ``/opt/homebrew/share/$appname/$version``.
-          If `multipath ` is enabled and we're in Homebrew,
+          If `multipath ` is enabled, and we're in Homebrew,
           the response is a multi-path string separated by ":", e.g.
           ``/opt/homebrew/share/$appname/$version:/Library/Application Support/$appname/$version``
         """
@@ -60,7 +63,7 @@ def site_cache_dir(self) -> str:
         :return: cache directory shared by users, e.g. ``/Library/Caches/$appname/$version``.
           If we're using a Python binary managed by `Homebrew `_, the directory
           will be under the Homebrew prefix, e.g. ``/opt/homebrew/var/cache/$appname/$version``.
-          If `multipath ` is enabled and we're in Homebrew,
+          If `multipath ` is enabled, and we're in Homebrew,
           the response is a multi-path string separated by ":", e.g.
           ``/opt/homebrew/var/cache/$appname/$version:/Library/Caches/$appname/$version``
         """
diff --git a/src/pip/_vendor/platformdirs/unix.py b/src/pip/_vendor/platformdirs/unix.py
index ca4728e6079..9500ade614c 100644
--- a/src/pip/_vendor/platformdirs/unix.py
+++ b/src/pip/_vendor/platformdirs/unix.py
@@ -6,13 +6,13 @@
 import sys
 from configparser import ConfigParser
 from pathlib import Path
-from typing import Iterator
+from typing import Iterator, NoReturn
 
 from .api import PlatformDirsABC
 
 if sys.platform == "win32":
 
-    def getuid() -> int:
+    def getuid() -> NoReturn:
         msg = "should only be used on Unix"
         raise RuntimeError(msg)
 
@@ -20,17 +20,17 @@ def getuid() -> int:
     from os import getuid
 
 
-class Unix(PlatformDirsABC):
+class Unix(PlatformDirsABC):  # noqa: PLR0904
     """
-    On Unix/Linux, we follow the
-    `XDG Basedir Spec `_. The spec allows
-    overriding directories with environment variables. The examples show are the default values, alongside the name of
-    the environment variable that overrides them. Makes use of the
-    `appname `,
-    `version `,
-    `multipath `,
-    `opinion `,
-    `ensure_exists `.
+    On Unix/Linux, we follow the `XDG Basedir Spec `_.
+
+    The spec allows overriding directories with environment variables. The examples shown are the default values,
+    alongside the name of the environment variable that overrides them. Makes use of the `appname
+    `, `version `, `multipath
+    `, `opinion `, `ensure_exists
+    `.
+
     """
 
     @property
@@ -205,17 +205,17 @@ def site_runtime_dir(self) -> str:
 
     @property
     def site_data_path(self) -> Path:
-        """:return: data path shared by users. Only return first item, even if ``multipath`` is set to ``True``"""
+        """:return: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
         return self._first_item_as_path_if_multipath(self.site_data_dir)
 
     @property
     def site_config_path(self) -> Path:
-        """:return: config path shared by the users. Only return first item, even if ``multipath`` is set to ``True``"""
+        """:return: config path shared by the users, returns the first item, even if ``multipath`` is set to ``True``"""
         return self._first_item_as_path_if_multipath(self.site_config_dir)
 
     @property
     def site_cache_path(self) -> Path:
-        """:return: cache path shared by users. Only return first item, even if ``multipath`` is set to ``True``"""
+        """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
         return self._first_item_as_path_if_multipath(self.site_cache_dir)
 
     def _first_item_as_path_if_multipath(self, directory: str) -> Path:
@@ -246,7 +246,12 @@ def _get_user_media_dir(env_var: str, fallback_tilde_path: str) -> str:
 
 
 def _get_user_dirs_folder(key: str) -> str | None:
-    """Return directory from user-dirs.dirs config file. See https://freedesktop.org/wiki/Software/xdg-user-dirs/."""
+    """
+    Return directory from user-dirs.dirs config file.
+
+    See https://freedesktop.org/wiki/Software/xdg-user-dirs/.
+
+    """
     user_dirs_config_path = Path(Unix().user_config_dir) / "user-dirs.dirs"
     if user_dirs_config_path.exists():
         parser = ConfigParser()
diff --git a/src/pip/_vendor/platformdirs/version.py b/src/pip/_vendor/platformdirs/version.py
index cc1e34568ad..c418cd0c9af 100644
--- a/src/pip/_vendor/platformdirs/version.py
+++ b/src/pip/_vendor/platformdirs/version.py
@@ -12,5 +12,5 @@
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.2.0'
-__version_tuple__ = version_tuple = (4, 2, 0)
+__version__ = version = '4.2.1'
+__version_tuple__ = version_tuple = (4, 2, 1)
diff --git a/src/pip/_vendor/platformdirs/windows.py b/src/pip/_vendor/platformdirs/windows.py
index c62d0c8d2ba..d7bc96091a2 100644
--- a/src/pip/_vendor/platformdirs/windows.py
+++ b/src/pip/_vendor/platformdirs/windows.py
@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import ctypes
 import os
 import sys
 from functools import lru_cache
@@ -16,15 +15,13 @@
 
 class Windows(PlatformDirsABC):
     """
-    `MSDN on where to store app data files
-    `_.
-    Makes use of the
-    `appname `,
-    `appauthor `,
-    `version `,
-    `roaming `,
-    `opinion `,
-    `ensure_exists `.
+    `MSDN on where to store app data files `_.
+
+    Makes use of the `appname `, `appauthor
+    `, `version `, `roaming
+    `, `opinion `, `ensure_exists
+    `.
+
     """
 
     @property
@@ -165,7 +162,7 @@ def get_win_folder_from_env_vars(csidl_name: str) -> str:
 
 
 def get_win_folder_if_csidl_name_not_env_var(csidl_name: str) -> str | None:
-    """Get folder for a CSIDL name that does not exist as an environment variable."""
+    """Get a folder for a CSIDL name that does not exist as an environment variable."""
     if csidl_name == "CSIDL_PERSONAL":
         return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Documents")  # noqa: PTH118
 
@@ -189,6 +186,7 @@ def get_win_folder_from_registry(csidl_name: str) -> str:
 
     This is a fallback technique at best. I'm not sure if using the registry for these guarantees us the correct answer
     for all CSIDL_* names.
+
     """
     shell_folder_name = {
         "CSIDL_APPDATA": "AppData",
@@ -205,7 +203,7 @@ def get_win_folder_from_registry(csidl_name: str) -> str:
         raise ValueError(msg)
     if sys.platform != "win32":  # only needed for mypy type checker to know that this code runs only on Windows
         raise NotImplementedError
-    import winreg
+    import winreg  # noqa: PLC0415
 
     key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
     directory, _ = winreg.QueryValueEx(key, shell_folder_name)
@@ -218,6 +216,8 @@ def get_win_folder_via_ctypes(csidl_name: str) -> str:
     # Use 'CSIDL_PROFILE' (40) and append the default folder 'Downloads' instead.
     # https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid
 
+    import ctypes  # noqa: PLC0415
+
     csidl_const = {
         "CSIDL_APPDATA": 26,
         "CSIDL_COMMON_APPDATA": 35,
@@ -250,10 +250,15 @@ def get_win_folder_via_ctypes(csidl_name: str) -> str:
 
 
 def _pick_get_win_folder() -> Callable[[str], str]:
-    if hasattr(ctypes, "windll"):
-        return get_win_folder_via_ctypes
     try:
-        import winreg  # noqa: F401
+        import ctypes  # noqa: PLC0415
+    except ImportError:
+        pass
+    else:
+        if hasattr(ctypes, "windll"):
+            return get_win_folder_via_ctypes
+    try:
+        import winreg  # noqa: PLC0415, F401
     except ImportError:
         return get_win_folder_from_env_vars
     else:
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index bb962664d08..fc60f5cae04 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -4,7 +4,7 @@ distlib==0.3.8
 distro==1.9.0
 msgpack==1.0.8
 packaging==21.3
-platformdirs==4.2.0
+platformdirs==4.2.1
 pyparsing==3.1.0
 pyproject-hooks==1.0.0
 requests==2.31.0

From f404164d7918b6939e5dceff1b4c41c3e8e1591b Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 3 May 2024 20:59:46 +0100
Subject: [PATCH 355/992] Upgrade pyparsing to 3.1.2

---
 news/pyparsing.vendor.rst                     |   1 +
 src/pip/_vendor/pyparsing/__init__.py         |   7 +-
 src/pip/_vendor/pyparsing/actions.py          |  21 +-
 src/pip/_vendor/pyparsing/common.py           |   9 +-
 src/pip/_vendor/pyparsing/core.py             | 964 +++++++++---------
 src/pip/_vendor/pyparsing/diagram/__init__.py |   2 +-
 src/pip/_vendor/pyparsing/exceptions.py       |  81 +-
 src/pip/_vendor/pyparsing/helpers.py          |  86 +-
 src/pip/_vendor/pyparsing/results.py          | 211 ++--
 src/pip/_vendor/pyparsing/testing.py          | 118 ++-
 src/pip/_vendor/pyparsing/unicode.py          |  13 +-
 src/pip/_vendor/pyparsing/util.py             |  13 +-
 src/pip/_vendor/vendor.txt                    |   2 +-
 13 files changed, 740 insertions(+), 788 deletions(-)
 create mode 100644 news/pyparsing.vendor.rst

diff --git a/news/pyparsing.vendor.rst b/news/pyparsing.vendor.rst
new file mode 100644
index 00000000000..d6aab47079f
--- /dev/null
+++ b/news/pyparsing.vendor.rst
@@ -0,0 +1 @@
+Upgrade pyparsing to 3.1.2
diff --git a/src/pip/_vendor/pyparsing/__init__.py b/src/pip/_vendor/pyparsing/__init__.py
index 88bc10ac18a..83937ebf1f1 100644
--- a/src/pip/_vendor/pyparsing/__init__.py
+++ b/src/pip/_vendor/pyparsing/__init__.py
@@ -120,8 +120,8 @@ def __repr__(self):
         return f"{__name__}.{type(self).__name__}({', '.join('{}={!r}'.format(*nv) for nv in zip(self._fields, self))})"
 
 
-__version_info__ = version_info(3, 1, 0, "final", 1)
-__version_time__ = "18 Jun 2023 14:05 UTC"
+__version_info__ = version_info(3, 1, 2, "final", 1)
+__version_time__ = "06 Mar 2024 07:08 UTC"
 __version__ = __version_info__.__version__
 __versionTime__ = __version_time__
 __author__ = "Paul McGuire "
@@ -319,4 +319,7 @@ def __repr__(self):
     "unicodeString",
     "withAttribute",
     "withClass",
+    "common",
+    "unicode",
+    "testing",
 ]
diff --git a/src/pip/_vendor/pyparsing/actions.py b/src/pip/_vendor/pyparsing/actions.py
index ca6e4c6afb4..ce51b3957ca 100644
--- a/src/pip/_vendor/pyparsing/actions.py
+++ b/src/pip/_vendor/pyparsing/actions.py
@@ -111,7 +111,6 @@ def with_attribute(*args, **attr_dict):
             
1,3 2,3 1,1

             
this has no type

             

-
         '''
         div,div_end = make_html_tags("div")
 
@@ -199,19 +198,9 @@ def with_class(classname, namespace=""):
 
 # pre-PEP8 compatibility symbols
 # fmt: off
-@replaced_by_pep8(replace_with)
-def replaceWith(): ...
-
-@replaced_by_pep8(remove_quotes)
-def removeQuotes(): ...
-
-@replaced_by_pep8(with_attribute)
-def withAttribute(): ...
-
-@replaced_by_pep8(with_class)
-def withClass(): ...
-
-@replaced_by_pep8(match_only_at_col)
-def matchOnlyAtCol(): ...
-
+replaceWith = replaced_by_pep8("replaceWith", replace_with)
+removeQuotes = replaced_by_pep8("removeQuotes", remove_quotes)
+withAttribute = replaced_by_pep8("withAttribute", with_attribute)
+withClass = replaced_by_pep8("withClass", with_class)
+matchOnlyAtCol = replaced_by_pep8("matchOnlyAtCol", match_only_at_col)
 # fmt: on
diff --git a/src/pip/_vendor/pyparsing/common.py b/src/pip/_vendor/pyparsing/common.py
index 7a666b276df..74faa46085a 100644
--- a/src/pip/_vendor/pyparsing/common.py
+++ b/src/pip/_vendor/pyparsing/common.py
@@ -206,7 +206,7 @@ class pyparsing_common:
     scientific notation and returns a float"""
 
     # streamlining this expression makes the docs nicer-looking
-    number = (sci_real | real | signed_integer).setName("number").streamline()
+    number = (sci_real | real | signed_integer).set_name("number").streamline()
     """any numeric expression, returns the corresponding Python type"""
 
     fnumber = (
@@ -216,6 +216,13 @@ class pyparsing_common:
     )
     """any int or real number, returned as float"""
 
+    ieee_float = (
+        Regex(r"(?i)[+-]?((\d+\.?\d*(e[+-]?\d+)?)|nan|inf(inity)?)")
+        .set_name("ieee_float")
+        .set_parse_action(convert_to_float)
+    )
+    """any floating-point literal (int, real number, infinity, or NaN), returned as float"""
+
     identifier = Word(identchars, identbodychars).set_name("identifier")
     """typical code identifier (leading alpha or '_', followed by 0 or more alphas, nums, or '_')"""
 
diff --git a/src/pip/_vendor/pyparsing/core.py b/src/pip/_vendor/pyparsing/core.py
index 8d5a856ecd6..fc403862354 100644
--- a/src/pip/_vendor/pyparsing/core.py
+++ b/src/pip/_vendor/pyparsing/core.py
@@ -571,6 +571,7 @@ def set_results_name(
 
         Example::
 
+            integer = Word(nums)
             date_str = (integer.set_results_name("year") + '/'
                         + integer.set_results_name("month") + '/'
                         + integer.set_results_name("day"))
@@ -610,9 +611,8 @@ def breaker(instring, loc, doActions=True, callPreParse=True):
 
             breaker._originalParseMethod = _parseMethod  # type: ignore [attr-defined]
             self._parse = breaker  # type: ignore [assignment]
-        else:
-            if hasattr(self._parse, "_originalParseMethod"):
-                self._parse = self._parse._originalParseMethod  # type: ignore [attr-defined, assignment]
+        elif hasattr(self._parse, "_originalParseMethod"):
+            self._parse = self._parse._originalParseMethod  # type: ignore [attr-defined, assignment]
         return self
 
     def set_parse_action(self, *fns: ParseAction, **kwargs) -> "ParserElement":
@@ -692,13 +692,15 @@ def is_valid_date(instring, loc, toks):
         """
         if list(fns) == [None]:
             self.parseAction = []
-        else:
-            if not all(callable(fn) for fn in fns):
-                raise TypeError("parse actions must be callable")
-            self.parseAction = [_trim_arity(fn) for fn in fns]
-            self.callDuringTry = kwargs.get(
-                "call_during_try", kwargs.get("callDuringTry", False)
-            )
+            return self
+
+        if not all(callable(fn) for fn in fns):
+            raise TypeError("parse actions must be callable")
+        self.parseAction = [_trim_arity(fn) for fn in fns]
+        self.callDuringTry = kwargs.get(
+            "call_during_try", kwargs.get("callDuringTry", False)
+        )
+
         return self
 
     def add_parse_action(self, *fns: ParseAction, **kwargs) -> "ParserElement":
@@ -771,6 +773,7 @@ def _skipIgnorables(self, instring: str, loc: int) -> int:
             return loc
         exprsFound = True
         ignore_expr_fns = [e._parse for e in self.ignoreExprs]
+        last_loc = loc
         while exprsFound:
             exprsFound = False
             for ignore_fn in ignore_expr_fns:
@@ -780,6 +783,10 @@ def _skipIgnorables(self, instring: str, loc: int) -> int:
                         exprsFound = True
                 except ParseException:
                     pass
+            # check if all ignore exprs matched but didn't actually advance the parse location
+            if loc == last_loc:
+                break
+            last_loc = loc
         return loc
 
     def preParse(self, instring: str, loc: int) -> int:
@@ -939,11 +946,9 @@ class to help type checking
 
         not_in_cache: bool
 
-        def get(self, *args):
-            ...
+        def get(self, *args): ...
 
-        def set(self, *args):
-            ...
+        def set(self, *args): ...
 
     # argument cache for optimizing repeated calls when backtracking through recursive expressions
     packrat_cache = (
@@ -1075,11 +1080,13 @@ def enable_left_recursion(
         elif cache_size_limit > 0:
             ParserElement.recursion_memos = _LRUMemo(capacity=cache_size_limit)  # type: ignore[assignment]
         else:
-            raise NotImplementedError("Memo size of %s" % cache_size_limit)
+            raise NotImplementedError(f"Memo size of {cache_size_limit}")
         ParserElement._left_recursion_enabled = True
 
     @staticmethod
-    def enable_packrat(cache_size_limit: int = 128, *, force: bool = False) -> None:
+    def enable_packrat(
+        cache_size_limit: Union[int, None] = 128, *, force: bool = False
+    ) -> None:
         """
         Enables "packrat" parsing, which adds memoizing to the parsing logic.
         Repeated parse attempts at the same string location (which happens
@@ -1114,13 +1121,16 @@ def enable_packrat(cache_size_limit: int = 128, *, force: bool = False) -> None:
             ParserElement.disable_memoization()
         elif ParserElement._left_recursion_enabled:
             raise RuntimeError("Packrat and Bounded Recursion are not compatible")
-        if not ParserElement._packratEnabled:
-            ParserElement._packratEnabled = True
-            if cache_size_limit is None:
-                ParserElement.packrat_cache = _UnboundedCache()
-            else:
-                ParserElement.packrat_cache = _FifoCache(cache_size_limit)  # type: ignore[assignment]
-            ParserElement._parse = ParserElement._parseCache
+
+        if ParserElement._packratEnabled:
+            return
+
+        ParserElement._packratEnabled = True
+        if cache_size_limit is None:
+            ParserElement.packrat_cache = _UnboundedCache()
+        else:
+            ParserElement.packrat_cache = _FifoCache(cache_size_limit)  # type: ignore[assignment]
+        ParserElement._parse = ParserElement._parseCache
 
     def parse_string(
         self, instring: str, parse_all: bool = False, *, parseAll: bool = False
@@ -1278,9 +1288,9 @@ def scan_string(
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc.with_traceback(None)
+
+            # catch and re-raise exception from here, clears out pyparsing internal stack trace
+            raise exc.with_traceback(None)
 
     def transform_string(self, instring: str, *, debug: bool = False) -> str:
         """
@@ -1310,23 +1320,27 @@ def transform_string(self, instring: str, *, debug: bool = False) -> str:
         try:
             for t, s, e in self.scan_string(instring, debug=debug):
                 out.append(instring[lastE:s])
-                if t:
-                    if isinstance(t, ParseResults):
-                        out += t.as_list()
-                    elif isinstance(t, Iterable) and not isinstance(t, str_type):
-                        out.extend(t)
-                    else:
-                        out.append(t)
                 lastE = e
+
+                if not t:
+                    continue
+
+                if isinstance(t, ParseResults):
+                    out += t.as_list()
+                elif isinstance(t, Iterable) and not isinstance(t, str_type):
+                    out.extend(t)
+                else:
+                    out.append(t)
+
             out.append(instring[lastE:])
             out = [o for o in out if o]
             return "".join([str(s) for s in _flatten(out)])
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc.with_traceback(None)
+
+            # catch and re-raise exception from here, clears out pyparsing internal stack trace
+            raise exc.with_traceback(None)
 
     def search_string(
         self,
@@ -1364,9 +1378,9 @@ def search_string(
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc.with_traceback(None)
+
+            # catch and re-raise exception from here, clears out pyparsing internal stack trace
+            raise exc.with_traceback(None)
 
     def split(
         self,
@@ -1495,9 +1509,12 @@ def __mul__(self, other) -> "ParserElement":
         elif isinstance(other, tuple) and other[:1] == (Ellipsis,):
             other = ((0,) + other[1:] + (None,))[:2]
 
+        if not isinstance(other, (int, tuple)):
+            return NotImplemented
+
         if isinstance(other, int):
             minElements, optElements = other, 0
-        elif isinstance(other, tuple):
+        else:
             other = tuple(o if o is not Ellipsis else None for o in other)
             other = (other + (None, None))[:2]
             if other[0] is None:
@@ -1514,8 +1531,6 @@ def __mul__(self, other) -> "ParserElement":
                 optElements -= minElements
             else:
                 return NotImplemented
-        else:
-            return NotImplemented
 
         if minElements < 0:
             raise ValueError("cannot multiply ParserElement by negative value")
@@ -1704,8 +1719,8 @@ def __call__(self, name: typing.Optional[str] = None) -> "ParserElement":
         """
         if name is not None:
             return self._setResultsName(name)
-        else:
-            return self.copy()
+
+        return self.copy()
 
     def suppress(self) -> "ParserElement":
         """
@@ -1763,7 +1778,7 @@ def ignore(self, other: "ParserElement") -> "ParserElement":
 
         Example::
 
-            patt = Word(alphas)[1, ...]
+            patt = Word(alphas)[...]
             patt.parse_string('ablaj /* comment */ lskjd')
             # -> ['ablaj']
 
@@ -1771,8 +1786,6 @@ def ignore(self, other: "ParserElement") -> "ParserElement":
             patt.parse_string('ablaj /* comment */ lskjd')
             # -> ['ablaj', 'lskjd']
         """
-        import typing
-
         if isinstance(other, str_type):
             other = Suppress(other)
 
@@ -1880,11 +1893,14 @@ def set_name(self, name: str) -> "ParserElement":
 
         Example::
 
-            Word(nums).parse_string("ABC")  # -> Exception: Expected W:(0-9) (at char 0), (line:1, col:1)
-            Word(nums).set_name("integer").parse_string("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
+            integer = Word(nums)
+            integer.parse_string("ABC")  # -> Exception: Expected W:(0-9) (at char 0), (line:1, col:1)
+
+            integer.set_name("integer")
+            integer.parse_string("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
         """
         self.customName = name
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         if __diag__.enable_debug_on_named_expressions:
             self.set_debug()
         return self
@@ -1950,9 +1966,9 @@ def parse_file(
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
-            else:
-                # catch and re-raise exception from here, clears out pyparsing internal stack trace
-                raise exc.with_traceback(None)
+
+            # catch and re-raise exception from here, clears out pyparsing internal stack trace
+            raise exc.with_traceback(None)
 
     def __eq__(self, other):
         if self is other:
@@ -2130,6 +2146,7 @@ def run_tests(
         success = True
         NL = Literal(r"\n").add_parse_action(replace_with("\n")).ignore(quoted_string)
         BOM = "\ufeff"
+        nlstr = "\n"
         for t in tests:
             if comment_specified and comment.matches(t, False) or comments and not t:
                 comments.append(
@@ -2139,7 +2156,7 @@ def run_tests(
             if not t:
                 continue
             out = [
-                "\n" + "\n".join(comments) if comments else "",
+                f"{nlstr}{nlstr.join(comments) if comments else ''}",
                 pyparsing_test.with_line_numbers(t) if with_line_numbers else t,
             ]
             comments = []
@@ -2148,9 +2165,9 @@ def run_tests(
                 t = NL.transform_string(t.lstrip(BOM))
                 result = self.parse_string(t, parse_all=parseAll)
             except ParseBaseException as pe:
-                fatal = "(FATAL)" if isinstance(pe, ParseFatalException) else ""
+                fatal = "(FATAL) " if isinstance(pe, ParseFatalException) else ""
                 out.append(pe.explain())
-                out.append("FAIL: " + str(pe))
+                out.append(f"FAIL: {fatal}{pe}")
                 if ParserElement.verbose_stacktrace:
                     out.extend(traceback.format_tb(pe.__traceback__))
                 success = success and failureTests
@@ -2237,91 +2254,42 @@ def create_diagram(
             show_groups=show_groups,
             diagram_kwargs=kwargs,
         )
-        if isinstance(output_html, (str, Path)):
-            with open(output_html, "w", encoding="utf-8") as diag_file:
-                diag_file.write(railroad_to_html(railroad, embed=embed, **kwargs))
-        else:
+        if not isinstance(output_html, (str, Path)):
             # we were passed a file-like object, just write to it
             output_html.write(railroad_to_html(railroad, embed=embed, **kwargs))
+            return
+
+        with open(output_html, "w", encoding="utf-8") as diag_file:
+            diag_file.write(railroad_to_html(railroad, embed=embed, **kwargs))
 
     # Compatibility synonyms
     # fmt: off
-    @staticmethod
-    @replaced_by_pep8(inline_literals_using)
-    def inlineLiteralsUsing(): ...
-
-    @staticmethod
-    @replaced_by_pep8(set_default_whitespace_chars)
-    def setDefaultWhitespaceChars(): ...
-
-    @replaced_by_pep8(set_results_name)
-    def setResultsName(self): ...
-
-    @replaced_by_pep8(set_break)
-    def setBreak(self): ...
-
-    @replaced_by_pep8(set_parse_action)
-    def setParseAction(self): ...
-
-    @replaced_by_pep8(add_parse_action)
-    def addParseAction(self): ...
-
-    @replaced_by_pep8(add_condition)
-    def addCondition(self): ...
-
-    @replaced_by_pep8(set_fail_action)
-    def setFailAction(self): ...
-
-    @replaced_by_pep8(try_parse)
-    def tryParse(self): ...
-
-    @staticmethod
-    @replaced_by_pep8(enable_left_recursion)
-    def enableLeftRecursion(): ...
-
-    @staticmethod
-    @replaced_by_pep8(enable_packrat)
-    def enablePackrat(): ...
-
-    @replaced_by_pep8(parse_string)
-    def parseString(self): ...
-
-    @replaced_by_pep8(scan_string)
-    def scanString(self): ...
-
-    @replaced_by_pep8(transform_string)
-    def transformString(self): ...
-
-    @replaced_by_pep8(search_string)
-    def searchString(self): ...
-
-    @replaced_by_pep8(ignore_whitespace)
-    def ignoreWhitespace(self): ...
-
-    @replaced_by_pep8(leave_whitespace)
-    def leaveWhitespace(self): ...
-
-    @replaced_by_pep8(set_whitespace_chars)
-    def setWhitespaceChars(self): ...
-
-    @replaced_by_pep8(parse_with_tabs)
-    def parseWithTabs(self): ...
-
-    @replaced_by_pep8(set_debug_actions)
-    def setDebugActions(self): ...
-
-    @replaced_by_pep8(set_debug)
-    def setDebug(self): ...
-
-    @replaced_by_pep8(set_name)
-    def setName(self): ...
-
-    @replaced_by_pep8(parse_file)
-    def parseFile(self): ...
-
-    @replaced_by_pep8(run_tests)
-    def runTests(self): ...
-
+    inlineLiteralsUsing = replaced_by_pep8("inlineLiteralsUsing", inline_literals_using)
+    setDefaultWhitespaceChars = replaced_by_pep8(
+        "setDefaultWhitespaceChars", set_default_whitespace_chars
+    )
+    setResultsName = replaced_by_pep8("setResultsName", set_results_name)
+    setBreak = replaced_by_pep8("setBreak", set_break)
+    setParseAction = replaced_by_pep8("setParseAction", set_parse_action)
+    addParseAction = replaced_by_pep8("addParseAction", add_parse_action)
+    addCondition = replaced_by_pep8("addCondition", add_condition)
+    setFailAction = replaced_by_pep8("setFailAction", set_fail_action)
+    tryParse = replaced_by_pep8("tryParse", try_parse)
+    enableLeftRecursion = replaced_by_pep8("enableLeftRecursion", enable_left_recursion)
+    enablePackrat = replaced_by_pep8("enablePackrat", enable_packrat)
+    parseString = replaced_by_pep8("parseString", parse_string)
+    scanString = replaced_by_pep8("scanString", scan_string)
+    transformString = replaced_by_pep8("transformString", transform_string)
+    searchString = replaced_by_pep8("searchString", search_string)
+    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
+    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
+    setWhitespaceChars = replaced_by_pep8("setWhitespaceChars", set_whitespace_chars)
+    parseWithTabs = replaced_by_pep8("parseWithTabs", parse_with_tabs)
+    setDebugActions = replaced_by_pep8("setDebugActions", set_debug_actions)
+    setDebug = replaced_by_pep8("setDebug", set_debug)
+    setName = replaced_by_pep8("setName", set_name)
+    parseFile = replaced_by_pep8("parseFile", parse_file)
+    runTests = replaced_by_pep8("runTests", run_tests)
     canParseNext = can_parse_next
     resetCache = reset_cache
     defaultName = default_name
@@ -2351,7 +2319,7 @@ def must_skip(t):
             def show_skip(t):
                 if t._skipped.as_list()[-1:] == [""]:
                     t.pop("_skipped")
-                    t["_skipped"] = "missing <" + repr(self.anchor) + ">"
+                    t["_skipped"] = f"missing <{self.anchor!r}>"
 
             return (
                 self.anchor + skipper().add_parse_action(must_skip)
@@ -2402,9 +2370,9 @@ class Literal(Token):
 
     Example::
 
-        Literal('blah').parse_string('blah')  # -> ['blah']
-        Literal('blah').parse_string('blahfooblah')  # -> ['blah']
-        Literal('blah').parse_string('bla')  # -> Exception: Expected "blah"
+        Literal('abc').parse_string('abc')  # -> ['abc']
+        Literal('abc').parse_string('abcdef')  # -> ['abc']
+        Literal('abc').parse_string('ab')  # -> Exception: Expected "abc"
 
     For case-insensitive matching, use :class:`CaselessLiteral`.
 
@@ -2434,7 +2402,7 @@ def __init__(self, match_string: str = "", *, matchString: str = ""):
         self.match = match_string
         self.matchLen = len(match_string)
         self.firstMatchChar = match_string[:1]
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayReturnEmpty = False
         self.mayIndexError = False
 
@@ -2548,40 +2516,37 @@ def parseImpl(self, instring, loc, doActions=True):
                         or instring[loc + self.matchLen].upper() not in self.identChars
                     ):
                         return loc + self.matchLen, self.match
-                    else:
-                        # followed by keyword char
-                        errmsg += ", was immediately followed by keyword character"
-                        errloc = loc + self.matchLen
-                else:
-                    # preceded by keyword char
-                    errmsg += ", keyword was immediately preceded by keyword character"
-                    errloc = loc - 1
-            # else no match just raise plain exception
 
-        else:
-            if (
-                instring[loc] == self.firstMatchChar
-                and self.matchLen == 1
-                or instring.startswith(self.match, loc)
-            ):
-                if loc == 0 or instring[loc - 1] not in self.identChars:
-                    if (
-                        loc >= len(instring) - self.matchLen
-                        or instring[loc + self.matchLen] not in self.identChars
-                    ):
-                        return loc + self.matchLen, self.match
-                    else:
-                        # followed by keyword char
-                        errmsg += (
-                            ", keyword was immediately followed by keyword character"
-                        )
-                        errloc = loc + self.matchLen
+                    # followed by keyword char
+                    errmsg += ", was immediately followed by keyword character"
+                    errloc = loc + self.matchLen
                 else:
                     # preceded by keyword char
                     errmsg += ", keyword was immediately preceded by keyword character"
                     errloc = loc - 1
             # else no match just raise plain exception
 
+        elif (
+            instring[loc] == self.firstMatchChar
+            and self.matchLen == 1
+            or instring.startswith(self.match, loc)
+        ):
+            if loc == 0 or instring[loc - 1] not in self.identChars:
+                if (
+                    loc >= len(instring) - self.matchLen
+                    or instring[loc + self.matchLen] not in self.identChars
+                ):
+                    return loc + self.matchLen, self.match
+
+                # followed by keyword char
+                errmsg += ", keyword was immediately followed by keyword character"
+                errloc = loc + self.matchLen
+            else:
+                # preceded by keyword char
+                errmsg += ", keyword was immediately preceded by keyword character"
+                errloc = loc - 1
+        # else no match just raise plain exception
+
         raise ParseException(instring, errloc, errmsg, self)
 
     @staticmethod
@@ -2613,7 +2578,7 @@ def __init__(self, match_string: str = "", *, matchString: str = ""):
         super().__init__(match_string.upper())
         # Preserve the defining literal.
         self.returnString = match_string
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
 
     def parseImpl(self, instring, loc, doActions=True):
         if instring[loc : loc + self.matchLen].upper() == self.match:
@@ -2788,7 +2753,7 @@ class Word(Token):
         integer = Word(nums) # equivalent to Word("0123456789") or Word(srange("0-9"))
 
         # a word with a leading capital, and zero or more lowercase
-        capital_word = Word(alphas.upper(), alphas.lower())
+        capitalized_word = Word(alphas.upper(), alphas.lower())
 
         # hostnames are alphanumeric, with leading alpha, and '-'
         hostname = Word(alphas, alphanums + '-')
@@ -2865,7 +2830,7 @@ def __init__(
             self.maxLen = exact
             self.minLen = exact
 
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayIndexError = False
         self.asKeyword = asKeyword
         if self.asKeyword:
@@ -2879,7 +2844,7 @@ def __init__(
                 re_leading_fragment = f"[{_collapse_string_to_ranges(self.initChars)}]"
 
             if self.bodyChars == self.initChars:
-                if max == 0:
+                if max == 0 and self.minLen == 1:
                     repeat = "+"
                 elif max == 1:
                     repeat = ""
@@ -2895,19 +2860,17 @@ def __init__(
                     repeat = ""
                 else:
                     re_body_fragment = f"[{_collapse_string_to_ranges(self.bodyChars)}]"
-                    if max == 0:
+                    if max == 0 and self.minLen == 1:
                         repeat = "*"
                     elif max == 2:
                         repeat = "?" if min <= 1 else ""
                     else:
                         if min != max:
-                            repeat = f"{{{min - 1 if min > 0 else 0},{max - 1}}}"
+                            repeat = f"{{{min - 1 if min > 0 else ''},{max - 1 if max > 0 else ''}}}"
                         else:
-                            repeat = f"{{{min - 1 if min > 0 else 0}}}"
+                            repeat = f"{{{min - 1 if min > 0 else ''}}}"
 
-                self.reString = (
-                    f"{re_leading_fragment}" f"{re_body_fragment}" f"{repeat}"
-                )
+                self.reString = f"{re_leading_fragment}{re_body_fragment}{repeat}"
 
             if self.asKeyword:
                 self.reString = rf"\b{self.reString}\b"
@@ -2924,10 +2887,11 @@ def _generateDefaultName(self) -> str:
         def charsAsStr(s):
             max_repr_len = 16
             s = _collapse_string_to_ranges(s, re_escape=False)
+
             if len(s) > max_repr_len:
                 return s[: max_repr_len - 3] + "..."
-            else:
-                return s
+
+            return s
 
         if self.initChars != self.bodyChars:
             base = f"W:({charsAsStr(self.initChars)}, {charsAsStr(self.bodyChars)})"
@@ -2965,14 +2929,11 @@ def parseImpl(self, instring, loc, doActions=True):
             throwException = True
         elif self.maxSpecified and loc < instrlen and instring[loc] in bodychars:
             throwException = True
-        elif self.asKeyword:
-            if (
-                start > 0
-                and instring[start - 1] in bodychars
-                or loc < instrlen
-                and instring[loc] in bodychars
-            ):
-                throwException = True
+        elif self.asKeyword and (
+            (start > 0 and instring[start - 1] in bodychars)
+            or (loc < instrlen and instring[loc] in bodychars)
+        ):
+            throwException = True
 
         if throwException:
             raise ParseException(instring, loc, self.errmsg, self)
@@ -3072,7 +3033,7 @@ def __init__(
                 "Regex may only be constructed with a string or a compiled RE object"
             )
 
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayIndexError = False
         self.asGroupList = asGroupList
         self.asMatch = asMatch
@@ -3085,11 +3046,11 @@ def __init__(
     def re(self):
         if self._re:
             return self._re
-        else:
-            try:
-                return re.compile(self.pattern, self.flags)
-            except re.error:
-                raise ValueError(f"invalid pattern ({self.pattern!r}) passed to Regex")
+
+        try:
+            return re.compile(self.pattern, self.flags)
+        except re.error:
+            raise ValueError(f"invalid pattern ({self.pattern!r}) passed to Regex")
 
     @cached_property
     def re_match(self):
@@ -3110,9 +3071,10 @@ def parseImpl(self, instring, loc, doActions=True):
         loc = result.end()
         ret = ParseResults(result.group())
         d = result.groupdict()
-        if d:
-            for k, v in d.items():
-                ret[k] = v
+
+        for k, v in d.items():
+            ret[k] = v
+
         return loc, ret
 
     def parseImplAsGroupList(self, instring, loc, doActions=True):
@@ -3204,6 +3166,7 @@ class QuotedString(Token):
         [['This is the "quote"']]
         [['This is the quote with "embedded" quotes']]
     """
+
     ws_map = dict(((r"\t", "\t"), (r"\n", "\n"), (r"\f", "\f"), (r"\r", "\r")))
 
     def __init__(
@@ -3224,148 +3187,164 @@ def __init__(
         convertWhitespaceEscapes: bool = True,
     ):
         super().__init__()
-        escChar = escChar or esc_char
-        escQuote = escQuote or esc_quote
-        unquoteResults = unquoteResults and unquote_results
-        endQuoteChar = endQuoteChar or end_quote_char
-        convertWhitespaceEscapes = (
+        esc_char = escChar or esc_char
+        esc_quote = escQuote or esc_quote
+        unquote_results = unquoteResults and unquote_results
+        end_quote_char = endQuoteChar or end_quote_char
+        convert_whitespace_escapes = (
             convertWhitespaceEscapes and convert_whitespace_escapes
         )
         quote_char = quoteChar or quote_char
 
-        # remove white space from quote chars - wont work anyway
+        # remove white space from quote chars
         quote_char = quote_char.strip()
         if not quote_char:
             raise ValueError("quote_char cannot be the empty string")
 
-        if endQuoteChar is None:
-            endQuoteChar = quote_char
+        if end_quote_char is None:
+            end_quote_char = quote_char
         else:
-            endQuoteChar = endQuoteChar.strip()
-            if not endQuoteChar:
+            end_quote_char = end_quote_char.strip()
+            if not end_quote_char:
                 raise ValueError("end_quote_char cannot be the empty string")
 
-        self.quoteChar: str = quote_char
-        self.quoteCharLen: int = len(quote_char)
-        self.firstQuoteChar: str = quote_char[0]
-        self.endQuoteChar: str = endQuoteChar
-        self.endQuoteCharLen: int = len(endQuoteChar)
-        self.escChar: str = escChar or ""
-        self.escQuote: str = escQuote or ""
-        self.unquoteResults: bool = unquoteResults
-        self.convertWhitespaceEscapes: bool = convertWhitespaceEscapes
+        self.quote_char: str = quote_char
+        self.quote_char_len: int = len(quote_char)
+        self.first_quote_char: str = quote_char[0]
+        self.end_quote_char: str = end_quote_char
+        self.end_quote_char_len: int = len(end_quote_char)
+        self.esc_char: str = esc_char or ""
+        self.has_esc_char: bool = esc_char is not None
+        self.esc_quote: str = esc_quote or ""
+        self.unquote_results: bool = unquote_results
+        self.convert_whitespace_escapes: bool = convert_whitespace_escapes
         self.multiline = multiline
+        self.re_flags = re.RegexFlag(0)
 
-        sep = ""
-        inner_pattern = ""
+        # fmt: off
+        # build up re pattern for the content between the quote delimiters
+        inner_pattern = []
 
-        if escQuote:
-            inner_pattern += rf"{sep}(?:{re.escape(escQuote)})"
-            sep = "|"
+        if esc_quote:
+            inner_pattern.append(rf"(?:{re.escape(esc_quote)})")
 
-        if escChar:
-            inner_pattern += rf"{sep}(?:{re.escape(escChar)}.)"
-            sep = "|"
-            self.escCharReplacePattern = re.escape(escChar) + "(.)"
+        if esc_char:
+            inner_pattern.append(rf"(?:{re.escape(esc_char)}.)")
 
-        if len(self.endQuoteChar) > 1:
-            inner_pattern += (
-                f"{sep}(?:"
+        if len(self.end_quote_char) > 1:
+            inner_pattern.append(
+                "(?:"
                 + "|".join(
-                    f"(?:{re.escape(self.endQuoteChar[:i])}(?!{re.escape(self.endQuoteChar[i:])}))"
-                    for i in range(len(self.endQuoteChar) - 1, 0, -1)
+                    f"(?:{re.escape(self.end_quote_char[:i])}(?!{re.escape(self.end_quote_char[i:])}))"
+                    for i in range(len(self.end_quote_char) - 1, 0, -1)
                 )
                 + ")"
             )
-            sep = "|"
-
-        self.flags = re.RegexFlag(0)
 
-        if multiline:
-            self.flags = re.MULTILINE | re.DOTALL
-            inner_pattern += (
-                rf"{sep}(?:[^{_escape_regex_range_chars(self.endQuoteChar[0])}"
-                rf"{(_escape_regex_range_chars(escChar) if escChar is not None else '')}])"
+        if self.multiline:
+            self.re_flags |= re.MULTILINE | re.DOTALL
+            inner_pattern.append(
+                rf"(?:[^{_escape_regex_range_chars(self.end_quote_char[0])}"
+                rf"{(_escape_regex_range_chars(esc_char) if self.has_esc_char else '')}])"
             )
         else:
-            inner_pattern += (
-                rf"{sep}(?:[^{_escape_regex_range_chars(self.endQuoteChar[0])}\n\r"
-                rf"{(_escape_regex_range_chars(escChar) if escChar is not None else '')}])"
+            inner_pattern.append(
+                rf"(?:[^{_escape_regex_range_chars(self.end_quote_char[0])}\n\r"
+                rf"{(_escape_regex_range_chars(esc_char) if self.has_esc_char else '')}])"
             )
 
         self.pattern = "".join(
             [
-                re.escape(self.quoteChar),
+                re.escape(self.quote_char),
                 "(?:",
-                inner_pattern,
+                '|'.join(inner_pattern),
                 ")*",
-                re.escape(self.endQuoteChar),
+                re.escape(self.end_quote_char),
             ]
         )
 
-        if self.unquoteResults:
-            if self.convertWhitespaceEscapes:
+        if self.unquote_results:
+            if self.convert_whitespace_escapes:
                 self.unquote_scan_re = re.compile(
-                    rf"({'|'.join(re.escape(k) for k in self.ws_map)})|({re.escape(self.escChar)}.)|(\n|.)",
-                    flags=self.flags,
+                    rf"({'|'.join(re.escape(k) for k in self.ws_map)})"
+                    rf"|({re.escape(self.esc_char)}.)"
+                    rf"|(\n|.)",
+                    flags=self.re_flags,
                 )
             else:
                 self.unquote_scan_re = re.compile(
-                    rf"({re.escape(self.escChar)}.)|(\n|.)", flags=self.flags
+                    rf"({re.escape(self.esc_char)}.)"
+                    rf"|(\n|.)",
+                    flags=self.re_flags
                 )
+        # fmt: on
 
         try:
-            self.re = re.compile(self.pattern, self.flags)
+            self.re = re.compile(self.pattern, self.re_flags)
             self.reString = self.pattern
             self.re_match = self.re.match
         except re.error:
             raise ValueError(f"invalid pattern {self.pattern!r} passed to Regex")
 
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayIndexError = False
         self.mayReturnEmpty = True
 
     def _generateDefaultName(self) -> str:
-        if self.quoteChar == self.endQuoteChar and isinstance(self.quoteChar, str_type):
-            return f"string enclosed in {self.quoteChar!r}"
+        if self.quote_char == self.end_quote_char and isinstance(
+            self.quote_char, str_type
+        ):
+            return f"string enclosed in {self.quote_char!r}"
 
-        return f"quoted string, starting with {self.quoteChar} ending with {self.endQuoteChar}"
+        return f"quoted string, starting with {self.quote_char} ending with {self.end_quote_char}"
 
     def parseImpl(self, instring, loc, doActions=True):
+        # check first character of opening quote to see if that is a match
+        # before doing the more complicated regex match
         result = (
-            instring[loc] == self.firstQuoteChar
+            instring[loc] == self.first_quote_char
             and self.re_match(instring, loc)
             or None
         )
         if not result:
             raise ParseException(instring, loc, self.errmsg, self)
 
+        # get ending loc and matched string from regex matching result
         loc = result.end()
         ret = result.group()
 
-        if self.unquoteResults:
+        if self.unquote_results:
             # strip off quotes
-            ret = ret[self.quoteCharLen : -self.endQuoteCharLen]
+            ret = ret[self.quote_char_len : -self.end_quote_char_len]
 
             if isinstance(ret, str_type):
-                if self.convertWhitespaceEscapes:
+                # fmt: off
+                if self.convert_whitespace_escapes:
+                    # as we iterate over matches in the input string,
+                    # collect from whichever match group of the unquote_scan_re
+                    # regex matches (only 1 group will match at any given time)
                     ret = "".join(
-                        self.ws_map[match.group(1)]
-                        if match.group(1)
-                        else match.group(2)[-1]
-                        if match.group(2)
+                        # match group 1 matches \t, \n, etc.
+                        self.ws_map[match.group(1)] if match.group(1)
+                        # match group 2 matches escaped characters
+                        else match.group(2)[-1] if match.group(2)
+                        # match group 3 matches any character
                         else match.group(3)
                         for match in self.unquote_scan_re.finditer(ret)
                     )
                 else:
                     ret = "".join(
-                        match.group(1)[-1] if match.group(1) else match.group(2)
+                        # match group 1 matches escaped characters
+                        match.group(1)[-1] if match.group(1)
+                        # match group 2 matches any character
+                        else match.group(2)
                         for match in self.unquote_scan_re.finditer(ret)
                     )
+                # fmt: on
 
                 # replace escaped quotes
-                if self.escQuote:
-                    ret = ret.replace(self.escQuote, self.endQuoteChar)
+                if self.esc_quote:
+                    ret = ret.replace(self.esc_quote, self.end_quote_char)
 
         return loc, ret
 
@@ -3407,8 +3386,8 @@ def __init__(
 
         if min < 1:
             raise ValueError(
-                "cannot specify a minimum length < 1; use "
-                "Opt(CharsNotIn()) if zero-length char group is permitted"
+                "cannot specify a minimum length < 1; use"
+                " Opt(CharsNotIn()) if zero-length char group is permitted"
             )
 
         self.minLen = min
@@ -3422,7 +3401,7 @@ def __init__(
             self.maxLen = exact
             self.minLen = exact
 
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
         self.mayReturnEmpty = self.minLen == 0
         self.mayIndexError = False
 
@@ -3495,7 +3474,7 @@ def __init__(self, ws: str = " \t\r\n", min: int = 1, max: int = 0, exact: int =
         )
         # self.leave_whitespace()
         self.mayReturnEmpty = True
-        self.errmsg = "Expected " + self.name
+        self.errmsg = f"Expected {self.name}"
 
         self.minLen = min
 
@@ -3544,16 +3523,19 @@ def __init__(self, colno: int):
         self.col = colno
 
     def preParse(self, instring: str, loc: int) -> int:
-        if col(loc, instring) != self.col:
-            instrlen = len(instring)
-            if self.ignoreExprs:
-                loc = self._skipIgnorables(instring, loc)
-            while (
-                loc < instrlen
-                and instring[loc].isspace()
-                and col(loc, instring) != self.col
-            ):
-                loc += 1
+        if col(loc, instring) == self.col:
+            return loc
+
+        instrlen = len(instring)
+        if self.ignoreExprs:
+            loc = self._skipIgnorables(instring, loc)
+        while (
+            loc < instrlen
+            and instring[loc].isspace()
+            and col(loc, instring) != self.col
+        ):
+            loc += 1
+
         return loc
 
     def parseImpl(self, instring, loc, doActions=True):
@@ -3599,12 +3581,14 @@ def __init__(self):
     def preParse(self, instring: str, loc: int) -> int:
         if loc == 0:
             return loc
-        else:
-            ret = self.skipper.preParse(instring, loc)
-            if "\n" in self.orig_whiteChars:
-                while instring[ret : ret + 1] == "\n":
-                    ret = self.skipper.preParse(instring, ret + 1)
-            return ret
+
+        ret = self.skipper.preParse(instring, loc)
+
+        if "\n" in self.orig_whiteChars:
+            while instring[ret : ret + 1] == "\n":
+                ret = self.skipper.preParse(instring, ret + 1)
+
+        return ret
 
     def parseImpl(self, instring, loc, doActions=True):
         if col(loc, instring) == 1:
@@ -3645,10 +3629,10 @@ def __init__(self):
         self.errmsg = "Expected start of text"
 
     def parseImpl(self, instring, loc, doActions=True):
-        if loc != 0:
-            # see if entire string up to here is just whitespace and ignoreables
-            if loc != self.preParse(instring, 0):
-                raise ParseException(instring, loc, self.errmsg, self)
+        # see if entire string up to here is just whitespace and ignoreables
+        if loc != 0 and loc != self.preParse(instring, 0):
+            raise ParseException(instring, loc, self.errmsg, self)
+
         return loc, []
 
 
@@ -3664,12 +3648,12 @@ def __init__(self):
     def parseImpl(self, instring, loc, doActions=True):
         if loc < len(instring):
             raise ParseException(instring, loc, self.errmsg, self)
-        elif loc == len(instring):
+        if loc == len(instring):
             return loc + 1, []
-        elif loc > len(instring):
+        if loc > len(instring):
             return loc, []
-        else:
-            raise ParseException(instring, loc, self.errmsg, self)
+
+        raise ParseException(instring, loc, self.errmsg, self)
 
 
 class WordStart(PositionToken):
@@ -3802,7 +3786,7 @@ def ignore(self, other) -> ParserElement:
         return self
 
     def _generateDefaultName(self) -> str:
-        return f"{self.__class__.__name__}:({str(self.exprs)})"
+        return f"{type(self).__name__}:({self.exprs})"
 
     def streamline(self) -> ParserElement:
         if self.streamlined:
@@ -3841,7 +3825,7 @@ def streamline(self) -> ParserElement:
                 self.mayReturnEmpty |= other.mayReturnEmpty
                 self.mayIndexError |= other.mayIndexError
 
-        self.errmsg = "Expected " + str(self)
+        self.errmsg = f"Expected {self}"
 
         return self
 
@@ -3863,38 +3847,36 @@ def copy(self) -> ParserElement:
         return ret
 
     def _setResultsName(self, name, listAllMatches=False):
-        if (
+        if not (
             __diag__.warn_ungrouped_named_tokens_in_collection
             and Diagnostics.warn_ungrouped_named_tokens_in_collection
             not in self.suppress_warnings_
         ):
-            for e in self.exprs:
-                if (
-                    isinstance(e, ParserElement)
-                    and e.resultsName
-                    and Diagnostics.warn_ungrouped_named_tokens_in_collection
+            return super()._setResultsName(name, listAllMatches)
+
+        for e in self.exprs:
+            if (
+                isinstance(e, ParserElement)
+                and e.resultsName
+                and (
+                    Diagnostics.warn_ungrouped_named_tokens_in_collection
                     not in e.suppress_warnings_
-                ):
-                    warnings.warn(
-                        "{}: setting results name {!r} on {} expression "
-                        "collides with {!r} on contained expression".format(
-                            "warn_ungrouped_named_tokens_in_collection",
-                            name,
-                            type(self).__name__,
-                            e.resultsName,
-                        ),
-                        stacklevel=3,
-                    )
+                )
+            ):
+                warning = (
+                    "warn_ungrouped_named_tokens_in_collection:"
+                    f" setting results name {name!r} on {type(self).__name__} expression"
+                    f" collides with {e.resultsName!r} on contained expression"
+                )
+                warnings.warn(warning, stacklevel=3)
+                break
 
         return super()._setResultsName(name, listAllMatches)
 
     # Compatibility synonyms
     # fmt: off
-    @replaced_by_pep8(leave_whitespace)
-    def leaveWhitespace(self): ...
-
-    @replaced_by_pep8(ignore_whitespace)
-    def ignoreWhitespace(self): ...
+    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
+    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
     # fmt: on
 
 
@@ -3931,18 +3913,18 @@ def __init__(
         if exprs and Ellipsis in exprs:
             tmp = []
             for i, expr in enumerate(exprs):
-                if expr is Ellipsis:
-                    if i < len(exprs) - 1:
-                        skipto_arg: ParserElement = typing.cast(
-                            ParseExpression, (Empty() + exprs[i + 1])
-                        ).exprs[-1]
-                        tmp.append(SkipTo(skipto_arg)("_skipped*"))
-                    else:
-                        raise Exception(
-                            "cannot construct And with sequence ending in ..."
-                        )
-                else:
+                if expr is not Ellipsis:
                     tmp.append(expr)
+                    continue
+
+                if i < len(exprs) - 1:
+                    skipto_arg: ParserElement = typing.cast(
+                        ParseExpression, (Empty() + exprs[i + 1])
+                    ).exprs[-1]
+                    tmp.append(SkipTo(skipto_arg)("_skipped*"))
+                    continue
+
+                raise Exception("cannot construct And with sequence ending in ...")
             exprs[:] = tmp
         super().__init__(exprs, savelist)
         if self.exprs:
@@ -3961,25 +3943,24 @@ def __init__(
 
     def streamline(self) -> ParserElement:
         # collapse any _PendingSkip's
-        if self.exprs:
-            if any(
-                isinstance(e, ParseExpression)
-                and e.exprs
-                and isinstance(e.exprs[-1], _PendingSkip)
-                for e in self.exprs[:-1]
-            ):
-                deleted_expr_marker = NoMatch()
-                for i, e in enumerate(self.exprs[:-1]):
-                    if e is deleted_expr_marker:
-                        continue
-                    if (
-                        isinstance(e, ParseExpression)
-                        and e.exprs
-                        and isinstance(e.exprs[-1], _PendingSkip)
-                    ):
-                        e.exprs[-1] = e.exprs[-1] + self.exprs[i + 1]
-                        self.exprs[i + 1] = deleted_expr_marker
-                self.exprs = [e for e in self.exprs if e is not deleted_expr_marker]
+        if self.exprs and any(
+            isinstance(e, ParseExpression)
+            and e.exprs
+            and isinstance(e.exprs[-1], _PendingSkip)
+            for e in self.exprs[:-1]
+        ):
+            deleted_expr_marker = NoMatch()
+            for i, e in enumerate(self.exprs[:-1]):
+                if e is deleted_expr_marker:
+                    continue
+                if (
+                    isinstance(e, ParseExpression)
+                    and e.exprs
+                    and isinstance(e.exprs[-1], _PendingSkip)
+                ):
+                    e.exprs[-1] = e.exprs[-1] + self.exprs[i + 1]
+                    self.exprs[i + 1] = deleted_expr_marker
+            self.exprs = [e for e in self.exprs if e is not deleted_expr_marker]
 
         super().streamline()
 
@@ -4058,7 +4039,7 @@ def _generateDefaultName(self) -> str:
         # strip off redundant inner {}'s
         while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
             inner = inner[1:-1]
-        return "{" + inner + "}"
+        return f"{{{inner}}}"
 
 
 class Or(ParseExpression):
@@ -4179,10 +4160,8 @@ def parseImpl(self, instring, loc, doActions=True):
             if maxExcLoc == loc:
                 maxException.msg = self.errmsg
             raise maxException
-        else:
-            raise ParseException(
-                instring, loc, "no defined alternatives to match", self
-            )
+
+        raise ParseException(instring, loc, "no defined alternatives to match", self)
 
     def __ixor__(self, other):
         if isinstance(other, str_type):
@@ -4192,7 +4171,7 @@ def __ixor__(self, other):
         return self.append(other)  # Or([self, other])
 
     def _generateDefaultName(self) -> str:
-        return "{" + " ^ ".join(str(e) for e in self.exprs) + "}"
+        return f"{{{' ^ '.join(str(e) for e in self.exprs)}}}"
 
     def _setResultsName(self, name, listAllMatches=False):
         if (
@@ -4206,17 +4185,14 @@ def _setResultsName(self, name, listAllMatches=False):
                 not in e.suppress_warnings_
                 for e in self.exprs
             ):
-                warnings.warn(
-                    "{}: setting results name {!r} on {} expression "
-                    "will return a list of all parsed tokens in an And alternative, "
-                    "in prior versions only the first token was returned; enclose "
-                    "contained argument in Group".format(
-                        "warn_multiple_tokens_in_named_alternation",
-                        name,
-                        type(self).__name__,
-                    ),
-                    stacklevel=3,
+                warning = (
+                    "warn_multiple_tokens_in_named_alternation:"
+                    f" setting results name {name!r} on {type(self).__name__} expression"
+                    " will return a list of all parsed tokens in an And alternative,"
+                    " in prior versions only the first token was returned; enclose"
+                    " contained argument in Group"
                 )
+                warnings.warn(warning, stacklevel=3)
 
         return super()._setResultsName(name, listAllMatches)
 
@@ -4269,11 +4245,7 @@ def parseImpl(self, instring, loc, doActions=True):
 
         for e in self.exprs:
             try:
-                return e._parse(
-                    instring,
-                    loc,
-                    doActions,
-                )
+                return e._parse(instring, loc, doActions)
             except ParseFatalException as pfe:
                 pfe.__traceback__ = None
                 pfe.parser_element = e
@@ -4295,10 +4267,8 @@ def parseImpl(self, instring, loc, doActions=True):
             if maxExcLoc == loc:
                 maxException.msg = self.errmsg
             raise maxException
-        else:
-            raise ParseException(
-                instring, loc, "no defined alternatives to match", self
-            )
+
+        raise ParseException(instring, loc, "no defined alternatives to match", self)
 
     def __ior__(self, other):
         if isinstance(other, str_type):
@@ -4308,7 +4278,7 @@ def __ior__(self, other):
         return self.append(other)  # MatchFirst([self, other])
 
     def _generateDefaultName(self) -> str:
-        return "{" + " | ".join(str(e) for e in self.exprs) + "}"
+        return f"{{{' | '.join(str(e) for e in self.exprs)}}}"
 
     def _setResultsName(self, name, listAllMatches=False):
         if (
@@ -4322,17 +4292,14 @@ def _setResultsName(self, name, listAllMatches=False):
                 not in e.suppress_warnings_
                 for e in self.exprs
             ):
-                warnings.warn(
-                    "{}: setting results name {!r} on {} expression "
-                    "will return a list of all parsed tokens in an And alternative, "
-                    "in prior versions only the first token was returned; enclose "
-                    "contained argument in Group".format(
-                        "warn_multiple_tokens_in_named_alternation",
-                        name,
-                        type(self).__name__,
-                    ),
-                    stacklevel=3,
+                warning = (
+                    "warn_multiple_tokens_in_named_alternation:"
+                    f" setting results name {name!r} on {type(self).__name__} expression"
+                    " will return a list of all parsed tokens in an And alternative,"
+                    " in prior versions only the first token was returned; enclose"
+                    " contained argument in Group"
                 )
+                warnings.warn(warning, stacklevel=3)
 
         return super()._setResultsName(name, listAllMatches)
 
@@ -4508,7 +4475,7 @@ def parseImpl(self, instring, loc, doActions=True):
         return loc, total_results
 
     def _generateDefaultName(self) -> str:
-        return "{" + " & ".join(str(e) for e in self.exprs) + "}"
+        return f"{{{' & '.join(str(e) for e in self.exprs)}}}"
 
 
 class ParseElementEnhance(ParserElement):
@@ -4543,15 +4510,17 @@ def recurse(self) -> List[ParserElement]:
         return [self.expr] if self.expr is not None else []
 
     def parseImpl(self, instring, loc, doActions=True):
-        if self.expr is not None:
-            try:
-                return self.expr._parse(instring, loc, doActions, callPreParse=False)
-            except ParseBaseException as pbe:
-                pbe.msg = self.errmsg
-                raise
-        else:
+        if self.expr is None:
             raise ParseException(instring, loc, "No expression defined", self)
 
+        try:
+            return self.expr._parse(instring, loc, doActions, callPreParse=False)
+        except ParseBaseException as pbe:
+            if not isinstance(self, Forward) or self.customName is not None:
+                if self.errmsg:
+                    pbe.msg = self.errmsg
+            raise
+
     def leave_whitespace(self, recursive: bool = True) -> ParserElement:
         super().leave_whitespace(recursive)
 
@@ -4571,15 +4540,11 @@ def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
         return self
 
     def ignore(self, other) -> ParserElement:
-        if isinstance(other, Suppress):
-            if other not in self.ignoreExprs:
-                super().ignore(other)
-                if self.expr is not None:
-                    self.expr.ignore(self.ignoreExprs[-1])
-        else:
+        if not isinstance(other, Suppress) or other not in self.ignoreExprs:
             super().ignore(other)
             if self.expr is not None:
                 self.expr.ignore(self.ignoreExprs[-1])
+
         return self
 
     def streamline(self) -> ParserElement:
@@ -4609,15 +4574,12 @@ def validate(self, validateTrace=None) -> None:
         self._checkRecursion([])
 
     def _generateDefaultName(self) -> str:
-        return f"{self.__class__.__name__}:({str(self.expr)})"
+        return f"{type(self).__name__}:({self.expr})"
 
     # Compatibility synonyms
     # fmt: off
-    @replaced_by_pep8(leave_whitespace)
-    def leaveWhitespace(self): ...
-
-    @replaced_by_pep8(ignore_whitespace)
-    def ignoreWhitespace(self): ...
+    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
+    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
     # fmt: on
 
 
@@ -4827,7 +4789,7 @@ def __init__(
             retreat = 0
             self.exact = True
         self.retreat = retreat
-        self.errmsg = "not preceded by " + str(expr)
+        self.errmsg = f"not preceded by {expr}"
         self.skipWhitespace = False
         self.parseAction.append(lambda s, l, t: t.__delitem__(slice(None, None)))
 
@@ -4837,23 +4799,24 @@ def parseImpl(self, instring, loc=0, doActions=True):
                 raise ParseException(instring, loc, self.errmsg)
             start = loc - self.retreat
             _, ret = self.expr._parse(instring, start)
-        else:
-            # retreat specified a maximum lookbehind window, iterate
-            test_expr = self.expr + StringEnd()
-            instring_slice = instring[max(0, loc - self.retreat) : loc]
-            last_expr = ParseException(instring, loc, self.errmsg)
-            for offset in range(1, min(loc, self.retreat + 1) + 1):
-                try:
-                    # print('trying', offset, instring_slice, repr(instring_slice[loc - offset:]))
-                    _, ret = test_expr._parse(
-                        instring_slice, len(instring_slice) - offset
-                    )
-                except ParseBaseException as pbe:
-                    last_expr = pbe
-                else:
-                    break
+            return loc, ret
+
+        # retreat specified a maximum lookbehind window, iterate
+        test_expr = self.expr + StringEnd()
+        instring_slice = instring[max(0, loc - self.retreat) : loc]
+        last_expr = ParseException(instring, loc, self.errmsg)
+
+        for offset in range(1, min(loc, self.retreat + 1) + 1):
+            try:
+                # print('trying', offset, instring_slice, repr(instring_slice[loc - offset:]))
+                _, ret = test_expr._parse(instring_slice, len(instring_slice) - offset)
+            except ParseBaseException as pbe:
+                last_expr = pbe
             else:
-                raise last_expr
+                break
+        else:
+            raise last_expr
+
         return loc, ret
 
 
@@ -4931,7 +4894,7 @@ def __init__(self, expr: Union[ParserElement, str]):
         self.skipWhitespace = False
 
         self.mayReturnEmpty = True
-        self.errmsg = "Found unwanted token, " + str(self.expr)
+        self.errmsg = f"Found unwanted token, {self.expr}"
 
     def parseImpl(self, instring, loc, doActions=True):
         if self.expr.can_parse_next(instring, loc, do_actions=doActions):
@@ -4939,7 +4902,7 @@ def parseImpl(self, instring, loc, doActions=True):
         return loc, []
 
     def _generateDefaultName(self) -> str:
-        return "~{" + str(self.expr) + "}"
+        return f"~{{{self.expr}}}"
 
 
 class _MultipleMatch(ParseElementEnhance):
@@ -5002,19 +4965,18 @@ def _setResultsName(self, name, listAllMatches=False):
                 if (
                     isinstance(e, ParserElement)
                     and e.resultsName
-                    and Diagnostics.warn_ungrouped_named_tokens_in_collection
-                    not in e.suppress_warnings_
+                    and (
+                        Diagnostics.warn_ungrouped_named_tokens_in_collection
+                        not in e.suppress_warnings_
+                    )
                 ):
-                    warnings.warn(
-                        "{}: setting results name {!r} on {} expression "
-                        "collides with {!r} on contained expression".format(
-                            "warn_ungrouped_named_tokens_in_collection",
-                            name,
-                            type(self).__name__,
-                            e.resultsName,
-                        ),
-                        stacklevel=3,
+                    warning = (
+                        "warn_ungrouped_named_tokens_in_collection:"
+                        f" setting results name {name!r} on {type(self).__name__} expression"
+                        f" collides with {e.resultsName!r} on contained expression"
                     )
+                    warnings.warn(warning, stacklevel=3)
+                    break
 
         return super()._setResultsName(name, listAllMatches)
 
@@ -5048,7 +5010,7 @@ class OneOrMore(_MultipleMatch):
     """
 
     def _generateDefaultName(self) -> str:
-        return "{" + str(self.expr) + "}..."
+        return f"{{{self.expr}}}..."
 
 
 class ZeroOrMore(_MultipleMatch):
@@ -5082,7 +5044,7 @@ def parseImpl(self, instring, loc, doActions=True):
             return loc, ParseResults([], name=self.resultsName)
 
     def _generateDefaultName(self) -> str:
-        return "[" + str(self.expr) + "]..."
+        return f"[{self.expr}]..."
 
 
 class DelimitedList(ParseElementEnhance):
@@ -5117,12 +5079,11 @@ def __init__(
             expr = ParserElement._literalStringClass(expr)
         expr = typing.cast(ParserElement, expr)
 
-        if min is not None:
-            if min < 1:
-                raise ValueError("min must be greater than 0")
-        if max is not None:
-            if min is not None and max < min:
-                raise ValueError("max must be greater than, or equal to min")
+        if min is not None and min < 1:
+            raise ValueError("min must be greater than 0")
+
+        if max is not None and min is not None and max < min:
+            raise ValueError("max must be greater than, or equal to min")
 
         self.content = expr
         self.raw_delim = str(delim)
@@ -5147,7 +5108,8 @@ def __init__(
         super().__init__(delim_list_expr, savelist=True)
 
     def _generateDefaultName(self) -> str:
-        return "{0} [{1} {0}]...".format(self.content.streamline(), self.raw_delim)
+        content_expr = self.content.streamline()
+        return f"{content_expr} [{self.raw_delim} {content_expr}]..."
 
 
 class _NullToken:
@@ -5229,7 +5191,7 @@ def _generateDefaultName(self) -> str:
         # strip off redundant inner {}'s
         while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
             inner = inner[1:-1]
-        return "[" + inner + "]"
+        return f"[{inner}]"
 
 
 Optional = Opt
@@ -5308,8 +5270,7 @@ def __init__(
     ):
         super().__init__(other)
         failOn = failOn or fail_on
-        if ignore is not None:
-            self.ignore(ignore)
+        self.ignoreExpr = ignore
         self.mayReturnEmpty = True
         self.mayIndexError = False
         self.includeMatch = include
@@ -5319,6 +5280,20 @@ def __init__(
         else:
             self.failOn = failOn
         self.errmsg = "No match found for " + str(self.expr)
+        self.ignorer = Empty().leave_whitespace()
+        self._update_ignorer()
+
+    def _update_ignorer(self):
+        # rebuild internal ignore expr from current ignore exprs and assigned ignoreExpr
+        self.ignorer.ignoreExprs.clear()
+        for e in self.expr.ignoreExprs:
+            self.ignorer.ignore(e)
+        if self.ignoreExpr:
+            self.ignorer.ignore(self.ignoreExpr)
+
+    def ignore(self, expr):
+        super().ignore(expr)
+        self._update_ignorer()
 
     def parseImpl(self, instring, loc, doActions=True):
         startloc = loc
@@ -5327,7 +5302,7 @@ def parseImpl(self, instring, loc, doActions=True):
         self_failOn_canParseNext = (
             self.failOn.canParseNext if self.failOn is not None else None
         )
-        self_preParse = self.preParse if self.callPreparse else None
+        ignorer_try_parse = self.ignorer.try_parse if self.ignorer.ignoreExprs else None
 
         tmploc = loc
         while tmploc <= instrlen:
@@ -5336,9 +5311,18 @@ def parseImpl(self, instring, loc, doActions=True):
                 if self_failOn_canParseNext(instring, tmploc):
                     break
 
-            if self_preParse is not None:
-                # skip grammar-ignored expressions
-                tmploc = self_preParse(instring, tmploc)
+            if ignorer_try_parse is not None:
+                # advance past ignore expressions
+                prev_tmploc = tmploc
+                while 1:
+                    try:
+                        tmploc = ignorer_try_parse(instring, tmploc)
+                    except ParseBaseException:
+                        break
+                    # see if all ignorers matched, but didn't actually ignore anything
+                    if tmploc == prev_tmploc:
+                        break
+                    prev_tmploc = tmploc
 
             try:
                 self_expr_parse(instring, tmploc, doActions=False, callPreParse=False)
@@ -5542,14 +5526,13 @@ def parseImpl(self, instring, loc, doActions=True):
                         del memo[peek_key]
                         return prev_loc, prev_peek.copy()
                     # the match did get better: see if we can improve further
-                    else:
-                        if doActions:
-                            try:
-                                memo[act_key] = super().parseImpl(instring, loc, True)
-                            except ParseException as e:
-                                memo[peek_key] = memo[act_key] = (new_loc, e)
-                                raise
-                        prev_loc, prev_peek = memo[peek_key] = new_loc, new_peek
+                    if doActions:
+                        try:
+                            memo[act_key] = super().parseImpl(instring, loc, True)
+                        except ParseException as e:
+                            memo[peek_key] = memo[act_key] = (new_loc, e)
+                            raise
+                    prev_loc, prev_peek = memo[peek_key] = new_loc, new_peek
 
     def leave_whitespace(self, recursive: bool = True) -> ParserElement:
         self.skipWhitespace = False
@@ -5593,7 +5576,7 @@ def _generateDefaultName(self) -> str:
             else:
                 retString = "None"
         finally:
-            return self.__class__.__name__ + ": " + retString
+            return f"{type(self).__name__}: {retString}"
 
     def copy(self) -> ParserElement:
         if self.expr is not None:
@@ -5604,29 +5587,26 @@ def copy(self) -> ParserElement:
             return ret
 
     def _setResultsName(self, name, list_all_matches=False):
+        # fmt: off
         if (
             __diag__.warn_name_set_on_empty_Forward
-            and Diagnostics.warn_name_set_on_empty_Forward
-            not in self.suppress_warnings_
+            and Diagnostics.warn_name_set_on_empty_Forward not in self.suppress_warnings_
+            and self.expr is None
         ):
-            if self.expr is None:
-                warnings.warn(
-                    "{}: setting results name {!r} on {} expression "
-                    "that has no contained expression".format(
-                        "warn_name_set_on_empty_Forward", name, type(self).__name__
-                    ),
-                    stacklevel=3,
-                )
+            warning = (
+                "warn_name_set_on_empty_Forward:"
+                f" setting results name {name!r} on {type(self).__name__} expression"
+                " that has no contained expression"
+            )
+            warnings.warn(warning, stacklevel=3)
+        # fmt: on
 
         return super()._setResultsName(name, list_all_matches)
 
     # Compatibility synonyms
     # fmt: off
-    @replaced_by_pep8(leave_whitespace)
-    def leaveWhitespace(self): ...
-
-    @replaced_by_pep8(ignore_whitespace)
-    def ignoreWhitespace(self): ...
+    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
+    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
     # fmt: on
 
 
@@ -5730,8 +5710,8 @@ def postParse(self, instring, loc, tokenlist):
                 if isinstance(tokenlist, ParseResults)
                 else list(tokenlist)
             )
-        else:
-            return [tokenlist]
+
+        return [tokenlist]
 
 
 class Dict(TokenConverter):
@@ -5817,8 +5797,8 @@ def postParse(self, instring, loc, tokenlist):
 
         if self._asPythonDict:
             return [tokenlist.as_dict()] if self.resultsName else tokenlist.as_dict()
-        else:
-            return [tokenlist] if self.resultsName else tokenlist
+
+        return [tokenlist] if self.resultsName else tokenlist
 
 
 class Suppress(TokenConverter):
@@ -5860,14 +5840,14 @@ def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
     def __add__(self, other) -> "ParserElement":
         if isinstance(self.expr, _PendingSkip):
             return Suppress(SkipTo(other)) + other
-        else:
-            return super().__add__(other)
+
+        return super().__add__(other)
 
     def __sub__(self, other) -> "ParserElement":
         if isinstance(self.expr, _PendingSkip):
             return Suppress(SkipTo(other)) - other
-        else:
-            return super().__sub__(other)
+
+        return super().__sub__(other)
 
     def postParse(self, instring, loc, tokenlist):
         return []
@@ -5907,7 +5887,7 @@ def z(*paArgs):
         thisFunc = f.__name__
         s, l, t = paArgs[-3:]
         if len(paArgs) > 3:
-            thisFunc = paArgs[0].__class__.__name__ + "." + thisFunc
+            thisFunc = f"{type(paArgs[0]).__name__}.{thisFunc}"
         sys.stderr.write(f">>entering {thisFunc}(line: {line(l, s)!r}, {l}, {t!r})\n")
         try:
             ret = f(*paArgs)
@@ -5975,8 +5955,8 @@ def srange(s: str) -> str:
     - any combination of the above (``'aeiouy'``,
       ``'a-zA-Z0-9_$'``, etc.)
     """
-    _expanded = (
-        lambda p: p
+    _expanded = lambda p: (
+        p
         if not isinstance(p, ParseResults)
         else "".join(chr(c) for c in range(ord(p[0]), ord(p[1]) + 1))
     )
@@ -6100,16 +6080,8 @@ def autoname_elements() -> None:
 lineEnd = line_end
 stringStart = string_start
 stringEnd = string_end
-
-@replaced_by_pep8(null_debug_action)
-def nullDebugAction(): ...
-
-@replaced_by_pep8(trace_parse_action)
-def traceParseAction(): ...
-
-@replaced_by_pep8(condition_as_parse_action)
-def conditionAsParseAction(): ...
-
-@replaced_by_pep8(token_map)
-def tokenMap(): ...
+nullDebugAction = replaced_by_pep8("nullDebugAction", null_debug_action)
+traceParseAction = replaced_by_pep8("traceParseAction", trace_parse_action)
+conditionAsParseAction = replaced_by_pep8("conditionAsParseAction", condition_as_parse_action)
+tokenMap = replaced_by_pep8("tokenMap", token_map)
 # fmt: on
diff --git a/src/pip/_vendor/pyparsing/diagram/__init__.py b/src/pip/_vendor/pyparsing/diagram/__init__.py
index 83f9018ee93..6074d2bfd0f 100644
--- a/src/pip/_vendor/pyparsing/diagram/__init__.py
+++ b/src/pip/_vendor/pyparsing/diagram/__init__.py
@@ -473,7 +473,7 @@ def _to_diagram_element(
     :param show_groups: bool flag indicating whether to show groups using bounding box
     """
     exprs = element.recurse()
-    name = name_hint or element.customName or element.__class__.__name__
+    name = name_hint or element.customName or type(element).__name__
 
     # Python's id() is used to provide a unique identifier for elements
     el_id = id(element)
diff --git a/src/pip/_vendor/pyparsing/exceptions.py b/src/pip/_vendor/pyparsing/exceptions.py
index 12219f124ae..1aaea56f54d 100644
--- a/src/pip/_vendor/pyparsing/exceptions.py
+++ b/src/pip/_vendor/pyparsing/exceptions.py
@@ -14,11 +14,13 @@
 from .unicode import pyparsing_unicode as ppu
 
 
-class ExceptionWordUnicode(ppu.Latin1, ppu.LatinA, ppu.LatinB, ppu.Greek, ppu.Cyrillic):
+class _ExceptionWordUnicodeSet(
+    ppu.Latin1, ppu.LatinA, ppu.LatinB, ppu.Greek, ppu.Cyrillic
+):
     pass
 
 
-_extract_alphanums = _collapse_string_to_ranges(ExceptionWordUnicode.alphanums)
+_extract_alphanums = _collapse_string_to_ranges(_ExceptionWordUnicodeSet.alphanums)
 _exception_word_extractor = re.compile("([" + _extract_alphanums + "]{1,16})|.")
 
 
@@ -86,41 +88,39 @@ def explain_exception(exc, depth=16):
             ret.append(" " * (exc.column - 1) + "^")
         ret.append(f"{type(exc).__name__}: {exc}")
 
-        if depth > 0:
-            callers = inspect.getinnerframes(exc.__traceback__, context=depth)
-            seen = set()
-            for i, ff in enumerate(callers[-depth:]):
-                frm = ff[0]
-
-                f_self = frm.f_locals.get("self", None)
-                if isinstance(f_self, ParserElement):
-                    if not frm.f_code.co_name.startswith(
-                        ("parseImpl", "_parseNoCache")
-                    ):
-                        continue
-                    if id(f_self) in seen:
-                        continue
-                    seen.add(id(f_self))
-
-                    self_type = type(f_self)
-                    ret.append(
-                        f"{self_type.__module__}.{self_type.__name__} - {f_self}"
-                    )
-
-                elif f_self is not None:
-                    self_type = type(f_self)
-                    ret.append(f"{self_type.__module__}.{self_type.__name__}")
+        if depth <= 0:
+            return "\n".join(ret)
 
-                else:
-                    code = frm.f_code
-                    if code.co_name in ("wrapper", ""):
-                        continue
+        callers = inspect.getinnerframes(exc.__traceback__, context=depth)
+        seen = set()
+        for ff in callers[-depth:]:
+            frm = ff[0]
+
+            f_self = frm.f_locals.get("self", None)
+            if isinstance(f_self, ParserElement):
+                if not frm.f_code.co_name.startswith(("parseImpl", "_parseNoCache")):
+                    continue
+                if id(f_self) in seen:
+                    continue
+                seen.add(id(f_self))
+
+                self_type = type(f_self)
+                ret.append(f"{self_type.__module__}.{self_type.__name__} - {f_self}")
+
+            elif f_self is not None:
+                self_type = type(f_self)
+                ret.append(f"{self_type.__module__}.{self_type.__name__}")
+
+            else:
+                code = frm.f_code
+                if code.co_name in ("wrapper", ""):
+                    continue
 
-                    ret.append(code.co_name)
+                ret.append(code.co_name)
 
-                depth -= 1
-                if not depth:
-                    break
+            depth -= 1
+            if not depth:
+                break
 
         return "\n".join(ret)
 
@@ -220,8 +220,10 @@ def explain(self, depth=16) -> str:
 
         Example::
 
+            # an expression to parse 3 integers
             expr = pp.Word(pp.nums) * 3
             try:
+                # a failing parse - the third integer is prefixed with "A"
                 expr.parse_string("123 456 A789")
             except pp.ParseException as pe:
                 print(pe.explain(depth=0))
@@ -244,8 +246,7 @@ def explain(self, depth=16) -> str:
         return self.explain_exception(self, depth)
 
     # fmt: off
-    @replaced_by_pep8(mark_input_line)
-    def markInputline(self): ...
+    markInputline = replaced_by_pep8("markInputline", mark_input_line)
     # fmt: on
 
 
@@ -255,16 +256,16 @@ class ParseException(ParseBaseException):
 
     Example::
 
+        integer = Word(nums).set_name("integer")
         try:
-            Word(nums).set_name("integer").parse_string("ABC")
+            integer.parse_string("ABC")
         except ParseException as pe:
             print(pe)
-            print("column: {}".format(pe.column))
+            print(f"column: {pe.column}")
 
     prints::
 
-       Expected integer (at char 0), (line:1, col:1)
-        column: 1
+       Expected integer (at char 0), (line:1, col:1) column: 1
 
     """
 
diff --git a/src/pip/_vendor/pyparsing/helpers.py b/src/pip/_vendor/pyparsing/helpers.py
index 018f0d6ac86..dcfdb8fe4bf 100644
--- a/src/pip/_vendor/pyparsing/helpers.py
+++ b/src/pip/_vendor/pyparsing/helpers.py
@@ -74,7 +74,7 @@ def count_field_parse_action(s, l, t):
         intExpr = intExpr.copy()
     intExpr.set_name("arrayLen")
     intExpr.add_parse_action(count_field_parse_action, call_during_try=True)
-    return (intExpr + array_expr).set_name("(len) " + str(expr) + "...")
+    return (intExpr + array_expr).set_name(f"(len) {expr}...")
 
 
 def match_previous_literal(expr: ParserElement) -> ParserElement:
@@ -95,15 +95,17 @@ def match_previous_literal(expr: ParserElement) -> ParserElement:
     rep = Forward()
 
     def copy_token_to_repeater(s, l, t):
-        if t:
-            if len(t) == 1:
-                rep << t[0]
-            else:
-                # flatten t tokens
-                tflat = _flatten(t.as_list())
-                rep << And(Literal(tt) for tt in tflat)
-        else:
+        if not t:
             rep << Empty()
+            return
+
+        if len(t) == 1:
+            rep << t[0]
+            return
+
+        # flatten t tokens
+        tflat = _flatten(t.as_list())
+        rep << And(Literal(tt) for tt in tflat)
 
     expr.add_parse_action(copy_token_to_repeater, callDuringTry=True)
     rep.set_name("(prev) " + str(expr))
@@ -230,7 +232,7 @@ def one_of(
                 if isequal(other, cur):
                     del symbols[i + j + 1]
                     break
-                elif masks(cur, other):
+                if masks(cur, other):
                     del symbols[i + j + 1]
                     symbols.insert(i, other)
                     break
@@ -534,7 +536,9 @@ def nested_expr(
         )
     else:
         ret <<= Group(Suppress(opener) + ZeroOrMore(ret | content) + Suppress(closer))
-    ret.set_name("nested %s%s expression" % (opener, closer))
+    ret.set_name(f"nested {opener}{closer} expression")
+    # don't override error message from content expressions
+    ret.errmsg = None
     return ret
 
 
@@ -580,7 +584,7 @@ def _makeTags(tagStr, xml, suppress_LT=Suppress("<"), suppress_GT=Suppress(">"))
         )
     closeTag = Combine(Literal("", adjacent=False)
 
-    openTag.set_name("<%s>" % resname)
+    openTag.set_name(f"<{resname}>")
     # add start results name in parse action now that ungrouped names are not reported at two levels
     openTag.add_parse_action(
         lambda t: t.__setitem__(
@@ -589,7 +593,7 @@ def _makeTags(tagStr, xml, suppress_LT=Suppress("<"), suppress_GT=Suppress(">"))
     )
     closeTag = closeTag(
         "end" + "".join(resname.replace(":", " ").title().split())
-    ).set_name("" % resname)
+    ).set_name(f"")
     openTag.tag = resname
     closeTag.tag = resname
     openTag.tag_body = SkipTo(closeTag())
@@ -777,7 +781,7 @@ def parseImpl(self, instring, loc, doActions=True):
         rpar = Suppress(rpar)
 
     # if lpar and rpar are not suppressed, wrap in group
-    if not (isinstance(rpar, Suppress) and isinstance(rpar, Suppress)):
+    if not (isinstance(lpar, Suppress) and isinstance(rpar, Suppress)):
         lastExpr = base_expr | Group(lpar + ret + rpar)
     else:
         lastExpr = base_expr | (lpar + ret + rpar)
@@ -787,7 +791,7 @@ def parseImpl(self, instring, loc, doActions=True):
     pa: typing.Optional[ParseAction]
     opExpr1: ParserElement
     opExpr2: ParserElement
-    for i, operDef in enumerate(op_list):
+    for operDef in op_list:
         opExpr, arity, rightLeftAssoc, pa = (operDef + (None,))[:4]  # type: ignore[assignment]
         if isinstance(opExpr, str_type):
             opExpr = ParserElement._literalStringClass(opExpr)
@@ -1058,43 +1062,17 @@ def delimited_list(
 cppStyleComment = cpp_style_comment
 javaStyleComment = java_style_comment
 pythonStyleComment = python_style_comment
-
-@replaced_by_pep8(DelimitedList)
-def delimitedList(): ...
-
-@replaced_by_pep8(DelimitedList)
-def delimited_list(): ...
-
-@replaced_by_pep8(counted_array)
-def countedArray(): ...
-
-@replaced_by_pep8(match_previous_literal)
-def matchPreviousLiteral(): ...
-
-@replaced_by_pep8(match_previous_expr)
-def matchPreviousExpr(): ...
-
-@replaced_by_pep8(one_of)
-def oneOf(): ...
-
-@replaced_by_pep8(dict_of)
-def dictOf(): ...
-
-@replaced_by_pep8(original_text_for)
-def originalTextFor(): ...
-
-@replaced_by_pep8(nested_expr)
-def nestedExpr(): ...
-
-@replaced_by_pep8(make_html_tags)
-def makeHTMLTags(): ...
-
-@replaced_by_pep8(make_xml_tags)
-def makeXMLTags(): ...
-
-@replaced_by_pep8(replace_html_entity)
-def replaceHTMLEntity(): ...
-
-@replaced_by_pep8(infix_notation)
-def infixNotation(): ...
+delimitedList = replaced_by_pep8("delimitedList", DelimitedList)
+delimited_list = replaced_by_pep8("delimited_list", DelimitedList)
+countedArray = replaced_by_pep8("countedArray", counted_array)
+matchPreviousLiteral = replaced_by_pep8("matchPreviousLiteral", match_previous_literal)
+matchPreviousExpr = replaced_by_pep8("matchPreviousExpr", match_previous_expr)
+oneOf = replaced_by_pep8("oneOf", one_of)
+dictOf = replaced_by_pep8("dictOf", dict_of)
+originalTextFor = replaced_by_pep8("originalTextFor", original_text_for)
+nestedExpr = replaced_by_pep8("nestedExpr", nested_expr)
+makeHTMLTags = replaced_by_pep8("makeHTMLTags", make_html_tags)
+makeXMLTags = replaced_by_pep8("makeXMLTags", make_xml_tags)
+replaceHTMLEntity = replaced_by_pep8("replaceHTMLEntity", replace_html_entity)
+infixNotation = replaced_by_pep8("infixNotation", infix_notation)
 # fmt: on
diff --git a/src/pip/_vendor/pyparsing/results.py b/src/pip/_vendor/pyparsing/results.py
index 0313049763b..3e5fe2089bd 100644
--- a/src/pip/_vendor/pyparsing/results.py
+++ b/src/pip/_vendor/pyparsing/results.py
@@ -173,42 +173,48 @@ def __init__(
     ):
         self._tokdict: Dict[str, _ParseResultsWithOffset]
         self._modal = modal
-        if name is not None and name != "":
-            if isinstance(name, int):
-                name = str(name)
-            if not modal:
-                self._all_names = {name}
-            self._name = name
-            if toklist not in self._null_values:
-                if isinstance(toklist, (str_type, type)):
-                    toklist = [toklist]
-                if asList:
-                    if isinstance(toklist, ParseResults):
-                        self[name] = _ParseResultsWithOffset(
-                            ParseResults(toklist._toklist), 0
-                        )
-                    else:
-                        self[name] = _ParseResultsWithOffset(
-                            ParseResults(toklist[0]), 0
-                        )
-                    self[name]._name = name
-                else:
-                    try:
-                        self[name] = toklist[0]
-                    except (KeyError, TypeError, IndexError):
-                        if toklist is not self:
-                            self[name] = toklist
-                        else:
-                            self._name = name
+
+        if name is None or name == "":
+            return
+
+        if isinstance(name, int):
+            name = str(name)
+
+        if not modal:
+            self._all_names = {name}
+
+        self._name = name
+
+        if toklist in self._null_values:
+            return
+
+        if isinstance(toklist, (str_type, type)):
+            toklist = [toklist]
+
+        if asList:
+            if isinstance(toklist, ParseResults):
+                self[name] = _ParseResultsWithOffset(ParseResults(toklist._toklist), 0)
+            else:
+                self[name] = _ParseResultsWithOffset(ParseResults(toklist[0]), 0)
+            self[name]._name = name
+            return
+
+        try:
+            self[name] = toklist[0]
+        except (KeyError, TypeError, IndexError):
+            if toklist is not self:
+                self[name] = toklist
+            else:
+                self._name = name
 
     def __getitem__(self, i):
         if isinstance(i, (int, slice)):
             return self._toklist[i]
-        else:
-            if i not in self._all_names:
-                return self._tokdict[i][-1][0]
-            else:
-                return ParseResults([v[0] for v in self._tokdict[i]])
+
+        if i not in self._all_names:
+            return self._tokdict[i][-1][0]
+
+        return ParseResults([v[0] for v in self._tokdict[i]])
 
     def __setitem__(self, k, v, isinstance=isinstance):
         if isinstance(v, _ParseResultsWithOffset):
@@ -226,27 +232,28 @@ def __setitem__(self, k, v, isinstance=isinstance):
             sub._parent = self
 
     def __delitem__(self, i):
-        if isinstance(i, (int, slice)):
-            mylen = len(self._toklist)
-            del self._toklist[i]
-
-            # convert int to slice
-            if isinstance(i, int):
-                if i < 0:
-                    i += mylen
-                i = slice(i, i + 1)
-            # get removed indices
-            removed = list(range(*i.indices(mylen)))
-            removed.reverse()
-            # fixup indices in token dictionary
-            for name, occurrences in self._tokdict.items():
-                for j in removed:
-                    for k, (value, position) in enumerate(occurrences):
-                        occurrences[k] = _ParseResultsWithOffset(
-                            value, position - (position > j)
-                        )
-        else:
+        if not isinstance(i, (int, slice)):
             del self._tokdict[i]
+            return
+
+        mylen = len(self._toklist)
+        del self._toklist[i]
+
+        # convert int to slice
+        if isinstance(i, int):
+            if i < 0:
+                i += mylen
+            i = slice(i, i + 1)
+        # get removed indices
+        removed = list(range(*i.indices(mylen)))
+        removed.reverse()
+        # fixup indices in token dictionary
+        for occurrences in self._tokdict.values():
+            for j in removed:
+                for k, (value, position) in enumerate(occurrences):
+                    occurrences[k] = _ParseResultsWithOffset(
+                        value, position - (position > j)
+                    )
 
     def __contains__(self, k) -> bool:
         return k in self._tokdict
@@ -376,7 +383,7 @@ def insert_locn(locn, tokens):
         """
         self._toklist.insert(index, ins_string)
         # fixup indices in token dictionary
-        for name, occurrences in self._tokdict.items():
+        for occurrences in self._tokdict.values():
             for k, (value, position) in enumerate(occurrences):
                 occurrences[k] = _ParseResultsWithOffset(
                     value, position + (position > index)
@@ -652,58 +659,52 @@ def dump(self, indent="", full=True, include_list=True, _depth=0) -> str:
         NL = "\n"
         out.append(indent + str(self.as_list()) if include_list else "")
 
-        if full:
-            if self.haskeys():
-                items = sorted((str(k), v) for k, v in self.items())
-                for k, v in items:
-                    if out:
-                        out.append(NL)
-                    out.append(f"{indent}{('  ' * _depth)}- {k}: ")
-                    if isinstance(v, ParseResults):
-                        if v:
-                            out.append(
-                                v.dump(
-                                    indent=indent,
-                                    full=full,
-                                    include_list=include_list,
-                                    _depth=_depth + 1,
-                                )
-                            )
-                        else:
-                            out.append(str(v))
-                    else:
-                        out.append(repr(v))
-            if any(isinstance(vv, ParseResults) for vv in self):
-                v = self
-                for i, vv in enumerate(v):
-                    if isinstance(vv, ParseResults):
-                        out.append(
-                            "\n{}{}[{}]:\n{}{}{}".format(
-                                indent,
-                                ("  " * (_depth)),
-                                i,
-                                indent,
-                                ("  " * (_depth + 1)),
-                                vv.dump(
-                                    indent=indent,
-                                    full=full,
-                                    include_list=include_list,
-                                    _depth=_depth + 1,
-                                ),
-                            )
-                        )
-                    else:
-                        out.append(
-                            "\n%s%s[%d]:\n%s%s%s"
-                            % (
-                                indent,
-                                ("  " * (_depth)),
-                                i,
-                                indent,
-                                ("  " * (_depth + 1)),
-                                str(vv),
-                            )
-                        )
+        if not full:
+            return "".join(out)
+
+        if self.haskeys():
+            items = sorted((str(k), v) for k, v in self.items())
+            for k, v in items:
+                if out:
+                    out.append(NL)
+                out.append(f"{indent}{('  ' * _depth)}- {k}: ")
+                if not isinstance(v, ParseResults):
+                    out.append(repr(v))
+                    continue
+
+                if not v:
+                    out.append(str(v))
+                    continue
+
+                out.append(
+                    v.dump(
+                        indent=indent,
+                        full=full,
+                        include_list=include_list,
+                        _depth=_depth + 1,
+                    )
+                )
+        if not any(isinstance(vv, ParseResults) for vv in self):
+            return "".join(out)
+
+        v = self
+        incr = "  "
+        nl = "\n"
+        for i, vv in enumerate(v):
+            if isinstance(vv, ParseResults):
+                vv_dump = vv.dump(
+                    indent=indent,
+                    full=full,
+                    include_list=include_list,
+                    _depth=_depth + 1,
+                )
+                out.append(
+                    f"{nl}{indent}{incr * _depth}[{i}]:{nl}{indent}{incr * (_depth + 1)}{vv_dump}"
+                )
+            else:
+                out.append(
+                    f"{nl}{indent}{incr * _depth}[{i}]:{nl}{indent}{incr * (_depth + 1)}{vv}"
+                )
 
         return "".join(out)
 
diff --git a/src/pip/_vendor/pyparsing/testing.py b/src/pip/_vendor/pyparsing/testing.py
index 6a254c1c5e2..5654d47d62d 100644
--- a/src/pip/_vendor/pyparsing/testing.py
+++ b/src/pip/_vendor/pyparsing/testing.py
@@ -1,8 +1,10 @@
 # testing.py
 
 from contextlib import contextmanager
+import re
 import typing
 
+
 from .core import (
     ParserElement,
     ParseException,
@@ -49,23 +51,23 @@ def save(self):
             self._save_context["default_whitespace"] = ParserElement.DEFAULT_WHITE_CHARS
             self._save_context["default_keyword_chars"] = Keyword.DEFAULT_KEYWORD_CHARS
 
-            self._save_context[
-                "literal_string_class"
-            ] = ParserElement._literalStringClass
+            self._save_context["literal_string_class"] = (
+                ParserElement._literalStringClass
+            )
 
             self._save_context["verbose_stacktrace"] = ParserElement.verbose_stacktrace
 
             self._save_context["packrat_enabled"] = ParserElement._packratEnabled
             if ParserElement._packratEnabled:
-                self._save_context[
-                    "packrat_cache_size"
-                ] = ParserElement.packrat_cache.size
+                self._save_context["packrat_cache_size"] = (
+                    ParserElement.packrat_cache.size
+                )
             else:
                 self._save_context["packrat_cache_size"] = None
             self._save_context["packrat_parse"] = ParserElement._parse
-            self._save_context[
-                "recursion_enabled"
-            ] = ParserElement._left_recursion_enabled
+            self._save_context["recursion_enabled"] = (
+                ParserElement._left_recursion_enabled
+            )
 
             self._save_context["__diag__"] = {
                 name: getattr(__diag__, name) for name in __diag__._all_names
@@ -180,49 +182,52 @@ def assertRunTestResults(
             """
             run_test_success, run_test_results = run_tests_report
 
-            if expected_parse_results is not None:
-                merged = [
-                    (*rpt, expected)
-                    for rpt, expected in zip(run_test_results, expected_parse_results)
-                ]
-                for test_string, result, expected in merged:
-                    # expected should be a tuple containing a list and/or a dict or an exception,
-                    # and optional failure message string
-                    # an empty tuple will skip any result validation
-                    fail_msg = next(
-                        (exp for exp in expected if isinstance(exp, str)), None
+            if expected_parse_results is None:
+                self.assertTrue(
+                    run_test_success, msg=msg if msg is not None else "failed runTests"
+                )
+                return
+
+            merged = [
+                (*rpt, expected)
+                for rpt, expected in zip(run_test_results, expected_parse_results)
+            ]
+            for test_string, result, expected in merged:
+                # expected should be a tuple containing a list and/or a dict or an exception,
+                # and optional failure message string
+                # an empty tuple will skip any result validation
+                fail_msg = next((exp for exp in expected if isinstance(exp, str)), None)
+                expected_exception = next(
+                    (
+                        exp
+                        for exp in expected
+                        if isinstance(exp, type) and issubclass(exp, Exception)
+                    ),
+                    None,
+                )
+                if expected_exception is not None:
+                    with self.assertRaises(
+                        expected_exception=expected_exception, msg=fail_msg or msg
+                    ):
+                        if isinstance(result, Exception):
+                            raise result
+                else:
+                    expected_list = next(
+                        (exp for exp in expected if isinstance(exp, list)), None
                     )
-                    expected_exception = next(
-                        (
-                            exp
-                            for exp in expected
-                            if isinstance(exp, type) and issubclass(exp, Exception)
-                        ),
-                        None,
+                    expected_dict = next(
+                        (exp for exp in expected if isinstance(exp, dict)), None
                     )
-                    if expected_exception is not None:
-                        with self.assertRaises(
-                            expected_exception=expected_exception, msg=fail_msg or msg
-                        ):
-                            if isinstance(result, Exception):
-                                raise result
-                    else:
-                        expected_list = next(
-                            (exp for exp in expected if isinstance(exp, list)), None
+                    if (expected_list, expected_dict) != (None, None):
+                        self.assertParseResultsEquals(
+                            result,
+                            expected_list=expected_list,
+                            expected_dict=expected_dict,
+                            msg=fail_msg or msg,
                         )
-                        expected_dict = next(
-                            (exp for exp in expected if isinstance(exp, dict)), None
-                        )
-                        if (expected_list, expected_dict) != (None, None):
-                            self.assertParseResultsEquals(
-                                result,
-                                expected_list=expected_list,
-                                expected_dict=expected_dict,
-                                msg=fail_msg or msg,
-                            )
-                        else:
-                            # warning here maybe?
-                            print(f"no validation for {test_string!r}")
+                    else:
+                        # warning here maybe?
+                        print(f"no validation for {test_string!r}")
 
             # do this last, in case some specific test results can be reported instead
             self.assertTrue(
@@ -230,9 +235,18 @@ def assertRunTestResults(
             )
 
         @contextmanager
-        def assertRaisesParseException(self, exc_type=ParseException, msg=None):
-            with self.assertRaises(exc_type, msg=msg):
-                yield
+        def assertRaisesParseException(
+            self, exc_type=ParseException, expected_msg=None, msg=None
+        ):
+            if expected_msg is not None:
+                if isinstance(expected_msg, str):
+                    expected_msg = re.escape(expected_msg)
+                with self.assertRaisesRegex(exc_type, expected_msg, msg=msg) as ctx:
+                    yield ctx
+
+            else:
+                with self.assertRaises(exc_type, msg=msg) as ctx:
+                    yield ctx
 
     @staticmethod
     def with_line_numbers(
diff --git a/src/pip/_vendor/pyparsing/unicode.py b/src/pip/_vendor/pyparsing/unicode.py
index ec0b3a4fe60..e0b7b4ccb9a 100644
--- a/src/pip/_vendor/pyparsing/unicode.py
+++ b/src/pip/_vendor/pyparsing/unicode.py
@@ -102,17 +102,10 @@ def identbodychars(cls):
         all characters in this range that are valid identifier body characters,
         plus the digits 0-9, and · (Unicode MIDDLE DOT)
         """
-        return "".join(
-            sorted(
-                set(
-                    cls.identchars
-                    + "0123456789·"
-                    + "".join(
-                        [c for c in cls._chars_for_ranges if ("_" + c).isidentifier()]
-                    )
-                )
-            )
+        identifier_chars = set(
+            c for c in cls._chars_for_ranges if ("_" + c).isidentifier()
         )
+        return "".join(sorted(identifier_chars | set(cls.identchars + "0123456789·")))
 
     @_lazyclassproperty
     def identifier(cls):
diff --git a/src/pip/_vendor/pyparsing/util.py b/src/pip/_vendor/pyparsing/util.py
index d8d3f414cca..4ae018a9636 100644
--- a/src/pip/_vendor/pyparsing/util.py
+++ b/src/pip/_vendor/pyparsing/util.py
@@ -237,7 +237,7 @@ def _flatten(ll: list) -> list:
     return ret
 
 
-def _make_synonym_function(compat_name: str, fn: C) -> C:
+def replaced_by_pep8(compat_name: str, fn: C) -> C:
     # In a future version, uncomment the code in the internal _inner() functions
     # to begin emitting DeprecationWarnings.
 
@@ -251,7 +251,7 @@ def _make_synonym_function(compat_name: str, fn: C) -> C:
         @wraps(fn)
         def _inner(self, *args, **kwargs):
             # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=3
+            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
             # )
             return fn(self, *args, **kwargs)
 
@@ -260,7 +260,7 @@ def _inner(self, *args, **kwargs):
         @wraps(fn)
         def _inner(*args, **kwargs):
             # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=3
+            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
             # )
             return fn(*args, **kwargs)
 
@@ -275,10 +275,3 @@ def _inner(*args, **kwargs):
         _inner.__kwdefaults__ = None
     _inner.__qualname__ = fn.__qualname__
     return cast(C, _inner)
-
-
-def replaced_by_pep8(fn: C) -> Callable[[Callable], C]:
-    """
-    Decorator for pre-PEP8 compatibility synonyms, to link them to the new function.
-    """
-    return lambda other: _make_synonym_function(other.__name__, fn)
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index fc60f5cae04..ab207435d0d 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -5,7 +5,7 @@ distro==1.9.0
 msgpack==1.0.8
 packaging==21.3
 platformdirs==4.2.1
-pyparsing==3.1.0
+pyparsing==3.1.2
 pyproject-hooks==1.0.0
 requests==2.31.0
     certifi==2024.2.2

From cba5b13f9b0791de05456d7a13d0c1a0a32e1f95 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 3 May 2024 21:03:50 +0100
Subject: [PATCH 356/992] Upgrade idna to 3.7

---
 news/idna.vendor.rst                 |    2 +-
 src/pip/_vendor/idna/LICENSE.md      |    2 +-
 src/pip/_vendor/idna/core.py         |   23 +-
 src/pip/_vendor/idna/idnadata.py     | 2197 +++++++++++++++++++++++++-
 src/pip/_vendor/idna/package_data.py |    2 +-
 src/pip/_vendor/vendor.txt           |    2 +-
 6 files changed, 2159 insertions(+), 69 deletions(-)

diff --git a/news/idna.vendor.rst b/news/idna.vendor.rst
index 229b1f3568a..1b8f7430aa6 100644
--- a/news/idna.vendor.rst
+++ b/news/idna.vendor.rst
@@ -1 +1 @@
-Upgrade idna to 3.6
+Upgrade idna to 3.7
diff --git a/src/pip/_vendor/idna/LICENSE.md b/src/pip/_vendor/idna/LICENSE.md
index ce3670186c6..19b6b45242c 100644
--- a/src/pip/_vendor/idna/LICENSE.md
+++ b/src/pip/_vendor/idna/LICENSE.md
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2013-2023, Kim Davies and contributors.
+Copyright (c) 2013-2024, Kim Davies and contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/pip/_vendor/idna/core.py b/src/pip/_vendor/idna/core.py
index aaf7d658ba0..0dae61acdbc 100644
--- a/src/pip/_vendor/idna/core.py
+++ b/src/pip/_vendor/idna/core.py
@@ -150,9 +150,11 @@ def valid_contextj(label: str, pos: int) -> bool:
             joining_type = idnadata.joining_types.get(ord(label[i]))
             if joining_type == ord('T'):
                 continue
-            if joining_type in [ord('L'), ord('D')]:
+            elif joining_type in [ord('L'), ord('D')]:
                 ok = True
                 break
+            else:
+                break
 
         if not ok:
             return False
@@ -162,9 +164,11 @@ def valid_contextj(label: str, pos: int) -> bool:
             joining_type = idnadata.joining_types.get(ord(label[i]))
             if joining_type == ord('T'):
                 continue
-            if joining_type in [ord('R'), ord('D')]:
+            elif joining_type in [ord('R'), ord('D')]:
                 ok = True
                 break
+            else:
+                break
         return ok
 
     if cp_value == 0x200d:
@@ -236,12 +240,8 @@ def check_label(label: Union[str, bytes, bytearray]) -> None:
         if intranges_contain(cp_value, idnadata.codepoint_classes['PVALID']):
             continue
         elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTJ']):
-            try:
-                if not valid_contextj(label, pos):
-                    raise InvalidCodepointContext('Joiner {} not allowed at position {} in {}'.format(
-                        _unot(cp_value), pos+1, repr(label)))
-            except ValueError:
-                raise IDNAError('Unknown codepoint adjacent to joiner {} at position {} in {}'.format(
+            if not valid_contextj(label, pos):
+                raise InvalidCodepointContext('Joiner {} not allowed at position {} in {}'.format(
                     _unot(cp_value), pos+1, repr(label)))
         elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTO']):
             if not valid_contexto(label, pos):
@@ -262,13 +262,8 @@ def alabel(label: str) -> bytes:
     except UnicodeEncodeError:
         pass
 
-    if not label:
-        raise IDNAError('No Input')
-
-    label = str(label)
     check_label(label)
-    label_bytes = _punycode(label)
-    label_bytes = _alabel_prefix + label_bytes
+    label_bytes = _alabel_prefix + _punycode(label)
 
     if not valid_label_length(label_bytes):
         raise IDNAError('Label too long')
diff --git a/src/pip/_vendor/idna/idnadata.py b/src/pip/_vendor/idna/idnadata.py
index 5cd05d9056e..c61dcf977e5 100644
--- a/src/pip/_vendor/idna/idnadata.py
+++ b/src/pip/_vendor/idna/idnadata.py
@@ -101,16 +101,190 @@
     ),
 }
 joining_types = {
-    0x600: 85,
-    0x601: 85,
-    0x602: 85,
-    0x603: 85,
-    0x604: 85,
-    0x605: 85,
-    0x608: 85,
-    0x60b: 85,
+    0xad: 84,
+    0x300: 84,
+    0x301: 84,
+    0x302: 84,
+    0x303: 84,
+    0x304: 84,
+    0x305: 84,
+    0x306: 84,
+    0x307: 84,
+    0x308: 84,
+    0x309: 84,
+    0x30a: 84,
+    0x30b: 84,
+    0x30c: 84,
+    0x30d: 84,
+    0x30e: 84,
+    0x30f: 84,
+    0x310: 84,
+    0x311: 84,
+    0x312: 84,
+    0x313: 84,
+    0x314: 84,
+    0x315: 84,
+    0x316: 84,
+    0x317: 84,
+    0x318: 84,
+    0x319: 84,
+    0x31a: 84,
+    0x31b: 84,
+    0x31c: 84,
+    0x31d: 84,
+    0x31e: 84,
+    0x31f: 84,
+    0x320: 84,
+    0x321: 84,
+    0x322: 84,
+    0x323: 84,
+    0x324: 84,
+    0x325: 84,
+    0x326: 84,
+    0x327: 84,
+    0x328: 84,
+    0x329: 84,
+    0x32a: 84,
+    0x32b: 84,
+    0x32c: 84,
+    0x32d: 84,
+    0x32e: 84,
+    0x32f: 84,
+    0x330: 84,
+    0x331: 84,
+    0x332: 84,
+    0x333: 84,
+    0x334: 84,
+    0x335: 84,
+    0x336: 84,
+    0x337: 84,
+    0x338: 84,
+    0x339: 84,
+    0x33a: 84,
+    0x33b: 84,
+    0x33c: 84,
+    0x33d: 84,
+    0x33e: 84,
+    0x33f: 84,
+    0x340: 84,
+    0x341: 84,
+    0x342: 84,
+    0x343: 84,
+    0x344: 84,
+    0x345: 84,
+    0x346: 84,
+    0x347: 84,
+    0x348: 84,
+    0x349: 84,
+    0x34a: 84,
+    0x34b: 84,
+    0x34c: 84,
+    0x34d: 84,
+    0x34e: 84,
+    0x34f: 84,
+    0x350: 84,
+    0x351: 84,
+    0x352: 84,
+    0x353: 84,
+    0x354: 84,
+    0x355: 84,
+    0x356: 84,
+    0x357: 84,
+    0x358: 84,
+    0x359: 84,
+    0x35a: 84,
+    0x35b: 84,
+    0x35c: 84,
+    0x35d: 84,
+    0x35e: 84,
+    0x35f: 84,
+    0x360: 84,
+    0x361: 84,
+    0x362: 84,
+    0x363: 84,
+    0x364: 84,
+    0x365: 84,
+    0x366: 84,
+    0x367: 84,
+    0x368: 84,
+    0x369: 84,
+    0x36a: 84,
+    0x36b: 84,
+    0x36c: 84,
+    0x36d: 84,
+    0x36e: 84,
+    0x36f: 84,
+    0x483: 84,
+    0x484: 84,
+    0x485: 84,
+    0x486: 84,
+    0x487: 84,
+    0x488: 84,
+    0x489: 84,
+    0x591: 84,
+    0x592: 84,
+    0x593: 84,
+    0x594: 84,
+    0x595: 84,
+    0x596: 84,
+    0x597: 84,
+    0x598: 84,
+    0x599: 84,
+    0x59a: 84,
+    0x59b: 84,
+    0x59c: 84,
+    0x59d: 84,
+    0x59e: 84,
+    0x59f: 84,
+    0x5a0: 84,
+    0x5a1: 84,
+    0x5a2: 84,
+    0x5a3: 84,
+    0x5a4: 84,
+    0x5a5: 84,
+    0x5a6: 84,
+    0x5a7: 84,
+    0x5a8: 84,
+    0x5a9: 84,
+    0x5aa: 84,
+    0x5ab: 84,
+    0x5ac: 84,
+    0x5ad: 84,
+    0x5ae: 84,
+    0x5af: 84,
+    0x5b0: 84,
+    0x5b1: 84,
+    0x5b2: 84,
+    0x5b3: 84,
+    0x5b4: 84,
+    0x5b5: 84,
+    0x5b6: 84,
+    0x5b7: 84,
+    0x5b8: 84,
+    0x5b9: 84,
+    0x5ba: 84,
+    0x5bb: 84,
+    0x5bc: 84,
+    0x5bd: 84,
+    0x5bf: 84,
+    0x5c1: 84,
+    0x5c2: 84,
+    0x5c4: 84,
+    0x5c5: 84,
+    0x5c7: 84,
+    0x610: 84,
+    0x611: 84,
+    0x612: 84,
+    0x613: 84,
+    0x614: 84,
+    0x615: 84,
+    0x616: 84,
+    0x617: 84,
+    0x618: 84,
+    0x619: 84,
+    0x61a: 84,
+    0x61c: 84,
     0x620: 68,
-    0x621: 85,
     0x622: 82,
     0x623: 82,
     0x624: 82,
@@ -152,12 +326,33 @@
     0x648: 82,
     0x649: 68,
     0x64a: 68,
+    0x64b: 84,
+    0x64c: 84,
+    0x64d: 84,
+    0x64e: 84,
+    0x64f: 84,
+    0x650: 84,
+    0x651: 84,
+    0x652: 84,
+    0x653: 84,
+    0x654: 84,
+    0x655: 84,
+    0x656: 84,
+    0x657: 84,
+    0x658: 84,
+    0x659: 84,
+    0x65a: 84,
+    0x65b: 84,
+    0x65c: 84,
+    0x65d: 84,
+    0x65e: 84,
+    0x65f: 84,
     0x66e: 68,
     0x66f: 68,
+    0x670: 84,
     0x671: 82,
     0x672: 82,
     0x673: 82,
-    0x674: 85,
     0x675: 82,
     0x676: 82,
     0x677: 82,
@@ -254,7 +449,25 @@
     0x6d2: 82,
     0x6d3: 82,
     0x6d5: 82,
-    0x6dd: 85,
+    0x6d6: 84,
+    0x6d7: 84,
+    0x6d8: 84,
+    0x6d9: 84,
+    0x6da: 84,
+    0x6db: 84,
+    0x6dc: 84,
+    0x6df: 84,
+    0x6e0: 84,
+    0x6e1: 84,
+    0x6e2: 84,
+    0x6e3: 84,
+    0x6e4: 84,
+    0x6e7: 84,
+    0x6e8: 84,
+    0x6ea: 84,
+    0x6eb: 84,
+    0x6ec: 84,
+    0x6ed: 84,
     0x6ee: 82,
     0x6ef: 82,
     0x6fa: 68,
@@ -263,6 +476,7 @@
     0x6ff: 68,
     0x70f: 84,
     0x710: 82,
+    0x711: 84,
     0x712: 68,
     0x713: 68,
     0x714: 68,
@@ -293,6 +507,33 @@
     0x72d: 68,
     0x72e: 68,
     0x72f: 82,
+    0x730: 84,
+    0x731: 84,
+    0x732: 84,
+    0x733: 84,
+    0x734: 84,
+    0x735: 84,
+    0x736: 84,
+    0x737: 84,
+    0x738: 84,
+    0x739: 84,
+    0x73a: 84,
+    0x73b: 84,
+    0x73c: 84,
+    0x73d: 84,
+    0x73e: 84,
+    0x73f: 84,
+    0x740: 84,
+    0x741: 84,
+    0x742: 84,
+    0x743: 84,
+    0x744: 84,
+    0x745: 84,
+    0x746: 84,
+    0x747: 84,
+    0x748: 84,
+    0x749: 84,
+    0x74a: 84,
     0x74d: 82,
     0x74e: 68,
     0x74f: 68,
@@ -344,6 +585,17 @@
     0x77d: 68,
     0x77e: 68,
     0x77f: 68,
+    0x7a6: 84,
+    0x7a7: 84,
+    0x7a8: 84,
+    0x7a9: 84,
+    0x7aa: 84,
+    0x7ab: 84,
+    0x7ac: 84,
+    0x7ad: 84,
+    0x7ae: 84,
+    0x7af: 84,
+    0x7b0: 84,
     0x7ca: 68,
     0x7cb: 68,
     0x7cc: 68,
@@ -377,7 +629,38 @@
     0x7e8: 68,
     0x7e9: 68,
     0x7ea: 68,
+    0x7eb: 84,
+    0x7ec: 84,
+    0x7ed: 84,
+    0x7ee: 84,
+    0x7ef: 84,
+    0x7f0: 84,
+    0x7f1: 84,
+    0x7f2: 84,
+    0x7f3: 84,
     0x7fa: 67,
+    0x7fd: 84,
+    0x816: 84,
+    0x817: 84,
+    0x818: 84,
+    0x819: 84,
+    0x81b: 84,
+    0x81c: 84,
+    0x81d: 84,
+    0x81e: 84,
+    0x81f: 84,
+    0x820: 84,
+    0x821: 84,
+    0x822: 84,
+    0x823: 84,
+    0x825: 84,
+    0x826: 84,
+    0x827: 84,
+    0x829: 84,
+    0x82a: 84,
+    0x82b: 84,
+    0x82c: 84,
+    0x82d: 84,
     0x840: 82,
     0x841: 68,
     0x842: 68,
@@ -403,13 +686,14 @@
     0x856: 82,
     0x857: 82,
     0x858: 82,
+    0x859: 84,
+    0x85a: 84,
+    0x85b: 84,
     0x860: 68,
-    0x861: 85,
     0x862: 68,
     0x863: 68,
     0x864: 68,
     0x865: 68,
-    0x866: 85,
     0x867: 82,
     0x868: 68,
     0x869: 82,
@@ -437,16 +721,20 @@
     0x884: 67,
     0x885: 67,
     0x886: 68,
-    0x887: 85,
-    0x888: 85,
     0x889: 68,
     0x88a: 68,
     0x88b: 68,
     0x88c: 68,
     0x88d: 68,
     0x88e: 82,
-    0x890: 85,
-    0x891: 85,
+    0x898: 84,
+    0x899: 84,
+    0x89a: 84,
+    0x89b: 84,
+    0x89c: 84,
+    0x89d: 84,
+    0x89e: 84,
+    0x89f: 84,
     0x8a0: 68,
     0x8a1: 68,
     0x8a2: 68,
@@ -460,7 +748,6 @@
     0x8aa: 82,
     0x8ab: 82,
     0x8ac: 82,
-    0x8ad: 85,
     0x8ae: 82,
     0x8af: 68,
     0x8b0: 68,
@@ -488,11 +775,357 @@
     0x8c6: 68,
     0x8c7: 68,
     0x8c8: 68,
-    0x8e2: 85,
-    0x1806: 85,
+    0x8ca: 84,
+    0x8cb: 84,
+    0x8cc: 84,
+    0x8cd: 84,
+    0x8ce: 84,
+    0x8cf: 84,
+    0x8d0: 84,
+    0x8d1: 84,
+    0x8d2: 84,
+    0x8d3: 84,
+    0x8d4: 84,
+    0x8d5: 84,
+    0x8d6: 84,
+    0x8d7: 84,
+    0x8d8: 84,
+    0x8d9: 84,
+    0x8da: 84,
+    0x8db: 84,
+    0x8dc: 84,
+    0x8dd: 84,
+    0x8de: 84,
+    0x8df: 84,
+    0x8e0: 84,
+    0x8e1: 84,
+    0x8e3: 84,
+    0x8e4: 84,
+    0x8e5: 84,
+    0x8e6: 84,
+    0x8e7: 84,
+    0x8e8: 84,
+    0x8e9: 84,
+    0x8ea: 84,
+    0x8eb: 84,
+    0x8ec: 84,
+    0x8ed: 84,
+    0x8ee: 84,
+    0x8ef: 84,
+    0x8f0: 84,
+    0x8f1: 84,
+    0x8f2: 84,
+    0x8f3: 84,
+    0x8f4: 84,
+    0x8f5: 84,
+    0x8f6: 84,
+    0x8f7: 84,
+    0x8f8: 84,
+    0x8f9: 84,
+    0x8fa: 84,
+    0x8fb: 84,
+    0x8fc: 84,
+    0x8fd: 84,
+    0x8fe: 84,
+    0x8ff: 84,
+    0x900: 84,
+    0x901: 84,
+    0x902: 84,
+    0x93a: 84,
+    0x93c: 84,
+    0x941: 84,
+    0x942: 84,
+    0x943: 84,
+    0x944: 84,
+    0x945: 84,
+    0x946: 84,
+    0x947: 84,
+    0x948: 84,
+    0x94d: 84,
+    0x951: 84,
+    0x952: 84,
+    0x953: 84,
+    0x954: 84,
+    0x955: 84,
+    0x956: 84,
+    0x957: 84,
+    0x962: 84,
+    0x963: 84,
+    0x981: 84,
+    0x9bc: 84,
+    0x9c1: 84,
+    0x9c2: 84,
+    0x9c3: 84,
+    0x9c4: 84,
+    0x9cd: 84,
+    0x9e2: 84,
+    0x9e3: 84,
+    0x9fe: 84,
+    0xa01: 84,
+    0xa02: 84,
+    0xa3c: 84,
+    0xa41: 84,
+    0xa42: 84,
+    0xa47: 84,
+    0xa48: 84,
+    0xa4b: 84,
+    0xa4c: 84,
+    0xa4d: 84,
+    0xa51: 84,
+    0xa70: 84,
+    0xa71: 84,
+    0xa75: 84,
+    0xa81: 84,
+    0xa82: 84,
+    0xabc: 84,
+    0xac1: 84,
+    0xac2: 84,
+    0xac3: 84,
+    0xac4: 84,
+    0xac5: 84,
+    0xac7: 84,
+    0xac8: 84,
+    0xacd: 84,
+    0xae2: 84,
+    0xae3: 84,
+    0xafa: 84,
+    0xafb: 84,
+    0xafc: 84,
+    0xafd: 84,
+    0xafe: 84,
+    0xaff: 84,
+    0xb01: 84,
+    0xb3c: 84,
+    0xb3f: 84,
+    0xb41: 84,
+    0xb42: 84,
+    0xb43: 84,
+    0xb44: 84,
+    0xb4d: 84,
+    0xb55: 84,
+    0xb56: 84,
+    0xb62: 84,
+    0xb63: 84,
+    0xb82: 84,
+    0xbc0: 84,
+    0xbcd: 84,
+    0xc00: 84,
+    0xc04: 84,
+    0xc3c: 84,
+    0xc3e: 84,
+    0xc3f: 84,
+    0xc40: 84,
+    0xc46: 84,
+    0xc47: 84,
+    0xc48: 84,
+    0xc4a: 84,
+    0xc4b: 84,
+    0xc4c: 84,
+    0xc4d: 84,
+    0xc55: 84,
+    0xc56: 84,
+    0xc62: 84,
+    0xc63: 84,
+    0xc81: 84,
+    0xcbc: 84,
+    0xcbf: 84,
+    0xcc6: 84,
+    0xccc: 84,
+    0xccd: 84,
+    0xce2: 84,
+    0xce3: 84,
+    0xd00: 84,
+    0xd01: 84,
+    0xd3b: 84,
+    0xd3c: 84,
+    0xd41: 84,
+    0xd42: 84,
+    0xd43: 84,
+    0xd44: 84,
+    0xd4d: 84,
+    0xd62: 84,
+    0xd63: 84,
+    0xd81: 84,
+    0xdca: 84,
+    0xdd2: 84,
+    0xdd3: 84,
+    0xdd4: 84,
+    0xdd6: 84,
+    0xe31: 84,
+    0xe34: 84,
+    0xe35: 84,
+    0xe36: 84,
+    0xe37: 84,
+    0xe38: 84,
+    0xe39: 84,
+    0xe3a: 84,
+    0xe47: 84,
+    0xe48: 84,
+    0xe49: 84,
+    0xe4a: 84,
+    0xe4b: 84,
+    0xe4c: 84,
+    0xe4d: 84,
+    0xe4e: 84,
+    0xeb1: 84,
+    0xeb4: 84,
+    0xeb5: 84,
+    0xeb6: 84,
+    0xeb7: 84,
+    0xeb8: 84,
+    0xeb9: 84,
+    0xeba: 84,
+    0xebb: 84,
+    0xebc: 84,
+    0xec8: 84,
+    0xec9: 84,
+    0xeca: 84,
+    0xecb: 84,
+    0xecc: 84,
+    0xecd: 84,
+    0xece: 84,
+    0xf18: 84,
+    0xf19: 84,
+    0xf35: 84,
+    0xf37: 84,
+    0xf39: 84,
+    0xf71: 84,
+    0xf72: 84,
+    0xf73: 84,
+    0xf74: 84,
+    0xf75: 84,
+    0xf76: 84,
+    0xf77: 84,
+    0xf78: 84,
+    0xf79: 84,
+    0xf7a: 84,
+    0xf7b: 84,
+    0xf7c: 84,
+    0xf7d: 84,
+    0xf7e: 84,
+    0xf80: 84,
+    0xf81: 84,
+    0xf82: 84,
+    0xf83: 84,
+    0xf84: 84,
+    0xf86: 84,
+    0xf87: 84,
+    0xf8d: 84,
+    0xf8e: 84,
+    0xf8f: 84,
+    0xf90: 84,
+    0xf91: 84,
+    0xf92: 84,
+    0xf93: 84,
+    0xf94: 84,
+    0xf95: 84,
+    0xf96: 84,
+    0xf97: 84,
+    0xf99: 84,
+    0xf9a: 84,
+    0xf9b: 84,
+    0xf9c: 84,
+    0xf9d: 84,
+    0xf9e: 84,
+    0xf9f: 84,
+    0xfa0: 84,
+    0xfa1: 84,
+    0xfa2: 84,
+    0xfa3: 84,
+    0xfa4: 84,
+    0xfa5: 84,
+    0xfa6: 84,
+    0xfa7: 84,
+    0xfa8: 84,
+    0xfa9: 84,
+    0xfaa: 84,
+    0xfab: 84,
+    0xfac: 84,
+    0xfad: 84,
+    0xfae: 84,
+    0xfaf: 84,
+    0xfb0: 84,
+    0xfb1: 84,
+    0xfb2: 84,
+    0xfb3: 84,
+    0xfb4: 84,
+    0xfb5: 84,
+    0xfb6: 84,
+    0xfb7: 84,
+    0xfb8: 84,
+    0xfb9: 84,
+    0xfba: 84,
+    0xfbb: 84,
+    0xfbc: 84,
+    0xfc6: 84,
+    0x102d: 84,
+    0x102e: 84,
+    0x102f: 84,
+    0x1030: 84,
+    0x1032: 84,
+    0x1033: 84,
+    0x1034: 84,
+    0x1035: 84,
+    0x1036: 84,
+    0x1037: 84,
+    0x1039: 84,
+    0x103a: 84,
+    0x103d: 84,
+    0x103e: 84,
+    0x1058: 84,
+    0x1059: 84,
+    0x105e: 84,
+    0x105f: 84,
+    0x1060: 84,
+    0x1071: 84,
+    0x1072: 84,
+    0x1073: 84,
+    0x1074: 84,
+    0x1082: 84,
+    0x1085: 84,
+    0x1086: 84,
+    0x108d: 84,
+    0x109d: 84,
+    0x135d: 84,
+    0x135e: 84,
+    0x135f: 84,
+    0x1712: 84,
+    0x1713: 84,
+    0x1714: 84,
+    0x1732: 84,
+    0x1733: 84,
+    0x1752: 84,
+    0x1753: 84,
+    0x1772: 84,
+    0x1773: 84,
+    0x17b4: 84,
+    0x17b5: 84,
+    0x17b7: 84,
+    0x17b8: 84,
+    0x17b9: 84,
+    0x17ba: 84,
+    0x17bb: 84,
+    0x17bc: 84,
+    0x17bd: 84,
+    0x17c6: 84,
+    0x17c9: 84,
+    0x17ca: 84,
+    0x17cb: 84,
+    0x17cc: 84,
+    0x17cd: 84,
+    0x17ce: 84,
+    0x17cf: 84,
+    0x17d0: 84,
+    0x17d1: 84,
+    0x17d2: 84,
+    0x17d3: 84,
+    0x17dd: 84,
     0x1807: 68,
     0x180a: 67,
-    0x180e: 85,
+    0x180b: 84,
+    0x180c: 84,
+    0x180d: 84,
+    0x180f: 84,
     0x1820: 68,
     0x1821: 68,
     0x1822: 68,
@@ -582,11 +1215,6 @@
     0x1876: 68,
     0x1877: 68,
     0x1878: 68,
-    0x1880: 85,
-    0x1881: 85,
-    0x1882: 85,
-    0x1883: 85,
-    0x1884: 85,
     0x1885: 84,
     0x1886: 84,
     0x1887: 68,
@@ -623,14 +1251,339 @@
     0x18a6: 68,
     0x18a7: 68,
     0x18a8: 68,
+    0x18a9: 84,
     0x18aa: 68,
-    0x200c: 85,
+    0x1920: 84,
+    0x1921: 84,
+    0x1922: 84,
+    0x1927: 84,
+    0x1928: 84,
+    0x1932: 84,
+    0x1939: 84,
+    0x193a: 84,
+    0x193b: 84,
+    0x1a17: 84,
+    0x1a18: 84,
+    0x1a1b: 84,
+    0x1a56: 84,
+    0x1a58: 84,
+    0x1a59: 84,
+    0x1a5a: 84,
+    0x1a5b: 84,
+    0x1a5c: 84,
+    0x1a5d: 84,
+    0x1a5e: 84,
+    0x1a60: 84,
+    0x1a62: 84,
+    0x1a65: 84,
+    0x1a66: 84,
+    0x1a67: 84,
+    0x1a68: 84,
+    0x1a69: 84,
+    0x1a6a: 84,
+    0x1a6b: 84,
+    0x1a6c: 84,
+    0x1a73: 84,
+    0x1a74: 84,
+    0x1a75: 84,
+    0x1a76: 84,
+    0x1a77: 84,
+    0x1a78: 84,
+    0x1a79: 84,
+    0x1a7a: 84,
+    0x1a7b: 84,
+    0x1a7c: 84,
+    0x1a7f: 84,
+    0x1ab0: 84,
+    0x1ab1: 84,
+    0x1ab2: 84,
+    0x1ab3: 84,
+    0x1ab4: 84,
+    0x1ab5: 84,
+    0x1ab6: 84,
+    0x1ab7: 84,
+    0x1ab8: 84,
+    0x1ab9: 84,
+    0x1aba: 84,
+    0x1abb: 84,
+    0x1abc: 84,
+    0x1abd: 84,
+    0x1abe: 84,
+    0x1abf: 84,
+    0x1ac0: 84,
+    0x1ac1: 84,
+    0x1ac2: 84,
+    0x1ac3: 84,
+    0x1ac4: 84,
+    0x1ac5: 84,
+    0x1ac6: 84,
+    0x1ac7: 84,
+    0x1ac8: 84,
+    0x1ac9: 84,
+    0x1aca: 84,
+    0x1acb: 84,
+    0x1acc: 84,
+    0x1acd: 84,
+    0x1ace: 84,
+    0x1b00: 84,
+    0x1b01: 84,
+    0x1b02: 84,
+    0x1b03: 84,
+    0x1b34: 84,
+    0x1b36: 84,
+    0x1b37: 84,
+    0x1b38: 84,
+    0x1b39: 84,
+    0x1b3a: 84,
+    0x1b3c: 84,
+    0x1b42: 84,
+    0x1b6b: 84,
+    0x1b6c: 84,
+    0x1b6d: 84,
+    0x1b6e: 84,
+    0x1b6f: 84,
+    0x1b70: 84,
+    0x1b71: 84,
+    0x1b72: 84,
+    0x1b73: 84,
+    0x1b80: 84,
+    0x1b81: 84,
+    0x1ba2: 84,
+    0x1ba3: 84,
+    0x1ba4: 84,
+    0x1ba5: 84,
+    0x1ba8: 84,
+    0x1ba9: 84,
+    0x1bab: 84,
+    0x1bac: 84,
+    0x1bad: 84,
+    0x1be6: 84,
+    0x1be8: 84,
+    0x1be9: 84,
+    0x1bed: 84,
+    0x1bef: 84,
+    0x1bf0: 84,
+    0x1bf1: 84,
+    0x1c2c: 84,
+    0x1c2d: 84,
+    0x1c2e: 84,
+    0x1c2f: 84,
+    0x1c30: 84,
+    0x1c31: 84,
+    0x1c32: 84,
+    0x1c33: 84,
+    0x1c36: 84,
+    0x1c37: 84,
+    0x1cd0: 84,
+    0x1cd1: 84,
+    0x1cd2: 84,
+    0x1cd4: 84,
+    0x1cd5: 84,
+    0x1cd6: 84,
+    0x1cd7: 84,
+    0x1cd8: 84,
+    0x1cd9: 84,
+    0x1cda: 84,
+    0x1cdb: 84,
+    0x1cdc: 84,
+    0x1cdd: 84,
+    0x1cde: 84,
+    0x1cdf: 84,
+    0x1ce0: 84,
+    0x1ce2: 84,
+    0x1ce3: 84,
+    0x1ce4: 84,
+    0x1ce5: 84,
+    0x1ce6: 84,
+    0x1ce7: 84,
+    0x1ce8: 84,
+    0x1ced: 84,
+    0x1cf4: 84,
+    0x1cf8: 84,
+    0x1cf9: 84,
+    0x1dc0: 84,
+    0x1dc1: 84,
+    0x1dc2: 84,
+    0x1dc3: 84,
+    0x1dc4: 84,
+    0x1dc5: 84,
+    0x1dc6: 84,
+    0x1dc7: 84,
+    0x1dc8: 84,
+    0x1dc9: 84,
+    0x1dca: 84,
+    0x1dcb: 84,
+    0x1dcc: 84,
+    0x1dcd: 84,
+    0x1dce: 84,
+    0x1dcf: 84,
+    0x1dd0: 84,
+    0x1dd1: 84,
+    0x1dd2: 84,
+    0x1dd3: 84,
+    0x1dd4: 84,
+    0x1dd5: 84,
+    0x1dd6: 84,
+    0x1dd7: 84,
+    0x1dd8: 84,
+    0x1dd9: 84,
+    0x1dda: 84,
+    0x1ddb: 84,
+    0x1ddc: 84,
+    0x1ddd: 84,
+    0x1dde: 84,
+    0x1ddf: 84,
+    0x1de0: 84,
+    0x1de1: 84,
+    0x1de2: 84,
+    0x1de3: 84,
+    0x1de4: 84,
+    0x1de5: 84,
+    0x1de6: 84,
+    0x1de7: 84,
+    0x1de8: 84,
+    0x1de9: 84,
+    0x1dea: 84,
+    0x1deb: 84,
+    0x1dec: 84,
+    0x1ded: 84,
+    0x1dee: 84,
+    0x1def: 84,
+    0x1df0: 84,
+    0x1df1: 84,
+    0x1df2: 84,
+    0x1df3: 84,
+    0x1df4: 84,
+    0x1df5: 84,
+    0x1df6: 84,
+    0x1df7: 84,
+    0x1df8: 84,
+    0x1df9: 84,
+    0x1dfa: 84,
+    0x1dfb: 84,
+    0x1dfc: 84,
+    0x1dfd: 84,
+    0x1dfe: 84,
+    0x1dff: 84,
+    0x200b: 84,
     0x200d: 67,
-    0x202f: 85,
-    0x2066: 85,
-    0x2067: 85,
-    0x2068: 85,
-    0x2069: 85,
+    0x200e: 84,
+    0x200f: 84,
+    0x202a: 84,
+    0x202b: 84,
+    0x202c: 84,
+    0x202d: 84,
+    0x202e: 84,
+    0x2060: 84,
+    0x2061: 84,
+    0x2062: 84,
+    0x2063: 84,
+    0x2064: 84,
+    0x206a: 84,
+    0x206b: 84,
+    0x206c: 84,
+    0x206d: 84,
+    0x206e: 84,
+    0x206f: 84,
+    0x20d0: 84,
+    0x20d1: 84,
+    0x20d2: 84,
+    0x20d3: 84,
+    0x20d4: 84,
+    0x20d5: 84,
+    0x20d6: 84,
+    0x20d7: 84,
+    0x20d8: 84,
+    0x20d9: 84,
+    0x20da: 84,
+    0x20db: 84,
+    0x20dc: 84,
+    0x20dd: 84,
+    0x20de: 84,
+    0x20df: 84,
+    0x20e0: 84,
+    0x20e1: 84,
+    0x20e2: 84,
+    0x20e3: 84,
+    0x20e4: 84,
+    0x20e5: 84,
+    0x20e6: 84,
+    0x20e7: 84,
+    0x20e8: 84,
+    0x20e9: 84,
+    0x20ea: 84,
+    0x20eb: 84,
+    0x20ec: 84,
+    0x20ed: 84,
+    0x20ee: 84,
+    0x20ef: 84,
+    0x20f0: 84,
+    0x2cef: 84,
+    0x2cf0: 84,
+    0x2cf1: 84,
+    0x2d7f: 84,
+    0x2de0: 84,
+    0x2de1: 84,
+    0x2de2: 84,
+    0x2de3: 84,
+    0x2de4: 84,
+    0x2de5: 84,
+    0x2de6: 84,
+    0x2de7: 84,
+    0x2de8: 84,
+    0x2de9: 84,
+    0x2dea: 84,
+    0x2deb: 84,
+    0x2dec: 84,
+    0x2ded: 84,
+    0x2dee: 84,
+    0x2def: 84,
+    0x2df0: 84,
+    0x2df1: 84,
+    0x2df2: 84,
+    0x2df3: 84,
+    0x2df4: 84,
+    0x2df5: 84,
+    0x2df6: 84,
+    0x2df7: 84,
+    0x2df8: 84,
+    0x2df9: 84,
+    0x2dfa: 84,
+    0x2dfb: 84,
+    0x2dfc: 84,
+    0x2dfd: 84,
+    0x2dfe: 84,
+    0x2dff: 84,
+    0x302a: 84,
+    0x302b: 84,
+    0x302c: 84,
+    0x302d: 84,
+    0x3099: 84,
+    0x309a: 84,
+    0xa66f: 84,
+    0xa670: 84,
+    0xa671: 84,
+    0xa672: 84,
+    0xa674: 84,
+    0xa675: 84,
+    0xa676: 84,
+    0xa677: 84,
+    0xa678: 84,
+    0xa679: 84,
+    0xa67a: 84,
+    0xa67b: 84,
+    0xa67c: 84,
+    0xa67d: 84,
+    0xa69e: 84,
+    0xa69f: 84,
+    0xa6f0: 84,
+    0xa6f1: 84,
+    0xa802: 84,
+    0xa806: 84,
+    0xa80b: 84,
+    0xa825: 84,
+    0xa826: 84,
+    0xa82c: 84,
     0xa840: 68,
     0xa841: 68,
     0xa842: 68,
@@ -682,20 +1635,151 @@
     0xa870: 68,
     0xa871: 68,
     0xa872: 76,
-    0xa873: 85,
+    0xa8c4: 84,
+    0xa8c5: 84,
+    0xa8e0: 84,
+    0xa8e1: 84,
+    0xa8e2: 84,
+    0xa8e3: 84,
+    0xa8e4: 84,
+    0xa8e5: 84,
+    0xa8e6: 84,
+    0xa8e7: 84,
+    0xa8e8: 84,
+    0xa8e9: 84,
+    0xa8ea: 84,
+    0xa8eb: 84,
+    0xa8ec: 84,
+    0xa8ed: 84,
+    0xa8ee: 84,
+    0xa8ef: 84,
+    0xa8f0: 84,
+    0xa8f1: 84,
+    0xa8ff: 84,
+    0xa926: 84,
+    0xa927: 84,
+    0xa928: 84,
+    0xa929: 84,
+    0xa92a: 84,
+    0xa92b: 84,
+    0xa92c: 84,
+    0xa92d: 84,
+    0xa947: 84,
+    0xa948: 84,
+    0xa949: 84,
+    0xa94a: 84,
+    0xa94b: 84,
+    0xa94c: 84,
+    0xa94d: 84,
+    0xa94e: 84,
+    0xa94f: 84,
+    0xa950: 84,
+    0xa951: 84,
+    0xa980: 84,
+    0xa981: 84,
+    0xa982: 84,
+    0xa9b3: 84,
+    0xa9b6: 84,
+    0xa9b7: 84,
+    0xa9b8: 84,
+    0xa9b9: 84,
+    0xa9bc: 84,
+    0xa9bd: 84,
+    0xa9e5: 84,
+    0xaa29: 84,
+    0xaa2a: 84,
+    0xaa2b: 84,
+    0xaa2c: 84,
+    0xaa2d: 84,
+    0xaa2e: 84,
+    0xaa31: 84,
+    0xaa32: 84,
+    0xaa35: 84,
+    0xaa36: 84,
+    0xaa43: 84,
+    0xaa4c: 84,
+    0xaa7c: 84,
+    0xaab0: 84,
+    0xaab2: 84,
+    0xaab3: 84,
+    0xaab4: 84,
+    0xaab7: 84,
+    0xaab8: 84,
+    0xaabe: 84,
+    0xaabf: 84,
+    0xaac1: 84,
+    0xaaec: 84,
+    0xaaed: 84,
+    0xaaf6: 84,
+    0xabe5: 84,
+    0xabe8: 84,
+    0xabed: 84,
+    0xfb1e: 84,
+    0xfe00: 84,
+    0xfe01: 84,
+    0xfe02: 84,
+    0xfe03: 84,
+    0xfe04: 84,
+    0xfe05: 84,
+    0xfe06: 84,
+    0xfe07: 84,
+    0xfe08: 84,
+    0xfe09: 84,
+    0xfe0a: 84,
+    0xfe0b: 84,
+    0xfe0c: 84,
+    0xfe0d: 84,
+    0xfe0e: 84,
+    0xfe0f: 84,
+    0xfe20: 84,
+    0xfe21: 84,
+    0xfe22: 84,
+    0xfe23: 84,
+    0xfe24: 84,
+    0xfe25: 84,
+    0xfe26: 84,
+    0xfe27: 84,
+    0xfe28: 84,
+    0xfe29: 84,
+    0xfe2a: 84,
+    0xfe2b: 84,
+    0xfe2c: 84,
+    0xfe2d: 84,
+    0xfe2e: 84,
+    0xfe2f: 84,
+    0xfeff: 84,
+    0xfff9: 84,
+    0xfffa: 84,
+    0xfffb: 84,
+    0x101fd: 84,
+    0x102e0: 84,
+    0x10376: 84,
+    0x10377: 84,
+    0x10378: 84,
+    0x10379: 84,
+    0x1037a: 84,
+    0x10a01: 84,
+    0x10a02: 84,
+    0x10a03: 84,
+    0x10a05: 84,
+    0x10a06: 84,
+    0x10a0c: 84,
+    0x10a0d: 84,
+    0x10a0e: 84,
+    0x10a0f: 84,
+    0x10a38: 84,
+    0x10a39: 84,
+    0x10a3a: 84,
+    0x10a3f: 84,
     0x10ac0: 68,
     0x10ac1: 68,
     0x10ac2: 68,
     0x10ac3: 68,
     0x10ac4: 68,
     0x10ac5: 82,
-    0x10ac6: 85,
     0x10ac7: 82,
-    0x10ac8: 85,
     0x10ac9: 82,
     0x10aca: 82,
-    0x10acb: 85,
-    0x10acc: 85,
     0x10acd: 76,
     0x10ace: 82,
     0x10acf: 82,
@@ -717,9 +1801,9 @@
     0x10adf: 68,
     0x10ae0: 68,
     0x10ae1: 82,
-    0x10ae2: 85,
-    0x10ae3: 85,
     0x10ae4: 82,
+    0x10ae5: 84,
+    0x10ae6: 84,
     0x10aeb: 68,
     0x10aec: 68,
     0x10aed: 68,
@@ -749,7 +1833,6 @@
     0x10bac: 82,
     0x10bad: 68,
     0x10bae: 68,
-    0x10baf: 85,
     0x10d00: 76,
     0x10d01: 68,
     0x10d02: 68,
@@ -786,6 +1869,15 @@
     0x10d21: 68,
     0x10d22: 82,
     0x10d23: 68,
+    0x10d24: 84,
+    0x10d25: 84,
+    0x10d26: 84,
+    0x10d27: 84,
+    0x10eab: 84,
+    0x10eac: 84,
+    0x10efd: 84,
+    0x10efe: 84,
+    0x10eff: 84,
     0x10f30: 68,
     0x10f31: 68,
     0x10f32: 68,
@@ -807,7 +1899,17 @@
     0x10f42: 68,
     0x10f43: 68,
     0x10f44: 68,
-    0x10f45: 85,
+    0x10f46: 84,
+    0x10f47: 84,
+    0x10f48: 84,
+    0x10f49: 84,
+    0x10f4a: 84,
+    0x10f4b: 84,
+    0x10f4c: 84,
+    0x10f4d: 84,
+    0x10f4e: 84,
+    0x10f4f: 84,
+    0x10f50: 84,
     0x10f51: 68,
     0x10f52: 68,
     0x10f53: 68,
@@ -830,14 +1932,16 @@
     0x10f7f: 68,
     0x10f80: 68,
     0x10f81: 68,
+    0x10f82: 84,
+    0x10f83: 84,
+    0x10f84: 84,
+    0x10f85: 84,
     0x10fb0: 68,
-    0x10fb1: 85,
     0x10fb2: 68,
     0x10fb3: 68,
     0x10fb4: 82,
     0x10fb5: 82,
     0x10fb6: 82,
-    0x10fb7: 85,
     0x10fb8: 68,
     0x10fb9: 82,
     0x10fba: 82,
@@ -846,20 +1950,668 @@
     0x10fbd: 82,
     0x10fbe: 68,
     0x10fbf: 68,
-    0x10fc0: 85,
     0x10fc1: 68,
     0x10fc2: 82,
     0x10fc3: 82,
     0x10fc4: 68,
-    0x10fc5: 85,
-    0x10fc6: 85,
-    0x10fc7: 85,
-    0x10fc8: 85,
     0x10fc9: 82,
     0x10fca: 68,
     0x10fcb: 76,
-    0x110bd: 85,
-    0x110cd: 85,
+    0x11001: 84,
+    0x11038: 84,
+    0x11039: 84,
+    0x1103a: 84,
+    0x1103b: 84,
+    0x1103c: 84,
+    0x1103d: 84,
+    0x1103e: 84,
+    0x1103f: 84,
+    0x11040: 84,
+    0x11041: 84,
+    0x11042: 84,
+    0x11043: 84,
+    0x11044: 84,
+    0x11045: 84,
+    0x11046: 84,
+    0x11070: 84,
+    0x11073: 84,
+    0x11074: 84,
+    0x1107f: 84,
+    0x11080: 84,
+    0x11081: 84,
+    0x110b3: 84,
+    0x110b4: 84,
+    0x110b5: 84,
+    0x110b6: 84,
+    0x110b9: 84,
+    0x110ba: 84,
+    0x110c2: 84,
+    0x11100: 84,
+    0x11101: 84,
+    0x11102: 84,
+    0x11127: 84,
+    0x11128: 84,
+    0x11129: 84,
+    0x1112a: 84,
+    0x1112b: 84,
+    0x1112d: 84,
+    0x1112e: 84,
+    0x1112f: 84,
+    0x11130: 84,
+    0x11131: 84,
+    0x11132: 84,
+    0x11133: 84,
+    0x11134: 84,
+    0x11173: 84,
+    0x11180: 84,
+    0x11181: 84,
+    0x111b6: 84,
+    0x111b7: 84,
+    0x111b8: 84,
+    0x111b9: 84,
+    0x111ba: 84,
+    0x111bb: 84,
+    0x111bc: 84,
+    0x111bd: 84,
+    0x111be: 84,
+    0x111c9: 84,
+    0x111ca: 84,
+    0x111cb: 84,
+    0x111cc: 84,
+    0x111cf: 84,
+    0x1122f: 84,
+    0x11230: 84,
+    0x11231: 84,
+    0x11234: 84,
+    0x11236: 84,
+    0x11237: 84,
+    0x1123e: 84,
+    0x11241: 84,
+    0x112df: 84,
+    0x112e3: 84,
+    0x112e4: 84,
+    0x112e5: 84,
+    0x112e6: 84,
+    0x112e7: 84,
+    0x112e8: 84,
+    0x112e9: 84,
+    0x112ea: 84,
+    0x11300: 84,
+    0x11301: 84,
+    0x1133b: 84,
+    0x1133c: 84,
+    0x11340: 84,
+    0x11366: 84,
+    0x11367: 84,
+    0x11368: 84,
+    0x11369: 84,
+    0x1136a: 84,
+    0x1136b: 84,
+    0x1136c: 84,
+    0x11370: 84,
+    0x11371: 84,
+    0x11372: 84,
+    0x11373: 84,
+    0x11374: 84,
+    0x11438: 84,
+    0x11439: 84,
+    0x1143a: 84,
+    0x1143b: 84,
+    0x1143c: 84,
+    0x1143d: 84,
+    0x1143e: 84,
+    0x1143f: 84,
+    0x11442: 84,
+    0x11443: 84,
+    0x11444: 84,
+    0x11446: 84,
+    0x1145e: 84,
+    0x114b3: 84,
+    0x114b4: 84,
+    0x114b5: 84,
+    0x114b6: 84,
+    0x114b7: 84,
+    0x114b8: 84,
+    0x114ba: 84,
+    0x114bf: 84,
+    0x114c0: 84,
+    0x114c2: 84,
+    0x114c3: 84,
+    0x115b2: 84,
+    0x115b3: 84,
+    0x115b4: 84,
+    0x115b5: 84,
+    0x115bc: 84,
+    0x115bd: 84,
+    0x115bf: 84,
+    0x115c0: 84,
+    0x115dc: 84,
+    0x115dd: 84,
+    0x11633: 84,
+    0x11634: 84,
+    0x11635: 84,
+    0x11636: 84,
+    0x11637: 84,
+    0x11638: 84,
+    0x11639: 84,
+    0x1163a: 84,
+    0x1163d: 84,
+    0x1163f: 84,
+    0x11640: 84,
+    0x116ab: 84,
+    0x116ad: 84,
+    0x116b0: 84,
+    0x116b1: 84,
+    0x116b2: 84,
+    0x116b3: 84,
+    0x116b4: 84,
+    0x116b5: 84,
+    0x116b7: 84,
+    0x1171d: 84,
+    0x1171e: 84,
+    0x1171f: 84,
+    0x11722: 84,
+    0x11723: 84,
+    0x11724: 84,
+    0x11725: 84,
+    0x11727: 84,
+    0x11728: 84,
+    0x11729: 84,
+    0x1172a: 84,
+    0x1172b: 84,
+    0x1182f: 84,
+    0x11830: 84,
+    0x11831: 84,
+    0x11832: 84,
+    0x11833: 84,
+    0x11834: 84,
+    0x11835: 84,
+    0x11836: 84,
+    0x11837: 84,
+    0x11839: 84,
+    0x1183a: 84,
+    0x1193b: 84,
+    0x1193c: 84,
+    0x1193e: 84,
+    0x11943: 84,
+    0x119d4: 84,
+    0x119d5: 84,
+    0x119d6: 84,
+    0x119d7: 84,
+    0x119da: 84,
+    0x119db: 84,
+    0x119e0: 84,
+    0x11a01: 84,
+    0x11a02: 84,
+    0x11a03: 84,
+    0x11a04: 84,
+    0x11a05: 84,
+    0x11a06: 84,
+    0x11a07: 84,
+    0x11a08: 84,
+    0x11a09: 84,
+    0x11a0a: 84,
+    0x11a33: 84,
+    0x11a34: 84,
+    0x11a35: 84,
+    0x11a36: 84,
+    0x11a37: 84,
+    0x11a38: 84,
+    0x11a3b: 84,
+    0x11a3c: 84,
+    0x11a3d: 84,
+    0x11a3e: 84,
+    0x11a47: 84,
+    0x11a51: 84,
+    0x11a52: 84,
+    0x11a53: 84,
+    0x11a54: 84,
+    0x11a55: 84,
+    0x11a56: 84,
+    0x11a59: 84,
+    0x11a5a: 84,
+    0x11a5b: 84,
+    0x11a8a: 84,
+    0x11a8b: 84,
+    0x11a8c: 84,
+    0x11a8d: 84,
+    0x11a8e: 84,
+    0x11a8f: 84,
+    0x11a90: 84,
+    0x11a91: 84,
+    0x11a92: 84,
+    0x11a93: 84,
+    0x11a94: 84,
+    0x11a95: 84,
+    0x11a96: 84,
+    0x11a98: 84,
+    0x11a99: 84,
+    0x11c30: 84,
+    0x11c31: 84,
+    0x11c32: 84,
+    0x11c33: 84,
+    0x11c34: 84,
+    0x11c35: 84,
+    0x11c36: 84,
+    0x11c38: 84,
+    0x11c39: 84,
+    0x11c3a: 84,
+    0x11c3b: 84,
+    0x11c3c: 84,
+    0x11c3d: 84,
+    0x11c3f: 84,
+    0x11c92: 84,
+    0x11c93: 84,
+    0x11c94: 84,
+    0x11c95: 84,
+    0x11c96: 84,
+    0x11c97: 84,
+    0x11c98: 84,
+    0x11c99: 84,
+    0x11c9a: 84,
+    0x11c9b: 84,
+    0x11c9c: 84,
+    0x11c9d: 84,
+    0x11c9e: 84,
+    0x11c9f: 84,
+    0x11ca0: 84,
+    0x11ca1: 84,
+    0x11ca2: 84,
+    0x11ca3: 84,
+    0x11ca4: 84,
+    0x11ca5: 84,
+    0x11ca6: 84,
+    0x11ca7: 84,
+    0x11caa: 84,
+    0x11cab: 84,
+    0x11cac: 84,
+    0x11cad: 84,
+    0x11cae: 84,
+    0x11caf: 84,
+    0x11cb0: 84,
+    0x11cb2: 84,
+    0x11cb3: 84,
+    0x11cb5: 84,
+    0x11cb6: 84,
+    0x11d31: 84,
+    0x11d32: 84,
+    0x11d33: 84,
+    0x11d34: 84,
+    0x11d35: 84,
+    0x11d36: 84,
+    0x11d3a: 84,
+    0x11d3c: 84,
+    0x11d3d: 84,
+    0x11d3f: 84,
+    0x11d40: 84,
+    0x11d41: 84,
+    0x11d42: 84,
+    0x11d43: 84,
+    0x11d44: 84,
+    0x11d45: 84,
+    0x11d47: 84,
+    0x11d90: 84,
+    0x11d91: 84,
+    0x11d95: 84,
+    0x11d97: 84,
+    0x11ef3: 84,
+    0x11ef4: 84,
+    0x11f00: 84,
+    0x11f01: 84,
+    0x11f36: 84,
+    0x11f37: 84,
+    0x11f38: 84,
+    0x11f39: 84,
+    0x11f3a: 84,
+    0x11f40: 84,
+    0x11f42: 84,
+    0x13430: 84,
+    0x13431: 84,
+    0x13432: 84,
+    0x13433: 84,
+    0x13434: 84,
+    0x13435: 84,
+    0x13436: 84,
+    0x13437: 84,
+    0x13438: 84,
+    0x13439: 84,
+    0x1343a: 84,
+    0x1343b: 84,
+    0x1343c: 84,
+    0x1343d: 84,
+    0x1343e: 84,
+    0x1343f: 84,
+    0x13440: 84,
+    0x13447: 84,
+    0x13448: 84,
+    0x13449: 84,
+    0x1344a: 84,
+    0x1344b: 84,
+    0x1344c: 84,
+    0x1344d: 84,
+    0x1344e: 84,
+    0x1344f: 84,
+    0x13450: 84,
+    0x13451: 84,
+    0x13452: 84,
+    0x13453: 84,
+    0x13454: 84,
+    0x13455: 84,
+    0x16af0: 84,
+    0x16af1: 84,
+    0x16af2: 84,
+    0x16af3: 84,
+    0x16af4: 84,
+    0x16b30: 84,
+    0x16b31: 84,
+    0x16b32: 84,
+    0x16b33: 84,
+    0x16b34: 84,
+    0x16b35: 84,
+    0x16b36: 84,
+    0x16f4f: 84,
+    0x16f8f: 84,
+    0x16f90: 84,
+    0x16f91: 84,
+    0x16f92: 84,
+    0x16fe4: 84,
+    0x1bc9d: 84,
+    0x1bc9e: 84,
+    0x1bca0: 84,
+    0x1bca1: 84,
+    0x1bca2: 84,
+    0x1bca3: 84,
+    0x1cf00: 84,
+    0x1cf01: 84,
+    0x1cf02: 84,
+    0x1cf03: 84,
+    0x1cf04: 84,
+    0x1cf05: 84,
+    0x1cf06: 84,
+    0x1cf07: 84,
+    0x1cf08: 84,
+    0x1cf09: 84,
+    0x1cf0a: 84,
+    0x1cf0b: 84,
+    0x1cf0c: 84,
+    0x1cf0d: 84,
+    0x1cf0e: 84,
+    0x1cf0f: 84,
+    0x1cf10: 84,
+    0x1cf11: 84,
+    0x1cf12: 84,
+    0x1cf13: 84,
+    0x1cf14: 84,
+    0x1cf15: 84,
+    0x1cf16: 84,
+    0x1cf17: 84,
+    0x1cf18: 84,
+    0x1cf19: 84,
+    0x1cf1a: 84,
+    0x1cf1b: 84,
+    0x1cf1c: 84,
+    0x1cf1d: 84,
+    0x1cf1e: 84,
+    0x1cf1f: 84,
+    0x1cf20: 84,
+    0x1cf21: 84,
+    0x1cf22: 84,
+    0x1cf23: 84,
+    0x1cf24: 84,
+    0x1cf25: 84,
+    0x1cf26: 84,
+    0x1cf27: 84,
+    0x1cf28: 84,
+    0x1cf29: 84,
+    0x1cf2a: 84,
+    0x1cf2b: 84,
+    0x1cf2c: 84,
+    0x1cf2d: 84,
+    0x1cf30: 84,
+    0x1cf31: 84,
+    0x1cf32: 84,
+    0x1cf33: 84,
+    0x1cf34: 84,
+    0x1cf35: 84,
+    0x1cf36: 84,
+    0x1cf37: 84,
+    0x1cf38: 84,
+    0x1cf39: 84,
+    0x1cf3a: 84,
+    0x1cf3b: 84,
+    0x1cf3c: 84,
+    0x1cf3d: 84,
+    0x1cf3e: 84,
+    0x1cf3f: 84,
+    0x1cf40: 84,
+    0x1cf41: 84,
+    0x1cf42: 84,
+    0x1cf43: 84,
+    0x1cf44: 84,
+    0x1cf45: 84,
+    0x1cf46: 84,
+    0x1d167: 84,
+    0x1d168: 84,
+    0x1d169: 84,
+    0x1d173: 84,
+    0x1d174: 84,
+    0x1d175: 84,
+    0x1d176: 84,
+    0x1d177: 84,
+    0x1d178: 84,
+    0x1d179: 84,
+    0x1d17a: 84,
+    0x1d17b: 84,
+    0x1d17c: 84,
+    0x1d17d: 84,
+    0x1d17e: 84,
+    0x1d17f: 84,
+    0x1d180: 84,
+    0x1d181: 84,
+    0x1d182: 84,
+    0x1d185: 84,
+    0x1d186: 84,
+    0x1d187: 84,
+    0x1d188: 84,
+    0x1d189: 84,
+    0x1d18a: 84,
+    0x1d18b: 84,
+    0x1d1aa: 84,
+    0x1d1ab: 84,
+    0x1d1ac: 84,
+    0x1d1ad: 84,
+    0x1d242: 84,
+    0x1d243: 84,
+    0x1d244: 84,
+    0x1da00: 84,
+    0x1da01: 84,
+    0x1da02: 84,
+    0x1da03: 84,
+    0x1da04: 84,
+    0x1da05: 84,
+    0x1da06: 84,
+    0x1da07: 84,
+    0x1da08: 84,
+    0x1da09: 84,
+    0x1da0a: 84,
+    0x1da0b: 84,
+    0x1da0c: 84,
+    0x1da0d: 84,
+    0x1da0e: 84,
+    0x1da0f: 84,
+    0x1da10: 84,
+    0x1da11: 84,
+    0x1da12: 84,
+    0x1da13: 84,
+    0x1da14: 84,
+    0x1da15: 84,
+    0x1da16: 84,
+    0x1da17: 84,
+    0x1da18: 84,
+    0x1da19: 84,
+    0x1da1a: 84,
+    0x1da1b: 84,
+    0x1da1c: 84,
+    0x1da1d: 84,
+    0x1da1e: 84,
+    0x1da1f: 84,
+    0x1da20: 84,
+    0x1da21: 84,
+    0x1da22: 84,
+    0x1da23: 84,
+    0x1da24: 84,
+    0x1da25: 84,
+    0x1da26: 84,
+    0x1da27: 84,
+    0x1da28: 84,
+    0x1da29: 84,
+    0x1da2a: 84,
+    0x1da2b: 84,
+    0x1da2c: 84,
+    0x1da2d: 84,
+    0x1da2e: 84,
+    0x1da2f: 84,
+    0x1da30: 84,
+    0x1da31: 84,
+    0x1da32: 84,
+    0x1da33: 84,
+    0x1da34: 84,
+    0x1da35: 84,
+    0x1da36: 84,
+    0x1da3b: 84,
+    0x1da3c: 84,
+    0x1da3d: 84,
+    0x1da3e: 84,
+    0x1da3f: 84,
+    0x1da40: 84,
+    0x1da41: 84,
+    0x1da42: 84,
+    0x1da43: 84,
+    0x1da44: 84,
+    0x1da45: 84,
+    0x1da46: 84,
+    0x1da47: 84,
+    0x1da48: 84,
+    0x1da49: 84,
+    0x1da4a: 84,
+    0x1da4b: 84,
+    0x1da4c: 84,
+    0x1da4d: 84,
+    0x1da4e: 84,
+    0x1da4f: 84,
+    0x1da50: 84,
+    0x1da51: 84,
+    0x1da52: 84,
+    0x1da53: 84,
+    0x1da54: 84,
+    0x1da55: 84,
+    0x1da56: 84,
+    0x1da57: 84,
+    0x1da58: 84,
+    0x1da59: 84,
+    0x1da5a: 84,
+    0x1da5b: 84,
+    0x1da5c: 84,
+    0x1da5d: 84,
+    0x1da5e: 84,
+    0x1da5f: 84,
+    0x1da60: 84,
+    0x1da61: 84,
+    0x1da62: 84,
+    0x1da63: 84,
+    0x1da64: 84,
+    0x1da65: 84,
+    0x1da66: 84,
+    0x1da67: 84,
+    0x1da68: 84,
+    0x1da69: 84,
+    0x1da6a: 84,
+    0x1da6b: 84,
+    0x1da6c: 84,
+    0x1da75: 84,
+    0x1da84: 84,
+    0x1da9b: 84,
+    0x1da9c: 84,
+    0x1da9d: 84,
+    0x1da9e: 84,
+    0x1da9f: 84,
+    0x1daa1: 84,
+    0x1daa2: 84,
+    0x1daa3: 84,
+    0x1daa4: 84,
+    0x1daa5: 84,
+    0x1daa6: 84,
+    0x1daa7: 84,
+    0x1daa8: 84,
+    0x1daa9: 84,
+    0x1daaa: 84,
+    0x1daab: 84,
+    0x1daac: 84,
+    0x1daad: 84,
+    0x1daae: 84,
+    0x1daaf: 84,
+    0x1e000: 84,
+    0x1e001: 84,
+    0x1e002: 84,
+    0x1e003: 84,
+    0x1e004: 84,
+    0x1e005: 84,
+    0x1e006: 84,
+    0x1e008: 84,
+    0x1e009: 84,
+    0x1e00a: 84,
+    0x1e00b: 84,
+    0x1e00c: 84,
+    0x1e00d: 84,
+    0x1e00e: 84,
+    0x1e00f: 84,
+    0x1e010: 84,
+    0x1e011: 84,
+    0x1e012: 84,
+    0x1e013: 84,
+    0x1e014: 84,
+    0x1e015: 84,
+    0x1e016: 84,
+    0x1e017: 84,
+    0x1e018: 84,
+    0x1e01b: 84,
+    0x1e01c: 84,
+    0x1e01d: 84,
+    0x1e01e: 84,
+    0x1e01f: 84,
+    0x1e020: 84,
+    0x1e021: 84,
+    0x1e023: 84,
+    0x1e024: 84,
+    0x1e026: 84,
+    0x1e027: 84,
+    0x1e028: 84,
+    0x1e029: 84,
+    0x1e02a: 84,
+    0x1e08f: 84,
+    0x1e130: 84,
+    0x1e131: 84,
+    0x1e132: 84,
+    0x1e133: 84,
+    0x1e134: 84,
+    0x1e135: 84,
+    0x1e136: 84,
+    0x1e2ae: 84,
+    0x1e2ec: 84,
+    0x1e2ed: 84,
+    0x1e2ee: 84,
+    0x1e2ef: 84,
+    0x1e4ec: 84,
+    0x1e4ed: 84,
+    0x1e4ee: 84,
+    0x1e4ef: 84,
+    0x1e8d0: 84,
+    0x1e8d1: 84,
+    0x1e8d2: 84,
+    0x1e8d3: 84,
+    0x1e8d4: 84,
+    0x1e8d5: 84,
+    0x1e8d6: 84,
     0x1e900: 68,
     0x1e901: 68,
     0x1e902: 68,
@@ -928,7 +2680,351 @@
     0x1e941: 68,
     0x1e942: 68,
     0x1e943: 68,
+    0x1e944: 84,
+    0x1e945: 84,
+    0x1e946: 84,
+    0x1e947: 84,
+    0x1e948: 84,
+    0x1e949: 84,
+    0x1e94a: 84,
     0x1e94b: 84,
+    0xe0001: 84,
+    0xe0020: 84,
+    0xe0021: 84,
+    0xe0022: 84,
+    0xe0023: 84,
+    0xe0024: 84,
+    0xe0025: 84,
+    0xe0026: 84,
+    0xe0027: 84,
+    0xe0028: 84,
+    0xe0029: 84,
+    0xe002a: 84,
+    0xe002b: 84,
+    0xe002c: 84,
+    0xe002d: 84,
+    0xe002e: 84,
+    0xe002f: 84,
+    0xe0030: 84,
+    0xe0031: 84,
+    0xe0032: 84,
+    0xe0033: 84,
+    0xe0034: 84,
+    0xe0035: 84,
+    0xe0036: 84,
+    0xe0037: 84,
+    0xe0038: 84,
+    0xe0039: 84,
+    0xe003a: 84,
+    0xe003b: 84,
+    0xe003c: 84,
+    0xe003d: 84,
+    0xe003e: 84,
+    0xe003f: 84,
+    0xe0040: 84,
+    0xe0041: 84,
+    0xe0042: 84,
+    0xe0043: 84,
+    0xe0044: 84,
+    0xe0045: 84,
+    0xe0046: 84,
+    0xe0047: 84,
+    0xe0048: 84,
+    0xe0049: 84,
+    0xe004a: 84,
+    0xe004b: 84,
+    0xe004c: 84,
+    0xe004d: 84,
+    0xe004e: 84,
+    0xe004f: 84,
+    0xe0050: 84,
+    0xe0051: 84,
+    0xe0052: 84,
+    0xe0053: 84,
+    0xe0054: 84,
+    0xe0055: 84,
+    0xe0056: 84,
+    0xe0057: 84,
+    0xe0058: 84,
+    0xe0059: 84,
+    0xe005a: 84,
+    0xe005b: 84,
+    0xe005c: 84,
+    0xe005d: 84,
+    0xe005e: 84,
+    0xe005f: 84,
+    0xe0060: 84,
+    0xe0061: 84,
+    0xe0062: 84,
+    0xe0063: 84,
+    0xe0064: 84,
+    0xe0065: 84,
+    0xe0066: 84,
+    0xe0067: 84,
+    0xe0068: 84,
+    0xe0069: 84,
+    0xe006a: 84,
+    0xe006b: 84,
+    0xe006c: 84,
+    0xe006d: 84,
+    0xe006e: 84,
+    0xe006f: 84,
+    0xe0070: 84,
+    0xe0071: 84,
+    0xe0072: 84,
+    0xe0073: 84,
+    0xe0074: 84,
+    0xe0075: 84,
+    0xe0076: 84,
+    0xe0077: 84,
+    0xe0078: 84,
+    0xe0079: 84,
+    0xe007a: 84,
+    0xe007b: 84,
+    0xe007c: 84,
+    0xe007d: 84,
+    0xe007e: 84,
+    0xe007f: 84,
+    0xe0100: 84,
+    0xe0101: 84,
+    0xe0102: 84,
+    0xe0103: 84,
+    0xe0104: 84,
+    0xe0105: 84,
+    0xe0106: 84,
+    0xe0107: 84,
+    0xe0108: 84,
+    0xe0109: 84,
+    0xe010a: 84,
+    0xe010b: 84,
+    0xe010c: 84,
+    0xe010d: 84,
+    0xe010e: 84,
+    0xe010f: 84,
+    0xe0110: 84,
+    0xe0111: 84,
+    0xe0112: 84,
+    0xe0113: 84,
+    0xe0114: 84,
+    0xe0115: 84,
+    0xe0116: 84,
+    0xe0117: 84,
+    0xe0118: 84,
+    0xe0119: 84,
+    0xe011a: 84,
+    0xe011b: 84,
+    0xe011c: 84,
+    0xe011d: 84,
+    0xe011e: 84,
+    0xe011f: 84,
+    0xe0120: 84,
+    0xe0121: 84,
+    0xe0122: 84,
+    0xe0123: 84,
+    0xe0124: 84,
+    0xe0125: 84,
+    0xe0126: 84,
+    0xe0127: 84,
+    0xe0128: 84,
+    0xe0129: 84,
+    0xe012a: 84,
+    0xe012b: 84,
+    0xe012c: 84,
+    0xe012d: 84,
+    0xe012e: 84,
+    0xe012f: 84,
+    0xe0130: 84,
+    0xe0131: 84,
+    0xe0132: 84,
+    0xe0133: 84,
+    0xe0134: 84,
+    0xe0135: 84,
+    0xe0136: 84,
+    0xe0137: 84,
+    0xe0138: 84,
+    0xe0139: 84,
+    0xe013a: 84,
+    0xe013b: 84,
+    0xe013c: 84,
+    0xe013d: 84,
+    0xe013e: 84,
+    0xe013f: 84,
+    0xe0140: 84,
+    0xe0141: 84,
+    0xe0142: 84,
+    0xe0143: 84,
+    0xe0144: 84,
+    0xe0145: 84,
+    0xe0146: 84,
+    0xe0147: 84,
+    0xe0148: 84,
+    0xe0149: 84,
+    0xe014a: 84,
+    0xe014b: 84,
+    0xe014c: 84,
+    0xe014d: 84,
+    0xe014e: 84,
+    0xe014f: 84,
+    0xe0150: 84,
+    0xe0151: 84,
+    0xe0152: 84,
+    0xe0153: 84,
+    0xe0154: 84,
+    0xe0155: 84,
+    0xe0156: 84,
+    0xe0157: 84,
+    0xe0158: 84,
+    0xe0159: 84,
+    0xe015a: 84,
+    0xe015b: 84,
+    0xe015c: 84,
+    0xe015d: 84,
+    0xe015e: 84,
+    0xe015f: 84,
+    0xe0160: 84,
+    0xe0161: 84,
+    0xe0162: 84,
+    0xe0163: 84,
+    0xe0164: 84,
+    0xe0165: 84,
+    0xe0166: 84,
+    0xe0167: 84,
+    0xe0168: 84,
+    0xe0169: 84,
+    0xe016a: 84,
+    0xe016b: 84,
+    0xe016c: 84,
+    0xe016d: 84,
+    0xe016e: 84,
+    0xe016f: 84,
+    0xe0170: 84,
+    0xe0171: 84,
+    0xe0172: 84,
+    0xe0173: 84,
+    0xe0174: 84,
+    0xe0175: 84,
+    0xe0176: 84,
+    0xe0177: 84,
+    0xe0178: 84,
+    0xe0179: 84,
+    0xe017a: 84,
+    0xe017b: 84,
+    0xe017c: 84,
+    0xe017d: 84,
+    0xe017e: 84,
+    0xe017f: 84,
+    0xe0180: 84,
+    0xe0181: 84,
+    0xe0182: 84,
+    0xe0183: 84,
+    0xe0184: 84,
+    0xe0185: 84,
+    0xe0186: 84,
+    0xe0187: 84,
+    0xe0188: 84,
+    0xe0189: 84,
+    0xe018a: 84,
+    0xe018b: 84,
+    0xe018c: 84,
+    0xe018d: 84,
+    0xe018e: 84,
+    0xe018f: 84,
+    0xe0190: 84,
+    0xe0191: 84,
+    0xe0192: 84,
+    0xe0193: 84,
+    0xe0194: 84,
+    0xe0195: 84,
+    0xe0196: 84,
+    0xe0197: 84,
+    0xe0198: 84,
+    0xe0199: 84,
+    0xe019a: 84,
+    0xe019b: 84,
+    0xe019c: 84,
+    0xe019d: 84,
+    0xe019e: 84,
+    0xe019f: 84,
+    0xe01a0: 84,
+    0xe01a1: 84,
+    0xe01a2: 84,
+    0xe01a3: 84,
+    0xe01a4: 84,
+    0xe01a5: 84,
+    0xe01a6: 84,
+    0xe01a7: 84,
+    0xe01a8: 84,
+    0xe01a9: 84,
+    0xe01aa: 84,
+    0xe01ab: 84,
+    0xe01ac: 84,
+    0xe01ad: 84,
+    0xe01ae: 84,
+    0xe01af: 84,
+    0xe01b0: 84,
+    0xe01b1: 84,
+    0xe01b2: 84,
+    0xe01b3: 84,
+    0xe01b4: 84,
+    0xe01b5: 84,
+    0xe01b6: 84,
+    0xe01b7: 84,
+    0xe01b8: 84,
+    0xe01b9: 84,
+    0xe01ba: 84,
+    0xe01bb: 84,
+    0xe01bc: 84,
+    0xe01bd: 84,
+    0xe01be: 84,
+    0xe01bf: 84,
+    0xe01c0: 84,
+    0xe01c1: 84,
+    0xe01c2: 84,
+    0xe01c3: 84,
+    0xe01c4: 84,
+    0xe01c5: 84,
+    0xe01c6: 84,
+    0xe01c7: 84,
+    0xe01c8: 84,
+    0xe01c9: 84,
+    0xe01ca: 84,
+    0xe01cb: 84,
+    0xe01cc: 84,
+    0xe01cd: 84,
+    0xe01ce: 84,
+    0xe01cf: 84,
+    0xe01d0: 84,
+    0xe01d1: 84,
+    0xe01d2: 84,
+    0xe01d3: 84,
+    0xe01d4: 84,
+    0xe01d5: 84,
+    0xe01d6: 84,
+    0xe01d7: 84,
+    0xe01d8: 84,
+    0xe01d9: 84,
+    0xe01da: 84,
+    0xe01db: 84,
+    0xe01dc: 84,
+    0xe01dd: 84,
+    0xe01de: 84,
+    0xe01df: 84,
+    0xe01e0: 84,
+    0xe01e1: 84,
+    0xe01e2: 84,
+    0xe01e3: 84,
+    0xe01e4: 84,
+    0xe01e5: 84,
+    0xe01e6: 84,
+    0xe01e7: 84,
+    0xe01e8: 84,
+    0xe01e9: 84,
+    0xe01ea: 84,
+    0xe01eb: 84,
+    0xe01ec: 84,
+    0xe01ed: 84,
+    0xe01ee: 84,
+    0xe01ef: 84,
 }
 codepoint_classes = {
     'PVALID': (
@@ -2110,7 +4206,6 @@
         0x1e01b0001e022,
         0x1e0230001e025,
         0x1e0260001e02b,
-        0x1e0300001e06e,
         0x1e08f0001e090,
         0x1e1000001e12d,
         0x1e1300001e13e,
diff --git a/src/pip/_vendor/idna/package_data.py b/src/pip/_vendor/idna/package_data.py
index c5b7220c970..ed811133633 100644
--- a/src/pip/_vendor/idna/package_data.py
+++ b/src/pip/_vendor/idna/package_data.py
@@ -1,2 +1,2 @@
-__version__ = '3.6'
+__version__ = '3.7'
 
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index ab207435d0d..15406823f3e 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -10,7 +10,7 @@ pyproject-hooks==1.0.0
 requests==2.31.0
     certifi==2024.2.2
     chardet==5.2.0
-    idna==3.6
+    idna==3.7
     urllib3==1.26.18
 rich==13.7.0
     pygments==2.17.2

From 26ab64a3534bf2f575ccee2af61bacccc3d8c3ee Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 3 May 2024 21:04:52 +0100
Subject: [PATCH 357/992] Upgrade rich to 13.7.1

---
 news/rich.vendor.rst                 |   2 +-
 src/pip/_vendor/rich/_cell_widths.py | 367 ++++++++++++++-------------
 src/pip/_vendor/rich/text.py         |   2 +-
 src/pip/_vendor/vendor.txt           |   2 +-
 4 files changed, 188 insertions(+), 185 deletions(-)

diff --git a/news/rich.vendor.rst b/news/rich.vendor.rst
index 586a4617228..b3c8f257742 100644
--- a/news/rich.vendor.rst
+++ b/news/rich.vendor.rst
@@ -1 +1 @@
-Upgrade rich to 13.7.0
+Upgrade rich to 13.7.1
diff --git a/src/pip/_vendor/rich/_cell_widths.py b/src/pip/_vendor/rich/_cell_widths.py
index 36286df379e..608ae3a75d1 100644
--- a/src/pip/_vendor/rich/_cell_widths.py
+++ b/src/pip/_vendor/rich/_cell_widths.py
@@ -4,6 +4,7 @@
     (0, 0, 0),
     (1, 31, -1),
     (127, 159, -1),
+    (173, 173, 0),
     (768, 879, 0),
     (1155, 1161, 0),
     (1425, 1469, 0),
@@ -11,13 +12,16 @@
     (1473, 1474, 0),
     (1476, 1477, 0),
     (1479, 1479, 0),
+    (1536, 1541, 0),
     (1552, 1562, 0),
+    (1564, 1564, 0),
     (1611, 1631, 0),
     (1648, 1648, 0),
-    (1750, 1756, 0),
+    (1750, 1757, 0),
     (1759, 1764, 0),
     (1767, 1768, 0),
     (1770, 1773, 0),
+    (1807, 1807, 0),
     (1809, 1809, 0),
     (1840, 1866, 0),
     (1958, 1968, 0),
@@ -28,149 +32,137 @@
     (2085, 2087, 0),
     (2089, 2093, 0),
     (2137, 2139, 0),
-    (2259, 2273, 0),
-    (2275, 2306, 0),
-    (2362, 2362, 0),
-    (2364, 2364, 0),
-    (2369, 2376, 0),
-    (2381, 2381, 0),
+    (2192, 2193, 0),
+    (2200, 2207, 0),
+    (2250, 2307, 0),
+    (2362, 2364, 0),
+    (2366, 2383, 0),
     (2385, 2391, 0),
     (2402, 2403, 0),
-    (2433, 2433, 0),
+    (2433, 2435, 0),
     (2492, 2492, 0),
-    (2497, 2500, 0),
-    (2509, 2509, 0),
+    (2494, 2500, 0),
+    (2503, 2504, 0),
+    (2507, 2509, 0),
+    (2519, 2519, 0),
     (2530, 2531, 0),
     (2558, 2558, 0),
-    (2561, 2562, 0),
+    (2561, 2563, 0),
     (2620, 2620, 0),
-    (2625, 2626, 0),
+    (2622, 2626, 0),
     (2631, 2632, 0),
     (2635, 2637, 0),
     (2641, 2641, 0),
     (2672, 2673, 0),
     (2677, 2677, 0),
-    (2689, 2690, 0),
+    (2689, 2691, 0),
     (2748, 2748, 0),
-    (2753, 2757, 0),
-    (2759, 2760, 0),
-    (2765, 2765, 0),
+    (2750, 2757, 0),
+    (2759, 2761, 0),
+    (2763, 2765, 0),
     (2786, 2787, 0),
     (2810, 2815, 0),
-    (2817, 2817, 0),
+    (2817, 2819, 0),
     (2876, 2876, 0),
-    (2879, 2879, 0),
-    (2881, 2884, 0),
-    (2893, 2893, 0),
-    (2901, 2902, 0),
+    (2878, 2884, 0),
+    (2887, 2888, 0),
+    (2891, 2893, 0),
+    (2901, 2903, 0),
     (2914, 2915, 0),
     (2946, 2946, 0),
-    (3008, 3008, 0),
-    (3021, 3021, 0),
-    (3072, 3072, 0),
-    (3076, 3076, 0),
-    (3134, 3136, 0),
+    (3006, 3010, 0),
+    (3014, 3016, 0),
+    (3018, 3021, 0),
+    (3031, 3031, 0),
+    (3072, 3076, 0),
+    (3132, 3132, 0),
+    (3134, 3140, 0),
     (3142, 3144, 0),
     (3146, 3149, 0),
     (3157, 3158, 0),
     (3170, 3171, 0),
-    (3201, 3201, 0),
+    (3201, 3203, 0),
     (3260, 3260, 0),
-    (3263, 3263, 0),
-    (3270, 3270, 0),
-    (3276, 3277, 0),
+    (3262, 3268, 0),
+    (3270, 3272, 0),
+    (3274, 3277, 0),
+    (3285, 3286, 0),
     (3298, 3299, 0),
-    (3328, 3329, 0),
+    (3315, 3315, 0),
+    (3328, 3331, 0),
     (3387, 3388, 0),
-    (3393, 3396, 0),
-    (3405, 3405, 0),
+    (3390, 3396, 0),
+    (3398, 3400, 0),
+    (3402, 3405, 0),
+    (3415, 3415, 0),
     (3426, 3427, 0),
-    (3457, 3457, 0),
+    (3457, 3459, 0),
     (3530, 3530, 0),
-    (3538, 3540, 0),
+    (3535, 3540, 0),
     (3542, 3542, 0),
+    (3544, 3551, 0),
+    (3570, 3571, 0),
     (3633, 3633, 0),
     (3636, 3642, 0),
     (3655, 3662, 0),
     (3761, 3761, 0),
     (3764, 3772, 0),
-    (3784, 3789, 0),
+    (3784, 3790, 0),
     (3864, 3865, 0),
     (3893, 3893, 0),
     (3895, 3895, 0),
     (3897, 3897, 0),
-    (3953, 3966, 0),
-    (3968, 3972, 0),
+    (3902, 3903, 0),
+    (3953, 3972, 0),
     (3974, 3975, 0),
     (3981, 3991, 0),
     (3993, 4028, 0),
     (4038, 4038, 0),
-    (4141, 4144, 0),
-    (4146, 4151, 0),
-    (4153, 4154, 0),
-    (4157, 4158, 0),
-    (4184, 4185, 0),
+    (4139, 4158, 0),
+    (4182, 4185, 0),
     (4190, 4192, 0),
+    (4194, 4196, 0),
+    (4199, 4205, 0),
     (4209, 4212, 0),
-    (4226, 4226, 0),
-    (4229, 4230, 0),
-    (4237, 4237, 0),
-    (4253, 4253, 0),
+    (4226, 4237, 0),
+    (4239, 4239, 0),
+    (4250, 4253, 0),
     (4352, 4447, 2),
+    (4448, 4607, 0),
     (4957, 4959, 0),
-    (5906, 5908, 0),
+    (5906, 5909, 0),
     (5938, 5940, 0),
     (5970, 5971, 0),
     (6002, 6003, 0),
-    (6068, 6069, 0),
-    (6071, 6077, 0),
-    (6086, 6086, 0),
-    (6089, 6099, 0),
+    (6068, 6099, 0),
     (6109, 6109, 0),
-    (6155, 6157, 0),
+    (6155, 6159, 0),
     (6277, 6278, 0),
     (6313, 6313, 0),
-    (6432, 6434, 0),
-    (6439, 6440, 0),
-    (6450, 6450, 0),
-    (6457, 6459, 0),
-    (6679, 6680, 0),
-    (6683, 6683, 0),
-    (6742, 6742, 0),
-    (6744, 6750, 0),
-    (6752, 6752, 0),
-    (6754, 6754, 0),
-    (6757, 6764, 0),
-    (6771, 6780, 0),
+    (6432, 6443, 0),
+    (6448, 6459, 0),
+    (6679, 6683, 0),
+    (6741, 6750, 0),
+    (6752, 6780, 0),
     (6783, 6783, 0),
-    (6832, 6848, 0),
-    (6912, 6915, 0),
-    (6964, 6964, 0),
-    (6966, 6970, 0),
-    (6972, 6972, 0),
-    (6978, 6978, 0),
+    (6832, 6862, 0),
+    (6912, 6916, 0),
+    (6964, 6980, 0),
     (7019, 7027, 0),
-    (7040, 7041, 0),
-    (7074, 7077, 0),
-    (7080, 7081, 0),
-    (7083, 7085, 0),
-    (7142, 7142, 0),
-    (7144, 7145, 0),
-    (7149, 7149, 0),
-    (7151, 7153, 0),
-    (7212, 7219, 0),
-    (7222, 7223, 0),
+    (7040, 7042, 0),
+    (7073, 7085, 0),
+    (7142, 7155, 0),
+    (7204, 7223, 0),
     (7376, 7378, 0),
-    (7380, 7392, 0),
-    (7394, 7400, 0),
+    (7380, 7400, 0),
     (7405, 7405, 0),
     (7412, 7412, 0),
-    (7416, 7417, 0),
-    (7616, 7673, 0),
-    (7675, 7679, 0),
+    (7415, 7417, 0),
+    (7616, 7679, 0),
     (8203, 8207, 0),
     (8232, 8238, 0),
-    (8288, 8291, 0),
+    (8288, 8292, 0),
+    (8294, 8303, 0),
     (8400, 8432, 0),
     (8986, 8987, 2),
     (9001, 9002, 2),
@@ -212,17 +204,16 @@
     (11904, 11929, 2),
     (11931, 12019, 2),
     (12032, 12245, 2),
-    (12272, 12283, 2),
-    (12288, 12329, 2),
-    (12330, 12333, 0),
-    (12334, 12350, 2),
+    (12272, 12329, 2),
+    (12330, 12335, 0),
+    (12336, 12350, 2),
     (12353, 12438, 2),
     (12441, 12442, 0),
     (12443, 12543, 2),
     (12549, 12591, 2),
     (12593, 12686, 2),
     (12688, 12771, 2),
-    (12784, 12830, 2),
+    (12783, 12830, 2),
     (12832, 12871, 2),
     (12880, 19903, 2),
     (19968, 42124, 2),
@@ -234,36 +225,33 @@
     (43010, 43010, 0),
     (43014, 43014, 0),
     (43019, 43019, 0),
-    (43045, 43046, 0),
+    (43043, 43047, 0),
     (43052, 43052, 0),
-    (43204, 43205, 0),
+    (43136, 43137, 0),
+    (43188, 43205, 0),
     (43232, 43249, 0),
     (43263, 43263, 0),
     (43302, 43309, 0),
-    (43335, 43345, 0),
+    (43335, 43347, 0),
     (43360, 43388, 2),
-    (43392, 43394, 0),
-    (43443, 43443, 0),
-    (43446, 43449, 0),
-    (43452, 43453, 0),
+    (43392, 43395, 0),
+    (43443, 43456, 0),
     (43493, 43493, 0),
-    (43561, 43566, 0),
-    (43569, 43570, 0),
-    (43573, 43574, 0),
+    (43561, 43574, 0),
     (43587, 43587, 0),
-    (43596, 43596, 0),
-    (43644, 43644, 0),
+    (43596, 43597, 0),
+    (43643, 43645, 0),
     (43696, 43696, 0),
     (43698, 43700, 0),
     (43703, 43704, 0),
     (43710, 43711, 0),
     (43713, 43713, 0),
-    (43756, 43757, 0),
-    (43766, 43766, 0),
-    (44005, 44005, 0),
-    (44008, 44008, 0),
-    (44013, 44013, 0),
+    (43755, 43759, 0),
+    (43765, 43766, 0),
+    (44003, 44010, 0),
+    (44012, 44013, 0),
     (44032, 55203, 2),
+    (55216, 55295, 0),
     (63744, 64255, 2),
     (64286, 64286, 0),
     (65024, 65039, 0),
@@ -272,8 +260,10 @@
     (65072, 65106, 2),
     (65108, 65126, 2),
     (65128, 65131, 2),
+    (65279, 65279, 0),
     (65281, 65376, 2),
     (65504, 65510, 2),
+    (65529, 65531, 0),
     (66045, 66045, 0),
     (66272, 66272, 0),
     (66422, 66426, 0),
@@ -285,102 +275,108 @@
     (68325, 68326, 0),
     (68900, 68903, 0),
     (69291, 69292, 0),
+    (69373, 69375, 0),
     (69446, 69456, 0),
-    (69633, 69633, 0),
+    (69506, 69509, 0),
+    (69632, 69634, 0),
     (69688, 69702, 0),
-    (69759, 69761, 0),
-    (69811, 69814, 0),
-    (69817, 69818, 0),
+    (69744, 69744, 0),
+    (69747, 69748, 0),
+    (69759, 69762, 0),
+    (69808, 69818, 0),
+    (69821, 69821, 0),
+    (69826, 69826, 0),
+    (69837, 69837, 0),
     (69888, 69890, 0),
-    (69927, 69931, 0),
-    (69933, 69940, 0),
+    (69927, 69940, 0),
+    (69957, 69958, 0),
     (70003, 70003, 0),
-    (70016, 70017, 0),
-    (70070, 70078, 0),
+    (70016, 70018, 0),
+    (70067, 70080, 0),
     (70089, 70092, 0),
-    (70095, 70095, 0),
-    (70191, 70193, 0),
-    (70196, 70196, 0),
-    (70198, 70199, 0),
+    (70094, 70095, 0),
+    (70188, 70199, 0),
     (70206, 70206, 0),
-    (70367, 70367, 0),
-    (70371, 70378, 0),
-    (70400, 70401, 0),
+    (70209, 70209, 0),
+    (70367, 70378, 0),
+    (70400, 70403, 0),
     (70459, 70460, 0),
-    (70464, 70464, 0),
+    (70462, 70468, 0),
+    (70471, 70472, 0),
+    (70475, 70477, 0),
+    (70487, 70487, 0),
+    (70498, 70499, 0),
     (70502, 70508, 0),
     (70512, 70516, 0),
-    (70712, 70719, 0),
-    (70722, 70724, 0),
-    (70726, 70726, 0),
+    (70709, 70726, 0),
     (70750, 70750, 0),
-    (70835, 70840, 0),
-    (70842, 70842, 0),
-    (70847, 70848, 0),
-    (70850, 70851, 0),
-    (71090, 71093, 0),
-    (71100, 71101, 0),
-    (71103, 71104, 0),
+    (70832, 70851, 0),
+    (71087, 71093, 0),
+    (71096, 71104, 0),
     (71132, 71133, 0),
-    (71219, 71226, 0),
-    (71229, 71229, 0),
-    (71231, 71232, 0),
-    (71339, 71339, 0),
-    (71341, 71341, 0),
-    (71344, 71349, 0),
-    (71351, 71351, 0),
-    (71453, 71455, 0),
-    (71458, 71461, 0),
-    (71463, 71467, 0),
-    (71727, 71735, 0),
-    (71737, 71738, 0),
-    (71995, 71996, 0),
-    (71998, 71998, 0),
-    (72003, 72003, 0),
-    (72148, 72151, 0),
-    (72154, 72155, 0),
-    (72160, 72160, 0),
+    (71216, 71232, 0),
+    (71339, 71351, 0),
+    (71453, 71467, 0),
+    (71724, 71738, 0),
+    (71984, 71989, 0),
+    (71991, 71992, 0),
+    (71995, 71998, 0),
+    (72000, 72000, 0),
+    (72002, 72003, 0),
+    (72145, 72151, 0),
+    (72154, 72160, 0),
+    (72164, 72164, 0),
     (72193, 72202, 0),
-    (72243, 72248, 0),
+    (72243, 72249, 0),
     (72251, 72254, 0),
     (72263, 72263, 0),
-    (72273, 72278, 0),
-    (72281, 72283, 0),
-    (72330, 72342, 0),
-    (72344, 72345, 0),
-    (72752, 72758, 0),
-    (72760, 72765, 0),
-    (72767, 72767, 0),
+    (72273, 72283, 0),
+    (72330, 72345, 0),
+    (72751, 72758, 0),
+    (72760, 72767, 0),
     (72850, 72871, 0),
-    (72874, 72880, 0),
-    (72882, 72883, 0),
-    (72885, 72886, 0),
+    (72873, 72886, 0),
     (73009, 73014, 0),
     (73018, 73018, 0),
     (73020, 73021, 0),
     (73023, 73029, 0),
     (73031, 73031, 0),
+    (73098, 73102, 0),
     (73104, 73105, 0),
-    (73109, 73109, 0),
-    (73111, 73111, 0),
-    (73459, 73460, 0),
+    (73107, 73111, 0),
+    (73459, 73462, 0),
+    (73472, 73473, 0),
+    (73475, 73475, 0),
+    (73524, 73530, 0),
+    (73534, 73538, 0),
+    (78896, 78912, 0),
+    (78919, 78933, 0),
     (92912, 92916, 0),
     (92976, 92982, 0),
     (94031, 94031, 0),
+    (94033, 94087, 0),
     (94095, 94098, 0),
     (94176, 94179, 2),
     (94180, 94180, 0),
-    (94192, 94193, 2),
+    (94192, 94193, 0),
     (94208, 100343, 2),
     (100352, 101589, 2),
     (101632, 101640, 2),
-    (110592, 110878, 2),
+    (110576, 110579, 2),
+    (110581, 110587, 2),
+    (110589, 110590, 2),
+    (110592, 110882, 2),
+    (110898, 110898, 2),
     (110928, 110930, 2),
+    (110933, 110933, 2),
     (110948, 110951, 2),
     (110960, 111355, 2),
     (113821, 113822, 0),
-    (119143, 119145, 0),
-    (119163, 119170, 0),
+    (113824, 113827, 0),
+    (118528, 118573, 0),
+    (118576, 118598, 0),
+    (119141, 119145, 0),
+    (119149, 119170, 0),
     (119173, 119179, 0),
     (119210, 119213, 0),
     (119362, 119364, 0),
@@ -395,8 +391,11 @@
     (122907, 122913, 0),
     (122915, 122916, 0),
     (122918, 122922, 0),
+    (123023, 123023, 0),
     (123184, 123190, 0),
+    (123566, 123566, 0),
     (123628, 123631, 0),
+    (124140, 124143, 0),
     (125136, 125142, 0),
     (125252, 125258, 0),
     (126980, 126980, 2),
@@ -416,7 +415,9 @@
     (127951, 127955, 2),
     (127968, 127984, 2),
     (127988, 127988, 2),
-    (127992, 128062, 2),
+    (127992, 127994, 2),
+    (127995, 127999, 0),
+    (128000, 128062, 2),
     (128064, 128064, 2),
     (128066, 128252, 2),
     (128255, 128317, 2),
@@ -430,22 +431,24 @@
     (128716, 128716, 2),
     (128720, 128722, 2),
     (128725, 128727, 2),
+    (128732, 128735, 2),
     (128747, 128748, 2),
     (128756, 128764, 2),
     (128992, 129003, 2),
+    (129008, 129008, 2),
     (129292, 129338, 2),
     (129340, 129349, 2),
-    (129351, 129400, 2),
-    (129402, 129483, 2),
-    (129485, 129535, 2),
-    (129648, 129652, 2),
-    (129656, 129658, 2),
-    (129664, 129670, 2),
-    (129680, 129704, 2),
-    (129712, 129718, 2),
-    (129728, 129730, 2),
-    (129744, 129750, 2),
+    (129351, 129535, 2),
+    (129648, 129660, 2),
+    (129664, 129672, 2),
+    (129680, 129725, 2),
+    (129727, 129733, 2),
+    (129742, 129755, 2),
+    (129760, 129768, 2),
+    (129776, 129784, 2),
     (131072, 196605, 2),
     (196608, 262141, 2),
+    (917505, 917505, 0),
+    (917536, 917631, 0),
     (917760, 917999, 0),
 ]
diff --git a/src/pip/_vendor/rich/text.py b/src/pip/_vendor/rich/text.py
index 09f881e7296..209aa943483 100644
--- a/src/pip/_vendor/rich/text.py
+++ b/src/pip/_vendor/rich/text.py
@@ -38,7 +38,7 @@
 _re_whitespace = re.compile(r"\s+$")
 
 TextType = Union[str, "Text"]
-"""A plain string or a [Text][rich.text.Text] instance."""
+"""A plain string or a :class:`Text` instance."""
 
 GetStyleCallable = Callable[[str], Optional[StyleType]]
 
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 15406823f3e..bba94517734 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -12,7 +12,7 @@ requests==2.31.0
     chardet==5.2.0
     idna==3.7
     urllib3==1.26.18
-rich==13.7.0
+rich==13.7.1
     pygments==2.17.2
     typing_extensions==4.9.0
 resolvelib==1.0.1

From f9d5e7d9f702472ec06f46aee3cd426439e2c7a9 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 3 May 2024 21:05:34 +0100
Subject: [PATCH 358/992] Upgrade typing_extensions to 4.11.0

---
 news/typing_extensions.vendor.rst    |   2 +-
 src/pip/_vendor/typing_extensions.py | 433 ++++++++++++++++++++++-----
 src/pip/_vendor/vendor.txt           |   2 +-
 3 files changed, 358 insertions(+), 79 deletions(-)

diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
index d23d4bbced0..c605c366678 100644
--- a/news/typing_extensions.vendor.rst
+++ b/news/typing_extensions.vendor.rst
@@ -1 +1 @@
-Upgrade typing_extensions to 4.9.0
+Upgrade typing_extensions to 4.11.0
diff --git a/src/pip/_vendor/typing_extensions.py b/src/pip/_vendor/typing_extensions.py
index 351036faf7f..d60315a6adc 100644
--- a/src/pip/_vendor/typing_extensions.py
+++ b/src/pip/_vendor/typing_extensions.py
@@ -83,6 +83,7 @@
     'TypeAlias',
     'TypeAliasType',
     'TypeGuard',
+    'TypeIs',
     'TYPE_CHECKING',
     'Never',
     'NoReturn',
@@ -146,27 +147,6 @@ def __repr__(self):
 _marker = _Sentinel()
 
 
-def _check_generic(cls, parameters, elen=_marker):
-    """Check correct count for parameters of a generic cls (internal helper).
-    This gives a nice error message in case of count mismatch.
-    """
-    if not elen:
-        raise TypeError(f"{cls} is not a generic class")
-    if elen is _marker:
-        if not hasattr(cls, "__parameters__") or not cls.__parameters__:
-            raise TypeError(f"{cls} is not a generic class")
-        elen = len(cls.__parameters__)
-    alen = len(parameters)
-    if alen != elen:
-        if hasattr(cls, "__parameters__"):
-            parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
-            num_tv_tuples = sum(isinstance(p, TypeVarTuple) for p in parameters)
-            if (num_tv_tuples > 0) and (alen >= elen - num_tv_tuples):
-                return
-        raise TypeError(f"Too {'many' if alen > elen else 'few'} parameters for {cls};"
-                        f" actual {alen}, expected {elen}")
-
-
 if sys.version_info >= (3, 10):
     def _should_collect_from_parameters(t):
         return isinstance(
@@ -180,27 +160,6 @@ def _should_collect_from_parameters(t):
         return isinstance(t, typing._GenericAlias) and not t._special
 
 
-def _collect_type_vars(types, typevar_types=None):
-    """Collect all type variable contained in types in order of
-    first appearance (lexicographic order). For example::
-
-        _collect_type_vars((T, List[S, T])) == (T, S)
-    """
-    if typevar_types is None:
-        typevar_types = typing.TypeVar
-    tvars = []
-    for t in types:
-        if (
-            isinstance(t, typevar_types) and
-            t not in tvars and
-            not _is_unpack(t)
-        ):
-            tvars.append(t)
-        if _should_collect_from_parameters(t):
-            tvars.extend([t for t in t.__parameters__ if t not in tvars])
-    return tuple(tvars)
-
-
 NoReturn = typing.NoReturn
 
 # Some unconstrained type variables.  These are used by the container types.
@@ -473,7 +432,7 @@ def clear_overloads():
     "_is_runtime_protocol", "__dict__", "__slots__", "__parameters__",
     "__orig_bases__", "__module__", "_MutableMapping__marker", "__doc__",
     "__subclasshook__", "__orig_class__", "__init__", "__new__",
-    "__protocol_attrs__", "__callable_proto_members_only__",
+    "__protocol_attrs__", "__non_callable_proto_members__",
     "__match_args__",
 }
 
@@ -521,6 +480,22 @@ def _no_init(self, *args, **kwargs):
         if type(self)._is_protocol:
             raise TypeError('Protocols cannot be instantiated')
 
+    def _type_check_issubclass_arg_1(arg):
+        """Raise TypeError if `arg` is not an instance of `type`
+        in `issubclass(arg, )`.
+
+        In most cases, this is verified by type.__subclasscheck__.
+        Checking it again unnecessarily would slow down issubclass() checks,
+        so, we don't perform this check unless we absolutely have to.
+
+        For various error paths, however,
+        we want to ensure that *this* error message is shown to the user
+        where relevant, rather than a typing.py-specific error message.
+        """
+        if not isinstance(arg, type):
+            # Same error message as for issubclass(1, int).
+            raise TypeError('issubclass() arg 1 must be a class')
+
     # Inheriting from typing._ProtocolMeta isn't actually desirable,
     # but is necessary to allow typing.Protocol and typing_extensions.Protocol
     # to mix without getting TypeErrors about "metaclass conflict"
@@ -551,11 +526,6 @@ def __init__(cls, *args, **kwargs):
             abc.ABCMeta.__init__(cls, *args, **kwargs)
             if getattr(cls, "_is_protocol", False):
                 cls.__protocol_attrs__ = _get_protocol_attrs(cls)
-                # PEP 544 prohibits using issubclass()
-                # with protocols that have non-method members.
-                cls.__callable_proto_members_only__ = all(
-                    callable(getattr(cls, attr, None)) for attr in cls.__protocol_attrs__
-                )
 
         def __subclasscheck__(cls, other):
             if cls is Protocol:
@@ -564,26 +534,23 @@ def __subclasscheck__(cls, other):
                 getattr(cls, '_is_protocol', False)
                 and not _allow_reckless_class_checks()
             ):
-                if not isinstance(other, type):
-                    # Same error message as for issubclass(1, int).
-                    raise TypeError('issubclass() arg 1 must be a class')
+                if not getattr(cls, '_is_runtime_protocol', False):
+                    _type_check_issubclass_arg_1(other)
+                    raise TypeError(
+                        "Instance and class checks can only be used with "
+                        "@runtime_checkable protocols"
+                    )
                 if (
-                    not cls.__callable_proto_members_only__
+                    # this attribute is set by @runtime_checkable:
+                    cls.__non_callable_proto_members__
                     and cls.__dict__.get("__subclasshook__") is _proto_hook
                 ):
-                    non_method_attrs = sorted(
-                        attr for attr in cls.__protocol_attrs__
-                        if not callable(getattr(cls, attr, None))
-                    )
+                    _type_check_issubclass_arg_1(other)
+                    non_method_attrs = sorted(cls.__non_callable_proto_members__)
                     raise TypeError(
                         "Protocols with non-method members don't support issubclass()."
                         f" Non-method members: {str(non_method_attrs)[1:-1]}."
                     )
-                if not getattr(cls, '_is_runtime_protocol', False):
-                    raise TypeError(
-                        "Instance and class checks can only be used with "
-                        "@runtime_checkable protocols"
-                    )
             return abc.ABCMeta.__subclasscheck__(cls, other)
 
         def __instancecheck__(cls, instance):
@@ -610,7 +577,8 @@ def __instancecheck__(cls, instance):
                     val = inspect.getattr_static(instance, attr)
                 except AttributeError:
                     break
-                if val is None and callable(getattr(cls, attr, None)):
+                # this attribute is set by @runtime_checkable:
+                if val is None and attr not in cls.__non_callable_proto_members__:
                     break
             else:
                 return True
@@ -678,8 +646,58 @@ def __init_subclass__(cls, *args, **kwargs):
                 cls.__init__ = _no_init
 
 
+if sys.version_info >= (3, 13):
+    runtime_checkable = typing.runtime_checkable
+else:
+    def runtime_checkable(cls):
+        """Mark a protocol class as a runtime protocol.
+
+        Such protocol can be used with isinstance() and issubclass().
+        Raise TypeError if applied to a non-protocol class.
+        This allows a simple-minded structural check very similar to
+        one trick ponies in collections.abc such as Iterable.
+
+        For example::
+
+            @runtime_checkable
+            class Closable(Protocol):
+                def close(self): ...
+
+            assert isinstance(open('/some/file'), Closable)
+
+        Warning: this will check only the presence of the required methods,
+        not their type signatures!
+        """
+        if not issubclass(cls, typing.Generic) or not getattr(cls, '_is_protocol', False):
+            raise TypeError('@runtime_checkable can be only applied to protocol classes,'
+                            ' got %r' % cls)
+        cls._is_runtime_protocol = True
+
+        # Only execute the following block if it's a typing_extensions.Protocol class.
+        # typing.Protocol classes don't need it.
+        if isinstance(cls, _ProtocolMeta):
+            # PEP 544 prohibits using issubclass()
+            # with protocols that have non-method members.
+            # See gh-113320 for why we compute this attribute here,
+            # rather than in `_ProtocolMeta.__init__`
+            cls.__non_callable_proto_members__ = set()
+            for attr in cls.__protocol_attrs__:
+                try:
+                    is_callable = callable(getattr(cls, attr, None))
+                except Exception as e:
+                    raise TypeError(
+                        f"Failed to determine whether protocol member {attr!r} "
+                        "is a method member"
+                    ) from e
+                else:
+                    if not is_callable:
+                        cls.__non_callable_proto_members__.add(attr)
+
+        return cls
+
+
 # The "runtime" alias exists for backwards compatibility.
-runtime = runtime_checkable = typing.runtime_checkable
+runtime = runtime_checkable
 
 
 # Our version of runtime-checkable protocols is faster on Python 3.8-3.11
@@ -774,7 +792,11 @@ def inner(func):
     return inner
 
 
-if hasattr(typing, "ReadOnly"):
+# Update this to something like >=3.13.0b1 if and when
+# PEP 728 is implemented in CPython
+_PEP_728_IMPLEMENTED = False
+
+if _PEP_728_IMPLEMENTED:
     # The standard library TypedDict in Python 3.8 does not store runtime information
     # about which (if any) keys are optional.  See https://bugs.python.org/issue38834
     # The standard library TypedDict in Python 3.9.0/1 does not honour the "total"
@@ -785,7 +807,8 @@ def inner(func):
     # Aaaand on 3.12 we add __orig_bases__ to TypedDict
     # to enable better runtime introspection.
     # On 3.13 we deprecate some odd ways of creating TypedDicts.
-    # PEP 705 proposes adding the ReadOnly[] qualifier.
+    # Also on 3.13, PEP 705 adds the ReadOnly[] qualifier.
+    # PEP 728 (still pending) makes more changes.
     TypedDict = typing.TypedDict
     _TypedDictMeta = typing._TypedDictMeta
     is_typeddict = typing.is_typeddict
@@ -815,7 +838,7 @@ def _get_typeddict_qualifiers(annotation_type):
                 break
 
     class _TypedDictMeta(type):
-        def __new__(cls, name, bases, ns, *, total=True):
+        def __new__(cls, name, bases, ns, *, total=True, closed=False):
             """Create new typed dict class object.
 
             This method is called when TypedDict is subclassed,
@@ -860,6 +883,7 @@ def __new__(cls, name, bases, ns, *, total=True):
             optional_keys = set()
             readonly_keys = set()
             mutable_keys = set()
+            extra_items_type = None
 
             for base in bases:
                 base_dict = base.__dict__
@@ -869,6 +893,26 @@ def __new__(cls, name, bases, ns, *, total=True):
                 optional_keys.update(base_dict.get('__optional_keys__', ()))
                 readonly_keys.update(base_dict.get('__readonly_keys__', ()))
                 mutable_keys.update(base_dict.get('__mutable_keys__', ()))
+                base_extra_items_type = base_dict.get('__extra_items__', None)
+                if base_extra_items_type is not None:
+                    extra_items_type = base_extra_items_type
+
+            if closed and extra_items_type is None:
+                extra_items_type = Never
+            if closed and "__extra_items__" in own_annotations:
+                annotation_type = own_annotations.pop("__extra_items__")
+                qualifiers = set(_get_typeddict_qualifiers(annotation_type))
+                if Required in qualifiers:
+                    raise TypeError(
+                        "Special key __extra_items__ does not support "
+                        "Required"
+                    )
+                if NotRequired in qualifiers:
+                    raise TypeError(
+                        "Special key __extra_items__ does not support "
+                        "NotRequired"
+                    )
+                extra_items_type = annotation_type
 
             annotations.update(own_annotations)
             for annotation_key, annotation_type in own_annotations.items():
@@ -883,11 +927,7 @@ def __new__(cls, name, bases, ns, *, total=True):
                 else:
                     optional_keys.add(annotation_key)
                 if ReadOnly in qualifiers:
-                    if annotation_key in mutable_keys:
-                        raise TypeError(
-                            f"Cannot override mutable key {annotation_key!r}"
-                            " with read-only key"
-                        )
+                    mutable_keys.discard(annotation_key)
                     readonly_keys.add(annotation_key)
                 else:
                     mutable_keys.add(annotation_key)
@@ -900,6 +940,8 @@ def __new__(cls, name, bases, ns, *, total=True):
             tp_dict.__mutable_keys__ = frozenset(mutable_keys)
             if not hasattr(tp_dict, '__total__'):
                 tp_dict.__total__ = total
+            tp_dict.__closed__ = closed
+            tp_dict.__extra_items__ = extra_items_type
             return tp_dict
 
         __call__ = dict  # static method
@@ -913,7 +955,7 @@ def __subclasscheck__(cls, other):
     _TypedDict = type.__new__(_TypedDictMeta, 'TypedDict', (), {})
 
     @_ensure_subclassable(lambda bases: (_TypedDict,))
-    def TypedDict(typename, fields=_marker, /, *, total=True, **kwargs):
+    def TypedDict(typename, fields=_marker, /, *, total=True, closed=False, **kwargs):
         """A simple typed namespace. At runtime it is equivalent to a plain dict.
 
         TypedDict creates a dictionary type such that a type checker will expect all
@@ -973,6 +1015,9 @@ class Point2D(TypedDict):
                 "using the functional syntax, pass an empty dictionary, e.g. "
             ) + example + "."
             warnings.warn(deprecation_msg, DeprecationWarning, stacklevel=2)
+            if closed is not False and closed is not True:
+                kwargs["closed"] = closed
+                closed = False
             fields = kwargs
         elif kwargs:
             raise TypeError("TypedDict takes either a dict or keyword arguments,"
@@ -994,7 +1039,7 @@ class Point2D(TypedDict):
             # Setting correct module is necessary to make typed dict classes pickleable.
             ns['__module__'] = module
 
-        td = _TypedDictMeta(typename, (), ns, total=total)
+        td = _TypedDictMeta(typename, (), ns, total=total, closed=closed)
         td.__orig_bases__ = (TypedDict,)
         return td
 
@@ -1040,15 +1085,15 @@ def greet(name: str) -> None:
         return val
 
 
-if hasattr(typing, "Required"):  # 3.11+
+if hasattr(typing, "ReadOnly"):  # 3.13+
     get_type_hints = typing.get_type_hints
-else:  # <=3.10
+else:  # <=3.13
     # replaces _strip_annotations()
     def _strip_extras(t):
         """Strips Annotated, Required and NotRequired from a given type."""
         if isinstance(t, _AnnotatedAlias):
             return _strip_extras(t.__origin__)
-        if hasattr(t, "__origin__") and t.__origin__ in (Required, NotRequired):
+        if hasattr(t, "__origin__") and t.__origin__ in (Required, NotRequired, ReadOnly):
             return _strip_extras(t.__args__[0])
         if isinstance(t, typing._GenericAlias):
             stripped_args = tuple(_strip_extras(a) for a in t.__args__)
@@ -1768,6 +1813,98 @@ def is_str(val: Union[str, float]):
         PEP 647 (User-Defined Type Guards).
         """)
 
+# 3.13+
+if hasattr(typing, 'TypeIs'):
+    TypeIs = typing.TypeIs
+# 3.9
+elif sys.version_info[:2] >= (3, 9):
+    @_ExtensionsSpecialForm
+    def TypeIs(self, parameters):
+        """Special typing form used to annotate the return type of a user-defined
+        type narrower function.  ``TypeIs`` only accepts a single type argument.
+        At runtime, functions marked this way should return a boolean.
+
+        ``TypeIs`` aims to benefit *type narrowing* -- a technique used by static
+        type checkers to determine a more precise type of an expression within a
+        program's code flow.  Usually type narrowing is done by analyzing
+        conditional code flow and applying the narrowing to a block of code.  The
+        conditional expression here is sometimes referred to as a "type guard".
+
+        Sometimes it would be convenient to use a user-defined boolean function
+        as a type guard.  Such a function should use ``TypeIs[...]`` as its
+        return type to alert static type checkers to this intention.
+
+        Using  ``-> TypeIs`` tells the static type checker that for a given
+        function:
+
+        1. The return value is a boolean.
+        2. If the return value is ``True``, the type of its argument
+        is the intersection of the type inside ``TypeGuard`` and the argument's
+        previously known type.
+
+        For example::
+
+            def is_awaitable(val: object) -> TypeIs[Awaitable[Any]]:
+                return hasattr(val, '__await__')
+
+            def f(val: Union[int, Awaitable[int]]) -> int:
+                if is_awaitable(val):
+                    assert_type(val, Awaitable[int])
+                else:
+                    assert_type(val, int)
+
+        ``TypeIs`` also works with type variables.  For more information, see
+        PEP 742 (Narrowing types with TypeIs).
+        """
+        item = typing._type_check(parameters, f'{self} accepts only a single type.')
+        return typing._GenericAlias(self, (item,))
+# 3.8
+else:
+    class _TypeIsForm(_ExtensionsSpecialForm, _root=True):
+        def __getitem__(self, parameters):
+            item = typing._type_check(parameters,
+                                      f'{self._name} accepts only a single type')
+            return typing._GenericAlias(self, (item,))
+
+    TypeIs = _TypeIsForm(
+        'TypeIs',
+        doc="""Special typing form used to annotate the return type of a user-defined
+        type narrower function.  ``TypeIs`` only accepts a single type argument.
+        At runtime, functions marked this way should return a boolean.
+
+        ``TypeIs`` aims to benefit *type narrowing* -- a technique used by static
+        type checkers to determine a more precise type of an expression within a
+        program's code flow.  Usually type narrowing is done by analyzing
+        conditional code flow and applying the narrowing to a block of code.  The
+        conditional expression here is sometimes referred to as a "type guard".
+
+        Sometimes it would be convenient to use a user-defined boolean function
+        as a type guard.  Such a function should use ``TypeIs[...]`` as its
+        return type to alert static type checkers to this intention.
+
+        Using  ``-> TypeIs`` tells the static type checker that for a given
+        function:
+
+        1. The return value is a boolean.
+        2. If the return value is ``True``, the type of its argument
+        is the intersection of the type inside ``TypeGuard`` and the argument's
+        previously known type.
+
+        For example::
+
+            def is_awaitable(val: object) -> TypeIs[Awaitable[Any]]:
+                return hasattr(val, '__await__')
+
+            def f(val: Union[int, Awaitable[int]]) -> int:
+                if is_awaitable(val):
+                    assert_type(val, Awaitable[int])
+                else:
+                    assert_type(val, int)
+
+        ``TypeIs`` also works with type variables.  For more information, see
+        PEP 742 (Narrowing types with TypeIs).
+        """)
+
 
 # Vendored from cpython typing._SpecialFrom
 class _SpecialForm(typing._Final, _root=True):
@@ -2515,9 +2652,151 @@ def wrapper(*args, **kwargs):
 #   counting generic parameters, so that when we subscript a generic,
 #   the runtime doesn't try to substitute the Unpack with the subscripted type.
 if not hasattr(typing, "TypeVarTuple"):
+    def _check_generic(cls, parameters, elen=_marker):
+        """Check correct count for parameters of a generic cls (internal helper).
+
+        This gives a nice error message in case of count mismatch.
+        """
+        if not elen:
+            raise TypeError(f"{cls} is not a generic class")
+        if elen is _marker:
+            if not hasattr(cls, "__parameters__") or not cls.__parameters__:
+                raise TypeError(f"{cls} is not a generic class")
+            elen = len(cls.__parameters__)
+        alen = len(parameters)
+        if alen != elen:
+            expect_val = elen
+            if hasattr(cls, "__parameters__"):
+                parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
+                num_tv_tuples = sum(isinstance(p, TypeVarTuple) for p in parameters)
+                if (num_tv_tuples > 0) and (alen >= elen - num_tv_tuples):
+                    return
+
+                # deal with TypeVarLike defaults
+                # required TypeVarLikes cannot appear after a defaulted one.
+                if alen < elen:
+                    # since we validate TypeVarLike default in _collect_type_vars
+                    # or _collect_parameters we can safely check parameters[alen]
+                    if getattr(parameters[alen], '__default__', None) is not None:
+                        return
+
+                    num_default_tv = sum(getattr(p, '__default__', None)
+                                         is not None for p in parameters)
+
+                    elen -= num_default_tv
+
+                    expect_val = f"at least {elen}"
+
+            things = "arguments" if sys.version_info >= (3, 10) else "parameters"
+            raise TypeError(f"Too {'many' if alen > elen else 'few'} {things}"
+                            f" for {cls}; actual {alen}, expected {expect_val}")
+else:
+    # Python 3.11+
+
+    def _check_generic(cls, parameters, elen):
+        """Check correct count for parameters of a generic cls (internal helper).
+
+        This gives a nice error message in case of count mismatch.
+        """
+        if not elen:
+            raise TypeError(f"{cls} is not a generic class")
+        alen = len(parameters)
+        if alen != elen:
+            expect_val = elen
+            if hasattr(cls, "__parameters__"):
+                parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
+
+                # deal with TypeVarLike defaults
+                # required TypeVarLikes cannot appear after a defaulted one.
+                if alen < elen:
+                    # since we validate TypeVarLike default in _collect_type_vars
+                    # or _collect_parameters we can safely check parameters[alen]
+                    if getattr(parameters[alen], '__default__', None) is not None:
+                        return
+
+                    num_default_tv = sum(getattr(p, '__default__', None)
+                                         is not None for p in parameters)
+
+                    elen -= num_default_tv
+
+                    expect_val = f"at least {elen}"
+
+            raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments"
+                            f" for {cls}; actual {alen}, expected {expect_val}")
+
+typing._check_generic = _check_generic
+
+# Python 3.11+ _collect_type_vars was renamed to _collect_parameters
+if hasattr(typing, '_collect_type_vars'):
+    def _collect_type_vars(types, typevar_types=None):
+        """Collect all type variable contained in types in order of
+        first appearance (lexicographic order). For example::
+
+            _collect_type_vars((T, List[S, T])) == (T, S)
+        """
+        if typevar_types is None:
+            typevar_types = typing.TypeVar
+        tvars = []
+        # required TypeVarLike cannot appear after TypeVarLike with default
+        default_encountered = False
+        for t in types:
+            if (
+                isinstance(t, typevar_types) and
+                t not in tvars and
+                not _is_unpack(t)
+            ):
+                if getattr(t, '__default__', None) is not None:
+                    default_encountered = True
+                elif default_encountered:
+                    raise TypeError(f'Type parameter {t!r} without a default'
+                                    ' follows type parameter with a default')
+
+                tvars.append(t)
+            if _should_collect_from_parameters(t):
+                tvars.extend([t for t in t.__parameters__ if t not in tvars])
+        return tuple(tvars)
+
     typing._collect_type_vars = _collect_type_vars
-    typing._check_generic = _check_generic
+else:
+    def _collect_parameters(args):
+        """Collect all type variables and parameter specifications in args
+        in order of first appearance (lexicographic order).
+
+        For example::
+
+            assert _collect_parameters((T, Callable[P, T])) == (T, P)
+        """
+        parameters = []
+        # required TypeVarLike cannot appear after TypeVarLike with default
+        default_encountered = False
+        for t in args:
+            if isinstance(t, type):
+                # We don't want __parameters__ descriptor of a bare Python class.
+                pass
+            elif isinstance(t, tuple):
+                # `t` might be a tuple, when `ParamSpec` is substituted with
+                # `[T, int]`, or `[int, *Ts]`, etc.
+                for x in t:
+                    for collected in _collect_parameters([x]):
+                        if collected not in parameters:
+                            parameters.append(collected)
+            elif hasattr(t, '__typing_subst__'):
+                if t not in parameters:
+                    if getattr(t, '__default__', None) is not None:
+                        default_encountered = True
+                    elif default_encountered:
+                        raise TypeError(f'Type parameter {t!r} without a default'
+                                        ' follows type parameter with a default')
+
+                    parameters.append(t)
+            else:
+                for x in getattr(t, '__parameters__', ()):
+                    if x not in parameters:
+                        parameters.append(x)
+
+        return tuple(parameters)
 
+    typing._collect_parameters = _collect_parameters
 
 # Backport typing.NamedTuple as it exists in Python 3.13.
 # In 3.11, the ability to define generic `NamedTuple`s was supported.
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index bba94517734..04ccb0c5aa0 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -14,7 +14,7 @@ requests==2.31.0
     urllib3==1.26.18
 rich==13.7.1
     pygments==2.17.2
-    typing_extensions==4.9.0
+    typing_extensions==4.11.0
 resolvelib==1.0.1
 setuptools==69.1.1
 six==1.16.0

From d24ddc3267fded605ec8bf248f1d5923941d6bc8 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 3 May 2024 21:06:03 +0100
Subject: [PATCH 359/992] Upgrade setuptools to 69.5.1

---
 news/setuptools.vendor.rst                |  2 +-
 src/pip/_vendor/pkg_resources/__init__.py | 68 ++++++++++-------------
 src/pip/_vendor/vendor.txt                |  2 +-
 3 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/news/setuptools.vendor.rst b/news/setuptools.vendor.rst
index 135850e0a97..70703ddc15e 100644
--- a/news/setuptools.vendor.rst
+++ b/news/setuptools.vendor.rst
@@ -1 +1 @@
-Upgrade setuptools to 69.1.1
+Upgrade setuptools to 69.5.1
diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py
index 89f49570f4a..417a537d6f6 100644
--- a/src/pip/_vendor/pkg_resources/__init__.py
+++ b/src/pip/_vendor/pkg_resources/__init__.py
@@ -27,7 +27,7 @@
 import time
 import re
 import types
-from typing import Protocol
+from typing import List, Protocol
 import zipfile
 import zipimport
 import warnings
@@ -85,9 +85,7 @@
 require = None
 working_set = None
 add_activation_listener = None
-resources_stream = None
 cleanup_resources = None
-resource_dir = None
 resource_stream = None
 set_extraction_path = None
 resource_isdir = None
@@ -491,19 +489,6 @@ def compatible_platforms(provided, required):
     return False
 
 
-def run_script(dist_spec, script_name):
-    """Locate distribution `dist_spec` and run its `script_name` script"""
-    ns = sys._getframe(1).f_globals
-    name = ns['__name__']
-    ns.clear()
-    ns['__name__'] = name
-    require(dist_spec)[0].run_script(script_name, ns)
-
-
-# backward compatibility
-run_main = run_script
-
-
 def get_distribution(dist):
     """Return a current distribution object for a Requirement or string"""
     if isinstance(dist, str):
@@ -531,7 +516,7 @@ def get_entry_info(dist, group, name):
 
 
 class IMetadataProvider(Protocol):
-    def has_metadata(self, name):
+    def has_metadata(self, name) -> bool:
         """Does the package's distribution contain the named metadata?"""
 
     def get_metadata(self, name):
@@ -543,7 +528,7 @@ def get_metadata_lines(self, name):
         Leading and trailing whitespace is stripped from each line, and lines
         with ``#`` as the first non-blank character are omitted."""
 
-    def metadata_isdir(self, name):
+    def metadata_isdir(self, name) -> bool:
         """Is the named metadata a directory?  (like ``os.path.isdir()``)"""
 
     def metadata_listdir(self, name):
@@ -566,8 +551,8 @@ def get_resource_stream(self, manager, resource_name):
 
         `manager` must be an ``IResourceManager``"""
 
-    def get_resource_string(self, manager, resource_name):
-        """Return a string containing the contents of `resource_name`
+    def get_resource_string(self, manager, resource_name) -> bytes:
+        """Return the contents of `resource_name` as :obj:`bytes`
 
         `manager` must be an ``IResourceManager``"""
 
@@ -1203,8 +1188,8 @@ def resource_stream(self, package_or_requirement, resource_name):
             self, resource_name
         )
 
-    def resource_string(self, package_or_requirement, resource_name):
-        """Return specified resource as a string"""
+    def resource_string(self, package_or_requirement, resource_name) -> bytes:
+        """Return specified resource as :obj:`bytes`"""
         return get_provider(package_or_requirement).get_resource_string(
             self, resource_name
         )
@@ -1339,7 +1324,7 @@ def set_extraction_path(self, path):
 
         self.extraction_path = path
 
-    def cleanup_resources(self, force=False):
+    def cleanup_resources(self, force=False) -> List[str]:
         """
         Delete all extracted resource files and directories, returning a list
         of the file and directory names that could not be successfully removed.
@@ -1351,6 +1336,7 @@ def cleanup_resources(self, force=False):
         directory used for extractions.
         """
         # XXX
+        return []
 
 
 def get_default_cache():
@@ -1479,7 +1465,7 @@ def get_resource_filename(self, manager, resource_name):
     def get_resource_stream(self, manager, resource_name):
         return io.BytesIO(self.get_resource_string(manager, resource_name))
 
-    def get_resource_string(self, manager, resource_name):
+    def get_resource_string(self, manager, resource_name) -> bytes:
         return self._get(self._fn(self.module_path, resource_name))
 
     def has_resource(self, resource_name):
@@ -1488,9 +1474,9 @@ def has_resource(self, resource_name):
     def _get_metadata_path(self, name):
         return self._fn(self.egg_info, name)
 
-    def has_metadata(self, name):
+    def has_metadata(self, name) -> bool:
         if not self.egg_info:
-            return self.egg_info
+            return False
 
         path = self._get_metadata_path(name)
         return self._has(path)
@@ -1514,8 +1500,8 @@ def get_metadata_lines(self, name):
     def resource_isdir(self, resource_name):
         return self._isdir(self._fn(self.module_path, resource_name))
 
-    def metadata_isdir(self, name):
-        return self.egg_info and self._isdir(self._fn(self.egg_info, name))
+    def metadata_isdir(self, name) -> bool:
+        return bool(self.egg_info and self._isdir(self._fn(self.egg_info, name)))
 
     def resource_listdir(self, resource_name):
         return self._listdir(self._fn(self.module_path, resource_name))
@@ -1554,12 +1540,12 @@ def run_script(self, script_name, namespace):
             script_code = compile(script_text, script_filename, 'exec')
             exec(script_code, namespace, namespace)
 
-    def _has(self, path):
+    def _has(self, path) -> bool:
         raise NotImplementedError(
             "Can't perform this operation for unregistered loader type"
         )
 
-    def _isdir(self, path):
+    def _isdir(self, path) -> bool:
         raise NotImplementedError(
             "Can't perform this operation for unregistered loader type"
         )
@@ -1649,7 +1635,7 @@ def _validate_resource_path(path):
             DeprecationWarning,
         )
 
-    def _get(self, path):
+    def _get(self, path) -> bytes:
         if hasattr(self.loader, 'get_data'):
             return self.loader.get_data(path)
         raise NotImplementedError(
@@ -1694,10 +1680,10 @@ def _set_egg(self, path):
 class DefaultProvider(EggProvider):
     """Provides access to package resources in the filesystem"""
 
-    def _has(self, path):
+    def _has(self, path) -> bool:
         return os.path.exists(path)
 
-    def _isdir(self, path):
+    def _isdir(self, path) -> bool:
         return os.path.isdir(path)
 
     def _listdir(self, path):
@@ -1706,7 +1692,7 @@ def _listdir(self, path):
     def get_resource_stream(self, manager, resource_name):
         return open(self._fn(self.module_path, resource_name), 'rb')
 
-    def _get(self, path):
+    def _get(self, path) -> bytes:
         with open(path, 'rb') as stream:
             return stream.read()
 
@@ -1731,8 +1717,8 @@ class EmptyProvider(NullProvider):
 
     _isdir = _has = lambda self, path: False
 
-    def _get(self, path):
-        return ''
+    def _get(self, path) -> bytes:
+        return b''
 
     def _listdir(self, path):
         return []
@@ -1939,11 +1925,11 @@ def _index(self):
             self._dirindex = ind
             return ind
 
-    def _has(self, fspath):
+    def _has(self, fspath) -> bool:
         zip_path = self._zipinfo_name(fspath)
         return zip_path in self.zipinfo or zip_path in self._index()
 
-    def _isdir(self, fspath):
+    def _isdir(self, fspath) -> bool:
         return self._zipinfo_name(fspath) in self._index()
 
     def _listdir(self, fspath):
@@ -1977,7 +1963,7 @@ def __init__(self, path):
     def _get_metadata_path(self, name):
         return self.path
 
-    def has_metadata(self, name):
+    def has_metadata(self, name) -> bool:
         return name == 'PKG-INFO' and os.path.isfile(self.path)
 
     def get_metadata(self, name):
@@ -3207,7 +3193,9 @@ def _find_adapter(registry, ob):
     for t in types:
         if t in registry:
             return registry[t]
-    return None
+    # _find_adapter would previously return None, and immediately be called.
+    # So we're raising a TypeError to keep backward compatibility if anyone depended on that behaviour.
+    raise TypeError(f"Could not find adapter for {registry} and {ob}")
 
 
 def ensure_directory(path):
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 04ccb0c5aa0..e9694adc037 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -16,7 +16,7 @@ rich==13.7.1
     pygments==2.17.2
     typing_extensions==4.11.0
 resolvelib==1.0.1
-setuptools==69.1.1
+setuptools==69.5.1
 six==1.16.0
 tenacity==8.2.3
 tomli==2.0.1

From 8547b52e26061f6f385400626aed3b1a74bfd441 Mon Sep 17 00:00:00 2001
From: Seth Michael Larson 
Date: Fri, 3 May 2024 15:27:57 -0500
Subject: [PATCH 360/992] Upgrade vendored truststore to 0.9.0 (#12662)

---
 news/truststore.vendor.rst             |  1 +
 src/pip/_vendor/truststore/__init__.py |  2 +-
 src/pip/_vendor/truststore/_api.py     | 39 +++++++++++++++-----------
 src/pip/_vendor/truststore/_macos.py   | 14 ++++-----
 src/pip/_vendor/truststore/_windows.py | 30 +++++++++++++-------
 src/pip/_vendor/vendor.txt             |  2 +-
 6 files changed, 52 insertions(+), 36 deletions(-)
 create mode 100644 news/truststore.vendor.rst

diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst
new file mode 100644
index 00000000000..a18235085f9
--- /dev/null
+++ b/news/truststore.vendor.rst
@@ -0,0 +1 @@
+Upgrade truststore to 0.9.0
diff --git a/src/pip/_vendor/truststore/__init__.py b/src/pip/_vendor/truststore/__init__.py
index 59930f455b0..9e7f26795fc 100644
--- a/src/pip/_vendor/truststore/__init__.py
+++ b/src/pip/_vendor/truststore/__init__.py
@@ -10,4 +10,4 @@
 del _api, _sys  # type: ignore[name-defined] # noqa: F821
 
 __all__ = ["SSLContext", "inject_into_ssl", "extract_from_ssl"]
-__version__ = "0.8.0"
+__version__ = "0.9.0"
diff --git a/src/pip/_vendor/truststore/_api.py b/src/pip/_vendor/truststore/_api.py
index 829aff72672..f1ac6676813 100644
--- a/src/pip/_vendor/truststore/_api.py
+++ b/src/pip/_vendor/truststore/_api.py
@@ -2,10 +2,9 @@
 import platform
 import socket
 import ssl
+import sys
 import typing
 
-import _ssl  # type: ignore[import]
-
 from ._ssl_constants import (
     _original_SSLContext,
     _original_super_SSLContext,
@@ -49,7 +48,7 @@ def extract_from_ssl() -> None:
     try:
         import pip._vendor.urllib3.util.ssl_ as urllib3_ssl
 
-        urllib3_ssl.SSLContext = _original_SSLContext
+        urllib3_ssl.SSLContext = _original_SSLContext  # type: ignore[assignment]
     except ImportError:
         pass
 
@@ -171,16 +170,13 @@ def cert_store_stats(self) -> dict[str, int]:
     @typing.overload
     def get_ca_certs(
         self, binary_form: typing.Literal[False] = ...
-    ) -> list[typing.Any]:
-        ...
+    ) -> list[typing.Any]: ...
 
     @typing.overload
-    def get_ca_certs(self, binary_form: typing.Literal[True] = ...) -> list[bytes]:
-        ...
+    def get_ca_certs(self, binary_form: typing.Literal[True] = ...) -> list[bytes]: ...
 
     @typing.overload
-    def get_ca_certs(self, binary_form: bool = ...) -> typing.Any:
-        ...
+    def get_ca_certs(self, binary_form: bool = ...) -> typing.Any: ...
 
     def get_ca_certs(self, binary_form: bool = False) -> list[typing.Any] | list[bytes]:
         raise NotImplementedError()
@@ -276,6 +272,23 @@ def verify_mode(self, value: ssl.VerifyMode) -> None:
         )
 
 
+# Python 3.13+ makes get_unverified_chain() a public API that only returns DER
+# encoded certificates. We detect whether we need to call public_bytes() for 3.10->3.12
+# Pre-3.13 returned None instead of an empty list from get_unverified_chain()
+if sys.version_info >= (3, 13):
+
+    def _get_unverified_chain_bytes(sslobj: ssl.SSLObject) -> list[bytes]:
+        unverified_chain = sslobj.get_unverified_chain() or ()  # type: ignore[attr-defined]
+        return [cert for cert in unverified_chain]
+
+else:
+    import _ssl  # type: ignore[import-not-found]
+
+    def _get_unverified_chain_bytes(sslobj: ssl.SSLObject) -> list[bytes]:
+        unverified_chain = sslobj.get_unverified_chain() or ()  # type: ignore[attr-defined]
+        return [cert.public_bytes(_ssl.ENCODING_DER) for cert in unverified_chain]
+
+
 def _verify_peercerts(
     sock_or_sslobj: ssl.SSLSocket | ssl.SSLObject, server_hostname: str | None
 ) -> None:
@@ -290,13 +303,7 @@ def _verify_peercerts(
     except AttributeError:
         pass
 
-    # SSLObject.get_unverified_chain() returns 'None'
-    # if the peer sends no certificates. This is common
-    # for the server-side scenario.
-    unverified_chain: typing.Sequence[_ssl.Certificate] = (
-        sslobj.get_unverified_chain() or ()  # type: ignore[attr-defined]
-    )
-    cert_bytes = [cert.public_bytes(_ssl.ENCODING_DER) for cert in unverified_chain]
+    cert_bytes = _get_unverified_chain_bytes(sslobj)
     _verify_peercerts_impl(
         sock_or_sslobj.context, cert_bytes, server_hostname=server_hostname
     )
diff --git a/src/pip/_vendor/truststore/_macos.py b/src/pip/_vendor/truststore/_macos.py
index 7dc440bf362..b234ffec723 100644
--- a/src/pip/_vendor/truststore/_macos.py
+++ b/src/pip/_vendor/truststore/_macos.py
@@ -96,9 +96,6 @@ def _load_cdll(name: str, macos10_16_path: str) -> CDLL:
     Security.SecTrustSetAnchorCertificatesOnly.argtypes = [SecTrustRef, Boolean]
     Security.SecTrustSetAnchorCertificatesOnly.restype = OSStatus
 
-    Security.SecTrustEvaluate.argtypes = [SecTrustRef, POINTER(SecTrustResultType)]
-    Security.SecTrustEvaluate.restype = OSStatus
-
     Security.SecPolicyCreateRevocation.argtypes = [CFOptionFlags]
     Security.SecPolicyCreateRevocation.restype = SecPolicyRef
 
@@ -259,6 +256,7 @@ def _handle_osstatus(result: OSStatus, _: typing.Any, args: typing.Any) -> typin
 
 Security.SecTrustCreateWithCertificates.errcheck = _handle_osstatus  # type: ignore[assignment]
 Security.SecTrustSetAnchorCertificates.errcheck = _handle_osstatus  # type: ignore[assignment]
+Security.SecTrustSetAnchorCertificatesOnly.errcheck = _handle_osstatus  # type: ignore[assignment]
 Security.SecTrustGetTrustResult.errcheck = _handle_osstatus  # type: ignore[assignment]
 
 
@@ -417,21 +415,21 @@ def _verify_peercerts_impl(
                 CoreFoundation.CFRelease(certs)
 
         # If there are additional trust anchors to load we need to transform
-        # the list of DER-encoded certificates into a CFArray. Otherwise
-        # pass 'None' to signal that we only want system / fetched certificates.
+        # the list of DER-encoded certificates into a CFArray.
         ctx_ca_certs_der: list[bytes] | None = ssl_context.get_ca_certs(
             binary_form=True
         )
         if ctx_ca_certs_der:
             ctx_ca_certs = None
             try:
-                ctx_ca_certs = _der_certs_to_cf_cert_array(cert_chain)
+                ctx_ca_certs = _der_certs_to_cf_cert_array(ctx_ca_certs_der)
                 Security.SecTrustSetAnchorCertificates(trust, ctx_ca_certs)
             finally:
                 if ctx_ca_certs:
                     CoreFoundation.CFRelease(ctx_ca_certs)
-        else:
-            Security.SecTrustSetAnchorCertificates(trust, None)
+
+        # We always want system certificates.
+        Security.SecTrustSetAnchorCertificatesOnly(trust, False)
 
         cf_error = CoreFoundation.CFErrorRef()
         sec_trust_eval_result = Security.SecTrustEvaluateWithError(
diff --git a/src/pip/_vendor/truststore/_windows.py b/src/pip/_vendor/truststore/_windows.py
index 3de4960a1b0..3d00d467f99 100644
--- a/src/pip/_vendor/truststore/_windows.py
+++ b/src/pip/_vendor/truststore/_windows.py
@@ -325,6 +325,12 @@ def _verify_peercerts_impl(
     server_hostname: str | None = None,
 ) -> None:
     """Verify the cert_chain from the server using Windows APIs."""
+
+    # If the peer didn't send any certificates then
+    # we can't do verification. Raise an error.
+    if not cert_chain:
+        raise ssl.SSLCertVerificationError("Peer sent no certificates to verify")
+
     pCertContext = None
     hIntermediateCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, None, 0, None)
     try:
@@ -375,7 +381,7 @@ def _verify_peercerts_impl(
                 server_hostname,
                 chain_flags=chain_flags,
             )
-        except ssl.SSLCertVerificationError:
+        except ssl.SSLCertVerificationError as e:
             # If that fails but custom CA certs have been added
             # to the SSLContext using load_verify_locations,
             # try verifying using a custom chain engine
@@ -384,15 +390,19 @@ def _verify_peercerts_impl(
                 binary_form=True
             )
             if custom_ca_certs:
-                _verify_using_custom_ca_certs(
-                    ssl_context,
-                    custom_ca_certs,
-                    hIntermediateCertStore,
-                    pCertContext,
-                    pChainPara,
-                    server_hostname,
-                    chain_flags=chain_flags,
-                )
+                try:
+                    _verify_using_custom_ca_certs(
+                        ssl_context,
+                        custom_ca_certs,
+                        hIntermediateCertStore,
+                        pCertContext,
+                        pChainPara,
+                        server_hostname,
+                        chain_flags=chain_flags,
+                    )
+                # Raise the original error, not the new error.
+                except ssl.SSLCertVerificationError:
+                    raise e from None
             else:
                 raise
     finally:
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index f00a8c02db4..14166a8192d 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -20,5 +20,5 @@ setuptools==69.1.1
 six==1.16.0
 tenacity==8.2.3
 tomli==2.0.1
-truststore==0.8.0
+truststore==0.9.0
 webencodings==0.5.1

From bc844911fc59efd40b8aa330f6802690388ec7c8 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sat, 4 May 2024 01:58:33 +0100
Subject: [PATCH 361/992] Revert "Upgrade vendored truststore to 0.9.0"
 (#12671)

This reverts commit 8547b52e26061f6f385400626aed3b1a74bfd441.
---
 news/truststore.vendor.rst             |  1 -
 src/pip/_vendor/truststore/__init__.py |  2 +-
 src/pip/_vendor/truststore/_api.py     | 39 +++++++++++---------------
 src/pip/_vendor/truststore/_macos.py   | 14 +++++----
 src/pip/_vendor/truststore/_windows.py | 30 +++++++-------------
 src/pip/_vendor/vendor.txt             |  2 +-
 6 files changed, 36 insertions(+), 52 deletions(-)
 delete mode 100644 news/truststore.vendor.rst

diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst
deleted file mode 100644
index a18235085f9..00000000000
--- a/news/truststore.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade truststore to 0.9.0
diff --git a/src/pip/_vendor/truststore/__init__.py b/src/pip/_vendor/truststore/__init__.py
index 9e7f26795fc..59930f455b0 100644
--- a/src/pip/_vendor/truststore/__init__.py
+++ b/src/pip/_vendor/truststore/__init__.py
@@ -10,4 +10,4 @@
 del _api, _sys  # type: ignore[name-defined] # noqa: F821
 
 __all__ = ["SSLContext", "inject_into_ssl", "extract_from_ssl"]
-__version__ = "0.9.0"
+__version__ = "0.8.0"
diff --git a/src/pip/_vendor/truststore/_api.py b/src/pip/_vendor/truststore/_api.py
index f1ac6676813..829aff72672 100644
--- a/src/pip/_vendor/truststore/_api.py
+++ b/src/pip/_vendor/truststore/_api.py
@@ -2,9 +2,10 @@
 import platform
 import socket
 import ssl
-import sys
 import typing
 
+import _ssl  # type: ignore[import]
+
 from ._ssl_constants import (
     _original_SSLContext,
     _original_super_SSLContext,
@@ -48,7 +49,7 @@ def extract_from_ssl() -> None:
     try:
         import pip._vendor.urllib3.util.ssl_ as urllib3_ssl
 
-        urllib3_ssl.SSLContext = _original_SSLContext  # type: ignore[assignment]
+        urllib3_ssl.SSLContext = _original_SSLContext
     except ImportError:
         pass
 
@@ -170,13 +171,16 @@ def cert_store_stats(self) -> dict[str, int]:
     @typing.overload
     def get_ca_certs(
         self, binary_form: typing.Literal[False] = ...
-    ) -> list[typing.Any]: ...
+    ) -> list[typing.Any]:
+        ...
 
     @typing.overload
-    def get_ca_certs(self, binary_form: typing.Literal[True] = ...) -> list[bytes]: ...
+    def get_ca_certs(self, binary_form: typing.Literal[True] = ...) -> list[bytes]:
+        ...
 
     @typing.overload
-    def get_ca_certs(self, binary_form: bool = ...) -> typing.Any: ...
+    def get_ca_certs(self, binary_form: bool = ...) -> typing.Any:
+        ...
 
     def get_ca_certs(self, binary_form: bool = False) -> list[typing.Any] | list[bytes]:
         raise NotImplementedError()
@@ -272,23 +276,6 @@ def verify_mode(self, value: ssl.VerifyMode) -> None:
         )
 
 
-# Python 3.13+ makes get_unverified_chain() a public API that only returns DER
-# encoded certificates. We detect whether we need to call public_bytes() for 3.10->3.12
-# Pre-3.13 returned None instead of an empty list from get_unverified_chain()
-if sys.version_info >= (3, 13):
-
-    def _get_unverified_chain_bytes(sslobj: ssl.SSLObject) -> list[bytes]:
-        unverified_chain = sslobj.get_unverified_chain() or ()  # type: ignore[attr-defined]
-        return [cert for cert in unverified_chain]
-
-else:
-    import _ssl  # type: ignore[import-not-found]
-
-    def _get_unverified_chain_bytes(sslobj: ssl.SSLObject) -> list[bytes]:
-        unverified_chain = sslobj.get_unverified_chain() or ()  # type: ignore[attr-defined]
-        return [cert.public_bytes(_ssl.ENCODING_DER) for cert in unverified_chain]
-
-
 def _verify_peercerts(
     sock_or_sslobj: ssl.SSLSocket | ssl.SSLObject, server_hostname: str | None
 ) -> None:
@@ -303,7 +290,13 @@ def _verify_peercerts(
     except AttributeError:
         pass
 
-    cert_bytes = _get_unverified_chain_bytes(sslobj)
+    # SSLObject.get_unverified_chain() returns 'None'
+    # if the peer sends no certificates. This is common
+    # for the server-side scenario.
+    unverified_chain: typing.Sequence[_ssl.Certificate] = (
+        sslobj.get_unverified_chain() or ()  # type: ignore[attr-defined]
+    )
+    cert_bytes = [cert.public_bytes(_ssl.ENCODING_DER) for cert in unverified_chain]
     _verify_peercerts_impl(
         sock_or_sslobj.context, cert_bytes, server_hostname=server_hostname
     )
diff --git a/src/pip/_vendor/truststore/_macos.py b/src/pip/_vendor/truststore/_macos.py
index b234ffec723..7dc440bf362 100644
--- a/src/pip/_vendor/truststore/_macos.py
+++ b/src/pip/_vendor/truststore/_macos.py
@@ -96,6 +96,9 @@ def _load_cdll(name: str, macos10_16_path: str) -> CDLL:
     Security.SecTrustSetAnchorCertificatesOnly.argtypes = [SecTrustRef, Boolean]
     Security.SecTrustSetAnchorCertificatesOnly.restype = OSStatus
 
+    Security.SecTrustEvaluate.argtypes = [SecTrustRef, POINTER(SecTrustResultType)]
+    Security.SecTrustEvaluate.restype = OSStatus
+
     Security.SecPolicyCreateRevocation.argtypes = [CFOptionFlags]
     Security.SecPolicyCreateRevocation.restype = SecPolicyRef
 
@@ -256,7 +259,6 @@ def _handle_osstatus(result: OSStatus, _: typing.Any, args: typing.Any) -> typin
 
 Security.SecTrustCreateWithCertificates.errcheck = _handle_osstatus  # type: ignore[assignment]
 Security.SecTrustSetAnchorCertificates.errcheck = _handle_osstatus  # type: ignore[assignment]
-Security.SecTrustSetAnchorCertificatesOnly.errcheck = _handle_osstatus  # type: ignore[assignment]
 Security.SecTrustGetTrustResult.errcheck = _handle_osstatus  # type: ignore[assignment]
 
 
@@ -415,21 +417,21 @@ def _verify_peercerts_impl(
                 CoreFoundation.CFRelease(certs)
 
         # If there are additional trust anchors to load we need to transform
-        # the list of DER-encoded certificates into a CFArray.
+        # the list of DER-encoded certificates into a CFArray. Otherwise
+        # pass 'None' to signal that we only want system / fetched certificates.
         ctx_ca_certs_der: list[bytes] | None = ssl_context.get_ca_certs(
             binary_form=True
         )
         if ctx_ca_certs_der:
             ctx_ca_certs = None
             try:
-                ctx_ca_certs = _der_certs_to_cf_cert_array(ctx_ca_certs_der)
+                ctx_ca_certs = _der_certs_to_cf_cert_array(cert_chain)
                 Security.SecTrustSetAnchorCertificates(trust, ctx_ca_certs)
             finally:
                 if ctx_ca_certs:
                     CoreFoundation.CFRelease(ctx_ca_certs)
-
-        # We always want system certificates.
-        Security.SecTrustSetAnchorCertificatesOnly(trust, False)
+        else:
+            Security.SecTrustSetAnchorCertificates(trust, None)
 
         cf_error = CoreFoundation.CFErrorRef()
         sec_trust_eval_result = Security.SecTrustEvaluateWithError(
diff --git a/src/pip/_vendor/truststore/_windows.py b/src/pip/_vendor/truststore/_windows.py
index 3d00d467f99..3de4960a1b0 100644
--- a/src/pip/_vendor/truststore/_windows.py
+++ b/src/pip/_vendor/truststore/_windows.py
@@ -325,12 +325,6 @@ def _verify_peercerts_impl(
     server_hostname: str | None = None,
 ) -> None:
     """Verify the cert_chain from the server using Windows APIs."""
-
-    # If the peer didn't send any certificates then
-    # we can't do verification. Raise an error.
-    if not cert_chain:
-        raise ssl.SSLCertVerificationError("Peer sent no certificates to verify")
-
     pCertContext = None
     hIntermediateCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, None, 0, None)
     try:
@@ -381,7 +375,7 @@ def _verify_peercerts_impl(
                 server_hostname,
                 chain_flags=chain_flags,
             )
-        except ssl.SSLCertVerificationError as e:
+        except ssl.SSLCertVerificationError:
             # If that fails but custom CA certs have been added
             # to the SSLContext using load_verify_locations,
             # try verifying using a custom chain engine
@@ -390,19 +384,15 @@ def _verify_peercerts_impl(
                 binary_form=True
             )
             if custom_ca_certs:
-                try:
-                    _verify_using_custom_ca_certs(
-                        ssl_context,
-                        custom_ca_certs,
-                        hIntermediateCertStore,
-                        pCertContext,
-                        pChainPara,
-                        server_hostname,
-                        chain_flags=chain_flags,
-                    )
-                # Raise the original error, not the new error.
-                except ssl.SSLCertVerificationError:
-                    raise e from None
+                _verify_using_custom_ca_certs(
+                    ssl_context,
+                    custom_ca_certs,
+                    hIntermediateCertStore,
+                    pCertContext,
+                    pChainPara,
+                    server_hostname,
+                    chain_flags=chain_flags,
+                )
             else:
                 raise
     finally:
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 14166a8192d..f00a8c02db4 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -20,5 +20,5 @@ setuptools==69.1.1
 six==1.16.0
 tenacity==8.2.3
 tomli==2.0.1
-truststore==0.9.0
+truststore==0.8.0
 webencodings==0.5.1

From 47a8480065d4eac252edb3673cfaecccb7dbf3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Fri, 29 Sep 2023 22:11:12 +0200
Subject: [PATCH 362/992] Upgrade vendored packaging lib

---
 news/packaging.vendor.rst                     |   1 +
 src/pip/_internal/commands/check.py           |   2 -
 src/pip/_internal/commands/download.py        |   1 -
 src/pip/_internal/commands/index.py           |   6 +-
 src/pip/_internal/commands/install.py         |   3 -
 src/pip/_internal/commands/list.py            |   4 +-
 src/pip/_internal/commands/wheel.py           |   1 -
 src/pip/_internal/metadata/base.py            |   6 +-
 .../_internal/metadata/importlib/_dists.py    |   4 +-
 src/pip/_internal/metadata/pkg_resources.py   |   4 +-
 src/pip/_internal/operations/check.py         |  44 +-
 src/pip/_internal/req/req_set.py              |  37 -
 .../_internal/resolution/resolvelib/base.py   |   7 +-
 .../resolution/resolvelib/candidates.py       |  16 +-
 .../resolution/resolvelib/factory.py          |  11 +-
 src/pip/_internal/self_outdated_check.py      |   4 +-
 src/pip/_vendor/packaging/__about__.py        |  26 -
 src/pip/_vendor/packaging/__init__.py         |  30 +-
 src/pip/_vendor/packaging/_elffile.py         | 108 +++
 src/pip/_vendor/packaging/_manylinux.py       | 211 ++--
 src/pip/_vendor/packaging/_musllinux.py       |  89 +-
 src/pip/_vendor/packaging/_parser.py          | 359 +++++++
 src/pip/_vendor/packaging/_tokenizer.py       | 192 ++++
 src/pip/_vendor/packaging/markers.py          | 204 ++--
 src/pip/_vendor/packaging/metadata.py         | 822 ++++++++++++++++
 src/pip/_vendor/packaging/requirements.py     | 154 +--
 src/pip/_vendor/packaging/specifiers.py       | 918 +++++++++++-------
 src/pip/_vendor/packaging/tags.py             |  94 +-
 src/pip/_vendor/packaging/utils.py            |  50 +-
 src/pip/_vendor/packaging/version.py          | 395 ++++----
 src/pip/_vendor/vendor.txt                    |   2 +-
 31 files changed, 2662 insertions(+), 1143 deletions(-)
 create mode 100644 news/packaging.vendor.rst
 delete mode 100644 src/pip/_vendor/packaging/__about__.py
 create mode 100644 src/pip/_vendor/packaging/_elffile.py
 create mode 100644 src/pip/_vendor/packaging/_parser.py
 create mode 100644 src/pip/_vendor/packaging/_tokenizer.py
 create mode 100644 src/pip/_vendor/packaging/metadata.py

diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst
new file mode 100644
index 00000000000..1834f6df449
--- /dev/null
+++ b/news/packaging.vendor.rst
@@ -0,0 +1 @@
+Upgrade packaging to 23.2
diff --git a/src/pip/_internal/commands/check.py b/src/pip/_internal/commands/check.py
index 5efd0a34160..584df9f55c5 100644
--- a/src/pip/_internal/commands/check.py
+++ b/src/pip/_internal/commands/check.py
@@ -7,7 +7,6 @@
 from pip._internal.operations.check import (
     check_package_set,
     create_package_set_from_installed,
-    warn_legacy_versions_and_specifiers,
 )
 from pip._internal.utils.misc import write_output
 
@@ -22,7 +21,6 @@ class CheckCommand(Command):
 
     def run(self, options: Values, args: List[str]) -> int:
         package_set, parsing_probs = create_package_set_from_installed()
-        warn_legacy_versions_and_specifiers(package_set)
         missing, conflicting = check_package_set(package_set)
 
         for project_name in missing:
diff --git a/src/pip/_internal/commands/download.py b/src/pip/_internal/commands/download.py
index 54247a78a65..917bbb91d83 100644
--- a/src/pip/_internal/commands/download.py
+++ b/src/pip/_internal/commands/download.py
@@ -139,7 +139,6 @@ def run(self, options: Values, args: List[str]) -> int:
                 downloaded.append(req.name)
 
         preparer.prepare_linked_requirements_more(requirement_set.requirements.values())
-        requirement_set.warn_legacy_versions_and_specifiers()
 
         if downloaded:
             write_output("Successfully downloaded %s", " ".join(downloaded))
diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py
index f55e9e49974..2e2661bba71 100644
--- a/src/pip/_internal/commands/index.py
+++ b/src/pip/_internal/commands/index.py
@@ -1,8 +1,8 @@
 import logging
 from optparse import Values
-from typing import Any, Iterable, List, Optional, Union
+from typing import Any, Iterable, List, Optional
 
-from pip._vendor.packaging.version import LegacyVersion, Version
+from pip._vendor.packaging.version import Version
 
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.req_command import IndexGroupCommand
@@ -115,7 +115,7 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
                 ignore_requires_python=options.ignore_requires_python,
             )
 
-            versions: Iterable[Union[LegacyVersion, Version]] = (
+            versions: Iterable[Version] = (
                 candidate.version for candidate in finder.find_all_candidates(query)
             )
 
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index 6cf7571e4a6..a9e83f9d8cd 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -387,9 +387,6 @@ def run(self, options: Values, args: List[str]) -> int:
                         json.dump(report.to_dict(), f, indent=2, ensure_ascii=False)
 
             if options.dry_run:
-                # In non dry-run mode, the legacy versions and specifiers check
-                # will be done as part of conflict detection.
-                requirement_set.warn_legacy_versions_and_specifiers()
                 would_install_items = sorted(
                     (r.metadata["name"], r.metadata["version"])
                     for r in requirement_set.requirements_to_install
diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index f510919910e..171461aebaf 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, Generator, List, Optional, Sequence, Tuple, cast
 
 from pip._vendor.packaging.utils import canonicalize_name
+from pip._vendor.packaging.version import Version
 
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.req_command import IndexGroupCommand
@@ -18,7 +19,6 @@
 from pip._internal.utils.misc import tabulate, write_output
 
 if TYPE_CHECKING:
-    from pip._internal.metadata.base import DistributionVersion
 
     class _DistWithLatestInfo(BaseDistribution):
         """Give the distribution object a couple of extra fields.
@@ -27,7 +27,7 @@ class _DistWithLatestInfo(BaseDistribution):
         makes the rest of the code much cleaner.
         """
 
-        latest_version: DistributionVersion
+        latest_version: Version
         latest_filetype: str
 
     _ProcessedDists = Sequence[_DistWithLatestInfo]
diff --git a/src/pip/_internal/commands/wheel.py b/src/pip/_internal/commands/wheel.py
index ed578aa2500..278719f4e0c 100644
--- a/src/pip/_internal/commands/wheel.py
+++ b/src/pip/_internal/commands/wheel.py
@@ -154,7 +154,6 @@ def run(self, options: Values, args: List[str]) -> int:
                 reqs_to_build.append(req)
 
         preparer.prepare_linked_requirements_more(requirement_set.requirements.values())
-        requirement_set.warn_legacy_versions_and_specifiers()
 
         # build wheels
         build_successes, build_failures = build(
diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py
index af0412c819c..843a4e60aeb 100644
--- a/src/pip/_internal/metadata/base.py
+++ b/src/pip/_internal/metadata/base.py
@@ -25,7 +25,7 @@
 from pip._vendor.packaging.requirements import Requirement
 from pip._vendor.packaging.specifiers import InvalidSpecifier, SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
-from pip._vendor.packaging.version import LegacyVersion, Version
+from pip._vendor.packaging.version import Version
 
 from pip._internal.exceptions import NoneMetadataError
 from pip._internal.locations import site_packages, user_site
@@ -41,8 +41,6 @@
 
 from ._json import msg_to_json
 
-DistributionVersion = Union[LegacyVersion, Version]
-
 InfoPath = Union[str, pathlib.PurePath]
 
 logger = logging.getLogger(__name__)
@@ -274,7 +272,7 @@ def canonical_name(self) -> NormalizedName:
         raise NotImplementedError()
 
     @property
-    def version(self) -> DistributionVersion:
+    def version(self) -> Version:
         raise NotImplementedError()
 
     @property
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index 8591029f16e..9eee474ea5b 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -16,13 +16,13 @@
 
 from pip._vendor.packaging.requirements import Requirement
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
+from pip._vendor.packaging.version import Version
 from pip._vendor.packaging.version import parse as parse_version
 
 from pip._internal.exceptions import InvalidWheel, UnsupportedWheel
 from pip._internal.metadata.base import (
     BaseDistribution,
     BaseEntryPoint,
-    DistributionVersion,
     InfoPath,
     Wheel,
 )
@@ -171,7 +171,7 @@ def canonical_name(self) -> NormalizedName:
         return canonicalize_name(name)
 
     @property
-    def version(self) -> DistributionVersion:
+    def version(self) -> Version:
         return parse_version(self._dist.version)
 
     def is_file(self, path: InfoPath) -> bool:
diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py
index bb11e5bd8a5..57a9fdba1bc 100644
--- a/src/pip/_internal/metadata/pkg_resources.py
+++ b/src/pip/_internal/metadata/pkg_resources.py
@@ -8,6 +8,7 @@
 from pip._vendor import pkg_resources
 from pip._vendor.packaging.requirements import Requirement
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
+from pip._vendor.packaging.version import Version
 from pip._vendor.packaging.version import parse as parse_version
 
 from pip._internal.exceptions import InvalidWheel, NoneMetadataError, UnsupportedWheel
@@ -19,7 +20,6 @@
     BaseDistribution,
     BaseEntryPoint,
     BaseEnvironment,
-    DistributionVersion,
     InfoPath,
     Wheel,
 )
@@ -168,7 +168,7 @@ def canonical_name(self) -> NormalizedName:
         return canonicalize_name(self._dist.project_name)
 
     @property
-    def version(self) -> DistributionVersion:
+    def version(self) -> Version:
         return parse_version(self._dist.version)
 
     def is_file(self, path: InfoPath) -> bool:
diff --git a/src/pip/_internal/operations/check.py b/src/pip/_internal/operations/check.py
index 90c6a58a55e..ee1a5bcfe06 100644
--- a/src/pip/_internal/operations/check.py
+++ b/src/pip/_internal/operations/check.py
@@ -5,28 +5,25 @@
 from typing import Callable, Dict, List, NamedTuple, Optional, Set, Tuple
 
 from pip._vendor.packaging.requirements import Requirement
-from pip._vendor.packaging.specifiers import LegacySpecifier
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
-from pip._vendor.packaging.version import LegacyVersion
+from pip._vendor.packaging.version import Version
 
 from pip._internal.distributions import make_distribution_for_install_requirement
 from pip._internal.metadata import get_default_environment
-from pip._internal.metadata.base import DistributionVersion
 from pip._internal.req.req_install import InstallRequirement
-from pip._internal.utils.deprecation import deprecated
 
 logger = logging.getLogger(__name__)
 
 
 class PackageDetails(NamedTuple):
-    version: DistributionVersion
+    version: Version
     dependencies: List[Requirement]
 
 
 # Shorthands
 PackageSet = Dict[NormalizedName, PackageDetails]
 Missing = Tuple[NormalizedName, Requirement]
-Conflicting = Tuple[NormalizedName, DistributionVersion, Requirement]
+Conflicting = Tuple[NormalizedName, Version, Requirement]
 
 MissingDict = Dict[NormalizedName, List[Missing]]
 ConflictingDict = Dict[NormalizedName, List[Conflicting]]
@@ -60,8 +57,6 @@ def check_package_set(
     package name and returns a boolean.
     """
 
-    warn_legacy_versions_and_specifiers(package_set)
-
     missing = {}
     conflicting = {}
 
@@ -152,36 +147,3 @@ def _create_whitelist(
                 break
 
     return packages_affected
-
-
-def warn_legacy_versions_and_specifiers(package_set: PackageSet) -> None:
-    for project_name, package_details in package_set.items():
-        if isinstance(package_details.version, LegacyVersion):
-            deprecated(
-                reason=(
-                    f"{project_name} {package_details.version} "
-                    f"has a non-standard version number."
-                ),
-                replacement=(
-                    f"to upgrade to a newer version of {project_name} "
-                    f"or contact the author to suggest that they "
-                    f"release a version with a conforming version number"
-                ),
-                issue=12063,
-                gone_in="24.1",
-            )
-        for dep in package_details.dependencies:
-            if any(isinstance(spec, LegacySpecifier) for spec in dep.specifier):
-                deprecated(
-                    reason=(
-                        f"{project_name} {package_details.version} "
-                        f"has a non-standard dependency specifier {dep}."
-                    ),
-                    replacement=(
-                        f"to upgrade to a newer version of {project_name} "
-                        f"or contact the author to suggest that they "
-                        f"release a version with a conforming dependency specifiers"
-                    ),
-                    issue=12063,
-                    gone_in="24.1",
-                )
diff --git a/src/pip/_internal/req/req_set.py b/src/pip/_internal/req/req_set.py
index bf36114e802..ec7a6e07a25 100644
--- a/src/pip/_internal/req/req_set.py
+++ b/src/pip/_internal/req/req_set.py
@@ -2,12 +2,9 @@
 from collections import OrderedDict
 from typing import Dict, List
 
-from pip._vendor.packaging.specifiers import LegacySpecifier
 from pip._vendor.packaging.utils import canonicalize_name
-from pip._vendor.packaging.version import LegacyVersion
 
 from pip._internal.req.req_install import InstallRequirement
-from pip._internal.utils.deprecation import deprecated
 
 logger = logging.getLogger(__name__)
 
@@ -83,37 +80,3 @@ def requirements_to_install(self) -> List[InstallRequirement]:
             for install_req in self.all_requirements
             if not install_req.constraint and not install_req.satisfied_by
         ]
-
-    def warn_legacy_versions_and_specifiers(self) -> None:
-        for req in self.requirements_to_install:
-            version = req.get_dist().version
-            if isinstance(version, LegacyVersion):
-                deprecated(
-                    reason=(
-                        f"pip has selected the non standard version {version} "
-                        f"of {req}. In the future this version will be "
-                        f"ignored as it isn't standard compliant."
-                    ),
-                    replacement=(
-                        "set or update constraints to select another version "
-                        "or contact the package author to fix the version number"
-                    ),
-                    issue=12063,
-                    gone_in="24.1",
-                )
-            for dep in req.get_dist().iter_dependencies():
-                if any(isinstance(spec, LegacySpecifier) for spec in dep.specifier):
-                    deprecated(
-                        reason=(
-                            f"pip has selected {req} {version} which has non "
-                            f"standard dependency specifier {dep}. "
-                            f"In the future this version of {req} will be "
-                            f"ignored as it isn't standard compliant."
-                        ),
-                        replacement=(
-                            "set or update constraints to select another version "
-                            "or contact the package author to fix the version number"
-                        ),
-                        issue=12063,
-                        gone_in="24.1",
-                    )
diff --git a/src/pip/_internal/resolution/resolvelib/base.py b/src/pip/_internal/resolution/resolvelib/base.py
index 4269c7fbecc..0f31dc9b307 100644
--- a/src/pip/_internal/resolution/resolvelib/base.py
+++ b/src/pip/_internal/resolution/resolvelib/base.py
@@ -1,16 +1,15 @@
 from dataclasses import dataclass
-from typing import FrozenSet, Iterable, Optional, Tuple, Union
+from typing import FrozenSet, Iterable, Optional, Tuple
 
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName
-from pip._vendor.packaging.version import LegacyVersion, Version
+from pip._vendor.packaging.version import Version
 
 from pip._internal.models.link import Link, links_equivalent
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.hashes import Hashes
 
 CandidateLookup = Tuple[Optional["Candidate"], Optional[InstallRequirement]]
-CandidateVersion = Union[LegacyVersion, Version]
 
 
 def format_name(project: NormalizedName, extras: FrozenSet[NormalizedName]) -> str:
@@ -115,7 +114,7 @@ def name(self) -> str:
         raise NotImplementedError("Override in subclass")
 
     @property
-    def version(self) -> CandidateVersion:
+    def version(self) -> Version:
         raise NotImplementedError("Override in subclass")
 
     @property
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 019ff60a0a5..029b26a3368 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -21,7 +21,7 @@
 from pip._internal.utils.direct_url_helpers import direct_url_from_link
 from pip._internal.utils.misc import normalize_version_info
 
-from .base import Candidate, CandidateVersion, Requirement, format_name
+from .base import Candidate, Requirement, format_name
 
 if TYPE_CHECKING:
     from .factory import Factory
@@ -145,7 +145,7 @@ def __init__(
         ireq: InstallRequirement,
         factory: "Factory",
         name: Optional[NormalizedName] = None,
-        version: Optional[CandidateVersion] = None,
+        version: Optional[Version] = None,
     ) -> None:
         self._link = link
         self._source_link = source_link
@@ -190,7 +190,7 @@ def name(self) -> str:
         return self.project_name
 
     @property
-    def version(self) -> CandidateVersion:
+    def version(self) -> Version:
         if self._version is None:
             self._version = self.dist.version
         return self._version
@@ -257,7 +257,7 @@ def __init__(
         template: InstallRequirement,
         factory: "Factory",
         name: Optional[NormalizedName] = None,
-        version: Optional[CandidateVersion] = None,
+        version: Optional[Version] = None,
     ) -> None:
         source_link = link
         cache_entry = factory.get_wheel_cache_entry(source_link, name)
@@ -314,7 +314,7 @@ def __init__(
         template: InstallRequirement,
         factory: "Factory",
         name: Optional[NormalizedName] = None,
-        version: Optional[CandidateVersion] = None,
+        version: Optional[Version] = None,
     ) -> None:
         super().__init__(
             link=link,
@@ -374,7 +374,7 @@ def name(self) -> str:
         return self.project_name
 
     @property
-    def version(self) -> CandidateVersion:
+    def version(self) -> Version:
         if self._version is None:
             self._version = self.dist.version
         return self._version
@@ -473,7 +473,7 @@ def name(self) -> str:
         return format_name(self.base.project_name, self.extras)
 
     @property
-    def version(self) -> CandidateVersion:
+    def version(self) -> Version:
         return self.base.version
 
     def format_for_error(self) -> str:
@@ -588,7 +588,7 @@ def name(self) -> str:
         return REQUIRES_PYTHON_IDENTIFIER
 
     @property
-    def version(self) -> CandidateVersion:
+    def version(self) -> Version:
         return self._version
 
     def format_for_error(self) -> str:
diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
index e36df15d459..6de5d698e16 100644
--- a/src/pip/_internal/resolution/resolvelib/factory.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -23,6 +23,7 @@
 from pip._vendor.packaging.requirements import InvalidRequirement
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
+from pip._vendor.packaging.version import Version
 from pip._vendor.resolvelib import ResolutionImpossible
 
 from pip._internal.cache import CacheEntry, WheelCache
@@ -52,7 +53,7 @@
 from pip._internal.utils.packaging import get_requirement
 from pip._internal.utils.virtualenv import running_under_virtualenv
 
-from .base import Candidate, CandidateVersion, Constraint, Requirement
+from .base import Candidate, Constraint, Requirement
 from .candidates import (
     AlreadyInstalledCandidate,
     BaseCandidate,
@@ -178,7 +179,7 @@ def _make_candidate_from_link(
         extras: FrozenSet[str],
         template: InstallRequirement,
         name: Optional[NormalizedName],
-        version: Optional[CandidateVersion],
+        version: Optional[Version],
     ) -> Optional[Candidate]:
         base: Optional[BaseCandidate] = self._make_base_candidate_from_link(
             link, template, name, version
@@ -192,7 +193,7 @@ def _make_base_candidate_from_link(
         link: Link,
         template: InstallRequirement,
         name: Optional[NormalizedName],
-        version: Optional[CandidateVersion],
+        version: Optional[Version],
     ) -> Optional[BaseCandidate]:
         # TODO: Check already installed candidate, and use it if the link and
         # editable flag match.
@@ -670,8 +671,8 @@ def _report_single_requirement_conflict(
         cands = self._finder.find_all_candidates(req.project_name)
         skipped_by_requires_python = self._finder.requires_python_skipped_reasons()
 
-        versions_set: Set[CandidateVersion] = set()
-        yanked_versions_set: Set[CandidateVersion] = set()
+        versions_set: Set[Version] = set()
+        yanked_versions_set: Set[Version] = set()
         for c in cands:
             is_yanked = c.link.is_yanked if c.link else False
             if is_yanked:
diff --git a/src/pip/_internal/self_outdated_check.py b/src/pip/_internal/self_outdated_check.py
index 0f64ae0e614..2185f2fb108 100644
--- a/src/pip/_internal/self_outdated_check.py
+++ b/src/pip/_internal/self_outdated_check.py
@@ -9,6 +9,7 @@
 from dataclasses import dataclass
 from typing import Any, Callable, Dict, Optional
 
+from pip._vendor.packaging.version import Version
 from pip._vendor.packaging.version import parse as parse_version
 from pip._vendor.rich.console import Group
 from pip._vendor.rich.markup import escape
@@ -17,7 +18,6 @@
 from pip._internal.index.collector import LinkCollector
 from pip._internal.index.package_finder import PackageFinder
 from pip._internal.metadata import get_default_environment
-from pip._internal.metadata.base import DistributionVersion
 from pip._internal.models.selection_prefs import SelectionPreferences
 from pip._internal.network.session import PipSession
 from pip._internal.utils.compat import WINDOWS
@@ -191,7 +191,7 @@ def _self_version_check_logic(
     *,
     state: SelfCheckState,
     current_time: datetime.datetime,
-    local_version: DistributionVersion,
+    local_version: Version,
     get_remote_version: Callable[[], Optional[str]],
 ) -> Optional[UpgradePrompt]:
     remote_version_str = state.get(current_time)
diff --git a/src/pip/_vendor/packaging/__about__.py b/src/pip/_vendor/packaging/__about__.py
deleted file mode 100644
index 3551bc2d298..00000000000
--- a/src/pip/_vendor/packaging/__about__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-__all__ = [
-    "__title__",
-    "__summary__",
-    "__uri__",
-    "__version__",
-    "__author__",
-    "__email__",
-    "__license__",
-    "__copyright__",
-]
-
-__title__ = "packaging"
-__summary__ = "Core utilities for Python packages"
-__uri__ = "https://github.com/pypa/packaging"
-
-__version__ = "21.3"
-
-__author__ = "Donald Stufft and individual contributors"
-__email__ = "donald@stufft.io"
-
-__license__ = "BSD-2-Clause or Apache-2.0"
-__copyright__ = "2014-2019 %s" % __author__
diff --git a/src/pip/_vendor/packaging/__init__.py b/src/pip/_vendor/packaging/__init__.py
index 3c50c5dcfee..22809cfd5dc 100644
--- a/src/pip/_vendor/packaging/__init__.py
+++ b/src/pip/_vendor/packaging/__init__.py
@@ -2,24 +2,14 @@
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
 
-from .__about__ import (
-    __author__,
-    __copyright__,
-    __email__,
-    __license__,
-    __summary__,
-    __title__,
-    __uri__,
-    __version__,
-)
+__title__ = "packaging"
+__summary__ = "Core utilities for Python packages"
+__uri__ = "https://github.com/pypa/packaging"
 
-__all__ = [
-    "__title__",
-    "__summary__",
-    "__uri__",
-    "__version__",
-    "__author__",
-    "__email__",
-    "__license__",
-    "__copyright__",
-]
+__version__ = "23.2"
+
+__author__ = "Donald Stufft and individual contributors"
+__email__ = "donald@stufft.io"
+
+__license__ = "BSD-2-Clause or Apache-2.0"
+__copyright__ = "2014 %s" % __author__
diff --git a/src/pip/_vendor/packaging/_elffile.py b/src/pip/_vendor/packaging/_elffile.py
new file mode 100644
index 00000000000..6fb19b30bb5
--- /dev/null
+++ b/src/pip/_vendor/packaging/_elffile.py
@@ -0,0 +1,108 @@
+"""
+ELF file parser.
+
+This provides a class ``ELFFile`` that parses an ELF executable in a similar
+interface to ``ZipFile``. Only the read interface is implemented.
+
+Based on: https://gist.github.com/lyssdod/f51579ae8d93c8657a5564aefc2ffbca
+ELF header: https://refspecs.linuxfoundation.org/elf/gabi4+/ch4.eheader.html
+"""
+
+import enum
+import os
+import struct
+from typing import IO, Optional, Tuple
+
+
+class ELFInvalid(ValueError):
+    pass
+
+
+class EIClass(enum.IntEnum):
+    C32 = 1
+    C64 = 2
+
+
+class EIData(enum.IntEnum):
+    Lsb = 1
+    Msb = 2
+
+
+class EMachine(enum.IntEnum):
+    I386 = 3
+    S390 = 22
+    Arm = 40
+    X8664 = 62
+    AArc64 = 183
+
+
+class ELFFile:
+    """
+    Representation of an ELF executable.
+    """
+
+    def __init__(self, f: IO[bytes]) -> None:
+        self._f = f
+
+        try:
+            ident = self._read("16B")
+        except struct.error:
+            raise ELFInvalid("unable to parse identification")
+        magic = bytes(ident[:4])
+        if magic != b"\x7fELF":
+            raise ELFInvalid(f"invalid magic: {magic!r}")
+
+        self.capacity = ident[4]  # Format for program header (bitness).
+        self.encoding = ident[5]  # Data structure encoding (endianness).
+
+        try:
+            # e_fmt: Format for program header.
+            # p_fmt: Format for section header.
+            # p_idx: Indexes to find p_type, p_offset, and p_filesz.
+            e_fmt, self._p_fmt, self._p_idx = {
+                (1, 1): ("HHIIIIIHHH", ">IIIIIIII", (0, 1, 4)),  # 32-bit MSB.
+                (2, 1): ("HHIQQQIHHH", ">IIQQQQQQ", (0, 2, 5)),  # 64-bit MSB.
+            }[(self.capacity, self.encoding)]
+        except KeyError:
+            raise ELFInvalid(
+                f"unrecognized capacity ({self.capacity}) or "
+                f"encoding ({self.encoding})"
+            )
+
+        try:
+            (
+                _,
+                self.machine,  # Architecture type.
+                _,
+                _,
+                self._e_phoff,  # Offset of program header.
+                _,
+                self.flags,  # Processor-specific flags.
+                _,
+                self._e_phentsize,  # Size of section.
+                self._e_phnum,  # Number of sections.
+            ) = self._read(e_fmt)
+        except struct.error as e:
+            raise ELFInvalid("unable to parse machine and section information") from e
+
+    def _read(self, fmt: str) -> Tuple[int, ...]:
+        return struct.unpack(fmt, self._f.read(struct.calcsize(fmt)))
+
+    @property
+    def interpreter(self) -> Optional[str]:
+        """
+        The path recorded in the ``PT_INTERP`` section header.
+        """
+        for index in range(self._e_phnum):
+            self._f.seek(self._e_phoff + self._e_phentsize * index)
+            try:
+                data = self._read(self._p_fmt)
+            except struct.error:
+                continue
+            if data[self._p_idx[0]] != 3:  # Not PT_INTERP.
+                continue
+            self._f.seek(data[self._p_idx[1]])
+            return os.fsdecode(self._f.read(data[self._p_idx[2]])).strip("\0")
+        return None
diff --git a/src/pip/_vendor/packaging/_manylinux.py b/src/pip/_vendor/packaging/_manylinux.py
index 4c379aa6f69..3705d50db91 100644
--- a/src/pip/_vendor/packaging/_manylinux.py
+++ b/src/pip/_vendor/packaging/_manylinux.py
@@ -1,122 +1,62 @@
 import collections
+import contextlib
 import functools
 import os
 import re
-import struct
 import sys
 import warnings
-from typing import IO, Dict, Iterator, NamedTuple, Optional, Tuple
-
-
-# Python does not provide platform information at sufficient granularity to
-# identify the architecture of the running executable in some cases, so we
-# determine it dynamically by reading the information from the running
-# process. This only applies on Linux, which uses the ELF format.
-class _ELFFileHeader:
-    # https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
-    class _InvalidELFFileHeader(ValueError):
-        """
-        An invalid ELF file header was found.
-        """
-
-    ELF_MAGIC_NUMBER = 0x7F454C46
-    ELFCLASS32 = 1
-    ELFCLASS64 = 2
-    ELFDATA2LSB = 1
-    ELFDATA2MSB = 2
-    EM_386 = 3
-    EM_S390 = 22
-    EM_ARM = 40
-    EM_X86_64 = 62
-    EF_ARM_ABIMASK = 0xFF000000
-    EF_ARM_ABI_VER5 = 0x05000000
-    EF_ARM_ABI_FLOAT_HARD = 0x00000400
-
-    def __init__(self, file: IO[bytes]) -> None:
-        def unpack(fmt: str) -> int:
-            try:
-                data = file.read(struct.calcsize(fmt))
-                result: Tuple[int, ...] = struct.unpack(fmt, data)
-            except struct.error:
-                raise _ELFFileHeader._InvalidELFFileHeader()
-            return result[0]
-
-        self.e_ident_magic = unpack(">I")
-        if self.e_ident_magic != self.ELF_MAGIC_NUMBER:
-            raise _ELFFileHeader._InvalidELFFileHeader()
-        self.e_ident_class = unpack("B")
-        if self.e_ident_class not in {self.ELFCLASS32, self.ELFCLASS64}:
-            raise _ELFFileHeader._InvalidELFFileHeader()
-        self.e_ident_data = unpack("B")
-        if self.e_ident_data not in {self.ELFDATA2LSB, self.ELFDATA2MSB}:
-            raise _ELFFileHeader._InvalidELFFileHeader()
-        self.e_ident_version = unpack("B")
-        self.e_ident_osabi = unpack("B")
-        self.e_ident_abiversion = unpack("B")
-        self.e_ident_pad = file.read(7)
-        format_h = "H"
-        format_i = "I"
-        format_q = "Q"
-        format_p = format_i if self.e_ident_class == self.ELFCLASS32 else format_q
-        self.e_type = unpack(format_h)
-        self.e_machine = unpack(format_h)
-        self.e_version = unpack(format_i)
-        self.e_entry = unpack(format_p)
-        self.e_phoff = unpack(format_p)
-        self.e_shoff = unpack(format_p)
-        self.e_flags = unpack(format_i)
-        self.e_ehsize = unpack(format_h)
-        self.e_phentsize = unpack(format_h)
-        self.e_phnum = unpack(format_h)
-        self.e_shentsize = unpack(format_h)
-        self.e_shnum = unpack(format_h)
-        self.e_shstrndx = unpack(format_h)
-
-
-def _get_elf_header() -> Optional[_ELFFileHeader]:
+from typing import Dict, Generator, Iterator, NamedTuple, Optional, Sequence, Tuple
+
+from ._elffile import EIClass, EIData, ELFFile, EMachine
+
+EF_ARM_ABIMASK = 0xFF000000
+EF_ARM_ABI_VER5 = 0x05000000
+EF_ARM_ABI_FLOAT_HARD = 0x00000400
+
+
+# `os.PathLike` not a generic type until Python 3.9, so sticking with `str`
+# as the type for `path` until then.
+@contextlib.contextmanager
+def _parse_elf(path: str) -> Generator[Optional[ELFFile], None, None]:
     try:
-        with open(sys.executable, "rb") as f:
-            elf_header = _ELFFileHeader(f)
-    except (OSError, TypeError, _ELFFileHeader._InvalidELFFileHeader):
-        return None
-    return elf_header
+        with open(path, "rb") as f:
+            yield ELFFile(f)
+    except (OSError, TypeError, ValueError):
+        yield None
 
 
-def _is_linux_armhf() -> bool:
+def _is_linux_armhf(executable: str) -> bool:
     # hard-float ABI can be detected from the ELF header of the running
     # process
     # https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
-    elf_header = _get_elf_header()
-    if elf_header is None:
-        return False
-    result = elf_header.e_ident_class == elf_header.ELFCLASS32
-    result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB
-    result &= elf_header.e_machine == elf_header.EM_ARM
-    result &= (
-        elf_header.e_flags & elf_header.EF_ARM_ABIMASK
-    ) == elf_header.EF_ARM_ABI_VER5
-    result &= (
-        elf_header.e_flags & elf_header.EF_ARM_ABI_FLOAT_HARD
-    ) == elf_header.EF_ARM_ABI_FLOAT_HARD
-    return result
-
-
-def _is_linux_i686() -> bool:
-    elf_header = _get_elf_header()
-    if elf_header is None:
-        return False
-    result = elf_header.e_ident_class == elf_header.ELFCLASS32
-    result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB
-    result &= elf_header.e_machine == elf_header.EM_386
-    return result
+    with _parse_elf(executable) as f:
+        return (
+            f is not None
+            and f.capacity == EIClass.C32
+            and f.encoding == EIData.Lsb
+            and f.machine == EMachine.Arm
+            and f.flags & EF_ARM_ABIMASK == EF_ARM_ABI_VER5
+            and f.flags & EF_ARM_ABI_FLOAT_HARD == EF_ARM_ABI_FLOAT_HARD
+        )
+
+
+def _is_linux_i686(executable: str) -> bool:
+    with _parse_elf(executable) as f:
+        return (
+            f is not None
+            and f.capacity == EIClass.C32
+            and f.encoding == EIData.Lsb
+            and f.machine == EMachine.I386
+        )
 
 
-def _have_compatible_abi(arch: str) -> bool:
-    if arch == "armv7l":
-        return _is_linux_armhf()
-    if arch == "i686":
-        return _is_linux_i686()
-    return arch in {"x86_64", "aarch64", "ppc64", "ppc64le", "s390x"}
+def _have_compatible_abi(executable: str, archs: Sequence[str]) -> bool:
+    if "armv7l" in archs:
+        return _is_linux_armhf(executable)
+    if "i686" in archs:
+        return _is_linux_i686(executable)
+    allowed_archs = {"x86_64", "aarch64", "ppc64", "ppc64le", "s390x", "loongarch64"}
+    return any(arch in allowed_archs for arch in archs)
 
 
 # If glibc ever changes its major version, we need to know what the last
@@ -141,10 +81,10 @@ def _glibc_version_string_confstr() -> Optional[str]:
     # platform module.
     # https://github.com/python/cpython/blob/fcf1d003bf4f0100c/Lib/platform.py#L175-L183
     try:
-        # os.confstr("CS_GNU_LIBC_VERSION") returns a string like "glibc 2.17".
-        version_string = os.confstr("CS_GNU_LIBC_VERSION")
+        # Should be a string like "glibc 2.17".
+        version_string: str = getattr(os, "confstr")("CS_GNU_LIBC_VERSION")
         assert version_string is not None
-        _, version = version_string.split()
+        _, version = version_string.rsplit()
     except (AssertionError, AttributeError, OSError, ValueError):
         # os.confstr() or CS_GNU_LIBC_VERSION not available (or a bad value)...
         return None
@@ -211,8 +151,8 @@ def _parse_glibc_version(version_str: str) -> Tuple[int, int]:
     m = re.match(r"(?P[0-9]+)\.(?P[0-9]+)", version_str)
     if not m:
         warnings.warn(
-            "Expected glibc version with 2 components major.minor,"
-            " got: %s" % version_str,
+            f"Expected glibc version with 2 components major.minor,"
+            f" got: {version_str}",
             RuntimeWarning,
         )
         return -1, -1
@@ -228,7 +168,7 @@ def _get_glibc_version() -> Tuple[int, int]:
 
 
 # From PEP 513, PEP 600
-def _is_compatible(name: str, arch: str, version: _GLibCVersion) -> bool:
+def _is_compatible(arch: str, version: _GLibCVersion) -> bool:
     sys_glibc = _get_glibc_version()
     if sys_glibc < version:
         return False
@@ -264,12 +204,22 @@ def _is_compatible(name: str, arch: str, version: _GLibCVersion) -> bool:
 }
 
 
-def platform_tags(linux: str, arch: str) -> Iterator[str]:
-    if not _have_compatible_abi(arch):
+def platform_tags(archs: Sequence[str]) -> Iterator[str]:
+    """Generate manylinux tags compatible to the current platform.
+
+    :param archs: Sequence of compatible architectures.
+        The first one shall be the closest to the actual architecture and be the part of
+        platform tag after the ``linux_`` prefix, e.g. ``x86_64``.
+        The ``linux_`` prefix is assumed as a prerequisite for the current platform to
+        be manylinux-compatible.
+
+    :returns: An iterator of compatible manylinux tags.
+    """
+    if not _have_compatible_abi(sys.executable, archs):
         return
     # Oldest glibc to be supported regardless of architecture is (2, 17).
     too_old_glibc2 = _GLibCVersion(2, 16)
-    if arch in {"x86_64", "i686"}:
+    if set(archs) & {"x86_64", "i686"}:
         # On x86/i686 also oldest glibc to be supported is (2, 5).
         too_old_glibc2 = _GLibCVersion(2, 4)
     current_glibc = _GLibCVersion(*_get_glibc_version())
@@ -283,19 +233,20 @@ def platform_tags(linux: str, arch: str) -> Iterator[str]:
     for glibc_major in range(current_glibc.major - 1, 1, -1):
         glibc_minor = _LAST_GLIBC_MINOR[glibc_major]
         glibc_max_list.append(_GLibCVersion(glibc_major, glibc_minor))
-    for glibc_max in glibc_max_list:
-        if glibc_max.major == too_old_glibc2.major:
-            min_minor = too_old_glibc2.minor
-        else:
-            # For other glibc major versions oldest supported is (x, 0).
-            min_minor = -1
-        for glibc_minor in range(glibc_max.minor, min_minor, -1):
-            glibc_version = _GLibCVersion(glibc_max.major, glibc_minor)
-            tag = "manylinux_{}_{}".format(*glibc_version)
-            if _is_compatible(tag, arch, glibc_version):
-                yield linux.replace("linux", tag)
-            # Handle the legacy manylinux1, manylinux2010, manylinux2014 tags.
-            if glibc_version in _LEGACY_MANYLINUX_MAP:
-                legacy_tag = _LEGACY_MANYLINUX_MAP[glibc_version]
-                if _is_compatible(legacy_tag, arch, glibc_version):
-                    yield linux.replace("linux", legacy_tag)
+    for arch in archs:
+        for glibc_max in glibc_max_list:
+            if glibc_max.major == too_old_glibc2.major:
+                min_minor = too_old_glibc2.minor
+            else:
+                # For other glibc major versions oldest supported is (x, 0).
+                min_minor = -1
+            for glibc_minor in range(glibc_max.minor, min_minor, -1):
+                glibc_version = _GLibCVersion(glibc_max.major, glibc_minor)
+                tag = "manylinux_{}_{}".format(*glibc_version)
+                if _is_compatible(arch, glibc_version):
+                    yield f"{tag}_{arch}"
+                # Handle the legacy manylinux1, manylinux2010, manylinux2014 tags.
+                if glibc_version in _LEGACY_MANYLINUX_MAP:
+                    legacy_tag = _LEGACY_MANYLINUX_MAP[glibc_version]
+                    if _is_compatible(arch, glibc_version):
+                        yield f"{legacy_tag}_{arch}"
diff --git a/src/pip/_vendor/packaging/_musllinux.py b/src/pip/_vendor/packaging/_musllinux.py
index 8ac3059ba3c..86419df9d70 100644
--- a/src/pip/_vendor/packaging/_musllinux.py
+++ b/src/pip/_vendor/packaging/_musllinux.py
@@ -4,68 +4,13 @@
 linked against musl, and what musl version is used.
 """
 
-import contextlib
 import functools
-import operator
-import os
 import re
-import struct
 import subprocess
 import sys
-from typing import IO, Iterator, NamedTuple, Optional, Tuple
+from typing import Iterator, NamedTuple, Optional, Sequence
 
-
-def _read_unpacked(f: IO[bytes], fmt: str) -> Tuple[int, ...]:
-    return struct.unpack(fmt, f.read(struct.calcsize(fmt)))
-
-
-def _parse_ld_musl_from_elf(f: IO[bytes]) -> Optional[str]:
-    """Detect musl libc location by parsing the Python executable.
-
-    Based on: https://gist.github.com/lyssdod/f51579ae8d93c8657a5564aefc2ffbca
-    ELF header: https://refspecs.linuxfoundation.org/elf/gabi4+/ch4.eheader.html
-    """
-    f.seek(0)
-    try:
-        ident = _read_unpacked(f, "16B")
-    except struct.error:
-        return None
-    if ident[:4] != tuple(b"\x7fELF"):  # Invalid magic, not ELF.
-        return None
-    f.seek(struct.calcsize("HHI"), 1)  # Skip file type, machine, and version.
-
-    try:
-        # e_fmt: Format for program header.
-        # p_fmt: Format for section header.
-        # p_idx: Indexes to find p_type, p_offset, and p_filesz.
-        e_fmt, p_fmt, p_idx = {
-            1: ("IIIIHHH", "IIIIIIII", (0, 1, 4)),  # 32-bit.
-            2: ("QQQIHHH", "IIQQQQQQ", (0, 2, 5)),  # 64-bit.
-        }[ident[4]]
-    except KeyError:
-        return None
-    else:
-        p_get = operator.itemgetter(*p_idx)
-
-    # Find the interpreter section and return its content.
-    try:
-        _, e_phoff, _, _, _, e_phentsize, e_phnum = _read_unpacked(f, e_fmt)
-    except struct.error:
-        return None
-    for i in range(e_phnum + 1):
-        f.seek(e_phoff + e_phentsize * i)
-        try:
-            p_type, p_offset, p_filesz = p_get(_read_unpacked(f, p_fmt))
-        except struct.error:
-            return None
-        if p_type != 3:  # Not PT_INTERP.
-            continue
-        f.seek(p_offset)
-        interpreter = os.fsdecode(f.read(p_filesz)).strip("\0")
-        if "musl" not in interpreter:
-            return None
-        return interpreter
-    return None
+from ._elffile import ELFFile
 
 
 class _MuslVersion(NamedTuple):
@@ -95,32 +40,34 @@ def _get_musl_version(executable: str) -> Optional[_MuslVersion]:
         Version 1.2.2
         Dynamic Program Loader
     """
-    with contextlib.ExitStack() as stack:
-        try:
-            f = stack.enter_context(open(executable, "rb"))
-        except OSError:
-            return None
-        ld = _parse_ld_musl_from_elf(f)
-    if not ld:
+    try:
+        with open(executable, "rb") as f:
+            ld = ELFFile(f).interpreter
+    except (OSError, TypeError, ValueError):
+        return None
+    if ld is None or "musl" not in ld:
         return None
-    proc = subprocess.run([ld], stderr=subprocess.PIPE, universal_newlines=True)
+    proc = subprocess.run([ld], stderr=subprocess.PIPE, text=True)
     return _parse_musl_version(proc.stderr)
 
 
-def platform_tags(arch: str) -> Iterator[str]:
+def platform_tags(archs: Sequence[str]) -> Iterator[str]:
     """Generate musllinux tags compatible to the current platform.
 
-    :param arch: Should be the part of platform tag after the ``linux_``
-        prefix, e.g. ``x86_64``. The ``linux_`` prefix is assumed as a
-        prerequisite for the current platform to be musllinux-compatible.
+    :param archs: Sequence of compatible architectures.
+        The first one shall be the closest to the actual architecture and be the part of
+        platform tag after the ``linux_`` prefix, e.g. ``x86_64``.
+        The ``linux_`` prefix is assumed as a prerequisite for the current platform to
+        be musllinux-compatible.
 
     :returns: An iterator of compatible musllinux tags.
     """
     sys_musl = _get_musl_version(sys.executable)
     if sys_musl is None:  # Python not dynamically linked against musl.
         return
-    for minor in range(sys_musl.minor, -1, -1):
-        yield f"musllinux_{sys_musl.major}_{minor}_{arch}"
+    for arch in archs:
+        for minor in range(sys_musl.minor, -1, -1):
+            yield f"musllinux_{sys_musl.major}_{minor}_{arch}"
 
 
 if __name__ == "__main__":  # pragma: no cover
diff --git a/src/pip/_vendor/packaging/_parser.py b/src/pip/_vendor/packaging/_parser.py
new file mode 100644
index 00000000000..4576981c2dd
--- /dev/null
+++ b/src/pip/_vendor/packaging/_parser.py
@@ -0,0 +1,359 @@
+"""Handwritten parser of dependency specifiers.
+
+The docstring for each __parse_* function contains ENBF-inspired grammar representing
+the implementation.
+"""
+
+import ast
+from typing import Any, List, NamedTuple, Optional, Tuple, Union
+
+from ._tokenizer import DEFAULT_RULES, Tokenizer
+
+
+class Node:
+    def __init__(self, value: str) -> None:
+        self.value = value
+
+    def __str__(self) -> str:
+        return self.value
+
+    def __repr__(self) -> str:
+        return f"<{self.__class__.__name__}('{self}')>"
+
+    def serialize(self) -> str:
+        raise NotImplementedError
+
+
+class Variable(Node):
+    def serialize(self) -> str:
+        return str(self)
+
+
+class Value(Node):
+    def serialize(self) -> str:
+        return f'"{self}"'
+
+
+class Op(Node):
+    def serialize(self) -> str:
+        return str(self)
+
+
+MarkerVar = Union[Variable, Value]
+MarkerItem = Tuple[MarkerVar, Op, MarkerVar]
+# MarkerAtom = Union[MarkerItem, List["MarkerAtom"]]
+# MarkerList = List[Union["MarkerList", MarkerAtom, str]]
+# mypy does not support recursive type definition
+# https://github.com/python/mypy/issues/731
+MarkerAtom = Any
+MarkerList = List[Any]
+
+
+class ParsedRequirement(NamedTuple):
+    name: str
+    url: str
+    extras: List[str]
+    specifier: str
+    marker: Optional[MarkerList]
+
+
+# --------------------------------------------------------------------------------------
+# Recursive descent parser for dependency specifier
+# --------------------------------------------------------------------------------------
+def parse_requirement(source: str) -> ParsedRequirement:
+    return _parse_requirement(Tokenizer(source, rules=DEFAULT_RULES))
+
+
+def _parse_requirement(tokenizer: Tokenizer) -> ParsedRequirement:
+    """
+    requirement = WS? IDENTIFIER WS? extras WS? requirement_details
+    """
+    tokenizer.consume("WS")
+
+    name_token = tokenizer.expect(
+        "IDENTIFIER", expected="package name at the start of dependency specifier"
+    )
+    name = name_token.text
+    tokenizer.consume("WS")
+
+    extras = _parse_extras(tokenizer)
+    tokenizer.consume("WS")
+
+    url, specifier, marker = _parse_requirement_details(tokenizer)
+    tokenizer.expect("END", expected="end of dependency specifier")
+
+    return ParsedRequirement(name, url, extras, specifier, marker)
+
+
+def _parse_requirement_details(
+    tokenizer: Tokenizer,
+) -> Tuple[str, str, Optional[MarkerList]]:
+    """
+    requirement_details = AT URL (WS requirement_marker?)?
+                        | specifier WS? (requirement_marker)?
+    """
+
+    specifier = ""
+    url = ""
+    marker = None
+
+    if tokenizer.check("AT"):
+        tokenizer.read()
+        tokenizer.consume("WS")
+
+        url_start = tokenizer.position
+        url = tokenizer.expect("URL", expected="URL after @").text
+        if tokenizer.check("END", peek=True):
+            return (url, specifier, marker)
+
+        tokenizer.expect("WS", expected="whitespace after URL")
+
+        # The input might end after whitespace.
+        if tokenizer.check("END", peek=True):
+            return (url, specifier, marker)
+
+        marker = _parse_requirement_marker(
+            tokenizer, span_start=url_start, after="URL and whitespace"
+        )
+    else:
+        specifier_start = tokenizer.position
+        specifier = _parse_specifier(tokenizer)
+        tokenizer.consume("WS")
+
+        if tokenizer.check("END", peek=True):
+            return (url, specifier, marker)
+
+        marker = _parse_requirement_marker(
+            tokenizer,
+            span_start=specifier_start,
+            after=(
+                "version specifier"
+                if specifier
+                else "name and no valid version specifier"
+            ),
+        )
+
+    return (url, specifier, marker)
+
+
+def _parse_requirement_marker(
+    tokenizer: Tokenizer, *, span_start: int, after: str
+) -> MarkerList:
+    """
+    requirement_marker = SEMICOLON marker WS?
+    """
+
+    if not tokenizer.check("SEMICOLON"):
+        tokenizer.raise_syntax_error(
+            f"Expected end or semicolon (after {after})",
+            span_start=span_start,
+        )
+    tokenizer.read()
+
+    marker = _parse_marker(tokenizer)
+    tokenizer.consume("WS")
+
+    return marker
+
+
+def _parse_extras(tokenizer: Tokenizer) -> List[str]:
+    """
+    extras = (LEFT_BRACKET wsp* extras_list? wsp* RIGHT_BRACKET)?
+    """
+    if not tokenizer.check("LEFT_BRACKET", peek=True):
+        return []
+
+    with tokenizer.enclosing_tokens(
+        "LEFT_BRACKET",
+        "RIGHT_BRACKET",
+        around="extras",
+    ):
+        tokenizer.consume("WS")
+        extras = _parse_extras_list(tokenizer)
+        tokenizer.consume("WS")
+
+    return extras
+
+
+def _parse_extras_list(tokenizer: Tokenizer) -> List[str]:
+    """
+    extras_list = identifier (wsp* ',' wsp* identifier)*
+    """
+    extras: List[str] = []
+
+    if not tokenizer.check("IDENTIFIER"):
+        return extras
+
+    extras.append(tokenizer.read().text)
+
+    while True:
+        tokenizer.consume("WS")
+        if tokenizer.check("IDENTIFIER", peek=True):
+            tokenizer.raise_syntax_error("Expected comma between extra names")
+        elif not tokenizer.check("COMMA"):
+            break
+
+        tokenizer.read()
+        tokenizer.consume("WS")
+
+        extra_token = tokenizer.expect("IDENTIFIER", expected="extra name after comma")
+        extras.append(extra_token.text)
+
+    return extras
+
+
+def _parse_specifier(tokenizer: Tokenizer) -> str:
+    """
+    specifier = LEFT_PARENTHESIS WS? version_many WS? RIGHT_PARENTHESIS
+              | WS? version_many WS?
+    """
+    with tokenizer.enclosing_tokens(
+        "LEFT_PARENTHESIS",
+        "RIGHT_PARENTHESIS",
+        around="version specifier",
+    ):
+        tokenizer.consume("WS")
+        parsed_specifiers = _parse_version_many(tokenizer)
+        tokenizer.consume("WS")
+
+    return parsed_specifiers
+
+
+def _parse_version_many(tokenizer: Tokenizer) -> str:
+    """
+    version_many = (SPECIFIER (WS? COMMA WS? SPECIFIER)*)?
+    """
+    parsed_specifiers = ""
+    while tokenizer.check("SPECIFIER"):
+        span_start = tokenizer.position
+        parsed_specifiers += tokenizer.read().text
+        if tokenizer.check("VERSION_PREFIX_TRAIL", peek=True):
+            tokenizer.raise_syntax_error(
+                ".* suffix can only be used with `==` or `!=` operators",
+                span_start=span_start,
+                span_end=tokenizer.position + 1,
+            )
+        if tokenizer.check("VERSION_LOCAL_LABEL_TRAIL", peek=True):
+            tokenizer.raise_syntax_error(
+                "Local version label can only be used with `==` or `!=` operators",
+                span_start=span_start,
+                span_end=tokenizer.position,
+            )
+        tokenizer.consume("WS")
+        if not tokenizer.check("COMMA"):
+            break
+        parsed_specifiers += tokenizer.read().text
+        tokenizer.consume("WS")
+
+    return parsed_specifiers
+
+
+# --------------------------------------------------------------------------------------
+# Recursive descent parser for marker expression
+# --------------------------------------------------------------------------------------
+def parse_marker(source: str) -> MarkerList:
+    return _parse_full_marker(Tokenizer(source, rules=DEFAULT_RULES))
+
+
+def _parse_full_marker(tokenizer: Tokenizer) -> MarkerList:
+    retval = _parse_marker(tokenizer)
+    tokenizer.expect("END", expected="end of marker expression")
+    return retval
+
+
+def _parse_marker(tokenizer: Tokenizer) -> MarkerList:
+    """
+    marker = marker_atom (BOOLOP marker_atom)+
+    """
+    expression = [_parse_marker_atom(tokenizer)]
+    while tokenizer.check("BOOLOP"):
+        token = tokenizer.read()
+        expr_right = _parse_marker_atom(tokenizer)
+        expression.extend((token.text, expr_right))
+    return expression
+
+
+def _parse_marker_atom(tokenizer: Tokenizer) -> MarkerAtom:
+    """
+    marker_atom = WS? LEFT_PARENTHESIS WS? marker WS? RIGHT_PARENTHESIS WS?
+                | WS? marker_item WS?
+    """
+
+    tokenizer.consume("WS")
+    if tokenizer.check("LEFT_PARENTHESIS", peek=True):
+        with tokenizer.enclosing_tokens(
+            "LEFT_PARENTHESIS",
+            "RIGHT_PARENTHESIS",
+            around="marker expression",
+        ):
+            tokenizer.consume("WS")
+            marker: MarkerAtom = _parse_marker(tokenizer)
+            tokenizer.consume("WS")
+    else:
+        marker = _parse_marker_item(tokenizer)
+    tokenizer.consume("WS")
+    return marker
+
+
+def _parse_marker_item(tokenizer: Tokenizer) -> MarkerItem:
+    """
+    marker_item = WS? marker_var WS? marker_op WS? marker_var WS?
+    """
+    tokenizer.consume("WS")
+    marker_var_left = _parse_marker_var(tokenizer)
+    tokenizer.consume("WS")
+    marker_op = _parse_marker_op(tokenizer)
+    tokenizer.consume("WS")
+    marker_var_right = _parse_marker_var(tokenizer)
+    tokenizer.consume("WS")
+    return (marker_var_left, marker_op, marker_var_right)
+
+
+def _parse_marker_var(tokenizer: Tokenizer) -> MarkerVar:
+    """
+    marker_var = VARIABLE | QUOTED_STRING
+    """
+    if tokenizer.check("VARIABLE"):
+        return process_env_var(tokenizer.read().text.replace(".", "_"))
+    elif tokenizer.check("QUOTED_STRING"):
+        return process_python_str(tokenizer.read().text)
+    else:
+        tokenizer.raise_syntax_error(
+            message="Expected a marker variable or quoted string"
+        )
+
+
+def process_env_var(env_var: str) -> Variable:
+    if (
+        env_var == "platform_python_implementation"
+        or env_var == "python_implementation"
+    ):
+        return Variable("platform_python_implementation")
+    else:
+        return Variable(env_var)
+
+
+def process_python_str(python_str: str) -> Value:
+    value = ast.literal_eval(python_str)
+    return Value(str(value))
+
+
+def _parse_marker_op(tokenizer: Tokenizer) -> Op:
+    """
+    marker_op = IN | NOT IN | OP
+    """
+    if tokenizer.check("IN"):
+        tokenizer.read()
+        return Op("in")
+    elif tokenizer.check("NOT"):
+        tokenizer.read()
+        tokenizer.expect("WS", expected="whitespace after 'not'")
+        tokenizer.expect("IN", expected="'in' after 'not'")
+        return Op("not in")
+    elif tokenizer.check("OP"):
+        return Op(tokenizer.read().text)
+    else:
+        return tokenizer.raise_syntax_error(
+            "Expected marker operator, one of "
+            "<=, <, !=, ==, >=, >, ~=, ===, in, not in"
+        )
diff --git a/src/pip/_vendor/packaging/_tokenizer.py b/src/pip/_vendor/packaging/_tokenizer.py
new file mode 100644
index 00000000000..dd0d648d49a
--- /dev/null
+++ b/src/pip/_vendor/packaging/_tokenizer.py
@@ -0,0 +1,192 @@
+import contextlib
+import re
+from dataclasses import dataclass
+from typing import Dict, Iterator, NoReturn, Optional, Tuple, Union
+
+from .specifiers import Specifier
+
+
+@dataclass
+class Token:
+    name: str
+    text: str
+    position: int
+
+
+class ParserSyntaxError(Exception):
+    """The provided source text could not be parsed correctly."""
+
+    def __init__(
+        self,
+        message: str,
+        *,
+        source: str,
+        span: Tuple[int, int],
+    ) -> None:
+        self.span = span
+        self.message = message
+        self.source = source
+
+        super().__init__()
+
+    def __str__(self) -> str:
+        marker = " " * self.span[0] + "~" * (self.span[1] - self.span[0]) + "^"
+        return "\n    ".join([self.message, self.source, marker])
+
+
+DEFAULT_RULES: "Dict[str, Union[str, re.Pattern[str]]]" = {
+    "LEFT_PARENTHESIS": r"\(",
+    "RIGHT_PARENTHESIS": r"\)",
+    "LEFT_BRACKET": r"\[",
+    "RIGHT_BRACKET": r"\]",
+    "SEMICOLON": r";",
+    "COMMA": r",",
+    "QUOTED_STRING": re.compile(
+        r"""
+            (
+                ('[^']*')
+                |
+                ("[^"]*")
+            )
+        """,
+        re.VERBOSE,
+    ),
+    "OP": r"(===|==|~=|!=|<=|>=|<|>)",
+    "BOOLOP": r"\b(or|and)\b",
+    "IN": r"\bin\b",
+    "NOT": r"\bnot\b",
+    "VARIABLE": re.compile(
+        r"""
+            \b(
+                python_version
+                |python_full_version
+                |os[._]name
+                |sys[._]platform
+                |platform_(release|system)
+                |platform[._](version|machine|python_implementation)
+                |python_implementation
+                |implementation_(name|version)
+                |extra
+            )\b
+        """,
+        re.VERBOSE,
+    ),
+    "SPECIFIER": re.compile(
+        Specifier._operator_regex_str + Specifier._version_regex_str,
+        re.VERBOSE | re.IGNORECASE,
+    ),
+    "AT": r"\@",
+    "URL": r"[^ \t]+",
+    "IDENTIFIER": r"\b[a-zA-Z0-9][a-zA-Z0-9._-]*\b",
+    "VERSION_PREFIX_TRAIL": r"\.\*",
+    "VERSION_LOCAL_LABEL_TRAIL": r"\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*",
+    "WS": r"[ \t]+",
+    "END": r"$",
+}
+
+
+class Tokenizer:
+    """Context-sensitive token parsing.
+
+    Provides methods to examine the input stream to check whether the next token
+    matches.
+    """
+
+    def __init__(
+        self,
+        source: str,
+        *,
+        rules: "Dict[str, Union[str, re.Pattern[str]]]",
+    ) -> None:
+        self.source = source
+        self.rules: Dict[str, re.Pattern[str]] = {
+            name: re.compile(pattern) for name, pattern in rules.items()
+        }
+        self.next_token: Optional[Token] = None
+        self.position = 0
+
+    def consume(self, name: str) -> None:
+        """Move beyond provided token name, if at current position."""
+        if self.check(name):
+            self.read()
+
+    def check(self, name: str, *, peek: bool = False) -> bool:
+        """Check whether the next token has the provided name.
+
+        By default, if the check succeeds, the token *must* be read before
+        another check. If `peek` is set to `True`, the token is not loaded and
+        would need to be checked again.
+        """
+        assert (
+            self.next_token is None
+        ), f"Cannot check for {name!r}, already have {self.next_token!r}"
+        assert name in self.rules, f"Unknown token name: {name!r}"
+
+        expression = self.rules[name]
+
+        match = expression.match(self.source, self.position)
+        if match is None:
+            return False
+        if not peek:
+            self.next_token = Token(name, match[0], self.position)
+        return True
+
+    def expect(self, name: str, *, expected: str) -> Token:
+        """Expect a certain token name next, failing with a syntax error otherwise.
+
+        The token is *not* read.
+        """
+        if not self.check(name):
+            raise self.raise_syntax_error(f"Expected {expected}")
+        return self.read()
+
+    def read(self) -> Token:
+        """Consume the next token and return it."""
+        token = self.next_token
+        assert token is not None
+
+        self.position += len(token.text)
+        self.next_token = None
+
+        return token
+
+    def raise_syntax_error(
+        self,
+        message: str,
+        *,
+        span_start: Optional[int] = None,
+        span_end: Optional[int] = None,
+    ) -> NoReturn:
+        """Raise ParserSyntaxError at the given position."""
+        span = (
+            self.position if span_start is None else span_start,
+            self.position if span_end is None else span_end,
+        )
+        raise ParserSyntaxError(
+            message,
+            source=self.source,
+            span=span,
+        )
+
+    @contextlib.contextmanager
+    def enclosing_tokens(
+        self, open_token: str, close_token: str, *, around: str
+    ) -> Iterator[None]:
+        if self.check(open_token):
+            open_position = self.position
+            self.read()
+        else:
+            open_position = None
+
+        yield
+
+        if open_position is None:
+            return
+
+        if not self.check(close_token):
+            self.raise_syntax_error(
+                f"Expected matching {close_token} for {open_token}, after {around}",
+                span_start=open_position,
+            )
+
+        self.read()
diff --git a/src/pip/_vendor/packaging/markers.py b/src/pip/_vendor/packaging/markers.py
index 540e7a4dc79..8b98fca7233 100644
--- a/src/pip/_vendor/packaging/markers.py
+++ b/src/pip/_vendor/packaging/markers.py
@@ -8,19 +8,17 @@
 import sys
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
-from pip._vendor.pyparsing import (  # noqa: N817
-    Forward,
-    Group,
-    Literal as L,
-    ParseException,
-    ParseResults,
-    QuotedString,
-    ZeroOrMore,
-    stringEnd,
-    stringStart,
+from ._parser import (
+    MarkerAtom,
+    MarkerList,
+    Op,
+    Value,
+    Variable,
+    parse_marker as _parse_marker,
 )
-
+from ._tokenizer import ParserSyntaxError
 from .specifiers import InvalidSpecifier, Specifier
+from .utils import canonicalize_name
 
 __all__ = [
     "InvalidMarker",
@@ -52,101 +50,24 @@ class UndefinedEnvironmentName(ValueError):
     """
 
 
-class Node:
-    def __init__(self, value: Any) -> None:
-        self.value = value
-
-    def __str__(self) -> str:
-        return str(self.value)
-
-    def __repr__(self) -> str:
-        return f"<{self.__class__.__name__}('{self}')>"
-
-    def serialize(self) -> str:
-        raise NotImplementedError
-
-
-class Variable(Node):
-    def serialize(self) -> str:
-        return str(self)
-
-
-class Value(Node):
-    def serialize(self) -> str:
-        return f'"{self}"'
-
-
-class Op(Node):
-    def serialize(self) -> str:
-        return str(self)
-
-
-VARIABLE = (
-    L("implementation_version")
-    | L("platform_python_implementation")
-    | L("implementation_name")
-    | L("python_full_version")
-    | L("platform_release")
-    | L("platform_version")
-    | L("platform_machine")
-    | L("platform_system")
-    | L("python_version")
-    | L("sys_platform")
-    | L("os_name")
-    | L("os.name")  # PEP-345
-    | L("sys.platform")  # PEP-345
-    | L("platform.version")  # PEP-345
-    | L("platform.machine")  # PEP-345
-    | L("platform.python_implementation")  # PEP-345
-    | L("python_implementation")  # undocumented setuptools legacy
-    | L("extra")  # PEP-508
-)
-ALIASES = {
-    "os.name": "os_name",
-    "sys.platform": "sys_platform",
-    "platform.version": "platform_version",
-    "platform.machine": "platform_machine",
-    "platform.python_implementation": "platform_python_implementation",
-    "python_implementation": "platform_python_implementation",
-}
-VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0])))
-
-VERSION_CMP = (
-    L("===") | L("==") | L(">=") | L("<=") | L("!=") | L("~=") | L(">") | L("<")
-)
-
-MARKER_OP = VERSION_CMP | L("not in") | L("in")
-MARKER_OP.setParseAction(lambda s, l, t: Op(t[0]))
-
-MARKER_VALUE = QuotedString("'") | QuotedString('"')
-MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0]))
-
-BOOLOP = L("and") | L("or")
-
-MARKER_VAR = VARIABLE | MARKER_VALUE
-
-MARKER_ITEM = Group(MARKER_VAR + MARKER_OP + MARKER_VAR)
-MARKER_ITEM.setParseAction(lambda s, l, t: tuple(t[0]))
-
-LPAREN = L("(").suppress()
-RPAREN = L(")").suppress()
-
-MARKER_EXPR = Forward()
-MARKER_ATOM = MARKER_ITEM | Group(LPAREN + MARKER_EXPR + RPAREN)
-MARKER_EXPR << MARKER_ATOM + ZeroOrMore(BOOLOP + MARKER_EXPR)
-
-MARKER = stringStart + MARKER_EXPR + stringEnd
-
-
-def _coerce_parse_result(results: Union[ParseResults, List[Any]]) -> List[Any]:
-    if isinstance(results, ParseResults):
-        return [_coerce_parse_result(i) for i in results]
-    else:
-        return results
+def _normalize_extra_values(results: Any) -> Any:
+    """
+    Normalize extra values.
+    """
+    if isinstance(results[0], tuple):
+        lhs, op, rhs = results[0]
+        if isinstance(lhs, Variable) and lhs.value == "extra":
+            normalized_extra = canonicalize_name(rhs.value)
+            rhs = Value(normalized_extra)
+        elif isinstance(rhs, Variable) and rhs.value == "extra":
+            normalized_extra = canonicalize_name(lhs.value)
+            lhs = Value(normalized_extra)
+        results[0] = lhs, op, rhs
+    return results
 
 
 def _format_marker(
-    marker: Union[List[str], Tuple[Node, ...], str], first: Optional[bool] = True
+    marker: Union[List[str], MarkerAtom, str], first: Optional[bool] = True
 ) -> str:
 
     assert isinstance(marker, (list, tuple, str))
@@ -192,7 +113,7 @@ def _eval_op(lhs: str, op: Op, rhs: str) -> bool:
     except InvalidSpecifier:
         pass
     else:
-        return spec.contains(lhs)
+        return spec.contains(lhs, prereleases=True)
 
     oper: Optional[Operator] = _operators.get(op.serialize())
     if oper is None:
@@ -201,25 +122,19 @@ def _eval_op(lhs: str, op: Op, rhs: str) -> bool:
     return oper(lhs, rhs)
 
 
-class Undefined:
-    pass
-
+def _normalize(*values: str, key: str) -> Tuple[str, ...]:
+    # PEP 685 – Comparison of extra names for optional distribution dependencies
+    # https://peps.python.org/pep-0685/
+    # > When comparing extra names, tools MUST normalize the names being
+    # > compared using the semantics outlined in PEP 503 for names
+    if key == "extra":
+        return tuple(canonicalize_name(v) for v in values)
 
-_undefined = Undefined()
+    # other environment markers don't have such standards
+    return values
 
 
-def _get_env(environment: Dict[str, str], name: str) -> str:
-    value: Union[str, Undefined] = environment.get(name, _undefined)
-
-    if isinstance(value, Undefined):
-        raise UndefinedEnvironmentName(
-            f"{name!r} does not exist in evaluation environment."
-        )
-
-    return value
-
-
-def _evaluate_markers(markers: List[Any], environment: Dict[str, str]) -> bool:
+def _evaluate_markers(markers: MarkerList, environment: Dict[str, str]) -> bool:
     groups: List[List[bool]] = [[]]
 
     for marker in markers:
@@ -231,12 +146,15 @@ def _evaluate_markers(markers: List[Any], environment: Dict[str, str]) -> bool:
             lhs, op, rhs = marker
 
             if isinstance(lhs, Variable):
-                lhs_value = _get_env(environment, lhs.value)
+                environment_key = lhs.value
+                lhs_value = environment[environment_key]
                 rhs_value = rhs.value
             else:
                 lhs_value = lhs.value
-                rhs_value = _get_env(environment, rhs.value)
+                environment_key = rhs.value
+                rhs_value = environment[environment_key]
 
+            lhs_value, rhs_value = _normalize(lhs_value, rhs_value, key=environment_key)
             groups[-1].append(_eval_op(lhs_value, op, rhs_value))
         else:
             assert marker in ["and", "or"]
@@ -274,13 +192,29 @@ def default_environment() -> Dict[str, str]:
 
 class Marker:
     def __init__(self, marker: str) -> None:
+        # Note: We create a Marker object without calling this constructor in
+        #       packaging.requirements.Requirement. If any additional logic is
+        #       added here, make sure to mirror/adapt Requirement.
         try:
-            self._markers = _coerce_parse_result(MARKER.parseString(marker))
-        except ParseException as e:
-            raise InvalidMarker(
-                f"Invalid marker: {marker!r}, parse error at "
-                f"{marker[e.loc : e.loc + 8]!r}"
-            )
+            self._markers = _normalize_extra_values(_parse_marker(marker))
+            # The attribute `_markers` can be described in terms of a recursive type:
+            # MarkerList = List[Union[Tuple[Node, ...], str, MarkerList]]
+            #
+            # For example, the following expression:
+            # python_version > "3.6" or (python_version == "3.6" and os_name == "unix")
+            #
+            # is parsed into:
+            # [
+            #     (, ')>, ),
+            #     'and',
+            #     [
+            #         (, , ),
+            #         'or',
+            #         (, , )
+            #     ]
+            # ]
+        except ParserSyntaxError as e:
+            raise InvalidMarker(str(e)) from e
 
     def __str__(self) -> str:
         return _format_marker(self._markers)
@@ -288,6 +222,15 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return f""
 
+    def __hash__(self) -> int:
+        return hash((self.__class__.__name__, str(self)))
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, Marker):
+            return NotImplemented
+
+        return str(self) == str(other)
+
     def evaluate(self, environment: Optional[Dict[str, str]] = None) -> bool:
         """Evaluate a marker.
 
@@ -298,7 +241,12 @@ def evaluate(self, environment: Optional[Dict[str, str]] = None) -> bool:
         The environment is determined from the current Python process.
         """
         current_environment = default_environment()
+        current_environment["extra"] = ""
         if environment is not None:
             current_environment.update(environment)
+            # The API used to allow setting extra to None. We need to handle this
+            # case for backwards compatibility.
+            if current_environment["extra"] is None:
+                current_environment["extra"] = ""
 
         return _evaluate_markers(self._markers, current_environment)
diff --git a/src/pip/_vendor/packaging/metadata.py b/src/pip/_vendor/packaging/metadata.py
new file mode 100644
index 00000000000..87763455ab1
--- /dev/null
+++ b/src/pip/_vendor/packaging/metadata.py
@@ -0,0 +1,822 @@
+import email.feedparser
+import email.header
+import email.message
+import email.parser
+import email.policy
+import sys
+import typing
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Generic,
+    List,
+    Optional,
+    Tuple,
+    Type,
+    Union,
+    cast,
+)
+
+from . import requirements, specifiers, utils, version as version_module
+
+T = typing.TypeVar("T")
+if sys.version_info[:2] >= (3, 8):  # pragma: no cover
+    from typing import Literal, TypedDict
+else:  # pragma: no cover
+    if typing.TYPE_CHECKING:
+        from pip._vendor.typing_extensions import Literal, TypedDict
+    else:
+        try:
+            from pip._vendor.typing_extensions import Literal, TypedDict
+        except ImportError:
+
+            class Literal:
+                def __init_subclass__(*_args, **_kwargs):
+                    pass
+
+            class TypedDict:
+                def __init_subclass__(*_args, **_kwargs):
+                    pass
+
+
+try:
+    ExceptionGroup = __builtins__.ExceptionGroup  # type: ignore[attr-defined]
+except AttributeError:
+
+    class ExceptionGroup(Exception):  # type: ignore[no-redef]  # noqa: N818
+        """A minimal implementation of :external:exc:`ExceptionGroup` from Python 3.11.
+
+        If :external:exc:`ExceptionGroup` is already defined by Python itself,
+        that version is used instead.
+        """
+
+        message: str
+        exceptions: List[Exception]
+
+        def __init__(self, message: str, exceptions: List[Exception]) -> None:
+            self.message = message
+            self.exceptions = exceptions
+
+        def __repr__(self) -> str:
+            return f"{self.__class__.__name__}({self.message!r}, {self.exceptions!r})"
+
+
+class InvalidMetadata(ValueError):
+    """A metadata field contains invalid data."""
+
+    field: str
+    """The name of the field that contains invalid data."""
+
+    def __init__(self, field: str, message: str) -> None:
+        self.field = field
+        super().__init__(message)
+
+
+# The RawMetadata class attempts to make as few assumptions about the underlying
+# serialization formats as possible. The idea is that as long as a serialization
+# formats offer some very basic primitives in *some* way then we can support
+# serializing to and from that format.
+class RawMetadata(TypedDict, total=False):
+    """A dictionary of raw core metadata.
+
+    Each field in core metadata maps to a key of this dictionary (when data is
+    provided). The key is lower-case and underscores are used instead of dashes
+    compared to the equivalent core metadata field. Any core metadata field that
+    can be specified multiple times or can hold multiple values in a single
+    field have a key with a plural name. See :class:`Metadata` whose attributes
+    match the keys of this dictionary.
+
+    Core metadata fields that can be specified multiple times are stored as a
+    list or dict depending on which is appropriate for the field. Any fields
+    which hold multiple values in a single field are stored as a list.
+
+    """
+
+    # Metadata 1.0 - PEP 241
+    metadata_version: str
+    name: str
+    version: str
+    platforms: List[str]
+    summary: str
+    description: str
+    keywords: List[str]
+    home_page: str
+    author: str
+    author_email: str
+    license: str
+
+    # Metadata 1.1 - PEP 314
+    supported_platforms: List[str]
+    download_url: str
+    classifiers: List[str]
+    requires: List[str]
+    provides: List[str]
+    obsoletes: List[str]
+
+    # Metadata 1.2 - PEP 345
+    maintainer: str
+    maintainer_email: str
+    requires_dist: List[str]
+    provides_dist: List[str]
+    obsoletes_dist: List[str]
+    requires_python: str
+    requires_external: List[str]
+    project_urls: Dict[str, str]
+
+    # Metadata 2.0
+    # PEP 426 attempted to completely revamp the metadata format
+    # but got stuck without ever being able to build consensus on
+    # it and ultimately ended up withdrawn.
+    #
+    # However, a number of tools had started emitting METADATA with
+    # `2.0` Metadata-Version, so for historical reasons, this version
+    # was skipped.
+
+    # Metadata 2.1 - PEP 566
+    description_content_type: str
+    provides_extra: List[str]
+
+    # Metadata 2.2 - PEP 643
+    dynamic: List[str]
+
+    # Metadata 2.3 - PEP 685
+    # No new fields were added in PEP 685, just some edge case were
+    # tightened up to provide better interoptability.
+
+
+_STRING_FIELDS = {
+    "author",
+    "author_email",
+    "description",
+    "description_content_type",
+    "download_url",
+    "home_page",
+    "license",
+    "maintainer",
+    "maintainer_email",
+    "metadata_version",
+    "name",
+    "requires_python",
+    "summary",
+    "version",
+}
+
+_LIST_FIELDS = {
+    "classifiers",
+    "dynamic",
+    "obsoletes",
+    "obsoletes_dist",
+    "platforms",
+    "provides",
+    "provides_dist",
+    "provides_extra",
+    "requires",
+    "requires_dist",
+    "requires_external",
+    "supported_platforms",
+}
+
+_DICT_FIELDS = {
+    "project_urls",
+}
+
+
+def _parse_keywords(data: str) -> List[str]:
+    """Split a string of comma-separate keyboards into a list of keywords."""
+    return [k.strip() for k in data.split(",")]
+
+
+def _parse_project_urls(data: List[str]) -> Dict[str, str]:
+    """Parse a list of label/URL string pairings separated by a comma."""
+    urls = {}
+    for pair in data:
+        # Our logic is slightly tricky here as we want to try and do
+        # *something* reasonable with malformed data.
+        #
+        # The main thing that we have to worry about, is data that does
+        # not have a ',' at all to split the label from the Value. There
+        # isn't a singular right answer here, and we will fail validation
+        # later on (if the caller is validating) so it doesn't *really*
+        # matter, but since the missing value has to be an empty str
+        # and our return value is dict[str, str], if we let the key
+        # be the missing value, then they'd have multiple '' values that
+        # overwrite each other in a accumulating dict.
+        #
+        # The other potentional issue is that it's possible to have the
+        # same label multiple times in the metadata, with no solid "right"
+        # answer with what to do in that case. As such, we'll do the only
+        # thing we can, which is treat the field as unparseable and add it
+        # to our list of unparsed fields.
+        parts = [p.strip() for p in pair.split(",", 1)]
+        parts.extend([""] * (max(0, 2 - len(parts))))  # Ensure 2 items
+
+        # TODO: The spec doesn't say anything about if the keys should be
+        #       considered case sensitive or not... logically they should
+        #       be case-preserving and case-insensitive, but doing that
+        #       would open up more cases where we might have duplicate
+        #       entries.
+        label, url = parts
+        if label in urls:
+            # The label already exists in our set of urls, so this field
+            # is unparseable, and we can just add the whole thing to our
+            # unparseable data and stop processing it.
+            raise KeyError("duplicate labels in project urls")
+        urls[label] = url
+
+    return urls
+
+
+def _get_payload(msg: email.message.Message, source: Union[bytes, str]) -> str:
+    """Get the body of the message."""
+    # If our source is a str, then our caller has managed encodings for us,
+    # and we don't need to deal with it.
+    if isinstance(source, str):
+        payload: str = msg.get_payload()
+        return payload
+    # If our source is a bytes, then we're managing the encoding and we need
+    # to deal with it.
+    else:
+        bpayload: bytes = msg.get_payload(decode=True)
+        try:
+            return bpayload.decode("utf8", "strict")
+        except UnicodeDecodeError:
+            raise ValueError("payload in an invalid encoding")
+
+
+# The various parse_FORMAT functions here are intended to be as lenient as
+# possible in their parsing, while still returning a correctly typed
+# RawMetadata.
+#
+# To aid in this, we also generally want to do as little touching of the
+# data as possible, except where there are possibly some historic holdovers
+# that make valid data awkward to work with.
+#
+# While this is a lower level, intermediate format than our ``Metadata``
+# class, some light touch ups can make a massive difference in usability.
+
+# Map METADATA fields to RawMetadata.
+_EMAIL_TO_RAW_MAPPING = {
+    "author": "author",
+    "author-email": "author_email",
+    "classifier": "classifiers",
+    "description": "description",
+    "description-content-type": "description_content_type",
+    "download-url": "download_url",
+    "dynamic": "dynamic",
+    "home-page": "home_page",
+    "keywords": "keywords",
+    "license": "license",
+    "maintainer": "maintainer",
+    "maintainer-email": "maintainer_email",
+    "metadata-version": "metadata_version",
+    "name": "name",
+    "obsoletes": "obsoletes",
+    "obsoletes-dist": "obsoletes_dist",
+    "platform": "platforms",
+    "project-url": "project_urls",
+    "provides": "provides",
+    "provides-dist": "provides_dist",
+    "provides-extra": "provides_extra",
+    "requires": "requires",
+    "requires-dist": "requires_dist",
+    "requires-external": "requires_external",
+    "requires-python": "requires_python",
+    "summary": "summary",
+    "supported-platform": "supported_platforms",
+    "version": "version",
+}
+_RAW_TO_EMAIL_MAPPING = {raw: email for email, raw in _EMAIL_TO_RAW_MAPPING.items()}
+
+
+def parse_email(data: Union[bytes, str]) -> Tuple[RawMetadata, Dict[str, List[str]]]:
+    """Parse a distribution's metadata stored as email headers (e.g. from ``METADATA``).
+
+    This function returns a two-item tuple of dicts. The first dict is of
+    recognized fields from the core metadata specification. Fields that can be
+    parsed and translated into Python's built-in types are converted
+    appropriately. All other fields are left as-is. Fields that are allowed to
+    appear multiple times are stored as lists.
+
+    The second dict contains all other fields from the metadata. This includes
+    any unrecognized fields. It also includes any fields which are expected to
+    be parsed into a built-in type but were not formatted appropriately. Finally,
+    any fields that are expected to appear only once but are repeated are
+    included in this dict.
+
+    """
+    raw: Dict[str, Union[str, List[str], Dict[str, str]]] = {}
+    unparsed: Dict[str, List[str]] = {}
+
+    if isinstance(data, str):
+        parsed = email.parser.Parser(policy=email.policy.compat32).parsestr(data)
+    else:
+        parsed = email.parser.BytesParser(policy=email.policy.compat32).parsebytes(data)
+
+    # We have to wrap parsed.keys() in a set, because in the case of multiple
+    # values for a key (a list), the key will appear multiple times in the
+    # list of keys, but we're avoiding that by using get_all().
+    for name in frozenset(parsed.keys()):
+        # Header names in RFC are case insensitive, so we'll normalize to all
+        # lower case to make comparisons easier.
+        name = name.lower()
+
+        # We use get_all() here, even for fields that aren't multiple use,
+        # because otherwise someone could have e.g. two Name fields, and we
+        # would just silently ignore it rather than doing something about it.
+        headers = parsed.get_all(name) or []
+
+        # The way the email module works when parsing bytes is that it
+        # unconditionally decodes the bytes as ascii using the surrogateescape
+        # handler. When you pull that data back out (such as with get_all() ),
+        # it looks to see if the str has any surrogate escapes, and if it does
+        # it wraps it in a Header object instead of returning the string.
+        #
+        # As such, we'll look for those Header objects, and fix up the encoding.
+        value = []
+        # Flag if we have run into any issues processing the headers, thus
+        # signalling that the data belongs in 'unparsed'.
+        valid_encoding = True
+        for h in headers:
+            # It's unclear if this can return more types than just a Header or
+            # a str, so we'll just assert here to make sure.
+            assert isinstance(h, (email.header.Header, str))
+
+            # If it's a header object, we need to do our little dance to get
+            # the real data out of it. In cases where there is invalid data
+            # we're going to end up with mojibake, but there's no obvious, good
+            # way around that without reimplementing parts of the Header object
+            # ourselves.
+            #
+            # That should be fine since, if mojibacked happens, this key is
+            # going into the unparsed dict anyways.
+            if isinstance(h, email.header.Header):
+                # The Header object stores it's data as chunks, and each chunk
+                # can be independently encoded, so we'll need to check each
+                # of them.
+                chunks: List[Tuple[bytes, Optional[str]]] = []
+                for bin, encoding in email.header.decode_header(h):
+                    try:
+                        bin.decode("utf8", "strict")
+                    except UnicodeDecodeError:
+                        # Enable mojibake.
+                        encoding = "latin1"
+                        valid_encoding = False
+                    else:
+                        encoding = "utf8"
+                    chunks.append((bin, encoding))
+
+                # Turn our chunks back into a Header object, then let that
+                # Header object do the right thing to turn them into a
+                # string for us.
+                value.append(str(email.header.make_header(chunks)))
+            # This is already a string, so just add it.
+            else:
+                value.append(h)
+
+        # We've processed all of our values to get them into a list of str,
+        # but we may have mojibake data, in which case this is an unparsed
+        # field.
+        if not valid_encoding:
+            unparsed[name] = value
+            continue
+
+        raw_name = _EMAIL_TO_RAW_MAPPING.get(name)
+        if raw_name is None:
+            # This is a bit of a weird situation, we've encountered a key that
+            # we don't know what it means, so we don't know whether it's meant
+            # to be a list or not.
+            #
+            # Since we can't really tell one way or another, we'll just leave it
+            # as a list, even though it may be a single item list, because that's
+            # what makes the most sense for email headers.
+            unparsed[name] = value
+            continue
+
+        # If this is one of our string fields, then we'll check to see if our
+        # value is a list of a single item. If it is then we'll assume that
+        # it was emitted as a single string, and unwrap the str from inside
+        # the list.
+        #
+        # If it's any other kind of data, then we haven't the faintest clue
+        # what we should parse it as, and we have to just add it to our list
+        # of unparsed stuff.
+        if raw_name in _STRING_FIELDS and len(value) == 1:
+            raw[raw_name] = value[0]
+        # If this is one of our list of string fields, then we can just assign
+        # the value, since email *only* has strings, and our get_all() call
+        # above ensures that this is a list.
+        elif raw_name in _LIST_FIELDS:
+            raw[raw_name] = value
+        # Special Case: Keywords
+        # The keywords field is implemented in the metadata spec as a str,
+        # but it conceptually is a list of strings, and is serialized using
+        # ", ".join(keywords), so we'll do some light data massaging to turn
+        # this into what it logically is.
+        elif raw_name == "keywords" and len(value) == 1:
+            raw[raw_name] = _parse_keywords(value[0])
+        # Special Case: Project-URL
+        # The project urls is implemented in the metadata spec as a list of
+        # specially-formatted strings that represent a key and a value, which
+        # is fundamentally a mapping, however the email format doesn't support
+        # mappings in a sane way, so it was crammed into a list of strings
+        # instead.
+        #
+        # We will do a little light data massaging to turn this into a map as
+        # it logically should be.
+        elif raw_name == "project_urls":
+            try:
+                raw[raw_name] = _parse_project_urls(value)
+            except KeyError:
+                unparsed[name] = value
+        # Nothing that we've done has managed to parse this, so it'll just
+        # throw it in our unparseable data and move on.
+        else:
+            unparsed[name] = value
+
+    # We need to support getting the Description from the message payload in
+    # addition to getting it from the the headers. This does mean, though, there
+    # is the possibility of it being set both ways, in which case we put both
+    # in 'unparsed' since we don't know which is right.
+    try:
+        payload = _get_payload(parsed, data)
+    except ValueError:
+        unparsed.setdefault("description", []).append(
+            parsed.get_payload(decode=isinstance(data, bytes))
+        )
+    else:
+        if payload:
+            # Check to see if we've already got a description, if so then both
+            # it, and this body move to unparseable.
+            if "description" in raw:
+                description_header = cast(str, raw.pop("description"))
+                unparsed.setdefault("description", []).extend(
+                    [description_header, payload]
+                )
+            elif "description" in unparsed:
+                unparsed["description"].append(payload)
+            else:
+                raw["description"] = payload
+
+    # We need to cast our `raw` to a metadata, because a TypedDict only support
+    # literal key names, but we're computing our key names on purpose, but the
+    # way this function is implemented, our `TypedDict` can only have valid key
+    # names.
+    return cast(RawMetadata, raw), unparsed
+
+
+_NOT_FOUND = object()
+
+
+# Keep the two values in sync.
+_VALID_METADATA_VERSIONS = ["1.0", "1.1", "1.2", "2.1", "2.2", "2.3"]
+_MetadataVersion = Literal["1.0", "1.1", "1.2", "2.1", "2.2", "2.3"]
+
+_REQUIRED_ATTRS = frozenset(["metadata_version", "name", "version"])
+
+
+class _Validator(Generic[T]):
+    """Validate a metadata field.
+
+    All _process_*() methods correspond to a core metadata field. The method is
+    called with the field's raw value. If the raw value is valid it is returned
+    in its "enriched" form (e.g. ``version.Version`` for the ``Version`` field).
+    If the raw value is invalid, :exc:`InvalidMetadata` is raised (with a cause
+    as appropriate).
+    """
+
+    name: str
+    raw_name: str
+    added: _MetadataVersion
+
+    def __init__(
+        self,
+        *,
+        added: _MetadataVersion = "1.0",
+    ) -> None:
+        self.added = added
+
+    def __set_name__(self, _owner: "Metadata", name: str) -> None:
+        self.name = name
+        self.raw_name = _RAW_TO_EMAIL_MAPPING[name]
+
+    def __get__(self, instance: "Metadata", _owner: Type["Metadata"]) -> T:
+        # With Python 3.8, the caching can be replaced with functools.cached_property().
+        # No need to check the cache as attribute lookup will resolve into the
+        # instance's __dict__ before __get__ is called.
+        cache = instance.__dict__
+        try:
+            value = instance._raw[self.name]  # type: ignore[literal-required]
+        except KeyError:
+            if self.name in _STRING_FIELDS:
+                value = ""
+            elif self.name in _LIST_FIELDS:
+                value = []
+            elif self.name in _DICT_FIELDS:
+                value = {}
+            else:  # pragma: no cover
+                assert False
+
+        try:
+            converter: Callable[[Any], T] = getattr(self, f"_process_{self.name}")
+        except AttributeError:
+            pass
+        else:
+            value = converter(value)
+
+        cache[self.name] = value
+        try:
+            del instance._raw[self.name]  # type: ignore[misc]
+        except KeyError:
+            pass
+
+        return cast(T, value)
+
+    def _invalid_metadata(
+        self, msg: str, cause: Optional[Exception] = None
+    ) -> InvalidMetadata:
+        exc = InvalidMetadata(
+            self.raw_name, msg.format_map({"field": repr(self.raw_name)})
+        )
+        exc.__cause__ = cause
+        return exc
+
+    def _process_metadata_version(self, value: str) -> _MetadataVersion:
+        # Implicitly makes Metadata-Version required.
+        if value not in _VALID_METADATA_VERSIONS:
+            raise self._invalid_metadata(f"{value!r} is not a valid metadata version")
+        return cast(_MetadataVersion, value)
+
+    def _process_name(self, value: str) -> str:
+        if not value:
+            raise self._invalid_metadata("{field} is a required field")
+        # Validate the name as a side-effect.
+        try:
+            utils.canonicalize_name(value, validate=True)
+        except utils.InvalidName as exc:
+            raise self._invalid_metadata(
+                f"{value!r} is invalid for {{field}}", cause=exc
+            )
+        else:
+            return value
+
+    def _process_version(self, value: str) -> version_module.Version:
+        if not value:
+            raise self._invalid_metadata("{field} is a required field")
+        try:
+            return version_module.parse(value)
+        except version_module.InvalidVersion as exc:
+            raise self._invalid_metadata(
+                f"{value!r} is invalid for {{field}}", cause=exc
+            )
+
+    def _process_summary(self, value: str) -> str:
+        """Check the field contains no newlines."""
+        if "\n" in value:
+            raise self._invalid_metadata("{field} must be a single line")
+        return value
+
+    def _process_description_content_type(self, value: str) -> str:
+        content_types = {"text/plain", "text/x-rst", "text/markdown"}
+        message = email.message.EmailMessage()
+        message["content-type"] = value
+
+        content_type, parameters = (
+            # Defaults to `text/plain` if parsing failed.
+            message.get_content_type().lower(),
+            message["content-type"].params,
+        )
+        # Check if content-type is valid or defaulted to `text/plain` and thus was
+        # not parseable.
+        if content_type not in content_types or content_type not in value.lower():
+            raise self._invalid_metadata(
+                f"{{field}} must be one of {list(content_types)}, not {value!r}"
+            )
+
+        charset = parameters.get("charset", "UTF-8")
+        if charset != "UTF-8":
+            raise self._invalid_metadata(
+                f"{{field}} can only specify the UTF-8 charset, not {list(charset)}"
+            )
+
+        markdown_variants = {"GFM", "CommonMark"}
+        variant = parameters.get("variant", "GFM")  # Use an acceptable default.
+        if content_type == "text/markdown" and variant not in markdown_variants:
+            raise self._invalid_metadata(
+                f"valid Markdown variants for {{field}} are {list(markdown_variants)}, "
+                f"not {variant!r}",
+            )
+        return value
+
+    def _process_dynamic(self, value: List[str]) -> List[str]:
+        for dynamic_field in map(str.lower, value):
+            if dynamic_field in {"name", "version", "metadata-version"}:
+                raise self._invalid_metadata(
+                    f"{value!r} is not allowed as a dynamic field"
+                )
+            elif dynamic_field not in _EMAIL_TO_RAW_MAPPING:
+                raise self._invalid_metadata(f"{value!r} is not a valid dynamic field")
+        return list(map(str.lower, value))
+
+    def _process_provides_extra(
+        self,
+        value: List[str],
+    ) -> List[utils.NormalizedName]:
+        normalized_names = []
+        try:
+            for name in value:
+                normalized_names.append(utils.canonicalize_name(name, validate=True))
+        except utils.InvalidName as exc:
+            raise self._invalid_metadata(
+                f"{name!r} is invalid for {{field}}", cause=exc
+            )
+        else:
+            return normalized_names
+
+    def _process_requires_python(self, value: str) -> specifiers.SpecifierSet:
+        try:
+            return specifiers.SpecifierSet(value)
+        except specifiers.InvalidSpecifier as exc:
+            raise self._invalid_metadata(
+                f"{value!r} is invalid for {{field}}", cause=exc
+            )
+
+    def _process_requires_dist(
+        self,
+        value: List[str],
+    ) -> List[requirements.Requirement]:
+        reqs = []
+        try:
+            for req in value:
+                reqs.append(requirements.Requirement(req))
+        except requirements.InvalidRequirement as exc:
+            raise self._invalid_metadata(f"{req!r} is invalid for {{field}}", cause=exc)
+        else:
+            return reqs
+
+
+class Metadata:
+    """Representation of distribution metadata.
+
+    Compared to :class:`RawMetadata`, this class provides objects representing
+    metadata fields instead of only using built-in types. Any invalid metadata
+    will cause :exc:`InvalidMetadata` to be raised (with a
+    :py:attr:`~BaseException.__cause__` attribute as appropriate).
+    """
+
+    _raw: RawMetadata
+
+    @classmethod
+    def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> "Metadata":
+        """Create an instance from :class:`RawMetadata`.
+
+        If *validate* is true, all metadata will be validated. All exceptions
+        related to validation will be gathered and raised as an :class:`ExceptionGroup`.
+        """
+        ins = cls()
+        ins._raw = data.copy()  # Mutations occur due to caching enriched values.
+
+        if validate:
+            exceptions: List[InvalidMetadata] = []
+            try:
+                metadata_version = ins.metadata_version
+                metadata_age = _VALID_METADATA_VERSIONS.index(metadata_version)
+            except InvalidMetadata as metadata_version_exc:
+                exceptions.append(metadata_version_exc)
+                metadata_version = None
+
+            # Make sure to check for the fields that are present, the required
+            # fields (so their absence can be reported).
+            fields_to_check = frozenset(ins._raw) | _REQUIRED_ATTRS
+            # Remove fields that have already been checked.
+            fields_to_check -= {"metadata_version"}
+
+            for key in fields_to_check:
+                try:
+                    if metadata_version:
+                        # Can't use getattr() as that triggers descriptor protocol which
+                        # will fail due to no value for the instance argument.
+                        try:
+                            field_metadata_version = cls.__dict__[key].added
+                        except KeyError:
+                            exc = InvalidMetadata(key, f"unrecognized field: {key!r}")
+                            exceptions.append(exc)
+                            continue
+                        field_age = _VALID_METADATA_VERSIONS.index(
+                            field_metadata_version
+                        )
+                        if field_age > metadata_age:
+                            field = _RAW_TO_EMAIL_MAPPING[key]
+                            exc = InvalidMetadata(
+                                field,
+                                "{field} introduced in metadata version "
+                                "{field_metadata_version}, not {metadata_version}",
+                            )
+                            exceptions.append(exc)
+                            continue
+                    getattr(ins, key)
+                except InvalidMetadata as exc:
+                    exceptions.append(exc)
+
+            if exceptions:
+                raise ExceptionGroup("invalid metadata", exceptions)
+
+        return ins
+
+    @classmethod
+    def from_email(
+        cls, data: Union[bytes, str], *, validate: bool = True
+    ) -> "Metadata":
+        """Parse metadata from email headers.
+
+        If *validate* is true, the metadata will be validated. All exceptions
+        related to validation will be gathered and raised as an :class:`ExceptionGroup`.
+        """
+        exceptions: list[InvalidMetadata] = []
+        raw, unparsed = parse_email(data)
+
+        if validate:
+            for unparsed_key in unparsed:
+                if unparsed_key in _EMAIL_TO_RAW_MAPPING:
+                    message = f"{unparsed_key!r} has invalid data"
+                else:
+                    message = f"unrecognized field: {unparsed_key!r}"
+                exceptions.append(InvalidMetadata(unparsed_key, message))
+
+            if exceptions:
+                raise ExceptionGroup("unparsed", exceptions)
+
+        try:
+            return cls.from_raw(raw, validate=validate)
+        except ExceptionGroup as exc_group:
+            exceptions.extend(exc_group.exceptions)
+            raise ExceptionGroup("invalid or unparsed metadata", exceptions) from None
+
+    metadata_version: _Validator[_MetadataVersion] = _Validator()
+    """:external:ref:`core-metadata-metadata-version`
+    (required; validated to be a valid metadata version)"""
+    name: _Validator[str] = _Validator()
+    """:external:ref:`core-metadata-name`
+    (required; validated using :func:`~packaging.utils.canonicalize_name` and its
+    *validate* parameter)"""
+    version: _Validator[version_module.Version] = _Validator()
+    """:external:ref:`core-metadata-version` (required)"""
+    dynamic: _Validator[List[str]] = _Validator(
+        added="2.2",
+    )
+    """:external:ref:`core-metadata-dynamic`
+    (validated against core metadata field names and lowercased)"""
+    platforms: _Validator[List[str]] = _Validator()
+    """:external:ref:`core-metadata-platform`"""
+    supported_platforms: _Validator[List[str]] = _Validator(added="1.1")
+    """:external:ref:`core-metadata-supported-platform`"""
+    summary: _Validator[str] = _Validator()
+    """:external:ref:`core-metadata-summary` (validated to contain no newlines)"""
+    description: _Validator[str] = _Validator()  # TODO 2.1: can be in body
+    """:external:ref:`core-metadata-description`"""
+    description_content_type: _Validator[str] = _Validator(added="2.1")
+    """:external:ref:`core-metadata-description-content-type` (validated)"""
+    keywords: _Validator[List[str]] = _Validator()
+    """:external:ref:`core-metadata-keywords`"""
+    home_page: _Validator[str] = _Validator()
+    """:external:ref:`core-metadata-home-page`"""
+    download_url: _Validator[str] = _Validator(added="1.1")
+    """:external:ref:`core-metadata-download-url`"""
+    author: _Validator[str] = _Validator()
+    """:external:ref:`core-metadata-author`"""
+    author_email: _Validator[str] = _Validator()
+    """:external:ref:`core-metadata-author-email`"""
+    maintainer: _Validator[str] = _Validator(added="1.2")
+    """:external:ref:`core-metadata-maintainer`"""
+    maintainer_email: _Validator[str] = _Validator(added="1.2")
+    """:external:ref:`core-metadata-maintainer-email`"""
+    license: _Validator[str] = _Validator()
+    """:external:ref:`core-metadata-license`"""
+    classifiers: _Validator[List[str]] = _Validator(added="1.1")
+    """:external:ref:`core-metadata-classifier`"""
+    requires_dist: _Validator[List[requirements.Requirement]] = _Validator(added="1.2")
+    """:external:ref:`core-metadata-requires-dist`"""
+    requires_python: _Validator[specifiers.SpecifierSet] = _Validator(added="1.2")
+    """:external:ref:`core-metadata-requires-python`"""
+    # Because `Requires-External` allows for non-PEP 440 version specifiers, we
+    # don't do any processing on the values.
+    requires_external: _Validator[List[str]] = _Validator(added="1.2")
+    """:external:ref:`core-metadata-requires-external`"""
+    project_urls: _Validator[Dict[str, str]] = _Validator(added="1.2")
+    """:external:ref:`core-metadata-project-url`"""
+    # PEP 685 lets us raise an error if an extra doesn't pass `Name` validation
+    # regardless of metadata version.
+    provides_extra: _Validator[List[utils.NormalizedName]] = _Validator(
+        added="2.1",
+    )
+    """:external:ref:`core-metadata-provides-extra`"""
+    provides_dist: _Validator[List[str]] = _Validator(added="1.2")
+    """:external:ref:`core-metadata-provides-dist`"""
+    obsoletes_dist: _Validator[List[str]] = _Validator(added="1.2")
+    """:external:ref:`core-metadata-obsoletes-dist`"""
+    requires: _Validator[List[str]] = _Validator(added="1.1")
+    """``Requires`` (deprecated)"""
+    provides: _Validator[List[str]] = _Validator(added="1.1")
+    """``Provides`` (deprecated)"""
+    obsoletes: _Validator[List[str]] = _Validator(added="1.1")
+    """``Obsoletes`` (deprecated)"""
diff --git a/src/pip/_vendor/packaging/requirements.py b/src/pip/_vendor/packaging/requirements.py
index 1eab7dd66d9..0c00eba331b 100644
--- a/src/pip/_vendor/packaging/requirements.py
+++ b/src/pip/_vendor/packaging/requirements.py
@@ -2,26 +2,13 @@
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
 
-import re
-import string
-import urllib.parse
-from typing import List, Optional as TOptional, Set
-
-from pip._vendor.pyparsing import (  # noqa
-    Combine,
-    Literal as L,
-    Optional,
-    ParseException,
-    Regex,
-    Word,
-    ZeroOrMore,
-    originalTextFor,
-    stringEnd,
-    stringStart,
-)
-
-from .markers import MARKER_EXPR, Marker
-from .specifiers import LegacySpecifier, Specifier, SpecifierSet
+from typing import Any, Iterator, Optional, Set
+
+from ._parser import parse_requirement as _parse_requirement
+from ._tokenizer import ParserSyntaxError
+from .markers import Marker, _normalize_extra_values
+from .specifiers import SpecifierSet
+from .utils import canonicalize_name
 
 
 class InvalidRequirement(ValueError):
@@ -30,60 +17,6 @@ class InvalidRequirement(ValueError):
     """
 
 
-ALPHANUM = Word(string.ascii_letters + string.digits)
-
-LBRACKET = L("[").suppress()
-RBRACKET = L("]").suppress()
-LPAREN = L("(").suppress()
-RPAREN = L(")").suppress()
-COMMA = L(",").suppress()
-SEMICOLON = L(";").suppress()
-AT = L("@").suppress()
-
-PUNCTUATION = Word("-_.")
-IDENTIFIER_END = ALPHANUM | (ZeroOrMore(PUNCTUATION) + ALPHANUM)
-IDENTIFIER = Combine(ALPHANUM + ZeroOrMore(IDENTIFIER_END))
-
-NAME = IDENTIFIER("name")
-EXTRA = IDENTIFIER
-
-URI = Regex(r"[^ ]+")("url")
-URL = AT + URI
-
-EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA)
-EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras")
-
-VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE)
-VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
-
-VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
-VERSION_MANY = Combine(
-    VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE), joinString=",", adjacent=False
-)("_raw_spec")
-_VERSION_SPEC = Optional((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY)
-_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or "")
-
-VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier")
-VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
-
-MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
-MARKER_EXPR.setParseAction(
-    lambda s, l, t: Marker(s[t._original_start : t._original_end])
-)
-MARKER_SEPARATOR = SEMICOLON
-MARKER = MARKER_SEPARATOR + MARKER_EXPR
-
-VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
-URL_AND_MARKER = URL + Optional(MARKER)
-
-NAMED_REQUIREMENT = NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
-
-REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
-# pyparsing isn't thread safe during initialization, so we do it eagerly, see
-# issue #104
-REQUIREMENT.parseString("x[]")
-
-
 class Requirement:
     """Parse a requirement.
 
@@ -99,48 +32,59 @@ class Requirement:
 
     def __init__(self, requirement_string: str) -> None:
         try:
-            req = REQUIREMENT.parseString(requirement_string)
-        except ParseException as e:
-            raise InvalidRequirement(
-                f'Parse error at "{ requirement_string[e.loc : e.loc + 8]!r}": {e.msg}'
-            )
-
-        self.name: str = req.name
-        if req.url:
-            parsed_url = urllib.parse.urlparse(req.url)
-            if parsed_url.scheme == "file":
-                if urllib.parse.urlunparse(parsed_url) != req.url:
-                    raise InvalidRequirement("Invalid URL given")
-            elif not (parsed_url.scheme and parsed_url.netloc) or (
-                not parsed_url.scheme and not parsed_url.netloc
-            ):
-                raise InvalidRequirement(f"Invalid URL: {req.url}")
-            self.url: TOptional[str] = req.url
-        else:
-            self.url = None
-        self.extras: Set[str] = set(req.extras.asList() if req.extras else [])
-        self.specifier: SpecifierSet = SpecifierSet(req.specifier)
-        self.marker: TOptional[Marker] = req.marker if req.marker else None
-
-    def __str__(self) -> str:
-        parts: List[str] = [self.name]
+            parsed = _parse_requirement(requirement_string)
+        except ParserSyntaxError as e:
+            raise InvalidRequirement(str(e)) from e
+
+        self.name: str = parsed.name
+        self.url: Optional[str] = parsed.url or None
+        self.extras: Set[str] = set(parsed.extras if parsed.extras else [])
+        self.specifier: SpecifierSet = SpecifierSet(parsed.specifier)
+        self.marker: Optional[Marker] = None
+        if parsed.marker is not None:
+            self.marker = Marker.__new__(Marker)
+            self.marker._markers = _normalize_extra_values(parsed.marker)
+
+    def _iter_parts(self, name: str) -> Iterator[str]:
+        yield name
 
         if self.extras:
             formatted_extras = ",".join(sorted(self.extras))
-            parts.append(f"[{formatted_extras}]")
+            yield f"[{formatted_extras}]"
 
         if self.specifier:
-            parts.append(str(self.specifier))
+            yield str(self.specifier)
 
         if self.url:
-            parts.append(f"@ {self.url}")
+            yield f"@ {self.url}"
             if self.marker:
-                parts.append(" ")
+                yield " "
 
         if self.marker:
-            parts.append(f"; {self.marker}")
+            yield f"; {self.marker}"
 
-        return "".join(parts)
+    def __str__(self) -> str:
+        return "".join(self._iter_parts(self.name))
 
     def __repr__(self) -> str:
         return f""
+
+    def __hash__(self) -> int:
+        return hash(
+            (
+                self.__class__.__name__,
+                *self._iter_parts(canonicalize_name(self.name)),
+            )
+        )
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, Requirement):
+            return NotImplemented
+
+        return (
+            canonicalize_name(self.name) == canonicalize_name(other.name)
+            and self.extras == other.extras
+            and self.specifier == other.specifier
+            and self.url == other.url
+            and self.marker == other.marker
+        )
diff --git a/src/pip/_vendor/packaging/specifiers.py b/src/pip/_vendor/packaging/specifiers.py
index 0e218a6f9f7..7617726c385 100644
--- a/src/pip/_vendor/packaging/specifiers.py
+++ b/src/pip/_vendor/packaging/specifiers.py
@@ -1,20 +1,22 @@
 # This file is dual licensed under the terms of the Apache License, Version
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
+"""
+.. testsetup::
+
+    from pip._vendor.packaging.specifiers import Specifier, SpecifierSet, InvalidSpecifier
+    from pip._vendor.packaging.version import Version
+"""
 
 import abc
-import functools
 import itertools
 import re
-import warnings
 from typing import (
     Callable,
-    Dict,
     Iterable,
     Iterator,
     List,
     Optional,
-    Pattern,
     Set,
     Tuple,
     TypeVar,
@@ -22,17 +24,28 @@
 )
 
 from .utils import canonicalize_version
-from .version import LegacyVersion, Version, parse
+from .version import Version
+
+UnparsedVersion = Union[Version, str]
+UnparsedVersionVar = TypeVar("UnparsedVersionVar", bound=UnparsedVersion)
+CallableOperator = Callable[[Version, str], bool]
 
-ParsedVersion = Union[Version, LegacyVersion]
-UnparsedVersion = Union[Version, LegacyVersion, str]
-VersionTypeVar = TypeVar("VersionTypeVar", bound=UnparsedVersion)
-CallableOperator = Callable[[ParsedVersion, str], bool]
+
+def _coerce_version(version: UnparsedVersion) -> Version:
+    if not isinstance(version, Version):
+        version = Version(version)
+    return version
 
 
 class InvalidSpecifier(ValueError):
     """
-    An invalid specifier was found, users should refer to PEP 440.
+    Raised when attempting to create a :class:`Specifier` with a specifier
+    string that is invalid.
+
+    >>> Specifier("lolwat")
+    Traceback (most recent call last):
+        ...
+    packaging.specifiers.InvalidSpecifier: Invalid specifier: 'lolwat'
     """
 
 
@@ -40,35 +53,39 @@ class BaseSpecifier(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def __str__(self) -> str:
         """
-        Returns the str representation of this Specifier like object. This
+        Returns the str representation of this Specifier-like object. This
         should be representative of the Specifier itself.
         """
 
     @abc.abstractmethod
     def __hash__(self) -> int:
         """
-        Returns a hash value for this Specifier like object.
+        Returns a hash value for this Specifier-like object.
         """
 
     @abc.abstractmethod
     def __eq__(self, other: object) -> bool:
         """
-        Returns a boolean representing whether or not the two Specifier like
+        Returns a boolean representing whether or not the two Specifier-like
         objects are equal.
+
+        :param other: The other object to check against.
         """
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def prereleases(self) -> Optional[bool]:
-        """
-        Returns whether or not pre-releases as a whole are allowed by this
-        specifier.
+        """Whether or not pre-releases as a whole are allowed.
+
+        This can be set to either ``True`` or ``False`` to explicitly enable or disable
+        prereleases or it can be set to ``None`` (the default) to use default semantics.
         """
 
     @prereleases.setter
     def prereleases(self, value: bool) -> None:
-        """
-        Sets whether or not pre-releases as a whole are allowed by this
-        specifier.
+        """Setter for :attr:`prereleases`.
+
+        :param value: The value to set.
         """
 
     @abc.abstractmethod
@@ -79,227 +96,28 @@ def contains(self, item: str, prereleases: Optional[bool] = None) -> bool:
 
     @abc.abstractmethod
     def filter(
-        self, iterable: Iterable[VersionTypeVar], prereleases: Optional[bool] = None
-    ) -> Iterable[VersionTypeVar]:
+        self, iterable: Iterable[UnparsedVersionVar], prereleases: Optional[bool] = None
+    ) -> Iterator[UnparsedVersionVar]:
         """
         Takes an iterable of items and filters them so that only items which
         are contained within this specifier are allowed in it.
         """
 
 
-class _IndividualSpecifier(BaseSpecifier):
-
-    _operators: Dict[str, str] = {}
-    _regex: Pattern[str]
-
-    def __init__(self, spec: str = "", prereleases: Optional[bool] = None) -> None:
-        match = self._regex.search(spec)
-        if not match:
-            raise InvalidSpecifier(f"Invalid specifier: '{spec}'")
-
-        self._spec: Tuple[str, str] = (
-            match.group("operator").strip(),
-            match.group("version").strip(),
-        )
-
-        # Store whether or not this Specifier should accept prereleases
-        self._prereleases = prereleases
-
-    def __repr__(self) -> str:
-        pre = (
-            f", prereleases={self.prereleases!r}"
-            if self._prereleases is not None
-            else ""
-        )
-
-        return f"<{self.__class__.__name__}({str(self)!r}{pre})>"
-
-    def __str__(self) -> str:
-        return "{}{}".format(*self._spec)
-
-    @property
-    def _canonical_spec(self) -> Tuple[str, str]:
-        return self._spec[0], canonicalize_version(self._spec[1])
-
-    def __hash__(self) -> int:
-        return hash(self._canonical_spec)
-
-    def __eq__(self, other: object) -> bool:
-        if isinstance(other, str):
-            try:
-                other = self.__class__(str(other))
-            except InvalidSpecifier:
-                return NotImplemented
-        elif not isinstance(other, self.__class__):
-            return NotImplemented
-
-        return self._canonical_spec == other._canonical_spec
-
-    def _get_operator(self, op: str) -> CallableOperator:
-        operator_callable: CallableOperator = getattr(
-            self, f"_compare_{self._operators[op]}"
-        )
-        return operator_callable
-
-    def _coerce_version(self, version: UnparsedVersion) -> ParsedVersion:
-        if not isinstance(version, (LegacyVersion, Version)):
-            version = parse(version)
-        return version
+class Specifier(BaseSpecifier):
+    """This class abstracts handling of version specifiers.
 
-    @property
-    def operator(self) -> str:
-        return self._spec[0]
+    .. tip::
 
-    @property
-    def version(self) -> str:
-        return self._spec[1]
-
-    @property
-    def prereleases(self) -> Optional[bool]:
-        return self._prereleases
-
-    @prereleases.setter
-    def prereleases(self, value: bool) -> None:
-        self._prereleases = value
-
-    def __contains__(self, item: str) -> bool:
-        return self.contains(item)
-
-    def contains(
-        self, item: UnparsedVersion, prereleases: Optional[bool] = None
-    ) -> bool:
-
-        # Determine if prereleases are to be allowed or not.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # Normalize item to a Version or LegacyVersion, this allows us to have
-        # a shortcut for ``"2.0" in Specifier(">=2")
-        normalized_item = self._coerce_version(item)
-
-        # Determine if we should be supporting prereleases in this specifier
-        # or not, if we do not support prereleases than we can short circuit
-        # logic if this version is a prereleases.
-        if normalized_item.is_prerelease and not prereleases:
-            return False
-
-        # Actually do the comparison to determine if this item is contained
-        # within this Specifier or not.
-        operator_callable: CallableOperator = self._get_operator(self.operator)
-        return operator_callable(normalized_item, self.version)
-
-    def filter(
-        self, iterable: Iterable[VersionTypeVar], prereleases: Optional[bool] = None
-    ) -> Iterable[VersionTypeVar]:
-
-        yielded = False
-        found_prereleases = []
-
-        kw = {"prereleases": prereleases if prereleases is not None else True}
-
-        # Attempt to iterate over all the values in the iterable and if any of
-        # them match, yield them.
-        for version in iterable:
-            parsed_version = self._coerce_version(version)
-
-            if self.contains(parsed_version, **kw):
-                # If our version is a prerelease, and we were not set to allow
-                # prereleases, then we'll store it for later in case nothing
-                # else matches this specifier.
-                if parsed_version.is_prerelease and not (
-                    prereleases or self.prereleases
-                ):
-                    found_prereleases.append(version)
-                # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the beginning.
-                else:
-                    yielded = True
-                    yield version
-
-        # Now that we've iterated over everything, determine if we've yielded
-        # any values, and if we have not and we have any prereleases stored up
-        # then we will go ahead and yield the prereleases.
-        if not yielded and found_prereleases:
-            for version in found_prereleases:
-                yield version
-
-
-class LegacySpecifier(_IndividualSpecifier):
-
-    _regex_str = r"""
-        (?P(==|!=|<=|>=|<|>))
-        \s*
-        (?P
-            [^,;\s)]* # Since this is a "legacy" specifier, and the version
-                      # string can be just about anything, we match everything
-                      # except for whitespace, a semi-colon for marker support,
-                      # a closing paren since versions can be enclosed in
-                      # them, and a comma since it's a version separator.
-        )
-        """
-
-    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
-
-    _operators = {
-        "==": "equal",
-        "!=": "not_equal",
-        "<=": "less_than_equal",
-        ">=": "greater_than_equal",
-        "<": "less_than",
-        ">": "greater_than",
-    }
-
-    def __init__(self, spec: str = "", prereleases: Optional[bool] = None) -> None:
-        super().__init__(spec, prereleases)
-
-        warnings.warn(
-            "Creating a LegacyVersion has been deprecated and will be "
-            "removed in the next major release",
-            DeprecationWarning,
-        )
-
-    def _coerce_version(self, version: UnparsedVersion) -> LegacyVersion:
-        if not isinstance(version, LegacyVersion):
-            version = LegacyVersion(str(version))
-        return version
-
-    def _compare_equal(self, prospective: LegacyVersion, spec: str) -> bool:
-        return prospective == self._coerce_version(spec)
-
-    def _compare_not_equal(self, prospective: LegacyVersion, spec: str) -> bool:
-        return prospective != self._coerce_version(spec)
-
-    def _compare_less_than_equal(self, prospective: LegacyVersion, spec: str) -> bool:
-        return prospective <= self._coerce_version(spec)
-
-    def _compare_greater_than_equal(
-        self, prospective: LegacyVersion, spec: str
-    ) -> bool:
-        return prospective >= self._coerce_version(spec)
-
-    def _compare_less_than(self, prospective: LegacyVersion, spec: str) -> bool:
-        return prospective < self._coerce_version(spec)
-
-    def _compare_greater_than(self, prospective: LegacyVersion, spec: str) -> bool:
-        return prospective > self._coerce_version(spec)
-
-
-def _require_version_compare(
-    fn: Callable[["Specifier", ParsedVersion, str], bool]
-) -> Callable[["Specifier", ParsedVersion, str], bool]:
-    @functools.wraps(fn)
-    def wrapped(self: "Specifier", prospective: ParsedVersion, spec: str) -> bool:
-        if not isinstance(prospective, Version):
-            return False
-        return fn(self, prospective, spec)
-
-    return wrapped
-
-
-class Specifier(_IndividualSpecifier):
+        It is generally not required to instantiate this manually. You should instead
+        prefer to work with :class:`SpecifierSet` instead, which can parse
+        comma-separated version specifiers (which is what package metadata contains).
+    """
 
-    _regex_str = r"""
+    _operator_regex_str = r"""
         (?P(~=|==|!=|<=|>=|<|>|===))
+        """
+    _version_regex_str = r"""
         (?P
             (?:
                 # The identity operators allow for an escape hatch that will
@@ -309,8 +127,10 @@ class Specifier(_IndividualSpecifier):
                 # but included entirely as an escape hatch.
                 (?<====)  # Only match for the identity operator
                 \s*
-                [^\s]*    # We just match everything, except for whitespace
-                          # since we are only testing for strict identity.
+                [^\s;)]*  # The arbitrary version can be just about anything,
+                          # we match everything except for whitespace, a
+                          # semi-colon for marker support, and a closing paren
+                          # since versions can be enclosed in them.
             )
             |
             (?:
@@ -323,23 +143,23 @@ class Specifier(_IndividualSpecifier):
                 v?
                 (?:[0-9]+!)?          # epoch
                 [0-9]+(?:\.[0-9]+)*   # release
-                (?:                   # pre release
-                    [-_\.]?
-                    (a|b|c|rc|alpha|beta|pre|preview)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
 
-                # You cannot use a wild card and a dev or local version
-                # together so group them with a | and make them optional.
+                # You cannot use a wild card and a pre-release, post-release, a dev or
+                # local version together so group them with a | and make them optional.
                 (?:
+                    \.\*  # Wild card syntax of .*
+                    |
+                    (?:                                  # pre release
+                        [-_\.]?
+                        (alpha|beta|preview|pre|a|b|c|rc)
+                        [-_\.]?
+                        [0-9]*
+                    )?
+                    (?:                                  # post release
+                        (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                    )?
                     (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
                     (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
-                    |
-                    \.\*  # Wild card syntax of .*
                 )?
             )
             |
@@ -354,7 +174,7 @@ class Specifier(_IndividualSpecifier):
                 [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
                 (?:                   # pre release
                     [-_\.]?
-                    (a|b|c|rc|alpha|beta|pre|preview)
+                    (alpha|beta|preview|pre|a|b|c|rc)
                     [-_\.]?
                     [0-9]*
                 )?
@@ -379,7 +199,7 @@ class Specifier(_IndividualSpecifier):
                 [0-9]+(?:\.[0-9]+)*   # release
                 (?:                   # pre release
                     [-_\.]?
-                    (a|b|c|rc|alpha|beta|pre|preview)
+                    (alpha|beta|preview|pre|a|b|c|rc)
                     [-_\.]?
                     [0-9]*
                 )?
@@ -391,7 +211,10 @@ class Specifier(_IndividualSpecifier):
         )
         """
 
-    _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+    _regex = re.compile(
+        r"^\s*" + _operator_regex_str + _version_regex_str + r"\s*$",
+        re.VERBOSE | re.IGNORECASE,
+    )
 
     _operators = {
         "~=": "compatible",
@@ -404,8 +227,153 @@ class Specifier(_IndividualSpecifier):
         "===": "arbitrary",
     }
 
-    @_require_version_compare
-    def _compare_compatible(self, prospective: ParsedVersion, spec: str) -> bool:
+    def __init__(self, spec: str = "", prereleases: Optional[bool] = None) -> None:
+        """Initialize a Specifier instance.
+
+        :param spec:
+            The string representation of a specifier which will be parsed and
+            normalized before use.
+        :param prereleases:
+            This tells the specifier if it should accept prerelease versions if
+            applicable or not. The default of ``None`` will autodetect it from the
+            given specifiers.
+        :raises InvalidSpecifier:
+            If the given specifier is invalid (i.e. bad syntax).
+        """
+        match = self._regex.search(spec)
+        if not match:
+            raise InvalidSpecifier(f"Invalid specifier: '{spec}'")
+
+        self._spec: Tuple[str, str] = (
+            match.group("operator").strip(),
+            match.group("version").strip(),
+        )
+
+        # Store whether or not this Specifier should accept prereleases
+        self._prereleases = prereleases
+
+    # https://github.com/python/mypy/pull/13475#pullrequestreview-1079784515
+    @property  # type: ignore[override]
+    def prereleases(self) -> bool:
+        # If there is an explicit prereleases set for this, then we'll just
+        # blindly use that.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # Look at all of our specifiers and determine if they are inclusive
+        # operators, and if they are if they are including an explicit
+        # prerelease.
+        operator, version = self._spec
+        if operator in ["==", ">=", "<=", "~=", "==="]:
+            # The == specifier can include a trailing .*, if it does we
+            # want to remove before parsing.
+            if operator == "==" and version.endswith(".*"):
+                version = version[:-2]
+
+            # Parse the version, and if it is a pre-release than this
+            # specifier allows pre-releases.
+            if Version(version).is_prerelease:
+                return True
+
+        return False
+
+    @prereleases.setter
+    def prereleases(self, value: bool) -> None:
+        self._prereleases = value
+
+    @property
+    def operator(self) -> str:
+        """The operator of this specifier.
+
+        >>> Specifier("==1.2.3").operator
+        '=='
+        """
+        return self._spec[0]
+
+    @property
+    def version(self) -> str:
+        """The version of this specifier.
+
+        >>> Specifier("==1.2.3").version
+        '1.2.3'
+        """
+        return self._spec[1]
+
+    def __repr__(self) -> str:
+        """A representation of the Specifier that shows all internal state.
+
+        >>> Specifier('>=1.0.0')
+        =1.0.0')>
+        >>> Specifier('>=1.0.0', prereleases=False)
+        =1.0.0', prereleases=False)>
+        >>> Specifier('>=1.0.0', prereleases=True)
+        =1.0.0', prereleases=True)>
+        """
+        pre = (
+            f", prereleases={self.prereleases!r}"
+            if self._prereleases is not None
+            else ""
+        )
+
+        return f"<{self.__class__.__name__}({str(self)!r}{pre})>"
+
+    def __str__(self) -> str:
+        """A string representation of the Specifier that can be round-tripped.
+
+        >>> str(Specifier('>=1.0.0'))
+        '>=1.0.0'
+        >>> str(Specifier('>=1.0.0', prereleases=False))
+        '>=1.0.0'
+        """
+        return "{}{}".format(*self._spec)
+
+    @property
+    def _canonical_spec(self) -> Tuple[str, str]:
+        canonical_version = canonicalize_version(
+            self._spec[1],
+            strip_trailing_zero=(self._spec[0] != "~="),
+        )
+        return self._spec[0], canonical_version
+
+    def __hash__(self) -> int:
+        return hash(self._canonical_spec)
+
+    def __eq__(self, other: object) -> bool:
+        """Whether or not the two Specifier-like objects are equal.
+
+        :param other: The other object to check against.
+
+        The value of :attr:`prereleases` is ignored.
+
+        >>> Specifier("==1.2.3") == Specifier("== 1.2.3.0")
+        True
+        >>> (Specifier("==1.2.3", prereleases=False) ==
+        ...  Specifier("==1.2.3", prereleases=True))
+        True
+        >>> Specifier("==1.2.3") == "==1.2.3"
+        True
+        >>> Specifier("==1.2.3") == Specifier("==1.2.4")
+        False
+        >>> Specifier("==1.2.3") == Specifier("~=1.2.3")
+        False
+        """
+        if isinstance(other, str):
+            try:
+                other = self.__class__(str(other))
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._canonical_spec == other._canonical_spec
+
+    def _get_operator(self, op: str) -> CallableOperator:
+        operator_callable: CallableOperator = getattr(
+            self, f"_compare_{self._operators[op]}"
+        )
+        return operator_callable
+
+    def _compare_compatible(self, prospective: Version, spec: str) -> bool:
 
         # Compatible releases have an equivalent combination of >= and ==. That
         # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
@@ -426,34 +394,35 @@ def _compare_compatible(self, prospective: ParsedVersion, spec: str) -> bool:
             prospective, prefix
         )
 
-    @_require_version_compare
-    def _compare_equal(self, prospective: ParsedVersion, spec: str) -> bool:
+    def _compare_equal(self, prospective: Version, spec: str) -> bool:
 
         # We need special logic to handle prefix matching
         if spec.endswith(".*"):
             # In the case of prefix matching we want to ignore local segment.
-            prospective = Version(prospective.public)
+            normalized_prospective = canonicalize_version(
+                prospective.public, strip_trailing_zero=False
+            )
+            # Get the normalized version string ignoring the trailing .*
+            normalized_spec = canonicalize_version(spec[:-2], strip_trailing_zero=False)
             # Split the spec out by dots, and pretend that there is an implicit
             # dot in between a release segment and a pre-release segment.
-            split_spec = _version_split(spec[:-2])  # Remove the trailing .*
+            split_spec = _version_split(normalized_spec)
 
             # Split the prospective version out by dots, and pretend that there
             # is an implicit dot in between a release segment and a pre-release
             # segment.
-            split_prospective = _version_split(str(prospective))
+            split_prospective = _version_split(normalized_prospective)
+
+            # 0-pad the prospective version before shortening it to get the correct
+            # shortened version.
+            padded_prospective, _ = _pad_version(split_prospective, split_spec)
 
             # Shorten the prospective version to be the same length as the spec
             # so that we can determine if the specifier is a prefix of the
             # prospective version or not.
-            shortened_prospective = split_prospective[: len(split_spec)]
+            shortened_prospective = padded_prospective[: len(split_spec)]
 
-            # Pad out our two sides with zeros so that they both equal the same
-            # length.
-            padded_spec, padded_prospective = _pad_version(
-                split_spec, shortened_prospective
-            )
-
-            return padded_prospective == padded_spec
+            return shortened_prospective == split_spec
         else:
             # Convert our spec string into a Version
             spec_version = Version(spec)
@@ -466,30 +435,24 @@ def _compare_equal(self, prospective: ParsedVersion, spec: str) -> bool:
 
             return prospective == spec_version
 
-    @_require_version_compare
-    def _compare_not_equal(self, prospective: ParsedVersion, spec: str) -> bool:
+    def _compare_not_equal(self, prospective: Version, spec: str) -> bool:
         return not self._compare_equal(prospective, spec)
 
-    @_require_version_compare
-    def _compare_less_than_equal(self, prospective: ParsedVersion, spec: str) -> bool:
+    def _compare_less_than_equal(self, prospective: Version, spec: str) -> bool:
 
         # NB: Local version identifiers are NOT permitted in the version
         # specifier, so local version labels can be universally removed from
         # the prospective version.
         return Version(prospective.public) <= Version(spec)
 
-    @_require_version_compare
-    def _compare_greater_than_equal(
-        self, prospective: ParsedVersion, spec: str
-    ) -> bool:
+    def _compare_greater_than_equal(self, prospective: Version, spec: str) -> bool:
 
         # NB: Local version identifiers are NOT permitted in the version
         # specifier, so local version labels can be universally removed from
         # the prospective version.
         return Version(prospective.public) >= Version(spec)
 
-    @_require_version_compare
-    def _compare_less_than(self, prospective: ParsedVersion, spec_str: str) -> bool:
+    def _compare_less_than(self, prospective: Version, spec_str: str) -> bool:
 
         # Convert our spec to a Version instance, since we'll want to work with
         # it as a version.
@@ -514,8 +477,7 @@ def _compare_less_than(self, prospective: ParsedVersion, spec_str: str) -> bool:
         # version in the spec.
         return True
 
-    @_require_version_compare
-    def _compare_greater_than(self, prospective: ParsedVersion, spec_str: str) -> bool:
+    def _compare_greater_than(self, prospective: Version, spec_str: str) -> bool:
 
         # Convert our spec to a Version instance, since we'll want to work with
         # it as a version.
@@ -549,34 +511,133 @@ def _compare_greater_than(self, prospective: ParsedVersion, spec_str: str) -> bo
     def _compare_arbitrary(self, prospective: Version, spec: str) -> bool:
         return str(prospective).lower() == str(spec).lower()
 
-    @property
-    def prereleases(self) -> bool:
+    def __contains__(self, item: Union[str, Version]) -> bool:
+        """Return whether or not the item is contained in this specifier.
 
-        # If there is an explicit prereleases set for this, then we'll just
-        # blindly use that.
-        if self._prereleases is not None:
-            return self._prereleases
+        :param item: The item to check for.
 
-        # Look at all of our specifiers and determine if they are inclusive
-        # operators, and if they are if they are including an explicit
-        # prerelease.
-        operator, version = self._spec
-        if operator in ["==", ">=", "<=", "~=", "==="]:
-            # The == specifier can include a trailing .*, if it does we
-            # want to remove before parsing.
-            if operator == "==" and version.endswith(".*"):
-                version = version[:-2]
+        This is used for the ``in`` operator and behaves the same as
+        :meth:`contains` with no ``prereleases`` argument passed.
 
-            # Parse the version, and if it is a pre-release than this
-            # specifier allows pre-releases.
-            if parse(version).is_prerelease:
-                return True
+        >>> "1.2.3" in Specifier(">=1.2.3")
+        True
+        >>> Version("1.2.3") in Specifier(">=1.2.3")
+        True
+        >>> "1.0.0" in Specifier(">=1.2.3")
+        False
+        >>> "1.3.0a1" in Specifier(">=1.2.3")
+        False
+        >>> "1.3.0a1" in Specifier(">=1.2.3", prereleases=True)
+        True
+        """
+        return self.contains(item)
 
-        return False
+    def contains(
+        self, item: UnparsedVersion, prereleases: Optional[bool] = None
+    ) -> bool:
+        """Return whether or not the item is contained in this specifier.
+
+        :param item:
+            The item to check for, which can be a version string or a
+            :class:`Version` instance.
+        :param prereleases:
+            Whether or not to match prereleases with this Specifier. If set to
+            ``None`` (the default), it uses :attr:`prereleases` to determine
+            whether or not prereleases are allowed.
+
+        >>> Specifier(">=1.2.3").contains("1.2.3")
+        True
+        >>> Specifier(">=1.2.3").contains(Version("1.2.3"))
+        True
+        >>> Specifier(">=1.2.3").contains("1.0.0")
+        False
+        >>> Specifier(">=1.2.3").contains("1.3.0a1")
+        False
+        >>> Specifier(">=1.2.3", prereleases=True).contains("1.3.0a1")
+        True
+        >>> Specifier(">=1.2.3").contains("1.3.0a1", prereleases=True)
+        True
+        """
 
-    @prereleases.setter
-    def prereleases(self, value: bool) -> None:
-        self._prereleases = value
+        # Determine if prereleases are to be allowed or not.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # Normalize item to a Version, this allows us to have a shortcut for
+        # "2.0" in Specifier(">=2")
+        normalized_item = _coerce_version(item)
+
+        # Determine if we should be supporting prereleases in this specifier
+        # or not, if we do not support prereleases than we can short circuit
+        # logic if this version is a prereleases.
+        if normalized_item.is_prerelease and not prereleases:
+            return False
+
+        # Actually do the comparison to determine if this item is contained
+        # within this Specifier or not.
+        operator_callable: CallableOperator = self._get_operator(self.operator)
+        return operator_callable(normalized_item, self.version)
+
+    def filter(
+        self, iterable: Iterable[UnparsedVersionVar], prereleases: Optional[bool] = None
+    ) -> Iterator[UnparsedVersionVar]:
+        """Filter items in the given iterable, that match the specifier.
+
+        :param iterable:
+            An iterable that can contain version strings and :class:`Version` instances.
+            The items in the iterable will be filtered according to the specifier.
+        :param prereleases:
+            Whether or not to allow prereleases in the returned iterator. If set to
+            ``None`` (the default), it will be intelligently decide whether to allow
+            prereleases or not (based on the :attr:`prereleases` attribute, and
+            whether the only versions matching are prereleases).
+
+        This method is smarter than just ``filter(Specifier().contains, [...])``
+        because it implements the rule from :pep:`440` that a prerelease item
+        SHOULD be accepted if no other versions match the given specifier.
+
+        >>> list(Specifier(">=1.2.3").filter(["1.2", "1.3", "1.5a1"]))
+        ['1.3']
+        >>> list(Specifier(">=1.2.3").filter(["1.2", "1.2.3", "1.3", Version("1.4")]))
+        ['1.2.3', '1.3', ]
+        >>> list(Specifier(">=1.2.3").filter(["1.2", "1.5a1"]))
+        ['1.5a1']
+        >>> list(Specifier(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True))
+        ['1.3', '1.5a1']
+        >>> list(Specifier(">=1.2.3", prereleases=True).filter(["1.3", "1.5a1"]))
+        ['1.3', '1.5a1']
+        """
+
+        yielded = False
+        found_prereleases = []
+
+        kw = {"prereleases": prereleases if prereleases is not None else True}
+
+        # Attempt to iterate over all the values in the iterable and if any of
+        # them match, yield them.
+        for version in iterable:
+            parsed_version = _coerce_version(version)
+
+            if self.contains(parsed_version, **kw):
+                # If our version is a prerelease, and we were not set to allow
+                # prereleases, then we'll store it for later in case nothing
+                # else matches this specifier.
+                if parsed_version.is_prerelease and not (
+                    prereleases or self.prereleases
+                ):
+                    found_prereleases.append(version)
+                # Either this is not a prerelease, or we should have been
+                # accepting prereleases from the beginning.
+                else:
+                    yielded = True
+                    yield version
+
+        # Now that we've iterated over everything, determine if we've yielded
+        # any values, and if we have not and we have any prereleases stored up
+        # then we will go ahead and yield the prereleases.
+        if not yielded and found_prereleases:
+            for version in found_prereleases:
+                yield version
 
 
 _prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
@@ -618,22 +679,39 @@ def _pad_version(left: List[str], right: List[str]) -> Tuple[List[str], List[str
 
 
 class SpecifierSet(BaseSpecifier):
+    """This class abstracts handling of a set of version specifiers.
+
+    It can be passed a single specifier (``>=3.0``), a comma-separated list of
+    specifiers (``>=3.0,!=3.1``), or no specifier at all.
+    """
+
     def __init__(
         self, specifiers: str = "", prereleases: Optional[bool] = None
     ) -> None:
+        """Initialize a SpecifierSet instance.
+
+        :param specifiers:
+            The string representation of a specifier or a comma-separated list of
+            specifiers which will be parsed and normalized before use.
+        :param prereleases:
+            This tells the SpecifierSet if it should accept prerelease versions if
+            applicable or not. The default of ``None`` will autodetect it from the
+            given specifiers.
+
+        :raises InvalidSpecifier:
+            If the given ``specifiers`` are not parseable than this exception will be
+            raised.
+        """
 
-        # Split on , to break each individual specifier into it's own item, and
+        # Split on `,` to break each individual specifier into it's own item, and
         # strip each item to remove leading/trailing whitespace.
         split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
 
         # Parsed each individual specifier, attempting first to make it a
-        # Specifier and falling back to a LegacySpecifier.
-        parsed: Set[_IndividualSpecifier] = set()
+        # Specifier.
+        parsed: Set[Specifier] = set()
         for specifier in split_specifiers:
-            try:
-                parsed.add(Specifier(specifier))
-            except InvalidSpecifier:
-                parsed.add(LegacySpecifier(specifier))
+            parsed.add(Specifier(specifier))
 
         # Turn our parsed specifiers into a frozen set and save them for later.
         self._specs = frozenset(parsed)
@@ -642,7 +720,40 @@ def __init__(
         # we accept prereleases or not.
         self._prereleases = prereleases
 
+    @property
+    def prereleases(self) -> Optional[bool]:
+        # If we have been given an explicit prerelease modifier, then we'll
+        # pass that through here.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # If we don't have any specifiers, and we don't have a forced value,
+        # then we'll just return None since we don't know if this should have
+        # pre-releases or not.
+        if not self._specs:
+            return None
+
+        # Otherwise we'll see if any of the given specifiers accept
+        # prereleases, if any of them do we'll return True, otherwise False.
+        return any(s.prereleases for s in self._specs)
+
+    @prereleases.setter
+    def prereleases(self, value: bool) -> None:
+        self._prereleases = value
+
     def __repr__(self) -> str:
+        """A representation of the specifier set that shows all internal state.
+
+        Note that the ordering of the individual specifiers within the set may not
+        match the input string.
+
+        >>> SpecifierSet('>=1.0.0,!=2.0.0')
+        =1.0.0')>
+        >>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=False)
+        =1.0.0', prereleases=False)>
+        >>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=True)
+        =1.0.0', prereleases=True)>
+        """
         pre = (
             f", prereleases={self.prereleases!r}"
             if self._prereleases is not None
@@ -652,12 +763,31 @@ def __repr__(self) -> str:
         return f""
 
     def __str__(self) -> str:
+        """A string representation of the specifier set that can be round-tripped.
+
+        Note that the ordering of the individual specifiers within the set may not
+        match the input string.
+
+        >>> str(SpecifierSet(">=1.0.0,!=1.0.1"))
+        '!=1.0.1,>=1.0.0'
+        >>> str(SpecifierSet(">=1.0.0,!=1.0.1", prereleases=False))
+        '!=1.0.1,>=1.0.0'
+        """
         return ",".join(sorted(str(s) for s in self._specs))
 
     def __hash__(self) -> int:
         return hash(self._specs)
 
     def __and__(self, other: Union["SpecifierSet", str]) -> "SpecifierSet":
+        """Return a SpecifierSet which is a combination of the two sets.
+
+        :param other: The other object to combine with.
+
+        >>> SpecifierSet(">=1.0.0,!=1.0.1") & '<=2.0.0,!=2.0.1'
+        =1.0.0')>
+        >>> SpecifierSet(">=1.0.0,!=1.0.1") & SpecifierSet('<=2.0.0,!=2.0.1')
+        =1.0.0')>
+        """
         if isinstance(other, str):
             other = SpecifierSet(other)
         elif not isinstance(other, SpecifierSet):
@@ -681,7 +811,25 @@ def __and__(self, other: Union["SpecifierSet", str]) -> "SpecifierSet":
         return specifier
 
     def __eq__(self, other: object) -> bool:
-        if isinstance(other, (str, _IndividualSpecifier)):
+        """Whether or not the two SpecifierSet-like objects are equal.
+
+        :param other: The other object to check against.
+
+        The value of :attr:`prereleases` is ignored.
+
+        >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0,!=1.0.1")
+        True
+        >>> (SpecifierSet(">=1.0.0,!=1.0.1", prereleases=False) ==
+        ...  SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True))
+        True
+        >>> SpecifierSet(">=1.0.0,!=1.0.1") == ">=1.0.0,!=1.0.1"
+        True
+        >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0")
+        False
+        >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0,!=1.0.2")
+        False
+        """
+        if isinstance(other, (str, Specifier)):
             other = SpecifierSet(str(other))
         elif not isinstance(other, SpecifierSet):
             return NotImplemented
@@ -689,43 +837,72 @@ def __eq__(self, other: object) -> bool:
         return self._specs == other._specs
 
     def __len__(self) -> int:
+        """Returns the number of specifiers in this specifier set."""
         return len(self._specs)
 
-    def __iter__(self) -> Iterator[_IndividualSpecifier]:
-        return iter(self._specs)
-
-    @property
-    def prereleases(self) -> Optional[bool]:
-
-        # If we have been given an explicit prerelease modifier, then we'll
-        # pass that through here.
-        if self._prereleases is not None:
-            return self._prereleases
-
-        # If we don't have any specifiers, and we don't have a forced value,
-        # then we'll just return None since we don't know if this should have
-        # pre-releases or not.
-        if not self._specs:
-            return None
-
-        # Otherwise we'll see if any of the given specifiers accept
-        # prereleases, if any of them do we'll return True, otherwise False.
-        return any(s.prereleases for s in self._specs)
+    def __iter__(self) -> Iterator[Specifier]:
+        """
+        Returns an iterator over all the underlying :class:`Specifier` instances
+        in this specifier set.
 
-    @prereleases.setter
-    def prereleases(self, value: bool) -> None:
-        self._prereleases = value
+        >>> sorted(SpecifierSet(">=1.0.0,!=1.0.1"), key=str)
+        [, =1.0.0')>]
+        """
+        return iter(self._specs)
 
     def __contains__(self, item: UnparsedVersion) -> bool:
+        """Return whether or not the item is contained in this specifier.
+
+        :param item: The item to check for.
+
+        This is used for the ``in`` operator and behaves the same as
+        :meth:`contains` with no ``prereleases`` argument passed.
+
+        >>> "1.2.3" in SpecifierSet(">=1.0.0,!=1.0.1")
+        True
+        >>> Version("1.2.3") in SpecifierSet(">=1.0.0,!=1.0.1")
+        True
+        >>> "1.0.1" in SpecifierSet(">=1.0.0,!=1.0.1")
+        False
+        >>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1")
+        False
+        >>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True)
+        True
+        """
         return self.contains(item)
 
     def contains(
-        self, item: UnparsedVersion, prereleases: Optional[bool] = None
+        self,
+        item: UnparsedVersion,
+        prereleases: Optional[bool] = None,
+        installed: Optional[bool] = None,
     ) -> bool:
-
-        # Ensure that our item is a Version or LegacyVersion instance.
-        if not isinstance(item, (LegacyVersion, Version)):
-            item = parse(item)
+        """Return whether or not the item is contained in this SpecifierSet.
+
+        :param item:
+            The item to check for, which can be a version string or a
+            :class:`Version` instance.
+        :param prereleases:
+            Whether or not to match prereleases with this SpecifierSet. If set to
+            ``None`` (the default), it uses :attr:`prereleases` to determine
+            whether or not prereleases are allowed.
+
+        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.2.3")
+        True
+        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains(Version("1.2.3"))
+        True
+        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.0.1")
+        False
+        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.3.0a1")
+        False
+        >>> SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True).contains("1.3.0a1")
+        True
+        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.3.0a1", prereleases=True)
+        True
+        """
+        # Ensure that our item is a Version instance.
+        if not isinstance(item, Version):
+            item = Version(item)
 
         # Determine if we're forcing a prerelease or not, if we're not forcing
         # one for this particular filter call, then we'll use whatever the
@@ -742,6 +919,9 @@ def contains(
         if not prereleases and item.is_prerelease:
             return False
 
+        if installed and item.is_prerelease:
+            item = Version(item.base_version)
+
         # We simply dispatch to the underlying specs here to make sure that the
         # given version is contained within all of them.
         # Note: This use of all() here means that an empty set of specifiers
@@ -749,9 +929,46 @@ def contains(
         return all(s.contains(item, prereleases=prereleases) for s in self._specs)
 
     def filter(
-        self, iterable: Iterable[VersionTypeVar], prereleases: Optional[bool] = None
-    ) -> Iterable[VersionTypeVar]:
-
+        self, iterable: Iterable[UnparsedVersionVar], prereleases: Optional[bool] = None
+    ) -> Iterator[UnparsedVersionVar]:
+        """Filter items in the given iterable, that match the specifiers in this set.
+
+        :param iterable:
+            An iterable that can contain version strings and :class:`Version` instances.
+            The items in the iterable will be filtered according to the specifier.
+        :param prereleases:
+            Whether or not to allow prereleases in the returned iterator. If set to
+            ``None`` (the default), it will be intelligently decide whether to allow
+            prereleases or not (based on the :attr:`prereleases` attribute, and
+            whether the only versions matching are prereleases).
+
+        This method is smarter than just ``filter(SpecifierSet(...).contains, [...])``
+        because it implements the rule from :pep:`440` that a prerelease item
+        SHOULD be accepted if no other versions match the given specifier.
+
+        >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", "1.5a1"]))
+        ['1.3']
+        >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", Version("1.4")]))
+        ['1.3', ]
+        >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.5a1"]))
+        []
+        >>> list(SpecifierSet(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True))
+        ['1.3', '1.5a1']
+        >>> list(SpecifierSet(">=1.2.3", prereleases=True).filter(["1.3", "1.5a1"]))
+        ['1.3', '1.5a1']
+
+        An "empty" SpecifierSet will filter items based on the presence of prerelease
+        versions in the set.
+
+        >>> list(SpecifierSet("").filter(["1.3", "1.5a1"]))
+        ['1.3']
+        >>> list(SpecifierSet("").filter(["1.5a1"]))
+        ['1.5a1']
+        >>> list(SpecifierSet("", prereleases=True).filter(["1.3", "1.5a1"]))
+        ['1.3', '1.5a1']
+        >>> list(SpecifierSet("").filter(["1.3", "1.5a1"], prereleases=True))
+        ['1.3', '1.5a1']
+        """
         # Determine if we're forcing a prerelease or not, if we're not forcing
         # one for this particular filter call, then we'll use whatever the
         # SpecifierSet thinks for whether or not we should support prereleases.
@@ -764,27 +981,16 @@ def filter(
         if self._specs:
             for spec in self._specs:
                 iterable = spec.filter(iterable, prereleases=bool(prereleases))
-            return iterable
+            return iter(iterable)
         # If we do not have any specifiers, then we need to have a rough filter
         # which will filter out any pre-releases, unless there are no final
-        # releases, and which will filter out LegacyVersion in general.
+        # releases.
         else:
-            filtered: List[VersionTypeVar] = []
-            found_prereleases: List[VersionTypeVar] = []
-
-            item: UnparsedVersion
-            parsed_version: Union[Version, LegacyVersion]
+            filtered: List[UnparsedVersionVar] = []
+            found_prereleases: List[UnparsedVersionVar] = []
 
             for item in iterable:
-                # Ensure that we some kind of Version class for this item.
-                if not isinstance(item, (LegacyVersion, Version)):
-                    parsed_version = parse(item)
-                else:
-                    parsed_version = item
-
-                # Filter out any item which is parsed as a LegacyVersion
-                if isinstance(parsed_version, LegacyVersion):
-                    continue
+                parsed_version = _coerce_version(item)
 
                 # Store any item which is a pre-release for later unless we've
                 # already found a final version or we are accepting prereleases
@@ -797,6 +1003,6 @@ def filter(
             # If we've found no items except for pre-releases, then we'll go
             # ahead and use the pre-releases
             if not filtered and found_prereleases and prereleases is None:
-                return found_prereleases
+                return iter(found_prereleases)
 
-            return filtered
+            return iter(filtered)
diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
index 9a3d25a71c7..37f33b1ef84 100644
--- a/src/pip/_vendor/packaging/tags.py
+++ b/src/pip/_vendor/packaging/tags.py
@@ -4,6 +4,8 @@
 
 import logging
 import platform
+import struct
+import subprocess
 import sys
 import sysconfig
 from importlib.machinery import EXTENSION_SUFFIXES
@@ -36,7 +38,7 @@
 }
 
 
-_32_BIT_INTERPRETER = sys.maxsize <= 2 ** 32
+_32_BIT_INTERPRETER = struct.calcsize("P") == 4
 
 
 class Tag:
@@ -110,7 +112,7 @@ def parse_tag(tag: str) -> FrozenSet[Tag]:
 
 
 def _get_config_var(name: str, warn: bool = False) -> Union[int, str, None]:
-    value = sysconfig.get_config_var(name)
+    value: Union[int, str, None] = sysconfig.get_config_var(name)
     if value is None and warn:
         logger.debug(
             "Config variable '%s' is unset, Python ABI tag may be incorrect", name
@@ -119,7 +121,7 @@ def _get_config_var(name: str, warn: bool = False) -> Union[int, str, None]:
 
 
 def _normalize_string(string: str) -> str:
-    return string.replace(".", "_").replace("-", "_")
+    return string.replace(".", "_").replace("-", "_").replace(" ", "_")
 
 
 def _abi3_applies(python_version: PythonVersion) -> bool:
@@ -224,10 +226,45 @@ def cpython_tags(
                 yield Tag(interpreter, "abi3", platform_)
 
 
-def _generic_abi() -> Iterator[str]:
-    abi = sysconfig.get_config_var("SOABI")
-    if abi:
-        yield _normalize_string(abi)
+def _generic_abi() -> List[str]:
+    """
+    Return the ABI tag based on EXT_SUFFIX.
+    """
+    # The following are examples of `EXT_SUFFIX`.
+    # We want to keep the parts which are related to the ABI and remove the
+    # parts which are related to the platform:
+    # - linux:   '.cpython-310-x86_64-linux-gnu.so' => cp310
+    # - mac:     '.cpython-310-darwin.so'           => cp310
+    # - win:     '.cp310-win_amd64.pyd'             => cp310
+    # - win:     '.pyd'                             => cp37 (uses _cpython_abis())
+    # - pypy:    '.pypy38-pp73-x86_64-linux-gnu.so' => pypy38_pp73
+    # - graalpy: '.graalpy-38-native-x86_64-darwin.dylib'
+    #                                               => graalpy_38_native
+
+    ext_suffix = _get_config_var("EXT_SUFFIX", warn=True)
+    if not isinstance(ext_suffix, str) or ext_suffix[0] != ".":
+        raise SystemError("invalid sysconfig.get_config_var('EXT_SUFFIX')")
+    parts = ext_suffix.split(".")
+    if len(parts) < 3:
+        # CPython3.7 and earlier uses ".pyd" on Windows.
+        return _cpython_abis(sys.version_info[:2])
+    soabi = parts[1]
+    if soabi.startswith("cpython"):
+        # non-windows
+        abi = "cp" + soabi.split("-")[1]
+    elif soabi.startswith("cp"):
+        # windows
+        abi = soabi.split("-")[0]
+    elif soabi.startswith("pypy"):
+        abi = "-".join(soabi.split("-")[:2])
+    elif soabi.startswith("graalpy"):
+        abi = "-".join(soabi.split("-")[:3])
+    elif soabi:
+        # pyston, ironpython, others?
+        abi = soabi
+    else:
+        return []
+    return [_normalize_string(abi)]
 
 
 def generic_tags(
@@ -251,8 +288,9 @@ def generic_tags(
         interpreter = "".join([interp_name, interp_version])
     if abis is None:
         abis = _generic_abi()
+    else:
+        abis = list(abis)
     platforms = list(platforms or platform_tags())
-    abis = list(abis)
     if "none" not in abis:
         abis.append("none")
     for abi in abis:
@@ -356,6 +394,22 @@ def mac_platforms(
     version_str, _, cpu_arch = platform.mac_ver()
     if version is None:
         version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
+        if version == (10, 16):
+            # When built against an older macOS SDK, Python will report macOS 10.16
+            # instead of the real version.
+            version_str = subprocess.run(
+                [
+                    sys.executable,
+                    "-sS",
+                    "-c",
+                    "import platform; print(platform.mac_ver()[0])",
+                ],
+                check=True,
+                env={"SYSTEM_VERSION_COMPAT": "0"},
+                stdout=subprocess.PIPE,
+                text=True,
+            ).stdout
+            version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
     else:
         version = version
     if arch is None:
@@ -416,15 +470,21 @@ def mac_platforms(
 
 def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
     linux = _normalize_string(sysconfig.get_platform())
+    if not linux.startswith("linux_"):
+        # we should never be here, just yield the sysconfig one and return
+        yield linux
+        return
     if is_32bit:
         if linux == "linux_x86_64":
             linux = "linux_i686"
         elif linux == "linux_aarch64":
-            linux = "linux_armv7l"
+            linux = "linux_armv8l"
     _, arch = linux.split("_", 1)
-    yield from _manylinux.platform_tags(linux, arch)
-    yield from _musllinux.platform_tags(arch)
-    yield linux
+    archs = {"armv8l": ["armv8l", "armv7l"]}.get(arch, [arch])
+    yield from _manylinux.platform_tags(archs)
+    yield from _musllinux.platform_tags(archs)
+    for arch in archs:
+        yield f"linux_{arch}"
 
 
 def _generic_platforms() -> Iterator[str]:
@@ -446,6 +506,9 @@ def platform_tags() -> Iterator[str]:
 def interpreter_name() -> str:
     """
     Returns the name of the running interpreter.
+
+    Some implementations have a reserved, two-letter abbreviation which will
+    be returned when appropriate.
     """
     name = sys.implementation.name
     return INTERPRETER_SHORT_NAMES.get(name) or name
@@ -482,6 +545,9 @@ def sys_tags(*, warn: bool = False) -> Iterator[Tag]:
         yield from generic_tags()
 
     if interp_name == "pp":
-        yield from compatible_tags(interpreter="pp3")
+        interp = "pp3"
+    elif interp_name == "cp":
+        interp = "cp" + interpreter_version(warn=warn)
     else:
-        yield from compatible_tags()
+        interp = None
+    yield from compatible_tags(interpreter=interp)
diff --git a/src/pip/_vendor/packaging/utils.py b/src/pip/_vendor/packaging/utils.py
index bab11b80c60..c2c2f75aa80 100644
--- a/src/pip/_vendor/packaging/utils.py
+++ b/src/pip/_vendor/packaging/utils.py
@@ -12,6 +12,12 @@
 NormalizedName = NewType("NormalizedName", str)
 
 
+class InvalidName(ValueError):
+    """
+    An invalid distribution name; users should refer to the packaging user guide.
+    """
+
+
 class InvalidWheelFilename(ValueError):
     """
     An invalid wheel filename was found, users should refer to PEP 427.
@@ -24,18 +30,31 @@ class InvalidSdistFilename(ValueError):
     """
 
 
+# Core metadata spec for `Name`
+_validate_regex = re.compile(
+    r"^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$", re.IGNORECASE
+)
 _canonicalize_regex = re.compile(r"[-_.]+")
+_normalized_regex = re.compile(r"^([a-z0-9]|[a-z0-9]([a-z0-9-](?!--))*[a-z0-9])$")
 # PEP 427: The build number must start with a digit.
 _build_tag_regex = re.compile(r"(\d+)(.*)")
 
 
-def canonicalize_name(name: str) -> NormalizedName:
+def canonicalize_name(name: str, *, validate: bool = False) -> NormalizedName:
+    if validate and not _validate_regex.match(name):
+        raise InvalidName(f"name is invalid: {name!r}")
     # This is taken from PEP 503.
     value = _canonicalize_regex.sub("-", name).lower()
     return cast(NormalizedName, value)
 
 
-def canonicalize_version(version: Union[Version, str]) -> str:
+def is_normalized_name(name: str) -> bool:
+    return _normalized_regex.match(name) is not None
+
+
+def canonicalize_version(
+    version: Union[Version, str], *, strip_trailing_zero: bool = True
+) -> str:
     """
     This is very similar to Version.__str__, but has one subtle difference
     with the way it handles the release segment.
@@ -56,8 +75,11 @@ def canonicalize_version(version: Union[Version, str]) -> str:
         parts.append(f"{parsed.epoch}!")
 
     # Release segment
-    # NB: This strips trailing '.0's to normalize
-    parts.append(re.sub(r"(\.0)+$", "", ".".join(str(x) for x in parsed.release)))
+    release_segment = ".".join(str(x) for x in parsed.release)
+    if strip_trailing_zero:
+        # NB: This strips trailing '.0's to normalize
+        release_segment = re.sub(r"(\.0)+$", "", release_segment)
+    parts.append(release_segment)
 
     # Pre-release
     if parsed.pre is not None:
@@ -95,11 +117,18 @@ def parse_wheel_filename(
 
     parts = filename.split("-", dashes - 2)
     name_part = parts[0]
-    # See PEP 427 for the rules on escaping the project name
+    # See PEP 427 for the rules on escaping the project name.
     if "__" in name_part or re.match(r"^[\w\d._]*$", name_part, re.UNICODE) is None:
         raise InvalidWheelFilename(f"Invalid project name: {filename}")
     name = canonicalize_name(name_part)
-    version = Version(parts[1])
+
+    try:
+        version = Version(parts[1])
+    except InvalidVersion as e:
+        raise InvalidWheelFilename(
+            f"Invalid wheel filename (invalid version): {filename}"
+        ) from e
+
     if dashes == 5:
         build_part = parts[2]
         build_match = _build_tag_regex.match(build_part)
@@ -132,5 +161,12 @@ def parse_sdist_filename(filename: str) -> Tuple[NormalizedName, Version]:
         raise InvalidSdistFilename(f"Invalid sdist filename: {filename}")
 
     name = canonicalize_name(name_part)
-    version = Version(version_part)
+
+    try:
+        version = Version(version_part)
+    except InvalidVersion as e:
+        raise InvalidSdistFilename(
+            f"Invalid sdist filename (invalid version): {filename}"
+        ) from e
+
     return (name, version)
diff --git a/src/pip/_vendor/packaging/version.py b/src/pip/_vendor/packaging/version.py
index de9a09a4ed3..6978e2843fa 100644
--- a/src/pip/_vendor/packaging/version.py
+++ b/src/pip/_vendor/packaging/version.py
@@ -1,64 +1,71 @@
 # This file is dual licensed under the terms of the Apache License, Version
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
+"""
+.. testsetup::
+
+    from pip._vendor.packaging.version import parse, Version
+"""
 
-import collections
 import itertools
 import re
-import warnings
-from typing import Callable, Iterator, List, Optional, SupportsInt, Tuple, Union
+from typing import Any, Callable, NamedTuple, Optional, SupportsInt, Tuple, Union
 
 from ._structures import Infinity, InfinityType, NegativeInfinity, NegativeInfinityType
 
-__all__ = ["parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"]
+__all__ = ["VERSION_PATTERN", "parse", "Version", "InvalidVersion"]
 
-InfiniteTypes = Union[InfinityType, NegativeInfinityType]
-PrePostDevType = Union[InfiniteTypes, Tuple[str, int]]
-SubLocalType = Union[InfiniteTypes, int, str]
-LocalType = Union[
+LocalType = Tuple[Union[int, str], ...]
+
+CmpPrePostDevType = Union[InfinityType, NegativeInfinityType, Tuple[str, int]]
+CmpLocalType = Union[
     NegativeInfinityType,
-    Tuple[
-        Union[
-            SubLocalType,
-            Tuple[SubLocalType, str],
-            Tuple[NegativeInfinityType, SubLocalType],
-        ],
-        ...,
-    ],
+    Tuple[Union[Tuple[int, str], Tuple[NegativeInfinityType, Union[int, str]]], ...],
 ]
 CmpKey = Tuple[
-    int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType
-]
-LegacyCmpKey = Tuple[int, Tuple[str, ...]]
-VersionComparisonMethod = Callable[
-    [Union[CmpKey, LegacyCmpKey], Union[CmpKey, LegacyCmpKey]], bool
+    int,
+    Tuple[int, ...],
+    CmpPrePostDevType,
+    CmpPrePostDevType,
+    CmpPrePostDevType,
+    CmpLocalType,
 ]
+VersionComparisonMethod = Callable[[CmpKey, CmpKey], bool]
 
-_Version = collections.namedtuple(
-    "_Version", ["epoch", "release", "dev", "pre", "post", "local"]
-)
 
+class _Version(NamedTuple):
+    epoch: int
+    release: Tuple[int, ...]
+    dev: Optional[Tuple[str, int]]
+    pre: Optional[Tuple[str, int]]
+    post: Optional[Tuple[str, int]]
+    local: Optional[LocalType]
 
-def parse(version: str) -> Union["LegacyVersion", "Version"]:
-    """
-    Parse the given version string and return either a :class:`Version` object
-    or a :class:`LegacyVersion` object depending on if the given version is
-    a valid PEP 440 version or a legacy version.
+
+def parse(version: str) -> "Version":
+    """Parse the given version string.
+
+    >>> parse('1.0.dev1')
+    
+
+    :param version: The version string to parse.
+    :raises InvalidVersion: When the version string is not a valid version.
     """
-    try:
-        return Version(version)
-    except InvalidVersion:
-        return LegacyVersion(version)
+    return Version(version)
 
 
 class InvalidVersion(ValueError):
-    """
-    An invalid version was found, users should refer to PEP 440.
+    """Raised when a version string is not a valid version.
+
+    >>> Version("invalid")
+    Traceback (most recent call last):
+        ...
+    packaging.version.InvalidVersion: Invalid version: 'invalid'
     """
 
 
 class _BaseVersion:
-    _key: Union[CmpKey, LegacyCmpKey]
+    _key: Tuple[Any, ...]
 
     def __hash__(self) -> int:
         return hash(self._key)
@@ -103,133 +110,16 @@ def __ne__(self, other: object) -> bool:
         return self._key != other._key
 
 
-class LegacyVersion(_BaseVersion):
-    def __init__(self, version: str) -> None:
-        self._version = str(version)
-        self._key = _legacy_cmpkey(self._version)
-
-        warnings.warn(
-            "Creating a LegacyVersion has been deprecated and will be "
-            "removed in the next major release",
-            DeprecationWarning,
-        )
-
-    def __str__(self) -> str:
-        return self._version
-
-    def __repr__(self) -> str:
-        return f""
-
-    @property
-    def public(self) -> str:
-        return self._version
-
-    @property
-    def base_version(self) -> str:
-        return self._version
-
-    @property
-    def epoch(self) -> int:
-        return -1
-
-    @property
-    def release(self) -> None:
-        return None
-
-    @property
-    def pre(self) -> None:
-        return None
-
-    @property
-    def post(self) -> None:
-        return None
-
-    @property
-    def dev(self) -> None:
-        return None
-
-    @property
-    def local(self) -> None:
-        return None
-
-    @property
-    def is_prerelease(self) -> bool:
-        return False
-
-    @property
-    def is_postrelease(self) -> bool:
-        return False
-
-    @property
-    def is_devrelease(self) -> bool:
-        return False
-
-
-_legacy_version_component_re = re.compile(r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE)
-
-_legacy_version_replacement_map = {
-    "pre": "c",
-    "preview": "c",
-    "-": "final-",
-    "rc": "c",
-    "dev": "@",
-}
-
-
-def _parse_version_parts(s: str) -> Iterator[str]:
-    for part in _legacy_version_component_re.split(s):
-        part = _legacy_version_replacement_map.get(part, part)
-
-        if not part or part == ".":
-            continue
-
-        if part[:1] in "0123456789":
-            # pad for numeric comparison
-            yield part.zfill(8)
-        else:
-            yield "*" + part
-
-    # ensure that alpha/beta/candidate are before final
-    yield "*final"
-
-
-def _legacy_cmpkey(version: str) -> LegacyCmpKey:
-
-    # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
-    # greater than or equal to 0. This will effectively put the LegacyVersion,
-    # which uses the defacto standard originally implemented by setuptools,
-    # as before all PEP 440 versions.
-    epoch = -1
-
-    # This scheme is taken from pkg_resources.parse_version setuptools prior to
-    # it's adoption of the packaging library.
-    parts: List[str] = []
-    for part in _parse_version_parts(version.lower()):
-        if part.startswith("*"):
-            # remove "-" before a prerelease tag
-            if part < "*final":
-                while parts and parts[-1] == "*final-":
-                    parts.pop()
-
-            # remove trailing zeros from each series of numeric parts
-            while parts and parts[-1] == "00000000":
-                parts.pop()
-
-        parts.append(part)
-
-    return epoch, tuple(parts)
-
-
 # Deliberately not anchored to the start and end of the string, to make it
 # easier for 3rd party code to reuse
-VERSION_PATTERN = r"""
+_VERSION_PATTERN = r"""
     v?
     (?:
         (?:(?P[0-9]+)!)?                           # epoch
         (?P[0-9]+(?:\.[0-9]+)*)                  # release segment
         (?P
                                          # pre-release
             [-_\.]?
-            (?P(a|b|c|rc|alpha|beta|pre|preview))
+            (?Palpha|a|beta|b|preview|pre|c|rc)
             [-_\.]?
             (?P[0-9]+)?
         )?
@@ -253,12 +143,56 @@ def _legacy_cmpkey(version: str) -> LegacyCmpKey:
     (?:\+(?P[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
 """
 
+VERSION_PATTERN = _VERSION_PATTERN
+"""
+A string containing the regular expression used to match a valid version.
+
+The pattern is not anchored at either end, and is intended for embedding in larger
+expressions (for example, matching a version number as part of a file name). The
+regular expression should be compiled with the ``re.VERBOSE`` and ``re.IGNORECASE``
+flags set.
+
+:meta hide-value:
+"""
+
 
 class Version(_BaseVersion):
+    """This class abstracts handling of a project's versions.
+
+    A :class:`Version` instance is comparison aware and can be compared and
+    sorted using the standard Python interfaces.
+
+    >>> v1 = Version("1.0a5")
+    >>> v2 = Version("1.0")
+    >>> v1
+    
+    >>> v2
+    
+    >>> v1 < v2
+    True
+    >>> v1 == v2
+    False
+    >>> v1 > v2
+    False
+    >>> v1 >= v2
+    False
+    >>> v1 <= v2
+    True
+    """
 
     _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
+    _key: CmpKey
 
     def __init__(self, version: str) -> None:
+        """Initialize a Version object.
+
+        :param version:
+            The string representation of a version which will be parsed and normalized
+            before use.
+        :raises InvalidVersion:
+            If the ``version`` does not conform to PEP 440 in any way then this
+            exception will be raised.
+        """
 
         # Validate the version and parse it into pieces
         match = self._regex.search(version)
@@ -288,9 +222,19 @@ def __init__(self, version: str) -> None:
         )
 
     def __repr__(self) -> str:
+        """A representation of the Version that shows all internal state.
+
+        >>> Version('1.0.0')
+        
+        """
         return f""
 
     def __str__(self) -> str:
+        """A string representation of the version that can be rounded-tripped.
+
+        >>> str(Version("1.0a5"))
+        '1.0a5'
+        """
         parts = []
 
         # Epoch
@@ -320,29 +264,77 @@ def __str__(self) -> str:
 
     @property
     def epoch(self) -> int:
-        _epoch: int = self._version.epoch
-        return _epoch
+        """The epoch of the version.
+
+        >>> Version("2.0.0").epoch
+        0
+        >>> Version("1!2.0.0").epoch
+        1
+        """
+        return self._version.epoch
 
     @property
     def release(self) -> Tuple[int, ...]:
-        _release: Tuple[int, ...] = self._version.release
-        return _release
+        """The components of the "release" segment of the version.
+
+        >>> Version("1.2.3").release
+        (1, 2, 3)
+        >>> Version("2.0.0").release
+        (2, 0, 0)
+        >>> Version("1!2.0.0.post0").release
+        (2, 0, 0)
+
+        Includes trailing zeroes but not the epoch or any pre-release / development /
+        post-release suffixes.
+        """
+        return self._version.release
 
     @property
     def pre(self) -> Optional[Tuple[str, int]]:
-        _pre: Optional[Tuple[str, int]] = self._version.pre
-        return _pre
+        """The pre-release segment of the version.
+
+        >>> print(Version("1.2.3").pre)
+        None
+        >>> Version("1.2.3a1").pre
+        ('a', 1)
+        >>> Version("1.2.3b1").pre
+        ('b', 1)
+        >>> Version("1.2.3rc1").pre
+        ('rc', 1)
+        """
+        return self._version.pre
 
     @property
     def post(self) -> Optional[int]:
+        """The post-release number of the version.
+
+        >>> print(Version("1.2.3").post)
+        None
+        >>> Version("1.2.3.post1").post
+        1
+        """
         return self._version.post[1] if self._version.post else None
 
     @property
     def dev(self) -> Optional[int]:
+        """The development number of the version.
+
+        >>> print(Version("1.2.3").dev)
+        None
+        >>> Version("1.2.3.dev1").dev
+        1
+        """
         return self._version.dev[1] if self._version.dev else None
 
     @property
     def local(self) -> Optional[str]:
+        """The local version segment of the version.
+
+        >>> print(Version("1.2.3").local)
+        None
+        >>> Version("1.2.3+abc").local
+        'abc'
+        """
         if self._version.local:
             return ".".join(str(x) for x in self._version.local)
         else:
@@ -350,10 +342,31 @@ def local(self) -> Optional[str]:
 
     @property
     def public(self) -> str:
+        """The public portion of the version.
+
+        >>> Version("1.2.3").public
+        '1.2.3'
+        >>> Version("1.2.3+abc").public
+        '1.2.3'
+        >>> Version("1.2.3+abc.dev1").public
+        '1.2.3'
+        """
         return str(self).split("+", 1)[0]
 
     @property
     def base_version(self) -> str:
+        """The "base version" of the version.
+
+        >>> Version("1.2.3").base_version
+        '1.2.3'
+        >>> Version("1.2.3+abc").base_version
+        '1.2.3'
+        >>> Version("1!1.2.3+abc.dev1").base_version
+        '1!1.2.3'
+
+        The "base version" is the public version of the project without any pre or post
+        release markers.
+        """
         parts = []
 
         # Epoch
@@ -367,31 +380,77 @@ def base_version(self) -> str:
 
     @property
     def is_prerelease(self) -> bool:
+        """Whether this version is a pre-release.
+
+        >>> Version("1.2.3").is_prerelease
+        False
+        >>> Version("1.2.3a1").is_prerelease
+        True
+        >>> Version("1.2.3b1").is_prerelease
+        True
+        >>> Version("1.2.3rc1").is_prerelease
+        True
+        >>> Version("1.2.3dev1").is_prerelease
+        True
+        """
         return self.dev is not None or self.pre is not None
 
     @property
     def is_postrelease(self) -> bool:
+        """Whether this version is a post-release.
+
+        >>> Version("1.2.3").is_postrelease
+        False
+        >>> Version("1.2.3.post1").is_postrelease
+        True
+        """
         return self.post is not None
 
     @property
     def is_devrelease(self) -> bool:
+        """Whether this version is a development release.
+
+        >>> Version("1.2.3").is_devrelease
+        False
+        >>> Version("1.2.3.dev1").is_devrelease
+        True
+        """
         return self.dev is not None
 
     @property
     def major(self) -> int:
+        """The first item of :attr:`release` or ``0`` if unavailable.
+
+        >>> Version("1.2.3").major
+        1
+        """
         return self.release[0] if len(self.release) >= 1 else 0
 
     @property
     def minor(self) -> int:
+        """The second item of :attr:`release` or ``0`` if unavailable.
+
+        >>> Version("1.2.3").minor
+        2
+        >>> Version("1").minor
+        0
+        """
         return self.release[1] if len(self.release) >= 2 else 0
 
     @property
     def micro(self) -> int:
+        """The third item of :attr:`release` or ``0`` if unavailable.
+
+        >>> Version("1.2.3").micro
+        3
+        >>> Version("1").micro
+        0
+        """
         return self.release[2] if len(self.release) >= 3 else 0
 
 
 def _parse_letter_version(
-    letter: str, number: Union[str, bytes, SupportsInt]
+    letter: Optional[str], number: Union[str, bytes, SupportsInt, None]
 ) -> Optional[Tuple[str, int]]:
 
     if letter:
@@ -429,7 +488,7 @@ def _parse_letter_version(
 _local_version_separators = re.compile(r"[\._-]")
 
 
-def _parse_local_version(local: str) -> Optional[LocalType]:
+def _parse_local_version(local: Optional[str]) -> Optional[LocalType]:
     """
     Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
     """
@@ -447,7 +506,7 @@ def _cmpkey(
     pre: Optional[Tuple[str, int]],
     post: Optional[Tuple[str, int]],
     dev: Optional[Tuple[str, int]],
-    local: Optional[Tuple[SubLocalType]],
+    local: Optional[LocalType],
 ) -> CmpKey:
 
     # When we compare a release version, we want to compare it with all of the
@@ -464,7 +523,7 @@ def _cmpkey(
     # if there is not a pre or a post segment. If we have one of those then
     # the normal sorting rules will handle this case correctly.
     if pre is None and post is None and dev is not None:
-        _pre: PrePostDevType = NegativeInfinity
+        _pre: CmpPrePostDevType = NegativeInfinity
     # Versions without a pre-release (except as noted above) should sort after
     # those with one.
     elif pre is None:
@@ -474,21 +533,21 @@ def _cmpkey(
 
     # Versions without a post segment should sort before those with one.
     if post is None:
-        _post: PrePostDevType = NegativeInfinity
+        _post: CmpPrePostDevType = NegativeInfinity
 
     else:
         _post = post
 
     # Versions without a development segment should sort after those with one.
     if dev is None:
-        _dev: PrePostDevType = Infinity
+        _dev: CmpPrePostDevType = Infinity
 
     else:
         _dev = dev
 
     if local is None:
         # Versions without a local segment should sort before those with one.
-        _local: LocalType = NegativeInfinity
+        _local: CmpLocalType = NegativeInfinity
     else:
         # Versions with a local segment need that segment parsed to implement
         # the sorting rules in PEP440.
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index e9694adc037..c892f8d4ad0 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -3,7 +3,7 @@ colorama==0.4.6
 distlib==0.3.8
 distro==1.9.0
 msgpack==1.0.8
-packaging==21.3
+packaging==23.2
 platformdirs==4.2.1
 pyparsing==3.1.2
 pyproject-hooks==1.0.0

From 335f01cbfb16f8f07047f42f8a50687ee354bdaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Fri, 29 Sep 2023 22:20:56 +0200
Subject: [PATCH 363/992] Fix test?

---
 tests/unit/metadata/test_metadata_pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/metadata/test_metadata_pkg_resources.py b/tests/unit/metadata/test_metadata_pkg_resources.py
index ab1a56107f4..69efa209fdf 100644
--- a/tests/unit/metadata/test_metadata_pkg_resources.py
+++ b/tests/unit/metadata/test_metadata_pkg_resources.py
@@ -82,7 +82,7 @@ def test_wheel_metadata_works() -> None:
     name = "simple"
     version = "0.1.0"
     require_a = "a==1.0"
-    require_b = 'b==1.1; extra == "also_b"'
+    require_b = 'b==1.1; extra == "also-b"'
     requires = [require_a, require_b, 'c==1.2; extra == "also_c"']
     extras = ["also_b", "also_c"]
     requires_python = ">=3"

From 87bda4b14a799e8b14f8736b6947bac48b0a748a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Fri, 29 Sep 2023 22:48:08 +0200
Subject: [PATCH 364/992] Rename invalid sdists in our test data

---
 ...e-0.1.1.tar.gz => pip_test_package-0.1.1.tar.gz} | Bin
 ...ckage-0.1.tar.gz => pip_test_package-0.1.tar.gz} | Bin
 tests/functional/test_install.py                    |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/data/packages/{pip-test-package-0.1.1.tar.gz => pip_test_package-0.1.1.tar.gz} (100%)
 rename tests/data/packages/{pip-test-package-0.1.tar.gz => pip_test_package-0.1.tar.gz} (100%)

diff --git a/tests/data/packages/pip-test-package-0.1.1.tar.gz b/tests/data/packages/pip_test_package-0.1.1.tar.gz
similarity index 100%
rename from tests/data/packages/pip-test-package-0.1.1.tar.gz
rename to tests/data/packages/pip_test_package-0.1.1.tar.gz
diff --git a/tests/data/packages/pip-test-package-0.1.tar.gz b/tests/data/packages/pip_test_package-0.1.tar.gz
similarity index 100%
rename from tests/data/packages/pip-test-package-0.1.tar.gz
rename to tests/data/packages/pip_test_package-0.1.tar.gz
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index b65212f929c..5ec07e7c456 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -391,7 +391,7 @@ def test_install_editable_uninstalls_existing(
     https://github.com/pypa/pip/issues/1548
     https://github.com/pypa/pip/pull/1552
     """
-    to_install = data.packages.joinpath("pip-test-package-0.1.tar.gz")
+    to_install = data.packages.joinpath("pip_test_package-0.1.tar.gz")
     result = script.pip_install_local(to_install)
     assert "Successfully installed pip-test-package" in result.stdout
     result.assert_installed("piptestpackage", editable=False)

From 3b012210a0f98a567b53eea8316778ca56ef2b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Fri, 29 Sep 2023 22:52:12 +0200
Subject: [PATCH 365/992] Fix test following stricter version specifiers
 parsing

---
 tests/functional/test_install.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 5ec07e7c456..eaea12a163c 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -2253,14 +2253,14 @@ def test_yanked_version_missing_from_availble_versions_error_message(
     """
     result = script.pip(
         "install",
-        "simple==",
+        "simple==0.1",
         "--index-url",
         data.index_url("yanked"),
         expect_error=True,
     )
     # the yanked version (3.0) is filtered out from the output:
     expected_warning = (
-        "Could not find a version that satisfies the requirement simple== "
+        "Could not find a version that satisfies the requirement simple==0.1 "
         "(from versions: 1.0, 2.0)"
     )
     assert expected_warning in result.stderr, str(result)

From 62215ca9efd02f4863ea3b5f806a6f6c2822859d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Fri, 29 Sep 2023 23:14:54 +0200
Subject: [PATCH 366/992] Don't use legacy version numbers in tests

---
 tests/data/packages/README.txt                      |   6 +++---
 ...en-0.2broken.tar.gz => broken-0.2+broken.tar.gz} | Bin
 tests/functional/test_install_upgrade.py            |   2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/data/packages/{broken-0.2broken.tar.gz => broken-0.2+broken.tar.gz} (100%)

diff --git a/tests/data/packages/README.txt b/tests/data/packages/README.txt
index aa957b337f0..37860a21b9e 100644
--- a/tests/data/packages/README.txt
+++ b/tests/data/packages/README.txt
@@ -6,9 +6,9 @@ broken-0.1.tar.gz
 -----------------
 This package exists for testing uninstall-rollback.
 
-broken-0.2broken.tar.gz
------------------------
-Version 0.2broken has a setup.py crafted to fail on install (and only on
+broken-0.2+broken.tar.gz
+------------------------
+Version 0.2+broken has a setup.py crafted to fail on install (and only on
 install). If any earlier step would fail (i.e. egg-info-generation), the
 already-installed version would never be uninstalled, so uninstall-rollback
 would not come into play.
diff --git a/tests/data/packages/broken-0.2broken.tar.gz b/tests/data/packages/broken-0.2+broken.tar.gz
similarity index 100%
rename from tests/data/packages/broken-0.2broken.tar.gz
rename to tests/data/packages/broken-0.2+broken.tar.gz
diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py
index 6556fcdf599..00036c1ef05 100644
--- a/tests/functional/test_install_upgrade.py
+++ b/tests/functional/test_install_upgrade.py
@@ -295,7 +295,7 @@ def test_uninstall_rollback(script: PipTestEnvironment, data: TestData) -> None:
         "-f",
         data.find_links,
         "--no-index",
-        "broken===0.2broken",
+        "broken===0.2+broken",
         expect_error=True,
     )
     assert result2.returncode == 1, str(result2)

From 9dcd26935982736d1cadcb1ec36ecc150a1621ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 30 Sep 2023 22:58:13 +0200
Subject: [PATCH 367/992] Remove now redundant error detection

This specifier syntax check is now done by the packaging library.
---
 src/pip/_internal/req/constructors.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
index 36f517e599d..b2c9505a9a4 100644
--- a/src/pip/_internal/req/constructors.py
+++ b/src/pip/_internal/req/constructors.py
@@ -359,7 +359,7 @@ def with_source(text: str) -> str:
 
     def _parse_req_string(req_as_string: str) -> Requirement:
         try:
-            req = get_requirement(req_as_string)
+            return get_requirement(req_as_string)
         except InvalidRequirement:
             if os.path.sep in req_as_string:
                 add_msg = "It looks like a path."
@@ -374,17 +374,6 @@ def _parse_req_string(req_as_string: str) -> Requirement:
             if add_msg:
                 msg += f"\nHint: {add_msg}"
             raise InstallationError(msg)
-        else:
-            # Deprecate extras after specifiers: "name>=1.0[extras]"
-            # This currently works by accident because _strip_extras() parses
-            # any extras in the end of the string and those are saved in
-            # RequirementParts
-            for spec in req.specifier:
-                spec_str = str(spec)
-                if spec_str.endswith("]"):
-                    msg = f"Extras after version '{spec_str}'."
-                    raise InstallationError(msg)
-        return req
 
     if req_as_string is not None:
         req: Optional[Requirement] = _parse_req_string(req_as_string)

From 4d70566c687d83cd8e0c0c41040b9beaca41492c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Fri, 29 Sep 2023 22:35:21 +0200
Subject: [PATCH 368/992] Remove various extras normalization workarounds

---
 src/pip/_internal/req/req_install.py               |  8 +-------
 .../_internal/resolution/resolvelib/candidates.py  | 10 +---------
 tests/functional/test_install_extras.py            | 14 ++------------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index 7d527959e81..213278588d2 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -52,7 +52,6 @@
     redact_auth_from_requirement,
     redact_auth_from_url,
 )
-from pip._internal.utils.packaging import safe_extra
 from pip._internal.utils.subprocess import runner_with_spinner_message
 from pip._internal.utils.temp_dir import TempDirectory, tempdir_kinds
 from pip._internal.utils.unpacking import unpack_file
@@ -284,12 +283,7 @@ def match_markers(self, extras_requested: Optional[Iterable[str]] = None) -> boo
             extras_requested = ("",)
         if self.markers is not None:
             return any(
-                self.markers.evaluate({"extra": extra})
-                # TODO: Remove these two variants when packaging is upgraded to
-                # support the marker comparison logic specified in PEP 685.
-                or self.markers.evaluate({"extra": safe_extra(extra)})
-                or self.markers.evaluate({"extra": canonicalize_name(extra)})
-                for extra in extras_requested
+                self.markers.evaluate({"extra": extra}) for extra in extras_requested
             )
         else:
             return True
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 029b26a3368..bda9147d7f9 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -438,14 +438,6 @@ def __init__(
         """
         self.base = base
         self.extras = frozenset(canonicalize_name(e) for e in extras)
-        # If any extras are requested in their non-normalized forms, keep track
-        # of their raw values. This is needed when we look up dependencies
-        # since PEP 685 has not been implemented for marker-matching, and using
-        # the non-normalized extra for lookup ensures the user can select a
-        # non-normalized extra in a package with its non-normalized form.
-        # TODO: Remove this attribute when packaging is upgraded to support the
-        # marker comparison logic specified in PEP 685.
-        self._unnormalized_extras = extras.difference(self.extras)
         self._comes_from = comes_from if comes_from is not None else self.base._ireq
 
     def __str__(self) -> str:
@@ -528,7 +520,7 @@ def _calculate_valid_requested_extras(self) -> FrozenSet[str]:
         candidate doesn't support. Any unsupported extras are dropped, and each
         cause a warning to be logged here.
         """
-        requested_extras = self.extras.union(self._unnormalized_extras)
+        requested_extras = self.extras
         valid_extras = frozenset(
             extra
             for extra in requested_extras
diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py
index 1dd67be0a0c..4dd27bb9df3 100644
--- a/tests/functional/test_install_extras.py
+++ b/tests/functional/test_install_extras.py
@@ -152,24 +152,14 @@ def test_install_fails_if_extra_at_end(
         script.scratch_path / "requirements.txt",
         expect_error=True,
     )
-    assert "Extras after version" in result.stderr
+    assert "Invalid requirement: 'requires_simple_extra>=0.1[extra]'" in result.stderr
 
 
 @pytest.mark.parametrize(
     "specified_extra, requested_extra",
     [
         ("Hop_hOp-hoP", "Hop_hOp-hoP"),
-        pytest.param(
-            "Hop_hOp-hoP",
-            "hop-hop-hop",
-            marks=pytest.mark.xfail(
-                reason=(
-                    "matching a normalized extra request against an"
-                    "unnormalized extra in metadata requires PEP 685 support "
-                    "in packaging (see pypa/pip#11445)."
-                ),
-            ),
-        ),
+        ("Hop_hOp-hoP", "hop-hop-hop"),
         ("hop-hop-hop", "Hop_hOp-hoP"),
     ],
 )

From 5463bbadaa61ad205bc01e6cfe238ee282847b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 1 Oct 2023 18:29:03 +0200
Subject: [PATCH 369/992] Fix obvious typo in test wheel generator

---
 tests/lib/wheel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lib/wheel.py b/tests/lib/wheel.py
index e63f44e1cad..342abbacaad 100644
--- a/tests/lib/wheel.py
+++ b/tests/lib/wheel.py
@@ -103,7 +103,7 @@ def make_metadata_file(
     if body is not _default:
         message.set_payload(body)
 
-    return File(path, message_from_dict(metadata).as_bytes())
+    return File(path, message.as_bytes())
 
 
 def make_wheel_metadata_file(

From 92cb9c91cc3ad544fc58c3a053f5b5699bb8254b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 1 Oct 2023 18:48:12 +0200
Subject: [PATCH 370/992] Strip Requires-Dist metadata parsed from METADATA
 files

These can contain a leading \n if the requirement was long and wrapped by
email.message.EmailMessage.as_bytes().
---
 src/pip/_internal/metadata/importlib/_dists.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index 9eee474ea5b..5e6a0345621 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -216,7 +216,9 @@ def is_extra_provided(self, extra: str) -> bool:
     def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]:
         contexts: Sequence[Dict[str, str]] = [{"extra": e} for e in extras]
         for req_string in self.metadata.get_all("Requires-Dist", []):
-            req = Requirement(req_string)
+            # strip() because email.message.Message.get_all() may return a leading \n
+            # in case a long header was wrapped.
+            req = Requirement(req_string.strip())
             if not req.marker:
                 yield req
             elif not extras and req.marker.evaluate({"extra": ""}):

From 04ea0da1878c8bec271760b12ec4d7f702e3c3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 1 Oct 2023 19:22:53 +0200
Subject: [PATCH 371/992] Remove vendored pyparsing

---
 news/pyparsing.vendor.rst                     |    2 +-
 src/pip/_vendor/pyparsing/LICENSE             |   18 -
 src/pip/_vendor/pyparsing/__init__.py         |  325 -
 src/pip/_vendor/pyparsing/actions.py          |  206 -
 src/pip/_vendor/pyparsing/common.py           |  439 --
 src/pip/_vendor/pyparsing/core.py             | 6087 -----------------
 src/pip/_vendor/pyparsing/diagram/__init__.py |  656 --
 src/pip/_vendor/pyparsing/exceptions.py       |  300 -
 src/pip/_vendor/pyparsing/helpers.py          | 1078 ---
 src/pip/_vendor/pyparsing/py.typed            |    0
 src/pip/_vendor/pyparsing/results.py          |  797 ---
 src/pip/_vendor/pyparsing/testing.py          |  345 -
 src/pip/_vendor/pyparsing/unicode.py          |  354 -
 src/pip/_vendor/pyparsing/util.py             |  277 -
 src/pip/_vendor/vendor.txt                    |    1 -
 15 files changed, 1 insertion(+), 10884 deletions(-)
 delete mode 100644 src/pip/_vendor/pyparsing/LICENSE
 delete mode 100644 src/pip/_vendor/pyparsing/__init__.py
 delete mode 100644 src/pip/_vendor/pyparsing/actions.py
 delete mode 100644 src/pip/_vendor/pyparsing/common.py
 delete mode 100644 src/pip/_vendor/pyparsing/core.py
 delete mode 100644 src/pip/_vendor/pyparsing/diagram/__init__.py
 delete mode 100644 src/pip/_vendor/pyparsing/exceptions.py
 delete mode 100644 src/pip/_vendor/pyparsing/helpers.py
 delete mode 100644 src/pip/_vendor/pyparsing/py.typed
 delete mode 100644 src/pip/_vendor/pyparsing/results.py
 delete mode 100644 src/pip/_vendor/pyparsing/testing.py
 delete mode 100644 src/pip/_vendor/pyparsing/unicode.py
 delete mode 100644 src/pip/_vendor/pyparsing/util.py

diff --git a/news/pyparsing.vendor.rst b/news/pyparsing.vendor.rst
index d6aab47079f..37a586a5651 100644
--- a/news/pyparsing.vendor.rst
+++ b/news/pyparsing.vendor.rst
@@ -1 +1 @@
-Upgrade pyparsing to 3.1.2
+Remove pyparsing
diff --git a/src/pip/_vendor/pyparsing/LICENSE b/src/pip/_vendor/pyparsing/LICENSE
deleted file mode 100644
index 1bf98523e33..00000000000
--- a/src/pip/_vendor/pyparsing/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/pip/_vendor/pyparsing/__init__.py b/src/pip/_vendor/pyparsing/__init__.py
deleted file mode 100644
index 83937ebf1f1..00000000000
--- a/src/pip/_vendor/pyparsing/__init__.py
+++ /dev/null
@@ -1,325 +0,0 @@
-# module pyparsing.py
-#
-# Copyright (c) 2003-2022  Paul T. McGuire
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__doc__ = """
-pyparsing module - Classes and methods to define and execute parsing grammars
-=============================================================================
-
-The pyparsing module is an alternative approach to creating and
-executing simple grammars, vs. the traditional lex/yacc approach, or the
-use of regular expressions.  With pyparsing, you don't need to learn
-a new syntax for defining grammars or matching expressions - the parsing
-module provides a library of classes that you use to construct the
-grammar directly in Python.
-
-Here is a program to parse "Hello, World!" (or any greeting of the form
-``", !"``), built up using :class:`Word`,
-:class:`Literal`, and :class:`And` elements
-(the :meth:`'+'` operators create :class:`And` expressions,
-and the strings are auto-converted to :class:`Literal` expressions)::
-
-    from pip._vendor.pyparsing import Word, alphas
-
-    # define grammar of a greeting
-    greet = Word(alphas) + "," + Word(alphas) + "!"
-
-    hello = "Hello, World!"
-    print(hello, "->", greet.parse_string(hello))
-
-The program outputs the following::
-
-    Hello, World! -> ['Hello', ',', 'World', '!']
-
-The Python representation of the grammar is quite readable, owing to the
-self-explanatory class names, and the use of :class:`'+'`,
-:class:`'|'`, :class:`'^'` and :class:`'&'` operators.
-
-The :class:`ParseResults` object returned from
-:class:`ParserElement.parse_string` can be
-accessed as a nested list, a dictionary, or an object with named
-attributes.
-
-The pyparsing module handles some of the problems that are typically
-vexing when writing text parsers:
-
-  - extra or missing whitespace (the above program will also handle
-    "Hello,World!", "Hello  ,  World  !", etc.)
-  - quoted strings
-  - embedded comments
-
-
-Getting Started -
------------------
-Visit the classes :class:`ParserElement` and :class:`ParseResults` to
-see the base classes that most other pyparsing
-classes inherit from. Use the docstrings for examples of how to:
-
- - construct literal match expressions from :class:`Literal` and
-   :class:`CaselessLiteral` classes
- - construct character word-group expressions using the :class:`Word`
-   class
- - see how to create repetitive expressions using :class:`ZeroOrMore`
-   and :class:`OneOrMore` classes
- - use :class:`'+'`, :class:`'|'`, :class:`'^'`,
-   and :class:`'&'` operators to combine simple expressions into
-   more complex ones
- - associate names with your parsed results using
-   :class:`ParserElement.set_results_name`
- - access the parsed data, which is returned as a :class:`ParseResults`
-   object
- - find some helpful expression short-cuts like :class:`DelimitedList`
-   and :class:`one_of`
- - find more useful common expressions in the :class:`pyparsing_common`
-   namespace class
-"""
-from typing import NamedTuple
-
-
-class version_info(NamedTuple):
-    major: int
-    minor: int
-    micro: int
-    releaselevel: str
-    serial: int
-
-    @property
-    def __version__(self):
-        return (
-            f"{self.major}.{self.minor}.{self.micro}"
-            + (
-                f"{'r' if self.releaselevel[0] == 'c' else ''}{self.releaselevel[0]}{self.serial}",
-                "",
-            )[self.releaselevel == "final"]
-        )
-
-    def __str__(self):
-        return f"{__name__} {self.__version__} / {__version_time__}"
-
-    def __repr__(self):
-        return f"{__name__}.{type(self).__name__}({', '.join('{}={!r}'.format(*nv) for nv in zip(self._fields, self))})"
-
-
-__version_info__ = version_info(3, 1, 2, "final", 1)
-__version_time__ = "06 Mar 2024 07:08 UTC"
-__version__ = __version_info__.__version__
-__versionTime__ = __version_time__
-__author__ = "Paul McGuire "
-
-from .util import *
-from .exceptions import *
-from .actions import *
-from .core import __diag__, __compat__
-from .results import *
-from .core import *  # type: ignore[misc, assignment]
-from .core import _builtin_exprs as core_builtin_exprs
-from .helpers import *  # type: ignore[misc, assignment]
-from .helpers import _builtin_exprs as helper_builtin_exprs
-
-from .unicode import unicode_set, UnicodeRangeList, pyparsing_unicode as unicode
-from .testing import pyparsing_test as testing
-from .common import (
-    pyparsing_common as common,
-    _builtin_exprs as common_builtin_exprs,
-)
-
-# define backward compat synonyms
-if "pyparsing_unicode" not in globals():
-    pyparsing_unicode = unicode  # type: ignore[misc]
-if "pyparsing_common" not in globals():
-    pyparsing_common = common  # type: ignore[misc]
-if "pyparsing_test" not in globals():
-    pyparsing_test = testing  # type: ignore[misc]
-
-core_builtin_exprs += common_builtin_exprs + helper_builtin_exprs
-
-
-__all__ = [
-    "__version__",
-    "__version_time__",
-    "__author__",
-    "__compat__",
-    "__diag__",
-    "And",
-    "AtLineStart",
-    "AtStringStart",
-    "CaselessKeyword",
-    "CaselessLiteral",
-    "CharsNotIn",
-    "CloseMatch",
-    "Combine",
-    "DelimitedList",
-    "Dict",
-    "Each",
-    "Empty",
-    "FollowedBy",
-    "Forward",
-    "GoToColumn",
-    "Group",
-    "IndentedBlock",
-    "Keyword",
-    "LineEnd",
-    "LineStart",
-    "Literal",
-    "Located",
-    "PrecededBy",
-    "MatchFirst",
-    "NoMatch",
-    "NotAny",
-    "OneOrMore",
-    "OnlyOnce",
-    "OpAssoc",
-    "Opt",
-    "Optional",
-    "Or",
-    "ParseBaseException",
-    "ParseElementEnhance",
-    "ParseException",
-    "ParseExpression",
-    "ParseFatalException",
-    "ParseResults",
-    "ParseSyntaxException",
-    "ParserElement",
-    "PositionToken",
-    "QuotedString",
-    "RecursiveGrammarException",
-    "Regex",
-    "SkipTo",
-    "StringEnd",
-    "StringStart",
-    "Suppress",
-    "Token",
-    "TokenConverter",
-    "White",
-    "Word",
-    "WordEnd",
-    "WordStart",
-    "ZeroOrMore",
-    "Char",
-    "alphanums",
-    "alphas",
-    "alphas8bit",
-    "any_close_tag",
-    "any_open_tag",
-    "autoname_elements",
-    "c_style_comment",
-    "col",
-    "common_html_entity",
-    "condition_as_parse_action",
-    "counted_array",
-    "cpp_style_comment",
-    "dbl_quoted_string",
-    "dbl_slash_comment",
-    "delimited_list",
-    "dict_of",
-    "empty",
-    "hexnums",
-    "html_comment",
-    "identchars",
-    "identbodychars",
-    "infix_notation",
-    "java_style_comment",
-    "line",
-    "line_end",
-    "line_start",
-    "lineno",
-    "make_html_tags",
-    "make_xml_tags",
-    "match_only_at_col",
-    "match_previous_expr",
-    "match_previous_literal",
-    "nested_expr",
-    "null_debug_action",
-    "nums",
-    "one_of",
-    "original_text_for",
-    "printables",
-    "punc8bit",
-    "pyparsing_common",
-    "pyparsing_test",
-    "pyparsing_unicode",
-    "python_style_comment",
-    "quoted_string",
-    "remove_quotes",
-    "replace_with",
-    "replace_html_entity",
-    "rest_of_line",
-    "sgl_quoted_string",
-    "srange",
-    "string_end",
-    "string_start",
-    "token_map",
-    "trace_parse_action",
-    "ungroup",
-    "unicode_set",
-    "unicode_string",
-    "with_attribute",
-    "with_class",
-    # pre-PEP8 compatibility names
-    "__versionTime__",
-    "anyCloseTag",
-    "anyOpenTag",
-    "cStyleComment",
-    "commonHTMLEntity",
-    "conditionAsParseAction",
-    "countedArray",
-    "cppStyleComment",
-    "dblQuotedString",
-    "dblSlashComment",
-    "delimitedList",
-    "dictOf",
-    "htmlComment",
-    "indentedBlock",
-    "infixNotation",
-    "javaStyleComment",
-    "lineEnd",
-    "lineStart",
-    "locatedExpr",
-    "makeHTMLTags",
-    "makeXMLTags",
-    "matchOnlyAtCol",
-    "matchPreviousExpr",
-    "matchPreviousLiteral",
-    "nestedExpr",
-    "nullDebugAction",
-    "oneOf",
-    "opAssoc",
-    "originalTextFor",
-    "pythonStyleComment",
-    "quotedString",
-    "removeQuotes",
-    "replaceHTMLEntity",
-    "replaceWith",
-    "restOfLine",
-    "sglQuotedString",
-    "stringEnd",
-    "stringStart",
-    "tokenMap",
-    "traceParseAction",
-    "unicodeString",
-    "withAttribute",
-    "withClass",
-    "common",
-    "unicode",
-    "testing",
-]
diff --git a/src/pip/_vendor/pyparsing/actions.py b/src/pip/_vendor/pyparsing/actions.py
deleted file mode 100644
index ce51b3957ca..00000000000
--- a/src/pip/_vendor/pyparsing/actions.py
+++ /dev/null
@@ -1,206 +0,0 @@
-# actions.py
-
-from .exceptions import ParseException
-from .util import col, replaced_by_pep8
-
-
-class OnlyOnce:
-    """
-    Wrapper for parse actions, to ensure they are only called once.
-    """
-
-    def __init__(self, method_call):
-        from .core import _trim_arity
-
-        self.callable = _trim_arity(method_call)
-        self.called = False
-
-    def __call__(self, s, l, t):
-        if not self.called:
-            results = self.callable(s, l, t)
-            self.called = True
-            return results
-        raise ParseException(s, l, "OnlyOnce obj called multiple times w/out reset")
-
-    def reset(self):
-        """
-        Allow the associated parse action to be called once more.
-        """
-
-        self.called = False
-
-
-def match_only_at_col(n):
-    """
-    Helper method for defining parse actions that require matching at
-    a specific column in the input text.
-    """
-
-    def verify_col(strg, locn, toks):
-        if col(locn, strg) != n:
-            raise ParseException(strg, locn, f"matched token not at column {n}")
-
-    return verify_col
-
-
-def replace_with(repl_str):
-    """
-    Helper method for common parse actions that simply return
-    a literal value.  Especially useful when used with
-    :class:`transform_string` ().
-
-    Example::
-
-        num = Word(nums).set_parse_action(lambda toks: int(toks[0]))
-        na = one_of("N/A NA").set_parse_action(replace_with(math.nan))
-        term = na | num
-
-        term[1, ...].parse_string("324 234 N/A 234") # -> [324, 234, nan, 234]
-    """
-    return lambda s, l, t: [repl_str]
-
-
-def remove_quotes(s, l, t):
-    """
-    Helper parse action for removing quotation marks from parsed
-    quoted strings.
-
-    Example::
-
-        # by default, quotation marks are included in parsed results
-        quoted_string.parse_string("'Now is the Winter of our Discontent'") # -> ["'Now is the Winter of our Discontent'"]
-
-        # use remove_quotes to strip quotation marks from parsed results
-        quoted_string.set_parse_action(remove_quotes)
-        quoted_string.parse_string("'Now is the Winter of our Discontent'") # -> ["Now is the Winter of our Discontent"]
-    """
-    return t[0][1:-1]
-
-
-def with_attribute(*args, **attr_dict):
-    """
-    Helper to create a validating parse action to be used with start
-    tags created with :class:`make_xml_tags` or
-    :class:`make_html_tags`. Use ``with_attribute`` to qualify
-    a starting tag with a required attribute value, to avoid false
-    matches on common tags such as ```` or ``
``.
-
-    Call ``with_attribute`` with a series of attribute names and
-    values. Specify the list of filter attributes names and values as:
-
-    - keyword arguments, as in ``(align="right")``, or
-    - as an explicit dict with ``**`` operator, when an attribute
-      name is also a Python reserved word, as in ``**{"class":"Customer", "align":"right"}``
-    - a list of name-value tuples, as in ``(("ns1:class", "Customer"), ("ns2:align", "right"))``
-
-    For attribute names with a namespace prefix, you must use the second
-    form.  Attribute names are matched insensitive to upper/lower case.
-
-    If just testing for ``class`` (with or without a namespace), use
-    :class:`with_class`.
-
-    To verify that the attribute exists, but without specifying a value,
-    pass ``with_attribute.ANY_VALUE`` as the value.
-
-    Example::
-
-        html = '''
-            

-            Some text
-            
1 4 0 1 0

-            
1,3 2,3 1,1

-            
this has no type

-            

-        '''
-        div,div_end = make_html_tags("div")
-
-        # only match div tag having a type attribute with value "grid"
-        div_grid = div().set_parse_action(with_attribute(type="grid"))
-        grid_expr = div_grid + SkipTo(div | div_end)("body")
-        for grid_header in grid_expr.search_string(html):
-            print(grid_header.body)
-
-        # construct a match with any div tag having a type attribute, regardless of the value
-        div_any_type = div().set_parse_action(with_attribute(type=with_attribute.ANY_VALUE))
-        div_expr = div_any_type + SkipTo(div | div_end)("body")
-        for div_header in div_expr.search_string(html):
-            print(div_header.body)
-
-    prints::
-
-        1 4 0 1 0
-
-        1 4 0 1 0
-        1,3 2,3 1,1
-    """
-    if args:
-        attrs = args[:]
-    else:
-        attrs = attr_dict.items()
-    attrs = [(k, v) for k, v in attrs]
-
-    def pa(s, l, tokens):
-        for attrName, attrValue in attrs:
-            if attrName not in tokens:
-                raise ParseException(s, l, "no matching attribute " + attrName)
-            if attrValue != with_attribute.ANY_VALUE and tokens[attrName] != attrValue:
-                raise ParseException(
-                    s,
-                    l,
-                    f"attribute {attrName!r} has value {tokens[attrName]!r}, must be {attrValue!r}",
-                )
-
-    return pa
-
-
-with_attribute.ANY_VALUE = object()  # type: ignore [attr-defined]
-
-
-def with_class(classname, namespace=""):
-    """
-    Simplified version of :class:`with_attribute` when
-    matching on a div class - made difficult because ``class`` is
-    a reserved word in Python.
-
-    Example::
-
-        html = '''
-            

-            Some text
-            
1 4 0 1 0

-            
1,3 2,3 1,1

-            
this <div> has no class

-            

-
-        '''
-        div,div_end = make_html_tags("div")
-        div_grid = div().set_parse_action(with_class("grid"))
-
-        grid_expr = div_grid + SkipTo(div | div_end)("body")
-        for grid_header in grid_expr.search_string(html):
-            print(grid_header.body)
-
-        div_any_type = div().set_parse_action(with_class(withAttribute.ANY_VALUE))
-        div_expr = div_any_type + SkipTo(div | div_end)("body")
-        for div_header in div_expr.search_string(html):
-            print(div_header.body)
-
-    prints::
-
-        1 4 0 1 0
-
-        1 4 0 1 0
-        1,3 2,3 1,1
-    """
-    classattr = f"{namespace}:class" if namespace else "class"
-    return with_attribute(**{classattr: classname})
-
-
-# pre-PEP8 compatibility symbols
-# fmt: off
-replaceWith = replaced_by_pep8("replaceWith", replace_with)
-removeQuotes = replaced_by_pep8("removeQuotes", remove_quotes)
-withAttribute = replaced_by_pep8("withAttribute", with_attribute)
-withClass = replaced_by_pep8("withClass", with_class)
-matchOnlyAtCol = replaced_by_pep8("matchOnlyAtCol", match_only_at_col)
-# fmt: on
diff --git a/src/pip/_vendor/pyparsing/common.py b/src/pip/_vendor/pyparsing/common.py
deleted file mode 100644
index 74faa46085a..00000000000
--- a/src/pip/_vendor/pyparsing/common.py
+++ /dev/null
@@ -1,439 +0,0 @@
-# common.py
-from .core import *
-from .helpers import DelimitedList, any_open_tag, any_close_tag
-from datetime import datetime
-
-
-# some other useful expressions - using lower-case class name since we are really using this as a namespace
-class pyparsing_common:
-    """Here are some common low-level expressions that may be useful in
-    jump-starting parser development:
-
-    - numeric forms (:class:`integers`, :class:`reals`,
-      :class:`scientific notation`)
-    - common :class:`programming identifiers`
-    - network addresses (:class:`MAC`,
-      :class:`IPv4`, :class:`IPv6`)
-    - ISO8601 :class:`dates` and
-      :class:`datetime`
-    - :class:`UUID`
-    - :class:`comma-separated list`
-    - :class:`url`
-
-    Parse actions:
-
-    - :class:`convert_to_integer`
-    - :class:`convert_to_float`
-    - :class:`convert_to_date`
-    - :class:`convert_to_datetime`
-    - :class:`strip_html_tags`
-    - :class:`upcase_tokens`
-    - :class:`downcase_tokens`
-
-    Example::
-
-        pyparsing_common.number.run_tests('''
-            # any int or real number, returned as the appropriate type
-            100
-            -100
-            +100
-            3.14159
-            6.02e23
-            1e-12
-            ''')
-
-        pyparsing_common.fnumber.run_tests('''
-            # any int or real number, returned as float
-            100
-            -100
-            +100
-            3.14159
-            6.02e23
-            1e-12
-            ''')
-
-        pyparsing_common.hex_integer.run_tests('''
-            # hex numbers
-            100
-            FF
-            ''')
-
-        pyparsing_common.fraction.run_tests('''
-            # fractions
-            1/2
-            -3/4
-            ''')
-
-        pyparsing_common.mixed_integer.run_tests('''
-            # mixed fractions
-            1
-            1/2
-            -3/4
-            1-3/4
-            ''')
-
-        import uuid
-        pyparsing_common.uuid.set_parse_action(token_map(uuid.UUID))
-        pyparsing_common.uuid.run_tests('''
-            # uuid
-            12345678-1234-5678-1234-567812345678
-            ''')
-
-    prints::
-
-        # any int or real number, returned as the appropriate type
-        100
-        [100]
-
-        -100
-        [-100]
-
-        +100
-        [100]
-
-        3.14159
-        [3.14159]
-
-        6.02e23
-        [6.02e+23]
-
-        1e-12
-        [1e-12]
-
-        # any int or real number, returned as float
-        100
-        [100.0]
-
-        -100
-        [-100.0]
-
-        +100
-        [100.0]
-
-        3.14159
-        [3.14159]
-
-        6.02e23
-        [6.02e+23]
-
-        1e-12
-        [1e-12]
-
-        # hex numbers
-        100
-        [256]
-
-        FF
-        [255]
-
-        # fractions
-        1/2
-        [0.5]
-
-        -3/4
-        [-0.75]
-
-        # mixed fractions
-        1
-        [1]
-
-        1/2
-        [0.5]
-
-        -3/4
-        [-0.75]
-
-        1-3/4
-        [1.75]
-
-        # uuid
-        12345678-1234-5678-1234-567812345678
-        [UUID('12345678-1234-5678-1234-567812345678')]
-    """
-
-    convert_to_integer = token_map(int)
-    """
-    Parse action for converting parsed integers to Python int
-    """
-
-    convert_to_float = token_map(float)
-    """
-    Parse action for converting parsed numbers to Python float
-    """
-
-    integer = Word(nums).set_name("integer").set_parse_action(convert_to_integer)
-    """expression that parses an unsigned integer, returns an int"""
-
-    hex_integer = (
-        Word(hexnums).set_name("hex integer").set_parse_action(token_map(int, 16))
-    )
-    """expression that parses a hexadecimal integer, returns an int"""
-
-    signed_integer = (
-        Regex(r"[+-]?\d+")
-        .set_name("signed integer")
-        .set_parse_action(convert_to_integer)
-    )
-    """expression that parses an integer with optional leading sign, returns an int"""
-
-    fraction = (
-        signed_integer().set_parse_action(convert_to_float)
-        + "/"
-        + signed_integer().set_parse_action(convert_to_float)
-    ).set_name("fraction")
-    """fractional expression of an integer divided by an integer, returns a float"""
-    fraction.add_parse_action(lambda tt: tt[0] / tt[-1])
-
-    mixed_integer = (
-        fraction | signed_integer + Opt(Opt("-").suppress() + fraction)
-    ).set_name("fraction or mixed integer-fraction")
-    """mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
-    mixed_integer.add_parse_action(sum)
-
-    real = (
-        Regex(r"[+-]?(?:\d+\.\d*|\.\d+)")
-        .set_name("real number")
-        .set_parse_action(convert_to_float)
-    )
-    """expression that parses a floating point number and returns a float"""
-
-    sci_real = (
-        Regex(r"[+-]?(?:\d+(?:[eE][+-]?\d+)|(?:\d+\.\d*|\.\d+)(?:[eE][+-]?\d+)?)")
-        .set_name("real number with scientific notation")
-        .set_parse_action(convert_to_float)
-    )
-    """expression that parses a floating point number with optional
-    scientific notation and returns a float"""
-
-    # streamlining this expression makes the docs nicer-looking
-    number = (sci_real | real | signed_integer).set_name("number").streamline()
-    """any numeric expression, returns the corresponding Python type"""
-
-    fnumber = (
-        Regex(r"[+-]?\d+\.?\d*([eE][+-]?\d+)?")
-        .set_name("fnumber")
-        .set_parse_action(convert_to_float)
-    )
-    """any int or real number, returned as float"""
-
-    ieee_float = (
-        Regex(r"(?i)[+-]?((\d+\.?\d*(e[+-]?\d+)?)|nan|inf(inity)?)")
-        .set_name("ieee_float")
-        .set_parse_action(convert_to_float)
-    )
-    """any floating-point literal (int, real number, infinity, or NaN), returned as float"""
-
-    identifier = Word(identchars, identbodychars).set_name("identifier")
-    """typical code identifier (leading alpha or '_', followed by 0 or more alphas, nums, or '_')"""
-
-    ipv4_address = Regex(
-        r"(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(\.(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})){3}"
-    ).set_name("IPv4 address")
-    "IPv4 address (``0.0.0.0 - 255.255.255.255``)"
-
-    _ipv6_part = Regex(r"[0-9a-fA-F]{1,4}").set_name("hex_integer")
-    _full_ipv6_address = (_ipv6_part + (":" + _ipv6_part) * 7).set_name(
-        "full IPv6 address"
-    )
-    _short_ipv6_address = (
-        Opt(_ipv6_part + (":" + _ipv6_part) * (0, 6))
-        + "::"
-        + Opt(_ipv6_part + (":" + _ipv6_part) * (0, 6))
-    ).set_name("short IPv6 address")
-    _short_ipv6_address.add_condition(
-        lambda t: sum(1 for tt in t if pyparsing_common._ipv6_part.matches(tt)) < 8
-    )
-    _mixed_ipv6_address = ("::ffff:" + ipv4_address).set_name("mixed IPv6 address")
-    ipv6_address = Combine(
-        (_full_ipv6_address | _mixed_ipv6_address | _short_ipv6_address).set_name(
-            "IPv6 address"
-        )
-    ).set_name("IPv6 address")
-    "IPv6 address (long, short, or mixed form)"
-
-    mac_address = Regex(
-        r"[0-9a-fA-F]{2}([:.-])[0-9a-fA-F]{2}(?:\1[0-9a-fA-F]{2}){4}"
-    ).set_name("MAC address")
-    "MAC address xx:xx:xx:xx:xx (may also have '-' or '.' delimiters)"
-
-    @staticmethod
-    def convert_to_date(fmt: str = "%Y-%m-%d"):
-        """
-        Helper to create a parse action for converting parsed date string to Python datetime.date
-
-        Params -
-        - fmt - format to be passed to datetime.strptime (default= ``"%Y-%m-%d"``)
-
-        Example::
-
-            date_expr = pyparsing_common.iso8601_date.copy()
-            date_expr.set_parse_action(pyparsing_common.convert_to_date())
-            print(date_expr.parse_string("1999-12-31"))
-
-        prints::
-
-            [datetime.date(1999, 12, 31)]
-        """
-
-        def cvt_fn(ss, ll, tt):
-            try:
-                return datetime.strptime(tt[0], fmt).date()
-            except ValueError as ve:
-                raise ParseException(ss, ll, str(ve))
-
-        return cvt_fn
-
-    @staticmethod
-    def convert_to_datetime(fmt: str = "%Y-%m-%dT%H:%M:%S.%f"):
-        """Helper to create a parse action for converting parsed
-        datetime string to Python datetime.datetime
-
-        Params -
-        - fmt - format to be passed to datetime.strptime (default= ``"%Y-%m-%dT%H:%M:%S.%f"``)
-
-        Example::
-
-            dt_expr = pyparsing_common.iso8601_datetime.copy()
-            dt_expr.set_parse_action(pyparsing_common.convert_to_datetime())
-            print(dt_expr.parse_string("1999-12-31T23:59:59.999"))
-
-        prints::
-
-            [datetime.datetime(1999, 12, 31, 23, 59, 59, 999000)]
-        """
-
-        def cvt_fn(s, l, t):
-            try:
-                return datetime.strptime(t[0], fmt)
-            except ValueError as ve:
-                raise ParseException(s, l, str(ve))
-
-        return cvt_fn
-
-    iso8601_date = Regex(
-        r"(?P\d{4})(?:-(?P\d\d)(?:-(?P\d\d))?)?"
-    ).set_name("ISO8601 date")
-    "ISO8601 date (``yyyy-mm-dd``)"
-
-    iso8601_datetime = Regex(
-        r"(?P\d{4})-(?P\d\d)-(?P\d\d)[T ](?P\d\d):(?P\d\d)(:(?P\d\d(\.\d*)?)?)?(?PZ|[+-]\d\d:?\d\d)?"
-    ).set_name("ISO8601 datetime")
-    "ISO8601 datetime (``yyyy-mm-ddThh:mm:ss.s(Z|+-00:00)``) - trailing seconds, milliseconds, and timezone optional; accepts separating ``'T'`` or ``' '``"
-
-    uuid = Regex(r"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}").set_name("UUID")
-    "UUID (``xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx``)"
-
-    _html_stripper = any_open_tag.suppress() | any_close_tag.suppress()
-
-    @staticmethod
-    def strip_html_tags(s: str, l: int, tokens: ParseResults):
-        """Parse action to remove HTML tags from web page HTML source
-
-        Example::
-
-            # strip HTML links from normal text
-            text = 'More info at the pyparsing wiki page'
-            td, td_end = make_html_tags("TD")
-            table_text = td + SkipTo(td_end).set_parse_action(pyparsing_common.strip_html_tags)("body") + td_end
-            print(table_text.parse_string(text).body)
-
-        Prints::
-
-            More info at the pyparsing wiki page
-        """
-        return pyparsing_common._html_stripper.transform_string(tokens[0])
-
-    _commasepitem = (
-        Combine(
-            OneOrMore(
-                ~Literal(",")
-                + ~LineEnd()
-                + Word(printables, exclude_chars=",")
-                + Opt(White(" \t") + ~FollowedBy(LineEnd() | ","))
-            )
-        )
-        .streamline()
-        .set_name("commaItem")
-    )
-    comma_separated_list = DelimitedList(
-        Opt(quoted_string.copy() | _commasepitem, default="")
-    ).set_name("comma separated list")
-    """Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
-
-    upcase_tokens = staticmethod(token_map(lambda t: t.upper()))
-    """Parse action to convert tokens to upper case."""
-
-    downcase_tokens = staticmethod(token_map(lambda t: t.lower()))
-    """Parse action to convert tokens to lower case."""
-
-    # fmt: off
-    url = Regex(
-        # https://mathiasbynens.be/demo/url-regex
-        # https://gist.github.com/dperini/729294
-        r"(?P" +
-        # protocol identifier (optional)
-        # short syntax // still required
-        r"(?:(?:(?Phttps?|ftp):)?\/\/)" +
-        # user:pass BasicAuth (optional)
-        r"(?:(?P\S+(?::\S*)?)@)?" +
-        r"(?P" +
-        # IP address exclusion
-        # private & local networks
-        r"(?!(?:10|127)(?:\.\d{1,3}){3})" +
-        r"(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})" +
-        r"(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})" +
-        # IP address dotted notation octets
-        # excludes loopback network 0.0.0.0
-        # excludes reserved space >= 224.0.0.0
-        # excludes network & broadcast addresses
-        # (first & last IP address of each class)
-        r"(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])" +
-        r"(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}" +
-        r"(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))" +
-        r"|" +
-        # host & domain names, may end with dot
-        # can be replaced by a shortest alternative
-        # (?![-_])(?:[-\w\u00a1-\uffff]{0,63}[^-_]\.)+
-        r"(?:" +
-        r"(?:" +
-        r"[a-z0-9\u00a1-\uffff]" +
-        r"[a-z0-9\u00a1-\uffff_-]{0,62}" +
-        r")?" +
-        r"[a-z0-9\u00a1-\uffff]\." +
-        r")+" +
-        # TLD identifier name, may end with dot
-        r"(?:[a-z\u00a1-\uffff]{2,}\.?)" +
-        r")" +
-        # port number (optional)
-        r"(:(?P\d{2,5}))?" +
-        # resource path (optional)
-        r"(?P\/[^?# ]*)?" +
-        # query string (optional)
-        r"(\?(?P[^#]*))?" +
-        # fragment (optional)
-        r"(#(?P\S*))?" +
-        r")"
-    ).set_name("url")
-    """URL (http/https/ftp scheme)"""
-    # fmt: on
-
-    # pre-PEP8 compatibility names
-    convertToInteger = convert_to_integer
-    """Deprecated - use :class:`convert_to_integer`"""
-    convertToFloat = convert_to_float
-    """Deprecated - use :class:`convert_to_float`"""
-    convertToDate = convert_to_date
-    """Deprecated - use :class:`convert_to_date`"""
-    convertToDatetime = convert_to_datetime
-    """Deprecated - use :class:`convert_to_datetime`"""
-    stripHTMLTags = strip_html_tags
-    """Deprecated - use :class:`strip_html_tags`"""
-    upcaseTokens = upcase_tokens
-    """Deprecated - use :class:`upcase_tokens`"""
-    downcaseTokens = downcase_tokens
-    """Deprecated - use :class:`downcase_tokens`"""
-
-
-_builtin_exprs = [
-    v for v in vars(pyparsing_common).values() if isinstance(v, ParserElement)
-]
diff --git a/src/pip/_vendor/pyparsing/core.py b/src/pip/_vendor/pyparsing/core.py
deleted file mode 100644
index fc403862354..00000000000
--- a/src/pip/_vendor/pyparsing/core.py
+++ /dev/null
@@ -1,6087 +0,0 @@
-#
-# core.py
-#
-
-from collections import deque
-import os
-import typing
-from typing import (
-    Any,
-    Callable,
-    Generator,
-    List,
-    NamedTuple,
-    Sequence,
-    Set,
-    TextIO,
-    Tuple,
-    Union,
-    cast,
-)
-from abc import ABC, abstractmethod
-from enum import Enum
-import string
-import copy
-import warnings
-import re
-import sys
-from collections.abc import Iterable
-import traceback
-import types
-from operator import itemgetter
-from functools import wraps
-from threading import RLock
-from pathlib import Path
-
-from .util import (
-    _FifoCache,
-    _UnboundedCache,
-    __config_flags,
-    _collapse_string_to_ranges,
-    _escape_regex_range_chars,
-    _bslash,
-    _flatten,
-    LRUMemo as _LRUMemo,
-    UnboundedMemo as _UnboundedMemo,
-    replaced_by_pep8,
-)
-from .exceptions import *
-from .actions import *
-from .results import ParseResults, _ParseResultsWithOffset
-from .unicode import pyparsing_unicode
-
-_MAX_INT = sys.maxsize
-str_type: Tuple[type, ...] = (str, bytes)
-
-#
-# Copyright (c) 2003-2022  Paul T. McGuire
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-
-if sys.version_info >= (3, 8):
-    from functools import cached_property
-else:
-
-    class cached_property:
-        def __init__(self, func):
-            self._func = func
-
-        def __get__(self, instance, owner=None):
-            ret = instance.__dict__[self._func.__name__] = self._func(instance)
-            return ret
-
-
-class __compat__(__config_flags):
-    """
-    A cross-version compatibility configuration for pyparsing features that will be
-    released in a future version. By setting values in this configuration to True,
-    those features can be enabled in prior versions for compatibility development
-    and testing.
-
-    - ``collect_all_And_tokens`` - flag to enable fix for Issue #63 that fixes erroneous grouping
-      of results names when an :class:`And` expression is nested within an :class:`Or` or :class:`MatchFirst`;
-      maintained for compatibility, but setting to ``False`` no longer restores pre-2.3.1
-      behavior
-    """
-
-    _type_desc = "compatibility"
-
-    collect_all_And_tokens = True
-
-    _all_names = [__ for __ in locals() if not __.startswith("_")]
-    _fixed_names = """
-        collect_all_And_tokens
-        """.split()
-
-
-class __diag__(__config_flags):
-    _type_desc = "diagnostic"
-
-    warn_multiple_tokens_in_named_alternation = False
-    warn_ungrouped_named_tokens_in_collection = False
-    warn_name_set_on_empty_Forward = False
-    warn_on_parse_using_empty_Forward = False
-    warn_on_assignment_to_Forward = False
-    warn_on_multiple_string_args_to_oneof = False
-    warn_on_match_first_with_lshift_operator = False
-    enable_debug_on_named_expressions = False
-
-    _all_names = [__ for __ in locals() if not __.startswith("_")]
-    _warning_names = [name for name in _all_names if name.startswith("warn")]
-    _debug_names = [name for name in _all_names if name.startswith("enable_debug")]
-
-    @classmethod
-    def enable_all_warnings(cls) -> None:
-        for name in cls._warning_names:
-            cls.enable(name)
-
-
-class Diagnostics(Enum):
-    """
-    Diagnostic configuration (all default to disabled)
-
-    - ``warn_multiple_tokens_in_named_alternation`` - flag to enable warnings when a results
-      name is defined on a :class:`MatchFirst` or :class:`Or` expression with one or more :class:`And` subexpressions
-    - ``warn_ungrouped_named_tokens_in_collection`` - flag to enable warnings when a results
-      name is defined on a containing expression with ungrouped subexpressions that also
-      have results names
-    - ``warn_name_set_on_empty_Forward`` - flag to enable warnings when a :class:`Forward` is defined
-      with a results name, but has no contents defined
-    - ``warn_on_parse_using_empty_Forward`` - flag to enable warnings when a :class:`Forward` is
-      defined in a grammar but has never had an expression attached to it
-    - ``warn_on_assignment_to_Forward`` - flag to enable warnings when a :class:`Forward` is defined
-      but is overwritten by assigning using ``'='`` instead of ``'<<='`` or ``'<<'``
-    - ``warn_on_multiple_string_args_to_oneof`` - flag to enable warnings when :class:`one_of` is
-      incorrectly called with multiple str arguments
-    - ``enable_debug_on_named_expressions`` - flag to auto-enable debug on all subsequent
-      calls to :class:`ParserElement.set_name`
-
-    Diagnostics are enabled/disabled by calling :class:`enable_diag` and :class:`disable_diag`.
-    All warnings can be enabled by calling :class:`enable_all_warnings`.
-    """
-
-    warn_multiple_tokens_in_named_alternation = 0
-    warn_ungrouped_named_tokens_in_collection = 1
-    warn_name_set_on_empty_Forward = 2
-    warn_on_parse_using_empty_Forward = 3
-    warn_on_assignment_to_Forward = 4
-    warn_on_multiple_string_args_to_oneof = 5
-    warn_on_match_first_with_lshift_operator = 6
-    enable_debug_on_named_expressions = 7
-
-
-def enable_diag(diag_enum: Diagnostics) -> None:
-    """
-    Enable a global pyparsing diagnostic flag (see :class:`Diagnostics`).
-    """
-    __diag__.enable(diag_enum.name)
-
-
-def disable_diag(diag_enum: Diagnostics) -> None:
-    """
-    Disable a global pyparsing diagnostic flag (see :class:`Diagnostics`).
-    """
-    __diag__.disable(diag_enum.name)
-
-
-def enable_all_warnings() -> None:
-    """
-    Enable all global pyparsing diagnostic warnings (see :class:`Diagnostics`).
-    """
-    __diag__.enable_all_warnings()
-
-
-# hide abstract class
-del __config_flags
-
-
-def _should_enable_warnings(
-    cmd_line_warn_options: typing.Iterable[str], warn_env_var: typing.Optional[str]
-) -> bool:
-    enable = bool(warn_env_var)
-    for warn_opt in cmd_line_warn_options:
-        w_action, w_message, w_category, w_module, w_line = (warn_opt + "::::").split(
-            ":"
-        )[:5]
-        if not w_action.lower().startswith("i") and (
-            not (w_message or w_category or w_module) or w_module == "pyparsing"
-        ):
-            enable = True
-        elif w_action.lower().startswith("i") and w_module in ("pyparsing", ""):
-            enable = False
-    return enable
-
-
-if _should_enable_warnings(
-    sys.warnoptions, os.environ.get("PYPARSINGENABLEALLWARNINGS")
-):
-    enable_all_warnings()
-
-
-# build list of single arg builtins, that can be used as parse actions
-_single_arg_builtins = {
-    sum,
-    len,
-    sorted,
-    reversed,
-    list,
-    tuple,
-    set,
-    any,
-    all,
-    min,
-    max,
-}
-
-_generatorType = types.GeneratorType
-ParseImplReturnType = Tuple[int, Any]
-PostParseReturnType = Union[ParseResults, Sequence[ParseResults]]
-ParseAction = Union[
-    Callable[[], Any],
-    Callable[[ParseResults], Any],
-    Callable[[int, ParseResults], Any],
-    Callable[[str, int, ParseResults], Any],
-]
-ParseCondition = Union[
-    Callable[[], bool],
-    Callable[[ParseResults], bool],
-    Callable[[int, ParseResults], bool],
-    Callable[[str, int, ParseResults], bool],
-]
-ParseFailAction = Callable[[str, int, "ParserElement", Exception], None]
-DebugStartAction = Callable[[str, int, "ParserElement", bool], None]
-DebugSuccessAction = Callable[
-    [str, int, int, "ParserElement", ParseResults, bool], None
-]
-DebugExceptionAction = Callable[[str, int, "ParserElement", Exception, bool], None]
-
-
-alphas = string.ascii_uppercase + string.ascii_lowercase
-identchars = pyparsing_unicode.Latin1.identchars
-identbodychars = pyparsing_unicode.Latin1.identbodychars
-nums = "0123456789"
-hexnums = nums + "ABCDEFabcdef"
-alphanums = alphas + nums
-printables = "".join([c for c in string.printable if c not in string.whitespace])
-
-_trim_arity_call_line: traceback.StackSummary = None  # type: ignore[assignment]
-
-
-def _trim_arity(func, max_limit=3):
-    """decorator to trim function calls to match the arity of the target"""
-    global _trim_arity_call_line
-
-    if func in _single_arg_builtins:
-        return lambda s, l, t: func(t)
-
-    limit = 0
-    found_arity = False
-
-    # synthesize what would be returned by traceback.extract_stack at the call to
-    # user's parse action 'func', so that we don't incur call penalty at parse time
-
-    # fmt: off
-    LINE_DIFF = 7
-    # IF ANY CODE CHANGES, EVEN JUST COMMENTS OR BLANK LINES, BETWEEN THE NEXT LINE AND
-    # THE CALL TO FUNC INSIDE WRAPPER, LINE_DIFF MUST BE MODIFIED!!!!
-    _trim_arity_call_line = (_trim_arity_call_line or traceback.extract_stack(limit=2)[-1])
-    pa_call_line_synth = (_trim_arity_call_line[0], _trim_arity_call_line[1] + LINE_DIFF)
-
-    def wrapper(*args):
-        nonlocal found_arity, limit
-        while 1:
-            try:
-                ret = func(*args[limit:])
-                found_arity = True
-                return ret
-            except TypeError as te:
-                # re-raise TypeErrors if they did not come from our arity testing
-                if found_arity:
-                    raise
-                else:
-                    tb = te.__traceback__
-                    frames = traceback.extract_tb(tb, limit=2)
-                    frame_summary = frames[-1]
-                    trim_arity_type_error = (
-                        [frame_summary[:2]][-1][:2] == pa_call_line_synth
-                    )
-                    del tb
-
-                    if trim_arity_type_error:
-                        if limit < max_limit:
-                            limit += 1
-                            continue
-
-                    raise
-    # fmt: on
-
-    # copy func name to wrapper for sensible debug output
-    # (can't use functools.wraps, since that messes with function signature)
-    func_name = getattr(func, "__name__", getattr(func, "__class__").__name__)
-    wrapper.__name__ = func_name
-    wrapper.__doc__ = func.__doc__
-
-    return wrapper
-
-
-def condition_as_parse_action(
-    fn: ParseCondition, message: typing.Optional[str] = None, fatal: bool = False
-) -> ParseAction:
-    """
-    Function to convert a simple predicate function that returns ``True`` or ``False``
-    into a parse action. Can be used in places when a parse action is required
-    and :class:`ParserElement.add_condition` cannot be used (such as when adding a condition
-    to an operator level in :class:`infix_notation`).
-
-    Optional keyword arguments:
-
-    - ``message`` - define a custom message to be used in the raised exception
-    - ``fatal`` - if True, will raise :class:`ParseFatalException` to stop parsing immediately;
-      otherwise will raise :class:`ParseException`
-
-    """
-    msg = message if message is not None else "failed user-defined condition"
-    exc_type = ParseFatalException if fatal else ParseException
-    fn = _trim_arity(fn)
-
-    @wraps(fn)
-    def pa(s, l, t):
-        if not bool(fn(s, l, t)):
-            raise exc_type(s, l, msg)
-
-    return pa
-
-
-def _default_start_debug_action(
-    instring: str, loc: int, expr: "ParserElement", cache_hit: bool = False
-):
-    cache_hit_str = "*" if cache_hit else ""
-    print(
-        (
-            f"{cache_hit_str}Match {expr} at loc {loc}({lineno(loc, instring)},{col(loc, instring)})\n"
-            f"  {line(loc, instring)}\n"
-            f"  {' ' * (col(loc, instring) - 1)}^"
-        )
-    )
-
-
-def _default_success_debug_action(
-    instring: str,
-    startloc: int,
-    endloc: int,
-    expr: "ParserElement",
-    toks: ParseResults,
-    cache_hit: bool = False,
-):
-    cache_hit_str = "*" if cache_hit else ""
-    print(f"{cache_hit_str}Matched {expr} -> {toks.as_list()}")
-
-
-def _default_exception_debug_action(
-    instring: str,
-    loc: int,
-    expr: "ParserElement",
-    exc: Exception,
-    cache_hit: bool = False,
-):
-    cache_hit_str = "*" if cache_hit else ""
-    print(f"{cache_hit_str}Match {expr} failed, {type(exc).__name__} raised: {exc}")
-
-
-def null_debug_action(*args):
-    """'Do-nothing' debug action, to suppress debugging output during parsing."""
-
-
-class ParserElement(ABC):
-    """Abstract base level parser element class."""
-
-    DEFAULT_WHITE_CHARS: str = " \n\t\r"
-    verbose_stacktrace: bool = False
-    _literalStringClass: type = None  # type: ignore[assignment]
-
-    @staticmethod
-    def set_default_whitespace_chars(chars: str) -> None:
-        r"""
-        Overrides the default whitespace chars
-
-        Example::
-
-            # default whitespace chars are space,  and newline
-            Word(alphas)[1, ...].parse_string("abc def\nghi jkl")  # -> ['abc', 'def', 'ghi', 'jkl']
-
-            # change to just treat newline as significant
-            ParserElement.set_default_whitespace_chars(" \t")
-            Word(alphas)[1, ...].parse_string("abc def\nghi jkl")  # -> ['abc', 'def']
-        """
-        ParserElement.DEFAULT_WHITE_CHARS = chars
-
-        # update whitespace all parse expressions defined in this module
-        for expr in _builtin_exprs:
-            if expr.copyDefaultWhiteChars:
-                expr.whiteChars = set(chars)
-
-    @staticmethod
-    def inline_literals_using(cls: type) -> None:
-        """
-        Set class to be used for inclusion of string literals into a parser.
-
-        Example::
-
-            # default literal class used is Literal
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            date_str.parse_string("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
-
-
-            # change to Suppress
-            ParserElement.inline_literals_using(Suppress)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            date_str.parse_string("1999/12/31")  # -> ['1999', '12', '31']
-        """
-        ParserElement._literalStringClass = cls
-
-    @classmethod
-    def using_each(cls, seq, **class_kwargs):
-        """
-        Yields a sequence of class(obj, **class_kwargs) for obj in seq.
-
-        Example::
-
-            LPAR, RPAR, LBRACE, RBRACE, SEMI = Suppress.using_each("(){};")
-
-        """
-        yield from (cls(obj, **class_kwargs) for obj in seq)
-
-    class DebugActions(NamedTuple):
-        debug_try: typing.Optional[DebugStartAction]
-        debug_match: typing.Optional[DebugSuccessAction]
-        debug_fail: typing.Optional[DebugExceptionAction]
-
-    def __init__(self, savelist: bool = False):
-        self.parseAction: List[ParseAction] = list()
-        self.failAction: typing.Optional[ParseFailAction] = None
-        self.customName: str = None  # type: ignore[assignment]
-        self._defaultName: typing.Optional[str] = None
-        self.resultsName: str = None  # type: ignore[assignment]
-        self.saveAsList = savelist
-        self.skipWhitespace = True
-        self.whiteChars = set(ParserElement.DEFAULT_WHITE_CHARS)
-        self.copyDefaultWhiteChars = True
-        # used when checking for left-recursion
-        self.mayReturnEmpty = False
-        self.keepTabs = False
-        self.ignoreExprs: List["ParserElement"] = list()
-        self.debug = False
-        self.streamlined = False
-        # optimize exception handling for subclasses that don't advance parse index
-        self.mayIndexError = True
-        self.errmsg = ""
-        # mark results names as modal (report only last) or cumulative (list all)
-        self.modalResults = True
-        # custom debug actions
-        self.debugActions = self.DebugActions(None, None, None)
-        # avoid redundant calls to preParse
-        self.callPreparse = True
-        self.callDuringTry = False
-        self.suppress_warnings_: List[Diagnostics] = []
-
-    def suppress_warning(self, warning_type: Diagnostics) -> "ParserElement":
-        """
-        Suppress warnings emitted for a particular diagnostic on this expression.
-
-        Example::
-
-            base = pp.Forward()
-            base.suppress_warning(Diagnostics.warn_on_parse_using_empty_Forward)
-
-            # statement would normally raise a warning, but is now suppressed
-            print(base.parse_string("x"))
-
-        """
-        self.suppress_warnings_.append(warning_type)
-        return self
-
-    def visit_all(self):
-        """General-purpose method to yield all expressions and sub-expressions
-        in a grammar. Typically just for internal use.
-        """
-        to_visit = deque([self])
-        seen = set()
-        while to_visit:
-            cur = to_visit.popleft()
-
-            # guard against looping forever through recursive grammars
-            if cur in seen:
-                continue
-            seen.add(cur)
-
-            to_visit.extend(cur.recurse())
-            yield cur
-
-    def copy(self) -> "ParserElement":
-        """
-        Make a copy of this :class:`ParserElement`.  Useful for defining
-        different parse actions for the same parsing pattern, using copies of
-        the original parse element.
-
-        Example::
-
-            integer = Word(nums).set_parse_action(lambda toks: int(toks[0]))
-            integerK = integer.copy().add_parse_action(lambda toks: toks[0] * 1024) + Suppress("K")
-            integerM = integer.copy().add_parse_action(lambda toks: toks[0] * 1024 * 1024) + Suppress("M")
-
-            print((integerK | integerM | integer)[1, ...].parse_string("5K 100 640K 256M"))
-
-        prints::
-
-            [5120, 100, 655360, 268435456]
-
-        Equivalent form of ``expr.copy()`` is just ``expr()``::
-
-            integerM = integer().add_parse_action(lambda toks: toks[0] * 1024 * 1024) + Suppress("M")
-        """
-        cpy = copy.copy(self)
-        cpy.parseAction = self.parseAction[:]
-        cpy.ignoreExprs = self.ignoreExprs[:]
-        if self.copyDefaultWhiteChars:
-            cpy.whiteChars = set(ParserElement.DEFAULT_WHITE_CHARS)
-        return cpy
-
-    def set_results_name(
-        self, name: str, list_all_matches: bool = False, *, listAllMatches: bool = False
-    ) -> "ParserElement":
-        """
-        Define name for referencing matching tokens as a nested attribute
-        of the returned parse results.
-
-        Normally, results names are assigned as you would assign keys in a dict:
-        any existing value is overwritten by later values. If it is necessary to
-        keep all values captured for a particular results name, call ``set_results_name``
-        with ``list_all_matches`` = True.
-
-        NOTE: ``set_results_name`` returns a *copy* of the original :class:`ParserElement` object;
-        this is so that the client can define a basic element, such as an
-        integer, and reference it in multiple places with different names.
-
-        You can also set results names using the abbreviated syntax,
-        ``expr("name")`` in place of ``expr.set_results_name("name")``
-        - see :class:`__call__`. If ``list_all_matches`` is required, use
-        ``expr("name*")``.
-
-        Example::
-
-            integer = Word(nums)
-            date_str = (integer.set_results_name("year") + '/'
-                        + integer.set_results_name("month") + '/'
-                        + integer.set_results_name("day"))
-
-            # equivalent form:
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-        """
-        listAllMatches = listAllMatches or list_all_matches
-        return self._setResultsName(name, listAllMatches)
-
-    def _setResultsName(self, name, listAllMatches=False):
-        if name is None:
-            return self
-        newself = self.copy()
-        if name.endswith("*"):
-            name = name[:-1]
-            listAllMatches = True
-        newself.resultsName = name
-        newself.modalResults = not listAllMatches
-        return newself
-
-    def set_break(self, break_flag: bool = True) -> "ParserElement":
-        """
-        Method to invoke the Python pdb debugger when this element is
-        about to be parsed. Set ``break_flag`` to ``True`` to enable, ``False`` to
-        disable.
-        """
-        if break_flag:
-            _parseMethod = self._parse
-
-            def breaker(instring, loc, doActions=True, callPreParse=True):
-                import pdb
-
-                # this call to pdb.set_trace() is intentional, not a checkin error
-                pdb.set_trace()
-                return _parseMethod(instring, loc, doActions, callPreParse)
-
-            breaker._originalParseMethod = _parseMethod  # type: ignore [attr-defined]
-            self._parse = breaker  # type: ignore [assignment]
-        elif hasattr(self._parse, "_originalParseMethod"):
-            self._parse = self._parse._originalParseMethod  # type: ignore [attr-defined, assignment]
-        return self
-
-    def set_parse_action(self, *fns: ParseAction, **kwargs) -> "ParserElement":
-        """
-        Define one or more actions to perform when successfully matching parse element definition.
-
-        Parse actions can be called to perform data conversions, do extra validation,
-        update external data structures, or enhance or replace the parsed tokens.
-        Each parse action ``fn`` is a callable method with 0-3 arguments, called as
-        ``fn(s, loc, toks)`` , ``fn(loc, toks)`` , ``fn(toks)`` , or just ``fn()`` , where:
-
-        - ``s``    = the original string being parsed (see note below)
-        - ``loc``  = the location of the matching substring
-        - ``toks`` = a list of the matched tokens, packaged as a :class:`ParseResults` object
-
-        The parsed tokens are passed to the parse action as ParseResults. They can be
-        modified in place using list-style append, extend, and pop operations to update
-        the parsed list elements; and with dictionary-style item set and del operations
-        to add, update, or remove any named results. If the tokens are modified in place,
-        it is not necessary to return them with a return statement.
-
-        Parse actions can also completely replace the given tokens, with another ``ParseResults``
-        object, or with some entirely different object (common for parse actions that perform data
-        conversions). A convenient way to build a new parse result is to define the values
-        using a dict, and then create the return value using :class:`ParseResults.from_dict`.
-
-        If None is passed as the ``fn`` parse action, all previously added parse actions for this
-        expression are cleared.
-
-        Optional keyword arguments:
-
-        - ``call_during_try`` = (default= ``False``) indicate if parse action should be run during
-          lookaheads and alternate testing. For parse actions that have side effects, it is
-          important to only call the parse action once it is determined that it is being
-          called as part of a successful parse. For parse actions that perform additional
-          validation, then call_during_try should be passed as True, so that the validation
-          code is included in the preliminary "try" parses.
-
-        Note: the default parsing behavior is to expand tabs in the input string
-        before starting the parsing process.  See :class:`parse_string` for more
-        information on parsing strings containing ```` s, and suggested
-        methods to maintain a consistent view of the parsed string, the parse
-        location, and line and column positions within the parsed string.
-
-        Example::
-
-            # parse dates in the form YYYY/MM/DD
-
-            # use parse action to convert toks from str to int at parse time
-            def convert_to_int(toks):
-                return int(toks[0])
-
-            # use a parse action to verify that the date is a valid date
-            def is_valid_date(instring, loc, toks):
-                from datetime import date
-                year, month, day = toks[::2]
-                try:
-                    date(year, month, day)
-                except ValueError:
-                    raise ParseException(instring, loc, "invalid date given")
-
-            integer = Word(nums)
-            date_str = integer + '/' + integer + '/' + integer
-
-            # add parse actions
-            integer.set_parse_action(convert_to_int)
-            date_str.set_parse_action(is_valid_date)
-
-            # note that integer fields are now ints, not strings
-            date_str.run_tests('''
-                # successful parse - note that integer fields were converted to ints
-                1999/12/31
-
-                # fail - invalid date
-                1999/13/31
-                ''')
-        """
-        if list(fns) == [None]:
-            self.parseAction = []
-            return self
-
-        if not all(callable(fn) for fn in fns):
-            raise TypeError("parse actions must be callable")
-        self.parseAction = [_trim_arity(fn) for fn in fns]
-        self.callDuringTry = kwargs.get(
-            "call_during_try", kwargs.get("callDuringTry", False)
-        )
-
-        return self
-
-    def add_parse_action(self, *fns: ParseAction, **kwargs) -> "ParserElement":
-        """
-        Add one or more parse actions to expression's list of parse actions. See :class:`set_parse_action`.
-
-        See examples in :class:`copy`.
-        """
-        self.parseAction += [_trim_arity(fn) for fn in fns]
-        self.callDuringTry = self.callDuringTry or kwargs.get(
-            "call_during_try", kwargs.get("callDuringTry", False)
-        )
-        return self
-
-    def add_condition(self, *fns: ParseCondition, **kwargs) -> "ParserElement":
-        """Add a boolean predicate function to expression's list of parse actions. See
-        :class:`set_parse_action` for function call signatures. Unlike ``set_parse_action``,
-        functions passed to ``add_condition`` need to return boolean success/fail of the condition.
-
-        Optional keyword arguments:
-
-        - ``message`` = define a custom message to be used in the raised exception
-        - ``fatal`` = if True, will raise ParseFatalException to stop parsing immediately; otherwise will raise
-          ParseException
-        - ``call_during_try`` = boolean to indicate if this method should be called during internal tryParse calls,
-          default=False
-
-        Example::
-
-            integer = Word(nums).set_parse_action(lambda toks: int(toks[0]))
-            year_int = integer.copy()
-            year_int.add_condition(lambda toks: toks[0] >= 2000, message="Only support years 2000 and later")
-            date_str = year_int + '/' + integer + '/' + integer
-
-            result = date_str.parse_string("1999/12/31")  # -> Exception: Only support years 2000 and later (at char 0),
-                                                                         (line:1, col:1)
-        """
-        for fn in fns:
-            self.parseAction.append(
-                condition_as_parse_action(
-                    fn,
-                    message=str(kwargs.get("message")),
-                    fatal=bool(kwargs.get("fatal", False)),
-                )
-            )
-
-        self.callDuringTry = self.callDuringTry or kwargs.get(
-            "call_during_try", kwargs.get("callDuringTry", False)
-        )
-        return self
-
-    def set_fail_action(self, fn: ParseFailAction) -> "ParserElement":
-        """
-        Define action to perform if parsing fails at this expression.
-        Fail acton fn is a callable function that takes the arguments
-        ``fn(s, loc, expr, err)`` where:
-
-        - ``s`` = string being parsed
-        - ``loc`` = location where expression match was attempted and failed
-        - ``expr`` = the parse expression that failed
-        - ``err`` = the exception thrown
-
-        The function returns no value.  It may throw :class:`ParseFatalException`
-        if it is desired to stop parsing immediately."""
-        self.failAction = fn
-        return self
-
-    def _skipIgnorables(self, instring: str, loc: int) -> int:
-        if not self.ignoreExprs:
-            return loc
-        exprsFound = True
-        ignore_expr_fns = [e._parse for e in self.ignoreExprs]
-        last_loc = loc
-        while exprsFound:
-            exprsFound = False
-            for ignore_fn in ignore_expr_fns:
-                try:
-                    while 1:
-                        loc, dummy = ignore_fn(instring, loc)
-                        exprsFound = True
-                except ParseException:
-                    pass
-            # check if all ignore exprs matched but didn't actually advance the parse location
-            if loc == last_loc:
-                break
-            last_loc = loc
-        return loc
-
-    def preParse(self, instring: str, loc: int) -> int:
-        if self.ignoreExprs:
-            loc = self._skipIgnorables(instring, loc)
-
-        if self.skipWhitespace:
-            instrlen = len(instring)
-            white_chars = self.whiteChars
-            while loc < instrlen and instring[loc] in white_chars:
-                loc += 1
-
-        return loc
-
-    def parseImpl(self, instring, loc, doActions=True):
-        return loc, []
-
-    def postParse(self, instring, loc, tokenlist):
-        return tokenlist
-
-    # @profile
-    def _parseNoCache(
-        self, instring, loc, doActions=True, callPreParse=True
-    ) -> Tuple[int, ParseResults]:
-        TRY, MATCH, FAIL = 0, 1, 2
-        debugging = self.debug  # and doActions)
-        len_instring = len(instring)
-
-        if debugging or self.failAction:
-            # print("Match {} at loc {}({}, {})".format(self, loc, lineno(loc, instring), col(loc, instring)))
-            try:
-                if callPreParse and self.callPreparse:
-                    pre_loc = self.preParse(instring, loc)
-                else:
-                    pre_loc = loc
-                tokens_start = pre_loc
-                if self.debugActions.debug_try:
-                    self.debugActions.debug_try(instring, tokens_start, self, False)
-                if self.mayIndexError or pre_loc >= len_instring:
-                    try:
-                        loc, tokens = self.parseImpl(instring, pre_loc, doActions)
-                    except IndexError:
-                        raise ParseException(instring, len_instring, self.errmsg, self)
-                else:
-                    loc, tokens = self.parseImpl(instring, pre_loc, doActions)
-            except Exception as err:
-                # print("Exception raised:", err)
-                if self.debugActions.debug_fail:
-                    self.debugActions.debug_fail(
-                        instring, tokens_start, self, err, False
-                    )
-                if self.failAction:
-                    self.failAction(instring, tokens_start, self, err)
-                raise
-        else:
-            if callPreParse and self.callPreparse:
-                pre_loc = self.preParse(instring, loc)
-            else:
-                pre_loc = loc
-            tokens_start = pre_loc
-            if self.mayIndexError or pre_loc >= len_instring:
-                try:
-                    loc, tokens = self.parseImpl(instring, pre_loc, doActions)
-                except IndexError:
-                    raise ParseException(instring, len_instring, self.errmsg, self)
-            else:
-                loc, tokens = self.parseImpl(instring, pre_loc, doActions)
-
-        tokens = self.postParse(instring, loc, tokens)
-
-        ret_tokens = ParseResults(
-            tokens, self.resultsName, asList=self.saveAsList, modal=self.modalResults
-        )
-        if self.parseAction and (doActions or self.callDuringTry):
-            if debugging:
-                try:
-                    for fn in self.parseAction:
-                        try:
-                            tokens = fn(instring, tokens_start, ret_tokens)  # type: ignore [call-arg, arg-type]
-                        except IndexError as parse_action_exc:
-                            exc = ParseException("exception raised in parse action")
-                            raise exc from parse_action_exc
-
-                        if tokens is not None and tokens is not ret_tokens:
-                            ret_tokens = ParseResults(
-                                tokens,
-                                self.resultsName,
-                                asList=self.saveAsList
-                                and isinstance(tokens, (ParseResults, list)),
-                                modal=self.modalResults,
-                            )
-                except Exception as err:
-                    # print "Exception raised in user parse action:", err
-                    if self.debugActions.debug_fail:
-                        self.debugActions.debug_fail(
-                            instring, tokens_start, self, err, False
-                        )
-                    raise
-            else:
-                for fn in self.parseAction:
-                    try:
-                        tokens = fn(instring, tokens_start, ret_tokens)  # type: ignore [call-arg, arg-type]
-                    except IndexError as parse_action_exc:
-                        exc = ParseException("exception raised in parse action")
-                        raise exc from parse_action_exc
-
-                    if tokens is not None and tokens is not ret_tokens:
-                        ret_tokens = ParseResults(
-                            tokens,
-                            self.resultsName,
-                            asList=self.saveAsList
-                            and isinstance(tokens, (ParseResults, list)),
-                            modal=self.modalResults,
-                        )
-        if debugging:
-            # print("Matched", self, "->", ret_tokens.as_list())
-            if self.debugActions.debug_match:
-                self.debugActions.debug_match(
-                    instring, tokens_start, loc, self, ret_tokens, False
-                )
-
-        return loc, ret_tokens
-
-    def try_parse(
-        self,
-        instring: str,
-        loc: int,
-        *,
-        raise_fatal: bool = False,
-        do_actions: bool = False,
-    ) -> int:
-        try:
-            return self._parse(instring, loc, doActions=do_actions)[0]
-        except ParseFatalException:
-            if raise_fatal:
-                raise
-            raise ParseException(instring, loc, self.errmsg, self)
-
-    def can_parse_next(self, instring: str, loc: int, do_actions: bool = False) -> bool:
-        try:
-            self.try_parse(instring, loc, do_actions=do_actions)
-        except (ParseException, IndexError):
-            return False
-        else:
-            return True
-
-    # cache for left-recursion in Forward references
-    recursion_lock = RLock()
-    recursion_memos: typing.Dict[
-        Tuple[int, "Forward", bool], Tuple[int, Union[ParseResults, Exception]]
-    ] = {}
-
-    class _CacheType(dict):
-        """
-        class to help type checking
-        """
-
-        not_in_cache: bool
-
-        def get(self, *args): ...
-
-        def set(self, *args): ...
-
-    # argument cache for optimizing repeated calls when backtracking through recursive expressions
-    packrat_cache = (
-        _CacheType()
-    )  # set later by enable_packrat(); this is here so that reset_cache() doesn't fail
-    packrat_cache_lock = RLock()
-    packrat_cache_stats = [0, 0]
-
-    # this method gets repeatedly called during backtracking with the same arguments -
-    # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression
-    def _parseCache(
-        self, instring, loc, doActions=True, callPreParse=True
-    ) -> Tuple[int, ParseResults]:
-        HIT, MISS = 0, 1
-        TRY, MATCH, FAIL = 0, 1, 2
-        lookup = (self, instring, loc, callPreParse, doActions)
-        with ParserElement.packrat_cache_lock:
-            cache = ParserElement.packrat_cache
-            value = cache.get(lookup)
-            if value is cache.not_in_cache:
-                ParserElement.packrat_cache_stats[MISS] += 1
-                try:
-                    value = self._parseNoCache(instring, loc, doActions, callPreParse)
-                except ParseBaseException as pe:
-                    # cache a copy of the exception, without the traceback
-                    cache.set(lookup, pe.__class__(*pe.args))
-                    raise
-                else:
-                    cache.set(lookup, (value[0], value[1].copy(), loc))
-                    return value
-            else:
-                ParserElement.packrat_cache_stats[HIT] += 1
-                if self.debug and self.debugActions.debug_try:
-                    try:
-                        self.debugActions.debug_try(instring, loc, self, cache_hit=True)  # type: ignore [call-arg]
-                    except TypeError:
-                        pass
-                if isinstance(value, Exception):
-                    if self.debug and self.debugActions.debug_fail:
-                        try:
-                            self.debugActions.debug_fail(
-                                instring, loc, self, value, cache_hit=True  # type: ignore [call-arg]
-                            )
-                        except TypeError:
-                            pass
-                    raise value
-
-                value = cast(Tuple[int, ParseResults, int], value)
-                loc_, result, endloc = value[0], value[1].copy(), value[2]
-                if self.debug and self.debugActions.debug_match:
-                    try:
-                        self.debugActions.debug_match(
-                            instring, loc_, endloc, self, result, cache_hit=True  # type: ignore [call-arg]
-                        )
-                    except TypeError:
-                        pass
-
-                return loc_, result
-
-    _parse = _parseNoCache
-
-    @staticmethod
-    def reset_cache() -> None:
-        ParserElement.packrat_cache.clear()
-        ParserElement.packrat_cache_stats[:] = [0] * len(
-            ParserElement.packrat_cache_stats
-        )
-        ParserElement.recursion_memos.clear()
-
-    _packratEnabled = False
-    _left_recursion_enabled = False
-
-    @staticmethod
-    def disable_memoization() -> None:
-        """
-        Disables active Packrat or Left Recursion parsing and their memoization
-
-        This method also works if neither Packrat nor Left Recursion are enabled.
-        This makes it safe to call before activating Packrat nor Left Recursion
-        to clear any previous settings.
-        """
-        ParserElement.reset_cache()
-        ParserElement._left_recursion_enabled = False
-        ParserElement._packratEnabled = False
-        ParserElement._parse = ParserElement._parseNoCache
-
-    @staticmethod
-    def enable_left_recursion(
-        cache_size_limit: typing.Optional[int] = None, *, force=False
-    ) -> None:
-        """
-        Enables "bounded recursion" parsing, which allows for both direct and indirect
-        left-recursion. During parsing, left-recursive :class:`Forward` elements are
-        repeatedly matched with a fixed recursion depth that is gradually increased
-        until finding the longest match.
-
-        Example::
-
-            from pip._vendor import pyparsing as pp
-            pp.ParserElement.enable_left_recursion()
-
-            E = pp.Forward("E")
-            num = pp.Word(pp.nums)
-            # match `num`, or `num '+' num`, or `num '+' num '+' num`, ...
-            E <<= E + '+' - num | num
-
-            print(E.parse_string("1+2+3"))
-
-        Recursion search naturally memoizes matches of ``Forward`` elements and may
-        thus skip reevaluation of parse actions during backtracking. This may break
-        programs with parse actions which rely on strict ordering of side-effects.
-
-        Parameters:
-
-        - ``cache_size_limit`` - (default=``None``) - memoize at most this many
-          ``Forward`` elements during matching; if ``None`` (the default),
-          memoize all ``Forward`` elements.
-
-        Bounded Recursion parsing works similar but not identical to Packrat parsing,
-        thus the two cannot be used together. Use ``force=True`` to disable any
-        previous, conflicting settings.
-        """
-        if force:
-            ParserElement.disable_memoization()
-        elif ParserElement._packratEnabled:
-            raise RuntimeError("Packrat and Bounded Recursion are not compatible")
-        if cache_size_limit is None:
-            ParserElement.recursion_memos = _UnboundedMemo()  # type: ignore[assignment]
-        elif cache_size_limit > 0:
-            ParserElement.recursion_memos = _LRUMemo(capacity=cache_size_limit)  # type: ignore[assignment]
-        else:
-            raise NotImplementedError(f"Memo size of {cache_size_limit}")
-        ParserElement._left_recursion_enabled = True
-
-    @staticmethod
-    def enable_packrat(
-        cache_size_limit: Union[int, None] = 128, *, force: bool = False
-    ) -> None:
-        """
-        Enables "packrat" parsing, which adds memoizing to the parsing logic.
-        Repeated parse attempts at the same string location (which happens
-        often in many complex grammars) can immediately return a cached value,
-        instead of re-executing parsing/validating code.  Memoizing is done of
-        both valid results and parsing exceptions.
-
-        Parameters:
-
-        - ``cache_size_limit`` - (default= ``128``) - if an integer value is provided
-          will limit the size of the packrat cache; if None is passed, then
-          the cache size will be unbounded; if 0 is passed, the cache will
-          be effectively disabled.
-
-        This speedup may break existing programs that use parse actions that
-        have side-effects.  For this reason, packrat parsing is disabled when
-        you first import pyparsing.  To activate the packrat feature, your
-        program must call the class method :class:`ParserElement.enable_packrat`.
-        For best results, call ``enable_packrat()`` immediately after
-        importing pyparsing.
-
-        Example::
-
-            from pip._vendor import pyparsing
-            pyparsing.ParserElement.enable_packrat()
-
-        Packrat parsing works similar but not identical to Bounded Recursion parsing,
-        thus the two cannot be used together. Use ``force=True`` to disable any
-        previous, conflicting settings.
-        """
-        if force:
-            ParserElement.disable_memoization()
-        elif ParserElement._left_recursion_enabled:
-            raise RuntimeError("Packrat and Bounded Recursion are not compatible")
-
-        if ParserElement._packratEnabled:
-            return
-
-        ParserElement._packratEnabled = True
-        if cache_size_limit is None:
-            ParserElement.packrat_cache = _UnboundedCache()
-        else:
-            ParserElement.packrat_cache = _FifoCache(cache_size_limit)  # type: ignore[assignment]
-        ParserElement._parse = ParserElement._parseCache
-
-    def parse_string(
-        self, instring: str, parse_all: bool = False, *, parseAll: bool = False
-    ) -> ParseResults:
-        """
-        Parse a string with respect to the parser definition. This function is intended as the primary interface to the
-        client code.
-
-        :param instring: The input string to be parsed.
-        :param parse_all: If set, the entire input string must match the grammar.
-        :param parseAll: retained for pre-PEP8 compatibility, will be removed in a future release.
-        :raises ParseException: Raised if ``parse_all`` is set and the input string does not match the whole grammar.
-        :returns: the parsed data as a :class:`ParseResults` object, which may be accessed as a `list`, a `dict`, or
-          an object with attributes if the given parser includes results names.
-
-        If the input string is required to match the entire grammar, ``parse_all`` flag must be set to ``True``. This
-        is also equivalent to ending the grammar with :class:`StringEnd`\\ ().
-
-        To report proper column numbers, ``parse_string`` operates on a copy of the input string where all tabs are
-        converted to spaces (8 spaces per tab, as per the default in ``string.expandtabs``). If the input string
-        contains tabs and the grammar uses parse actions that use the ``loc`` argument to index into the string
-        being parsed, one can ensure a consistent view of the input string by doing one of the following:
-
-        - calling ``parse_with_tabs`` on your grammar before calling ``parse_string`` (see :class:`parse_with_tabs`),
-        - define your parse action using the full ``(s,loc,toks)`` signature, and reference the input string using the
-          parse action's ``s`` argument, or
-        - explicitly expand the tabs in your input string before calling ``parse_string``.
-
-        Examples:
-
-        By default, partial matches are OK.
-
-        >>> res = Word('a').parse_string('aaaaabaaa')
-        >>> print(res)
-        ['aaaaa']
-
-        The parsing behavior varies by the inheriting class of this abstract class. Please refer to the children
-        directly to see more examples.
-
-        It raises an exception if parse_all flag is set and instring does not match the whole grammar.
-
-        >>> res = Word('a').parse_string('aaaaabaaa', parse_all=True)
-        Traceback (most recent call last):
-        ...
-        pyparsing.ParseException: Expected end of text, found 'b'  (at char 5), (line:1, col:6)
-        """
-        parseAll = parse_all or parseAll
-
-        ParserElement.reset_cache()
-        if not self.streamlined:
-            self.streamline()
-        for e in self.ignoreExprs:
-            e.streamline()
-        if not self.keepTabs:
-            instring = instring.expandtabs()
-        try:
-            loc, tokens = self._parse(instring, 0)
-            if parseAll:
-                loc = self.preParse(instring, loc)
-                se = Empty() + StringEnd()
-                se._parse(instring, loc)
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-            else:
-                # catch and re-raise exception from here, clearing out pyparsing internal stack trace
-                raise exc.with_traceback(None)
-        else:
-            return tokens
-
-    def scan_string(
-        self,
-        instring: str,
-        max_matches: int = _MAX_INT,
-        overlap: bool = False,
-        *,
-        debug: bool = False,
-        maxMatches: int = _MAX_INT,
-    ) -> Generator[Tuple[ParseResults, int, int], None, None]:
-        """
-        Scan the input string for expression matches.  Each match will return the
-        matching tokens, start location, and end location.  May be called with optional
-        ``max_matches`` argument, to clip scanning after 'n' matches are found.  If
-        ``overlap`` is specified, then overlapping matches will be reported.
-
-        Note that the start and end locations are reported relative to the string
-        being parsed.  See :class:`parse_string` for more information on parsing
-        strings with embedded tabs.
-
-        Example::
-
-            source = "sldjf123lsdjjkf345sldkjf879lkjsfd987"
-            print(source)
-            for tokens, start, end in Word(alphas).scan_string(source):
-                print(' '*start + '^'*(end-start))
-                print(' '*start + tokens[0])
-
-        prints::
-
-            sldjf123lsdjjkf345sldkjf879lkjsfd987
-            ^^^^^
-            sldjf
-                    ^^^^^^^
-                    lsdjjkf
-                              ^^^^^^
-                              sldkjf
-                                       ^^^^^^
-                                       lkjsfd
-        """
-        maxMatches = min(maxMatches, max_matches)
-        if not self.streamlined:
-            self.streamline()
-        for e in self.ignoreExprs:
-            e.streamline()
-
-        if not self.keepTabs:
-            instring = str(instring).expandtabs()
-        instrlen = len(instring)
-        loc = 0
-        preparseFn = self.preParse
-        parseFn = self._parse
-        ParserElement.resetCache()
-        matches = 0
-        try:
-            while loc <= instrlen and matches < maxMatches:
-                try:
-                    preloc: int = preparseFn(instring, loc)
-                    nextLoc: int
-                    tokens: ParseResults
-                    nextLoc, tokens = parseFn(instring, preloc, callPreParse=False)
-                except ParseException:
-                    loc = preloc + 1
-                else:
-                    if nextLoc > loc:
-                        matches += 1
-                        if debug:
-                            print(
-                                {
-                                    "tokens": tokens.asList(),
-                                    "start": preloc,
-                                    "end": nextLoc,
-                                }
-                            )
-                        yield tokens, preloc, nextLoc
-                        if overlap:
-                            nextloc = preparseFn(instring, loc)
-                            if nextloc > loc:
-                                loc = nextLoc
-                            else:
-                                loc += 1
-                        else:
-                            loc = nextLoc
-                    else:
-                        loc = preloc + 1
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-
-            # catch and re-raise exception from here, clears out pyparsing internal stack trace
-            raise exc.with_traceback(None)
-
-    def transform_string(self, instring: str, *, debug: bool = False) -> str:
-        """
-        Extension to :class:`scan_string`, to modify matching text with modified tokens that may
-        be returned from a parse action.  To use ``transform_string``, define a grammar and
-        attach a parse action to it that modifies the returned token list.
-        Invoking ``transform_string()`` on a target string will then scan for matches,
-        and replace the matched text patterns according to the logic in the parse
-        action.  ``transform_string()`` returns the resulting transformed string.
-
-        Example::
-
-            wd = Word(alphas)
-            wd.set_parse_action(lambda toks: toks[0].title())
-
-            print(wd.transform_string("now is the winter of our discontent made glorious summer by this sun of york."))
-
-        prints::
-
-            Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York.
-        """
-        out: List[str] = []
-        lastE = 0
-        # force preservation of s, to minimize unwanted transformation of string, and to
-        # keep string locs straight between transform_string and scan_string
-        self.keepTabs = True
-        try:
-            for t, s, e in self.scan_string(instring, debug=debug):
-                out.append(instring[lastE:s])
-                lastE = e
-
-                if not t:
-                    continue
-
-                if isinstance(t, ParseResults):
-                    out += t.as_list()
-                elif isinstance(t, Iterable) and not isinstance(t, str_type):
-                    out.extend(t)
-                else:
-                    out.append(t)
-
-            out.append(instring[lastE:])
-            out = [o for o in out if o]
-            return "".join([str(s) for s in _flatten(out)])
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-
-            # catch and re-raise exception from here, clears out pyparsing internal stack trace
-            raise exc.with_traceback(None)
-
-    def search_string(
-        self,
-        instring: str,
-        max_matches: int = _MAX_INT,
-        *,
-        debug: bool = False,
-        maxMatches: int = _MAX_INT,
-    ) -> ParseResults:
-        """
-        Another extension to :class:`scan_string`, simplifying the access to the tokens found
-        to match the given parse expression.  May be called with optional
-        ``max_matches`` argument, to clip searching after 'n' matches are found.
-
-        Example::
-
-            # a capitalized word starts with an uppercase letter, followed by zero or more lowercase letters
-            cap_word = Word(alphas.upper(), alphas.lower())
-
-            print(cap_word.search_string("More than Iron, more than Lead, more than Gold I need Electricity"))
-
-            # the sum() builtin can be used to merge results into a single ParseResults object
-            print(sum(cap_word.search_string("More than Iron, more than Lead, more than Gold I need Electricity")))
-
-        prints::
-
-            [['More'], ['Iron'], ['Lead'], ['Gold'], ['I'], ['Electricity']]
-            ['More', 'Iron', 'Lead', 'Gold', 'I', 'Electricity']
-        """
-        maxMatches = min(maxMatches, max_matches)
-        try:
-            return ParseResults(
-                [t for t, s, e in self.scan_string(instring, maxMatches, debug=debug)]
-            )
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-
-            # catch and re-raise exception from here, clears out pyparsing internal stack trace
-            raise exc.with_traceback(None)
-
-    def split(
-        self,
-        instring: str,
-        maxsplit: int = _MAX_INT,
-        include_separators: bool = False,
-        *,
-        includeSeparators=False,
-    ) -> Generator[str, None, None]:
-        """
-        Generator method to split a string using the given expression as a separator.
-        May be called with optional ``maxsplit`` argument, to limit the number of splits;
-        and the optional ``include_separators`` argument (default= ``False``), if the separating
-        matching text should be included in the split results.
-
-        Example::
-
-            punc = one_of(list(".,;:/-!?"))
-            print(list(punc.split("This, this?, this sentence, is badly punctuated!")))
-
-        prints::
-
-            ['This', ' this', '', ' this sentence', ' is badly punctuated', '']
-        """
-        includeSeparators = includeSeparators or include_separators
-        last = 0
-        for t, s, e in self.scan_string(instring, max_matches=maxsplit):
-            yield instring[last:s]
-            if includeSeparators:
-                yield t[0]
-            last = e
-        yield instring[last:]
-
-    def __add__(self, other) -> "ParserElement":
-        """
-        Implementation of ``+`` operator - returns :class:`And`. Adding strings to a :class:`ParserElement`
-        converts them to :class:`Literal`\\ s by default.
-
-        Example::
-
-            greet = Word(alphas) + "," + Word(alphas) + "!"
-            hello = "Hello, World!"
-            print(hello, "->", greet.parse_string(hello))
-
-        prints::
-
-            Hello, World! -> ['Hello', ',', 'World', '!']
-
-        ``...`` may be used as a parse expression as a short form of :class:`SkipTo`::
-
-            Literal('start') + ... + Literal('end')
-
-        is equivalent to::
-
-            Literal('start') + SkipTo('end')("_skipped*") + Literal('end')
-
-        Note that the skipped text is returned with '_skipped' as a results name,
-        and to support having multiple skips in the same parser, the value returned is
-        a list of all skipped text.
-        """
-        if other is Ellipsis:
-            return _PendingSkip(self)
-
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return And([self, other])
-
-    def __radd__(self, other) -> "ParserElement":
-        """
-        Implementation of ``+`` operator when left operand is not a :class:`ParserElement`
-        """
-        if other is Ellipsis:
-            return SkipTo(self)("_skipped*") + self
-
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other + self
-
-    def __sub__(self, other) -> "ParserElement":
-        """
-        Implementation of ``-`` operator, returns :class:`And` with error stop
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self + And._ErrorStop() + other
-
-    def __rsub__(self, other) -> "ParserElement":
-        """
-        Implementation of ``-`` operator when left operand is not a :class:`ParserElement`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other - self
-
-    def __mul__(self, other) -> "ParserElement":
-        """
-        Implementation of ``*`` operator, allows use of ``expr * 3`` in place of
-        ``expr + expr + expr``.  Expressions may also be multiplied by a 2-integer
-        tuple, similar to ``{min, max}`` multipliers in regular expressions.  Tuples
-        may also include ``None`` as in:
-
-        - ``expr*(n, None)`` or ``expr*(n, )`` is equivalent
-          to ``expr*n + ZeroOrMore(expr)``
-          (read as "at least n instances of ``expr``")
-        - ``expr*(None, n)`` is equivalent to ``expr*(0, n)``
-          (read as "0 to n instances of ``expr``")
-        - ``expr*(None, None)`` is equivalent to ``ZeroOrMore(expr)``
-        - ``expr*(1, None)`` is equivalent to ``OneOrMore(expr)``
-
-        Note that ``expr*(None, n)`` does not raise an exception if
-        more than n exprs exist in the input stream; that is,
-        ``expr*(None, n)`` does not enforce a maximum number of expr
-        occurrences.  If this behavior is desired, then write
-        ``expr*(None, n) + ~expr``
-        """
-        if other is Ellipsis:
-            other = (0, None)
-        elif isinstance(other, tuple) and other[:1] == (Ellipsis,):
-            other = ((0,) + other[1:] + (None,))[:2]
-
-        if not isinstance(other, (int, tuple)):
-            return NotImplemented
-
-        if isinstance(other, int):
-            minElements, optElements = other, 0
-        else:
-            other = tuple(o if o is not Ellipsis else None for o in other)
-            other = (other + (None, None))[:2]
-            if other[0] is None:
-                other = (0, other[1])
-            if isinstance(other[0], int) and other[1] is None:
-                if other[0] == 0:
-                    return ZeroOrMore(self)
-                if other[0] == 1:
-                    return OneOrMore(self)
-                else:
-                    return self * other[0] + ZeroOrMore(self)
-            elif isinstance(other[0], int) and isinstance(other[1], int):
-                minElements, optElements = other
-                optElements -= minElements
-            else:
-                return NotImplemented
-
-        if minElements < 0:
-            raise ValueError("cannot multiply ParserElement by negative value")
-        if optElements < 0:
-            raise ValueError(
-                "second tuple value must be greater or equal to first tuple value"
-            )
-        if minElements == optElements == 0:
-            return And([])
-
-        if optElements:
-
-            def makeOptionalList(n):
-                if n > 1:
-                    return Opt(self + makeOptionalList(n - 1))
-                else:
-                    return Opt(self)
-
-            if minElements:
-                if minElements == 1:
-                    ret = self + makeOptionalList(optElements)
-                else:
-                    ret = And([self] * minElements) + makeOptionalList(optElements)
-            else:
-                ret = makeOptionalList(optElements)
-        else:
-            if minElements == 1:
-                ret = self
-            else:
-                ret = And([self] * minElements)
-        return ret
-
-    def __rmul__(self, other) -> "ParserElement":
-        return self.__mul__(other)
-
-    def __or__(self, other) -> "ParserElement":
-        """
-        Implementation of ``|`` operator - returns :class:`MatchFirst`
-        """
-        if other is Ellipsis:
-            return _PendingSkip(self, must_skip=True)
-
-        if isinstance(other, str_type):
-            # `expr | ""` is equivalent to `Opt(expr)`
-            if other == "":
-                return Opt(self)
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return MatchFirst([self, other])
-
-    def __ror__(self, other) -> "ParserElement":
-        """
-        Implementation of ``|`` operator when left operand is not a :class:`ParserElement`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other | self
-
-    def __xor__(self, other) -> "ParserElement":
-        """
-        Implementation of ``^`` operator - returns :class:`Or`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return Or([self, other])
-
-    def __rxor__(self, other) -> "ParserElement":
-        """
-        Implementation of ``^`` operator when left operand is not a :class:`ParserElement`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other ^ self
-
-    def __and__(self, other) -> "ParserElement":
-        """
-        Implementation of ``&`` operator - returns :class:`Each`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return Each([self, other])
-
-    def __rand__(self, other) -> "ParserElement":
-        """
-        Implementation of ``&`` operator when left operand is not a :class:`ParserElement`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other & self
-
-    def __invert__(self) -> "ParserElement":
-        """
-        Implementation of ``~`` operator - returns :class:`NotAny`
-        """
-        return NotAny(self)
-
-    # disable __iter__ to override legacy use of sequential access to __getitem__ to
-    # iterate over a sequence
-    __iter__ = None
-
-    def __getitem__(self, key):
-        """
-        use ``[]`` indexing notation as a short form for expression repetition:
-
-        - ``expr[n]`` is equivalent to ``expr*n``
-        - ``expr[m, n]`` is equivalent to ``expr*(m, n)``
-        - ``expr[n, ...]`` or ``expr[n,]`` is equivalent
-             to ``expr*n + ZeroOrMore(expr)``
-             (read as "at least n instances of ``expr``")
-        - ``expr[..., n]`` is equivalent to ``expr*(0, n)``
-             (read as "0 to n instances of ``expr``")
-        - ``expr[...]`` and ``expr[0, ...]`` are equivalent to ``ZeroOrMore(expr)``
-        - ``expr[1, ...]`` is equivalent to ``OneOrMore(expr)``
-
-        ``None`` may be used in place of ``...``.
-
-        Note that ``expr[..., n]`` and ``expr[m, n]`` do not raise an exception
-        if more than ``n`` ``expr``\\ s exist in the input stream.  If this behavior is
-        desired, then write ``expr[..., n] + ~expr``.
-
-        For repetition with a stop_on expression, use slice notation:
-
-        - ``expr[...: end_expr]`` and ``expr[0, ...: end_expr]`` are equivalent to ``ZeroOrMore(expr, stop_on=end_expr)``
-        - ``expr[1, ...: end_expr]`` is equivalent to ``OneOrMore(expr, stop_on=end_expr)``
-
-        """
-
-        stop_on_defined = False
-        stop_on = NoMatch()
-        if isinstance(key, slice):
-            key, stop_on = key.start, key.stop
-            if key is None:
-                key = ...
-            stop_on_defined = True
-        elif isinstance(key, tuple) and isinstance(key[-1], slice):
-            key, stop_on = (key[0], key[1].start), key[1].stop
-            stop_on_defined = True
-
-        # convert single arg keys to tuples
-        if isinstance(key, str_type):
-            key = (key,)
-        try:
-            iter(key)
-        except TypeError:
-            key = (key, key)
-
-        if len(key) > 2:
-            raise TypeError(
-                f"only 1 or 2 index arguments supported ({key[:5]}{f'... [{len(key)}]' if len(key) > 5 else ''})"
-            )
-
-        # clip to 2 elements
-        ret = self * tuple(key[:2])
-        ret = typing.cast(_MultipleMatch, ret)
-
-        if stop_on_defined:
-            ret.stopOn(stop_on)
-
-        return ret
-
-    def __call__(self, name: typing.Optional[str] = None) -> "ParserElement":
-        """
-        Shortcut for :class:`set_results_name`, with ``list_all_matches=False``.
-
-        If ``name`` is given with a trailing ``'*'`` character, then ``list_all_matches`` will be
-        passed as ``True``.
-
-        If ``name`` is omitted, same as calling :class:`copy`.
-
-        Example::
-
-            # these are equivalent
-            userdata = Word(alphas).set_results_name("name") + Word(nums + "-").set_results_name("socsecno")
-            userdata = Word(alphas)("name") + Word(nums + "-")("socsecno")
-        """
-        if name is not None:
-            return self._setResultsName(name)
-
-        return self.copy()
-
-    def suppress(self) -> "ParserElement":
-        """
-        Suppresses the output of this :class:`ParserElement`; useful to keep punctuation from
-        cluttering up returned output.
-        """
-        return Suppress(self)
-
-    def ignore_whitespace(self, recursive: bool = True) -> "ParserElement":
-        """
-        Enables the skipping of whitespace before matching the characters in the
-        :class:`ParserElement`'s defined pattern.
-
-        :param recursive: If ``True`` (the default), also enable whitespace skipping in child elements (if any)
-        """
-        self.skipWhitespace = True
-        return self
-
-    def leave_whitespace(self, recursive: bool = True) -> "ParserElement":
-        """
-        Disables the skipping of whitespace before matching the characters in the
-        :class:`ParserElement`'s defined pattern.  This is normally only used internally by
-        the pyparsing module, but may be needed in some whitespace-sensitive grammars.
-
-        :param recursive: If true (the default), also disable whitespace skipping in child elements (if any)
-        """
-        self.skipWhitespace = False
-        return self
-
-    def set_whitespace_chars(
-        self, chars: Union[Set[str], str], copy_defaults: bool = False
-    ) -> "ParserElement":
-        """
-        Overrides the default whitespace chars
-        """
-        self.skipWhitespace = True
-        self.whiteChars = set(chars)
-        self.copyDefaultWhiteChars = copy_defaults
-        return self
-
-    def parse_with_tabs(self) -> "ParserElement":
-        """
-        Overrides default behavior to expand ```` s to spaces before parsing the input string.
-        Must be called before ``parse_string`` when the input grammar contains elements that
-        match ```` characters.
-        """
-        self.keepTabs = True
-        return self
-
-    def ignore(self, other: "ParserElement") -> "ParserElement":
-        """
-        Define expression to be ignored (e.g., comments) while doing pattern
-        matching; may be called repeatedly, to define multiple comment or other
-        ignorable patterns.
-
-        Example::
-
-            patt = Word(alphas)[...]
-            patt.parse_string('ablaj /* comment */ lskjd')
-            # -> ['ablaj']
-
-            patt.ignore(c_style_comment)
-            patt.parse_string('ablaj /* comment */ lskjd')
-            # -> ['ablaj', 'lskjd']
-        """
-        if isinstance(other, str_type):
-            other = Suppress(other)
-
-        if isinstance(other, Suppress):
-            if other not in self.ignoreExprs:
-                self.ignoreExprs.append(other)
-        else:
-            self.ignoreExprs.append(Suppress(other.copy()))
-        return self
-
-    def set_debug_actions(
-        self,
-        start_action: DebugStartAction,
-        success_action: DebugSuccessAction,
-        exception_action: DebugExceptionAction,
-    ) -> "ParserElement":
-        """
-        Customize display of debugging messages while doing pattern matching:
-
-        - ``start_action`` - method to be called when an expression is about to be parsed;
-          should have the signature ``fn(input_string: str, location: int, expression: ParserElement, cache_hit: bool)``
-
-        - ``success_action`` - method to be called when an expression has successfully parsed;
-          should have the signature ``fn(input_string: str, start_location: int, end_location: int, expression: ParserELement, parsed_tokens: ParseResults, cache_hit: bool)``
-
-        - ``exception_action`` - method to be called when expression fails to parse;
-          should have the signature ``fn(input_string: str, location: int, expression: ParserElement, exception: Exception, cache_hit: bool)``
-        """
-        self.debugActions = self.DebugActions(
-            start_action or _default_start_debug_action,  # type: ignore[truthy-function]
-            success_action or _default_success_debug_action,  # type: ignore[truthy-function]
-            exception_action or _default_exception_debug_action,  # type: ignore[truthy-function]
-        )
-        self.debug = True
-        return self
-
-    def set_debug(self, flag: bool = True, recurse: bool = False) -> "ParserElement":
-        """
-        Enable display of debugging messages while doing pattern matching.
-        Set ``flag`` to ``True`` to enable, ``False`` to disable.
-        Set ``recurse`` to ``True`` to set the debug flag on this expression and all sub-expressions.
-
-        Example::
-
-            wd = Word(alphas).set_name("alphaword")
-            integer = Word(nums).set_name("numword")
-            term = wd | integer
-
-            # turn on debugging for wd
-            wd.set_debug()
-
-            term[1, ...].parse_string("abc 123 xyz 890")
-
-        prints::
-
-            Match alphaword at loc 0(1,1)
-            Matched alphaword -> ['abc']
-            Match alphaword at loc 3(1,4)
-            Exception raised:Expected alphaword (at char 4), (line:1, col:5)
-            Match alphaword at loc 7(1,8)
-            Matched alphaword -> ['xyz']
-            Match alphaword at loc 11(1,12)
-            Exception raised:Expected alphaword (at char 12), (line:1, col:13)
-            Match alphaword at loc 15(1,16)
-            Exception raised:Expected alphaword (at char 15), (line:1, col:16)
-
-        The output shown is that produced by the default debug actions - custom debug actions can be
-        specified using :class:`set_debug_actions`. Prior to attempting
-        to match the ``wd`` expression, the debugging message ``"Match  at loc (,)"``
-        is shown. Then if the parse succeeds, a ``"Matched"`` message is shown, or an ``"Exception raised"``
-        message is shown. Also note the use of :class:`set_name` to assign a human-readable name to the expression,
-        which makes debugging and exception messages easier to understand - for instance, the default
-        name created for the :class:`Word` expression without calling ``set_name`` is ``"W:(A-Za-z)"``.
-        """
-        if recurse:
-            for expr in self.visit_all():
-                expr.set_debug(flag, recurse=False)
-            return self
-
-        if flag:
-            self.set_debug_actions(
-                _default_start_debug_action,
-                _default_success_debug_action,
-                _default_exception_debug_action,
-            )
-        else:
-            self.debug = False
-        return self
-
-    @property
-    def default_name(self) -> str:
-        if self._defaultName is None:
-            self._defaultName = self._generateDefaultName()
-        return self._defaultName
-
-    @abstractmethod
-    def _generateDefaultName(self) -> str:
-        """
-        Child classes must define this method, which defines how the ``default_name`` is set.
-        """
-
-    def set_name(self, name: str) -> "ParserElement":
-        """
-        Define name for this expression, makes debugging and exception messages clearer.
-
-        Example::
-
-            integer = Word(nums)
-            integer.parse_string("ABC")  # -> Exception: Expected W:(0-9) (at char 0), (line:1, col:1)
-
-            integer.set_name("integer")
-            integer.parse_string("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
-        """
-        self.customName = name
-        self.errmsg = f"Expected {self.name}"
-        if __diag__.enable_debug_on_named_expressions:
-            self.set_debug()
-        return self
-
-    @property
-    def name(self) -> str:
-        # This will use a user-defined name if available, but otherwise defaults back to the auto-generated name
-        return self.customName if self.customName is not None else self.default_name
-
-    def __str__(self) -> str:
-        return self.name
-
-    def __repr__(self) -> str:
-        return str(self)
-
-    def streamline(self) -> "ParserElement":
-        self.streamlined = True
-        self._defaultName = None
-        return self
-
-    def recurse(self) -> List["ParserElement"]:
-        return []
-
-    def _checkRecursion(self, parseElementList):
-        subRecCheckList = parseElementList[:] + [self]
-        for e in self.recurse():
-            e._checkRecursion(subRecCheckList)
-
-    def validate(self, validateTrace=None) -> None:
-        """
-        Check defined expressions for valid structure, check for infinite recursive definitions.
-        """
-        warnings.warn(
-            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self._checkRecursion([])
-
-    def parse_file(
-        self,
-        file_or_filename: Union[str, Path, TextIO],
-        encoding: str = "utf-8",
-        parse_all: bool = False,
-        *,
-        parseAll: bool = False,
-    ) -> ParseResults:
-        """
-        Execute the parse expression on the given file or filename.
-        If a filename is specified (instead of a file object),
-        the entire file is opened, read, and closed before parsing.
-        """
-        parseAll = parseAll or parse_all
-        try:
-            file_or_filename = typing.cast(TextIO, file_or_filename)
-            file_contents = file_or_filename.read()
-        except AttributeError:
-            file_or_filename = typing.cast(str, file_or_filename)
-            with open(file_or_filename, "r", encoding=encoding) as f:
-                file_contents = f.read()
-        try:
-            return self.parse_string(file_contents, parseAll)
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-
-            # catch and re-raise exception from here, clears out pyparsing internal stack trace
-            raise exc.with_traceback(None)
-
-    def __eq__(self, other):
-        if self is other:
-            return True
-        elif isinstance(other, str_type):
-            return self.matches(other, parse_all=True)
-        elif isinstance(other, ParserElement):
-            return vars(self) == vars(other)
-        return False
-
-    def __hash__(self):
-        return id(self)
-
-    def matches(
-        self, test_string: str, parse_all: bool = True, *, parseAll: bool = True
-    ) -> bool:
-        """
-        Method for quick testing of a parser against a test string. Good for simple
-        inline microtests of sub expressions while building up larger parser.
-
-        Parameters:
-
-        - ``test_string`` - to test against this expression for a match
-        - ``parse_all`` - (default= ``True``) - flag to pass to :class:`parse_string` when running tests
-
-        Example::
-
-            expr = Word(nums)
-            assert expr.matches("100")
-        """
-        parseAll = parseAll and parse_all
-        try:
-            self.parse_string(str(test_string), parse_all=parseAll)
-            return True
-        except ParseBaseException:
-            return False
-
-    def run_tests(
-        self,
-        tests: Union[str, List[str]],
-        parse_all: bool = True,
-        comment: typing.Optional[Union["ParserElement", str]] = "#",
-        full_dump: bool = True,
-        print_results: bool = True,
-        failure_tests: bool = False,
-        post_parse: typing.Optional[Callable[[str, ParseResults], str]] = None,
-        file: typing.Optional[TextIO] = None,
-        with_line_numbers: bool = False,
-        *,
-        parseAll: bool = True,
-        fullDump: bool = True,
-        printResults: bool = True,
-        failureTests: bool = False,
-        postParse: typing.Optional[Callable[[str, ParseResults], str]] = None,
-    ) -> Tuple[bool, List[Tuple[str, Union[ParseResults, Exception]]]]:
-        """
-        Execute the parse expression on a series of test strings, showing each
-        test, the parsed results or where the parse failed. Quick and easy way to
-        run a parse expression against a list of sample strings.
-
-        Parameters:
-
-        - ``tests`` - a list of separate test strings, or a multiline string of test strings
-        - ``parse_all`` - (default= ``True``) - flag to pass to :class:`parse_string` when running tests
-        - ``comment`` - (default= ``'#'``) - expression for indicating embedded comments in the test
-          string; pass None to disable comment filtering
-        - ``full_dump`` - (default= ``True``) - dump results as list followed by results names in nested outline;
-          if False, only dump nested list
-        - ``print_results`` - (default= ``True``) prints test output to stdout
-        - ``failure_tests`` - (default= ``False``) indicates if these tests are expected to fail parsing
-        - ``post_parse`` - (default= ``None``) optional callback for successful parse results; called as
-          `fn(test_string, parse_results)` and returns a string to be added to the test output
-        - ``file`` - (default= ``None``) optional file-like object to which test output will be written;
-          if None, will default to ``sys.stdout``
-        - ``with_line_numbers`` - default= ``False``) show test strings with line and column numbers
-
-        Returns: a (success, results) tuple, where success indicates that all tests succeeded
-        (or failed if ``failure_tests`` is True), and the results contain a list of lines of each
-        test's output
-
-        Example::
-
-            number_expr = pyparsing_common.number.copy()
-
-            result = number_expr.run_tests('''
-                # unsigned integer
-                100
-                # negative integer
-                -100
-                # float with scientific notation
-                6.02e23
-                # integer with scientific notation
-                1e-12
-                ''')
-            print("Success" if result[0] else "Failed!")
-
-            result = number_expr.run_tests('''
-                # stray character
-                100Z
-                # missing leading digit before '.'
-                -.100
-                # too many '.'
-                3.14.159
-                ''', failure_tests=True)
-            print("Success" if result[0] else "Failed!")
-
-        prints::
-
-            # unsigned integer
-            100
-            [100]
-
-            # negative integer
-            -100
-            [-100]
-
-            # float with scientific notation
-            6.02e23
-            [6.02e+23]
-
-            # integer with scientific notation
-            1e-12
-            [1e-12]
-
-            Success
-
-            # stray character
-            100Z
-               ^
-            FAIL: Expected end of text (at char 3), (line:1, col:4)
-
-            # missing leading digit before '.'
-            -.100
-            ^
-            FAIL: Expected {real number with scientific notation | real number | signed integer} (at char 0), (line:1, col:1)
-
-            # too many '.'
-            3.14.159
-                ^
-            FAIL: Expected end of text (at char 4), (line:1, col:5)
-
-            Success
-
-        Each test string must be on a single line. If you want to test a string that spans multiple
-        lines, create a test like this::
-
-            expr.run_tests(r"this is a test\\n of strings that spans \\n 3 lines")
-
-        (Note that this is a raw string literal, you must include the leading ``'r'``.)
-        """
-        from .testing import pyparsing_test
-
-        parseAll = parseAll and parse_all
-        fullDump = fullDump and full_dump
-        printResults = printResults and print_results
-        failureTests = failureTests or failure_tests
-        postParse = postParse or post_parse
-        if isinstance(tests, str_type):
-            tests = typing.cast(str, tests)
-            line_strip = type(tests).strip
-            tests = [line_strip(test_line) for test_line in tests.rstrip().splitlines()]
-        comment_specified = comment is not None
-        if comment_specified:
-            if isinstance(comment, str_type):
-                comment = typing.cast(str, comment)
-                comment = Literal(comment)
-        comment = typing.cast(ParserElement, comment)
-        if file is None:
-            file = sys.stdout
-        print_ = file.write
-
-        result: Union[ParseResults, Exception]
-        allResults: List[Tuple[str, Union[ParseResults, Exception]]] = []
-        comments: List[str] = []
-        success = True
-        NL = Literal(r"\n").add_parse_action(replace_with("\n")).ignore(quoted_string)
-        BOM = "\ufeff"
-        nlstr = "\n"
-        for t in tests:
-            if comment_specified and comment.matches(t, False) or comments and not t:
-                comments.append(
-                    pyparsing_test.with_line_numbers(t) if with_line_numbers else t
-                )
-                continue
-            if not t:
-                continue
-            out = [
-                f"{nlstr}{nlstr.join(comments) if comments else ''}",
-                pyparsing_test.with_line_numbers(t) if with_line_numbers else t,
-            ]
-            comments = []
-            try:
-                # convert newline marks to actual newlines, and strip leading BOM if present
-                t = NL.transform_string(t.lstrip(BOM))
-                result = self.parse_string(t, parse_all=parseAll)
-            except ParseBaseException as pe:
-                fatal = "(FATAL) " if isinstance(pe, ParseFatalException) else ""
-                out.append(pe.explain())
-                out.append(f"FAIL: {fatal}{pe}")
-                if ParserElement.verbose_stacktrace:
-                    out.extend(traceback.format_tb(pe.__traceback__))
-                success = success and failureTests
-                result = pe
-            except Exception as exc:
-                out.append(f"FAIL-EXCEPTION: {type(exc).__name__}: {exc}")
-                if ParserElement.verbose_stacktrace:
-                    out.extend(traceback.format_tb(exc.__traceback__))
-                success = success and failureTests
-                result = exc
-            else:
-                success = success and not failureTests
-                if postParse is not None:
-                    try:
-                        pp_value = postParse(t, result)
-                        if pp_value is not None:
-                            if isinstance(pp_value, ParseResults):
-                                out.append(pp_value.dump())
-                            else:
-                                out.append(str(pp_value))
-                        else:
-                            out.append(result.dump())
-                    except Exception as e:
-                        out.append(result.dump(full=fullDump))
-                        out.append(
-                            f"{postParse.__name__} failed: {type(e).__name__}: {e}"
-                        )
-                else:
-                    out.append(result.dump(full=fullDump))
-            out.append("")
-
-            if printResults:
-                print_("\n".join(out))
-
-            allResults.append((t, result))
-
-        return success, allResults
-
-    def create_diagram(
-        self,
-        output_html: Union[TextIO, Path, str],
-        vertical: int = 3,
-        show_results_names: bool = False,
-        show_groups: bool = False,
-        embed: bool = False,
-        **kwargs,
-    ) -> None:
-        """
-        Create a railroad diagram for the parser.
-
-        Parameters:
-
-        - ``output_html`` (str or file-like object) - output target for generated
-          diagram HTML
-        - ``vertical`` (int) - threshold for formatting multiple alternatives vertically
-          instead of horizontally (default=3)
-        - ``show_results_names`` - bool flag whether diagram should show annotations for
-          defined results names
-        - ``show_groups`` - bool flag whether groups should be highlighted with an unlabeled surrounding box
-        - ``embed`` - bool flag whether generated HTML should omit , , and  tags to embed
-          the resulting HTML in an enclosing HTML source
-        - ``head`` - str containing additional HTML to insert into the  section of the generated code;
-          can be used to insert custom CSS styling
-        - ``body`` - str containing additional HTML to insert at the beginning of the  section of the
-          generated code
-
-        Additional diagram-formatting keyword arguments can also be included;
-        see railroad.Diagram class.
-        """
-
-        try:
-            from .diagram import to_railroad, railroad_to_html
-        except ImportError as ie:
-            raise Exception(
-                "must ``pip install pyparsing[diagrams]`` to generate parser railroad diagrams"
-            ) from ie
-
-        self.streamline()
-
-        railroad = to_railroad(
-            self,
-            vertical=vertical,
-            show_results_names=show_results_names,
-            show_groups=show_groups,
-            diagram_kwargs=kwargs,
-        )
-        if not isinstance(output_html, (str, Path)):
-            # we were passed a file-like object, just write to it
-            output_html.write(railroad_to_html(railroad, embed=embed, **kwargs))
-            return
-
-        with open(output_html, "w", encoding="utf-8") as diag_file:
-            diag_file.write(railroad_to_html(railroad, embed=embed, **kwargs))
-
-    # Compatibility synonyms
-    # fmt: off
-    inlineLiteralsUsing = replaced_by_pep8("inlineLiteralsUsing", inline_literals_using)
-    setDefaultWhitespaceChars = replaced_by_pep8(
-        "setDefaultWhitespaceChars", set_default_whitespace_chars
-    )
-    setResultsName = replaced_by_pep8("setResultsName", set_results_name)
-    setBreak = replaced_by_pep8("setBreak", set_break)
-    setParseAction = replaced_by_pep8("setParseAction", set_parse_action)
-    addParseAction = replaced_by_pep8("addParseAction", add_parse_action)
-    addCondition = replaced_by_pep8("addCondition", add_condition)
-    setFailAction = replaced_by_pep8("setFailAction", set_fail_action)
-    tryParse = replaced_by_pep8("tryParse", try_parse)
-    enableLeftRecursion = replaced_by_pep8("enableLeftRecursion", enable_left_recursion)
-    enablePackrat = replaced_by_pep8("enablePackrat", enable_packrat)
-    parseString = replaced_by_pep8("parseString", parse_string)
-    scanString = replaced_by_pep8("scanString", scan_string)
-    transformString = replaced_by_pep8("transformString", transform_string)
-    searchString = replaced_by_pep8("searchString", search_string)
-    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
-    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
-    setWhitespaceChars = replaced_by_pep8("setWhitespaceChars", set_whitespace_chars)
-    parseWithTabs = replaced_by_pep8("parseWithTabs", parse_with_tabs)
-    setDebugActions = replaced_by_pep8("setDebugActions", set_debug_actions)
-    setDebug = replaced_by_pep8("setDebug", set_debug)
-    setName = replaced_by_pep8("setName", set_name)
-    parseFile = replaced_by_pep8("parseFile", parse_file)
-    runTests = replaced_by_pep8("runTests", run_tests)
-    canParseNext = can_parse_next
-    resetCache = reset_cache
-    defaultName = default_name
-    # fmt: on
-
-
-class _PendingSkip(ParserElement):
-    # internal placeholder class to hold a place were '...' is added to a parser element,
-    # once another ParserElement is added, this placeholder will be replaced with a SkipTo
-    def __init__(self, expr: ParserElement, must_skip: bool = False):
-        super().__init__()
-        self.anchor = expr
-        self.must_skip = must_skip
-
-    def _generateDefaultName(self) -> str:
-        return str(self.anchor + Empty()).replace("Empty", "...")
-
-    def __add__(self, other) -> "ParserElement":
-        skipper = SkipTo(other).set_name("...")("_skipped*")
-        if self.must_skip:
-
-            def must_skip(t):
-                if not t._skipped or t._skipped.as_list() == [""]:
-                    del t[0]
-                    t.pop("_skipped", None)
-
-            def show_skip(t):
-                if t._skipped.as_list()[-1:] == [""]:
-                    t.pop("_skipped")
-                    t["_skipped"] = f"missing <{self.anchor!r}>"
-
-            return (
-                self.anchor + skipper().add_parse_action(must_skip)
-                | skipper().add_parse_action(show_skip)
-            ) + other
-
-        return self.anchor + skipper + other
-
-    def __repr__(self):
-        return self.defaultName
-
-    def parseImpl(self, *args):
-        raise Exception(
-            "use of `...` expression without following SkipTo target expression"
-        )
-
-
-class Token(ParserElement):
-    """Abstract :class:`ParserElement` subclass, for defining atomic
-    matching patterns.
-    """
-
-    def __init__(self):
-        super().__init__(savelist=False)
-
-    def _generateDefaultName(self) -> str:
-        return type(self).__name__
-
-
-class NoMatch(Token):
-    """
-    A token that will never match.
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-        self.errmsg = "Unmatchable token"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class Literal(Token):
-    """
-    Token to exactly match a specified string.
-
-    Example::
-
-        Literal('abc').parse_string('abc')  # -> ['abc']
-        Literal('abc').parse_string('abcdef')  # -> ['abc']
-        Literal('abc').parse_string('ab')  # -> Exception: Expected "abc"
-
-    For case-insensitive matching, use :class:`CaselessLiteral`.
-
-    For keyword matching (force word break before and after the matched string),
-    use :class:`Keyword` or :class:`CaselessKeyword`.
-    """
-
-    def __new__(cls, match_string: str = "", *, matchString: str = ""):
-        # Performance tuning: select a subclass with optimized parseImpl
-        if cls is Literal:
-            match_string = matchString or match_string
-            if not match_string:
-                return super().__new__(Empty)
-            if len(match_string) == 1:
-                return super().__new__(_SingleCharLiteral)
-
-        # Default behavior
-        return super().__new__(cls)
-
-    # Needed to make copy.copy() work correctly if we customize __new__
-    def __getnewargs__(self):
-        return (self.match,)
-
-    def __init__(self, match_string: str = "", *, matchString: str = ""):
-        super().__init__()
-        match_string = matchString or match_string
-        self.match = match_string
-        self.matchLen = len(match_string)
-        self.firstMatchChar = match_string[:1]
-        self.errmsg = f"Expected {self.name}"
-        self.mayReturnEmpty = False
-        self.mayIndexError = False
-
-    def _generateDefaultName(self) -> str:
-        return repr(self.match)
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if instring[loc] == self.firstMatchChar and instring.startswith(
-            self.match, loc
-        ):
-            return loc + self.matchLen, self.match
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class Empty(Literal):
-    """
-    An empty token, will always match.
-    """
-
-    def __init__(self, match_string="", *, matchString=""):
-        super().__init__("")
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-
-    def _generateDefaultName(self) -> str:
-        return "Empty"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        return loc, []
-
-
-class _SingleCharLiteral(Literal):
-    def parseImpl(self, instring, loc, doActions=True):
-        if instring[loc] == self.firstMatchChar:
-            return loc + 1, self.match
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-ParserElement._literalStringClass = Literal
-
-
-class Keyword(Token):
-    """
-    Token to exactly match a specified string as a keyword, that is,
-    it must be immediately preceded and followed by whitespace or
-    non-keyword characters. Compare with :class:`Literal`:
-
-    - ``Literal("if")`` will match the leading ``'if'`` in
-      ``'ifAndOnlyIf'``.
-    - ``Keyword("if")`` will not; it will only match the leading
-      ``'if'`` in ``'if x=1'``, or ``'if(y==2)'``
-
-    Accepts two optional constructor arguments in addition to the
-    keyword string:
-
-    - ``ident_chars`` is a string of characters that would be valid
-      identifier characters, defaulting to all alphanumerics + "_" and
-      "$"
-    - ``caseless`` allows case-insensitive matching, default is ``False``.
-
-    Example::
-
-        Keyword("start").parse_string("start")  # -> ['start']
-        Keyword("start").parse_string("starting")  # -> Exception
-
-    For case-insensitive matching, use :class:`CaselessKeyword`.
-    """
-
-    DEFAULT_KEYWORD_CHARS = alphanums + "_$"
-
-    def __init__(
-        self,
-        match_string: str = "",
-        ident_chars: typing.Optional[str] = None,
-        caseless: bool = False,
-        *,
-        matchString: str = "",
-        identChars: typing.Optional[str] = None,
-    ):
-        super().__init__()
-        identChars = identChars or ident_chars
-        if identChars is None:
-            identChars = Keyword.DEFAULT_KEYWORD_CHARS
-        match_string = matchString or match_string
-        self.match = match_string
-        self.matchLen = len(match_string)
-        try:
-            self.firstMatchChar = match_string[0]
-        except IndexError:
-            raise ValueError("null string passed to Keyword; use Empty() instead")
-        self.errmsg = f"Expected {type(self).__name__} {self.name}"
-        self.mayReturnEmpty = False
-        self.mayIndexError = False
-        self.caseless = caseless
-        if caseless:
-            self.caselessmatch = match_string.upper()
-            identChars = identChars.upper()
-        self.identChars = set(identChars)
-
-    def _generateDefaultName(self) -> str:
-        return repr(self.match)
-
-    def parseImpl(self, instring, loc, doActions=True):
-        errmsg = self.errmsg
-        errloc = loc
-        if self.caseless:
-            if instring[loc : loc + self.matchLen].upper() == self.caselessmatch:
-                if loc == 0 or instring[loc - 1].upper() not in self.identChars:
-                    if (
-                        loc >= len(instring) - self.matchLen
-                        or instring[loc + self.matchLen].upper() not in self.identChars
-                    ):
-                        return loc + self.matchLen, self.match
-
-                    # followed by keyword char
-                    errmsg += ", was immediately followed by keyword character"
-                    errloc = loc + self.matchLen
-                else:
-                    # preceded by keyword char
-                    errmsg += ", keyword was immediately preceded by keyword character"
-                    errloc = loc - 1
-            # else no match just raise plain exception
-
-        elif (
-            instring[loc] == self.firstMatchChar
-            and self.matchLen == 1
-            or instring.startswith(self.match, loc)
-        ):
-            if loc == 0 or instring[loc - 1] not in self.identChars:
-                if (
-                    loc >= len(instring) - self.matchLen
-                    or instring[loc + self.matchLen] not in self.identChars
-                ):
-                    return loc + self.matchLen, self.match
-
-                # followed by keyword char
-                errmsg += ", keyword was immediately followed by keyword character"
-                errloc = loc + self.matchLen
-            else:
-                # preceded by keyword char
-                errmsg += ", keyword was immediately preceded by keyword character"
-                errloc = loc - 1
-        # else no match just raise plain exception
-
-        raise ParseException(instring, errloc, errmsg, self)
-
-    @staticmethod
-    def set_default_keyword_chars(chars) -> None:
-        """
-        Overrides the default characters used by :class:`Keyword` expressions.
-        """
-        Keyword.DEFAULT_KEYWORD_CHARS = chars
-
-    setDefaultKeywordChars = set_default_keyword_chars
-
-
-class CaselessLiteral(Literal):
-    """
-    Token to match a specified string, ignoring case of letters.
-    Note: the matched results will always be in the case of the given
-    match string, NOT the case of the input text.
-
-    Example::
-
-        CaselessLiteral("CMD")[1, ...].parse_string("cmd CMD Cmd10")
-        # -> ['CMD', 'CMD', 'CMD']
-
-    (Contrast with example for :class:`CaselessKeyword`.)
-    """
-
-    def __init__(self, match_string: str = "", *, matchString: str = ""):
-        match_string = matchString or match_string
-        super().__init__(match_string.upper())
-        # Preserve the defining literal.
-        self.returnString = match_string
-        self.errmsg = f"Expected {self.name}"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if instring[loc : loc + self.matchLen].upper() == self.match:
-            return loc + self.matchLen, self.returnString
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class CaselessKeyword(Keyword):
-    """
-    Caseless version of :class:`Keyword`.
-
-    Example::
-
-        CaselessKeyword("CMD")[1, ...].parse_string("cmd CMD Cmd10")
-        # -> ['CMD', 'CMD']
-
-    (Contrast with example for :class:`CaselessLiteral`.)
-    """
-
-    def __init__(
-        self,
-        match_string: str = "",
-        ident_chars: typing.Optional[str] = None,
-        *,
-        matchString: str = "",
-        identChars: typing.Optional[str] = None,
-    ):
-        identChars = identChars or ident_chars
-        match_string = matchString or match_string
-        super().__init__(match_string, identChars, caseless=True)
-
-
-class CloseMatch(Token):
-    """A variation on :class:`Literal` which matches "close" matches,
-    that is, strings with at most 'n' mismatching characters.
-    :class:`CloseMatch` takes parameters:
-
-    - ``match_string`` - string to be matched
-    - ``caseless`` - a boolean indicating whether to ignore casing when comparing characters
-    - ``max_mismatches`` - (``default=1``) maximum number of
-      mismatches allowed to count as a match
-
-    The results from a successful parse will contain the matched text
-    from the input string and the following named results:
-
-    - ``mismatches`` - a list of the positions within the
-      match_string where mismatches were found
-    - ``original`` - the original match_string used to compare
-      against the input string
-
-    If ``mismatches`` is an empty list, then the match was an exact
-    match.
-
-    Example::
-
-        patt = CloseMatch("ATCATCGAATGGA")
-        patt.parse_string("ATCATCGAAXGGA") # -> (['ATCATCGAAXGGA'], {'mismatches': [[9]], 'original': ['ATCATCGAATGGA']})
-        patt.parse_string("ATCAXCGAAXGGA") # -> Exception: Expected 'ATCATCGAATGGA' (with up to 1 mismatches) (at char 0), (line:1, col:1)
-
-        # exact match
-        patt.parse_string("ATCATCGAATGGA") # -> (['ATCATCGAATGGA'], {'mismatches': [[]], 'original': ['ATCATCGAATGGA']})
-
-        # close match allowing up to 2 mismatches
-        patt = CloseMatch("ATCATCGAATGGA", max_mismatches=2)
-        patt.parse_string("ATCAXCGAAXGGA") # -> (['ATCAXCGAAXGGA'], {'mismatches': [[4, 9]], 'original': ['ATCATCGAATGGA']})
-    """
-
-    def __init__(
-        self,
-        match_string: str,
-        max_mismatches: typing.Optional[int] = None,
-        *,
-        maxMismatches: int = 1,
-        caseless=False,
-    ):
-        maxMismatches = max_mismatches if max_mismatches is not None else maxMismatches
-        super().__init__()
-        self.match_string = match_string
-        self.maxMismatches = maxMismatches
-        self.errmsg = f"Expected {self.match_string!r} (with up to {self.maxMismatches} mismatches)"
-        self.caseless = caseless
-        self.mayIndexError = False
-        self.mayReturnEmpty = False
-
-    def _generateDefaultName(self) -> str:
-        return f"{type(self).__name__}:{self.match_string!r}"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        start = loc
-        instrlen = len(instring)
-        maxloc = start + len(self.match_string)
-
-        if maxloc <= instrlen:
-            match_string = self.match_string
-            match_stringloc = 0
-            mismatches = []
-            maxMismatches = self.maxMismatches
-
-            for match_stringloc, s_m in enumerate(
-                zip(instring[loc:maxloc], match_string)
-            ):
-                src, mat = s_m
-                if self.caseless:
-                    src, mat = src.lower(), mat.lower()
-
-                if src != mat:
-                    mismatches.append(match_stringloc)
-                    if len(mismatches) > maxMismatches:
-                        break
-            else:
-                loc = start + match_stringloc + 1
-                results = ParseResults([instring[start:loc]])
-                results["original"] = match_string
-                results["mismatches"] = mismatches
-                return loc, results
-
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class Word(Token):
-    """Token for matching words composed of allowed character sets.
-
-    Parameters:
-
-    - ``init_chars`` - string of all characters that should be used to
-      match as a word; "ABC" will match "AAA", "ABAB", "CBAC", etc.;
-      if ``body_chars`` is also specified, then this is the string of
-      initial characters
-    - ``body_chars`` - string of characters that
-      can be used for matching after a matched initial character as
-      given in ``init_chars``; if omitted, same as the initial characters
-      (default=``None``)
-    - ``min`` - minimum number of characters to match (default=1)
-    - ``max`` - maximum number of characters to match (default=0)
-    - ``exact`` - exact number of characters to match (default=0)
-    - ``as_keyword`` - match as a keyword (default=``False``)
-    - ``exclude_chars`` - characters that might be
-      found in the input ``body_chars`` string but which should not be
-      accepted for matching ;useful to define a word of all
-      printables except for one or two characters, for instance
-      (default=``None``)
-
-    :class:`srange` is useful for defining custom character set strings
-    for defining :class:`Word` expressions, using range notation from
-    regular expression character sets.
-
-    A common mistake is to use :class:`Word` to match a specific literal
-    string, as in ``Word("Address")``. Remember that :class:`Word`
-    uses the string argument to define *sets* of matchable characters.
-    This expression would match "Add", "AAA", "dAred", or any other word
-    made up of the characters 'A', 'd', 'r', 'e', and 's'. To match an
-    exact literal string, use :class:`Literal` or :class:`Keyword`.
-
-    pyparsing includes helper strings for building Words:
-
-    - :class:`alphas`
-    - :class:`nums`
-    - :class:`alphanums`
-    - :class:`hexnums`
-    - :class:`alphas8bit` (alphabetic characters in ASCII range 128-255
-      - accented, tilded, umlauted, etc.)
-    - :class:`punc8bit` (non-alphabetic characters in ASCII range
-      128-255 - currency, symbols, superscripts, diacriticals, etc.)
-    - :class:`printables` (any non-whitespace character)
-
-    ``alphas``, ``nums``, and ``printables`` are also defined in several
-    Unicode sets - see :class:`pyparsing_unicode``.
-
-    Example::
-
-        # a word composed of digits
-        integer = Word(nums) # equivalent to Word("0123456789") or Word(srange("0-9"))
-
-        # a word with a leading capital, and zero or more lowercase
-        capitalized_word = Word(alphas.upper(), alphas.lower())
-
-        # hostnames are alphanumeric, with leading alpha, and '-'
-        hostname = Word(alphas, alphanums + '-')
-
-        # roman numeral (not a strict parser, accepts invalid mix of characters)
-        roman = Word("IVXLCDM")
-
-        # any string of non-whitespace characters, except for ','
-        csv_value = Word(printables, exclude_chars=",")
-    """
-
-    def __init__(
-        self,
-        init_chars: str = "",
-        body_chars: typing.Optional[str] = None,
-        min: int = 1,
-        max: int = 0,
-        exact: int = 0,
-        as_keyword: bool = False,
-        exclude_chars: typing.Optional[str] = None,
-        *,
-        initChars: typing.Optional[str] = None,
-        bodyChars: typing.Optional[str] = None,
-        asKeyword: bool = False,
-        excludeChars: typing.Optional[str] = None,
-    ):
-        initChars = initChars or init_chars
-        bodyChars = bodyChars or body_chars
-        asKeyword = asKeyword or as_keyword
-        excludeChars = excludeChars or exclude_chars
-        super().__init__()
-        if not initChars:
-            raise ValueError(
-                f"invalid {type(self).__name__}, initChars cannot be empty string"
-            )
-
-        initChars_set = set(initChars)
-        if excludeChars:
-            excludeChars_set = set(excludeChars)
-            initChars_set -= excludeChars_set
-            if bodyChars:
-                bodyChars = "".join(set(bodyChars) - excludeChars_set)
-        self.initChars = initChars_set
-        self.initCharsOrig = "".join(sorted(initChars_set))
-
-        if bodyChars:
-            self.bodyChars = set(bodyChars)
-            self.bodyCharsOrig = "".join(sorted(bodyChars))
-        else:
-            self.bodyChars = initChars_set
-            self.bodyCharsOrig = self.initCharsOrig
-
-        self.maxSpecified = max > 0
-
-        if min < 1:
-            raise ValueError(
-                "cannot specify a minimum length < 1; use Opt(Word()) if zero-length word is permitted"
-            )
-
-        if self.maxSpecified and min > max:
-            raise ValueError(
-                f"invalid args, if min and max both specified min must be <= max (min={min}, max={max})"
-            )
-
-        self.minLen = min
-
-        if max > 0:
-            self.maxLen = max
-        else:
-            self.maxLen = _MAX_INT
-
-        if exact > 0:
-            min = max = exact
-            self.maxLen = exact
-            self.minLen = exact
-
-        self.errmsg = f"Expected {self.name}"
-        self.mayIndexError = False
-        self.asKeyword = asKeyword
-        if self.asKeyword:
-            self.errmsg += " as a keyword"
-
-        # see if we can make a regex for this Word
-        if " " not in (self.initChars | self.bodyChars):
-            if len(self.initChars) == 1:
-                re_leading_fragment = re.escape(self.initCharsOrig)
-            else:
-                re_leading_fragment = f"[{_collapse_string_to_ranges(self.initChars)}]"
-
-            if self.bodyChars == self.initChars:
-                if max == 0 and self.minLen == 1:
-                    repeat = "+"
-                elif max == 1:
-                    repeat = ""
-                else:
-                    if self.minLen != self.maxLen:
-                        repeat = f"{{{self.minLen},{'' if self.maxLen == _MAX_INT else self.maxLen}}}"
-                    else:
-                        repeat = f"{{{self.minLen}}}"
-                self.reString = f"{re_leading_fragment}{repeat}"
-            else:
-                if max == 1:
-                    re_body_fragment = ""
-                    repeat = ""
-                else:
-                    re_body_fragment = f"[{_collapse_string_to_ranges(self.bodyChars)}]"
-                    if max == 0 and self.minLen == 1:
-                        repeat = "*"
-                    elif max == 2:
-                        repeat = "?" if min <= 1 else ""
-                    else:
-                        if min != max:
-                            repeat = f"{{{min - 1 if min > 0 else ''},{max - 1 if max > 0 else ''}}}"
-                        else:
-                            repeat = f"{{{min - 1 if min > 0 else ''}}}"
-
-                self.reString = f"{re_leading_fragment}{re_body_fragment}{repeat}"
-
-            if self.asKeyword:
-                self.reString = rf"\b{self.reString}\b"
-
-            try:
-                self.re = re.compile(self.reString)
-            except re.error:
-                self.re = None  # type: ignore[assignment]
-            else:
-                self.re_match = self.re.match
-                self.parseImpl = self.parseImpl_regex  # type: ignore[assignment]
-
-    def _generateDefaultName(self) -> str:
-        def charsAsStr(s):
-            max_repr_len = 16
-            s = _collapse_string_to_ranges(s, re_escape=False)
-
-            if len(s) > max_repr_len:
-                return s[: max_repr_len - 3] + "..."
-
-            return s
-
-        if self.initChars != self.bodyChars:
-            base = f"W:({charsAsStr(self.initChars)}, {charsAsStr(self.bodyChars)})"
-        else:
-            base = f"W:({charsAsStr(self.initChars)})"
-
-        # add length specification
-        if self.minLen > 1 or self.maxLen != _MAX_INT:
-            if self.minLen == self.maxLen:
-                if self.minLen == 1:
-                    return base[2:]
-                else:
-                    return base + f"{{{self.minLen}}}"
-            elif self.maxLen == _MAX_INT:
-                return base + f"{{{self.minLen},...}}"
-            else:
-                return base + f"{{{self.minLen},{self.maxLen}}}"
-        return base
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if instring[loc] not in self.initChars:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        start = loc
-        loc += 1
-        instrlen = len(instring)
-        bodychars = self.bodyChars
-        maxloc = start + self.maxLen
-        maxloc = min(maxloc, instrlen)
-        while loc < maxloc and instring[loc] in bodychars:
-            loc += 1
-
-        throwException = False
-        if loc - start < self.minLen:
-            throwException = True
-        elif self.maxSpecified and loc < instrlen and instring[loc] in bodychars:
-            throwException = True
-        elif self.asKeyword and (
-            (start > 0 and instring[start - 1] in bodychars)
-            or (loc < instrlen and instring[loc] in bodychars)
-        ):
-            throwException = True
-
-        if throwException:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, instring[start:loc]
-
-    def parseImpl_regex(self, instring, loc, doActions=True):
-        result = self.re_match(instring, loc)
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        return loc, result.group()
-
-
-class Char(Word):
-    """A short-cut class for defining :class:`Word` ``(characters, exact=1)``,
-    when defining a match of any single character in a string of
-    characters.
-    """
-
-    def __init__(
-        self,
-        charset: str,
-        as_keyword: bool = False,
-        exclude_chars: typing.Optional[str] = None,
-        *,
-        asKeyword: bool = False,
-        excludeChars: typing.Optional[str] = None,
-    ):
-        asKeyword = asKeyword or as_keyword
-        excludeChars = excludeChars or exclude_chars
-        super().__init__(
-            charset, exact=1, as_keyword=asKeyword, exclude_chars=excludeChars
-        )
-
-
-class Regex(Token):
-    r"""Token for matching strings that match a given regular
-    expression. Defined with string specifying the regular expression in
-    a form recognized by the stdlib Python  `re module `_.
-    If the given regex contains named groups (defined using ``(?P...)``),
-    these will be preserved as named :class:`ParseResults`.
-
-    If instead of the Python stdlib ``re`` module you wish to use a different RE module
-    (such as the ``regex`` module), you can do so by building your ``Regex`` object with
-    a compiled RE that was compiled using ``regex``.
-
-    Example::
-
-        realnum = Regex(r"[+-]?\d+\.\d*")
-        # ref: https://stackoverflow.com/questions/267399/how-do-you-match-only-valid-roman-numerals-with-a-regular-expression
-        roman = Regex(r"M{0,4}(CM|CD|D?{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})")
-
-        # named fields in a regex will be returned as named results
-        date = Regex(r'(?P\d{4})-(?P\d\d?)-(?P\d\d?)')
-
-        # the Regex class will accept re's compiled using the regex module
-        import regex
-        parser = pp.Regex(regex.compile(r'[0-9]'))
-    """
-
-    def __init__(
-        self,
-        pattern: Any,
-        flags: Union[re.RegexFlag, int] = 0,
-        as_group_list: bool = False,
-        as_match: bool = False,
-        *,
-        asGroupList: bool = False,
-        asMatch: bool = False,
-    ):
-        """The parameters ``pattern`` and ``flags`` are passed
-        to the ``re.compile()`` function as-is. See the Python
-        `re module `_ module for an
-        explanation of the acceptable patterns and flags.
-        """
-        super().__init__()
-        asGroupList = asGroupList or as_group_list
-        asMatch = asMatch or as_match
-
-        if isinstance(pattern, str_type):
-            if not pattern:
-                raise ValueError("null string passed to Regex; use Empty() instead")
-
-            self._re = None
-            self.reString = self.pattern = pattern
-            self.flags = flags
-
-        elif hasattr(pattern, "pattern") and hasattr(pattern, "match"):
-            self._re = pattern
-            self.pattern = self.reString = pattern.pattern
-            self.flags = flags
-
-        else:
-            raise TypeError(
-                "Regex may only be constructed with a string or a compiled RE object"
-            )
-
-        self.errmsg = f"Expected {self.name}"
-        self.mayIndexError = False
-        self.asGroupList = asGroupList
-        self.asMatch = asMatch
-        if self.asGroupList:
-            self.parseImpl = self.parseImplAsGroupList  # type: ignore [assignment]
-        if self.asMatch:
-            self.parseImpl = self.parseImplAsMatch  # type: ignore [assignment]
-
-    @cached_property
-    def re(self):
-        if self._re:
-            return self._re
-
-        try:
-            return re.compile(self.pattern, self.flags)
-        except re.error:
-            raise ValueError(f"invalid pattern ({self.pattern!r}) passed to Regex")
-
-    @cached_property
-    def re_match(self):
-        return self.re.match
-
-    @cached_property
-    def mayReturnEmpty(self):
-        return self.re_match("") is not None
-
-    def _generateDefaultName(self) -> str:
-        return "Re:({})".format(repr(self.pattern).replace("\\\\", "\\"))
-
-    def parseImpl(self, instring, loc, doActions=True):
-        result = self.re_match(instring, loc)
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        ret = ParseResults(result.group())
-        d = result.groupdict()
-
-        for k, v in d.items():
-            ret[k] = v
-
-        return loc, ret
-
-    def parseImplAsGroupList(self, instring, loc, doActions=True):
-        result = self.re_match(instring, loc)
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        ret = result.groups()
-        return loc, ret
-
-    def parseImplAsMatch(self, instring, loc, doActions=True):
-        result = self.re_match(instring, loc)
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        ret = result
-        return loc, ret
-
-    def sub(self, repl: str) -> ParserElement:
-        r"""
-        Return :class:`Regex` with an attached parse action to transform the parsed
-        result as if called using `re.sub(expr, repl, string) `_.
-
-        Example::
-
-            make_html = Regex(r"(\w+):(.*?):").sub(r"<\1>\2")
-            print(make_html.transform_string("h1:main title:"))
-            # prints "
main title
"
-        """
-        if self.asGroupList:
-            raise TypeError("cannot use sub() with Regex(as_group_list=True)")
-
-        if self.asMatch and callable(repl):
-            raise TypeError(
-                "cannot use sub() with a callable with Regex(as_match=True)"
-            )
-
-        if self.asMatch:
-
-            def pa(tokens):
-                return tokens[0].expand(repl)
-
-        else:
-
-            def pa(tokens):
-                return self.re.sub(repl, tokens[0])
-
-        return self.add_parse_action(pa)
-
-
-class QuotedString(Token):
-    r"""
-    Token for matching strings that are delimited by quoting characters.
-
-    Defined with the following parameters:
-
-    - ``quote_char`` - string of one or more characters defining the
-      quote delimiting string
-    - ``esc_char`` - character to re_escape quotes, typically backslash
-      (default= ``None``)
-    - ``esc_quote`` - special quote sequence to re_escape an embedded quote
-      string (such as SQL's ``""`` to re_escape an embedded ``"``)
-      (default= ``None``)
-    - ``multiline`` - boolean indicating whether quotes can span
-      multiple lines (default= ``False``)
-    - ``unquote_results`` - boolean indicating whether the matched text
-      should be unquoted (default= ``True``)
-    - ``end_quote_char`` - string of one or more characters defining the
-      end of the quote delimited string (default= ``None``  => same as
-      quote_char)
-    - ``convert_whitespace_escapes`` - convert escaped whitespace
-      (``'\t'``, ``'\n'``, etc.) to actual whitespace
-      (default= ``True``)
-
-    Example::
-
-        qs = QuotedString('"')
-        print(qs.search_string('lsjdf "This is the quote" sldjf'))
-        complex_qs = QuotedString('{{', end_quote_char='}}')
-        print(complex_qs.search_string('lsjdf {{This is the "quote"}} sldjf'))
-        sql_qs = QuotedString('"', esc_quote='""')
-        print(sql_qs.search_string('lsjdf "This is the quote with ""embedded"" quotes" sldjf'))
-
-    prints::
-
-        [['This is the quote']]
-        [['This is the "quote"']]
-        [['This is the quote with "embedded" quotes']]
-    """
-
-    ws_map = dict(((r"\t", "\t"), (r"\n", "\n"), (r"\f", "\f"), (r"\r", "\r")))
-
-    def __init__(
-        self,
-        quote_char: str = "",
-        esc_char: typing.Optional[str] = None,
-        esc_quote: typing.Optional[str] = None,
-        multiline: bool = False,
-        unquote_results: bool = True,
-        end_quote_char: typing.Optional[str] = None,
-        convert_whitespace_escapes: bool = True,
-        *,
-        quoteChar: str = "",
-        escChar: typing.Optional[str] = None,
-        escQuote: typing.Optional[str] = None,
-        unquoteResults: bool = True,
-        endQuoteChar: typing.Optional[str] = None,
-        convertWhitespaceEscapes: bool = True,
-    ):
-        super().__init__()
-        esc_char = escChar or esc_char
-        esc_quote = escQuote or esc_quote
-        unquote_results = unquoteResults and unquote_results
-        end_quote_char = endQuoteChar or end_quote_char
-        convert_whitespace_escapes = (
-            convertWhitespaceEscapes and convert_whitespace_escapes
-        )
-        quote_char = quoteChar or quote_char
-
-        # remove white space from quote chars
-        quote_char = quote_char.strip()
-        if not quote_char:
-            raise ValueError("quote_char cannot be the empty string")
-
-        if end_quote_char is None:
-            end_quote_char = quote_char
-        else:
-            end_quote_char = end_quote_char.strip()
-            if not end_quote_char:
-                raise ValueError("end_quote_char cannot be the empty string")
-
-        self.quote_char: str = quote_char
-        self.quote_char_len: int = len(quote_char)
-        self.first_quote_char: str = quote_char[0]
-        self.end_quote_char: str = end_quote_char
-        self.end_quote_char_len: int = len(end_quote_char)
-        self.esc_char: str = esc_char or ""
-        self.has_esc_char: bool = esc_char is not None
-        self.esc_quote: str = esc_quote or ""
-        self.unquote_results: bool = unquote_results
-        self.convert_whitespace_escapes: bool = convert_whitespace_escapes
-        self.multiline = multiline
-        self.re_flags = re.RegexFlag(0)
-
-        # fmt: off
-        # build up re pattern for the content between the quote delimiters
-        inner_pattern = []
-
-        if esc_quote:
-            inner_pattern.append(rf"(?:{re.escape(esc_quote)})")
-
-        if esc_char:
-            inner_pattern.append(rf"(?:{re.escape(esc_char)}.)")
-
-        if len(self.end_quote_char) > 1:
-            inner_pattern.append(
-                "(?:"
-                + "|".join(
-                    f"(?:{re.escape(self.end_quote_char[:i])}(?!{re.escape(self.end_quote_char[i:])}))"
-                    for i in range(len(self.end_quote_char) - 1, 0, -1)
-                )
-                + ")"
-            )
-
-        if self.multiline:
-            self.re_flags |= re.MULTILINE | re.DOTALL
-            inner_pattern.append(
-                rf"(?:[^{_escape_regex_range_chars(self.end_quote_char[0])}"
-                rf"{(_escape_regex_range_chars(esc_char) if self.has_esc_char else '')}])"
-            )
-        else:
-            inner_pattern.append(
-                rf"(?:[^{_escape_regex_range_chars(self.end_quote_char[0])}\n\r"
-                rf"{(_escape_regex_range_chars(esc_char) if self.has_esc_char else '')}])"
-            )
-
-        self.pattern = "".join(
-            [
-                re.escape(self.quote_char),
-                "(?:",
-                '|'.join(inner_pattern),
-                ")*",
-                re.escape(self.end_quote_char),
-            ]
-        )
-
-        if self.unquote_results:
-            if self.convert_whitespace_escapes:
-                self.unquote_scan_re = re.compile(
-                    rf"({'|'.join(re.escape(k) for k in self.ws_map)})"
-                    rf"|({re.escape(self.esc_char)}.)"
-                    rf"|(\n|.)",
-                    flags=self.re_flags,
-                )
-            else:
-                self.unquote_scan_re = re.compile(
-                    rf"({re.escape(self.esc_char)}.)"
-                    rf"|(\n|.)",
-                    flags=self.re_flags
-                )
-        # fmt: on
-
-        try:
-            self.re = re.compile(self.pattern, self.re_flags)
-            self.reString = self.pattern
-            self.re_match = self.re.match
-        except re.error:
-            raise ValueError(f"invalid pattern {self.pattern!r} passed to Regex")
-
-        self.errmsg = f"Expected {self.name}"
-        self.mayIndexError = False
-        self.mayReturnEmpty = True
-
-    def _generateDefaultName(self) -> str:
-        if self.quote_char == self.end_quote_char and isinstance(
-            self.quote_char, str_type
-        ):
-            return f"string enclosed in {self.quote_char!r}"
-
-        return f"quoted string, starting with {self.quote_char} ending with {self.end_quote_char}"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        # check first character of opening quote to see if that is a match
-        # before doing the more complicated regex match
-        result = (
-            instring[loc] == self.first_quote_char
-            and self.re_match(instring, loc)
-            or None
-        )
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        # get ending loc and matched string from regex matching result
-        loc = result.end()
-        ret = result.group()
-
-        if self.unquote_results:
-            # strip off quotes
-            ret = ret[self.quote_char_len : -self.end_quote_char_len]
-
-            if isinstance(ret, str_type):
-                # fmt: off
-                if self.convert_whitespace_escapes:
-                    # as we iterate over matches in the input string,
-                    # collect from whichever match group of the unquote_scan_re
-                    # regex matches (only 1 group will match at any given time)
-                    ret = "".join(
-                        # match group 1 matches \t, \n, etc.
-                        self.ws_map[match.group(1)] if match.group(1)
-                        # match group 2 matches escaped characters
-                        else match.group(2)[-1] if match.group(2)
-                        # match group 3 matches any character
-                        else match.group(3)
-                        for match in self.unquote_scan_re.finditer(ret)
-                    )
-                else:
-                    ret = "".join(
-                        # match group 1 matches escaped characters
-                        match.group(1)[-1] if match.group(1)
-                        # match group 2 matches any character
-                        else match.group(2)
-                        for match in self.unquote_scan_re.finditer(ret)
-                    )
-                # fmt: on
-
-                # replace escaped quotes
-                if self.esc_quote:
-                    ret = ret.replace(self.esc_quote, self.end_quote_char)
-
-        return loc, ret
-
-
-class CharsNotIn(Token):
-    """Token for matching words composed of characters *not* in a given
-    set (will include whitespace in matched characters if not listed in
-    the provided exclusion set - see example). Defined with string
-    containing all disallowed characters, and an optional minimum,
-    maximum, and/or exact length.  The default value for ``min`` is
-    1 (a minimum value < 1 is not valid); the default values for
-    ``max`` and ``exact`` are 0, meaning no maximum or exact
-    length restriction.
-
-    Example::
-
-        # define a comma-separated-value as anything that is not a ','
-        csv_value = CharsNotIn(',')
-        print(DelimitedList(csv_value).parse_string("dkls,lsdkjf,s12 34,@!#,213"))
-
-    prints::
-
-        ['dkls', 'lsdkjf', 's12 34', '@!#', '213']
-    """
-
-    def __init__(
-        self,
-        not_chars: str = "",
-        min: int = 1,
-        max: int = 0,
-        exact: int = 0,
-        *,
-        notChars: str = "",
-    ):
-        super().__init__()
-        self.skipWhitespace = False
-        self.notChars = not_chars or notChars
-        self.notCharsSet = set(self.notChars)
-
-        if min < 1:
-            raise ValueError(
-                "cannot specify a minimum length < 1; use"
-                " Opt(CharsNotIn()) if zero-length char group is permitted"
-            )
-
-        self.minLen = min
-
-        if max > 0:
-            self.maxLen = max
-        else:
-            self.maxLen = _MAX_INT
-
-        if exact > 0:
-            self.maxLen = exact
-            self.minLen = exact
-
-        self.errmsg = f"Expected {self.name}"
-        self.mayReturnEmpty = self.minLen == 0
-        self.mayIndexError = False
-
-    def _generateDefaultName(self) -> str:
-        not_chars_str = _collapse_string_to_ranges(self.notChars)
-        if len(not_chars_str) > 16:
-            return f"!W:({self.notChars[: 16 - 3]}...)"
-        else:
-            return f"!W:({self.notChars})"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        notchars = self.notCharsSet
-        if instring[loc] in notchars:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        start = loc
-        loc += 1
-        maxlen = min(start + self.maxLen, len(instring))
-        while loc < maxlen and instring[loc] not in notchars:
-            loc += 1
-
-        if loc - start < self.minLen:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, instring[start:loc]
-
-
-class White(Token):
-    """Special matching class for matching whitespace.  Normally,
-    whitespace is ignored by pyparsing grammars.  This class is included
-    when some whitespace structures are significant.  Define with
-    a string containing the whitespace characters to be matched; default
-    is ``" \\t\\r\\n"``.  Also takes optional ``min``,
-    ``max``, and ``exact`` arguments, as defined for the
-    :class:`Word` class.
-    """
-
-    whiteStrs = {
-        " ": "",
-        "\t": "",
-        "\n": "",
-        "\r": "",
-        "\f": "",
-        "\u00A0": "",
-        "\u1680": "",
-        "\u180E": "",
-        "\u2000": "",
-        "\u2001": "",
-        "\u2002": "",
-        "\u2003": "",
-        "\u2004": "",
-        "\u2005": "",
-        "\u2006": "",
-        "\u2007": "",
-        "\u2008": "",
-        "\u2009": "",
-        "\u200A": "",
-        "\u200B": "",
-        "\u202F": "",
-        "\u205F": "",
-        "\u3000": "",
-    }
-
-    def __init__(self, ws: str = " \t\r\n", min: int = 1, max: int = 0, exact: int = 0):
-        super().__init__()
-        self.matchWhite = ws
-        self.set_whitespace_chars(
-            "".join(c for c in self.whiteStrs if c not in self.matchWhite),
-            copy_defaults=True,
-        )
-        # self.leave_whitespace()
-        self.mayReturnEmpty = True
-        self.errmsg = f"Expected {self.name}"
-
-        self.minLen = min
-
-        if max > 0:
-            self.maxLen = max
-        else:
-            self.maxLen = _MAX_INT
-
-        if exact > 0:
-            self.maxLen = exact
-            self.minLen = exact
-
-    def _generateDefaultName(self) -> str:
-        return "".join(White.whiteStrs[c] for c in self.matchWhite)
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if instring[loc] not in self.matchWhite:
-            raise ParseException(instring, loc, self.errmsg, self)
-        start = loc
-        loc += 1
-        maxloc = start + self.maxLen
-        maxloc = min(maxloc, len(instring))
-        while loc < maxloc and instring[loc] in self.matchWhite:
-            loc += 1
-
-        if loc - start < self.minLen:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, instring[start:loc]
-
-
-class PositionToken(Token):
-    def __init__(self):
-        super().__init__()
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-
-
-class GoToColumn(PositionToken):
-    """Token to advance to a specific column of input text; useful for
-    tabular report scraping.
-    """
-
-    def __init__(self, colno: int):
-        super().__init__()
-        self.col = colno
-
-    def preParse(self, instring: str, loc: int) -> int:
-        if col(loc, instring) == self.col:
-            return loc
-
-        instrlen = len(instring)
-        if self.ignoreExprs:
-            loc = self._skipIgnorables(instring, loc)
-        while (
-            loc < instrlen
-            and instring[loc].isspace()
-            and col(loc, instring) != self.col
-        ):
-            loc += 1
-
-        return loc
-
-    def parseImpl(self, instring, loc, doActions=True):
-        thiscol = col(loc, instring)
-        if thiscol > self.col:
-            raise ParseException(instring, loc, "Text not in expected column", self)
-        newloc = loc + self.col - thiscol
-        ret = instring[loc:newloc]
-        return newloc, ret
-
-
-class LineStart(PositionToken):
-    r"""Matches if current position is at the beginning of a line within
-    the parse string
-
-    Example::
-
-        test = '''\
-        AAA this line
-        AAA and this line
-          AAA but not this one
-        B AAA and definitely not this one
-        '''
-
-        for t in (LineStart() + 'AAA' + rest_of_line).search_string(test):
-            print(t)
-
-    prints::
-
-        ['AAA', ' this line']
-        ['AAA', ' and this line']
-
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.leave_whitespace()
-        self.orig_whiteChars = set() | self.whiteChars
-        self.whiteChars.discard("\n")
-        self.skipper = Empty().set_whitespace_chars(self.whiteChars)
-        self.errmsg = "Expected start of line"
-
-    def preParse(self, instring: str, loc: int) -> int:
-        if loc == 0:
-            return loc
-
-        ret = self.skipper.preParse(instring, loc)
-
-        if "\n" in self.orig_whiteChars:
-            while instring[ret : ret + 1] == "\n":
-                ret = self.skipper.preParse(instring, ret + 1)
-
-        return ret
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if col(loc, instring) == 1:
-            return loc, []
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class LineEnd(PositionToken):
-    """Matches if current position is at the end of a line within the
-    parse string
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.whiteChars.discard("\n")
-        self.set_whitespace_chars(self.whiteChars, copy_defaults=False)
-        self.errmsg = "Expected end of line"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if loc < len(instring):
-            if instring[loc] == "\n":
-                return loc + 1, "\n"
-            else:
-                raise ParseException(instring, loc, self.errmsg, self)
-        elif loc == len(instring):
-            return loc + 1, []
-        else:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-
-class StringStart(PositionToken):
-    """Matches if current position is at the beginning of the parse
-    string
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.errmsg = "Expected start of text"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        # see if entire string up to here is just whitespace and ignoreables
-        if loc != 0 and loc != self.preParse(instring, 0):
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, []
-
-
-class StringEnd(PositionToken):
-    """
-    Matches if current position is at the end of the parse string
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.errmsg = "Expected end of text"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if loc < len(instring):
-            raise ParseException(instring, loc, self.errmsg, self)
-        if loc == len(instring):
-            return loc + 1, []
-        if loc > len(instring):
-            return loc, []
-
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class WordStart(PositionToken):
-    """Matches if the current position is at the beginning of a
-    :class:`Word`, and is not preceded by any character in a given
-    set of ``word_chars`` (default= ``printables``). To emulate the
-    ``\b`` behavior of regular expressions, use
-    ``WordStart(alphanums)``. ``WordStart`` will also match at
-    the beginning of the string being parsed, or at the beginning of
-    a line.
-    """
-
-    def __init__(self, word_chars: str = printables, *, wordChars: str = printables):
-        wordChars = word_chars if wordChars == printables else wordChars
-        super().__init__()
-        self.wordChars = set(wordChars)
-        self.errmsg = "Not at the start of a word"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if loc != 0:
-            if (
-                instring[loc - 1] in self.wordChars
-                or instring[loc] not in self.wordChars
-            ):
-                raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-
-class WordEnd(PositionToken):
-    """Matches if the current position is at the end of a :class:`Word`,
-    and is not followed by any character in a given set of ``word_chars``
-    (default= ``printables``). To emulate the ``\b`` behavior of
-    regular expressions, use ``WordEnd(alphanums)``. ``WordEnd``
-    will also match at the end of the string being parsed, or at the end
-    of a line.
-    """
-
-    def __init__(self, word_chars: str = printables, *, wordChars: str = printables):
-        wordChars = word_chars if wordChars == printables else wordChars
-        super().__init__()
-        self.wordChars = set(wordChars)
-        self.skipWhitespace = False
-        self.errmsg = "Not at the end of a word"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        instrlen = len(instring)
-        if instrlen > 0 and loc < instrlen:
-            if (
-                instring[loc] in self.wordChars
-                or instring[loc - 1] not in self.wordChars
-            ):
-                raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-
-class ParseExpression(ParserElement):
-    """Abstract subclass of ParserElement, for combining and
-    post-processing parsed tokens.
-    """
-
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False):
-        super().__init__(savelist)
-        self.exprs: List[ParserElement]
-        if isinstance(exprs, _generatorType):
-            exprs = list(exprs)
-
-        if isinstance(exprs, str_type):
-            self.exprs = [self._literalStringClass(exprs)]
-        elif isinstance(exprs, ParserElement):
-            self.exprs = [exprs]
-        elif isinstance(exprs, Iterable):
-            exprs = list(exprs)
-            # if sequence of strings provided, wrap with Literal
-            if any(isinstance(expr, str_type) for expr in exprs):
-                exprs = (
-                    self._literalStringClass(e) if isinstance(e, str_type) else e
-                    for e in exprs
-                )
-            self.exprs = list(exprs)
-        else:
-            try:
-                self.exprs = list(exprs)
-            except TypeError:
-                self.exprs = [exprs]
-        self.callPreparse = False
-
-    def recurse(self) -> List[ParserElement]:
-        return self.exprs[:]
-
-    def append(self, other) -> ParserElement:
-        self.exprs.append(other)
-        self._defaultName = None
-        return self
-
-    def leave_whitespace(self, recursive: bool = True) -> ParserElement:
-        """
-        Extends ``leave_whitespace`` defined in base class, and also invokes ``leave_whitespace`` on
-           all contained expressions.
-        """
-        super().leave_whitespace(recursive)
-
-        if recursive:
-            self.exprs = [e.copy() for e in self.exprs]
-            for e in self.exprs:
-                e.leave_whitespace(recursive)
-        return self
-
-    def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
-        """
-        Extends ``ignore_whitespace`` defined in base class, and also invokes ``leave_whitespace`` on
-           all contained expressions.
-        """
-        super().ignore_whitespace(recursive)
-        if recursive:
-            self.exprs = [e.copy() for e in self.exprs]
-            for e in self.exprs:
-                e.ignore_whitespace(recursive)
-        return self
-
-    def ignore(self, other) -> ParserElement:
-        if isinstance(other, Suppress):
-            if other not in self.ignoreExprs:
-                super().ignore(other)
-                for e in self.exprs:
-                    e.ignore(self.ignoreExprs[-1])
-        else:
-            super().ignore(other)
-            for e in self.exprs:
-                e.ignore(self.ignoreExprs[-1])
-        return self
-
-    def _generateDefaultName(self) -> str:
-        return f"{type(self).__name__}:({self.exprs})"
-
-    def streamline(self) -> ParserElement:
-        if self.streamlined:
-            return self
-
-        super().streamline()
-
-        for e in self.exprs:
-            e.streamline()
-
-        # collapse nested :class:`And`'s of the form ``And(And(And(a, b), c), d)`` to ``And(a, b, c, d)``
-        # but only if there are no parse actions or resultsNames on the nested And's
-        # (likewise for :class:`Or`'s and :class:`MatchFirst`'s)
-        if len(self.exprs) == 2:
-            other = self.exprs[0]
-            if (
-                isinstance(other, self.__class__)
-                and not other.parseAction
-                and other.resultsName is None
-                and not other.debug
-            ):
-                self.exprs = other.exprs[:] + [self.exprs[1]]
-                self._defaultName = None
-                self.mayReturnEmpty |= other.mayReturnEmpty
-                self.mayIndexError |= other.mayIndexError
-
-            other = self.exprs[-1]
-            if (
-                isinstance(other, self.__class__)
-                and not other.parseAction
-                and other.resultsName is None
-                and not other.debug
-            ):
-                self.exprs = self.exprs[:-1] + other.exprs[:]
-                self._defaultName = None
-                self.mayReturnEmpty |= other.mayReturnEmpty
-                self.mayIndexError |= other.mayIndexError
-
-        self.errmsg = f"Expected {self}"
-
-        return self
-
-    def validate(self, validateTrace=None) -> None:
-        warnings.warn(
-            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        tmp = (validateTrace if validateTrace is not None else [])[:] + [self]
-        for e in self.exprs:
-            e.validate(tmp)
-        self._checkRecursion([])
-
-    def copy(self) -> ParserElement:
-        ret = super().copy()
-        ret = typing.cast(ParseExpression, ret)
-        ret.exprs = [e.copy() for e in self.exprs]
-        return ret
-
-    def _setResultsName(self, name, listAllMatches=False):
-        if not (
-            __diag__.warn_ungrouped_named_tokens_in_collection
-            and Diagnostics.warn_ungrouped_named_tokens_in_collection
-            not in self.suppress_warnings_
-        ):
-            return super()._setResultsName(name, listAllMatches)
-
-        for e in self.exprs:
-            if (
-                isinstance(e, ParserElement)
-                and e.resultsName
-                and (
-                    Diagnostics.warn_ungrouped_named_tokens_in_collection
-                    not in e.suppress_warnings_
-                )
-            ):
-                warning = (
-                    "warn_ungrouped_named_tokens_in_collection:"
-                    f" setting results name {name!r} on {type(self).__name__} expression"
-                    f" collides with {e.resultsName!r} on contained expression"
-                )
-                warnings.warn(warning, stacklevel=3)
-                break
-
-        return super()._setResultsName(name, listAllMatches)
-
-    # Compatibility synonyms
-    # fmt: off
-    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
-    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
-    # fmt: on
-
-
-class And(ParseExpression):
-    """
-    Requires all given :class:`ParseExpression` s to be found in the given order.
-    Expressions may be separated by whitespace.
-    May be constructed using the ``'+'`` operator.
-    May also be constructed using the ``'-'`` operator, which will
-    suppress backtracking.
-
-    Example::
-
-        integer = Word(nums)
-        name_expr = Word(alphas)[1, ...]
-
-        expr = And([integer("id"), name_expr("name"), integer("age")])
-        # more easily written as:
-        expr = integer("id") + name_expr("name") + integer("age")
-    """
-
-    class _ErrorStop(Empty):
-        def __init__(self, *args, **kwargs):
-            super().__init__(*args, **kwargs)
-            self.leave_whitespace()
-
-        def _generateDefaultName(self) -> str:
-            return "-"
-
-    def __init__(
-        self, exprs_arg: typing.Iterable[ParserElement], savelist: bool = True
-    ):
-        exprs: List[ParserElement] = list(exprs_arg)
-        if exprs and Ellipsis in exprs:
-            tmp = []
-            for i, expr in enumerate(exprs):
-                if expr is not Ellipsis:
-                    tmp.append(expr)
-                    continue
-
-                if i < len(exprs) - 1:
-                    skipto_arg: ParserElement = typing.cast(
-                        ParseExpression, (Empty() + exprs[i + 1])
-                    ).exprs[-1]
-                    tmp.append(SkipTo(skipto_arg)("_skipped*"))
-                    continue
-
-                raise Exception("cannot construct And with sequence ending in ...")
-            exprs[:] = tmp
-        super().__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-            if not isinstance(self.exprs[0], White):
-                self.set_whitespace_chars(
-                    self.exprs[0].whiteChars,
-                    copy_defaults=self.exprs[0].copyDefaultWhiteChars,
-                )
-                self.skipWhitespace = self.exprs[0].skipWhitespace
-            else:
-                self.skipWhitespace = False
-        else:
-            self.mayReturnEmpty = True
-        self.callPreparse = True
-
-    def streamline(self) -> ParserElement:
-        # collapse any _PendingSkip's
-        if self.exprs and any(
-            isinstance(e, ParseExpression)
-            and e.exprs
-            and isinstance(e.exprs[-1], _PendingSkip)
-            for e in self.exprs[:-1]
-        ):
-            deleted_expr_marker = NoMatch()
-            for i, e in enumerate(self.exprs[:-1]):
-                if e is deleted_expr_marker:
-                    continue
-                if (
-                    isinstance(e, ParseExpression)
-                    and e.exprs
-                    and isinstance(e.exprs[-1], _PendingSkip)
-                ):
-                    e.exprs[-1] = e.exprs[-1] + self.exprs[i + 1]
-                    self.exprs[i + 1] = deleted_expr_marker
-            self.exprs = [e for e in self.exprs if e is not deleted_expr_marker]
-
-        super().streamline()
-
-        # link any IndentedBlocks to the prior expression
-        prev: ParserElement
-        cur: ParserElement
-        for prev, cur in zip(self.exprs, self.exprs[1:]):
-            # traverse cur or any first embedded expr of cur looking for an IndentedBlock
-            # (but watch out for recursive grammar)
-            seen = set()
-            while True:
-                if id(cur) in seen:
-                    break
-                seen.add(id(cur))
-                if isinstance(cur, IndentedBlock):
-                    prev.add_parse_action(
-                        lambda s, l, t, cur_=cur: setattr(
-                            cur_, "parent_anchor", col(l, s)
-                        )
-                    )
-                    break
-                subs = cur.recurse()
-                next_first = next(iter(subs), None)
-                if next_first is None:
-                    break
-                cur = typing.cast(ParserElement, next_first)
-
-        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-        return self
-
-    def parseImpl(self, instring, loc, doActions=True):
-        # pass False as callPreParse arg to _parse for first element, since we already
-        # pre-parsed the string as part of our And pre-parsing
-        loc, resultlist = self.exprs[0]._parse(
-            instring, loc, doActions, callPreParse=False
-        )
-        errorStop = False
-        for e in self.exprs[1:]:
-            # if isinstance(e, And._ErrorStop):
-            if type(e) is And._ErrorStop:
-                errorStop = True
-                continue
-            if errorStop:
-                try:
-                    loc, exprtokens = e._parse(instring, loc, doActions)
-                except ParseSyntaxException:
-                    raise
-                except ParseBaseException as pe:
-                    pe.__traceback__ = None
-                    raise ParseSyntaxException._from_exception(pe)
-                except IndexError:
-                    raise ParseSyntaxException(
-                        instring, len(instring), self.errmsg, self
-                    )
-            else:
-                loc, exprtokens = e._parse(instring, loc, doActions)
-            resultlist += exprtokens
-        return loc, resultlist
-
-    def __iadd__(self, other):
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self.append(other)  # And([self, other])
-
-    def _checkRecursion(self, parseElementList):
-        subRecCheckList = parseElementList[:] + [self]
-        for e in self.exprs:
-            e._checkRecursion(subRecCheckList)
-            if not e.mayReturnEmpty:
-                break
-
-    def _generateDefaultName(self) -> str:
-        inner = " ".join(str(e) for e in self.exprs)
-        # strip off redundant inner {}'s
-        while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
-            inner = inner[1:-1]
-        return f"{{{inner}}}"
-
-
-class Or(ParseExpression):
-    """Requires that at least one :class:`ParseExpression` is found. If
-    two expressions match, the expression that matches the longest
-    string will be used. May be constructed using the ``'^'``
-    operator.
-
-    Example::
-
-        # construct Or using '^' operator
-
-        number = Word(nums) ^ Combine(Word(nums) + '.' + Word(nums))
-        print(number.search_string("123 3.1416 789"))
-
-    prints::
-
-        [['123'], ['3.1416'], ['789']]
-    """
-
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False):
-        super().__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-            self.skipWhitespace = all(e.skipWhitespace for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-
-    def streamline(self) -> ParserElement:
-        super().streamline()
-        if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-            self.saveAsList = any(e.saveAsList for e in self.exprs)
-            self.skipWhitespace = all(
-                e.skipWhitespace and not isinstance(e, White) for e in self.exprs
-            )
-        else:
-            self.saveAsList = False
-        return self
-
-    def parseImpl(self, instring, loc, doActions=True):
-        maxExcLoc = -1
-        maxException = None
-        matches = []
-        fatals = []
-        if all(e.callPreparse for e in self.exprs):
-            loc = self.preParse(instring, loc)
-        for e in self.exprs:
-            try:
-                loc2 = e.try_parse(instring, loc, raise_fatal=True)
-            except ParseFatalException as pfe:
-                pfe.__traceback__ = None
-                pfe.parser_element = e
-                fatals.append(pfe)
-                maxException = None
-                maxExcLoc = -1
-            except ParseException as err:
-                if not fatals:
-                    err.__traceback__ = None
-                    if err.loc > maxExcLoc:
-                        maxException = err
-                        maxExcLoc = err.loc
-            except IndexError:
-                if len(instring) > maxExcLoc:
-                    maxException = ParseException(
-                        instring, len(instring), e.errmsg, self
-                    )
-                    maxExcLoc = len(instring)
-            else:
-                # save match among all matches, to retry longest to shortest
-                matches.append((loc2, e))
-
-        if matches:
-            # re-evaluate all matches in descending order of length of match, in case attached actions
-            # might change whether or how much they match of the input.
-            matches.sort(key=itemgetter(0), reverse=True)
-
-            if not doActions:
-                # no further conditions or parse actions to change the selection of
-                # alternative, so the first match will be the best match
-                best_expr = matches[0][1]
-                return best_expr._parse(instring, loc, doActions)
-
-            longest = -1, None
-            for loc1, expr1 in matches:
-                if loc1 <= longest[0]:
-                    # already have a longer match than this one will deliver, we are done
-                    return longest
-
-                try:
-                    loc2, toks = expr1._parse(instring, loc, doActions)
-                except ParseException as err:
-                    err.__traceback__ = None
-                    if err.loc > maxExcLoc:
-                        maxException = err
-                        maxExcLoc = err.loc
-                else:
-                    if loc2 >= loc1:
-                        return loc2, toks
-                    # didn't match as much as before
-                    elif loc2 > longest[0]:
-                        longest = loc2, toks
-
-            if longest != (-1, None):
-                return longest
-
-        if fatals:
-            if len(fatals) > 1:
-                fatals.sort(key=lambda e: -e.loc)
-                if fatals[0].loc == fatals[1].loc:
-                    fatals.sort(key=lambda e: (-e.loc, -len(str(e.parser_element))))
-            max_fatal = fatals[0]
-            raise max_fatal
-
-        if maxException is not None:
-            # infer from this check that all alternatives failed at the current position
-            # so emit this collective error message instead of any single error message
-            if maxExcLoc == loc:
-                maxException.msg = self.errmsg
-            raise maxException
-
-        raise ParseException(instring, loc, "no defined alternatives to match", self)
-
-    def __ixor__(self, other):
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self.append(other)  # Or([self, other])
-
-    def _generateDefaultName(self) -> str:
-        return f"{{{' ^ '.join(str(e) for e in self.exprs)}}}"
-
-    def _setResultsName(self, name, listAllMatches=False):
-        if (
-            __diag__.warn_multiple_tokens_in_named_alternation
-            and Diagnostics.warn_multiple_tokens_in_named_alternation
-            not in self.suppress_warnings_
-        ):
-            if any(
-                isinstance(e, And)
-                and Diagnostics.warn_multiple_tokens_in_named_alternation
-                not in e.suppress_warnings_
-                for e in self.exprs
-            ):
-                warning = (
-                    "warn_multiple_tokens_in_named_alternation:"
-                    f" setting results name {name!r} on {type(self).__name__} expression"
-                    " will return a list of all parsed tokens in an And alternative,"
-                    " in prior versions only the first token was returned; enclose"
-                    " contained argument in Group"
-                )
-                warnings.warn(warning, stacklevel=3)
-
-        return super()._setResultsName(name, listAllMatches)
-
-
-class MatchFirst(ParseExpression):
-    """Requires that at least one :class:`ParseExpression` is found. If
-    more than one expression matches, the first one listed is the one that will
-    match. May be constructed using the ``'|'`` operator.
-
-    Example::
-
-        # construct MatchFirst using '|' operator
-
-        # watch the order of expressions to match
-        number = Word(nums) | Combine(Word(nums) + '.' + Word(nums))
-        print(number.search_string("123 3.1416 789")) #  Fail! -> [['123'], ['3'], ['1416'], ['789']]
-
-        # put more selective expression first
-        number = Combine(Word(nums) + '.' + Word(nums)) | Word(nums)
-        print(number.search_string("123 3.1416 789")) #  Better -> [['123'], ['3.1416'], ['789']]
-    """
-
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False):
-        super().__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-            self.skipWhitespace = all(e.skipWhitespace for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-
-    def streamline(self) -> ParserElement:
-        if self.streamlined:
-            return self
-
-        super().streamline()
-        if self.exprs:
-            self.saveAsList = any(e.saveAsList for e in self.exprs)
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-            self.skipWhitespace = all(
-                e.skipWhitespace and not isinstance(e, White) for e in self.exprs
-            )
-        else:
-            self.saveAsList = False
-            self.mayReturnEmpty = True
-        return self
-
-    def parseImpl(self, instring, loc, doActions=True):
-        maxExcLoc = -1
-        maxException = None
-
-        for e in self.exprs:
-            try:
-                return e._parse(instring, loc, doActions)
-            except ParseFatalException as pfe:
-                pfe.__traceback__ = None
-                pfe.parser_element = e
-                raise
-            except ParseException as err:
-                if err.loc > maxExcLoc:
-                    maxException = err
-                    maxExcLoc = err.loc
-            except IndexError:
-                if len(instring) > maxExcLoc:
-                    maxException = ParseException(
-                        instring, len(instring), e.errmsg, self
-                    )
-                    maxExcLoc = len(instring)
-
-        if maxException is not None:
-            # infer from this check that all alternatives failed at the current position
-            # so emit this collective error message instead of any individual error message
-            if maxExcLoc == loc:
-                maxException.msg = self.errmsg
-            raise maxException
-
-        raise ParseException(instring, loc, "no defined alternatives to match", self)
-
-    def __ior__(self, other):
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self.append(other)  # MatchFirst([self, other])
-
-    def _generateDefaultName(self) -> str:
-        return f"{{{' | '.join(str(e) for e in self.exprs)}}}"
-
-    def _setResultsName(self, name, listAllMatches=False):
-        if (
-            __diag__.warn_multiple_tokens_in_named_alternation
-            and Diagnostics.warn_multiple_tokens_in_named_alternation
-            not in self.suppress_warnings_
-        ):
-            if any(
-                isinstance(e, And)
-                and Diagnostics.warn_multiple_tokens_in_named_alternation
-                not in e.suppress_warnings_
-                for e in self.exprs
-            ):
-                warning = (
-                    "warn_multiple_tokens_in_named_alternation:"
-                    f" setting results name {name!r} on {type(self).__name__} expression"
-                    " will return a list of all parsed tokens in an And alternative,"
-                    " in prior versions only the first token was returned; enclose"
-                    " contained argument in Group"
-                )
-                warnings.warn(warning, stacklevel=3)
-
-        return super()._setResultsName(name, listAllMatches)
-
-
-class Each(ParseExpression):
-    """Requires all given :class:`ParseExpression` s to be found, but in
-    any order. Expressions may be separated by whitespace.
-
-    May be constructed using the ``'&'`` operator.
-
-    Example::
-
-        color = one_of("RED ORANGE YELLOW GREEN BLUE PURPLE BLACK WHITE BROWN")
-        shape_type = one_of("SQUARE CIRCLE TRIANGLE STAR HEXAGON OCTAGON")
-        integer = Word(nums)
-        shape_attr = "shape:" + shape_type("shape")
-        posn_attr = "posn:" + Group(integer("x") + ',' + integer("y"))("posn")
-        color_attr = "color:" + color("color")
-        size_attr = "size:" + integer("size")
-
-        # use Each (using operator '&') to accept attributes in any order
-        # (shape and posn are required, color and size are optional)
-        shape_spec = shape_attr & posn_attr & Opt(color_attr) & Opt(size_attr)
-
-        shape_spec.run_tests('''
-            shape: SQUARE color: BLACK posn: 100, 120
-            shape: CIRCLE size: 50 color: BLUE posn: 50,80
-            color:GREEN size:20 shape:TRIANGLE posn:20,40
-            '''
-            )
-
-    prints::
-
-        shape: SQUARE color: BLACK posn: 100, 120
-        ['shape:', 'SQUARE', 'color:', 'BLACK', 'posn:', ['100', ',', '120']]
-        - color: BLACK
-        - posn: ['100', ',', '120']
-          - x: 100
-          - y: 120
-        - shape: SQUARE
-
-
-        shape: CIRCLE size: 50 color: BLUE posn: 50,80
-        ['shape:', 'CIRCLE', 'size:', '50', 'color:', 'BLUE', 'posn:', ['50', ',', '80']]
-        - color: BLUE
-        - posn: ['50', ',', '80']
-          - x: 50
-          - y: 80
-        - shape: CIRCLE
-        - size: 50
-
-
-        color: GREEN size: 20 shape: TRIANGLE posn: 20,40
-        ['color:', 'GREEN', 'size:', '20', 'shape:', 'TRIANGLE', 'posn:', ['20', ',', '40']]
-        - color: GREEN
-        - posn: ['20', ',', '40']
-          - x: 20
-          - y: 40
-        - shape: TRIANGLE
-        - size: 20
-    """
-
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = True):
-        super().__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-        self.skipWhitespace = True
-        self.initExprGroups = True
-        self.saveAsList = True
-
-    def __iand__(self, other):
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self.append(other)  # Each([self, other])
-
-    def streamline(self) -> ParserElement:
-        super().streamline()
-        if self.exprs:
-            self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-        return self
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if self.initExprGroups:
-            self.opt1map = dict(
-                (id(e.expr), e) for e in self.exprs if isinstance(e, Opt)
-            )
-            opt1 = [e.expr for e in self.exprs if isinstance(e, Opt)]
-            opt2 = [
-                e
-                for e in self.exprs
-                if e.mayReturnEmpty and not isinstance(e, (Opt, Regex, ZeroOrMore))
-            ]
-            self.optionals = opt1 + opt2
-            self.multioptionals = [
-                e.expr.set_results_name(e.resultsName, list_all_matches=True)
-                for e in self.exprs
-                if isinstance(e, _MultipleMatch)
-            ]
-            self.multirequired = [
-                e.expr.set_results_name(e.resultsName, list_all_matches=True)
-                for e in self.exprs
-                if isinstance(e, OneOrMore)
-            ]
-            self.required = [
-                e for e in self.exprs if not isinstance(e, (Opt, ZeroOrMore, OneOrMore))
-            ]
-            self.required += self.multirequired
-            self.initExprGroups = False
-
-        tmpLoc = loc
-        tmpReqd = self.required[:]
-        tmpOpt = self.optionals[:]
-        multis = self.multioptionals[:]
-        matchOrder = []
-
-        keepMatching = True
-        failed = []
-        fatals = []
-        while keepMatching:
-            tmpExprs = tmpReqd + tmpOpt + multis
-            failed.clear()
-            fatals.clear()
-            for e in tmpExprs:
-                try:
-                    tmpLoc = e.try_parse(instring, tmpLoc, raise_fatal=True)
-                except ParseFatalException as pfe:
-                    pfe.__traceback__ = None
-                    pfe.parser_element = e
-                    fatals.append(pfe)
-                    failed.append(e)
-                except ParseException:
-                    failed.append(e)
-                else:
-                    matchOrder.append(self.opt1map.get(id(e), e))
-                    if e in tmpReqd:
-                        tmpReqd.remove(e)
-                    elif e in tmpOpt:
-                        tmpOpt.remove(e)
-            if len(failed) == len(tmpExprs):
-                keepMatching = False
-
-        # look for any ParseFatalExceptions
-        if fatals:
-            if len(fatals) > 1:
-                fatals.sort(key=lambda e: -e.loc)
-                if fatals[0].loc == fatals[1].loc:
-                    fatals.sort(key=lambda e: (-e.loc, -len(str(e.parser_element))))
-            max_fatal = fatals[0]
-            raise max_fatal
-
-        if tmpReqd:
-            missing = ", ".join([str(e) for e in tmpReqd])
-            raise ParseException(
-                instring,
-                loc,
-                f"Missing one or more required elements ({missing})",
-            )
-
-        # add any unmatched Opts, in case they have default values defined
-        matchOrder += [e for e in self.exprs if isinstance(e, Opt) and e.expr in tmpOpt]
-
-        total_results = ParseResults([])
-        for e in matchOrder:
-            loc, results = e._parse(instring, loc, doActions)
-            total_results += results
-
-        return loc, total_results
-
-    def _generateDefaultName(self) -> str:
-        return f"{{{' & '.join(str(e) for e in self.exprs)}}}"
-
-
-class ParseElementEnhance(ParserElement):
-    """Abstract subclass of :class:`ParserElement`, for combining and
-    post-processing parsed tokens.
-    """
-
-    def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
-        super().__init__(savelist)
-        if isinstance(expr, str_type):
-            expr_str = typing.cast(str, expr)
-            if issubclass(self._literalStringClass, Token):
-                expr = self._literalStringClass(expr_str)  # type: ignore[call-arg]
-            elif issubclass(type(self), self._literalStringClass):
-                expr = Literal(expr_str)
-            else:
-                expr = self._literalStringClass(Literal(expr_str))  # type: ignore[assignment, call-arg]
-        expr = typing.cast(ParserElement, expr)
-        self.expr = expr
-        if expr is not None:
-            self.mayIndexError = expr.mayIndexError
-            self.mayReturnEmpty = expr.mayReturnEmpty
-            self.set_whitespace_chars(
-                expr.whiteChars, copy_defaults=expr.copyDefaultWhiteChars
-            )
-            self.skipWhitespace = expr.skipWhitespace
-            self.saveAsList = expr.saveAsList
-            self.callPreparse = expr.callPreparse
-            self.ignoreExprs.extend(expr.ignoreExprs)
-
-    def recurse(self) -> List[ParserElement]:
-        return [self.expr] if self.expr is not None else []
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if self.expr is None:
-            raise ParseException(instring, loc, "No expression defined", self)
-
-        try:
-            return self.expr._parse(instring, loc, doActions, callPreParse=False)
-        except ParseBaseException as pbe:
-            if not isinstance(self, Forward) or self.customName is not None:
-                if self.errmsg:
-                    pbe.msg = self.errmsg
-            raise
-
-    def leave_whitespace(self, recursive: bool = True) -> ParserElement:
-        super().leave_whitespace(recursive)
-
-        if recursive:
-            if self.expr is not None:
-                self.expr = self.expr.copy()
-                self.expr.leave_whitespace(recursive)
-        return self
-
-    def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
-        super().ignore_whitespace(recursive)
-
-        if recursive:
-            if self.expr is not None:
-                self.expr = self.expr.copy()
-                self.expr.ignore_whitespace(recursive)
-        return self
-
-    def ignore(self, other) -> ParserElement:
-        if not isinstance(other, Suppress) or other not in self.ignoreExprs:
-            super().ignore(other)
-            if self.expr is not None:
-                self.expr.ignore(self.ignoreExprs[-1])
-
-        return self
-
-    def streamline(self) -> ParserElement:
-        super().streamline()
-        if self.expr is not None:
-            self.expr.streamline()
-        return self
-
-    def _checkRecursion(self, parseElementList):
-        if self in parseElementList:
-            raise RecursiveGrammarException(parseElementList + [self])
-        subRecCheckList = parseElementList[:] + [self]
-        if self.expr is not None:
-            self.expr._checkRecursion(subRecCheckList)
-
-    def validate(self, validateTrace=None) -> None:
-        warnings.warn(
-            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        if validateTrace is None:
-            validateTrace = []
-        tmp = validateTrace[:] + [self]
-        if self.expr is not None:
-            self.expr.validate(tmp)
-        self._checkRecursion([])
-
-    def _generateDefaultName(self) -> str:
-        return f"{type(self).__name__}:({self.expr})"
-
-    # Compatibility synonyms
-    # fmt: off
-    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
-    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
-    # fmt: on
-
-
-class IndentedBlock(ParseElementEnhance):
-    """
-    Expression to match one or more expressions at a given indentation level.
-    Useful for parsing text where structure is implied by indentation (like Python source code).
-    """
-
-    class _Indent(Empty):
-        def __init__(self, ref_col: int):
-            super().__init__()
-            self.errmsg = f"expected indent at column {ref_col}"
-            self.add_condition(lambda s, l, t: col(l, s) == ref_col)
-
-    class _IndentGreater(Empty):
-        def __init__(self, ref_col: int):
-            super().__init__()
-            self.errmsg = f"expected indent at column greater than {ref_col}"
-            self.add_condition(lambda s, l, t: col(l, s) > ref_col)
-
-    def __init__(
-        self, expr: ParserElement, *, recursive: bool = False, grouped: bool = True
-    ):
-        super().__init__(expr, savelist=True)
-        # if recursive:
-        #     raise NotImplementedError("IndentedBlock with recursive is not implemented")
-        self._recursive = recursive
-        self._grouped = grouped
-        self.parent_anchor = 1
-
-    def parseImpl(self, instring, loc, doActions=True):
-        # advance parse position to non-whitespace by using an Empty()
-        # this should be the column to be used for all subsequent indented lines
-        anchor_loc = Empty().preParse(instring, loc)
-
-        # see if self.expr matches at the current location - if not it will raise an exception
-        # and no further work is necessary
-        self.expr.try_parse(instring, anchor_loc, do_actions=doActions)
-
-        indent_col = col(anchor_loc, instring)
-        peer_detect_expr = self._Indent(indent_col)
-
-        inner_expr = Empty() + peer_detect_expr + self.expr
-        if self._recursive:
-            sub_indent = self._IndentGreater(indent_col)
-            nested_block = IndentedBlock(
-                self.expr, recursive=self._recursive, grouped=self._grouped
-            )
-            nested_block.set_debug(self.debug)
-            nested_block.parent_anchor = indent_col
-            inner_expr += Opt(sub_indent + nested_block)
-
-        inner_expr.set_name(f"inner {hex(id(inner_expr))[-4:].upper()}@{indent_col}")
-        block = OneOrMore(inner_expr)
-
-        trailing_undent = self._Indent(self.parent_anchor) | StringEnd()
-
-        if self._grouped:
-            wrapper = Group
-        else:
-            wrapper = lambda expr: expr
-        return (wrapper(block) + Optional(trailing_undent)).parseImpl(
-            instring, anchor_loc, doActions
-        )
-
-
-class AtStringStart(ParseElementEnhance):
-    """Matches if expression matches at the beginning of the parse
-    string::
-
-        AtStringStart(Word(nums)).parse_string("123")
-        # prints ["123"]
-
-        AtStringStart(Word(nums)).parse_string("    123")
-        # raises ParseException
-    """
-
-    def __init__(self, expr: Union[ParserElement, str]):
-        super().__init__(expr)
-        self.callPreparse = False
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if loc != 0:
-            raise ParseException(instring, loc, "not found at string start")
-        return super().parseImpl(instring, loc, doActions)
-
-
-class AtLineStart(ParseElementEnhance):
-    r"""Matches if an expression matches at the beginning of a line within
-    the parse string
-
-    Example::
-
-        test = '''\
-        AAA this line
-        AAA and this line
-          AAA but not this one
-        B AAA and definitely not this one
-        '''
-
-        for t in (AtLineStart('AAA') + rest_of_line).search_string(test):
-            print(t)
-
-    prints::
-
-        ['AAA', ' this line']
-        ['AAA', ' and this line']
-
-    """
-
-    def __init__(self, expr: Union[ParserElement, str]):
-        super().__init__(expr)
-        self.callPreparse = False
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if col(loc, instring) != 1:
-            raise ParseException(instring, loc, "not found at line start")
-        return super().parseImpl(instring, loc, doActions)
-
-
-class FollowedBy(ParseElementEnhance):
-    """Lookahead matching of the given parse expression.
-    ``FollowedBy`` does *not* advance the parsing position within
-    the input string, it only verifies that the specified parse
-    expression matches at the current position.  ``FollowedBy``
-    always returns a null token list. If any results names are defined
-    in the lookahead expression, those *will* be returned for access by
-    name.
-
-    Example::
-
-        # use FollowedBy to match a label only if it is followed by a ':'
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-
-        attr_expr[1, ...].parse_string("shape: SQUARE color: BLACK posn: upper left").pprint()
-
-    prints::
-
-        [['shape', 'SQUARE'], ['color', 'BLACK'], ['posn', 'upper left']]
-    """
-
-    def __init__(self, expr: Union[ParserElement, str]):
-        super().__init__(expr)
-        self.mayReturnEmpty = True
-
-    def parseImpl(self, instring, loc, doActions=True):
-        # by using self._expr.parse and deleting the contents of the returned ParseResults list
-        # we keep any named results that were defined in the FollowedBy expression
-        _, ret = self.expr._parse(instring, loc, doActions=doActions)
-        del ret[:]
-
-        return loc, ret
-
-
-class PrecededBy(ParseElementEnhance):
-    """Lookbehind matching of the given parse expression.
-    ``PrecededBy`` does not advance the parsing position within the
-    input string, it only verifies that the specified parse expression
-    matches prior to the current position.  ``PrecededBy`` always
-    returns a null token list, but if a results name is defined on the
-    given expression, it is returned.
-
-    Parameters:
-
-    - ``expr`` - expression that must match prior to the current parse
-      location
-    - ``retreat`` - (default= ``None``) - (int) maximum number of characters
-      to lookbehind prior to the current parse location
-
-    If the lookbehind expression is a string, :class:`Literal`,
-    :class:`Keyword`, or a :class:`Word` or :class:`CharsNotIn`
-    with a specified exact or maximum length, then the retreat
-    parameter is not required. Otherwise, retreat must be specified to
-    give a maximum number of characters to look back from
-    the current parse position for a lookbehind match.
-
-    Example::
-
-        # VB-style variable names with type prefixes
-        int_var = PrecededBy("#") + pyparsing_common.identifier
-        str_var = PrecededBy("$") + pyparsing_common.identifier
-
-    """
-
-    def __init__(
-        self, expr: Union[ParserElement, str], retreat: typing.Optional[int] = None
-    ):
-        super().__init__(expr)
-        self.expr = self.expr().leave_whitespace()
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-        self.exact = False
-        if isinstance(expr, str_type):
-            expr = typing.cast(str, expr)
-            retreat = len(expr)
-            self.exact = True
-        elif isinstance(expr, (Literal, Keyword)):
-            retreat = expr.matchLen
-            self.exact = True
-        elif isinstance(expr, (Word, CharsNotIn)) and expr.maxLen != _MAX_INT:
-            retreat = expr.maxLen
-            self.exact = True
-        elif isinstance(expr, PositionToken):
-            retreat = 0
-            self.exact = True
-        self.retreat = retreat
-        self.errmsg = f"not preceded by {expr}"
-        self.skipWhitespace = False
-        self.parseAction.append(lambda s, l, t: t.__delitem__(slice(None, None)))
-
-    def parseImpl(self, instring, loc=0, doActions=True):
-        if self.exact:
-            if loc < self.retreat:
-                raise ParseException(instring, loc, self.errmsg)
-            start = loc - self.retreat
-            _, ret = self.expr._parse(instring, start)
-            return loc, ret
-
-        # retreat specified a maximum lookbehind window, iterate
-        test_expr = self.expr + StringEnd()
-        instring_slice = instring[max(0, loc - self.retreat) : loc]
-        last_expr = ParseException(instring, loc, self.errmsg)
-
-        for offset in range(1, min(loc, self.retreat + 1) + 1):
-            try:
-                # print('trying', offset, instring_slice, repr(instring_slice[loc - offset:]))
-                _, ret = test_expr._parse(instring_slice, len(instring_slice) - offset)
-            except ParseBaseException as pbe:
-                last_expr = pbe
-            else:
-                break
-        else:
-            raise last_expr
-
-        return loc, ret
-
-
-class Located(ParseElementEnhance):
-    """
-    Decorates a returned token with its starting and ending
-    locations in the input string.
-
-    This helper adds the following results names:
-
-    - ``locn_start`` - location where matched expression begins
-    - ``locn_end`` - location where matched expression ends
-    - ``value`` - the actual parsed results
-
-    Be careful if the input text contains ```` characters, you
-    may want to call :class:`ParserElement.parse_with_tabs`
-
-    Example::
-
-        wd = Word(alphas)
-        for match in Located(wd).search_string("ljsdf123lksdjjf123lkkjj1222"):
-            print(match)
-
-    prints::
-
-        [0, ['ljsdf'], 5]
-        [8, ['lksdjjf'], 15]
-        [18, ['lkkjj'], 23]
-
-    """
-
-    def parseImpl(self, instring, loc, doActions=True):
-        start = loc
-        loc, tokens = self.expr._parse(instring, start, doActions, callPreParse=False)
-        ret_tokens = ParseResults([start, tokens, loc])
-        ret_tokens["locn_start"] = start
-        ret_tokens["value"] = tokens
-        ret_tokens["locn_end"] = loc
-        if self.resultsName:
-            # must return as a list, so that the name will be attached to the complete group
-            return loc, [ret_tokens]
-        else:
-            return loc, ret_tokens
-
-
-class NotAny(ParseElementEnhance):
-    """
-    Lookahead to disallow matching with the given parse expression.
-    ``NotAny`` does *not* advance the parsing position within the
-    input string, it only verifies that the specified parse expression
-    does *not* match at the current position.  Also, ``NotAny`` does
-    *not* skip over leading whitespace. ``NotAny`` always returns
-    a null token list.  May be constructed using the ``'~'`` operator.
-
-    Example::
-
-        AND, OR, NOT = map(CaselessKeyword, "AND OR NOT".split())
-
-        # take care not to mistake keywords for identifiers
-        ident = ~(AND | OR | NOT) + Word(alphas)
-        boolean_term = Opt(NOT) + ident
-
-        # very crude boolean expression - to support parenthesis groups and
-        # operation hierarchy, use infix_notation
-        boolean_expr = boolean_term + ((AND | OR) + boolean_term)[...]
-
-        # integers that are followed by "." are actually floats
-        integer = Word(nums) + ~Char(".")
-    """
-
-    def __init__(self, expr: Union[ParserElement, str]):
-        super().__init__(expr)
-        # do NOT use self.leave_whitespace(), don't want to propagate to exprs
-        # self.leave_whitespace()
-        self.skipWhitespace = False
-
-        self.mayReturnEmpty = True
-        self.errmsg = f"Found unwanted token, {self.expr}"
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if self.expr.can_parse_next(instring, loc, do_actions=doActions):
-            raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-    def _generateDefaultName(self) -> str:
-        return f"~{{{self.expr}}}"
-
-
-class _MultipleMatch(ParseElementEnhance):
-    def __init__(
-        self,
-        expr: Union[str, ParserElement],
-        stop_on: typing.Optional[Union[ParserElement, str]] = None,
-        *,
-        stopOn: typing.Optional[Union[ParserElement, str]] = None,
-    ):
-        super().__init__(expr)
-        stopOn = stopOn or stop_on
-        self.saveAsList = True
-        ender = stopOn
-        if isinstance(ender, str_type):
-            ender = self._literalStringClass(ender)
-        self.stopOn(ender)
-
-    def stopOn(self, ender) -> ParserElement:
-        if isinstance(ender, str_type):
-            ender = self._literalStringClass(ender)
-        self.not_ender = ~ender if ender is not None else None
-        return self
-
-    def parseImpl(self, instring, loc, doActions=True):
-        self_expr_parse = self.expr._parse
-        self_skip_ignorables = self._skipIgnorables
-        check_ender = self.not_ender is not None
-        if check_ender:
-            try_not_ender = self.not_ender.try_parse
-
-        # must be at least one (but first see if we are the stopOn sentinel;
-        # if so, fail)
-        if check_ender:
-            try_not_ender(instring, loc)
-        loc, tokens = self_expr_parse(instring, loc, doActions)
-        try:
-            hasIgnoreExprs = not not self.ignoreExprs
-            while 1:
-                if check_ender:
-                    try_not_ender(instring, loc)
-                if hasIgnoreExprs:
-                    preloc = self_skip_ignorables(instring, loc)
-                else:
-                    preloc = loc
-                loc, tmptokens = self_expr_parse(instring, preloc, doActions)
-                tokens += tmptokens
-        except (ParseException, IndexError):
-            pass
-
-        return loc, tokens
-
-    def _setResultsName(self, name, listAllMatches=False):
-        if (
-            __diag__.warn_ungrouped_named_tokens_in_collection
-            and Diagnostics.warn_ungrouped_named_tokens_in_collection
-            not in self.suppress_warnings_
-        ):
-            for e in [self.expr] + self.expr.recurse():
-                if (
-                    isinstance(e, ParserElement)
-                    and e.resultsName
-                    and (
-                        Diagnostics.warn_ungrouped_named_tokens_in_collection
-                        not in e.suppress_warnings_
-                    )
-                ):
-                    warning = (
-                        "warn_ungrouped_named_tokens_in_collection:"
-                        f" setting results name {name!r} on {type(self).__name__} expression"
-                        f" collides with {e.resultsName!r} on contained expression"
-                    )
-                    warnings.warn(warning, stacklevel=3)
-                    break
-
-        return super()._setResultsName(name, listAllMatches)
-
-
-class OneOrMore(_MultipleMatch):
-    """
-    Repetition of one or more of the given expression.
-
-    Parameters:
-
-    - ``expr`` - expression that must match one or more times
-    - ``stop_on`` - (default= ``None``) - expression for a terminating sentinel
-      (only required if the sentinel would ordinarily match the repetition
-      expression)
-
-    Example::
-
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).set_parse_action(' '.join))
-
-        text = "shape: SQUARE posn: upper left color: BLACK"
-        attr_expr[1, ...].parse_string(text).pprint()  # Fail! read 'color' as data instead of next label -> [['shape', 'SQUARE color']]
-
-        # use stop_on attribute for OneOrMore to avoid reading label string as part of the data
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-        OneOrMore(attr_expr).parse_string(text).pprint() # Better -> [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'BLACK']]
-
-        # could also be written as
-        (attr_expr * (1,)).parse_string(text).pprint()
-    """
-
-    def _generateDefaultName(self) -> str:
-        return f"{{{self.expr}}}..."
-
-
-class ZeroOrMore(_MultipleMatch):
-    """
-    Optional repetition of zero or more of the given expression.
-
-    Parameters:
-
-    - ``expr`` - expression that must match zero or more times
-    - ``stop_on`` - expression for a terminating sentinel
-      (only required if the sentinel would ordinarily match the repetition
-      expression) - (default= ``None``)
-
-    Example: similar to :class:`OneOrMore`
-    """
-
-    def __init__(
-        self,
-        expr: Union[str, ParserElement],
-        stop_on: typing.Optional[Union[ParserElement, str]] = None,
-        *,
-        stopOn: typing.Optional[Union[ParserElement, str]] = None,
-    ):
-        super().__init__(expr, stopOn=stopOn or stop_on)
-        self.mayReturnEmpty = True
-
-    def parseImpl(self, instring, loc, doActions=True):
-        try:
-            return super().parseImpl(instring, loc, doActions)
-        except (ParseException, IndexError):
-            return loc, ParseResults([], name=self.resultsName)
-
-    def _generateDefaultName(self) -> str:
-        return f"[{self.expr}]..."
-
-
-class DelimitedList(ParseElementEnhance):
-    def __init__(
-        self,
-        expr: Union[str, ParserElement],
-        delim: Union[str, ParserElement] = ",",
-        combine: bool = False,
-        min: typing.Optional[int] = None,
-        max: typing.Optional[int] = None,
-        *,
-        allow_trailing_delim: bool = False,
-    ):
-        """Helper to define a delimited list of expressions - the delimiter
-        defaults to ','. By default, the list elements and delimiters can
-        have intervening whitespace, and comments, but this can be
-        overridden by passing ``combine=True`` in the constructor. If
-        ``combine`` is set to ``True``, the matching tokens are
-        returned as a single token string, with the delimiters included;
-        otherwise, the matching tokens are returned as a list of tokens,
-        with the delimiters suppressed.
-
-        If ``allow_trailing_delim`` is set to True, then the list may end with
-        a delimiter.
-
-        Example::
-
-            DelimitedList(Word(alphas)).parse_string("aa,bb,cc") # -> ['aa', 'bb', 'cc']
-            DelimitedList(Word(hexnums), delim=':', combine=True).parse_string("AA:BB:CC:DD:EE") # -> ['AA:BB:CC:DD:EE']
-        """
-        if isinstance(expr, str_type):
-            expr = ParserElement._literalStringClass(expr)
-        expr = typing.cast(ParserElement, expr)
-
-        if min is not None and min < 1:
-            raise ValueError("min must be greater than 0")
-
-        if max is not None and min is not None and max < min:
-            raise ValueError("max must be greater than, or equal to min")
-
-        self.content = expr
-        self.raw_delim = str(delim)
-        self.delim = delim
-        self.combine = combine
-        if not combine:
-            self.delim = Suppress(delim)
-        self.min = min or 1
-        self.max = max
-        self.allow_trailing_delim = allow_trailing_delim
-
-        delim_list_expr = self.content + (self.delim + self.content) * (
-            self.min - 1,
-            None if self.max is None else self.max - 1,
-        )
-        if self.allow_trailing_delim:
-            delim_list_expr += Opt(self.delim)
-
-        if self.combine:
-            delim_list_expr = Combine(delim_list_expr)
-
-        super().__init__(delim_list_expr, savelist=True)
-
-    def _generateDefaultName(self) -> str:
-        content_expr = self.content.streamline()
-        return f"{content_expr} [{self.raw_delim} {content_expr}]..."
-
-
-class _NullToken:
-    def __bool__(self):
-        return False
-
-    def __str__(self):
-        return ""
-
-
-class Opt(ParseElementEnhance):
-    """
-    Optional matching of the given expression.
-
-    Parameters:
-
-    - ``expr`` - expression that must match zero or more times
-    - ``default`` (optional) - value to be returned if the optional expression is not found.
-
-    Example::
-
-        # US postal code can be a 5-digit zip, plus optional 4-digit qualifier
-        zip = Combine(Word(nums, exact=5) + Opt('-' + Word(nums, exact=4)))
-        zip.run_tests('''
-            # traditional ZIP code
-            12345
-
-            # ZIP+4 form
-            12101-0001
-
-            # invalid ZIP
-            98765-
-            ''')
-
-    prints::
-
-        # traditional ZIP code
-        12345
-        ['12345']
-
-        # ZIP+4 form
-        12101-0001
-        ['12101-0001']
-
-        # invalid ZIP
-        98765-
-             ^
-        FAIL: Expected end of text (at char 5), (line:1, col:6)
-    """
-
-    __optionalNotMatched = _NullToken()
-
-    def __init__(
-        self, expr: Union[ParserElement, str], default: Any = __optionalNotMatched
-    ):
-        super().__init__(expr, savelist=False)
-        self.saveAsList = self.expr.saveAsList
-        self.defaultValue = default
-        self.mayReturnEmpty = True
-
-    def parseImpl(self, instring, loc, doActions=True):
-        self_expr = self.expr
-        try:
-            loc, tokens = self_expr._parse(instring, loc, doActions, callPreParse=False)
-        except (ParseException, IndexError):
-            default_value = self.defaultValue
-            if default_value is not self.__optionalNotMatched:
-                if self_expr.resultsName:
-                    tokens = ParseResults([default_value])
-                    tokens[self_expr.resultsName] = default_value
-                else:
-                    tokens = [default_value]
-            else:
-                tokens = []
-        return loc, tokens
-
-    def _generateDefaultName(self) -> str:
-        inner = str(self.expr)
-        # strip off redundant inner {}'s
-        while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
-            inner = inner[1:-1]
-        return f"[{inner}]"
-
-
-Optional = Opt
-
-
-class SkipTo(ParseElementEnhance):
-    """
-    Token for skipping over all undefined text until the matched
-    expression is found.
-
-    Parameters:
-
-    - ``expr`` - target expression marking the end of the data to be skipped
-    - ``include`` - if ``True``, the target expression is also parsed
-      (the skipped text and target expression are returned as a 2-element
-      list) (default= ``False``).
-    - ``ignore`` - (default= ``None``) used to define grammars (typically quoted strings and
-      comments) that might contain false matches to the target expression
-    - ``fail_on`` - (default= ``None``) define expressions that are not allowed to be
-      included in the skipped test; if found before the target expression is found,
-      the :class:`SkipTo` is not a match
-
-    Example::
-
-        report = '''
-            Outstanding Issues Report - 1 Jan 2000
-
-               # | Severity | Description                               |  Days Open
-            -----+----------+-------------------------------------------+-----------
-             101 | Critical | Intermittent system crash                 |          6
-              94 | Cosmetic | Spelling error on Login ('log|n')         |         14
-              79 | Minor    | System slow when running too many reports |         47
-            '''
-        integer = Word(nums)
-        SEP = Suppress('|')
-        # use SkipTo to simply match everything up until the next SEP
-        # - ignore quoted strings, so that a '|' character inside a quoted string does not match
-        # - parse action will call token.strip() for each matched token, i.e., the description body
-        string_data = SkipTo(SEP, ignore=quoted_string)
-        string_data.set_parse_action(token_map(str.strip))
-        ticket_expr = (integer("issue_num") + SEP
-                      + string_data("sev") + SEP
-                      + string_data("desc") + SEP
-                      + integer("days_open"))
-
-        for tkt in ticket_expr.search_string(report):
-            print tkt.dump()
-
-    prints::
-
-        ['101', 'Critical', 'Intermittent system crash', '6']
-        - days_open: '6'
-        - desc: 'Intermittent system crash'
-        - issue_num: '101'
-        - sev: 'Critical'
-        ['94', 'Cosmetic', "Spelling error on Login ('log|n')", '14']
-        - days_open: '14'
-        - desc: "Spelling error on Login ('log|n')"
-        - issue_num: '94'
-        - sev: 'Cosmetic'
-        ['79', 'Minor', 'System slow when running too many reports', '47']
-        - days_open: '47'
-        - desc: 'System slow when running too many reports'
-        - issue_num: '79'
-        - sev: 'Minor'
-    """
-
-    def __init__(
-        self,
-        other: Union[ParserElement, str],
-        include: bool = False,
-        ignore: typing.Optional[Union[ParserElement, str]] = None,
-        fail_on: typing.Optional[Union[ParserElement, str]] = None,
-        *,
-        failOn: typing.Optional[Union[ParserElement, str]] = None,
-    ):
-        super().__init__(other)
-        failOn = failOn or fail_on
-        self.ignoreExpr = ignore
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-        self.includeMatch = include
-        self.saveAsList = False
-        if isinstance(failOn, str_type):
-            self.failOn = self._literalStringClass(failOn)
-        else:
-            self.failOn = failOn
-        self.errmsg = "No match found for " + str(self.expr)
-        self.ignorer = Empty().leave_whitespace()
-        self._update_ignorer()
-
-    def _update_ignorer(self):
-        # rebuild internal ignore expr from current ignore exprs and assigned ignoreExpr
-        self.ignorer.ignoreExprs.clear()
-        for e in self.expr.ignoreExprs:
-            self.ignorer.ignore(e)
-        if self.ignoreExpr:
-            self.ignorer.ignore(self.ignoreExpr)
-
-    def ignore(self, expr):
-        super().ignore(expr)
-        self._update_ignorer()
-
-    def parseImpl(self, instring, loc, doActions=True):
-        startloc = loc
-        instrlen = len(instring)
-        self_expr_parse = self.expr._parse
-        self_failOn_canParseNext = (
-            self.failOn.canParseNext if self.failOn is not None else None
-        )
-        ignorer_try_parse = self.ignorer.try_parse if self.ignorer.ignoreExprs else None
-
-        tmploc = loc
-        while tmploc <= instrlen:
-            if self_failOn_canParseNext is not None:
-                # break if failOn expression matches
-                if self_failOn_canParseNext(instring, tmploc):
-                    break
-
-            if ignorer_try_parse is not None:
-                # advance past ignore expressions
-                prev_tmploc = tmploc
-                while 1:
-                    try:
-                        tmploc = ignorer_try_parse(instring, tmploc)
-                    except ParseBaseException:
-                        break
-                    # see if all ignorers matched, but didn't actually ignore anything
-                    if tmploc == prev_tmploc:
-                        break
-                    prev_tmploc = tmploc
-
-            try:
-                self_expr_parse(instring, tmploc, doActions=False, callPreParse=False)
-            except (ParseException, IndexError):
-                # no match, advance loc in string
-                tmploc += 1
-            else:
-                # matched skipto expr, done
-                break
-
-        else:
-            # ran off the end of the input string without matching skipto expr, fail
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        # build up return values
-        loc = tmploc
-        skiptext = instring[startloc:loc]
-        skipresult = ParseResults(skiptext)
-
-        if self.includeMatch:
-            loc, mat = self_expr_parse(instring, loc, doActions, callPreParse=False)
-            skipresult += mat
-
-        return loc, skipresult
-
-
-class Forward(ParseElementEnhance):
-    """
-    Forward declaration of an expression to be defined later -
-    used for recursive grammars, such as algebraic infix notation.
-    When the expression is known, it is assigned to the ``Forward``
-    variable using the ``'<<'`` operator.
-
-    Note: take care when assigning to ``Forward`` not to overlook
-    precedence of operators.
-
-    Specifically, ``'|'`` has a lower precedence than ``'<<'``, so that::
-
-        fwd_expr << a | b | c
-
-    will actually be evaluated as::
-
-        (fwd_expr << a) | b | c
-
-    thereby leaving b and c out as parseable alternatives.  It is recommended that you
-    explicitly group the values inserted into the ``Forward``::
-
-        fwd_expr << (a | b | c)
-
-    Converting to use the ``'<<='`` operator instead will avoid this problem.
-
-    See :class:`ParseResults.pprint` for an example of a recursive
-    parser created using ``Forward``.
-    """
-
-    def __init__(self, other: typing.Optional[Union[ParserElement, str]] = None):
-        self.caller_frame = traceback.extract_stack(limit=2)[0]
-        super().__init__(other, savelist=False)  # type: ignore[arg-type]
-        self.lshift_line = None
-
-    def __lshift__(self, other) -> "Forward":
-        if hasattr(self, "caller_frame"):
-            del self.caller_frame
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-
-        self.expr = other
-        self.streamlined = other.streamlined
-        self.mayIndexError = self.expr.mayIndexError
-        self.mayReturnEmpty = self.expr.mayReturnEmpty
-        self.set_whitespace_chars(
-            self.expr.whiteChars, copy_defaults=self.expr.copyDefaultWhiteChars
-        )
-        self.skipWhitespace = self.expr.skipWhitespace
-        self.saveAsList = self.expr.saveAsList
-        self.ignoreExprs.extend(self.expr.ignoreExprs)
-        self.lshift_line = traceback.extract_stack(limit=2)[-2]  # type: ignore[assignment]
-        return self
-
-    def __ilshift__(self, other) -> "Forward":
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-
-        return self << other
-
-    def __or__(self, other) -> "ParserElement":
-        caller_line = traceback.extract_stack(limit=2)[-2]
-        if (
-            __diag__.warn_on_match_first_with_lshift_operator
-            and caller_line == self.lshift_line
-            and Diagnostics.warn_on_match_first_with_lshift_operator
-            not in self.suppress_warnings_
-        ):
-            warnings.warn(
-                "using '<<' operator with '|' is probably an error, use '<<='",
-                stacklevel=2,
-            )
-        ret = super().__or__(other)
-        return ret
-
-    def __del__(self):
-        # see if we are getting dropped because of '=' reassignment of var instead of '<<=' or '<<'
-        if (
-            self.expr is None
-            and __diag__.warn_on_assignment_to_Forward
-            and Diagnostics.warn_on_assignment_to_Forward not in self.suppress_warnings_
-        ):
-            warnings.warn_explicit(
-                "Forward defined here but no expression attached later using '<<=' or '<<'",
-                UserWarning,
-                filename=self.caller_frame.filename,
-                lineno=self.caller_frame.lineno,
-            )
-
-    def parseImpl(self, instring, loc, doActions=True):
-        if (
-            self.expr is None
-            and __diag__.warn_on_parse_using_empty_Forward
-            and Diagnostics.warn_on_parse_using_empty_Forward
-            not in self.suppress_warnings_
-        ):
-            # walk stack until parse_string, scan_string, search_string, or transform_string is found
-            parse_fns = (
-                "parse_string",
-                "scan_string",
-                "search_string",
-                "transform_string",
-            )
-            tb = traceback.extract_stack(limit=200)
-            for i, frm in enumerate(reversed(tb), start=1):
-                if frm.name in parse_fns:
-                    stacklevel = i + 1
-                    break
-            else:
-                stacklevel = 2
-            warnings.warn(
-                "Forward expression was never assigned a value, will not parse any input",
-                stacklevel=stacklevel,
-            )
-        if not ParserElement._left_recursion_enabled:
-            return super().parseImpl(instring, loc, doActions)
-        # ## Bounded Recursion algorithm ##
-        # Recursion only needs to be processed at ``Forward`` elements, since they are
-        # the only ones that can actually refer to themselves. The general idea is
-        # to handle recursion stepwise: We start at no recursion, then recurse once,
-        # recurse twice, ..., until more recursion offers no benefit (we hit the bound).
-        #
-        # The "trick" here is that each ``Forward`` gets evaluated in two contexts
-        # - to *match* a specific recursion level, and
-        # - to *search* the bounded recursion level
-        # and the two run concurrently. The *search* must *match* each recursion level
-        # to find the best possible match. This is handled by a memo table, which
-        # provides the previous match to the next level match attempt.
-        #
-        # See also "Left Recursion in Parsing Expression Grammars", Medeiros et al.
-        #
-        # There is a complication since we not only *parse* but also *transform* via
-        # actions: We do not want to run the actions too often while expanding. Thus,
-        # we expand using `doActions=False` and only run `doActions=True` if the next
-        # recursion level is acceptable.
-        with ParserElement.recursion_lock:
-            memo = ParserElement.recursion_memos
-            try:
-                # we are parsing at a specific recursion expansion - use it as-is
-                prev_loc, prev_result = memo[loc, self, doActions]
-                if isinstance(prev_result, Exception):
-                    raise prev_result
-                return prev_loc, prev_result.copy()
-            except KeyError:
-                act_key = (loc, self, True)
-                peek_key = (loc, self, False)
-                # we are searching for the best recursion expansion - keep on improving
-                # both `doActions` cases must be tracked separately here!
-                prev_loc, prev_peek = memo[peek_key] = (
-                    loc - 1,
-                    ParseException(
-                        instring, loc, "Forward recursion without base case", self
-                    ),
-                )
-                if doActions:
-                    memo[act_key] = memo[peek_key]
-                while True:
-                    try:
-                        new_loc, new_peek = super().parseImpl(instring, loc, False)
-                    except ParseException:
-                        # we failed before getting any match – do not hide the error
-                        if isinstance(prev_peek, Exception):
-                            raise
-                        new_loc, new_peek = prev_loc, prev_peek
-                    # the match did not get better: we are done
-                    if new_loc <= prev_loc:
-                        if doActions:
-                            # replace the match for doActions=False as well,
-                            # in case the action did backtrack
-                            prev_loc, prev_result = memo[peek_key] = memo[act_key]
-                            del memo[peek_key], memo[act_key]
-                            return prev_loc, prev_result.copy()
-                        del memo[peek_key]
-                        return prev_loc, prev_peek.copy()
-                    # the match did get better: see if we can improve further
-                    if doActions:
-                        try:
-                            memo[act_key] = super().parseImpl(instring, loc, True)
-                        except ParseException as e:
-                            memo[peek_key] = memo[act_key] = (new_loc, e)
-                            raise
-                    prev_loc, prev_peek = memo[peek_key] = new_loc, new_peek
-
-    def leave_whitespace(self, recursive: bool = True) -> ParserElement:
-        self.skipWhitespace = False
-        return self
-
-    def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
-        self.skipWhitespace = True
-        return self
-
-    def streamline(self) -> ParserElement:
-        if not self.streamlined:
-            self.streamlined = True
-            if self.expr is not None:
-                self.expr.streamline()
-        return self
-
-    def validate(self, validateTrace=None) -> None:
-        warnings.warn(
-            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        if validateTrace is None:
-            validateTrace = []
-
-        if self not in validateTrace:
-            tmp = validateTrace[:] + [self]
-            if self.expr is not None:
-                self.expr.validate(tmp)
-        self._checkRecursion([])
-
-    def _generateDefaultName(self) -> str:
-        # Avoid infinite recursion by setting a temporary _defaultName
-        self._defaultName = ": ..."
-
-        # Use the string representation of main expression.
-        retString = "..."
-        try:
-            if self.expr is not None:
-                retString = str(self.expr)[:1000]
-            else:
-                retString = "None"
-        finally:
-            return f"{type(self).__name__}: {retString}"
-
-    def copy(self) -> ParserElement:
-        if self.expr is not None:
-            return super().copy()
-        else:
-            ret = Forward()
-            ret <<= self
-            return ret
-
-    def _setResultsName(self, name, list_all_matches=False):
-        # fmt: off
-        if (
-            __diag__.warn_name_set_on_empty_Forward
-            and Diagnostics.warn_name_set_on_empty_Forward not in self.suppress_warnings_
-            and self.expr is None
-        ):
-            warning = (
-                "warn_name_set_on_empty_Forward:"
-                f" setting results name {name!r} on {type(self).__name__} expression"
-                " that has no contained expression"
-            )
-            warnings.warn(warning, stacklevel=3)
-        # fmt: on
-
-        return super()._setResultsName(name, list_all_matches)
-
-    # Compatibility synonyms
-    # fmt: off
-    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
-    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
-    # fmt: on
-
-
-class TokenConverter(ParseElementEnhance):
-    """
-    Abstract subclass of :class:`ParseExpression`, for converting parsed results.
-    """
-
-    def __init__(self, expr: Union[ParserElement, str], savelist=False):
-        super().__init__(expr)  # , savelist)
-        self.saveAsList = False
-
-
-class Combine(TokenConverter):
-    """Converter to concatenate all matching tokens to a single string.
-    By default, the matching patterns must also be contiguous in the
-    input string; this can be disabled by specifying
-    ``'adjacent=False'`` in the constructor.
-
-    Example::
-
-        real = Word(nums) + '.' + Word(nums)
-        print(real.parse_string('3.1416')) # -> ['3', '.', '1416']
-        # will also erroneously match the following
-        print(real.parse_string('3. 1416')) # -> ['3', '.', '1416']
-
-        real = Combine(Word(nums) + '.' + Word(nums))
-        print(real.parse_string('3.1416')) # -> ['3.1416']
-        # no match when there are internal spaces
-        print(real.parse_string('3. 1416')) # -> Exception: Expected W:(0123...)
-    """
-
-    def __init__(
-        self,
-        expr: ParserElement,
-        join_string: str = "",
-        adjacent: bool = True,
-        *,
-        joinString: typing.Optional[str] = None,
-    ):
-        super().__init__(expr)
-        joinString = joinString if joinString is not None else join_string
-        # suppress whitespace-stripping in contained parse expressions, but re-enable it on the Combine itself
-        if adjacent:
-            self.leave_whitespace()
-        self.adjacent = adjacent
-        self.skipWhitespace = True
-        self.joinString = joinString
-        self.callPreparse = True
-
-    def ignore(self, other) -> ParserElement:
-        if self.adjacent:
-            ParserElement.ignore(self, other)
-        else:
-            super().ignore(other)
-        return self
-
-    def postParse(self, instring, loc, tokenlist):
-        retToks = tokenlist.copy()
-        del retToks[:]
-        retToks += ParseResults(
-            ["".join(tokenlist._asStringList(self.joinString))], modal=self.modalResults
-        )
-
-        if self.resultsName and retToks.haskeys():
-            return [retToks]
-        else:
-            return retToks
-
-
-class Group(TokenConverter):
-    """Converter to return the matched tokens as a list - useful for
-    returning tokens of :class:`ZeroOrMore` and :class:`OneOrMore` expressions.
-
-    The optional ``aslist`` argument when set to True will return the
-    parsed tokens as a Python list instead of a pyparsing ParseResults.
-
-    Example::
-
-        ident = Word(alphas)
-        num = Word(nums)
-        term = ident | num
-        func = ident + Opt(DelimitedList(term))
-        print(func.parse_string("fn a, b, 100"))
-        # -> ['fn', 'a', 'b', '100']
-
-        func = ident + Group(Opt(DelimitedList(term)))
-        print(func.parse_string("fn a, b, 100"))
-        # -> ['fn', ['a', 'b', '100']]
-    """
-
-    def __init__(self, expr: ParserElement, aslist: bool = False):
-        super().__init__(expr)
-        self.saveAsList = True
-        self._asPythonList = aslist
-
-    def postParse(self, instring, loc, tokenlist):
-        if self._asPythonList:
-            return ParseResults.List(
-                tokenlist.asList()
-                if isinstance(tokenlist, ParseResults)
-                else list(tokenlist)
-            )
-
-        return [tokenlist]
-
-
-class Dict(TokenConverter):
-    """Converter to return a repetitive expression as a list, but also
-    as a dictionary. Each element can also be referenced using the first
-    token in the expression as its key. Useful for tabular report
-    scraping when the first column can be used as a item key.
-
-    The optional ``asdict`` argument when set to True will return the
-    parsed tokens as a Python dict instead of a pyparsing ParseResults.
-
-    Example::
-
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-
-        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
-        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-
-        # print attributes as plain groups
-        print(attr_expr[1, ...].parse_string(text).dump())
-
-        # instead of OneOrMore(expr), parse using Dict(Group(expr)[1, ...]) - Dict will auto-assign names
-        result = Dict(Group(attr_expr)[1, ...]).parse_string(text)
-        print(result.dump())
-
-        # access named fields as dict entries, or output as dict
-        print(result['shape'])
-        print(result.as_dict())
-
-    prints::
-
-        ['shape', 'SQUARE', 'posn', 'upper left', 'color', 'light blue', 'texture', 'burlap']
-        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
-        - color: 'light blue'
-        - posn: 'upper left'
-        - shape: 'SQUARE'
-        - texture: 'burlap'
-        SQUARE
-        {'color': 'light blue', 'posn': 'upper left', 'texture': 'burlap', 'shape': 'SQUARE'}
-
-    See more examples at :class:`ParseResults` of accessing fields by results name.
-    """
-
-    def __init__(self, expr: ParserElement, asdict: bool = False):
-        super().__init__(expr)
-        self.saveAsList = True
-        self._asPythonDict = asdict
-
-    def postParse(self, instring, loc, tokenlist):
-        for i, tok in enumerate(tokenlist):
-            if len(tok) == 0:
-                continue
-
-            ikey = tok[0]
-            if isinstance(ikey, int):
-                ikey = str(ikey).strip()
-
-            if len(tok) == 1:
-                tokenlist[ikey] = _ParseResultsWithOffset("", i)
-
-            elif len(tok) == 2 and not isinstance(tok[1], ParseResults):
-                tokenlist[ikey] = _ParseResultsWithOffset(tok[1], i)
-
-            else:
-                try:
-                    dictvalue = tok.copy()  # ParseResults(i)
-                except Exception:
-                    exc = TypeError(
-                        "could not extract dict values from parsed results"
-                        " - Dict expression must contain Grouped expressions"
-                    )
-                    raise exc from None
-
-                del dictvalue[0]
-
-                if len(dictvalue) != 1 or (
-                    isinstance(dictvalue, ParseResults) and dictvalue.haskeys()
-                ):
-                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue, i)
-                else:
-                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue[0], i)
-
-        if self._asPythonDict:
-            return [tokenlist.as_dict()] if self.resultsName else tokenlist.as_dict()
-
-        return [tokenlist] if self.resultsName else tokenlist
-
-
-class Suppress(TokenConverter):
-    """Converter for ignoring the results of a parsed expression.
-
-    Example::
-
-        source = "a, b, c,d"
-        wd = Word(alphas)
-        wd_list1 = wd + (',' + wd)[...]
-        print(wd_list1.parse_string(source))
-
-        # often, delimiters that are useful during parsing are just in the
-        # way afterward - use Suppress to keep them out of the parsed output
-        wd_list2 = wd + (Suppress(',') + wd)[...]
-        print(wd_list2.parse_string(source))
-
-        # Skipped text (using '...') can be suppressed as well
-        source = "lead in START relevant text END trailing text"
-        start_marker = Keyword("START")
-        end_marker = Keyword("END")
-        find_body = Suppress(...) + start_marker + ... + end_marker
-        print(find_body.parse_string(source)
-
-    prints::
-
-        ['a', ',', 'b', ',', 'c', ',', 'd']
-        ['a', 'b', 'c', 'd']
-        ['START', 'relevant text ', 'END']
-
-    (See also :class:`DelimitedList`.)
-    """
-
-    def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
-        if expr is ...:
-            expr = _PendingSkip(NoMatch())
-        super().__init__(expr)
-
-    def __add__(self, other) -> "ParserElement":
-        if isinstance(self.expr, _PendingSkip):
-            return Suppress(SkipTo(other)) + other
-
-        return super().__add__(other)
-
-    def __sub__(self, other) -> "ParserElement":
-        if isinstance(self.expr, _PendingSkip):
-            return Suppress(SkipTo(other)) - other
-
-        return super().__sub__(other)
-
-    def postParse(self, instring, loc, tokenlist):
-        return []
-
-    def suppress(self) -> ParserElement:
-        return self
-
-
-def trace_parse_action(f: ParseAction) -> ParseAction:
-    """Decorator for debugging parse actions.
-
-    When the parse action is called, this decorator will print
-    ``">> entering method-name(line:, , )"``.
-    When the parse action completes, the decorator will print
-    ``"<<"`` followed by the returned value, or any exception that the parse action raised.
-
-    Example::
-
-        wd = Word(alphas)
-
-        @trace_parse_action
-        def remove_duplicate_chars(tokens):
-            return ''.join(sorted(set(''.join(tokens))))
-
-        wds = wd[1, ...].set_parse_action(remove_duplicate_chars)
-        print(wds.parse_string("slkdjs sld sldd sdlf sdljf"))
-
-    prints::
-
-        >>entering remove_duplicate_chars(line: 'slkdjs sld sldd sdlf sdljf', 0, (['slkdjs', 'sld', 'sldd', 'sdlf', 'sdljf'], {}))
-        < 3:
-            thisFunc = f"{type(paArgs[0]).__name__}.{thisFunc}"
-        sys.stderr.write(f">>entering {thisFunc}(line: {line(l, s)!r}, {l}, {t!r})\n")
-        try:
-            ret = f(*paArgs)
-        except Exception as exc:
-            sys.stderr.write(f"< str:
-    r"""Helper to easily define string ranges for use in :class:`Word`
-    construction. Borrows syntax from regexp ``'[]'`` string range
-    definitions::
-
-        srange("[0-9]")   -> "0123456789"
-        srange("[a-z]")   -> "abcdefghijklmnopqrstuvwxyz"
-        srange("[a-z$_]") -> "abcdefghijklmnopqrstuvwxyz$_"
-
-    The input string must be enclosed in []'s, and the returned string
-    is the expanded character set joined into a single string. The
-    values enclosed in the []'s may be:
-
-    - a single character
-    - an escaped character with a leading backslash (such as ``\-``
-      or ``\]``)
-    - an escaped hex character with a leading ``'\x'``
-      (``\x21``, which is a ``'!'`` character) (``\0x##``
-      is also supported for backwards compatibility)
-    - an escaped octal character with a leading ``'\0'``
-      (``\041``, which is a ``'!'`` character)
-    - a range of any of the above, separated by a dash (``'a-z'``,
-      etc.)
-    - any combination of the above (``'aeiouy'``,
-      ``'a-zA-Z0-9_$'``, etc.)
-    """
-    _expanded = lambda p: (
-        p
-        if not isinstance(p, ParseResults)
-        else "".join(chr(c) for c in range(ord(p[0]), ord(p[1]) + 1))
-    )
-    try:
-        return "".join(_expanded(part) for part in _reBracketExpr.parse_string(s).body)
-    except Exception as e:
-        return ""
-
-
-def token_map(func, *args) -> ParseAction:
-    """Helper to define a parse action by mapping a function to all
-    elements of a :class:`ParseResults` list. If any additional args are passed,
-    they are forwarded to the given function as additional arguments
-    after the token, as in
-    ``hex_integer = Word(hexnums).set_parse_action(token_map(int, 16))``,
-    which will convert the parsed data to an integer using base 16.
-
-    Example (compare the last to example in :class:`ParserElement.transform_string`::
-
-        hex_ints = Word(hexnums)[1, ...].set_parse_action(token_map(int, 16))
-        hex_ints.run_tests('''
-            00 11 22 aa FF 0a 0d 1a
-            ''')
-
-        upperword = Word(alphas).set_parse_action(token_map(str.upper))
-        upperword[1, ...].run_tests('''
-            my kingdom for a horse
-            ''')
-
-        wd = Word(alphas).set_parse_action(token_map(str.title))
-        wd[1, ...].set_parse_action(' '.join).run_tests('''
-            now is the winter of our discontent made glorious summer by this sun of york
-            ''')
-
-    prints::
-
-        00 11 22 aa FF 0a 0d 1a
-        [0, 17, 34, 170, 255, 10, 13, 26]
-
-        my kingdom for a horse
-        ['MY', 'KINGDOM', 'FOR', 'A', 'HORSE']
-
-        now is the winter of our discontent made glorious summer by this sun of york
-        ['Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York']
-    """
-
-    def pa(s, l, t):
-        return [func(tokn, *args) for tokn in t]
-
-    func_name = getattr(func, "__name__", getattr(func, "__class__").__name__)
-    pa.__name__ = func_name
-
-    return pa
-
-
-def autoname_elements() -> None:
-    """
-    Utility to simplify mass-naming of parser elements, for
-    generating railroad diagram with named subdiagrams.
-    """
-    calling_frame = sys._getframe().f_back
-    if calling_frame is None:
-        return
-    calling_frame = typing.cast(types.FrameType, calling_frame)
-    for name, var in calling_frame.f_locals.items():
-        if isinstance(var, ParserElement) and not var.customName:
-            var.set_name(name)
-
-
-dbl_quoted_string = Combine(
-    Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*') + '"'
-).set_name("string enclosed in double quotes")
-
-sgl_quoted_string = Combine(
-    Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*") + "'"
-).set_name("string enclosed in single quotes")
-
-quoted_string = Combine(
-    (Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*') + '"').set_name(
-        "double quoted string"
-    )
-    | (Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*") + "'").set_name(
-        "single quoted string"
-    )
-).set_name("quoted string using single or double quotes")
-
-python_quoted_string = Combine(
-    (Regex(r'"""(?:[^"\\]|""(?!")|"(?!"")|\\.)*', flags=re.MULTILINE) + '"""').set_name(
-        "multiline double quoted string"
-    )
-    ^ (
-        Regex(r"'''(?:[^'\\]|''(?!')|'(?!'')|\\.)*", flags=re.MULTILINE) + "'''"
-    ).set_name("multiline single quoted string")
-    ^ (Regex(r'"(?:[^"\n\r\\]|(?:\\")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*') + '"').set_name(
-        "double quoted string"
-    )
-    ^ (Regex(r"'(?:[^'\n\r\\]|(?:\\')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*") + "'").set_name(
-        "single quoted string"
-    )
-).set_name("Python quoted string")
-
-unicode_string = Combine("u" + quoted_string.copy()).set_name("unicode string literal")
-
-
-alphas8bit = srange(r"[\0xc0-\0xd6\0xd8-\0xf6\0xf8-\0xff]")
-punc8bit = srange(r"[\0xa1-\0xbf\0xd7\0xf7]")
-
-# build list of built-in expressions, for future reference if a global default value
-# gets updated
-_builtin_exprs: List[ParserElement] = [
-    v for v in vars().values() if isinstance(v, ParserElement)
-]
-
-# backward compatibility names
-# fmt: off
-sglQuotedString = sgl_quoted_string
-dblQuotedString = dbl_quoted_string
-quotedString = quoted_string
-unicodeString = unicode_string
-lineStart = line_start
-lineEnd = line_end
-stringStart = string_start
-stringEnd = string_end
-nullDebugAction = replaced_by_pep8("nullDebugAction", null_debug_action)
-traceParseAction = replaced_by_pep8("traceParseAction", trace_parse_action)
-conditionAsParseAction = replaced_by_pep8("conditionAsParseAction", condition_as_parse_action)
-tokenMap = replaced_by_pep8("tokenMap", token_map)
-# fmt: on
diff --git a/src/pip/_vendor/pyparsing/diagram/__init__.py b/src/pip/_vendor/pyparsing/diagram/__init__.py
deleted file mode 100644
index 6074d2bfd0f..00000000000
--- a/src/pip/_vendor/pyparsing/diagram/__init__.py
+++ /dev/null
@@ -1,656 +0,0 @@
-# mypy: ignore-errors
-import railroad
-from pip._vendor import pyparsing
-import typing
-from typing import (
-    List,
-    NamedTuple,
-    Generic,
-    TypeVar,
-    Dict,
-    Callable,
-    Set,
-    Iterable,
-)
-from jinja2 import Template
-from io import StringIO
-import inspect
-
-
-jinja2_template_source = """\
-{% if not embed %}
-
-
-
-{% endif %}
-    {% if not head %}
-        
-    {% else %}
-        {{ head | safe }}
-    {% endif %}
-{% if not embed %}
-
-
-{% endif %}
-{{ body | safe }}
-{% for diagram in diagrams %}
-    

-        
{{ diagram.title }}

-        
{{ diagram.text }}

-        

-            {{ diagram.svg }}
-        

-    

-{% endfor %}
-{% if not embed %}
-
-
-{% endif %}
-"""
-
-template = Template(jinja2_template_source)
-
-# Note: ideally this would be a dataclass, but we're supporting Python 3.5+ so we can't do this yet
-NamedDiagram = NamedTuple(
-    "NamedDiagram",
-    [("name", str), ("diagram", typing.Optional[railroad.DiagramItem]), ("index", int)],
-)
-"""
-A simple structure for associating a name with a railroad diagram
-"""
-
-T = TypeVar("T")
-
-
-class EachItem(railroad.Group):
-    """
-    Custom railroad item to compose a:
-    - Group containing a
-      - OneOrMore containing a
-        - Choice of the elements in the Each
-    with the group label indicating that all must be matched
-    """
-
-    all_label = "[ALL]"
-
-    def __init__(self, *items):
-        choice_item = railroad.Choice(len(items) - 1, *items)
-        one_or_more_item = railroad.OneOrMore(item=choice_item)
-        super().__init__(one_or_more_item, label=self.all_label)
-
-
-class AnnotatedItem(railroad.Group):
-    """
-    Simple subclass of Group that creates an annotation label
-    """
-
-    def __init__(self, label: str, item):
-        super().__init__(item=item, label="[{}]".format(label) if label else label)
-
-
-class EditablePartial(Generic[T]):
-    """
-    Acts like a functools.partial, but can be edited. In other words, it represents a type that hasn't yet been
-    constructed.
-    """
-
-    # We need this here because the railroad constructors actually transform the data, so can't be called until the
-    # entire tree is assembled
-
-    def __init__(self, func: Callable[..., T], args: list, kwargs: dict):
-        self.func = func
-        self.args = args
-        self.kwargs = kwargs
-
-    @classmethod
-    def from_call(cls, func: Callable[..., T], *args, **kwargs) -> "EditablePartial[T]":
-        """
-        If you call this function in the same way that you would call the constructor, it will store the arguments
-        as you expect. For example EditablePartial.from_call(Fraction, 1, 3)() == Fraction(1, 3)
-        """
-        return EditablePartial(func=func, args=list(args), kwargs=kwargs)
-
-    @property
-    def name(self):
-        return self.kwargs["name"]
-
-    def __call__(self) -> T:
-        """
-        Evaluate the partial and return the result
-        """
-        args = self.args.copy()
-        kwargs = self.kwargs.copy()
-
-        # This is a helpful hack to allow you to specify varargs parameters (e.g. *args) as keyword args (e.g.
-        # args=['list', 'of', 'things'])
-        arg_spec = inspect.getfullargspec(self.func)
-        if arg_spec.varargs in self.kwargs:
-            args += kwargs.pop(arg_spec.varargs)
-
-        return self.func(*args, **kwargs)
-
-
-def railroad_to_html(diagrams: List[NamedDiagram], embed=False, **kwargs) -> str:
-    """
-    Given a list of NamedDiagram, produce a single HTML string that visualises those diagrams
-    :params kwargs: kwargs to be passed in to the template
-    """
-    data = []
-    for diagram in diagrams:
-        if diagram.diagram is None:
-            continue
-        io = StringIO()
-        try:
-            css = kwargs.get('css')
-            diagram.diagram.writeStandalone(io.write, css=css)
-        except AttributeError:
-            diagram.diagram.writeSvg(io.write)
-        title = diagram.name
-        if diagram.index == 0:
-            title += " (root)"
-        data.append({"title": title, "text": "", "svg": io.getvalue()})
-
-    return template.render(diagrams=data, embed=embed, **kwargs)
-
-
-def resolve_partial(partial: "EditablePartial[T]") -> T:
-    """
-    Recursively resolves a collection of Partials into whatever type they are
-    """
-    if isinstance(partial, EditablePartial):
-        partial.args = resolve_partial(partial.args)
-        partial.kwargs = resolve_partial(partial.kwargs)
-        return partial()
-    elif isinstance(partial, list):
-        return [resolve_partial(x) for x in partial]
-    elif isinstance(partial, dict):
-        return {key: resolve_partial(x) for key, x in partial.items()}
-    else:
-        return partial
-
-
-def to_railroad(
-    element: pyparsing.ParserElement,
-    diagram_kwargs: typing.Optional[dict] = None,
-    vertical: int = 3,
-    show_results_names: bool = False,
-    show_groups: bool = False,
-) -> List[NamedDiagram]:
-    """
-    Convert a pyparsing element tree into a list of diagrams. This is the recommended entrypoint to diagram
-    creation if you want to access the Railroad tree before it is converted to HTML
-    :param element: base element of the parser being diagrammed
-    :param diagram_kwargs: kwargs to pass to the Diagram() constructor
-    :param vertical: (optional) - int - limit at which number of alternatives should be
-       shown vertically instead of horizontally
-    :param show_results_names - bool to indicate whether results name annotations should be
-       included in the diagram
-    :param show_groups - bool to indicate whether groups should be highlighted with an unlabeled
-       surrounding box
-    """
-    # Convert the whole tree underneath the root
-    lookup = ConverterState(diagram_kwargs=diagram_kwargs or {})
-    _to_diagram_element(
-        element,
-        lookup=lookup,
-        parent=None,
-        vertical=vertical,
-        show_results_names=show_results_names,
-        show_groups=show_groups,
-    )
-
-    root_id = id(element)
-    # Convert the root if it hasn't been already
-    if root_id in lookup:
-        if not element.customName:
-            lookup[root_id].name = ""
-        lookup[root_id].mark_for_extraction(root_id, lookup, force=True)
-
-    # Now that we're finished, we can convert from intermediate structures into Railroad elements
-    diags = list(lookup.diagrams.values())
-    if len(diags) > 1:
-        # collapse out duplicate diags with the same name
-        seen = set()
-        deduped_diags = []
-        for d in diags:
-            # don't extract SkipTo elements, they are uninformative as subdiagrams
-            if d.name == "...":
-                continue
-            if d.name is not None and d.name not in seen:
-                seen.add(d.name)
-                deduped_diags.append(d)
-        resolved = [resolve_partial(partial) for partial in deduped_diags]
-    else:
-        # special case - if just one diagram, always display it, even if
-        # it has no name
-        resolved = [resolve_partial(partial) for partial in diags]
-    return sorted(resolved, key=lambda diag: diag.index)
-
-
-def _should_vertical(
-    specification: int, exprs: Iterable[pyparsing.ParserElement]
-) -> bool:
-    """
-    Returns true if we should return a vertical list of elements
-    """
-    if specification is None:
-        return False
-    else:
-        return len(_visible_exprs(exprs)) >= specification
-
-
-class ElementState:
-    """
-    State recorded for an individual pyparsing Element
-    """
-
-    # Note: this should be a dataclass, but we have to support Python 3.5
-    def __init__(
-        self,
-        element: pyparsing.ParserElement,
-        converted: EditablePartial,
-        parent: EditablePartial,
-        number: int,
-        name: str = None,
-        parent_index: typing.Optional[int] = None,
-    ):
-        #: The pyparsing element that this represents
-        self.element: pyparsing.ParserElement = element
-        #: The name of the element
-        self.name: typing.Optional[str] = name
-        #: The output Railroad element in an unconverted state
-        self.converted: EditablePartial = converted
-        #: The parent Railroad element, which we store so that we can extract this if it's duplicated
-        self.parent: EditablePartial = parent
-        #: The order in which we found this element, used for sorting diagrams if this is extracted into a diagram
-        self.number: int = number
-        #: The index of this inside its parent
-        self.parent_index: typing.Optional[int] = parent_index
-        #: If true, we should extract this out into a subdiagram
-        self.extract: bool = False
-        #: If true, all of this element's children have been filled out
-        self.complete: bool = False
-
-    def mark_for_extraction(
-        self, el_id: int, state: "ConverterState", name: str = None, force: bool = False
-    ):
-        """
-        Called when this instance has been seen twice, and thus should eventually be extracted into a sub-diagram
-        :param el_id: id of the element
-        :param state: element/diagram state tracker
-        :param name: name to use for this element's text
-        :param force: If true, force extraction now, regardless of the state of this. Only useful for extracting the
-        root element when we know we're finished
-        """
-        self.extract = True
-
-        # Set the name
-        if not self.name:
-            if name:
-                # Allow forcing a custom name
-                self.name = name
-            elif self.element.customName:
-                self.name = self.element.customName
-            else:
-                self.name = ""
-
-        # Just because this is marked for extraction doesn't mean we can do it yet. We may have to wait for children
-        # to be added
-        # Also, if this is just a string literal etc, don't bother extracting it
-        if force or (self.complete and _worth_extracting(self.element)):
-            state.extract_into_diagram(el_id)
-
-
-class ConverterState:
-    """
-    Stores some state that persists between recursions into the element tree
-    """
-
-    def __init__(self, diagram_kwargs: typing.Optional[dict] = None):
-        #: A dictionary mapping ParserElements to state relating to them
-        self._element_diagram_states: Dict[int, ElementState] = {}
-        #: A dictionary mapping ParserElement IDs to subdiagrams generated from them
-        self.diagrams: Dict[int, EditablePartial[NamedDiagram]] = {}
-        #: The index of the next unnamed element
-        self.unnamed_index: int = 1
-        #: The index of the next element. This is used for sorting
-        self.index: int = 0
-        #: Shared kwargs that are used to customize the construction of diagrams
-        self.diagram_kwargs: dict = diagram_kwargs or {}
-        self.extracted_diagram_names: Set[str] = set()
-
-    def __setitem__(self, key: int, value: ElementState):
-        self._element_diagram_states[key] = value
-
-    def __getitem__(self, key: int) -> ElementState:
-        return self._element_diagram_states[key]
-
-    def __delitem__(self, key: int):
-        del self._element_diagram_states[key]
-
-    def __contains__(self, key: int):
-        return key in self._element_diagram_states
-
-    def generate_unnamed(self) -> int:
-        """
-        Generate a number used in the name of an otherwise unnamed diagram
-        """
-        self.unnamed_index += 1
-        return self.unnamed_index
-
-    def generate_index(self) -> int:
-        """
-        Generate a number used to index a diagram
-        """
-        self.index += 1
-        return self.index
-
-    def extract_into_diagram(self, el_id: int):
-        """
-        Used when we encounter the same token twice in the same tree. When this
-        happens, we replace all instances of that token with a terminal, and
-        create a new subdiagram for the token
-        """
-        position = self[el_id]
-
-        # Replace the original definition of this element with a regular block
-        if position.parent:
-            ret = EditablePartial.from_call(railroad.NonTerminal, text=position.name)
-            if "item" in position.parent.kwargs:
-                position.parent.kwargs["item"] = ret
-            elif "items" in position.parent.kwargs:
-                position.parent.kwargs["items"][position.parent_index] = ret
-
-        # If the element we're extracting is a group, skip to its content but keep the title
-        if position.converted.func == railroad.Group:
-            content = position.converted.kwargs["item"]
-        else:
-            content = position.converted
-
-        self.diagrams[el_id] = EditablePartial.from_call(
-            NamedDiagram,
-            name=position.name,
-            diagram=EditablePartial.from_call(
-                railroad.Diagram, content, **self.diagram_kwargs
-            ),
-            index=position.number,
-        )
-
-        del self[el_id]
-
-
-def _worth_extracting(element: pyparsing.ParserElement) -> bool:
-    """
-    Returns true if this element is worth having its own sub-diagram. Simply, if any of its children
-    themselves have children, then its complex enough to extract
-    """
-    children = element.recurse()
-    return any(child.recurse() for child in children)
-
-
-def _apply_diagram_item_enhancements(fn):
-    """
-    decorator to ensure enhancements to a diagram item (such as results name annotations)
-    get applied on return from _to_diagram_element (we do this since there are several
-    returns in _to_diagram_element)
-    """
-
-    def _inner(
-        element: pyparsing.ParserElement,
-        parent: typing.Optional[EditablePartial],
-        lookup: ConverterState = None,
-        vertical: int = None,
-        index: int = 0,
-        name_hint: str = None,
-        show_results_names: bool = False,
-        show_groups: bool = False,
-    ) -> typing.Optional[EditablePartial]:
-        ret = fn(
-            element,
-            parent,
-            lookup,
-            vertical,
-            index,
-            name_hint,
-            show_results_names,
-            show_groups,
-        )
-
-        # apply annotation for results name, if present
-        if show_results_names and ret is not None:
-            element_results_name = element.resultsName
-            if element_results_name:
-                # add "*" to indicate if this is a "list all results" name
-                element_results_name += "" if element.modalResults else "*"
-                ret = EditablePartial.from_call(
-                    railroad.Group, item=ret, label=element_results_name
-                )
-
-        return ret
-
-    return _inner
-
-
-def _visible_exprs(exprs: Iterable[pyparsing.ParserElement]):
-    non_diagramming_exprs = (
-        pyparsing.ParseElementEnhance,
-        pyparsing.PositionToken,
-        pyparsing.And._ErrorStop,
-    )
-    return [
-        e
-        for e in exprs
-        if not (e.customName or e.resultsName or isinstance(e, non_diagramming_exprs))
-    ]
-
-
-@_apply_diagram_item_enhancements
-def _to_diagram_element(
-    element: pyparsing.ParserElement,
-    parent: typing.Optional[EditablePartial],
-    lookup: ConverterState = None,
-    vertical: int = None,
-    index: int = 0,
-    name_hint: str = None,
-    show_results_names: bool = False,
-    show_groups: bool = False,
-) -> typing.Optional[EditablePartial]:
-    """
-    Recursively converts a PyParsing Element to a railroad Element
-    :param lookup: The shared converter state that keeps track of useful things
-    :param index: The index of this element within the parent
-    :param parent: The parent of this element in the output tree
-    :param vertical: Controls at what point we make a list of elements vertical. If this is an integer (the default),
-    it sets the threshold of the number of items before we go vertical. If True, always go vertical, if False, never
-    do so
-    :param name_hint: If provided, this will override the generated name
-    :param show_results_names: bool flag indicating whether to add annotations for results names
-    :returns: The converted version of the input element, but as a Partial that hasn't yet been constructed
-    :param show_groups: bool flag indicating whether to show groups using bounding box
-    """
-    exprs = element.recurse()
-    name = name_hint or element.customName or type(element).__name__
-
-    # Python's id() is used to provide a unique identifier for elements
-    el_id = id(element)
-
-    element_results_name = element.resultsName
-
-    # Here we basically bypass processing certain wrapper elements if they contribute nothing to the diagram
-    if not element.customName:
-        if isinstance(
-            element,
-            (
-                # pyparsing.TokenConverter,
-                # pyparsing.Forward,
-                pyparsing.Located,
-            ),
-        ):
-            # However, if this element has a useful custom name, and its child does not, we can pass it on to the child
-            if exprs:
-                if not exprs[0].customName:
-                    propagated_name = name
-                else:
-                    propagated_name = None
-
-                return _to_diagram_element(
-                    element.expr,
-                    parent=parent,
-                    lookup=lookup,
-                    vertical=vertical,
-                    index=index,
-                    name_hint=propagated_name,
-                    show_results_names=show_results_names,
-                    show_groups=show_groups,
-                )
-
-    # If the element isn't worth extracting, we always treat it as the first time we say it
-    if _worth_extracting(element):
-        if el_id in lookup:
-            # If we've seen this element exactly once before, we are only just now finding out that it's a duplicate,
-            # so we have to extract it into a new diagram.
-            looked_up = lookup[el_id]
-            looked_up.mark_for_extraction(el_id, lookup, name=name_hint)
-            ret = EditablePartial.from_call(railroad.NonTerminal, text=looked_up.name)
-            return ret
-
-        elif el_id in lookup.diagrams:
-            # If we have seen the element at least twice before, and have already extracted it into a subdiagram, we
-            # just put in a marker element that refers to the sub-diagram
-            ret = EditablePartial.from_call(
-                railroad.NonTerminal, text=lookup.diagrams[el_id].kwargs["name"]
-            )
-            return ret
-
-    # Recursively convert child elements
-    # Here we find the most relevant Railroad element for matching pyparsing Element
-    # We use ``items=[]`` here to hold the place for where the child elements will go once created
-    if isinstance(element, pyparsing.And):
-        # detect And's created with ``expr*N`` notation - for these use a OneOrMore with a repeat
-        # (all will have the same name, and resultsName)
-        if not exprs:
-            return None
-        if len(set((e.name, e.resultsName) for e in exprs)) == 1:
-            ret = EditablePartial.from_call(
-                railroad.OneOrMore, item="", repeat=str(len(exprs))
-            )
-        elif _should_vertical(vertical, exprs):
-            ret = EditablePartial.from_call(railroad.Stack, items=[])
-        else:
-            ret = EditablePartial.from_call(railroad.Sequence, items=[])
-    elif isinstance(element, (pyparsing.Or, pyparsing.MatchFirst)):
-        if not exprs:
-            return None
-        if _should_vertical(vertical, exprs):
-            ret = EditablePartial.from_call(railroad.Choice, 0, items=[])
-        else:
-            ret = EditablePartial.from_call(railroad.HorizontalChoice, items=[])
-    elif isinstance(element, pyparsing.Each):
-        if not exprs:
-            return None
-        ret = EditablePartial.from_call(EachItem, items=[])
-    elif isinstance(element, pyparsing.NotAny):
-        ret = EditablePartial.from_call(AnnotatedItem, label="NOT", item="")
-    elif isinstance(element, pyparsing.FollowedBy):
-        ret = EditablePartial.from_call(AnnotatedItem, label="LOOKAHEAD", item="")
-    elif isinstance(element, pyparsing.PrecededBy):
-        ret = EditablePartial.from_call(AnnotatedItem, label="LOOKBEHIND", item="")
-    elif isinstance(element, pyparsing.Group):
-        if show_groups:
-            ret = EditablePartial.from_call(AnnotatedItem, label="", item="")
-        else:
-            ret = EditablePartial.from_call(railroad.Group, label="", item="")
-    elif isinstance(element, pyparsing.TokenConverter):
-        label = type(element).__name__.lower()
-        if label == "tokenconverter":
-            ret = EditablePartial.from_call(railroad.Sequence, items=[])
-        else:
-            ret = EditablePartial.from_call(AnnotatedItem, label=label, item="")
-    elif isinstance(element, pyparsing.Opt):
-        ret = EditablePartial.from_call(railroad.Optional, item="")
-    elif isinstance(element, pyparsing.OneOrMore):
-        ret = EditablePartial.from_call(railroad.OneOrMore, item="")
-    elif isinstance(element, pyparsing.ZeroOrMore):
-        ret = EditablePartial.from_call(railroad.ZeroOrMore, item="")
-    elif isinstance(element, pyparsing.Group):
-        ret = EditablePartial.from_call(
-            railroad.Group, item=None, label=element_results_name
-        )
-    elif isinstance(element, pyparsing.Empty) and not element.customName:
-        # Skip unnamed "Empty" elements
-        ret = None
-    elif isinstance(element, pyparsing.ParseElementEnhance):
-        ret = EditablePartial.from_call(railroad.Sequence, items=[])
-    elif len(exprs) > 0 and not element_results_name:
-        ret = EditablePartial.from_call(railroad.Group, item="", label=name)
-    elif len(exprs) > 0:
-        ret = EditablePartial.from_call(railroad.Sequence, items=[])
-    else:
-        terminal = EditablePartial.from_call(railroad.Terminal, element.defaultName)
-        ret = terminal
-
-    if ret is None:
-        return
-
-    # Indicate this element's position in the tree so we can extract it if necessary
-    lookup[el_id] = ElementState(
-        element=element,
-        converted=ret,
-        parent=parent,
-        parent_index=index,
-        number=lookup.generate_index(),
-    )
-    if element.customName:
-        lookup[el_id].mark_for_extraction(el_id, lookup, element.customName)
-
-    i = 0
-    for expr in exprs:
-        # Add a placeholder index in case we have to extract the child before we even add it to the parent
-        if "items" in ret.kwargs:
-            ret.kwargs["items"].insert(i, None)
-
-        item = _to_diagram_element(
-            expr,
-            parent=ret,
-            lookup=lookup,
-            vertical=vertical,
-            index=i,
-            show_results_names=show_results_names,
-            show_groups=show_groups,
-        )
-
-        # Some elements don't need to be shown in the diagram
-        if item is not None:
-            if "item" in ret.kwargs:
-                ret.kwargs["item"] = item
-            elif "items" in ret.kwargs:
-                # If we've already extracted the child, don't touch this index, since it's occupied by a nonterminal
-                ret.kwargs["items"][i] = item
-                i += 1
-        elif "items" in ret.kwargs:
-            # If we're supposed to skip this element, remove it from the parent
-            del ret.kwargs["items"][i]
-
-    # If all this items children are none, skip this item
-    if ret and (
-        ("items" in ret.kwargs and len(ret.kwargs["items"]) == 0)
-        or ("item" in ret.kwargs and ret.kwargs["item"] is None)
-    ):
-        ret = EditablePartial.from_call(railroad.Terminal, name)
-
-    # Mark this element as "complete", ie it has all of its children
-    if el_id in lookup:
-        lookup[el_id].complete = True
-
-    if el_id in lookup and lookup[el_id].extract and lookup[el_id].complete:
-        lookup.extract_into_diagram(el_id)
-        if ret is not None:
-            ret = EditablePartial.from_call(
-                railroad.NonTerminal, text=lookup.diagrams[el_id].kwargs["name"]
-            )
-
-    return ret
diff --git a/src/pip/_vendor/pyparsing/exceptions.py b/src/pip/_vendor/pyparsing/exceptions.py
deleted file mode 100644
index 1aaea56f54d..00000000000
--- a/src/pip/_vendor/pyparsing/exceptions.py
+++ /dev/null
@@ -1,300 +0,0 @@
-# exceptions.py
-
-import re
-import sys
-import typing
-
-from .util import (
-    col,
-    line,
-    lineno,
-    _collapse_string_to_ranges,
-    replaced_by_pep8,
-)
-from .unicode import pyparsing_unicode as ppu
-
-
-class _ExceptionWordUnicodeSet(
-    ppu.Latin1, ppu.LatinA, ppu.LatinB, ppu.Greek, ppu.Cyrillic
-):
-    pass
-
-
-_extract_alphanums = _collapse_string_to_ranges(_ExceptionWordUnicodeSet.alphanums)
-_exception_word_extractor = re.compile("([" + _extract_alphanums + "]{1,16})|.")
-
-
-class ParseBaseException(Exception):
-    """base exception class for all parsing runtime exceptions"""
-
-    loc: int
-    msg: str
-    pstr: str
-    parser_element: typing.Any  # "ParserElement"
-    args: typing.Tuple[str, int, typing.Optional[str]]
-
-    __slots__ = (
-        "loc",
-        "msg",
-        "pstr",
-        "parser_element",
-        "args",
-    )
-
-    # Performance tuning: we construct a *lot* of these, so keep this
-    # constructor as small and fast as possible
-    def __init__(
-        self,
-        pstr: str,
-        loc: int = 0,
-        msg: typing.Optional[str] = None,
-        elem=None,
-    ):
-        self.loc = loc
-        if msg is None:
-            self.msg = pstr
-            self.pstr = ""
-        else:
-            self.msg = msg
-            self.pstr = pstr
-        self.parser_element = elem
-        self.args = (pstr, loc, msg)
-
-    @staticmethod
-    def explain_exception(exc, depth=16):
-        """
-        Method to take an exception and translate the Python internal traceback into a list
-        of the pyparsing expressions that caused the exception to be raised.
-
-        Parameters:
-
-        - exc - exception raised during parsing (need not be a ParseException, in support
-          of Python exceptions that might be raised in a parse action)
-        - depth (default=16) - number of levels back in the stack trace to list expression
-          and function names; if None, the full stack trace names will be listed; if 0, only
-          the failing input line, marker, and exception string will be shown
-
-        Returns a multi-line string listing the ParserElements and/or function names in the
-        exception's stack trace.
-        """
-        import inspect
-        from .core import ParserElement
-
-        if depth is None:
-            depth = sys.getrecursionlimit()
-        ret = []
-        if isinstance(exc, ParseBaseException):
-            ret.append(exc.line)
-            ret.append(" " * (exc.column - 1) + "^")
-        ret.append(f"{type(exc).__name__}: {exc}")
-
-        if depth <= 0:
-            return "\n".join(ret)
-
-        callers = inspect.getinnerframes(exc.__traceback__, context=depth)
-        seen = set()
-        for ff in callers[-depth:]:
-            frm = ff[0]
-
-            f_self = frm.f_locals.get("self", None)
-            if isinstance(f_self, ParserElement):
-                if not frm.f_code.co_name.startswith(("parseImpl", "_parseNoCache")):
-                    continue
-                if id(f_self) in seen:
-                    continue
-                seen.add(id(f_self))
-
-                self_type = type(f_self)
-                ret.append(f"{self_type.__module__}.{self_type.__name__} - {f_self}")
-
-            elif f_self is not None:
-                self_type = type(f_self)
-                ret.append(f"{self_type.__module__}.{self_type.__name__}")
-
-            else:
-                code = frm.f_code
-                if code.co_name in ("wrapper", ""):
-                    continue
-
-                ret.append(code.co_name)
-
-            depth -= 1
-            if not depth:
-                break
-
-        return "\n".join(ret)
-
-    @classmethod
-    def _from_exception(cls, pe):
-        """
-        internal factory method to simplify creating one type of ParseException
-        from another - avoids having __init__ signature conflicts among subclasses
-        """
-        return cls(pe.pstr, pe.loc, pe.msg, pe.parser_element)
-
-    @property
-    def line(self) -> str:
-        """
-        Return the line of text where the exception occurred.
-        """
-        return line(self.loc, self.pstr)
-
-    @property
-    def lineno(self) -> int:
-        """
-        Return the 1-based line number of text where the exception occurred.
-        """
-        return lineno(self.loc, self.pstr)
-
-    @property
-    def col(self) -> int:
-        """
-        Return the 1-based column on the line of text where the exception occurred.
-        """
-        return col(self.loc, self.pstr)
-
-    @property
-    def column(self) -> int:
-        """
-        Return the 1-based column on the line of text where the exception occurred.
-        """
-        return col(self.loc, self.pstr)
-
-    # pre-PEP8 compatibility
-    @property
-    def parserElement(self):
-        return self.parser_element
-
-    @parserElement.setter
-    def parserElement(self, elem):
-        self.parser_element = elem
-
-    def __str__(self) -> str:
-        if self.pstr:
-            if self.loc >= len(self.pstr):
-                foundstr = ", found end of text"
-            else:
-                # pull out next word at error location
-                found_match = _exception_word_extractor.match(self.pstr, self.loc)
-                if found_match is not None:
-                    found = found_match.group(0)
-                else:
-                    found = self.pstr[self.loc : self.loc + 1]
-                foundstr = (", found %r" % found).replace(r"\\", "\\")
-        else:
-            foundstr = ""
-        return f"{self.msg}{foundstr}  (at char {self.loc}), (line:{self.lineno}, col:{self.column})"
-
-    def __repr__(self):
-        return str(self)
-
-    def mark_input_line(
-        self, marker_string: typing.Optional[str] = None, *, markerString: str = ">!<"
-    ) -> str:
-        """
-        Extracts the exception line from the input string, and marks
-        the location of the exception with a special symbol.
-        """
-        markerString = marker_string if marker_string is not None else markerString
-        line_str = self.line
-        line_column = self.column - 1
-        if markerString:
-            line_str = "".join(
-                (line_str[:line_column], markerString, line_str[line_column:])
-            )
-        return line_str.strip()
-
-    def explain(self, depth=16) -> str:
-        """
-        Method to translate the Python internal traceback into a list
-        of the pyparsing expressions that caused the exception to be raised.
-
-        Parameters:
-
-        - depth (default=16) - number of levels back in the stack trace to list expression
-          and function names; if None, the full stack trace names will be listed; if 0, only
-          the failing input line, marker, and exception string will be shown
-
-        Returns a multi-line string listing the ParserElements and/or function names in the
-        exception's stack trace.
-
-        Example::
-
-            # an expression to parse 3 integers
-            expr = pp.Word(pp.nums) * 3
-            try:
-                # a failing parse - the third integer is prefixed with "A"
-                expr.parse_string("123 456 A789")
-            except pp.ParseException as pe:
-                print(pe.explain(depth=0))
-
-        prints::
-
-            123 456 A789
-                    ^
-            ParseException: Expected W:(0-9), found 'A'  (at char 8), (line:1, col:9)
-
-        Note: the diagnostic output will include string representations of the expressions
-        that failed to parse. These representations will be more helpful if you use `set_name` to
-        give identifiable names to your expressions. Otherwise they will use the default string
-        forms, which may be cryptic to read.
-
-        Note: pyparsing's default truncation of exception tracebacks may also truncate the
-        stack of expressions that are displayed in the ``explain`` output. To get the full listing
-        of parser expressions, you may have to set ``ParserElement.verbose_stacktrace = True``
-        """
-        return self.explain_exception(self, depth)
-
-    # fmt: off
-    markInputline = replaced_by_pep8("markInputline", mark_input_line)
-    # fmt: on
-
-
-class ParseException(ParseBaseException):
-    """
-    Exception thrown when a parse expression doesn't match the input string
-
-    Example::
-
-        integer = Word(nums).set_name("integer")
-        try:
-            integer.parse_string("ABC")
-        except ParseException as pe:
-            print(pe)
-            print(f"column: {pe.column}")
-
-    prints::
-
-       Expected integer (at char 0), (line:1, col:1) column: 1
-
-    """
-
-
-class ParseFatalException(ParseBaseException):
-    """
-    User-throwable exception thrown when inconsistent parse content
-    is found; stops all parsing immediately
-    """
-
-
-class ParseSyntaxException(ParseFatalException):
-    """
-    Just like :class:`ParseFatalException`, but thrown internally
-    when an :class:`ErrorStop` ('-' operator) indicates
-    that parsing is to stop immediately because an unbacktrackable
-    syntax error has been found.
-    """
-
-
-class RecursiveGrammarException(Exception):
-    """
-    Exception thrown by :class:`ParserElement.validate` if the
-    grammar could be left-recursive; parser may need to enable
-    left recursion using :class:`ParserElement.enable_left_recursion`
-    """
-
-    def __init__(self, parseElementList):
-        self.parseElementTrace = parseElementList
-
-    def __str__(self) -> str:
-        return f"RecursiveGrammarException: {self.parseElementTrace}"
diff --git a/src/pip/_vendor/pyparsing/helpers.py b/src/pip/_vendor/pyparsing/helpers.py
deleted file mode 100644
index dcfdb8fe4bf..00000000000
--- a/src/pip/_vendor/pyparsing/helpers.py
+++ /dev/null
@@ -1,1078 +0,0 @@
-# helpers.py
-import html.entities
-import re
-import sys
-import typing
-
-from . import __diag__
-from .core import *
-from .util import (
-    _bslash,
-    _flatten,
-    _escape_regex_range_chars,
-    replaced_by_pep8,
-)
-
-
-#
-# global helpers
-#
-def counted_array(
-    expr: ParserElement,
-    int_expr: typing.Optional[ParserElement] = None,
-    *,
-    intExpr: typing.Optional[ParserElement] = None,
-) -> ParserElement:
-    """Helper to define a counted list of expressions.
-
-    This helper defines a pattern of the form::
-
-        integer expr expr expr...
-
-    where the leading integer tells how many expr expressions follow.
-    The matched tokens returns the array of expr tokens as a list - the
-    leading count token is suppressed.
-
-    If ``int_expr`` is specified, it should be a pyparsing expression
-    that produces an integer value.
-
-    Example::
-
-        counted_array(Word(alphas)).parse_string('2 ab cd ef')  # -> ['ab', 'cd']
-
-        # in this parser, the leading integer value is given in binary,
-        # '10' indicating that 2 values are in the array
-        binary_constant = Word('01').set_parse_action(lambda t: int(t[0], 2))
-        counted_array(Word(alphas), int_expr=binary_constant).parse_string('10 ab cd ef')  # -> ['ab', 'cd']
-
-        # if other fields must be parsed after the count but before the
-        # list items, give the fields results names and they will
-        # be preserved in the returned ParseResults:
-        count_with_metadata = integer + Word(alphas)("type")
-        typed_array = counted_array(Word(alphanums), int_expr=count_with_metadata)("items")
-        result = typed_array.parse_string("3 bool True True False")
-        print(result.dump())
-
-        # prints
-        # ['True', 'True', 'False']
-        # - items: ['True', 'True', 'False']
-        # - type: 'bool'
-    """
-    intExpr = intExpr or int_expr
-    array_expr = Forward()
-
-    def count_field_parse_action(s, l, t):
-        nonlocal array_expr
-        n = t[0]
-        array_expr <<= (expr * n) if n else Empty()
-        # clear list contents, but keep any named results
-        del t[:]
-
-    if intExpr is None:
-        intExpr = Word(nums).set_parse_action(lambda t: int(t[0]))
-    else:
-        intExpr = intExpr.copy()
-    intExpr.set_name("arrayLen")
-    intExpr.add_parse_action(count_field_parse_action, call_during_try=True)
-    return (intExpr + array_expr).set_name(f"(len) {expr}...")
-
-
-def match_previous_literal(expr: ParserElement) -> ParserElement:
-    """Helper to define an expression that is indirectly defined from
-    the tokens matched in a previous expression, that is, it looks for
-    a 'repeat' of a previous expression.  For example::
-
-        first = Word(nums)
-        second = match_previous_literal(first)
-        match_expr = first + ":" + second
-
-    will match ``"1:1"``, but not ``"1:2"``.  Because this
-    matches a previous literal, will also match the leading
-    ``"1:1"`` in ``"1:10"``. If this is not desired, use
-    :class:`match_previous_expr`. Do *not* use with packrat parsing
-    enabled.
-    """
-    rep = Forward()
-
-    def copy_token_to_repeater(s, l, t):
-        if not t:
-            rep << Empty()
-            return
-
-        if len(t) == 1:
-            rep << t[0]
-            return
-
-        # flatten t tokens
-        tflat = _flatten(t.as_list())
-        rep << And(Literal(tt) for tt in tflat)
-
-    expr.add_parse_action(copy_token_to_repeater, callDuringTry=True)
-    rep.set_name("(prev) " + str(expr))
-    return rep
-
-
-def match_previous_expr(expr: ParserElement) -> ParserElement:
-    """Helper to define an expression that is indirectly defined from
-    the tokens matched in a previous expression, that is, it looks for
-    a 'repeat' of a previous expression.  For example::
-
-        first = Word(nums)
-        second = match_previous_expr(first)
-        match_expr = first + ":" + second
-
-    will match ``"1:1"``, but not ``"1:2"``.  Because this
-    matches by expressions, will *not* match the leading ``"1:1"``
-    in ``"1:10"``; the expressions are evaluated first, and then
-    compared, so ``"1"`` is compared with ``"10"``. Do *not* use
-    with packrat parsing enabled.
-    """
-    rep = Forward()
-    e2 = expr.copy()
-    rep <<= e2
-
-    def copy_token_to_repeater(s, l, t):
-        matchTokens = _flatten(t.as_list())
-
-        def must_match_these_tokens(s, l, t):
-            theseTokens = _flatten(t.as_list())
-            if theseTokens != matchTokens:
-                raise ParseException(
-                    s, l, f"Expected {matchTokens}, found{theseTokens}"
-                )
-
-        rep.set_parse_action(must_match_these_tokens, callDuringTry=True)
-
-    expr.add_parse_action(copy_token_to_repeater, callDuringTry=True)
-    rep.set_name("(prev) " + str(expr))
-    return rep
-
-
-def one_of(
-    strs: Union[typing.Iterable[str], str],
-    caseless: bool = False,
-    use_regex: bool = True,
-    as_keyword: bool = False,
-    *,
-    useRegex: bool = True,
-    asKeyword: bool = False,
-) -> ParserElement:
-    """Helper to quickly define a set of alternative :class:`Literal` s,
-    and makes sure to do longest-first testing when there is a conflict,
-    regardless of the input order, but returns
-    a :class:`MatchFirst` for best performance.
-
-    Parameters:
-
-    - ``strs`` - a string of space-delimited literals, or a collection of
-      string literals
-    - ``caseless`` - treat all literals as caseless - (default= ``False``)
-    - ``use_regex`` - as an optimization, will
-      generate a :class:`Regex` object; otherwise, will generate
-      a :class:`MatchFirst` object (if ``caseless=True`` or ``as_keyword=True``, or if
-      creating a :class:`Regex` raises an exception) - (default= ``True``)
-    - ``as_keyword`` - enforce :class:`Keyword`-style matching on the
-      generated expressions - (default= ``False``)
-    - ``asKeyword`` and ``useRegex`` are retained for pre-PEP8 compatibility,
-      but will be removed in a future release
-
-    Example::
-
-        comp_oper = one_of("< = > <= >= !=")
-        var = Word(alphas)
-        number = Word(nums)
-        term = var | number
-        comparison_expr = term + comp_oper + term
-        print(comparison_expr.search_string("B = 12  AA=23 B<=AA AA>12"))
-
-    prints::
-
-        [['B', '=', '12'], ['AA', '=', '23'], ['B', '<=', 'AA'], ['AA', '>', '12']]
-    """
-    asKeyword = asKeyword or as_keyword
-    useRegex = useRegex and use_regex
-
-    if (
-        isinstance(caseless, str_type)
-        and __diag__.warn_on_multiple_string_args_to_oneof
-    ):
-        warnings.warn(
-            "More than one string argument passed to one_of, pass"
-            " choices as a list or space-delimited string",
-            stacklevel=2,
-        )
-
-    if caseless:
-        isequal = lambda a, b: a.upper() == b.upper()
-        masks = lambda a, b: b.upper().startswith(a.upper())
-        parseElementClass = CaselessKeyword if asKeyword else CaselessLiteral
-    else:
-        isequal = lambda a, b: a == b
-        masks = lambda a, b: b.startswith(a)
-        parseElementClass = Keyword if asKeyword else Literal
-
-    symbols: List[str] = []
-    if isinstance(strs, str_type):
-        strs = typing.cast(str, strs)
-        symbols = strs.split()
-    elif isinstance(strs, Iterable):
-        symbols = list(strs)
-    else:
-        raise TypeError("Invalid argument to one_of, expected string or iterable")
-    if not symbols:
-        return NoMatch()
-
-    # reorder given symbols to take care to avoid masking longer choices with shorter ones
-    # (but only if the given symbols are not just single characters)
-    if any(len(sym) > 1 for sym in symbols):
-        i = 0
-        while i < len(symbols) - 1:
-            cur = symbols[i]
-            for j, other in enumerate(symbols[i + 1 :]):
-                if isequal(other, cur):
-                    del symbols[i + j + 1]
-                    break
-                if masks(cur, other):
-                    del symbols[i + j + 1]
-                    symbols.insert(i, other)
-                    break
-            else:
-                i += 1
-
-    if useRegex:
-        re_flags: int = re.IGNORECASE if caseless else 0
-
-        try:
-            if all(len(sym) == 1 for sym in symbols):
-                # symbols are just single characters, create range regex pattern
-                patt = f"[{''.join(_escape_regex_range_chars(sym) for sym in symbols)}]"
-            else:
-                patt = "|".join(re.escape(sym) for sym in symbols)
-
-            # wrap with \b word break markers if defining as keywords
-            if asKeyword:
-                patt = rf"\b(?:{patt})\b"
-
-            ret = Regex(patt, flags=re_flags).set_name(" | ".join(symbols))
-
-            if caseless:
-                # add parse action to return symbols as specified, not in random
-                # casing as found in input string
-                symbol_map = {sym.lower(): sym for sym in symbols}
-                ret.add_parse_action(lambda s, l, t: symbol_map[t[0].lower()])
-
-            return ret
-
-        except re.error:
-            warnings.warn(
-                "Exception creating Regex for one_of, building MatchFirst", stacklevel=2
-            )
-
-    # last resort, just use MatchFirst
-    return MatchFirst(parseElementClass(sym) for sym in symbols).set_name(
-        " | ".join(symbols)
-    )
-
-
-def dict_of(key: ParserElement, value: ParserElement) -> ParserElement:
-    """Helper to easily and clearly define a dictionary by specifying
-    the respective patterns for the key and value.  Takes care of
-    defining the :class:`Dict`, :class:`ZeroOrMore`, and
-    :class:`Group` tokens in the proper order.  The key pattern
-    can include delimiting markers or punctuation, as long as they are
-    suppressed, thereby leaving the significant key text.  The value
-    pattern can include named results, so that the :class:`Dict` results
-    can include named token fields.
-
-    Example::
-
-        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
-        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-        print(attr_expr[1, ...].parse_string(text).dump())
-
-        attr_label = label
-        attr_value = Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join)
-
-        # similar to Dict, but simpler call format
-        result = dict_of(attr_label, attr_value).parse_string(text)
-        print(result.dump())
-        print(result['shape'])
-        print(result.shape)  # object attribute access works too
-        print(result.as_dict())
-
-    prints::
-
-        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
-        - color: 'light blue'
-        - posn: 'upper left'
-        - shape: 'SQUARE'
-        - texture: 'burlap'
-        SQUARE
-        SQUARE
-        {'color': 'light blue', 'shape': 'SQUARE', 'posn': 'upper left', 'texture': 'burlap'}
-    """
-    return Dict(OneOrMore(Group(key + value)))
-
-
-def original_text_for(
-    expr: ParserElement, as_string: bool = True, *, asString: bool = True
-) -> ParserElement:
-    """Helper to return the original, untokenized text for a given
-    expression.  Useful to restore the parsed fields of an HTML start
-    tag into the raw tag text itself, or to revert separate tokens with
-    intervening whitespace back to the original matching input text. By
-    default, returns a string containing the original parsed text.
-
-    If the optional ``as_string`` argument is passed as
-    ``False``, then the return value is
-    a :class:`ParseResults` containing any results names that
-    were originally matched, and a single token containing the original
-    matched text from the input string.  So if the expression passed to
-    :class:`original_text_for` contains expressions with defined
-    results names, you must set ``as_string`` to ``False`` if you
-    want to preserve those results name values.
-
-    The ``asString`` pre-PEP8 argument is retained for compatibility,
-    but will be removed in a future release.
-
-    Example::
-
-        src = "this is test  bold text  normal text "
-        for tag in ("b", "i"):
-            opener, closer = make_html_tags(tag)
-            patt = original_text_for(opener + ... + closer)
-            print(patt.search_string(src)[0])
-
-    prints::
-
-        [' bold text ']
-        ['text']
-    """
-    asString = asString and as_string
-
-    locMarker = Empty().set_parse_action(lambda s, loc, t: loc)
-    endlocMarker = locMarker.copy()
-    endlocMarker.callPreparse = False
-    matchExpr = locMarker("_original_start") + expr + endlocMarker("_original_end")
-    if asString:
-        extractText = lambda s, l, t: s[t._original_start : t._original_end]
-    else:
-
-        def extractText(s, l, t):
-            t[:] = [s[t.pop("_original_start") : t.pop("_original_end")]]
-
-    matchExpr.set_parse_action(extractText)
-    matchExpr.ignoreExprs = expr.ignoreExprs
-    matchExpr.suppress_warning(Diagnostics.warn_ungrouped_named_tokens_in_collection)
-    return matchExpr
-
-
-def ungroup(expr: ParserElement) -> ParserElement:
-    """Helper to undo pyparsing's default grouping of And expressions,
-    even if all but one are non-empty.
-    """
-    return TokenConverter(expr).add_parse_action(lambda t: t[0])
-
-
-def locatedExpr(expr: ParserElement) -> ParserElement:
-    """
-    (DEPRECATED - future code should use the :class:`Located` class)
-    Helper to decorate a returned token with its starting and ending
-    locations in the input string.
-
-    This helper adds the following results names:
-
-    - ``locn_start`` - location where matched expression begins
-    - ``locn_end`` - location where matched expression ends
-    - ``value`` - the actual parsed results
-
-    Be careful if the input text contains ```` characters, you
-    may want to call :class:`ParserElement.parse_with_tabs`
-
-    Example::
-
-        wd = Word(alphas)
-        for match in locatedExpr(wd).search_string("ljsdf123lksdjjf123lkkjj1222"):
-            print(match)
-
-    prints::
-
-        [[0, 'ljsdf', 5]]
-        [[8, 'lksdjjf', 15]]
-        [[18, 'lkkjj', 23]]
-    """
-    locator = Empty().set_parse_action(lambda ss, ll, tt: ll)
-    return Group(
-        locator("locn_start")
-        + expr("value")
-        + locator.copy().leaveWhitespace()("locn_end")
-    )
-
-
-def nested_expr(
-    opener: Union[str, ParserElement] = "(",
-    closer: Union[str, ParserElement] = ")",
-    content: typing.Optional[ParserElement] = None,
-    ignore_expr: ParserElement = quoted_string(),
-    *,
-    ignoreExpr: ParserElement = quoted_string(),
-) -> ParserElement:
-    """Helper method for defining nested lists enclosed in opening and
-    closing delimiters (``"("`` and ``")"`` are the default).
-
-    Parameters:
-
-    - ``opener`` - opening character for a nested list
-      (default= ``"("``); can also be a pyparsing expression
-    - ``closer`` - closing character for a nested list
-      (default= ``")"``); can also be a pyparsing expression
-    - ``content`` - expression for items within the nested lists
-      (default= ``None``)
-    - ``ignore_expr`` - expression for ignoring opening and closing delimiters
-      (default= :class:`quoted_string`)
-    - ``ignoreExpr`` - this pre-PEP8 argument is retained for compatibility
-      but will be removed in a future release
-
-    If an expression is not provided for the content argument, the
-    nested expression will capture all whitespace-delimited content
-    between delimiters as a list of separate values.
-
-    Use the ``ignore_expr`` argument to define expressions that may
-    contain opening or closing characters that should not be treated as
-    opening or closing characters for nesting, such as quoted_string or
-    a comment expression.  Specify multiple expressions using an
-    :class:`Or` or :class:`MatchFirst`. The default is
-    :class:`quoted_string`, but if no expressions are to be ignored, then
-    pass ``None`` for this argument.
-
-    Example::
-
-        data_type = one_of("void int short long char float double")
-        decl_data_type = Combine(data_type + Opt(Word('*')))
-        ident = Word(alphas+'_', alphanums+'_')
-        number = pyparsing_common.number
-        arg = Group(decl_data_type + ident)
-        LPAR, RPAR = map(Suppress, "()")
-
-        code_body = nested_expr('{', '}', ignore_expr=(quoted_string | c_style_comment))
-
-        c_function = (decl_data_type("type")
-                      + ident("name")
-                      + LPAR + Opt(DelimitedList(arg), [])("args") + RPAR
-                      + code_body("body"))
-        c_function.ignore(c_style_comment)
-
-        source_code = '''
-            int is_odd(int x) {
-                return (x%2);
-            }
-
-            int dec_to_hex(char hchar) {
-                if (hchar >= '0' && hchar <= '9') {
-                    return (ord(hchar)-ord('0'));
-                } else {
-                    return (10+ord(hchar)-ord('A'));
-                }
-            }
-        '''
-        for func in c_function.search_string(source_code):
-            print("%(name)s (%(type)s) args: %(args)s" % func)
-
-
-    prints::
-
-        is_odd (int) args: [['int', 'x']]
-        dec_to_hex (int) args: [['char', 'hchar']]
-    """
-    if ignoreExpr != ignore_expr:
-        ignoreExpr = ignore_expr if ignoreExpr == quoted_string() else ignoreExpr
-    if opener == closer:
-        raise ValueError("opening and closing strings cannot be the same")
-    if content is None:
-        if isinstance(opener, str_type) and isinstance(closer, str_type):
-            opener = typing.cast(str, opener)
-            closer = typing.cast(str, closer)
-            if len(opener) == 1 and len(closer) == 1:
-                if ignoreExpr is not None:
-                    content = Combine(
-                        OneOrMore(
-                            ~ignoreExpr
-                            + CharsNotIn(
-                                opener + closer + ParserElement.DEFAULT_WHITE_CHARS,
-                                exact=1,
-                            )
-                        )
-                    ).set_parse_action(lambda t: t[0].strip())
-                else:
-                    content = empty.copy() + CharsNotIn(
-                        opener + closer + ParserElement.DEFAULT_WHITE_CHARS
-                    ).set_parse_action(lambda t: t[0].strip())
-            else:
-                if ignoreExpr is not None:
-                    content = Combine(
-                        OneOrMore(
-                            ~ignoreExpr
-                            + ~Literal(opener)
-                            + ~Literal(closer)
-                            + CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS, exact=1)
-                        )
-                    ).set_parse_action(lambda t: t[0].strip())
-                else:
-                    content = Combine(
-                        OneOrMore(
-                            ~Literal(opener)
-                            + ~Literal(closer)
-                            + CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS, exact=1)
-                        )
-                    ).set_parse_action(lambda t: t[0].strip())
-        else:
-            raise ValueError(
-                "opening and closing arguments must be strings if no content expression is given"
-            )
-    ret = Forward()
-    if ignoreExpr is not None:
-        ret <<= Group(
-            Suppress(opener) + ZeroOrMore(ignoreExpr | ret | content) + Suppress(closer)
-        )
-    else:
-        ret <<= Group(Suppress(opener) + ZeroOrMore(ret | content) + Suppress(closer))
-    ret.set_name(f"nested {opener}{closer} expression")
-    # don't override error message from content expressions
-    ret.errmsg = None
-    return ret
-
-
-def _makeTags(tagStr, xml, suppress_LT=Suppress("<"), suppress_GT=Suppress(">")):
-    """Internal helper to construct opening and closing tag expressions, given a tag name"""
-    if isinstance(tagStr, str_type):
-        resname = tagStr
-        tagStr = Keyword(tagStr, caseless=not xml)
-    else:
-        resname = tagStr.name
-
-    tagAttrName = Word(alphas, alphanums + "_-:")
-    if xml:
-        tagAttrValue = dbl_quoted_string.copy().set_parse_action(remove_quotes)
-        openTag = (
-            suppress_LT
-            + tagStr("tag")
-            + Dict(ZeroOrMore(Group(tagAttrName + Suppress("=") + tagAttrValue)))
-            + Opt("/", default=[False])("empty").set_parse_action(
-                lambda s, l, t: t[0] == "/"
-            )
-            + suppress_GT
-        )
-    else:
-        tagAttrValue = quoted_string.copy().set_parse_action(remove_quotes) | Word(
-            printables, exclude_chars=">"
-        )
-        openTag = (
-            suppress_LT
-            + tagStr("tag")
-            + Dict(
-                ZeroOrMore(
-                    Group(
-                        tagAttrName.set_parse_action(lambda t: t[0].lower())
-                        + Opt(Suppress("=") + tagAttrValue)
-                    )
-                )
-            )
-            + Opt("/", default=[False])("empty").set_parse_action(
-                lambda s, l, t: t[0] == "/"
-            )
-            + suppress_GT
-        )
-    closeTag = Combine(Literal("", adjacent=False)
-
-    openTag.set_name(f"<{resname}>")
-    # add start results name in parse action now that ungrouped names are not reported at two levels
-    openTag.add_parse_action(
-        lambda t: t.__setitem__(
-            "start" + "".join(resname.replace(":", " ").title().split()), t.copy()
-        )
-    )
-    closeTag = closeTag(
-        "end" + "".join(resname.replace(":", " ").title().split())
-    ).set_name(f"")
-    openTag.tag = resname
-    closeTag.tag = resname
-    openTag.tag_body = SkipTo(closeTag())
-    return openTag, closeTag
-
-
-def make_html_tags(
-    tag_str: Union[str, ParserElement]
-) -> Tuple[ParserElement, ParserElement]:
-    """Helper to construct opening and closing tag expressions for HTML,
-    given a tag name. Matches tags in either upper or lower case,
-    attributes with namespaces and with quoted or unquoted values.
-
-    Example::
-
-        text = 'More info at the pyparsing wiki page'
-        # make_html_tags returns pyparsing expressions for the opening and
-        # closing tags as a 2-tuple
-        a, a_end = make_html_tags("A")
-        link_expr = a + SkipTo(a_end)("link_text") + a_end
-
-        for link in link_expr.search_string(text):
-            # attributes in the  tag (like "href" shown here) are
-            # also accessible as named results
-            print(link.link_text, '->', link.href)
-
-    prints::
-
-        pyparsing -> https://github.com/pyparsing/pyparsing/wiki
-    """
-    return _makeTags(tag_str, False)
-
-
-def make_xml_tags(
-    tag_str: Union[str, ParserElement]
-) -> Tuple[ParserElement, ParserElement]:
-    """Helper to construct opening and closing tag expressions for XML,
-    given a tag name. Matches tags only in the given upper/lower case.
-
-    Example: similar to :class:`make_html_tags`
-    """
-    return _makeTags(tag_str, True)
-
-
-any_open_tag: ParserElement
-any_close_tag: ParserElement
-any_open_tag, any_close_tag = make_html_tags(
-    Word(alphas, alphanums + "_:").set_name("any tag")
-)
-
-_htmlEntityMap = {k.rstrip(";"): v for k, v in html.entities.html5.items()}
-common_html_entity = Regex("&(?P" + "|".join(_htmlEntityMap) + ");").set_name(
-    "common HTML entity"
-)
-
-
-def replace_html_entity(s, l, t):
-    """Helper parser action to replace common HTML entities with their special characters"""
-    return _htmlEntityMap.get(t.entity)
-
-
-class OpAssoc(Enum):
-    """Enumeration of operator associativity
-    - used in constructing InfixNotationOperatorSpec for :class:`infix_notation`"""
-
-    LEFT = 1
-    RIGHT = 2
-
-
-InfixNotationOperatorArgType = Union[
-    ParserElement, str, Tuple[Union[ParserElement, str], Union[ParserElement, str]]
-]
-InfixNotationOperatorSpec = Union[
-    Tuple[
-        InfixNotationOperatorArgType,
-        int,
-        OpAssoc,
-        typing.Optional[ParseAction],
-    ],
-    Tuple[
-        InfixNotationOperatorArgType,
-        int,
-        OpAssoc,
-    ],
-]
-
-
-def infix_notation(
-    base_expr: ParserElement,
-    op_list: List[InfixNotationOperatorSpec],
-    lpar: Union[str, ParserElement] = Suppress("("),
-    rpar: Union[str, ParserElement] = Suppress(")"),
-) -> ParserElement:
-    """Helper method for constructing grammars of expressions made up of
-    operators working in a precedence hierarchy.  Operators may be unary
-    or binary, left- or right-associative.  Parse actions can also be
-    attached to operator expressions. The generated parser will also
-    recognize the use of parentheses to override operator precedences
-    (see example below).
-
-    Note: if you define a deep operator list, you may see performance
-    issues when using infix_notation. See
-    :class:`ParserElement.enable_packrat` for a mechanism to potentially
-    improve your parser performance.
-
-    Parameters:
-
-    - ``base_expr`` - expression representing the most basic operand to
-      be used in the expression
-    - ``op_list`` - list of tuples, one for each operator precedence level
-      in the expression grammar; each tuple is of the form ``(op_expr,
-      num_operands, right_left_assoc, (optional)parse_action)``, where:
-
-      - ``op_expr`` is the pyparsing expression for the operator; may also
-        be a string, which will be converted to a Literal; if ``num_operands``
-        is 3, ``op_expr`` is a tuple of two expressions, for the two
-        operators separating the 3 terms
-      - ``num_operands`` is the number of terms for this operator (must be 1,
-        2, or 3)
-      - ``right_left_assoc`` is the indicator whether the operator is right
-        or left associative, using the pyparsing-defined constants
-        ``OpAssoc.RIGHT`` and ``OpAssoc.LEFT``.
-      - ``parse_action`` is the parse action to be associated with
-        expressions matching this operator expression (the parse action
-        tuple member may be omitted); if the parse action is passed
-        a tuple or list of functions, this is equivalent to calling
-        ``set_parse_action(*fn)``
-        (:class:`ParserElement.set_parse_action`)
-    - ``lpar`` - expression for matching left-parentheses; if passed as a
-      str, then will be parsed as ``Suppress(lpar)``. If lpar is passed as
-      an expression (such as ``Literal('(')``), then it will be kept in
-      the parsed results, and grouped with them. (default= ``Suppress('(')``)
-    - ``rpar`` - expression for matching right-parentheses; if passed as a
-      str, then will be parsed as ``Suppress(rpar)``. If rpar is passed as
-      an expression (such as ``Literal(')')``), then it will be kept in
-      the parsed results, and grouped with them. (default= ``Suppress(')')``)
-
-    Example::
-
-        # simple example of four-function arithmetic with ints and
-        # variable names
-        integer = pyparsing_common.signed_integer
-        varname = pyparsing_common.identifier
-
-        arith_expr = infix_notation(integer | varname,
-            [
-            ('-', 1, OpAssoc.RIGHT),
-            (one_of('* /'), 2, OpAssoc.LEFT),
-            (one_of('+ -'), 2, OpAssoc.LEFT),
-            ])
-
-        arith_expr.run_tests('''
-            5+3*6
-            (5+3)*6
-            -2--11
-            ''', full_dump=False)
-
-    prints::
-
-        5+3*6
-        [[5, '+', [3, '*', 6]]]
-
-        (5+3)*6
-        [[[5, '+', 3], '*', 6]]
-
-        (5+x)*y
-        [[[5, '+', 'x'], '*', 'y']]
-
-        -2--11
-        [[['-', 2], '-', ['-', 11]]]
-    """
-
-    # captive version of FollowedBy that does not do parse actions or capture results names
-    class _FB(FollowedBy):
-        def parseImpl(self, instring, loc, doActions=True):
-            self.expr.try_parse(instring, loc)
-            return loc, []
-
-    _FB.__name__ = "FollowedBy>"
-
-    ret = Forward()
-    if isinstance(lpar, str):
-        lpar = Suppress(lpar)
-    if isinstance(rpar, str):
-        rpar = Suppress(rpar)
-
-    # if lpar and rpar are not suppressed, wrap in group
-    if not (isinstance(lpar, Suppress) and isinstance(rpar, Suppress)):
-        lastExpr = base_expr | Group(lpar + ret + rpar)
-    else:
-        lastExpr = base_expr | (lpar + ret + rpar)
-
-    arity: int
-    rightLeftAssoc: opAssoc
-    pa: typing.Optional[ParseAction]
-    opExpr1: ParserElement
-    opExpr2: ParserElement
-    for operDef in op_list:
-        opExpr, arity, rightLeftAssoc, pa = (operDef + (None,))[:4]  # type: ignore[assignment]
-        if isinstance(opExpr, str_type):
-            opExpr = ParserElement._literalStringClass(opExpr)
-        opExpr = typing.cast(ParserElement, opExpr)
-        if arity == 3:
-            if not isinstance(opExpr, (tuple, list)) or len(opExpr) != 2:
-                raise ValueError(
-                    "if numterms=3, opExpr must be a tuple or list of two expressions"
-                )
-            opExpr1, opExpr2 = opExpr
-            term_name = f"{opExpr1}{opExpr2} term"
-        else:
-            term_name = f"{opExpr} term"
-
-        if not 1 <= arity <= 3:
-            raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
-
-        if rightLeftAssoc not in (OpAssoc.LEFT, OpAssoc.RIGHT):
-            raise ValueError("operator must indicate right or left associativity")
-
-        thisExpr: ParserElement = Forward().set_name(term_name)
-        thisExpr = typing.cast(Forward, thisExpr)
-        if rightLeftAssoc is OpAssoc.LEFT:
-            if arity == 1:
-                matchExpr = _FB(lastExpr + opExpr) + Group(lastExpr + opExpr[1, ...])
-            elif arity == 2:
-                if opExpr is not None:
-                    matchExpr = _FB(lastExpr + opExpr + lastExpr) + Group(
-                        lastExpr + (opExpr + lastExpr)[1, ...]
-                    )
-                else:
-                    matchExpr = _FB(lastExpr + lastExpr) + Group(lastExpr[2, ...])
-            elif arity == 3:
-                matchExpr = _FB(
-                    lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr
-                ) + Group(lastExpr + OneOrMore(opExpr1 + lastExpr + opExpr2 + lastExpr))
-        elif rightLeftAssoc is OpAssoc.RIGHT:
-            if arity == 1:
-                # try to avoid LR with this extra test
-                if not isinstance(opExpr, Opt):
-                    opExpr = Opt(opExpr)
-                matchExpr = _FB(opExpr.expr + thisExpr) + Group(opExpr + thisExpr)
-            elif arity == 2:
-                if opExpr is not None:
-                    matchExpr = _FB(lastExpr + opExpr + thisExpr) + Group(
-                        lastExpr + (opExpr + thisExpr)[1, ...]
-                    )
-                else:
-                    matchExpr = _FB(lastExpr + thisExpr) + Group(
-                        lastExpr + thisExpr[1, ...]
-                    )
-            elif arity == 3:
-                matchExpr = _FB(
-                    lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr
-                ) + Group(lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr)
-        if pa:
-            if isinstance(pa, (tuple, list)):
-                matchExpr.set_parse_action(*pa)
-            else:
-                matchExpr.set_parse_action(pa)
-        thisExpr <<= (matchExpr | lastExpr).setName(term_name)
-        lastExpr = thisExpr
-    ret <<= lastExpr
-    return ret
-
-
-def indentedBlock(blockStatementExpr, indentStack, indent=True, backup_stacks=[]):
-    """
-    (DEPRECATED - use :class:`IndentedBlock` class instead)
-    Helper method for defining space-delimited indentation blocks,
-    such as those used to define block statements in Python source code.
-
-    Parameters:
-
-    - ``blockStatementExpr`` - expression defining syntax of statement that
-      is repeated within the indented block
-    - ``indentStack`` - list created by caller to manage indentation stack
-      (multiple ``statementWithIndentedBlock`` expressions within a single
-      grammar should share a common ``indentStack``)
-    - ``indent`` - boolean indicating whether block must be indented beyond
-      the current level; set to ``False`` for block of left-most statements
-      (default= ``True``)
-
-    A valid block must contain at least one ``blockStatement``.
-
-    (Note that indentedBlock uses internal parse actions which make it
-    incompatible with packrat parsing.)
-
-    Example::
-
-        data = '''
-        def A(z):
-          A1
-          B = 100
-          G = A2
-          A2
-          A3
-        B
-        def BB(a,b,c):
-          BB1
-          def BBA():
-            bba1
-            bba2
-            bba3
-        C
-        D
-        def spam(x,y):
-             def eggs(z):
-                 pass
-        '''
-
-
-        indentStack = [1]
-        stmt = Forward()
-
-        identifier = Word(alphas, alphanums)
-        funcDecl = ("def" + identifier + Group("(" + Opt(delimitedList(identifier)) + ")") + ":")
-        func_body = indentedBlock(stmt, indentStack)
-        funcDef = Group(funcDecl + func_body)
-
-        rvalue = Forward()
-        funcCall = Group(identifier + "(" + Opt(delimitedList(rvalue)) + ")")
-        rvalue << (funcCall | identifier | Word(nums))
-        assignment = Group(identifier + "=" + rvalue)
-        stmt << (funcDef | assignment | identifier)
-
-        module_body = stmt[1, ...]
-
-        parseTree = module_body.parseString(data)
-        parseTree.pprint()
-
-    prints::
-
-        [['def',
-          'A',
-          ['(', 'z', ')'],
-          ':',
-          [['A1'], [['B', '=', '100']], [['G', '=', 'A2']], ['A2'], ['A3']]],
-         'B',
-         ['def',
-          'BB',
-          ['(', 'a', 'b', 'c', ')'],
-          ':',
-          [['BB1'], [['def', 'BBA', ['(', ')'], ':', [['bba1'], ['bba2'], ['bba3']]]]]],
-         'C',
-         'D',
-         ['def',
-          'spam',
-          ['(', 'x', 'y', ')'],
-          ':',
-          [[['def', 'eggs', ['(', 'z', ')'], ':', [['pass']]]]]]]
-    """
-    backup_stacks.append(indentStack[:])
-
-    def reset_stack():
-        indentStack[:] = backup_stacks[-1]
-
-    def checkPeerIndent(s, l, t):
-        if l >= len(s):
-            return
-        curCol = col(l, s)
-        if curCol != indentStack[-1]:
-            if curCol > indentStack[-1]:
-                raise ParseException(s, l, "illegal nesting")
-            raise ParseException(s, l, "not a peer entry")
-
-    def checkSubIndent(s, l, t):
-        curCol = col(l, s)
-        if curCol > indentStack[-1]:
-            indentStack.append(curCol)
-        else:
-            raise ParseException(s, l, "not a subentry")
-
-    def checkUnindent(s, l, t):
-        if l >= len(s):
-            return
-        curCol = col(l, s)
-        if not (indentStack and curCol in indentStack):
-            raise ParseException(s, l, "not an unindent")
-        if curCol < indentStack[-1]:
-            indentStack.pop()
-
-    NL = OneOrMore(LineEnd().set_whitespace_chars("\t ").suppress())
-    INDENT = (Empty() + Empty().set_parse_action(checkSubIndent)).set_name("INDENT")
-    PEER = Empty().set_parse_action(checkPeerIndent).set_name("")
-    UNDENT = Empty().set_parse_action(checkUnindent).set_name("UNINDENT")
-    if indent:
-        smExpr = Group(
-            Opt(NL)
-            + INDENT
-            + OneOrMore(PEER + Group(blockStatementExpr) + Opt(NL))
-            + UNDENT
-        )
-    else:
-        smExpr = Group(
-            Opt(NL)
-            + OneOrMore(PEER + Group(blockStatementExpr) + Opt(NL))
-            + Opt(UNDENT)
-        )
-
-    # add a parse action to remove backup_stack from list of backups
-    smExpr.add_parse_action(
-        lambda: backup_stacks.pop(-1) and None if backup_stacks else None
-    )
-    smExpr.set_fail_action(lambda a, b, c, d: reset_stack())
-    blockStatementExpr.ignore(_bslash + LineEnd())
-    return smExpr.set_name("indented block")
-
-
-# it's easy to get these comment structures wrong - they're very common, so may as well make them available
-c_style_comment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + "*/").set_name(
-    "C style comment"
-)
-"Comment of the form ``/* ... */``"
-
-html_comment = Regex(r"").set_name("HTML comment")
-"Comment of the form ````"
-
-rest_of_line = Regex(r".*").leave_whitespace().set_name("rest of line")
-dbl_slash_comment = Regex(r"//(?:\\\n|[^\n])*").set_name("// comment")
-"Comment of the form ``// ... (to end of line)``"
-
-cpp_style_comment = Combine(
-    Regex(r"/\*(?:[^*]|\*(?!/))*") + "*/" | dbl_slash_comment
-).set_name("C++ style comment")
-"Comment of either form :class:`c_style_comment` or :class:`dbl_slash_comment`"
-
-java_style_comment = cpp_style_comment
-"Same as :class:`cpp_style_comment`"
-
-python_style_comment = Regex(r"#.*").set_name("Python style comment")
-"Comment of the form ``# ... (to end of line)``"
-
-
-# build list of built-in expressions, for future reference if a global default value
-# gets updated
-_builtin_exprs: List[ParserElement] = [
-    v for v in vars().values() if isinstance(v, ParserElement)
-]
-
-
-# compatibility function, superseded by DelimitedList class
-def delimited_list(
-    expr: Union[str, ParserElement],
-    delim: Union[str, ParserElement] = ",",
-    combine: bool = False,
-    min: typing.Optional[int] = None,
-    max: typing.Optional[int] = None,
-    *,
-    allow_trailing_delim: bool = False,
-) -> ParserElement:
-    """(DEPRECATED - use :class:`DelimitedList` class)"""
-    return DelimitedList(
-        expr, delim, combine, min, max, allow_trailing_delim=allow_trailing_delim
-    )
-
-
-# pre-PEP8 compatible names
-# fmt: off
-opAssoc = OpAssoc
-anyOpenTag = any_open_tag
-anyCloseTag = any_close_tag
-commonHTMLEntity = common_html_entity
-cStyleComment = c_style_comment
-htmlComment = html_comment
-restOfLine = rest_of_line
-dblSlashComment = dbl_slash_comment
-cppStyleComment = cpp_style_comment
-javaStyleComment = java_style_comment
-pythonStyleComment = python_style_comment
-delimitedList = replaced_by_pep8("delimitedList", DelimitedList)
-delimited_list = replaced_by_pep8("delimited_list", DelimitedList)
-countedArray = replaced_by_pep8("countedArray", counted_array)
-matchPreviousLiteral = replaced_by_pep8("matchPreviousLiteral", match_previous_literal)
-matchPreviousExpr = replaced_by_pep8("matchPreviousExpr", match_previous_expr)
-oneOf = replaced_by_pep8("oneOf", one_of)
-dictOf = replaced_by_pep8("dictOf", dict_of)
-originalTextFor = replaced_by_pep8("originalTextFor", original_text_for)
-nestedExpr = replaced_by_pep8("nestedExpr", nested_expr)
-makeHTMLTags = replaced_by_pep8("makeHTMLTags", make_html_tags)
-makeXMLTags = replaced_by_pep8("makeXMLTags", make_xml_tags)
-replaceHTMLEntity = replaced_by_pep8("replaceHTMLEntity", replace_html_entity)
-infixNotation = replaced_by_pep8("infixNotation", infix_notation)
-# fmt: on
diff --git a/src/pip/_vendor/pyparsing/py.typed b/src/pip/_vendor/pyparsing/py.typed
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/pip/_vendor/pyparsing/results.py b/src/pip/_vendor/pyparsing/results.py
deleted file mode 100644
index 3e5fe2089bd..00000000000
--- a/src/pip/_vendor/pyparsing/results.py
+++ /dev/null
@@ -1,797 +0,0 @@
-# results.py
-from collections.abc import (
-    MutableMapping,
-    Mapping,
-    MutableSequence,
-    Iterator,
-    Sequence,
-    Container,
-)
-import pprint
-from typing import Tuple, Any, Dict, Set, List
-
-str_type: Tuple[type, ...] = (str, bytes)
-_generator_type = type((_ for _ in ()))
-
-
-class _ParseResultsWithOffset:
-    tup: Tuple["ParseResults", int]
-    __slots__ = ["tup"]
-
-    def __init__(self, p1: "ParseResults", p2: int):
-        self.tup: Tuple[ParseResults, int] = (p1, p2)
-
-    def __getitem__(self, i):
-        return self.tup[i]
-
-    def __getstate__(self):
-        return self.tup
-
-    def __setstate__(self, *args):
-        self.tup = args[0]
-
-
-class ParseResults:
-    """Structured parse results, to provide multiple means of access to
-    the parsed data:
-
-    - as a list (``len(results)``)
-    - by list index (``results[0], results[1]``, etc.)
-    - by attribute (``results.`` - see :class:`ParserElement.set_results_name`)
-
-    Example::
-
-        integer = Word(nums)
-        date_str = (integer.set_results_name("year") + '/'
-                    + integer.set_results_name("month") + '/'
-                    + integer.set_results_name("day"))
-        # equivalent form:
-        # date_str = (integer("year") + '/'
-        #             + integer("month") + '/'
-        #             + integer("day"))
-
-        # parse_string returns a ParseResults object
-        result = date_str.parse_string("1999/12/31")
-
-        def test(s, fn=repr):
-            print(f"{s} -> {fn(eval(s))}")
-        test("list(result)")
-        test("result[0]")
-        test("result['month']")
-        test("result.day")
-        test("'month' in result")
-        test("'minutes' in result")
-        test("result.dump()", str)
-
-    prints::
-
-        list(result) -> ['1999', '/', '12', '/', '31']
-        result[0] -> '1999'
-        result['month'] -> '12'
-        result.day -> '31'
-        'month' in result -> True
-        'minutes' in result -> False
-        result.dump() -> ['1999', '/', '12', '/', '31']
-        - day: '31'
-        - month: '12'
-        - year: '1999'
-    """
-
-    _null_values: Tuple[Any, ...] = (None, [], ())
-
-    _name: str
-    _parent: "ParseResults"
-    _all_names: Set[str]
-    _modal: bool
-    _toklist: List[Any]
-    _tokdict: Dict[str, Any]
-
-    __slots__ = (
-        "_name",
-        "_parent",
-        "_all_names",
-        "_modal",
-        "_toklist",
-        "_tokdict",
-    )
-
-    class List(list):
-        """
-        Simple wrapper class to distinguish parsed list results that should be preserved
-        as actual Python lists, instead of being converted to :class:`ParseResults`::
-
-            LBRACK, RBRACK = map(pp.Suppress, "[]")
-            element = pp.Forward()
-            item = ppc.integer
-            element_list = LBRACK + pp.DelimitedList(element) + RBRACK
-
-            # add parse actions to convert from ParseResults to actual Python collection types
-            def as_python_list(t):
-                return pp.ParseResults.List(t.as_list())
-            element_list.add_parse_action(as_python_list)
-
-            element <<= item | element_list
-
-            element.run_tests('''
-                100
-                [2,3,4]
-                [[2, 1],3,4]
-                [(2, 1),3,4]
-                (2,3,4)
-                ''', post_parse=lambda s, r: (r[0], type(r[0])))
-
-        prints::
-
-            100
-            (100, )
-
-            [2,3,4]
-            ([2, 3, 4], )
-
-            [[2, 1],3,4]
-            ([[2, 1], 3, 4], )
-
-        (Used internally by :class:`Group` when `aslist=True`.)
-        """
-
-        def __new__(cls, contained=None):
-            if contained is None:
-                contained = []
-
-            if not isinstance(contained, list):
-                raise TypeError(
-                    f"{cls.__name__} may only be constructed with a list, not {type(contained).__name__}"
-                )
-
-            return list.__new__(cls)
-
-    def __new__(cls, toklist=None, name=None, **kwargs):
-        if isinstance(toklist, ParseResults):
-            return toklist
-        self = object.__new__(cls)
-        self._name = None
-        self._parent = None
-        self._all_names = set()
-
-        if toklist is None:
-            self._toklist = []
-        elif isinstance(toklist, (list, _generator_type)):
-            self._toklist = (
-                [toklist[:]]
-                if isinstance(toklist, ParseResults.List)
-                else list(toklist)
-            )
-        else:
-            self._toklist = [toklist]
-        self._tokdict = dict()
-        return self
-
-    # Performance tuning: we construct a *lot* of these, so keep this
-    # constructor as small and fast as possible
-    def __init__(
-        self, toklist=None, name=None, asList=True, modal=True, isinstance=isinstance
-    ):
-        self._tokdict: Dict[str, _ParseResultsWithOffset]
-        self._modal = modal
-
-        if name is None or name == "":
-            return
-
-        if isinstance(name, int):
-            name = str(name)
-
-        if not modal:
-            self._all_names = {name}
-
-        self._name = name
-
-        if toklist in self._null_values:
-            return
-
-        if isinstance(toklist, (str_type, type)):
-            toklist = [toklist]
-
-        if asList:
-            if isinstance(toklist, ParseResults):
-                self[name] = _ParseResultsWithOffset(ParseResults(toklist._toklist), 0)
-            else:
-                self[name] = _ParseResultsWithOffset(ParseResults(toklist[0]), 0)
-            self[name]._name = name
-            return
-
-        try:
-            self[name] = toklist[0]
-        except (KeyError, TypeError, IndexError):
-            if toklist is not self:
-                self[name] = toklist
-            else:
-                self._name = name
-
-    def __getitem__(self, i):
-        if isinstance(i, (int, slice)):
-            return self._toklist[i]
-
-        if i not in self._all_names:
-            return self._tokdict[i][-1][0]
-
-        return ParseResults([v[0] for v in self._tokdict[i]])
-
-    def __setitem__(self, k, v, isinstance=isinstance):
-        if isinstance(v, _ParseResultsWithOffset):
-            self._tokdict[k] = self._tokdict.get(k, list()) + [v]
-            sub = v[0]
-        elif isinstance(k, (int, slice)):
-            self._toklist[k] = v
-            sub = v
-        else:
-            self._tokdict[k] = self._tokdict.get(k, list()) + [
-                _ParseResultsWithOffset(v, 0)
-            ]
-            sub = v
-        if isinstance(sub, ParseResults):
-            sub._parent = self
-
-    def __delitem__(self, i):
-        if not isinstance(i, (int, slice)):
-            del self._tokdict[i]
-            return
-
-        mylen = len(self._toklist)
-        del self._toklist[i]
-
-        # convert int to slice
-        if isinstance(i, int):
-            if i < 0:
-                i += mylen
-            i = slice(i, i + 1)
-        # get removed indices
-        removed = list(range(*i.indices(mylen)))
-        removed.reverse()
-        # fixup indices in token dictionary
-        for occurrences in self._tokdict.values():
-            for j in removed:
-                for k, (value, position) in enumerate(occurrences):
-                    occurrences[k] = _ParseResultsWithOffset(
-                        value, position - (position > j)
-                    )
-
-    def __contains__(self, k) -> bool:
-        return k in self._tokdict
-
-    def __len__(self) -> int:
-        return len(self._toklist)
-
-    def __bool__(self) -> bool:
-        return not not (self._toklist or self._tokdict)
-
-    def __iter__(self) -> Iterator:
-        return iter(self._toklist)
-
-    def __reversed__(self) -> Iterator:
-        return iter(self._toklist[::-1])
-
-    def keys(self):
-        return iter(self._tokdict)
-
-    def values(self):
-        return (self[k] for k in self.keys())
-
-    def items(self):
-        return ((k, self[k]) for k in self.keys())
-
-    def haskeys(self) -> bool:
-        """
-        Since ``keys()`` returns an iterator, this method is helpful in bypassing
-        code that looks for the existence of any defined results names."""
-        return not not self._tokdict
-
-    def pop(self, *args, **kwargs):
-        """
-        Removes and returns item at specified index (default= ``last``).
-        Supports both ``list`` and ``dict`` semantics for ``pop()``. If
-        passed no argument or an integer argument, it will use ``list``
-        semantics and pop tokens from the list of parsed tokens. If passed
-        a non-integer argument (most likely a string), it will use ``dict``
-        semantics and pop the corresponding value from any defined results
-        names. A second default return value argument is supported, just as in
-        ``dict.pop()``.
-
-        Example::
-
-            numlist = Word(nums)[...]
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321']
-
-            def remove_first(tokens):
-                tokens.pop(0)
-            numlist.add_parse_action(remove_first)
-            print(numlist.parse_string("0 123 321")) # -> ['123', '321']
-
-            label = Word(alphas)
-            patt = label("LABEL") + Word(nums)[1, ...]
-            print(patt.parse_string("AAB 123 321").dump())
-
-            # Use pop() in a parse action to remove named result (note that corresponding value is not
-            # removed from list form of results)
-            def remove_LABEL(tokens):
-                tokens.pop("LABEL")
-                return tokens
-            patt.add_parse_action(remove_LABEL)
-            print(patt.parse_string("AAB 123 321").dump())
-
-        prints::
-
-            ['AAB', '123', '321']
-            - LABEL: 'AAB'
-
-            ['AAB', '123', '321']
-        """
-        if not args:
-            args = [-1]
-        for k, v in kwargs.items():
-            if k == "default":
-                args = (args[0], v)
-            else:
-                raise TypeError(f"pop() got an unexpected keyword argument {k!r}")
-        if isinstance(args[0], int) or len(args) == 1 or args[0] in self:
-            index = args[0]
-            ret = self[index]
-            del self[index]
-            return ret
-        else:
-            defaultvalue = args[1]
-            return defaultvalue
-
-    def get(self, key, default_value=None):
-        """
-        Returns named result matching the given key, or if there is no
-        such name, then returns the given ``default_value`` or ``None`` if no
-        ``default_value`` is specified.
-
-        Similar to ``dict.get()``.
-
-        Example::
-
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            result = date_str.parse_string("1999/12/31")
-            print(result.get("year")) # -> '1999'
-            print(result.get("hour", "not specified")) # -> 'not specified'
-            print(result.get("hour")) # -> None
-        """
-        if key in self:
-            return self[key]
-        else:
-            return default_value
-
-    def insert(self, index, ins_string):
-        """
-        Inserts new element at location index in the list of parsed tokens.
-
-        Similar to ``list.insert()``.
-
-        Example::
-
-            numlist = Word(nums)[...]
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321']
-
-            # use a parse action to insert the parse location in the front of the parsed results
-            def insert_locn(locn, tokens):
-                tokens.insert(0, locn)
-            numlist.add_parse_action(insert_locn)
-            print(numlist.parse_string("0 123 321")) # -> [0, '0', '123', '321']
-        """
-        self._toklist.insert(index, ins_string)
-        # fixup indices in token dictionary
-        for occurrences in self._tokdict.values():
-            for k, (value, position) in enumerate(occurrences):
-                occurrences[k] = _ParseResultsWithOffset(
-                    value, position + (position > index)
-                )
-
-    def append(self, item):
-        """
-        Add single element to end of ``ParseResults`` list of elements.
-
-        Example::
-
-            numlist = Word(nums)[...]
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321']
-
-            # use a parse action to compute the sum of the parsed integers, and add it to the end
-            def append_sum(tokens):
-                tokens.append(sum(map(int, tokens)))
-            numlist.add_parse_action(append_sum)
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321', 444]
-        """
-        self._toklist.append(item)
-
-    def extend(self, itemseq):
-        """
-        Add sequence of elements to end of ``ParseResults`` list of elements.
-
-        Example::
-
-            patt = Word(alphas)[1, ...]
-
-            # use a parse action to append the reverse of the matched strings, to make a palindrome
-            def make_palindrome(tokens):
-                tokens.extend(reversed([t[::-1] for t in tokens]))
-                return ''.join(tokens)
-            patt.add_parse_action(make_palindrome)
-            print(patt.parse_string("lskdj sdlkjf lksd")) # -> 'lskdjsdlkjflksddsklfjkldsjdksl'
-        """
-        if isinstance(itemseq, ParseResults):
-            self.__iadd__(itemseq)
-        else:
-            self._toklist.extend(itemseq)
-
-    def clear(self):
-        """
-        Clear all elements and results names.
-        """
-        del self._toklist[:]
-        self._tokdict.clear()
-
-    def __getattr__(self, name):
-        try:
-            return self[name]
-        except KeyError:
-            if name.startswith("__"):
-                raise AttributeError(name)
-            return ""
-
-    def __add__(self, other: "ParseResults") -> "ParseResults":
-        ret = self.copy()
-        ret += other
-        return ret
-
-    def __iadd__(self, other: "ParseResults") -> "ParseResults":
-        if not other:
-            return self
-
-        if other._tokdict:
-            offset = len(self._toklist)
-            addoffset = lambda a: offset if a < 0 else a + offset
-            otheritems = other._tokdict.items()
-            otherdictitems = [
-                (k, _ParseResultsWithOffset(v[0], addoffset(v[1])))
-                for k, vlist in otheritems
-                for v in vlist
-            ]
-            for k, v in otherdictitems:
-                self[k] = v
-                if isinstance(v[0], ParseResults):
-                    v[0]._parent = self
-
-        self._toklist += other._toklist
-        self._all_names |= other._all_names
-        return self
-
-    def __radd__(self, other) -> "ParseResults":
-        if isinstance(other, int) and other == 0:
-            # useful for merging many ParseResults using sum() builtin
-            return self.copy()
-        else:
-            # this may raise a TypeError - so be it
-            return other + self
-
-    def __repr__(self) -> str:
-        return f"{type(self).__name__}({self._toklist!r}, {self.as_dict()})"
-
-    def __str__(self) -> str:
-        return (
-            "["
-            + ", ".join(
-                [
-                    str(i) if isinstance(i, ParseResults) else repr(i)
-                    for i in self._toklist
-                ]
-            )
-            + "]"
-        )
-
-    def _asStringList(self, sep=""):
-        out = []
-        for item in self._toklist:
-            if out and sep:
-                out.append(sep)
-            if isinstance(item, ParseResults):
-                out += item._asStringList()
-            else:
-                out.append(str(item))
-        return out
-
-    def as_list(self) -> list:
-        """
-        Returns the parse results as a nested list of matching tokens, all converted to strings.
-
-        Example::
-
-            patt = Word(alphas)[1, ...]
-            result = patt.parse_string("sldkj lsdkj sldkj")
-            # even though the result prints in string-like form, it is actually a pyparsing ParseResults
-            print(type(result), result) # ->  ['sldkj', 'lsdkj', 'sldkj']
-
-            # Use as_list() to create an actual list
-            result_list = result.as_list()
-            print(type(result_list), result_list) # ->  ['sldkj', 'lsdkj', 'sldkj']
-        """
-        return [
-            res.as_list() if isinstance(res, ParseResults) else res
-            for res in self._toklist
-        ]
-
-    def as_dict(self) -> dict:
-        """
-        Returns the named parse results as a nested dictionary.
-
-        Example::
-
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            result = date_str.parse_string('12/31/1999')
-            print(type(result), repr(result)) # ->  (['12', '/', '31', '/', '1999'], {'day': [('1999', 4)], 'year': [('12', 0)], 'month': [('31', 2)]})
-
-            result_dict = result.as_dict()
-            print(type(result_dict), repr(result_dict)) # ->  {'day': '1999', 'year': '12', 'month': '31'}
-
-            # even though a ParseResults supports dict-like access, sometime you just need to have a dict
-            import json
-            print(json.dumps(result)) # -> Exception: TypeError: ... is not JSON serializable
-            print(json.dumps(result.as_dict())) # -> {"month": "31", "day": "1999", "year": "12"}
-        """
-
-        def to_item(obj):
-            if isinstance(obj, ParseResults):
-                return obj.as_dict() if obj.haskeys() else [to_item(v) for v in obj]
-            else:
-                return obj
-
-        return dict((k, to_item(v)) for k, v in self.items())
-
-    def copy(self) -> "ParseResults":
-        """
-        Returns a new shallow copy of a :class:`ParseResults` object. `ParseResults`
-        items contained within the source are shared with the copy. Use
-        :class:`ParseResults.deepcopy()` to create a copy with its own separate
-        content values.
-        """
-        ret = ParseResults(self._toklist)
-        ret._tokdict = self._tokdict.copy()
-        ret._parent = self._parent
-        ret._all_names |= self._all_names
-        ret._name = self._name
-        return ret
-
-    def deepcopy(self) -> "ParseResults":
-        """
-        Returns a new deep copy of a :class:`ParseResults` object.
-        """
-        ret = self.copy()
-        # replace values with copies if they are of known mutable types
-        for i, obj in enumerate(self._toklist):
-            if isinstance(obj, ParseResults):
-                self._toklist[i] = obj.deepcopy()
-            elif isinstance(obj, (str, bytes)):
-                pass
-            elif isinstance(obj, MutableMapping):
-                self._toklist[i] = dest = type(obj)()
-                for k, v in obj.items():
-                    dest[k] = v.deepcopy() if isinstance(v, ParseResults) else v
-            elif isinstance(obj, Container):
-                self._toklist[i] = type(obj)(
-                    v.deepcopy() if isinstance(v, ParseResults) else v for v in obj
-                )
-        return ret
-
-    def get_name(self):
-        r"""
-        Returns the results name for this token expression. Useful when several
-        different expressions might match at a particular location.
-
-        Example::
-
-            integer = Word(nums)
-            ssn_expr = Regex(r"\d\d\d-\d\d-\d\d\d\d")
-            house_number_expr = Suppress('#') + Word(nums, alphanums)
-            user_data = (Group(house_number_expr)("house_number")
-                        | Group(ssn_expr)("ssn")
-                        | Group(integer)("age"))
-            user_info = user_data[1, ...]
-
-            result = user_info.parse_string("22 111-22-3333 #221B")
-            for item in result:
-                print(item.get_name(), ':', item[0])
-
-        prints::
-
-            age : 22
-            ssn : 111-22-3333
-            house_number : 221B
-        """
-        if self._name:
-            return self._name
-        elif self._parent:
-            par: "ParseResults" = self._parent
-            parent_tokdict_items = par._tokdict.items()
-            return next(
-                (
-                    k
-                    for k, vlist in parent_tokdict_items
-                    for v, loc in vlist
-                    if v is self
-                ),
-                None,
-            )
-        elif (
-            len(self) == 1
-            and len(self._tokdict) == 1
-            and next(iter(self._tokdict.values()))[0][1] in (0, -1)
-        ):
-            return next(iter(self._tokdict.keys()))
-        else:
-            return None
-
-    def dump(self, indent="", full=True, include_list=True, _depth=0) -> str:
-        """
-        Diagnostic method for listing out the contents of
-        a :class:`ParseResults`. Accepts an optional ``indent`` argument so
-        that this string can be embedded in a nested display of other data.
-
-        Example::
-
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            result = date_str.parse_string('1999/12/31')
-            print(result.dump())
-
-        prints::
-
-            ['1999', '/', '12', '/', '31']
-            - day: '31'
-            - month: '12'
-            - year: '1999'
-        """
-        out = []
-        NL = "\n"
-        out.append(indent + str(self.as_list()) if include_list else "")
-
-        if not full:
-            return "".join(out)
-
-        if self.haskeys():
-            items = sorted((str(k), v) for k, v in self.items())
-            for k, v in items:
-                if out:
-                    out.append(NL)
-                out.append(f"{indent}{('  ' * _depth)}- {k}: ")
-                if not isinstance(v, ParseResults):
-                    out.append(repr(v))
-                    continue
-
-                if not v:
-                    out.append(str(v))
-                    continue
-
-                out.append(
-                    v.dump(
-                        indent=indent,
-                        full=full,
-                        include_list=include_list,
-                        _depth=_depth + 1,
-                    )
-                )
-        if not any(isinstance(vv, ParseResults) for vv in self):
-            return "".join(out)
-
-        v = self
-        incr = "  "
-        nl = "\n"
-        for i, vv in enumerate(v):
-            if isinstance(vv, ParseResults):
-                vv_dump = vv.dump(
-                    indent=indent,
-                    full=full,
-                    include_list=include_list,
-                    _depth=_depth + 1,
-                )
-                out.append(
-                    f"{nl}{indent}{incr * _depth}[{i}]:{nl}{indent}{incr * (_depth + 1)}{vv_dump}"
-                )
-            else:
-                out.append(
-                    f"{nl}{indent}{incr * _depth}[{i}]:{nl}{indent}{incr * (_depth + 1)}{vv}"
-                )
-
-        return "".join(out)
-
-    def pprint(self, *args, **kwargs):
-        """
-        Pretty-printer for parsed results as a list, using the
-        `pprint `_ module.
-        Accepts additional positional or keyword args as defined for
-        `pprint.pprint `_ .
-
-        Example::
-
-            ident = Word(alphas, alphanums)
-            num = Word(nums)
-            func = Forward()
-            term = ident | num | Group('(' + func + ')')
-            func <<= ident + Group(Optional(DelimitedList(term)))
-            result = func.parse_string("fna a,b,(fnb c,d,200),100")
-            result.pprint(width=40)
-
-        prints::
-
-            ['fna',
-             ['a',
-              'b',
-              ['(', 'fnb', ['c', 'd', '200'], ')'],
-              '100']]
-        """
-        pprint.pprint(self.as_list(), *args, **kwargs)
-
-    # add support for pickle protocol
-    def __getstate__(self):
-        return (
-            self._toklist,
-            (
-                self._tokdict.copy(),
-                None,
-                self._all_names,
-                self._name,
-            ),
-        )
-
-    def __setstate__(self, state):
-        self._toklist, (self._tokdict, par, inAccumNames, self._name) = state
-        self._all_names = set(inAccumNames)
-        self._parent = None
-
-    def __getnewargs__(self):
-        return self._toklist, self._name
-
-    def __dir__(self):
-        return dir(type(self)) + list(self.keys())
-
-    @classmethod
-    def from_dict(cls, other, name=None) -> "ParseResults":
-        """
-        Helper classmethod to construct a ``ParseResults`` from a ``dict``, preserving the
-        name-value relations as results names. If an optional ``name`` argument is
-        given, a nested ``ParseResults`` will be returned.
-        """
-
-        def is_iterable(obj):
-            try:
-                iter(obj)
-            except Exception:
-                return False
-            # str's are iterable, but in pyparsing, we don't want to iterate over them
-            else:
-                return not isinstance(obj, str_type)
-
-        ret = cls([])
-        for k, v in other.items():
-            if isinstance(v, Mapping):
-                ret += cls.from_dict(v, name=k)
-            else:
-                ret += cls([v], name=k, asList=is_iterable(v))
-        if name is not None:
-            ret = cls([ret], name=name)
-        return ret
-
-    asList = as_list
-    """Deprecated - use :class:`as_list`"""
-    asDict = as_dict
-    """Deprecated - use :class:`as_dict`"""
-    getName = get_name
-    """Deprecated - use :class:`get_name`"""
-
-
-MutableMapping.register(ParseResults)
-MutableSequence.register(ParseResults)
diff --git a/src/pip/_vendor/pyparsing/testing.py b/src/pip/_vendor/pyparsing/testing.py
deleted file mode 100644
index 5654d47d62d..00000000000
--- a/src/pip/_vendor/pyparsing/testing.py
+++ /dev/null
@@ -1,345 +0,0 @@
-# testing.py
-
-from contextlib import contextmanager
-import re
-import typing
-
-
-from .core import (
-    ParserElement,
-    ParseException,
-    Keyword,
-    __diag__,
-    __compat__,
-)
-
-
-class pyparsing_test:
-    """
-    namespace class for classes useful in writing unit tests
-    """
-
-    class reset_pyparsing_context:
-        """
-        Context manager to be used when writing unit tests that modify pyparsing config values:
-        - packrat parsing
-        - bounded recursion parsing
-        - default whitespace characters.
-        - default keyword characters
-        - literal string auto-conversion class
-        - __diag__ settings
-
-        Example::
-
-            with reset_pyparsing_context():
-                # test that literals used to construct a grammar are automatically suppressed
-                ParserElement.inlineLiteralsUsing(Suppress)
-
-                term = Word(alphas) | Word(nums)
-                group = Group('(' + term[...] + ')')
-
-                # assert that the '()' characters are not included in the parsed tokens
-                self.assertParseAndCheckList(group, "(abc 123 def)", ['abc', '123', 'def'])
-
-            # after exiting context manager, literals are converted to Literal expressions again
-        """
-
-        def __init__(self):
-            self._save_context = {}
-
-        def save(self):
-            self._save_context["default_whitespace"] = ParserElement.DEFAULT_WHITE_CHARS
-            self._save_context["default_keyword_chars"] = Keyword.DEFAULT_KEYWORD_CHARS
-
-            self._save_context["literal_string_class"] = (
-                ParserElement._literalStringClass
-            )
-
-            self._save_context["verbose_stacktrace"] = ParserElement.verbose_stacktrace
-
-            self._save_context["packrat_enabled"] = ParserElement._packratEnabled
-            if ParserElement._packratEnabled:
-                self._save_context["packrat_cache_size"] = (
-                    ParserElement.packrat_cache.size
-                )
-            else:
-                self._save_context["packrat_cache_size"] = None
-            self._save_context["packrat_parse"] = ParserElement._parse
-            self._save_context["recursion_enabled"] = (
-                ParserElement._left_recursion_enabled
-            )
-
-            self._save_context["__diag__"] = {
-                name: getattr(__diag__, name) for name in __diag__._all_names
-            }
-
-            self._save_context["__compat__"] = {
-                "collect_all_And_tokens": __compat__.collect_all_And_tokens
-            }
-
-            return self
-
-        def restore(self):
-            # reset pyparsing global state
-            if (
-                ParserElement.DEFAULT_WHITE_CHARS
-                != self._save_context["default_whitespace"]
-            ):
-                ParserElement.set_default_whitespace_chars(
-                    self._save_context["default_whitespace"]
-                )
-
-            ParserElement.verbose_stacktrace = self._save_context["verbose_stacktrace"]
-
-            Keyword.DEFAULT_KEYWORD_CHARS = self._save_context["default_keyword_chars"]
-            ParserElement.inlineLiteralsUsing(
-                self._save_context["literal_string_class"]
-            )
-
-            for name, value in self._save_context["__diag__"].items():
-                (__diag__.enable if value else __diag__.disable)(name)
-
-            ParserElement._packratEnabled = False
-            if self._save_context["packrat_enabled"]:
-                ParserElement.enable_packrat(self._save_context["packrat_cache_size"])
-            else:
-                ParserElement._parse = self._save_context["packrat_parse"]
-            ParserElement._left_recursion_enabled = self._save_context[
-                "recursion_enabled"
-            ]
-
-            __compat__.collect_all_And_tokens = self._save_context["__compat__"]
-
-            return self
-
-        def copy(self):
-            ret = type(self)()
-            ret._save_context.update(self._save_context)
-            return ret
-
-        def __enter__(self):
-            return self.save()
-
-        def __exit__(self, *args):
-            self.restore()
-
-    class TestParseResultsAsserts:
-        """
-        A mixin class to add parse results assertion methods to normal unittest.TestCase classes.
-        """
-
-        def assertParseResultsEquals(
-            self, result, expected_list=None, expected_dict=None, msg=None
-        ):
-            """
-            Unit test assertion to compare a :class:`ParseResults` object with an optional ``expected_list``,
-            and compare any defined results names with an optional ``expected_dict``.
-            """
-            if expected_list is not None:
-                self.assertEqual(expected_list, result.as_list(), msg=msg)
-            if expected_dict is not None:
-                self.assertEqual(expected_dict, result.as_dict(), msg=msg)
-
-        def assertParseAndCheckList(
-            self, expr, test_string, expected_list, msg=None, verbose=True
-        ):
-            """
-            Convenience wrapper assert to test a parser element and input string, and assert that
-            the resulting ``ParseResults.asList()`` is equal to the ``expected_list``.
-            """
-            result = expr.parse_string(test_string, parse_all=True)
-            if verbose:
-                print(result.dump())
-            else:
-                print(result.as_list())
-            self.assertParseResultsEquals(result, expected_list=expected_list, msg=msg)
-
-        def assertParseAndCheckDict(
-            self, expr, test_string, expected_dict, msg=None, verbose=True
-        ):
-            """
-            Convenience wrapper assert to test a parser element and input string, and assert that
-            the resulting ``ParseResults.asDict()`` is equal to the ``expected_dict``.
-            """
-            result = expr.parse_string(test_string, parseAll=True)
-            if verbose:
-                print(result.dump())
-            else:
-                print(result.as_list())
-            self.assertParseResultsEquals(result, expected_dict=expected_dict, msg=msg)
-
-        def assertRunTestResults(
-            self, run_tests_report, expected_parse_results=None, msg=None
-        ):
-            """
-            Unit test assertion to evaluate output of ``ParserElement.runTests()``. If a list of
-            list-dict tuples is given as the ``expected_parse_results`` argument, then these are zipped
-            with the report tuples returned by ``runTests`` and evaluated using ``assertParseResultsEquals``.
-            Finally, asserts that the overall ``runTests()`` success value is ``True``.
-
-            :param run_tests_report: tuple(bool, [tuple(str, ParseResults or Exception)]) returned from runTests
-            :param expected_parse_results (optional): [tuple(str, list, dict, Exception)]
-            """
-            run_test_success, run_test_results = run_tests_report
-
-            if expected_parse_results is None:
-                self.assertTrue(
-                    run_test_success, msg=msg if msg is not None else "failed runTests"
-                )
-                return
-
-            merged = [
-                (*rpt, expected)
-                for rpt, expected in zip(run_test_results, expected_parse_results)
-            ]
-            for test_string, result, expected in merged:
-                # expected should be a tuple containing a list and/or a dict or an exception,
-                # and optional failure message string
-                # an empty tuple will skip any result validation
-                fail_msg = next((exp for exp in expected if isinstance(exp, str)), None)
-                expected_exception = next(
-                    (
-                        exp
-                        for exp in expected
-                        if isinstance(exp, type) and issubclass(exp, Exception)
-                    ),
-                    None,
-                )
-                if expected_exception is not None:
-                    with self.assertRaises(
-                        expected_exception=expected_exception, msg=fail_msg or msg
-                    ):
-                        if isinstance(result, Exception):
-                            raise result
-                else:
-                    expected_list = next(
-                        (exp for exp in expected if isinstance(exp, list)), None
-                    )
-                    expected_dict = next(
-                        (exp for exp in expected if isinstance(exp, dict)), None
-                    )
-                    if (expected_list, expected_dict) != (None, None):
-                        self.assertParseResultsEquals(
-                            result,
-                            expected_list=expected_list,
-                            expected_dict=expected_dict,
-                            msg=fail_msg or msg,
-                        )
-                    else:
-                        # warning here maybe?
-                        print(f"no validation for {test_string!r}")
-
-            # do this last, in case some specific test results can be reported instead
-            self.assertTrue(
-                run_test_success, msg=msg if msg is not None else "failed runTests"
-            )
-
-        @contextmanager
-        def assertRaisesParseException(
-            self, exc_type=ParseException, expected_msg=None, msg=None
-        ):
-            if expected_msg is not None:
-                if isinstance(expected_msg, str):
-                    expected_msg = re.escape(expected_msg)
-                with self.assertRaisesRegex(exc_type, expected_msg, msg=msg) as ctx:
-                    yield ctx
-
-            else:
-                with self.assertRaises(exc_type, msg=msg) as ctx:
-                    yield ctx
-
-    @staticmethod
-    def with_line_numbers(
-        s: str,
-        start_line: typing.Optional[int] = None,
-        end_line: typing.Optional[int] = None,
-        expand_tabs: bool = True,
-        eol_mark: str = "|",
-        mark_spaces: typing.Optional[str] = None,
-        mark_control: typing.Optional[str] = None,
-    ) -> str:
-        """
-        Helpful method for debugging a parser - prints a string with line and column numbers.
-        (Line and column numbers are 1-based.)
-
-        :param s: tuple(bool, str - string to be printed with line and column numbers
-        :param start_line: int - (optional) starting line number in s to print (default=1)
-        :param end_line: int - (optional) ending line number in s to print (default=len(s))
-        :param expand_tabs: bool - (optional) expand tabs to spaces, to match the pyparsing default
-        :param eol_mark: str - (optional) string to mark the end of lines, helps visualize trailing spaces (default="|")
-        :param mark_spaces: str - (optional) special character to display in place of spaces
-        :param mark_control: str - (optional) convert non-printing control characters to a placeholding
-                                 character; valid values:
-                                 - "unicode" - replaces control chars with Unicode symbols, such as "␍" and "␊"
-                                 - any single character string - replace control characters with given string
-                                 - None (default) - string is displayed as-is
-
-        :return: str - input string with leading line numbers and column number headers
-        """
-        if expand_tabs:
-            s = s.expandtabs()
-        if mark_control is not None:
-            mark_control = typing.cast(str, mark_control)
-            if mark_control == "unicode":
-                transtable_map = {
-                    c: u for c, u in zip(range(0, 33), range(0x2400, 0x2433))
-                }
-                transtable_map[127] = 0x2421
-                tbl = str.maketrans(transtable_map)
-                eol_mark = ""
-            else:
-                ord_mark_control = ord(mark_control)
-                tbl = str.maketrans(
-                    {c: ord_mark_control for c in list(range(0, 32)) + [127]}
-                )
-            s = s.translate(tbl)
-        if mark_spaces is not None and mark_spaces != " ":
-            if mark_spaces == "unicode":
-                tbl = str.maketrans({9: 0x2409, 32: 0x2423})
-                s = s.translate(tbl)
-            else:
-                s = s.replace(" ", mark_spaces)
-        if start_line is None:
-            start_line = 1
-        if end_line is None:
-            end_line = len(s)
-        end_line = min(end_line, len(s))
-        start_line = min(max(1, start_line), end_line)
-
-        if mark_control != "unicode":
-            s_lines = s.splitlines()[start_line - 1 : end_line]
-        else:
-            s_lines = [line + "␊" for line in s.split("␊")[start_line - 1 : end_line]]
-        if not s_lines:
-            return ""
-
-        lineno_width = len(str(end_line))
-        max_line_len = max(len(line) for line in s_lines)
-        lead = " " * (lineno_width + 1)
-        if max_line_len >= 99:
-            header0 = (
-                lead
-                + "".join(
-                    f"{' ' * 99}{(i + 1) % 100}"
-                    for i in range(max(max_line_len // 100, 1))
-                )
-                + "\n"
-            )
-        else:
-            header0 = ""
-        header1 = (
-            header0
-            + lead
-            + "".join(f"         {(i + 1) % 10}" for i in range(-(-max_line_len // 10)))
-            + "\n"
-        )
-        header2 = lead + "1234567890" * (-(-max_line_len // 10)) + "\n"
-        return (
-            header1
-            + header2
-            + "\n".join(
-                f"{i:{lineno_width}d}:{line}{eol_mark}"
-                for i, line in enumerate(s_lines, start=start_line)
-            )
-            + "\n"
-        )
diff --git a/src/pip/_vendor/pyparsing/unicode.py b/src/pip/_vendor/pyparsing/unicode.py
deleted file mode 100644
index e0b7b4ccb9a..00000000000
--- a/src/pip/_vendor/pyparsing/unicode.py
+++ /dev/null
@@ -1,354 +0,0 @@
-# unicode.py
-
-import sys
-from itertools import filterfalse
-from typing import List, Tuple, Union
-
-
-class _lazyclassproperty:
-    def __init__(self, fn):
-        self.fn = fn
-        self.__doc__ = fn.__doc__
-        self.__name__ = fn.__name__
-
-    def __get__(self, obj, cls):
-        if cls is None:
-            cls = type(obj)
-        if not hasattr(cls, "_intern") or any(
-            cls._intern is getattr(superclass, "_intern", [])
-            for superclass in cls.__mro__[1:]
-        ):
-            cls._intern = {}
-        attrname = self.fn.__name__
-        if attrname not in cls._intern:
-            cls._intern[attrname] = self.fn(cls)
-        return cls._intern[attrname]
-
-
-UnicodeRangeList = List[Union[Tuple[int, int], Tuple[int]]]
-
-
-class unicode_set:
-    """
-    A set of Unicode characters, for language-specific strings for
-    ``alphas``, ``nums``, ``alphanums``, and ``printables``.
-    A unicode_set is defined by a list of ranges in the Unicode character
-    set, in a class attribute ``_ranges``. Ranges can be specified using
-    2-tuples or a 1-tuple, such as::
-
-        _ranges = [
-            (0x0020, 0x007e),
-            (0x00a0, 0x00ff),
-            (0x0100,),
-            ]
-
-    Ranges are left- and right-inclusive. A 1-tuple of (x,) is treated as (x, x).
-
-    A unicode set can also be defined using multiple inheritance of other unicode sets::
-
-        class CJK(Chinese, Japanese, Korean):
-            pass
-    """
-
-    _ranges: UnicodeRangeList = []
-
-    @_lazyclassproperty
-    def _chars_for_ranges(cls):
-        ret = []
-        for cc in cls.__mro__:
-            if cc is unicode_set:
-                break
-            for rr in getattr(cc, "_ranges", ()):
-                ret.extend(range(rr[0], rr[-1] + 1))
-        return [chr(c) for c in sorted(set(ret))]
-
-    @_lazyclassproperty
-    def printables(cls):
-        """all non-whitespace characters in this range"""
-        return "".join(filterfalse(str.isspace, cls._chars_for_ranges))
-
-    @_lazyclassproperty
-    def alphas(cls):
-        """all alphabetic characters in this range"""
-        return "".join(filter(str.isalpha, cls._chars_for_ranges))
-
-    @_lazyclassproperty
-    def nums(cls):
-        """all numeric digit characters in this range"""
-        return "".join(filter(str.isdigit, cls._chars_for_ranges))
-
-    @_lazyclassproperty
-    def alphanums(cls):
-        """all alphanumeric characters in this range"""
-        return cls.alphas + cls.nums
-
-    @_lazyclassproperty
-    def identchars(cls):
-        """all characters in this range that are valid identifier characters, plus underscore '_'"""
-        return "".join(
-            sorted(
-                set(
-                    "".join(filter(str.isidentifier, cls._chars_for_ranges))
-                    + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzªµº"
-                    + "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ"
-                    + "_"
-                )
-            )
-        )
-
-    @_lazyclassproperty
-    def identbodychars(cls):
-        """
-        all characters in this range that are valid identifier body characters,
-        plus the digits 0-9, and · (Unicode MIDDLE DOT)
-        """
-        identifier_chars = set(
-            c for c in cls._chars_for_ranges if ("_" + c).isidentifier()
-        )
-        return "".join(sorted(identifier_chars | set(cls.identchars + "0123456789·")))
-
-    @_lazyclassproperty
-    def identifier(cls):
-        """
-        a pyparsing Word expression for an identifier using this range's definitions for
-        identchars and identbodychars
-        """
-        from pip._vendor.pyparsing import Word
-
-        return Word(cls.identchars, cls.identbodychars)
-
-
-class pyparsing_unicode(unicode_set):
-    """
-    A namespace class for defining common language unicode_sets.
-    """
-
-    # fmt: off
-
-    # define ranges in language character sets
-    _ranges: UnicodeRangeList = [
-        (0x0020, sys.maxunicode),
-    ]
-
-    class BasicMultilingualPlane(unicode_set):
-        """Unicode set for the Basic Multilingual Plane"""
-        _ranges: UnicodeRangeList = [
-            (0x0020, 0xFFFF),
-        ]
-
-    class Latin1(unicode_set):
-        """Unicode set for Latin-1 Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0020, 0x007E),
-            (0x00A0, 0x00FF),
-        ]
-
-    class LatinA(unicode_set):
-        """Unicode set for Latin-A Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0100, 0x017F),
-        ]
-
-    class LatinB(unicode_set):
-        """Unicode set for Latin-B Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0180, 0x024F),
-        ]
-
-    class Greek(unicode_set):
-        """Unicode set for Greek Unicode Character Ranges"""
-        _ranges: UnicodeRangeList = [
-            (0x0342, 0x0345),
-            (0x0370, 0x0377),
-            (0x037A, 0x037F),
-            (0x0384, 0x038A),
-            (0x038C,),
-            (0x038E, 0x03A1),
-            (0x03A3, 0x03E1),
-            (0x03F0, 0x03FF),
-            (0x1D26, 0x1D2A),
-            (0x1D5E,),
-            (0x1D60,),
-            (0x1D66, 0x1D6A),
-            (0x1F00, 0x1F15),
-            (0x1F18, 0x1F1D),
-            (0x1F20, 0x1F45),
-            (0x1F48, 0x1F4D),
-            (0x1F50, 0x1F57),
-            (0x1F59,),
-            (0x1F5B,),
-            (0x1F5D,),
-            (0x1F5F, 0x1F7D),
-            (0x1F80, 0x1FB4),
-            (0x1FB6, 0x1FC4),
-            (0x1FC6, 0x1FD3),
-            (0x1FD6, 0x1FDB),
-            (0x1FDD, 0x1FEF),
-            (0x1FF2, 0x1FF4),
-            (0x1FF6, 0x1FFE),
-            (0x2129,),
-            (0x2719, 0x271A),
-            (0xAB65,),
-            (0x10140, 0x1018D),
-            (0x101A0,),
-            (0x1D200, 0x1D245),
-            (0x1F7A1, 0x1F7A7),
-        ]
-
-    class Cyrillic(unicode_set):
-        """Unicode set for Cyrillic Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0400, 0x052F),
-            (0x1C80, 0x1C88),
-            (0x1D2B,),
-            (0x1D78,),
-            (0x2DE0, 0x2DFF),
-            (0xA640, 0xA672),
-            (0xA674, 0xA69F),
-            (0xFE2E, 0xFE2F),
-        ]
-
-    class Chinese(unicode_set):
-        """Unicode set for Chinese Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x2E80, 0x2E99),
-            (0x2E9B, 0x2EF3),
-            (0x31C0, 0x31E3),
-            (0x3400, 0x4DB5),
-            (0x4E00, 0x9FEF),
-            (0xA700, 0xA707),
-            (0xF900, 0xFA6D),
-            (0xFA70, 0xFAD9),
-            (0x16FE2, 0x16FE3),
-            (0x1F210, 0x1F212),
-            (0x1F214, 0x1F23B),
-            (0x1F240, 0x1F248),
-            (0x20000, 0x2A6D6),
-            (0x2A700, 0x2B734),
-            (0x2B740, 0x2B81D),
-            (0x2B820, 0x2CEA1),
-            (0x2CEB0, 0x2EBE0),
-            (0x2F800, 0x2FA1D),
-        ]
-
-    class Japanese(unicode_set):
-        """Unicode set for Japanese Unicode Character Range, combining Kanji, Hiragana, and Katakana ranges"""
-
-        class Kanji(unicode_set):
-            "Unicode set for Kanji Unicode Character Range"
-            _ranges: UnicodeRangeList = [
-                (0x4E00, 0x9FBF),
-                (0x3000, 0x303F),
-            ]
-
-        class Hiragana(unicode_set):
-            """Unicode set for Hiragana Unicode Character Range"""
-            _ranges: UnicodeRangeList = [
-                (0x3041, 0x3096),
-                (0x3099, 0x30A0),
-                (0x30FC,),
-                (0xFF70,),
-                (0x1B001,),
-                (0x1B150, 0x1B152),
-                (0x1F200,),
-            ]
-
-        class Katakana(unicode_set):
-            """Unicode set for Katakana  Unicode Character Range"""
-            _ranges: UnicodeRangeList = [
-                (0x3099, 0x309C),
-                (0x30A0, 0x30FF),
-                (0x31F0, 0x31FF),
-                (0x32D0, 0x32FE),
-                (0xFF65, 0xFF9F),
-                (0x1B000,),
-                (0x1B164, 0x1B167),
-                (0x1F201, 0x1F202),
-                (0x1F213,),
-            ]
-
-        漢字 = Kanji
-        カタカナ = Katakana
-        ひらがな = Hiragana
-
-        _ranges = (
-            Kanji._ranges
-            + Hiragana._ranges
-            + Katakana._ranges
-        )
-
-    class Hangul(unicode_set):
-        """Unicode set for Hangul (Korean) Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x1100, 0x11FF),
-            (0x302E, 0x302F),
-            (0x3131, 0x318E),
-            (0x3200, 0x321C),
-            (0x3260, 0x327B),
-            (0x327E,),
-            (0xA960, 0xA97C),
-            (0xAC00, 0xD7A3),
-            (0xD7B0, 0xD7C6),
-            (0xD7CB, 0xD7FB),
-            (0xFFA0, 0xFFBE),
-            (0xFFC2, 0xFFC7),
-            (0xFFCA, 0xFFCF),
-            (0xFFD2, 0xFFD7),
-            (0xFFDA, 0xFFDC),
-        ]
-
-    Korean = Hangul
-
-    class CJK(Chinese, Japanese, Hangul):
-        """Unicode set for combined Chinese, Japanese, and Korean (CJK) Unicode Character Range"""
-
-    class Thai(unicode_set):
-        """Unicode set for Thai Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0E01, 0x0E3A),
-            (0x0E3F, 0x0E5B)
-        ]
-
-    class Arabic(unicode_set):
-        """Unicode set for Arabic Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0600, 0x061B),
-            (0x061E, 0x06FF),
-            (0x0700, 0x077F),
-        ]
-
-    class Hebrew(unicode_set):
-        """Unicode set for Hebrew Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0591, 0x05C7),
-            (0x05D0, 0x05EA),
-            (0x05EF, 0x05F4),
-            (0xFB1D, 0xFB36),
-            (0xFB38, 0xFB3C),
-            (0xFB3E,),
-            (0xFB40, 0xFB41),
-            (0xFB43, 0xFB44),
-            (0xFB46, 0xFB4F),
-        ]
-
-    class Devanagari(unicode_set):
-        """Unicode set for Devanagari Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0900, 0x097F),
-            (0xA8E0, 0xA8FF)
-        ]
-
-    BMP = BasicMultilingualPlane
-
-    # add language identifiers using language Unicode
-    العربية = Arabic
-    中文 = Chinese
-    кириллица = Cyrillic
-    Ελληνικά = Greek
-    עִברִית = Hebrew
-    日本語 = Japanese
-    한국어 = Korean
-    ไทย = Thai
-    देवनागरी = Devanagari
-
-    # fmt: on
diff --git a/src/pip/_vendor/pyparsing/util.py b/src/pip/_vendor/pyparsing/util.py
deleted file mode 100644
index 4ae018a9636..00000000000
--- a/src/pip/_vendor/pyparsing/util.py
+++ /dev/null
@@ -1,277 +0,0 @@
-# util.py
-import inspect
-import warnings
-import types
-import collections
-import itertools
-from functools import lru_cache, wraps
-from typing import Callable, List, Union, Iterable, TypeVar, cast
-
-_bslash = chr(92)
-C = TypeVar("C", bound=Callable)
-
-
-class __config_flags:
-    """Internal class for defining compatibility and debugging flags"""
-
-    _all_names: List[str] = []
-    _fixed_names: List[str] = []
-    _type_desc = "configuration"
-
-    @classmethod
-    def _set(cls, dname, value):
-        if dname in cls._fixed_names:
-            warnings.warn(
-                f"{cls.__name__}.{dname} {cls._type_desc} is {str(getattr(cls, dname)).upper()}"
-                f" and cannot be overridden",
-                stacklevel=3,
-            )
-            return
-        if dname in cls._all_names:
-            setattr(cls, dname, value)
-        else:
-            raise ValueError(f"no such {cls._type_desc} {dname!r}")
-
-    enable = classmethod(lambda cls, name: cls._set(name, True))
-    disable = classmethod(lambda cls, name: cls._set(name, False))
-
-
-@lru_cache(maxsize=128)
-def col(loc: int, strg: str) -> int:
-    """
-    Returns current column within a string, counting newlines as line separators.
-    The first column is number 1.
-
-    Note: the default parsing behavior is to expand tabs in the input string
-    before starting the parsing process.  See
-    :class:`ParserElement.parse_string` for more
-    information on parsing strings containing ```` s, and suggested
-    methods to maintain a consistent view of the parsed string, the parse
-    location, and line and column positions within the parsed string.
-    """
-    s = strg
-    return 1 if 0 < loc < len(s) and s[loc - 1] == "\n" else loc - s.rfind("\n", 0, loc)
-
-
-@lru_cache(maxsize=128)
-def lineno(loc: int, strg: str) -> int:
-    """Returns current line number within a string, counting newlines as line separators.
-    The first line is number 1.
-
-    Note - the default parsing behavior is to expand tabs in the input string
-    before starting the parsing process.  See :class:`ParserElement.parse_string`
-    for more information on parsing strings containing ```` s, and
-    suggested methods to maintain a consistent view of the parsed string, the
-    parse location, and line and column positions within the parsed string.
-    """
-    return strg.count("\n", 0, loc) + 1
-
-
-@lru_cache(maxsize=128)
-def line(loc: int, strg: str) -> str:
-    """
-    Returns the line of text containing loc within a string, counting newlines as line separators.
-    """
-    last_cr = strg.rfind("\n", 0, loc)
-    next_cr = strg.find("\n", loc)
-    return strg[last_cr + 1 : next_cr] if next_cr >= 0 else strg[last_cr + 1 :]
-
-
-class _UnboundedCache:
-    def __init__(self):
-        cache = {}
-        cache_get = cache.get
-        self.not_in_cache = not_in_cache = object()
-
-        def get(_, key):
-            return cache_get(key, not_in_cache)
-
-        def set_(_, key, value):
-            cache[key] = value
-
-        def clear(_):
-            cache.clear()
-
-        self.size = None
-        self.get = types.MethodType(get, self)
-        self.set = types.MethodType(set_, self)
-        self.clear = types.MethodType(clear, self)
-
-
-class _FifoCache:
-    def __init__(self, size):
-        self.not_in_cache = not_in_cache = object()
-        cache = {}
-        keyring = [object()] * size
-        cache_get = cache.get
-        cache_pop = cache.pop
-        keyiter = itertools.cycle(range(size))
-
-        def get(_, key):
-            return cache_get(key, not_in_cache)
-
-        def set_(_, key, value):
-            cache[key] = value
-            i = next(keyiter)
-            cache_pop(keyring[i], None)
-            keyring[i] = key
-
-        def clear(_):
-            cache.clear()
-            keyring[:] = [object()] * size
-
-        self.size = size
-        self.get = types.MethodType(get, self)
-        self.set = types.MethodType(set_, self)
-        self.clear = types.MethodType(clear, self)
-
-
-class LRUMemo:
-    """
-    A memoizing mapping that retains `capacity` deleted items
-
-    The memo tracks retained items by their access order; once `capacity` items
-    are retained, the least recently used item is discarded.
-    """
-
-    def __init__(self, capacity):
-        self._capacity = capacity
-        self._active = {}
-        self._memory = collections.OrderedDict()
-
-    def __getitem__(self, key):
-        try:
-            return self._active[key]
-        except KeyError:
-            self._memory.move_to_end(key)
-            return self._memory[key]
-
-    def __setitem__(self, key, value):
-        self._memory.pop(key, None)
-        self._active[key] = value
-
-    def __delitem__(self, key):
-        try:
-            value = self._active.pop(key)
-        except KeyError:
-            pass
-        else:
-            while len(self._memory) >= self._capacity:
-                self._memory.popitem(last=False)
-            self._memory[key] = value
-
-    def clear(self):
-        self._active.clear()
-        self._memory.clear()
-
-
-class UnboundedMemo(dict):
-    """
-    A memoizing mapping that retains all deleted items
-    """
-
-    def __delitem__(self, key):
-        pass
-
-
-def _escape_regex_range_chars(s: str) -> str:
-    # escape these chars: ^-[]
-    for c in r"\^-[]":
-        s = s.replace(c, _bslash + c)
-    s = s.replace("\n", r"\n")
-    s = s.replace("\t", r"\t")
-    return str(s)
-
-
-def _collapse_string_to_ranges(
-    s: Union[str, Iterable[str]], re_escape: bool = True
-) -> str:
-    def is_consecutive(c):
-        c_int = ord(c)
-        is_consecutive.prev, prev = c_int, is_consecutive.prev
-        if c_int - prev > 1:
-            is_consecutive.value = next(is_consecutive.counter)
-        return is_consecutive.value
-
-    is_consecutive.prev = 0  # type: ignore [attr-defined]
-    is_consecutive.counter = itertools.count()  # type: ignore [attr-defined]
-    is_consecutive.value = -1  # type: ignore [attr-defined]
-
-    def escape_re_range_char(c):
-        return "\\" + c if c in r"\^-][" else c
-
-    def no_escape_re_range_char(c):
-        return c
-
-    if not re_escape:
-        escape_re_range_char = no_escape_re_range_char
-
-    ret = []
-    s = "".join(sorted(set(s)))
-    if len(s) > 3:
-        for _, chars in itertools.groupby(s, key=is_consecutive):
-            first = last = next(chars)
-            last = collections.deque(
-                itertools.chain(iter([last]), chars), maxlen=1
-            ).pop()
-            if first == last:
-                ret.append(escape_re_range_char(first))
-            else:
-                sep = "" if ord(last) == ord(first) + 1 else "-"
-                ret.append(
-                    f"{escape_re_range_char(first)}{sep}{escape_re_range_char(last)}"
-                )
-    else:
-        ret = [escape_re_range_char(c) for c in s]
-
-    return "".join(ret)
-
-
-def _flatten(ll: list) -> list:
-    ret = []
-    for i in ll:
-        if isinstance(i, list):
-            ret.extend(_flatten(i))
-        else:
-            ret.append(i)
-    return ret
-
-
-def replaced_by_pep8(compat_name: str, fn: C) -> C:
-    # In a future version, uncomment the code in the internal _inner() functions
-    # to begin emitting DeprecationWarnings.
-
-    # Unwrap staticmethod/classmethod
-    fn = getattr(fn, "__func__", fn)
-
-    # (Presence of 'self' arg in signature is used by explain_exception() methods, so we take
-    # some extra steps to add it if present in decorated function.)
-    if "self" == list(inspect.signature(fn).parameters)[0]:
-
-        @wraps(fn)
-        def _inner(self, *args, **kwargs):
-            # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
-            # )
-            return fn(self, *args, **kwargs)
-
-    else:
-
-        @wraps(fn)
-        def _inner(*args, **kwargs):
-            # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
-            # )
-            return fn(*args, **kwargs)
-
-    _inner.__doc__ = f"""Deprecated - use :class:`{fn.__name__}`"""
-    _inner.__name__ = compat_name
-    _inner.__annotations__ = fn.__annotations__
-    if isinstance(fn, types.FunctionType):
-        _inner.__kwdefaults__ = fn.__kwdefaults__
-    elif isinstance(fn, type) and hasattr(fn, "__init__"):
-        _inner.__kwdefaults__ = fn.__init__.__kwdefaults__
-    else:
-        _inner.__kwdefaults__ = None
-    _inner.__qualname__ = fn.__qualname__
-    return cast(C, _inner)
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index c892f8d4ad0..75eeb1e0658 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -5,7 +5,6 @@ distro==1.9.0
 msgpack==1.0.8
 packaging==23.2
 platformdirs==4.2.1
-pyparsing==3.1.2
 pyproject-hooks==1.0.0
 requests==2.31.0
     certifi==2024.2.2

From 372c6163ebfe32a2c000b178f54a9dbcbe46449b Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 6 Oct 2023 19:40:27 +0100
Subject: [PATCH 372/992] Explicitly keep track of canonical extra names with
 `pkg_resources`

This ensures that the Distribution only exposes canonical forms of the
extras, papering over the lack of PEP 685 support in the vendored
version of `pkg_resources`.
---
 src/pip/_internal/metadata/pkg_resources.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py
index 57a9fdba1bc..5e6ffb0bf63 100644
--- a/src/pip/_internal/metadata/pkg_resources.py
+++ b/src/pip/_internal/metadata/pkg_resources.py
@@ -75,6 +75,9 @@ def run_script(self, script_name: str, namespace: str) -> None:
 class Distribution(BaseDistribution):
     def __init__(self, dist: pkg_resources.Distribution) -> None:
         self._dist = dist
+        self._extra_mapping = {
+            canonicalize_name(extra): extra for extra in self._dist.extras
+        }
 
     @classmethod
     def from_directory(cls, directory: str) -> BaseDistribution:
@@ -215,16 +218,21 @@ def _metadata_impl(self) -> email.message.Message:
         return feed_parser.close()
 
     def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]:
-        if extras:  # pkg_resources raises on invalid extras, so we sanitize.
-            extras = frozenset(pkg_resources.safe_extra(e) for e in extras)
-            extras = extras.intersection(self._dist.extras)
+        if extras:
+            sanitised_extras = {canonicalize_name(e) for e in extras} & set(
+                self._extra_mapping
+            )
+            extras = [
+                self._extra_mapping[canonicalize_name(extra)]
+                for extra in sanitised_extras
+            ]
         return self._dist.requires(extras)
 
     def iter_provided_extras(self) -> Iterable[str]:
-        return self._dist.extras
+        return self._extra_mapping.keys()
 
     def is_extra_provided(self, extra: str) -> bool:
-        return pkg_resources.safe_extra(extra) in self._dist.extras
+        return canonicalize_name(extra) in self._extra_mapping
 
 
 class Environment(BaseEnvironment):

From e38c2b95d3a6cac8f51cd666c6b08e87b71233b1 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 6 Oct 2023 19:58:09 +0100
Subject: [PATCH 373/992] Compare `Requirement` objects rather than requirement
 strings

This ensures that the comparision does not fail due to mismatching extra
normalisation.
---
 tests/unit/metadata/test_metadata_pkg_resources.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/unit/metadata/test_metadata_pkg_resources.py b/tests/unit/metadata/test_metadata_pkg_resources.py
index 69efa209fdf..ee1b22003ba 100644
--- a/tests/unit/metadata/test_metadata_pkg_resources.py
+++ b/tests/unit/metadata/test_metadata_pkg_resources.py
@@ -4,6 +4,7 @@
 from unittest import mock
 
 import pytest
+from pip._vendor.packaging.requirements import Requirement
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.version import parse as parse_version
 
@@ -82,7 +83,7 @@ def test_wheel_metadata_works() -> None:
     name = "simple"
     version = "0.1.0"
     require_a = "a==1.0"
-    require_b = 'b==1.1; extra == "also-b"'
+    require_b = 'b==1.1; extra == "also_b"'
     requires = [require_a, require_b, 'c==1.2; extra == "also_c"']
     extras = ["also_b", "also_c"]
     requires_python = ">=3"
@@ -108,8 +109,8 @@ def test_wheel_metadata_works() -> None:
     assert parse_version(version) == dist.version
     assert set(extras) == set(dist.iter_provided_extras())
     assert [require_a] == [str(r) for r in dist.iter_dependencies()]
-    assert [require_a, require_b] == [
-        str(r) for r in dist.iter_dependencies(["also_b"])
+    assert [Requirement(require_a), Requirement(require_b)] == [
+        Requirement(str(r)) for r in dist.iter_dependencies(["also_b"])
     ]
     assert metadata.as_string() == dist.metadata.as_string()
     assert SpecifierSet(requires_python) == dist.requires_python

From 908e9130205ef7027dd6a095718ce7bfee58b461 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 6 Oct 2023 19:59:17 +0100
Subject: [PATCH 374/992] Do not normalise `iter_provided_extras` from
 pkg_resources

This is explicitly checked for in the test suite and it isn't strictly
necessary to ensure the correct behaviour. This does expose that the
test mock objects are incomplete so those get a missing `extra`
attribute added.
---
 src/pip/_internal/metadata/pkg_resources.py        |  2 +-
 tests/unit/metadata/test_metadata_pkg_resources.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py
index 5e6ffb0bf63..783f901fe9d 100644
--- a/src/pip/_internal/metadata/pkg_resources.py
+++ b/src/pip/_internal/metadata/pkg_resources.py
@@ -229,7 +229,7 @@ def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requiremen
         return self._dist.requires(extras)
 
     def iter_provided_extras(self) -> Iterable[str]:
-        return self._extra_mapping.keys()
+        return self._dist.extras
 
     def is_extra_provided(self, extra: str) -> bool:
         return canonicalize_name(extra) in self._extra_mapping
diff --git a/tests/unit/metadata/test_metadata_pkg_resources.py b/tests/unit/metadata/test_metadata_pkg_resources.py
index ee1b22003ba..7795d3e982a 100644
--- a/tests/unit/metadata/test_metadata_pkg_resources.py
+++ b/tests/unit/metadata/test_metadata_pkg_resources.py
@@ -39,17 +39,17 @@ def require(self, name: str) -> None:
 
 workingset = _MockWorkingSet(
     (
-        mock.Mock(test_name="global", project_name="global"),
-        mock.Mock(test_name="editable", project_name="editable"),
-        mock.Mock(test_name="normal", project_name="normal"),
-        mock.Mock(test_name="user", project_name="user"),
+        mock.Mock(test_name="global", project_name="global", extras=[]),
+        mock.Mock(test_name="editable", project_name="editable", extras=[]),
+        mock.Mock(test_name="normal", project_name="normal", extras=[]),
+        mock.Mock(test_name="user", project_name="user", extras=[]),
     )
 )
 
 workingset_stdlib = _MockWorkingSet(
     (
-        mock.Mock(test_name="normal", project_name="argparse"),
-        mock.Mock(test_name="normal", project_name="wsgiref"),
+        mock.Mock(test_name="normal", project_name="argparse", extras=[]),
+        mock.Mock(test_name="normal", project_name="wsgiref", extras=[]),
     )
 )
 

From 5cc540be94dbccfaaa3c6b458dd3bd7c0877ce65 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sat, 7 Oct 2023 00:55:48 +0100
Subject: [PATCH 375/992] Use extras directly from metadata when using
 `pkg_resources`

Instead of relying on `pkg_resources`'s internal data structure, use the
metadata has to be constructed regardless to lookup the information
about relevant extras.
---
 src/pip/_internal/metadata/pkg_resources.py   | 25 ++++++++++++-------
 .../metadata/test_metadata_pkg_resources.py   | 12 ++++-----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py
index 783f901fe9d..094c1737e66 100644
--- a/src/pip/_internal/metadata/pkg_resources.py
+++ b/src/pip/_internal/metadata/pkg_resources.py
@@ -75,9 +75,19 @@ def run_script(self, script_name: str, namespace: str) -> None:
 class Distribution(BaseDistribution):
     def __init__(self, dist: pkg_resources.Distribution) -> None:
         self._dist = dist
-        self._extra_mapping = {
-            canonicalize_name(extra): extra for extra in self._dist.extras
-        }
+        # This is populated lazily, to avoid loading metadata for all possible
+        # distributions eagerly.
+        self.__extra_mapping: Optional[Mapping[NormalizedName, str]] = None
+
+    @property
+    def _extra_mapping(self) -> Mapping[NormalizedName, str]:
+        if self.__extra_mapping is None:
+            self.__extra_mapping = {
+                canonicalize_name(extra): pkg_resources.safe_extra(extra)
+                for extra in self.metadata.get_all("Provides-Extra", [])
+            }
+
+        return self.__extra_mapping
 
     @classmethod
     def from_directory(cls, directory: str) -> BaseDistribution:
@@ -219,13 +229,10 @@ def _metadata_impl(self) -> email.message.Message:
 
     def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]:
         if extras:
-            sanitised_extras = {canonicalize_name(e) for e in extras} & set(
-                self._extra_mapping
+            relevant_extras = set(self._extra_mapping) & set(
+                map(canonicalize_name, extras)
             )
-            extras = [
-                self._extra_mapping[canonicalize_name(extra)]
-                for extra in sanitised_extras
-            ]
+            extras = [self._extra_mapping[extra] for extra in relevant_extras]
         return self._dist.requires(extras)
 
     def iter_provided_extras(self) -> Iterable[str]:
diff --git a/tests/unit/metadata/test_metadata_pkg_resources.py b/tests/unit/metadata/test_metadata_pkg_resources.py
index 7795d3e982a..ee1b22003ba 100644
--- a/tests/unit/metadata/test_metadata_pkg_resources.py
+++ b/tests/unit/metadata/test_metadata_pkg_resources.py
@@ -39,17 +39,17 @@ def require(self, name: str) -> None:
 
 workingset = _MockWorkingSet(
     (
-        mock.Mock(test_name="global", project_name="global", extras=[]),
-        mock.Mock(test_name="editable", project_name="editable", extras=[]),
-        mock.Mock(test_name="normal", project_name="normal", extras=[]),
-        mock.Mock(test_name="user", project_name="user", extras=[]),
+        mock.Mock(test_name="global", project_name="global"),
+        mock.Mock(test_name="editable", project_name="editable"),
+        mock.Mock(test_name="normal", project_name="normal"),
+        mock.Mock(test_name="user", project_name="user"),
     )
 )
 
 workingset_stdlib = _MockWorkingSet(
     (
-        mock.Mock(test_name="normal", project_name="argparse", extras=[]),
-        mock.Mock(test_name="normal", project_name="wsgiref", extras=[]),
+        mock.Mock(test_name="normal", project_name="argparse"),
+        mock.Mock(test_name="normal", project_name="wsgiref"),
     )
 )
 

From 8d22e803bdf483c1ffde1ae7cd163d9ea4154bff Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sat, 7 Oct 2023 00:47:26 +0100
Subject: [PATCH 376/992] Implement PEP 685 on distribution objects directly

This uses normalised names across the board for extras, with
comparisions outside this context relying on `packaging`'s support for
the corresponding comparisions.
---
 src/pip/_internal/metadata/base.py            | 17 ++----
 .../_internal/metadata/importlib/_dists.py    | 13 ++---
 src/pip/_internal/metadata/pkg_resources.py   | 20 ++++---
 .../resolution/resolvelib/candidates.py       | 57 ++++---------------
 .../metadata/test_metadata_pkg_resources.py   |  3 +-
 5 files changed, 36 insertions(+), 74 deletions(-)

diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py
index 843a4e60aeb..ac585c717e6 100644
--- a/src/pip/_internal/metadata/base.py
+++ b/src/pip/_internal/metadata/base.py
@@ -441,24 +441,15 @@ def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requiremen
         """
         raise NotImplementedError()
 
-    def iter_provided_extras(self) -> Iterable[str]:
+    def iter_provided_extras(self) -> Iterable[NormalizedName]:
         """Extras provided by this distribution.
 
         For modern .dist-info distributions, this is the collection of
         "Provides-Extra:" entries in distribution metadata.
 
-        The return value of this function is not particularly useful other than
-        display purposes due to backward compatibility issues and the extra
-        names being poorly normalized prior to PEP 685. If you want to perform
-        logic operations on extras, use :func:`is_extra_provided` instead.
-        """
-        raise NotImplementedError()
-
-    def is_extra_provided(self, extra: str) -> bool:
-        """Check whether an extra is provided by this distribution.
-
-        This is needed mostly for compatibility issues with pkg_resources not
-        following the extra normalization rules defined in PEP 685.
+        The return value of this function is expected to be normalised names,
+        per PEP 685, with the returned value being handled appropriately by
+        `iter_dependencies`.
         """
         raise NotImplementedError()
 
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index 5e6a0345621..94a13a280d3 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -204,14 +204,11 @@ def _metadata_impl(self) -> email.message.Message:
         # until upstream can improve the protocol. (python/cpython#94952)
         return cast(email.message.Message, self._dist.metadata)
 
-    def iter_provided_extras(self) -> Iterable[str]:
-        return self.metadata.get_all("Provides-Extra", [])
-
-    def is_extra_provided(self, extra: str) -> bool:
-        return any(
-            canonicalize_name(provided_extra) == canonicalize_name(extra)
-            for provided_extra in self.metadata.get_all("Provides-Extra", [])
-        )
+    def iter_provided_extras(self) -> Iterable[NormalizedName]:
+        return [
+            canonicalize_name(extra)
+            for extra in self.metadata.get_all("Provides-Extra", [])
+        ]
 
     def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requirement]:
         contexts: Sequence[Dict[str, str]] = [{"extra": e} for e in extras]
diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py
index 094c1737e66..3786b7cd394 100644
--- a/src/pip/_internal/metadata/pkg_resources.py
+++ b/src/pip/_internal/metadata/pkg_resources.py
@@ -3,7 +3,16 @@
 import logging
 import os
 import zipfile
-from typing import Collection, Iterable, Iterator, List, Mapping, NamedTuple, Optional
+from typing import (
+    Collection,
+    Iterable,
+    Iterator,
+    List,
+    Mapping,
+    NamedTuple,
+    Optional,
+    cast,
+)
 
 from pip._vendor import pkg_resources
 from pip._vendor.packaging.requirements import Requirement
@@ -83,7 +92,7 @@ def __init__(self, dist: pkg_resources.Distribution) -> None:
     def _extra_mapping(self) -> Mapping[NormalizedName, str]:
         if self.__extra_mapping is None:
             self.__extra_mapping = {
-                canonicalize_name(extra): pkg_resources.safe_extra(extra)
+                canonicalize_name(extra): pkg_resources.safe_extra(cast(str, extra))
                 for extra in self.metadata.get_all("Provides-Extra", [])
             }
 
@@ -235,11 +244,8 @@ def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requiremen
             extras = [self._extra_mapping[extra] for extra in relevant_extras]
         return self._dist.requires(extras)
 
-    def iter_provided_extras(self) -> Iterable[str]:
-        return self._dist.extras
-
-    def is_extra_provided(self, extra: str) -> bool:
-        return canonicalize_name(extra) in self._extra_mapping
+    def iter_provided_extras(self) -> Iterable[NormalizedName]:
+        return list(self._extra_mapping.keys())
 
 
 class Environment(BaseEnvironment):
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index bda9147d7f9..a8d7d78da7c 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -485,50 +485,6 @@ def is_editable(self) -> bool:
     def source_link(self) -> Optional[Link]:
         return self.base.source_link
 
-    def _warn_invalid_extras(
-        self,
-        requested: FrozenSet[str],
-        valid: FrozenSet[str],
-    ) -> None:
-        """Emit warnings for invalid extras being requested.
-
-        This emits a warning for each requested extra that is not in the
-        candidate's ``Provides-Extra`` list.
-        """
-        invalid_extras_to_warn = frozenset(
-            extra
-            for extra in requested
-            if extra not in valid
-            # If an extra is requested in an unnormalized form, skip warning
-            # about the normalized form being missing.
-            and extra in self.extras
-        )
-        if not invalid_extras_to_warn:
-            return
-        for extra in sorted(invalid_extras_to_warn):
-            logger.warning(
-                "%s %s does not provide the extra '%s'",
-                self.base.name,
-                self.version,
-                extra,
-            )
-
-    def _calculate_valid_requested_extras(self) -> FrozenSet[str]:
-        """Get a list of valid extras requested by this candidate.
-
-        The user (or upstream dependent) may have specified extras that the
-        candidate doesn't support. Any unsupported extras are dropped, and each
-        cause a warning to be logged here.
-        """
-        requested_extras = self.extras
-        valid_extras = frozenset(
-            extra
-            for extra in requested_extras
-            if self.base.dist.is_extra_provided(extra)
-        )
-        self._warn_invalid_extras(requested_extras, valid_extras)
-        return valid_extras
-
     def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]:
         factory = self.base._factory
 
@@ -538,7 +494,18 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen
         if not with_requires:
             return
 
-        valid_extras = self._calculate_valid_requested_extras()
+        # The user may have specified extras that the candidate doesn't
+        # support. We ignore any unsupported extras here.
+        valid_extras = self.extras.intersection(self.base.dist.iter_provided_extras())
+        invalid_extras = self.extras.difference(self.base.dist.iter_provided_extras())
+        for extra in sorted(invalid_extras):
+            logger.warning(
+                "%s %s does not provide the extra '%s'",
+                self.base.name,
+                self.version,
+                extra,
+            )
+
         for r in self.base.dist.iter_dependencies(valid_extras):
             yield from factory.make_requirements_from_spec(
                 str(r),
diff --git a/tests/unit/metadata/test_metadata_pkg_resources.py b/tests/unit/metadata/test_metadata_pkg_resources.py
index ee1b22003ba..6044c14e4ca 100644
--- a/tests/unit/metadata/test_metadata_pkg_resources.py
+++ b/tests/unit/metadata/test_metadata_pkg_resources.py
@@ -6,6 +6,7 @@
 import pytest
 from pip._vendor.packaging.requirements import Requirement
 from pip._vendor.packaging.specifiers import SpecifierSet
+from pip._vendor.packaging.utils import canonicalize_name
 from pip._vendor.packaging.version import parse as parse_version
 
 from pip._internal.exceptions import UnsupportedWheel
@@ -107,7 +108,7 @@ def test_wheel_metadata_works() -> None:
 
     assert name == dist.canonical_name == dist.raw_name
     assert parse_version(version) == dist.version
-    assert set(extras) == set(dist.iter_provided_extras())
+    assert {canonicalize_name(e) for e in extras} == set(dist.iter_provided_extras())
     assert [require_a] == [str(r) for r in dist.iter_dependencies()]
     assert [Requirement(require_a), Requirement(require_b)] == [
         Requirement(str(r)) for r in dist.iter_dependencies(["also_b"])

From cec49eac759ee5bd2234677f5c47f10d38cf3ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 30 Mar 2024 18:45:59 +0100
Subject: [PATCH 377/992] Add failing test for index with legacy versions

---
 .../invalid-version/invalid-version/index.html   |   7 +++++++
 tests/data/packages/README.txt                   |   8 ++++++++
 .../invalid_version-1.0-py3-none-any.whl         | Bin 0 -> 983 bytes
 .../invalid_version-2010i-py3-none-any.whl       | Bin 0 -> 1001 bytes
 .../test_invalid_versions_and_specifiers.py      |  15 +++++++++++++++
 5 files changed, 30 insertions(+)
 create mode 100644 tests/data/indexes/invalid-version/invalid-version/index.html
 create mode 100644 tests/data/packages/invalid_version-1.0-py3-none-any.whl
 create mode 100644 tests/data/packages/invalid_version-2010i-py3-none-any.whl
 create mode 100644 tests/functional/test_invalid_versions_and_specifiers.py

diff --git a/tests/data/indexes/invalid-version/invalid-version/index.html b/tests/data/indexes/invalid-version/invalid-version/index.html
new file mode 100644
index 00000000000..db9c47fed4b
--- /dev/null
+++ b/tests/data/indexes/invalid-version/invalid-version/index.html
@@ -0,0 +1,7 @@
+
+
+  
+    invalid_version-2010i-py3-none-any.whl
+    invalid_version-1.0-py3-none-any.whl
+  
+
diff --git a/tests/data/packages/README.txt b/tests/data/packages/README.txt
index 37860a21b9e..a0cb164c4f1 100644
--- a/tests/data/packages/README.txt
+++ b/tests/data/packages/README.txt
@@ -104,3 +104,11 @@ require_simple-1.0.tar.gz
 ------------------------
 contains "require_simple" package which requires simple>=2.0 - used for testing
 if dependencies are handled correctly.
+
+invalid_version-2010i-py3-none-any.whl
+--------------------------------------
+The invalid-version package with a legacy version.
+
+invalid_version-1.0-py3-none-any.whl
+------------------------------------
+A valid variant of the invalid-version package.
diff --git a/tests/data/packages/invalid_version-1.0-py3-none-any.whl b/tests/data/packages/invalid_version-1.0-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..eeee9527792f522dd0303081b416208f6237e5a6
GIT binary patch
literal 983
zcmWIWW@Zs#U|`^25T0BY5&d$GkRgy~1;lDVoS9dan3I_jUzS=_oSC1eYp7?Smy%gr
zqMMnQmap&Y8sg~U7~=TZSJ%_WQ^)fPueYw&xijZC2N_&4e)7rtjPKT<6KAx&&z$tR
zsN3vOcyOx3E6IXFMuq?sOaJgyd&dAR17T%?mWF${y83XR_wYS?5n~3m5fhr@CbL~PVg@>j5s0-3I<6$YAU-FxEHy{3q@v_8x>=hO
zN=hyQ&9Da=rb5uHAXjJqAeYv&-bGCY3=9|crgL^&afmEo{IvSdF_DxPZH)rCTtaOu
z0e<(V-mYr=o?#y@n|o?z&zwzhw@!B53D8ry6@SC5DCn|Tu<(cZUahy<`2v4%b9+CG
zIJ?iJI;dds+Kl(dEax4|aC@b@C_h_XoaexI-oN7KYmalz-&B6Z_2#o_zaw6~l5#lI
z<3CL|aot9Dr%MmYCh@%5{rpEAQ`;{mu^bI+qse|^Gd+fHJ
KP){Kfhz9`D$wTx2

literal 0
HcmV?d00001

diff --git a/tests/data/packages/invalid_version-2010i-py3-none-any.whl b/tests/data/packages/invalid_version-2010i-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..1048e6ffc382e2a0a42b1aad512dbffa21941830
GIT binary patch
literal 1001
zcmWIWW@Zs#U|`^2h@4Otaqf|(wGohK1H>9YoS9dan3I_jUzS=_oSC1eYh++(kg1oF
zSzMx`|yVMM6RI*gl?Z#oJzQOVxX*j|p1p{$@rv<-
zBLB1Ax?Vab^*051c%9VI>(pmo8F<0qg0bN>;|ou?PMz1k_*Lf`uZFJI*^@q-f;2R>
ze4lc8`fLxmx#_78GtJ?mZ6WWd01VQ;#pj*-);Mcfw{ShY-p
zR_00AtxRL$RMlLu{QW6Y@rwS=jX9CQJtYA?Tp3c@&AQUdOi~`X@2h!m=I*YU+*h`m
z=>GQQ6P>x}qqKZnd7b;ZCKF~Wku7oNE0p(lN@Zj${G2XVoFL6@cKEsCv6Gkil$LPM
ztNvHJ>Xdg*;LAOy*K3~4t@O_nE3baB;e!3Uyy^!tHgB6&d-2l5ZQiw)&mUg<%V34R
zC#z*(pn{rw@!5;_7uzqNeam{GsZHfs0eNQDu+6LoXHUstjQGPG;LXS+!i+od0fPn%
zwlsn$Vv{1Wso0Vh#7qW;EsYgKm
UCBU1N4Wy3+2qS>Hs+mAM0FYEd3jhEB

literal 0
HcmV?d00001

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
new file mode 100644
index 00000000000..ea0bc6371e0
--- /dev/null
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -0,0 +1,15 @@
+from tests.lib import PipTestEnvironment, TestData
+
+
+def test_install_from_index_with_invalid_version(
+    script: PipTestEnvironment, data: TestData
+) -> None:
+    """
+    Test that pip does not crash when installing a package from an index with
+    an invalid version. It ignores invalid versions.
+    """
+    index_url = data.index_url("invalid-version")
+    result = script.pip(
+        "install", "--dry-run", "--index-url", index_url, "invalid-version"
+    )
+    assert "Would install invalid-version-1.0" in result.stdout

From b63e279aab10432f3c92e213c99d1de452b8b89f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 30 Mar 2024 18:46:27 +0100
Subject: [PATCH 378/992] Ignore legacy versions in the package finder

---
 src/pip/_internal/index/package_finder.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index 98ee6315567..fb270f22f83 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -11,7 +11,7 @@
 from pip._vendor.packaging import specifiers
 from pip._vendor.packaging.tags import Tag
 from pip._vendor.packaging.utils import canonicalize_name
-from pip._vendor.packaging.version import _BaseVersion
+from pip._vendor.packaging.version import InvalidVersion, _BaseVersion
 from pip._vendor.packaging.version import parse as parse_version
 
 from pip._internal.exceptions import (
@@ -752,11 +752,14 @@ def get_install_candidate(
             self._log_skipped_link(link, result, detail)
             return None
 
-        return InstallationCandidate(
-            name=link_evaluator.project_name,
-            link=link,
-            version=detail,
-        )
+        try:
+            return InstallationCandidate(
+                name=link_evaluator.project_name,
+                link=link,
+                version=detail,
+            )
+        except InvalidVersion:
+            return None
 
     def evaluate_links(
         self, link_evaluator: LinkEvaluator, links: Iterable[Link]

From 587854a79926db6187d3e1a6c9eb67e620ad6331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 30 Mar 2024 19:36:50 +0100
Subject: [PATCH 379/992] Add failing test for package with invalid specifier
 in dependencies

---
 .../invalid-version/index.html                   |   6 ++++++
 .../require-invalid-version/index.html           |   7 +++++++
 tests/data/packages/README.txt                   |   8 ++++++++
 .../require_invalid_version-0.1-py3-none-any.whl | Bin 0 -> 1059 bytes
 .../require_invalid_version-1.0-py3-none-any.whl | Bin 0 -> 1083 bytes
 .../test_invalid_versions_and_specifiers.py      |  14 ++++++++++++++
 6 files changed, 35 insertions(+)
 create mode 100644 tests/data/indexes/require-invalid-version/invalid-version/index.html
 create mode 100644 tests/data/indexes/require-invalid-version/require-invalid-version/index.html
 create mode 100644 tests/data/packages/require_invalid_version-0.1-py3-none-any.whl
 create mode 100644 tests/data/packages/require_invalid_version-1.0-py3-none-any.whl

diff --git a/tests/data/indexes/require-invalid-version/invalid-version/index.html b/tests/data/indexes/require-invalid-version/invalid-version/index.html
new file mode 100644
index 00000000000..b1ff5550ea1
--- /dev/null
+++ b/tests/data/indexes/require-invalid-version/invalid-version/index.html
@@ -0,0 +1,6 @@
+
+
+  
+    invalid_version-2010i-py3-none-any.whl
+  
+
diff --git a/tests/data/indexes/require-invalid-version/require-invalid-version/index.html b/tests/data/indexes/require-invalid-version/require-invalid-version/index.html
new file mode 100644
index 00000000000..66afe3e6daa
--- /dev/null
+++ b/tests/data/indexes/require-invalid-version/require-invalid-version/index.html
@@ -0,0 +1,7 @@
+
+
+  
+    require_invalid_version-0.1-py3-none-any.whl
+    require_invalid_version-1.0-py3-none-any.whl
+  
+
diff --git a/tests/data/packages/README.txt b/tests/data/packages/README.txt
index a0cb164c4f1..bdf1a4fa22c 100644
--- a/tests/data/packages/README.txt
+++ b/tests/data/packages/README.txt
@@ -112,3 +112,11 @@ The invalid-version package with a legacy version.
 invalid_version-1.0-py3-none-any.whl
 ------------------------------------
 A valid variant of the invalid-version package.
+
+require_invalid_version-0.1-py3-none-any.whl
+--------------------------------------------
+A valid variant of the require-invalid-version package.
+
+require_invalid_version-1.0-py3-none-any.whl
+--------------------------------------------
+This package has an invalid version specifier in its requirements.
diff --git a/tests/data/packages/require_invalid_version-0.1-py3-none-any.whl b/tests/data/packages/require_invalid_version-0.1-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..976b80b89a095138508dd05b015e2cbc62c8b174
GIT binary patch
literal 1059
zcmWIWW@Zs#U|`^2$e36c!7jg$-vY>U0%AQNE=nyd%`8fd&&(@J%*jlNFH0>d&dkr#
zHPAEEOUW!Q(ap?D%h&gH4RLgF3~~JItLy3GspENt*IQTX+?n&6gA6ViKl$W+#&>Iw
zhL^6+SskydXU}MRpE>DsQMXy+VUxBggVs|fh5!^d{Nbzijse;Y!rDZ;A>6~&)rb4M
zhws^o2-~k1KPd7)>#gghb5eg(kcZbv9lcI{_LYGb3@#WOUNgS%gzMCK{fl39uJLN<
zdYwJ#vnfbJQ_J@$m#5G6AdM9!*Up|k?|s$x%<3nP&>cCM?Ya>&&~c1FY)rHxOY#fi
zb5hGvbM#6oN*<$|srR7Q@fy&qc%Y#=M4K7p>g*rn(tFmssL6nV;lkc@&x};B39jNb
zOjiOVHJeHff9RamD8$2f00cM
z+va_~$9sGY?r?=V&)@CspYX-FYi^atmTDbY(_JgQQ-zpcM*2r+&M#ZN_*)O7lk`R{
z&)S~m>kr)6o47N0aDAE!uy4mQ-4q`F`!;LUe=ClM2FMO<+V5=V+9KgKhzO
dxppBJOCcTVcq}$

literal 0
HcmV?d00001

diff --git a/tests/data/packages/require_invalid_version-1.0-py3-none-any.whl b/tests/data/packages/require_invalid_version-1.0-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..3dd628a16d79577b4c869ec2c7cf80200d320517
GIT binary patch
literal 1083
zcmWIWW@Zs#U|`^2I6a{*f;GWj+aJiw1Y$iPE=nyd%`8fd&&(@J%*jlNFH0>d&dkr#
zHPkcEOUW!Q(ap?D%h&gH4RLgF3~~JItLy3GspENt*IQTX+?n&6gA6ViKl$W+#&>Iw
zhL^6+SskydXU}MRpE>DsQMXy+VUxD$72^k7O&VI)N>A$OZ47ba(v5ykKy_*zlV1g(qC6&g)s{1jz`$@}Z@TA-3rdFR
zAJ{(CCo?;)kv=``YKBU4!k*?;o5HfxR8sD??teS?%B{$itVi-!zMOqNdv2^@&GKZ;
z#2>w^t`b*&D0aWGk$>TOnfaJ{w7Y!?|CO!#q{MW0zPGrz`U8{mBDL*zD_40*y=s{q
zZ!>#Q&Ee-WmOQ*KIO|NgfBSF28Mh8Oev;doqOw-${U_7N(D&6d+(dJP1S{@7vFgp~
zxxLu_cyx~VF?O9dRUH2F7+xLHDBM=Ki8Fxb)vqDV``$Yx_p
zcMy{q7`8OdCfaOpDnvIJJ*^-Nb^yjSagIhwImi}ZOE?G%rVwobBpC&Gv$BD7vjAZM
KQ14bI5Dx&s<8sRY

literal 0
HcmV?d00001

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index ea0bc6371e0..08d31ec2ace 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -13,3 +13,17 @@ def test_install_from_index_with_invalid_version(
         "install", "--dry-run", "--index-url", index_url, "invalid-version"
     )
     assert "Would install invalid-version-1.0" in result.stdout
+
+
+def test_install_from_index_with_invalid_specifier(
+    script: PipTestEnvironment, data: TestData
+) -> None:
+    """
+    Test that pip does not crash when installing a package with an invalid
+    version specifier in its dependencies.
+    """
+    index_url = data.index_url("require-invalid-version")
+    result = script.pip(
+        "install", "--dry-run", "--index-url", index_url, "require-invalid-version"
+    )
+    assert "Would install require-invalid-version-0.1" in result.stdout

From bf8b887ebfcb48eab4bd4905db359949a59a57c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 6 Apr 2024 17:20:58 +0200
Subject: [PATCH 380/992] Discard candidates with invalid dependencies

---
 src/pip/_internal/exceptions.py                       | 11 +++++++++++
 src/pip/_internal/resolution/resolvelib/candidates.py |  9 +++++++++
 src/pip/_internal/resolution/resolvelib/factory.py    |  5 +++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index 0609e450683..0542d12cc01 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -358,6 +358,17 @@ def __str__(self) -> str:
         )
 
 
+class MetadataInvalid(InstallationError):
+    """Metadata is invalid."""
+
+    def __init__(self, ireq: "InstallRequirement", error: str) -> None:
+        self.ireq = ireq
+        self.error = error
+
+    def __str__(self) -> str:
+        return f"Requested {self.ireq} has invalid metadata: {self.error}"
+
+
 class InstallationSubprocessError(DiagnosticPipError, InstallationError):
     """A subprocess call failed."""
 
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index a8d7d78da7c..d30d477be68 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -2,6 +2,7 @@
 import sys
 from typing import TYPE_CHECKING, Any, FrozenSet, Iterable, Optional, Tuple, Union, cast
 
+from pip._vendor.packaging.requirements import InvalidRequirement
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
 from pip._vendor.packaging.version import Version
 
@@ -9,6 +10,7 @@
     HashError,
     InstallationSubprocessError,
     MetadataInconsistent,
+    MetadataInvalid,
 )
 from pip._internal.metadata import BaseDistribution
 from pip._internal.models.link import Link, links_equivalent
@@ -220,6 +222,13 @@ def _check_metadata_consistency(self, dist: BaseDistribution) -> None:
                 str(self._version),
                 str(dist.version),
             )
+        # check dependencies are valid
+        # TODO performance: this means we iterate the dependencies at least twice,
+        # we may want to cache parsed Requires-Dist
+        try:
+            list(dist.iter_dependencies(list(dist.iter_provided_extras())))
+        except InvalidRequirement as e:
+            raise MetadataInvalid(self._ireq, str(e))
 
     def _prepare(self) -> BaseDistribution:
         try:
diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
index 6de5d698e16..cebdeebad01 100644
--- a/src/pip/_internal/resolution/resolvelib/factory.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -31,6 +31,7 @@
     DistributionNotFound,
     InstallationError,
     MetadataInconsistent,
+    MetadataInvalid,
     UnsupportedPythonVersion,
     UnsupportedWheel,
 )
@@ -213,7 +214,7 @@ def _make_base_candidate_from_link(
                         name=name,
                         version=version,
                     )
-                except MetadataInconsistent as e:
+                except (MetadataInconsistent, MetadataInvalid) as e:
                     logger.info(
                         "Discarding [blue underline]%s[/]: [yellow]%s[reset]",
                         link,
@@ -234,7 +235,7 @@ def _make_base_candidate_from_link(
                         name=name,
                         version=version,
                     )
-                except MetadataInconsistent as e:
+                except (MetadataInconsistent, MetadataInvalid) as e:
                     logger.info(
                         "Discarding [blue underline]%s[/]: [yellow]%s[reset]",
                         link,

From c44c6a4aec68a31d3584450c20c53177ea25445a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 15:42:18 +0200
Subject: [PATCH 381/992] Add failing test for uninstallation of dist with
 legacy version

---
 .../test_invalid_versions_and_specifiers.py        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 08d31ec2ace..8df90de708d 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -1,3 +1,5 @@
+import zipfile
+
 from tests.lib import PipTestEnvironment, TestData
 
 
@@ -27,3 +29,15 @@ def test_install_from_index_with_invalid_specifier(
         "install", "--dry-run", "--index-url", index_url, "require-invalid-version"
     )
     assert "Would install require-invalid-version-0.1" in result.stdout
+
+
+def test_uninstall_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
+    """
+    Test that it is possible to uninstall a package with an invalid version.
+    """
+    # install package with legacy version in site packages
+    with zipfile.ZipFile(
+        data.packages.joinpath("invalid_version-2010i-py3-none-any.whl")
+    ) as zf:
+        zf.extractall(script.site_packages_path)
+    script.pip("uninstall", "-y", "invalid-version")

From 73f67440a9ac3c68bf317fa62cccec6a0c3ee98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 15:44:32 +0200
Subject: [PATCH 382/992] Allow uninstallation of dist with legacy version

We do this by adding a version_str property to BaseDistribution,
which allows us to access the version without parsing it.
---
 src/pip/_internal/metadata/base.py             | 8 ++++++--
 src/pip/_internal/metadata/importlib/_dists.py | 4 ++++
 src/pip/_internal/metadata/pkg_resources.py    | 4 ++++
 src/pip/_internal/req/req_uninstall.py         | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py
index ac585c717e6..aba6e3a3a9f 100644
--- a/src/pip/_internal/metadata/base.py
+++ b/src/pip/_internal/metadata/base.py
@@ -138,10 +138,10 @@ def from_wheel(cls, wheel: "Wheel", name: str) -> "BaseDistribution":
         raise NotImplementedError()
 
     def __repr__(self) -> str:
-        return f"{self.raw_name} {self.version} ({self.location})"
+        return f"{self.raw_name} {self.version_str} ({self.location})"
 
     def __str__(self) -> str:
-        return f"{self.raw_name} {self.version}"
+        return f"{self.raw_name} {self.version_str}"
 
     @property
     def location(self) -> Optional[str]:
@@ -275,6 +275,10 @@ def canonical_name(self) -> NormalizedName:
     def version(self) -> Version:
         raise NotImplementedError()
 
+    @property
+    def version_str(self) -> str:
+        raise NotImplementedError()
+
     @property
     def setuptools_filename(self) -> str:
         """Convert a project name to its setuptools-compatible filename.
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index 94a13a280d3..2fa32f6877b 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -174,6 +174,10 @@ def canonical_name(self) -> NormalizedName:
     def version(self) -> Version:
         return parse_version(self._dist.version)
 
+    @property
+    def version_str(self) -> str:
+        return self._dist.version
+
     def is_file(self, path: InfoPath) -> bool:
         return self._dist.read_text(str(path)) is not None
 
diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py
index 3786b7cd394..c31c5673143 100644
--- a/src/pip/_internal/metadata/pkg_resources.py
+++ b/src/pip/_internal/metadata/pkg_resources.py
@@ -193,6 +193,10 @@ def canonical_name(self) -> NormalizedName:
     def version(self) -> Version:
         return parse_version(self._dist.version)
 
+    @property
+    def version_str(self) -> str:
+        return self._dist.version
+
     def is_file(self, path: InfoPath) -> bool:
         return self._dist.has_metadata(str(path))
 
diff --git a/src/pip/_internal/req/req_uninstall.py b/src/pip/_internal/req/req_uninstall.py
index 3a9ae2b1097..f3e49f98709 100644
--- a/src/pip/_internal/req/req_uninstall.py
+++ b/src/pip/_internal/req/req_uninstall.py
@@ -367,7 +367,7 @@ def remove(self, auto_confirm: bool = False, verbose: bool = False) -> None:
             )
             return
 
-        dist_name_version = f"{self._dist.raw_name}-{self._dist.version}"
+        dist_name_version = f"{self._dist.raw_name}-{self._dist.version_str}"
         logger.info("Uninstalling %s:", dist_name_version)
 
         with indent_log():

From 056313220538a422808138882024f738000c83f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 15:46:29 +0200
Subject: [PATCH 383/992] Refactor test

---
 .../test_invalid_versions_and_specifiers.py          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 8df90de708d..4cea86bf33a 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -31,13 +31,19 @@ def test_install_from_index_with_invalid_specifier(
     assert "Would install require-invalid-version-0.1" in result.stdout
 
 
-def test_uninstall_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
+def _install_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
     """
-    Test that it is possible to uninstall a package with an invalid version.
+    Install a package with an invalid version.
     """
-    # install package with legacy version in site packages
     with zipfile.ZipFile(
         data.packages.joinpath("invalid_version-2010i-py3-none-any.whl")
     ) as zf:
         zf.extractall(script.site_packages_path)
+
+
+def test_uninstall_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
+    """
+    Test that it is possible to uninstall a package with an invalid version.
+    """
+    _install_invalid_version(script, data)
     script.pip("uninstall", "-y", "invalid-version")

From 27807fb5992ead09cee8c84e061e1c57c24df289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 15:48:00 +0200
Subject: [PATCH 384/992] Add failing test for pip list in presence of legacy
 version

---
 tests/functional/test_invalid_versions_and_specifiers.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 4cea86bf33a..5cc4a6b0978 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -47,3 +47,11 @@ def test_uninstall_invalid_version(script: PipTestEnvironment, data: TestData) -
     """
     _install_invalid_version(script, data)
     script.pip("uninstall", "-y", "invalid-version")
+
+
+def test_list_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
+    """
+    Test that pip can list an environment containing a package with a legacy version.
+    """
+    _install_invalid_version(script, data)
+    script.pip("list")

From 0529c044fa0089df0ca1d6bcee315ee6bd0a4909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 15:51:05 +0200
Subject: [PATCH 385/992] Fix pip list in presence of installed legacy versions

---
 src/pip/_internal/commands/list.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index 171461aebaf..5653907a1fe 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -333,7 +333,7 @@ def format_for_columns(
     for proj in pkgs:
         # if we're working on the 'outdated' list, separate out the
         # latest_version and type
-        row = [proj.raw_name, str(proj.version)]
+        row = [proj.raw_name, str(proj.version_str)]
 
         if running_outdated:
             row.append(str(proj.latest_version))

From 93e52cfa919ad2097fc3ed024049daa8d4caa564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 17:11:12 +0200
Subject: [PATCH 386/992] Add failing test for pip freeze in presence of legacy
 version

---
 tests/functional/test_invalid_versions_and_specifiers.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 5cc4a6b0978..45fb2ee1204 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -55,3 +55,12 @@ def test_list_invalid_version(script: PipTestEnvironment, data: TestData) -> Non
     """
     _install_invalid_version(script, data)
     script.pip("list")
+
+
+def test_freeze_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
+    """
+    Test that pip can freeze an environment containing a package with a legacy version.
+    """
+    _install_invalid_version(script, data)
+    result = script.pip("freeze")
+    assert "invalid-version===2010i\n" in result.stdout

From a28d13a2281b5f733b3294ce5fc7562114bb1c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 17:11:24 +0200
Subject: [PATCH 387/992] Fix pip freeze in presence of legacy version

---
 src/pip/_internal/operations/freeze.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pip/_internal/operations/freeze.py b/src/pip/_internal/operations/freeze.py
index 35445684514..de5563ba7d6 100644
--- a/src/pip/_internal/operations/freeze.py
+++ b/src/pip/_internal/operations/freeze.py
@@ -4,7 +4,7 @@
 from typing import Container, Dict, Generator, Iterable, List, NamedTuple, Optional, Set
 
 from pip._vendor.packaging.utils import canonicalize_name
-from pip._vendor.packaging.version import Version
+from pip._vendor.packaging.version import InvalidVersion
 
 from pip._internal.exceptions import BadCommand, InstallationError
 from pip._internal.metadata import BaseDistribution, get_environment
@@ -145,10 +145,13 @@ def freeze(
 
 
 def _format_as_name_version(dist: BaseDistribution) -> str:
-    dist_version = dist.version
-    if isinstance(dist_version, Version):
+    try:
+        dist_version = dist.version
+    except InvalidVersion:
+        # legacy version
+        return f"{dist.raw_name}==={dist.version_str}"
+    else:
         return f"{dist.raw_name}=={dist_version}"
-    return f"{dist.raw_name}==={dist_version}"
 
 
 def _get_editable_info(dist: BaseDistribution) -> _EditableInfo:

From be652aa19745f41d3b8874538fd185a707697b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 17:26:46 +0200
Subject: [PATCH 388/992] Add failing test for pip show of legacy version

---
 tests/functional/test_invalid_versions_and_specifiers.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 45fb2ee1204..1044d9e5689 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -64,3 +64,12 @@ def test_freeze_invalid_version(script: PipTestEnvironment, data: TestData) -> N
     _install_invalid_version(script, data)
     result = script.pip("freeze")
     assert "invalid-version===2010i\n" in result.stdout
+
+
+def test_show_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
+    """
+    Test that pip can show an installed distribution with a legacy version.
+    """
+    _install_invalid_version(script, data)
+    result = script.pip("show", "invalid-version")
+    assert "Name: invalid-version\nVersion: 2010i\n" in result.stdout

From 8f97eb592e2589b921fed5e4aacd44c9c56f778f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 17:28:05 +0200
Subject: [PATCH 389/992] Fix pip show of legacy version

---
 src/pip/_internal/commands/show.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py
index b7894ce1f9c..80809a3a997 100644
--- a/src/pip/_internal/commands/show.py
+++ b/src/pip/_internal/commands/show.py
@@ -139,7 +139,7 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
 
         yield _PackageInfo(
             name=dist.raw_name,
-            version=str(dist.version),
+            version=dist.version_str,
             location=dist.location or "",
             editable_project_location=dist.editable_project_location,
             requires=requires,

From 08ae751a26d4e957b0c6d6a5836212421095b248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 17:55:34 +0200
Subject: [PATCH 390/992] Upgrade packaging to 24.0

---
 news/packaging.vendor.rst                 |   2 +-
 src/pip/_vendor/packaging/__init__.py     |   2 +-
 src/pip/_vendor/packaging/_manylinux.py   |  14 ++-
 src/pip/_vendor/packaging/_parser.py      |   5 +-
 src/pip/_vendor/packaging/metadata.py     | 101 +++++++++++-----------
 src/pip/_vendor/packaging/requirements.py |   2 +-
 src/pip/_vendor/packaging/specifiers.py   |  63 ++++++++------
 src/pip/_vendor/packaging/tags.py         |  44 +++++++---
 src/pip/_vendor/vendor.txt                |   2 +-
 9 files changed, 135 insertions(+), 100 deletions(-)

diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst
index 1834f6df449..08f099e1cb3 100644
--- a/news/packaging.vendor.rst
+++ b/news/packaging.vendor.rst
@@ -1 +1 @@
-Upgrade packaging to 23.2
+Upgrade packaging to 24.0
diff --git a/src/pip/_vendor/packaging/__init__.py b/src/pip/_vendor/packaging/__init__.py
index 22809cfd5dc..e7c0aa12ca9 100644
--- a/src/pip/_vendor/packaging/__init__.py
+++ b/src/pip/_vendor/packaging/__init__.py
@@ -6,7 +6,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "23.2"
+__version__ = "24.0"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
diff --git a/src/pip/_vendor/packaging/_manylinux.py b/src/pip/_vendor/packaging/_manylinux.py
index 3705d50db91..ad62505f3ff 100644
--- a/src/pip/_vendor/packaging/_manylinux.py
+++ b/src/pip/_vendor/packaging/_manylinux.py
@@ -55,7 +55,15 @@ def _have_compatible_abi(executable: str, archs: Sequence[str]) -> bool:
         return _is_linux_armhf(executable)
     if "i686" in archs:
         return _is_linux_i686(executable)
-    allowed_archs = {"x86_64", "aarch64", "ppc64", "ppc64le", "s390x", "loongarch64"}
+    allowed_archs = {
+        "x86_64",
+        "aarch64",
+        "ppc64",
+        "ppc64le",
+        "s390x",
+        "loongarch64",
+        "riscv64",
+    }
     return any(arch in allowed_archs for arch in archs)
 
 
@@ -82,7 +90,7 @@ def _glibc_version_string_confstr() -> Optional[str]:
     # https://github.com/python/cpython/blob/fcf1d003bf4f0100c/Lib/platform.py#L175-L183
     try:
         # Should be a string like "glibc 2.17".
-        version_string: str = getattr(os, "confstr")("CS_GNU_LIBC_VERSION")
+        version_string: Optional[str] = os.confstr("CS_GNU_LIBC_VERSION")
         assert version_string is not None
         _, version = version_string.rsplit()
     except (AssertionError, AttributeError, OSError, ValueError):
@@ -174,7 +182,7 @@ def _is_compatible(arch: str, version: _GLibCVersion) -> bool:
         return False
     # Check for presence of _manylinux module.
     try:
-        import _manylinux  # noqa
+        import _manylinux
     except ImportError:
         return True
     if hasattr(_manylinux, "manylinux_compatible"):
diff --git a/src/pip/_vendor/packaging/_parser.py b/src/pip/_vendor/packaging/_parser.py
index 4576981c2dd..684df75457c 100644
--- a/src/pip/_vendor/packaging/_parser.py
+++ b/src/pip/_vendor/packaging/_parser.py
@@ -324,10 +324,7 @@ def _parse_marker_var(tokenizer: Tokenizer) -> MarkerVar:
 
 
 def process_env_var(env_var: str) -> Variable:
-    if (
-        env_var == "platform_python_implementation"
-        or env_var == "python_implementation"
-    ):
+    if env_var in ("platform_python_implementation", "python_implementation"):
         return Variable("platform_python_implementation")
     else:
         return Variable(env_var)
diff --git a/src/pip/_vendor/packaging/metadata.py b/src/pip/_vendor/packaging/metadata.py
index 87763455ab1..5e4c106c549 100644
--- a/src/pip/_vendor/packaging/metadata.py
+++ b/src/pip/_vendor/packaging/metadata.py
@@ -41,10 +41,10 @@ def __init_subclass__(*_args, **_kwargs):
 
 
 try:
-    ExceptionGroup = __builtins__.ExceptionGroup  # type: ignore[attr-defined]
-except AttributeError:
+    ExceptionGroup
+except NameError:  # pragma: no cover
 
-    class ExceptionGroup(Exception):  # type: ignore[no-redef]  # noqa: N818
+    class ExceptionGroup(Exception):  # noqa: N818
         """A minimal implementation of :external:exc:`ExceptionGroup` from Python 3.11.
 
         If :external:exc:`ExceptionGroup` is already defined by Python itself,
@@ -61,6 +61,9 @@ def __init__(self, message: str, exceptions: List[Exception]) -> None:
         def __repr__(self) -> str:
             return f"{self.__class__.__name__}({self.message!r}, {self.exceptions!r})"
 
+else:  # pragma: no cover
+    ExceptionGroup = ExceptionGroup
+
 
 class InvalidMetadata(ValueError):
     """A metadata field contains invalid data."""
@@ -505,24 +508,19 @@ def __get__(self, instance: "Metadata", _owner: Type["Metadata"]) -> T:
         # No need to check the cache as attribute lookup will resolve into the
         # instance's __dict__ before __get__ is called.
         cache = instance.__dict__
-        try:
-            value = instance._raw[self.name]  # type: ignore[literal-required]
-        except KeyError:
-            if self.name in _STRING_FIELDS:
-                value = ""
-            elif self.name in _LIST_FIELDS:
-                value = []
-            elif self.name in _DICT_FIELDS:
-                value = {}
-            else:  # pragma: no cover
-                assert False
+        value = instance._raw.get(self.name)
 
-        try:
-            converter: Callable[[Any], T] = getattr(self, f"_process_{self.name}")
-        except AttributeError:
-            pass
-        else:
-            value = converter(value)
+        # To make the _process_* methods easier, we'll check if the value is None
+        # and if this field is NOT a required attribute, and if both of those
+        # things are true, we'll skip the the converter. This will mean that the
+        # converters never have to deal with the None union.
+        if self.name in _REQUIRED_ATTRS or value is not None:
+            try:
+                converter: Callable[[Any], T] = getattr(self, f"_process_{self.name}")
+            except AttributeError:
+                pass
+            else:
+                value = converter(value)
 
         cache[self.name] = value
         try:
@@ -677,7 +675,7 @@ def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> "Metadata":
         ins._raw = data.copy()  # Mutations occur due to caching enriched values.
 
         if validate:
-            exceptions: List[InvalidMetadata] = []
+            exceptions: List[Exception] = []
             try:
                 metadata_version = ins.metadata_version
                 metadata_age = _VALID_METADATA_VERSIONS.index(metadata_version)
@@ -732,10 +730,10 @@ def from_email(
         If *validate* is true, the metadata will be validated. All exceptions
         related to validation will be gathered and raised as an :class:`ExceptionGroup`.
         """
-        exceptions: list[InvalidMetadata] = []
         raw, unparsed = parse_email(data)
 
         if validate:
+            exceptions: list[Exception] = []
             for unparsed_key in unparsed:
                 if unparsed_key in _EMAIL_TO_RAW_MAPPING:
                     message = f"{unparsed_key!r} has invalid data"
@@ -749,8 +747,9 @@ def from_email(
         try:
             return cls.from_raw(raw, validate=validate)
         except ExceptionGroup as exc_group:
-            exceptions.extend(exc_group.exceptions)
-            raise ExceptionGroup("invalid or unparsed metadata", exceptions) from None
+            raise ExceptionGroup(
+                "invalid or unparsed metadata", exc_group.exceptions
+            ) from None
 
     metadata_version: _Validator[_MetadataVersion] = _Validator()
     """:external:ref:`core-metadata-metadata-version`
@@ -761,62 +760,66 @@ def from_email(
     *validate* parameter)"""
     version: _Validator[version_module.Version] = _Validator()
     """:external:ref:`core-metadata-version` (required)"""
-    dynamic: _Validator[List[str]] = _Validator(
+    dynamic: _Validator[Optional[List[str]]] = _Validator(
         added="2.2",
     )
     """:external:ref:`core-metadata-dynamic`
     (validated against core metadata field names and lowercased)"""
-    platforms: _Validator[List[str]] = _Validator()
+    platforms: _Validator[Optional[List[str]]] = _Validator()
     """:external:ref:`core-metadata-platform`"""
-    supported_platforms: _Validator[List[str]] = _Validator(added="1.1")
+    supported_platforms: _Validator[Optional[List[str]]] = _Validator(added="1.1")
     """:external:ref:`core-metadata-supported-platform`"""
-    summary: _Validator[str] = _Validator()
+    summary: _Validator[Optional[str]] = _Validator()
     """:external:ref:`core-metadata-summary` (validated to contain no newlines)"""
-    description: _Validator[str] = _Validator()  # TODO 2.1: can be in body
+    description: _Validator[Optional[str]] = _Validator()  # TODO 2.1: can be in body
     """:external:ref:`core-metadata-description`"""
-    description_content_type: _Validator[str] = _Validator(added="2.1")
+    description_content_type: _Validator[Optional[str]] = _Validator(added="2.1")
     """:external:ref:`core-metadata-description-content-type` (validated)"""
-    keywords: _Validator[List[str]] = _Validator()
+    keywords: _Validator[Optional[List[str]]] = _Validator()
     """:external:ref:`core-metadata-keywords`"""
-    home_page: _Validator[str] = _Validator()
+    home_page: _Validator[Optional[str]] = _Validator()
     """:external:ref:`core-metadata-home-page`"""
-    download_url: _Validator[str] = _Validator(added="1.1")
+    download_url: _Validator[Optional[str]] = _Validator(added="1.1")
     """:external:ref:`core-metadata-download-url`"""
-    author: _Validator[str] = _Validator()
+    author: _Validator[Optional[str]] = _Validator()
     """:external:ref:`core-metadata-author`"""
-    author_email: _Validator[str] = _Validator()
+    author_email: _Validator[Optional[str]] = _Validator()
     """:external:ref:`core-metadata-author-email`"""
-    maintainer: _Validator[str] = _Validator(added="1.2")
+    maintainer: _Validator[Optional[str]] = _Validator(added="1.2")
     """:external:ref:`core-metadata-maintainer`"""
-    maintainer_email: _Validator[str] = _Validator(added="1.2")
+    maintainer_email: _Validator[Optional[str]] = _Validator(added="1.2")
     """:external:ref:`core-metadata-maintainer-email`"""
-    license: _Validator[str] = _Validator()
+    license: _Validator[Optional[str]] = _Validator()
     """:external:ref:`core-metadata-license`"""
-    classifiers: _Validator[List[str]] = _Validator(added="1.1")
+    classifiers: _Validator[Optional[List[str]]] = _Validator(added="1.1")
     """:external:ref:`core-metadata-classifier`"""
-    requires_dist: _Validator[List[requirements.Requirement]] = _Validator(added="1.2")
+    requires_dist: _Validator[Optional[List[requirements.Requirement]]] = _Validator(
+        added="1.2"
+    )
     """:external:ref:`core-metadata-requires-dist`"""
-    requires_python: _Validator[specifiers.SpecifierSet] = _Validator(added="1.2")
+    requires_python: _Validator[Optional[specifiers.SpecifierSet]] = _Validator(
+        added="1.2"
+    )
     """:external:ref:`core-metadata-requires-python`"""
     # Because `Requires-External` allows for non-PEP 440 version specifiers, we
     # don't do any processing on the values.
-    requires_external: _Validator[List[str]] = _Validator(added="1.2")
+    requires_external: _Validator[Optional[List[str]]] = _Validator(added="1.2")
     """:external:ref:`core-metadata-requires-external`"""
-    project_urls: _Validator[Dict[str, str]] = _Validator(added="1.2")
+    project_urls: _Validator[Optional[Dict[str, str]]] = _Validator(added="1.2")
     """:external:ref:`core-metadata-project-url`"""
     # PEP 685 lets us raise an error if an extra doesn't pass `Name` validation
     # regardless of metadata version.
-    provides_extra: _Validator[List[utils.NormalizedName]] = _Validator(
+    provides_extra: _Validator[Optional[List[utils.NormalizedName]]] = _Validator(
         added="2.1",
     )
     """:external:ref:`core-metadata-provides-extra`"""
-    provides_dist: _Validator[List[str]] = _Validator(added="1.2")
+    provides_dist: _Validator[Optional[List[str]]] = _Validator(added="1.2")
     """:external:ref:`core-metadata-provides-dist`"""
-    obsoletes_dist: _Validator[List[str]] = _Validator(added="1.2")
+    obsoletes_dist: _Validator[Optional[List[str]]] = _Validator(added="1.2")
     """:external:ref:`core-metadata-obsoletes-dist`"""
-    requires: _Validator[List[str]] = _Validator(added="1.1")
+    requires: _Validator[Optional[List[str]]] = _Validator(added="1.1")
     """``Requires`` (deprecated)"""
-    provides: _Validator[List[str]] = _Validator(added="1.1")
+    provides: _Validator[Optional[List[str]]] = _Validator(added="1.1")
     """``Provides`` (deprecated)"""
-    obsoletes: _Validator[List[str]] = _Validator(added="1.1")
+    obsoletes: _Validator[Optional[List[str]]] = _Validator(added="1.1")
     """``Obsoletes`` (deprecated)"""
diff --git a/src/pip/_vendor/packaging/requirements.py b/src/pip/_vendor/packaging/requirements.py
index 0c00eba331b..bdc43a7e98d 100644
--- a/src/pip/_vendor/packaging/requirements.py
+++ b/src/pip/_vendor/packaging/requirements.py
@@ -38,7 +38,7 @@ def __init__(self, requirement_string: str) -> None:
 
         self.name: str = parsed.name
         self.url: Optional[str] = parsed.url or None
-        self.extras: Set[str] = set(parsed.extras if parsed.extras else [])
+        self.extras: Set[str] = set(parsed.extras or [])
         self.specifier: SpecifierSet = SpecifierSet(parsed.specifier)
         self.marker: Optional[Marker] = None
         if parsed.marker is not None:
diff --git a/src/pip/_vendor/packaging/specifiers.py b/src/pip/_vendor/packaging/specifiers.py
index 7617726c385..3a6497e44e6 100644
--- a/src/pip/_vendor/packaging/specifiers.py
+++ b/src/pip/_vendor/packaging/specifiers.py
@@ -11,17 +11,7 @@
 import abc
 import itertools
 import re
-from typing import (
-    Callable,
-    Iterable,
-    Iterator,
-    List,
-    Optional,
-    Set,
-    Tuple,
-    TypeVar,
-    Union,
-)
+from typing import Callable, Iterable, Iterator, List, Optional, Tuple, TypeVar, Union
 
 from .utils import canonicalize_version
 from .version import Version
@@ -383,7 +373,7 @@ def _compare_compatible(self, prospective: Version, spec: str) -> bool:
 
         # We want everything but the last item in the version, but we want to
         # ignore suffix segments.
-        prefix = ".".join(
+        prefix = _version_join(
             list(itertools.takewhile(_is_not_suffix, _version_split(spec)))[:-1]
         )
 
@@ -404,13 +394,13 @@ def _compare_equal(self, prospective: Version, spec: str) -> bool:
             )
             # Get the normalized version string ignoring the trailing .*
             normalized_spec = canonicalize_version(spec[:-2], strip_trailing_zero=False)
-            # Split the spec out by dots, and pretend that there is an implicit
-            # dot in between a release segment and a pre-release segment.
+            # Split the spec out by bangs and dots, and pretend that there is
+            # an implicit dot in between a release segment and a pre-release segment.
             split_spec = _version_split(normalized_spec)
 
-            # Split the prospective version out by dots, and pretend that there
-            # is an implicit dot in between a release segment and a pre-release
-            # segment.
+            # Split the prospective version out by bangs and dots, and pretend
+            # that there is an implicit dot in between a release segment and
+            # a pre-release segment.
             split_prospective = _version_split(normalized_prospective)
 
             # 0-pad the prospective version before shortening it to get the correct
@@ -644,8 +634,19 @@ def filter(
 
 
 def _version_split(version: str) -> List[str]:
+    """Split version into components.
+
+    The split components are intended for version comparison. The logic does
+    not attempt to retain the original version string, so joining the
+    components back with :func:`_version_join` may not produce the original
+    version string.
+    """
     result: List[str] = []
-    for item in version.split("."):
+
+    epoch, _, rest = version.rpartition("!")
+    result.append(epoch or "0")
+
+    for item in rest.split("."):
         match = _prefix_regex.search(item)
         if match:
             result.extend(match.groups())
@@ -654,6 +655,17 @@ def _version_split(version: str) -> List[str]:
     return result
 
 
+def _version_join(components: List[str]) -> str:
+    """Join split version components into a version string.
+
+    This function assumes the input came from :func:`_version_split`, where the
+    first component must be the epoch (either empty or numeric), and all other
+    components numeric.
+    """
+    epoch, *rest = components
+    return f"{epoch}!{'.'.join(rest)}"
+
+
 def _is_not_suffix(segment: str) -> bool:
     return not any(
         segment.startswith(prefix) for prefix in ("dev", "a", "b", "rc", "post")
@@ -675,7 +687,10 @@ def _pad_version(left: List[str], right: List[str]) -> Tuple[List[str], List[str
     left_split.insert(1, ["0"] * max(0, len(right_split[0]) - len(left_split[0])))
     right_split.insert(1, ["0"] * max(0, len(left_split[0]) - len(right_split[0])))
 
-    return (list(itertools.chain(*left_split)), list(itertools.chain(*right_split)))
+    return (
+        list(itertools.chain.from_iterable(left_split)),
+        list(itertools.chain.from_iterable(right_split)),
+    )
 
 
 class SpecifierSet(BaseSpecifier):
@@ -707,14 +722,8 @@ def __init__(
         # strip each item to remove leading/trailing whitespace.
         split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
 
-        # Parsed each individual specifier, attempting first to make it a
-        # Specifier.
-        parsed: Set[Specifier] = set()
-        for specifier in split_specifiers:
-            parsed.add(Specifier(specifier))
-
-        # Turn our parsed specifiers into a frozen set and save them for later.
-        self._specs = frozenset(parsed)
+        # Make each individual specifier a Specifier and save in a frozen set for later.
+        self._specs = frozenset(map(Specifier, split_specifiers))
 
         # Store our prereleases value so we can use it later to determine if
         # we accept prereleases or not.
diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
index 37f33b1ef84..89f1926137d 100644
--- a/src/pip/_vendor/packaging/tags.py
+++ b/src/pip/_vendor/packaging/tags.py
@@ -4,6 +4,7 @@
 
 import logging
 import platform
+import re
 import struct
 import subprocess
 import sys
@@ -124,20 +125,37 @@ def _normalize_string(string: str) -> str:
     return string.replace(".", "_").replace("-", "_").replace(" ", "_")
 
 
-def _abi3_applies(python_version: PythonVersion) -> bool:
+def _is_threaded_cpython(abis: List[str]) -> bool:
+    """
+    Determine if the ABI corresponds to a threaded (`--disable-gil`) build.
+
+    The threaded builds are indicated by a "t" in the abiflags.
+    """
+    if len(abis) == 0:
+        return False
+    # expect e.g., cp313
+    m = re.match(r"cp\d+(.*)", abis[0])
+    if not m:
+        return False
+    abiflags = m.group(1)
+    return "t" in abiflags
+
+
+def _abi3_applies(python_version: PythonVersion, threading: bool) -> bool:
     """
     Determine if the Python version supports abi3.
 
-    PEP 384 was first implemented in Python 3.2.
+    PEP 384 was first implemented in Python 3.2. The threaded (`--disable-gil`)
+    builds do not support abi3.
     """
-    return len(python_version) > 1 and tuple(python_version) >= (3, 2)
+    return len(python_version) > 1 and tuple(python_version) >= (3, 2) and not threading
 
 
 def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> List[str]:
     py_version = tuple(py_version)  # To allow for version comparison.
     abis = []
     version = _version_nodot(py_version[:2])
-    debug = pymalloc = ucs4 = ""
+    threading = debug = pymalloc = ucs4 = ""
     with_debug = _get_config_var("Py_DEBUG", warn)
     has_refcount = hasattr(sys, "gettotalrefcount")
     # Windows doesn't set Py_DEBUG, so checking for support of debug-compiled
@@ -146,6 +164,8 @@ def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> List[str]:
     has_ext = "_d.pyd" in EXTENSION_SUFFIXES
     if with_debug or (with_debug is None and (has_refcount or has_ext)):
         debug = "d"
+    if py_version >= (3, 13) and _get_config_var("Py_GIL_DISABLED", warn):
+        threading = "t"
     if py_version < (3, 8):
         with_pymalloc = _get_config_var("WITH_PYMALLOC", warn)
         if with_pymalloc or with_pymalloc is None:
@@ -159,13 +179,8 @@ def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> List[str]:
     elif debug:
         # Debug builds can also load "normal" extension modules.
         # We can also assume no UCS-4 or pymalloc requirement.
-        abis.append(f"cp{version}")
-    abis.insert(
-        0,
-        "cp{version}{debug}{pymalloc}{ucs4}".format(
-            version=version, debug=debug, pymalloc=pymalloc, ucs4=ucs4
-        ),
-    )
+        abis.append(f"cp{version}{threading}")
+    abis.insert(0, f"cp{version}{threading}{debug}{pymalloc}{ucs4}")
     return abis
 
 
@@ -213,11 +228,14 @@ def cpython_tags(
     for abi in abis:
         for platform_ in platforms:
             yield Tag(interpreter, abi, platform_)
-    if _abi3_applies(python_version):
+
+    threading = _is_threaded_cpython(abis)
+    use_abi3 = _abi3_applies(python_version, threading)
+    if use_abi3:
         yield from (Tag(interpreter, "abi3", platform_) for platform_ in platforms)
     yield from (Tag(interpreter, "none", platform_) for platform_ in platforms)
 
-    if _abi3_applies(python_version):
+    if use_abi3:
         for minor_version in range(python_version[1] - 1, 1, -1):
             for platform_ in platforms:
                 interpreter = "cp{version}".format(
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 75eeb1e0658..e433acf8e04 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -3,7 +3,7 @@ colorama==0.4.6
 distlib==0.3.8
 distro==1.9.0
 msgpack==1.0.8
-packaging==23.2
+packaging==24.0
 platformdirs==4.2.1
 pyproject-hooks==1.0.0
 requests==2.31.0

From 196d536e565d851ad12e85afd134c823290a382c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 7 Apr 2024 18:56:24 +0200
Subject: [PATCH 391/992] Add news

---
 news/12063.removal.rst | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 news/12063.removal.rst

diff --git a/news/12063.removal.rst b/news/12063.removal.rst
new file mode 100644
index 00000000000..03d785d69c5
--- /dev/null
+++ b/news/12063.removal.rst
@@ -0,0 +1,4 @@
+Remove support for legacy versions and dependency specifiers. Packages with non
+standard-compliant versions or dependency specifiers are now ignored by the resolver.
+Already installed packages with non standard-compliant versions or dependency specifiers
+must be uninstalled before upgrading them.

From 83e77bfc66bf54f036bf6554525f40e63918817c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 13 Apr 2024 18:52:24 +0200
Subject: [PATCH 392/992] Add test sdist that requires invalid version

---
 .../require-invalid-version/index.html            |   1 +
 tests/data/packages/README.txt                    |   4 ++++
 .../packages/require_invalid_version-1.0.tar.gz   | Bin 0 -> 319 bytes
 3 files changed, 5 insertions(+)
 create mode 100644 tests/data/packages/require_invalid_version-1.0.tar.gz

diff --git a/tests/data/indexes/require-invalid-version/require-invalid-version/index.html b/tests/data/indexes/require-invalid-version/require-invalid-version/index.html
index 66afe3e6daa..4b3300db082 100644
--- a/tests/data/indexes/require-invalid-version/require-invalid-version/index.html
+++ b/tests/data/indexes/require-invalid-version/require-invalid-version/index.html
@@ -3,5 +3,6 @@
   
     require_invalid_version-0.1-py3-none-any.whl
     require_invalid_version-1.0-py3-none-any.whl
+    require_invalid_version-1.0.tar.gz
   
 
diff --git a/tests/data/packages/README.txt b/tests/data/packages/README.txt
index bdf1a4fa22c..067ee98225c 100644
--- a/tests/data/packages/README.txt
+++ b/tests/data/packages/README.txt
@@ -120,3 +120,7 @@ A valid variant of the require-invalid-version package.
 require_invalid_version-1.0-py3-none-any.whl
 --------------------------------------------
 This package has an invalid version specifier in its requirements.
+
+require_invalid_version-1.0.tar.gz
+----------------------------------
+This package has an invalid version specifier in its requirements.
diff --git a/tests/data/packages/require_invalid_version-1.0.tar.gz b/tests/data/packages/require_invalid_version-1.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..9db066988ff29cea6330da97f3a3f1b1dabaf686
GIT binary patch
literal 319
zcmb2|=3oE==C@b;y$>5muzi^KS<~tLTF=?b0$%uv2rjSqV04Tln{VRR{#>&Uw`cFP
zO5MSi7JB4)x#kxAEe|W_Z~K**8f9yKHA>glF#h#6<5JNN6XsSbC;H7&o2~6H{O#kf
zV~?GTW*#Zjx+5b#hqGTTx%R+>(DYF6mEo@*?o2-ae?^(X|J|=oKgcR7{C%}NhiRIV
z%$fP>?|*WO@7aAY^-ZAJF~
Date: Sat, 13 Apr 2024 19:09:58 +0200
Subject: [PATCH 393/992] Ignore all candidates of a version when one has
 invalid metadata

We do this to avoid needlessly building a sdist when
we have determined that a wheel has invalid metadata.
---
 .../resolution/resolvelib/factory.py          |  2 +-
 .../resolution/resolvelib/found_candidates.py | 29 +++++++++++++++----
 .../test_invalid_versions_and_specifiers.py   | 11 ++++++-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
index cebdeebad01..1f31d834b04 100644
--- a/src/pip/_internal/resolution/resolvelib/factory.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -235,7 +235,7 @@ def _make_base_candidate_from_link(
                         name=name,
                         version=version,
                     )
-                except (MetadataInconsistent, MetadataInvalid) as e:
+                except MetadataInconsistent as e:
                     logger.info(
                         "Discarding [blue underline]%s[/]: [yellow]%s[reset]",
                         link,
diff --git a/src/pip/_internal/resolution/resolvelib/found_candidates.py b/src/pip/_internal/resolution/resolvelib/found_candidates.py
index 8663097b447..a1d57e0f4b2 100644
--- a/src/pip/_internal/resolution/resolvelib/found_candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/found_candidates.py
@@ -9,13 +9,18 @@
 """
 
 import functools
+import logging
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any, Callable, Iterator, Optional, Set, Tuple
 
 from pip._vendor.packaging.version import _BaseVersion
 
+from pip._internal.exceptions import MetadataInvalid
+
 from .base import Candidate
 
+logger = logging.getLogger(__name__)
+
 IndexCandidateInfo = Tuple[_BaseVersion, Callable[[], Optional[Candidate]]]
 
 if TYPE_CHECKING:
@@ -44,11 +49,25 @@ def _iter_built(infos: Iterator[IndexCandidateInfo]) -> Iterator[Candidate]:
     for version, func in infos:
         if version in versions_found:
             continue
-        candidate = func()
-        if candidate is None:
-            continue
-        yield candidate
-        versions_found.add(version)
+        try:
+            candidate = func()
+        except MetadataInvalid as e:
+            logger.warning(
+                "Ignoring version %s of %s since it has invalid metadata:\n"
+                "%s\n"
+                "Please use pip<24.1 if you need to use this version.",
+                version,
+                e.ireq.name,
+                e,
+            )
+            # Mark version as found to avoid trying other candidates with the same
+            # version, since they most likely have invalid metadata as well.
+            versions_found.add(version)
+        else:
+            if candidate is None:
+                continue
+            yield candidate
+            versions_found.add(version)
 
 
 def _iter_built_with_prepended(
diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 1044d9e5689..d661b39c0ae 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -26,8 +26,17 @@ def test_install_from_index_with_invalid_specifier(
     """
     index_url = data.index_url("require-invalid-version")
     result = script.pip(
-        "install", "--dry-run", "--index-url", index_url, "require-invalid-version"
+        "install",
+        "--dry-run",
+        "--index-url",
+        index_url,
+        "require-invalid-version",
+        allow_stderr_warning=True,
     )
+    assert (
+        "WARNING: Ignoring version 1.0 of require-invalid-version "
+        "since it has invalid metadata"
+    ) in result.stderr
     assert "Would install require-invalid-version-0.1" in result.stdout
 
 

From 350c9803455074defae70c7a3b2384bf173f8d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 13 Apr 2024 19:16:56 +0200
Subject: [PATCH 394/992] Simplify

Co-authored-by: Tzu-ping Chung 
---
 src/pip/_internal/commands/list.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index 5653907a1fe..76bd2634934 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -333,7 +333,7 @@ def format_for_columns(
     for proj in pkgs:
         # if we're working on the 'outdated' list, separate out the
         # latest_version and type
-        row = [proj.raw_name, str(proj.version_str)]
+        row = [proj.raw_name, proj.version_str]
 
         if running_outdated:
             row.append(str(proj.latest_version))

From f4b821c13f95d7ed54a03687de202ab1aa51e86b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 13 Apr 2024 19:19:59 +0200
Subject: [PATCH 395/992] Don't create a list when an iterator is sufficient

---
 src/pip/_internal/metadata/pkg_resources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py
index c31c5673143..2741d3a6309 100644
--- a/src/pip/_internal/metadata/pkg_resources.py
+++ b/src/pip/_internal/metadata/pkg_resources.py
@@ -249,7 +249,7 @@ def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requiremen
         return self._dist.requires(extras)
 
     def iter_provided_extras(self) -> Iterable[NormalizedName]:
-        return list(self._extra_mapping.keys())
+        return self._extra_mapping.keys()
 
 
 class Environment(BaseEnvironment):

From c50290efe36095d4f46319d1e3f423a1b58397a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 14 Apr 2024 10:58:51 +0200
Subject: [PATCH 396/992] Rename version_str to raw_version for consistency
 with raw_name

---
 src/pip/_internal/commands/list.py             | 2 +-
 src/pip/_internal/commands/show.py             | 2 +-
 src/pip/_internal/metadata/base.py             | 6 +++---
 src/pip/_internal/metadata/importlib/_dists.py | 2 +-
 src/pip/_internal/metadata/pkg_resources.py    | 2 +-
 src/pip/_internal/operations/freeze.py         | 2 +-
 src/pip/_internal/req/req_uninstall.py         | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index 76bd2634934..cb1e313f468 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -333,7 +333,7 @@ def format_for_columns(
     for proj in pkgs:
         # if we're working on the 'outdated' list, separate out the
         # latest_version and type
-        row = [proj.raw_name, proj.version_str]
+        row = [proj.raw_name, proj.raw_version]
 
         if running_outdated:
             row.append(str(proj.latest_version))
diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py
index 80809a3a997..b478da118e0 100644
--- a/src/pip/_internal/commands/show.py
+++ b/src/pip/_internal/commands/show.py
@@ -139,7 +139,7 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
 
         yield _PackageInfo(
             name=dist.raw_name,
-            version=dist.version_str,
+            version=dist.raw_version,
             location=dist.location or "",
             editable_project_location=dist.editable_project_location,
             requires=requires,
diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py
index aba6e3a3a9f..2652333e86b 100644
--- a/src/pip/_internal/metadata/base.py
+++ b/src/pip/_internal/metadata/base.py
@@ -138,10 +138,10 @@ def from_wheel(cls, wheel: "Wheel", name: str) -> "BaseDistribution":
         raise NotImplementedError()
 
     def __repr__(self) -> str:
-        return f"{self.raw_name} {self.version_str} ({self.location})"
+        return f"{self.raw_name} {self.raw_version} ({self.location})"
 
     def __str__(self) -> str:
-        return f"{self.raw_name} {self.version_str}"
+        return f"{self.raw_name} {self.raw_version}"
 
     @property
     def location(self) -> Optional[str]:
@@ -276,7 +276,7 @@ def version(self) -> Version:
         raise NotImplementedError()
 
     @property
-    def version_str(self) -> str:
+    def raw_version(self) -> str:
         raise NotImplementedError()
 
     @property
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index 2fa32f6877b..f65ccb1e706 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -175,7 +175,7 @@ def version(self) -> Version:
         return parse_version(self._dist.version)
 
     @property
-    def version_str(self) -> str:
+    def raw_version(self) -> str:
         return self._dist.version
 
     def is_file(self, path: InfoPath) -> bool:
diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py
index 2741d3a6309..235556781c6 100644
--- a/src/pip/_internal/metadata/pkg_resources.py
+++ b/src/pip/_internal/metadata/pkg_resources.py
@@ -194,7 +194,7 @@ def version(self) -> Version:
         return parse_version(self._dist.version)
 
     @property
-    def version_str(self) -> str:
+    def raw_version(self) -> str:
         return self._dist.version
 
     def is_file(self, path: InfoPath) -> bool:
diff --git a/src/pip/_internal/operations/freeze.py b/src/pip/_internal/operations/freeze.py
index de5563ba7d6..bb1039fb776 100644
--- a/src/pip/_internal/operations/freeze.py
+++ b/src/pip/_internal/operations/freeze.py
@@ -149,7 +149,7 @@ def _format_as_name_version(dist: BaseDistribution) -> str:
         dist_version = dist.version
     except InvalidVersion:
         # legacy version
-        return f"{dist.raw_name}==={dist.version_str}"
+        return f"{dist.raw_name}==={dist.raw_version}"
     else:
         return f"{dist.raw_name}=={dist_version}"
 
diff --git a/src/pip/_internal/req/req_uninstall.py b/src/pip/_internal/req/req_uninstall.py
index f3e49f98709..51ee01171ae 100644
--- a/src/pip/_internal/req/req_uninstall.py
+++ b/src/pip/_internal/req/req_uninstall.py
@@ -367,7 +367,7 @@ def remove(self, auto_confirm: bool = False, verbose: bool = False) -> None:
             )
             return
 
-        dist_name_version = f"{self._dist.raw_name}-{self._dist.version_str}"
+        dist_name_version = f"{self._dist.raw_name}-{self._dist.raw_version}"
         logger.info("Uninstalling %s:", dist_name_version)
 
         with indent_log():

From 00edcf4e87d3aa8ce265f011e917bba60bc963db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 21 Apr 2024 19:04:10 +0200
Subject: [PATCH 397/992] Add failing test for pip show of dist with legacy
 specifier

---
 .../test_invalid_versions_and_specifiers.py   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index d661b39c0ae..69a8afddaa2 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -50,6 +50,18 @@ def _install_invalid_version(script: PipTestEnvironment, data: TestData) -> None
         zf.extractall(script.site_packages_path)
 
 
+def _install_require_invalid_version(
+    script: PipTestEnvironment, data: TestData
+) -> None:
+    """
+    Install a package with an invalid version.
+    """
+    with zipfile.ZipFile(
+        data.packages.joinpath("require_invalid_version-1.0-py3-none-any.whl")
+    ) as zf:
+        zf.extractall(script.site_packages_path)
+
+
 def test_uninstall_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
     """
     Test that it is possible to uninstall a package with an invalid version.
@@ -82,3 +94,14 @@ def test_show_invalid_version(script: PipTestEnvironment, data: TestData) -> Non
     _install_invalid_version(script, data)
     result = script.pip("show", "invalid-version")
     assert "Name: invalid-version\nVersion: 2010i\n" in result.stdout
+
+
+def test_show_require_invalid_version(
+    script: PipTestEnvironment, data: TestData
+) -> None:
+    """
+    Test that pip can show an installed distribution with a legacy specifier.
+    """
+    _install_require_invalid_version(script, data)
+    result = script.pip("show", "require-invalid-version")
+    assert "Name: require-invalid-version\nVersion: 1.0\n" in result.stdout

From f24fa663d2c307fecdb6001351b1a11d58890c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 21 Apr 2024 19:13:40 +0200
Subject: [PATCH 398/992] Add iterator of raw dependencie (Requires-Dist) to
 BaseDistribution

---
 src/pip/_internal/metadata/base.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py
index 2652333e86b..9eabcdb278b 100644
--- a/src/pip/_internal/metadata/base.py
+++ b/src/pip/_internal/metadata/base.py
@@ -445,6 +445,10 @@ def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requiremen
         """
         raise NotImplementedError()
 
+    def iter_raw_dependencies(self) -> Iterable[str]:
+        """Raw Requires-Dist metadata."""
+        return self.metadata.get_all("Requires-Dist", [])
+
     def iter_provided_extras(self) -> Iterable[NormalizedName]:
         """Extras provided by this distribution.
 

From d85efceb37f960479fcdf6c37f10bbca5f31b2c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 21 Apr 2024 19:14:09 +0200
Subject: [PATCH 399/992] Fix pip show of dist with legacy dependency
 specifiers

---
 src/pip/_internal/commands/show.py            | 20 +++++++++++++------
 .../test_invalid_versions_and_specifiers.py   |  2 ++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py
index b478da118e0..c54d548f5fb 100644
--- a/src/pip/_internal/commands/show.py
+++ b/src/pip/_internal/commands/show.py
@@ -2,6 +2,7 @@
 from optparse import Values
 from typing import Generator, Iterable, Iterator, List, NamedTuple, Optional
 
+from pip._vendor.packaging.requirements import InvalidRequirement
 from pip._vendor.packaging.utils import canonicalize_name
 
 from pip._internal.cli.base_command import Command
@@ -100,12 +101,19 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
         except KeyError:
             continue
 
-        requires = sorted(
-            # Avoid duplicates in requirements (e.g. due to environment markers).
-            {req.name for req in dist.iter_dependencies()},
-            key=str.lower,
-        )
-        required_by = sorted(_get_requiring_packages(dist), key=str.lower)
+        try:
+            requires = sorted(
+                # Avoid duplicates in requirements (e.g. due to environment markers).
+                {req.name for req in dist.iter_dependencies()},
+                key=str.lower,
+            )
+        except InvalidRequirement:
+            requires = sorted(dist.iter_raw_dependencies(), key=str.lower)
+
+        try:
+            required_by = sorted(_get_requiring_packages(dist), key=str.lower)
+        except InvalidRequirement:
+            required_by = ["#N/A"]
 
         try:
             entry_points_text = dist.read_text("entry_points.txt")
diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 69a8afddaa2..9a4615b9e49 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -105,3 +105,5 @@ def test_show_require_invalid_version(
     _install_require_invalid_version(script, data)
     result = script.pip("show", "require-invalid-version")
     assert "Name: require-invalid-version\nVersion: 1.0\n" in result.stdout
+    assert "Requires: invalid-version ==2010i\n" in result.stdout
+    assert "Required-by: #N/A\n" in result.stdout

From 4052f6a6700bc20d7bfd657baed044aaf3870292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Mon, 22 Apr 2024 08:31:32 +0200
Subject: [PATCH 400/992] Clarify warning messages

Dependencies should be more precise than requirements;
---
 src/pip/_internal/operations/check.py | 2 +-
 tests/functional/test_check.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/operations/check.py b/src/pip/_internal/operations/check.py
index ee1a5bcfe06..623db76e229 100644
--- a/src/pip/_internal/operations/check.py
+++ b/src/pip/_internal/operations/check.py
@@ -43,7 +43,7 @@ def create_package_set_from_installed() -> Tuple[PackageSet, bool]:
             package_set[name] = PackageDetails(dist.version, dependencies)
         except (OSError, ValueError) as e:
             # Don't crash on unreadable or broken metadata.
-            logger.warning("Error parsing requirements for %s: %s", name, e)
+            logger.warning("Error parsing dependencies of %s: %s", name, e)
             problems = True
     return package_set, problems
 
diff --git a/tests/functional/test_check.py b/tests/functional/test_check.py
index 79b6df39c19..46ecdcc6457 100644
--- a/tests/functional/test_check.py
+++ b/tests/functional/test_check.py
@@ -272,7 +272,7 @@ def test_basic_check_broken_metadata(script: PipTestEnvironment) -> None:
 
     result = script.pip("check", expect_error=True)
 
-    assert "Error parsing requirements" in result.stderr
+    assert "Error parsing dependencies of" in result.stderr
     assert result.returncode == 1
 
 

From edc98cd174261de66954301e0998343d59fed9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 28 Apr 2024 13:42:04 +0200
Subject: [PATCH 401/992] Clarify test packages README

---
 tests/data/packages/README.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/data/packages/README.txt b/tests/data/packages/README.txt
index 067ee98225c..b957f158a3b 100644
--- a/tests/data/packages/README.txt
+++ b/tests/data/packages/README.txt
@@ -111,7 +111,8 @@ The invalid-version package with a legacy version.
 
 invalid_version-1.0-py3-none-any.whl
 ------------------------------------
-A valid variant of the invalid-version package.
+A valid variant of the invalid-version package. Used, for instance, to test that the
+version with invalid metadata is ignored in favor of this one.
 
 require_invalid_version-0.1-py3-none-any.whl
 --------------------------------------------

From 4bb5085384de20da5769a8204cc45cd28b8cc91e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 28 Apr 2024 19:11:30 +0200
Subject: [PATCH 402/992] Add a failing test for upgrading a distribution with
 an invalid version

---
 .../test_invalid_versions_and_specifiers.py        | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 9a4615b9e49..1d924d5d02f 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -1,5 +1,7 @@
 import zipfile
 
+import pytest
+
 from tests.lib import PipTestEnvironment, TestData
 
 
@@ -64,12 +66,22 @@ def _install_require_invalid_version(
 
 def test_uninstall_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
     """
-    Test that it is possible to uninstall a package with an invalid version.
+    Test that it is possible to uninstall a distribution with an invalid version.
     """
     _install_invalid_version(script, data)
     script.pip("uninstall", "-y", "invalid-version")
 
 
+@pytest.mark.xfail
+def test_upgrade_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
+    """
+    Test that it is possible to upgrade a distribution with an invalid version.
+    """
+    _install_invalid_version(script, data)
+    index_url = data.index_url("invalid-version")
+    script.pip("install", "--index-url", index_url, "invalid-version")
+
+
 def test_list_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
     """
     Test that pip can list an environment containing a package with a legacy version.

From c51fb4f9556b52194229502a801f7601c856d9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Thu, 2 May 2024 17:24:40 +0200
Subject: [PATCH 403/992] Add a failing test for upgrading a distribution with
 invalid metadata

---
 .../test_invalid_versions_and_specifiers.py          | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 1d924d5d02f..f48b92be71e 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -82,6 +82,18 @@ def test_upgrade_invalid_version(script: PipTestEnvironment, data: TestData) ->
     script.pip("install", "--index-url", index_url, "invalid-version")
 
 
+@pytest.mark.xfail
+def test_upgrade_require_invalid_version(
+    script: PipTestEnvironment, data: TestData
+) -> None:
+    """
+    Test that it is possible to upgrade a distribution with an invalid metadata.
+    """
+    _install_require_invalid_version(script, data)
+    index_url = data.index_url("require-invalid-version")
+    script.pip("install", "--index-url", index_url, "require-invalid-version")
+
+
 def test_list_invalid_version(script: PipTestEnvironment, data: TestData) -> None:
     """
     Test that pip can list an environment containing a package with a legacy version.

From 84ad55a7807060a3bfe2c9d4857d541439959945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Thu, 2 May 2024 18:48:47 +0200
Subject: [PATCH 404/992] Fix test_show_require_invalid_version with
 pkg_resources backend

The pkg_ressources metadata backend does not suffer from invalid metadata in this test case.
---
 tests/functional/test_invalid_versions_and_specifiers.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index f48b92be71e..21ce02085fc 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -2,6 +2,7 @@
 
 import pytest
 
+from pip._internal.metadata import select_backend
 from tests.lib import PipTestEnvironment, TestData
 
 
@@ -130,4 +131,9 @@ def test_show_require_invalid_version(
     result = script.pip("show", "require-invalid-version")
     assert "Name: require-invalid-version\nVersion: 1.0\n" in result.stdout
     assert "Requires: invalid-version ==2010i\n" in result.stdout
-    assert "Required-by: #N/A\n" in result.stdout
+    if select_backend().NAME == "importlib":
+        assert "Required-by: #N/A\n" in result.stdout
+    elif select_backend().NAME == "pkg_resources":
+        assert "Required-by: \n" in result.stdout
+    else:
+        assert False, "Unknown metadata backend"

From 50ada46ed487c5a3385aac82090c18f1cd0ea2a7 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 17 Apr 2024 20:11:42 -0400
Subject: [PATCH 405/992] Move warn_if_run_as_root() to utils

While it's reasonable to put this function in req_install.py, putting it
there unfortunately means importing a bunch of heavy network/index code
as well which isn't acceptable.
---
 src/pip/_internal/cli/req_command.py    | 34 -------------------------
 src/pip/_internal/commands/install.py   |  2 +-
 src/pip/_internal/commands/uninstall.py |  3 ++-
 src/pip/_internal/utils/misc.py         | 33 ++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
index 7a5580a8457..8acffb241ad 100644
--- a/src/pip/_internal/cli/req_command.py
+++ b/src/pip/_internal/cli/req_command.py
@@ -39,7 +39,6 @@
     TempDirectoryTypeRegistry,
     tempdir_kinds,
 )
-from pip._internal.utils.virtualenv import running_under_virtualenv
 
 if TYPE_CHECKING:
     from ssl import SSLContext
@@ -194,39 +193,6 @@ def handle_pip_version_check(self, options: Values) -> None:
 ]
 
 
-def warn_if_run_as_root() -> None:
-    """Output a warning for sudo users on Unix.
-
-    In a virtual environment, sudo pip still writes to virtualenv.
-    On Windows, users may run pip as Administrator without issues.
-    This warning only applies to Unix root users outside of virtualenv.
-    """
-    if running_under_virtualenv():
-        return
-    if not hasattr(os, "getuid"):
-        return
-    # On Windows, there are no "system managed" Python packages. Installing as
-    # Administrator via pip is the correct way of updating system environments.
-    #
-    # We choose sys.platform over utils.compat.WINDOWS here to enable Mypy platform
-    # checks: https://mypy.readthedocs.io/en/stable/common_issues.html
-    if sys.platform == "win32" or sys.platform == "cygwin":
-        return
-
-    if os.getuid() != 0:
-        return
-
-    logger.warning(
-        "Running pip as the 'root' user can result in broken permissions and "
-        "conflicting behaviour with the system package manager, possibly "
-        "rendering your system unusable."
-        "It is recommended to use a virtual environment instead: "
-        "https://pip.pypa.io/warnings/venv. "
-        "Use the --root-user-action option if you know what you are doing and "
-        "want to suppress this warning."
-    )
-
-
 def with_cleanup(func: Any) -> Any:
     """Decorator for common logic related to managing temporary
     directories.
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index a9e83f9d8cd..29276c243cc 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -14,7 +14,6 @@
 from pip._internal.cli.cmdoptions import make_target_python
 from pip._internal.cli.req_command import (
     RequirementCommand,
-    warn_if_run_as_root,
     with_cleanup,
 )
 from pip._internal.cli.status_codes import ERROR, SUCCESS
@@ -37,6 +36,7 @@
     ensure_dir,
     get_pip_version,
     protect_pip_from_modification_on_windows,
+    warn_if_run_as_root,
     write_output,
 )
 from pip._internal.utils.temp_dir import TempDirectory
diff --git a/src/pip/_internal/commands/uninstall.py b/src/pip/_internal/commands/uninstall.py
index f198fc313ff..32a0aa8a044 100644
--- a/src/pip/_internal/commands/uninstall.py
+++ b/src/pip/_internal/commands/uninstall.py
@@ -6,7 +6,7 @@
 
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import Command
-from pip._internal.cli.req_command import SessionCommandMixin, warn_if_run_as_root
+from pip._internal.cli.req_command import SessionCommandMixin
 from pip._internal.cli.status_codes import SUCCESS
 from pip._internal.exceptions import InstallationError
 from pip._internal.req import parse_requirements
@@ -17,6 +17,7 @@
 from pip._internal.utils.misc import (
     check_externally_managed,
     protect_pip_from_modification_on_windows,
+    warn_if_run_as_root,
 )
 
 logger = logging.getLogger(__name__)
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index 82b6261322d..48771c09919 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -745,3 +745,36 @@ def prepare_metadata_for_build_editable(
             config_settings=cs,
             _allow_fallback=_allow_fallback,
         )
+
+
+def warn_if_run_as_root() -> None:
+    """Output a warning for sudo users on Unix.
+
+    In a virtual environment, sudo pip still writes to virtualenv.
+    On Windows, users may run pip as Administrator without issues.
+    This warning only applies to Unix root users outside of virtualenv.
+    """
+    if running_under_virtualenv():
+        return
+    if not hasattr(os, "getuid"):
+        return
+    # On Windows, there are no "system managed" Python packages. Installing as
+    # Administrator via pip is the correct way of updating system environments.
+    #
+    # We choose sys.platform over utils.compat.WINDOWS here to enable Mypy platform
+    # checks: https://mypy.readthedocs.io/en/stable/common_issues.html
+    if sys.platform == "win32" or sys.platform == "cygwin":
+        return
+
+    if os.getuid() != 0:
+        return
+
+    logger.warning(
+        "Running pip as the 'root' user can result in broken permissions and "
+        "conflicting behaviour with the system package manager, possibly "
+        "rendering your system unusable."
+        "It is recommended to use a virtual environment instead: "
+        "https://pip.pypa.io/warnings/venv. "
+        "Use the --root-user-action option if you know what you are doing and "
+        "want to suppress this warning."
+    )

From 55cfa546c8193bc419335c424ee2dcddd767f605 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 17 Apr 2024 20:59:57 -0400
Subject: [PATCH 406/992] Move non requirement command classes out of
 req_command.py

By moving SessionCommandMixin and IndexGroupCommand into their own
module, lazy imports can be easily used.
---
 src/pip/_internal/cli/index_command.py | 172 +++++++++++++++++++++++++
 src/pip/_internal/cli/req_command.py   | 158 +----------------------
 src/pip/_internal/commands/list.py     |   2 +-
 tests/unit/test_base_command.py        |   2 +-
 tests/unit/test_commands.py            |   2 +-
 5 files changed, 181 insertions(+), 155 deletions(-)
 create mode 100644 src/pip/_internal/cli/index_command.py

diff --git a/src/pip/_internal/cli/index_command.py b/src/pip/_internal/cli/index_command.py
new file mode 100644
index 00000000000..4ff7b2c3a5d
--- /dev/null
+++ b/src/pip/_internal/cli/index_command.py
@@ -0,0 +1,172 @@
+"""
+Contains command classes which may interact with an index / the network.
+
+Unlike its sister module, req_command, this module still uses lazy imports
+so commands which don't always hit the network (e.g. list w/o --outdated or
+--uptodate) don't need waste time importing PipSession and friends.
+"""
+
+import logging
+import os
+import sys
+from optparse import Values
+from typing import TYPE_CHECKING, List, Optional
+
+from pip._internal.cli.base_command import Command
+from pip._internal.cli.command_context import CommandContextMixIn
+from pip._internal.exceptions import CommandError
+
+if TYPE_CHECKING:
+    from ssl import SSLContext
+
+    from pip._internal.network.session import PipSession
+
+logger = logging.getLogger(__name__)
+
+
+def _create_truststore_ssl_context() -> Optional["SSLContext"]:
+    if sys.version_info < (3, 10):
+        raise CommandError("The truststore feature is only available for Python 3.10+")
+
+    try:
+        import ssl
+    except ImportError:
+        logger.warning("Disabling truststore since ssl support is missing")
+        return None
+
+    try:
+        from pip._vendor import truststore
+    except ImportError as e:
+        raise CommandError(f"The truststore feature is unavailable: {e}")
+
+    return truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+
+
+class SessionCommandMixin(CommandContextMixIn):
+    """
+    A class mixin for command classes needing _build_session().
+    """
+
+    def __init__(self) -> None:
+        super().__init__()
+        self._session: Optional["PipSession"] = None
+
+    @classmethod
+    def _get_index_urls(cls, options: Values) -> Optional[List[str]]:
+        """Return a list of index urls from user-provided options."""
+        index_urls = []
+        if not getattr(options, "no_index", False):
+            url = getattr(options, "index_url", None)
+            if url:
+                index_urls.append(url)
+        urls = getattr(options, "extra_index_urls", None)
+        if urls:
+            index_urls.extend(urls)
+        # Return None rather than an empty list
+        return index_urls or None
+
+    def get_default_session(self, options: Values) -> "PipSession":
+        """Get a default-managed session."""
+        if self._session is None:
+            self._session = self.enter_context(self._build_session(options))
+            # there's no type annotation on requests.Session, so it's
+            # automatically ContextManager[Any] and self._session becomes Any,
+            # then https://github.com/python/mypy/issues/7696 kicks in
+            assert self._session is not None
+        return self._session
+
+    def _build_session(
+        self,
+        options: Values,
+        retries: Optional[int] = None,
+        timeout: Optional[int] = None,
+        fallback_to_certifi: bool = False,
+    ) -> "PipSession":
+        from pip._internal.network.session import PipSession
+
+        cache_dir = options.cache_dir
+        assert not cache_dir or os.path.isabs(cache_dir)
+
+        if "truststore" in options.features_enabled:
+            try:
+                ssl_context = _create_truststore_ssl_context()
+            except Exception:
+                if not fallback_to_certifi:
+                    raise
+                ssl_context = None
+        else:
+            ssl_context = None
+
+        session = PipSession(
+            cache=os.path.join(cache_dir, "http-v2") if cache_dir else None,
+            retries=retries if retries is not None else options.retries,
+            trusted_hosts=options.trusted_hosts,
+            index_urls=self._get_index_urls(options),
+            ssl_context=ssl_context,
+        )
+
+        # Handle custom ca-bundles from the user
+        if options.cert:
+            session.verify = options.cert
+
+        # Handle SSL client certificate
+        if options.client_cert:
+            session.cert = options.client_cert
+
+        # Handle timeouts
+        if options.timeout or timeout:
+            session.timeout = timeout if timeout is not None else options.timeout
+
+        # Handle configured proxies
+        if options.proxy:
+            session.proxies = {
+                "http": options.proxy,
+                "https": options.proxy,
+            }
+            session.trust_env = False
+
+        # Determine if we can prompt the user for authentication or not
+        session.auth.prompting = not options.no_input
+        session.auth.keyring_provider = options.keyring_provider
+
+        return session
+
+
+def _pip_self_version_check(session: "PipSession", options: Values) -> None:
+    from pip._internal.self_outdated_check import pip_self_version_check as check
+
+    check(session, options)
+
+
+class IndexGroupCommand(Command, SessionCommandMixin):
+    """
+    Abstract base class for commands with the index_group options.
+
+    This also corresponds to the commands that permit the pip version check.
+    """
+
+    def handle_pip_version_check(self, options: Values) -> None:
+        """
+        Do the pip version check if not disabled.
+
+        This overrides the default behavior of not doing the check.
+        """
+        # Make sure the index_group options are present.
+        assert hasattr(options, "no_index")
+
+        if options.disable_pip_version_check or options.no_index:
+            return
+
+        # Otherwise, check if we're using the latest version of pip available.
+        session = self._build_session(
+            options,
+            retries=0,
+            timeout=min(5, options.timeout),
+            # This is set to ensure the function does not fail when truststore is
+            # specified in use-feature but cannot be loaded. This usually raises a
+            # CommandError and shows a nice user-facing error, but this function is not
+            # called in that try-except block.
+            fallback_to_certifi=True,
+        )
+        with session:
+            _pip_self_version_check(session, options)
diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
index 8acffb241ad..92900f94ff4 100644
--- a/src/pip/_internal/cli/req_command.py
+++ b/src/pip/_internal/cli/req_command.py
@@ -1,21 +1,19 @@
-"""Contains the Command base classes that depend on PipSession.
+"""Contains the RequirementCommand base class.
 
-The classes in this module are in a separate module so the commands not
-needing download / PackageFinder capability don't unnecessarily import the
+This class is in a separate module so the commands that do not always
+need PackageFinder capability don't unnecessarily import the
 PackageFinder machinery and all its vendored dependencies, etc.
 """
 
 import logging
-import os
-import sys
 from functools import partial
 from optparse import Values
-from typing import TYPE_CHECKING, Any, List, Optional, Tuple
+from typing import Any, List, Optional, Tuple
 
 from pip._internal.cache import WheelCache
 from pip._internal.cli import cmdoptions
-from pip._internal.cli.base_command import Command
-from pip._internal.cli.command_context import CommandContextMixIn
+from pip._internal.cli.index_command import IndexGroupCommand
+from pip._internal.cli.index_command import SessionCommandMixin as SessionCommandMixin
 from pip._internal.exceptions import CommandError, PreviousBuildDirError
 from pip._internal.index.collector import LinkCollector
 from pip._internal.index.package_finder import PackageFinder
@@ -33,159 +31,15 @@
 from pip._internal.req.req_file import parse_requirements
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.resolution.base import BaseResolver
-from pip._internal.self_outdated_check import pip_self_version_check
 from pip._internal.utils.temp_dir import (
     TempDirectory,
     TempDirectoryTypeRegistry,
     tempdir_kinds,
 )
 
-if TYPE_CHECKING:
-    from ssl import SSLContext
-
 logger = logging.getLogger(__name__)
 
 
-def _create_truststore_ssl_context() -> Optional["SSLContext"]:
-    if sys.version_info < (3, 10):
-        raise CommandError("The truststore feature is only available for Python 3.10+")
-
-    try:
-        import ssl
-    except ImportError:
-        logger.warning("Disabling truststore since ssl support is missing")
-        return None
-
-    try:
-        from pip._vendor import truststore
-    except ImportError as e:
-        raise CommandError(f"The truststore feature is unavailable: {e}")
-
-    return truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-
-
-class SessionCommandMixin(CommandContextMixIn):
-    """
-    A class mixin for command classes needing _build_session().
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-        self._session: Optional[PipSession] = None
-
-    @classmethod
-    def _get_index_urls(cls, options: Values) -> Optional[List[str]]:
-        """Return a list of index urls from user-provided options."""
-        index_urls = []
-        if not getattr(options, "no_index", False):
-            url = getattr(options, "index_url", None)
-            if url:
-                index_urls.append(url)
-        urls = getattr(options, "extra_index_urls", None)
-        if urls:
-            index_urls.extend(urls)
-        # Return None rather than an empty list
-        return index_urls or None
-
-    def get_default_session(self, options: Values) -> PipSession:
-        """Get a default-managed session."""
-        if self._session is None:
-            self._session = self.enter_context(self._build_session(options))
-            # there's no type annotation on requests.Session, so it's
-            # automatically ContextManager[Any] and self._session becomes Any,
-            # then https://github.com/python/mypy/issues/7696 kicks in
-            assert self._session is not None
-        return self._session
-
-    def _build_session(
-        self,
-        options: Values,
-        retries: Optional[int] = None,
-        timeout: Optional[int] = None,
-        fallback_to_certifi: bool = False,
-    ) -> PipSession:
-        cache_dir = options.cache_dir
-        assert not cache_dir or os.path.isabs(cache_dir)
-
-        if "truststore" in options.features_enabled:
-            try:
-                ssl_context = _create_truststore_ssl_context()
-            except Exception:
-                if not fallback_to_certifi:
-                    raise
-                ssl_context = None
-        else:
-            ssl_context = None
-
-        session = PipSession(
-            cache=os.path.join(cache_dir, "http-v2") if cache_dir else None,
-            retries=retries if retries is not None else options.retries,
-            trusted_hosts=options.trusted_hosts,
-            index_urls=self._get_index_urls(options),
-            ssl_context=ssl_context,
-        )
-
-        # Handle custom ca-bundles from the user
-        if options.cert:
-            session.verify = options.cert
-
-        # Handle SSL client certificate
-        if options.client_cert:
-            session.cert = options.client_cert
-
-        # Handle timeouts
-        if options.timeout or timeout:
-            session.timeout = timeout if timeout is not None else options.timeout
-
-        # Handle configured proxies
-        if options.proxy:
-            session.proxies = {
-                "http": options.proxy,
-                "https": options.proxy,
-            }
-            session.trust_env = False
-
-        # Determine if we can prompt the user for authentication or not
-        session.auth.prompting = not options.no_input
-        session.auth.keyring_provider = options.keyring_provider
-
-        return session
-
-
-class IndexGroupCommand(Command, SessionCommandMixin):
-    """
-    Abstract base class for commands with the index_group options.
-
-    This also corresponds to the commands that permit the pip version check.
-    """
-
-    def handle_pip_version_check(self, options: Values) -> None:
-        """
-        Do the pip version check if not disabled.
-
-        This overrides the default behavior of not doing the check.
-        """
-        # Make sure the index_group options are present.
-        assert hasattr(options, "no_index")
-
-        if options.disable_pip_version_check or options.no_index:
-            return
-
-        # Otherwise, check if we're using the latest version of pip available.
-        session = self._build_session(
-            options,
-            retries=0,
-            timeout=min(5, options.timeout),
-            # This is set to ensure the function does not fail when truststore is
-            # specified in use-feature but cannot be loaded. This usually raises a
-            # CommandError and shows a nice user-facing error, but this function is not
-            # called in that try-except block.
-            fallback_to_certifi=True,
-        )
-        with session:
-            pip_self_version_check(session, options)
-
-
 KEEPABLE_TEMPDIR_TYPES = [
     tempdir_kinds.BUILD_ENV,
     tempdir_kinds.EPHEM_WHEEL_CACHE,
diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index cb1e313f468..2da5e2d5204 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -7,7 +7,7 @@
 from pip._vendor.packaging.version import Version
 
 from pip._internal.cli import cmdoptions
-from pip._internal.cli.req_command import IndexGroupCommand
+from pip._internal.cli.index_command import IndexGroupCommand
 from pip._internal.cli.status_codes import SUCCESS
 from pip._internal.exceptions import CommandError
 from pip._internal.index.collector import LinkCollector
diff --git a/tests/unit/test_base_command.py b/tests/unit/test_base_command.py
index 44dae384a75..80c93799d94 100644
--- a/tests/unit/test_base_command.py
+++ b/tests/unit/test_base_command.py
@@ -93,7 +93,7 @@ def test_raise_broken_stdout__debug_logging(
         assert "Traceback (most recent call last):" in stderr
 
 
-@patch("pip._internal.cli.req_command.Command.handle_pip_version_check")
+@patch("pip._internal.cli.index_command.Command.handle_pip_version_check")
 def test_handle_pip_version_check_called(mock_handle_version_check: Mock) -> None:
     """
     Check that Command.handle_pip_version_check() is called.
diff --git a/tests/unit/test_commands.py b/tests/unit/test_commands.py
index 4f6366513d7..9dfb71a4d1d 100644
--- a/tests/unit/test_commands.py
+++ b/tests/unit/test_commands.py
@@ -87,7 +87,7 @@ def has_option_no_index(command: Command) -> bool:
         (True, True, False),
     ],
 )
-@mock.patch("pip._internal.cli.req_command.pip_self_version_check")
+@mock.patch("pip._internal.cli.index_command._pip_self_version_check")
 def test_index_group_handle_pip_version_check(
     mock_version_check: mock.Mock,
     command_name: str,

From 1071614e5c579266fdc0d031824595e87d1469a0 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 17 Apr 2024 21:10:51 -0400
Subject: [PATCH 407/992] Avoid heavy index imports for pip uninstall & list

pip uninstall and list currently depend on req_install.py which always imports
the expensive network and index machinery. However, it's only in rare situations
that these commands actually hit the network:

- `pip list --outdated`
- `pip list --uptodate`
- `pip uninstall --requirement `

This commit builds on the previous two refactoring commits and modifies these
commands to avoid the expensive imports unless truly necessary.
---
 ...24ca5f01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst | 10 ++++++++++
 src/pip/_internal/commands/list.py                  | 13 ++++++++-----
 src/pip/_internal/commands/uninstall.py             |  2 +-
 tests/functional/test_cli.py                        |  3 +--
 tests/unit/test_commands.py                         |  2 +-
 5 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 news/24ca5f01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst

diff --git a/news/24ca5f01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst b/news/24ca5f01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst
new file mode 100644
index 00000000000..1be25395635
--- /dev/null
+++ b/news/24ca5f01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst
@@ -0,0 +1,10 @@
+pip uninstall and list currently depend on req_install.py which always imports
+the expensive network and index machinery. However, it's only in rare situations
+that these commands actually hit the network:
+
+- ``pip list --outdated``
+- ``pip list --uptodate``
+- ``pip uninstall --requirement ``
+
+This patch refactors req_install.py so these commands can avoid the expensive
+imports unless truly necessary.
diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index 2da5e2d5204..82fc46a118f 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -10,15 +10,14 @@
 from pip._internal.cli.index_command import IndexGroupCommand
 from pip._internal.cli.status_codes import SUCCESS
 from pip._internal.exceptions import CommandError
-from pip._internal.index.collector import LinkCollector
-from pip._internal.index.package_finder import PackageFinder
 from pip._internal.metadata import BaseDistribution, get_environment
 from pip._internal.models.selection_prefs import SelectionPreferences
-from pip._internal.network.session import PipSession
 from pip._internal.utils.compat import stdlib_pkgs
 from pip._internal.utils.misc import tabulate, write_output
 
 if TYPE_CHECKING:
+    from pip._internal.index.package_finder import PackageFinder
+    from pip._internal.network.session import PipSession
 
     class _DistWithLatestInfo(BaseDistribution):
         """Give the distribution object a couple of extra fields.
@@ -140,11 +139,15 @@ def handle_pip_version_check(self, options: Values) -> None:
             super().handle_pip_version_check(options)
 
     def _build_package_finder(
-        self, options: Values, session: PipSession
-    ) -> PackageFinder:
+        self, options: Values, session: "PipSession"
+    ) -> "PackageFinder":
         """
         Create a package finder appropriate to this list command.
         """
+        # Lazy import the heavy index modules as most list invocations won't need 'em.
+        from pip._internal.index.collector import LinkCollector
+        from pip._internal.index.package_finder import PackageFinder
+
         link_collector = LinkCollector.create(session, options=options)
 
         # Pass allow_yanked=False to ignore yanked versions.
diff --git a/src/pip/_internal/commands/uninstall.py b/src/pip/_internal/commands/uninstall.py
index 32a0aa8a044..bc0edeac9fb 100644
--- a/src/pip/_internal/commands/uninstall.py
+++ b/src/pip/_internal/commands/uninstall.py
@@ -6,7 +6,7 @@
 
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import Command
-from pip._internal.cli.req_command import SessionCommandMixin
+from pip._internal.cli.index_command import SessionCommandMixin
 from pip._internal.cli.status_codes import SUCCESS
 from pip._internal.exceptions import InstallationError
 from pip._internal.req import parse_requirements
diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index 3c166152111..e1ccf04ea1c 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -57,8 +57,7 @@ def test_entrypoints_work(entrypoint: str, script: PipTestEnvironment) -> None:
     sorted(
         set(commands_dict).symmetric_difference(
             # Exclude commands that are expected to use the network.
-            # TODO: uninstall and list should only import network modules as needed
-            {"install", "uninstall", "download", "search", "index", "wheel", "list"}
+            {"install", "download", "search", "index", "wheel"}
         )
     ),
 )
diff --git a/tests/unit/test_commands.py b/tests/unit/test_commands.py
index 9dfb71a4d1d..9d5aefec298 100644
--- a/tests/unit/test_commands.py
+++ b/tests/unit/test_commands.py
@@ -128,7 +128,7 @@ def is_requirement_command(command: Command) -> bool:
 
 
 @pytest.mark.parametrize("flag", ["", "--outdated", "--uptodate"])
-@mock.patch("pip._internal.cli.req_command.pip_self_version_check")
+@mock.patch("pip._internal.cli.index_command._pip_self_version_check")
 @mock.patch.dict(os.environ, {"PIP_DISABLE_PIP_VERSION_CHECK": "no"})
 def test_list_pip_version_check(version_check_mock: mock.Mock, flag: str) -> None:
     """

From 22142d6fcc9885587bcf102d7652529ec1d9503e Mon Sep 17 00:00:00 2001
From: Agus 
Date: Mon, 6 May 2024 13:16:10 +0200
Subject: [PATCH 408/992] Add documentation for CLI architecture (#12093)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Pradyun Gedam 
Co-authored-by: chrysle <96722107+chrysle@users.noreply.github.com>
---
 .../architecture/command-line-interface.rst   | 166 +++++++++++++++++-
 news/6831.doc.rst                             |   1 +
 2 files changed, 158 insertions(+), 9 deletions(-)
 create mode 100644 news/6831.doc.rst

diff --git a/docs/html/development/architecture/command-line-interface.rst b/docs/html/development/architecture/command-line-interface.rst
index 9bfa9119258..725199bf580 100644
--- a/docs/html/development/architecture/command-line-interface.rst
+++ b/docs/html/development/architecture/command-line-interface.rst
@@ -28,19 +28,167 @@ for parsing top level args.
 
 ``Command`` then uses another ``ConfigOptionParser`` instance, to parse command-specific args.
 
-* TODO: How & where options are defined
-  (cmdoptions, command-specific files).
+Command structure
+-----------------
 
-* TODO: How & where arguments are processed.
-  (main_parser, command-specific parser)
+This section shows the class hierarchy from which every command's class will inherit
+from.
 
-* TODO: How processed arguments are accessed.
-  (attributes on argument to ``Command.run()``)
+`base_command.py `_
+defines the base ``Command`` class, from which every other command will inherit directly or
+indirectly (see the *command tree* at the end of this section).
 
-* TODO: How configuration and CLI "blend".
-  (implemented in ``ConfigOptionParser``)
+Using the ``ConfigOptionParser`` (see `Configuration and CLI "blend" `_),
+this class adds the general options and instantiates the *cmd_opts* group, where every other specific
+option will be added if needed on each command's class. For those commands that define specific
+options, like ``--dry-run`` on ``pip install`` command, the options must be added to *cmd_opts*
+this is the job of *add_options* method), which will be automatically called on ``Command``'s initialization.
 
-* TODO: progress bars and spinners
+The base ``Command`` has the following methods:
+
+.. py:class:: Command
+
+  .. py:method:: main()
+
+    Main method of the class, it's always called (as can be seen in main.py's
+    `main `_).
+    It's in charge of calling the specific ``run`` method of the class and handling the possible errors.
+
+  .. py:method:: run()
+
+    Abstract method where the actual action of a command is defined.
+
+  .. py:method:: add_options()
+
+    Optional method to insert additional options on a class, called on ``Command`` initialization.
+
+Some commands have more specialized behavior, (see for example ``pip index``).
+These commands instead will inherit from ``IndexGroupCommand``, which inherits from ``Command``
+and  ``SessionCommandMixin`` to build build the pip session for the corresponding requests.
+
+Lastly, ``RequirementCommand``, which inherits from ``IndexGroupCommand`` is the base class
+for those commands which make use of requirements in any form, like ``pip install``.
+
+In addition to the previous classes, a last mixin class must be mentioned, from which
+``Command`` as well as ``SessionCommandMixin`` inherit: ``CommandContextMixIn``, in
+charge of the command's context.
+
+In the following command tree we can see the hierarchy defined for the different pip
+commands, where each command is defined under the base class it inherits from:
+
+| ``Command``
+|  ├─ ``cache``, ``check``, ``completion``, ``configuration``, ``debug``, ``freeze``, ``hash``, ``help``, ``inspect``, ``show``, ``search``, ``uninstall``
+|  └─ ``IndexGroupCommand``
+|      ├─ ``index``, ``list``
+|      └─ ``RequirementCommand``
+|           └─ ``wheel``, ``download``, ``install``
+
+
+Option definition
+-----------------
+
+The set of shared options are defined in `cmdoptions.py `_
+module, as well as the *general options* and *package index options* groups of options
+we see when we call a command's help, or the ``pip index``'s help message respectively.
+All options are defined in terms of functions that return `optparse.Option `_
+instances once called, while specific groups of options, like *Config Options* for
+``pip config`` are defined in each specific command file (see for example the
+`configuration.py `_).
+
+Argument parsing
+----------------
+
+The main entrypoint for the application is defined in the ``main`` function in the
+`main.py `_ module.
+This function is in charge of the `autocompletion `_,
+calling the ``parse_command`` function and creating and running the subprograms
+via ``create_command``, on which the ``main`` method is called.
+
+The ``parse_command`` is defined in the `main_parser.py `_
+module, which defines the following two functions:
+
+.. py:function:: parse_command()
+
+  Function in charge of the initial parse of ``pip``'s program. Creates the main parser (see
+  the next function ``create_main_parser``) to extract the general options
+  and the remaining arguments. For example, running ``pip --timeout=5 install --user INITools``
+  will split ``['--timeout=5']`` as general option and  ``['install', '--user', 'INITools']``
+  as the remainder.
+
+  At this step the program deals with the options ``--python``, ``--version``, ``pip``
+  or ``pip help``. If neither of the previous options is found, it tries to extract the command
+  name and arguments.
+
+.. py:function:: create_main_parser()
+
+  Creates the main parser (type ``pip`` in the console to see the description of the
+  program). The internal parser (`ConfigOptionParser `_),
+  adds the general option group and the list of commands coming from ``cmdoptions.py``
+  at this point.
+
+After the initial parsing is done, ``create_command`` is in charge of creating the appropriate
+command using the information stored in `commands_dict `_
+variable, and calling its ``main`` method (see `Command structure `_).
+
+A second argument parsing is done at each specific command (defined in the base ``Command`` class),
+again using the ``ConfigOptionParser``.
+
+Argument access
+---------------
+
+To access all the options and arguments, ``Command.run()`` takes
+the options as `optparse.Values `_
+and a list of strings for the arguments (parsed in ``Command.main()``). The internal methods of
+the base ``Command`` class are in charge of passing these variables after ``parse_args`` is
+called for a specific command.
+
+Configuration and CLI "blend"
+-----------------------------
+
+The base ``Command`` instantiates the class `ConfigOptionParser `_
+which is in charge of the parsing process (via its parent class
+`optparse.OptionParser `_).
+Its main addition consists of the following function:
+
+.. py:class:: ConfigOptionParser(OptionParser)
+
+  .. py:method:: get_default_values()
+
+    Overrides the original method to allow updating the defaults ater the instantiation of the
+    option parser.
+
+It allows overriding the default options and arguments using the ``Configuration`` class
+(more information can be found on :ref:`Configuration`) to include environment variables and
+settings from configuration files.
+
+Progress bars and spinners
+--------------------------
+
+There are two more modules in the ``cli`` subpackage in charge of showing the state of the
+program.
+
+* `progress_bars.py `_
+
+  This module contains the following function:
+
+  .. py:function:: get_download_progress_renderer()
+
+    It uses `rich `_
+    functionalities to render the download progress.
+
+  This function (used in `download.py `_,
+  inside the ``Downloader`` class), allows watching the download process when running
+  ``pip install`` on *big* packages.
+
+* `spinner.py `_
+
+  The main function of this module is:
+
+  .. py:function:: open_spinner()
+
+    It yields the appropriate type of spinner, which is used in ``call_subprocess``
+    function, inside `subprocess.py `_
+    module, so the user can see there is a program running.
 
 * TODO: quirks / standard practices / broad ideas.
   (avoiding lists in option def'n, special cased option value types,
diff --git a/news/6831.doc.rst b/news/6831.doc.rst
new file mode 100644
index 00000000000..994fc763d6e
--- /dev/null
+++ b/news/6831.doc.rst
@@ -0,0 +1 @@
+Update architecture documentation for command line interface.

From 12c171f193b7b38329a75bbaecabca814831d5e5 Mon Sep 17 00:00:00 2001
From: Petr Viktorin 
Date: Mon, 6 May 2024 13:20:47 +0200
Subject: [PATCH 409/992] Use the ``data_filter`` when extracting tarballs, if
 it's available. (#12214)

Previous behaviour is used on Python without PEP-720 tarfile filters. (Note that the
feature is now in security releases of all supported versions.)

A custom filter (which wraps `data_filter`) is used to retain pip-specific behaviour:
- Removing a common leading directory
- Setting the mode (Unix permissions)

Compared to the previous behaviour, if a file can't be unpacked, the unpacking operation
will fail with `InstallError`, rather than skipping the individual file with
a `logger.warning`. This means that "some corrupt tar files" now can't be unpacked.

Note that PEP 721 limits itself to sdists, this change affects unpacking any
other tar file.
---
 news/12111.feature.rst               |   1 +
 src/pip/_internal/utils/unpacking.py | 170 +++++++++++++++++++--------
 tests/unit/test_utils_unpacking.py   |  28 ++++-
 3 files changed, 148 insertions(+), 51 deletions(-)
 create mode 100644 news/12111.feature.rst

diff --git a/news/12111.feature.rst b/news/12111.feature.rst
new file mode 100644
index 00000000000..eb03b76d826
--- /dev/null
+++ b/news/12111.feature.rst
@@ -0,0 +1 @@
+PEP 721: Use the ``data_filter`` when extracting tarballs, if it's available.
diff --git a/src/pip/_internal/utils/unpacking.py b/src/pip/_internal/utils/unpacking.py
index 78b5c13ced3..341269550ce 100644
--- a/src/pip/_internal/utils/unpacking.py
+++ b/src/pip/_internal/utils/unpacking.py
@@ -5,6 +5,7 @@
 import os
 import shutil
 import stat
+import sys
 import tarfile
 import zipfile
 from typing import Iterable, List, Optional
@@ -85,12 +86,16 @@ def is_within_directory(directory: str, target: str) -> bool:
     return prefix == abs_directory
 
 
+def _get_default_mode_plus_executable() -> int:
+    return 0o777 & ~current_umask() | 0o111
+
+
 def set_extracted_file_to_default_mode_plus_executable(path: str) -> None:
     """
     Make file present at path have execute for user/group/world
     (chmod +x) is no-op on windows per python docs
     """
-    os.chmod(path, (0o777 & ~current_umask() | 0o111))
+    os.chmod(path, _get_default_mode_plus_executable())
 
 
 def zip_item_is_executable(info: ZipInfo) -> bool:
@@ -151,8 +156,8 @@ def untar_file(filename: str, location: str) -> None:
     Untar the file (with path `filename`) to the destination `location`.
     All files are written based on system defaults and umask (i.e. permissions
     are not preserved), except that regular file members with any execute
-    permissions (user, group, or world) have "chmod +x" applied after being
-    written.  Note that for windows, any execute changes using os.chmod are
+    permissions (user, group, or world) have "chmod +x" applied on top of the
+    default.  Note that for windows, any execute changes using os.chmod are
     no-ops per the python docs.
     """
     ensure_dir(location)
@@ -170,62 +175,127 @@ def untar_file(filename: str, location: str) -> None:
             filename,
         )
         mode = "r:*"
+
     tar = tarfile.open(filename, mode, encoding="utf-8")
     try:
         leading = has_leading_dir([member.name for member in tar.getmembers()])
-        for member in tar.getmembers():
-            fn = member.name
-            if leading:
-                fn = split_leading_dir(fn)[1]
-            path = os.path.join(location, fn)
-            if not is_within_directory(location, path):
-                message = (
-                    "The tar file ({}) has a file ({}) trying to install "
-                    "outside target directory ({})"
-                )
-                raise InstallationError(message.format(filename, path, location))
-            if member.isdir():
-                ensure_dir(path)
-            elif member.issym():
-                try:
-                    tar._extract_member(member, path)
-                except Exception as exc:
-                    # Some corrupt tar files seem to produce this
-                    # (specifically bad symlinks)
-                    logger.warning(
-                        "In the tar file %s the member %s is invalid: %s",
-                        filename,
-                        member.name,
-                        exc,
-                    )
-                    continue
-            else:
+
+        # PEP 706 added `tarfile.data_filter`, and made some other changes to
+        # Python's tarfile module (see below). The features were backported to
+        # security releases.
+        try:
+            data_filter = tarfile.data_filter
+        except AttributeError:
+            _untar_without_filter(filename, location, tar, leading)
+        else:
+            default_mode_plus_executable = _get_default_mode_plus_executable()
+
+            def pip_filter(member: tarfile.TarInfo, path: str) -> tarfile.TarInfo:
+                if leading:
+                    member.name = split_leading_dir(member.name)[1]
+                orig_mode = member.mode
                 try:
-                    fp = tar.extractfile(member)
-                except (KeyError, AttributeError) as exc:
-                    # Some corrupt tar files seem to produce this
-                    # (specifically bad symlinks)
-                    logger.warning(
-                        "In the tar file %s the member %s is invalid: %s",
-                        filename,
-                        member.name,
-                        exc,
+                    try:
+                        member = data_filter(member, location)
+                    except tarfile.LinkOutsideDestinationError:
+                        if sys.version_info[:3] in {
+                            (3, 8, 17),
+                            (3, 9, 17),
+                            (3, 10, 12),
+                            (3, 11, 4),
+                        }:
+                            # The tarfile filter in specific Python versions
+                            # raises LinkOutsideDestinationError on valid input
+                            # (https://github.com/python/cpython/issues/107845)
+                            # Ignore the error there, but do use the
+                            # more lax `tar_filter`
+                            member = tarfile.tar_filter(member, location)
+                        else:
+                            raise
+                except tarfile.TarError as exc:
+                    message = "Invalid member in the tar file {}: {}"
+                    # Filter error messages mention the member name.
+                    # No need to add it here.
+                    raise InstallationError(
+                        message.format(
+                            filename,
+                            exc,
+                        )
                     )
-                    continue
-                ensure_dir(os.path.dirname(path))
-                assert fp is not None
-                with open(path, "wb") as destfp:
-                    shutil.copyfileobj(fp, destfp)
-                fp.close()
-                # Update the timestamp (useful for cython compiled files)
-                tar.utime(member, path)
-                # member have any execute permissions for user/group/world?
-                if member.mode & 0o111:
-                    set_extracted_file_to_default_mode_plus_executable(path)
+                if member.isfile() and orig_mode & 0o111:
+                    member.mode = default_mode_plus_executable
+                else:
+                    # See PEP 706 note above.
+                    # The PEP changed this from `int` to `Optional[int]`,
+                    # where None means "use the default". Mypy doesn't
+                    # know this yet.
+                    member.mode = None  # type: ignore [assignment]
+                return member
+
+            tar.extractall(location, filter=pip_filter)
+
     finally:
         tar.close()
 
 
+def _untar_without_filter(
+    filename: str,
+    location: str,
+    tar: tarfile.TarFile,
+    leading: bool,
+) -> None:
+    """Fallback for Python without tarfile.data_filter"""
+    for member in tar.getmembers():
+        fn = member.name
+        if leading:
+            fn = split_leading_dir(fn)[1]
+        path = os.path.join(location, fn)
+        if not is_within_directory(location, path):
+            message = (
+                "The tar file ({}) has a file ({}) trying to install "
+                "outside target directory ({})"
+            )
+            raise InstallationError(message.format(filename, path, location))
+        if member.isdir():
+            ensure_dir(path)
+        elif member.issym():
+            try:
+                tar._extract_member(member, path)
+            except Exception as exc:
+                # Some corrupt tar files seem to produce this
+                # (specifically bad symlinks)
+                logger.warning(
+                    "In the tar file %s the member %s is invalid: %s",
+                    filename,
+                    member.name,
+                    exc,
+                )
+                continue
+        else:
+            try:
+                fp = tar.extractfile(member)
+            except (KeyError, AttributeError) as exc:
+                # Some corrupt tar files seem to produce this
+                # (specifically bad symlinks)
+                logger.warning(
+                    "In the tar file %s the member %s is invalid: %s",
+                    filename,
+                    member.name,
+                    exc,
+                )
+                continue
+            ensure_dir(os.path.dirname(path))
+            assert fp is not None
+            with open(path, "wb") as destfp:
+                shutil.copyfileobj(fp, destfp)
+            fp.close()
+            # Update the timestamp (useful for cython compiled files)
+            tar.utime(member, path)
+            # member have any execute permissions for user/group/world?
+            if member.mode & 0o111:
+                set_extracted_file_to_default_mode_plus_executable(path)
+
+
 def unpack_file(
     filename: str,
     location: str,
diff --git a/tests/unit/test_utils_unpacking.py b/tests/unit/test_utils_unpacking.py
index 1f0b59dbd6b..3fdd822e739 100644
--- a/tests/unit/test_utils_unpacking.py
+++ b/tests/unit/test_utils_unpacking.py
@@ -155,7 +155,13 @@ def test_unpack_tar_failure(self) -> None:
         test_tar = self.make_tar_file("test_tar.tar", files)
         with pytest.raises(InstallationError) as e:
             untar_file(test_tar, self.tempdir)
-        assert "trying to install outside target directory" in str(e.value)
+
+        # The error message comes from tarfile.data_filter when it is available,
+        # otherwise from pip's own check.
+        if hasattr(tarfile, "data_filter"):
+            assert "is outside the destination" in str(e.value)
+        else:
+            assert "trying to install outside target directory" in str(e.value)
 
     def test_unpack_tar_success(self) -> None:
         """
@@ -171,6 +177,26 @@ def test_unpack_tar_success(self) -> None:
         test_tar = self.make_tar_file("test_tar.tar", files)
         untar_file(test_tar, self.tempdir)
 
+    @pytest.mark.skipif(
+        not hasattr(tarfile, "data_filter"),
+        reason="tarfile filters (PEP-721) not available",
+    )
+    def test_unpack_tar_filter(self) -> None:
+        """
+        Test that the tarfile.data_filter is used to disallow dangerous
+        behaviour (PEP-721)
+        """
+        test_tar = os.path.join(self.tempdir, "test_tar_filter.tar")
+        with tarfile.open(test_tar, "w") as mytar:
+            file_tarinfo = tarfile.TarInfo("bad-link")
+            file_tarinfo.type = tarfile.SYMTYPE
+            file_tarinfo.linkname = "../../../../pwn"
+            mytar.addfile(file_tarinfo, io.BytesIO(b""))
+        with pytest.raises(InstallationError) as e:
+            untar_file(test_tar, self.tempdir)
+
+        assert "is outside the destination" in str(e.value)
+
 
 def test_unpack_tar_unicode(tmpdir: Path) -> None:
     test_tar = tmpdir / "test.tar"

From 47d0dc540f03447d2d16ef2d374f5a0166457c7e Mon Sep 17 00:00:00 2001
From: Ran Benita 
Date: Mon, 6 May 2024 21:52:10 +0300
Subject: [PATCH 410/992] Vendor charset-normalizer instead of chardet (#12638)

---
 news/chardet.vendor.rst                       |    2 +-
 news/charset_normalizer.vendor.rst            |    1 +
 pyproject.toml                                |    2 +
 src/pip/_vendor/chardet/LICENSE               |  502 --
 src/pip/_vendor/chardet/__init__.py           |  115 -
 src/pip/_vendor/chardet/__main__.py           |    6 -
 src/pip/_vendor/chardet/big5freq.py           |  386 --
 src/pip/_vendor/chardet/big5prober.py         |   47 -
 src/pip/_vendor/chardet/chardistribution.py   |  261 -
 src/pip/_vendor/chardet/charsetgroupprober.py |  106 -
 src/pip/_vendor/chardet/charsetprober.py      |  147 -
 src/pip/_vendor/chardet/cli/__init__.py       |    0
 src/pip/_vendor/chardet/cli/chardetect.py     |  112 -
 src/pip/_vendor/chardet/codingstatemachine.py |   90 -
 .../_vendor/chardet/codingstatemachinedict.py |   19 -
 src/pip/_vendor/chardet/cp949prober.py        |   49 -
 src/pip/_vendor/chardet/enums.py              |   85 -
 src/pip/_vendor/chardet/escprober.py          |  102 -
 src/pip/_vendor/chardet/escsm.py              |  261 -
 src/pip/_vendor/chardet/eucjpprober.py        |  102 -
 src/pip/_vendor/chardet/euckrfreq.py          |  196 -
 src/pip/_vendor/chardet/euckrprober.py        |   47 -
 src/pip/_vendor/chardet/euctwfreq.py          |  388 --
 src/pip/_vendor/chardet/euctwprober.py        |   47 -
 src/pip/_vendor/chardet/gb2312freq.py         |  284 -
 src/pip/_vendor/chardet/gb2312prober.py       |   47 -
 src/pip/_vendor/chardet/hebrewprober.py       |  316 -
 src/pip/_vendor/chardet/jisfreq.py            |  325 -
 src/pip/_vendor/chardet/johabfreq.py          | 2382 -------
 src/pip/_vendor/chardet/johabprober.py        |   47 -
 src/pip/_vendor/chardet/jpcntx.py             |  238 -
 src/pip/_vendor/chardet/langbulgarianmodel.py | 4649 -------------
 src/pip/_vendor/chardet/langgreekmodel.py     | 4397 -------------
 src/pip/_vendor/chardet/langhebrewmodel.py    | 4380 -------------
 src/pip/_vendor/chardet/langhungarianmodel.py | 4649 -------------
 src/pip/_vendor/chardet/langrussianmodel.py   | 5725 -----------------
 src/pip/_vendor/chardet/langthaimodel.py      | 4380 -------------
 src/pip/_vendor/chardet/langturkishmodel.py   | 4380 -------------
 src/pip/_vendor/chardet/latin1prober.py       |  147 -
 src/pip/_vendor/chardet/macromanprober.py     |  162 -
 src/pip/_vendor/chardet/mbcharsetprober.py    |   95 -
 src/pip/_vendor/chardet/mbcsgroupprober.py    |   57 -
 src/pip/_vendor/chardet/mbcssm.py             |  661 --
 src/pip/_vendor/chardet/metadata/__init__.py  |    0
 src/pip/_vendor/chardet/metadata/languages.py |  352 -
 src/pip/_vendor/chardet/resultdict.py         |   16 -
 src/pip/_vendor/chardet/sbcharsetprober.py    |  162 -
 src/pip/_vendor/chardet/sbcsgroupprober.py    |   88 -
 src/pip/_vendor/chardet/sjisprober.py         |  105 -
 src/pip/_vendor/chardet/universaldetector.py  |  362 --
 src/pip/_vendor/chardet/utf1632prober.py      |  225 -
 src/pip/_vendor/chardet/utf8prober.py         |   82 -
 src/pip/_vendor/chardet/version.py            |    9 -
 src/pip/_vendor/charset_normalizer/LICENSE    |   21 +
 .../_vendor/charset_normalizer/__init__.py    |   46 +
 .../_vendor/charset_normalizer/__main__.py    |    4 +
 src/pip/_vendor/charset_normalizer/api.py     |  626 ++
 src/pip/_vendor/charset_normalizer/cd.py      |  395 ++
 .../charset_normalizer/cli/__init__.py        |    6 +
 .../charset_normalizer/cli/__main__.py        |  296 +
 .../_vendor/charset_normalizer/constant.py    | 1995 ++++++
 src/pip/_vendor/charset_normalizer/legacy.py  |   54 +
 src/pip/_vendor/charset_normalizer/md.py      |  615 ++
 src/pip/_vendor/charset_normalizer/models.py  |  340 +
 .../{chardet => charset_normalizer}/py.typed  |    0
 src/pip/_vendor/charset_normalizer/utils.py   |  421 ++
 src/pip/_vendor/charset_normalizer/version.py |    6 +
 src/pip/_vendor/pygments/lexer.py             |    4 +-
 src/pip/_vendor/requests/__init__.py          |    8 +-
 src/pip/_vendor/requests/compat.py            |    2 +-
 src/pip/_vendor/requests/help.py              |    8 +-
 src/pip/_vendor/requests/packages.py          |    2 +-
 src/pip/_vendor/vendor.txt                    |    2 +-
 tools/vendoring/patches/pygments.patch        |   29 +-
 tools/vendoring/patches/requests.patch        |   50 +-
 75 files changed, 4889 insertions(+), 41836 deletions(-)
 create mode 100644 news/charset_normalizer.vendor.rst
 delete mode 100644 src/pip/_vendor/chardet/LICENSE
 delete mode 100644 src/pip/_vendor/chardet/__init__.py
 delete mode 100644 src/pip/_vendor/chardet/__main__.py
 delete mode 100644 src/pip/_vendor/chardet/big5freq.py
 delete mode 100644 src/pip/_vendor/chardet/big5prober.py
 delete mode 100644 src/pip/_vendor/chardet/chardistribution.py
 delete mode 100644 src/pip/_vendor/chardet/charsetgroupprober.py
 delete mode 100644 src/pip/_vendor/chardet/charsetprober.py
 delete mode 100644 src/pip/_vendor/chardet/cli/__init__.py
 delete mode 100644 src/pip/_vendor/chardet/cli/chardetect.py
 delete mode 100644 src/pip/_vendor/chardet/codingstatemachine.py
 delete mode 100644 src/pip/_vendor/chardet/codingstatemachinedict.py
 delete mode 100644 src/pip/_vendor/chardet/cp949prober.py
 delete mode 100644 src/pip/_vendor/chardet/enums.py
 delete mode 100644 src/pip/_vendor/chardet/escprober.py
 delete mode 100644 src/pip/_vendor/chardet/escsm.py
 delete mode 100644 src/pip/_vendor/chardet/eucjpprober.py
 delete mode 100644 src/pip/_vendor/chardet/euckrfreq.py
 delete mode 100644 src/pip/_vendor/chardet/euckrprober.py
 delete mode 100644 src/pip/_vendor/chardet/euctwfreq.py
 delete mode 100644 src/pip/_vendor/chardet/euctwprober.py
 delete mode 100644 src/pip/_vendor/chardet/gb2312freq.py
 delete mode 100644 src/pip/_vendor/chardet/gb2312prober.py
 delete mode 100644 src/pip/_vendor/chardet/hebrewprober.py
 delete mode 100644 src/pip/_vendor/chardet/jisfreq.py
 delete mode 100644 src/pip/_vendor/chardet/johabfreq.py
 delete mode 100644 src/pip/_vendor/chardet/johabprober.py
 delete mode 100644 src/pip/_vendor/chardet/jpcntx.py
 delete mode 100644 src/pip/_vendor/chardet/langbulgarianmodel.py
 delete mode 100644 src/pip/_vendor/chardet/langgreekmodel.py
 delete mode 100644 src/pip/_vendor/chardet/langhebrewmodel.py
 delete mode 100644 src/pip/_vendor/chardet/langhungarianmodel.py
 delete mode 100644 src/pip/_vendor/chardet/langrussianmodel.py
 delete mode 100644 src/pip/_vendor/chardet/langthaimodel.py
 delete mode 100644 src/pip/_vendor/chardet/langturkishmodel.py
 delete mode 100644 src/pip/_vendor/chardet/latin1prober.py
 delete mode 100644 src/pip/_vendor/chardet/macromanprober.py
 delete mode 100644 src/pip/_vendor/chardet/mbcharsetprober.py
 delete mode 100644 src/pip/_vendor/chardet/mbcsgroupprober.py
 delete mode 100644 src/pip/_vendor/chardet/mbcssm.py
 delete mode 100644 src/pip/_vendor/chardet/metadata/__init__.py
 delete mode 100644 src/pip/_vendor/chardet/metadata/languages.py
 delete mode 100644 src/pip/_vendor/chardet/resultdict.py
 delete mode 100644 src/pip/_vendor/chardet/sbcharsetprober.py
 delete mode 100644 src/pip/_vendor/chardet/sbcsgroupprober.py
 delete mode 100644 src/pip/_vendor/chardet/sjisprober.py
 delete mode 100644 src/pip/_vendor/chardet/universaldetector.py
 delete mode 100644 src/pip/_vendor/chardet/utf1632prober.py
 delete mode 100644 src/pip/_vendor/chardet/utf8prober.py
 delete mode 100644 src/pip/_vendor/chardet/version.py
 create mode 100644 src/pip/_vendor/charset_normalizer/LICENSE
 create mode 100644 src/pip/_vendor/charset_normalizer/__init__.py
 create mode 100644 src/pip/_vendor/charset_normalizer/__main__.py
 create mode 100644 src/pip/_vendor/charset_normalizer/api.py
 create mode 100644 src/pip/_vendor/charset_normalizer/cd.py
 create mode 100644 src/pip/_vendor/charset_normalizer/cli/__init__.py
 create mode 100644 src/pip/_vendor/charset_normalizer/cli/__main__.py
 create mode 100644 src/pip/_vendor/charset_normalizer/constant.py
 create mode 100644 src/pip/_vendor/charset_normalizer/legacy.py
 create mode 100644 src/pip/_vendor/charset_normalizer/md.py
 create mode 100644 src/pip/_vendor/charset_normalizer/models.py
 rename src/pip/_vendor/{chardet => charset_normalizer}/py.typed (100%)
 create mode 100644 src/pip/_vendor/charset_normalizer/utils.py
 create mode 100644 src/pip/_vendor/charset_normalizer/version.py

diff --git a/news/chardet.vendor.rst b/news/chardet.vendor.rst
index 8471ff6bb36..2e1f3489425 100644
--- a/news/chardet.vendor.rst
+++ b/news/chardet.vendor.rst
@@ -1 +1 @@
-Upgrade chardet to 5.2.0
+The ``chardet`` vendoring is removed (replaced by ``charset-normalizer``).
diff --git a/news/charset_normalizer.vendor.rst b/news/charset_normalizer.vendor.rst
new file mode 100644
index 00000000000..30f1a8a6ed7
--- /dev/null
+++ b/news/charset_normalizer.vendor.rst
@@ -0,0 +1 @@
+Added at version 3.3.2.
diff --git a/pyproject.toml b/pyproject.toml
index 6d1f48c11a2..bf82ec374bc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -122,6 +122,8 @@ drop = [
   "bin/",
   # interpreter and OS specific msgpack libs
   "msgpack/*.so",
+  # interpreter and OS specific charset-normalizer libs
+  "charset_normalizer/*.so",
   # unneeded parts of setuptools
   "easy_install.py",
   "setuptools",
diff --git a/src/pip/_vendor/chardet/LICENSE b/src/pip/_vendor/chardet/LICENSE
deleted file mode 100644
index 4362b49151d..00000000000
--- a/src/pip/_vendor/chardet/LICENSE
+++ /dev/null
@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  , 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/src/pip/_vendor/chardet/__init__.py b/src/pip/_vendor/chardet/__init__.py
deleted file mode 100644
index fe581623d89..00000000000
--- a/src/pip/_vendor/chardet/__init__.py
+++ /dev/null
@@ -1,115 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import List, Union
-
-from .charsetgroupprober import CharSetGroupProber
-from .charsetprober import CharSetProber
-from .enums import InputState
-from .resultdict import ResultDict
-from .universaldetector import UniversalDetector
-from .version import VERSION, __version__
-
-__all__ = ["UniversalDetector", "detect", "detect_all", "__version__", "VERSION"]
-
-
-def detect(
-    byte_str: Union[bytes, bytearray], should_rename_legacy: bool = False
-) -> ResultDict:
-    """
-    Detect the encoding of the given byte string.
-
-    :param byte_str:     The byte sequence to examine.
-    :type byte_str:      ``bytes`` or ``bytearray``
-    :param should_rename_legacy:  Should we rename legacy encodings
-                                  to their more modern equivalents?
-    :type should_rename_legacy:   ``bool``
-    """
-    if not isinstance(byte_str, bytearray):
-        if not isinstance(byte_str, bytes):
-            raise TypeError(
-                f"Expected object of type bytes or bytearray, got: {type(byte_str)}"
-            )
-        byte_str = bytearray(byte_str)
-    detector = UniversalDetector(should_rename_legacy=should_rename_legacy)
-    detector.feed(byte_str)
-    return detector.close()
-
-
-def detect_all(
-    byte_str: Union[bytes, bytearray],
-    ignore_threshold: bool = False,
-    should_rename_legacy: bool = False,
-) -> List[ResultDict]:
-    """
-    Detect all the possible encodings of the given byte string.
-
-    :param byte_str:          The byte sequence to examine.
-    :type byte_str:           ``bytes`` or ``bytearray``
-    :param ignore_threshold:  Include encodings that are below
-                              ``UniversalDetector.MINIMUM_THRESHOLD``
-                              in results.
-    :type ignore_threshold:   ``bool``
-    :param should_rename_legacy:  Should we rename legacy encodings
-                                  to their more modern equivalents?
-    :type should_rename_legacy:   ``bool``
-    """
-    if not isinstance(byte_str, bytearray):
-        if not isinstance(byte_str, bytes):
-            raise TypeError(
-                f"Expected object of type bytes or bytearray, got: {type(byte_str)}"
-            )
-        byte_str = bytearray(byte_str)
-
-    detector = UniversalDetector(should_rename_legacy=should_rename_legacy)
-    detector.feed(byte_str)
-    detector.close()
-
-    if detector.input_state == InputState.HIGH_BYTE:
-        results: List[ResultDict] = []
-        probers: List[CharSetProber] = []
-        for prober in detector.charset_probers:
-            if isinstance(prober, CharSetGroupProber):
-                probers.extend(p for p in prober.probers)
-            else:
-                probers.append(prober)
-        for prober in probers:
-            if ignore_threshold or prober.get_confidence() > detector.MINIMUM_THRESHOLD:
-                charset_name = prober.charset_name or ""
-                lower_charset_name = charset_name.lower()
-                # Use Windows encoding name instead of ISO-8859 if we saw any
-                # extra Windows-specific bytes
-                if lower_charset_name.startswith("iso-8859") and detector.has_win_bytes:
-                    charset_name = detector.ISO_WIN_MAP.get(
-                        lower_charset_name, charset_name
-                    )
-                # Rename legacy encodings with superset encodings if asked
-                if should_rename_legacy:
-                    charset_name = detector.LEGACY_MAP.get(
-                        charset_name.lower(), charset_name
-                    )
-                results.append(
-                    {
-                        "encoding": charset_name,
-                        "confidence": prober.get_confidence(),
-                        "language": prober.language,
-                    }
-                )
-        if len(results) > 0:
-            return sorted(results, key=lambda result: -result["confidence"])
-
-    return [detector.result]
diff --git a/src/pip/_vendor/chardet/__main__.py b/src/pip/_vendor/chardet/__main__.py
deleted file mode 100644
index c19b0d2d7a3..00000000000
--- a/src/pip/_vendor/chardet/__main__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""Wrapper so people can run python -m chardet"""
-
-from .cli.chardetect import main
-
-if __name__ == "__main__":
-    main()
diff --git a/src/pip/_vendor/chardet/big5freq.py b/src/pip/_vendor/chardet/big5freq.py
deleted file mode 100644
index 87d9f972edd..00000000000
--- a/src/pip/_vendor/chardet/big5freq.py
+++ /dev/null
@@ -1,386 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# Big5 frequency table
-# by Taiwan's Mandarin Promotion Council
-# 
-#
-# 128  --> 0.42261
-# 256  --> 0.57851
-# 512  --> 0.74851
-# 1024 --> 0.89384
-# 2048 --> 0.97583
-#
-# Ideal Distribution Ratio = 0.74851/(1-0.74851) =2.98
-# Random Distribution Ration = 512/(5401-512)=0.105
-#
-# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
-
-BIG5_TYPICAL_DISTRIBUTION_RATIO = 0.75
-
-# Char to FreqOrder table
-BIG5_TABLE_SIZE = 5376
-# fmt: off
-BIG5_CHAR_TO_FREQ_ORDER = (
-   1,1801,1506, 255,1431, 198,   9,  82,   6,5008, 177, 202,3681,1256,2821, 110, #   16
-3814,  33,3274, 261,  76,  44,2114,  16,2946,2187,1176, 659,3971,  26,3451,2653, #   32
-1198,3972,3350,4202, 410,2215, 302, 590, 361,1964,   8, 204,  58,4510,5009,1932, #   48
-  63,5010,5011, 317,1614,  75, 222, 159,4203,2417,1480,5012,3555,3091, 224,2822, #   64
-3682,   3,  10,3973,1471,  29,2787,1135,2866,1940, 873, 130,3275,1123, 312,5013, #   80
-4511,2052, 507, 252, 682,5014, 142,1915, 124, 206,2947,  34,3556,3204,  64, 604, #   96
-5015,2501,1977,1978, 155,1991, 645, 641,1606,5016,3452, 337,  72, 406,5017,  80, #  112
- 630, 238,3205,1509, 263, 939,1092,2654, 756,1440,1094,3453, 449,  69,2987, 591, #  128
- 179,2096, 471, 115,2035,1844,  60,  50,2988, 134, 806,1869, 734,2036,3454, 180, #  144
- 995,1607, 156, 537,2907, 688,5018, 319,1305, 779,2145, 514,2379, 298,4512, 359, #  160
-2502,  90,2716,1338, 663,  11, 906,1099,2553,  20,2441, 182, 532,1716,5019, 732, #  176
-1376,4204,1311,1420,3206,  25,2317,1056, 113, 399, 382,1950, 242,3455,2474, 529, #  192
-3276, 475,1447,3683,5020, 117,  21, 656, 810,1297,2300,2334,3557,5021, 126,4205, #  208
- 706, 456, 150, 613,4513,  71,1118,2037,4206, 145,3092,  85, 835, 486,2115,1246, #  224
-1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,5022,2128,2359, 347,3815, 221, #  240
-3558,3135,5023,1956,1153,4207,  83, 296,1199,3093, 192, 624,  93,5024, 822,1898, #  256
-2823,3136, 795,2065, 991,1554,1542,1592,  27,  43,2867, 859, 139,1456, 860,4514, #  272
- 437, 712,3974, 164,2397,3137, 695, 211,3037,2097, 195,3975,1608,3559,3560,3684, #  288
-3976, 234, 811,2989,2098,3977,2233,1441,3561,1615,2380, 668,2077,1638, 305, 228, #  304
-1664,4515, 467, 415,5025, 262,2099,1593, 239, 108, 300, 200,1033, 512,1247,2078, #  320
-5026,5027,2176,3207,3685,2682, 593, 845,1062,3277,  88,1723,2038,3978,1951, 212, #  336
- 266, 152, 149, 468,1899,4208,4516,  77, 187,5028,3038,  37,   5,2990,5029,3979, #  352
-5030,5031,  39,2524,4517,2908,3208,2079,  55, 148,  74,4518, 545, 483,1474,1029, #  368
-1665, 217,1870,1531,3138,1104,2655,4209,  24, 172,3562, 900,3980,3563,3564,4519, #  384
-  32,1408,2824,1312, 329, 487,2360,2251,2717, 784,2683,   4,3039,3351,1427,1789, #  400
- 188, 109, 499,5032,3686,1717,1790, 888,1217,3040,4520,5033,3565,5034,3352,1520, #  416
-3687,3981, 196,1034, 775,5035,5036, 929,1816, 249, 439,  38,5037,1063,5038, 794, #  432
-3982,1435,2301,  46, 178,3278,2066,5039,2381,5040, 214,1709,4521, 804,  35, 707, #  448
- 324,3688,1601,2554, 140, 459,4210,5041,5042,1365, 839, 272, 978,2262,2580,3456, #  464
-2129,1363,3689,1423, 697, 100,3094,  48,  70,1231, 495,3139,2196,5043,1294,5044, #  480
-2080, 462, 586,1042,3279, 853, 256, 988, 185,2382,3457,1698, 434,1084,5045,3458, #  496
- 314,2625,2788,4522,2335,2336, 569,2285, 637,1817,2525, 757,1162,1879,1616,3459, #  512
- 287,1577,2116, 768,4523,1671,2868,3566,2526,1321,3816, 909,2418,5046,4211, 933, #  528
-3817,4212,2053,2361,1222,4524, 765,2419,1322, 786,4525,5047,1920,1462,1677,2909, #  544
-1699,5048,4526,1424,2442,3140,3690,2600,3353,1775,1941,3460,3983,4213, 309,1369, #  560
-1130,2825, 364,2234,1653,1299,3984,3567,3985,3986,2656, 525,1085,3041, 902,2001, #  576
-1475, 964,4527, 421,1845,1415,1057,2286, 940,1364,3141, 376,4528,4529,1381,   7, #  592
-2527, 983,2383, 336,1710,2684,1846, 321,3461, 559,1131,3042,2752,1809,1132,1313, #  608
- 265,1481,1858,5049, 352,1203,2826,3280, 167,1089, 420,2827, 776, 792,1724,3568, #  624
-4214,2443,3281,5050,4215,5051, 446, 229, 333,2753, 901,3818,1200,1557,4530,2657, #  640
-1921, 395,2754,2685,3819,4216,1836, 125, 916,3209,2626,4531,5052,5053,3820,5054, #  656
-5055,5056,4532,3142,3691,1133,2555,1757,3462,1510,2318,1409,3569,5057,2146, 438, #  672
-2601,2910,2384,3354,1068, 958,3043, 461, 311,2869,2686,4217,1916,3210,4218,1979, #  688
- 383, 750,2755,2627,4219, 274, 539, 385,1278,1442,5058,1154,1965, 384, 561, 210, #  704
-  98,1295,2556,3570,5059,1711,2420,1482,3463,3987,2911,1257, 129,5060,3821, 642, #  720
- 523,2789,2790,2658,5061, 141,2235,1333,  68, 176, 441, 876, 907,4220, 603,2602, #  736
- 710, 171,3464, 404, 549,  18,3143,2398,1410,3692,1666,5062,3571,4533,2912,4534, #  752
-5063,2991, 368,5064, 146, 366,  99, 871,3693,1543, 748, 807,1586,1185,  22,2263, #  768
- 379,3822,3211,5065,3212, 505,1942,2628,1992,1382,2319,5066, 380,2362, 218, 702, #  784
-1818,1248,3465,3044,3572,3355,3282,5067,2992,3694, 930,3283,3823,5068,  59,5069, #  800
- 585, 601,4221, 497,3466,1112,1314,4535,1802,5070,1223,1472,2177,5071, 749,1837, #  816
- 690,1900,3824,1773,3988,1476, 429,1043,1791,2236,2117, 917,4222, 447,1086,1629, #  832
-5072, 556,5073,5074,2021,1654, 844,1090, 105, 550, 966,1758,2828,1008,1783, 686, #  848
-1095,5075,2287, 793,1602,5076,3573,2603,4536,4223,2948,2302,4537,3825, 980,2503, #  864
- 544, 353, 527,4538, 908,2687,2913,5077, 381,2629,1943,1348,5078,1341,1252, 560, #  880
-3095,5079,3467,2870,5080,2054, 973, 886,2081, 143,4539,5081,5082, 157,3989, 496, #  896
-4224,  57, 840, 540,2039,4540,4541,3468,2118,1445, 970,2264,1748,1966,2082,4225, #  912
-3144,1234,1776,3284,2829,3695, 773,1206,2130,1066,2040,1326,3990,1738,1725,4226, #  928
- 279,3145,  51,1544,2604, 423,1578,2131,2067, 173,4542,1880,5083,5084,1583, 264, #  944
- 610,3696,4543,2444, 280, 154,5085,5086,5087,1739, 338,1282,3096, 693,2871,1411, #  960
-1074,3826,2445,5088,4544,5089,5090,1240, 952,2399,5091,2914,1538,2688, 685,1483, #  976
-4227,2475,1436, 953,4228,2055,4545, 671,2400,  79,4229,2446,3285, 608, 567,2689, #  992
-3469,4230,4231,1691, 393,1261,1792,2401,5092,4546,5093,5094,5095,5096,1383,1672, # 1008
-3827,3213,1464, 522,1119, 661,1150, 216, 675,4547,3991,1432,3574, 609,4548,2690, # 1024
-2402,5097,5098,5099,4232,3045,   0,5100,2476, 315, 231,2447, 301,3356,4549,2385, # 1040
-5101, 233,4233,3697,1819,4550,4551,5102,  96,1777,1315,2083,5103, 257,5104,1810, # 1056
-3698,2718,1139,1820,4234,2022,1124,2164,2791,1778,2659,5105,3097, 363,1655,3214, # 1072
-5106,2993,5107,5108,5109,3992,1567,3993, 718, 103,3215, 849,1443, 341,3357,2949, # 1088
-1484,5110,1712, 127,  67, 339,4235,2403, 679,1412, 821,5111,5112, 834, 738, 351, # 1104
-2994,2147, 846, 235,1497,1881, 418,1993,3828,2719, 186,1100,2148,2756,3575,1545, # 1120
-1355,2950,2872,1377, 583,3994,4236,2581,2995,5113,1298,3699,1078,2557,3700,2363, # 1136
-  78,3829,3830, 267,1289,2100,2002,1594,4237, 348, 369,1274,2197,2178,1838,4552, # 1152
-1821,2830,3701,2757,2288,2003,4553,2951,2758, 144,3358, 882,4554,3995,2759,3470, # 1168
-4555,2915,5114,4238,1726, 320,5115,3996,3046, 788,2996,5116,2831,1774,1327,2873, # 1184
-3997,2832,5117,1306,4556,2004,1700,3831,3576,2364,2660, 787,2023, 506, 824,3702, # 1200
- 534, 323,4557,1044,3359,2024,1901, 946,3471,5118,1779,1500,1678,5119,1882,4558, # 1216
- 165, 243,4559,3703,2528, 123, 683,4239, 764,4560,  36,3998,1793, 589,2916, 816, # 1232
- 626,1667,3047,2237,1639,1555,1622,3832,3999,5120,4000,2874,1370,1228,1933, 891, # 1248
-2084,2917, 304,4240,5121, 292,2997,2720,3577, 691,2101,4241,1115,4561, 118, 662, # 1264
-5122, 611,1156, 854,2386,1316,2875,   2, 386, 515,2918,5123,5124,3286, 868,2238, # 1280
-1486, 855,2661, 785,2216,3048,5125,1040,3216,3578,5126,3146, 448,5127,1525,5128, # 1296
-2165,4562,5129,3833,5130,4242,2833,3579,3147, 503, 818,4001,3148,1568, 814, 676, # 1312
-1444, 306,1749,5131,3834,1416,1030, 197,1428, 805,2834,1501,4563,5132,5133,5134, # 1328
-1994,5135,4564,5136,5137,2198,  13,2792,3704,2998,3149,1229,1917,5138,3835,2132, # 1344
-5139,4243,4565,2404,3580,5140,2217,1511,1727,1120,5141,5142, 646,3836,2448, 307, # 1360
-5143,5144,1595,3217,5145,5146,5147,3705,1113,1356,4002,1465,2529,2530,5148, 519, # 1376
-5149, 128,2133,  92,2289,1980,5150,4003,1512, 342,3150,2199,5151,2793,2218,1981, # 1392
-3360,4244, 290,1656,1317, 789, 827,2365,5152,3837,4566, 562, 581,4004,5153, 401, # 1408
-4567,2252,  94,4568,5154,1399,2794,5155,1463,2025,4569,3218,1944,5156, 828,1105, # 1424
-4245,1262,1394,5157,4246, 605,4570,5158,1784,2876,5159,2835, 819,2102, 578,2200, # 1440
-2952,5160,1502, 436,3287,4247,3288,2836,4005,2919,3472,3473,5161,2721,2320,5162, # 1456
-5163,2337,2068,  23,4571, 193, 826,3838,2103, 699,1630,4248,3098, 390,1794,1064, # 1472
-3581,5164,1579,3099,3100,1400,5165,4249,1839,1640,2877,5166,4572,4573, 137,4250, # 1488
- 598,3101,1967, 780, 104, 974,2953,5167, 278, 899, 253, 402, 572, 504, 493,1339, # 1504
-5168,4006,1275,4574,2582,2558,5169,3706,3049,3102,2253, 565,1334,2722, 863,  41, # 1520
-5170,5171,4575,5172,1657,2338,  19, 463,2760,4251, 606,5173,2999,3289,1087,2085, # 1536
-1323,2662,3000,5174,1631,1623,1750,4252,2691,5175,2878, 791,2723,2663,2339, 232, # 1552
-2421,5176,3001,1498,5177,2664,2630, 755,1366,3707,3290,3151,2026,1609, 119,1918, # 1568
-3474, 862,1026,4253,5178,4007,3839,4576,4008,4577,2265,1952,2477,5179,1125, 817, # 1584
-4254,4255,4009,1513,1766,2041,1487,4256,3050,3291,2837,3840,3152,5180,5181,1507, # 1600
-5182,2692, 733,  40,1632,1106,2879, 345,4257, 841,2531, 230,4578,3002,1847,3292, # 1616
-3475,5183,1263, 986,3476,5184, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562, # 1632
-4010,4011,2954, 967,2761,2665,1349, 592,2134,1692,3361,3003,1995,4258,1679,4012, # 1648
-1902,2188,5185, 739,3708,2724,1296,1290,5186,4259,2201,2202,1922,1563,2605,2559, # 1664
-1871,2762,3004,5187, 435,5188, 343,1108, 596,  17,1751,4579,2239,3477,3709,5189, # 1680
-4580, 294,3582,2955,1693, 477, 979, 281,2042,3583, 643,2043,3710,2631,2795,2266, # 1696
-1031,2340,2135,2303,3584,4581, 367,1249,2560,5190,3585,5191,4582,1283,3362,2005, # 1712
- 240,1762,3363,4583,4584, 836,1069,3153, 474,5192,2149,2532, 268,3586,5193,3219, # 1728
-1521,1284,5194,1658,1546,4260,5195,3587,3588,5196,4261,3364,2693,1685,4262, 961, # 1744
-1673,2632, 190,2006,2203,3841,4585,4586,5197, 570,2504,3711,1490,5198,4587,2633, # 1760
-3293,1957,4588, 584,1514, 396,1045,1945,5199,4589,1968,2449,5200,5201,4590,4013, # 1776
- 619,5202,3154,3294, 215,2007,2796,2561,3220,4591,3221,4592, 763,4263,3842,4593, # 1792
-5203,5204,1958,1767,2956,3365,3712,1174, 452,1477,4594,3366,3155,5205,2838,1253, # 1808
-2387,2189,1091,2290,4264, 492,5206, 638,1169,1825,2136,1752,4014, 648, 926,1021, # 1824
-1324,4595, 520,4596, 997, 847,1007, 892,4597,3843,2267,1872,3713,2405,1785,4598, # 1840
-1953,2957,3103,3222,1728,4265,2044,3714,4599,2008,1701,3156,1551,  30,2268,4266, # 1856
-5207,2027,4600,3589,5208, 501,5209,4267, 594,3478,2166,1822,3590,3479,3591,3223, # 1872
- 829,2839,4268,5210,1680,3157,1225,4269,5211,3295,4601,4270,3158,2341,5212,4602, # 1888
-4271,5213,4015,4016,5214,1848,2388,2606,3367,5215,4603, 374,4017, 652,4272,4273, # 1904
- 375,1140, 798,5216,5217,5218,2366,4604,2269, 546,1659, 138,3051,2450,4605,5219, # 1920
-2254, 612,1849, 910, 796,3844,1740,1371, 825,3845,3846,5220,2920,2562,5221, 692, # 1936
- 444,3052,2634, 801,4606,4274,5222,1491, 244,1053,3053,4275,4276, 340,5223,4018, # 1952
-1041,3005, 293,1168,  87,1357,5224,1539, 959,5225,2240, 721, 694,4277,3847, 219, # 1968
-1478, 644,1417,3368,2666,1413,1401,1335,1389,4019,5226,5227,3006,2367,3159,1826, # 1984
- 730,1515, 184,2840,  66,4607,5228,1660,2958, 246,3369, 378,1457, 226,3480, 975, # 2000
-4020,2959,1264,3592, 674, 696,5229, 163,5230,1141,2422,2167, 713,3593,3370,4608, # 2016
-4021,5231,5232,1186,  15,5233,1079,1070,5234,1522,3224,3594, 276,1050,2725, 758, # 2032
-1126, 653,2960,3296,5235,2342, 889,3595,4022,3104,3007, 903,1250,4609,4023,3481, # 2048
-3596,1342,1681,1718, 766,3297, 286,  89,2961,3715,5236,1713,5237,2607,3371,3008, # 2064
-5238,2962,2219,3225,2880,5239,4610,2505,2533, 181, 387,1075,4024, 731,2190,3372, # 2080
-5240,3298, 310, 313,3482,2304, 770,4278,  54,3054, 189,4611,3105,3848,4025,5241, # 2096
-1230,1617,1850, 355,3597,4279,4612,3373, 111,4280,3716,1350,3160,3483,3055,4281, # 2112
-2150,3299,3598,5242,2797,4026,4027,3009, 722,2009,5243,1071, 247,1207,2343,2478, # 2128
-1378,4613,2010, 864,1437,1214,4614, 373,3849,1142,2220, 667,4615, 442,2763,2563, # 2144
-3850,4028,1969,4282,3300,1840, 837, 170,1107, 934,1336,1883,5244,5245,2119,4283, # 2160
-2841, 743,1569,5246,4616,4284, 582,2389,1418,3484,5247,1803,5248, 357,1395,1729, # 2176
-3717,3301,2423,1564,2241,5249,3106,3851,1633,4617,1114,2086,4285,1532,5250, 482, # 2192
-2451,4618,5251,5252,1492, 833,1466,5253,2726,3599,1641,2842,5254,1526,1272,3718, # 2208
-4286,1686,1795, 416,2564,1903,1954,1804,5255,3852,2798,3853,1159,2321,5256,2881, # 2224
-4619,1610,1584,3056,2424,2764, 443,3302,1163,3161,5257,5258,4029,5259,4287,2506, # 2240
-3057,4620,4030,3162,2104,1647,3600,2011,1873,4288,5260,4289, 431,3485,5261, 250, # 2256
-  97,  81,4290,5262,1648,1851,1558, 160, 848,5263, 866, 740,1694,5264,2204,2843, # 2272
-3226,4291,4621,3719,1687, 950,2479, 426, 469,3227,3720,3721,4031,5265,5266,1188, # 2288
- 424,1996, 861,3601,4292,3854,2205,2694, 168,1235,3602,4293,5267,2087,1674,4622, # 2304
-3374,3303, 220,2565,1009,5268,3855, 670,3010, 332,1208, 717,5269,5270,3603,2452, # 2320
-4032,3375,5271, 513,5272,1209,2882,3376,3163,4623,1080,5273,5274,5275,5276,2534, # 2336
-3722,3604, 815,1587,4033,4034,5277,3605,3486,3856,1254,4624,1328,3058,1390,4035, # 2352
-1741,4036,3857,4037,5278, 236,3858,2453,3304,5279,5280,3723,3859,1273,3860,4625, # 2368
-5281, 308,5282,4626, 245,4627,1852,2480,1307,2583, 430, 715,2137,2454,5283, 270, # 2384
- 199,2883,4038,5284,3606,2727,1753, 761,1754, 725,1661,1841,4628,3487,3724,5285, # 2400
-5286, 587,  14,3305, 227,2608, 326, 480,2270, 943,2765,3607, 291, 650,1884,5287, # 2416
-1702,1226, 102,1547,  62,3488, 904,4629,3489,1164,4294,5288,5289,1224,1548,2766, # 2432
- 391, 498,1493,5290,1386,1419,5291,2056,1177,4630, 813, 880,1081,2368, 566,1145, # 2448
-4631,2291,1001,1035,2566,2609,2242, 394,1286,5292,5293,2069,5294,  86,1494,1730, # 2464
-4039, 491,1588, 745, 897,2963, 843,3377,4040,2767,2884,3306,1768, 998,2221,2070, # 2480
- 397,1827,1195,1970,3725,3011,3378, 284,5295,3861,2507,2138,2120,1904,5296,4041, # 2496
-2151,4042,4295,1036,3490,1905, 114,2567,4296, 209,1527,5297,5298,2964,2844,2635, # 2512
-2390,2728,3164, 812,2568,5299,3307,5300,1559, 737,1885,3726,1210, 885,  28,2695, # 2528
-3608,3862,5301,4297,1004,1780,4632,5302, 346,1982,2222,2696,4633,3863,1742, 797, # 2544
-1642,4043,1934,1072,1384,2152, 896,4044,3308,3727,3228,2885,3609,5303,2569,1959, # 2560
-4634,2455,1786,5304,5305,5306,4045,4298,1005,1308,3728,4299,2729,4635,4636,1528, # 2576
-2610, 161,1178,4300,1983, 987,4637,1101,4301, 631,4046,1157,3229,2425,1343,1241, # 2592
-1016,2243,2570, 372, 877,2344,2508,1160, 555,1935, 911,4047,5307, 466,1170, 169, # 2608
-1051,2921,2697,3729,2481,3012,1182,2012,2571,1251,2636,5308, 992,2345,3491,1540, # 2624
-2730,1201,2071,2406,1997,2482,5309,4638, 528,1923,2191,1503,1874,1570,2369,3379, # 2640
-3309,5310, 557,1073,5311,1828,3492,2088,2271,3165,3059,3107, 767,3108,2799,4639, # 2656
-1006,4302,4640,2346,1267,2179,3730,3230, 778,4048,3231,2731,1597,2667,5312,4641, # 2672
-5313,3493,5314,5315,5316,3310,2698,1433,3311, 131,  95,1504,4049, 723,4303,3166, # 2688
-1842,3610,2768,2192,4050,2028,2105,3731,5317,3013,4051,1218,5318,3380,3232,4052, # 2704
-4304,2584, 248,1634,3864, 912,5319,2845,3732,3060,3865, 654,  53,5320,3014,5321, # 2720
-1688,4642, 777,3494,1032,4053,1425,5322, 191, 820,2121,2846, 971,4643, 931,3233, # 2736
- 135, 664, 783,3866,1998, 772,2922,1936,4054,3867,4644,2923,3234, 282,2732, 640, # 2752
-1372,3495,1127, 922, 325,3381,5323,5324, 711,2045,5325,5326,4055,2223,2800,1937, # 2768
-4056,3382,2224,2255,3868,2305,5327,4645,3869,1258,3312,4057,3235,2139,2965,4058, # 2784
-4059,5328,2225, 258,3236,4646, 101,1227,5329,3313,1755,5330,1391,3314,5331,2924, # 2800
-2057, 893,5332,5333,5334,1402,4305,2347,5335,5336,3237,3611,5337,5338, 878,1325, # 2816
-1781,2801,4647, 259,1385,2585, 744,1183,2272,4648,5339,4060,2509,5340, 684,1024, # 2832
-4306,5341, 472,3612,3496,1165,3315,4061,4062, 322,2153, 881, 455,1695,1152,1340, # 2848
- 660, 554,2154,4649,1058,4650,4307, 830,1065,3383,4063,4651,1924,5342,1703,1919, # 2864
-5343, 932,2273, 122,5344,4652, 947, 677,5345,3870,2637, 297,1906,1925,2274,4653, # 2880
-2322,3316,5346,5347,4308,5348,4309,  84,4310, 112, 989,5349, 547,1059,4064, 701, # 2896
-3613,1019,5350,4311,5351,3497, 942, 639, 457,2306,2456, 993,2966, 407, 851, 494, # 2912
-4654,3384, 927,5352,1237,5353,2426,3385, 573,4312, 680, 921,2925,1279,1875, 285, # 2928
- 790,1448,1984, 719,2168,5354,5355,4655,4065,4066,1649,5356,1541, 563,5357,1077, # 2944
-5358,3386,3061,3498, 511,3015,4067,4068,3733,4069,1268,2572,3387,3238,4656,4657, # 2960
-5359, 535,1048,1276,1189,2926,2029,3167,1438,1373,2847,2967,1134,2013,5360,4313, # 2976
-1238,2586,3109,1259,5361, 700,5362,2968,3168,3734,4314,5363,4315,1146,1876,1907, # 2992
-4658,2611,4070, 781,2427, 132,1589, 203, 147, 273,2802,2407, 898,1787,2155,4071, # 3008
-4072,5364,3871,2803,5365,5366,4659,4660,5367,3239,5368,1635,3872, 965,5369,1805, # 3024
-2699,1516,3614,1121,1082,1329,3317,4073,1449,3873,  65,1128,2848,2927,2769,1590, # 3040
-3874,5370,5371,  12,2668,  45, 976,2587,3169,4661, 517,2535,1013,1037,3240,5372, # 3056
-3875,2849,5373,3876,5374,3499,5375,2612, 614,1999,2323,3877,3110,2733,2638,5376, # 3072
-2588,4316, 599,1269,5377,1811,3735,5378,2700,3111, 759,1060, 489,1806,3388,3318, # 3088
-1358,5379,5380,2391,1387,1215,2639,2256, 490,5381,5382,4317,1759,2392,2348,5383, # 3104
-4662,3878,1908,4074,2640,1807,3241,4663,3500,3319,2770,2349, 874,5384,5385,3501, # 3120
-3736,1859,  91,2928,3737,3062,3879,4664,5386,3170,4075,2669,5387,3502,1202,1403, # 3136
-3880,2969,2536,1517,2510,4665,3503,2511,5388,4666,5389,2701,1886,1495,1731,4076, # 3152
-2370,4667,5390,2030,5391,5392,4077,2702,1216, 237,2589,4318,2324,4078,3881,4668, # 3168
-4669,2703,3615,3504, 445,4670,5393,5394,5395,5396,2771,  61,4079,3738,1823,4080, # 3184
-5397, 687,2046, 935, 925, 405,2670, 703,1096,1860,2734,4671,4081,1877,1367,2704, # 3200
-3389, 918,2106,1782,2483, 334,3320,1611,1093,4672, 564,3171,3505,3739,3390, 945, # 3216
-2641,2058,4673,5398,1926, 872,4319,5399,3506,2705,3112, 349,4320,3740,4082,4674, # 3232
-3882,4321,3741,2156,4083,4675,4676,4322,4677,2408,2047, 782,4084, 400, 251,4323, # 3248
-1624,5400,5401, 277,3742, 299,1265, 476,1191,3883,2122,4324,4325,1109, 205,5402, # 3264
-2590,1000,2157,3616,1861,5403,5404,5405,4678,5406,4679,2573, 107,2484,2158,4085, # 3280
-3507,3172,5407,1533, 541,1301, 158, 753,4326,2886,3617,5408,1696, 370,1088,4327, # 3296
-4680,3618, 579, 327, 440, 162,2244, 269,1938,1374,3508, 968,3063,  56,1396,3113, # 3312
-2107,3321,3391,5409,1927,2159,4681,3016,5410,3619,5411,5412,3743,4682,2485,5413, # 3328
-2804,5414,1650,4683,5415,2613,5416,5417,4086,2671,3392,1149,3393,4087,3884,4088, # 3344
-5418,1076,  49,5419, 951,3242,3322,3323, 450,2850, 920,5420,1812,2805,2371,4328, # 3360
-1909,1138,2372,3885,3509,5421,3243,4684,1910,1147,1518,2428,4685,3886,5422,4686, # 3376
-2393,2614, 260,1796,3244,5423,5424,3887,3324, 708,5425,3620,1704,5426,3621,1351, # 3392
-1618,3394,3017,1887, 944,4329,3395,4330,3064,3396,4331,5427,3744, 422, 413,1714, # 3408
-3325, 500,2059,2350,4332,2486,5428,1344,1911, 954,5429,1668,5430,5431,4089,2409, # 3424
-4333,3622,3888,4334,5432,2307,1318,2512,3114, 133,3115,2887,4687, 629,  31,2851, # 3440
-2706,3889,4688, 850, 949,4689,4090,2970,1732,2089,4335,1496,1853,5433,4091, 620, # 3456
-3245, 981,1242,3745,3397,1619,3746,1643,3326,2140,2457,1971,1719,3510,2169,5434, # 3472
-3246,5435,5436,3398,1829,5437,1277,4690,1565,2048,5438,1636,3623,3116,5439, 869, # 3488
-2852, 655,3890,3891,3117,4092,3018,3892,1310,3624,4691,5440,5441,5442,1733, 558, # 3504
-4692,3747, 335,1549,3065,1756,4336,3748,1946,3511,1830,1291,1192, 470,2735,2108, # 3520
-2806, 913,1054,4093,5443,1027,5444,3066,4094,4693, 982,2672,3399,3173,3512,3247, # 3536
-3248,1947,2807,5445, 571,4694,5446,1831,5447,3625,2591,1523,2429,5448,2090, 984, # 3552
-4695,3749,1960,5449,3750, 852, 923,2808,3513,3751, 969,1519, 999,2049,2325,1705, # 3568
-5450,3118, 615,1662, 151, 597,4095,2410,2326,1049, 275,4696,3752,4337, 568,3753, # 3584
-3626,2487,4338,3754,5451,2430,2275, 409,3249,5452,1566,2888,3514,1002, 769,2853, # 3600
- 194,2091,3174,3755,2226,3327,4339, 628,1505,5453,5454,1763,2180,3019,4096, 521, # 3616
-1161,2592,1788,2206,2411,4697,4097,1625,4340,4341, 412,  42,3119, 464,5455,2642, # 3632
-4698,3400,1760,1571,2889,3515,2537,1219,2207,3893,2643,2141,2373,4699,4700,3328, # 3648
-1651,3401,3627,5456,5457,3628,2488,3516,5458,3756,5459,5460,2276,2092, 460,5461, # 3664
-4701,5462,3020, 962, 588,3629, 289,3250,2644,1116,  52,5463,3067,1797,5464,5465, # 3680
-5466,1467,5467,1598,1143,3757,4342,1985,1734,1067,4702,1280,3402, 465,4703,1572, # 3696
- 510,5468,1928,2245,1813,1644,3630,5469,4704,3758,5470,5471,2673,1573,1534,5472, # 3712
-5473, 536,1808,1761,3517,3894,3175,2645,5474,5475,5476,4705,3518,2929,1912,2809, # 3728
-5477,3329,1122, 377,3251,5478, 360,5479,5480,4343,1529, 551,5481,2060,3759,1769, # 3744
-2431,5482,2930,4344,3330,3120,2327,2109,2031,4706,1404, 136,1468,1479, 672,1171, # 3760
-3252,2308, 271,3176,5483,2772,5484,2050, 678,2736, 865,1948,4707,5485,2014,4098, # 3776
-2971,5486,2737,2227,1397,3068,3760,4708,4709,1735,2931,3403,3631,5487,3895, 509, # 3792
-2854,2458,2890,3896,5488,5489,3177,3178,4710,4345,2538,4711,2309,1166,1010, 552, # 3808
- 681,1888,5490,5491,2972,2973,4099,1287,1596,1862,3179, 358, 453, 736, 175, 478, # 3824
-1117, 905,1167,1097,5492,1854,1530,5493,1706,5494,2181,3519,2292,3761,3520,3632, # 3840
-4346,2093,4347,5495,3404,1193,2489,4348,1458,2193,2208,1863,1889,1421,3331,2932, # 3856
-3069,2182,3521, 595,2123,5496,4100,5497,5498,4349,1707,2646, 223,3762,1359, 751, # 3872
-3121, 183,3522,5499,2810,3021, 419,2374, 633, 704,3897,2394, 241,5500,5501,5502, # 3888
- 838,3022,3763,2277,2773,2459,3898,1939,2051,4101,1309,3122,2246,1181,5503,1136, # 3904
-2209,3899,2375,1446,4350,2310,4712,5504,5505,4351,1055,2615, 484,3764,5506,4102, # 3920
- 625,4352,2278,3405,1499,4353,4103,5507,4104,4354,3253,2279,2280,3523,5508,5509, # 3936
-2774, 808,2616,3765,3406,4105,4355,3123,2539, 526,3407,3900,4356, 955,5510,1620, # 3952
-4357,2647,2432,5511,1429,3766,1669,1832, 994, 928,5512,3633,1260,5513,5514,5515, # 3968
-1949,2293, 741,2933,1626,4358,2738,2460, 867,1184, 362,3408,1392,5516,5517,4106, # 3984
-4359,1770,1736,3254,2934,4713,4714,1929,2707,1459,1158,5518,3070,3409,2891,1292, # 4000
-1930,2513,2855,3767,1986,1187,2072,2015,2617,4360,5519,2574,2514,2170,3768,2490, # 4016
-3332,5520,3769,4715,5521,5522, 666,1003,3023,1022,3634,4361,5523,4716,1814,2257, # 4032
- 574,3901,1603, 295,1535, 705,3902,4362, 283, 858, 417,5524,5525,3255,4717,4718, # 4048
-3071,1220,1890,1046,2281,2461,4107,1393,1599, 689,2575, 388,4363,5526,2491, 802, # 4064
-5527,2811,3903,2061,1405,2258,5528,4719,3904,2110,1052,1345,3256,1585,5529, 809, # 4080
-5530,5531,5532, 575,2739,3524, 956,1552,1469,1144,2328,5533,2329,1560,2462,3635, # 4096
-3257,4108, 616,2210,4364,3180,2183,2294,5534,1833,5535,3525,4720,5536,1319,3770, # 4112
-3771,1211,3636,1023,3258,1293,2812,5537,5538,5539,3905, 607,2311,3906, 762,2892, # 4128
-1439,4365,1360,4721,1485,3072,5540,4722,1038,4366,1450,2062,2648,4367,1379,4723, # 4144
-2593,5541,5542,4368,1352,1414,2330,2935,1172,5543,5544,3907,3908,4724,1798,1451, # 4160
-5545,5546,5547,5548,2936,4109,4110,2492,2351, 411,4111,4112,3637,3333,3124,4725, # 4176
-1561,2674,1452,4113,1375,5549,5550,  47,2974, 316,5551,1406,1591,2937,3181,5552, # 4192
-1025,2142,3125,3182, 354,2740, 884,2228,4369,2412, 508,3772, 726,3638, 996,2433, # 4208
-3639, 729,5553, 392,2194,1453,4114,4726,3773,5554,5555,2463,3640,2618,1675,2813, # 4224
- 919,2352,2975,2353,1270,4727,4115,  73,5556,5557, 647,5558,3259,2856,2259,1550, # 4240
-1346,3024,5559,1332, 883,3526,5560,5561,5562,5563,3334,2775,5564,1212, 831,1347, # 4256
-4370,4728,2331,3909,1864,3073, 720,3910,4729,4730,3911,5565,4371,5566,5567,4731, # 4272
-5568,5569,1799,4732,3774,2619,4733,3641,1645,2376,4734,5570,2938, 669,2211,2675, # 4288
-2434,5571,2893,5572,5573,1028,3260,5574,4372,2413,5575,2260,1353,5576,5577,4735, # 4304
-3183, 518,5578,4116,5579,4373,1961,5580,2143,4374,5581,5582,3025,2354,2355,3912, # 4320
- 516,1834,1454,4117,2708,4375,4736,2229,2620,1972,1129,3642,5583,2776,5584,2976, # 4336
-1422, 577,1470,3026,1524,3410,5585,5586, 432,4376,3074,3527,5587,2594,1455,2515, # 4352
-2230,1973,1175,5588,1020,2741,4118,3528,4737,5589,2742,5590,1743,1361,3075,3529, # 4368
-2649,4119,4377,4738,2295, 895, 924,4378,2171, 331,2247,3076, 166,1627,3077,1098, # 4384
-5591,1232,2894,2231,3411,4739, 657, 403,1196,2377, 542,3775,3412,1600,4379,3530, # 4400
-5592,4740,2777,3261, 576, 530,1362,4741,4742,2540,2676,3776,4120,5593, 842,3913, # 4416
-5594,2814,2032,1014,4121, 213,2709,3413, 665, 621,4380,5595,3777,2939,2435,5596, # 4432
-2436,3335,3643,3414,4743,4381,2541,4382,4744,3644,1682,4383,3531,1380,5597, 724, # 4448
-2282, 600,1670,5598,1337,1233,4745,3126,2248,5599,1621,4746,5600, 651,4384,5601, # 4464
-1612,4385,2621,5602,2857,5603,2743,2312,3078,5604, 716,2464,3079, 174,1255,2710, # 4480
-4122,3645, 548,1320,1398, 728,4123,1574,5605,1891,1197,3080,4124,5606,3081,3082, # 4496
-3778,3646,3779, 747,5607, 635,4386,4747,5608,5609,5610,4387,5611,5612,4748,5613, # 4512
-3415,4749,2437, 451,5614,3780,2542,2073,4388,2744,4389,4125,5615,1764,4750,5616, # 4528
-4390, 350,4751,2283,2395,2493,5617,4391,4126,2249,1434,4127, 488,4752, 458,4392, # 4544
-4128,3781, 771,1330,2396,3914,2576,3184,2160,2414,1553,2677,3185,4393,5618,2494, # 4560
-2895,2622,1720,2711,4394,3416,4753,5619,2543,4395,5620,3262,4396,2778,5621,2016, # 4576
-2745,5622,1155,1017,3782,3915,5623,3336,2313, 201,1865,4397,1430,5624,4129,5625, # 4592
-5626,5627,5628,5629,4398,1604,5630, 414,1866, 371,2595,4754,4755,3532,2017,3127, # 4608
-4756,1708, 960,4399, 887, 389,2172,1536,1663,1721,5631,2232,4130,2356,2940,1580, # 4624
-5632,5633,1744,4757,2544,4758,4759,5634,4760,5635,2074,5636,4761,3647,3417,2896, # 4640
-4400,5637,4401,2650,3418,2815, 673,2712,2465, 709,3533,4131,3648,4402,5638,1148, # 4656
- 502, 634,5639,5640,1204,4762,3649,1575,4763,2623,3783,5641,3784,3128, 948,3263, # 4672
- 121,1745,3916,1110,5642,4403,3083,2516,3027,4132,3785,1151,1771,3917,1488,4133, # 4688
-1987,5643,2438,3534,5644,5645,2094,5646,4404,3918,1213,1407,2816, 531,2746,2545, # 4704
-3264,1011,1537,4764,2779,4405,3129,1061,5647,3786,3787,1867,2897,5648,2018, 120, # 4720
-4406,4407,2063,3650,3265,2314,3919,2678,3419,1955,4765,4134,5649,3535,1047,2713, # 4736
-1266,5650,1368,4766,2858, 649,3420,3920,2546,2747,1102,2859,2679,5651,5652,2000, # 4752
-5653,1111,3651,2977,5654,2495,3921,3652,2817,1855,3421,3788,5655,5656,3422,2415, # 4768
-2898,3337,3266,3653,5657,2577,5658,3654,2818,4135,1460, 856,5659,3655,5660,2899, # 4784
-2978,5661,2900,3922,5662,4408, 632,2517, 875,3923,1697,3924,2296,5663,5664,4767, # 4800
-3028,1239, 580,4768,4409,5665, 914, 936,2075,1190,4136,1039,2124,5666,5667,5668, # 4816
-5669,3423,1473,5670,1354,4410,3925,4769,2173,3084,4137, 915,3338,4411,4412,3339, # 4832
-1605,1835,5671,2748, 398,3656,4413,3926,4138, 328,1913,2860,4139,3927,1331,4414, # 4848
-3029, 937,4415,5672,3657,4140,4141,3424,2161,4770,3425, 524, 742, 538,3085,1012, # 4864
-5673,5674,3928,2466,5675, 658,1103, 225,3929,5676,5677,4771,5678,4772,5679,3267, # 4880
-1243,5680,4142, 963,2250,4773,5681,2714,3658,3186,5682,5683,2596,2332,5684,4774, # 4896
-5685,5686,5687,3536, 957,3426,2547,2033,1931,2941,2467, 870,2019,3659,1746,2780, # 4912
-2781,2439,2468,5688,3930,5689,3789,3130,3790,3537,3427,3791,5690,1179,3086,5691, # 4928
-3187,2378,4416,3792,2548,3188,3131,2749,4143,5692,3428,1556,2549,2297, 977,2901, # 4944
-2034,4144,1205,3429,5693,1765,3430,3189,2125,1271, 714,1689,4775,3538,5694,2333, # 4960
-3931, 533,4417,3660,2184, 617,5695,2469,3340,3539,2315,5696,5697,3190,5698,5699, # 4976
-3932,1988, 618, 427,2651,3540,3431,5700,5701,1244,1690,5702,2819,4418,4776,5703, # 4992
-3541,4777,5704,2284,1576, 473,3661,4419,3432, 972,5705,3662,5706,3087,5707,5708, # 5008
-4778,4779,5709,3793,4145,4146,5710, 153,4780, 356,5711,1892,2902,4420,2144, 408, # 5024
- 803,2357,5712,3933,5713,4421,1646,2578,2518,4781,4782,3934,5714,3935,4422,5715, # 5040
-2416,3433, 752,5716,5717,1962,3341,2979,5718, 746,3030,2470,4783,4423,3794, 698, # 5056
-4784,1893,4424,3663,2550,4785,3664,3936,5719,3191,3434,5720,1824,1302,4147,2715, # 5072
-3937,1974,4425,5721,4426,3192, 823,1303,1288,1236,2861,3542,4148,3435, 774,3938, # 5088
-5722,1581,4786,1304,2862,3939,4787,5723,2440,2162,1083,3268,4427,4149,4428, 344, # 5104
-1173, 288,2316, 454,1683,5724,5725,1461,4788,4150,2597,5726,5727,4789, 985, 894, # 5120
-5728,3436,3193,5729,1914,2942,3795,1989,5730,2111,1975,5731,4151,5732,2579,1194, # 5136
- 425,5733,4790,3194,1245,3796,4429,5734,5735,2863,5736, 636,4791,1856,3940, 760, # 5152
-1800,5737,4430,2212,1508,4792,4152,1894,1684,2298,5738,5739,4793,4431,4432,2213, # 5168
- 479,5740,5741, 832,5742,4153,2496,5743,2980,2497,3797, 990,3132, 627,1815,2652, # 5184
-4433,1582,4434,2126,2112,3543,4794,5744, 799,4435,3195,5745,4795,2113,1737,3031, # 5200
-1018, 543, 754,4436,3342,1676,4796,4797,4154,4798,1489,5746,3544,5747,2624,2903, # 5216
-4155,5748,5749,2981,5750,5751,5752,5753,3196,4799,4800,2185,1722,5754,3269,3270, # 5232
-1843,3665,1715, 481, 365,1976,1857,5755,5756,1963,2498,4801,5757,2127,3666,3271, # 5248
- 433,1895,2064,2076,5758, 602,2750,5759,5760,5761,5762,5763,3032,1628,3437,5764, # 5264
-3197,4802,4156,2904,4803,2519,5765,2551,2782,5766,5767,5768,3343,4804,2905,5769, # 5280
-4805,5770,2864,4806,4807,1221,2982,4157,2520,5771,5772,5773,1868,1990,5774,5775, # 5296
-5776,1896,5777,5778,4808,1897,4158, 318,5779,2095,4159,4437,5780,5781, 485,5782, # 5312
- 938,3941, 553,2680, 116,5783,3942,3667,5784,3545,2681,2783,3438,3344,2820,5785, # 5328
-3668,2943,4160,1747,2944,2983,5786,5787, 207,5788,4809,5789,4810,2521,5790,3033, # 5344
- 890,3669,3943,5791,1878,3798,3439,5792,2186,2358,3440,1652,5793,5794,5795, 941, # 5360
-2299, 208,3546,4161,2020, 330,4438,3944,2906,2499,3799,4439,4811,5796,5797,5798, # 5376
-)
-# fmt: on
diff --git a/src/pip/_vendor/chardet/big5prober.py b/src/pip/_vendor/chardet/big5prober.py
deleted file mode 100644
index ef09c60e327..00000000000
--- a/src/pip/_vendor/chardet/big5prober.py
+++ /dev/null
@@ -1,47 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .chardistribution import Big5DistributionAnalysis
-from .codingstatemachine import CodingStateMachine
-from .mbcharsetprober import MultiByteCharSetProber
-from .mbcssm import BIG5_SM_MODEL
-
-
-class Big5Prober(MultiByteCharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self.coding_sm = CodingStateMachine(BIG5_SM_MODEL)
-        self.distribution_analyzer = Big5DistributionAnalysis()
-        self.reset()
-
-    @property
-    def charset_name(self) -> str:
-        return "Big5"
-
-    @property
-    def language(self) -> str:
-        return "Chinese"
diff --git a/src/pip/_vendor/chardet/chardistribution.py b/src/pip/_vendor/chardet/chardistribution.py
deleted file mode 100644
index 176cb996408..00000000000
--- a/src/pip/_vendor/chardet/chardistribution.py
+++ /dev/null
@@ -1,261 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import Tuple, Union
-
-from .big5freq import (
-    BIG5_CHAR_TO_FREQ_ORDER,
-    BIG5_TABLE_SIZE,
-    BIG5_TYPICAL_DISTRIBUTION_RATIO,
-)
-from .euckrfreq import (
-    EUCKR_CHAR_TO_FREQ_ORDER,
-    EUCKR_TABLE_SIZE,
-    EUCKR_TYPICAL_DISTRIBUTION_RATIO,
-)
-from .euctwfreq import (
-    EUCTW_CHAR_TO_FREQ_ORDER,
-    EUCTW_TABLE_SIZE,
-    EUCTW_TYPICAL_DISTRIBUTION_RATIO,
-)
-from .gb2312freq import (
-    GB2312_CHAR_TO_FREQ_ORDER,
-    GB2312_TABLE_SIZE,
-    GB2312_TYPICAL_DISTRIBUTION_RATIO,
-)
-from .jisfreq import (
-    JIS_CHAR_TO_FREQ_ORDER,
-    JIS_TABLE_SIZE,
-    JIS_TYPICAL_DISTRIBUTION_RATIO,
-)
-from .johabfreq import JOHAB_TO_EUCKR_ORDER_TABLE
-
-
-class CharDistributionAnalysis:
-    ENOUGH_DATA_THRESHOLD = 1024
-    SURE_YES = 0.99
-    SURE_NO = 0.01
-    MINIMUM_DATA_THRESHOLD = 3
-
-    def __init__(self) -> None:
-        # Mapping table to get frequency order from char order (get from
-        # GetOrder())
-        self._char_to_freq_order: Tuple[int, ...] = tuple()
-        self._table_size = 0  # Size of above table
-        # This is a constant value which varies from language to language,
-        # used in calculating confidence.  See
-        # http://www.mozilla.org/projects/intl/UniversalCharsetDetection.html
-        # for further detail.
-        self.typical_distribution_ratio = 0.0
-        self._done = False
-        self._total_chars = 0
-        self._freq_chars = 0
-        self.reset()
-
-    def reset(self) -> None:
-        """reset analyser, clear any state"""
-        # If this flag is set to True, detection is done and conclusion has
-        # been made
-        self._done = False
-        self._total_chars = 0  # Total characters encountered
-        # The number of characters whose frequency order is less than 512
-        self._freq_chars = 0
-
-    def feed(self, char: Union[bytes, bytearray], char_len: int) -> None:
-        """feed a character with known length"""
-        if char_len == 2:
-            # we only care about 2-bytes character in our distribution analysis
-            order = self.get_order(char)
-        else:
-            order = -1
-        if order >= 0:
-            self._total_chars += 1
-            # order is valid
-            if order < self._table_size:
-                if 512 > self._char_to_freq_order[order]:
-                    self._freq_chars += 1
-
-    def get_confidence(self) -> float:
-        """return confidence based on existing data"""
-        # if we didn't receive any character in our consideration range,
-        # return negative answer
-        if self._total_chars <= 0 or self._freq_chars <= self.MINIMUM_DATA_THRESHOLD:
-            return self.SURE_NO
-
-        if self._total_chars != self._freq_chars:
-            r = self._freq_chars / (
-                (self._total_chars - self._freq_chars) * self.typical_distribution_ratio
-            )
-            if r < self.SURE_YES:
-                return r
-
-        # normalize confidence (we don't want to be 100% sure)
-        return self.SURE_YES
-
-    def got_enough_data(self) -> bool:
-        # It is not necessary to receive all data to draw conclusion.
-        # For charset detection, certain amount of data is enough
-        return self._total_chars > self.ENOUGH_DATA_THRESHOLD
-
-    def get_order(self, _: Union[bytes, bytearray]) -> int:
-        # We do not handle characters based on the original encoding string,
-        # but convert this encoding string to a number, here called order.
-        # This allows multiple encodings of a language to share one frequency
-        # table.
-        return -1
-
-
-class EUCTWDistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self) -> None:
-        super().__init__()
-        self._char_to_freq_order = EUCTW_CHAR_TO_FREQ_ORDER
-        self._table_size = EUCTW_TABLE_SIZE
-        self.typical_distribution_ratio = EUCTW_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, byte_str: Union[bytes, bytearray]) -> int:
-        # for euc-TW encoding, we are interested
-        #   first  byte range: 0xc4 -- 0xfe
-        #   second byte range: 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        first_char = byte_str[0]
-        if first_char >= 0xC4:
-            return 94 * (first_char - 0xC4) + byte_str[1] - 0xA1
-        return -1
-
-
-class EUCKRDistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self) -> None:
-        super().__init__()
-        self._char_to_freq_order = EUCKR_CHAR_TO_FREQ_ORDER
-        self._table_size = EUCKR_TABLE_SIZE
-        self.typical_distribution_ratio = EUCKR_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, byte_str: Union[bytes, bytearray]) -> int:
-        # for euc-KR encoding, we are interested
-        #   first  byte range: 0xb0 -- 0xfe
-        #   second byte range: 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        first_char = byte_str[0]
-        if first_char >= 0xB0:
-            return 94 * (first_char - 0xB0) + byte_str[1] - 0xA1
-        return -1
-
-
-class JOHABDistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self) -> None:
-        super().__init__()
-        self._char_to_freq_order = EUCKR_CHAR_TO_FREQ_ORDER
-        self._table_size = EUCKR_TABLE_SIZE
-        self.typical_distribution_ratio = EUCKR_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, byte_str: Union[bytes, bytearray]) -> int:
-        first_char = byte_str[0]
-        if 0x88 <= first_char < 0xD4:
-            code = first_char * 256 + byte_str[1]
-            return JOHAB_TO_EUCKR_ORDER_TABLE.get(code, -1)
-        return -1
-
-
-class GB2312DistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self) -> None:
-        super().__init__()
-        self._char_to_freq_order = GB2312_CHAR_TO_FREQ_ORDER
-        self._table_size = GB2312_TABLE_SIZE
-        self.typical_distribution_ratio = GB2312_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, byte_str: Union[bytes, bytearray]) -> int:
-        # for GB2312 encoding, we are interested
-        #  first  byte range: 0xb0 -- 0xfe
-        #  second byte range: 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        first_char, second_char = byte_str[0], byte_str[1]
-        if (first_char >= 0xB0) and (second_char >= 0xA1):
-            return 94 * (first_char - 0xB0) + second_char - 0xA1
-        return -1
-
-
-class Big5DistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self) -> None:
-        super().__init__()
-        self._char_to_freq_order = BIG5_CHAR_TO_FREQ_ORDER
-        self._table_size = BIG5_TABLE_SIZE
-        self.typical_distribution_ratio = BIG5_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, byte_str: Union[bytes, bytearray]) -> int:
-        # for big5 encoding, we are interested
-        #   first  byte range: 0xa4 -- 0xfe
-        #   second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        first_char, second_char = byte_str[0], byte_str[1]
-        if first_char >= 0xA4:
-            if second_char >= 0xA1:
-                return 157 * (first_char - 0xA4) + second_char - 0xA1 + 63
-            return 157 * (first_char - 0xA4) + second_char - 0x40
-        return -1
-
-
-class SJISDistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self) -> None:
-        super().__init__()
-        self._char_to_freq_order = JIS_CHAR_TO_FREQ_ORDER
-        self._table_size = JIS_TABLE_SIZE
-        self.typical_distribution_ratio = JIS_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, byte_str: Union[bytes, bytearray]) -> int:
-        # for sjis encoding, we are interested
-        #   first  byte range: 0x81 -- 0x9f , 0xe0 -- 0xfe
-        #   second byte range: 0x40 -- 0x7e,  0x81 -- oxfe
-        # no validation needed here. State machine has done that
-        first_char, second_char = byte_str[0], byte_str[1]
-        if 0x81 <= first_char <= 0x9F:
-            order = 188 * (first_char - 0x81)
-        elif 0xE0 <= first_char <= 0xEF:
-            order = 188 * (first_char - 0xE0 + 31)
-        else:
-            return -1
-        order = order + second_char - 0x40
-        if second_char > 0x7F:
-            order = -1
-        return order
-
-
-class EUCJPDistributionAnalysis(CharDistributionAnalysis):
-    def __init__(self) -> None:
-        super().__init__()
-        self._char_to_freq_order = JIS_CHAR_TO_FREQ_ORDER
-        self._table_size = JIS_TABLE_SIZE
-        self.typical_distribution_ratio = JIS_TYPICAL_DISTRIBUTION_RATIO
-
-    def get_order(self, byte_str: Union[bytes, bytearray]) -> int:
-        # for euc-JP encoding, we are interested
-        #   first  byte range: 0xa0 -- 0xfe
-        #   second byte range: 0xa1 -- 0xfe
-        # no validation needed here. State machine has done that
-        char = byte_str[0]
-        if char >= 0xA0:
-            return 94 * (char - 0xA1) + byte_str[1] - 0xA1
-        return -1
diff --git a/src/pip/_vendor/chardet/charsetgroupprober.py b/src/pip/_vendor/chardet/charsetgroupprober.py
deleted file mode 100644
index 6def56b4a75..00000000000
--- a/src/pip/_vendor/chardet/charsetgroupprober.py
+++ /dev/null
@@ -1,106 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import List, Optional, Union
-
-from .charsetprober import CharSetProber
-from .enums import LanguageFilter, ProbingState
-
-
-class CharSetGroupProber(CharSetProber):
-    def __init__(self, lang_filter: LanguageFilter = LanguageFilter.NONE) -> None:
-        super().__init__(lang_filter=lang_filter)
-        self._active_num = 0
-        self.probers: List[CharSetProber] = []
-        self._best_guess_prober: Optional[CharSetProber] = None
-
-    def reset(self) -> None:
-        super().reset()
-        self._active_num = 0
-        for prober in self.probers:
-            prober.reset()
-            prober.active = True
-            self._active_num += 1
-        self._best_guess_prober = None
-
-    @property
-    def charset_name(self) -> Optional[str]:
-        if not self._best_guess_prober:
-            self.get_confidence()
-            if not self._best_guess_prober:
-                return None
-        return self._best_guess_prober.charset_name
-
-    @property
-    def language(self) -> Optional[str]:
-        if not self._best_guess_prober:
-            self.get_confidence()
-            if not self._best_guess_prober:
-                return None
-        return self._best_guess_prober.language
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        for prober in self.probers:
-            if not prober.active:
-                continue
-            state = prober.feed(byte_str)
-            if not state:
-                continue
-            if state == ProbingState.FOUND_IT:
-                self._best_guess_prober = prober
-                self._state = ProbingState.FOUND_IT
-                return self.state
-            if state == ProbingState.NOT_ME:
-                prober.active = False
-                self._active_num -= 1
-                if self._active_num <= 0:
-                    self._state = ProbingState.NOT_ME
-                    return self.state
-        return self.state
-
-    def get_confidence(self) -> float:
-        state = self.state
-        if state == ProbingState.FOUND_IT:
-            return 0.99
-        if state == ProbingState.NOT_ME:
-            return 0.01
-        best_conf = 0.0
-        self._best_guess_prober = None
-        for prober in self.probers:
-            if not prober.active:
-                self.logger.debug("%s not active", prober.charset_name)
-                continue
-            conf = prober.get_confidence()
-            self.logger.debug(
-                "%s %s confidence = %s", prober.charset_name, prober.language, conf
-            )
-            if best_conf < conf:
-                best_conf = conf
-                self._best_guess_prober = prober
-        if not self._best_guess_prober:
-            return 0.0
-        return best_conf
diff --git a/src/pip/_vendor/chardet/charsetprober.py b/src/pip/_vendor/chardet/charsetprober.py
deleted file mode 100644
index a103ca11356..00000000000
--- a/src/pip/_vendor/chardet/charsetprober.py
+++ /dev/null
@@ -1,147 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-import logging
-import re
-from typing import Optional, Union
-
-from .enums import LanguageFilter, ProbingState
-
-INTERNATIONAL_WORDS_PATTERN = re.compile(
-    b"[a-zA-Z]*[\x80-\xFF]+[a-zA-Z]*[^a-zA-Z\x80-\xFF]?"
-)
-
-
-class CharSetProber:
-
-    SHORTCUT_THRESHOLD = 0.95
-
-    def __init__(self, lang_filter: LanguageFilter = LanguageFilter.NONE) -> None:
-        self._state = ProbingState.DETECTING
-        self.active = True
-        self.lang_filter = lang_filter
-        self.logger = logging.getLogger(__name__)
-
-    def reset(self) -> None:
-        self._state = ProbingState.DETECTING
-
-    @property
-    def charset_name(self) -> Optional[str]:
-        return None
-
-    @property
-    def language(self) -> Optional[str]:
-        raise NotImplementedError
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        raise NotImplementedError
-
-    @property
-    def state(self) -> ProbingState:
-        return self._state
-
-    def get_confidence(self) -> float:
-        return 0.0
-
-    @staticmethod
-    def filter_high_byte_only(buf: Union[bytes, bytearray]) -> bytes:
-        buf = re.sub(b"([\x00-\x7F])+", b" ", buf)
-        return buf
-
-    @staticmethod
-    def filter_international_words(buf: Union[bytes, bytearray]) -> bytearray:
-        """
-        We define three types of bytes:
-        alphabet: english alphabets [a-zA-Z]
-        international: international characters [\x80-\xFF]
-        marker: everything else [^a-zA-Z\x80-\xFF]
-        The input buffer can be thought to contain a series of words delimited
-        by markers. This function works to filter all words that contain at
-        least one international character. All contiguous sequences of markers
-        are replaced by a single space ascii character.
-        This filter applies to all scripts which do not use English characters.
-        """
-        filtered = bytearray()
-
-        # This regex expression filters out only words that have at-least one
-        # international character. The word may include one marker character at
-        # the end.
-        words = INTERNATIONAL_WORDS_PATTERN.findall(buf)
-
-        for word in words:
-            filtered.extend(word[:-1])
-
-            # If the last character in the word is a marker, replace it with a
-            # space as markers shouldn't affect our analysis (they are used
-            # similarly across all languages and may thus have similar
-            # frequencies).
-            last_char = word[-1:]
-            if not last_char.isalpha() and last_char < b"\x80":
-                last_char = b" "
-            filtered.extend(last_char)
-
-        return filtered
-
-    @staticmethod
-    def remove_xml_tags(buf: Union[bytes, bytearray]) -> bytes:
-        """
-        Returns a copy of ``buf`` that retains only the sequences of English
-        alphabet and high byte characters that are not between <> characters.
-        This filter can be applied to all scripts which contain both English
-        characters and extended ASCII characters, but is currently only used by
-        ``Latin1Prober``.
-        """
-        filtered = bytearray()
-        in_tag = False
-        prev = 0
-        buf = memoryview(buf).cast("c")
-
-        for curr, buf_char in enumerate(buf):
-            # Check if we're coming out of or entering an XML tag
-
-            # https://github.com/python/typeshed/issues/8182
-            if buf_char == b">":  # type: ignore[comparison-overlap]
-                prev = curr + 1
-                in_tag = False
-            # https://github.com/python/typeshed/issues/8182
-            elif buf_char == b"<":  # type: ignore[comparison-overlap]
-                if curr > prev and not in_tag:
-                    # Keep everything after last non-extended-ASCII,
-                    # non-alphabetic character
-                    filtered.extend(buf[prev:curr])
-                    # Output a space to delimit stretch we kept
-                    filtered.extend(b" ")
-                in_tag = True
-
-        # If we're not in a tag...
-        if not in_tag:
-            # Keep everything after last non-extended-ASCII, non-alphabetic
-            # character
-            filtered.extend(buf[prev:])
-
-        return filtered
diff --git a/src/pip/_vendor/chardet/cli/__init__.py b/src/pip/_vendor/chardet/cli/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/pip/_vendor/chardet/cli/chardetect.py b/src/pip/_vendor/chardet/cli/chardetect.py
deleted file mode 100644
index 43f6e144f67..00000000000
--- a/src/pip/_vendor/chardet/cli/chardetect.py
+++ /dev/null
@@ -1,112 +0,0 @@
-"""
-Script which takes one or more file paths and reports on their detected
-encodings
-
-Example::
-
-    % chardetect somefile someotherfile
-    somefile: windows-1252 with confidence 0.5
-    someotherfile: ascii with confidence 1.0
-
-If no paths are provided, it takes its input from stdin.
-
-"""
-
-
-import argparse
-import sys
-from typing import Iterable, List, Optional
-
-from .. import __version__
-from ..universaldetector import UniversalDetector
-
-
-def description_of(
-    lines: Iterable[bytes],
-    name: str = "stdin",
-    minimal: bool = False,
-    should_rename_legacy: bool = False,
-) -> Optional[str]:
-    """
-    Return a string describing the probable encoding of a file or
-    list of strings.
-
-    :param lines: The lines to get the encoding of.
-    :type lines: Iterable of bytes
-    :param name: Name of file or collection of lines
-    :type name: str
-    :param should_rename_legacy:  Should we rename legacy encodings to
-                                  their more modern equivalents?
-    :type should_rename_legacy:   ``bool``
-    """
-    u = UniversalDetector(should_rename_legacy=should_rename_legacy)
-    for line in lines:
-        line = bytearray(line)
-        u.feed(line)
-        # shortcut out of the loop to save reading further - particularly useful if we read a BOM.
-        if u.done:
-            break
-    u.close()
-    result = u.result
-    if minimal:
-        return result["encoding"]
-    if result["encoding"]:
-        return f'{name}: {result["encoding"]} with confidence {result["confidence"]}'
-    return f"{name}: no result"
-
-
-def main(argv: Optional[List[str]] = None) -> None:
-    """
-    Handles command line arguments and gets things started.
-
-    :param argv: List of arguments, as if specified on the command-line.
-                 If None, ``sys.argv[1:]`` is used instead.
-    :type argv: list of str
-    """
-    # Get command line arguments
-    parser = argparse.ArgumentParser(
-        description=(
-            "Takes one or more file paths and reports their detected encodings"
-        )
-    )
-    parser.add_argument(
-        "input",
-        help="File whose encoding we would like to determine. (default: stdin)",
-        type=argparse.FileType("rb"),
-        nargs="*",
-        default=[sys.stdin.buffer],
-    )
-    parser.add_argument(
-        "--minimal",
-        help="Print only the encoding to standard output",
-        action="store_true",
-    )
-    parser.add_argument(
-        "-l",
-        "--legacy",
-        help="Rename legacy encodings to more modern ones.",
-        action="store_true",
-    )
-    parser.add_argument(
-        "--version", action="version", version=f"%(prog)s {__version__}"
-    )
-    args = parser.parse_args(argv)
-
-    for f in args.input:
-        if f.isatty():
-            print(
-                "You are running chardetect interactively. Press "
-                "CTRL-D twice at the start of a blank line to signal the "
-                "end of your input. If you want help, run chardetect "
-                "--help\n",
-                file=sys.stderr,
-            )
-        print(
-            description_of(
-                f, f.name, minimal=args.minimal, should_rename_legacy=args.legacy
-            )
-        )
-
-
-if __name__ == "__main__":
-    main()
diff --git a/src/pip/_vendor/chardet/codingstatemachine.py b/src/pip/_vendor/chardet/codingstatemachine.py
deleted file mode 100644
index 8ed4a8773b8..00000000000
--- a/src/pip/_vendor/chardet/codingstatemachine.py
+++ /dev/null
@@ -1,90 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-import logging
-
-from .codingstatemachinedict import CodingStateMachineDict
-from .enums import MachineState
-
-
-class CodingStateMachine:
-    """
-    A state machine to verify a byte sequence for a particular encoding. For
-    each byte the detector receives, it will feed that byte to every active
-    state machine available, one byte at a time. The state machine changes its
-    state based on its previous state and the byte it receives. There are 3
-    states in a state machine that are of interest to an auto-detector:
-
-    START state: This is the state to start with, or a legal byte sequence
-                 (i.e. a valid code point) for character has been identified.
-
-    ME state:  This indicates that the state machine identified a byte sequence
-               that is specific to the charset it is designed for and that
-               there is no other possible encoding which can contain this byte
-               sequence. This will to lead to an immediate positive answer for
-               the detector.
-
-    ERROR state: This indicates the state machine identified an illegal byte
-                 sequence for that encoding. This will lead to an immediate
-                 negative answer for this encoding. Detector will exclude this
-                 encoding from consideration from here on.
-    """
-
-    def __init__(self, sm: CodingStateMachineDict) -> None:
-        self._model = sm
-        self._curr_byte_pos = 0
-        self._curr_char_len = 0
-        self._curr_state = MachineState.START
-        self.active = True
-        self.logger = logging.getLogger(__name__)
-        self.reset()
-
-    def reset(self) -> None:
-        self._curr_state = MachineState.START
-
-    def next_state(self, c: int) -> int:
-        # for each byte we get its class
-        # if it is first byte, we also get byte length
-        byte_class = self._model["class_table"][c]
-        if self._curr_state == MachineState.START:
-            self._curr_byte_pos = 0
-            self._curr_char_len = self._model["char_len_table"][byte_class]
-        # from byte's class and state_table, we get its next state
-        curr_state = self._curr_state * self._model["class_factor"] + byte_class
-        self._curr_state = self._model["state_table"][curr_state]
-        self._curr_byte_pos += 1
-        return self._curr_state
-
-    def get_current_charlen(self) -> int:
-        return self._curr_char_len
-
-    def get_coding_state_machine(self) -> str:
-        return self._model["name"]
-
-    @property
-    def language(self) -> str:
-        return self._model["language"]
diff --git a/src/pip/_vendor/chardet/codingstatemachinedict.py b/src/pip/_vendor/chardet/codingstatemachinedict.py
deleted file mode 100644
index 7a3c4c7e3fe..00000000000
--- a/src/pip/_vendor/chardet/codingstatemachinedict.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from typing import TYPE_CHECKING, Tuple
-
-if TYPE_CHECKING:
-    # TypedDict was introduced in Python 3.8.
-    #
-    # TODO: Remove the else block and TYPE_CHECKING check when dropping support
-    # for Python 3.7.
-    from typing import TypedDict
-
-    class CodingStateMachineDict(TypedDict, total=False):
-        class_table: Tuple[int, ...]
-        class_factor: int
-        state_table: Tuple[int, ...]
-        char_len_table: Tuple[int, ...]
-        name: str
-        language: str  # Optional key
-
-else:
-    CodingStateMachineDict = dict
diff --git a/src/pip/_vendor/chardet/cp949prober.py b/src/pip/_vendor/chardet/cp949prober.py
deleted file mode 100644
index fa7307ed898..00000000000
--- a/src/pip/_vendor/chardet/cp949prober.py
+++ /dev/null
@@ -1,49 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .chardistribution import EUCKRDistributionAnalysis
-from .codingstatemachine import CodingStateMachine
-from .mbcharsetprober import MultiByteCharSetProber
-from .mbcssm import CP949_SM_MODEL
-
-
-class CP949Prober(MultiByteCharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self.coding_sm = CodingStateMachine(CP949_SM_MODEL)
-        # NOTE: CP949 is a superset of EUC-KR, so the distribution should be
-        #       not different.
-        self.distribution_analyzer = EUCKRDistributionAnalysis()
-        self.reset()
-
-    @property
-    def charset_name(self) -> str:
-        return "CP949"
-
-    @property
-    def language(self) -> str:
-        return "Korean"
diff --git a/src/pip/_vendor/chardet/enums.py b/src/pip/_vendor/chardet/enums.py
deleted file mode 100644
index 5e3e1982336..00000000000
--- a/src/pip/_vendor/chardet/enums.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""
-All of the Enums that are used throughout the chardet package.
-
-:author: Dan Blanchard (dan.blanchard@gmail.com)
-"""
-
-from enum import Enum, Flag
-
-
-class InputState:
-    """
-    This enum represents the different states a universal detector can be in.
-    """
-
-    PURE_ASCII = 0
-    ESC_ASCII = 1
-    HIGH_BYTE = 2
-
-
-class LanguageFilter(Flag):
-    """
-    This enum represents the different language filters we can apply to a
-    ``UniversalDetector``.
-    """
-
-    NONE = 0x00
-    CHINESE_SIMPLIFIED = 0x01
-    CHINESE_TRADITIONAL = 0x02
-    JAPANESE = 0x04
-    KOREAN = 0x08
-    NON_CJK = 0x10
-    ALL = 0x1F
-    CHINESE = CHINESE_SIMPLIFIED | CHINESE_TRADITIONAL
-    CJK = CHINESE | JAPANESE | KOREAN
-
-
-class ProbingState(Enum):
-    """
-    This enum represents the different states a prober can be in.
-    """
-
-    DETECTING = 0
-    FOUND_IT = 1
-    NOT_ME = 2
-
-
-class MachineState:
-    """
-    This enum represents the different states a state machine can be in.
-    """
-
-    START = 0
-    ERROR = 1
-    ITS_ME = 2
-
-
-class SequenceLikelihood:
-    """
-    This enum represents the likelihood of a character following the previous one.
-    """
-
-    NEGATIVE = 0
-    UNLIKELY = 1
-    LIKELY = 2
-    POSITIVE = 3
-
-    @classmethod
-    def get_num_categories(cls) -> int:
-        """:returns: The number of likelihood categories in the enum."""
-        return 4
-
-
-class CharacterCategory:
-    """
-    This enum represents the different categories language models for
-    ``SingleByteCharsetProber`` put characters into.
-
-    Anything less than CONTROL is considered a letter.
-    """
-
-    UNDEFINED = 255
-    LINE_BREAK = 254
-    SYMBOL = 253
-    DIGIT = 252
-    CONTROL = 251
diff --git a/src/pip/_vendor/chardet/escprober.py b/src/pip/_vendor/chardet/escprober.py
deleted file mode 100644
index fd713830d36..00000000000
--- a/src/pip/_vendor/chardet/escprober.py
+++ /dev/null
@@ -1,102 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import Optional, Union
-
-from .charsetprober import CharSetProber
-from .codingstatemachine import CodingStateMachine
-from .enums import LanguageFilter, MachineState, ProbingState
-from .escsm import (
-    HZ_SM_MODEL,
-    ISO2022CN_SM_MODEL,
-    ISO2022JP_SM_MODEL,
-    ISO2022KR_SM_MODEL,
-)
-
-
-class EscCharSetProber(CharSetProber):
-    """
-    This CharSetProber uses a "code scheme" approach for detecting encodings,
-    whereby easily recognizable escape or shift sequences are relied on to
-    identify these encodings.
-    """
-
-    def __init__(self, lang_filter: LanguageFilter = LanguageFilter.NONE) -> None:
-        super().__init__(lang_filter=lang_filter)
-        self.coding_sm = []
-        if self.lang_filter & LanguageFilter.CHINESE_SIMPLIFIED:
-            self.coding_sm.append(CodingStateMachine(HZ_SM_MODEL))
-            self.coding_sm.append(CodingStateMachine(ISO2022CN_SM_MODEL))
-        if self.lang_filter & LanguageFilter.JAPANESE:
-            self.coding_sm.append(CodingStateMachine(ISO2022JP_SM_MODEL))
-        if self.lang_filter & LanguageFilter.KOREAN:
-            self.coding_sm.append(CodingStateMachine(ISO2022KR_SM_MODEL))
-        self.active_sm_count = 0
-        self._detected_charset: Optional[str] = None
-        self._detected_language: Optional[str] = None
-        self._state = ProbingState.DETECTING
-        self.reset()
-
-    def reset(self) -> None:
-        super().reset()
-        for coding_sm in self.coding_sm:
-            coding_sm.active = True
-            coding_sm.reset()
-        self.active_sm_count = len(self.coding_sm)
-        self._detected_charset = None
-        self._detected_language = None
-
-    @property
-    def charset_name(self) -> Optional[str]:
-        return self._detected_charset
-
-    @property
-    def language(self) -> Optional[str]:
-        return self._detected_language
-
-    def get_confidence(self) -> float:
-        return 0.99 if self._detected_charset else 0.00
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        for c in byte_str:
-            for coding_sm in self.coding_sm:
-                if not coding_sm.active:
-                    continue
-                coding_state = coding_sm.next_state(c)
-                if coding_state == MachineState.ERROR:
-                    coding_sm.active = False
-                    self.active_sm_count -= 1
-                    if self.active_sm_count <= 0:
-                        self._state = ProbingState.NOT_ME
-                        return self.state
-                elif coding_state == MachineState.ITS_ME:
-                    self._state = ProbingState.FOUND_IT
-                    self._detected_charset = coding_sm.get_coding_state_machine()
-                    self._detected_language = coding_sm.language
-                    return self.state
-
-        return self.state
diff --git a/src/pip/_vendor/chardet/escsm.py b/src/pip/_vendor/chardet/escsm.py
deleted file mode 100644
index 11d4adf771f..00000000000
--- a/src/pip/_vendor/chardet/escsm.py
+++ /dev/null
@@ -1,261 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License,  or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not,  write to the Free Software
-# Foundation,  Inc.,  51 Franklin St,  Fifth Floor,  Boston,  MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .codingstatemachinedict import CodingStateMachineDict
-from .enums import MachineState
-
-# fmt: off
-HZ_CLS = (
-    1, 0, 0, 0, 0, 0, 0, 0,  # 00 - 07
-    0, 0, 0, 0, 0, 0, 0, 0,  # 08 - 0f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 10 - 17
-    0, 0, 0, 1, 0, 0, 0, 0,  # 18 - 1f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 20 - 27
-    0, 0, 0, 0, 0, 0, 0, 0,  # 28 - 2f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 30 - 37
-    0, 0, 0, 0, 0, 0, 0, 0,  # 38 - 3f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 40 - 47
-    0, 0, 0, 0, 0, 0, 0, 0,  # 48 - 4f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 50 - 57
-    0, 0, 0, 0, 0, 0, 0, 0,  # 58 - 5f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 60 - 67
-    0, 0, 0, 0, 0, 0, 0, 0,  # 68 - 6f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 70 - 77
-    0, 0, 0, 4, 0, 5, 2, 0,  # 78 - 7f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 80 - 87
-    1, 1, 1, 1, 1, 1, 1, 1,  # 88 - 8f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 90 - 97
-    1, 1, 1, 1, 1, 1, 1, 1,  # 98 - 9f
-    1, 1, 1, 1, 1, 1, 1, 1,  # a0 - a7
-    1, 1, 1, 1, 1, 1, 1, 1,  # a8 - af
-    1, 1, 1, 1, 1, 1, 1, 1,  # b0 - b7
-    1, 1, 1, 1, 1, 1, 1, 1,  # b8 - bf
-    1, 1, 1, 1, 1, 1, 1, 1,  # c0 - c7
-    1, 1, 1, 1, 1, 1, 1, 1,  # c8 - cf
-    1, 1, 1, 1, 1, 1, 1, 1,  # d0 - d7
-    1, 1, 1, 1, 1, 1, 1, 1,  # d8 - df
-    1, 1, 1, 1, 1, 1, 1, 1,  # e0 - e7
-    1, 1, 1, 1, 1, 1, 1, 1,  # e8 - ef
-    1, 1, 1, 1, 1, 1, 1, 1,  # f0 - f7
-    1, 1, 1, 1, 1, 1, 1, 1,  # f8 - ff
-)
-
-HZ_ST = (
-MachineState.START, MachineState.ERROR,      3, MachineState.START, MachineState.START, MachineState.START, MachineState.ERROR, MachineState.ERROR, # 00-07
-MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, # 08-0f
-MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ERROR, MachineState.ERROR, MachineState.START, MachineState.START,      4, MachineState.ERROR, # 10-17
-     5, MachineState.ERROR,      6, MachineState.ERROR,      5,      5,      4, MachineState.ERROR, # 18-1f
-     4, MachineState.ERROR,      4,      4,      4, MachineState.ERROR,      4, MachineState.ERROR, # 20-27
-     4, MachineState.ITS_ME, MachineState.START, MachineState.START, MachineState.START, MachineState.START, MachineState.START, MachineState.START, # 28-2f
-)
-# fmt: on
-
-HZ_CHAR_LEN_TABLE = (0, 0, 0, 0, 0, 0)
-
-HZ_SM_MODEL: CodingStateMachineDict = {
-    "class_table": HZ_CLS,
-    "class_factor": 6,
-    "state_table": HZ_ST,
-    "char_len_table": HZ_CHAR_LEN_TABLE,
-    "name": "HZ-GB-2312",
-    "language": "Chinese",
-}
-
-# fmt: off
-ISO2022CN_CLS = (
-    2, 0, 0, 0, 0, 0, 0, 0,  # 00 - 07
-    0, 0, 0, 0, 0, 0, 0, 0,  # 08 - 0f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 10 - 17
-    0, 0, 0, 1, 0, 0, 0, 0,  # 18 - 1f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 20 - 27
-    0, 3, 0, 0, 0, 0, 0, 0,  # 28 - 2f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 30 - 37
-    0, 0, 0, 0, 0, 0, 0, 0,  # 38 - 3f
-    0, 0, 0, 4, 0, 0, 0, 0,  # 40 - 47
-    0, 0, 0, 0, 0, 0, 0, 0,  # 48 - 4f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 50 - 57
-    0, 0, 0, 0, 0, 0, 0, 0,  # 58 - 5f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 60 - 67
-    0, 0, 0, 0, 0, 0, 0, 0,  # 68 - 6f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 70 - 77
-    0, 0, 0, 0, 0, 0, 0, 0,  # 78 - 7f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 80 - 87
-    2, 2, 2, 2, 2, 2, 2, 2,  # 88 - 8f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 90 - 97
-    2, 2, 2, 2, 2, 2, 2, 2,  # 98 - 9f
-    2, 2, 2, 2, 2, 2, 2, 2,  # a0 - a7
-    2, 2, 2, 2, 2, 2, 2, 2,  # a8 - af
-    2, 2, 2, 2, 2, 2, 2, 2,  # b0 - b7
-    2, 2, 2, 2, 2, 2, 2, 2,  # b8 - bf
-    2, 2, 2, 2, 2, 2, 2, 2,  # c0 - c7
-    2, 2, 2, 2, 2, 2, 2, 2,  # c8 - cf
-    2, 2, 2, 2, 2, 2, 2, 2,  # d0 - d7
-    2, 2, 2, 2, 2, 2, 2, 2,  # d8 - df
-    2, 2, 2, 2, 2, 2, 2, 2,  # e0 - e7
-    2, 2, 2, 2, 2, 2, 2, 2,  # e8 - ef
-    2, 2, 2, 2, 2, 2, 2, 2,  # f0 - f7
-    2, 2, 2, 2, 2, 2, 2, 2,  # f8 - ff
-)
-
-ISO2022CN_ST = (
-    MachineState.START,      3, MachineState.ERROR, MachineState.START, MachineState.START, MachineState.START, MachineState.START, MachineState.START, # 00-07
-    MachineState.START, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, # 08-0f
-    MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, # 10-17
-    MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR,      4, MachineState.ERROR, # 18-1f
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, # 20-27
-        5,      6, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, # 28-2f
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, # 30-37
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ERROR, MachineState.START, # 38-3f
-)
-# fmt: on
-
-ISO2022CN_CHAR_LEN_TABLE = (0, 0, 0, 0, 0, 0, 0, 0, 0)
-
-ISO2022CN_SM_MODEL: CodingStateMachineDict = {
-    "class_table": ISO2022CN_CLS,
-    "class_factor": 9,
-    "state_table": ISO2022CN_ST,
-    "char_len_table": ISO2022CN_CHAR_LEN_TABLE,
-    "name": "ISO-2022-CN",
-    "language": "Chinese",
-}
-
-# fmt: off
-ISO2022JP_CLS = (
-    2, 0, 0, 0, 0, 0, 0, 0,  # 00 - 07
-    0, 0, 0, 0, 0, 0, 2, 2,  # 08 - 0f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 10 - 17
-    0, 0, 0, 1, 0, 0, 0, 0,  # 18 - 1f
-    0, 0, 0, 0, 7, 0, 0, 0,  # 20 - 27
-    3, 0, 0, 0, 0, 0, 0, 0,  # 28 - 2f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 30 - 37
-    0, 0, 0, 0, 0, 0, 0, 0,  # 38 - 3f
-    6, 0, 4, 0, 8, 0, 0, 0,  # 40 - 47
-    0, 9, 5, 0, 0, 0, 0, 0,  # 48 - 4f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 50 - 57
-    0, 0, 0, 0, 0, 0, 0, 0,  # 58 - 5f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 60 - 67
-    0, 0, 0, 0, 0, 0, 0, 0,  # 68 - 6f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 70 - 77
-    0, 0, 0, 0, 0, 0, 0, 0,  # 78 - 7f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 80 - 87
-    2, 2, 2, 2, 2, 2, 2, 2,  # 88 - 8f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 90 - 97
-    2, 2, 2, 2, 2, 2, 2, 2,  # 98 - 9f
-    2, 2, 2, 2, 2, 2, 2, 2,  # a0 - a7
-    2, 2, 2, 2, 2, 2, 2, 2,  # a8 - af
-    2, 2, 2, 2, 2, 2, 2, 2,  # b0 - b7
-    2, 2, 2, 2, 2, 2, 2, 2,  # b8 - bf
-    2, 2, 2, 2, 2, 2, 2, 2,  # c0 - c7
-    2, 2, 2, 2, 2, 2, 2, 2,  # c8 - cf
-    2, 2, 2, 2, 2, 2, 2, 2,  # d0 - d7
-    2, 2, 2, 2, 2, 2, 2, 2,  # d8 - df
-    2, 2, 2, 2, 2, 2, 2, 2,  # e0 - e7
-    2, 2, 2, 2, 2, 2, 2, 2,  # e8 - ef
-    2, 2, 2, 2, 2, 2, 2, 2,  # f0 - f7
-    2, 2, 2, 2, 2, 2, 2, 2,  # f8 - ff
-)
-
-ISO2022JP_ST = (
-    MachineState.START,      3, MachineState.ERROR, MachineState.START, MachineState.START, MachineState.START, MachineState.START, MachineState.START, # 00-07
-    MachineState.START, MachineState.START, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, # 08-0f
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, # 10-17
-    MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ERROR, MachineState.ERROR, # 18-1f
-    MachineState.ERROR,      5, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR,      4, MachineState.ERROR, MachineState.ERROR, # 20-27
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR,      6, MachineState.ITS_ME, MachineState.ERROR, MachineState.ITS_ME, MachineState.ERROR, # 28-2f
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ITS_ME, # 30-37
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, # 38-3f
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ERROR, MachineState.START, MachineState.START, # 40-47
-)
-# fmt: on
-
-ISO2022JP_CHAR_LEN_TABLE = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-
-ISO2022JP_SM_MODEL: CodingStateMachineDict = {
-    "class_table": ISO2022JP_CLS,
-    "class_factor": 10,
-    "state_table": ISO2022JP_ST,
-    "char_len_table": ISO2022JP_CHAR_LEN_TABLE,
-    "name": "ISO-2022-JP",
-    "language": "Japanese",
-}
-
-# fmt: off
-ISO2022KR_CLS = (
-    2, 0, 0, 0, 0, 0, 0, 0,  # 00 - 07
-    0, 0, 0, 0, 0, 0, 0, 0,  # 08 - 0f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 10 - 17
-    0, 0, 0, 1, 0, 0, 0, 0,  # 18 - 1f
-    0, 0, 0, 0, 3, 0, 0, 0,  # 20 - 27
-    0, 4, 0, 0, 0, 0, 0, 0,  # 28 - 2f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 30 - 37
-    0, 0, 0, 0, 0, 0, 0, 0,  # 38 - 3f
-    0, 0, 0, 5, 0, 0, 0, 0,  # 40 - 47
-    0, 0, 0, 0, 0, 0, 0, 0,  # 48 - 4f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 50 - 57
-    0, 0, 0, 0, 0, 0, 0, 0,  # 58 - 5f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 60 - 67
-    0, 0, 0, 0, 0, 0, 0, 0,  # 68 - 6f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 70 - 77
-    0, 0, 0, 0, 0, 0, 0, 0,  # 78 - 7f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 80 - 87
-    2, 2, 2, 2, 2, 2, 2, 2,  # 88 - 8f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 90 - 97
-    2, 2, 2, 2, 2, 2, 2, 2,  # 98 - 9f
-    2, 2, 2, 2, 2, 2, 2, 2,  # a0 - a7
-    2, 2, 2, 2, 2, 2, 2, 2,  # a8 - af
-    2, 2, 2, 2, 2, 2, 2, 2,  # b0 - b7
-    2, 2, 2, 2, 2, 2, 2, 2,  # b8 - bf
-    2, 2, 2, 2, 2, 2, 2, 2,  # c0 - c7
-    2, 2, 2, 2, 2, 2, 2, 2,  # c8 - cf
-    2, 2, 2, 2, 2, 2, 2, 2,  # d0 - d7
-    2, 2, 2, 2, 2, 2, 2, 2,  # d8 - df
-    2, 2, 2, 2, 2, 2, 2, 2,  # e0 - e7
-    2, 2, 2, 2, 2, 2, 2, 2,  # e8 - ef
-    2, 2, 2, 2, 2, 2, 2, 2,  # f0 - f7
-    2, 2, 2, 2, 2, 2, 2, 2,  # f8 - ff
-)
-
-ISO2022KR_ST = (
-    MachineState.START,      3, MachineState.ERROR, MachineState.START, MachineState.START, MachineState.START, MachineState.ERROR, MachineState.ERROR, # 00-07
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ITS_ME, # 08-0f
-    MachineState.ITS_ME, MachineState.ITS_ME, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR,      4, MachineState.ERROR, MachineState.ERROR, # 10-17
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR,      5, MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, # 18-1f
-    MachineState.ERROR, MachineState.ERROR, MachineState.ERROR, MachineState.ITS_ME, MachineState.START, MachineState.START, MachineState.START, MachineState.START, # 20-27
-)
-# fmt: on
-
-ISO2022KR_CHAR_LEN_TABLE = (0, 0, 0, 0, 0, 0)
-
-ISO2022KR_SM_MODEL: CodingStateMachineDict = {
-    "class_table": ISO2022KR_CLS,
-    "class_factor": 6,
-    "state_table": ISO2022KR_ST,
-    "char_len_table": ISO2022KR_CHAR_LEN_TABLE,
-    "name": "ISO-2022-KR",
-    "language": "Korean",
-}
diff --git a/src/pip/_vendor/chardet/eucjpprober.py b/src/pip/_vendor/chardet/eucjpprober.py
deleted file mode 100644
index 39487f4098d..00000000000
--- a/src/pip/_vendor/chardet/eucjpprober.py
+++ /dev/null
@@ -1,102 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import Union
-
-from .chardistribution import EUCJPDistributionAnalysis
-from .codingstatemachine import CodingStateMachine
-from .enums import MachineState, ProbingState
-from .jpcntx import EUCJPContextAnalysis
-from .mbcharsetprober import MultiByteCharSetProber
-from .mbcssm import EUCJP_SM_MODEL
-
-
-class EUCJPProber(MultiByteCharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self.coding_sm = CodingStateMachine(EUCJP_SM_MODEL)
-        self.distribution_analyzer = EUCJPDistributionAnalysis()
-        self.context_analyzer = EUCJPContextAnalysis()
-        self.reset()
-
-    def reset(self) -> None:
-        super().reset()
-        self.context_analyzer.reset()
-
-    @property
-    def charset_name(self) -> str:
-        return "EUC-JP"
-
-    @property
-    def language(self) -> str:
-        return "Japanese"
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        assert self.coding_sm is not None
-        assert self.distribution_analyzer is not None
-
-        for i, byte in enumerate(byte_str):
-            # PY3K: byte_str is a byte array, so byte is an int, not a byte
-            coding_state = self.coding_sm.next_state(byte)
-            if coding_state == MachineState.ERROR:
-                self.logger.debug(
-                    "%s %s prober hit error at byte %s",
-                    self.charset_name,
-                    self.language,
-                    i,
-                )
-                self._state = ProbingState.NOT_ME
-                break
-            if coding_state == MachineState.ITS_ME:
-                self._state = ProbingState.FOUND_IT
-                break
-            if coding_state == MachineState.START:
-                char_len = self.coding_sm.get_current_charlen()
-                if i == 0:
-                    self._last_char[1] = byte
-                    self.context_analyzer.feed(self._last_char, char_len)
-                    self.distribution_analyzer.feed(self._last_char, char_len)
-                else:
-                    self.context_analyzer.feed(byte_str[i - 1 : i + 1], char_len)
-                    self.distribution_analyzer.feed(byte_str[i - 1 : i + 1], char_len)
-
-        self._last_char[0] = byte_str[-1]
-
-        if self.state == ProbingState.DETECTING:
-            if self.context_analyzer.got_enough_data() and (
-                self.get_confidence() > self.SHORTCUT_THRESHOLD
-            ):
-                self._state = ProbingState.FOUND_IT
-
-        return self.state
-
-    def get_confidence(self) -> float:
-        assert self.distribution_analyzer is not None
-
-        context_conf = self.context_analyzer.get_confidence()
-        distrib_conf = self.distribution_analyzer.get_confidence()
-        return max(context_conf, distrib_conf)
diff --git a/src/pip/_vendor/chardet/euckrfreq.py b/src/pip/_vendor/chardet/euckrfreq.py
deleted file mode 100644
index 7dc3b10387d..00000000000
--- a/src/pip/_vendor/chardet/euckrfreq.py
+++ /dev/null
@@ -1,196 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# Sampling from about 20M text materials include literature and computer technology
-
-# 128  --> 0.79
-# 256  --> 0.92
-# 512  --> 0.986
-# 1024 --> 0.99944
-# 2048 --> 0.99999
-#
-# Idea Distribution Ratio = 0.98653 / (1-0.98653) = 73.24
-# Random Distribution Ration = 512 / (2350-512) = 0.279.
-#
-# Typical Distribution Ratio
-
-EUCKR_TYPICAL_DISTRIBUTION_RATIO = 6.0
-
-EUCKR_TABLE_SIZE = 2352
-
-# Char to FreqOrder table ,
-# fmt: off
-EUCKR_CHAR_TO_FREQ_ORDER = (
-  13, 130, 120,1396, 481,1719,1720, 328, 609, 212,1721, 707, 400, 299,1722,  87,
-1397,1723, 104, 536,1117,1203,1724,1267, 685,1268, 508,1725,1726,1727,1728,1398,
-1399,1729,1730,1731, 141, 621, 326,1057, 368,1732, 267, 488,  20,1733,1269,1734,
- 945,1400,1735,  47, 904,1270,1736,1737, 773, 248,1738, 409, 313, 786, 429,1739,
- 116, 987, 813,1401, 683,  75,1204, 145,1740,1741,1742,1743,  16, 847, 667, 622,
- 708,1744,1745,1746, 966, 787, 304, 129,1747,  60, 820, 123, 676,1748,1749,1750,
-1751, 617,1752, 626,1753,1754,1755,1756, 653,1757,1758,1759,1760,1761,1762, 856,
- 344,1763,1764,1765,1766,  89, 401, 418, 806, 905, 848,1767,1768,1769, 946,1205,
- 709,1770,1118,1771, 241,1772,1773,1774,1271,1775, 569,1776, 999,1777,1778,1779,
-1780, 337, 751,1058,  28, 628, 254,1781, 177, 906, 270, 349, 891,1079,1782,  19,
-1783, 379,1784, 315,1785, 629, 754,1402, 559,1786, 636, 203,1206,1787, 710, 567,
-1788, 935, 814,1789,1790,1207, 766, 528,1791,1792,1208,1793,1794,1795,1796,1797,
-1403,1798,1799, 533,1059,1404,1405,1156,1406, 936, 884,1080,1800, 351,1801,1802,
-1803,1804,1805, 801,1806,1807,1808,1119,1809,1157, 714, 474,1407,1810, 298, 899,
- 885,1811,1120, 802,1158,1812, 892,1813,1814,1408, 659,1815,1816,1121,1817,1818,
-1819,1820,1821,1822, 319,1823, 594, 545,1824, 815, 937,1209,1825,1826, 573,1409,
-1022,1827,1210,1828,1829,1830,1831,1832,1833, 556, 722, 807,1122,1060,1834, 697,
-1835, 900, 557, 715,1836,1410, 540,1411, 752,1159, 294, 597,1211, 976, 803, 770,
-1412,1837,1838,  39, 794,1413, 358,1839, 371, 925,1840, 453, 661, 788, 531, 723,
- 544,1023,1081, 869,  91,1841, 392, 430, 790, 602,1414, 677,1082, 457,1415,1416,
-1842,1843, 475, 327,1024,1417, 795, 121,1844, 733, 403,1418,1845,1846,1847, 300,
- 119, 711,1212, 627,1848,1272, 207,1849,1850, 796,1213, 382,1851, 519,1852,1083,
- 893,1853,1854,1855, 367, 809, 487, 671,1856, 663,1857,1858, 956, 471, 306, 857,
-1859,1860,1160,1084,1861,1862,1863,1864,1865,1061,1866,1867,1868,1869,1870,1871,
- 282,  96, 574,1872, 502,1085,1873,1214,1874, 907,1875,1876, 827, 977,1419,1420,
-1421, 268,1877,1422,1878,1879,1880, 308,1881,   2, 537,1882,1883,1215,1884,1885,
- 127, 791,1886,1273,1423,1887,  34, 336, 404, 643,1888, 571, 654, 894, 840,1889,
-   0, 886,1274, 122, 575, 260, 908, 938,1890,1275, 410, 316,1891,1892, 100,1893,
-1894,1123,  48,1161,1124,1025,1895, 633, 901,1276,1896,1897, 115, 816,1898, 317,
-1899, 694,1900, 909, 734,1424, 572, 866,1425, 691,  85, 524,1010, 543, 394, 841,
-1901,1902,1903,1026,1904,1905,1906,1907,1908,1909,  30, 451, 651, 988, 310,1910,
-1911,1426, 810,1216,  93,1912,1913,1277,1217,1914, 858, 759,  45,  58, 181, 610,
- 269,1915,1916, 131,1062, 551, 443,1000, 821,1427, 957, 895,1086,1917,1918, 375,
-1919, 359,1920, 687,1921, 822,1922, 293,1923,1924,  40, 662, 118, 692,  29, 939,
- 887, 640, 482, 174,1925,  69,1162, 728,1428, 910,1926,1278,1218,1279, 386, 870,
- 217, 854,1163, 823,1927,1928,1929,1930, 834,1931,  78,1932, 859,1933,1063,1934,
-1935,1936,1937, 438,1164, 208, 595,1938,1939,1940,1941,1219,1125,1942, 280, 888,
-1429,1430,1220,1431,1943,1944,1945,1946,1947,1280, 150, 510,1432,1948,1949,1950,
-1951,1952,1953,1954,1011,1087,1955,1433,1043,1956, 881,1957, 614, 958,1064,1065,
-1221,1958, 638,1001, 860, 967, 896,1434, 989, 492, 553,1281,1165,1959,1282,1002,
-1283,1222,1960,1961,1962,1963,  36, 383, 228, 753, 247, 454,1964, 876, 678,1965,
-1966,1284, 126, 464, 490, 835, 136, 672, 529, 940,1088,1435, 473,1967,1968, 467,
-  50, 390, 227, 587, 279, 378, 598, 792, 968, 240, 151, 160, 849, 882,1126,1285,
- 639,1044, 133, 140, 288, 360, 811, 563,1027, 561, 142, 523,1969,1970,1971,   7,
- 103, 296, 439, 407, 506, 634, 990,1972,1973,1974,1975, 645,1976,1977,1978,1979,
-1980,1981, 236,1982,1436,1983,1984,1089, 192, 828, 618, 518,1166, 333,1127,1985,
- 818,1223,1986,1987,1988,1989,1990,1991,1992,1993, 342,1128,1286, 746, 842,1994,
-1995, 560, 223,1287,  98,   8, 189, 650, 978,1288,1996,1437,1997,  17, 345, 250,
- 423, 277, 234, 512, 226,  97, 289,  42, 167,1998, 201,1999,2000, 843, 836, 824,
- 532, 338, 783,1090, 182, 576, 436,1438,1439, 527, 500,2001, 947, 889,2002,2003,
-2004,2005, 262, 600, 314, 447,2006, 547,2007, 693, 738,1129,2008,  71,1440, 745,
- 619, 688,2009, 829,2010,2011, 147,2012,  33, 948,2013,2014,  74, 224,2015,  61,
- 191, 918, 399, 637,2016,1028,1130, 257, 902,2017,2018,2019,2020,2021,2022,2023,
-2024,2025,2026, 837,2027,2028,2029,2030, 179, 874, 591,  52, 724, 246,2031,2032,
-2033,2034,1167, 969,2035,1289, 630, 605, 911,1091,1168,2036,2037,2038,1441, 912,
-2039, 623,2040,2041, 253,1169,1290,2042,1442, 146, 620, 611, 577, 433,2043,1224,
- 719,1170, 959, 440, 437, 534,  84, 388, 480,1131, 159, 220, 198, 679,2044,1012,
- 819,1066,1443, 113,1225, 194, 318,1003,1029,2045,2046,2047,2048,1067,2049,2050,
-2051,2052,2053,  59, 913, 112,2054, 632,2055, 455, 144, 739,1291,2056, 273, 681,
- 499,2057, 448,2058,2059, 760,2060,2061, 970, 384, 169, 245,1132,2062,2063, 414,
-1444,2064,2065,  41, 235,2066, 157, 252, 877, 568, 919, 789, 580,2067, 725,2068,
-2069,1292,2070,2071,1445,2072,1446,2073,2074,  55, 588,  66,1447, 271,1092,2075,
-1226,2076, 960,1013, 372,2077,2078,2079,2080,2081,1293,2082,2083,2084,2085, 850,
-2086,2087,2088,2089,2090, 186,2091,1068, 180,2092,2093,2094, 109,1227, 522, 606,
-2095, 867,1448,1093, 991,1171, 926, 353,1133,2096, 581,2097,2098,2099,1294,1449,
-1450,2100, 596,1172,1014,1228,2101,1451,1295,1173,1229,2102,2103,1296,1134,1452,
- 949,1135,2104,2105,1094,1453,1454,1455,2106,1095,2107,2108,2109,2110,2111,2112,
-2113,2114,2115,2116,2117, 804,2118,2119,1230,1231, 805,1456, 405,1136,2120,2121,
-2122,2123,2124, 720, 701,1297, 992,1457, 927,1004,2125,2126,2127,2128,2129,2130,
-  22, 417,2131, 303,2132, 385,2133, 971, 520, 513,2134,1174,  73,1096, 231, 274,
- 962,1458, 673,2135,1459,2136, 152,1137,2137,2138,2139,2140,1005,1138,1460,1139,
-2141,2142,2143,2144,  11, 374, 844,2145, 154,1232,  46,1461,2146, 838, 830, 721,
-1233, 106,2147,  90, 428, 462, 578, 566,1175, 352,2148,2149, 538,1234, 124,1298,
-2150,1462, 761, 565,2151, 686,2152, 649,2153,  72, 173,2154, 460, 415,2155,1463,
-2156,1235, 305,2157,2158,2159,2160,2161,2162, 579,2163,2164,2165,2166,2167, 747,
-2168,2169,2170,2171,1464, 669,2172,2173,2174,2175,2176,1465,2177,  23, 530, 285,
-2178, 335, 729,2179, 397,2180,2181,2182,1030,2183,2184, 698,2185,2186, 325,2187,
-2188, 369,2189, 799,1097,1015, 348,2190,1069, 680,2191, 851,1466,2192,2193,  10,
-2194, 613, 424,2195, 979, 108, 449, 589,  27, 172,  81,1031,  80, 774, 281, 350,
-1032, 525, 301, 582,1176,2196, 674,1045,2197,2198,1467, 730, 762,2199,2200,2201,
-2202,1468,2203, 993,2204,2205, 266,1070, 963,1140,2206,2207,2208, 664,1098, 972,
-2209,2210,2211,1177,1469,1470, 871,2212,2213,2214,2215,2216,1471,2217,2218,2219,
-2220,2221,2222,2223,2224,2225,2226,2227,1472,1236,2228,2229,2230,2231,2232,2233,
-2234,2235,1299,2236,2237, 200,2238, 477, 373,2239,2240, 731, 825, 777,2241,2242,
-2243, 521, 486, 548,2244,2245,2246,1473,1300,  53, 549, 137, 875,  76, 158,2247,
-1301,1474, 469, 396,1016, 278, 712,2248, 321, 442, 503, 767, 744, 941,1237,1178,
-1475,2249,  82, 178,1141,1179, 973,2250,1302,2251, 297,2252,2253, 570,2254,2255,
-2256,  18, 450, 206,2257, 290, 292,1142,2258, 511, 162,  99, 346, 164, 735,2259,
-1476,1477,   4, 554, 343, 798,1099,2260,1100,2261,  43, 171,1303, 139, 215,2262,
-2263, 717, 775,2264,1033, 322, 216,2265, 831,2266, 149,2267,1304,2268,2269, 702,
-1238, 135, 845, 347, 309,2270, 484,2271, 878, 655, 238,1006,1478,2272,  67,2273,
- 295,2274,2275, 461,2276, 478, 942, 412,2277,1034,2278,2279,2280, 265,2281, 541,
-2282,2283,2284,2285,2286,  70, 852,1071,2287,2288,2289,2290,  21,  56, 509, 117,
- 432,2291,2292, 331, 980, 552,1101, 148, 284, 105, 393,1180,1239, 755,2293, 187,
-2294,1046,1479,2295, 340,2296,  63,1047, 230,2297,2298,1305, 763,1306, 101, 800,
- 808, 494,2299,2300,2301, 903,2302,  37,1072,  14,   5,2303,  79, 675,2304, 312,
-2305,2306,2307,2308,2309,1480,   6,1307,2310,2311,2312,   1, 470,  35,  24, 229,
-2313, 695, 210,  86, 778,  15, 784, 592, 779,  32,  77, 855, 964,2314, 259,2315,
- 501, 380,2316,2317,  83, 981, 153, 689,1308,1481,1482,1483,2318,2319, 716,1484,
-2320,2321,2322,2323,2324,2325,1485,2326,2327, 128,  57,  68, 261,1048, 211, 170,
-1240,  31,2328,  51, 435, 742,2329,2330,2331, 635,2332, 264, 456,2333,2334,2335,
- 425,2336,1486, 143, 507, 263, 943,2337, 363, 920,1487, 256,1488,1102, 243, 601,
-1489,2338,2339,2340,2341,2342,2343,2344, 861,2345,2346,2347,2348,2349,2350, 395,
-2351,1490,1491,  62, 535, 166, 225,2352,2353, 668, 419,1241, 138, 604, 928,2354,
-1181,2355,1492,1493,2356,2357,2358,1143,2359, 696,2360, 387, 307,1309, 682, 476,
-2361,2362, 332,  12, 222, 156,2363, 232,2364, 641, 276, 656, 517,1494,1495,1035,
- 416, 736,1496,2365,1017, 586,2366,2367,2368,1497,2369, 242,2370,2371,2372,1498,
-2373, 965, 713,2374,2375,2376,2377, 740, 982,1499, 944,1500,1007,2378,2379,1310,
-1501,2380,2381,2382, 785, 329,2383,2384,1502,2385,2386,2387, 932,2388,1503,2389,
-2390,2391,2392,1242,2393,2394,2395,2396,2397, 994, 950,2398,2399,2400,2401,1504,
-1311,2402,2403,2404,2405,1049, 749,2406,2407, 853, 718,1144,1312,2408,1182,1505,
-2409,2410, 255, 516, 479, 564, 550, 214,1506,1507,1313, 413, 239, 444, 339,1145,
-1036,1508,1509,1314,1037,1510,1315,2411,1511,2412,2413,2414, 176, 703, 497, 624,
- 593, 921, 302,2415, 341, 165,1103,1512,2416,1513,2417,2418,2419, 376,2420, 700,
-2421,2422,2423, 258, 768,1316,2424,1183,2425, 995, 608,2426,2427,2428,2429, 221,
-2430,2431,2432,2433,2434,2435,2436,2437, 195, 323, 726, 188, 897, 983,1317, 377,
- 644,1050, 879,2438, 452,2439,2440,2441,2442,2443,2444, 914,2445,2446,2447,2448,
- 915, 489,2449,1514,1184,2450,2451, 515,  64, 427, 495,2452, 583,2453, 483, 485,
-1038, 562, 213,1515, 748, 666,2454,2455,2456,2457, 334,2458, 780, 996,1008, 705,
-1243,2459,2460,2461,2462,2463, 114,2464, 493,1146, 366, 163,1516, 961,1104,2465,
- 291,2466,1318,1105,2467,1517, 365,2468, 355, 951,1244,2469,1319,2470, 631,2471,
-2472, 218,1320, 364, 320, 756,1518,1519,1321,1520,1322,2473,2474,2475,2476, 997,
-2477,2478,2479,2480, 665,1185,2481, 916,1521,2482,2483,2484, 584, 684,2485,2486,
- 797,2487,1051,1186,2488,2489,2490,1522,2491,2492, 370,2493,1039,1187,  65,2494,
- 434, 205, 463,1188,2495, 125, 812, 391, 402, 826, 699, 286, 398, 155, 781, 771,
- 585,2496, 590, 505,1073,2497, 599, 244, 219, 917,1018, 952, 646,1523,2498,1323,
-2499,2500,  49, 984, 354, 741,2501, 625,2502,1324,2503,1019, 190, 357, 757, 491,
-  95, 782, 868,2504,2505,2506,2507,2508,2509, 134,1524,1074, 422,1525, 898,2510,
- 161,2511,2512,2513,2514, 769,2515,1526,2516,2517, 411,1325,2518, 472,1527,2519,
-2520,2521,2522,2523,2524, 985,2525,2526,2527,2528,2529,2530, 764,2531,1245,2532,
-2533,  25, 204, 311,2534, 496,2535,1052,2536,2537,2538,2539,2540,2541,2542, 199,
- 704, 504, 468, 758, 657,1528, 196,  44, 839,1246, 272, 750,2543, 765, 862,2544,
-2545,1326,2546, 132, 615, 933,2547, 732,2548,2549,2550,1189,1529,2551, 283,1247,
-1053, 607, 929,2552,2553,2554, 930, 183, 872, 616,1040,1147,2555,1148,1020, 441,
- 249,1075,2556,2557,2558, 466, 743,2559,2560,2561,  92, 514, 426, 420, 526,2562,
-2563,2564,2565,2566,2567,2568, 185,2569,2570,2571,2572, 776,1530, 658,2573, 362,
-2574, 361, 922,1076, 793,2575,2576,2577,2578,2579,2580,1531, 251,2581,2582,2583,
-2584,1532,  54, 612, 237,1327,2585,2586, 275, 408, 647, 111,2587,1533,1106, 465,
-   3, 458,   9,  38,2588, 107, 110, 890, 209,  26, 737, 498,2589,1534,2590, 431,
- 202,  88,1535, 356, 287,1107, 660,1149,2591, 381,1536, 986,1150, 445,1248,1151,
- 974,2592,2593, 846,2594, 446, 953, 184,1249,1250, 727,2595, 923, 193, 883,2596,
-2597,2598, 102, 324, 539, 817,2599, 421,1041,2600, 832,2601,  94, 175, 197, 406,
-2602, 459,2603,2604,2605,2606,2607, 330, 555,2608,2609,2610, 706,1108, 389,2611,
-2612,2613,2614, 233,2615, 833, 558, 931, 954,1251,2616,2617,1537, 546,2618,2619,
-1009,2620,2621,2622,1538, 690,1328,2623, 955,2624,1539,2625,2626, 772,2627,2628,
-2629,2630,2631, 924, 648, 863, 603,2632,2633, 934,1540, 864, 865,2634, 642,1042,
- 670,1190,2635,2636,2637,2638, 168,2639, 652, 873, 542,1054,1541,2640,2641,2642,  # 512, 256
-)
-# fmt: on
diff --git a/src/pip/_vendor/chardet/euckrprober.py b/src/pip/_vendor/chardet/euckrprober.py
deleted file mode 100644
index 1fc5de0462c..00000000000
--- a/src/pip/_vendor/chardet/euckrprober.py
+++ /dev/null
@@ -1,47 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .chardistribution import EUCKRDistributionAnalysis
-from .codingstatemachine import CodingStateMachine
-from .mbcharsetprober import MultiByteCharSetProber
-from .mbcssm import EUCKR_SM_MODEL
-
-
-class EUCKRProber(MultiByteCharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self.coding_sm = CodingStateMachine(EUCKR_SM_MODEL)
-        self.distribution_analyzer = EUCKRDistributionAnalysis()
-        self.reset()
-
-    @property
-    def charset_name(self) -> str:
-        return "EUC-KR"
-
-    @property
-    def language(self) -> str:
-        return "Korean"
diff --git a/src/pip/_vendor/chardet/euctwfreq.py b/src/pip/_vendor/chardet/euctwfreq.py
deleted file mode 100644
index 4900ccc160a..00000000000
--- a/src/pip/_vendor/chardet/euctwfreq.py
+++ /dev/null
@@ -1,388 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# EUCTW frequency table
-# Converted from big5 work
-# by Taiwan's Mandarin Promotion Council
-# 
-
-# 128  --> 0.42261
-# 256  --> 0.57851
-# 512  --> 0.74851
-# 1024 --> 0.89384
-# 2048 --> 0.97583
-#
-# Idea Distribution Ratio = 0.74851/(1-0.74851) =2.98
-# Random Distribution Ration = 512/(5401-512)=0.105
-#
-# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
-
-EUCTW_TYPICAL_DISTRIBUTION_RATIO = 0.75
-
-# Char to FreqOrder table
-EUCTW_TABLE_SIZE = 5376
-
-# fmt: off
-EUCTW_CHAR_TO_FREQ_ORDER = (
-    1, 1800, 1506, 255, 1431, 198, 9, 82, 6, 7310, 177, 202, 3615, 1256, 2808, 110,  # 2742
-    3735, 33, 3241, 261, 76, 44, 2113, 16, 2931, 2184, 1176, 659, 3868, 26, 3404, 2643,  # 2758
-    1198, 3869, 3313, 4060, 410, 2211, 302, 590, 361, 1963, 8, 204, 58, 4296, 7311, 1931,  # 2774
-    63, 7312, 7313, 317, 1614, 75, 222, 159, 4061, 2412, 1480, 7314, 3500, 3068, 224, 2809,  # 2790
-    3616, 3, 10, 3870, 1471, 29, 2774, 1135, 2852, 1939, 873, 130, 3242, 1123, 312, 7315,  # 2806
-    4297, 2051, 507, 252, 682, 7316, 142, 1914, 124, 206, 2932, 34, 3501, 3173, 64, 604,  # 2822
-    7317, 2494, 1976, 1977, 155, 1990, 645, 641, 1606, 7318, 3405, 337, 72, 406, 7319, 80,  # 2838
-    630, 238, 3174, 1509, 263, 939, 1092, 2644, 756, 1440, 1094, 3406, 449, 69, 2969, 591,  # 2854
-    179, 2095, 471, 115, 2034, 1843, 60, 50, 2970, 134, 806, 1868, 734, 2035, 3407, 180,  # 2870
-    995, 1607, 156, 537, 2893, 688, 7320, 319, 1305, 779, 2144, 514, 2374, 298, 4298, 359,  # 2886
-    2495, 90, 2707, 1338, 663, 11, 906, 1099, 2545, 20, 2436, 182, 532, 1716, 7321, 732,  # 2902
-    1376, 4062, 1311, 1420, 3175, 25, 2312, 1056, 113, 399, 382, 1949, 242, 3408, 2467, 529,  # 2918
-    3243, 475, 1447, 3617, 7322, 117, 21, 656, 810, 1297, 2295, 2329, 3502, 7323, 126, 4063,  # 2934
-    706, 456, 150, 613, 4299, 71, 1118, 2036, 4064, 145, 3069, 85, 835, 486, 2114, 1246,  # 2950
-    1426, 428, 727, 1285, 1015, 800, 106, 623, 303, 1281, 7324, 2127, 2354, 347, 3736, 221,  # 2966
-    3503, 3110, 7325, 1955, 1153, 4065, 83, 296, 1199, 3070, 192, 624, 93, 7326, 822, 1897,  # 2982
-    2810, 3111, 795, 2064, 991, 1554, 1542, 1592, 27, 43, 2853, 859, 139, 1456, 860, 4300,  # 2998
-    437, 712, 3871, 164, 2392, 3112, 695, 211, 3017, 2096, 195, 3872, 1608, 3504, 3505, 3618,  # 3014
-    3873, 234, 811, 2971, 2097, 3874, 2229, 1441, 3506, 1615, 2375, 668, 2076, 1638, 305, 228,  # 3030
-    1664, 4301, 467, 415, 7327, 262, 2098, 1593, 239, 108, 300, 200, 1033, 512, 1247, 2077,  # 3046
-    7328, 7329, 2173, 3176, 3619, 2673, 593, 845, 1062, 3244, 88, 1723, 2037, 3875, 1950, 212,  # 3062
-    266, 152, 149, 468, 1898, 4066, 4302, 77, 187, 7330, 3018, 37, 5, 2972, 7331, 3876,  # 3078
-    7332, 7333, 39, 2517, 4303, 2894, 3177, 2078, 55, 148, 74, 4304, 545, 483, 1474, 1029,  # 3094
-    1665, 217, 1869, 1531, 3113, 1104, 2645, 4067, 24, 172, 3507, 900, 3877, 3508, 3509, 4305,  # 3110
-    32, 1408, 2811, 1312, 329, 487, 2355, 2247, 2708, 784, 2674, 4, 3019, 3314, 1427, 1788,  # 3126
-    188, 109, 499, 7334, 3620, 1717, 1789, 888, 1217, 3020, 4306, 7335, 3510, 7336, 3315, 1520,  # 3142
-    3621, 3878, 196, 1034, 775, 7337, 7338, 929, 1815, 249, 439, 38, 7339, 1063, 7340, 794,  # 3158
-    3879, 1435, 2296, 46, 178, 3245, 2065, 7341, 2376, 7342, 214, 1709, 4307, 804, 35, 707,  # 3174
-    324, 3622, 1601, 2546, 140, 459, 4068, 7343, 7344, 1365, 839, 272, 978, 2257, 2572, 3409,  # 3190
-    2128, 1363, 3623, 1423, 697, 100, 3071, 48, 70, 1231, 495, 3114, 2193, 7345, 1294, 7346,  # 3206
-    2079, 462, 586, 1042, 3246, 853, 256, 988, 185, 2377, 3410, 1698, 434, 1084, 7347, 3411,  # 3222
-    314, 2615, 2775, 4308, 2330, 2331, 569, 2280, 637, 1816, 2518, 757, 1162, 1878, 1616, 3412,  # 3238
-    287, 1577, 2115, 768, 4309, 1671, 2854, 3511, 2519, 1321, 3737, 909, 2413, 7348, 4069, 933,  # 3254
-    3738, 7349, 2052, 2356, 1222, 4310, 765, 2414, 1322, 786, 4311, 7350, 1919, 1462, 1677, 2895,  # 3270
-    1699, 7351, 4312, 1424, 2437, 3115, 3624, 2590, 3316, 1774, 1940, 3413, 3880, 4070, 309, 1369,  # 3286
-    1130, 2812, 364, 2230, 1653, 1299, 3881, 3512, 3882, 3883, 2646, 525, 1085, 3021, 902, 2000,  # 3302
-    1475, 964, 4313, 421, 1844, 1415, 1057, 2281, 940, 1364, 3116, 376, 4314, 4315, 1381, 7,  # 3318
-    2520, 983, 2378, 336, 1710, 2675, 1845, 321, 3414, 559, 1131, 3022, 2742, 1808, 1132, 1313,  # 3334
-    265, 1481, 1857, 7352, 352, 1203, 2813, 3247, 167, 1089, 420, 2814, 776, 792, 1724, 3513,  # 3350
-    4071, 2438, 3248, 7353, 4072, 7354, 446, 229, 333, 2743, 901, 3739, 1200, 1557, 4316, 2647,  # 3366
-    1920, 395, 2744, 2676, 3740, 4073, 1835, 125, 916, 3178, 2616, 4317, 7355, 7356, 3741, 7357,  # 3382
-    7358, 7359, 4318, 3117, 3625, 1133, 2547, 1757, 3415, 1510, 2313, 1409, 3514, 7360, 2145, 438,  # 3398
-    2591, 2896, 2379, 3317, 1068, 958, 3023, 461, 311, 2855, 2677, 4074, 1915, 3179, 4075, 1978,  # 3414
-    383, 750, 2745, 2617, 4076, 274, 539, 385, 1278, 1442, 7361, 1154, 1964, 384, 561, 210,  # 3430
-    98, 1295, 2548, 3515, 7362, 1711, 2415, 1482, 3416, 3884, 2897, 1257, 129, 7363, 3742, 642,  # 3446
-    523, 2776, 2777, 2648, 7364, 141, 2231, 1333, 68, 176, 441, 876, 907, 4077, 603, 2592,  # 3462
-    710, 171, 3417, 404, 549, 18, 3118, 2393, 1410, 3626, 1666, 7365, 3516, 4319, 2898, 4320,  # 3478
-    7366, 2973, 368, 7367, 146, 366, 99, 871, 3627, 1543, 748, 807, 1586, 1185, 22, 2258,  # 3494
-    379, 3743, 3180, 7368, 3181, 505, 1941, 2618, 1991, 1382, 2314, 7369, 380, 2357, 218, 702,  # 3510
-    1817, 1248, 3418, 3024, 3517, 3318, 3249, 7370, 2974, 3628, 930, 3250, 3744, 7371, 59, 7372,  # 3526
-    585, 601, 4078, 497, 3419, 1112, 1314, 4321, 1801, 7373, 1223, 1472, 2174, 7374, 749, 1836,  # 3542
-    690, 1899, 3745, 1772, 3885, 1476, 429, 1043, 1790, 2232, 2116, 917, 4079, 447, 1086, 1629,  # 3558
-    7375, 556, 7376, 7377, 2020, 1654, 844, 1090, 105, 550, 966, 1758, 2815, 1008, 1782, 686,  # 3574
-    1095, 7378, 2282, 793, 1602, 7379, 3518, 2593, 4322, 4080, 2933, 2297, 4323, 3746, 980, 2496,  # 3590
-    544, 353, 527, 4324, 908, 2678, 2899, 7380, 381, 2619, 1942, 1348, 7381, 1341, 1252, 560,  # 3606
-    3072, 7382, 3420, 2856, 7383, 2053, 973, 886, 2080, 143, 4325, 7384, 7385, 157, 3886, 496,  # 3622
-    4081, 57, 840, 540, 2038, 4326, 4327, 3421, 2117, 1445, 970, 2259, 1748, 1965, 2081, 4082,  # 3638
-    3119, 1234, 1775, 3251, 2816, 3629, 773, 1206, 2129, 1066, 2039, 1326, 3887, 1738, 1725, 4083,  # 3654
-    279, 3120, 51, 1544, 2594, 423, 1578, 2130, 2066, 173, 4328, 1879, 7386, 7387, 1583, 264,  # 3670
-    610, 3630, 4329, 2439, 280, 154, 7388, 7389, 7390, 1739, 338, 1282, 3073, 693, 2857, 1411,  # 3686
-    1074, 3747, 2440, 7391, 4330, 7392, 7393, 1240, 952, 2394, 7394, 2900, 1538, 2679, 685, 1483,  # 3702
-    4084, 2468, 1436, 953, 4085, 2054, 4331, 671, 2395, 79, 4086, 2441, 3252, 608, 567, 2680,  # 3718
-    3422, 4087, 4088, 1691, 393, 1261, 1791, 2396, 7395, 4332, 7396, 7397, 7398, 7399, 1383, 1672,  # 3734
-    3748, 3182, 1464, 522, 1119, 661, 1150, 216, 675, 4333, 3888, 1432, 3519, 609, 4334, 2681,  # 3750
-    2397, 7400, 7401, 7402, 4089, 3025, 0, 7403, 2469, 315, 231, 2442, 301, 3319, 4335, 2380,  # 3766
-    7404, 233, 4090, 3631, 1818, 4336, 4337, 7405, 96, 1776, 1315, 2082, 7406, 257, 7407, 1809,  # 3782
-    3632, 2709, 1139, 1819, 4091, 2021, 1124, 2163, 2778, 1777, 2649, 7408, 3074, 363, 1655, 3183,  # 3798
-    7409, 2975, 7410, 7411, 7412, 3889, 1567, 3890, 718, 103, 3184, 849, 1443, 341, 3320, 2934,  # 3814
-    1484, 7413, 1712, 127, 67, 339, 4092, 2398, 679, 1412, 821, 7414, 7415, 834, 738, 351,  # 3830
-    2976, 2146, 846, 235, 1497, 1880, 418, 1992, 3749, 2710, 186, 1100, 2147, 2746, 3520, 1545,  # 3846
-    1355, 2935, 2858, 1377, 583, 3891, 4093, 2573, 2977, 7416, 1298, 3633, 1078, 2549, 3634, 2358,  # 3862
-    78, 3750, 3751, 267, 1289, 2099, 2001, 1594, 4094, 348, 369, 1274, 2194, 2175, 1837, 4338,  # 3878
-    1820, 2817, 3635, 2747, 2283, 2002, 4339, 2936, 2748, 144, 3321, 882, 4340, 3892, 2749, 3423,  # 3894
-    4341, 2901, 7417, 4095, 1726, 320, 7418, 3893, 3026, 788, 2978, 7419, 2818, 1773, 1327, 2859,  # 3910
-    3894, 2819, 7420, 1306, 4342, 2003, 1700, 3752, 3521, 2359, 2650, 787, 2022, 506, 824, 3636,  # 3926
-    534, 323, 4343, 1044, 3322, 2023, 1900, 946, 3424, 7421, 1778, 1500, 1678, 7422, 1881, 4344,  # 3942
-    165, 243, 4345, 3637, 2521, 123, 683, 4096, 764, 4346, 36, 3895, 1792, 589, 2902, 816,  # 3958
-    626, 1667, 3027, 2233, 1639, 1555, 1622, 3753, 3896, 7423, 3897, 2860, 1370, 1228, 1932, 891,  # 3974
-    2083, 2903, 304, 4097, 7424, 292, 2979, 2711, 3522, 691, 2100, 4098, 1115, 4347, 118, 662,  # 3990
-    7425, 611, 1156, 854, 2381, 1316, 2861, 2, 386, 515, 2904, 7426, 7427, 3253, 868, 2234,  # 4006
-    1486, 855, 2651, 785, 2212, 3028, 7428, 1040, 3185, 3523, 7429, 3121, 448, 7430, 1525, 7431,  # 4022
-    2164, 4348, 7432, 3754, 7433, 4099, 2820, 3524, 3122, 503, 818, 3898, 3123, 1568, 814, 676,  # 4038
-    1444, 306, 1749, 7434, 3755, 1416, 1030, 197, 1428, 805, 2821, 1501, 4349, 7435, 7436, 7437,  # 4054
-    1993, 7438, 4350, 7439, 7440, 2195, 13, 2779, 3638, 2980, 3124, 1229, 1916, 7441, 3756, 2131,  # 4070
-    7442, 4100, 4351, 2399, 3525, 7443, 2213, 1511, 1727, 1120, 7444, 7445, 646, 3757, 2443, 307,  # 4086
-    7446, 7447, 1595, 3186, 7448, 7449, 7450, 3639, 1113, 1356, 3899, 1465, 2522, 2523, 7451, 519,  # 4102
-    7452, 128, 2132, 92, 2284, 1979, 7453, 3900, 1512, 342, 3125, 2196, 7454, 2780, 2214, 1980,  # 4118
-    3323, 7455, 290, 1656, 1317, 789, 827, 2360, 7456, 3758, 4352, 562, 581, 3901, 7457, 401,  # 4134
-    4353, 2248, 94, 4354, 1399, 2781, 7458, 1463, 2024, 4355, 3187, 1943, 7459, 828, 1105, 4101,  # 4150
-    1262, 1394, 7460, 4102, 605, 4356, 7461, 1783, 2862, 7462, 2822, 819, 2101, 578, 2197, 2937,  # 4166
-    7463, 1502, 436, 3254, 4103, 3255, 2823, 3902, 2905, 3425, 3426, 7464, 2712, 2315, 7465, 7466,  # 4182
-    2332, 2067, 23, 4357, 193, 826, 3759, 2102, 699, 1630, 4104, 3075, 390, 1793, 1064, 3526,  # 4198
-    7467, 1579, 3076, 3077, 1400, 7468, 4105, 1838, 1640, 2863, 7469, 4358, 4359, 137, 4106, 598,  # 4214
-    3078, 1966, 780, 104, 974, 2938, 7470, 278, 899, 253, 402, 572, 504, 493, 1339, 7471,  # 4230
-    3903, 1275, 4360, 2574, 2550, 7472, 3640, 3029, 3079, 2249, 565, 1334, 2713, 863, 41, 7473,  # 4246
-    7474, 4361, 7475, 1657, 2333, 19, 463, 2750, 4107, 606, 7476, 2981, 3256, 1087, 2084, 1323,  # 4262
-    2652, 2982, 7477, 1631, 1623, 1750, 4108, 2682, 7478, 2864, 791, 2714, 2653, 2334, 232, 2416,  # 4278
-    7479, 2983, 1498, 7480, 2654, 2620, 755, 1366, 3641, 3257, 3126, 2025, 1609, 119, 1917, 3427,  # 4294
-    862, 1026, 4109, 7481, 3904, 3760, 4362, 3905, 4363, 2260, 1951, 2470, 7482, 1125, 817, 4110,  # 4310
-    4111, 3906, 1513, 1766, 2040, 1487, 4112, 3030, 3258, 2824, 3761, 3127, 7483, 7484, 1507, 7485,  # 4326
-    2683, 733, 40, 1632, 1106, 2865, 345, 4113, 841, 2524, 230, 4364, 2984, 1846, 3259, 3428,  # 4342
-    7486, 1263, 986, 3429, 7487, 735, 879, 254, 1137, 857, 622, 1300, 1180, 1388, 1562, 3907,  # 4358
-    3908, 2939, 967, 2751, 2655, 1349, 592, 2133, 1692, 3324, 2985, 1994, 4114, 1679, 3909, 1901,  # 4374
-    2185, 7488, 739, 3642, 2715, 1296, 1290, 7489, 4115, 2198, 2199, 1921, 1563, 2595, 2551, 1870,  # 4390
-    2752, 2986, 7490, 435, 7491, 343, 1108, 596, 17, 1751, 4365, 2235, 3430, 3643, 7492, 4366,  # 4406
-    294, 3527, 2940, 1693, 477, 979, 281, 2041, 3528, 643, 2042, 3644, 2621, 2782, 2261, 1031,  # 4422
-    2335, 2134, 2298, 3529, 4367, 367, 1249, 2552, 7493, 3530, 7494, 4368, 1283, 3325, 2004, 240,  # 4438
-    1762, 3326, 4369, 4370, 836, 1069, 3128, 474, 7495, 2148, 2525, 268, 3531, 7496, 3188, 1521,  # 4454
-    1284, 7497, 1658, 1546, 4116, 7498, 3532, 3533, 7499, 4117, 3327, 2684, 1685, 4118, 961, 1673,  # 4470
-    2622, 190, 2005, 2200, 3762, 4371, 4372, 7500, 570, 2497, 3645, 1490, 7501, 4373, 2623, 3260,  # 4486
-    1956, 4374, 584, 1514, 396, 1045, 1944, 7502, 4375, 1967, 2444, 7503, 7504, 4376, 3910, 619,  # 4502
-    7505, 3129, 3261, 215, 2006, 2783, 2553, 3189, 4377, 3190, 4378, 763, 4119, 3763, 4379, 7506,  # 4518
-    7507, 1957, 1767, 2941, 3328, 3646, 1174, 452, 1477, 4380, 3329, 3130, 7508, 2825, 1253, 2382,  # 4534
-    2186, 1091, 2285, 4120, 492, 7509, 638, 1169, 1824, 2135, 1752, 3911, 648, 926, 1021, 1324,  # 4550
-    4381, 520, 4382, 997, 847, 1007, 892, 4383, 3764, 2262, 1871, 3647, 7510, 2400, 1784, 4384,  # 4566
-    1952, 2942, 3080, 3191, 1728, 4121, 2043, 3648, 4385, 2007, 1701, 3131, 1551, 30, 2263, 4122,  # 4582
-    7511, 2026, 4386, 3534, 7512, 501, 7513, 4123, 594, 3431, 2165, 1821, 3535, 3432, 3536, 3192,  # 4598
-    829, 2826, 4124, 7514, 1680, 3132, 1225, 4125, 7515, 3262, 4387, 4126, 3133, 2336, 7516, 4388,  # 4614
-    4127, 7517, 3912, 3913, 7518, 1847, 2383, 2596, 3330, 7519, 4389, 374, 3914, 652, 4128, 4129,  # 4630
-    375, 1140, 798, 7520, 7521, 7522, 2361, 4390, 2264, 546, 1659, 138, 3031, 2445, 4391, 7523,  # 4646
-    2250, 612, 1848, 910, 796, 3765, 1740, 1371, 825, 3766, 3767, 7524, 2906, 2554, 7525, 692,  # 4662
-    444, 3032, 2624, 801, 4392, 4130, 7526, 1491, 244, 1053, 3033, 4131, 4132, 340, 7527, 3915,  # 4678
-    1041, 2987, 293, 1168, 87, 1357, 7528, 1539, 959, 7529, 2236, 721, 694, 4133, 3768, 219,  # 4694
-    1478, 644, 1417, 3331, 2656, 1413, 1401, 1335, 1389, 3916, 7530, 7531, 2988, 2362, 3134, 1825,  # 4710
-    730, 1515, 184, 2827, 66, 4393, 7532, 1660, 2943, 246, 3332, 378, 1457, 226, 3433, 975,  # 4726
-    3917, 2944, 1264, 3537, 674, 696, 7533, 163, 7534, 1141, 2417, 2166, 713, 3538, 3333, 4394,  # 4742
-    3918, 7535, 7536, 1186, 15, 7537, 1079, 1070, 7538, 1522, 3193, 3539, 276, 1050, 2716, 758,  # 4758
-    1126, 653, 2945, 3263, 7539, 2337, 889, 3540, 3919, 3081, 2989, 903, 1250, 4395, 3920, 3434,  # 4774
-    3541, 1342, 1681, 1718, 766, 3264, 286, 89, 2946, 3649, 7540, 1713, 7541, 2597, 3334, 2990,  # 4790
-    7542, 2947, 2215, 3194, 2866, 7543, 4396, 2498, 2526, 181, 387, 1075, 3921, 731, 2187, 3335,  # 4806
-    7544, 3265, 310, 313, 3435, 2299, 770, 4134, 54, 3034, 189, 4397, 3082, 3769, 3922, 7545,  # 4822
-    1230, 1617, 1849, 355, 3542, 4135, 4398, 3336, 111, 4136, 3650, 1350, 3135, 3436, 3035, 4137,  # 4838
-    2149, 3266, 3543, 7546, 2784, 3923, 3924, 2991, 722, 2008, 7547, 1071, 247, 1207, 2338, 2471,  # 4854
-    1378, 4399, 2009, 864, 1437, 1214, 4400, 373, 3770, 1142, 2216, 667, 4401, 442, 2753, 2555,  # 4870
-    3771, 3925, 1968, 4138, 3267, 1839, 837, 170, 1107, 934, 1336, 1882, 7548, 7549, 2118, 4139,  # 4886
-    2828, 743, 1569, 7550, 4402, 4140, 582, 2384, 1418, 3437, 7551, 1802, 7552, 357, 1395, 1729,  # 4902
-    3651, 3268, 2418, 1564, 2237, 7553, 3083, 3772, 1633, 4403, 1114, 2085, 4141, 1532, 7554, 482,  # 4918
-    2446, 4404, 7555, 7556, 1492, 833, 1466, 7557, 2717, 3544, 1641, 2829, 7558, 1526, 1272, 3652,  # 4934
-    4142, 1686, 1794, 416, 2556, 1902, 1953, 1803, 7559, 3773, 2785, 3774, 1159, 2316, 7560, 2867,  # 4950
-    4405, 1610, 1584, 3036, 2419, 2754, 443, 3269, 1163, 3136, 7561, 7562, 3926, 7563, 4143, 2499,  # 4966
-    3037, 4406, 3927, 3137, 2103, 1647, 3545, 2010, 1872, 4144, 7564, 4145, 431, 3438, 7565, 250,  # 4982
-    97, 81, 4146, 7566, 1648, 1850, 1558, 160, 848, 7567, 866, 740, 1694, 7568, 2201, 2830,  # 4998
-    3195, 4147, 4407, 3653, 1687, 950, 2472, 426, 469, 3196, 3654, 3655, 3928, 7569, 7570, 1188,  # 5014
-    424, 1995, 861, 3546, 4148, 3775, 2202, 2685, 168, 1235, 3547, 4149, 7571, 2086, 1674, 4408,  # 5030
-    3337, 3270, 220, 2557, 1009, 7572, 3776, 670, 2992, 332, 1208, 717, 7573, 7574, 3548, 2447,  # 5046
-    3929, 3338, 7575, 513, 7576, 1209, 2868, 3339, 3138, 4409, 1080, 7577, 7578, 7579, 7580, 2527,  # 5062
-    3656, 3549, 815, 1587, 3930, 3931, 7581, 3550, 3439, 3777, 1254, 4410, 1328, 3038, 1390, 3932,  # 5078
-    1741, 3933, 3778, 3934, 7582, 236, 3779, 2448, 3271, 7583, 7584, 3657, 3780, 1273, 3781, 4411,  # 5094
-    7585, 308, 7586, 4412, 245, 4413, 1851, 2473, 1307, 2575, 430, 715, 2136, 2449, 7587, 270,  # 5110
-    199, 2869, 3935, 7588, 3551, 2718, 1753, 761, 1754, 725, 1661, 1840, 4414, 3440, 3658, 7589,  # 5126
-    7590, 587, 14, 3272, 227, 2598, 326, 480, 2265, 943, 2755, 3552, 291, 650, 1883, 7591,  # 5142
-    1702, 1226, 102, 1547, 62, 3441, 904, 4415, 3442, 1164, 4150, 7592, 7593, 1224, 1548, 2756,  # 5158
-    391, 498, 1493, 7594, 1386, 1419, 7595, 2055, 1177, 4416, 813, 880, 1081, 2363, 566, 1145,  # 5174
-    4417, 2286, 1001, 1035, 2558, 2599, 2238, 394, 1286, 7596, 7597, 2068, 7598, 86, 1494, 1730,  # 5190
-    3936, 491, 1588, 745, 897, 2948, 843, 3340, 3937, 2757, 2870, 3273, 1768, 998, 2217, 2069,  # 5206
-    397, 1826, 1195, 1969, 3659, 2993, 3341, 284, 7599, 3782, 2500, 2137, 2119, 1903, 7600, 3938,  # 5222
-    2150, 3939, 4151, 1036, 3443, 1904, 114, 2559, 4152, 209, 1527, 7601, 7602, 2949, 2831, 2625,  # 5238
-    2385, 2719, 3139, 812, 2560, 7603, 3274, 7604, 1559, 737, 1884, 3660, 1210, 885, 28, 2686,  # 5254
-    3553, 3783, 7605, 4153, 1004, 1779, 4418, 7606, 346, 1981, 2218, 2687, 4419, 3784, 1742, 797,  # 5270
-    1642, 3940, 1933, 1072, 1384, 2151, 896, 3941, 3275, 3661, 3197, 2871, 3554, 7607, 2561, 1958,  # 5286
-    4420, 2450, 1785, 7608, 7609, 7610, 3942, 4154, 1005, 1308, 3662, 4155, 2720, 4421, 4422, 1528,  # 5302
-    2600, 161, 1178, 4156, 1982, 987, 4423, 1101, 4157, 631, 3943, 1157, 3198, 2420, 1343, 1241,  # 5318
-    1016, 2239, 2562, 372, 877, 2339, 2501, 1160, 555, 1934, 911, 3944, 7611, 466, 1170, 169,  # 5334
-    1051, 2907, 2688, 3663, 2474, 2994, 1182, 2011, 2563, 1251, 2626, 7612, 992, 2340, 3444, 1540,  # 5350
-    2721, 1201, 2070, 2401, 1996, 2475, 7613, 4424, 528, 1922, 2188, 1503, 1873, 1570, 2364, 3342,  # 5366
-    3276, 7614, 557, 1073, 7615, 1827, 3445, 2087, 2266, 3140, 3039, 3084, 767, 3085, 2786, 4425,  # 5382
-    1006, 4158, 4426, 2341, 1267, 2176, 3664, 3199, 778, 3945, 3200, 2722, 1597, 2657, 7616, 4427,  # 5398
-    7617, 3446, 7618, 7619, 7620, 3277, 2689, 1433, 3278, 131, 95, 1504, 3946, 723, 4159, 3141,  # 5414
-    1841, 3555, 2758, 2189, 3947, 2027, 2104, 3665, 7621, 2995, 3948, 1218, 7622, 3343, 3201, 3949,  # 5430
-    4160, 2576, 248, 1634, 3785, 912, 7623, 2832, 3666, 3040, 3786, 654, 53, 7624, 2996, 7625,  # 5446
-    1688, 4428, 777, 3447, 1032, 3950, 1425, 7626, 191, 820, 2120, 2833, 971, 4429, 931, 3202,  # 5462
-    135, 664, 783, 3787, 1997, 772, 2908, 1935, 3951, 3788, 4430, 2909, 3203, 282, 2723, 640,  # 5478
-    1372, 3448, 1127, 922, 325, 3344, 7627, 7628, 711, 2044, 7629, 7630, 3952, 2219, 2787, 1936,  # 5494
-    3953, 3345, 2220, 2251, 3789, 2300, 7631, 4431, 3790, 1258, 3279, 3954, 3204, 2138, 2950, 3955,  # 5510
-    3956, 7632, 2221, 258, 3205, 4432, 101, 1227, 7633, 3280, 1755, 7634, 1391, 3281, 7635, 2910,  # 5526
-    2056, 893, 7636, 7637, 7638, 1402, 4161, 2342, 7639, 7640, 3206, 3556, 7641, 7642, 878, 1325,  # 5542
-    1780, 2788, 4433, 259, 1385, 2577, 744, 1183, 2267, 4434, 7643, 3957, 2502, 7644, 684, 1024,  # 5558
-    4162, 7645, 472, 3557, 3449, 1165, 3282, 3958, 3959, 322, 2152, 881, 455, 1695, 1152, 1340,  # 5574
-    660, 554, 2153, 4435, 1058, 4436, 4163, 830, 1065, 3346, 3960, 4437, 1923, 7646, 1703, 1918,  # 5590
-    7647, 932, 2268, 122, 7648, 4438, 947, 677, 7649, 3791, 2627, 297, 1905, 1924, 2269, 4439,  # 5606
-    2317, 3283, 7650, 7651, 4164, 7652, 4165, 84, 4166, 112, 989, 7653, 547, 1059, 3961, 701,  # 5622
-    3558, 1019, 7654, 4167, 7655, 3450, 942, 639, 457, 2301, 2451, 993, 2951, 407, 851, 494,  # 5638
-    4440, 3347, 927, 7656, 1237, 7657, 2421, 3348, 573, 4168, 680, 921, 2911, 1279, 1874, 285,  # 5654
-    790, 1448, 1983, 719, 2167, 7658, 7659, 4441, 3962, 3963, 1649, 7660, 1541, 563, 7661, 1077,  # 5670
-    7662, 3349, 3041, 3451, 511, 2997, 3964, 3965, 3667, 3966, 1268, 2564, 3350, 3207, 4442, 4443,  # 5686
-    7663, 535, 1048, 1276, 1189, 2912, 2028, 3142, 1438, 1373, 2834, 2952, 1134, 2012, 7664, 4169,  # 5702
-    1238, 2578, 3086, 1259, 7665, 700, 7666, 2953, 3143, 3668, 4170, 7667, 4171, 1146, 1875, 1906,  # 5718
-    4444, 2601, 3967, 781, 2422, 132, 1589, 203, 147, 273, 2789, 2402, 898, 1786, 2154, 3968,  # 5734
-    3969, 7668, 3792, 2790, 7669, 7670, 4445, 4446, 7671, 3208, 7672, 1635, 3793, 965, 7673, 1804,  # 5750
-    2690, 1516, 3559, 1121, 1082, 1329, 3284, 3970, 1449, 3794, 65, 1128, 2835, 2913, 2759, 1590,  # 5766
-    3795, 7674, 7675, 12, 2658, 45, 976, 2579, 3144, 4447, 517, 2528, 1013, 1037, 3209, 7676,  # 5782
-    3796, 2836, 7677, 3797, 7678, 3452, 7679, 2602, 614, 1998, 2318, 3798, 3087, 2724, 2628, 7680,  # 5798
-    2580, 4172, 599, 1269, 7681, 1810, 3669, 7682, 2691, 3088, 759, 1060, 489, 1805, 3351, 3285,  # 5814
-    1358, 7683, 7684, 2386, 1387, 1215, 2629, 2252, 490, 7685, 7686, 4173, 1759, 2387, 2343, 7687,  # 5830
-    4448, 3799, 1907, 3971, 2630, 1806, 3210, 4449, 3453, 3286, 2760, 2344, 874, 7688, 7689, 3454,  # 5846
-    3670, 1858, 91, 2914, 3671, 3042, 3800, 4450, 7690, 3145, 3972, 2659, 7691, 3455, 1202, 1403,  # 5862
-    3801, 2954, 2529, 1517, 2503, 4451, 3456, 2504, 7692, 4452, 7693, 2692, 1885, 1495, 1731, 3973,  # 5878
-    2365, 4453, 7694, 2029, 7695, 7696, 3974, 2693, 1216, 237, 2581, 4174, 2319, 3975, 3802, 4454,  # 5894
-    4455, 2694, 3560, 3457, 445, 4456, 7697, 7698, 7699, 7700, 2761, 61, 3976, 3672, 1822, 3977,  # 5910
-    7701, 687, 2045, 935, 925, 405, 2660, 703, 1096, 1859, 2725, 4457, 3978, 1876, 1367, 2695,  # 5926
-    3352, 918, 2105, 1781, 2476, 334, 3287, 1611, 1093, 4458, 564, 3146, 3458, 3673, 3353, 945,  # 5942
-    2631, 2057, 4459, 7702, 1925, 872, 4175, 7703, 3459, 2696, 3089, 349, 4176, 3674, 3979, 4460,  # 5958
-    3803, 4177, 3675, 2155, 3980, 4461, 4462, 4178, 4463, 2403, 2046, 782, 3981, 400, 251, 4179,  # 5974
-    1624, 7704, 7705, 277, 3676, 299, 1265, 476, 1191, 3804, 2121, 4180, 4181, 1109, 205, 7706,  # 5990
-    2582, 1000, 2156, 3561, 1860, 7707, 7708, 7709, 4464, 7710, 4465, 2565, 107, 2477, 2157, 3982,  # 6006
-    3460, 3147, 7711, 1533, 541, 1301, 158, 753, 4182, 2872, 3562, 7712, 1696, 370, 1088, 4183,  # 6022
-    4466, 3563, 579, 327, 440, 162, 2240, 269, 1937, 1374, 3461, 968, 3043, 56, 1396, 3090,  # 6038
-    2106, 3288, 3354, 7713, 1926, 2158, 4467, 2998, 7714, 3564, 7715, 7716, 3677, 4468, 2478, 7717,  # 6054
-    2791, 7718, 1650, 4469, 7719, 2603, 7720, 7721, 3983, 2661, 3355, 1149, 3356, 3984, 3805, 3985,  # 6070
-    7722, 1076, 49, 7723, 951, 3211, 3289, 3290, 450, 2837, 920, 7724, 1811, 2792, 2366, 4184,  # 6086
-    1908, 1138, 2367, 3806, 3462, 7725, 3212, 4470, 1909, 1147, 1518, 2423, 4471, 3807, 7726, 4472,  # 6102
-    2388, 2604, 260, 1795, 3213, 7727, 7728, 3808, 3291, 708, 7729, 3565, 1704, 7730, 3566, 1351,  # 6118
-    1618, 3357, 2999, 1886, 944, 4185, 3358, 4186, 3044, 3359, 4187, 7731, 3678, 422, 413, 1714,  # 6134
-    3292, 500, 2058, 2345, 4188, 2479, 7732, 1344, 1910, 954, 7733, 1668, 7734, 7735, 3986, 2404,  # 6150
-    4189, 3567, 3809, 4190, 7736, 2302, 1318, 2505, 3091, 133, 3092, 2873, 4473, 629, 31, 2838,  # 6166
-    2697, 3810, 4474, 850, 949, 4475, 3987, 2955, 1732, 2088, 4191, 1496, 1852, 7737, 3988, 620,  # 6182
-    3214, 981, 1242, 3679, 3360, 1619, 3680, 1643, 3293, 2139, 2452, 1970, 1719, 3463, 2168, 7738,  # 6198
-    3215, 7739, 7740, 3361, 1828, 7741, 1277, 4476, 1565, 2047, 7742, 1636, 3568, 3093, 7743, 869,  # 6214
-    2839, 655, 3811, 3812, 3094, 3989, 3000, 3813, 1310, 3569, 4477, 7744, 7745, 7746, 1733, 558,  # 6230
-    4478, 3681, 335, 1549, 3045, 1756, 4192, 3682, 1945, 3464, 1829, 1291, 1192, 470, 2726, 2107,  # 6246
-    2793, 913, 1054, 3990, 7747, 1027, 7748, 3046, 3991, 4479, 982, 2662, 3362, 3148, 3465, 3216,  # 6262
-    3217, 1946, 2794, 7749, 571, 4480, 7750, 1830, 7751, 3570, 2583, 1523, 2424, 7752, 2089, 984,  # 6278
-    4481, 3683, 1959, 7753, 3684, 852, 923, 2795, 3466, 3685, 969, 1519, 999, 2048, 2320, 1705,  # 6294
-    7754, 3095, 615, 1662, 151, 597, 3992, 2405, 2321, 1049, 275, 4482, 3686, 4193, 568, 3687,  # 6310
-    3571, 2480, 4194, 3688, 7755, 2425, 2270, 409, 3218, 7756, 1566, 2874, 3467, 1002, 769, 2840,  # 6326
-    194, 2090, 3149, 3689, 2222, 3294, 4195, 628, 1505, 7757, 7758, 1763, 2177, 3001, 3993, 521,  # 6342
-    1161, 2584, 1787, 2203, 2406, 4483, 3994, 1625, 4196, 4197, 412, 42, 3096, 464, 7759, 2632,  # 6358
-    4484, 3363, 1760, 1571, 2875, 3468, 2530, 1219, 2204, 3814, 2633, 2140, 2368, 4485, 4486, 3295,  # 6374
-    1651, 3364, 3572, 7760, 7761, 3573, 2481, 3469, 7762, 3690, 7763, 7764, 2271, 2091, 460, 7765,  # 6390
-    4487, 7766, 3002, 962, 588, 3574, 289, 3219, 2634, 1116, 52, 7767, 3047, 1796, 7768, 7769,  # 6406
-    7770, 1467, 7771, 1598, 1143, 3691, 4198, 1984, 1734, 1067, 4488, 1280, 3365, 465, 4489, 1572,  # 6422
-    510, 7772, 1927, 2241, 1812, 1644, 3575, 7773, 4490, 3692, 7774, 7775, 2663, 1573, 1534, 7776,  # 6438
-    7777, 4199, 536, 1807, 1761, 3470, 3815, 3150, 2635, 7778, 7779, 7780, 4491, 3471, 2915, 1911,  # 6454
-    2796, 7781, 3296, 1122, 377, 3220, 7782, 360, 7783, 7784, 4200, 1529, 551, 7785, 2059, 3693,  # 6470
-    1769, 2426, 7786, 2916, 4201, 3297, 3097, 2322, 2108, 2030, 4492, 1404, 136, 1468, 1479, 672,  # 6486
-    1171, 3221, 2303, 271, 3151, 7787, 2762, 7788, 2049, 678, 2727, 865, 1947, 4493, 7789, 2013,  # 6502
-    3995, 2956, 7790, 2728, 2223, 1397, 3048, 3694, 4494, 4495, 1735, 2917, 3366, 3576, 7791, 3816,  # 6518
-    509, 2841, 2453, 2876, 3817, 7792, 7793, 3152, 3153, 4496, 4202, 2531, 4497, 2304, 1166, 1010,  # 6534
-    552, 681, 1887, 7794, 7795, 2957, 2958, 3996, 1287, 1596, 1861, 3154, 358, 453, 736, 175,  # 6550
-    478, 1117, 905, 1167, 1097, 7796, 1853, 1530, 7797, 1706, 7798, 2178, 3472, 2287, 3695, 3473,  # 6566
-    3577, 4203, 2092, 4204, 7799, 3367, 1193, 2482, 4205, 1458, 2190, 2205, 1862, 1888, 1421, 3298,  # 6582
-    2918, 3049, 2179, 3474, 595, 2122, 7800, 3997, 7801, 7802, 4206, 1707, 2636, 223, 3696, 1359,  # 6598
-    751, 3098, 183, 3475, 7803, 2797, 3003, 419, 2369, 633, 704, 3818, 2389, 241, 7804, 7805,  # 6614
-    7806, 838, 3004, 3697, 2272, 2763, 2454, 3819, 1938, 2050, 3998, 1309, 3099, 2242, 1181, 7807,  # 6630
-    1136, 2206, 3820, 2370, 1446, 4207, 2305, 4498, 7808, 7809, 4208, 1055, 2605, 484, 3698, 7810,  # 6646
-    3999, 625, 4209, 2273, 3368, 1499, 4210, 4000, 7811, 4001, 4211, 3222, 2274, 2275, 3476, 7812,  # 6662
-    7813, 2764, 808, 2606, 3699, 3369, 4002, 4212, 3100, 2532, 526, 3370, 3821, 4213, 955, 7814,  # 6678
-    1620, 4214, 2637, 2427, 7815, 1429, 3700, 1669, 1831, 994, 928, 7816, 3578, 1260, 7817, 7818,  # 6694
-    7819, 1948, 2288, 741, 2919, 1626, 4215, 2729, 2455, 867, 1184, 362, 3371, 1392, 7820, 7821,  # 6710
-    4003, 4216, 1770, 1736, 3223, 2920, 4499, 4500, 1928, 2698, 1459, 1158, 7822, 3050, 3372, 2877,  # 6726
-    1292, 1929, 2506, 2842, 3701, 1985, 1187, 2071, 2014, 2607, 4217, 7823, 2566, 2507, 2169, 3702,  # 6742
-    2483, 3299, 7824, 3703, 4501, 7825, 7826, 666, 1003, 3005, 1022, 3579, 4218, 7827, 4502, 1813,  # 6758
-    2253, 574, 3822, 1603, 295, 1535, 705, 3823, 4219, 283, 858, 417, 7828, 7829, 3224, 4503,  # 6774
-    4504, 3051, 1220, 1889, 1046, 2276, 2456, 4004, 1393, 1599, 689, 2567, 388, 4220, 7830, 2484,  # 6790
-    802, 7831, 2798, 3824, 2060, 1405, 2254, 7832, 4505, 3825, 2109, 1052, 1345, 3225, 1585, 7833,  # 6806
-    809, 7834, 7835, 7836, 575, 2730, 3477, 956, 1552, 1469, 1144, 2323, 7837, 2324, 1560, 2457,  # 6822
-    3580, 3226, 4005, 616, 2207, 3155, 2180, 2289, 7838, 1832, 7839, 3478, 4506, 7840, 1319, 3704,  # 6838
-    3705, 1211, 3581, 1023, 3227, 1293, 2799, 7841, 7842, 7843, 3826, 607, 2306, 3827, 762, 2878,  # 6854
-    1439, 4221, 1360, 7844, 1485, 3052, 7845, 4507, 1038, 4222, 1450, 2061, 2638, 4223, 1379, 4508,  # 6870
-    2585, 7846, 7847, 4224, 1352, 1414, 2325, 2921, 1172, 7848, 7849, 3828, 3829, 7850, 1797, 1451,  # 6886
-    7851, 7852, 7853, 7854, 2922, 4006, 4007, 2485, 2346, 411, 4008, 4009, 3582, 3300, 3101, 4509,  # 6902
-    1561, 2664, 1452, 4010, 1375, 7855, 7856, 47, 2959, 316, 7857, 1406, 1591, 2923, 3156, 7858,  # 6918
-    1025, 2141, 3102, 3157, 354, 2731, 884, 2224, 4225, 2407, 508, 3706, 726, 3583, 996, 2428,  # 6934
-    3584, 729, 7859, 392, 2191, 1453, 4011, 4510, 3707, 7860, 7861, 2458, 3585, 2608, 1675, 2800,  # 6950
-    919, 2347, 2960, 2348, 1270, 4511, 4012, 73, 7862, 7863, 647, 7864, 3228, 2843, 2255, 1550,  # 6966
-    1346, 3006, 7865, 1332, 883, 3479, 7866, 7867, 7868, 7869, 3301, 2765, 7870, 1212, 831, 1347,  # 6982
-    4226, 4512, 2326, 3830, 1863, 3053, 720, 3831, 4513, 4514, 3832, 7871, 4227, 7872, 7873, 4515,  # 6998
-    7874, 7875, 1798, 4516, 3708, 2609, 4517, 3586, 1645, 2371, 7876, 7877, 2924, 669, 2208, 2665,  # 7014
-    2429, 7878, 2879, 7879, 7880, 1028, 3229, 7881, 4228, 2408, 7882, 2256, 1353, 7883, 7884, 4518,  # 7030
-    3158, 518, 7885, 4013, 7886, 4229, 1960, 7887, 2142, 4230, 7888, 7889, 3007, 2349, 2350, 3833,  # 7046
-    516, 1833, 1454, 4014, 2699, 4231, 4519, 2225, 2610, 1971, 1129, 3587, 7890, 2766, 7891, 2961,  # 7062
-    1422, 577, 1470, 3008, 1524, 3373, 7892, 7893, 432, 4232, 3054, 3480, 7894, 2586, 1455, 2508,  # 7078
-    2226, 1972, 1175, 7895, 1020, 2732, 4015, 3481, 4520, 7896, 2733, 7897, 1743, 1361, 3055, 3482,  # 7094
-    2639, 4016, 4233, 4521, 2290, 895, 924, 4234, 2170, 331, 2243, 3056, 166, 1627, 3057, 1098,  # 7110
-    7898, 1232, 2880, 2227, 3374, 4522, 657, 403, 1196, 2372, 542, 3709, 3375, 1600, 4235, 3483,  # 7126
-    7899, 4523, 2767, 3230, 576, 530, 1362, 7900, 4524, 2533, 2666, 3710, 4017, 7901, 842, 3834,  # 7142
-    7902, 2801, 2031, 1014, 4018, 213, 2700, 3376, 665, 621, 4236, 7903, 3711, 2925, 2430, 7904,  # 7158
-    2431, 3302, 3588, 3377, 7905, 4237, 2534, 4238, 4525, 3589, 1682, 4239, 3484, 1380, 7906, 724,  # 7174
-    2277, 600, 1670, 7907, 1337, 1233, 4526, 3103, 2244, 7908, 1621, 4527, 7909, 651, 4240, 7910,  # 7190
-    1612, 4241, 2611, 7911, 2844, 7912, 2734, 2307, 3058, 7913, 716, 2459, 3059, 174, 1255, 2701,  # 7206
-    4019, 3590, 548, 1320, 1398, 728, 4020, 1574, 7914, 1890, 1197, 3060, 4021, 7915, 3061, 3062,  # 7222
-    3712, 3591, 3713, 747, 7916, 635, 4242, 4528, 7917, 7918, 7919, 4243, 7920, 7921, 4529, 7922,  # 7238
-    3378, 4530, 2432, 451, 7923, 3714, 2535, 2072, 4244, 2735, 4245, 4022, 7924, 1764, 4531, 7925,  # 7254
-    4246, 350, 7926, 2278, 2390, 2486, 7927, 4247, 4023, 2245, 1434, 4024, 488, 4532, 458, 4248,  # 7270
-    4025, 3715, 771, 1330, 2391, 3835, 2568, 3159, 2159, 2409, 1553, 2667, 3160, 4249, 7928, 2487,  # 7286
-    2881, 2612, 1720, 2702, 4250, 3379, 4533, 7929, 2536, 4251, 7930, 3231, 4252, 2768, 7931, 2015,  # 7302
-    2736, 7932, 1155, 1017, 3716, 3836, 7933, 3303, 2308, 201, 1864, 4253, 1430, 7934, 4026, 7935,  # 7318
-    7936, 7937, 7938, 7939, 4254, 1604, 7940, 414, 1865, 371, 2587, 4534, 4535, 3485, 2016, 3104,  # 7334
-    4536, 1708, 960, 4255, 887, 389, 2171, 1536, 1663, 1721, 7941, 2228, 4027, 2351, 2926, 1580,  # 7350
-    7942, 7943, 7944, 1744, 7945, 2537, 4537, 4538, 7946, 4539, 7947, 2073, 7948, 7949, 3592, 3380,  # 7366
-    2882, 4256, 7950, 4257, 2640, 3381, 2802, 673, 2703, 2460, 709, 3486, 4028, 3593, 4258, 7951,  # 7382
-    1148, 502, 634, 7952, 7953, 1204, 4540, 3594, 1575, 4541, 2613, 3717, 7954, 3718, 3105, 948,  # 7398
-    3232, 121, 1745, 3837, 1110, 7955, 4259, 3063, 2509, 3009, 4029, 3719, 1151, 1771, 3838, 1488,  # 7414
-    4030, 1986, 7956, 2433, 3487, 7957, 7958, 2093, 7959, 4260, 3839, 1213, 1407, 2803, 531, 2737,  # 7430
-    2538, 3233, 1011, 1537, 7960, 2769, 4261, 3106, 1061, 7961, 3720, 3721, 1866, 2883, 7962, 2017,  # 7446
-    120, 4262, 4263, 2062, 3595, 3234, 2309, 3840, 2668, 3382, 1954, 4542, 7963, 7964, 3488, 1047,  # 7462
-    2704, 1266, 7965, 1368, 4543, 2845, 649, 3383, 3841, 2539, 2738, 1102, 2846, 2669, 7966, 7967,  # 7478
-    1999, 7968, 1111, 3596, 2962, 7969, 2488, 3842, 3597, 2804, 1854, 3384, 3722, 7970, 7971, 3385,  # 7494
-    2410, 2884, 3304, 3235, 3598, 7972, 2569, 7973, 3599, 2805, 4031, 1460, 856, 7974, 3600, 7975,  # 7510
-    2885, 2963, 7976, 2886, 3843, 7977, 4264, 632, 2510, 875, 3844, 1697, 3845, 2291, 7978, 7979,  # 7526
-    4544, 3010, 1239, 580, 4545, 4265, 7980, 914, 936, 2074, 1190, 4032, 1039, 2123, 7981, 7982,  # 7542
-    7983, 3386, 1473, 7984, 1354, 4266, 3846, 7985, 2172, 3064, 4033, 915, 3305, 4267, 4268, 3306,  # 7558
-    1605, 1834, 7986, 2739, 398, 3601, 4269, 3847, 4034, 328, 1912, 2847, 4035, 3848, 1331, 4270,  # 7574
-    3011, 937, 4271, 7987, 3602, 4036, 4037, 3387, 2160, 4546, 3388, 524, 742, 538, 3065, 1012,  # 7590
-    7988, 7989, 3849, 2461, 7990, 658, 1103, 225, 3850, 7991, 7992, 4547, 7993, 4548, 7994, 3236,  # 7606
-    1243, 7995, 4038, 963, 2246, 4549, 7996, 2705, 3603, 3161, 7997, 7998, 2588, 2327, 7999, 4550,  # 7622
-    8000, 8001, 8002, 3489, 3307, 957, 3389, 2540, 2032, 1930, 2927, 2462, 870, 2018, 3604, 1746,  # 7638
-    2770, 2771, 2434, 2463, 8003, 3851, 8004, 3723, 3107, 3724, 3490, 3390, 3725, 8005, 1179, 3066,  # 7654
-    8006, 3162, 2373, 4272, 3726, 2541, 3163, 3108, 2740, 4039, 8007, 3391, 1556, 2542, 2292, 977,  # 7670
-    2887, 2033, 4040, 1205, 3392, 8008, 1765, 3393, 3164, 2124, 1271, 1689, 714, 4551, 3491, 8009,  # 7686
-    2328, 3852, 533, 4273, 3605, 2181, 617, 8010, 2464, 3308, 3492, 2310, 8011, 8012, 3165, 8013,  # 7702
-    8014, 3853, 1987, 618, 427, 2641, 3493, 3394, 8015, 8016, 1244, 1690, 8017, 2806, 4274, 4552,  # 7718
-    8018, 3494, 8019, 8020, 2279, 1576, 473, 3606, 4275, 3395, 972, 8021, 3607, 8022, 3067, 8023,  # 7734
-    8024, 4553, 4554, 8025, 3727, 4041, 4042, 8026, 153, 4555, 356, 8027, 1891, 2888, 4276, 2143,  # 7750
-    408, 803, 2352, 8028, 3854, 8029, 4277, 1646, 2570, 2511, 4556, 4557, 3855, 8030, 3856, 4278,  # 7766
-    8031, 2411, 3396, 752, 8032, 8033, 1961, 2964, 8034, 746, 3012, 2465, 8035, 4279, 3728, 698,  # 7782
-    4558, 1892, 4280, 3608, 2543, 4559, 3609, 3857, 8036, 3166, 3397, 8037, 1823, 1302, 4043, 2706,  # 7798
-    3858, 1973, 4281, 8038, 4282, 3167, 823, 1303, 1288, 1236, 2848, 3495, 4044, 3398, 774, 3859,  # 7814
-    8039, 1581, 4560, 1304, 2849, 3860, 4561, 8040, 2435, 2161, 1083, 3237, 4283, 4045, 4284, 344,  # 7830
-    1173, 288, 2311, 454, 1683, 8041, 8042, 1461, 4562, 4046, 2589, 8043, 8044, 4563, 985, 894,  # 7846
-    8045, 3399, 3168, 8046, 1913, 2928, 3729, 1988, 8047, 2110, 1974, 8048, 4047, 8049, 2571, 1194,  # 7862
-    425, 8050, 4564, 3169, 1245, 3730, 4285, 8051, 8052, 2850, 8053, 636, 4565, 1855, 3861, 760,  # 7878
-    1799, 8054, 4286, 2209, 1508, 4566, 4048, 1893, 1684, 2293, 8055, 8056, 8057, 4287, 4288, 2210,  # 7894
-    479, 8058, 8059, 832, 8060, 4049, 2489, 8061, 2965, 2490, 3731, 990, 3109, 627, 1814, 2642,  # 7910
-    4289, 1582, 4290, 2125, 2111, 3496, 4567, 8062, 799, 4291, 3170, 8063, 4568, 2112, 1737, 3013,  # 7926
-    1018, 543, 754, 4292, 3309, 1676, 4569, 4570, 4050, 8064, 1489, 8065, 3497, 8066, 2614, 2889,  # 7942
-    4051, 8067, 8068, 2966, 8069, 8070, 8071, 8072, 3171, 4571, 4572, 2182, 1722, 8073, 3238, 3239,  # 7958
-    1842, 3610, 1715, 481, 365, 1975, 1856, 8074, 8075, 1962, 2491, 4573, 8076, 2126, 3611, 3240,  # 7974
-    433, 1894, 2063, 2075, 8077, 602, 2741, 8078, 8079, 8080, 8081, 8082, 3014, 1628, 3400, 8083,  # 7990
-    3172, 4574, 4052, 2890, 4575, 2512, 8084, 2544, 2772, 8085, 8086, 8087, 3310, 4576, 2891, 8088,  # 8006
-    4577, 8089, 2851, 4578, 4579, 1221, 2967, 4053, 2513, 8090, 8091, 8092, 1867, 1989, 8093, 8094,  # 8022
-    8095, 1895, 8096, 8097, 4580, 1896, 4054, 318, 8098, 2094, 4055, 4293, 8099, 8100, 485, 8101,  # 8038
-    938, 3862, 553, 2670, 116, 8102, 3863, 3612, 8103, 3498, 2671, 2773, 3401, 3311, 2807, 8104,  # 8054
-    3613, 2929, 4056, 1747, 2930, 2968, 8105, 8106, 207, 8107, 8108, 2672, 4581, 2514, 8109, 3015,  # 8070
-    890, 3614, 3864, 8110, 1877, 3732, 3402, 8111, 2183, 2353, 3403, 1652, 8112, 8113, 8114, 941,  # 8086
-    2294, 208, 3499, 4057, 2019, 330, 4294, 3865, 2892, 2492, 3733, 4295, 8115, 8116, 8117, 8118,  # 8102
-)
-# fmt: on
diff --git a/src/pip/_vendor/chardet/euctwprober.py b/src/pip/_vendor/chardet/euctwprober.py
deleted file mode 100644
index a37ab189958..00000000000
--- a/src/pip/_vendor/chardet/euctwprober.py
+++ /dev/null
@@ -1,47 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .chardistribution import EUCTWDistributionAnalysis
-from .codingstatemachine import CodingStateMachine
-from .mbcharsetprober import MultiByteCharSetProber
-from .mbcssm import EUCTW_SM_MODEL
-
-
-class EUCTWProber(MultiByteCharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self.coding_sm = CodingStateMachine(EUCTW_SM_MODEL)
-        self.distribution_analyzer = EUCTWDistributionAnalysis()
-        self.reset()
-
-    @property
-    def charset_name(self) -> str:
-        return "EUC-TW"
-
-    @property
-    def language(self) -> str:
-        return "Taiwan"
diff --git a/src/pip/_vendor/chardet/gb2312freq.py b/src/pip/_vendor/chardet/gb2312freq.py
deleted file mode 100644
index b32bfc74213..00000000000
--- a/src/pip/_vendor/chardet/gb2312freq.py
+++ /dev/null
@@ -1,284 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# GB2312 most frequently used character table
-#
-# Char to FreqOrder table , from hz6763
-
-# 512  --> 0.79  -- 0.79
-# 1024 --> 0.92  -- 0.13
-# 2048 --> 0.98  -- 0.06
-# 6768 --> 1.00  -- 0.02
-#
-# Ideal Distribution Ratio = 0.79135/(1-0.79135) = 3.79
-# Random Distribution Ration = 512 / (3755 - 512) = 0.157
-#
-# Typical Distribution Ratio about 25% of Ideal one, still much higher that RDR
-
-GB2312_TYPICAL_DISTRIBUTION_RATIO = 0.9
-
-GB2312_TABLE_SIZE = 3760
-
-# fmt: off
-GB2312_CHAR_TO_FREQ_ORDER = (
-1671, 749,1443,2364,3924,3807,2330,3921,1704,3463,2691,1511,1515, 572,3191,2205,
-2361, 224,2558, 479,1711, 963,3162, 440,4060,1905,2966,2947,3580,2647,3961,3842,
-2204, 869,4207, 970,2678,5626,2944,2956,1479,4048, 514,3595, 588,1346,2820,3409,
- 249,4088,1746,1873,2047,1774, 581,1813, 358,1174,3590,1014,1561,4844,2245, 670,
-1636,3112, 889,1286, 953, 556,2327,3060,1290,3141, 613, 185,3477,1367, 850,3820,
-1715,2428,2642,2303,2732,3041,2562,2648,3566,3946,1349, 388,3098,2091,1360,3585,
- 152,1687,1539, 738,1559,  59,1232,2925,2267,1388,1249,1741,1679,2960, 151,1566,
-1125,1352,4271, 924,4296, 385,3166,4459, 310,1245,2850,  70,3285,2729,3534,3575,
-2398,3298,3466,1960,2265, 217,3647, 864,1909,2084,4401,2773,1010,3269,5152, 853,
-3051,3121,1244,4251,1895, 364,1499,1540,2313,1180,3655,2268, 562, 715,2417,3061,
- 544, 336,3768,2380,1752,4075, 950, 280,2425,4382, 183,2759,3272, 333,4297,2155,
-1688,2356,1444,1039,4540, 736,1177,3349,2443,2368,2144,2225, 565, 196,1482,3406,
- 927,1335,4147, 692, 878,1311,1653,3911,3622,1378,4200,1840,2969,3149,2126,1816,
-2534,1546,2393,2760, 737,2494,  13, 447, 245,2747,  38,2765,2129,2589,1079, 606,
- 360, 471,3755,2890, 404, 848, 699,1785,1236, 370,2221,1023,3746,2074,2026,2023,
-2388,1581,2119, 812,1141,3091,2536,1519, 804,2053, 406,1596,1090, 784, 548,4414,
-1806,2264,2936,1100, 343,4114,5096, 622,3358, 743,3668,1510,1626,5020,3567,2513,
-3195,4115,5627,2489,2991,  24,2065,2697,1087,2719,  48,1634, 315,  68, 985,2052,
- 198,2239,1347,1107,1439, 597,2366,2172, 871,3307, 919,2487,2790,1867, 236,2570,
-1413,3794, 906,3365,3381,1701,1982,1818,1524,2924,1205, 616,2586,2072,2004, 575,
- 253,3099,  32,1365,1182, 197,1714,2454,1201, 554,3388,3224,2748, 756,2587, 250,
-2567,1507,1517,3529,1922,2761,2337,3416,1961,1677,2452,2238,3153, 615, 911,1506,
-1474,2495,1265,1906,2749,3756,3280,2161, 898,2714,1759,3450,2243,2444, 563,  26,
-3286,2266,3769,3344,2707,3677, 611,1402, 531,1028,2871,4548,1375, 261,2948, 835,
-1190,4134, 353, 840,2684,1900,3082,1435,2109,1207,1674, 329,1872,2781,4055,2686,
-2104, 608,3318,2423,2957,2768,1108,3739,3512,3271,3985,2203,1771,3520,1418,2054,
-1681,1153, 225,1627,2929, 162,2050,2511,3687,1954, 124,1859,2431,1684,3032,2894,
- 585,4805,3969,2869,2704,2088,2032,2095,3656,2635,4362,2209, 256, 518,2042,2105,
-3777,3657, 643,2298,1148,1779, 190, 989,3544, 414,  11,2135,2063,2979,1471, 403,
-3678, 126, 770,1563, 671,2499,3216,2877, 600,1179, 307,2805,4937,1268,1297,2694,
- 252,4032,1448,1494,1331,1394, 127,2256, 222,1647,1035,1481,3056,1915,1048, 873,
-3651, 210,  33,1608,2516, 200,1520, 415, 102,   0,3389,1287, 817,  91,3299,2940,
- 836,1814, 549,2197,1396,1669,2987,3582,2297,2848,4528,1070, 687,  20,1819, 121,
-1552,1364,1461,1968,2617,3540,2824,2083, 177, 948,4938,2291, 110,4549,2066, 648,
-3359,1755,2110,2114,4642,4845,1693,3937,3308,1257,1869,2123, 208,1804,3159,2992,
-2531,2549,3361,2418,1350,2347,2800,2568,1291,2036,2680,  72, 842,1990, 212,1233,
-1154,1586,  75,2027,3410,4900,1823,1337,2710,2676, 728,2810,1522,3026,4995, 157,
- 755,1050,4022, 710, 785,1936,2194,2085,1406,2777,2400, 150,1250,4049,1206, 807,
-1910, 534, 529,3309,1721,1660, 274,  39,2827, 661,2670,1578, 925,3248,3815,1094,
-4278,4901,4252,  41,1150,3747,2572,2227,4501,3658,4902,3813,3357,3617,2884,2258,
- 887, 538,4187,3199,1294,2439,3042,2329,2343,2497,1255, 107, 543,1527, 521,3478,
-3568, 194,5062,  15, 961,3870,1241,1192,2664,  66,5215,3260,2111,1295,1127,2152,
-3805,4135, 901,1164,1976, 398,1278, 530,1460, 748, 904,1054,1966,1426,  53,2909,
- 509, 523,2279,1534, 536,1019, 239,1685, 460,2353, 673,1065,2401,3600,4298,2272,
-1272,2363, 284,1753,3679,4064,1695,  81, 815,2677,2757,2731,1386, 859, 500,4221,
-2190,2566, 757,1006,2519,2068,1166,1455, 337,2654,3203,1863,1682,1914,3025,1252,
-1409,1366, 847, 714,2834,2038,3209, 964,2970,1901, 885,2553,1078,1756,3049, 301,
-1572,3326, 688,2130,1996,2429,1805,1648,2930,3421,2750,3652,3088, 262,1158,1254,
- 389,1641,1812, 526,1719, 923,2073,1073,1902, 468, 489,4625,1140, 857,2375,3070,
-3319,2863, 380, 116,1328,2693,1161,2244, 273,1212,1884,2769,3011,1775,1142, 461,
-3066,1200,2147,2212, 790, 702,2695,4222,1601,1058, 434,2338,5153,3640,  67,2360,
-4099,2502, 618,3472,1329, 416,1132, 830,2782,1807,2653,3211,3510,1662, 192,2124,
- 296,3979,1739,1611,3684,  23, 118, 324, 446,1239,1225, 293,2520,3814,3795,2535,
-3116,  17,1074, 467,2692,2201, 387,2922,  45,1326,3055,1645,3659,2817, 958, 243,
-1903,2320,1339,2825,1784,3289, 356, 576, 865,2315,2381,3377,3916,1088,3122,1713,
-1655, 935, 628,4689,1034,1327, 441, 800, 720, 894,1979,2183,1528,5289,2702,1071,
-4046,3572,2399,1571,3281,  79, 761,1103, 327, 134, 758,1899,1371,1615, 879, 442,
- 215,2605,2579, 173,2048,2485,1057,2975,3317,1097,2253,3801,4263,1403,1650,2946,
- 814,4968,3487,1548,2644,1567,1285,   2, 295,2636,  97, 946,3576, 832, 141,4257,
-3273, 760,3821,3521,3156,2607, 949,1024,1733,1516,1803,1920,2125,2283,2665,3180,
-1501,2064,3560,2171,1592, 803,3518,1416, 732,3897,4258,1363,1362,2458, 119,1427,
- 602,1525,2608,1605,1639,3175, 694,3064,  10, 465,  76,2000,4846,4208, 444,3781,
-1619,3353,2206,1273,3796, 740,2483, 320,1723,2377,3660,2619,1359,1137,1762,1724,
-2345,2842,1850,1862, 912, 821,1866, 612,2625,1735,2573,3369,1093, 844,  89, 937,
- 930,1424,3564,2413,2972,1004,3046,3019,2011, 711,3171,1452,4178, 428, 801,1943,
- 432, 445,2811, 206,4136,1472, 730, 349,  73, 397,2802,2547, 998,1637,1167, 789,
- 396,3217, 154,1218, 716,1120,1780,2819,4826,1931,3334,3762,2139,1215,2627, 552,
-3664,3628,3232,1405,2383,3111,1356,2652,3577,3320,3101,1703, 640,1045,1370,1246,
-4996, 371,1575,2436,1621,2210, 984,4033,1734,2638,  16,4529, 663,2755,3255,1451,
-3917,2257,1253,1955,2234,1263,2951, 214,1229, 617, 485, 359,1831,1969, 473,2310,
- 750,2058, 165,  80,2864,2419, 361,4344,2416,2479,1134, 796,3726,1266,2943, 860,
-2715, 938, 390,2734,1313,1384, 248, 202, 877,1064,2854, 522,3907, 279,1602, 297,
-2357, 395,3740, 137,2075, 944,4089,2584,1267,3802,  62,1533,2285, 178, 176, 780,
-2440, 201,3707, 590, 478,1560,4354,2117,1075,  30,  74,4643,4004,1635,1441,2745,
- 776,2596, 238,1077,1692,1912,2844, 605, 499,1742,3947, 241,3053, 980,1749, 936,
-2640,4511,2582, 515,1543,2162,5322,2892,2993, 890,2148,1924, 665,1827,3581,1032,
- 968,3163, 339,1044,1896, 270, 583,1791,1720,4367,1194,3488,3669,  43,2523,1657,
- 163,2167, 290,1209,1622,3378, 550, 634,2508,2510, 695,2634,2384,2512,1476,1414,
- 220,1469,2341,2138,2852,3183,2900,4939,2865,3502,1211,3680, 854,3227,1299,2976,
-3172, 186,2998,1459, 443,1067,3251,1495, 321,1932,3054, 909, 753,1410,1828, 436,
-2441,1119,1587,3164,2186,1258, 227, 231,1425,1890,3200,3942, 247, 959, 725,5254,
-2741, 577,2158,2079, 929, 120, 174, 838,2813, 591,1115, 417,2024,  40,3240,1536,
-1037, 291,4151,2354, 632,1298,2406,2500,3535,1825,1846,3451, 205,1171, 345,4238,
-  18,1163, 811, 685,2208,1217, 425,1312,1508,1175,4308,2552,1033, 587,1381,3059,
-2984,3482, 340,1316,4023,3972, 792,3176, 519, 777,4690, 918, 933,4130,2981,3741,
-  90,3360,2911,2200,5184,4550, 609,3079,2030, 272,3379,2736, 363,3881,1130,1447,
- 286, 779, 357,1169,3350,3137,1630,1220,2687,2391, 747,1277,3688,2618,2682,2601,
-1156,3196,5290,4034,3102,1689,3596,3128, 874, 219,2783, 798, 508,1843,2461, 269,
-1658,1776,1392,1913,2983,3287,2866,2159,2372, 829,4076,  46,4253,2873,1889,1894,
- 915,1834,1631,2181,2318, 298, 664,2818,3555,2735, 954,3228,3117, 527,3511,2173,
- 681,2712,3033,2247,2346,3467,1652, 155,2164,3382, 113,1994, 450, 899, 494, 994,
-1237,2958,1875,2336,1926,3727, 545,1577,1550, 633,3473, 204,1305,3072,2410,1956,
-2471, 707,2134, 841,2195,2196,2663,3843,1026,4940, 990,3252,4997, 368,1092, 437,
-3212,3258,1933,1829, 675,2977,2893, 412, 943,3723,4644,3294,3283,2230,2373,5154,
-2389,2241,2661,2323,1404,2524, 593, 787, 677,3008,1275,2059, 438,2709,2609,2240,
-2269,2246,1446,  36,1568,1373,3892,1574,2301,1456,3962, 693,2276,5216,2035,1143,
-2720,1919,1797,1811,2763,4137,2597,1830,1699,1488,1198,2090, 424,1694, 312,3634,
-3390,4179,3335,2252,1214, 561,1059,3243,2295,2561, 975,5155,2321,2751,3772, 472,
-1537,3282,3398,1047,2077,2348,2878,1323,3340,3076, 690,2906,  51, 369, 170,3541,
-1060,2187,2688,3670,2541,1083,1683, 928,3918, 459, 109,4427, 599,3744,4286, 143,
-2101,2730,2490,  82,1588,3036,2121, 281,1860, 477,4035,1238,2812,3020,2716,3312,
-1530,2188,2055,1317, 843, 636,1808,1173,3495, 649, 181,1002, 147,3641,1159,2414,
-3750,2289,2795, 813,3123,2610,1136,4368,   5,3391,4541,2174, 420, 429,1728, 754,
-1228,2115,2219, 347,2223,2733, 735,1518,3003,2355,3134,1764,3948,3329,1888,2424,
-1001,1234,1972,3321,3363,1672,1021,1450,1584, 226, 765, 655,2526,3404,3244,2302,
-3665, 731, 594,2184, 319,1576, 621, 658,2656,4299,2099,3864,1279,2071,2598,2739,
- 795,3086,3699,3908,1707,2352,2402,1382,3136,2475,1465,4847,3496,3865,1085,3004,
-2591,1084, 213,2287,1963,3565,2250, 822, 793,4574,3187,1772,1789,3050, 595,1484,
-1959,2770,1080,2650, 456, 422,2996, 940,3322,4328,4345,3092,2742, 965,2784, 739,
-4124, 952,1358,2498,2949,2565, 332,2698,2378, 660,2260,2473,4194,3856,2919, 535,
-1260,2651,1208,1428,1300,1949,1303,2942, 433,2455,2450,1251,1946, 614,1269, 641,
-1306,1810,2737,3078,2912, 564,2365,1419,1415,1497,4460,2367,2185,1379,3005,1307,
-3218,2175,1897,3063, 682,1157,4040,4005,1712,1160,1941,1399, 394, 402,2952,1573,
-1151,2986,2404, 862, 299,2033,1489,3006, 346, 171,2886,3401,1726,2932, 168,2533,
-  47,2507,1030,3735,1145,3370,1395,1318,1579,3609,4560,2857,4116,1457,2529,1965,
- 504,1036,2690,2988,2405, 745,5871, 849,2397,2056,3081, 863,2359,3857,2096,  99,
-1397,1769,2300,4428,1643,3455,1978,1757,3718,1440,  35,4879,3742,1296,4228,2280,
- 160,5063,1599,2013, 166, 520,3479,1646,3345,3012, 490,1937,1545,1264,2182,2505,
-1096,1188,1369,1436,2421,1667,2792,2460,1270,2122, 727,3167,2143, 806,1706,1012,
-1800,3037, 960,2218,1882, 805, 139,2456,1139,1521, 851,1052,3093,3089, 342,2039,
- 744,5097,1468,1502,1585,2087, 223, 939, 326,2140,2577, 892,2481,1623,4077, 982,
-3708, 135,2131,  87,2503,3114,2326,1106, 876,1616, 547,2997,2831,2093,3441,4530,
-4314,   9,3256,4229,4148, 659,1462,1986,1710,2046,2913,2231,4090,4880,5255,3392,
-3274,1368,3689,4645,1477, 705,3384,3635,1068,1529,2941,1458,3782,1509, 100,1656,
-2548, 718,2339, 408,1590,2780,3548,1838,4117,3719,1345,3530, 717,3442,2778,3220,
-2898,1892,4590,3614,3371,2043,1998,1224,3483, 891, 635, 584,2559,3355, 733,1766,
-1729,1172,3789,1891,2307, 781,2982,2271,1957,1580,5773,2633,2005,4195,3097,1535,
-3213,1189,1934,5693,3262, 586,3118,1324,1598, 517,1564,2217,1868,1893,4445,3728,
-2703,3139,1526,1787,1992,3882,2875,1549,1199,1056,2224,1904,2711,5098,4287, 338,
-1993,3129,3489,2689,1809,2815,1997, 957,1855,3898,2550,3275,3057,1105,1319, 627,
-1505,1911,1883,3526, 698,3629,3456,1833,1431, 746,  77,1261,2017,2296,1977,1885,
- 125,1334,1600, 525,1798,1109,2222,1470,1945, 559,2236,1186,3443,2476,1929,1411,
-2411,3135,1777,3372,2621,1841,1613,3229, 668,1430,1839,2643,2916, 195,1989,2671,
-2358,1387, 629,3205,2293,5256,4439, 123,1310, 888,1879,4300,3021,3605,1003,1162,
-3192,2910,2010, 140,2395,2859,  55,1082,2012,2901, 662, 419,2081,1438, 680,2774,
-4654,3912,1620,1731,1625,5035,4065,2328, 512,1344, 802,5443,2163,2311,2537, 524,
-3399,  98,1155,2103,1918,2606,3925,2816,1393,2465,1504,3773,2177,3963,1478,4346,
- 180,1113,4655,3461,2028,1698, 833,2696,1235,1322,1594,4408,3623,3013,3225,2040,
-3022, 541,2881, 607,3632,2029,1665,1219, 639,1385,1686,1099,2803,3231,1938,3188,
-2858, 427, 676,2772,1168,2025, 454,3253,2486,3556, 230,1950, 580, 791,1991,1280,
-1086,1974,2034, 630, 257,3338,2788,4903,1017,  86,4790, 966,2789,1995,1696,1131,
- 259,3095,4188,1308, 179,1463,5257, 289,4107,1248,  42,3413,1725,2288, 896,1947,
- 774,4474,4254, 604,3430,4264, 392,2514,2588, 452, 237,1408,3018, 988,4531,1970,
-3034,3310, 540,2370,1562,1288,2990, 502,4765,1147,   4,1853,2708, 207, 294,2814,
-4078,2902,2509, 684,  34,3105,3532,2551, 644, 709,2801,2344, 573,1727,3573,3557,
-2021,1081,3100,4315,2100,3681, 199,2263,1837,2385, 146,3484,1195,2776,3949, 997,
-1939,3973,1008,1091,1202,1962,1847,1149,4209,5444,1076, 493, 117,5400,2521, 972,
-1490,2934,1796,4542,2374,1512,2933,2657, 413,2888,1135,2762,2314,2156,1355,2369,
- 766,2007,2527,2170,3124,2491,2593,2632,4757,2437, 234,3125,3591,1898,1750,1376,
-1942,3468,3138, 570,2127,2145,3276,4131, 962, 132,1445,4196,  19, 941,3624,3480,
-3366,1973,1374,4461,3431,2629, 283,2415,2275, 808,2887,3620,2112,2563,1353,3610,
- 955,1089,3103,1053,  96,  88,4097, 823,3808,1583, 399, 292,4091,3313, 421,1128,
- 642,4006, 903,2539,1877,2082, 596,  29,4066,1790, 722,2157, 130, 995,1569, 769,
-1485, 464, 513,2213, 288,1923,1101,2453,4316, 133, 486,2445,  50, 625, 487,2207,
-  57, 423, 481,2962, 159,3729,1558, 491, 303, 482, 501, 240,2837, 112,3648,2392,
-1783, 362,   8,3433,3422, 610,2793,3277,1390,1284,1654,  21,3823, 734, 367, 623,
- 193, 287, 374,1009,1483, 816, 476, 313,2255,2340,1262,2150,2899,1146,2581, 782,
-2116,1659,2018,1880, 255,3586,3314,1110,2867,2137,2564, 986,2767,5185,2006, 650,
- 158, 926, 762, 881,3157,2717,2362,3587, 306,3690,3245,1542,3077,2427,1691,2478,
-2118,2985,3490,2438, 539,2305, 983, 129,1754, 355,4201,2386, 827,2923, 104,1773,
-2838,2771, 411,2905,3919, 376, 767, 122,1114, 828,2422,1817,3506, 266,3460,1007,
-1609,4998, 945,2612,4429,2274, 726,1247,1964,2914,2199,2070,4002,4108, 657,3323,
-1422, 579, 455,2764,4737,1222,2895,1670, 824,1223,1487,2525, 558, 861,3080, 598,
-2659,2515,1967, 752,2583,2376,2214,4180, 977, 704,2464,4999,2622,4109,1210,2961,
- 819,1541, 142,2284,  44, 418, 457,1126,3730,4347,4626,1644,1876,3671,1864, 302,
-1063,5694, 624, 723,1984,3745,1314,1676,2488,1610,1449,3558,3569,2166,2098, 409,
-1011,2325,3704,2306, 818,1732,1383,1824,1844,3757, 999,2705,3497,1216,1423,2683,
-2426,2954,2501,2726,2229,1475,2554,5064,1971,1794,1666,2014,1343, 783, 724, 191,
-2434,1354,2220,5065,1763,2752,2472,4152, 131, 175,2885,3434,  92,1466,4920,2616,
-3871,3872,3866, 128,1551,1632, 669,1854,3682,4691,4125,1230, 188,2973,3290,1302,
-1213, 560,3266, 917, 763,3909,3249,1760, 868,1958, 764,1782,2097, 145,2277,3774,
-4462,  64,1491,3062, 971,2132,3606,2442, 221,1226,1617, 218, 323,1185,3207,3147,
- 571, 619,1473,1005,1744,2281, 449,1887,2396,3685, 275, 375,3816,1743,3844,3731,
- 845,1983,2350,4210,1377, 773, 967,3499,3052,3743,2725,4007,1697,1022,3943,1464,
-3264,2855,2722,1952,1029,2839,2467,  84,4383,2215, 820,1391,2015,2448,3672, 377,
-1948,2168, 797,2545,3536,2578,2645,  94,2874,1678, 405,1259,3071, 771, 546,1315,
- 470,1243,3083, 895,2468, 981, 969,2037, 846,4181, 653,1276,2928,  14,2594, 557,
-3007,2474, 156, 902,1338,1740,2574, 537,2518, 973,2282,2216,2433,1928, 138,2903,
-1293,2631,1612, 646,3457, 839,2935, 111, 496,2191,2847, 589,3186, 149,3994,2060,
-4031,2641,4067,3145,1870,  37,3597,2136,1025,2051,3009,3383,3549,1121,1016,3261,
-1301, 251,2446,2599,2153, 872,3246, 637, 334,3705, 831, 884, 921,3065,3140,4092,
-2198,1944, 246,2964, 108,2045,1152,1921,2308,1031, 203,3173,4170,1907,3890, 810,
-1401,2003,1690, 506, 647,1242,2828,1761,1649,3208,2249,1589,3709,2931,5156,1708,
- 498, 666,2613, 834,3817,1231, 184,2851,1124, 883,3197,2261,3710,1765,1553,2658,
-1178,2639,2351,  93,1193, 942,2538,2141,4402, 235,1821, 870,1591,2192,1709,1871,
-3341,1618,4126,2595,2334, 603, 651,  69, 701, 268,2662,3411,2555,1380,1606, 503,
- 448, 254,2371,2646, 574,1187,2309,1770, 322,2235,1292,1801, 305, 566,1133, 229,
-2067,2057, 706, 167, 483,2002,2672,3295,1820,3561,3067, 316, 378,2746,3452,1112,
- 136,1981, 507,1651,2917,1117, 285,4591, 182,2580,3522,1304, 335,3303,1835,2504,
-1795,1792,2248, 674,1018,2106,2449,1857,2292,2845, 976,3047,1781,2600,2727,1389,
-1281,  52,3152, 153, 265,3950, 672,3485,3951,4463, 430,1183, 365, 278,2169,  27,
-1407,1336,2304, 209,1340,1730,2202,1852,2403,2883, 979,1737,1062, 631,2829,2542,
-3876,2592, 825,2086,2226,3048,3625, 352,1417,3724, 542, 991, 431,1351,3938,1861,
-2294, 826,1361,2927,3142,3503,1738, 463,2462,2723, 582,1916,1595,2808, 400,3845,
-3891,2868,3621,2254,  58,2492,1123, 910,2160,2614,1372,1603,1196,1072,3385,1700,
-3267,1980, 696, 480,2430, 920, 799,1570,2920,1951,2041,4047,2540,1321,4223,2469,
-3562,2228,1271,2602, 401,2833,3351,2575,5157, 907,2312,1256, 410, 263,3507,1582,
- 996, 678,1849,2316,1480, 908,3545,2237, 703,2322, 667,1826,2849,1531,2604,2999,
-2407,3146,2151,2630,1786,3711, 469,3542, 497,3899,2409, 858, 837,4446,3393,1274,
- 786, 620,1845,2001,3311, 484, 308,3367,1204,1815,3691,2332,1532,2557,1842,2020,
-2724,1927,2333,4440, 567,  22,1673,2728,4475,1987,1858,1144,1597, 101,1832,3601,
-  12, 974,3783,4391, 951,1412,   1,3720, 453,4608,4041, 528,1041,1027,3230,2628,
-1129, 875,1051,3291,1203,2262,1069,2860,2799,2149,2615,3278, 144,1758,3040,  31,
- 475,1680, 366,2685,3184, 311,1642,4008,2466,5036,1593,1493,2809, 216,1420,1668,
- 233, 304,2128,3284, 232,1429,1768,1040,2008,3407,2740,2967,2543, 242,2133, 778,
-1565,2022,2620, 505,2189,2756,1098,2273, 372,1614, 708, 553,2846,2094,2278, 169,
-3626,2835,4161, 228,2674,3165, 809,1454,1309, 466,1705,1095, 900,3423, 880,2667,
-3751,5258,2317,3109,2571,4317,2766,1503,1342, 866,4447,1118,  63,2076, 314,1881,
-1348,1061, 172, 978,3515,1747, 532, 511,3970,   6, 601, 905,2699,3300,1751, 276,
-1467,3725,2668,  65,4239,2544,2779,2556,1604, 578,2451,1802, 992,2331,2624,1320,
-3446, 713,1513,1013, 103,2786,2447,1661, 886,1702, 916, 654,3574,2031,1556, 751,
-2178,2821,2179,1498,1538,2176, 271, 914,2251,2080,1325, 638,1953,2937,3877,2432,
-2754,  95,3265,1716, 260,1227,4083, 775, 106,1357,3254, 426,1607, 555,2480, 772,
-1985, 244,2546, 474, 495,1046,2611,1851,2061,  71,2089,1675,2590, 742,3758,2843,
-3222,1433, 267,2180,2576,2826,2233,2092,3913,2435, 956,1745,3075, 856,2113,1116,
- 451,   3,1988,2896,1398, 993,2463,1878,2049,1341,2718,2721,2870,2108, 712,2904,
-4363,2753,2324, 277,2872,2349,2649, 384, 987, 435, 691,3000, 922, 164,3939, 652,
-1500,1184,4153,2482,3373,2165,4848,2335,3775,3508,3154,2806,2830,1554,2102,1664,
-2530,1434,2408, 893,1547,2623,3447,2832,2242,2532,3169,2856,3223,2078,  49,3770,
-3469, 462, 318, 656,2259,3250,3069, 679,1629,2758, 344,1138,1104,3120,1836,1283,
-3115,2154,1437,4448, 934, 759,1999, 794,2862,1038, 533,2560,1722,2342, 855,2626,
-1197,1663,4476,3127,  85,4240,2528,  25,1111,1181,3673, 407,3470,4561,2679,2713,
- 768,1925,2841,3986,1544,1165, 932, 373,1240,2146,1930,2673, 721,4766, 354,4333,
- 391,2963, 187,  61,3364,1442,1102, 330,1940,1767, 341,3809,4118, 393,2496,2062,
-2211, 105, 331, 300, 439, 913,1332, 626, 379,3304,1557, 328, 689,3952, 309,1555,
- 931, 317,2517,3027, 325, 569, 686,2107,3084,  60,1042,1333,2794, 264,3177,4014,
-1628, 258,3712,   7,4464,1176,1043,1778, 683, 114,1975,  78,1492, 383,1886, 510,
- 386, 645,5291,2891,2069,3305,4138,3867,2939,2603,2493,1935,1066,1848,3588,1015,
-1282,1289,4609, 697,1453,3044,2666,3611,1856,2412,  54, 719,1330, 568,3778,2459,
-1748, 788, 492, 551,1191,1000, 488,3394,3763, 282,1799, 348,2016,1523,3155,2390,
-1049, 382,2019,1788,1170, 729,2968,3523, 897,3926,2785,2938,3292, 350,2319,3238,
-1718,1717,2655,3453,3143,4465, 161,2889,2980,2009,1421,  56,1908,1640,2387,2232,
-1917,1874,2477,4921, 148,  83,3438, 592,4245,2882,1822,1055, 741, 115,1496,1624,
- 381,1638,4592,1020, 516,3214, 458, 947,4575,1432, 211,1514,2926,1865,2142, 189,
- 852,1221,1400,1486, 882,2299,4036, 351,  28,1122, 700,6479,6480,6481,6482,6483,  #last 512
-)
-# fmt: on
diff --git a/src/pip/_vendor/chardet/gb2312prober.py b/src/pip/_vendor/chardet/gb2312prober.py
deleted file mode 100644
index d423e7311e2..00000000000
--- a/src/pip/_vendor/chardet/gb2312prober.py
+++ /dev/null
@@ -1,47 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .chardistribution import GB2312DistributionAnalysis
-from .codingstatemachine import CodingStateMachine
-from .mbcharsetprober import MultiByteCharSetProber
-from .mbcssm import GB2312_SM_MODEL
-
-
-class GB2312Prober(MultiByteCharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self.coding_sm = CodingStateMachine(GB2312_SM_MODEL)
-        self.distribution_analyzer = GB2312DistributionAnalysis()
-        self.reset()
-
-    @property
-    def charset_name(self) -> str:
-        return "GB2312"
-
-    @property
-    def language(self) -> str:
-        return "Chinese"
diff --git a/src/pip/_vendor/chardet/hebrewprober.py b/src/pip/_vendor/chardet/hebrewprober.py
deleted file mode 100644
index 785d0057bcc..00000000000
--- a/src/pip/_vendor/chardet/hebrewprober.py
+++ /dev/null
@@ -1,316 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-#          Shy Shalom
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import Optional, Union
-
-from .charsetprober import CharSetProber
-from .enums import ProbingState
-from .sbcharsetprober import SingleByteCharSetProber
-
-# This prober doesn't actually recognize a language or a charset.
-# It is a helper prober for the use of the Hebrew model probers
-
-### General ideas of the Hebrew charset recognition ###
-#
-# Four main charsets exist in Hebrew:
-# "ISO-8859-8" - Visual Hebrew
-# "windows-1255" - Logical Hebrew
-# "ISO-8859-8-I" - Logical Hebrew
-# "x-mac-hebrew" - ?? Logical Hebrew ??
-#
-# Both "ISO" charsets use a completely identical set of code points, whereas
-# "windows-1255" and "x-mac-hebrew" are two different proper supersets of
-# these code points. windows-1255 defines additional characters in the range
-# 0x80-0x9F as some misc punctuation marks as well as some Hebrew-specific
-# diacritics and additional 'Yiddish' ligature letters in the range 0xc0-0xd6.
-# x-mac-hebrew defines similar additional code points but with a different
-# mapping.
-#
-# As far as an average Hebrew text with no diacritics is concerned, all four
-# charsets are identical with respect to code points. Meaning that for the
-# main Hebrew alphabet, all four map the same values to all 27 Hebrew letters
-# (including final letters).
-#
-# The dominant difference between these charsets is their directionality.
-# "Visual" directionality means that the text is ordered as if the renderer is
-# not aware of a BIDI rendering algorithm. The renderer sees the text and
-# draws it from left to right. The text itself when ordered naturally is read
-# backwards. A buffer of Visual Hebrew generally looks like so:
-# "[last word of first line spelled backwards] [whole line ordered backwards
-# and spelled backwards] [first word of first line spelled backwards]
-# [end of line] [last word of second line] ... etc' "
-# adding punctuation marks, numbers and English text to visual text is
-# naturally also "visual" and from left to right.
-#
-# "Logical" directionality means the text is ordered "naturally" according to
-# the order it is read. It is the responsibility of the renderer to display
-# the text from right to left. A BIDI algorithm is used to place general
-# punctuation marks, numbers and English text in the text.
-#
-# Texts in x-mac-hebrew are almost impossible to find on the Internet. From
-# what little evidence I could find, it seems that its general directionality
-# is Logical.
-#
-# To sum up all of the above, the Hebrew probing mechanism knows about two
-# charsets:
-# Visual Hebrew - "ISO-8859-8" - backwards text - Words and sentences are
-#    backwards while line order is natural. For charset recognition purposes
-#    the line order is unimportant (In fact, for this implementation, even
-#    word order is unimportant).
-# Logical Hebrew - "windows-1255" - normal, naturally ordered text.
-#
-# "ISO-8859-8-I" is a subset of windows-1255 and doesn't need to be
-#    specifically identified.
-# "x-mac-hebrew" is also identified as windows-1255. A text in x-mac-hebrew
-#    that contain special punctuation marks or diacritics is displayed with
-#    some unconverted characters showing as question marks. This problem might
-#    be corrected using another model prober for x-mac-hebrew. Due to the fact
-#    that x-mac-hebrew texts are so rare, writing another model prober isn't
-#    worth the effort and performance hit.
-#
-#### The Prober ####
-#
-# The prober is divided between two SBCharSetProbers and a HebrewProber,
-# all of which are managed, created, fed data, inquired and deleted by the
-# SBCSGroupProber. The two SBCharSetProbers identify that the text is in
-# fact some kind of Hebrew, Logical or Visual. The final decision about which
-# one is it is made by the HebrewProber by combining final-letter scores
-# with the scores of the two SBCharSetProbers to produce a final answer.
-#
-# The SBCSGroupProber is responsible for stripping the original text of HTML
-# tags, English characters, numbers, low-ASCII punctuation characters, spaces
-# and new lines. It reduces any sequence of such characters to a single space.
-# The buffer fed to each prober in the SBCS group prober is pure text in
-# high-ASCII.
-# The two SBCharSetProbers (model probers) share the same language model:
-# Win1255Model.
-# The first SBCharSetProber uses the model normally as any other
-# SBCharSetProber does, to recognize windows-1255, upon which this model was
-# built. The second SBCharSetProber is told to make the pair-of-letter
-# lookup in the language model backwards. This in practice exactly simulates
-# a visual Hebrew model using the windows-1255 logical Hebrew model.
-#
-# The HebrewProber is not using any language model. All it does is look for
-# final-letter evidence suggesting the text is either logical Hebrew or visual
-# Hebrew. Disjointed from the model probers, the results of the HebrewProber
-# alone are meaningless. HebrewProber always returns 0.00 as confidence
-# since it never identifies a charset by itself. Instead, the pointer to the
-# HebrewProber is passed to the model probers as a helper "Name Prober".
-# When the Group prober receives a positive identification from any prober,
-# it asks for the name of the charset identified. If the prober queried is a
-# Hebrew model prober, the model prober forwards the call to the
-# HebrewProber to make the final decision. In the HebrewProber, the
-# decision is made according to the final-letters scores maintained and Both
-# model probers scores. The answer is returned in the form of the name of the
-# charset identified, either "windows-1255" or "ISO-8859-8".
-
-
-class HebrewProber(CharSetProber):
-    SPACE = 0x20
-    # windows-1255 / ISO-8859-8 code points of interest
-    FINAL_KAF = 0xEA
-    NORMAL_KAF = 0xEB
-    FINAL_MEM = 0xED
-    NORMAL_MEM = 0xEE
-    FINAL_NUN = 0xEF
-    NORMAL_NUN = 0xF0
-    FINAL_PE = 0xF3
-    NORMAL_PE = 0xF4
-    FINAL_TSADI = 0xF5
-    NORMAL_TSADI = 0xF6
-
-    # Minimum Visual vs Logical final letter score difference.
-    # If the difference is below this, don't rely solely on the final letter score
-    # distance.
-    MIN_FINAL_CHAR_DISTANCE = 5
-
-    # Minimum Visual vs Logical model score difference.
-    # If the difference is below this, don't rely at all on the model score
-    # distance.
-    MIN_MODEL_DISTANCE = 0.01
-
-    VISUAL_HEBREW_NAME = "ISO-8859-8"
-    LOGICAL_HEBREW_NAME = "windows-1255"
-
-    def __init__(self) -> None:
-        super().__init__()
-        self._final_char_logical_score = 0
-        self._final_char_visual_score = 0
-        self._prev = self.SPACE
-        self._before_prev = self.SPACE
-        self._logical_prober: Optional[SingleByteCharSetProber] = None
-        self._visual_prober: Optional[SingleByteCharSetProber] = None
-        self.reset()
-
-    def reset(self) -> None:
-        self._final_char_logical_score = 0
-        self._final_char_visual_score = 0
-        # The two last characters seen in the previous buffer,
-        # mPrev and mBeforePrev are initialized to space in order to simulate
-        # a word delimiter at the beginning of the data
-        self._prev = self.SPACE
-        self._before_prev = self.SPACE
-        # These probers are owned by the group prober.
-
-    def set_model_probers(
-        self,
-        logical_prober: SingleByteCharSetProber,
-        visual_prober: SingleByteCharSetProber,
-    ) -> None:
-        self._logical_prober = logical_prober
-        self._visual_prober = visual_prober
-
-    def is_final(self, c: int) -> bool:
-        return c in [
-            self.FINAL_KAF,
-            self.FINAL_MEM,
-            self.FINAL_NUN,
-            self.FINAL_PE,
-            self.FINAL_TSADI,
-        ]
-
-    def is_non_final(self, c: int) -> bool:
-        # The normal Tsadi is not a good Non-Final letter due to words like
-        # 'lechotet' (to chat) containing an apostrophe after the tsadi. This
-        # apostrophe is converted to a space in FilterWithoutEnglishLetters
-        # causing the Non-Final tsadi to appear at an end of a word even
-        # though this is not the case in the original text.
-        # The letters Pe and Kaf rarely display a related behavior of not being
-        # a good Non-Final letter. Words like 'Pop', 'Winamp' and 'Mubarak'
-        # for example legally end with a Non-Final Pe or Kaf. However, the
-        # benefit of these letters as Non-Final letters outweighs the damage
-        # since these words are quite rare.
-        return c in [self.NORMAL_KAF, self.NORMAL_MEM, self.NORMAL_NUN, self.NORMAL_PE]
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        # Final letter analysis for logical-visual decision.
-        # Look for evidence that the received buffer is either logical Hebrew
-        # or visual Hebrew.
-        # The following cases are checked:
-        # 1) A word longer than 1 letter, ending with a final letter. This is
-        #    an indication that the text is laid out "naturally" since the
-        #    final letter really appears at the end. +1 for logical score.
-        # 2) A word longer than 1 letter, ending with a Non-Final letter. In
-        #    normal Hebrew, words ending with Kaf, Mem, Nun, Pe or Tsadi,
-        #    should not end with the Non-Final form of that letter. Exceptions
-        #    to this rule are mentioned above in isNonFinal(). This is an
-        #    indication that the text is laid out backwards. +1 for visual
-        #    score
-        # 3) A word longer than 1 letter, starting with a final letter. Final
-        #    letters should not appear at the beginning of a word. This is an
-        #    indication that the text is laid out backwards. +1 for visual
-        #    score.
-        #
-        # The visual score and logical score are accumulated throughout the
-        # text and are finally checked against each other in GetCharSetName().
-        # No checking for final letters in the middle of words is done since
-        # that case is not an indication for either Logical or Visual text.
-        #
-        # We automatically filter out all 7-bit characters (replace them with
-        # spaces) so the word boundary detection works properly. [MAP]
-
-        if self.state == ProbingState.NOT_ME:
-            # Both model probers say it's not them. No reason to continue.
-            return ProbingState.NOT_ME
-
-        byte_str = self.filter_high_byte_only(byte_str)
-
-        for cur in byte_str:
-            if cur == self.SPACE:
-                # We stand on a space - a word just ended
-                if self._before_prev != self.SPACE:
-                    # next-to-last char was not a space so self._prev is not a
-                    # 1 letter word
-                    if self.is_final(self._prev):
-                        # case (1) [-2:not space][-1:final letter][cur:space]
-                        self._final_char_logical_score += 1
-                    elif self.is_non_final(self._prev):
-                        # case (2) [-2:not space][-1:Non-Final letter][
-                        #  cur:space]
-                        self._final_char_visual_score += 1
-            else:
-                # Not standing on a space
-                if (
-                    (self._before_prev == self.SPACE)
-                    and (self.is_final(self._prev))
-                    and (cur != self.SPACE)
-                ):
-                    # case (3) [-2:space][-1:final letter][cur:not space]
-                    self._final_char_visual_score += 1
-            self._before_prev = self._prev
-            self._prev = cur
-
-        # Forever detecting, till the end or until both model probers return
-        # ProbingState.NOT_ME (handled above)
-        return ProbingState.DETECTING
-
-    @property
-    def charset_name(self) -> str:
-        assert self._logical_prober is not None
-        assert self._visual_prober is not None
-
-        # Make the decision: is it Logical or Visual?
-        # If the final letter score distance is dominant enough, rely on it.
-        finalsub = self._final_char_logical_score - self._final_char_visual_score
-        if finalsub >= self.MIN_FINAL_CHAR_DISTANCE:
-            return self.LOGICAL_HEBREW_NAME
-        if finalsub <= -self.MIN_FINAL_CHAR_DISTANCE:
-            return self.VISUAL_HEBREW_NAME
-
-        # It's not dominant enough, try to rely on the model scores instead.
-        modelsub = (
-            self._logical_prober.get_confidence() - self._visual_prober.get_confidence()
-        )
-        if modelsub > self.MIN_MODEL_DISTANCE:
-            return self.LOGICAL_HEBREW_NAME
-        if modelsub < -self.MIN_MODEL_DISTANCE:
-            return self.VISUAL_HEBREW_NAME
-
-        # Still no good, back to final letter distance, maybe it'll save the
-        # day.
-        if finalsub < 0.0:
-            return self.VISUAL_HEBREW_NAME
-
-        # (finalsub > 0 - Logical) or (don't know what to do) default to
-        # Logical.
-        return self.LOGICAL_HEBREW_NAME
-
-    @property
-    def language(self) -> str:
-        return "Hebrew"
-
-    @property
-    def state(self) -> ProbingState:
-        assert self._logical_prober is not None
-        assert self._visual_prober is not None
-
-        # Remain active as long as any of the model probers are active.
-        if (self._logical_prober.state == ProbingState.NOT_ME) and (
-            self._visual_prober.state == ProbingState.NOT_ME
-        ):
-            return ProbingState.NOT_ME
-        return ProbingState.DETECTING
diff --git a/src/pip/_vendor/chardet/jisfreq.py b/src/pip/_vendor/chardet/jisfreq.py
deleted file mode 100644
index 3293576e012..00000000000
--- a/src/pip/_vendor/chardet/jisfreq.py
+++ /dev/null
@@ -1,325 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# Sampling from about 20M text materials include literature and computer technology
-#
-# Japanese frequency table, applied to both S-JIS and EUC-JP
-# They are sorted in order.
-
-# 128  --> 0.77094
-# 256  --> 0.85710
-# 512  --> 0.92635
-# 1024 --> 0.97130
-# 2048 --> 0.99431
-#
-# Ideal Distribution Ratio = 0.92635 / (1-0.92635) = 12.58
-# Random Distribution Ration = 512 / (2965+62+83+86-512) = 0.191
-#
-# Typical Distribution Ratio, 25% of IDR
-
-JIS_TYPICAL_DISTRIBUTION_RATIO = 3.0
-
-# Char to FreqOrder table ,
-JIS_TABLE_SIZE = 4368
-
-# fmt: off
-JIS_CHAR_TO_FREQ_ORDER = (
-  40,   1,   6, 182, 152, 180, 295,2127, 285, 381,3295,4304,3068,4606,3165,3510, #   16
-3511,1822,2785,4607,1193,2226,5070,4608, 171,2996,1247,  18, 179,5071, 856,1661, #   32
-1262,5072, 619, 127,3431,3512,3230,1899,1700, 232, 228,1294,1298, 284, 283,2041, #   48
-2042,1061,1062,  48,  49,  44,  45, 433, 434,1040,1041, 996, 787,2997,1255,4305, #   64
-2108,4609,1684,1648,5073,5074,5075,5076,5077,5078,3687,5079,4610,5080,3927,3928, #   80
-5081,3296,3432, 290,2285,1471,2187,5082,2580,2825,1303,2140,1739,1445,2691,3375, #   96
-1691,3297,4306,4307,4611, 452,3376,1182,2713,3688,3069,4308,5083,5084,5085,5086, #  112
-5087,5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102, #  128
-5103,5104,5105,5106,5107,5108,5109,5110,5111,5112,4097,5113,5114,5115,5116,5117, #  144
-5118,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,5129,5130,5131,5132,5133, #  160
-5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,5149, #  176
-5150,5151,5152,4612,5153,5154,5155,5156,5157,5158,5159,5160,5161,5162,5163,5164, #  192
-5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,1472, 598, 618, 820,1205, #  208
-1309,1412,1858,1307,1692,5176,5177,5178,5179,5180,5181,5182,1142,1452,1234,1172, #  224
-1875,2043,2149,1793,1382,2973, 925,2404,1067,1241, 960,1377,2935,1491, 919,1217, #  240
-1865,2030,1406,1499,2749,4098,5183,5184,5185,5186,5187,5188,2561,4099,3117,1804, #  256
-2049,3689,4309,3513,1663,5189,3166,3118,3298,1587,1561,3433,5190,3119,1625,2998, #  272
-3299,4613,1766,3690,2786,4614,5191,5192,5193,5194,2161,  26,3377,   2,3929,  20, #  288
-3691,  47,4100,  50,  17,  16,  35, 268,  27, 243,  42, 155,  24, 154,  29, 184, #  304
-   4,  91,  14,  92,  53, 396,  33, 289,   9,  37,  64, 620,  21,  39, 321,   5, #  320
-  12,  11,  52,  13,   3, 208, 138,   0,   7,  60, 526, 141, 151,1069, 181, 275, #  336
-1591,  83, 132,1475, 126, 331, 829,  15,  69, 160,  59,  22, 157,  55,1079, 312, #  352
- 109,  38,  23,  25,  10,  19,  79,5195,  61, 382,1124,   8,  30,5196,5197,5198, #  368
-5199,5200,5201,5202,5203,5204,5205,5206,  89,  62,  74,  34,2416, 112, 139, 196, #  384
- 271, 149,  84, 607, 131, 765,  46,  88, 153, 683,  76, 874, 101, 258,  57,  80, #  400
-  32, 364, 121,1508, 169,1547,  68, 235, 145,2999,  41, 360,3027,  70,  63,  31, #  416
-  43, 259, 262,1383,  99, 533, 194,  66,  93, 846, 217, 192,  56, 106,  58, 565, #  432
- 280, 272, 311, 256, 146,  82, 308,  71, 100, 128, 214, 655, 110, 261, 104,1140, #  448
-  54,  51,  36,  87,  67,3070, 185,2618,2936,2020,  28,1066,2390,2059,5207,5208, #  464
-5209,5210,5211,5212,5213,5214,5215,5216,4615,5217,5218,5219,5220,5221,5222,5223, #  480
-5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,5235,5236,3514,5237,5238, #  496
-5239,5240,5241,5242,5243,5244,2297,2031,4616,4310,3692,5245,3071,5246,3598,5247, #  512
-4617,3231,3515,5248,4101,4311,4618,3808,4312,4102,5249,4103,4104,3599,5250,5251, #  528
-5252,5253,5254,5255,5256,5257,5258,5259,5260,5261,5262,5263,5264,5265,5266,5267, #  544
-5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,5279,5280,5281,5282,5283, #  560
-5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,5294,5295,5296,5297,5298,5299, #  576
-5300,5301,5302,5303,5304,5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315, #  592
-5316,5317,5318,5319,5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331, #  608
-5332,5333,5334,5335,5336,5337,5338,5339,5340,5341,5342,5343,5344,5345,5346,5347, #  624
-5348,5349,5350,5351,5352,5353,5354,5355,5356,5357,5358,5359,5360,5361,5362,5363, #  640
-5364,5365,5366,5367,5368,5369,5370,5371,5372,5373,5374,5375,5376,5377,5378,5379, #  656
-5380,5381, 363, 642,2787,2878,2788,2789,2316,3232,2317,3434,2011, 165,1942,3930, #  672
-3931,3932,3933,5382,4619,5383,4620,5384,5385,5386,5387,5388,5389,5390,5391,5392, #  688
-5393,5394,5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408, #  704
-5409,5410,5411,5412,5413,5414,5415,5416,5417,5418,5419,5420,5421,5422,5423,5424, #  720
-5425,5426,5427,5428,5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,5439,5440, #  736
-5441,5442,5443,5444,5445,5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456, #  752
-5457,5458,5459,5460,5461,5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472, #  768
-5473,5474,5475,5476,5477,5478,5479,5480,5481,5482,5483,5484,5485,5486,5487,5488, #  784
-5489,5490,5491,5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504, #  800
-5505,5506,5507,5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520, #  816
-5521,5522,5523,5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536, #  832
-5537,5538,5539,5540,5541,5542,5543,5544,5545,5546,5547,5548,5549,5550,5551,5552, #  848
-5553,5554,5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568, #  864
-5569,5570,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584, #  880
-5585,5586,5587,5588,5589,5590,5591,5592,5593,5594,5595,5596,5597,5598,5599,5600, #  896
-5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,5615,5616, #  912
-5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,5632, #  928
-5633,5634,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,5647,5648, #  944
-5649,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,5661,5662,5663,5664, #  960
-5665,5666,5667,5668,5669,5670,5671,5672,5673,5674,5675,5676,5677,5678,5679,5680, #  976
-5681,5682,5683,5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,5694,5695,5696, #  992
-5697,5698,5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,5709,5710,5711,5712, # 1008
-5713,5714,5715,5716,5717,5718,5719,5720,5721,5722,5723,5724,5725,5726,5727,5728, # 1024
-5729,5730,5731,5732,5733,5734,5735,5736,5737,5738,5739,5740,5741,5742,5743,5744, # 1040
-5745,5746,5747,5748,5749,5750,5751,5752,5753,5754,5755,5756,5757,5758,5759,5760, # 1056
-5761,5762,5763,5764,5765,5766,5767,5768,5769,5770,5771,5772,5773,5774,5775,5776, # 1072
-5777,5778,5779,5780,5781,5782,5783,5784,5785,5786,5787,5788,5789,5790,5791,5792, # 1088
-5793,5794,5795,5796,5797,5798,5799,5800,5801,5802,5803,5804,5805,5806,5807,5808, # 1104
-5809,5810,5811,5812,5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824, # 1120
-5825,5826,5827,5828,5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840, # 1136
-5841,5842,5843,5844,5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856, # 1152
-5857,5858,5859,5860,5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872, # 1168
-5873,5874,5875,5876,5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888, # 1184
-5889,5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904, # 1200
-5905,5906,5907,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920, # 1216
-5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936, # 1232
-5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952, # 1248
-5953,5954,5955,5956,5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968, # 1264
-5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984, # 1280
-5985,5986,5987,5988,5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000, # 1296
-6001,6002,6003,6004,6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016, # 1312
-6017,6018,6019,6020,6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032, # 1328
-6033,6034,6035,6036,6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048, # 1344
-6049,6050,6051,6052,6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064, # 1360
-6065,6066,6067,6068,6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080, # 1376
-6081,6082,6083,6084,6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096, # 1392
-6097,6098,6099,6100,6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112, # 1408
-6113,6114,2044,2060,4621, 997,1235, 473,1186,4622, 920,3378,6115,6116, 379,1108, # 1424
-4313,2657,2735,3934,6117,3809, 636,3233, 573,1026,3693,3435,2974,3300,2298,4105, # 1440
- 854,2937,2463, 393,2581,2417, 539, 752,1280,2750,2480, 140,1161, 440, 708,1569, # 1456
- 665,2497,1746,1291,1523,3000, 164,1603, 847,1331, 537,1997, 486, 508,1693,2418, # 1472
-1970,2227, 878,1220, 299,1030, 969, 652,2751, 624,1137,3301,2619,  65,3302,2045, # 1488
-1761,1859,3120,1930,3694,3516, 663,1767, 852, 835,3695, 269, 767,2826,2339,1305, # 1504
- 896,1150, 770,1616,6118, 506,1502,2075,1012,2519, 775,2520,2975,2340,2938,4314, # 1520
-3028,2086,1224,1943,2286,6119,3072,4315,2240,1273,1987,3935,1557, 175, 597, 985, # 1536
-3517,2419,2521,1416,3029, 585, 938,1931,1007,1052,1932,1685,6120,3379,4316,4623, # 1552
- 804, 599,3121,1333,2128,2539,1159,1554,2032,3810, 687,2033,2904, 952, 675,1467, # 1568
-3436,6121,2241,1096,1786,2440,1543,1924, 980,1813,2228, 781,2692,1879, 728,1918, # 1584
-3696,4624, 548,1950,4625,1809,1088,1356,3303,2522,1944, 502, 972, 373, 513,2827, # 1600
- 586,2377,2391,1003,1976,1631,6122,2464,1084, 648,1776,4626,2141, 324, 962,2012, # 1616
-2177,2076,1384, 742,2178,1448,1173,1810, 222, 102, 301, 445, 125,2420, 662,2498, # 1632
- 277, 200,1476,1165,1068, 224,2562,1378,1446, 450,1880, 659, 791, 582,4627,2939, # 1648
-3936,1516,1274, 555,2099,3697,1020,1389,1526,3380,1762,1723,1787,2229, 412,2114, # 1664
-1900,2392,3518, 512,2597, 427,1925,2341,3122,1653,1686,2465,2499, 697, 330, 273, # 1680
- 380,2162, 951, 832, 780, 991,1301,3073, 965,2270,3519, 668,2523,2636,1286, 535, # 1696
-1407, 518, 671, 957,2658,2378, 267, 611,2197,3030,6123, 248,2299, 967,1799,2356, # 1712
- 850,1418,3437,1876,1256,1480,2828,1718,6124,6125,1755,1664,2405,6126,4628,2879, # 1728
-2829, 499,2179, 676,4629, 557,2329,2214,2090, 325,3234, 464, 811,3001, 992,2342, # 1744
-2481,1232,1469, 303,2242, 466,1070,2163, 603,1777,2091,4630,2752,4631,2714, 322, # 1760
-2659,1964,1768, 481,2188,1463,2330,2857,3600,2092,3031,2421,4632,2318,2070,1849, # 1776
-2598,4633,1302,2254,1668,1701,2422,3811,2905,3032,3123,2046,4106,1763,1694,4634, # 1792
-1604, 943,1724,1454, 917, 868,2215,1169,2940, 552,1145,1800,1228,1823,1955, 316, # 1808
-1080,2510, 361,1807,2830,4107,2660,3381,1346,1423,1134,4108,6127, 541,1263,1229, # 1824
-1148,2540, 545, 465,1833,2880,3438,1901,3074,2482, 816,3937, 713,1788,2500, 122, # 1840
-1575, 195,1451,2501,1111,6128, 859, 374,1225,2243,2483,4317, 390,1033,3439,3075, # 1856
-2524,1687, 266, 793,1440,2599, 946, 779, 802, 507, 897,1081, 528,2189,1292, 711, # 1872
-1866,1725,1167,1640, 753, 398,2661,1053, 246, 348,4318, 137,1024,3440,1600,2077, # 1888
-2129, 825,4319, 698, 238, 521, 187,2300,1157,2423,1641,1605,1464,1610,1097,2541, # 1904
-1260,1436, 759,2255,1814,2150, 705,3235, 409,2563,3304, 561,3033,2005,2564, 726, # 1920
-1956,2343,3698,4109, 949,3812,3813,3520,1669, 653,1379,2525, 881,2198, 632,2256, # 1936
-1027, 778,1074, 733,1957, 514,1481,2466, 554,2180, 702,3938,1606,1017,1398,6129, # 1952
-1380,3521, 921, 993,1313, 594, 449,1489,1617,1166, 768,1426,1360, 495,1794,3601, # 1968
-1177,3602,1170,4320,2344, 476, 425,3167,4635,3168,1424, 401,2662,1171,3382,1998, # 1984
-1089,4110, 477,3169, 474,6130,1909, 596,2831,1842, 494, 693,1051,1028,1207,3076, # 2000
- 606,2115, 727,2790,1473,1115, 743,3522, 630, 805,1532,4321,2021, 366,1057, 838, # 2016
- 684,1114,2142,4322,2050,1492,1892,1808,2271,3814,2424,1971,1447,1373,3305,1090, # 2032
-1536,3939,3523,3306,1455,2199, 336, 369,2331,1035, 584,2393, 902, 718,2600,6131, # 2048
-2753, 463,2151,1149,1611,2467, 715,1308,3124,1268, 343,1413,3236,1517,1347,2663, # 2064
-2093,3940,2022,1131,1553,2100,2941,1427,3441,2942,1323,2484,6132,1980, 872,2368, # 2080
-2441,2943, 320,2369,2116,1082, 679,1933,3941,2791,3815, 625,1143,2023, 422,2200, # 2096
-3816,6133, 730,1695, 356,2257,1626,2301,2858,2637,1627,1778, 937, 883,2906,2693, # 2112
-3002,1769,1086, 400,1063,1325,3307,2792,4111,3077, 456,2345,1046, 747,6134,1524, # 2128
- 884,1094,3383,1474,2164,1059, 974,1688,2181,2258,1047, 345,1665,1187, 358, 875, # 2144
-3170, 305, 660,3524,2190,1334,1135,3171,1540,1649,2542,1527, 927, 968,2793, 885, # 2160
-1972,1850, 482, 500,2638,1218,1109,1085,2543,1654,2034, 876,  78,2287,1482,1277, # 2176
- 861,1675,1083,1779, 724,2754, 454, 397,1132,1612,2332, 893, 672,1237, 257,2259, # 2192
-2370, 135,3384, 337,2244, 547, 352, 340, 709,2485,1400, 788,1138,2511, 540, 772, # 2208
-1682,2260,2272,2544,2013,1843,1902,4636,1999,1562,2288,4637,2201,1403,1533, 407, # 2224
- 576,3308,1254,2071, 978,3385, 170, 136,1201,3125,2664,3172,2394, 213, 912, 873, # 2240
-3603,1713,2202, 699,3604,3699, 813,3442, 493, 531,1054, 468,2907,1483, 304, 281, # 2256
-4112,1726,1252,2094, 339,2319,2130,2639, 756,1563,2944, 748, 571,2976,1588,2425, # 2272
-2715,1851,1460,2426,1528,1392,1973,3237, 288,3309, 685,3386, 296, 892,2716,2216, # 2288
-1570,2245, 722,1747,2217, 905,3238,1103,6135,1893,1441,1965, 251,1805,2371,3700, # 2304
-2601,1919,1078,  75,2182,1509,1592,1270,2640,4638,2152,6136,3310,3817, 524, 706, # 2320
-1075, 292,3818,1756,2602, 317,  98,3173,3605,3525,1844,2218,3819,2502, 814, 567, # 2336
- 385,2908,1534,6137, 534,1642,3239, 797,6138,1670,1529, 953,4323, 188,1071, 538, # 2352
- 178, 729,3240,2109,1226,1374,2000,2357,2977, 731,2468,1116,2014,2051,6139,1261, # 2368
-1593, 803,2859,2736,3443, 556, 682, 823,1541,6140,1369,2289,1706,2794, 845, 462, # 2384
-2603,2665,1361, 387, 162,2358,1740, 739,1770,1720,1304,1401,3241,1049, 627,1571, # 2400
-2427,3526,1877,3942,1852,1500, 431,1910,1503, 677, 297,2795, 286,1433,1038,1198, # 2416
-2290,1133,1596,4113,4639,2469,1510,1484,3943,6141,2442, 108, 712,4640,2372, 866, # 2432
-3701,2755,3242,1348, 834,1945,1408,3527,2395,3243,1811, 824, 994,1179,2110,1548, # 2448
-1453, 790,3003, 690,4324,4325,2832,2909,3820,1860,3821, 225,1748, 310, 346,1780, # 2464
-2470, 821,1993,2717,2796, 828, 877,3528,2860,2471,1702,2165,2910,2486,1789, 453, # 2480
- 359,2291,1676,  73,1164,1461,1127,3311, 421, 604, 314,1037, 589, 116,2487, 737, # 2496
- 837,1180, 111, 244, 735,6142,2261,1861,1362, 986, 523, 418, 581,2666,3822, 103, # 2512
- 855, 503,1414,1867,2488,1091, 657,1597, 979, 605,1316,4641,1021,2443,2078,2001, # 2528
-1209,  96, 587,2166,1032, 260,1072,2153, 173,  94, 226,3244, 819,2006,4642,4114, # 2544
-2203, 231,1744, 782,  97,2667, 786,3387, 887, 391, 442,2219,4326,1425,6143,2694, # 2560
- 633,1544,1202, 483,2015, 592,2052,1958,2472,1655, 419, 129,4327,3444,3312,1714, # 2576
-1257,3078,4328,1518,1098, 865,1310,1019,1885,1512,1734, 469,2444, 148, 773, 436, # 2592
-1815,1868,1128,1055,4329,1245,2756,3445,2154,1934,1039,4643, 579,1238, 932,2320, # 2608
- 353, 205, 801, 115,2428, 944,2321,1881, 399,2565,1211, 678, 766,3944, 335,2101, # 2624
-1459,1781,1402,3945,2737,2131,1010, 844, 981,1326,1013, 550,1816,1545,2620,1335, # 2640
-1008, 371,2881, 936,1419,1613,3529,1456,1395,2273,1834,2604,1317,2738,2503, 416, # 2656
-1643,4330, 806,1126, 229, 591,3946,1314,1981,1576,1837,1666, 347,1790, 977,3313, # 2672
- 764,2861,1853, 688,2429,1920,1462,  77, 595, 415,2002,3034, 798,1192,4115,6144, # 2688
-2978,4331,3035,2695,2582,2072,2566, 430,2430,1727, 842,1396,3947,3702, 613, 377, # 2704
- 278, 236,1417,3388,3314,3174, 757,1869, 107,3530,6145,1194, 623,2262, 207,1253, # 2720
-2167,3446,3948, 492,1117,1935, 536,1838,2757,1246,4332, 696,2095,2406,1393,1572, # 2736
-3175,1782, 583, 190, 253,1390,2230, 830,3126,3389, 934,3245,1703,1749,2979,1870, # 2752
-2545,1656,2204, 869,2346,4116,3176,1817, 496,1764,4644, 942,1504, 404,1903,1122, # 2768
-1580,3606,2945,1022, 515, 372,1735, 955,2431,3036,6146,2797,1110,2302,2798, 617, # 2784
-6147, 441, 762,1771,3447,3607,3608,1904, 840,3037,  86, 939,1385, 572,1370,2445, # 2800
-1336, 114,3703, 898, 294, 203,3315, 703,1583,2274, 429, 961,4333,1854,1951,3390, # 2816
-2373,3704,4334,1318,1381, 966,1911,2322,1006,1155, 309, 989, 458,2718,1795,1372, # 2832
-1203, 252,1689,1363,3177, 517,1936, 168,1490, 562, 193,3823,1042,4117,1835, 551, # 2848
- 470,4645, 395, 489,3448,1871,1465,2583,2641, 417,1493, 279,1295, 511,1236,1119, # 2864
-  72,1231,1982,1812,3004, 871,1564, 984,3449,1667,2696,2096,4646,2347,2833,1673, # 2880
-3609, 695,3246,2668, 807,1183,4647, 890, 388,2333,1801,1457,2911,1765,1477,1031, # 2896
-3316,3317,1278,3391,2799,2292,2526, 163,3450,4335,2669,1404,1802,6148,2323,2407, # 2912
-1584,1728,1494,1824,1269, 298, 909,3318,1034,1632, 375, 776,1683,2061, 291, 210, # 2928
-1123, 809,1249,1002,2642,3038, 206,1011,2132, 144, 975, 882,1565, 342, 667, 754, # 2944
-1442,2143,1299,2303,2062, 447, 626,2205,1221,2739,2912,1144,1214,2206,2584, 760, # 2960
-1715, 614, 950,1281,2670,2621, 810, 577,1287,2546,4648, 242,2168, 250,2643, 691, # 2976
- 123,2644, 647, 313,1029, 689,1357,2946,1650, 216, 771,1339,1306, 808,2063, 549, # 2992
- 913,1371,2913,2914,6149,1466,1092,1174,1196,1311,2605,2396,1783,1796,3079, 406, # 3008
-2671,2117,3949,4649, 487,1825,2220,6150,2915, 448,2348,1073,6151,2397,1707, 130, # 3024
- 900,1598, 329, 176,1959,2527,1620,6152,2275,4336,3319,1983,2191,3705,3610,2155, # 3040
-3706,1912,1513,1614,6153,1988, 646, 392,2304,1589,3320,3039,1826,1239,1352,1340, # 3056
-2916, 505,2567,1709,1437,2408,2547, 906,6154,2672, 384,1458,1594,1100,1329, 710, # 3072
- 423,3531,2064,2231,2622,1989,2673,1087,1882, 333, 841,3005,1296,2882,2379, 580, # 3088
-1937,1827,1293,2585, 601, 574, 249,1772,4118,2079,1120, 645, 901,1176,1690, 795, # 3104
-2207, 478,1434, 516,1190,1530, 761,2080, 930,1264, 355, 435,1552, 644,1791, 987, # 3120
- 220,1364,1163,1121,1538, 306,2169,1327,1222, 546,2645, 218, 241, 610,1704,3321, # 3136
-1984,1839,1966,2528, 451,6155,2586,3707,2568, 907,3178, 254,2947, 186,1845,4650, # 3152
- 745, 432,1757, 428,1633, 888,2246,2221,2489,3611,2118,1258,1265, 956,3127,1784, # 3168
-4337,2490, 319, 510, 119, 457,3612, 274,2035,2007,4651,1409,3128, 970,2758, 590, # 3184
-2800, 661,2247,4652,2008,3950,1420,1549,3080,3322,3951,1651,1375,2111, 485,2491, # 3200
-1429,1156,6156,2548,2183,1495, 831,1840,2529,2446, 501,1657, 307,1894,3247,1341, # 3216
- 666, 899,2156,1539,2549,1559, 886, 349,2208,3081,2305,1736,3824,2170,2759,1014, # 3232
-1913,1386, 542,1397,2948, 490, 368, 716, 362, 159, 282,2569,1129,1658,1288,1750, # 3248
-2674, 276, 649,2016, 751,1496, 658,1818,1284,1862,2209,2087,2512,3451, 622,2834, # 3264
- 376, 117,1060,2053,1208,1721,1101,1443, 247,1250,3179,1792,3952,2760,2398,3953, # 3280
-6157,2144,3708, 446,2432,1151,2570,3452,2447,2761,2835,1210,2448,3082, 424,2222, # 3296
-1251,2449,2119,2836, 504,1581,4338, 602, 817, 857,3825,2349,2306, 357,3826,1470, # 3312
-1883,2883, 255, 958, 929,2917,3248, 302,4653,1050,1271,1751,2307,1952,1430,2697, # 3328
-2719,2359, 354,3180, 777, 158,2036,4339,1659,4340,4654,2308,2949,2248,1146,2232, # 3344
-3532,2720,1696,2623,3827,6158,3129,1550,2698,1485,1297,1428, 637, 931,2721,2145, # 3360
- 914,2550,2587,  81,2450, 612, 827,2646,1242,4655,1118,2884, 472,1855,3181,3533, # 3376
-3534, 569,1353,2699,1244,1758,2588,4119,2009,2762,2171,3709,1312,1531,6159,1152, # 3392
-1938, 134,1830, 471,3710,2276,1112,1535,3323,3453,3535, 982,1337,2950, 488, 826, # 3408
- 674,1058,1628,4120,2017, 522,2399, 211, 568,1367,3454, 350, 293,1872,1139,3249, # 3424
-1399,1946,3006,1300,2360,3324, 588, 736,6160,2606, 744, 669,3536,3828,6161,1358, # 3440
- 199, 723, 848, 933, 851,1939,1505,1514,1338,1618,1831,4656,1634,3613, 443,2740, # 3456
-3829, 717,1947, 491,1914,6162,2551,1542,4121,1025,6163,1099,1223, 198,3040,2722, # 3472
- 370, 410,1905,2589, 998,1248,3182,2380, 519,1449,4122,1710, 947, 928,1153,4341, # 3488
-2277, 344,2624,1511, 615, 105, 161,1212,1076,1960,3130,2054,1926,1175,1906,2473, # 3504
- 414,1873,2801,6164,2309, 315,1319,3325, 318,2018,2146,2157, 963, 631, 223,4342, # 3520
-4343,2675, 479,3711,1197,2625,3712,2676,2361,6165,4344,4123,6166,2451,3183,1886, # 3536
-2184,1674,1330,1711,1635,1506, 799, 219,3250,3083,3954,1677,3713,3326,2081,3614, # 3552
-1652,2073,4657,1147,3041,1752, 643,1961, 147,1974,3955,6167,1716,2037, 918,3007, # 3568
-1994, 120,1537, 118, 609,3184,4345, 740,3455,1219, 332,1615,3830,6168,1621,2980, # 3584
-1582, 783, 212, 553,2350,3714,1349,2433,2082,4124, 889,6169,2310,1275,1410, 973, # 3600
- 166,1320,3456,1797,1215,3185,2885,1846,2590,2763,4658, 629, 822,3008, 763, 940, # 3616
-1990,2862, 439,2409,1566,1240,1622, 926,1282,1907,2764, 654,2210,1607, 327,1130, # 3632
-3956,1678,1623,6170,2434,2192, 686, 608,3831,3715, 903,3957,3042,6171,2741,1522, # 3648
-1915,1105,1555,2552,1359, 323,3251,4346,3457, 738,1354,2553,2311,2334,1828,2003, # 3664
-3832,1753,2351,1227,6172,1887,4125,1478,6173,2410,1874,1712,1847, 520,1204,2607, # 3680
- 264,4659, 836,2677,2102, 600,4660,3833,2278,3084,6174,4347,3615,1342, 640, 532, # 3696
- 543,2608,1888,2400,2591,1009,4348,1497, 341,1737,3616,2723,1394, 529,3252,1321, # 3712
- 983,4661,1515,2120, 971,2592, 924, 287,1662,3186,4349,2700,4350,1519, 908,1948, # 3728
-2452, 156, 796,1629,1486,2223,2055, 694,4126,1259,1036,3392,1213,2249,2742,1889, # 3744
-1230,3958,1015, 910, 408, 559,3617,4662, 746, 725, 935,4663,3959,3009,1289, 563, # 3760
- 867,4664,3960,1567,2981,2038,2626, 988,2263,2381,4351, 143,2374, 704,1895,6175, # 3776
-1188,3716,2088, 673,3085,2362,4352, 484,1608,1921,2765,2918, 215, 904,3618,3537, # 3792
- 894, 509, 976,3043,2701,3961,4353,2837,2982, 498,6176,6177,1102,3538,1332,3393, # 3808
-1487,1636,1637, 233, 245,3962, 383, 650, 995,3044, 460,1520,1206,2352, 749,3327, # 3824
- 530, 700, 389,1438,1560,1773,3963,2264, 719,2951,2724,3834, 870,1832,1644,1000, # 3840
- 839,2474,3717, 197,1630,3394, 365,2886,3964,1285,2133, 734, 922, 818,1106, 732, # 3856
- 480,2083,1774,3458, 923,2279,1350, 221,3086,  85,2233,2234,3835,1585,3010,2147, # 3872
-1387,1705,2382,1619,2475, 133, 239,2802,1991,1016,2084,2383, 411,2838,1113, 651, # 3888
-1985,1160,3328, 990,1863,3087,1048,1276,2647, 265,2627,1599,3253,2056, 150, 638, # 3904
-2019, 656, 853, 326,1479, 680,1439,4354,1001,1759, 413,3459,3395,2492,1431, 459, # 3920
-4355,1125,3329,2265,1953,1450,2065,2863, 849, 351,2678,3131,3254,3255,1104,1577, # 3936
- 227,1351,1645,2453,2193,1421,2887, 812,2121, 634,  95,2435, 201,2312,4665,1646, # 3952
-1671,2743,1601,2554,2702,2648,2280,1315,1366,2089,3132,1573,3718,3965,1729,1189, # 3968
- 328,2679,1077,1940,1136, 558,1283, 964,1195, 621,2074,1199,1743,3460,3619,1896, # 3984
-1916,1890,3836,2952,1154,2112,1064, 862, 378,3011,2066,2113,2803,1568,2839,6178, # 4000
-3088,2919,1941,1660,2004,1992,2194, 142, 707,1590,1708,1624,1922,1023,1836,1233, # 4016
-1004,2313, 789, 741,3620,6179,1609,2411,1200,4127,3719,3720,4666,2057,3721, 593, # 4032
-2840, 367,2920,1878,6180,3461,1521, 628,1168, 692,2211,2649, 300, 720,2067,2571, # 4048
-2953,3396, 959,2504,3966,3539,3462,1977, 701,6181, 954,1043, 800, 681, 183,3722, # 4064
-1803,1730,3540,4128,2103, 815,2314, 174, 467, 230,2454,1093,2134, 755,3541,3397, # 4080
-1141,1162,6182,1738,2039, 270,3256,2513,1005,1647,2185,3837, 858,1679,1897,1719, # 4096
-2954,2324,1806, 402, 670, 167,4129,1498,2158,2104, 750,6183, 915, 189,1680,1551, # 4112
- 455,4356,1501,2455, 405,1095,2955, 338,1586,1266,1819, 570, 641,1324, 237,1556, # 4128
-2650,1388,3723,6184,1368,2384,1343,1978,3089,2436, 879,3724, 792,1191, 758,3012, # 4144
-1411,2135,1322,4357, 240,4667,1848,3725,1574,6185, 420,3045,1546,1391, 714,4358, # 4160
-1967, 941,1864, 863, 664, 426, 560,1731,2680,1785,2864,1949,2363, 403,3330,1415, # 4176
-1279,2136,1697,2335, 204, 721,2097,3838,  90,6186,2085,2505, 191,3967, 124,2148, # 4192
-1376,1798,1178,1107,1898,1405, 860,4359,1243,1272,2375,2983,1558,2456,1638, 113, # 4208
-3621, 578,1923,2609, 880, 386,4130, 784,2186,2266,1422,2956,2172,1722, 497, 263, # 4224
-2514,1267,2412,2610, 177,2703,3542, 774,1927,1344, 616,1432,1595,1018, 172,4360, # 4240
-2325, 911,4361, 438,1468,3622, 794,3968,2024,2173,1681,1829,2957, 945, 895,3090, # 4256
- 575,2212,2476, 475,2401,2681, 785,2744,1745,2293,2555,1975,3133,2865, 394,4668, # 4272
-3839, 635,4131, 639, 202,1507,2195,2766,1345,1435,2572,3726,1908,1184,1181,2457, # 4288
-3727,3134,4362, 843,2611, 437, 916,4669, 234, 769,1884,3046,3047,3623, 833,6187, # 4304
-1639,2250,2402,1355,1185,2010,2047, 999, 525,1732,1290,1488,2612, 948,1578,3728, # 4320
-2413,2477,1216,2725,2159, 334,3840,1328,3624,2921,1525,4132, 564,1056, 891,4363, # 4336
-1444,1698,2385,2251,3729,1365,2281,2235,1717,6188, 864,3841,2515, 444, 527,2767, # 4352
-2922,3625, 544, 461,6189, 566, 209,2437,3398,2098,1065,2068,3331,3626,3257,2137, # 4368  #last 512
-)
-# fmt: on
diff --git a/src/pip/_vendor/chardet/johabfreq.py b/src/pip/_vendor/chardet/johabfreq.py
deleted file mode 100644
index c12969990d7..00000000000
--- a/src/pip/_vendor/chardet/johabfreq.py
+++ /dev/null
@@ -1,2382 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-# The frequency data itself is the same as euc-kr.
-# This is just a mapping table to euc-kr.
-
-JOHAB_TO_EUCKR_ORDER_TABLE = {
-    0x8861: 0,
-    0x8862: 1,
-    0x8865: 2,
-    0x8868: 3,
-    0x8869: 4,
-    0x886A: 5,
-    0x886B: 6,
-    0x8871: 7,
-    0x8873: 8,
-    0x8874: 9,
-    0x8875: 10,
-    0x8876: 11,
-    0x8877: 12,
-    0x8878: 13,
-    0x8879: 14,
-    0x887B: 15,
-    0x887C: 16,
-    0x887D: 17,
-    0x8881: 18,
-    0x8882: 19,
-    0x8885: 20,
-    0x8889: 21,
-    0x8891: 22,
-    0x8893: 23,
-    0x8895: 24,
-    0x8896: 25,
-    0x8897: 26,
-    0x88A1: 27,
-    0x88A2: 28,
-    0x88A5: 29,
-    0x88A9: 30,
-    0x88B5: 31,
-    0x88B7: 32,
-    0x88C1: 33,
-    0x88C5: 34,
-    0x88C9: 35,
-    0x88E1: 36,
-    0x88E2: 37,
-    0x88E5: 38,
-    0x88E8: 39,
-    0x88E9: 40,
-    0x88EB: 41,
-    0x88F1: 42,
-    0x88F3: 43,
-    0x88F5: 44,
-    0x88F6: 45,
-    0x88F7: 46,
-    0x88F8: 47,
-    0x88FB: 48,
-    0x88FC: 49,
-    0x88FD: 50,
-    0x8941: 51,
-    0x8945: 52,
-    0x8949: 53,
-    0x8951: 54,
-    0x8953: 55,
-    0x8955: 56,
-    0x8956: 57,
-    0x8957: 58,
-    0x8961: 59,
-    0x8962: 60,
-    0x8963: 61,
-    0x8965: 62,
-    0x8968: 63,
-    0x8969: 64,
-    0x8971: 65,
-    0x8973: 66,
-    0x8975: 67,
-    0x8976: 68,
-    0x8977: 69,
-    0x897B: 70,
-    0x8981: 71,
-    0x8985: 72,
-    0x8989: 73,
-    0x8993: 74,
-    0x8995: 75,
-    0x89A1: 76,
-    0x89A2: 77,
-    0x89A5: 78,
-    0x89A8: 79,
-    0x89A9: 80,
-    0x89AB: 81,
-    0x89AD: 82,
-    0x89B0: 83,
-    0x89B1: 84,
-    0x89B3: 85,
-    0x89B5: 86,
-    0x89B7: 87,
-    0x89B8: 88,
-    0x89C1: 89,
-    0x89C2: 90,
-    0x89C5: 91,
-    0x89C9: 92,
-    0x89CB: 93,
-    0x89D1: 94,
-    0x89D3: 95,
-    0x89D5: 96,
-    0x89D7: 97,
-    0x89E1: 98,
-    0x89E5: 99,
-    0x89E9: 100,
-    0x89F3: 101,
-    0x89F6: 102,
-    0x89F7: 103,
-    0x8A41: 104,
-    0x8A42: 105,
-    0x8A45: 106,
-    0x8A49: 107,
-    0x8A51: 108,
-    0x8A53: 109,
-    0x8A55: 110,
-    0x8A57: 111,
-    0x8A61: 112,
-    0x8A65: 113,
-    0x8A69: 114,
-    0x8A73: 115,
-    0x8A75: 116,
-    0x8A81: 117,
-    0x8A82: 118,
-    0x8A85: 119,
-    0x8A88: 120,
-    0x8A89: 121,
-    0x8A8A: 122,
-    0x8A8B: 123,
-    0x8A90: 124,
-    0x8A91: 125,
-    0x8A93: 126,
-    0x8A95: 127,
-    0x8A97: 128,
-    0x8A98: 129,
-    0x8AA1: 130,
-    0x8AA2: 131,
-    0x8AA5: 132,
-    0x8AA9: 133,
-    0x8AB6: 134,
-    0x8AB7: 135,
-    0x8AC1: 136,
-    0x8AD5: 137,
-    0x8AE1: 138,
-    0x8AE2: 139,
-    0x8AE5: 140,
-    0x8AE9: 141,
-    0x8AF1: 142,
-    0x8AF3: 143,
-    0x8AF5: 144,
-    0x8B41: 145,
-    0x8B45: 146,
-    0x8B49: 147,
-    0x8B61: 148,
-    0x8B62: 149,
-    0x8B65: 150,
-    0x8B68: 151,
-    0x8B69: 152,
-    0x8B6A: 153,
-    0x8B71: 154,
-    0x8B73: 155,
-    0x8B75: 156,
-    0x8B77: 157,
-    0x8B81: 158,
-    0x8BA1: 159,
-    0x8BA2: 160,
-    0x8BA5: 161,
-    0x8BA8: 162,
-    0x8BA9: 163,
-    0x8BAB: 164,
-    0x8BB1: 165,
-    0x8BB3: 166,
-    0x8BB5: 167,
-    0x8BB7: 168,
-    0x8BB8: 169,
-    0x8BBC: 170,
-    0x8C61: 171,
-    0x8C62: 172,
-    0x8C63: 173,
-    0x8C65: 174,
-    0x8C69: 175,
-    0x8C6B: 176,
-    0x8C71: 177,
-    0x8C73: 178,
-    0x8C75: 179,
-    0x8C76: 180,
-    0x8C77: 181,
-    0x8C7B: 182,
-    0x8C81: 183,
-    0x8C82: 184,
-    0x8C85: 185,
-    0x8C89: 186,
-    0x8C91: 187,
-    0x8C93: 188,
-    0x8C95: 189,
-    0x8C96: 190,
-    0x8C97: 191,
-    0x8CA1: 192,
-    0x8CA2: 193,
-    0x8CA9: 194,
-    0x8CE1: 195,
-    0x8CE2: 196,
-    0x8CE3: 197,
-    0x8CE5: 198,
-    0x8CE9: 199,
-    0x8CF1: 200,
-    0x8CF3: 201,
-    0x8CF5: 202,
-    0x8CF6: 203,
-    0x8CF7: 204,
-    0x8D41: 205,
-    0x8D42: 206,
-    0x8D45: 207,
-    0x8D51: 208,
-    0x8D55: 209,
-    0x8D57: 210,
-    0x8D61: 211,
-    0x8D65: 212,
-    0x8D69: 213,
-    0x8D75: 214,
-    0x8D76: 215,
-    0x8D7B: 216,
-    0x8D81: 217,
-    0x8DA1: 218,
-    0x8DA2: 219,
-    0x8DA5: 220,
-    0x8DA7: 221,
-    0x8DA9: 222,
-    0x8DB1: 223,
-    0x8DB3: 224,
-    0x8DB5: 225,
-    0x8DB7: 226,
-    0x8DB8: 227,
-    0x8DB9: 228,
-    0x8DC1: 229,
-    0x8DC2: 230,
-    0x8DC9: 231,
-    0x8DD6: 232,
-    0x8DD7: 233,
-    0x8DE1: 234,
-    0x8DE2: 235,
-    0x8DF7: 236,
-    0x8E41: 237,
-    0x8E45: 238,
-    0x8E49: 239,
-    0x8E51: 240,
-    0x8E53: 241,
-    0x8E57: 242,
-    0x8E61: 243,
-    0x8E81: 244,
-    0x8E82: 245,
-    0x8E85: 246,
-    0x8E89: 247,
-    0x8E90: 248,
-    0x8E91: 249,
-    0x8E93: 250,
-    0x8E95: 251,
-    0x8E97: 252,
-    0x8E98: 253,
-    0x8EA1: 254,
-    0x8EA9: 255,
-    0x8EB6: 256,
-    0x8EB7: 257,
-    0x8EC1: 258,
-    0x8EC2: 259,
-    0x8EC5: 260,
-    0x8EC9: 261,
-    0x8ED1: 262,
-    0x8ED3: 263,
-    0x8ED6: 264,
-    0x8EE1: 265,
-    0x8EE5: 266,
-    0x8EE9: 267,
-    0x8EF1: 268,
-    0x8EF3: 269,
-    0x8F41: 270,
-    0x8F61: 271,
-    0x8F62: 272,
-    0x8F65: 273,
-    0x8F67: 274,
-    0x8F69: 275,
-    0x8F6B: 276,
-    0x8F70: 277,
-    0x8F71: 278,
-    0x8F73: 279,
-    0x8F75: 280,
-    0x8F77: 281,
-    0x8F7B: 282,
-    0x8FA1: 283,
-    0x8FA2: 284,
-    0x8FA5: 285,
-    0x8FA9: 286,
-    0x8FB1: 287,
-    0x8FB3: 288,
-    0x8FB5: 289,
-    0x8FB7: 290,
-    0x9061: 291,
-    0x9062: 292,
-    0x9063: 293,
-    0x9065: 294,
-    0x9068: 295,
-    0x9069: 296,
-    0x906A: 297,
-    0x906B: 298,
-    0x9071: 299,
-    0x9073: 300,
-    0x9075: 301,
-    0x9076: 302,
-    0x9077: 303,
-    0x9078: 304,
-    0x9079: 305,
-    0x907B: 306,
-    0x907D: 307,
-    0x9081: 308,
-    0x9082: 309,
-    0x9085: 310,
-    0x9089: 311,
-    0x9091: 312,
-    0x9093: 313,
-    0x9095: 314,
-    0x9096: 315,
-    0x9097: 316,
-    0x90A1: 317,
-    0x90A2: 318,
-    0x90A5: 319,
-    0x90A9: 320,
-    0x90B1: 321,
-    0x90B7: 322,
-    0x90E1: 323,
-    0x90E2: 324,
-    0x90E4: 325,
-    0x90E5: 326,
-    0x90E9: 327,
-    0x90EB: 328,
-    0x90EC: 329,
-    0x90F1: 330,
-    0x90F3: 331,
-    0x90F5: 332,
-    0x90F6: 333,
-    0x90F7: 334,
-    0x90FD: 335,
-    0x9141: 336,
-    0x9142: 337,
-    0x9145: 338,
-    0x9149: 339,
-    0x9151: 340,
-    0x9153: 341,
-    0x9155: 342,
-    0x9156: 343,
-    0x9157: 344,
-    0x9161: 345,
-    0x9162: 346,
-    0x9165: 347,
-    0x9169: 348,
-    0x9171: 349,
-    0x9173: 350,
-    0x9176: 351,
-    0x9177: 352,
-    0x917A: 353,
-    0x9181: 354,
-    0x9185: 355,
-    0x91A1: 356,
-    0x91A2: 357,
-    0x91A5: 358,
-    0x91A9: 359,
-    0x91AB: 360,
-    0x91B1: 361,
-    0x91B3: 362,
-    0x91B5: 363,
-    0x91B7: 364,
-    0x91BC: 365,
-    0x91BD: 366,
-    0x91C1: 367,
-    0x91C5: 368,
-    0x91C9: 369,
-    0x91D6: 370,
-    0x9241: 371,
-    0x9245: 372,
-    0x9249: 373,
-    0x9251: 374,
-    0x9253: 375,
-    0x9255: 376,
-    0x9261: 377,
-    0x9262: 378,
-    0x9265: 379,
-    0x9269: 380,
-    0x9273: 381,
-    0x9275: 382,
-    0x9277: 383,
-    0x9281: 384,
-    0x9282: 385,
-    0x9285: 386,
-    0x9288: 387,
-    0x9289: 388,
-    0x9291: 389,
-    0x9293: 390,
-    0x9295: 391,
-    0x9297: 392,
-    0x92A1: 393,
-    0x92B6: 394,
-    0x92C1: 395,
-    0x92E1: 396,
-    0x92E5: 397,
-    0x92E9: 398,
-    0x92F1: 399,
-    0x92F3: 400,
-    0x9341: 401,
-    0x9342: 402,
-    0x9349: 403,
-    0x9351: 404,
-    0x9353: 405,
-    0x9357: 406,
-    0x9361: 407,
-    0x9362: 408,
-    0x9365: 409,
-    0x9369: 410,
-    0x936A: 411,
-    0x936B: 412,
-    0x9371: 413,
-    0x9373: 414,
-    0x9375: 415,
-    0x9377: 416,
-    0x9378: 417,
-    0x937C: 418,
-    0x9381: 419,
-    0x9385: 420,
-    0x9389: 421,
-    0x93A1: 422,
-    0x93A2: 423,
-    0x93A5: 424,
-    0x93A9: 425,
-    0x93AB: 426,
-    0x93B1: 427,
-    0x93B3: 428,
-    0x93B5: 429,
-    0x93B7: 430,
-    0x93BC: 431,
-    0x9461: 432,
-    0x9462: 433,
-    0x9463: 434,
-    0x9465: 435,
-    0x9468: 436,
-    0x9469: 437,
-    0x946A: 438,
-    0x946B: 439,
-    0x946C: 440,
-    0x9470: 441,
-    0x9471: 442,
-    0x9473: 443,
-    0x9475: 444,
-    0x9476: 445,
-    0x9477: 446,
-    0x9478: 447,
-    0x9479: 448,
-    0x947D: 449,
-    0x9481: 450,
-    0x9482: 451,
-    0x9485: 452,
-    0x9489: 453,
-    0x9491: 454,
-    0x9493: 455,
-    0x9495: 456,
-    0x9496: 457,
-    0x9497: 458,
-    0x94A1: 459,
-    0x94E1: 460,
-    0x94E2: 461,
-    0x94E3: 462,
-    0x94E5: 463,
-    0x94E8: 464,
-    0x94E9: 465,
-    0x94EB: 466,
-    0x94EC: 467,
-    0x94F1: 468,
-    0x94F3: 469,
-    0x94F5: 470,
-    0x94F7: 471,
-    0x94F9: 472,
-    0x94FC: 473,
-    0x9541: 474,
-    0x9542: 475,
-    0x9545: 476,
-    0x9549: 477,
-    0x9551: 478,
-    0x9553: 479,
-    0x9555: 480,
-    0x9556: 481,
-    0x9557: 482,
-    0x9561: 483,
-    0x9565: 484,
-    0x9569: 485,
-    0x9576: 486,
-    0x9577: 487,
-    0x9581: 488,
-    0x9585: 489,
-    0x95A1: 490,
-    0x95A2: 491,
-    0x95A5: 492,
-    0x95A8: 493,
-    0x95A9: 494,
-    0x95AB: 495,
-    0x95AD: 496,
-    0x95B1: 497,
-    0x95B3: 498,
-    0x95B5: 499,
-    0x95B7: 500,
-    0x95B9: 501,
-    0x95BB: 502,
-    0x95C1: 503,
-    0x95C5: 504,
-    0x95C9: 505,
-    0x95E1: 506,
-    0x95F6: 507,
-    0x9641: 508,
-    0x9645: 509,
-    0x9649: 510,
-    0x9651: 511,
-    0x9653: 512,
-    0x9655: 513,
-    0x9661: 514,
-    0x9681: 515,
-    0x9682: 516,
-    0x9685: 517,
-    0x9689: 518,
-    0x9691: 519,
-    0x9693: 520,
-    0x9695: 521,
-    0x9697: 522,
-    0x96A1: 523,
-    0x96B6: 524,
-    0x96C1: 525,
-    0x96D7: 526,
-    0x96E1: 527,
-    0x96E5: 528,
-    0x96E9: 529,
-    0x96F3: 530,
-    0x96F5: 531,
-    0x96F7: 532,
-    0x9741: 533,
-    0x9745: 534,
-    0x9749: 535,
-    0x9751: 536,
-    0x9757: 537,
-    0x9761: 538,
-    0x9762: 539,
-    0x9765: 540,
-    0x9768: 541,
-    0x9769: 542,
-    0x976B: 543,
-    0x9771: 544,
-    0x9773: 545,
-    0x9775: 546,
-    0x9777: 547,
-    0x9781: 548,
-    0x97A1: 549,
-    0x97A2: 550,
-    0x97A5: 551,
-    0x97A8: 552,
-    0x97A9: 553,
-    0x97B1: 554,
-    0x97B3: 555,
-    0x97B5: 556,
-    0x97B6: 557,
-    0x97B7: 558,
-    0x97B8: 559,
-    0x9861: 560,
-    0x9862: 561,
-    0x9865: 562,
-    0x9869: 563,
-    0x9871: 564,
-    0x9873: 565,
-    0x9875: 566,
-    0x9876: 567,
-    0x9877: 568,
-    0x987D: 569,
-    0x9881: 570,
-    0x9882: 571,
-    0x9885: 572,
-    0x9889: 573,
-    0x9891: 574,
-    0x9893: 575,
-    0x9895: 576,
-    0x9896: 577,
-    0x9897: 578,
-    0x98E1: 579,
-    0x98E2: 580,
-    0x98E5: 581,
-    0x98E9: 582,
-    0x98EB: 583,
-    0x98EC: 584,
-    0x98F1: 585,
-    0x98F3: 586,
-    0x98F5: 587,
-    0x98F6: 588,
-    0x98F7: 589,
-    0x98FD: 590,
-    0x9941: 591,
-    0x9942: 592,
-    0x9945: 593,
-    0x9949: 594,
-    0x9951: 595,
-    0x9953: 596,
-    0x9955: 597,
-    0x9956: 598,
-    0x9957: 599,
-    0x9961: 600,
-    0x9976: 601,
-    0x99A1: 602,
-    0x99A2: 603,
-    0x99A5: 604,
-    0x99A9: 605,
-    0x99B7: 606,
-    0x99C1: 607,
-    0x99C9: 608,
-    0x99E1: 609,
-    0x9A41: 610,
-    0x9A45: 611,
-    0x9A81: 612,
-    0x9A82: 613,
-    0x9A85: 614,
-    0x9A89: 615,
-    0x9A90: 616,
-    0x9A91: 617,
-    0x9A97: 618,
-    0x9AC1: 619,
-    0x9AE1: 620,
-    0x9AE5: 621,
-    0x9AE9: 622,
-    0x9AF1: 623,
-    0x9AF3: 624,
-    0x9AF7: 625,
-    0x9B61: 626,
-    0x9B62: 627,
-    0x9B65: 628,
-    0x9B68: 629,
-    0x9B69: 630,
-    0x9B71: 631,
-    0x9B73: 632,
-    0x9B75: 633,
-    0x9B81: 634,
-    0x9B85: 635,
-    0x9B89: 636,
-    0x9B91: 637,
-    0x9B93: 638,
-    0x9BA1: 639,
-    0x9BA5: 640,
-    0x9BA9: 641,
-    0x9BB1: 642,
-    0x9BB3: 643,
-    0x9BB5: 644,
-    0x9BB7: 645,
-    0x9C61: 646,
-    0x9C62: 647,
-    0x9C65: 648,
-    0x9C69: 649,
-    0x9C71: 650,
-    0x9C73: 651,
-    0x9C75: 652,
-    0x9C76: 653,
-    0x9C77: 654,
-    0x9C78: 655,
-    0x9C7C: 656,
-    0x9C7D: 657,
-    0x9C81: 658,
-    0x9C82: 659,
-    0x9C85: 660,
-    0x9C89: 661,
-    0x9C91: 662,
-    0x9C93: 663,
-    0x9C95: 664,
-    0x9C96: 665,
-    0x9C97: 666,
-    0x9CA1: 667,
-    0x9CA2: 668,
-    0x9CA5: 669,
-    0x9CB5: 670,
-    0x9CB7: 671,
-    0x9CE1: 672,
-    0x9CE2: 673,
-    0x9CE5: 674,
-    0x9CE9: 675,
-    0x9CF1: 676,
-    0x9CF3: 677,
-    0x9CF5: 678,
-    0x9CF6: 679,
-    0x9CF7: 680,
-    0x9CFD: 681,
-    0x9D41: 682,
-    0x9D42: 683,
-    0x9D45: 684,
-    0x9D49: 685,
-    0x9D51: 686,
-    0x9D53: 687,
-    0x9D55: 688,
-    0x9D57: 689,
-    0x9D61: 690,
-    0x9D62: 691,
-    0x9D65: 692,
-    0x9D69: 693,
-    0x9D71: 694,
-    0x9D73: 695,
-    0x9D75: 696,
-    0x9D76: 697,
-    0x9D77: 698,
-    0x9D81: 699,
-    0x9D85: 700,
-    0x9D93: 701,
-    0x9D95: 702,
-    0x9DA1: 703,
-    0x9DA2: 704,
-    0x9DA5: 705,
-    0x9DA9: 706,
-    0x9DB1: 707,
-    0x9DB3: 708,
-    0x9DB5: 709,
-    0x9DB7: 710,
-    0x9DC1: 711,
-    0x9DC5: 712,
-    0x9DD7: 713,
-    0x9DF6: 714,
-    0x9E41: 715,
-    0x9E45: 716,
-    0x9E49: 717,
-    0x9E51: 718,
-    0x9E53: 719,
-    0x9E55: 720,
-    0x9E57: 721,
-    0x9E61: 722,
-    0x9E65: 723,
-    0x9E69: 724,
-    0x9E73: 725,
-    0x9E75: 726,
-    0x9E77: 727,
-    0x9E81: 728,
-    0x9E82: 729,
-    0x9E85: 730,
-    0x9E89: 731,
-    0x9E91: 732,
-    0x9E93: 733,
-    0x9E95: 734,
-    0x9E97: 735,
-    0x9EA1: 736,
-    0x9EB6: 737,
-    0x9EC1: 738,
-    0x9EE1: 739,
-    0x9EE2: 740,
-    0x9EE5: 741,
-    0x9EE9: 742,
-    0x9EF1: 743,
-    0x9EF5: 744,
-    0x9EF7: 745,
-    0x9F41: 746,
-    0x9F42: 747,
-    0x9F45: 748,
-    0x9F49: 749,
-    0x9F51: 750,
-    0x9F53: 751,
-    0x9F55: 752,
-    0x9F57: 753,
-    0x9F61: 754,
-    0x9F62: 755,
-    0x9F65: 756,
-    0x9F69: 757,
-    0x9F71: 758,
-    0x9F73: 759,
-    0x9F75: 760,
-    0x9F77: 761,
-    0x9F78: 762,
-    0x9F7B: 763,
-    0x9F7C: 764,
-    0x9FA1: 765,
-    0x9FA2: 766,
-    0x9FA5: 767,
-    0x9FA9: 768,
-    0x9FB1: 769,
-    0x9FB3: 770,
-    0x9FB5: 771,
-    0x9FB7: 772,
-    0xA061: 773,
-    0xA062: 774,
-    0xA065: 775,
-    0xA067: 776,
-    0xA068: 777,
-    0xA069: 778,
-    0xA06A: 779,
-    0xA06B: 780,
-    0xA071: 781,
-    0xA073: 782,
-    0xA075: 783,
-    0xA077: 784,
-    0xA078: 785,
-    0xA07B: 786,
-    0xA07D: 787,
-    0xA081: 788,
-    0xA082: 789,
-    0xA085: 790,
-    0xA089: 791,
-    0xA091: 792,
-    0xA093: 793,
-    0xA095: 794,
-    0xA096: 795,
-    0xA097: 796,
-    0xA098: 797,
-    0xA0A1: 798,
-    0xA0A2: 799,
-    0xA0A9: 800,
-    0xA0B7: 801,
-    0xA0E1: 802,
-    0xA0E2: 803,
-    0xA0E5: 804,
-    0xA0E9: 805,
-    0xA0EB: 806,
-    0xA0F1: 807,
-    0xA0F3: 808,
-    0xA0F5: 809,
-    0xA0F7: 810,
-    0xA0F8: 811,
-    0xA0FD: 812,
-    0xA141: 813,
-    0xA142: 814,
-    0xA145: 815,
-    0xA149: 816,
-    0xA151: 817,
-    0xA153: 818,
-    0xA155: 819,
-    0xA156: 820,
-    0xA157: 821,
-    0xA161: 822,
-    0xA162: 823,
-    0xA165: 824,
-    0xA169: 825,
-    0xA175: 826,
-    0xA176: 827,
-    0xA177: 828,
-    0xA179: 829,
-    0xA181: 830,
-    0xA1A1: 831,
-    0xA1A2: 832,
-    0xA1A4: 833,
-    0xA1A5: 834,
-    0xA1A9: 835,
-    0xA1AB: 836,
-    0xA1B1: 837,
-    0xA1B3: 838,
-    0xA1B5: 839,
-    0xA1B7: 840,
-    0xA1C1: 841,
-    0xA1C5: 842,
-    0xA1D6: 843,
-    0xA1D7: 844,
-    0xA241: 845,
-    0xA245: 846,
-    0xA249: 847,
-    0xA253: 848,
-    0xA255: 849,
-    0xA257: 850,
-    0xA261: 851,
-    0xA265: 852,
-    0xA269: 853,
-    0xA273: 854,
-    0xA275: 855,
-    0xA281: 856,
-    0xA282: 857,
-    0xA283: 858,
-    0xA285: 859,
-    0xA288: 860,
-    0xA289: 861,
-    0xA28A: 862,
-    0xA28B: 863,
-    0xA291: 864,
-    0xA293: 865,
-    0xA295: 866,
-    0xA297: 867,
-    0xA29B: 868,
-    0xA29D: 869,
-    0xA2A1: 870,
-    0xA2A5: 871,
-    0xA2A9: 872,
-    0xA2B3: 873,
-    0xA2B5: 874,
-    0xA2C1: 875,
-    0xA2E1: 876,
-    0xA2E5: 877,
-    0xA2E9: 878,
-    0xA341: 879,
-    0xA345: 880,
-    0xA349: 881,
-    0xA351: 882,
-    0xA355: 883,
-    0xA361: 884,
-    0xA365: 885,
-    0xA369: 886,
-    0xA371: 887,
-    0xA375: 888,
-    0xA3A1: 889,
-    0xA3A2: 890,
-    0xA3A5: 891,
-    0xA3A8: 892,
-    0xA3A9: 893,
-    0xA3AB: 894,
-    0xA3B1: 895,
-    0xA3B3: 896,
-    0xA3B5: 897,
-    0xA3B6: 898,
-    0xA3B7: 899,
-    0xA3B9: 900,
-    0xA3BB: 901,
-    0xA461: 902,
-    0xA462: 903,
-    0xA463: 904,
-    0xA464: 905,
-    0xA465: 906,
-    0xA468: 907,
-    0xA469: 908,
-    0xA46A: 909,
-    0xA46B: 910,
-    0xA46C: 911,
-    0xA471: 912,
-    0xA473: 913,
-    0xA475: 914,
-    0xA477: 915,
-    0xA47B: 916,
-    0xA481: 917,
-    0xA482: 918,
-    0xA485: 919,
-    0xA489: 920,
-    0xA491: 921,
-    0xA493: 922,
-    0xA495: 923,
-    0xA496: 924,
-    0xA497: 925,
-    0xA49B: 926,
-    0xA4A1: 927,
-    0xA4A2: 928,
-    0xA4A5: 929,
-    0xA4B3: 930,
-    0xA4E1: 931,
-    0xA4E2: 932,
-    0xA4E5: 933,
-    0xA4E8: 934,
-    0xA4E9: 935,
-    0xA4EB: 936,
-    0xA4F1: 937,
-    0xA4F3: 938,
-    0xA4F5: 939,
-    0xA4F7: 940,
-    0xA4F8: 941,
-    0xA541: 942,
-    0xA542: 943,
-    0xA545: 944,
-    0xA548: 945,
-    0xA549: 946,
-    0xA551: 947,
-    0xA553: 948,
-    0xA555: 949,
-    0xA556: 950,
-    0xA557: 951,
-    0xA561: 952,
-    0xA562: 953,
-    0xA565: 954,
-    0xA569: 955,
-    0xA573: 956,
-    0xA575: 957,
-    0xA576: 958,
-    0xA577: 959,
-    0xA57B: 960,
-    0xA581: 961,
-    0xA585: 962,
-    0xA5A1: 963,
-    0xA5A2: 964,
-    0xA5A3: 965,
-    0xA5A5: 966,
-    0xA5A9: 967,
-    0xA5B1: 968,
-    0xA5B3: 969,
-    0xA5B5: 970,
-    0xA5B7: 971,
-    0xA5C1: 972,
-    0xA5C5: 973,
-    0xA5D6: 974,
-    0xA5E1: 975,
-    0xA5F6: 976,
-    0xA641: 977,
-    0xA642: 978,
-    0xA645: 979,
-    0xA649: 980,
-    0xA651: 981,
-    0xA653: 982,
-    0xA661: 983,
-    0xA665: 984,
-    0xA681: 985,
-    0xA682: 986,
-    0xA685: 987,
-    0xA688: 988,
-    0xA689: 989,
-    0xA68A: 990,
-    0xA68B: 991,
-    0xA691: 992,
-    0xA693: 993,
-    0xA695: 994,
-    0xA697: 995,
-    0xA69B: 996,
-    0xA69C: 997,
-    0xA6A1: 998,
-    0xA6A9: 999,
-    0xA6B6: 1000,
-    0xA6C1: 1001,
-    0xA6E1: 1002,
-    0xA6E2: 1003,
-    0xA6E5: 1004,
-    0xA6E9: 1005,
-    0xA6F7: 1006,
-    0xA741: 1007,
-    0xA745: 1008,
-    0xA749: 1009,
-    0xA751: 1010,
-    0xA755: 1011,
-    0xA757: 1012,
-    0xA761: 1013,
-    0xA762: 1014,
-    0xA765: 1015,
-    0xA769: 1016,
-    0xA771: 1017,
-    0xA773: 1018,
-    0xA775: 1019,
-    0xA7A1: 1020,
-    0xA7A2: 1021,
-    0xA7A5: 1022,
-    0xA7A9: 1023,
-    0xA7AB: 1024,
-    0xA7B1: 1025,
-    0xA7B3: 1026,
-    0xA7B5: 1027,
-    0xA7B7: 1028,
-    0xA7B8: 1029,
-    0xA7B9: 1030,
-    0xA861: 1031,
-    0xA862: 1032,
-    0xA865: 1033,
-    0xA869: 1034,
-    0xA86B: 1035,
-    0xA871: 1036,
-    0xA873: 1037,
-    0xA875: 1038,
-    0xA876: 1039,
-    0xA877: 1040,
-    0xA87D: 1041,
-    0xA881: 1042,
-    0xA882: 1043,
-    0xA885: 1044,
-    0xA889: 1045,
-    0xA891: 1046,
-    0xA893: 1047,
-    0xA895: 1048,
-    0xA896: 1049,
-    0xA897: 1050,
-    0xA8A1: 1051,
-    0xA8A2: 1052,
-    0xA8B1: 1053,
-    0xA8E1: 1054,
-    0xA8E2: 1055,
-    0xA8E5: 1056,
-    0xA8E8: 1057,
-    0xA8E9: 1058,
-    0xA8F1: 1059,
-    0xA8F5: 1060,
-    0xA8F6: 1061,
-    0xA8F7: 1062,
-    0xA941: 1063,
-    0xA957: 1064,
-    0xA961: 1065,
-    0xA962: 1066,
-    0xA971: 1067,
-    0xA973: 1068,
-    0xA975: 1069,
-    0xA976: 1070,
-    0xA977: 1071,
-    0xA9A1: 1072,
-    0xA9A2: 1073,
-    0xA9A5: 1074,
-    0xA9A9: 1075,
-    0xA9B1: 1076,
-    0xA9B3: 1077,
-    0xA9B7: 1078,
-    0xAA41: 1079,
-    0xAA61: 1080,
-    0xAA77: 1081,
-    0xAA81: 1082,
-    0xAA82: 1083,
-    0xAA85: 1084,
-    0xAA89: 1085,
-    0xAA91: 1086,
-    0xAA95: 1087,
-    0xAA97: 1088,
-    0xAB41: 1089,
-    0xAB57: 1090,
-    0xAB61: 1091,
-    0xAB65: 1092,
-    0xAB69: 1093,
-    0xAB71: 1094,
-    0xAB73: 1095,
-    0xABA1: 1096,
-    0xABA2: 1097,
-    0xABA5: 1098,
-    0xABA9: 1099,
-    0xABB1: 1100,
-    0xABB3: 1101,
-    0xABB5: 1102,
-    0xABB7: 1103,
-    0xAC61: 1104,
-    0xAC62: 1105,
-    0xAC64: 1106,
-    0xAC65: 1107,
-    0xAC68: 1108,
-    0xAC69: 1109,
-    0xAC6A: 1110,
-    0xAC6B: 1111,
-    0xAC71: 1112,
-    0xAC73: 1113,
-    0xAC75: 1114,
-    0xAC76: 1115,
-    0xAC77: 1116,
-    0xAC7B: 1117,
-    0xAC81: 1118,
-    0xAC82: 1119,
-    0xAC85: 1120,
-    0xAC89: 1121,
-    0xAC91: 1122,
-    0xAC93: 1123,
-    0xAC95: 1124,
-    0xAC96: 1125,
-    0xAC97: 1126,
-    0xACA1: 1127,
-    0xACA2: 1128,
-    0xACA5: 1129,
-    0xACA9: 1130,
-    0xACB1: 1131,
-    0xACB3: 1132,
-    0xACB5: 1133,
-    0xACB7: 1134,
-    0xACC1: 1135,
-    0xACC5: 1136,
-    0xACC9: 1137,
-    0xACD1: 1138,
-    0xACD7: 1139,
-    0xACE1: 1140,
-    0xACE2: 1141,
-    0xACE3: 1142,
-    0xACE4: 1143,
-    0xACE5: 1144,
-    0xACE8: 1145,
-    0xACE9: 1146,
-    0xACEB: 1147,
-    0xACEC: 1148,
-    0xACF1: 1149,
-    0xACF3: 1150,
-    0xACF5: 1151,
-    0xACF6: 1152,
-    0xACF7: 1153,
-    0xACFC: 1154,
-    0xAD41: 1155,
-    0xAD42: 1156,
-    0xAD45: 1157,
-    0xAD49: 1158,
-    0xAD51: 1159,
-    0xAD53: 1160,
-    0xAD55: 1161,
-    0xAD56: 1162,
-    0xAD57: 1163,
-    0xAD61: 1164,
-    0xAD62: 1165,
-    0xAD65: 1166,
-    0xAD69: 1167,
-    0xAD71: 1168,
-    0xAD73: 1169,
-    0xAD75: 1170,
-    0xAD76: 1171,
-    0xAD77: 1172,
-    0xAD81: 1173,
-    0xAD85: 1174,
-    0xAD89: 1175,
-    0xAD97: 1176,
-    0xADA1: 1177,
-    0xADA2: 1178,
-    0xADA3: 1179,
-    0xADA5: 1180,
-    0xADA9: 1181,
-    0xADAB: 1182,
-    0xADB1: 1183,
-    0xADB3: 1184,
-    0xADB5: 1185,
-    0xADB7: 1186,
-    0xADBB: 1187,
-    0xADC1: 1188,
-    0xADC2: 1189,
-    0xADC5: 1190,
-    0xADC9: 1191,
-    0xADD7: 1192,
-    0xADE1: 1193,
-    0xADE5: 1194,
-    0xADE9: 1195,
-    0xADF1: 1196,
-    0xADF5: 1197,
-    0xADF6: 1198,
-    0xAE41: 1199,
-    0xAE45: 1200,
-    0xAE49: 1201,
-    0xAE51: 1202,
-    0xAE53: 1203,
-    0xAE55: 1204,
-    0xAE61: 1205,
-    0xAE62: 1206,
-    0xAE65: 1207,
-    0xAE69: 1208,
-    0xAE71: 1209,
-    0xAE73: 1210,
-    0xAE75: 1211,
-    0xAE77: 1212,
-    0xAE81: 1213,
-    0xAE82: 1214,
-    0xAE85: 1215,
-    0xAE88: 1216,
-    0xAE89: 1217,
-    0xAE91: 1218,
-    0xAE93: 1219,
-    0xAE95: 1220,
-    0xAE97: 1221,
-    0xAE99: 1222,
-    0xAE9B: 1223,
-    0xAE9C: 1224,
-    0xAEA1: 1225,
-    0xAEB6: 1226,
-    0xAEC1: 1227,
-    0xAEC2: 1228,
-    0xAEC5: 1229,
-    0xAEC9: 1230,
-    0xAED1: 1231,
-    0xAED7: 1232,
-    0xAEE1: 1233,
-    0xAEE2: 1234,
-    0xAEE5: 1235,
-    0xAEE9: 1236,
-    0xAEF1: 1237,
-    0xAEF3: 1238,
-    0xAEF5: 1239,
-    0xAEF7: 1240,
-    0xAF41: 1241,
-    0xAF42: 1242,
-    0xAF49: 1243,
-    0xAF51: 1244,
-    0xAF55: 1245,
-    0xAF57: 1246,
-    0xAF61: 1247,
-    0xAF62: 1248,
-    0xAF65: 1249,
-    0xAF69: 1250,
-    0xAF6A: 1251,
-    0xAF71: 1252,
-    0xAF73: 1253,
-    0xAF75: 1254,
-    0xAF77: 1255,
-    0xAFA1: 1256,
-    0xAFA2: 1257,
-    0xAFA5: 1258,
-    0xAFA8: 1259,
-    0xAFA9: 1260,
-    0xAFB0: 1261,
-    0xAFB1: 1262,
-    0xAFB3: 1263,
-    0xAFB5: 1264,
-    0xAFB7: 1265,
-    0xAFBC: 1266,
-    0xB061: 1267,
-    0xB062: 1268,
-    0xB064: 1269,
-    0xB065: 1270,
-    0xB069: 1271,
-    0xB071: 1272,
-    0xB073: 1273,
-    0xB076: 1274,
-    0xB077: 1275,
-    0xB07D: 1276,
-    0xB081: 1277,
-    0xB082: 1278,
-    0xB085: 1279,
-    0xB089: 1280,
-    0xB091: 1281,
-    0xB093: 1282,
-    0xB096: 1283,
-    0xB097: 1284,
-    0xB0B7: 1285,
-    0xB0E1: 1286,
-    0xB0E2: 1287,
-    0xB0E5: 1288,
-    0xB0E9: 1289,
-    0xB0EB: 1290,
-    0xB0F1: 1291,
-    0xB0F3: 1292,
-    0xB0F6: 1293,
-    0xB0F7: 1294,
-    0xB141: 1295,
-    0xB145: 1296,
-    0xB149: 1297,
-    0xB185: 1298,
-    0xB1A1: 1299,
-    0xB1A2: 1300,
-    0xB1A5: 1301,
-    0xB1A8: 1302,
-    0xB1A9: 1303,
-    0xB1AB: 1304,
-    0xB1B1: 1305,
-    0xB1B3: 1306,
-    0xB1B7: 1307,
-    0xB1C1: 1308,
-    0xB1C2: 1309,
-    0xB1C5: 1310,
-    0xB1D6: 1311,
-    0xB1E1: 1312,
-    0xB1F6: 1313,
-    0xB241: 1314,
-    0xB245: 1315,
-    0xB249: 1316,
-    0xB251: 1317,
-    0xB253: 1318,
-    0xB261: 1319,
-    0xB281: 1320,
-    0xB282: 1321,
-    0xB285: 1322,
-    0xB289: 1323,
-    0xB291: 1324,
-    0xB293: 1325,
-    0xB297: 1326,
-    0xB2A1: 1327,
-    0xB2B6: 1328,
-    0xB2C1: 1329,
-    0xB2E1: 1330,
-    0xB2E5: 1331,
-    0xB357: 1332,
-    0xB361: 1333,
-    0xB362: 1334,
-    0xB365: 1335,
-    0xB369: 1336,
-    0xB36B: 1337,
-    0xB370: 1338,
-    0xB371: 1339,
-    0xB373: 1340,
-    0xB381: 1341,
-    0xB385: 1342,
-    0xB389: 1343,
-    0xB391: 1344,
-    0xB3A1: 1345,
-    0xB3A2: 1346,
-    0xB3A5: 1347,
-    0xB3A9: 1348,
-    0xB3B1: 1349,
-    0xB3B3: 1350,
-    0xB3B5: 1351,
-    0xB3B7: 1352,
-    0xB461: 1353,
-    0xB462: 1354,
-    0xB465: 1355,
-    0xB466: 1356,
-    0xB467: 1357,
-    0xB469: 1358,
-    0xB46A: 1359,
-    0xB46B: 1360,
-    0xB470: 1361,
-    0xB471: 1362,
-    0xB473: 1363,
-    0xB475: 1364,
-    0xB476: 1365,
-    0xB477: 1366,
-    0xB47B: 1367,
-    0xB47C: 1368,
-    0xB481: 1369,
-    0xB482: 1370,
-    0xB485: 1371,
-    0xB489: 1372,
-    0xB491: 1373,
-    0xB493: 1374,
-    0xB495: 1375,
-    0xB496: 1376,
-    0xB497: 1377,
-    0xB4A1: 1378,
-    0xB4A2: 1379,
-    0xB4A5: 1380,
-    0xB4A9: 1381,
-    0xB4AC: 1382,
-    0xB4B1: 1383,
-    0xB4B3: 1384,
-    0xB4B5: 1385,
-    0xB4B7: 1386,
-    0xB4BB: 1387,
-    0xB4BD: 1388,
-    0xB4C1: 1389,
-    0xB4C5: 1390,
-    0xB4C9: 1391,
-    0xB4D3: 1392,
-    0xB4E1: 1393,
-    0xB4E2: 1394,
-    0xB4E5: 1395,
-    0xB4E6: 1396,
-    0xB4E8: 1397,
-    0xB4E9: 1398,
-    0xB4EA: 1399,
-    0xB4EB: 1400,
-    0xB4F1: 1401,
-    0xB4F3: 1402,
-    0xB4F4: 1403,
-    0xB4F5: 1404,
-    0xB4F6: 1405,
-    0xB4F7: 1406,
-    0xB4F8: 1407,
-    0xB4FA: 1408,
-    0xB4FC: 1409,
-    0xB541: 1410,
-    0xB542: 1411,
-    0xB545: 1412,
-    0xB549: 1413,
-    0xB551: 1414,
-    0xB553: 1415,
-    0xB555: 1416,
-    0xB557: 1417,
-    0xB561: 1418,
-    0xB562: 1419,
-    0xB563: 1420,
-    0xB565: 1421,
-    0xB569: 1422,
-    0xB56B: 1423,
-    0xB56C: 1424,
-    0xB571: 1425,
-    0xB573: 1426,
-    0xB574: 1427,
-    0xB575: 1428,
-    0xB576: 1429,
-    0xB577: 1430,
-    0xB57B: 1431,
-    0xB57C: 1432,
-    0xB57D: 1433,
-    0xB581: 1434,
-    0xB585: 1435,
-    0xB589: 1436,
-    0xB591: 1437,
-    0xB593: 1438,
-    0xB595: 1439,
-    0xB596: 1440,
-    0xB5A1: 1441,
-    0xB5A2: 1442,
-    0xB5A5: 1443,
-    0xB5A9: 1444,
-    0xB5AA: 1445,
-    0xB5AB: 1446,
-    0xB5AD: 1447,
-    0xB5B0: 1448,
-    0xB5B1: 1449,
-    0xB5B3: 1450,
-    0xB5B5: 1451,
-    0xB5B7: 1452,
-    0xB5B9: 1453,
-    0xB5C1: 1454,
-    0xB5C2: 1455,
-    0xB5C5: 1456,
-    0xB5C9: 1457,
-    0xB5D1: 1458,
-    0xB5D3: 1459,
-    0xB5D5: 1460,
-    0xB5D6: 1461,
-    0xB5D7: 1462,
-    0xB5E1: 1463,
-    0xB5E2: 1464,
-    0xB5E5: 1465,
-    0xB5F1: 1466,
-    0xB5F5: 1467,
-    0xB5F7: 1468,
-    0xB641: 1469,
-    0xB642: 1470,
-    0xB645: 1471,
-    0xB649: 1472,
-    0xB651: 1473,
-    0xB653: 1474,
-    0xB655: 1475,
-    0xB657: 1476,
-    0xB661: 1477,
-    0xB662: 1478,
-    0xB665: 1479,
-    0xB669: 1480,
-    0xB671: 1481,
-    0xB673: 1482,
-    0xB675: 1483,
-    0xB677: 1484,
-    0xB681: 1485,
-    0xB682: 1486,
-    0xB685: 1487,
-    0xB689: 1488,
-    0xB68A: 1489,
-    0xB68B: 1490,
-    0xB691: 1491,
-    0xB693: 1492,
-    0xB695: 1493,
-    0xB697: 1494,
-    0xB6A1: 1495,
-    0xB6A2: 1496,
-    0xB6A5: 1497,
-    0xB6A9: 1498,
-    0xB6B1: 1499,
-    0xB6B3: 1500,
-    0xB6B6: 1501,
-    0xB6B7: 1502,
-    0xB6C1: 1503,
-    0xB6C2: 1504,
-    0xB6C5: 1505,
-    0xB6C9: 1506,
-    0xB6D1: 1507,
-    0xB6D3: 1508,
-    0xB6D7: 1509,
-    0xB6E1: 1510,
-    0xB6E2: 1511,
-    0xB6E5: 1512,
-    0xB6E9: 1513,
-    0xB6F1: 1514,
-    0xB6F3: 1515,
-    0xB6F5: 1516,
-    0xB6F7: 1517,
-    0xB741: 1518,
-    0xB742: 1519,
-    0xB745: 1520,
-    0xB749: 1521,
-    0xB751: 1522,
-    0xB753: 1523,
-    0xB755: 1524,
-    0xB757: 1525,
-    0xB759: 1526,
-    0xB761: 1527,
-    0xB762: 1528,
-    0xB765: 1529,
-    0xB769: 1530,
-    0xB76F: 1531,
-    0xB771: 1532,
-    0xB773: 1533,
-    0xB775: 1534,
-    0xB777: 1535,
-    0xB778: 1536,
-    0xB779: 1537,
-    0xB77A: 1538,
-    0xB77B: 1539,
-    0xB77C: 1540,
-    0xB77D: 1541,
-    0xB781: 1542,
-    0xB785: 1543,
-    0xB789: 1544,
-    0xB791: 1545,
-    0xB795: 1546,
-    0xB7A1: 1547,
-    0xB7A2: 1548,
-    0xB7A5: 1549,
-    0xB7A9: 1550,
-    0xB7AA: 1551,
-    0xB7AB: 1552,
-    0xB7B0: 1553,
-    0xB7B1: 1554,
-    0xB7B3: 1555,
-    0xB7B5: 1556,
-    0xB7B6: 1557,
-    0xB7B7: 1558,
-    0xB7B8: 1559,
-    0xB7BC: 1560,
-    0xB861: 1561,
-    0xB862: 1562,
-    0xB865: 1563,
-    0xB867: 1564,
-    0xB868: 1565,
-    0xB869: 1566,
-    0xB86B: 1567,
-    0xB871: 1568,
-    0xB873: 1569,
-    0xB875: 1570,
-    0xB876: 1571,
-    0xB877: 1572,
-    0xB878: 1573,
-    0xB881: 1574,
-    0xB882: 1575,
-    0xB885: 1576,
-    0xB889: 1577,
-    0xB891: 1578,
-    0xB893: 1579,
-    0xB895: 1580,
-    0xB896: 1581,
-    0xB897: 1582,
-    0xB8A1: 1583,
-    0xB8A2: 1584,
-    0xB8A5: 1585,
-    0xB8A7: 1586,
-    0xB8A9: 1587,
-    0xB8B1: 1588,
-    0xB8B7: 1589,
-    0xB8C1: 1590,
-    0xB8C5: 1591,
-    0xB8C9: 1592,
-    0xB8E1: 1593,
-    0xB8E2: 1594,
-    0xB8E5: 1595,
-    0xB8E9: 1596,
-    0xB8EB: 1597,
-    0xB8F1: 1598,
-    0xB8F3: 1599,
-    0xB8F5: 1600,
-    0xB8F7: 1601,
-    0xB8F8: 1602,
-    0xB941: 1603,
-    0xB942: 1604,
-    0xB945: 1605,
-    0xB949: 1606,
-    0xB951: 1607,
-    0xB953: 1608,
-    0xB955: 1609,
-    0xB957: 1610,
-    0xB961: 1611,
-    0xB965: 1612,
-    0xB969: 1613,
-    0xB971: 1614,
-    0xB973: 1615,
-    0xB976: 1616,
-    0xB977: 1617,
-    0xB981: 1618,
-    0xB9A1: 1619,
-    0xB9A2: 1620,
-    0xB9A5: 1621,
-    0xB9A9: 1622,
-    0xB9AB: 1623,
-    0xB9B1: 1624,
-    0xB9B3: 1625,
-    0xB9B5: 1626,
-    0xB9B7: 1627,
-    0xB9B8: 1628,
-    0xB9B9: 1629,
-    0xB9BD: 1630,
-    0xB9C1: 1631,
-    0xB9C2: 1632,
-    0xB9C9: 1633,
-    0xB9D3: 1634,
-    0xB9D5: 1635,
-    0xB9D7: 1636,
-    0xB9E1: 1637,
-    0xB9F6: 1638,
-    0xB9F7: 1639,
-    0xBA41: 1640,
-    0xBA45: 1641,
-    0xBA49: 1642,
-    0xBA51: 1643,
-    0xBA53: 1644,
-    0xBA55: 1645,
-    0xBA57: 1646,
-    0xBA61: 1647,
-    0xBA62: 1648,
-    0xBA65: 1649,
-    0xBA77: 1650,
-    0xBA81: 1651,
-    0xBA82: 1652,
-    0xBA85: 1653,
-    0xBA89: 1654,
-    0xBA8A: 1655,
-    0xBA8B: 1656,
-    0xBA91: 1657,
-    0xBA93: 1658,
-    0xBA95: 1659,
-    0xBA97: 1660,
-    0xBAA1: 1661,
-    0xBAB6: 1662,
-    0xBAC1: 1663,
-    0xBAE1: 1664,
-    0xBAE2: 1665,
-    0xBAE5: 1666,
-    0xBAE9: 1667,
-    0xBAF1: 1668,
-    0xBAF3: 1669,
-    0xBAF5: 1670,
-    0xBB41: 1671,
-    0xBB45: 1672,
-    0xBB49: 1673,
-    0xBB51: 1674,
-    0xBB61: 1675,
-    0xBB62: 1676,
-    0xBB65: 1677,
-    0xBB69: 1678,
-    0xBB71: 1679,
-    0xBB73: 1680,
-    0xBB75: 1681,
-    0xBB77: 1682,
-    0xBBA1: 1683,
-    0xBBA2: 1684,
-    0xBBA5: 1685,
-    0xBBA8: 1686,
-    0xBBA9: 1687,
-    0xBBAB: 1688,
-    0xBBB1: 1689,
-    0xBBB3: 1690,
-    0xBBB5: 1691,
-    0xBBB7: 1692,
-    0xBBB8: 1693,
-    0xBBBB: 1694,
-    0xBBBC: 1695,
-    0xBC61: 1696,
-    0xBC62: 1697,
-    0xBC65: 1698,
-    0xBC67: 1699,
-    0xBC69: 1700,
-    0xBC6C: 1701,
-    0xBC71: 1702,
-    0xBC73: 1703,
-    0xBC75: 1704,
-    0xBC76: 1705,
-    0xBC77: 1706,
-    0xBC81: 1707,
-    0xBC82: 1708,
-    0xBC85: 1709,
-    0xBC89: 1710,
-    0xBC91: 1711,
-    0xBC93: 1712,
-    0xBC95: 1713,
-    0xBC96: 1714,
-    0xBC97: 1715,
-    0xBCA1: 1716,
-    0xBCA5: 1717,
-    0xBCB7: 1718,
-    0xBCE1: 1719,
-    0xBCE2: 1720,
-    0xBCE5: 1721,
-    0xBCE9: 1722,
-    0xBCF1: 1723,
-    0xBCF3: 1724,
-    0xBCF5: 1725,
-    0xBCF6: 1726,
-    0xBCF7: 1727,
-    0xBD41: 1728,
-    0xBD57: 1729,
-    0xBD61: 1730,
-    0xBD76: 1731,
-    0xBDA1: 1732,
-    0xBDA2: 1733,
-    0xBDA5: 1734,
-    0xBDA9: 1735,
-    0xBDB1: 1736,
-    0xBDB3: 1737,
-    0xBDB5: 1738,
-    0xBDB7: 1739,
-    0xBDB9: 1740,
-    0xBDC1: 1741,
-    0xBDC2: 1742,
-    0xBDC9: 1743,
-    0xBDD6: 1744,
-    0xBDE1: 1745,
-    0xBDF6: 1746,
-    0xBE41: 1747,
-    0xBE45: 1748,
-    0xBE49: 1749,
-    0xBE51: 1750,
-    0xBE53: 1751,
-    0xBE77: 1752,
-    0xBE81: 1753,
-    0xBE82: 1754,
-    0xBE85: 1755,
-    0xBE89: 1756,
-    0xBE91: 1757,
-    0xBE93: 1758,
-    0xBE97: 1759,
-    0xBEA1: 1760,
-    0xBEB6: 1761,
-    0xBEB7: 1762,
-    0xBEE1: 1763,
-    0xBF41: 1764,
-    0xBF61: 1765,
-    0xBF71: 1766,
-    0xBF75: 1767,
-    0xBF77: 1768,
-    0xBFA1: 1769,
-    0xBFA2: 1770,
-    0xBFA5: 1771,
-    0xBFA9: 1772,
-    0xBFB1: 1773,
-    0xBFB3: 1774,
-    0xBFB7: 1775,
-    0xBFB8: 1776,
-    0xBFBD: 1777,
-    0xC061: 1778,
-    0xC062: 1779,
-    0xC065: 1780,
-    0xC067: 1781,
-    0xC069: 1782,
-    0xC071: 1783,
-    0xC073: 1784,
-    0xC075: 1785,
-    0xC076: 1786,
-    0xC077: 1787,
-    0xC078: 1788,
-    0xC081: 1789,
-    0xC082: 1790,
-    0xC085: 1791,
-    0xC089: 1792,
-    0xC091: 1793,
-    0xC093: 1794,
-    0xC095: 1795,
-    0xC096: 1796,
-    0xC097: 1797,
-    0xC0A1: 1798,
-    0xC0A5: 1799,
-    0xC0A7: 1800,
-    0xC0A9: 1801,
-    0xC0B1: 1802,
-    0xC0B7: 1803,
-    0xC0E1: 1804,
-    0xC0E2: 1805,
-    0xC0E5: 1806,
-    0xC0E9: 1807,
-    0xC0F1: 1808,
-    0xC0F3: 1809,
-    0xC0F5: 1810,
-    0xC0F6: 1811,
-    0xC0F7: 1812,
-    0xC141: 1813,
-    0xC142: 1814,
-    0xC145: 1815,
-    0xC149: 1816,
-    0xC151: 1817,
-    0xC153: 1818,
-    0xC155: 1819,
-    0xC157: 1820,
-    0xC161: 1821,
-    0xC165: 1822,
-    0xC176: 1823,
-    0xC181: 1824,
-    0xC185: 1825,
-    0xC197: 1826,
-    0xC1A1: 1827,
-    0xC1A2: 1828,
-    0xC1A5: 1829,
-    0xC1A9: 1830,
-    0xC1B1: 1831,
-    0xC1B3: 1832,
-    0xC1B5: 1833,
-    0xC1B7: 1834,
-    0xC1C1: 1835,
-    0xC1C5: 1836,
-    0xC1C9: 1837,
-    0xC1D7: 1838,
-    0xC241: 1839,
-    0xC245: 1840,
-    0xC249: 1841,
-    0xC251: 1842,
-    0xC253: 1843,
-    0xC255: 1844,
-    0xC257: 1845,
-    0xC261: 1846,
-    0xC271: 1847,
-    0xC281: 1848,
-    0xC282: 1849,
-    0xC285: 1850,
-    0xC289: 1851,
-    0xC291: 1852,
-    0xC293: 1853,
-    0xC295: 1854,
-    0xC297: 1855,
-    0xC2A1: 1856,
-    0xC2B6: 1857,
-    0xC2C1: 1858,
-    0xC2C5: 1859,
-    0xC2E1: 1860,
-    0xC2E5: 1861,
-    0xC2E9: 1862,
-    0xC2F1: 1863,
-    0xC2F3: 1864,
-    0xC2F5: 1865,
-    0xC2F7: 1866,
-    0xC341: 1867,
-    0xC345: 1868,
-    0xC349: 1869,
-    0xC351: 1870,
-    0xC357: 1871,
-    0xC361: 1872,
-    0xC362: 1873,
-    0xC365: 1874,
-    0xC369: 1875,
-    0xC371: 1876,
-    0xC373: 1877,
-    0xC375: 1878,
-    0xC377: 1879,
-    0xC3A1: 1880,
-    0xC3A2: 1881,
-    0xC3A5: 1882,
-    0xC3A8: 1883,
-    0xC3A9: 1884,
-    0xC3AA: 1885,
-    0xC3B1: 1886,
-    0xC3B3: 1887,
-    0xC3B5: 1888,
-    0xC3B7: 1889,
-    0xC461: 1890,
-    0xC462: 1891,
-    0xC465: 1892,
-    0xC469: 1893,
-    0xC471: 1894,
-    0xC473: 1895,
-    0xC475: 1896,
-    0xC477: 1897,
-    0xC481: 1898,
-    0xC482: 1899,
-    0xC485: 1900,
-    0xC489: 1901,
-    0xC491: 1902,
-    0xC493: 1903,
-    0xC495: 1904,
-    0xC496: 1905,
-    0xC497: 1906,
-    0xC4A1: 1907,
-    0xC4A2: 1908,
-    0xC4B7: 1909,
-    0xC4E1: 1910,
-    0xC4E2: 1911,
-    0xC4E5: 1912,
-    0xC4E8: 1913,
-    0xC4E9: 1914,
-    0xC4F1: 1915,
-    0xC4F3: 1916,
-    0xC4F5: 1917,
-    0xC4F6: 1918,
-    0xC4F7: 1919,
-    0xC541: 1920,
-    0xC542: 1921,
-    0xC545: 1922,
-    0xC549: 1923,
-    0xC551: 1924,
-    0xC553: 1925,
-    0xC555: 1926,
-    0xC557: 1927,
-    0xC561: 1928,
-    0xC565: 1929,
-    0xC569: 1930,
-    0xC571: 1931,
-    0xC573: 1932,
-    0xC575: 1933,
-    0xC576: 1934,
-    0xC577: 1935,
-    0xC581: 1936,
-    0xC5A1: 1937,
-    0xC5A2: 1938,
-    0xC5A5: 1939,
-    0xC5A9: 1940,
-    0xC5B1: 1941,
-    0xC5B3: 1942,
-    0xC5B5: 1943,
-    0xC5B7: 1944,
-    0xC5C1: 1945,
-    0xC5C2: 1946,
-    0xC5C5: 1947,
-    0xC5C9: 1948,
-    0xC5D1: 1949,
-    0xC5D7: 1950,
-    0xC5E1: 1951,
-    0xC5F7: 1952,
-    0xC641: 1953,
-    0xC649: 1954,
-    0xC661: 1955,
-    0xC681: 1956,
-    0xC682: 1957,
-    0xC685: 1958,
-    0xC689: 1959,
-    0xC691: 1960,
-    0xC693: 1961,
-    0xC695: 1962,
-    0xC697: 1963,
-    0xC6A1: 1964,
-    0xC6A5: 1965,
-    0xC6A9: 1966,
-    0xC6B7: 1967,
-    0xC6C1: 1968,
-    0xC6D7: 1969,
-    0xC6E1: 1970,
-    0xC6E2: 1971,
-    0xC6E5: 1972,
-    0xC6E9: 1973,
-    0xC6F1: 1974,
-    0xC6F3: 1975,
-    0xC6F5: 1976,
-    0xC6F7: 1977,
-    0xC741: 1978,
-    0xC745: 1979,
-    0xC749: 1980,
-    0xC751: 1981,
-    0xC761: 1982,
-    0xC762: 1983,
-    0xC765: 1984,
-    0xC769: 1985,
-    0xC771: 1986,
-    0xC773: 1987,
-    0xC777: 1988,
-    0xC7A1: 1989,
-    0xC7A2: 1990,
-    0xC7A5: 1991,
-    0xC7A9: 1992,
-    0xC7B1: 1993,
-    0xC7B3: 1994,
-    0xC7B5: 1995,
-    0xC7B7: 1996,
-    0xC861: 1997,
-    0xC862: 1998,
-    0xC865: 1999,
-    0xC869: 2000,
-    0xC86A: 2001,
-    0xC871: 2002,
-    0xC873: 2003,
-    0xC875: 2004,
-    0xC876: 2005,
-    0xC877: 2006,
-    0xC881: 2007,
-    0xC882: 2008,
-    0xC885: 2009,
-    0xC889: 2010,
-    0xC891: 2011,
-    0xC893: 2012,
-    0xC895: 2013,
-    0xC896: 2014,
-    0xC897: 2015,
-    0xC8A1: 2016,
-    0xC8B7: 2017,
-    0xC8E1: 2018,
-    0xC8E2: 2019,
-    0xC8E5: 2020,
-    0xC8E9: 2021,
-    0xC8EB: 2022,
-    0xC8F1: 2023,
-    0xC8F3: 2024,
-    0xC8F5: 2025,
-    0xC8F6: 2026,
-    0xC8F7: 2027,
-    0xC941: 2028,
-    0xC942: 2029,
-    0xC945: 2030,
-    0xC949: 2031,
-    0xC951: 2032,
-    0xC953: 2033,
-    0xC955: 2034,
-    0xC957: 2035,
-    0xC961: 2036,
-    0xC965: 2037,
-    0xC976: 2038,
-    0xC981: 2039,
-    0xC985: 2040,
-    0xC9A1: 2041,
-    0xC9A2: 2042,
-    0xC9A5: 2043,
-    0xC9A9: 2044,
-    0xC9B1: 2045,
-    0xC9B3: 2046,
-    0xC9B5: 2047,
-    0xC9B7: 2048,
-    0xC9BC: 2049,
-    0xC9C1: 2050,
-    0xC9C5: 2051,
-    0xC9E1: 2052,
-    0xCA41: 2053,
-    0xCA45: 2054,
-    0xCA55: 2055,
-    0xCA57: 2056,
-    0xCA61: 2057,
-    0xCA81: 2058,
-    0xCA82: 2059,
-    0xCA85: 2060,
-    0xCA89: 2061,
-    0xCA91: 2062,
-    0xCA93: 2063,
-    0xCA95: 2064,
-    0xCA97: 2065,
-    0xCAA1: 2066,
-    0xCAB6: 2067,
-    0xCAC1: 2068,
-    0xCAE1: 2069,
-    0xCAE2: 2070,
-    0xCAE5: 2071,
-    0xCAE9: 2072,
-    0xCAF1: 2073,
-    0xCAF3: 2074,
-    0xCAF7: 2075,
-    0xCB41: 2076,
-    0xCB45: 2077,
-    0xCB49: 2078,
-    0xCB51: 2079,
-    0xCB57: 2080,
-    0xCB61: 2081,
-    0xCB62: 2082,
-    0xCB65: 2083,
-    0xCB68: 2084,
-    0xCB69: 2085,
-    0xCB6B: 2086,
-    0xCB71: 2087,
-    0xCB73: 2088,
-    0xCB75: 2089,
-    0xCB81: 2090,
-    0xCB85: 2091,
-    0xCB89: 2092,
-    0xCB91: 2093,
-    0xCB93: 2094,
-    0xCBA1: 2095,
-    0xCBA2: 2096,
-    0xCBA5: 2097,
-    0xCBA9: 2098,
-    0xCBB1: 2099,
-    0xCBB3: 2100,
-    0xCBB5: 2101,
-    0xCBB7: 2102,
-    0xCC61: 2103,
-    0xCC62: 2104,
-    0xCC63: 2105,
-    0xCC65: 2106,
-    0xCC69: 2107,
-    0xCC6B: 2108,
-    0xCC71: 2109,
-    0xCC73: 2110,
-    0xCC75: 2111,
-    0xCC76: 2112,
-    0xCC77: 2113,
-    0xCC7B: 2114,
-    0xCC81: 2115,
-    0xCC82: 2116,
-    0xCC85: 2117,
-    0xCC89: 2118,
-    0xCC91: 2119,
-    0xCC93: 2120,
-    0xCC95: 2121,
-    0xCC96: 2122,
-    0xCC97: 2123,
-    0xCCA1: 2124,
-    0xCCA2: 2125,
-    0xCCE1: 2126,
-    0xCCE2: 2127,
-    0xCCE5: 2128,
-    0xCCE9: 2129,
-    0xCCF1: 2130,
-    0xCCF3: 2131,
-    0xCCF5: 2132,
-    0xCCF6: 2133,
-    0xCCF7: 2134,
-    0xCD41: 2135,
-    0xCD42: 2136,
-    0xCD45: 2137,
-    0xCD49: 2138,
-    0xCD51: 2139,
-    0xCD53: 2140,
-    0xCD55: 2141,
-    0xCD57: 2142,
-    0xCD61: 2143,
-    0xCD65: 2144,
-    0xCD69: 2145,
-    0xCD71: 2146,
-    0xCD73: 2147,
-    0xCD76: 2148,
-    0xCD77: 2149,
-    0xCD81: 2150,
-    0xCD89: 2151,
-    0xCD93: 2152,
-    0xCD95: 2153,
-    0xCDA1: 2154,
-    0xCDA2: 2155,
-    0xCDA5: 2156,
-    0xCDA9: 2157,
-    0xCDB1: 2158,
-    0xCDB3: 2159,
-    0xCDB5: 2160,
-    0xCDB7: 2161,
-    0xCDC1: 2162,
-    0xCDD7: 2163,
-    0xCE41: 2164,
-    0xCE45: 2165,
-    0xCE61: 2166,
-    0xCE65: 2167,
-    0xCE69: 2168,
-    0xCE73: 2169,
-    0xCE75: 2170,
-    0xCE81: 2171,
-    0xCE82: 2172,
-    0xCE85: 2173,
-    0xCE88: 2174,
-    0xCE89: 2175,
-    0xCE8B: 2176,
-    0xCE91: 2177,
-    0xCE93: 2178,
-    0xCE95: 2179,
-    0xCE97: 2180,
-    0xCEA1: 2181,
-    0xCEB7: 2182,
-    0xCEE1: 2183,
-    0xCEE5: 2184,
-    0xCEE9: 2185,
-    0xCEF1: 2186,
-    0xCEF5: 2187,
-    0xCF41: 2188,
-    0xCF45: 2189,
-    0xCF49: 2190,
-    0xCF51: 2191,
-    0xCF55: 2192,
-    0xCF57: 2193,
-    0xCF61: 2194,
-    0xCF65: 2195,
-    0xCF69: 2196,
-    0xCF71: 2197,
-    0xCF73: 2198,
-    0xCF75: 2199,
-    0xCFA1: 2200,
-    0xCFA2: 2201,
-    0xCFA5: 2202,
-    0xCFA9: 2203,
-    0xCFB1: 2204,
-    0xCFB3: 2205,
-    0xCFB5: 2206,
-    0xCFB7: 2207,
-    0xD061: 2208,
-    0xD062: 2209,
-    0xD065: 2210,
-    0xD069: 2211,
-    0xD06E: 2212,
-    0xD071: 2213,
-    0xD073: 2214,
-    0xD075: 2215,
-    0xD077: 2216,
-    0xD081: 2217,
-    0xD082: 2218,
-    0xD085: 2219,
-    0xD089: 2220,
-    0xD091: 2221,
-    0xD093: 2222,
-    0xD095: 2223,
-    0xD096: 2224,
-    0xD097: 2225,
-    0xD0A1: 2226,
-    0xD0B7: 2227,
-    0xD0E1: 2228,
-    0xD0E2: 2229,
-    0xD0E5: 2230,
-    0xD0E9: 2231,
-    0xD0EB: 2232,
-    0xD0F1: 2233,
-    0xD0F3: 2234,
-    0xD0F5: 2235,
-    0xD0F7: 2236,
-    0xD141: 2237,
-    0xD142: 2238,
-    0xD145: 2239,
-    0xD149: 2240,
-    0xD151: 2241,
-    0xD153: 2242,
-    0xD155: 2243,
-    0xD157: 2244,
-    0xD161: 2245,
-    0xD162: 2246,
-    0xD165: 2247,
-    0xD169: 2248,
-    0xD171: 2249,
-    0xD173: 2250,
-    0xD175: 2251,
-    0xD176: 2252,
-    0xD177: 2253,
-    0xD181: 2254,
-    0xD185: 2255,
-    0xD189: 2256,
-    0xD193: 2257,
-    0xD1A1: 2258,
-    0xD1A2: 2259,
-    0xD1A5: 2260,
-    0xD1A9: 2261,
-    0xD1AE: 2262,
-    0xD1B1: 2263,
-    0xD1B3: 2264,
-    0xD1B5: 2265,
-    0xD1B7: 2266,
-    0xD1BB: 2267,
-    0xD1C1: 2268,
-    0xD1C2: 2269,
-    0xD1C5: 2270,
-    0xD1C9: 2271,
-    0xD1D5: 2272,
-    0xD1D7: 2273,
-    0xD1E1: 2274,
-    0xD1E2: 2275,
-    0xD1E5: 2276,
-    0xD1F5: 2277,
-    0xD1F7: 2278,
-    0xD241: 2279,
-    0xD242: 2280,
-    0xD245: 2281,
-    0xD249: 2282,
-    0xD253: 2283,
-    0xD255: 2284,
-    0xD257: 2285,
-    0xD261: 2286,
-    0xD265: 2287,
-    0xD269: 2288,
-    0xD273: 2289,
-    0xD275: 2290,
-    0xD281: 2291,
-    0xD282: 2292,
-    0xD285: 2293,
-    0xD289: 2294,
-    0xD28E: 2295,
-    0xD291: 2296,
-    0xD295: 2297,
-    0xD297: 2298,
-    0xD2A1: 2299,
-    0xD2A5: 2300,
-    0xD2A9: 2301,
-    0xD2B1: 2302,
-    0xD2B7: 2303,
-    0xD2C1: 2304,
-    0xD2C2: 2305,
-    0xD2C5: 2306,
-    0xD2C9: 2307,
-    0xD2D7: 2308,
-    0xD2E1: 2309,
-    0xD2E2: 2310,
-    0xD2E5: 2311,
-    0xD2E9: 2312,
-    0xD2F1: 2313,
-    0xD2F3: 2314,
-    0xD2F5: 2315,
-    0xD2F7: 2316,
-    0xD341: 2317,
-    0xD342: 2318,
-    0xD345: 2319,
-    0xD349: 2320,
-    0xD351: 2321,
-    0xD355: 2322,
-    0xD357: 2323,
-    0xD361: 2324,
-    0xD362: 2325,
-    0xD365: 2326,
-    0xD367: 2327,
-    0xD368: 2328,
-    0xD369: 2329,
-    0xD36A: 2330,
-    0xD371: 2331,
-    0xD373: 2332,
-    0xD375: 2333,
-    0xD377: 2334,
-    0xD37B: 2335,
-    0xD381: 2336,
-    0xD385: 2337,
-    0xD389: 2338,
-    0xD391: 2339,
-    0xD393: 2340,
-    0xD397: 2341,
-    0xD3A1: 2342,
-    0xD3A2: 2343,
-    0xD3A5: 2344,
-    0xD3A9: 2345,
-    0xD3B1: 2346,
-    0xD3B3: 2347,
-    0xD3B5: 2348,
-    0xD3B7: 2349,
-}
diff --git a/src/pip/_vendor/chardet/johabprober.py b/src/pip/_vendor/chardet/johabprober.py
deleted file mode 100644
index d7364ba61ec..00000000000
--- a/src/pip/_vendor/chardet/johabprober.py
+++ /dev/null
@@ -1,47 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .chardistribution import JOHABDistributionAnalysis
-from .codingstatemachine import CodingStateMachine
-from .mbcharsetprober import MultiByteCharSetProber
-from .mbcssm import JOHAB_SM_MODEL
-
-
-class JOHABProber(MultiByteCharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self.coding_sm = CodingStateMachine(JOHAB_SM_MODEL)
-        self.distribution_analyzer = JOHABDistributionAnalysis()
-        self.reset()
-
-    @property
-    def charset_name(self) -> str:
-        return "Johab"
-
-    @property
-    def language(self) -> str:
-        return "Korean"
diff --git a/src/pip/_vendor/chardet/jpcntx.py b/src/pip/_vendor/chardet/jpcntx.py
deleted file mode 100644
index 2f53bdda09e..00000000000
--- a/src/pip/_vendor/chardet/jpcntx.py
+++ /dev/null
@@ -1,238 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import List, Tuple, Union
-
-# This is hiragana 2-char sequence table, the number in each cell represents its frequency category
-# fmt: off
-jp2_char_context = (
-    (0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1),
-    (2, 4, 0, 4, 0, 3, 0, 4, 0, 3, 4, 4, 4, 2, 4, 3, 3, 4, 3, 2, 3, 3, 4, 2, 3, 3, 3, 2, 4, 1, 4, 3, 3, 1, 5, 4, 3, 4, 3, 4, 3, 5, 3, 0, 3, 5, 4, 2, 0, 3, 1, 0, 3, 3, 0, 3, 3, 0, 1, 1, 0, 4, 3, 0, 3, 3, 0, 4, 0, 2, 0, 3, 5, 5, 5, 5, 4, 0, 4, 1, 0, 3, 4),
-    (0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2),
-    (0, 4, 0, 5, 0, 5, 0, 4, 0, 4, 5, 4, 4, 3, 5, 3, 5, 1, 5, 3, 4, 3, 4, 4, 3, 4, 3, 3, 4, 3, 5, 4, 4, 3, 5, 5, 3, 5, 5, 5, 3, 5, 5, 3, 4, 5, 5, 3, 1, 3, 2, 0, 3, 4, 0, 4, 2, 0, 4, 2, 1, 5, 3, 2, 3, 5, 0, 4, 0, 2, 0, 5, 4, 4, 5, 4, 5, 0, 4, 0, 0, 4, 4),
-    (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
-    (0, 3, 0, 4, 0, 3, 0, 3, 0, 4, 5, 4, 3, 3, 3, 3, 4, 3, 5, 4, 4, 3, 5, 4, 4, 3, 4, 3, 4, 4, 4, 4, 5, 3, 4, 4, 3, 4, 5, 5, 4, 5, 5, 1, 4, 5, 4, 3, 0, 3, 3, 1, 3, 3, 0, 4, 4, 0, 3, 3, 1, 5, 3, 3, 3, 5, 0, 4, 0, 3, 0, 4, 4, 3, 4, 3, 3, 0, 4, 1, 1, 3, 4),
-    (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
-    (0, 4, 0, 3, 0, 3, 0, 4, 0, 3, 4, 4, 3, 2, 2, 1, 2, 1, 3, 1, 3, 3, 3, 3, 3, 4, 3, 1, 3, 3, 5, 3, 3, 0, 4, 3, 0, 5, 4, 3, 3, 5, 4, 4, 3, 4, 4, 5, 0, 1, 2, 0, 1, 2, 0, 2, 2, 0, 1, 0, 0, 5, 2, 2, 1, 4, 0, 3, 0, 1, 0, 4, 4, 3, 5, 4, 3, 0, 2, 1, 0, 4, 3),
-    (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
-    (0, 3, 0, 5, 0, 4, 0, 2, 1, 4, 4, 2, 4, 1, 4, 2, 4, 2, 4, 3, 3, 3, 4, 3, 3, 3, 3, 1, 4, 2, 3, 3, 3, 1, 4, 4, 1, 1, 1, 4, 3, 3, 2, 0, 2, 4, 3, 2, 0, 3, 3, 0, 3, 1, 1, 0, 0, 0, 3, 3, 0, 4, 2, 2, 3, 4, 0, 4, 0, 3, 0, 4, 4, 5, 3, 4, 4, 0, 3, 0, 0, 1, 4),
-    (1, 4, 0, 4, 0, 4, 0, 4, 0, 3, 5, 4, 4, 3, 4, 3, 5, 4, 3, 3, 4, 3, 5, 4, 4, 4, 4, 3, 4, 2, 4, 3, 3, 1, 5, 4, 3, 2, 4, 5, 4, 5, 5, 4, 4, 5, 4, 4, 0, 3, 2, 2, 3, 3, 0, 4, 3, 1, 3, 2, 1, 4, 3, 3, 4, 5, 0, 3, 0, 2, 0, 4, 5, 5, 4, 5, 4, 0, 4, 0, 0, 5, 4),
-    (0, 5, 0, 5, 0, 4, 0, 3, 0, 4, 4, 3, 4, 3, 3, 3, 4, 0, 4, 4, 4, 3, 4, 3, 4, 3, 3, 1, 4, 2, 4, 3, 4, 0, 5, 4, 1, 4, 5, 4, 4, 5, 3, 2, 4, 3, 4, 3, 2, 4, 1, 3, 3, 3, 2, 3, 2, 0, 4, 3, 3, 4, 3, 3, 3, 4, 0, 4, 0, 3, 0, 4, 5, 4, 4, 4, 3, 0, 4, 1, 0, 1, 3),
-    (0, 3, 1, 4, 0, 3, 0, 2, 0, 3, 4, 4, 3, 1, 4, 2, 3, 3, 4, 3, 4, 3, 4, 3, 4, 4, 3, 2, 3, 1, 5, 4, 4, 1, 4, 4, 3, 5, 4, 4, 3, 5, 5, 4, 3, 4, 4, 3, 1, 2, 3, 1, 2, 2, 0, 3, 2, 0, 3, 1, 0, 5, 3, 3, 3, 4, 3, 3, 3, 3, 4, 4, 4, 4, 5, 4, 2, 0, 3, 3, 2, 4, 3),
-    (0, 2, 0, 3, 0, 1, 0, 1, 0, 0, 3, 2, 0, 0, 2, 0, 1, 0, 2, 1, 3, 3, 3, 1, 2, 3, 1, 0, 1, 0, 4, 2, 1, 1, 3, 3, 0, 4, 3, 3, 1, 4, 3, 3, 0, 3, 3, 2, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 4, 1, 0, 2, 3, 2, 2, 2, 1, 3, 3, 3, 4, 4, 3, 2, 0, 3, 1, 0, 3, 3),
-    (0, 4, 0, 4, 0, 3, 0, 3, 0, 4, 4, 4, 3, 3, 3, 3, 3, 3, 4, 3, 4, 2, 4, 3, 4, 3, 3, 2, 4, 3, 4, 5, 4, 1, 4, 5, 3, 5, 4, 5, 3, 5, 4, 0, 3, 5, 5, 3, 1, 3, 3, 2, 2, 3, 0, 3, 4, 1, 3, 3, 2, 4, 3, 3, 3, 4, 0, 4, 0, 3, 0, 4, 5, 4, 4, 5, 3, 0, 4, 1, 0, 3, 4),
-    (0, 2, 0, 3, 0, 3, 0, 0, 0, 2, 2, 2, 1, 0, 1, 0, 0, 0, 3, 0, 3, 0, 3, 0, 1, 3, 1, 0, 3, 1, 3, 3, 3, 1, 3, 3, 3, 0, 1, 3, 1, 3, 4, 0, 0, 3, 1, 1, 0, 3, 2, 0, 0, 0, 0, 1, 3, 0, 1, 0, 0, 3, 3, 2, 0, 3, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 3, 0, 3, 0, 0, 2, 3),
-    (2, 3, 0, 3, 0, 2, 0, 1, 0, 3, 3, 4, 3, 1, 3, 1, 1, 1, 3, 1, 4, 3, 4, 3, 3, 3, 0, 0, 3, 1, 5, 4, 3, 1, 4, 3, 2, 5, 5, 4, 4, 4, 4, 3, 3, 4, 4, 4, 0, 2, 1, 1, 3, 2, 0, 1, 2, 0, 0, 1, 0, 4, 1, 3, 3, 3, 0, 3, 0, 1, 0, 4, 4, 4, 5, 5, 3, 0, 2, 0, 0, 4, 4),
-    (0, 2, 0, 1, 0, 3, 1, 3, 0, 2, 3, 3, 3, 0, 3, 1, 0, 0, 3, 0, 3, 2, 3, 1, 3, 2, 1, 1, 0, 0, 4, 2, 1, 0, 2, 3, 1, 4, 3, 2, 0, 4, 4, 3, 1, 3, 1, 3, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4, 1, 1, 1, 2, 0, 3, 0, 0, 0, 3, 4, 2, 4, 3, 2, 0, 1, 0, 0, 3, 3),
-    (0, 1, 0, 4, 0, 5, 0, 4, 0, 2, 4, 4, 2, 3, 3, 2, 3, 3, 5, 3, 3, 3, 4, 3, 4, 2, 3, 0, 4, 3, 3, 3, 4, 1, 4, 3, 2, 1, 5, 5, 3, 4, 5, 1, 3, 5, 4, 2, 0, 3, 3, 0, 1, 3, 0, 4, 2, 0, 1, 3, 1, 4, 3, 3, 3, 3, 0, 3, 0, 1, 0, 3, 4, 4, 4, 5, 5, 0, 3, 0, 1, 4, 5),
-    (0, 2, 0, 3, 0, 3, 0, 0, 0, 2, 3, 1, 3, 0, 4, 0, 1, 1, 3, 0, 3, 4, 3, 2, 3, 1, 0, 3, 3, 2, 3, 1, 3, 0, 2, 3, 0, 2, 1, 4, 1, 2, 2, 0, 0, 3, 3, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 2, 2, 0, 3, 2, 1, 3, 3, 0, 2, 0, 2, 0, 0, 3, 3, 1, 2, 4, 0, 3, 0, 2, 2, 3),
-    (2, 4, 0, 5, 0, 4, 0, 4, 0, 2, 4, 4, 4, 3, 4, 3, 3, 3, 1, 2, 4, 3, 4, 3, 4, 4, 5, 0, 3, 3, 3, 3, 2, 0, 4, 3, 1, 4, 3, 4, 1, 4, 4, 3, 3, 4, 4, 3, 1, 2, 3, 0, 4, 2, 0, 4, 1, 0, 3, 3, 0, 4, 3, 3, 3, 4, 0, 4, 0, 2, 0, 3, 5, 3, 4, 5, 2, 0, 3, 0, 0, 4, 5),
-    (0, 3, 0, 4, 0, 1, 0, 1, 0, 1, 3, 2, 2, 1, 3, 0, 3, 0, 2, 0, 2, 0, 3, 0, 2, 0, 0, 0, 1, 0, 1, 1, 0, 0, 3, 1, 0, 0, 0, 4, 0, 3, 1, 0, 2, 1, 3, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, 2, 2, 3, 1, 0, 3, 0, 0, 0, 1, 4, 4, 4, 3, 0, 0, 4, 0, 0, 1, 4),
-    (1, 4, 1, 5, 0, 3, 0, 3, 0, 4, 5, 4, 4, 3, 5, 3, 3, 4, 4, 3, 4, 1, 3, 3, 3, 3, 2, 1, 4, 1, 5, 4, 3, 1, 4, 4, 3, 5, 4, 4, 3, 5, 4, 3, 3, 4, 4, 4, 0, 3, 3, 1, 2, 3, 0, 3, 1, 0, 3, 3, 0, 5, 4, 4, 4, 4, 4, 4, 3, 3, 5, 4, 4, 3, 3, 5, 4, 0, 3, 2, 0, 4, 4),
-    (0, 2, 0, 3, 0, 1, 0, 0, 0, 1, 3, 3, 3, 2, 4, 1, 3, 0, 3, 1, 3, 0, 2, 2, 1, 1, 0, 0, 2, 0, 4, 3, 1, 0, 4, 3, 0, 4, 4, 4, 1, 4, 3, 1, 1, 3, 3, 1, 0, 2, 0, 0, 1, 3, 0, 0, 0, 0, 2, 0, 0, 4, 3, 2, 4, 3, 5, 4, 3, 3, 3, 4, 3, 3, 4, 3, 3, 0, 2, 1, 0, 3, 3),
-    (0, 2, 0, 4, 0, 3, 0, 2, 0, 2, 5, 5, 3, 4, 4, 4, 4, 1, 4, 3, 3, 0, 4, 3, 4, 3, 1, 3, 3, 2, 4, 3, 0, 3, 4, 3, 0, 3, 4, 4, 2, 4, 4, 0, 4, 5, 3, 3, 2, 2, 1, 1, 1, 2, 0, 1, 5, 0, 3, 3, 2, 4, 3, 3, 3, 4, 0, 3, 0, 2, 0, 4, 4, 3, 5, 5, 0, 0, 3, 0, 2, 3, 3),
-    (0, 3, 0, 4, 0, 3, 0, 1, 0, 3, 4, 3, 3, 1, 3, 3, 3, 0, 3, 1, 3, 0, 4, 3, 3, 1, 1, 0, 3, 0, 3, 3, 0, 0, 4, 4, 0, 1, 5, 4, 3, 3, 5, 0, 3, 3, 4, 3, 0, 2, 0, 1, 1, 1, 0, 1, 3, 0, 1, 2, 1, 3, 3, 2, 3, 3, 0, 3, 0, 1, 0, 1, 3, 3, 4, 4, 1, 0, 1, 2, 2, 1, 3),
-    (0, 1, 0, 4, 0, 4, 0, 3, 0, 1, 3, 3, 3, 2, 3, 1, 1, 0, 3, 0, 3, 3, 4, 3, 2, 4, 2, 0, 1, 0, 4, 3, 2, 0, 4, 3, 0, 5, 3, 3, 2, 4, 4, 4, 3, 3, 3, 4, 0, 1, 3, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 4, 2, 3, 3, 3, 0, 3, 0, 0, 0, 4, 4, 4, 5, 3, 2, 0, 3, 3, 0, 3, 5),
-    (0, 2, 0, 3, 0, 0, 0, 3, 0, 1, 3, 0, 2, 0, 0, 0, 1, 0, 3, 1, 1, 3, 3, 0, 0, 3, 0, 0, 3, 0, 2, 3, 1, 0, 3, 1, 0, 3, 3, 2, 0, 4, 2, 2, 0, 2, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 2, 0, 1, 0, 1, 0, 0, 0, 1, 3, 1, 2, 0, 0, 0, 1, 0, 0, 1, 4),
-    (0, 3, 0, 3, 0, 5, 0, 1, 0, 2, 4, 3, 1, 3, 3, 2, 1, 1, 5, 2, 1, 0, 5, 1, 2, 0, 0, 0, 3, 3, 2, 2, 3, 2, 4, 3, 0, 0, 3, 3, 1, 3, 3, 0, 2, 5, 3, 4, 0, 3, 3, 0, 1, 2, 0, 2, 2, 0, 3, 2, 0, 2, 2, 3, 3, 3, 0, 2, 0, 1, 0, 3, 4, 4, 2, 5, 4, 0, 3, 0, 0, 3, 5),
-    (0, 3, 0, 3, 0, 3, 0, 1, 0, 3, 3, 3, 3, 0, 3, 0, 2, 0, 2, 1, 1, 0, 2, 0, 1, 0, 0, 0, 2, 1, 0, 0, 1, 0, 3, 2, 0, 0, 3, 3, 1, 2, 3, 1, 0, 3, 3, 0, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 3, 1, 2, 3, 0, 3, 0, 1, 0, 3, 2, 1, 0, 4, 3, 0, 1, 1, 0, 3, 3),
-    (0, 4, 0, 5, 0, 3, 0, 3, 0, 4, 5, 5, 4, 3, 5, 3, 4, 3, 5, 3, 3, 2, 5, 3, 4, 4, 4, 3, 4, 3, 4, 5, 5, 3, 4, 4, 3, 4, 4, 5, 4, 4, 4, 3, 4, 5, 5, 4, 2, 3, 4, 2, 3, 4, 0, 3, 3, 1, 4, 3, 2, 4, 3, 3, 5, 5, 0, 3, 0, 3, 0, 5, 5, 5, 5, 4, 4, 0, 4, 0, 1, 4, 4),
-    (0, 4, 0, 4, 0, 3, 0, 3, 0, 3, 5, 4, 4, 2, 3, 2, 5, 1, 3, 2, 5, 1, 4, 2, 3, 2, 3, 3, 4, 3, 3, 3, 3, 2, 5, 4, 1, 3, 3, 5, 3, 4, 4, 0, 4, 4, 3, 1, 1, 3, 1, 0, 2, 3, 0, 2, 3, 0, 3, 0, 0, 4, 3, 1, 3, 4, 0, 3, 0, 2, 0, 4, 4, 4, 3, 4, 5, 0, 4, 0, 0, 3, 4),
-    (0, 3, 0, 3, 0, 3, 1, 2, 0, 3, 4, 4, 3, 3, 3, 0, 2, 2, 4, 3, 3, 1, 3, 3, 3, 1, 1, 0, 3, 1, 4, 3, 2, 3, 4, 4, 2, 4, 4, 4, 3, 4, 4, 3, 2, 4, 4, 3, 1, 3, 3, 1, 3, 3, 0, 4, 1, 0, 2, 2, 1, 4, 3, 2, 3, 3, 5, 4, 3, 3, 5, 4, 4, 3, 3, 0, 4, 0, 3, 2, 2, 4, 4),
-    (0, 2, 0, 1, 0, 0, 0, 0, 0, 1, 2, 1, 3, 0, 0, 0, 0, 0, 2, 0, 1, 2, 1, 0, 0, 1, 0, 0, 0, 0, 3, 0, 0, 1, 0, 1, 1, 3, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 0, 3, 4, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1),
-    (0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, 4, 1, 4, 0, 3, 0, 4, 0, 3, 0, 4, 0, 3, 0, 3, 0, 4, 1, 5, 1, 4, 0, 0, 3, 0, 5, 0, 5, 2, 0, 1, 0, 0, 0, 2, 1, 4, 0, 1, 3, 0, 0, 3, 0, 0, 3, 1, 1, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0),
-    (1, 4, 0, 5, 0, 3, 0, 2, 0, 3, 5, 4, 4, 3, 4, 3, 5, 3, 4, 3, 3, 0, 4, 3, 3, 3, 3, 3, 3, 2, 4, 4, 3, 1, 3, 4, 4, 5, 4, 4, 3, 4, 4, 1, 3, 5, 4, 3, 3, 3, 1, 2, 2, 3, 3, 1, 3, 1, 3, 3, 3, 5, 3, 3, 4, 5, 0, 3, 0, 3, 0, 3, 4, 3, 4, 4, 3, 0, 3, 0, 2, 4, 3),
-    (0, 1, 0, 4, 0, 0, 0, 0, 0, 1, 4, 0, 4, 1, 4, 2, 4, 0, 3, 0, 1, 0, 1, 0, 0, 0, 0, 0, 2, 0, 3, 1, 1, 1, 0, 3, 0, 0, 0, 1, 2, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 0, 3, 0, 0, 0, 0, 3, 2, 0, 2, 2, 0, 1, 0, 0, 0, 2, 3, 2, 3, 3, 0, 0, 0, 0, 2, 1, 0),
-    (0, 5, 1, 5, 0, 3, 0, 3, 0, 5, 4, 4, 5, 1, 5, 3, 3, 0, 4, 3, 4, 3, 5, 3, 4, 3, 3, 2, 4, 3, 4, 3, 3, 0, 3, 3, 1, 4, 4, 3, 4, 4, 4, 3, 4, 5, 5, 3, 2, 3, 1, 1, 3, 3, 1, 3, 1, 1, 3, 3, 2, 4, 5, 3, 3, 5, 0, 4, 0, 3, 0, 4, 4, 3, 5, 3, 3, 0, 3, 4, 0, 4, 3),
-    (0, 5, 0, 5, 0, 3, 0, 2, 0, 4, 4, 3, 5, 2, 4, 3, 3, 3, 4, 4, 4, 3, 5, 3, 5, 3, 3, 1, 4, 0, 4, 3, 3, 0, 3, 3, 0, 4, 4, 4, 4, 5, 4, 3, 3, 5, 5, 3, 2, 3, 1, 2, 3, 2, 0, 1, 0, 0, 3, 2, 2, 4, 4, 3, 1, 5, 0, 4, 0, 3, 0, 4, 3, 1, 3, 2, 1, 0, 3, 3, 0, 3, 3),
-    (0, 4, 0, 5, 0, 5, 0, 4, 0, 4, 5, 5, 5, 3, 4, 3, 3, 2, 5, 4, 4, 3, 5, 3, 5, 3, 4, 0, 4, 3, 4, 4, 3, 2, 4, 4, 3, 4, 5, 4, 4, 5, 5, 0, 3, 5, 5, 4, 1, 3, 3, 2, 3, 3, 1, 3, 1, 0, 4, 3, 1, 4, 4, 3, 4, 5, 0, 4, 0, 2, 0, 4, 3, 4, 4, 3, 3, 0, 4, 0, 0, 5, 5),
-    (0, 4, 0, 4, 0, 5, 0, 1, 1, 3, 3, 4, 4, 3, 4, 1, 3, 0, 5, 1, 3, 0, 3, 1, 3, 1, 1, 0, 3, 0, 3, 3, 4, 0, 4, 3, 0, 4, 4, 4, 3, 4, 4, 0, 3, 5, 4, 1, 0, 3, 0, 0, 2, 3, 0, 3, 1, 0, 3, 1, 0, 3, 2, 1, 3, 5, 0, 3, 0, 1, 0, 3, 2, 3, 3, 4, 4, 0, 2, 2, 0, 4, 4),
-    (2, 4, 0, 5, 0, 4, 0, 3, 0, 4, 5, 5, 4, 3, 5, 3, 5, 3, 5, 3, 5, 2, 5, 3, 4, 3, 3, 4, 3, 4, 5, 3, 2, 1, 5, 4, 3, 2, 3, 4, 5, 3, 4, 1, 2, 5, 4, 3, 0, 3, 3, 0, 3, 2, 0, 2, 3, 0, 4, 1, 0, 3, 4, 3, 3, 5, 0, 3, 0, 1, 0, 4, 5, 5, 5, 4, 3, 0, 4, 2, 0, 3, 5),
-    (0, 5, 0, 4, 0, 4, 0, 2, 0, 5, 4, 3, 4, 3, 4, 3, 3, 3, 4, 3, 4, 2, 5, 3, 5, 3, 4, 1, 4, 3, 4, 4, 4, 0, 3, 5, 0, 4, 4, 4, 4, 5, 3, 1, 3, 4, 5, 3, 3, 3, 3, 3, 3, 3, 0, 2, 2, 0, 3, 3, 2, 4, 3, 3, 3, 5, 3, 4, 1, 3, 3, 5, 3, 2, 0, 0, 0, 0, 4, 3, 1, 3, 3),
-    (0, 1, 0, 3, 0, 3, 0, 1, 0, 1, 3, 3, 3, 2, 3, 3, 3, 0, 3, 0, 0, 0, 3, 1, 3, 0, 0, 0, 2, 2, 2, 3, 0, 0, 3, 2, 0, 1, 2, 4, 1, 3, 3, 0, 0, 3, 3, 3, 0, 1, 0, 0, 2, 1, 0, 0, 3, 0, 3, 1, 0, 3, 0, 0, 1, 3, 0, 2, 0, 1, 0, 3, 3, 1, 3, 3, 0, 0, 1, 1, 0, 3, 3),
-    (0, 2, 0, 3, 0, 2, 1, 4, 0, 2, 2, 3, 1, 1, 3, 1, 1, 0, 2, 0, 3, 1, 2, 3, 1, 3, 0, 0, 1, 0, 4, 3, 2, 3, 3, 3, 1, 4, 2, 3, 3, 3, 3, 1, 0, 3, 1, 4, 0, 1, 1, 0, 1, 2, 0, 1, 1, 0, 1, 1, 0, 3, 1, 3, 2, 2, 0, 1, 0, 0, 0, 2, 3, 3, 3, 1, 0, 0, 0, 0, 0, 2, 3),
-    (0, 5, 0, 4, 0, 5, 0, 2, 0, 4, 5, 5, 3, 3, 4, 3, 3, 1, 5, 4, 4, 2, 4, 4, 4, 3, 4, 2, 4, 3, 5, 5, 4, 3, 3, 4, 3, 3, 5, 5, 4, 5, 5, 1, 3, 4, 5, 3, 1, 4, 3, 1, 3, 3, 0, 3, 3, 1, 4, 3, 1, 4, 5, 3, 3, 5, 0, 4, 0, 3, 0, 5, 3, 3, 1, 4, 3, 0, 4, 0, 1, 5, 3),
-    (0, 5, 0, 5, 0, 4, 0, 2, 0, 4, 4, 3, 4, 3, 3, 3, 3, 3, 5, 4, 4, 4, 4, 4, 4, 5, 3, 3, 5, 2, 4, 4, 4, 3, 4, 4, 3, 3, 4, 4, 5, 5, 3, 3, 4, 3, 4, 3, 3, 4, 3, 3, 3, 3, 1, 2, 2, 1, 4, 3, 3, 5, 4, 4, 3, 4, 0, 4, 0, 3, 0, 4, 4, 4, 4, 4, 1, 0, 4, 2, 0, 2, 4),
-    (0, 4, 0, 4, 0, 3, 0, 1, 0, 3, 5, 2, 3, 0, 3, 0, 2, 1, 4, 2, 3, 3, 4, 1, 4, 3, 3, 2, 4, 1, 3, 3, 3, 0, 3, 3, 0, 0, 3, 3, 3, 5, 3, 3, 3, 3, 3, 2, 0, 2, 0, 0, 2, 0, 0, 2, 0, 0, 1, 0, 0, 3, 1, 2, 2, 3, 0, 3, 0, 2, 0, 4, 4, 3, 3, 4, 1, 0, 3, 0, 0, 2, 4),
-    (0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 2, 0, 0, 0, 0, 0, 1, 0, 2, 0, 1, 0, 0, 0, 0, 0, 3, 1, 3, 0, 3, 2, 0, 0, 0, 1, 0, 3, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 0, 2, 0, 0, 0, 0, 0, 0, 2),
-    (0, 2, 1, 3, 0, 2, 0, 2, 0, 3, 3, 3, 3, 1, 3, 1, 3, 3, 3, 3, 3, 3, 4, 2, 2, 1, 2, 1, 4, 0, 4, 3, 1, 3, 3, 3, 2, 4, 3, 5, 4, 3, 3, 3, 3, 3, 3, 3, 0, 1, 3, 0, 2, 0, 0, 1, 0, 0, 1, 0, 0, 4, 2, 0, 2, 3, 0, 3, 3, 0, 3, 3, 4, 2, 3, 1, 4, 0, 1, 2, 0, 2, 3),
-    (0, 3, 0, 3, 0, 1, 0, 3, 0, 2, 3, 3, 3, 0, 3, 1, 2, 0, 3, 3, 2, 3, 3, 2, 3, 2, 3, 1, 3, 0, 4, 3, 2, 0, 3, 3, 1, 4, 3, 3, 2, 3, 4, 3, 1, 3, 3, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 4, 1, 1, 0, 3, 0, 3, 1, 0, 2, 3, 3, 3, 3, 3, 1, 0, 0, 2, 0, 3, 3),
-    (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 3, 0, 3, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 2, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 3),
-    (0, 2, 0, 3, 1, 3, 0, 3, 0, 2, 3, 3, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 1, 3, 0, 2, 3, 1, 1, 4, 3, 3, 2, 3, 3, 1, 2, 2, 4, 1, 3, 3, 0, 1, 4, 2, 3, 0, 1, 3, 0, 3, 0, 0, 1, 3, 0, 2, 0, 0, 3, 3, 2, 1, 3, 0, 3, 0, 2, 0, 3, 4, 4, 4, 3, 1, 0, 3, 0, 0, 3, 3),
-    (0, 2, 0, 1, 0, 2, 0, 0, 0, 1, 3, 2, 2, 1, 3, 0, 1, 1, 3, 0, 3, 2, 3, 1, 2, 0, 2, 0, 1, 1, 3, 3, 3, 0, 3, 3, 1, 1, 2, 3, 2, 3, 3, 1, 2, 3, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 3, 0, 1, 0, 0, 2, 1, 2, 1, 3, 0, 3, 0, 0, 0, 3, 4, 4, 4, 3, 2, 0, 2, 0, 0, 2, 4),
-    (0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 3),
-    (0, 3, 0, 3, 0, 2, 0, 3, 0, 3, 3, 3, 2, 3, 2, 2, 2, 0, 3, 1, 3, 3, 3, 2, 3, 3, 0, 0, 3, 0, 3, 2, 2, 0, 2, 3, 1, 4, 3, 4, 3, 3, 2, 3, 1, 5, 4, 4, 0, 3, 1, 2, 1, 3, 0, 3, 1, 1, 2, 0, 2, 3, 1, 3, 1, 3, 0, 3, 0, 1, 0, 3, 3, 4, 4, 2, 1, 0, 2, 1, 0, 2, 4),
-    (0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 4, 2, 5, 1, 4, 0, 2, 0, 2, 1, 3, 1, 4, 0, 2, 1, 0, 0, 2, 1, 4, 1, 1, 0, 3, 3, 0, 5, 1, 3, 2, 3, 3, 1, 0, 3, 2, 3, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, 1, 0, 3, 0, 2, 0, 1, 0, 3, 3, 3, 4, 3, 3, 0, 0, 0, 0, 2, 3),
-    (0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 1, 0, 0, 0, 0, 0, 3),
-    (0, 1, 0, 3, 0, 4, 0, 3, 0, 2, 4, 3, 1, 0, 3, 2, 2, 1, 3, 1, 2, 2, 3, 1, 1, 1, 2, 1, 3, 0, 1, 2, 0, 1, 3, 2, 1, 3, 0, 5, 5, 1, 0, 0, 1, 3, 2, 1, 0, 3, 0, 0, 1, 0, 0, 0, 0, 0, 3, 4, 0, 1, 1, 1, 3, 2, 0, 2, 0, 1, 0, 2, 3, 3, 1, 2, 3, 0, 1, 0, 1, 0, 4),
-    (0, 0, 0, 1, 0, 3, 0, 3, 0, 2, 2, 1, 0, 0, 4, 0, 3, 0, 3, 1, 3, 0, 3, 0, 3, 0, 1, 0, 3, 0, 3, 1, 3, 0, 3, 3, 0, 0, 1, 2, 1, 1, 1, 0, 1, 2, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 1, 2, 0, 0, 2, 0, 0, 0, 0, 2, 3, 3, 3, 3, 0, 0, 0, 0, 1, 4),
-    (0, 0, 0, 3, 0, 3, 0, 0, 0, 0, 3, 1, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 2, 0, 2, 3, 0, 0, 2, 2, 3, 1, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0, 0, 2, 3),
-    (2, 4, 0, 5, 0, 5, 0, 4, 0, 3, 4, 3, 3, 3, 4, 3, 3, 3, 4, 3, 4, 4, 5, 4, 5, 5, 5, 2, 3, 0, 5, 5, 4, 1, 5, 4, 3, 1, 5, 4, 3, 4, 4, 3, 3, 4, 3, 3, 0, 3, 2, 0, 2, 3, 0, 3, 0, 0, 3, 3, 0, 5, 3, 2, 3, 3, 0, 3, 0, 3, 0, 3, 4, 5, 4, 5, 3, 0, 4, 3, 0, 3, 4),
-    (0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 3, 4, 3, 2, 3, 2, 3, 0, 4, 3, 3, 3, 3, 3, 3, 3, 3, 0, 3, 2, 4, 3, 3, 1, 3, 4, 3, 4, 4, 4, 3, 4, 4, 3, 2, 4, 4, 1, 0, 2, 0, 0, 1, 1, 0, 2, 0, 0, 3, 1, 0, 5, 3, 2, 1, 3, 0, 3, 0, 1, 2, 4, 3, 2, 4, 3, 3, 0, 3, 2, 0, 4, 4),
-    (0, 3, 0, 3, 0, 1, 0, 0, 0, 1, 4, 3, 3, 2, 3, 1, 3, 1, 4, 2, 3, 2, 4, 2, 3, 4, 3, 0, 2, 2, 3, 3, 3, 0, 3, 3, 3, 0, 3, 4, 1, 3, 3, 0, 3, 4, 3, 3, 0, 1, 1, 0, 1, 0, 0, 0, 4, 0, 3, 0, 0, 3, 1, 2, 1, 3, 0, 4, 0, 1, 0, 4, 3, 3, 4, 3, 3, 0, 2, 0, 0, 3, 3),
-    (0, 3, 0, 4, 0, 1, 0, 3, 0, 3, 4, 3, 3, 0, 3, 3, 3, 1, 3, 1, 3, 3, 4, 3, 3, 3, 0, 0, 3, 1, 5, 3, 3, 1, 3, 3, 2, 5, 4, 3, 3, 4, 5, 3, 2, 5, 3, 4, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1, 0, 4, 2, 2, 1, 3, 0, 3, 0, 2, 0, 4, 4, 3, 5, 3, 2, 0, 1, 1, 0, 3, 4),
-    (0, 5, 0, 4, 0, 5, 0, 2, 0, 4, 4, 3, 3, 2, 3, 3, 3, 1, 4, 3, 4, 1, 5, 3, 4, 3, 4, 0, 4, 2, 4, 3, 4, 1, 5, 4, 0, 4, 4, 4, 4, 5, 4, 1, 3, 5, 4, 2, 1, 4, 1, 1, 3, 2, 0, 3, 1, 0, 3, 2, 1, 4, 3, 3, 3, 4, 0, 4, 0, 3, 0, 4, 4, 4, 3, 3, 3, 0, 4, 2, 0, 3, 4),
-    (1, 4, 0, 4, 0, 3, 0, 1, 0, 3, 3, 3, 1, 1, 3, 3, 2, 2, 3, 3, 1, 0, 3, 2, 2, 1, 2, 0, 3, 1, 2, 1, 2, 0, 3, 2, 0, 2, 2, 3, 3, 4, 3, 0, 3, 3, 1, 2, 0, 1, 1, 3, 1, 2, 0, 0, 3, 0, 1, 1, 0, 3, 2, 2, 3, 3, 0, 3, 0, 0, 0, 2, 3, 3, 4, 3, 3, 0, 1, 0, 0, 1, 4),
-    (0, 4, 0, 4, 0, 4, 0, 0, 0, 3, 4, 4, 3, 1, 4, 2, 3, 2, 3, 3, 3, 1, 4, 3, 4, 0, 3, 0, 4, 2, 3, 3, 2, 2, 5, 4, 2, 1, 3, 4, 3, 4, 3, 1, 3, 3, 4, 2, 0, 2, 1, 0, 3, 3, 0, 0, 2, 0, 3, 1, 0, 4, 4, 3, 4, 3, 0, 4, 0, 1, 0, 2, 4, 4, 4, 4, 4, 0, 3, 2, 0, 3, 3),
-    (0, 0, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 2, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 2),
-    (0, 2, 0, 3, 0, 4, 0, 4, 0, 1, 3, 3, 3, 0, 4, 0, 2, 1, 2, 1, 1, 1, 2, 0, 3, 1, 1, 0, 1, 0, 3, 1, 0, 0, 3, 3, 2, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 2, 0, 2, 2, 0, 3, 1, 0, 0, 1, 0, 1, 1, 0, 1, 2, 0, 3, 0, 0, 0, 0, 1, 0, 0, 3, 3, 4, 3, 1, 0, 1, 0, 3, 0, 2),
-    (0, 0, 0, 3, 0, 5, 0, 0, 0, 0, 1, 0, 2, 0, 3, 1, 0, 1, 3, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 4, 0, 0, 0, 2, 3, 0, 1, 4, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 3, 0, 0, 0, 0, 0, 3),
-    (0, 2, 0, 5, 0, 5, 0, 1, 0, 2, 4, 3, 3, 2, 5, 1, 3, 2, 3, 3, 3, 0, 4, 1, 2, 0, 3, 0, 4, 0, 2, 2, 1, 1, 5, 3, 0, 0, 1, 4, 2, 3, 2, 0, 3, 3, 3, 2, 0, 2, 4, 1, 1, 2, 0, 1, 1, 0, 3, 1, 0, 1, 3, 1, 2, 3, 0, 2, 0, 0, 0, 1, 3, 5, 4, 4, 4, 0, 3, 0, 0, 1, 3),
-    (0, 4, 0, 5, 0, 4, 0, 4, 0, 4, 5, 4, 3, 3, 4, 3, 3, 3, 4, 3, 4, 4, 5, 3, 4, 5, 4, 2, 4, 2, 3, 4, 3, 1, 4, 4, 1, 3, 5, 4, 4, 5, 5, 4, 4, 5, 5, 5, 2, 3, 3, 1, 4, 3, 1, 3, 3, 0, 3, 3, 1, 4, 3, 4, 4, 4, 0, 3, 0, 4, 0, 3, 3, 4, 4, 5, 0, 0, 4, 3, 0, 4, 5),
-    (0, 4, 0, 4, 0, 3, 0, 3, 0, 3, 4, 4, 4, 3, 3, 2, 4, 3, 4, 3, 4, 3, 5, 3, 4, 3, 2, 1, 4, 2, 4, 4, 3, 1, 3, 4, 2, 4, 5, 5, 3, 4, 5, 4, 1, 5, 4, 3, 0, 3, 2, 2, 3, 2, 1, 3, 1, 0, 3, 3, 3, 5, 3, 3, 3, 5, 4, 4, 2, 3, 3, 4, 3, 3, 3, 2, 1, 0, 3, 2, 1, 4, 3),
-    (0, 4, 0, 5, 0, 4, 0, 3, 0, 3, 5, 5, 3, 2, 4, 3, 4, 0, 5, 4, 4, 1, 4, 4, 4, 3, 3, 3, 4, 3, 5, 5, 2, 3, 3, 4, 1, 2, 5, 5, 3, 5, 5, 2, 3, 5, 5, 4, 0, 3, 2, 0, 3, 3, 1, 1, 5, 1, 4, 1, 0, 4, 3, 2, 3, 5, 0, 4, 0, 3, 0, 5, 4, 3, 4, 3, 0, 0, 4, 1, 0, 4, 4),
-    (1, 3, 0, 4, 0, 2, 0, 2, 0, 2, 5, 5, 3, 3, 3, 3, 3, 0, 4, 2, 3, 4, 4, 4, 3, 4, 0, 0, 3, 4, 5, 4, 3, 3, 3, 3, 2, 5, 5, 4, 5, 5, 5, 4, 3, 5, 5, 5, 1, 3, 1, 0, 1, 0, 0, 3, 2, 0, 4, 2, 0, 5, 2, 3, 2, 4, 1, 3, 0, 3, 0, 4, 5, 4, 5, 4, 3, 0, 4, 2, 0, 5, 4),
-    (0, 3, 0, 4, 0, 5, 0, 3, 0, 3, 4, 4, 3, 2, 3, 2, 3, 3, 3, 3, 3, 2, 4, 3, 3, 2, 2, 0, 3, 3, 3, 3, 3, 1, 3, 3, 3, 0, 4, 4, 3, 4, 4, 1, 1, 4, 4, 2, 0, 3, 1, 0, 1, 1, 0, 4, 1, 0, 2, 3, 1, 3, 3, 1, 3, 4, 0, 3, 0, 1, 0, 3, 1, 3, 0, 0, 1, 0, 2, 0, 0, 4, 4),
-    (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
-    (0, 3, 0, 3, 0, 2, 0, 3, 0, 1, 5, 4, 3, 3, 3, 1, 4, 2, 1, 2, 3, 4, 4, 2, 4, 4, 5, 0, 3, 1, 4, 3, 4, 0, 4, 3, 3, 3, 2, 3, 2, 5, 3, 4, 3, 2, 2, 3, 0, 0, 3, 0, 2, 1, 0, 1, 2, 0, 0, 0, 0, 2, 1, 1, 3, 1, 0, 2, 0, 4, 0, 3, 4, 4, 4, 5, 2, 0, 2, 0, 0, 1, 3),
-    (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 4, 2, 1, 1, 0, 1, 0, 3, 2, 0, 0, 3, 1, 1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 0, 0, 1, 4, 0, 4, 2, 1, 0, 0, 0, 0, 0, 1),
-    (0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 2, 0, 2, 1, 0, 0, 1, 2, 1, 0, 1, 1, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 0, 0, 0, 0, 0, 1, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 2),
-    (0, 4, 0, 4, 0, 4, 0, 3, 0, 4, 4, 3, 4, 2, 4, 3, 2, 0, 4, 4, 4, 3, 5, 3, 5, 3, 3, 2, 4, 2, 4, 3, 4, 3, 1, 4, 0, 2, 3, 4, 4, 4, 3, 3, 3, 4, 4, 4, 3, 4, 1, 3, 4, 3, 2, 1, 2, 1, 3, 3, 3, 4, 4, 3, 3, 5, 0, 4, 0, 3, 0, 4, 3, 3, 3, 2, 1, 0, 3, 0, 0, 3, 3),
-    (0, 4, 0, 3, 0, 3, 0, 3, 0, 3, 5, 5, 3, 3, 3, 3, 4, 3, 4, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 3, 5, 3, 3, 1, 3, 2, 4, 5, 5, 5, 5, 4, 3, 4, 5, 5, 3, 2, 2, 3, 3, 3, 3, 2, 3, 3, 1, 2, 3, 2, 4, 3, 3, 3, 4, 0, 4, 0, 2, 0, 4, 3, 2, 2, 1, 2, 0, 3, 0, 0, 4, 1),
-)
-# fmt: on
-
-
-class JapaneseContextAnalysis:
-    NUM_OF_CATEGORY = 6
-    DONT_KNOW = -1
-    ENOUGH_REL_THRESHOLD = 100
-    MAX_REL_THRESHOLD = 1000
-    MINIMUM_DATA_THRESHOLD = 4
-
-    def __init__(self) -> None:
-        self._total_rel = 0
-        self._rel_sample: List[int] = []
-        self._need_to_skip_char_num = 0
-        self._last_char_order = -1
-        self._done = False
-        self.reset()
-
-    def reset(self) -> None:
-        self._total_rel = 0  # total sequence received
-        # category counters, each integer counts sequence in its category
-        self._rel_sample = [0] * self.NUM_OF_CATEGORY
-        # if last byte in current buffer is not the last byte of a character,
-        # we need to know how many bytes to skip in next buffer
-        self._need_to_skip_char_num = 0
-        self._last_char_order = -1  # The order of previous char
-        # If this flag is set to True, detection is done and conclusion has
-        # been made
-        self._done = False
-
-    def feed(self, byte_str: Union[bytes, bytearray], num_bytes: int) -> None:
-        if self._done:
-            return
-
-        # The buffer we got is byte oriented, and a character may span in more than one
-        # buffers. In case the last one or two byte in last buffer is not
-        # complete, we record how many byte needed to complete that character
-        # and skip these bytes here.  We can choose to record those bytes as
-        # well and analyse the character once it is complete, but since a
-        # character will not make much difference, by simply skipping
-        # this character will simply our logic and improve performance.
-        i = self._need_to_skip_char_num
-        while i < num_bytes:
-            order, char_len = self.get_order(byte_str[i : i + 2])
-            i += char_len
-            if i > num_bytes:
-                self._need_to_skip_char_num = i - num_bytes
-                self._last_char_order = -1
-            else:
-                if (order != -1) and (self._last_char_order != -1):
-                    self._total_rel += 1
-                    if self._total_rel > self.MAX_REL_THRESHOLD:
-                        self._done = True
-                        break
-                    self._rel_sample[
-                        jp2_char_context[self._last_char_order][order]
-                    ] += 1
-                self._last_char_order = order
-
-    def got_enough_data(self) -> bool:
-        return self._total_rel > self.ENOUGH_REL_THRESHOLD
-
-    def get_confidence(self) -> float:
-        # This is just one way to calculate confidence. It works well for me.
-        if self._total_rel > self.MINIMUM_DATA_THRESHOLD:
-            return (self._total_rel - self._rel_sample[0]) / self._total_rel
-        return self.DONT_KNOW
-
-    def get_order(self, _: Union[bytes, bytearray]) -> Tuple[int, int]:
-        return -1, 1
-
-
-class SJISContextAnalysis(JapaneseContextAnalysis):
-    def __init__(self) -> None:
-        super().__init__()
-        self._charset_name = "SHIFT_JIS"
-
-    @property
-    def charset_name(self) -> str:
-        return self._charset_name
-
-    def get_order(self, byte_str: Union[bytes, bytearray]) -> Tuple[int, int]:
-        if not byte_str:
-            return -1, 1
-        # find out current char's byte length
-        first_char = byte_str[0]
-        if (0x81 <= first_char <= 0x9F) or (0xE0 <= first_char <= 0xFC):
-            char_len = 2
-            if (first_char == 0x87) or (0xFA <= first_char <= 0xFC):
-                self._charset_name = "CP932"
-        else:
-            char_len = 1
-
-        # return its order if it is hiragana
-        if len(byte_str) > 1:
-            second_char = byte_str[1]
-            if (first_char == 202) and (0x9F <= second_char <= 0xF1):
-                return second_char - 0x9F, char_len
-
-        return -1, char_len
-
-
-class EUCJPContextAnalysis(JapaneseContextAnalysis):
-    def get_order(self, byte_str: Union[bytes, bytearray]) -> Tuple[int, int]:
-        if not byte_str:
-            return -1, 1
-        # find out current char's byte length
-        first_char = byte_str[0]
-        if (first_char == 0x8E) or (0xA1 <= first_char <= 0xFE):
-            char_len = 2
-        elif first_char == 0x8F:
-            char_len = 3
-        else:
-            char_len = 1
-
-        # return its order if it is hiragana
-        if len(byte_str) > 1:
-            second_char = byte_str[1]
-            if (first_char == 0xA4) and (0xA1 <= second_char <= 0xF3):
-                return second_char - 0xA1, char_len
-
-        return -1, char_len
diff --git a/src/pip/_vendor/chardet/langbulgarianmodel.py b/src/pip/_vendor/chardet/langbulgarianmodel.py
deleted file mode 100644
index 994668219dd..00000000000
--- a/src/pip/_vendor/chardet/langbulgarianmodel.py
+++ /dev/null
@@ -1,4649 +0,0 @@
-from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel
-
-# 3: Positive
-# 2: Likely
-# 1: Unlikely
-# 0: Negative
-
-BULGARIAN_LANG_MODEL = {
-    63: {  # 'e'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 0,  # 'а'
-        18: 1,  # 'б'
-        9: 1,  # 'в'
-        20: 1,  # 'г'
-        11: 1,  # 'д'
-        3: 1,  # 'е'
-        23: 1,  # 'ж'
-        15: 1,  # 'з'
-        2: 0,  # 'и'
-        26: 1,  # 'й'
-        12: 1,  # 'к'
-        10: 1,  # 'л'
-        14: 1,  # 'м'
-        6: 1,  # 'н'
-        4: 1,  # 'о'
-        13: 1,  # 'п'
-        7: 1,  # 'р'
-        8: 1,  # 'с'
-        5: 1,  # 'т'
-        19: 0,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 1,  # 'ч'
-        27: 1,  # 'ш'
-        24: 1,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    45: {  # '\xad'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 0,  # 'Г'
-        37: 1,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 0,  # 'Л'
-        38: 1,  # 'М'
-        36: 0,  # 'Н'
-        41: 1,  # 'О'
-        30: 1,  # 'П'
-        39: 1,  # 'Р'
-        28: 1,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 0,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 0,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 0,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 0,  # 'о'
-        13: 0,  # 'п'
-        7: 0,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 0,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    31: {  # 'А'
-        63: 0,  # 'e'
-        45: 1,  # '\xad'
-        31: 1,  # 'А'
-        32: 1,  # 'Б'
-        35: 2,  # 'В'
-        43: 1,  # 'Г'
-        37: 2,  # 'Д'
-        44: 2,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 2,  # 'З'
-        40: 1,  # 'И'
-        59: 1,  # 'Й'
-        33: 1,  # 'К'
-        46: 2,  # 'Л'
-        38: 1,  # 'М'
-        36: 2,  # 'Н'
-        41: 1,  # 'О'
-        30: 2,  # 'П'
-        39: 2,  # 'Р'
-        28: 2,  # 'С'
-        34: 2,  # 'Т'
-        51: 1,  # 'У'
-        48: 2,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 1,  # 'Ш'
-        57: 2,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 1,  # 'а'
-        18: 2,  # 'б'
-        9: 2,  # 'в'
-        20: 2,  # 'г'
-        11: 2,  # 'д'
-        3: 1,  # 'е'
-        23: 1,  # 'ж'
-        15: 2,  # 'з'
-        2: 0,  # 'и'
-        26: 2,  # 'й'
-        12: 2,  # 'к'
-        10: 3,  # 'л'
-        14: 2,  # 'м'
-        6: 3,  # 'н'
-        4: 0,  # 'о'
-        13: 2,  # 'п'
-        7: 2,  # 'р'
-        8: 2,  # 'с'
-        5: 2,  # 'т'
-        19: 1,  # 'у'
-        29: 2,  # 'ф'
-        25: 1,  # 'х'
-        22: 1,  # 'ц'
-        21: 1,  # 'ч'
-        27: 1,  # 'ш'
-        24: 0,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    32: {  # 'Б'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 2,  # 'Б'
-        35: 1,  # 'В'
-        43: 1,  # 'Г'
-        37: 2,  # 'Д'
-        44: 1,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 2,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 2,  # 'Н'
-        41: 2,  # 'О'
-        30: 1,  # 'П'
-        39: 1,  # 'Р'
-        28: 2,  # 'С'
-        34: 2,  # 'Т'
-        51: 1,  # 'У'
-        48: 2,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 1,  # 'Щ'
-        61: 2,  # 'Ъ'
-        60: 1,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 1,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 2,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 2,  # 'р'
-        8: 1,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 2,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    35: {  # 'В'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 0,  # 'Г'
-        37: 1,  # 'Д'
-        44: 2,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 1,  # 'О'
-        30: 1,  # 'П'
-        39: 2,  # 'Р'
-        28: 2,  # 'С'
-        34: 1,  # 'Т'
-        51: 1,  # 'У'
-        48: 2,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 1,  # 'Ю'
-        56: 2,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 1,  # 'д'
-        3: 3,  # 'е'
-        23: 1,  # 'ж'
-        15: 2,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 2,  # 'л'
-        14: 1,  # 'м'
-        6: 2,  # 'н'
-        4: 2,  # 'о'
-        13: 1,  # 'п'
-        7: 2,  # 'р'
-        8: 2,  # 'с'
-        5: 2,  # 'т'
-        19: 1,  # 'у'
-        29: 0,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 2,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    43: {  # 'Г'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 1,  # 'Д'
-        44: 2,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 1,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 0,  # 'М'
-        36: 1,  # 'Н'
-        41: 1,  # 'О'
-        30: 0,  # 'П'
-        39: 1,  # 'Р'
-        28: 1,  # 'С'
-        34: 0,  # 'Т'
-        51: 1,  # 'У'
-        48: 1,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 1,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 1,  # 'б'
-        9: 1,  # 'в'
-        20: 0,  # 'г'
-        11: 1,  # 'д'
-        3: 3,  # 'е'
-        23: 1,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 2,  # 'л'
-        14: 1,  # 'м'
-        6: 1,  # 'н'
-        4: 2,  # 'о'
-        13: 0,  # 'п'
-        7: 2,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 1,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    37: {  # 'Д'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 2,  # 'В'
-        43: 1,  # 'Г'
-        37: 2,  # 'Д'
-        44: 2,  # 'Е'
-        55: 2,  # 'Ж'
-        47: 1,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 2,  # 'О'
-        30: 2,  # 'П'
-        39: 1,  # 'Р'
-        28: 2,  # 'С'
-        34: 1,  # 'Т'
-        51: 1,  # 'У'
-        48: 1,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 1,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 2,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 3,  # 'е'
-        23: 3,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 1,  # 'л'
-        14: 1,  # 'м'
-        6: 2,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 2,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    44: {  # 'Е'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 1,  # 'А'
-        32: 1,  # 'Б'
-        35: 2,  # 'В'
-        43: 1,  # 'Г'
-        37: 1,  # 'Д'
-        44: 1,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 1,  # 'З'
-        40: 1,  # 'И'
-        59: 1,  # 'Й'
-        33: 2,  # 'К'
-        46: 2,  # 'Л'
-        38: 1,  # 'М'
-        36: 2,  # 'Н'
-        41: 2,  # 'О'
-        30: 1,  # 'П'
-        39: 2,  # 'Р'
-        28: 2,  # 'С'
-        34: 2,  # 'Т'
-        51: 1,  # 'У'
-        48: 2,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 2,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 1,  # 'Ш'
-        57: 1,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 0,  # 'а'
-        18: 1,  # 'б'
-        9: 2,  # 'в'
-        20: 1,  # 'г'
-        11: 2,  # 'д'
-        3: 0,  # 'е'
-        23: 1,  # 'ж'
-        15: 1,  # 'з'
-        2: 0,  # 'и'
-        26: 1,  # 'й'
-        12: 2,  # 'к'
-        10: 2,  # 'л'
-        14: 2,  # 'м'
-        6: 2,  # 'н'
-        4: 0,  # 'о'
-        13: 1,  # 'п'
-        7: 2,  # 'р'
-        8: 2,  # 'с'
-        5: 1,  # 'т'
-        19: 1,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 1,  # 'ч'
-        27: 1,  # 'ш'
-        24: 1,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    55: {  # 'Ж'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 1,  # 'А'
-        32: 0,  # 'Б'
-        35: 1,  # 'В'
-        43: 0,  # 'Г'
-        37: 1,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 1,  # 'Н'
-        41: 1,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 1,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 1,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 2,  # 'о'
-        13: 1,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 1,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    47: {  # 'З'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 1,  # 'Г'
-        37: 1,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 1,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 2,  # 'Н'
-        41: 1,  # 'О'
-        30: 1,  # 'П'
-        39: 1,  # 'Р'
-        28: 1,  # 'С'
-        34: 1,  # 'Т'
-        51: 1,  # 'У'
-        48: 0,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 2,  # 'в'
-        20: 1,  # 'г'
-        11: 2,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 1,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 2,  # 'л'
-        14: 1,  # 'м'
-        6: 1,  # 'н'
-        4: 1,  # 'о'
-        13: 0,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 1,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    40: {  # 'И'
-        63: 0,  # 'e'
-        45: 1,  # '\xad'
-        31: 1,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 1,  # 'Г'
-        37: 1,  # 'Д'
-        44: 2,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 2,  # 'З'
-        40: 1,  # 'И'
-        59: 1,  # 'Й'
-        33: 2,  # 'К'
-        46: 2,  # 'Л'
-        38: 2,  # 'М'
-        36: 2,  # 'Н'
-        41: 1,  # 'О'
-        30: 1,  # 'П'
-        39: 2,  # 'Р'
-        28: 2,  # 'С'
-        34: 2,  # 'Т'
-        51: 0,  # 'У'
-        48: 1,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 1,  # 'Ш'
-        57: 1,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 2,  # 'Я'
-        1: 1,  # 'а'
-        18: 1,  # 'б'
-        9: 3,  # 'в'
-        20: 2,  # 'г'
-        11: 1,  # 'д'
-        3: 1,  # 'е'
-        23: 0,  # 'ж'
-        15: 3,  # 'з'
-        2: 0,  # 'и'
-        26: 1,  # 'й'
-        12: 1,  # 'к'
-        10: 2,  # 'л'
-        14: 2,  # 'м'
-        6: 2,  # 'н'
-        4: 0,  # 'о'
-        13: 1,  # 'п'
-        7: 2,  # 'р'
-        8: 2,  # 'с'
-        5: 2,  # 'т'
-        19: 0,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 1,  # 'ц'
-        21: 1,  # 'ч'
-        27: 1,  # 'ш'
-        24: 1,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    59: {  # 'Й'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 1,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 1,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 1,  # 'С'
-        34: 1,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 0,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 1,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 0,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 2,  # 'о'
-        13: 0,  # 'п'
-        7: 0,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 0,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    33: {  # 'К'
-        63: 0,  # 'e'
-        45: 1,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 1,  # 'Г'
-        37: 1,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 1,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 0,  # 'М'
-        36: 2,  # 'Н'
-        41: 2,  # 'О'
-        30: 2,  # 'П'
-        39: 1,  # 'Р'
-        28: 2,  # 'С'
-        34: 1,  # 'Т'
-        51: 1,  # 'У'
-        48: 1,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 1,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 1,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 2,  # 'е'
-        23: 1,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 2,  # 'л'
-        14: 1,  # 'м'
-        6: 2,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 3,  # 'р'
-        8: 1,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 1,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    46: {  # 'Л'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 2,  # 'Г'
-        37: 1,  # 'Д'
-        44: 2,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 1,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 0,  # 'М'
-        36: 1,  # 'Н'
-        41: 2,  # 'О'
-        30: 1,  # 'П'
-        39: 0,  # 'Р'
-        28: 1,  # 'С'
-        34: 1,  # 'Т'
-        51: 1,  # 'У'
-        48: 0,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 1,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 2,  # 'а'
-        18: 0,  # 'б'
-        9: 1,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 2,  # 'о'
-        13: 0,  # 'п'
-        7: 0,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    38: {  # 'М'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 2,  # 'В'
-        43: 0,  # 'Г'
-        37: 1,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 1,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 2,  # 'О'
-        30: 1,  # 'П'
-        39: 1,  # 'Р'
-        28: 2,  # 'С'
-        34: 1,  # 'Т'
-        51: 1,  # 'У'
-        48: 1,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 2,  # 'л'
-        14: 0,  # 'м'
-        6: 2,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    36: {  # 'Н'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 2,  # 'Б'
-        35: 1,  # 'В'
-        43: 1,  # 'Г'
-        37: 2,  # 'Д'
-        44: 2,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 1,  # 'З'
-        40: 2,  # 'И'
-        59: 1,  # 'Й'
-        33: 2,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 2,  # 'О'
-        30: 1,  # 'П'
-        39: 1,  # 'Р'
-        28: 2,  # 'С'
-        34: 2,  # 'Т'
-        51: 1,  # 'У'
-        48: 1,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 1,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 1,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 1,  # 'г'
-        11: 0,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 0,  # 'р'
-        8: 0,  # 'с'
-        5: 1,  # 'т'
-        19: 1,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 1,  # 'ш'
-        24: 0,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 2,  # 'ю'
-        16: 2,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    41: {  # 'О'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 1,  # 'А'
-        32: 1,  # 'Б'
-        35: 2,  # 'В'
-        43: 1,  # 'Г'
-        37: 2,  # 'Д'
-        44: 1,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 1,  # 'З'
-        40: 1,  # 'И'
-        59: 1,  # 'Й'
-        33: 2,  # 'К'
-        46: 2,  # 'Л'
-        38: 2,  # 'М'
-        36: 2,  # 'Н'
-        41: 2,  # 'О'
-        30: 1,  # 'П'
-        39: 2,  # 'Р'
-        28: 2,  # 'С'
-        34: 2,  # 'Т'
-        51: 1,  # 'У'
-        48: 1,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 1,  # 'Ш'
-        57: 1,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 1,  # 'а'
-        18: 2,  # 'б'
-        9: 2,  # 'в'
-        20: 2,  # 'г'
-        11: 1,  # 'д'
-        3: 1,  # 'е'
-        23: 1,  # 'ж'
-        15: 1,  # 'з'
-        2: 0,  # 'и'
-        26: 1,  # 'й'
-        12: 2,  # 'к'
-        10: 2,  # 'л'
-        14: 1,  # 'м'
-        6: 1,  # 'н'
-        4: 0,  # 'о'
-        13: 2,  # 'п'
-        7: 2,  # 'р'
-        8: 2,  # 'с'
-        5: 3,  # 'т'
-        19: 1,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 1,  # 'ц'
-        21: 2,  # 'ч'
-        27: 0,  # 'ш'
-        24: 2,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    30: {  # 'П'
-        63: 0,  # 'e'
-        45: 1,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 1,  # 'Г'
-        37: 1,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 1,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 2,  # 'О'
-        30: 2,  # 'П'
-        39: 2,  # 'Р'
-        28: 2,  # 'С'
-        34: 1,  # 'Т'
-        51: 2,  # 'У'
-        48: 1,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 1,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 1,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 2,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 3,  # 'л'
-        14: 0,  # 'м'
-        6: 1,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 3,  # 'р'
-        8: 1,  # 'с'
-        5: 1,  # 'т'
-        19: 2,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 1,  # 'ч'
-        27: 1,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    39: {  # 'Р'
-        63: 0,  # 'e'
-        45: 1,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 2,  # 'Г'
-        37: 2,  # 'Д'
-        44: 2,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 1,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 0,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 2,  # 'О'
-        30: 2,  # 'П'
-        39: 1,  # 'Р'
-        28: 1,  # 'С'
-        34: 1,  # 'Т'
-        51: 1,  # 'У'
-        48: 1,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 1,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 1,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 0,  # 'р'
-        8: 1,  # 'с'
-        5: 0,  # 'т'
-        19: 3,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    28: {  # 'С'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 3,  # 'А'
-        32: 2,  # 'Б'
-        35: 2,  # 'В'
-        43: 1,  # 'Г'
-        37: 2,  # 'Д'
-        44: 2,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 1,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 2,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 2,  # 'О'
-        30: 2,  # 'П'
-        39: 1,  # 'Р'
-        28: 2,  # 'С'
-        34: 2,  # 'Т'
-        51: 1,  # 'У'
-        48: 1,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 1,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 2,  # 'в'
-        20: 1,  # 'г'
-        11: 1,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 2,  # 'к'
-        10: 3,  # 'л'
-        14: 2,  # 'м'
-        6: 1,  # 'н'
-        4: 3,  # 'о'
-        13: 3,  # 'п'
-        7: 2,  # 'р'
-        8: 0,  # 'с'
-        5: 3,  # 'т'
-        19: 2,  # 'у'
-        29: 2,  # 'ф'
-        25: 1,  # 'х'
-        22: 1,  # 'ц'
-        21: 1,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    34: {  # 'Т'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 2,  # 'Б'
-        35: 1,  # 'В'
-        43: 0,  # 'Г'
-        37: 1,  # 'Д'
-        44: 2,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 2,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 2,  # 'О'
-        30: 1,  # 'П'
-        39: 2,  # 'Р'
-        28: 2,  # 'С'
-        34: 1,  # 'Т'
-        51: 1,  # 'У'
-        48: 1,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 1,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 1,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 1,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 1,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 3,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 2,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    51: {  # 'У'
-        63: 0,  # 'e'
-        45: 1,  # '\xad'
-        31: 1,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 1,  # 'Г'
-        37: 1,  # 'Д'
-        44: 2,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 1,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 0,  # 'О'
-        30: 1,  # 'П'
-        39: 1,  # 'Р'
-        28: 1,  # 'С'
-        34: 2,  # 'Т'
-        51: 0,  # 'У'
-        48: 1,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 1,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 1,  # 'а'
-        18: 1,  # 'б'
-        9: 2,  # 'в'
-        20: 1,  # 'г'
-        11: 1,  # 'д'
-        3: 2,  # 'е'
-        23: 1,  # 'ж'
-        15: 1,  # 'з'
-        2: 2,  # 'и'
-        26: 1,  # 'й'
-        12: 2,  # 'к'
-        10: 1,  # 'л'
-        14: 1,  # 'м'
-        6: 2,  # 'н'
-        4: 2,  # 'о'
-        13: 1,  # 'п'
-        7: 1,  # 'р'
-        8: 2,  # 'с'
-        5: 1,  # 'т'
-        19: 1,  # 'у'
-        29: 0,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 2,  # 'ч'
-        27: 1,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    48: {  # 'Ф'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 0,  # 'М'
-        36: 1,  # 'Н'
-        41: 1,  # 'О'
-        30: 2,  # 'П'
-        39: 1,  # 'Р'
-        28: 2,  # 'С'
-        34: 1,  # 'Т'
-        51: 1,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 2,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 2,  # 'о'
-        13: 0,  # 'п'
-        7: 2,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 1,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    49: {  # 'Х'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 1,  # 'А'
-        32: 0,  # 'Б'
-        35: 1,  # 'В'
-        43: 1,  # 'Г'
-        37: 1,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 1,  # 'О'
-        30: 1,  # 'П'
-        39: 1,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 0,  # 'б'
-        9: 1,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 1,  # 'л'
-        14: 1,  # 'м'
-        6: 0,  # 'н'
-        4: 2,  # 'о'
-        13: 0,  # 'п'
-        7: 2,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    53: {  # 'Ц'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 1,  # 'А'
-        32: 0,  # 'Б'
-        35: 1,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 2,  # 'И'
-        59: 0,  # 'Й'
-        33: 2,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 1,  # 'Р'
-        28: 2,  # 'С'
-        34: 0,  # 'Т'
-        51: 1,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 0,  # 'б'
-        9: 2,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 1,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 1,  # 'о'
-        13: 0,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 1,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    50: {  # 'Ч'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 2,  # 'А'
-        32: 1,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 1,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 0,  # 'М'
-        36: 1,  # 'Н'
-        41: 1,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 1,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 3,  # 'е'
-        23: 1,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 1,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 2,  # 'о'
-        13: 0,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    54: {  # 'Ш'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 1,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 1,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 1,  # 'Н'
-        41: 1,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 1,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 0,  # 'б'
-        9: 2,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 2,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 1,  # 'л'
-        14: 1,  # 'м'
-        6: 1,  # 'н'
-        4: 2,  # 'о'
-        13: 1,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 1,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    57: {  # 'Щ'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 1,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 1,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 1,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 1,  # 'о'
-        13: 0,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 1,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    61: {  # 'Ъ'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 0,  # 'Г'
-        37: 1,  # 'Д'
-        44: 0,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 1,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 2,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 0,  # 'О'
-        30: 1,  # 'П'
-        39: 2,  # 'Р'
-        28: 1,  # 'С'
-        34: 1,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 1,  # 'Х'
-        53: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        54: 1,  # 'Ш'
-        57: 1,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 0,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 0,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 0,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 1,  # 'л'
-        14: 0,  # 'м'
-        6: 1,  # 'н'
-        4: 0,  # 'о'
-        13: 0,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 0,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    60: {  # 'Ю'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 1,  # 'А'
-        32: 1,  # 'Б'
-        35: 0,  # 'В'
-        43: 1,  # 'Г'
-        37: 1,  # 'Д'
-        44: 0,  # 'Е'
-        55: 1,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 0,  # 'М'
-        36: 1,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 1,  # 'Р'
-        28: 1,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 0,  # 'а'
-        18: 1,  # 'б'
-        9: 1,  # 'в'
-        20: 2,  # 'г'
-        11: 1,  # 'д'
-        3: 0,  # 'е'
-        23: 2,  # 'ж'
-        15: 1,  # 'з'
-        2: 1,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 1,  # 'л'
-        14: 1,  # 'м'
-        6: 1,  # 'н'
-        4: 0,  # 'о'
-        13: 1,  # 'п'
-        7: 1,  # 'р'
-        8: 1,  # 'с'
-        5: 1,  # 'т'
-        19: 0,  # 'у'
-        29: 0,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    56: {  # 'Я'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 1,  # 'Б'
-        35: 1,  # 'В'
-        43: 1,  # 'Г'
-        37: 1,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 1,  # 'Л'
-        38: 1,  # 'М'
-        36: 1,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 1,  # 'С'
-        34: 2,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 0,  # 'а'
-        18: 1,  # 'б'
-        9: 1,  # 'в'
-        20: 1,  # 'г'
-        11: 1,  # 'д'
-        3: 0,  # 'е'
-        23: 0,  # 'ж'
-        15: 1,  # 'з'
-        2: 1,  # 'и'
-        26: 1,  # 'й'
-        12: 1,  # 'к'
-        10: 1,  # 'л'
-        14: 2,  # 'м'
-        6: 2,  # 'н'
-        4: 0,  # 'о'
-        13: 2,  # 'п'
-        7: 1,  # 'р'
-        8: 1,  # 'с'
-        5: 1,  # 'т'
-        19: 0,  # 'у'
-        29: 0,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 1,  # 'ш'
-        24: 0,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    1: {  # 'а'
-        63: 1,  # 'e'
-        45: 1,  # '\xad'
-        31: 1,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 1,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 1,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 3,  # 'г'
-        11: 3,  # 'д'
-        3: 3,  # 'е'
-        23: 3,  # 'ж'
-        15: 3,  # 'з'
-        2: 3,  # 'и'
-        26: 3,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 2,  # 'о'
-        13: 3,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 3,  # 'у'
-        29: 3,  # 'ф'
-        25: 3,  # 'х'
-        22: 3,  # 'ц'
-        21: 3,  # 'ч'
-        27: 3,  # 'ш'
-        24: 3,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    18: {  # 'б'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 3,  # 'в'
-        20: 1,  # 'г'
-        11: 2,  # 'д'
-        3: 3,  # 'е'
-        23: 1,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 3,  # 'л'
-        14: 2,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 1,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 0,  # 'т'
-        19: 3,  # 'у'
-        29: 0,  # 'ф'
-        25: 2,  # 'х'
-        22: 1,  # 'ц'
-        21: 1,  # 'ч'
-        27: 1,  # 'ш'
-        24: 3,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    9: {  # 'в'
-        63: 1,  # 'e'
-        45: 1,  # '\xad'
-        31: 0,  # 'А'
-        32: 1,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 1,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 0,  # 'в'
-        20: 2,  # 'г'
-        11: 3,  # 'д'
-        3: 3,  # 'е'
-        23: 1,  # 'ж'
-        15: 3,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 2,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 2,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 2,  # 'х'
-        22: 2,  # 'ц'
-        21: 3,  # 'ч'
-        27: 2,  # 'ш'
-        24: 1,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    20: {  # 'г'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 2,  # 'в'
-        20: 1,  # 'г'
-        11: 2,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 3,  # 'л'
-        14: 1,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 1,  # 'п'
-        7: 3,  # 'р'
-        8: 2,  # 'с'
-        5: 2,  # 'т'
-        19: 3,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 1,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    11: {  # 'д'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 2,  # 'б'
-        9: 3,  # 'в'
-        20: 2,  # 'г'
-        11: 2,  # 'д'
-        3: 3,  # 'е'
-        23: 3,  # 'ж'
-        15: 2,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 3,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 1,  # 'т'
-        19: 3,  # 'у'
-        29: 1,  # 'ф'
-        25: 2,  # 'х'
-        22: 2,  # 'ц'
-        21: 2,  # 'ч'
-        27: 1,  # 'ш'
-        24: 1,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    3: {  # 'е'
-        63: 0,  # 'e'
-        45: 1,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 3,  # 'г'
-        11: 3,  # 'д'
-        3: 2,  # 'е'
-        23: 3,  # 'ж'
-        15: 3,  # 'з'
-        2: 2,  # 'и'
-        26: 3,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 3,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 2,  # 'у'
-        29: 3,  # 'ф'
-        25: 3,  # 'х'
-        22: 3,  # 'ц'
-        21: 3,  # 'ч'
-        27: 3,  # 'ш'
-        24: 3,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    23: {  # 'ж'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 3,  # 'б'
-        9: 2,  # 'в'
-        20: 1,  # 'г'
-        11: 3,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 2,  # 'к'
-        10: 1,  # 'л'
-        14: 1,  # 'м'
-        6: 3,  # 'н'
-        4: 2,  # 'о'
-        13: 1,  # 'п'
-        7: 1,  # 'р'
-        8: 1,  # 'с'
-        5: 1,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 1,  # 'ц'
-        21: 1,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    15: {  # 'з'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 3,  # 'г'
-        11: 3,  # 'д'
-        3: 3,  # 'е'
-        23: 1,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 3,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 3,  # 'у'
-        29: 1,  # 'ф'
-        25: 2,  # 'х'
-        22: 2,  # 'ц'
-        21: 2,  # 'ч'
-        27: 2,  # 'ш'
-        24: 1,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 2,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    2: {  # 'и'
-        63: 1,  # 'e'
-        45: 1,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 1,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 1,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 1,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 1,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 3,  # 'г'
-        11: 3,  # 'д'
-        3: 3,  # 'е'
-        23: 3,  # 'ж'
-        15: 3,  # 'з'
-        2: 3,  # 'и'
-        26: 3,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 3,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 2,  # 'у'
-        29: 3,  # 'ф'
-        25: 3,  # 'х'
-        22: 3,  # 'ц'
-        21: 3,  # 'ч'
-        27: 3,  # 'ш'
-        24: 3,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    26: {  # 'й'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 1,  # 'а'
-        18: 2,  # 'б'
-        9: 2,  # 'в'
-        20: 1,  # 'г'
-        11: 2,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 2,  # 'з'
-        2: 1,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 2,  # 'л'
-        14: 2,  # 'м'
-        6: 3,  # 'н'
-        4: 2,  # 'о'
-        13: 1,  # 'п'
-        7: 2,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 1,  # 'у'
-        29: 2,  # 'ф'
-        25: 1,  # 'х'
-        22: 2,  # 'ц'
-        21: 2,  # 'ч'
-        27: 1,  # 'ш'
-        24: 1,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    12: {  # 'к'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 1,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 1,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 3,  # 'в'
-        20: 2,  # 'г'
-        11: 1,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 2,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 3,  # 'л'
-        14: 2,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 1,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 3,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 3,  # 'ц'
-        21: 2,  # 'ч'
-        27: 1,  # 'ш'
-        24: 0,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    10: {  # 'л'
-        63: 1,  # 'e'
-        45: 1,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 1,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 3,  # 'г'
-        11: 2,  # 'д'
-        3: 3,  # 'е'
-        23: 3,  # 'ж'
-        15: 2,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 1,  # 'л'
-        14: 2,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 2,  # 'п'
-        7: 2,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 3,  # 'у'
-        29: 2,  # 'ф'
-        25: 2,  # 'х'
-        22: 2,  # 'ц'
-        21: 2,  # 'ч'
-        27: 2,  # 'ш'
-        24: 1,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 2,  # 'ь'
-        42: 3,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    14: {  # 'м'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 1,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 1,  # 'г'
-        11: 1,  # 'д'
-        3: 3,  # 'е'
-        23: 1,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 2,  # 'к'
-        10: 3,  # 'л'
-        14: 1,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 3,  # 'п'
-        7: 2,  # 'р'
-        8: 2,  # 'с'
-        5: 1,  # 'т'
-        19: 3,  # 'у'
-        29: 2,  # 'ф'
-        25: 1,  # 'х'
-        22: 2,  # 'ц'
-        21: 2,  # 'ч'
-        27: 2,  # 'ш'
-        24: 1,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    6: {  # 'н'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 1,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 2,  # 'б'
-        9: 2,  # 'в'
-        20: 3,  # 'г'
-        11: 3,  # 'д'
-        3: 3,  # 'е'
-        23: 2,  # 'ж'
-        15: 2,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 2,  # 'л'
-        14: 1,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 1,  # 'п'
-        7: 2,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 3,  # 'у'
-        29: 3,  # 'ф'
-        25: 2,  # 'х'
-        22: 3,  # 'ц'
-        21: 3,  # 'ч'
-        27: 2,  # 'ш'
-        24: 1,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 2,  # 'ь'
-        42: 2,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    4: {  # 'о'
-        63: 0,  # 'e'
-        45: 1,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 2,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 3,  # 'г'
-        11: 3,  # 'д'
-        3: 3,  # 'е'
-        23: 3,  # 'ж'
-        15: 3,  # 'з'
-        2: 3,  # 'и'
-        26: 3,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 2,  # 'о'
-        13: 3,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 2,  # 'у'
-        29: 3,  # 'ф'
-        25: 3,  # 'х'
-        22: 3,  # 'ц'
-        21: 3,  # 'ч'
-        27: 3,  # 'ш'
-        24: 3,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    13: {  # 'п'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 2,  # 'в'
-        20: 1,  # 'г'
-        11: 1,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 1,  # 'й'
-        12: 2,  # 'к'
-        10: 3,  # 'л'
-        14: 1,  # 'м'
-        6: 2,  # 'н'
-        4: 3,  # 'о'
-        13: 1,  # 'п'
-        7: 3,  # 'р'
-        8: 2,  # 'с'
-        5: 2,  # 'т'
-        19: 3,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 2,  # 'ц'
-        21: 2,  # 'ч'
-        27: 1,  # 'ш'
-        24: 1,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 2,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    7: {  # 'р'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 3,  # 'г'
-        11: 3,  # 'д'
-        3: 3,  # 'е'
-        23: 3,  # 'ж'
-        15: 2,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 2,  # 'п'
-        7: 1,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 3,  # 'у'
-        29: 2,  # 'ф'
-        25: 3,  # 'х'
-        22: 3,  # 'ц'
-        21: 2,  # 'ч'
-        27: 3,  # 'ш'
-        24: 1,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 2,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    8: {  # 'с'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 2,  # 'б'
-        9: 3,  # 'в'
-        20: 2,  # 'г'
-        11: 2,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 3,  # 'п'
-        7: 3,  # 'р'
-        8: 1,  # 'с'
-        5: 3,  # 'т'
-        19: 3,  # 'у'
-        29: 2,  # 'ф'
-        25: 2,  # 'х'
-        22: 2,  # 'ц'
-        21: 2,  # 'ч'
-        27: 2,  # 'ш'
-        24: 0,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 2,  # 'ь'
-        42: 2,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    5: {  # 'т'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 2,  # 'г'
-        11: 2,  # 'д'
-        3: 3,  # 'е'
-        23: 1,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 2,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 2,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 3,  # 'у'
-        29: 1,  # 'ф'
-        25: 2,  # 'х'
-        22: 2,  # 'ц'
-        21: 2,  # 'ч'
-        27: 1,  # 'ш'
-        24: 1,  # 'щ'
-        17: 3,  # 'ъ'
-        52: 2,  # 'ь'
-        42: 2,  # 'ю'
-        16: 3,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    19: {  # 'у'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 3,  # 'г'
-        11: 3,  # 'д'
-        3: 2,  # 'е'
-        23: 3,  # 'ж'
-        15: 3,  # 'з'
-        2: 2,  # 'и'
-        26: 2,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 2,  # 'о'
-        13: 3,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 1,  # 'у'
-        29: 2,  # 'ф'
-        25: 2,  # 'х'
-        22: 2,  # 'ц'
-        21: 3,  # 'ч'
-        27: 3,  # 'ш'
-        24: 2,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    29: {  # 'ф'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 1,  # 'в'
-        20: 1,  # 'г'
-        11: 0,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 2,  # 'к'
-        10: 2,  # 'л'
-        14: 1,  # 'м'
-        6: 1,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 2,  # 'р'
-        8: 2,  # 'с'
-        5: 2,  # 'т'
-        19: 2,  # 'у'
-        29: 0,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 1,  # 'ч'
-        27: 1,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 2,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    25: {  # 'х'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 3,  # 'в'
-        20: 0,  # 'г'
-        11: 1,  # 'д'
-        3: 2,  # 'е'
-        23: 0,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 2,  # 'л'
-        14: 2,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 1,  # 'п'
-        7: 3,  # 'р'
-        8: 1,  # 'с'
-        5: 2,  # 'т'
-        19: 3,  # 'у'
-        29: 0,  # 'ф'
-        25: 1,  # 'х'
-        22: 0,  # 'ц'
-        21: 1,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    22: {  # 'ц'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 2,  # 'в'
-        20: 1,  # 'г'
-        11: 1,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 1,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 2,  # 'к'
-        10: 1,  # 'л'
-        14: 1,  # 'м'
-        6: 1,  # 'н'
-        4: 2,  # 'о'
-        13: 1,  # 'п'
-        7: 1,  # 'р'
-        8: 1,  # 'с'
-        5: 1,  # 'т'
-        19: 2,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 1,  # 'ц'
-        21: 1,  # 'ч'
-        27: 1,  # 'ш'
-        24: 1,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 0,  # 'ю'
-        16: 2,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    21: {  # 'ч'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 1,  # 'б'
-        9: 3,  # 'в'
-        20: 1,  # 'г'
-        11: 0,  # 'д'
-        3: 3,  # 'е'
-        23: 1,  # 'ж'
-        15: 0,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 2,  # 'л'
-        14: 2,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 2,  # 'р'
-        8: 0,  # 'с'
-        5: 2,  # 'т'
-        19: 3,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 1,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    27: {  # 'ш'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 2,  # 'в'
-        20: 0,  # 'г'
-        11: 1,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 3,  # 'к'
-        10: 2,  # 'л'
-        14: 1,  # 'м'
-        6: 3,  # 'н'
-        4: 2,  # 'о'
-        13: 2,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 1,  # 'т'
-        19: 2,  # 'у'
-        29: 1,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 1,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 2,  # 'ъ'
-        52: 1,  # 'ь'
-        42: 1,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    24: {  # 'щ'
-        63: 1,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 3,  # 'а'
-        18: 0,  # 'б'
-        9: 1,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 3,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 3,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 2,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 1,  # 'р'
-        8: 0,  # 'с'
-        5: 2,  # 'т'
-        19: 3,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 1,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 2,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    17: {  # 'ъ'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 1,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 3,  # 'г'
-        11: 3,  # 'д'
-        3: 2,  # 'е'
-        23: 3,  # 'ж'
-        15: 3,  # 'з'
-        2: 1,  # 'и'
-        26: 2,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 3,  # 'о'
-        13: 3,  # 'п'
-        7: 3,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 1,  # 'у'
-        29: 1,  # 'ф'
-        25: 2,  # 'х'
-        22: 2,  # 'ц'
-        21: 3,  # 'ч'
-        27: 2,  # 'ш'
-        24: 3,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 2,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    52: {  # 'ь'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 0,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 1,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 0,  # 'и'
-        26: 0,  # 'й'
-        12: 1,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 1,  # 'н'
-        4: 3,  # 'о'
-        13: 0,  # 'п'
-        7: 0,  # 'р'
-        8: 0,  # 'с'
-        5: 1,  # 'т'
-        19: 0,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 1,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 1,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    42: {  # 'ю'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 1,  # 'а'
-        18: 2,  # 'б'
-        9: 1,  # 'в'
-        20: 2,  # 'г'
-        11: 2,  # 'д'
-        3: 1,  # 'е'
-        23: 2,  # 'ж'
-        15: 2,  # 'з'
-        2: 1,  # 'и'
-        26: 1,  # 'й'
-        12: 2,  # 'к'
-        10: 2,  # 'л'
-        14: 2,  # 'м'
-        6: 2,  # 'н'
-        4: 1,  # 'о'
-        13: 1,  # 'п'
-        7: 2,  # 'р'
-        8: 2,  # 'с'
-        5: 2,  # 'т'
-        19: 1,  # 'у'
-        29: 1,  # 'ф'
-        25: 1,  # 'х'
-        22: 2,  # 'ц'
-        21: 3,  # 'ч'
-        27: 1,  # 'ш'
-        24: 1,  # 'щ'
-        17: 1,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    16: {  # 'я'
-        63: 0,  # 'e'
-        45: 1,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 0,  # 'а'
-        18: 3,  # 'б'
-        9: 3,  # 'в'
-        20: 2,  # 'г'
-        11: 3,  # 'д'
-        3: 2,  # 'е'
-        23: 1,  # 'ж'
-        15: 2,  # 'з'
-        2: 1,  # 'и'
-        26: 2,  # 'й'
-        12: 3,  # 'к'
-        10: 3,  # 'л'
-        14: 3,  # 'м'
-        6: 3,  # 'н'
-        4: 1,  # 'о'
-        13: 2,  # 'п'
-        7: 2,  # 'р'
-        8: 3,  # 'с'
-        5: 3,  # 'т'
-        19: 1,  # 'у'
-        29: 1,  # 'ф'
-        25: 3,  # 'х'
-        22: 2,  # 'ц'
-        21: 1,  # 'ч'
-        27: 1,  # 'ш'
-        24: 2,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 1,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    58: {  # 'є'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 0,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 0,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 0,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 0,  # 'о'
-        13: 0,  # 'п'
-        7: 0,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 0,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-    62: {  # '№'
-        63: 0,  # 'e'
-        45: 0,  # '\xad'
-        31: 0,  # 'А'
-        32: 0,  # 'Б'
-        35: 0,  # 'В'
-        43: 0,  # 'Г'
-        37: 0,  # 'Д'
-        44: 0,  # 'Е'
-        55: 0,  # 'Ж'
-        47: 0,  # 'З'
-        40: 0,  # 'И'
-        59: 0,  # 'Й'
-        33: 0,  # 'К'
-        46: 0,  # 'Л'
-        38: 0,  # 'М'
-        36: 0,  # 'Н'
-        41: 0,  # 'О'
-        30: 0,  # 'П'
-        39: 0,  # 'Р'
-        28: 0,  # 'С'
-        34: 0,  # 'Т'
-        51: 0,  # 'У'
-        48: 0,  # 'Ф'
-        49: 0,  # 'Х'
-        53: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        54: 0,  # 'Ш'
-        57: 0,  # 'Щ'
-        61: 0,  # 'Ъ'
-        60: 0,  # 'Ю'
-        56: 0,  # 'Я'
-        1: 0,  # 'а'
-        18: 0,  # 'б'
-        9: 0,  # 'в'
-        20: 0,  # 'г'
-        11: 0,  # 'д'
-        3: 0,  # 'е'
-        23: 0,  # 'ж'
-        15: 0,  # 'з'
-        2: 0,  # 'и'
-        26: 0,  # 'й'
-        12: 0,  # 'к'
-        10: 0,  # 'л'
-        14: 0,  # 'м'
-        6: 0,  # 'н'
-        4: 0,  # 'о'
-        13: 0,  # 'п'
-        7: 0,  # 'р'
-        8: 0,  # 'с'
-        5: 0,  # 'т'
-        19: 0,  # 'у'
-        29: 0,  # 'ф'
-        25: 0,  # 'х'
-        22: 0,  # 'ц'
-        21: 0,  # 'ч'
-        27: 0,  # 'ш'
-        24: 0,  # 'щ'
-        17: 0,  # 'ъ'
-        52: 0,  # 'ь'
-        42: 0,  # 'ю'
-        16: 0,  # 'я'
-        58: 0,  # 'є'
-        62: 0,  # '№'
-    },
-}
-
-# 255: Undefined characters that did not exist in training text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-# 251: Control characters
-
-# Character Mapping Table(s):
-ISO_8859_5_BULGARIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 77,  # 'A'
-    66: 90,  # 'B'
-    67: 99,  # 'C'
-    68: 100,  # 'D'
-    69: 72,  # 'E'
-    70: 109,  # 'F'
-    71: 107,  # 'G'
-    72: 101,  # 'H'
-    73: 79,  # 'I'
-    74: 185,  # 'J'
-    75: 81,  # 'K'
-    76: 102,  # 'L'
-    77: 76,  # 'M'
-    78: 94,  # 'N'
-    79: 82,  # 'O'
-    80: 110,  # 'P'
-    81: 186,  # 'Q'
-    82: 108,  # 'R'
-    83: 91,  # 'S'
-    84: 74,  # 'T'
-    85: 119,  # 'U'
-    86: 84,  # 'V'
-    87: 96,  # 'W'
-    88: 111,  # 'X'
-    89: 187,  # 'Y'
-    90: 115,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 65,  # 'a'
-    98: 69,  # 'b'
-    99: 70,  # 'c'
-    100: 66,  # 'd'
-    101: 63,  # 'e'
-    102: 68,  # 'f'
-    103: 112,  # 'g'
-    104: 103,  # 'h'
-    105: 92,  # 'i'
-    106: 194,  # 'j'
-    107: 104,  # 'k'
-    108: 95,  # 'l'
-    109: 86,  # 'm'
-    110: 87,  # 'n'
-    111: 71,  # 'o'
-    112: 116,  # 'p'
-    113: 195,  # 'q'
-    114: 85,  # 'r'
-    115: 93,  # 's'
-    116: 97,  # 't'
-    117: 113,  # 'u'
-    118: 196,  # 'v'
-    119: 197,  # 'w'
-    120: 198,  # 'x'
-    121: 199,  # 'y'
-    122: 200,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 194,  # '\x80'
-    129: 195,  # '\x81'
-    130: 196,  # '\x82'
-    131: 197,  # '\x83'
-    132: 198,  # '\x84'
-    133: 199,  # '\x85'
-    134: 200,  # '\x86'
-    135: 201,  # '\x87'
-    136: 202,  # '\x88'
-    137: 203,  # '\x89'
-    138: 204,  # '\x8a'
-    139: 205,  # '\x8b'
-    140: 206,  # '\x8c'
-    141: 207,  # '\x8d'
-    142: 208,  # '\x8e'
-    143: 209,  # '\x8f'
-    144: 210,  # '\x90'
-    145: 211,  # '\x91'
-    146: 212,  # '\x92'
-    147: 213,  # '\x93'
-    148: 214,  # '\x94'
-    149: 215,  # '\x95'
-    150: 216,  # '\x96'
-    151: 217,  # '\x97'
-    152: 218,  # '\x98'
-    153: 219,  # '\x99'
-    154: 220,  # '\x9a'
-    155: 221,  # '\x9b'
-    156: 222,  # '\x9c'
-    157: 223,  # '\x9d'
-    158: 224,  # '\x9e'
-    159: 225,  # '\x9f'
-    160: 81,  # '\xa0'
-    161: 226,  # 'Ё'
-    162: 227,  # 'Ђ'
-    163: 228,  # 'Ѓ'
-    164: 229,  # 'Є'
-    165: 230,  # 'Ѕ'
-    166: 105,  # 'І'
-    167: 231,  # 'Ї'
-    168: 232,  # 'Ј'
-    169: 233,  # 'Љ'
-    170: 234,  # 'Њ'
-    171: 235,  # 'Ћ'
-    172: 236,  # 'Ќ'
-    173: 45,  # '\xad'
-    174: 237,  # 'Ў'
-    175: 238,  # 'Џ'
-    176: 31,  # 'А'
-    177: 32,  # 'Б'
-    178: 35,  # 'В'
-    179: 43,  # 'Г'
-    180: 37,  # 'Д'
-    181: 44,  # 'Е'
-    182: 55,  # 'Ж'
-    183: 47,  # 'З'
-    184: 40,  # 'И'
-    185: 59,  # 'Й'
-    186: 33,  # 'К'
-    187: 46,  # 'Л'
-    188: 38,  # 'М'
-    189: 36,  # 'Н'
-    190: 41,  # 'О'
-    191: 30,  # 'П'
-    192: 39,  # 'Р'
-    193: 28,  # 'С'
-    194: 34,  # 'Т'
-    195: 51,  # 'У'
-    196: 48,  # 'Ф'
-    197: 49,  # 'Х'
-    198: 53,  # 'Ц'
-    199: 50,  # 'Ч'
-    200: 54,  # 'Ш'
-    201: 57,  # 'Щ'
-    202: 61,  # 'Ъ'
-    203: 239,  # 'Ы'
-    204: 67,  # 'Ь'
-    205: 240,  # 'Э'
-    206: 60,  # 'Ю'
-    207: 56,  # 'Я'
-    208: 1,  # 'а'
-    209: 18,  # 'б'
-    210: 9,  # 'в'
-    211: 20,  # 'г'
-    212: 11,  # 'д'
-    213: 3,  # 'е'
-    214: 23,  # 'ж'
-    215: 15,  # 'з'
-    216: 2,  # 'и'
-    217: 26,  # 'й'
-    218: 12,  # 'к'
-    219: 10,  # 'л'
-    220: 14,  # 'м'
-    221: 6,  # 'н'
-    222: 4,  # 'о'
-    223: 13,  # 'п'
-    224: 7,  # 'р'
-    225: 8,  # 'с'
-    226: 5,  # 'т'
-    227: 19,  # 'у'
-    228: 29,  # 'ф'
-    229: 25,  # 'х'
-    230: 22,  # 'ц'
-    231: 21,  # 'ч'
-    232: 27,  # 'ш'
-    233: 24,  # 'щ'
-    234: 17,  # 'ъ'
-    235: 75,  # 'ы'
-    236: 52,  # 'ь'
-    237: 241,  # 'э'
-    238: 42,  # 'ю'
-    239: 16,  # 'я'
-    240: 62,  # '№'
-    241: 242,  # 'ё'
-    242: 243,  # 'ђ'
-    243: 244,  # 'ѓ'
-    244: 58,  # 'є'
-    245: 245,  # 'ѕ'
-    246: 98,  # 'і'
-    247: 246,  # 'ї'
-    248: 247,  # 'ј'
-    249: 248,  # 'љ'
-    250: 249,  # 'њ'
-    251: 250,  # 'ћ'
-    252: 251,  # 'ќ'
-    253: 91,  # '§'
-    254: 252,  # 'ў'
-    255: 253,  # 'џ'
-}
-
-ISO_8859_5_BULGARIAN_MODEL = SingleByteCharSetModel(
-    charset_name="ISO-8859-5",
-    language="Bulgarian",
-    char_to_order_map=ISO_8859_5_BULGARIAN_CHAR_TO_ORDER,
-    language_model=BULGARIAN_LANG_MODEL,
-    typical_positive_ratio=0.969392,
-    keep_ascii_letters=False,
-    alphabet="АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЬЮЯабвгдежзийклмнопрстуфхцчшщъьюя",
-)
-
-WINDOWS_1251_BULGARIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 77,  # 'A'
-    66: 90,  # 'B'
-    67: 99,  # 'C'
-    68: 100,  # 'D'
-    69: 72,  # 'E'
-    70: 109,  # 'F'
-    71: 107,  # 'G'
-    72: 101,  # 'H'
-    73: 79,  # 'I'
-    74: 185,  # 'J'
-    75: 81,  # 'K'
-    76: 102,  # 'L'
-    77: 76,  # 'M'
-    78: 94,  # 'N'
-    79: 82,  # 'O'
-    80: 110,  # 'P'
-    81: 186,  # 'Q'
-    82: 108,  # 'R'
-    83: 91,  # 'S'
-    84: 74,  # 'T'
-    85: 119,  # 'U'
-    86: 84,  # 'V'
-    87: 96,  # 'W'
-    88: 111,  # 'X'
-    89: 187,  # 'Y'
-    90: 115,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 65,  # 'a'
-    98: 69,  # 'b'
-    99: 70,  # 'c'
-    100: 66,  # 'd'
-    101: 63,  # 'e'
-    102: 68,  # 'f'
-    103: 112,  # 'g'
-    104: 103,  # 'h'
-    105: 92,  # 'i'
-    106: 194,  # 'j'
-    107: 104,  # 'k'
-    108: 95,  # 'l'
-    109: 86,  # 'm'
-    110: 87,  # 'n'
-    111: 71,  # 'o'
-    112: 116,  # 'p'
-    113: 195,  # 'q'
-    114: 85,  # 'r'
-    115: 93,  # 's'
-    116: 97,  # 't'
-    117: 113,  # 'u'
-    118: 196,  # 'v'
-    119: 197,  # 'w'
-    120: 198,  # 'x'
-    121: 199,  # 'y'
-    122: 200,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 206,  # 'Ђ'
-    129: 207,  # 'Ѓ'
-    130: 208,  # '‚'
-    131: 209,  # 'ѓ'
-    132: 210,  # '„'
-    133: 211,  # '…'
-    134: 212,  # '†'
-    135: 213,  # '‡'
-    136: 120,  # '€'
-    137: 214,  # '‰'
-    138: 215,  # 'Љ'
-    139: 216,  # '‹'
-    140: 217,  # 'Њ'
-    141: 218,  # 'Ќ'
-    142: 219,  # 'Ћ'
-    143: 220,  # 'Џ'
-    144: 221,  # 'ђ'
-    145: 78,  # '‘'
-    146: 64,  # '’'
-    147: 83,  # '“'
-    148: 121,  # '”'
-    149: 98,  # '•'
-    150: 117,  # '–'
-    151: 105,  # '—'
-    152: 222,  # None
-    153: 223,  # '™'
-    154: 224,  # 'љ'
-    155: 225,  # '›'
-    156: 226,  # 'њ'
-    157: 227,  # 'ќ'
-    158: 228,  # 'ћ'
-    159: 229,  # 'џ'
-    160: 88,  # '\xa0'
-    161: 230,  # 'Ў'
-    162: 231,  # 'ў'
-    163: 232,  # 'Ј'
-    164: 233,  # '¤'
-    165: 122,  # 'Ґ'
-    166: 89,  # '¦'
-    167: 106,  # '§'
-    168: 234,  # 'Ё'
-    169: 235,  # '©'
-    170: 236,  # 'Є'
-    171: 237,  # '«'
-    172: 238,  # '¬'
-    173: 45,  # '\xad'
-    174: 239,  # '®'
-    175: 240,  # 'Ї'
-    176: 73,  # '°'
-    177: 80,  # '±'
-    178: 118,  # 'І'
-    179: 114,  # 'і'
-    180: 241,  # 'ґ'
-    181: 242,  # 'µ'
-    182: 243,  # '¶'
-    183: 244,  # '·'
-    184: 245,  # 'ё'
-    185: 62,  # '№'
-    186: 58,  # 'є'
-    187: 246,  # '»'
-    188: 247,  # 'ј'
-    189: 248,  # 'Ѕ'
-    190: 249,  # 'ѕ'
-    191: 250,  # 'ї'
-    192: 31,  # 'А'
-    193: 32,  # 'Б'
-    194: 35,  # 'В'
-    195: 43,  # 'Г'
-    196: 37,  # 'Д'
-    197: 44,  # 'Е'
-    198: 55,  # 'Ж'
-    199: 47,  # 'З'
-    200: 40,  # 'И'
-    201: 59,  # 'Й'
-    202: 33,  # 'К'
-    203: 46,  # 'Л'
-    204: 38,  # 'М'
-    205: 36,  # 'Н'
-    206: 41,  # 'О'
-    207: 30,  # 'П'
-    208: 39,  # 'Р'
-    209: 28,  # 'С'
-    210: 34,  # 'Т'
-    211: 51,  # 'У'
-    212: 48,  # 'Ф'
-    213: 49,  # 'Х'
-    214: 53,  # 'Ц'
-    215: 50,  # 'Ч'
-    216: 54,  # 'Ш'
-    217: 57,  # 'Щ'
-    218: 61,  # 'Ъ'
-    219: 251,  # 'Ы'
-    220: 67,  # 'Ь'
-    221: 252,  # 'Э'
-    222: 60,  # 'Ю'
-    223: 56,  # 'Я'
-    224: 1,  # 'а'
-    225: 18,  # 'б'
-    226: 9,  # 'в'
-    227: 20,  # 'г'
-    228: 11,  # 'д'
-    229: 3,  # 'е'
-    230: 23,  # 'ж'
-    231: 15,  # 'з'
-    232: 2,  # 'и'
-    233: 26,  # 'й'
-    234: 12,  # 'к'
-    235: 10,  # 'л'
-    236: 14,  # 'м'
-    237: 6,  # 'н'
-    238: 4,  # 'о'
-    239: 13,  # 'п'
-    240: 7,  # 'р'
-    241: 8,  # 'с'
-    242: 5,  # 'т'
-    243: 19,  # 'у'
-    244: 29,  # 'ф'
-    245: 25,  # 'х'
-    246: 22,  # 'ц'
-    247: 21,  # 'ч'
-    248: 27,  # 'ш'
-    249: 24,  # 'щ'
-    250: 17,  # 'ъ'
-    251: 75,  # 'ы'
-    252: 52,  # 'ь'
-    253: 253,  # 'э'
-    254: 42,  # 'ю'
-    255: 16,  # 'я'
-}
-
-WINDOWS_1251_BULGARIAN_MODEL = SingleByteCharSetModel(
-    charset_name="windows-1251",
-    language="Bulgarian",
-    char_to_order_map=WINDOWS_1251_BULGARIAN_CHAR_TO_ORDER,
-    language_model=BULGARIAN_LANG_MODEL,
-    typical_positive_ratio=0.969392,
-    keep_ascii_letters=False,
-    alphabet="АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЬЮЯабвгдежзийклмнопрстуфхцчшщъьюя",
-)
diff --git a/src/pip/_vendor/chardet/langgreekmodel.py b/src/pip/_vendor/chardet/langgreekmodel.py
deleted file mode 100644
index cfb8639e560..00000000000
--- a/src/pip/_vendor/chardet/langgreekmodel.py
+++ /dev/null
@@ -1,4397 +0,0 @@
-from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel
-
-# 3: Positive
-# 2: Likely
-# 1: Unlikely
-# 0: Negative
-
-GREEK_LANG_MODEL = {
-    60: {  # 'e'
-        60: 2,  # 'e'
-        55: 1,  # 'o'
-        58: 2,  # 't'
-        36: 1,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 1,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    55: {  # 'o'
-        60: 0,  # 'e'
-        55: 2,  # 'o'
-        58: 2,  # 't'
-        36: 1,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 1,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 1,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    58: {  # 't'
-        60: 2,  # 'e'
-        55: 1,  # 'o'
-        58: 1,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 1,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    36: {  # '·'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    61: {  # 'Ά'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 1,  # 'γ'
-        21: 2,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 1,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    46: {  # 'Έ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 2,  # 'β'
-        20: 2,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 2,  # 'κ'
-        16: 2,  # 'λ'
-        10: 0,  # 'μ'
-        6: 3,  # 'ν'
-        30: 2,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 2,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 1,  # 'σ'
-        2: 2,  # 'τ'
-        12: 0,  # 'υ'
-        28: 2,  # 'φ'
-        23: 3,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    54: {  # 'Ό'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 2,  # 'μ'
-        6: 2,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 2,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 2,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 2,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    31: {  # 'Α'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 2,  # 'Β'
-        43: 2,  # 'Γ'
-        41: 1,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 2,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 2,  # 'Κ'
-        53: 2,  # 'Λ'
-        38: 2,  # 'Μ'
-        49: 2,  # 'Ν'
-        59: 1,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 2,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 2,  # 'Σ'
-        33: 2,  # 'Τ'
-        45: 2,  # 'Υ'
-        56: 2,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 2,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 1,  # 'θ'
-        5: 0,  # 'ι'
-        11: 2,  # 'κ'
-        16: 3,  # 'λ'
-        10: 2,  # 'μ'
-        6: 3,  # 'ν'
-        30: 2,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 2,  # 'ς'
-        7: 2,  # 'σ'
-        2: 0,  # 'τ'
-        12: 3,  # 'υ'
-        28: 2,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    51: {  # 'Β'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 1,  # 'Ε'
-        40: 1,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 1,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 1,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 2,  # 'έ'
-        22: 2,  # 'ή'
-        15: 0,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 2,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 0,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    43: {  # 'Γ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 1,  # 'Α'
-        51: 0,  # 'Β'
-        43: 2,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 1,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 1,  # 'Κ'
-        53: 1,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 1,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 2,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 1,  # 'Χ'
-        57: 2,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 2,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 2,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 0,  # 'μ'
-        6: 2,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 0,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    41: {  # 'Δ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 2,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 2,  # 'ή'
-        15: 2,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 2,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 0,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 1,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    34: {  # 'Ε'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 2,  # 'Γ'
-        41: 2,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 2,  # 'Κ'
-        53: 2,  # 'Λ'
-        38: 2,  # 'Μ'
-        49: 2,  # 'Ν'
-        59: 1,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 2,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 2,  # 'Σ'
-        33: 2,  # 'Τ'
-        45: 2,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 2,  # 'Χ'
-        57: 2,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 3,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 3,  # 'γ'
-        21: 2,  # 'δ'
-        3: 1,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 1,  # 'θ'
-        5: 2,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 2,  # 'μ'
-        6: 3,  # 'ν'
-        30: 2,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 3,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 2,  # 'σ'
-        2: 2,  # 'τ'
-        12: 2,  # 'υ'
-        28: 2,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 1,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    40: {  # 'Η'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 1,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 2,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 2,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 2,  # 'Μ'
-        49: 2,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 2,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 2,  # 'Σ'
-        33: 2,  # 'Τ'
-        45: 1,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 0,  # 'μ'
-        6: 1,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 1,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    52: {  # 'Θ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 1,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 1,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 2,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 2,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    47: {  # 'Ι'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 1,  # 'Β'
-        43: 1,  # 'Γ'
-        41: 2,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 2,  # 'Κ'
-        53: 2,  # 'Λ'
-        38: 2,  # 'Μ'
-        49: 2,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 2,  # 'Σ'
-        33: 2,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 2,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 2,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 2,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 1,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 2,  # 'σ'
-        2: 1,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 1,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    44: {  # 'Κ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 1,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 1,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 1,  # 'Τ'
-        45: 2,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 1,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 2,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 0,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 2,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    53: {  # 'Λ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 2,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 2,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 2,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 2,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 2,  # 'έ'
-        22: 0,  # 'ή'
-        15: 2,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 2,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 1,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 2,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    38: {  # 'Μ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 2,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 2,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 2,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 2,  # 'έ'
-        22: 2,  # 'ή'
-        15: 2,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 2,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 3,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 2,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    49: {  # 'Ν'
-        60: 2,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 2,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 2,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 2,  # 'έ'
-        22: 0,  # 'ή'
-        15: 2,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 1,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 1,  # 'ω'
-        19: 2,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    59: {  # 'Ξ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 1,  # 'Ε'
-        40: 1,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 1,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 2,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 2,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    39: {  # 'Ο'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 1,  # 'Β'
-        43: 2,  # 'Γ'
-        41: 2,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 1,  # 'Η'
-        52: 2,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 2,  # 'Κ'
-        53: 2,  # 'Λ'
-        38: 2,  # 'Μ'
-        49: 2,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 2,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 2,  # 'Σ'
-        33: 2,  # 'Τ'
-        45: 2,  # 'Υ'
-        56: 2,  # 'Φ'
-        50: 2,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 2,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 2,  # 'κ'
-        16: 2,  # 'λ'
-        10: 2,  # 'μ'
-        6: 2,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 2,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 2,  # 'τ'
-        12: 2,  # 'υ'
-        28: 1,  # 'φ'
-        23: 1,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    35: {  # 'Π'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 2,  # 'Λ'
-        38: 1,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 1,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 1,  # 'Χ'
-        57: 2,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 1,  # 'έ'
-        22: 1,  # 'ή'
-        15: 2,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 2,  # 'η'
-        25: 0,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 0,  # 'μ'
-        6: 2,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 2,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 2,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    48: {  # 'Ρ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 1,  # 'Γ'
-        41: 1,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 2,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 1,  # 'Τ'
-        45: 1,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 1,  # 'Χ'
-        57: 1,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 2,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 1,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 3,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 0,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    37: {  # 'Σ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 1,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 2,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 2,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 2,  # 'Σ'
-        33: 2,  # 'Τ'
-        45: 2,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 2,  # 'Χ'
-        57: 2,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 2,  # 'ή'
-        15: 2,  # 'ί'
-        1: 2,  # 'α'
-        29: 2,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 2,  # 'ι'
-        11: 2,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 2,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 0,  # 'φ'
-        23: 2,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 0,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    33: {  # 'Τ'
-        60: 0,  # 'e'
-        55: 1,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 2,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 2,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 1,  # 'Τ'
-        45: 1,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 2,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 2,  # 'έ'
-        22: 0,  # 'ή'
-        15: 2,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 2,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 2,  # 'η'
-        25: 0,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 2,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 2,  # 'σ'
-        2: 0,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 2,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    45: {  # 'Υ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 2,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 1,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 2,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 1,  # 'Λ'
-        38: 2,  # 'Μ'
-        49: 2,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 2,  # 'Π'
-        48: 1,  # 'Ρ'
-        37: 2,  # 'Σ'
-        33: 2,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 1,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 3,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    56: {  # 'Φ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 1,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 1,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 2,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 2,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 2,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 1,  # 'ύ'
-        27: 1,  # 'ώ'
-    },
-    50: {  # 'Χ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 1,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 2,  # 'Ε'
-        40: 2,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 2,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 1,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 1,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 1,  # 'Χ'
-        57: 1,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 2,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 2,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    57: {  # 'Ω'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 1,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 1,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 2,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 2,  # 'Ρ'
-        37: 2,  # 'Σ'
-        33: 2,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 0,  # 'π'
-        8: 2,  # 'ρ'
-        14: 2,  # 'ς'
-        7: 2,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 1,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    17: {  # 'ά'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 2,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 3,  # 'β'
-        20: 3,  # 'γ'
-        21: 3,  # 'δ'
-        3: 3,  # 'ε'
-        32: 3,  # 'ζ'
-        13: 0,  # 'η'
-        25: 3,  # 'θ'
-        5: 2,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 3,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 3,  # 'φ'
-        23: 3,  # 'χ'
-        42: 3,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    18: {  # 'έ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 3,  # 'α'
-        29: 2,  # 'β'
-        20: 3,  # 'γ'
-        21: 2,  # 'δ'
-        3: 3,  # 'ε'
-        32: 2,  # 'ζ'
-        13: 0,  # 'η'
-        25: 3,  # 'θ'
-        5: 0,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 3,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 3,  # 'φ'
-        23: 3,  # 'χ'
-        42: 3,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    22: {  # 'ή'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 1,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 3,  # 'γ'
-        21: 3,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 3,  # 'θ'
-        5: 0,  # 'ι'
-        11: 3,  # 'κ'
-        16: 2,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 2,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 2,  # 'φ'
-        23: 3,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    15: {  # 'ί'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 3,  # 'α'
-        29: 2,  # 'β'
-        20: 3,  # 'γ'
-        21: 3,  # 'δ'
-        3: 3,  # 'ε'
-        32: 3,  # 'ζ'
-        13: 3,  # 'η'
-        25: 3,  # 'θ'
-        5: 0,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 3,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 1,  # 'φ'
-        23: 3,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    1: {  # 'α'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 2,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 2,  # 'έ'
-        22: 0,  # 'ή'
-        15: 3,  # 'ί'
-        1: 0,  # 'α'
-        29: 3,  # 'β'
-        20: 3,  # 'γ'
-        21: 3,  # 'δ'
-        3: 2,  # 'ε'
-        32: 3,  # 'ζ'
-        13: 1,  # 'η'
-        25: 3,  # 'θ'
-        5: 3,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 3,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 3,  # 'φ'
-        23: 3,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 2,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    29: {  # 'β'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 2,  # 'έ'
-        22: 3,  # 'ή'
-        15: 2,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 2,  # 'γ'
-        21: 2,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 2,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 3,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 2,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    20: {  # 'γ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 3,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 3,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 3,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    21: {  # 'δ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 3,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    3: {  # 'ε'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 2,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 3,  # 'ί'
-        1: 2,  # 'α'
-        29: 3,  # 'β'
-        20: 3,  # 'γ'
-        21: 3,  # 'δ'
-        3: 2,  # 'ε'
-        32: 2,  # 'ζ'
-        13: 0,  # 'η'
-        25: 3,  # 'θ'
-        5: 3,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 3,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 3,  # 'φ'
-        23: 3,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 2,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    32: {  # 'ζ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 2,  # 'έ'
-        22: 2,  # 'ή'
-        15: 2,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 1,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 2,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    13: {  # 'η'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 2,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 3,  # 'γ'
-        21: 2,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 3,  # 'θ'
-        5: 0,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 2,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 2,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 2,  # 'φ'
-        23: 3,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    25: {  # 'θ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 2,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 1,  # 'λ'
-        10: 3,  # 'μ'
-        6: 2,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 3,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    5: {  # 'ι'
-        60: 0,  # 'e'
-        55: 1,  # 'o'
-        58: 0,  # 't'
-        36: 2,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 1,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 0,  # 'ί'
-        1: 3,  # 'α'
-        29: 3,  # 'β'
-        20: 3,  # 'γ'
-        21: 3,  # 'δ'
-        3: 3,  # 'ε'
-        32: 2,  # 'ζ'
-        13: 3,  # 'η'
-        25: 3,  # 'θ'
-        5: 0,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 3,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 2,  # 'φ'
-        23: 3,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    11: {  # 'κ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 3,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 2,  # 'θ'
-        5: 3,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 2,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 2,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 2,  # 'φ'
-        23: 2,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    16: {  # 'λ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 1,  # 'β'
-        20: 2,  # 'γ'
-        21: 1,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 2,  # 'θ'
-        5: 3,  # 'ι'
-        11: 2,  # 'κ'
-        16: 3,  # 'λ'
-        10: 2,  # 'μ'
-        6: 2,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 3,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 2,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    10: {  # 'μ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 1,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 3,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 3,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 2,  # 'υ'
-        28: 3,  # 'φ'
-        23: 0,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    6: {  # 'ν'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 2,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 3,  # 'δ'
-        3: 3,  # 'ε'
-        32: 2,  # 'ζ'
-        13: 3,  # 'η'
-        25: 3,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 1,  # 'λ'
-        10: 0,  # 'μ'
-        6: 2,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    30: {  # 'ξ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 2,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 3,  # 'τ'
-        12: 2,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 2,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 1,  # 'ώ'
-    },
-    4: {  # 'ο'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 2,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 2,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 2,  # 'α'
-        29: 3,  # 'β'
-        20: 3,  # 'γ'
-        21: 3,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 3,  # 'θ'
-        5: 3,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 2,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 3,  # 'φ'
-        23: 3,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 1,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    9: {  # 'π'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 3,  # 'λ'
-        10: 0,  # 'μ'
-        6: 2,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 2,  # 'ς'
-        7: 0,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 0,  # 'φ'
-        23: 2,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    8: {  # 'ρ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 2,  # 'β'
-        20: 3,  # 'γ'
-        21: 2,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 3,  # 'θ'
-        5: 3,  # 'ι'
-        11: 3,  # 'κ'
-        16: 1,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 2,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 2,  # 'π'
-        8: 2,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 2,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 3,  # 'φ'
-        23: 3,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    14: {  # 'ς'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 2,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 0,  # 'θ'
-        5: 0,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 0,  # 'τ'
-        12: 0,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    7: {  # 'σ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 2,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 3,  # 'β'
-        20: 0,  # 'γ'
-        21: 2,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 3,  # 'θ'
-        5: 3,  # 'ι'
-        11: 3,  # 'κ'
-        16: 2,  # 'λ'
-        10: 3,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 3,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 3,  # 'φ'
-        23: 3,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    2: {  # 'τ'
-        60: 0,  # 'e'
-        55: 2,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 2,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 3,  # 'ι'
-        11: 2,  # 'κ'
-        16: 2,  # 'λ'
-        10: 3,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 2,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    12: {  # 'υ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 2,  # 'έ'
-        22: 3,  # 'ή'
-        15: 2,  # 'ί'
-        1: 3,  # 'α'
-        29: 2,  # 'β'
-        20: 3,  # 'γ'
-        21: 2,  # 'δ'
-        3: 2,  # 'ε'
-        32: 2,  # 'ζ'
-        13: 2,  # 'η'
-        25: 3,  # 'θ'
-        5: 2,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 3,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 2,  # 'φ'
-        23: 3,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 2,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    28: {  # 'φ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 3,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 2,  # 'η'
-        25: 2,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 0,  # 'μ'
-        6: 1,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 1,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 2,  # 'ύ'
-        27: 2,  # 'ώ'
-    },
-    23: {  # 'χ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 3,  # 'ά'
-        18: 2,  # 'έ'
-        22: 3,  # 'ή'
-        15: 3,  # 'ί'
-        1: 3,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 2,  # 'η'
-        25: 2,  # 'θ'
-        5: 3,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 2,  # 'μ'
-        6: 3,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 0,  # 'π'
-        8: 3,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 3,  # 'τ'
-        12: 3,  # 'υ'
-        28: 0,  # 'φ'
-        23: 2,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 3,  # 'ω'
-        19: 3,  # 'ό'
-        26: 3,  # 'ύ'
-        27: 3,  # 'ώ'
-    },
-    42: {  # 'ψ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 2,  # 'ά'
-        18: 2,  # 'έ'
-        22: 1,  # 'ή'
-        15: 2,  # 'ί'
-        1: 2,  # 'α'
-        29: 0,  # 'β'
-        20: 0,  # 'γ'
-        21: 0,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 3,  # 'η'
-        25: 0,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 0,  # 'λ'
-        10: 0,  # 'μ'
-        6: 0,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 0,  # 'π'
-        8: 0,  # 'ρ'
-        14: 0,  # 'ς'
-        7: 0,  # 'σ'
-        2: 2,  # 'τ'
-        12: 1,  # 'υ'
-        28: 0,  # 'φ'
-        23: 0,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    24: {  # 'ω'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 1,  # 'ά'
-        18: 0,  # 'έ'
-        22: 2,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 2,  # 'β'
-        20: 3,  # 'γ'
-        21: 2,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 0,  # 'η'
-        25: 3,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 0,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 2,  # 'φ'
-        23: 2,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    19: {  # 'ό'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 3,  # 'β'
-        20: 3,  # 'γ'
-        21: 3,  # 'δ'
-        3: 1,  # 'ε'
-        32: 2,  # 'ζ'
-        13: 2,  # 'η'
-        25: 2,  # 'θ'
-        5: 2,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 1,  # 'ξ'
-        4: 2,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 2,  # 'φ'
-        23: 3,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    26: {  # 'ύ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 2,  # 'α'
-        29: 2,  # 'β'
-        20: 2,  # 'γ'
-        21: 1,  # 'δ'
-        3: 3,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 2,  # 'η'
-        25: 3,  # 'θ'
-        5: 0,  # 'ι'
-        11: 3,  # 'κ'
-        16: 3,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 2,  # 'ξ'
-        4: 3,  # 'ο'
-        9: 3,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 2,  # 'φ'
-        23: 2,  # 'χ'
-        42: 2,  # 'ψ'
-        24: 2,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-    27: {  # 'ώ'
-        60: 0,  # 'e'
-        55: 0,  # 'o'
-        58: 0,  # 't'
-        36: 0,  # '·'
-        61: 0,  # 'Ά'
-        46: 0,  # 'Έ'
-        54: 0,  # 'Ό'
-        31: 0,  # 'Α'
-        51: 0,  # 'Β'
-        43: 0,  # 'Γ'
-        41: 0,  # 'Δ'
-        34: 0,  # 'Ε'
-        40: 0,  # 'Η'
-        52: 0,  # 'Θ'
-        47: 0,  # 'Ι'
-        44: 0,  # 'Κ'
-        53: 0,  # 'Λ'
-        38: 0,  # 'Μ'
-        49: 0,  # 'Ν'
-        59: 0,  # 'Ξ'
-        39: 0,  # 'Ο'
-        35: 0,  # 'Π'
-        48: 0,  # 'Ρ'
-        37: 0,  # 'Σ'
-        33: 0,  # 'Τ'
-        45: 0,  # 'Υ'
-        56: 0,  # 'Φ'
-        50: 0,  # 'Χ'
-        57: 0,  # 'Ω'
-        17: 0,  # 'ά'
-        18: 0,  # 'έ'
-        22: 0,  # 'ή'
-        15: 0,  # 'ί'
-        1: 0,  # 'α'
-        29: 1,  # 'β'
-        20: 0,  # 'γ'
-        21: 3,  # 'δ'
-        3: 0,  # 'ε'
-        32: 0,  # 'ζ'
-        13: 1,  # 'η'
-        25: 2,  # 'θ'
-        5: 2,  # 'ι'
-        11: 0,  # 'κ'
-        16: 2,  # 'λ'
-        10: 3,  # 'μ'
-        6: 3,  # 'ν'
-        30: 1,  # 'ξ'
-        4: 0,  # 'ο'
-        9: 2,  # 'π'
-        8: 3,  # 'ρ'
-        14: 3,  # 'ς'
-        7: 3,  # 'σ'
-        2: 3,  # 'τ'
-        12: 0,  # 'υ'
-        28: 1,  # 'φ'
-        23: 1,  # 'χ'
-        42: 0,  # 'ψ'
-        24: 0,  # 'ω'
-        19: 0,  # 'ό'
-        26: 0,  # 'ύ'
-        27: 0,  # 'ώ'
-    },
-}
-
-# 255: Undefined characters that did not exist in training text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-# 251: Control characters
-
-# Character Mapping Table(s):
-WINDOWS_1253_GREEK_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 82,  # 'A'
-    66: 100,  # 'B'
-    67: 104,  # 'C'
-    68: 94,  # 'D'
-    69: 98,  # 'E'
-    70: 101,  # 'F'
-    71: 116,  # 'G'
-    72: 102,  # 'H'
-    73: 111,  # 'I'
-    74: 187,  # 'J'
-    75: 117,  # 'K'
-    76: 92,  # 'L'
-    77: 88,  # 'M'
-    78: 113,  # 'N'
-    79: 85,  # 'O'
-    80: 79,  # 'P'
-    81: 118,  # 'Q'
-    82: 105,  # 'R'
-    83: 83,  # 'S'
-    84: 67,  # 'T'
-    85: 114,  # 'U'
-    86: 119,  # 'V'
-    87: 95,  # 'W'
-    88: 99,  # 'X'
-    89: 109,  # 'Y'
-    90: 188,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 72,  # 'a'
-    98: 70,  # 'b'
-    99: 80,  # 'c'
-    100: 81,  # 'd'
-    101: 60,  # 'e'
-    102: 96,  # 'f'
-    103: 93,  # 'g'
-    104: 89,  # 'h'
-    105: 68,  # 'i'
-    106: 120,  # 'j'
-    107: 97,  # 'k'
-    108: 77,  # 'l'
-    109: 86,  # 'm'
-    110: 69,  # 'n'
-    111: 55,  # 'o'
-    112: 78,  # 'p'
-    113: 115,  # 'q'
-    114: 65,  # 'r'
-    115: 66,  # 's'
-    116: 58,  # 't'
-    117: 76,  # 'u'
-    118: 106,  # 'v'
-    119: 103,  # 'w'
-    120: 87,  # 'x'
-    121: 107,  # 'y'
-    122: 112,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 255,  # '€'
-    129: 255,  # None
-    130: 255,  # '‚'
-    131: 255,  # 'ƒ'
-    132: 255,  # '„'
-    133: 255,  # '…'
-    134: 255,  # '†'
-    135: 255,  # '‡'
-    136: 255,  # None
-    137: 255,  # '‰'
-    138: 255,  # None
-    139: 255,  # '‹'
-    140: 255,  # None
-    141: 255,  # None
-    142: 255,  # None
-    143: 255,  # None
-    144: 255,  # None
-    145: 255,  # '‘'
-    146: 255,  # '’'
-    147: 255,  # '“'
-    148: 255,  # '”'
-    149: 255,  # '•'
-    150: 255,  # '–'
-    151: 255,  # '—'
-    152: 255,  # None
-    153: 255,  # '™'
-    154: 255,  # None
-    155: 255,  # '›'
-    156: 255,  # None
-    157: 255,  # None
-    158: 255,  # None
-    159: 255,  # None
-    160: 253,  # '\xa0'
-    161: 233,  # '΅'
-    162: 61,  # 'Ά'
-    163: 253,  # '£'
-    164: 253,  # '¤'
-    165: 253,  # '¥'
-    166: 253,  # '¦'
-    167: 253,  # '§'
-    168: 253,  # '¨'
-    169: 253,  # '©'
-    170: 253,  # None
-    171: 253,  # '«'
-    172: 253,  # '¬'
-    173: 74,  # '\xad'
-    174: 253,  # '®'
-    175: 253,  # '―'
-    176: 253,  # '°'
-    177: 253,  # '±'
-    178: 253,  # '²'
-    179: 253,  # '³'
-    180: 247,  # '΄'
-    181: 253,  # 'µ'
-    182: 253,  # '¶'
-    183: 36,  # '·'
-    184: 46,  # 'Έ'
-    185: 71,  # 'Ή'
-    186: 73,  # 'Ί'
-    187: 253,  # '»'
-    188: 54,  # 'Ό'
-    189: 253,  # '½'
-    190: 108,  # 'Ύ'
-    191: 123,  # 'Ώ'
-    192: 110,  # 'ΐ'
-    193: 31,  # 'Α'
-    194: 51,  # 'Β'
-    195: 43,  # 'Γ'
-    196: 41,  # 'Δ'
-    197: 34,  # 'Ε'
-    198: 91,  # 'Ζ'
-    199: 40,  # 'Η'
-    200: 52,  # 'Θ'
-    201: 47,  # 'Ι'
-    202: 44,  # 'Κ'
-    203: 53,  # 'Λ'
-    204: 38,  # 'Μ'
-    205: 49,  # 'Ν'
-    206: 59,  # 'Ξ'
-    207: 39,  # 'Ο'
-    208: 35,  # 'Π'
-    209: 48,  # 'Ρ'
-    210: 250,  # None
-    211: 37,  # 'Σ'
-    212: 33,  # 'Τ'
-    213: 45,  # 'Υ'
-    214: 56,  # 'Φ'
-    215: 50,  # 'Χ'
-    216: 84,  # 'Ψ'
-    217: 57,  # 'Ω'
-    218: 120,  # 'Ϊ'
-    219: 121,  # 'Ϋ'
-    220: 17,  # 'ά'
-    221: 18,  # 'έ'
-    222: 22,  # 'ή'
-    223: 15,  # 'ί'
-    224: 124,  # 'ΰ'
-    225: 1,  # 'α'
-    226: 29,  # 'β'
-    227: 20,  # 'γ'
-    228: 21,  # 'δ'
-    229: 3,  # 'ε'
-    230: 32,  # 'ζ'
-    231: 13,  # 'η'
-    232: 25,  # 'θ'
-    233: 5,  # 'ι'
-    234: 11,  # 'κ'
-    235: 16,  # 'λ'
-    236: 10,  # 'μ'
-    237: 6,  # 'ν'
-    238: 30,  # 'ξ'
-    239: 4,  # 'ο'
-    240: 9,  # 'π'
-    241: 8,  # 'ρ'
-    242: 14,  # 'ς'
-    243: 7,  # 'σ'
-    244: 2,  # 'τ'
-    245: 12,  # 'υ'
-    246: 28,  # 'φ'
-    247: 23,  # 'χ'
-    248: 42,  # 'ψ'
-    249: 24,  # 'ω'
-    250: 64,  # 'ϊ'
-    251: 75,  # 'ϋ'
-    252: 19,  # 'ό'
-    253: 26,  # 'ύ'
-    254: 27,  # 'ώ'
-    255: 253,  # None
-}
-
-WINDOWS_1253_GREEK_MODEL = SingleByteCharSetModel(
-    charset_name="windows-1253",
-    language="Greek",
-    char_to_order_map=WINDOWS_1253_GREEK_CHAR_TO_ORDER,
-    language_model=GREEK_LANG_MODEL,
-    typical_positive_ratio=0.982851,
-    keep_ascii_letters=False,
-    alphabet="ΆΈΉΊΌΎΏΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩάέήίαβγδεζηθικλμνξοπρςστυφχψωόύώ",
-)
-
-ISO_8859_7_GREEK_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 82,  # 'A'
-    66: 100,  # 'B'
-    67: 104,  # 'C'
-    68: 94,  # 'D'
-    69: 98,  # 'E'
-    70: 101,  # 'F'
-    71: 116,  # 'G'
-    72: 102,  # 'H'
-    73: 111,  # 'I'
-    74: 187,  # 'J'
-    75: 117,  # 'K'
-    76: 92,  # 'L'
-    77: 88,  # 'M'
-    78: 113,  # 'N'
-    79: 85,  # 'O'
-    80: 79,  # 'P'
-    81: 118,  # 'Q'
-    82: 105,  # 'R'
-    83: 83,  # 'S'
-    84: 67,  # 'T'
-    85: 114,  # 'U'
-    86: 119,  # 'V'
-    87: 95,  # 'W'
-    88: 99,  # 'X'
-    89: 109,  # 'Y'
-    90: 188,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 72,  # 'a'
-    98: 70,  # 'b'
-    99: 80,  # 'c'
-    100: 81,  # 'd'
-    101: 60,  # 'e'
-    102: 96,  # 'f'
-    103: 93,  # 'g'
-    104: 89,  # 'h'
-    105: 68,  # 'i'
-    106: 120,  # 'j'
-    107: 97,  # 'k'
-    108: 77,  # 'l'
-    109: 86,  # 'm'
-    110: 69,  # 'n'
-    111: 55,  # 'o'
-    112: 78,  # 'p'
-    113: 115,  # 'q'
-    114: 65,  # 'r'
-    115: 66,  # 's'
-    116: 58,  # 't'
-    117: 76,  # 'u'
-    118: 106,  # 'v'
-    119: 103,  # 'w'
-    120: 87,  # 'x'
-    121: 107,  # 'y'
-    122: 112,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 255,  # '\x80'
-    129: 255,  # '\x81'
-    130: 255,  # '\x82'
-    131: 255,  # '\x83'
-    132: 255,  # '\x84'
-    133: 255,  # '\x85'
-    134: 255,  # '\x86'
-    135: 255,  # '\x87'
-    136: 255,  # '\x88'
-    137: 255,  # '\x89'
-    138: 255,  # '\x8a'
-    139: 255,  # '\x8b'
-    140: 255,  # '\x8c'
-    141: 255,  # '\x8d'
-    142: 255,  # '\x8e'
-    143: 255,  # '\x8f'
-    144: 255,  # '\x90'
-    145: 255,  # '\x91'
-    146: 255,  # '\x92'
-    147: 255,  # '\x93'
-    148: 255,  # '\x94'
-    149: 255,  # '\x95'
-    150: 255,  # '\x96'
-    151: 255,  # '\x97'
-    152: 255,  # '\x98'
-    153: 255,  # '\x99'
-    154: 255,  # '\x9a'
-    155: 255,  # '\x9b'
-    156: 255,  # '\x9c'
-    157: 255,  # '\x9d'
-    158: 255,  # '\x9e'
-    159: 255,  # '\x9f'
-    160: 253,  # '\xa0'
-    161: 233,  # '‘'
-    162: 90,  # '’'
-    163: 253,  # '£'
-    164: 253,  # '€'
-    165: 253,  # '₯'
-    166: 253,  # '¦'
-    167: 253,  # '§'
-    168: 253,  # '¨'
-    169: 253,  # '©'
-    170: 253,  # 'ͺ'
-    171: 253,  # '«'
-    172: 253,  # '¬'
-    173: 74,  # '\xad'
-    174: 253,  # None
-    175: 253,  # '―'
-    176: 253,  # '°'
-    177: 253,  # '±'
-    178: 253,  # '²'
-    179: 253,  # '³'
-    180: 247,  # '΄'
-    181: 248,  # '΅'
-    182: 61,  # 'Ά'
-    183: 36,  # '·'
-    184: 46,  # 'Έ'
-    185: 71,  # 'Ή'
-    186: 73,  # 'Ί'
-    187: 253,  # '»'
-    188: 54,  # 'Ό'
-    189: 253,  # '½'
-    190: 108,  # 'Ύ'
-    191: 123,  # 'Ώ'
-    192: 110,  # 'ΐ'
-    193: 31,  # 'Α'
-    194: 51,  # 'Β'
-    195: 43,  # 'Γ'
-    196: 41,  # 'Δ'
-    197: 34,  # 'Ε'
-    198: 91,  # 'Ζ'
-    199: 40,  # 'Η'
-    200: 52,  # 'Θ'
-    201: 47,  # 'Ι'
-    202: 44,  # 'Κ'
-    203: 53,  # 'Λ'
-    204: 38,  # 'Μ'
-    205: 49,  # 'Ν'
-    206: 59,  # 'Ξ'
-    207: 39,  # 'Ο'
-    208: 35,  # 'Π'
-    209: 48,  # 'Ρ'
-    210: 250,  # None
-    211: 37,  # 'Σ'
-    212: 33,  # 'Τ'
-    213: 45,  # 'Υ'
-    214: 56,  # 'Φ'
-    215: 50,  # 'Χ'
-    216: 84,  # 'Ψ'
-    217: 57,  # 'Ω'
-    218: 120,  # 'Ϊ'
-    219: 121,  # 'Ϋ'
-    220: 17,  # 'ά'
-    221: 18,  # 'έ'
-    222: 22,  # 'ή'
-    223: 15,  # 'ί'
-    224: 124,  # 'ΰ'
-    225: 1,  # 'α'
-    226: 29,  # 'β'
-    227: 20,  # 'γ'
-    228: 21,  # 'δ'
-    229: 3,  # 'ε'
-    230: 32,  # 'ζ'
-    231: 13,  # 'η'
-    232: 25,  # 'θ'
-    233: 5,  # 'ι'
-    234: 11,  # 'κ'
-    235: 16,  # 'λ'
-    236: 10,  # 'μ'
-    237: 6,  # 'ν'
-    238: 30,  # 'ξ'
-    239: 4,  # 'ο'
-    240: 9,  # 'π'
-    241: 8,  # 'ρ'
-    242: 14,  # 'ς'
-    243: 7,  # 'σ'
-    244: 2,  # 'τ'
-    245: 12,  # 'υ'
-    246: 28,  # 'φ'
-    247: 23,  # 'χ'
-    248: 42,  # 'ψ'
-    249: 24,  # 'ω'
-    250: 64,  # 'ϊ'
-    251: 75,  # 'ϋ'
-    252: 19,  # 'ό'
-    253: 26,  # 'ύ'
-    254: 27,  # 'ώ'
-    255: 253,  # None
-}
-
-ISO_8859_7_GREEK_MODEL = SingleByteCharSetModel(
-    charset_name="ISO-8859-7",
-    language="Greek",
-    char_to_order_map=ISO_8859_7_GREEK_CHAR_TO_ORDER,
-    language_model=GREEK_LANG_MODEL,
-    typical_positive_ratio=0.982851,
-    keep_ascii_letters=False,
-    alphabet="ΆΈΉΊΌΎΏΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩάέήίαβγδεζηθικλμνξοπρςστυφχψωόύώ",
-)
diff --git a/src/pip/_vendor/chardet/langhebrewmodel.py b/src/pip/_vendor/chardet/langhebrewmodel.py
deleted file mode 100644
index 56d2975877f..00000000000
--- a/src/pip/_vendor/chardet/langhebrewmodel.py
+++ /dev/null
@@ -1,4380 +0,0 @@
-from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel
-
-# 3: Positive
-# 2: Likely
-# 1: Unlikely
-# 0: Negative
-
-HEBREW_LANG_MODEL = {
-    50: {  # 'a'
-        50: 0,  # 'a'
-        60: 1,  # 'c'
-        61: 1,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 2,  # 'l'
-        54: 2,  # 'n'
-        49: 0,  # 'o'
-        51: 2,  # 'r'
-        43: 1,  # 's'
-        44: 2,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 1,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 1,  # 'ק'
-        7: 0,  # 'ר'
-        10: 1,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    60: {  # 'c'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 0,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 1,  # 'l'
-        54: 0,  # 'n'
-        49: 1,  # 'o'
-        51: 1,  # 'r'
-        43: 1,  # 's'
-        44: 2,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 1,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 1,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    61: {  # 'd'
-        50: 1,  # 'a'
-        60: 0,  # 'c'
-        61: 1,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 1,  # 'l'
-        54: 1,  # 'n'
-        49: 2,  # 'o'
-        51: 1,  # 'r'
-        43: 1,  # 's'
-        44: 0,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 1,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 1,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    42: {  # 'e'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 2,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 2,  # 'l'
-        54: 2,  # 'n'
-        49: 1,  # 'o'
-        51: 2,  # 'r'
-        43: 2,  # 's'
-        44: 2,  # 't'
-        63: 1,  # 'u'
-        34: 1,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 1,  # '–'
-        52: 2,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    53: {  # 'i'
-        50: 1,  # 'a'
-        60: 2,  # 'c'
-        61: 1,  # 'd'
-        42: 1,  # 'e'
-        53: 0,  # 'i'
-        56: 1,  # 'l'
-        54: 2,  # 'n'
-        49: 2,  # 'o'
-        51: 1,  # 'r'
-        43: 2,  # 's'
-        44: 2,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    56: {  # 'l'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 1,  # 'd'
-        42: 2,  # 'e'
-        53: 2,  # 'i'
-        56: 2,  # 'l'
-        54: 1,  # 'n'
-        49: 1,  # 'o'
-        51: 0,  # 'r'
-        43: 1,  # 's'
-        44: 1,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    54: {  # 'n'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 1,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 1,  # 'l'
-        54: 1,  # 'n'
-        49: 1,  # 'o'
-        51: 0,  # 'r'
-        43: 1,  # 's'
-        44: 2,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 1,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 2,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    49: {  # 'o'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 1,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 1,  # 'l'
-        54: 2,  # 'n'
-        49: 1,  # 'o'
-        51: 2,  # 'r'
-        43: 1,  # 's'
-        44: 1,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    51: {  # 'r'
-        50: 2,  # 'a'
-        60: 1,  # 'c'
-        61: 1,  # 'd'
-        42: 2,  # 'e'
-        53: 1,  # 'i'
-        56: 1,  # 'l'
-        54: 1,  # 'n'
-        49: 2,  # 'o'
-        51: 1,  # 'r'
-        43: 1,  # 's'
-        44: 1,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 2,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    43: {  # 's'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 0,  # 'd'
-        42: 2,  # 'e'
-        53: 1,  # 'i'
-        56: 1,  # 'l'
-        54: 1,  # 'n'
-        49: 1,  # 'o'
-        51: 1,  # 'r'
-        43: 1,  # 's'
-        44: 2,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 2,  # '”'
-        58: 0,  # '†'
-        40: 2,  # '…'
-    },
-    44: {  # 't'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 0,  # 'd'
-        42: 2,  # 'e'
-        53: 2,  # 'i'
-        56: 1,  # 'l'
-        54: 0,  # 'n'
-        49: 1,  # 'o'
-        51: 1,  # 'r'
-        43: 1,  # 's'
-        44: 1,  # 't'
-        63: 1,  # 'u'
-        34: 1,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 2,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    63: {  # 'u'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 1,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 1,  # 'l'
-        54: 1,  # 'n'
-        49: 0,  # 'o'
-        51: 1,  # 'r'
-        43: 2,  # 's'
-        44: 1,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    34: {  # '\xa0'
-        50: 1,  # 'a'
-        60: 0,  # 'c'
-        61: 1,  # 'd'
-        42: 0,  # 'e'
-        53: 1,  # 'i'
-        56: 0,  # 'l'
-        54: 1,  # 'n'
-        49: 1,  # 'o'
-        51: 0,  # 'r'
-        43: 1,  # 's'
-        44: 1,  # 't'
-        63: 0,  # 'u'
-        34: 2,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 1,  # 'ב'
-        20: 1,  # 'ג'
-        16: 1,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 1,  # 'ז'
-        14: 1,  # 'ח'
-        22: 1,  # 'ט'
-        1: 2,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 2,  # 'מ'
-        23: 0,  # 'ן'
-        12: 1,  # 'נ'
-        19: 1,  # 'ס'
-        13: 1,  # 'ע'
-        26: 0,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 1,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    55: {  # '´'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 1,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 2,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 1,  # 'ן'
-        12: 1,  # 'נ'
-        19: 1,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    48: {  # '¼'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 1,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    39: {  # '½'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 1,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    57: {  # '¾'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    30: {  # 'ְ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 2,  # 'ב'
-        20: 2,  # 'ג'
-        16: 2,  # 'ד'
-        3: 2,  # 'ה'
-        2: 2,  # 'ו'
-        24: 2,  # 'ז'
-        14: 2,  # 'ח'
-        22: 2,  # 'ט'
-        1: 2,  # 'י'
-        25: 2,  # 'ך'
-        15: 2,  # 'כ'
-        4: 2,  # 'ל'
-        11: 1,  # 'ם'
-        6: 2,  # 'מ'
-        23: 0,  # 'ן'
-        12: 2,  # 'נ'
-        19: 2,  # 'ס'
-        13: 2,  # 'ע'
-        26: 0,  # 'ף'
-        18: 2,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 2,  # 'ק'
-        7: 2,  # 'ר'
-        10: 2,  # 'ש'
-        5: 2,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    59: {  # 'ֱ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 1,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 1,  # 'ב'
-        20: 1,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 1,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 2,  # 'ל'
-        11: 0,  # 'ם'
-        6: 2,  # 'מ'
-        23: 0,  # 'ן'
-        12: 1,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    41: {  # 'ֲ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 2,  # 'ב'
-        20: 1,  # 'ג'
-        16: 2,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 1,  # 'ז'
-        14: 1,  # 'ח'
-        22: 1,  # 'ט'
-        1: 1,  # 'י'
-        25: 1,  # 'ך'
-        15: 1,  # 'כ'
-        4: 2,  # 'ל'
-        11: 0,  # 'ם'
-        6: 2,  # 'מ'
-        23: 0,  # 'ן'
-        12: 2,  # 'נ'
-        19: 1,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 1,  # 'ק'
-        7: 2,  # 'ר'
-        10: 2,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    33: {  # 'ִ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 1,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 1,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 1,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 1,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 2,  # 'ב'
-        20: 2,  # 'ג'
-        16: 2,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 2,  # 'ז'
-        14: 1,  # 'ח'
-        22: 1,  # 'ט'
-        1: 3,  # 'י'
-        25: 1,  # 'ך'
-        15: 2,  # 'כ'
-        4: 2,  # 'ל'
-        11: 2,  # 'ם'
-        6: 2,  # 'מ'
-        23: 2,  # 'ן'
-        12: 2,  # 'נ'
-        19: 2,  # 'ס'
-        13: 1,  # 'ע'
-        26: 0,  # 'ף'
-        18: 2,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 2,  # 'ק'
-        7: 2,  # 'ר'
-        10: 2,  # 'ש'
-        5: 2,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    37: {  # 'ֵ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 1,  # 'ַ'
-        29: 1,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 2,  # 'ב'
-        20: 1,  # 'ג'
-        16: 2,  # 'ד'
-        3: 2,  # 'ה'
-        2: 1,  # 'ו'
-        24: 1,  # 'ז'
-        14: 2,  # 'ח'
-        22: 1,  # 'ט'
-        1: 3,  # 'י'
-        25: 2,  # 'ך'
-        15: 1,  # 'כ'
-        4: 2,  # 'ל'
-        11: 2,  # 'ם'
-        6: 1,  # 'מ'
-        23: 2,  # 'ן'
-        12: 2,  # 'נ'
-        19: 1,  # 'ס'
-        13: 2,  # 'ע'
-        26: 1,  # 'ף'
-        18: 1,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 1,  # 'ק'
-        7: 2,  # 'ר'
-        10: 2,  # 'ש'
-        5: 2,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    36: {  # 'ֶ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 1,  # 'ַ'
-        29: 1,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 2,  # 'ב'
-        20: 1,  # 'ג'
-        16: 2,  # 'ד'
-        3: 2,  # 'ה'
-        2: 1,  # 'ו'
-        24: 1,  # 'ז'
-        14: 2,  # 'ח'
-        22: 1,  # 'ט'
-        1: 2,  # 'י'
-        25: 2,  # 'ך'
-        15: 1,  # 'כ'
-        4: 2,  # 'ל'
-        11: 2,  # 'ם'
-        6: 2,  # 'מ'
-        23: 2,  # 'ן'
-        12: 2,  # 'נ'
-        19: 2,  # 'ס'
-        13: 1,  # 'ע'
-        26: 1,  # 'ף'
-        18: 1,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 1,  # 'ק'
-        7: 2,  # 'ר'
-        10: 2,  # 'ש'
-        5: 2,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    31: {  # 'ַ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 1,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 2,  # 'ב'
-        20: 2,  # 'ג'
-        16: 2,  # 'ד'
-        3: 2,  # 'ה'
-        2: 1,  # 'ו'
-        24: 2,  # 'ז'
-        14: 2,  # 'ח'
-        22: 2,  # 'ט'
-        1: 3,  # 'י'
-        25: 1,  # 'ך'
-        15: 2,  # 'כ'
-        4: 2,  # 'ל'
-        11: 2,  # 'ם'
-        6: 2,  # 'מ'
-        23: 2,  # 'ן'
-        12: 2,  # 'נ'
-        19: 2,  # 'ס'
-        13: 2,  # 'ע'
-        26: 2,  # 'ף'
-        18: 2,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 2,  # 'ק'
-        7: 2,  # 'ר'
-        10: 2,  # 'ש'
-        5: 2,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    29: {  # 'ָ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 1,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 1,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 2,  # 'ב'
-        20: 2,  # 'ג'
-        16: 2,  # 'ד'
-        3: 3,  # 'ה'
-        2: 2,  # 'ו'
-        24: 2,  # 'ז'
-        14: 2,  # 'ח'
-        22: 1,  # 'ט'
-        1: 2,  # 'י'
-        25: 2,  # 'ך'
-        15: 2,  # 'כ'
-        4: 2,  # 'ל'
-        11: 2,  # 'ם'
-        6: 2,  # 'מ'
-        23: 2,  # 'ן'
-        12: 2,  # 'נ'
-        19: 1,  # 'ס'
-        13: 2,  # 'ע'
-        26: 1,  # 'ף'
-        18: 2,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 2,  # 'ק'
-        7: 2,  # 'ר'
-        10: 2,  # 'ש'
-        5: 2,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    35: {  # 'ֹ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 2,  # 'ב'
-        20: 1,  # 'ג'
-        16: 2,  # 'ד'
-        3: 2,  # 'ה'
-        2: 1,  # 'ו'
-        24: 1,  # 'ז'
-        14: 1,  # 'ח'
-        22: 1,  # 'ט'
-        1: 1,  # 'י'
-        25: 1,  # 'ך'
-        15: 2,  # 'כ'
-        4: 2,  # 'ל'
-        11: 2,  # 'ם'
-        6: 2,  # 'מ'
-        23: 2,  # 'ן'
-        12: 2,  # 'נ'
-        19: 2,  # 'ס'
-        13: 2,  # 'ע'
-        26: 1,  # 'ף'
-        18: 2,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 2,  # 'ק'
-        7: 2,  # 'ר'
-        10: 2,  # 'ש'
-        5: 2,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    62: {  # 'ֻ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 1,  # 'ב'
-        20: 1,  # 'ג'
-        16: 1,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 1,  # 'ז'
-        14: 1,  # 'ח'
-        22: 0,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 2,  # 'ל'
-        11: 1,  # 'ם'
-        6: 1,  # 'מ'
-        23: 1,  # 'ן'
-        12: 1,  # 'נ'
-        19: 1,  # 'ס'
-        13: 1,  # 'ע'
-        26: 0,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 1,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    28: {  # 'ּ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 3,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 1,  # 'ֲ'
-        33: 3,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 3,  # 'ַ'
-        29: 3,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 2,  # 'ׁ'
-        45: 1,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 2,  # 'ב'
-        20: 1,  # 'ג'
-        16: 2,  # 'ד'
-        3: 1,  # 'ה'
-        2: 2,  # 'ו'
-        24: 1,  # 'ז'
-        14: 1,  # 'ח'
-        22: 1,  # 'ט'
-        1: 2,  # 'י'
-        25: 2,  # 'ך'
-        15: 2,  # 'כ'
-        4: 2,  # 'ל'
-        11: 1,  # 'ם'
-        6: 2,  # 'מ'
-        23: 1,  # 'ן'
-        12: 2,  # 'נ'
-        19: 1,  # 'ס'
-        13: 2,  # 'ע'
-        26: 1,  # 'ף'
-        18: 1,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 1,  # 'ק'
-        7: 2,  # 'ר'
-        10: 2,  # 'ש'
-        5: 2,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    38: {  # 'ׁ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 2,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 1,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    45: {  # 'ׂ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 1,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 1,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 0,  # 'ב'
-        20: 1,  # 'ג'
-        16: 0,  # 'ד'
-        3: 1,  # 'ה'
-        2: 2,  # 'ו'
-        24: 0,  # 'ז'
-        14: 1,  # 'ח'
-        22: 0,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 1,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 1,  # 'נ'
-        19: 0,  # 'ס'
-        13: 1,  # 'ע'
-        26: 0,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 1,  # 'ר'
-        10: 0,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    9: {  # 'א'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 1,  # '´'
-        48: 1,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 2,  # 'ֱ'
-        41: 2,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 3,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 2,  # 'ע'
-        26: 3,  # 'ף'
-        18: 3,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    8: {  # 'ב'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 1,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 3,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 2,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 2,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 1,  # 'ף'
-        18: 3,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 1,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    20: {  # 'ג'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 2,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 1,  # 'ִ'
-        37: 1,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 3,  # 'ב'
-        20: 2,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 2,  # 'ח'
-        22: 2,  # 'ט'
-        1: 3,  # 'י'
-        25: 1,  # 'ך'
-        15: 1,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 2,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 2,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 1,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    16: {  # 'ד'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 1,  # 'ז'
-        14: 2,  # 'ח'
-        22: 2,  # 'ט'
-        1: 3,  # 'י'
-        25: 2,  # 'ך'
-        15: 2,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 2,  # 'ן'
-        12: 3,  # 'נ'
-        19: 2,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 3,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    3: {  # 'ה'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 1,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 0,  # '´'
-        48: 1,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 1,  # 'ְ'
-        59: 1,  # 'ֱ'
-        41: 2,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 3,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 1,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 0,  # 'ף'
-        18: 3,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 1,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 2,  # '…'
-    },
-    2: {  # 'ו'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 1,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 1,  # '´'
-        48: 1,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 1,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 3,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 3,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 3,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 3,  # 'ף'
-        18: 3,  # 'פ'
-        27: 3,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 1,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 2,  # '…'
-    },
-    24: {  # 'ז'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 1,  # 'ֲ'
-        33: 1,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 2,  # 'ב'
-        20: 2,  # 'ג'
-        16: 2,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 2,  # 'ז'
-        14: 2,  # 'ח'
-        22: 1,  # 'ט'
-        1: 3,  # 'י'
-        25: 1,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 2,  # 'ם'
-        6: 3,  # 'מ'
-        23: 2,  # 'ן'
-        12: 2,  # 'נ'
-        19: 1,  # 'ס'
-        13: 2,  # 'ע'
-        26: 1,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 1,  # 'ש'
-        5: 2,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    14: {  # 'ח'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 1,  # 'ֱ'
-        41: 2,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 3,  # 'ב'
-        20: 2,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 2,  # 'ח'
-        22: 2,  # 'ט'
-        1: 3,  # 'י'
-        25: 1,  # 'ך'
-        15: 2,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 2,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 1,  # 'ע'
-        26: 2,  # 'ף'
-        18: 2,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    22: {  # 'ט'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 1,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 1,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 1,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 1,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 2,  # 'ז'
-        14: 3,  # 'ח'
-        22: 2,  # 'ט'
-        1: 3,  # 'י'
-        25: 1,  # 'ך'
-        15: 2,  # 'כ'
-        4: 3,  # 'ל'
-        11: 2,  # 'ם'
-        6: 2,  # 'מ'
-        23: 2,  # 'ן'
-        12: 3,  # 'נ'
-        19: 2,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 3,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 2,  # 'ק'
-        7: 3,  # 'ר'
-        10: 2,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    1: {  # 'י'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 1,  # '´'
-        48: 1,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 3,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 3,  # 'ף'
-        18: 3,  # 'פ'
-        27: 3,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 1,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 2,  # '…'
-    },
-    25: {  # 'ך'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 1,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 1,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 1,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 1,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    15: {  # 'כ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 3,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 2,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 2,  # 'ט'
-        1: 3,  # 'י'
-        25: 3,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 2,  # 'ע'
-        26: 3,  # 'ף'
-        18: 3,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 2,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    4: {  # 'ל'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 3,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 3,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 2,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 3,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 1,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    11: {  # 'ם'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 1,  # 'ב'
-        20: 1,  # 'ג'
-        16: 0,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 1,  # 'ז'
-        14: 1,  # 'ח'
-        22: 0,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 1,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 1,  # 'נ'
-        19: 0,  # 'ס'
-        13: 1,  # 'ע'
-        26: 0,  # 'ף'
-        18: 1,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 1,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 2,  # '…'
-    },
-    6: {  # 'מ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 2,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 0,  # 'ף'
-        18: 3,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    23: {  # 'ן'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 0,  # '´'
-        48: 1,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 1,  # 'ב'
-        20: 1,  # 'ג'
-        16: 1,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 0,  # 'ז'
-        14: 1,  # 'ח'
-        22: 1,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 1,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 1,  # 'נ'
-        19: 1,  # 'ס'
-        13: 1,  # 'ע'
-        26: 1,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 1,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 1,  # 'ת'
-        32: 1,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 2,  # '…'
-    },
-    12: {  # 'נ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 2,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 3,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    19: {  # 'ס'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 1,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 1,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 2,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 1,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 2,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 2,  # 'ם'
-        6: 3,  # 'מ'
-        23: 2,  # 'ן'
-        12: 3,  # 'נ'
-        19: 2,  # 'ס'
-        13: 3,  # 'ע'
-        26: 3,  # 'ף'
-        18: 3,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 1,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    13: {  # 'ע'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 1,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 1,  # 'ְ'
-        59: 1,  # 'ֱ'
-        41: 2,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 1,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 2,  # 'ך'
-        15: 2,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 2,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 2,  # 'ע'
-        26: 1,  # 'ף'
-        18: 2,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    26: {  # 'ף'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 1,  # 'ו'
-        24: 0,  # 'ז'
-        14: 1,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 1,  # 'ס'
-        13: 0,  # 'ע'
-        26: 1,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 1,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    18: {  # 'פ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 1,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 1,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 2,  # 'ב'
-        20: 3,  # 'ג'
-        16: 2,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 2,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 2,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 2,  # 'ם'
-        6: 2,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 2,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    27: {  # 'ץ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 1,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 1,  # 'ר'
-        10: 0,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    21: {  # 'צ'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 2,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 1,  # 'ז'
-        14: 3,  # 'ח'
-        22: 2,  # 'ט'
-        1: 3,  # 'י'
-        25: 1,  # 'ך'
-        15: 1,  # 'כ'
-        4: 3,  # 'ל'
-        11: 2,  # 'ם'
-        6: 3,  # 'מ'
-        23: 2,  # 'ן'
-        12: 3,  # 'נ'
-        19: 1,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 3,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 0,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    17: {  # 'ק'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 1,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 2,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 2,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 1,  # 'ך'
-        15: 1,  # 'כ'
-        4: 3,  # 'ל'
-        11: 2,  # 'ם'
-        6: 3,  # 'מ'
-        23: 2,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 3,  # 'פ'
-        27: 2,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 2,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    7: {  # 'ר'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 2,  # '´'
-        48: 1,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 1,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 2,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 3,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 3,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 3,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 3,  # 'פ'
-        27: 3,  # 'ץ'
-        21: 3,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 2,  # '…'
-    },
-    10: {  # 'ש'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 1,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 1,  # 'ִ'
-        37: 1,  # 'ֵ'
-        36: 1,  # 'ֶ'
-        31: 1,  # 'ַ'
-        29: 1,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 3,  # 'ׁ'
-        45: 2,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 3,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 2,  # 'ז'
-        14: 3,  # 'ח'
-        22: 3,  # 'ט'
-        1: 3,  # 'י'
-        25: 3,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 2,  # 'ן'
-        12: 3,  # 'נ'
-        19: 2,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 3,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 1,  # '…'
-    },
-    5: {  # 'ת'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 1,  # '\xa0'
-        55: 0,  # '´'
-        48: 1,  # '¼'
-        39: 1,  # '½'
-        57: 0,  # '¾'
-        30: 2,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 2,  # 'ִ'
-        37: 2,  # 'ֵ'
-        36: 2,  # 'ֶ'
-        31: 2,  # 'ַ'
-        29: 2,  # 'ָ'
-        35: 1,  # 'ֹ'
-        62: 1,  # 'ֻ'
-        28: 2,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 3,  # 'א'
-        8: 3,  # 'ב'
-        20: 3,  # 'ג'
-        16: 2,  # 'ד'
-        3: 3,  # 'ה'
-        2: 3,  # 'ו'
-        24: 2,  # 'ז'
-        14: 3,  # 'ח'
-        22: 2,  # 'ט'
-        1: 3,  # 'י'
-        25: 2,  # 'ך'
-        15: 3,  # 'כ'
-        4: 3,  # 'ל'
-        11: 3,  # 'ם'
-        6: 3,  # 'מ'
-        23: 3,  # 'ן'
-        12: 3,  # 'נ'
-        19: 2,  # 'ס'
-        13: 3,  # 'ע'
-        26: 2,  # 'ף'
-        18: 3,  # 'פ'
-        27: 1,  # 'ץ'
-        21: 2,  # 'צ'
-        17: 3,  # 'ק'
-        7: 3,  # 'ר'
-        10: 3,  # 'ש'
-        5: 3,  # 'ת'
-        32: 1,  # '–'
-        52: 1,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 2,  # '…'
-    },
-    32: {  # '–'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 1,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 1,  # 'ב'
-        20: 1,  # 'ג'
-        16: 1,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 0,  # 'ז'
-        14: 1,  # 'ח'
-        22: 0,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 1,  # 'ס'
-        13: 1,  # 'ע'
-        26: 0,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 0,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    52: {  # '’'
-        50: 1,  # 'a'
-        60: 0,  # 'c'
-        61: 1,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 1,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 1,  # 'r'
-        43: 2,  # 's'
-        44: 2,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 1,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    47: {  # '“'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 1,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 1,  # 'l'
-        54: 1,  # 'n'
-        49: 1,  # 'o'
-        51: 1,  # 'r'
-        43: 1,  # 's'
-        44: 1,  # 't'
-        63: 1,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 2,  # 'א'
-        8: 1,  # 'ב'
-        20: 1,  # 'ג'
-        16: 1,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 1,  # 'ז'
-        14: 1,  # 'ח'
-        22: 1,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 1,  # 'נ'
-        19: 1,  # 'ס'
-        13: 1,  # 'ע'
-        26: 0,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 1,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    46: {  # '”'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 1,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 1,  # 'ב'
-        20: 1,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 1,  # 'צ'
-        17: 0,  # 'ק'
-        7: 1,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 0,  # '†'
-        40: 0,  # '…'
-    },
-    58: {  # '†'
-        50: 0,  # 'a'
-        60: 0,  # 'c'
-        61: 0,  # 'd'
-        42: 0,  # 'e'
-        53: 0,  # 'i'
-        56: 0,  # 'l'
-        54: 0,  # 'n'
-        49: 0,  # 'o'
-        51: 0,  # 'r'
-        43: 0,  # 's'
-        44: 0,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 0,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 0,  # 'ה'
-        2: 0,  # 'ו'
-        24: 0,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 0,  # 'י'
-        25: 0,  # 'ך'
-        15: 0,  # 'כ'
-        4: 0,  # 'ל'
-        11: 0,  # 'ם'
-        6: 0,  # 'מ'
-        23: 0,  # 'ן'
-        12: 0,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 0,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 0,  # 'ר'
-        10: 0,  # 'ש'
-        5: 0,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 0,  # '”'
-        58: 2,  # '†'
-        40: 0,  # '…'
-    },
-    40: {  # '…'
-        50: 1,  # 'a'
-        60: 1,  # 'c'
-        61: 1,  # 'd'
-        42: 1,  # 'e'
-        53: 1,  # 'i'
-        56: 0,  # 'l'
-        54: 1,  # 'n'
-        49: 0,  # 'o'
-        51: 1,  # 'r'
-        43: 1,  # 's'
-        44: 1,  # 't'
-        63: 0,  # 'u'
-        34: 0,  # '\xa0'
-        55: 0,  # '´'
-        48: 0,  # '¼'
-        39: 0,  # '½'
-        57: 0,  # '¾'
-        30: 0,  # 'ְ'
-        59: 0,  # 'ֱ'
-        41: 0,  # 'ֲ'
-        33: 0,  # 'ִ'
-        37: 0,  # 'ֵ'
-        36: 0,  # 'ֶ'
-        31: 0,  # 'ַ'
-        29: 0,  # 'ָ'
-        35: 0,  # 'ֹ'
-        62: 0,  # 'ֻ'
-        28: 0,  # 'ּ'
-        38: 0,  # 'ׁ'
-        45: 0,  # 'ׂ'
-        9: 1,  # 'א'
-        8: 0,  # 'ב'
-        20: 0,  # 'ג'
-        16: 0,  # 'ד'
-        3: 1,  # 'ה'
-        2: 1,  # 'ו'
-        24: 1,  # 'ז'
-        14: 0,  # 'ח'
-        22: 0,  # 'ט'
-        1: 1,  # 'י'
-        25: 0,  # 'ך'
-        15: 1,  # 'כ'
-        4: 1,  # 'ל'
-        11: 0,  # 'ם'
-        6: 1,  # 'מ'
-        23: 0,  # 'ן'
-        12: 1,  # 'נ'
-        19: 0,  # 'ס'
-        13: 0,  # 'ע'
-        26: 0,  # 'ף'
-        18: 1,  # 'פ'
-        27: 0,  # 'ץ'
-        21: 0,  # 'צ'
-        17: 0,  # 'ק'
-        7: 1,  # 'ר'
-        10: 1,  # 'ש'
-        5: 1,  # 'ת'
-        32: 0,  # '–'
-        52: 0,  # '’'
-        47: 0,  # '“'
-        46: 1,  # '”'
-        58: 0,  # '†'
-        40: 2,  # '…'
-    },
-}
-
-# 255: Undefined characters that did not exist in training text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-# 251: Control characters
-
-# Character Mapping Table(s):
-WINDOWS_1255_HEBREW_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 69,  # 'A'
-    66: 91,  # 'B'
-    67: 79,  # 'C'
-    68: 80,  # 'D'
-    69: 92,  # 'E'
-    70: 89,  # 'F'
-    71: 97,  # 'G'
-    72: 90,  # 'H'
-    73: 68,  # 'I'
-    74: 111,  # 'J'
-    75: 112,  # 'K'
-    76: 82,  # 'L'
-    77: 73,  # 'M'
-    78: 95,  # 'N'
-    79: 85,  # 'O'
-    80: 78,  # 'P'
-    81: 121,  # 'Q'
-    82: 86,  # 'R'
-    83: 71,  # 'S'
-    84: 67,  # 'T'
-    85: 102,  # 'U'
-    86: 107,  # 'V'
-    87: 84,  # 'W'
-    88: 114,  # 'X'
-    89: 103,  # 'Y'
-    90: 115,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 50,  # 'a'
-    98: 74,  # 'b'
-    99: 60,  # 'c'
-    100: 61,  # 'd'
-    101: 42,  # 'e'
-    102: 76,  # 'f'
-    103: 70,  # 'g'
-    104: 64,  # 'h'
-    105: 53,  # 'i'
-    106: 105,  # 'j'
-    107: 93,  # 'k'
-    108: 56,  # 'l'
-    109: 65,  # 'm'
-    110: 54,  # 'n'
-    111: 49,  # 'o'
-    112: 66,  # 'p'
-    113: 110,  # 'q'
-    114: 51,  # 'r'
-    115: 43,  # 's'
-    116: 44,  # 't'
-    117: 63,  # 'u'
-    118: 81,  # 'v'
-    119: 77,  # 'w'
-    120: 98,  # 'x'
-    121: 75,  # 'y'
-    122: 108,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 124,  # '€'
-    129: 202,  # None
-    130: 203,  # '‚'
-    131: 204,  # 'ƒ'
-    132: 205,  # '„'
-    133: 40,  # '…'
-    134: 58,  # '†'
-    135: 206,  # '‡'
-    136: 207,  # 'ˆ'
-    137: 208,  # '‰'
-    138: 209,  # None
-    139: 210,  # '‹'
-    140: 211,  # None
-    141: 212,  # None
-    142: 213,  # None
-    143: 214,  # None
-    144: 215,  # None
-    145: 83,  # '‘'
-    146: 52,  # '’'
-    147: 47,  # '“'
-    148: 46,  # '”'
-    149: 72,  # '•'
-    150: 32,  # '–'
-    151: 94,  # '—'
-    152: 216,  # '˜'
-    153: 113,  # '™'
-    154: 217,  # None
-    155: 109,  # '›'
-    156: 218,  # None
-    157: 219,  # None
-    158: 220,  # None
-    159: 221,  # None
-    160: 34,  # '\xa0'
-    161: 116,  # '¡'
-    162: 222,  # '¢'
-    163: 118,  # '£'
-    164: 100,  # '₪'
-    165: 223,  # '¥'
-    166: 224,  # '¦'
-    167: 117,  # '§'
-    168: 119,  # '¨'
-    169: 104,  # '©'
-    170: 125,  # '×'
-    171: 225,  # '«'
-    172: 226,  # '¬'
-    173: 87,  # '\xad'
-    174: 99,  # '®'
-    175: 227,  # '¯'
-    176: 106,  # '°'
-    177: 122,  # '±'
-    178: 123,  # '²'
-    179: 228,  # '³'
-    180: 55,  # '´'
-    181: 229,  # 'µ'
-    182: 230,  # '¶'
-    183: 101,  # '·'
-    184: 231,  # '¸'
-    185: 232,  # '¹'
-    186: 120,  # '÷'
-    187: 233,  # '»'
-    188: 48,  # '¼'
-    189: 39,  # '½'
-    190: 57,  # '¾'
-    191: 234,  # '¿'
-    192: 30,  # 'ְ'
-    193: 59,  # 'ֱ'
-    194: 41,  # 'ֲ'
-    195: 88,  # 'ֳ'
-    196: 33,  # 'ִ'
-    197: 37,  # 'ֵ'
-    198: 36,  # 'ֶ'
-    199: 31,  # 'ַ'
-    200: 29,  # 'ָ'
-    201: 35,  # 'ֹ'
-    202: 235,  # None
-    203: 62,  # 'ֻ'
-    204: 28,  # 'ּ'
-    205: 236,  # 'ֽ'
-    206: 126,  # '־'
-    207: 237,  # 'ֿ'
-    208: 238,  # '׀'
-    209: 38,  # 'ׁ'
-    210: 45,  # 'ׂ'
-    211: 239,  # '׃'
-    212: 240,  # 'װ'
-    213: 241,  # 'ױ'
-    214: 242,  # 'ײ'
-    215: 243,  # '׳'
-    216: 127,  # '״'
-    217: 244,  # None
-    218: 245,  # None
-    219: 246,  # None
-    220: 247,  # None
-    221: 248,  # None
-    222: 249,  # None
-    223: 250,  # None
-    224: 9,  # 'א'
-    225: 8,  # 'ב'
-    226: 20,  # 'ג'
-    227: 16,  # 'ד'
-    228: 3,  # 'ה'
-    229: 2,  # 'ו'
-    230: 24,  # 'ז'
-    231: 14,  # 'ח'
-    232: 22,  # 'ט'
-    233: 1,  # 'י'
-    234: 25,  # 'ך'
-    235: 15,  # 'כ'
-    236: 4,  # 'ל'
-    237: 11,  # 'ם'
-    238: 6,  # 'מ'
-    239: 23,  # 'ן'
-    240: 12,  # 'נ'
-    241: 19,  # 'ס'
-    242: 13,  # 'ע'
-    243: 26,  # 'ף'
-    244: 18,  # 'פ'
-    245: 27,  # 'ץ'
-    246: 21,  # 'צ'
-    247: 17,  # 'ק'
-    248: 7,  # 'ר'
-    249: 10,  # 'ש'
-    250: 5,  # 'ת'
-    251: 251,  # None
-    252: 252,  # None
-    253: 128,  # '\u200e'
-    254: 96,  # '\u200f'
-    255: 253,  # None
-}
-
-WINDOWS_1255_HEBREW_MODEL = SingleByteCharSetModel(
-    charset_name="windows-1255",
-    language="Hebrew",
-    char_to_order_map=WINDOWS_1255_HEBREW_CHAR_TO_ORDER,
-    language_model=HEBREW_LANG_MODEL,
-    typical_positive_ratio=0.984004,
-    keep_ascii_letters=False,
-    alphabet="אבגדהוזחטיךכלםמןנסעףפץצקרשתװױײ",
-)
diff --git a/src/pip/_vendor/chardet/langhungarianmodel.py b/src/pip/_vendor/chardet/langhungarianmodel.py
deleted file mode 100644
index 09a0d326b98..00000000000
--- a/src/pip/_vendor/chardet/langhungarianmodel.py
+++ /dev/null
@@ -1,4649 +0,0 @@
-from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel
-
-# 3: Positive
-# 2: Likely
-# 1: Unlikely
-# 0: Negative
-
-HUNGARIAN_LANG_MODEL = {
-    28: {  # 'A'
-        28: 0,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 2,  # 'D'
-        32: 1,  # 'E'
-        50: 1,  # 'F'
-        49: 2,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 2,  # 'K'
-        41: 2,  # 'L'
-        34: 1,  # 'M'
-        35: 2,  # 'N'
-        47: 1,  # 'O'
-        46: 2,  # 'P'
-        43: 2,  # 'R'
-        33: 2,  # 'S'
-        37: 2,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 2,  # 'Z'
-        2: 0,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 2,  # 'd'
-        1: 1,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 1,  # 'h'
-        9: 1,  # 'i'
-        22: 1,  # 'j'
-        7: 2,  # 'k'
-        6: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 2,  # 'n'
-        8: 0,  # 'o'
-        23: 2,  # 'p'
-        10: 2,  # 'r'
-        5: 1,  # 's'
-        3: 1,  # 't'
-        21: 1,  # 'u'
-        19: 1,  # 'v'
-        62: 1,  # 'x'
-        16: 0,  # 'y'
-        11: 3,  # 'z'
-        51: 1,  # 'Á'
-        44: 0,  # 'É'
-        61: 1,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    40: {  # 'B'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 0,  # 'M'
-        35: 1,  # 'N'
-        47: 2,  # 'O'
-        46: 0,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 3,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 2,  # 'i'
-        22: 1,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 2,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 3,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 0,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 2,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    54: {  # 'C'
-        28: 1,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 1,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 0,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 2,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 0,  # 'V'
-        55: 1,  # 'Y'
-        52: 1,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 1,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 1,  # 'h'
-        9: 1,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 3,  # 's'
-        3: 0,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 1,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    45: {  # 'D'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 0,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 0,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 2,  # 'O'
-        46: 0,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 1,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 3,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 1,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 1,  # 'o'
-        23: 0,  # 'p'
-        10: 2,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 2,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 1,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 1,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    32: {  # 'E'
-        28: 1,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 1,  # 'E'
-        50: 1,  # 'F'
-        49: 2,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 2,  # 'K'
-        41: 2,  # 'L'
-        34: 2,  # 'M'
-        35: 2,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 2,  # 'R'
-        33: 2,  # 'S'
-        37: 2,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 1,  # 'Z'
-        2: 1,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 2,  # 'd'
-        1: 1,  # 'e'
-        27: 1,  # 'f'
-        12: 3,  # 'g'
-        20: 1,  # 'h'
-        9: 1,  # 'i'
-        22: 1,  # 'j'
-        7: 1,  # 'k'
-        6: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 2,  # 'n'
-        8: 0,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 2,  # 's'
-        3: 1,  # 't'
-        21: 2,  # 'u'
-        19: 1,  # 'v'
-        62: 1,  # 'x'
-        16: 0,  # 'y'
-        11: 3,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 0,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 1,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    50: {  # 'F'
-        28: 1,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 1,  # 'E'
-        50: 1,  # 'F'
-        49: 0,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 1,  # 'O'
-        46: 0,  # 'P'
-        43: 1,  # 'R'
-        33: 0,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 0,  # 'V'
-        55: 1,  # 'Y'
-        52: 0,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 1,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 2,  # 'i'
-        22: 1,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 2,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 0,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 0,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 2,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    49: {  # 'G'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 2,  # 'Y'
-        52: 1,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 1,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 2,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 2,  # 'y'
-        11: 0,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 0,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 1,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    38: {  # 'H'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 0,  # 'D'
-        32: 1,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 1,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 1,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 1,  # 'O'
-        46: 0,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 0,  # 'V'
-        55: 1,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 2,  # 'i'
-        22: 1,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 0,  # 'n'
-        8: 3,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 2,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 0,  # 'z'
-        51: 2,  # 'Á'
-        44: 2,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 1,  # 'é'
-        30: 2,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    39: {  # 'I'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 1,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 2,  # 'K'
-        41: 2,  # 'L'
-        34: 1,  # 'M'
-        35: 2,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 2,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 2,  # 'Z'
-        2: 0,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 2,  # 'd'
-        1: 0,  # 'e'
-        27: 1,  # 'f'
-        12: 2,  # 'g'
-        20: 1,  # 'h'
-        9: 0,  # 'i'
-        22: 1,  # 'j'
-        7: 1,  # 'k'
-        6: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 1,  # 'n'
-        8: 0,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 2,  # 's'
-        3: 2,  # 't'
-        21: 0,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 1,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 0,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    53: {  # 'J'
-        28: 2,  # 'A'
-        40: 0,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 1,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 1,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 1,  # 'o'
-        23: 0,  # 'p'
-        10: 0,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 2,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 0,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 0,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 1,  # 'é'
-        30: 0,  # 'í'
-        25: 2,  # 'ó'
-        24: 2,  # 'ö'
-        31: 1,  # 'ú'
-        29: 0,  # 'ü'
-        42: 1,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    36: {  # 'K'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 0,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 2,  # 'O'
-        46: 0,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 0,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 1,  # 'f'
-        12: 0,  # 'g'
-        20: 1,  # 'h'
-        9: 3,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 2,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 1,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 0,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 2,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 2,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 2,  # 'ö'
-        31: 1,  # 'ú'
-        29: 2,  # 'ü'
-        42: 1,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    41: {  # 'L'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 2,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 2,  # 'O'
-        46: 0,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 2,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 1,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 3,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 2,  # 'i'
-        22: 1,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 0,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 2,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 0,  # 'z'
-        51: 2,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 0,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    34: {  # 'M'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 0,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 1,  # 'Z'
-        2: 3,  # 'a'
-        18: 0,  # 'b'
-        26: 1,  # 'c'
-        17: 0,  # 'd'
-        1: 3,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 3,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 3,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 2,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 0,  # 'z'
-        51: 2,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 2,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    35: {  # 'N'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 2,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 2,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 2,  # 'Y'
-        52: 1,  # 'Z'
-        2: 3,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 3,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 2,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 1,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 0,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 2,  # 'y'
-        11: 0,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 1,  # 'á'
-        15: 2,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 1,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    47: {  # 'O'
-        28: 1,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 1,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 2,  # 'K'
-        41: 2,  # 'L'
-        34: 2,  # 'M'
-        35: 2,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 2,  # 'R'
-        33: 2,  # 'S'
-        37: 2,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 1,  # 'Z'
-        2: 0,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 1,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 1,  # 'h'
-        9: 1,  # 'i'
-        22: 1,  # 'j'
-        7: 2,  # 'k'
-        6: 2,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 1,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 1,  # 's'
-        3: 2,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 1,  # 'x'
-        16: 0,  # 'y'
-        11: 1,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 0,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    46: {  # 'P'
-        28: 1,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 1,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 0,  # 'M'
-        35: 1,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 2,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 1,  # 'f'
-        12: 0,  # 'g'
-        20: 1,  # 'h'
-        9: 2,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 1,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 2,  # 'r'
-        5: 1,  # 's'
-        3: 0,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 0,  # 'z'
-        51: 2,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 3,  # 'á'
-        15: 2,  # 'é'
-        30: 0,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 0,  # 'ú'
-        29: 1,  # 'ü'
-        42: 1,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    43: {  # 'R'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 2,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 2,  # 'S'
-        37: 2,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 1,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 1,  # 'h'
-        9: 2,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 0,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 0,  # 'z'
-        51: 2,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 2,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 2,  # 'é'
-        30: 1,  # 'í'
-        25: 2,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    33: {  # 'S'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 2,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 2,  # 'S'
-        37: 2,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 3,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 1,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 1,  # 'h'
-        9: 2,  # 'i'
-        22: 0,  # 'j'
-        7: 1,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 0,  # 'n'
-        8: 2,  # 'o'
-        23: 1,  # 'p'
-        10: 0,  # 'r'
-        5: 0,  # 's'
-        3: 1,  # 't'
-        21: 1,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 3,  # 'z'
-        51: 2,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    37: {  # 'T'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 2,  # 'O'
-        46: 1,  # 'P'
-        43: 2,  # 'R'
-        33: 1,  # 'S'
-        37: 2,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 1,  # 'Z'
-        2: 2,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 1,  # 'h'
-        9: 2,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 1,  # 's'
-        3: 0,  # 't'
-        21: 2,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 1,  # 'z'
-        51: 2,  # 'Á'
-        44: 2,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 2,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    57: {  # 'U'
-        28: 1,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 1,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 2,  # 'S'
-        37: 1,  # 'T'
-        57: 0,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 0,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 1,  # 'e'
-        27: 0,  # 'f'
-        12: 2,  # 'g'
-        20: 0,  # 'h'
-        9: 0,  # 'i'
-        22: 1,  # 'j'
-        7: 1,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 0,  # 'o'
-        23: 1,  # 'p'
-        10: 1,  # 'r'
-        5: 1,  # 's'
-        3: 1,  # 't'
-        21: 0,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 1,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    48: {  # 'V'
-        28: 2,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 0,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 2,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 2,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 2,  # 'o'
-        23: 0,  # 'p'
-        10: 0,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 0,  # 'z'
-        51: 2,  # 'Á'
-        44: 2,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 2,  # 'á'
-        15: 2,  # 'é'
-        30: 1,  # 'í'
-        25: 0,  # 'ó'
-        24: 1,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    55: {  # 'Y'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 1,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 2,  # 'Z'
-        2: 1,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 1,  # 'd'
-        1: 1,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 0,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        8: 1,  # 'o'
-        23: 1,  # 'p'
-        10: 0,  # 'r'
-        5: 0,  # 's'
-        3: 0,  # 't'
-        21: 0,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 0,  # 'z'
-        51: 1,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    52: {  # 'Z'
-        28: 2,  # 'A'
-        40: 1,  # 'B'
-        54: 0,  # 'C'
-        45: 1,  # 'D'
-        32: 2,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 2,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 2,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 2,  # 'S'
-        37: 1,  # 'T'
-        57: 1,  # 'U'
-        48: 1,  # 'V'
-        55: 1,  # 'Y'
-        52: 1,  # 'Z'
-        2: 1,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 1,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 1,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 1,  # 'n'
-        8: 1,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 2,  # 's'
-        3: 0,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 0,  # 'z'
-        51: 2,  # 'Á'
-        44: 1,  # 'É'
-        61: 1,  # 'Í'
-        58: 1,  # 'Ó'
-        59: 1,  # 'Ö'
-        60: 1,  # 'Ú'
-        63: 1,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    2: {  # 'a'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 1,  # 'a'
-        18: 3,  # 'b'
-        26: 3,  # 'c'
-        17: 3,  # 'd'
-        1: 2,  # 'e'
-        27: 2,  # 'f'
-        12: 3,  # 'g'
-        20: 3,  # 'h'
-        9: 3,  # 'i'
-        22: 3,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 2,  # 'o'
-        23: 3,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 3,  # 'v'
-        62: 1,  # 'x'
-        16: 2,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    18: {  # 'b'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 3,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 3,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 1,  # 'h'
-        9: 3,  # 'i'
-        22: 2,  # 'j'
-        7: 2,  # 'k'
-        6: 2,  # 'l'
-        13: 1,  # 'm'
-        4: 2,  # 'n'
-        8: 3,  # 'o'
-        23: 1,  # 'p'
-        10: 3,  # 'r'
-        5: 2,  # 's'
-        3: 1,  # 't'
-        21: 3,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 2,  # 'í'
-        25: 3,  # 'ó'
-        24: 2,  # 'ö'
-        31: 2,  # 'ú'
-        29: 2,  # 'ü'
-        42: 2,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    26: {  # 'c'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 1,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 1,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 2,  # 'a'
-        18: 1,  # 'b'
-        26: 2,  # 'c'
-        17: 1,  # 'd'
-        1: 3,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 3,  # 'h'
-        9: 3,  # 'i'
-        22: 1,  # 'j'
-        7: 2,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 3,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 3,  # 's'
-        3: 2,  # 't'
-        21: 2,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 2,  # 'á'
-        15: 2,  # 'é'
-        30: 2,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    17: {  # 'd'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 2,  # 'b'
-        26: 1,  # 'c'
-        17: 2,  # 'd'
-        1: 3,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 2,  # 'h'
-        9: 3,  # 'i'
-        22: 3,  # 'j'
-        7: 2,  # 'k'
-        6: 1,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 1,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 3,  # 'v'
-        62: 0,  # 'x'
-        16: 2,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 3,  # 'í'
-        25: 3,  # 'ó'
-        24: 3,  # 'ö'
-        31: 2,  # 'ú'
-        29: 2,  # 'ü'
-        42: 2,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    1: {  # 'e'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 2,  # 'a'
-        18: 3,  # 'b'
-        26: 3,  # 'c'
-        17: 3,  # 'd'
-        1: 2,  # 'e'
-        27: 3,  # 'f'
-        12: 3,  # 'g'
-        20: 3,  # 'h'
-        9: 3,  # 'i'
-        22: 3,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 2,  # 'o'
-        23: 3,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 2,  # 'u'
-        19: 3,  # 'v'
-        62: 2,  # 'x'
-        16: 2,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    27: {  # 'f'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 3,  # 'e'
-        27: 2,  # 'f'
-        12: 1,  # 'g'
-        20: 1,  # 'h'
-        9: 3,  # 'i'
-        22: 2,  # 'j'
-        7: 1,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 3,  # 'o'
-        23: 0,  # 'p'
-        10: 3,  # 'r'
-        5: 1,  # 's'
-        3: 1,  # 't'
-        21: 2,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 0,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 3,  # 'ö'
-        31: 1,  # 'ú'
-        29: 2,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    12: {  # 'g'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 3,  # 'b'
-        26: 2,  # 'c'
-        17: 2,  # 'd'
-        1: 3,  # 'e'
-        27: 2,  # 'f'
-        12: 3,  # 'g'
-        20: 3,  # 'h'
-        9: 3,  # 'i'
-        22: 3,  # 'j'
-        7: 2,  # 'k'
-        6: 3,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 1,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 3,  # 'v'
-        62: 0,  # 'x'
-        16: 3,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 2,  # 'í'
-        25: 3,  # 'ó'
-        24: 2,  # 'ö'
-        31: 2,  # 'ú'
-        29: 2,  # 'ü'
-        42: 2,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    20: {  # 'h'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 0,  # 'd'
-        1: 3,  # 'e'
-        27: 0,  # 'f'
-        12: 1,  # 'g'
-        20: 2,  # 'h'
-        9: 3,  # 'i'
-        22: 1,  # 'j'
-        7: 1,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 3,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 2,  # 's'
-        3: 1,  # 't'
-        21: 3,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 2,  # 'y'
-        11: 0,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 3,  # 'í'
-        25: 2,  # 'ó'
-        24: 2,  # 'ö'
-        31: 2,  # 'ú'
-        29: 1,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    9: {  # 'i'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 3,  # 'b'
-        26: 3,  # 'c'
-        17: 3,  # 'd'
-        1: 3,  # 'e'
-        27: 3,  # 'f'
-        12: 3,  # 'g'
-        20: 3,  # 'h'
-        9: 2,  # 'i'
-        22: 2,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 2,  # 'o'
-        23: 2,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 3,  # 'v'
-        62: 1,  # 'x'
-        16: 1,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 2,  # 'é'
-        30: 1,  # 'í'
-        25: 3,  # 'ó'
-        24: 1,  # 'ö'
-        31: 2,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    22: {  # 'j'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 2,  # 'b'
-        26: 1,  # 'c'
-        17: 3,  # 'd'
-        1: 3,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 2,  # 'h'
-        9: 1,  # 'i'
-        22: 2,  # 'j'
-        7: 2,  # 'k'
-        6: 2,  # 'l'
-        13: 1,  # 'm'
-        4: 2,  # 'n'
-        8: 3,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 2,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 1,  # 'í'
-        25: 3,  # 'ó'
-        24: 3,  # 'ö'
-        31: 3,  # 'ú'
-        29: 2,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    7: {  # 'k'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 3,  # 'b'
-        26: 2,  # 'c'
-        17: 1,  # 'd'
-        1: 3,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 2,  # 'h'
-        9: 3,  # 'i'
-        22: 2,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 1,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 1,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 2,  # 'v'
-        62: 0,  # 'x'
-        16: 2,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 3,  # 'í'
-        25: 2,  # 'ó'
-        24: 3,  # 'ö'
-        31: 1,  # 'ú'
-        29: 3,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    6: {  # 'l'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 1,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 1,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 2,  # 'b'
-        26: 3,  # 'c'
-        17: 3,  # 'd'
-        1: 3,  # 'e'
-        27: 3,  # 'f'
-        12: 3,  # 'g'
-        20: 3,  # 'h'
-        9: 3,  # 'i'
-        22: 3,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 2,  # 'p'
-        10: 2,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 3,  # 'v'
-        62: 0,  # 'x'
-        16: 3,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 3,  # 'í'
-        25: 3,  # 'ó'
-        24: 3,  # 'ö'
-        31: 2,  # 'ú'
-        29: 2,  # 'ü'
-        42: 3,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    13: {  # 'm'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 3,  # 'b'
-        26: 2,  # 'c'
-        17: 1,  # 'd'
-        1: 3,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 2,  # 'h'
-        9: 3,  # 'i'
-        22: 2,  # 'j'
-        7: 1,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 2,  # 'n'
-        8: 3,  # 'o'
-        23: 3,  # 'p'
-        10: 2,  # 'r'
-        5: 2,  # 's'
-        3: 2,  # 't'
-        21: 3,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 2,  # 'í'
-        25: 2,  # 'ó'
-        24: 2,  # 'ö'
-        31: 2,  # 'ú'
-        29: 2,  # 'ü'
-        42: 1,  # 'ő'
-        56: 2,  # 'ű'
-    },
-    4: {  # 'n'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 3,  # 'b'
-        26: 3,  # 'c'
-        17: 3,  # 'd'
-        1: 3,  # 'e'
-        27: 2,  # 'f'
-        12: 3,  # 'g'
-        20: 3,  # 'h'
-        9: 3,  # 'i'
-        22: 2,  # 'j'
-        7: 3,  # 'k'
-        6: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 2,  # 'p'
-        10: 2,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 2,  # 'v'
-        62: 1,  # 'x'
-        16: 3,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 2,  # 'í'
-        25: 2,  # 'ó'
-        24: 3,  # 'ö'
-        31: 2,  # 'ú'
-        29: 3,  # 'ü'
-        42: 2,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    8: {  # 'o'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 1,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 2,  # 'a'
-        18: 3,  # 'b'
-        26: 3,  # 'c'
-        17: 3,  # 'd'
-        1: 2,  # 'e'
-        27: 2,  # 'f'
-        12: 3,  # 'g'
-        20: 3,  # 'h'
-        9: 2,  # 'i'
-        22: 2,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 1,  # 'o'
-        23: 3,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 2,  # 'u'
-        19: 3,  # 'v'
-        62: 1,  # 'x'
-        16: 1,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 1,  # 'á'
-        15: 2,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    23: {  # 'p'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 1,  # 'b'
-        26: 2,  # 'c'
-        17: 1,  # 'd'
-        1: 3,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 2,  # 'h'
-        9: 3,  # 'i'
-        22: 2,  # 'j'
-        7: 2,  # 'k'
-        6: 3,  # 'l'
-        13: 1,  # 'm'
-        4: 2,  # 'n'
-        8: 3,  # 'o'
-        23: 3,  # 'p'
-        10: 3,  # 'r'
-        5: 2,  # 's'
-        3: 2,  # 't'
-        21: 3,  # 'u'
-        19: 2,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 2,  # 'í'
-        25: 2,  # 'ó'
-        24: 2,  # 'ö'
-        31: 1,  # 'ú'
-        29: 2,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    10: {  # 'r'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 3,  # 'b'
-        26: 3,  # 'c'
-        17: 3,  # 'd'
-        1: 3,  # 'e'
-        27: 2,  # 'f'
-        12: 3,  # 'g'
-        20: 2,  # 'h'
-        9: 3,  # 'i'
-        22: 3,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 2,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 3,  # 'v'
-        62: 1,  # 'x'
-        16: 2,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 2,  # 'í'
-        25: 3,  # 'ó'
-        24: 3,  # 'ö'
-        31: 3,  # 'ú'
-        29: 3,  # 'ü'
-        42: 2,  # 'ő'
-        56: 2,  # 'ű'
-    },
-    5: {  # 's'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 3,  # 'b'
-        26: 2,  # 'c'
-        17: 2,  # 'd'
-        1: 3,  # 'e'
-        27: 2,  # 'f'
-        12: 2,  # 'g'
-        20: 2,  # 'h'
-        9: 3,  # 'i'
-        22: 1,  # 'j'
-        7: 3,  # 'k'
-        6: 2,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 2,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 2,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 3,  # 'í'
-        25: 3,  # 'ó'
-        24: 3,  # 'ö'
-        31: 3,  # 'ú'
-        29: 3,  # 'ü'
-        42: 2,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    3: {  # 't'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 3,  # 'b'
-        26: 2,  # 'c'
-        17: 1,  # 'd'
-        1: 3,  # 'e'
-        27: 2,  # 'f'
-        12: 1,  # 'g'
-        20: 3,  # 'h'
-        9: 3,  # 'i'
-        22: 3,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 1,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 3,  # 'v'
-        62: 0,  # 'x'
-        16: 3,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 2,  # 'í'
-        25: 3,  # 'ó'
-        24: 3,  # 'ö'
-        31: 3,  # 'ú'
-        29: 3,  # 'ü'
-        42: 3,  # 'ő'
-        56: 2,  # 'ű'
-    },
-    21: {  # 'u'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 1,  # 'a'
-        18: 2,  # 'b'
-        26: 2,  # 'c'
-        17: 3,  # 'd'
-        1: 2,  # 'e'
-        27: 1,  # 'f'
-        12: 3,  # 'g'
-        20: 2,  # 'h'
-        9: 2,  # 'i'
-        22: 2,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 1,  # 'o'
-        23: 2,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 1,  # 'u'
-        19: 3,  # 'v'
-        62: 1,  # 'x'
-        16: 1,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 2,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 0,  # 'ö'
-        31: 1,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    19: {  # 'v'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 2,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 3,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 1,  # 'h'
-        9: 3,  # 'i'
-        22: 1,  # 'j'
-        7: 1,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 3,  # 'o'
-        23: 1,  # 'p'
-        10: 1,  # 'r'
-        5: 2,  # 's'
-        3: 2,  # 't'
-        21: 2,  # 'u'
-        19: 2,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 2,  # 'í'
-        25: 2,  # 'ó'
-        24: 2,  # 'ö'
-        31: 1,  # 'ú'
-        29: 2,  # 'ü'
-        42: 1,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    62: {  # 'x'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 1,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 0,  # 'd'
-        1: 1,  # 'e'
-        27: 1,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 1,  # 'i'
-        22: 0,  # 'j'
-        7: 1,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 1,  # 'o'
-        23: 1,  # 'p'
-        10: 1,  # 'r'
-        5: 1,  # 's'
-        3: 1,  # 't'
-        21: 1,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 0,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 1,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    16: {  # 'y'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 2,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 3,  # 'e'
-        27: 2,  # 'f'
-        12: 2,  # 'g'
-        20: 2,  # 'h'
-        9: 3,  # 'i'
-        22: 2,  # 'j'
-        7: 2,  # 'k'
-        6: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 2,  # 'p'
-        10: 2,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 3,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 2,  # 'í'
-        25: 2,  # 'ó'
-        24: 3,  # 'ö'
-        31: 2,  # 'ú'
-        29: 2,  # 'ü'
-        42: 1,  # 'ő'
-        56: 2,  # 'ű'
-    },
-    11: {  # 'z'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 3,  # 'a'
-        18: 2,  # 'b'
-        26: 1,  # 'c'
-        17: 3,  # 'd'
-        1: 3,  # 'e'
-        27: 1,  # 'f'
-        12: 2,  # 'g'
-        20: 2,  # 'h'
-        9: 3,  # 'i'
-        22: 1,  # 'j'
-        7: 3,  # 'k'
-        6: 2,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 3,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 3,  # 'u'
-        19: 2,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 3,  # 'á'
-        15: 3,  # 'é'
-        30: 3,  # 'í'
-        25: 3,  # 'ó'
-        24: 3,  # 'ö'
-        31: 2,  # 'ú'
-        29: 3,  # 'ü'
-        42: 2,  # 'ő'
-        56: 1,  # 'ű'
-    },
-    51: {  # 'Á'
-        28: 0,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 0,  # 'E'
-        50: 1,  # 'F'
-        49: 2,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 2,  # 'L'
-        34: 1,  # 'M'
-        35: 2,  # 'N'
-        47: 0,  # 'O'
-        46: 1,  # 'P'
-        43: 2,  # 'R'
-        33: 2,  # 'S'
-        37: 1,  # 'T'
-        57: 0,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 0,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 0,  # 'e'
-        27: 0,  # 'f'
-        12: 1,  # 'g'
-        20: 1,  # 'h'
-        9: 0,  # 'i'
-        22: 1,  # 'j'
-        7: 1,  # 'k'
-        6: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 0,  # 'n'
-        8: 0,  # 'o'
-        23: 1,  # 'p'
-        10: 1,  # 'r'
-        5: 1,  # 's'
-        3: 1,  # 't'
-        21: 0,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 1,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    44: {  # 'É'
-        28: 0,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 1,  # 'E'
-        50: 0,  # 'F'
-        49: 2,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 2,  # 'L'
-        34: 1,  # 'M'
-        35: 2,  # 'N'
-        47: 0,  # 'O'
-        46: 1,  # 'P'
-        43: 2,  # 'R'
-        33: 2,  # 'S'
-        37: 2,  # 'T'
-        57: 0,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 0,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 0,  # 'e'
-        27: 0,  # 'f'
-        12: 1,  # 'g'
-        20: 1,  # 'h'
-        9: 0,  # 'i'
-        22: 1,  # 'j'
-        7: 1,  # 'k'
-        6: 2,  # 'l'
-        13: 1,  # 'm'
-        4: 2,  # 'n'
-        8: 0,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 3,  # 's'
-        3: 1,  # 't'
-        21: 0,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 0,  # 'z'
-        51: 0,  # 'Á'
-        44: 1,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    61: {  # 'Í'
-        28: 0,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 0,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 1,  # 'J'
-        36: 0,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 0,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 0,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 0,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 0,  # 'e'
-        27: 0,  # 'f'
-        12: 2,  # 'g'
-        20: 0,  # 'h'
-        9: 0,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 1,  # 'm'
-        4: 0,  # 'n'
-        8: 0,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 0,  # 's'
-        3: 1,  # 't'
-        21: 0,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    58: {  # 'Ó'
-        28: 1,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 0,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 1,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 2,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 0,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 0,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 0,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 0,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 2,  # 'h'
-        9: 0,  # 'i'
-        22: 0,  # 'j'
-        7: 1,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 1,  # 'n'
-        8: 0,  # 'o'
-        23: 1,  # 'p'
-        10: 1,  # 'r'
-        5: 1,  # 's'
-        3: 0,  # 't'
-        21: 0,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 1,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    59: {  # 'Ö'
-        28: 0,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 0,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 0,  # 'O'
-        46: 1,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 0,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 0,  # 'a'
-        18: 0,  # 'b'
-        26: 1,  # 'c'
-        17: 1,  # 'd'
-        1: 0,  # 'e'
-        27: 0,  # 'f'
-        12: 0,  # 'g'
-        20: 0,  # 'h'
-        9: 0,  # 'i'
-        22: 0,  # 'j'
-        7: 1,  # 'k'
-        6: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        8: 0,  # 'o'
-        23: 0,  # 'p'
-        10: 2,  # 'r'
-        5: 1,  # 's'
-        3: 1,  # 't'
-        21: 0,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    60: {  # 'Ú'
-        28: 0,  # 'A'
-        40: 1,  # 'B'
-        54: 1,  # 'C'
-        45: 1,  # 'D'
-        32: 0,  # 'E'
-        50: 1,  # 'F'
-        49: 1,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 0,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 0,  # 'a'
-        18: 0,  # 'b'
-        26: 0,  # 'c'
-        17: 0,  # 'd'
-        1: 0,  # 'e'
-        27: 0,  # 'f'
-        12: 2,  # 'g'
-        20: 0,  # 'h'
-        9: 0,  # 'i'
-        22: 2,  # 'j'
-        7: 0,  # 'k'
-        6: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 1,  # 'n'
-        8: 0,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 1,  # 's'
-        3: 1,  # 't'
-        21: 0,  # 'u'
-        19: 0,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 0,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    63: {  # 'Ü'
-        28: 0,  # 'A'
-        40: 1,  # 'B'
-        54: 0,  # 'C'
-        45: 1,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 1,  # 'G'
-        38: 1,  # 'H'
-        39: 0,  # 'I'
-        53: 1,  # 'J'
-        36: 1,  # 'K'
-        41: 1,  # 'L'
-        34: 1,  # 'M'
-        35: 1,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 1,  # 'R'
-        33: 1,  # 'S'
-        37: 1,  # 'T'
-        57: 0,  # 'U'
-        48: 1,  # 'V'
-        55: 0,  # 'Y'
-        52: 1,  # 'Z'
-        2: 0,  # 'a'
-        18: 1,  # 'b'
-        26: 0,  # 'c'
-        17: 1,  # 'd'
-        1: 0,  # 'e'
-        27: 0,  # 'f'
-        12: 1,  # 'g'
-        20: 0,  # 'h'
-        9: 0,  # 'i'
-        22: 0,  # 'j'
-        7: 0,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 1,  # 'n'
-        8: 0,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 1,  # 's'
-        3: 1,  # 't'
-        21: 0,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 1,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    14: {  # 'á'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 1,  # 'a'
-        18: 3,  # 'b'
-        26: 3,  # 'c'
-        17: 3,  # 'd'
-        1: 1,  # 'e'
-        27: 2,  # 'f'
-        12: 3,  # 'g'
-        20: 2,  # 'h'
-        9: 2,  # 'i'
-        22: 3,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 1,  # 'o'
-        23: 2,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 2,  # 'u'
-        19: 3,  # 'v'
-        62: 0,  # 'x'
-        16: 1,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 1,  # 'á'
-        15: 2,  # 'é'
-        30: 1,  # 'í'
-        25: 0,  # 'ó'
-        24: 1,  # 'ö'
-        31: 0,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    15: {  # 'é'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 1,  # 'a'
-        18: 3,  # 'b'
-        26: 2,  # 'c'
-        17: 3,  # 'd'
-        1: 1,  # 'e'
-        27: 1,  # 'f'
-        12: 3,  # 'g'
-        20: 3,  # 'h'
-        9: 2,  # 'i'
-        22: 2,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 1,  # 'o'
-        23: 3,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 0,  # 'u'
-        19: 3,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    30: {  # 'í'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 0,  # 'a'
-        18: 1,  # 'b'
-        26: 2,  # 'c'
-        17: 1,  # 'd'
-        1: 0,  # 'e'
-        27: 1,  # 'f'
-        12: 3,  # 'g'
-        20: 0,  # 'h'
-        9: 0,  # 'i'
-        22: 1,  # 'j'
-        7: 1,  # 'k'
-        6: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        8: 0,  # 'o'
-        23: 1,  # 'p'
-        10: 3,  # 'r'
-        5: 2,  # 's'
-        3: 3,  # 't'
-        21: 0,  # 'u'
-        19: 3,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    25: {  # 'ó'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 2,  # 'a'
-        18: 3,  # 'b'
-        26: 2,  # 'c'
-        17: 3,  # 'd'
-        1: 1,  # 'e'
-        27: 2,  # 'f'
-        12: 2,  # 'g'
-        20: 2,  # 'h'
-        9: 2,  # 'i'
-        22: 2,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        8: 1,  # 'o'
-        23: 2,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 1,  # 'u'
-        19: 2,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 0,  # 'ó'
-        24: 1,  # 'ö'
-        31: 1,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    24: {  # 'ö'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 0,  # 'a'
-        18: 3,  # 'b'
-        26: 1,  # 'c'
-        17: 2,  # 'd'
-        1: 0,  # 'e'
-        27: 1,  # 'f'
-        12: 2,  # 'g'
-        20: 1,  # 'h'
-        9: 0,  # 'i'
-        22: 1,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        8: 0,  # 'o'
-        23: 2,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 3,  # 't'
-        21: 0,  # 'u'
-        19: 3,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 3,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    31: {  # 'ú'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 1,  # 'a'
-        18: 1,  # 'b'
-        26: 2,  # 'c'
-        17: 1,  # 'd'
-        1: 1,  # 'e'
-        27: 2,  # 'f'
-        12: 3,  # 'g'
-        20: 1,  # 'h'
-        9: 1,  # 'i'
-        22: 3,  # 'j'
-        7: 1,  # 'k'
-        6: 3,  # 'l'
-        13: 1,  # 'm'
-        4: 2,  # 'n'
-        8: 0,  # 'o'
-        23: 1,  # 'p'
-        10: 3,  # 'r'
-        5: 3,  # 's'
-        3: 2,  # 't'
-        21: 1,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 1,  # 'á'
-        15: 1,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    29: {  # 'ü'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 1,  # 'a'
-        18: 1,  # 'b'
-        26: 1,  # 'c'
-        17: 2,  # 'd'
-        1: 1,  # 'e'
-        27: 1,  # 'f'
-        12: 3,  # 'g'
-        20: 2,  # 'h'
-        9: 1,  # 'i'
-        22: 1,  # 'j'
-        7: 3,  # 'k'
-        6: 3,  # 'l'
-        13: 1,  # 'm'
-        4: 3,  # 'n'
-        8: 0,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 2,  # 's'
-        3: 2,  # 't'
-        21: 0,  # 'u'
-        19: 2,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 1,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    42: {  # 'ő'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 1,  # 'a'
-        18: 2,  # 'b'
-        26: 1,  # 'c'
-        17: 2,  # 'd'
-        1: 1,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 1,  # 'h'
-        9: 1,  # 'i'
-        22: 1,  # 'j'
-        7: 2,  # 'k'
-        6: 3,  # 'l'
-        13: 1,  # 'm'
-        4: 2,  # 'n'
-        8: 1,  # 'o'
-        23: 1,  # 'p'
-        10: 2,  # 'r'
-        5: 2,  # 's'
-        3: 2,  # 't'
-        21: 1,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 1,  # 'é'
-        30: 1,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 1,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-    56: {  # 'ű'
-        28: 0,  # 'A'
-        40: 0,  # 'B'
-        54: 0,  # 'C'
-        45: 0,  # 'D'
-        32: 0,  # 'E'
-        50: 0,  # 'F'
-        49: 0,  # 'G'
-        38: 0,  # 'H'
-        39: 0,  # 'I'
-        53: 0,  # 'J'
-        36: 0,  # 'K'
-        41: 0,  # 'L'
-        34: 0,  # 'M'
-        35: 0,  # 'N'
-        47: 0,  # 'O'
-        46: 0,  # 'P'
-        43: 0,  # 'R'
-        33: 0,  # 'S'
-        37: 0,  # 'T'
-        57: 0,  # 'U'
-        48: 0,  # 'V'
-        55: 0,  # 'Y'
-        52: 0,  # 'Z'
-        2: 1,  # 'a'
-        18: 1,  # 'b'
-        26: 0,  # 'c'
-        17: 1,  # 'd'
-        1: 1,  # 'e'
-        27: 1,  # 'f'
-        12: 1,  # 'g'
-        20: 1,  # 'h'
-        9: 1,  # 'i'
-        22: 1,  # 'j'
-        7: 1,  # 'k'
-        6: 1,  # 'l'
-        13: 0,  # 'm'
-        4: 2,  # 'n'
-        8: 0,  # 'o'
-        23: 0,  # 'p'
-        10: 1,  # 'r'
-        5: 1,  # 's'
-        3: 1,  # 't'
-        21: 0,  # 'u'
-        19: 1,  # 'v'
-        62: 0,  # 'x'
-        16: 0,  # 'y'
-        11: 2,  # 'z'
-        51: 0,  # 'Á'
-        44: 0,  # 'É'
-        61: 0,  # 'Í'
-        58: 0,  # 'Ó'
-        59: 0,  # 'Ö'
-        60: 0,  # 'Ú'
-        63: 0,  # 'Ü'
-        14: 0,  # 'á'
-        15: 0,  # 'é'
-        30: 0,  # 'í'
-        25: 0,  # 'ó'
-        24: 0,  # 'ö'
-        31: 0,  # 'ú'
-        29: 0,  # 'ü'
-        42: 0,  # 'ő'
-        56: 0,  # 'ű'
-    },
-}
-
-# 255: Undefined characters that did not exist in training text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-# 251: Control characters
-
-# Character Mapping Table(s):
-WINDOWS_1250_HUNGARIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 28,  # 'A'
-    66: 40,  # 'B'
-    67: 54,  # 'C'
-    68: 45,  # 'D'
-    69: 32,  # 'E'
-    70: 50,  # 'F'
-    71: 49,  # 'G'
-    72: 38,  # 'H'
-    73: 39,  # 'I'
-    74: 53,  # 'J'
-    75: 36,  # 'K'
-    76: 41,  # 'L'
-    77: 34,  # 'M'
-    78: 35,  # 'N'
-    79: 47,  # 'O'
-    80: 46,  # 'P'
-    81: 72,  # 'Q'
-    82: 43,  # 'R'
-    83: 33,  # 'S'
-    84: 37,  # 'T'
-    85: 57,  # 'U'
-    86: 48,  # 'V'
-    87: 64,  # 'W'
-    88: 68,  # 'X'
-    89: 55,  # 'Y'
-    90: 52,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 2,  # 'a'
-    98: 18,  # 'b'
-    99: 26,  # 'c'
-    100: 17,  # 'd'
-    101: 1,  # 'e'
-    102: 27,  # 'f'
-    103: 12,  # 'g'
-    104: 20,  # 'h'
-    105: 9,  # 'i'
-    106: 22,  # 'j'
-    107: 7,  # 'k'
-    108: 6,  # 'l'
-    109: 13,  # 'm'
-    110: 4,  # 'n'
-    111: 8,  # 'o'
-    112: 23,  # 'p'
-    113: 67,  # 'q'
-    114: 10,  # 'r'
-    115: 5,  # 's'
-    116: 3,  # 't'
-    117: 21,  # 'u'
-    118: 19,  # 'v'
-    119: 65,  # 'w'
-    120: 62,  # 'x'
-    121: 16,  # 'y'
-    122: 11,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 161,  # '€'
-    129: 162,  # None
-    130: 163,  # '‚'
-    131: 164,  # None
-    132: 165,  # '„'
-    133: 166,  # '…'
-    134: 167,  # '†'
-    135: 168,  # '‡'
-    136: 169,  # None
-    137: 170,  # '‰'
-    138: 171,  # 'Š'
-    139: 172,  # '‹'
-    140: 173,  # 'Ś'
-    141: 174,  # 'Ť'
-    142: 175,  # 'Ž'
-    143: 176,  # 'Ź'
-    144: 177,  # None
-    145: 178,  # '‘'
-    146: 179,  # '’'
-    147: 180,  # '“'
-    148: 78,  # '”'
-    149: 181,  # '•'
-    150: 69,  # '–'
-    151: 182,  # '—'
-    152: 183,  # None
-    153: 184,  # '™'
-    154: 185,  # 'š'
-    155: 186,  # '›'
-    156: 187,  # 'ś'
-    157: 188,  # 'ť'
-    158: 189,  # 'ž'
-    159: 190,  # 'ź'
-    160: 191,  # '\xa0'
-    161: 192,  # 'ˇ'
-    162: 193,  # '˘'
-    163: 194,  # 'Ł'
-    164: 195,  # '¤'
-    165: 196,  # 'Ą'
-    166: 197,  # '¦'
-    167: 76,  # '§'
-    168: 198,  # '¨'
-    169: 199,  # '©'
-    170: 200,  # 'Ş'
-    171: 201,  # '«'
-    172: 202,  # '¬'
-    173: 203,  # '\xad'
-    174: 204,  # '®'
-    175: 205,  # 'Ż'
-    176: 81,  # '°'
-    177: 206,  # '±'
-    178: 207,  # '˛'
-    179: 208,  # 'ł'
-    180: 209,  # '´'
-    181: 210,  # 'µ'
-    182: 211,  # '¶'
-    183: 212,  # '·'
-    184: 213,  # '¸'
-    185: 214,  # 'ą'
-    186: 215,  # 'ş'
-    187: 216,  # '»'
-    188: 217,  # 'Ľ'
-    189: 218,  # '˝'
-    190: 219,  # 'ľ'
-    191: 220,  # 'ż'
-    192: 221,  # 'Ŕ'
-    193: 51,  # 'Á'
-    194: 83,  # 'Â'
-    195: 222,  # 'Ă'
-    196: 80,  # 'Ä'
-    197: 223,  # 'Ĺ'
-    198: 224,  # 'Ć'
-    199: 225,  # 'Ç'
-    200: 226,  # 'Č'
-    201: 44,  # 'É'
-    202: 227,  # 'Ę'
-    203: 228,  # 'Ë'
-    204: 229,  # 'Ě'
-    205: 61,  # 'Í'
-    206: 230,  # 'Î'
-    207: 231,  # 'Ď'
-    208: 232,  # 'Đ'
-    209: 233,  # 'Ń'
-    210: 234,  # 'Ň'
-    211: 58,  # 'Ó'
-    212: 235,  # 'Ô'
-    213: 66,  # 'Ő'
-    214: 59,  # 'Ö'
-    215: 236,  # '×'
-    216: 237,  # 'Ř'
-    217: 238,  # 'Ů'
-    218: 60,  # 'Ú'
-    219: 70,  # 'Ű'
-    220: 63,  # 'Ü'
-    221: 239,  # 'Ý'
-    222: 240,  # 'Ţ'
-    223: 241,  # 'ß'
-    224: 84,  # 'ŕ'
-    225: 14,  # 'á'
-    226: 75,  # 'â'
-    227: 242,  # 'ă'
-    228: 71,  # 'ä'
-    229: 82,  # 'ĺ'
-    230: 243,  # 'ć'
-    231: 73,  # 'ç'
-    232: 244,  # 'č'
-    233: 15,  # 'é'
-    234: 85,  # 'ę'
-    235: 79,  # 'ë'
-    236: 86,  # 'ě'
-    237: 30,  # 'í'
-    238: 77,  # 'î'
-    239: 87,  # 'ď'
-    240: 245,  # 'đ'
-    241: 246,  # 'ń'
-    242: 247,  # 'ň'
-    243: 25,  # 'ó'
-    244: 74,  # 'ô'
-    245: 42,  # 'ő'
-    246: 24,  # 'ö'
-    247: 248,  # '÷'
-    248: 249,  # 'ř'
-    249: 250,  # 'ů'
-    250: 31,  # 'ú'
-    251: 56,  # 'ű'
-    252: 29,  # 'ü'
-    253: 251,  # 'ý'
-    254: 252,  # 'ţ'
-    255: 253,  # '˙'
-}
-
-WINDOWS_1250_HUNGARIAN_MODEL = SingleByteCharSetModel(
-    charset_name="windows-1250",
-    language="Hungarian",
-    char_to_order_map=WINDOWS_1250_HUNGARIAN_CHAR_TO_ORDER,
-    language_model=HUNGARIAN_LANG_MODEL,
-    typical_positive_ratio=0.947368,
-    keep_ascii_letters=True,
-    alphabet="ABCDEFGHIJKLMNOPRSTUVZabcdefghijklmnoprstuvzÁÉÍÓÖÚÜáéíóöúüŐőŰű",
-)
-
-ISO_8859_2_HUNGARIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 28,  # 'A'
-    66: 40,  # 'B'
-    67: 54,  # 'C'
-    68: 45,  # 'D'
-    69: 32,  # 'E'
-    70: 50,  # 'F'
-    71: 49,  # 'G'
-    72: 38,  # 'H'
-    73: 39,  # 'I'
-    74: 53,  # 'J'
-    75: 36,  # 'K'
-    76: 41,  # 'L'
-    77: 34,  # 'M'
-    78: 35,  # 'N'
-    79: 47,  # 'O'
-    80: 46,  # 'P'
-    81: 71,  # 'Q'
-    82: 43,  # 'R'
-    83: 33,  # 'S'
-    84: 37,  # 'T'
-    85: 57,  # 'U'
-    86: 48,  # 'V'
-    87: 64,  # 'W'
-    88: 68,  # 'X'
-    89: 55,  # 'Y'
-    90: 52,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 2,  # 'a'
-    98: 18,  # 'b'
-    99: 26,  # 'c'
-    100: 17,  # 'd'
-    101: 1,  # 'e'
-    102: 27,  # 'f'
-    103: 12,  # 'g'
-    104: 20,  # 'h'
-    105: 9,  # 'i'
-    106: 22,  # 'j'
-    107: 7,  # 'k'
-    108: 6,  # 'l'
-    109: 13,  # 'm'
-    110: 4,  # 'n'
-    111: 8,  # 'o'
-    112: 23,  # 'p'
-    113: 67,  # 'q'
-    114: 10,  # 'r'
-    115: 5,  # 's'
-    116: 3,  # 't'
-    117: 21,  # 'u'
-    118: 19,  # 'v'
-    119: 65,  # 'w'
-    120: 62,  # 'x'
-    121: 16,  # 'y'
-    122: 11,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 159,  # '\x80'
-    129: 160,  # '\x81'
-    130: 161,  # '\x82'
-    131: 162,  # '\x83'
-    132: 163,  # '\x84'
-    133: 164,  # '\x85'
-    134: 165,  # '\x86'
-    135: 166,  # '\x87'
-    136: 167,  # '\x88'
-    137: 168,  # '\x89'
-    138: 169,  # '\x8a'
-    139: 170,  # '\x8b'
-    140: 171,  # '\x8c'
-    141: 172,  # '\x8d'
-    142: 173,  # '\x8e'
-    143: 174,  # '\x8f'
-    144: 175,  # '\x90'
-    145: 176,  # '\x91'
-    146: 177,  # '\x92'
-    147: 178,  # '\x93'
-    148: 179,  # '\x94'
-    149: 180,  # '\x95'
-    150: 181,  # '\x96'
-    151: 182,  # '\x97'
-    152: 183,  # '\x98'
-    153: 184,  # '\x99'
-    154: 185,  # '\x9a'
-    155: 186,  # '\x9b'
-    156: 187,  # '\x9c'
-    157: 188,  # '\x9d'
-    158: 189,  # '\x9e'
-    159: 190,  # '\x9f'
-    160: 191,  # '\xa0'
-    161: 192,  # 'Ą'
-    162: 193,  # '˘'
-    163: 194,  # 'Ł'
-    164: 195,  # '¤'
-    165: 196,  # 'Ľ'
-    166: 197,  # 'Ś'
-    167: 75,  # '§'
-    168: 198,  # '¨'
-    169: 199,  # 'Š'
-    170: 200,  # 'Ş'
-    171: 201,  # 'Ť'
-    172: 202,  # 'Ź'
-    173: 203,  # '\xad'
-    174: 204,  # 'Ž'
-    175: 205,  # 'Ż'
-    176: 79,  # '°'
-    177: 206,  # 'ą'
-    178: 207,  # '˛'
-    179: 208,  # 'ł'
-    180: 209,  # '´'
-    181: 210,  # 'ľ'
-    182: 211,  # 'ś'
-    183: 212,  # 'ˇ'
-    184: 213,  # '¸'
-    185: 214,  # 'š'
-    186: 215,  # 'ş'
-    187: 216,  # 'ť'
-    188: 217,  # 'ź'
-    189: 218,  # '˝'
-    190: 219,  # 'ž'
-    191: 220,  # 'ż'
-    192: 221,  # 'Ŕ'
-    193: 51,  # 'Á'
-    194: 81,  # 'Â'
-    195: 222,  # 'Ă'
-    196: 78,  # 'Ä'
-    197: 223,  # 'Ĺ'
-    198: 224,  # 'Ć'
-    199: 225,  # 'Ç'
-    200: 226,  # 'Č'
-    201: 44,  # 'É'
-    202: 227,  # 'Ę'
-    203: 228,  # 'Ë'
-    204: 229,  # 'Ě'
-    205: 61,  # 'Í'
-    206: 230,  # 'Î'
-    207: 231,  # 'Ď'
-    208: 232,  # 'Đ'
-    209: 233,  # 'Ń'
-    210: 234,  # 'Ň'
-    211: 58,  # 'Ó'
-    212: 235,  # 'Ô'
-    213: 66,  # 'Ő'
-    214: 59,  # 'Ö'
-    215: 236,  # '×'
-    216: 237,  # 'Ř'
-    217: 238,  # 'Ů'
-    218: 60,  # 'Ú'
-    219: 69,  # 'Ű'
-    220: 63,  # 'Ü'
-    221: 239,  # 'Ý'
-    222: 240,  # 'Ţ'
-    223: 241,  # 'ß'
-    224: 82,  # 'ŕ'
-    225: 14,  # 'á'
-    226: 74,  # 'â'
-    227: 242,  # 'ă'
-    228: 70,  # 'ä'
-    229: 80,  # 'ĺ'
-    230: 243,  # 'ć'
-    231: 72,  # 'ç'
-    232: 244,  # 'č'
-    233: 15,  # 'é'
-    234: 83,  # 'ę'
-    235: 77,  # 'ë'
-    236: 84,  # 'ě'
-    237: 30,  # 'í'
-    238: 76,  # 'î'
-    239: 85,  # 'ď'
-    240: 245,  # 'đ'
-    241: 246,  # 'ń'
-    242: 247,  # 'ň'
-    243: 25,  # 'ó'
-    244: 73,  # 'ô'
-    245: 42,  # 'ő'
-    246: 24,  # 'ö'
-    247: 248,  # '÷'
-    248: 249,  # 'ř'
-    249: 250,  # 'ů'
-    250: 31,  # 'ú'
-    251: 56,  # 'ű'
-    252: 29,  # 'ü'
-    253: 251,  # 'ý'
-    254: 252,  # 'ţ'
-    255: 253,  # '˙'
-}
-
-ISO_8859_2_HUNGARIAN_MODEL = SingleByteCharSetModel(
-    charset_name="ISO-8859-2",
-    language="Hungarian",
-    char_to_order_map=ISO_8859_2_HUNGARIAN_CHAR_TO_ORDER,
-    language_model=HUNGARIAN_LANG_MODEL,
-    typical_positive_ratio=0.947368,
-    keep_ascii_letters=True,
-    alphabet="ABCDEFGHIJKLMNOPRSTUVZabcdefghijklmnoprstuvzÁÉÍÓÖÚÜáéíóöúüŐőŰű",
-)
diff --git a/src/pip/_vendor/chardet/langrussianmodel.py b/src/pip/_vendor/chardet/langrussianmodel.py
deleted file mode 100644
index 39a5388948e..00000000000
--- a/src/pip/_vendor/chardet/langrussianmodel.py
+++ /dev/null
@@ -1,5725 +0,0 @@
-from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel
-
-# 3: Positive
-# 2: Likely
-# 1: Unlikely
-# 0: Negative
-
-RUSSIAN_LANG_MODEL = {
-    37: {  # 'А'
-        37: 0,  # 'А'
-        44: 1,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 1,  # 'Ж'
-        51: 1,  # 'З'
-        42: 1,  # 'И'
-        60: 1,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 2,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 1,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 1,  # 'Ш'
-        63: 1,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 1,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 1,  # 'а'
-        21: 2,  # 'б'
-        10: 2,  # 'в'
-        19: 2,  # 'г'
-        13: 2,  # 'д'
-        2: 0,  # 'е'
-        24: 1,  # 'ж'
-        20: 1,  # 'з'
-        4: 0,  # 'и'
-        23: 1,  # 'й'
-        11: 2,  # 'к'
-        8: 3,  # 'л'
-        12: 2,  # 'м'
-        5: 2,  # 'н'
-        1: 0,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 2,  # 'у'
-        39: 2,  # 'ф'
-        26: 2,  # 'х'
-        28: 0,  # 'ц'
-        22: 1,  # 'ч'
-        25: 2,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 1,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    44: {  # 'Б'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 1,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 2,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 1,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 2,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 2,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 2,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    33: {  # 'В'
-        37: 2,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 0,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 1,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 2,  # 'а'
-        21: 1,  # 'б'
-        10: 1,  # 'в'
-        19: 1,  # 'г'
-        13: 2,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 2,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 1,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 2,  # 'н'
-        1: 3,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 3,  # 'с'
-        6: 2,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 1,  # 'х'
-        28: 1,  # 'ц'
-        22: 2,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 1,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 0,  # 'ю'
-        16: 1,  # 'я'
-    },
-    46: {  # 'Г'
-        37: 1,  # 'А'
-        44: 1,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 0,  # 'б'
-        10: 1,  # 'в'
-        19: 0,  # 'г'
-        13: 2,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 1,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 2,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 1,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    41: {  # 'Д'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 2,  # 'Е'
-        56: 1,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 0,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 3,  # 'а'
-        21: 0,  # 'б'
-        10: 2,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 3,  # 'ж'
-        20: 1,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 1,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 2,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    48: {  # 'Е'
-        37: 1,  # 'А'
-        44: 1,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 1,  # 'Ж'
-        51: 1,  # 'З'
-        42: 1,  # 'И'
-        60: 1,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 2,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 2,  # 'Р'
-        32: 2,  # 'С'
-        40: 1,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 1,  # 'Ш'
-        63: 1,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 0,  # 'а'
-        21: 0,  # 'б'
-        10: 2,  # 'в'
-        19: 2,  # 'г'
-        13: 2,  # 'д'
-        2: 2,  # 'е'
-        24: 1,  # 'ж'
-        20: 1,  # 'з'
-        4: 0,  # 'и'
-        23: 2,  # 'й'
-        11: 1,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 1,  # 'н'
-        1: 0,  # 'о'
-        15: 1,  # 'п'
-        9: 1,  # 'р'
-        7: 3,  # 'с'
-        6: 0,  # 'т'
-        14: 0,  # 'у'
-        39: 1,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 1,  # 'ш'
-        29: 2,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    56: {  # 'Ж'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 1,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 1,  # 'б'
-        10: 0,  # 'в'
-        19: 1,  # 'г'
-        13: 1,  # 'д'
-        2: 2,  # 'е'
-        24: 1,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 1,  # 'м'
-        5: 0,  # 'н'
-        1: 2,  # 'о'
-        15: 0,  # 'п'
-        9: 1,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 2,  # 'ю'
-        16: 0,  # 'я'
-    },
-    51: {  # 'З'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 1,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 1,  # 'б'
-        10: 2,  # 'в'
-        19: 0,  # 'г'
-        13: 2,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 1,  # 'л'
-        12: 1,  # 'м'
-        5: 2,  # 'н'
-        1: 2,  # 'о'
-        15: 0,  # 'п'
-        9: 1,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 1,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 1,  # 'я'
-    },
-    42: {  # 'И'
-        37: 1,  # 'А'
-        44: 1,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 1,  # 'Д'
-        48: 2,  # 'Е'
-        56: 1,  # 'Ж'
-        51: 1,  # 'З'
-        42: 1,  # 'И'
-        60: 1,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 2,  # 'С'
-        40: 1,  # 'Т'
-        52: 0,  # 'У'
-        53: 1,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 1,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 1,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 1,  # 'а'
-        21: 2,  # 'б'
-        10: 2,  # 'в'
-        19: 2,  # 'г'
-        13: 2,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 2,  # 'з'
-        4: 1,  # 'и'
-        23: 0,  # 'й'
-        11: 1,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 2,  # 'н'
-        1: 1,  # 'о'
-        15: 1,  # 'п'
-        9: 2,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 1,  # 'у'
-        39: 1,  # 'ф'
-        26: 2,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 1,  # 'ш'
-        29: 1,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    60: {  # 'Й'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 1,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 0,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 1,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 0,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 2,  # 'о'
-        15: 0,  # 'п'
-        9: 0,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 0,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    36: {  # 'К'
-        37: 2,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 1,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 1,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 2,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 0,  # 'б'
-        10: 1,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 2,  # 'л'
-        12: 0,  # 'м'
-        5: 1,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 2,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    49: {  # 'Л'
-        37: 2,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 1,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 1,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 0,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 0,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 1,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 2,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 1,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 1,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 1,  # 'л'
-        12: 0,  # 'м'
-        5: 1,  # 'н'
-        1: 2,  # 'о'
-        15: 0,  # 'п'
-        9: 0,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 2,  # 'ю'
-        16: 1,  # 'я'
-    },
-    38: {  # 'М'
-        37: 1,  # 'А'
-        44: 1,  # 'Б'
-        33: 1,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 1,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 1,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 3,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 1,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 1,  # 'л'
-        12: 1,  # 'м'
-        5: 2,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 1,  # 'р'
-        7: 1,  # 'с'
-        6: 0,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    31: {  # 'Н'
-        37: 2,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 1,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 1,  # 'З'
-        42: 2,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 1,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 1,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 3,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 1,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 3,  # 'у'
-        39: 0,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 2,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    34: {  # 'О'
-        37: 0,  # 'А'
-        44: 1,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 2,  # 'Д'
-        48: 1,  # 'Е'
-        56: 1,  # 'Ж'
-        51: 1,  # 'З'
-        42: 1,  # 'И'
-        60: 1,  # 'Й'
-        36: 1,  # 'К'
-        49: 2,  # 'Л'
-        38: 1,  # 'М'
-        31: 2,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 2,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 1,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 1,  # 'Ш'
-        63: 1,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 1,  # 'а'
-        21: 2,  # 'б'
-        10: 1,  # 'в'
-        19: 2,  # 'г'
-        13: 2,  # 'д'
-        2: 0,  # 'е'
-        24: 1,  # 'ж'
-        20: 1,  # 'з'
-        4: 0,  # 'и'
-        23: 1,  # 'й'
-        11: 2,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 3,  # 'н'
-        1: 0,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 1,  # 'у'
-        39: 1,  # 'ф'
-        26: 2,  # 'х'
-        28: 1,  # 'ц'
-        22: 2,  # 'ч'
-        25: 2,  # 'ш'
-        29: 1,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    35: {  # 'П'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 1,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 2,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 2,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 2,  # 'л'
-        12: 0,  # 'м'
-        5: 1,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 3,  # 'р'
-        7: 1,  # 'с'
-        6: 1,  # 'т'
-        14: 2,  # 'у'
-        39: 1,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 2,  # 'ь'
-        30: 1,  # 'э'
-        27: 0,  # 'ю'
-        16: 2,  # 'я'
-    },
-    45: {  # 'Р'
-        37: 2,  # 'А'
-        44: 1,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 1,  # 'Д'
-        48: 2,  # 'Е'
-        56: 1,  # 'Ж'
-        51: 0,  # 'З'
-        42: 2,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 2,  # 'О'
-        35: 0,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 1,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 1,  # 'Э'
-        59: 1,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 3,  # 'а'
-        21: 0,  # 'б'
-        10: 1,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 1,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 1,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 2,  # 'ы'
-        17: 0,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 2,  # 'я'
-    },
-    32: {  # 'С'
-        37: 1,  # 'А'
-        44: 1,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 2,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 1,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 1,  # 'Э'
-        59: 1,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 2,  # 'а'
-        21: 1,  # 'б'
-        10: 2,  # 'в'
-        19: 1,  # 'г'
-        13: 2,  # 'д'
-        2: 3,  # 'е'
-        24: 1,  # 'ж'
-        20: 1,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 2,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 2,  # 'н'
-        1: 2,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 1,  # 'с'
-        6: 3,  # 'т'
-        14: 2,  # 'у'
-        39: 1,  # 'ф'
-        26: 1,  # 'х'
-        28: 1,  # 'ц'
-        22: 1,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 1,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    40: {  # 'Т'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 2,  # 'О'
-        35: 0,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 1,  # 'Э'
-        59: 1,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 3,  # 'а'
-        21: 1,  # 'б'
-        10: 2,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 1,  # 'к'
-        8: 1,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 2,  # 'р'
-        7: 1,  # 'с'
-        6: 0,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 1,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    52: {  # 'У'
-        37: 1,  # 'А'
-        44: 1,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 1,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 1,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 1,  # 'Ш'
-        63: 1,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 1,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 1,  # 'а'
-        21: 2,  # 'б'
-        10: 2,  # 'в'
-        19: 1,  # 'г'
-        13: 2,  # 'д'
-        2: 1,  # 'е'
-        24: 2,  # 'ж'
-        20: 2,  # 'з'
-        4: 2,  # 'и'
-        23: 1,  # 'й'
-        11: 1,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 1,  # 'н'
-        1: 2,  # 'о'
-        15: 1,  # 'п'
-        9: 2,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 0,  # 'у'
-        39: 1,  # 'ф'
-        26: 1,  # 'х'
-        28: 1,  # 'ц'
-        22: 2,  # 'ч'
-        25: 1,  # 'ш'
-        29: 1,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 2,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    53: {  # 'Ф'
-        37: 1,  # 'А'
-        44: 1,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 1,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 1,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 2,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 2,  # 'о'
-        15: 0,  # 'п'
-        9: 2,  # 'р'
-        7: 0,  # 'с'
-        6: 1,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    55: {  # 'Х'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 0,  # 'б'
-        10: 2,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 0,  # 'н'
-        1: 2,  # 'о'
-        15: 0,  # 'п'
-        9: 2,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 1,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 1,  # 'ь'
-        30: 1,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    58: {  # 'Ц'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 1,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 1,  # 'а'
-        21: 0,  # 'б'
-        10: 1,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 0,  # 'о'
-        15: 0,  # 'п'
-        9: 0,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 1,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    50: {  # 'Ч'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 0,  # 'О'
-        35: 1,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 1,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 1,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 1,  # 'о'
-        15: 0,  # 'п'
-        9: 1,  # 'р'
-        7: 0,  # 'с'
-        6: 3,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 1,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    57: {  # 'Ш'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 1,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 0,  # 'б'
-        10: 1,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 1,  # 'и'
-        23: 0,  # 'й'
-        11: 1,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 1,  # 'н'
-        1: 2,  # 'о'
-        15: 2,  # 'п'
-        9: 1,  # 'р'
-        7: 0,  # 'с'
-        6: 2,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 1,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    63: {  # 'Щ'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 1,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 1,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 1,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 1,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 1,  # 'о'
-        15: 0,  # 'п'
-        9: 0,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 1,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    62: {  # 'Ы'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 1,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 0,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 1,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 1,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 0,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 0,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 0,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 0,  # 'о'
-        15: 0,  # 'п'
-        9: 0,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 0,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    61: {  # 'Ь'
-        37: 0,  # 'А'
-        44: 1,  # 'Б'
-        33: 1,  # 'В'
-        46: 0,  # 'Г'
-        41: 1,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 0,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 1,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 1,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 1,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 1,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 1,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 0,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 0,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 0,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 0,  # 'о'
-        15: 0,  # 'п'
-        9: 0,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 0,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    47: {  # 'Э'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 0,  # 'Г'
-        41: 1,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 1,  # 'Й'
-        36: 1,  # 'К'
-        49: 1,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 0,  # 'О'
-        35: 1,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 1,  # 'а'
-        21: 1,  # 'б'
-        10: 2,  # 'в'
-        19: 1,  # 'г'
-        13: 2,  # 'д'
-        2: 0,  # 'е'
-        24: 1,  # 'ж'
-        20: 0,  # 'з'
-        4: 0,  # 'и'
-        23: 2,  # 'й'
-        11: 2,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 2,  # 'н'
-        1: 0,  # 'о'
-        15: 1,  # 'п'
-        9: 2,  # 'р'
-        7: 1,  # 'с'
-        6: 3,  # 'т'
-        14: 1,  # 'у'
-        39: 1,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    59: {  # 'Ю'
-        37: 1,  # 'А'
-        44: 1,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 1,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 1,  # 'Р'
-        32: 0,  # 'С'
-        40: 1,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 1,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 0,  # 'а'
-        21: 1,  # 'б'
-        10: 0,  # 'в'
-        19: 1,  # 'г'
-        13: 1,  # 'д'
-        2: 0,  # 'е'
-        24: 1,  # 'ж'
-        20: 0,  # 'з'
-        4: 0,  # 'и'
-        23: 0,  # 'й'
-        11: 1,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 2,  # 'н'
-        1: 0,  # 'о'
-        15: 1,  # 'п'
-        9: 1,  # 'р'
-        7: 1,  # 'с'
-        6: 0,  # 'т'
-        14: 0,  # 'у'
-        39: 0,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    43: {  # 'Я'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 1,  # 'В'
-        46: 1,  # 'Г'
-        41: 0,  # 'Д'
-        48: 1,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 1,  # 'С'
-        40: 1,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 1,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 1,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 1,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 1,  # 'Ю'
-        43: 1,  # 'Я'
-        3: 0,  # 'а'
-        21: 1,  # 'б'
-        10: 1,  # 'в'
-        19: 1,  # 'г'
-        13: 1,  # 'д'
-        2: 0,  # 'е'
-        24: 0,  # 'ж'
-        20: 1,  # 'з'
-        4: 0,  # 'и'
-        23: 1,  # 'й'
-        11: 1,  # 'к'
-        8: 1,  # 'л'
-        12: 1,  # 'м'
-        5: 2,  # 'н'
-        1: 0,  # 'о'
-        15: 1,  # 'п'
-        9: 1,  # 'р'
-        7: 1,  # 'с'
-        6: 0,  # 'т'
-        14: 0,  # 'у'
-        39: 0,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 1,  # 'ш'
-        29: 1,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    3: {  # 'а'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 1,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 3,  # 'б'
-        10: 3,  # 'в'
-        19: 3,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 3,  # 'ж'
-        20: 3,  # 'з'
-        4: 3,  # 'и'
-        23: 3,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 2,  # 'о'
-        15: 3,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 3,  # 'у'
-        39: 2,  # 'ф'
-        26: 3,  # 'х'
-        28: 3,  # 'ц'
-        22: 3,  # 'ч'
-        25: 3,  # 'ш'
-        29: 3,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 2,  # 'э'
-        27: 3,  # 'ю'
-        16: 3,  # 'я'
-    },
-    21: {  # 'б'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 1,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 2,  # 'в'
-        19: 1,  # 'г'
-        13: 2,  # 'д'
-        2: 3,  # 'е'
-        24: 2,  # 'ж'
-        20: 1,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 2,  # 'к'
-        8: 3,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 1,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 2,  # 'т'
-        14: 3,  # 'у'
-        39: 0,  # 'ф'
-        26: 2,  # 'х'
-        28: 1,  # 'ц'
-        22: 1,  # 'ч'
-        25: 2,  # 'ш'
-        29: 3,  # 'щ'
-        54: 2,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 2,  # 'ь'
-        30: 1,  # 'э'
-        27: 2,  # 'ю'
-        16: 3,  # 'я'
-    },
-    10: {  # 'в'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 2,  # 'в'
-        19: 2,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 1,  # 'ж'
-        20: 3,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 3,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 3,  # 'у'
-        39: 1,  # 'ф'
-        26: 2,  # 'х'
-        28: 2,  # 'ц'
-        22: 2,  # 'ч'
-        25: 3,  # 'ш'
-        29: 2,  # 'щ'
-        54: 2,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 3,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 3,  # 'я'
-    },
-    19: {  # 'г'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 1,  # 'б'
-        10: 2,  # 'в'
-        19: 1,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 1,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 2,  # 'к'
-        8: 3,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 3,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 3,  # 'у'
-        39: 1,  # 'ф'
-        26: 1,  # 'х'
-        28: 1,  # 'ц'
-        22: 2,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 1,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    13: {  # 'д'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 3,  # 'в'
-        19: 2,  # 'г'
-        13: 2,  # 'д'
-        2: 3,  # 'е'
-        24: 2,  # 'ж'
-        20: 2,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 2,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 3,  # 'у'
-        39: 1,  # 'ф'
-        26: 2,  # 'х'
-        28: 3,  # 'ц'
-        22: 2,  # 'ч'
-        25: 2,  # 'ш'
-        29: 1,  # 'щ'
-        54: 2,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 3,  # 'ь'
-        30: 1,  # 'э'
-        27: 2,  # 'ю'
-        16: 3,  # 'я'
-    },
-    2: {  # 'е'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 3,  # 'б'
-        10: 3,  # 'в'
-        19: 3,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 3,  # 'ж'
-        20: 3,  # 'з'
-        4: 2,  # 'и'
-        23: 3,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 3,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 2,  # 'у'
-        39: 2,  # 'ф'
-        26: 3,  # 'х'
-        28: 3,  # 'ц'
-        22: 3,  # 'ч'
-        25: 3,  # 'ш'
-        29: 3,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 1,  # 'э'
-        27: 2,  # 'ю'
-        16: 3,  # 'я'
-    },
-    24: {  # 'ж'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 1,  # 'в'
-        19: 2,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 2,  # 'ж'
-        20: 1,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 2,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 3,  # 'н'
-        1: 2,  # 'о'
-        15: 1,  # 'п'
-        9: 2,  # 'р'
-        7: 2,  # 'с'
-        6: 1,  # 'т'
-        14: 3,  # 'у'
-        39: 1,  # 'ф'
-        26: 0,  # 'х'
-        28: 1,  # 'ц'
-        22: 2,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 2,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    20: {  # 'з'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 3,  # 'б'
-        10: 3,  # 'в'
-        19: 3,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 2,  # 'ж'
-        20: 2,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 3,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 3,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 1,  # 'ц'
-        22: 2,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 2,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 2,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 3,  # 'я'
-    },
-    4: {  # 'и'
-        37: 1,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 1,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 3,  # 'б'
-        10: 3,  # 'в'
-        19: 3,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 3,  # 'ж'
-        20: 3,  # 'з'
-        4: 3,  # 'и'
-        23: 3,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 3,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 2,  # 'у'
-        39: 2,  # 'ф'
-        26: 3,  # 'х'
-        28: 3,  # 'ц'
-        22: 3,  # 'ч'
-        25: 3,  # 'ш'
-        29: 3,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 2,  # 'э'
-        27: 3,  # 'ю'
-        16: 3,  # 'я'
-    },
-    23: {  # 'й'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 1,  # 'а'
-        21: 1,  # 'б'
-        10: 1,  # 'в'
-        19: 2,  # 'г'
-        13: 3,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 2,  # 'з'
-        4: 1,  # 'и'
-        23: 0,  # 'й'
-        11: 2,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 2,  # 'о'
-        15: 1,  # 'п'
-        9: 2,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 1,  # 'у'
-        39: 2,  # 'ф'
-        26: 1,  # 'х'
-        28: 2,  # 'ц'
-        22: 3,  # 'ч'
-        25: 2,  # 'ш'
-        29: 1,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 2,  # 'я'
-    },
-    11: {  # 'к'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 1,  # 'б'
-        10: 3,  # 'в'
-        19: 1,  # 'г'
-        13: 1,  # 'д'
-        2: 3,  # 'е'
-        24: 2,  # 'ж'
-        20: 2,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 2,  # 'к'
-        8: 3,  # 'л'
-        12: 1,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 3,  # 'у'
-        39: 1,  # 'ф'
-        26: 2,  # 'х'
-        28: 2,  # 'ц'
-        22: 1,  # 'ч'
-        25: 2,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 1,  # 'ы'
-        17: 1,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    8: {  # 'л'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 2,  # 'в'
-        19: 3,  # 'г'
-        13: 2,  # 'д'
-        2: 3,  # 'е'
-        24: 3,  # 'ж'
-        20: 2,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 2,  # 'п'
-        9: 1,  # 'р'
-        7: 3,  # 'с'
-        6: 2,  # 'т'
-        14: 3,  # 'у'
-        39: 2,  # 'ф'
-        26: 2,  # 'х'
-        28: 1,  # 'ц'
-        22: 3,  # 'ч'
-        25: 2,  # 'ш'
-        29: 1,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 3,  # 'ь'
-        30: 1,  # 'э'
-        27: 3,  # 'ю'
-        16: 3,  # 'я'
-    },
-    12: {  # 'м'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 2,  # 'в'
-        19: 2,  # 'г'
-        13: 1,  # 'д'
-        2: 3,  # 'е'
-        24: 1,  # 'ж'
-        20: 1,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 2,  # 'к'
-        8: 3,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 3,  # 'с'
-        6: 2,  # 'т'
-        14: 3,  # 'у'
-        39: 2,  # 'ф'
-        26: 2,  # 'х'
-        28: 2,  # 'ц'
-        22: 2,  # 'ч'
-        25: 1,  # 'ш'
-        29: 1,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 2,  # 'ь'
-        30: 2,  # 'э'
-        27: 1,  # 'ю'
-        16: 3,  # 'я'
-    },
-    5: {  # 'н'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 2,  # 'в'
-        19: 3,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 2,  # 'ж'
-        20: 2,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 1,  # 'п'
-        9: 2,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 3,  # 'у'
-        39: 2,  # 'ф'
-        26: 2,  # 'х'
-        28: 3,  # 'ц'
-        22: 3,  # 'ч'
-        25: 2,  # 'ш'
-        29: 2,  # 'щ'
-        54: 1,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 3,  # 'ь'
-        30: 1,  # 'э'
-        27: 3,  # 'ю'
-        16: 3,  # 'я'
-    },
-    1: {  # 'о'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 3,  # 'б'
-        10: 3,  # 'в'
-        19: 3,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 3,  # 'ж'
-        20: 3,  # 'з'
-        4: 3,  # 'и'
-        23: 3,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 3,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 2,  # 'у'
-        39: 2,  # 'ф'
-        26: 3,  # 'х'
-        28: 2,  # 'ц'
-        22: 3,  # 'ч'
-        25: 3,  # 'ш'
-        29: 3,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 2,  # 'э'
-        27: 3,  # 'ю'
-        16: 3,  # 'я'
-    },
-    15: {  # 'п'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 1,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 2,  # 'к'
-        8: 3,  # 'л'
-        12: 1,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 2,  # 'п'
-        9: 3,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 3,  # 'у'
-        39: 1,  # 'ф'
-        26: 0,  # 'х'
-        28: 2,  # 'ц'
-        22: 2,  # 'ч'
-        25: 1,  # 'ш'
-        29: 1,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 2,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 3,  # 'я'
-    },
-    9: {  # 'р'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 3,  # 'в'
-        19: 3,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 3,  # 'ж'
-        20: 2,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 2,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 3,  # 'у'
-        39: 2,  # 'ф'
-        26: 3,  # 'х'
-        28: 2,  # 'ц'
-        22: 2,  # 'ч'
-        25: 3,  # 'ш'
-        29: 2,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 3,  # 'ь'
-        30: 2,  # 'э'
-        27: 2,  # 'ю'
-        16: 3,  # 'я'
-    },
-    7: {  # 'с'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 1,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 3,  # 'в'
-        19: 2,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 2,  # 'ж'
-        20: 2,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 3,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 3,  # 'у'
-        39: 2,  # 'ф'
-        26: 3,  # 'х'
-        28: 2,  # 'ц'
-        22: 3,  # 'ч'
-        25: 2,  # 'ш'
-        29: 1,  # 'щ'
-        54: 2,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 3,  # 'ь'
-        30: 2,  # 'э'
-        27: 3,  # 'ю'
-        16: 3,  # 'я'
-    },
-    6: {  # 'т'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 2,  # 'б'
-        10: 3,  # 'в'
-        19: 2,  # 'г'
-        13: 2,  # 'д'
-        2: 3,  # 'е'
-        24: 1,  # 'ж'
-        20: 1,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 2,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 2,  # 'т'
-        14: 3,  # 'у'
-        39: 2,  # 'ф'
-        26: 2,  # 'х'
-        28: 2,  # 'ц'
-        22: 2,  # 'ч'
-        25: 2,  # 'ш'
-        29: 2,  # 'щ'
-        54: 2,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 3,  # 'ь'
-        30: 2,  # 'э'
-        27: 2,  # 'ю'
-        16: 3,  # 'я'
-    },
-    14: {  # 'у'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 3,  # 'б'
-        10: 3,  # 'в'
-        19: 3,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 3,  # 'ж'
-        20: 3,  # 'з'
-        4: 2,  # 'и'
-        23: 2,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 2,  # 'о'
-        15: 3,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 1,  # 'у'
-        39: 2,  # 'ф'
-        26: 3,  # 'х'
-        28: 2,  # 'ц'
-        22: 3,  # 'ч'
-        25: 3,  # 'ш'
-        29: 3,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 2,  # 'э'
-        27: 3,  # 'ю'
-        16: 2,  # 'я'
-    },
-    39: {  # 'ф'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 1,  # 'б'
-        10: 0,  # 'в'
-        19: 1,  # 'г'
-        13: 0,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 1,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 1,  # 'н'
-        1: 3,  # 'о'
-        15: 1,  # 'п'
-        9: 2,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 2,  # 'у'
-        39: 2,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 1,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 2,  # 'ы'
-        17: 1,  # 'ь'
-        30: 2,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    26: {  # 'х'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 0,  # 'б'
-        10: 3,  # 'в'
-        19: 1,  # 'г'
-        13: 1,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 1,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 1,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 1,  # 'п'
-        9: 3,  # 'р'
-        7: 2,  # 'с'
-        6: 2,  # 'т'
-        14: 2,  # 'у'
-        39: 1,  # 'ф'
-        26: 1,  # 'х'
-        28: 1,  # 'ц'
-        22: 1,  # 'ч'
-        25: 2,  # 'ш'
-        29: 0,  # 'щ'
-        54: 1,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 1,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    28: {  # 'ц'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 1,  # 'б'
-        10: 2,  # 'в'
-        19: 1,  # 'г'
-        13: 1,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 1,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 2,  # 'к'
-        8: 1,  # 'л'
-        12: 1,  # 'м'
-        5: 1,  # 'н'
-        1: 3,  # 'о'
-        15: 0,  # 'п'
-        9: 1,  # 'р'
-        7: 0,  # 'с'
-        6: 1,  # 'т'
-        14: 3,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 1,  # 'ц'
-        22: 0,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 3,  # 'ы'
-        17: 1,  # 'ь'
-        30: 0,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    22: {  # 'ч'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 1,  # 'б'
-        10: 1,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 3,  # 'е'
-        24: 1,  # 'ж'
-        20: 0,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 2,  # 'л'
-        12: 1,  # 'м'
-        5: 3,  # 'н'
-        1: 2,  # 'о'
-        15: 0,  # 'п'
-        9: 2,  # 'р'
-        7: 1,  # 'с'
-        6: 3,  # 'т'
-        14: 3,  # 'у'
-        39: 1,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 1,  # 'ч'
-        25: 2,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 3,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    25: {  # 'ш'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 1,  # 'б'
-        10: 2,  # 'в'
-        19: 1,  # 'г'
-        13: 0,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 2,  # 'м'
-        5: 3,  # 'н'
-        1: 3,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 1,  # 'с'
-        6: 2,  # 'т'
-        14: 3,  # 'у'
-        39: 2,  # 'ф'
-        26: 1,  # 'х'
-        28: 1,  # 'ц'
-        22: 1,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 3,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 0,  # 'я'
-    },
-    29: {  # 'щ'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 3,  # 'а'
-        21: 0,  # 'б'
-        10: 1,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 3,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 3,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 1,  # 'м'
-        5: 2,  # 'н'
-        1: 1,  # 'о'
-        15: 0,  # 'п'
-        9: 2,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 2,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 2,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 0,  # 'я'
-    },
-    54: {  # 'ъ'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 0,  # 'а'
-        21: 0,  # 'б'
-        10: 0,  # 'в'
-        19: 0,  # 'г'
-        13: 0,  # 'д'
-        2: 2,  # 'е'
-        24: 0,  # 'ж'
-        20: 0,  # 'з'
-        4: 0,  # 'и'
-        23: 0,  # 'й'
-        11: 0,  # 'к'
-        8: 0,  # 'л'
-        12: 0,  # 'м'
-        5: 0,  # 'н'
-        1: 0,  # 'о'
-        15: 0,  # 'п'
-        9: 0,  # 'р'
-        7: 0,  # 'с'
-        6: 0,  # 'т'
-        14: 0,  # 'у'
-        39: 0,  # 'ф'
-        26: 0,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 0,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 1,  # 'ю'
-        16: 2,  # 'я'
-    },
-    18: {  # 'ы'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 0,  # 'а'
-        21: 3,  # 'б'
-        10: 3,  # 'в'
-        19: 2,  # 'г'
-        13: 2,  # 'д'
-        2: 3,  # 'е'
-        24: 2,  # 'ж'
-        20: 2,  # 'з'
-        4: 2,  # 'и'
-        23: 3,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 1,  # 'о'
-        15: 3,  # 'п'
-        9: 3,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 1,  # 'у'
-        39: 0,  # 'ф'
-        26: 3,  # 'х'
-        28: 2,  # 'ц'
-        22: 3,  # 'ч'
-        25: 3,  # 'ш'
-        29: 2,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 0,  # 'ю'
-        16: 2,  # 'я'
-    },
-    17: {  # 'ь'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 0,  # 'а'
-        21: 2,  # 'б'
-        10: 2,  # 'в'
-        19: 2,  # 'г'
-        13: 2,  # 'д'
-        2: 3,  # 'е'
-        24: 1,  # 'ж'
-        20: 3,  # 'з'
-        4: 2,  # 'и'
-        23: 0,  # 'й'
-        11: 3,  # 'к'
-        8: 0,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 2,  # 'о'
-        15: 2,  # 'п'
-        9: 1,  # 'р'
-        7: 3,  # 'с'
-        6: 2,  # 'т'
-        14: 0,  # 'у'
-        39: 2,  # 'ф'
-        26: 1,  # 'х'
-        28: 2,  # 'ц'
-        22: 2,  # 'ч'
-        25: 3,  # 'ш'
-        29: 2,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 1,  # 'э'
-        27: 3,  # 'ю'
-        16: 3,  # 'я'
-    },
-    30: {  # 'э'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 1,  # 'М'
-        31: 1,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 1,  # 'Р'
-        32: 1,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 1,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 0,  # 'а'
-        21: 1,  # 'б'
-        10: 1,  # 'в'
-        19: 1,  # 'г'
-        13: 2,  # 'д'
-        2: 1,  # 'е'
-        24: 0,  # 'ж'
-        20: 1,  # 'з'
-        4: 0,  # 'и'
-        23: 2,  # 'й'
-        11: 2,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 2,  # 'н'
-        1: 0,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 2,  # 'с'
-        6: 3,  # 'т'
-        14: 1,  # 'у'
-        39: 2,  # 'ф'
-        26: 1,  # 'х'
-        28: 0,  # 'ц'
-        22: 0,  # 'ч'
-        25: 1,  # 'ш'
-        29: 0,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 1,  # 'э'
-        27: 1,  # 'ю'
-        16: 1,  # 'я'
-    },
-    27: {  # 'ю'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 2,  # 'а'
-        21: 3,  # 'б'
-        10: 1,  # 'в'
-        19: 2,  # 'г'
-        13: 3,  # 'д'
-        2: 1,  # 'е'
-        24: 2,  # 'ж'
-        20: 2,  # 'з'
-        4: 1,  # 'и'
-        23: 1,  # 'й'
-        11: 2,  # 'к'
-        8: 2,  # 'л'
-        12: 2,  # 'м'
-        5: 2,  # 'н'
-        1: 1,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 0,  # 'у'
-        39: 1,  # 'ф'
-        26: 2,  # 'х'
-        28: 2,  # 'ц'
-        22: 2,  # 'ч'
-        25: 2,  # 'ш'
-        29: 3,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 1,  # 'э'
-        27: 2,  # 'ю'
-        16: 1,  # 'я'
-    },
-    16: {  # 'я'
-        37: 0,  # 'А'
-        44: 0,  # 'Б'
-        33: 0,  # 'В'
-        46: 0,  # 'Г'
-        41: 0,  # 'Д'
-        48: 0,  # 'Е'
-        56: 0,  # 'Ж'
-        51: 0,  # 'З'
-        42: 0,  # 'И'
-        60: 0,  # 'Й'
-        36: 0,  # 'К'
-        49: 0,  # 'Л'
-        38: 0,  # 'М'
-        31: 0,  # 'Н'
-        34: 0,  # 'О'
-        35: 0,  # 'П'
-        45: 0,  # 'Р'
-        32: 0,  # 'С'
-        40: 0,  # 'Т'
-        52: 0,  # 'У'
-        53: 0,  # 'Ф'
-        55: 0,  # 'Х'
-        58: 0,  # 'Ц'
-        50: 0,  # 'Ч'
-        57: 0,  # 'Ш'
-        63: 0,  # 'Щ'
-        62: 0,  # 'Ы'
-        61: 0,  # 'Ь'
-        47: 0,  # 'Э'
-        59: 0,  # 'Ю'
-        43: 0,  # 'Я'
-        3: 0,  # 'а'
-        21: 2,  # 'б'
-        10: 3,  # 'в'
-        19: 2,  # 'г'
-        13: 3,  # 'д'
-        2: 3,  # 'е'
-        24: 3,  # 'ж'
-        20: 3,  # 'з'
-        4: 2,  # 'и'
-        23: 2,  # 'й'
-        11: 3,  # 'к'
-        8: 3,  # 'л'
-        12: 3,  # 'м'
-        5: 3,  # 'н'
-        1: 0,  # 'о'
-        15: 2,  # 'п'
-        9: 2,  # 'р'
-        7: 3,  # 'с'
-        6: 3,  # 'т'
-        14: 1,  # 'у'
-        39: 1,  # 'ф'
-        26: 3,  # 'х'
-        28: 2,  # 'ц'
-        22: 2,  # 'ч'
-        25: 2,  # 'ш'
-        29: 3,  # 'щ'
-        54: 0,  # 'ъ'
-        18: 0,  # 'ы'
-        17: 0,  # 'ь'
-        30: 0,  # 'э'
-        27: 2,  # 'ю'
-        16: 2,  # 'я'
-    },
-}
-
-# 255: Undefined characters that did not exist in training text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-# 251: Control characters
-
-# Character Mapping Table(s):
-IBM866_RUSSIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 142,  # 'A'
-    66: 143,  # 'B'
-    67: 144,  # 'C'
-    68: 145,  # 'D'
-    69: 146,  # 'E'
-    70: 147,  # 'F'
-    71: 148,  # 'G'
-    72: 149,  # 'H'
-    73: 150,  # 'I'
-    74: 151,  # 'J'
-    75: 152,  # 'K'
-    76: 74,  # 'L'
-    77: 153,  # 'M'
-    78: 75,  # 'N'
-    79: 154,  # 'O'
-    80: 155,  # 'P'
-    81: 156,  # 'Q'
-    82: 157,  # 'R'
-    83: 158,  # 'S'
-    84: 159,  # 'T'
-    85: 160,  # 'U'
-    86: 161,  # 'V'
-    87: 162,  # 'W'
-    88: 163,  # 'X'
-    89: 164,  # 'Y'
-    90: 165,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 71,  # 'a'
-    98: 172,  # 'b'
-    99: 66,  # 'c'
-    100: 173,  # 'd'
-    101: 65,  # 'e'
-    102: 174,  # 'f'
-    103: 76,  # 'g'
-    104: 175,  # 'h'
-    105: 64,  # 'i'
-    106: 176,  # 'j'
-    107: 177,  # 'k'
-    108: 77,  # 'l'
-    109: 72,  # 'm'
-    110: 178,  # 'n'
-    111: 69,  # 'o'
-    112: 67,  # 'p'
-    113: 179,  # 'q'
-    114: 78,  # 'r'
-    115: 73,  # 's'
-    116: 180,  # 't'
-    117: 181,  # 'u'
-    118: 79,  # 'v'
-    119: 182,  # 'w'
-    120: 183,  # 'x'
-    121: 184,  # 'y'
-    122: 185,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 37,  # 'А'
-    129: 44,  # 'Б'
-    130: 33,  # 'В'
-    131: 46,  # 'Г'
-    132: 41,  # 'Д'
-    133: 48,  # 'Е'
-    134: 56,  # 'Ж'
-    135: 51,  # 'З'
-    136: 42,  # 'И'
-    137: 60,  # 'Й'
-    138: 36,  # 'К'
-    139: 49,  # 'Л'
-    140: 38,  # 'М'
-    141: 31,  # 'Н'
-    142: 34,  # 'О'
-    143: 35,  # 'П'
-    144: 45,  # 'Р'
-    145: 32,  # 'С'
-    146: 40,  # 'Т'
-    147: 52,  # 'У'
-    148: 53,  # 'Ф'
-    149: 55,  # 'Х'
-    150: 58,  # 'Ц'
-    151: 50,  # 'Ч'
-    152: 57,  # 'Ш'
-    153: 63,  # 'Щ'
-    154: 70,  # 'Ъ'
-    155: 62,  # 'Ы'
-    156: 61,  # 'Ь'
-    157: 47,  # 'Э'
-    158: 59,  # 'Ю'
-    159: 43,  # 'Я'
-    160: 3,  # 'а'
-    161: 21,  # 'б'
-    162: 10,  # 'в'
-    163: 19,  # 'г'
-    164: 13,  # 'д'
-    165: 2,  # 'е'
-    166: 24,  # 'ж'
-    167: 20,  # 'з'
-    168: 4,  # 'и'
-    169: 23,  # 'й'
-    170: 11,  # 'к'
-    171: 8,  # 'л'
-    172: 12,  # 'м'
-    173: 5,  # 'н'
-    174: 1,  # 'о'
-    175: 15,  # 'п'
-    176: 191,  # '░'
-    177: 192,  # '▒'
-    178: 193,  # '▓'
-    179: 194,  # '│'
-    180: 195,  # '┤'
-    181: 196,  # '╡'
-    182: 197,  # '╢'
-    183: 198,  # '╖'
-    184: 199,  # '╕'
-    185: 200,  # '╣'
-    186: 201,  # '║'
-    187: 202,  # '╗'
-    188: 203,  # '╝'
-    189: 204,  # '╜'
-    190: 205,  # '╛'
-    191: 206,  # '┐'
-    192: 207,  # '└'
-    193: 208,  # '┴'
-    194: 209,  # '┬'
-    195: 210,  # '├'
-    196: 211,  # '─'
-    197: 212,  # '┼'
-    198: 213,  # '╞'
-    199: 214,  # '╟'
-    200: 215,  # '╚'
-    201: 216,  # '╔'
-    202: 217,  # '╩'
-    203: 218,  # '╦'
-    204: 219,  # '╠'
-    205: 220,  # '═'
-    206: 221,  # '╬'
-    207: 222,  # '╧'
-    208: 223,  # '╨'
-    209: 224,  # '╤'
-    210: 225,  # '╥'
-    211: 226,  # '╙'
-    212: 227,  # '╘'
-    213: 228,  # '╒'
-    214: 229,  # '╓'
-    215: 230,  # '╫'
-    216: 231,  # '╪'
-    217: 232,  # '┘'
-    218: 233,  # '┌'
-    219: 234,  # '█'
-    220: 235,  # '▄'
-    221: 236,  # '▌'
-    222: 237,  # '▐'
-    223: 238,  # '▀'
-    224: 9,  # 'р'
-    225: 7,  # 'с'
-    226: 6,  # 'т'
-    227: 14,  # 'у'
-    228: 39,  # 'ф'
-    229: 26,  # 'х'
-    230: 28,  # 'ц'
-    231: 22,  # 'ч'
-    232: 25,  # 'ш'
-    233: 29,  # 'щ'
-    234: 54,  # 'ъ'
-    235: 18,  # 'ы'
-    236: 17,  # 'ь'
-    237: 30,  # 'э'
-    238: 27,  # 'ю'
-    239: 16,  # 'я'
-    240: 239,  # 'Ё'
-    241: 68,  # 'ё'
-    242: 240,  # 'Є'
-    243: 241,  # 'є'
-    244: 242,  # 'Ї'
-    245: 243,  # 'ї'
-    246: 244,  # 'Ў'
-    247: 245,  # 'ў'
-    248: 246,  # '°'
-    249: 247,  # '∙'
-    250: 248,  # '·'
-    251: 249,  # '√'
-    252: 250,  # '№'
-    253: 251,  # '¤'
-    254: 252,  # '■'
-    255: 255,  # '\xa0'
-}
-
-IBM866_RUSSIAN_MODEL = SingleByteCharSetModel(
-    charset_name="IBM866",
-    language="Russian",
-    char_to_order_map=IBM866_RUSSIAN_CHAR_TO_ORDER,
-    language_model=RUSSIAN_LANG_MODEL,
-    typical_positive_ratio=0.976601,
-    keep_ascii_letters=False,
-    alphabet="ЁАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяё",
-)
-
-WINDOWS_1251_RUSSIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 142,  # 'A'
-    66: 143,  # 'B'
-    67: 144,  # 'C'
-    68: 145,  # 'D'
-    69: 146,  # 'E'
-    70: 147,  # 'F'
-    71: 148,  # 'G'
-    72: 149,  # 'H'
-    73: 150,  # 'I'
-    74: 151,  # 'J'
-    75: 152,  # 'K'
-    76: 74,  # 'L'
-    77: 153,  # 'M'
-    78: 75,  # 'N'
-    79: 154,  # 'O'
-    80: 155,  # 'P'
-    81: 156,  # 'Q'
-    82: 157,  # 'R'
-    83: 158,  # 'S'
-    84: 159,  # 'T'
-    85: 160,  # 'U'
-    86: 161,  # 'V'
-    87: 162,  # 'W'
-    88: 163,  # 'X'
-    89: 164,  # 'Y'
-    90: 165,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 71,  # 'a'
-    98: 172,  # 'b'
-    99: 66,  # 'c'
-    100: 173,  # 'd'
-    101: 65,  # 'e'
-    102: 174,  # 'f'
-    103: 76,  # 'g'
-    104: 175,  # 'h'
-    105: 64,  # 'i'
-    106: 176,  # 'j'
-    107: 177,  # 'k'
-    108: 77,  # 'l'
-    109: 72,  # 'm'
-    110: 178,  # 'n'
-    111: 69,  # 'o'
-    112: 67,  # 'p'
-    113: 179,  # 'q'
-    114: 78,  # 'r'
-    115: 73,  # 's'
-    116: 180,  # 't'
-    117: 181,  # 'u'
-    118: 79,  # 'v'
-    119: 182,  # 'w'
-    120: 183,  # 'x'
-    121: 184,  # 'y'
-    122: 185,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 191,  # 'Ђ'
-    129: 192,  # 'Ѓ'
-    130: 193,  # '‚'
-    131: 194,  # 'ѓ'
-    132: 195,  # '„'
-    133: 196,  # '…'
-    134: 197,  # '†'
-    135: 198,  # '‡'
-    136: 199,  # '€'
-    137: 200,  # '‰'
-    138: 201,  # 'Љ'
-    139: 202,  # '‹'
-    140: 203,  # 'Њ'
-    141: 204,  # 'Ќ'
-    142: 205,  # 'Ћ'
-    143: 206,  # 'Џ'
-    144: 207,  # 'ђ'
-    145: 208,  # '‘'
-    146: 209,  # '’'
-    147: 210,  # '“'
-    148: 211,  # '”'
-    149: 212,  # '•'
-    150: 213,  # '–'
-    151: 214,  # '—'
-    152: 215,  # None
-    153: 216,  # '™'
-    154: 217,  # 'љ'
-    155: 218,  # '›'
-    156: 219,  # 'њ'
-    157: 220,  # 'ќ'
-    158: 221,  # 'ћ'
-    159: 222,  # 'џ'
-    160: 223,  # '\xa0'
-    161: 224,  # 'Ў'
-    162: 225,  # 'ў'
-    163: 226,  # 'Ј'
-    164: 227,  # '¤'
-    165: 228,  # 'Ґ'
-    166: 229,  # '¦'
-    167: 230,  # '§'
-    168: 231,  # 'Ё'
-    169: 232,  # '©'
-    170: 233,  # 'Є'
-    171: 234,  # '«'
-    172: 235,  # '¬'
-    173: 236,  # '\xad'
-    174: 237,  # '®'
-    175: 238,  # 'Ї'
-    176: 239,  # '°'
-    177: 240,  # '±'
-    178: 241,  # 'І'
-    179: 242,  # 'і'
-    180: 243,  # 'ґ'
-    181: 244,  # 'µ'
-    182: 245,  # '¶'
-    183: 246,  # '·'
-    184: 68,  # 'ё'
-    185: 247,  # '№'
-    186: 248,  # 'є'
-    187: 249,  # '»'
-    188: 250,  # 'ј'
-    189: 251,  # 'Ѕ'
-    190: 252,  # 'ѕ'
-    191: 253,  # 'ї'
-    192: 37,  # 'А'
-    193: 44,  # 'Б'
-    194: 33,  # 'В'
-    195: 46,  # 'Г'
-    196: 41,  # 'Д'
-    197: 48,  # 'Е'
-    198: 56,  # 'Ж'
-    199: 51,  # 'З'
-    200: 42,  # 'И'
-    201: 60,  # 'Й'
-    202: 36,  # 'К'
-    203: 49,  # 'Л'
-    204: 38,  # 'М'
-    205: 31,  # 'Н'
-    206: 34,  # 'О'
-    207: 35,  # 'П'
-    208: 45,  # 'Р'
-    209: 32,  # 'С'
-    210: 40,  # 'Т'
-    211: 52,  # 'У'
-    212: 53,  # 'Ф'
-    213: 55,  # 'Х'
-    214: 58,  # 'Ц'
-    215: 50,  # 'Ч'
-    216: 57,  # 'Ш'
-    217: 63,  # 'Щ'
-    218: 70,  # 'Ъ'
-    219: 62,  # 'Ы'
-    220: 61,  # 'Ь'
-    221: 47,  # 'Э'
-    222: 59,  # 'Ю'
-    223: 43,  # 'Я'
-    224: 3,  # 'а'
-    225: 21,  # 'б'
-    226: 10,  # 'в'
-    227: 19,  # 'г'
-    228: 13,  # 'д'
-    229: 2,  # 'е'
-    230: 24,  # 'ж'
-    231: 20,  # 'з'
-    232: 4,  # 'и'
-    233: 23,  # 'й'
-    234: 11,  # 'к'
-    235: 8,  # 'л'
-    236: 12,  # 'м'
-    237: 5,  # 'н'
-    238: 1,  # 'о'
-    239: 15,  # 'п'
-    240: 9,  # 'р'
-    241: 7,  # 'с'
-    242: 6,  # 'т'
-    243: 14,  # 'у'
-    244: 39,  # 'ф'
-    245: 26,  # 'х'
-    246: 28,  # 'ц'
-    247: 22,  # 'ч'
-    248: 25,  # 'ш'
-    249: 29,  # 'щ'
-    250: 54,  # 'ъ'
-    251: 18,  # 'ы'
-    252: 17,  # 'ь'
-    253: 30,  # 'э'
-    254: 27,  # 'ю'
-    255: 16,  # 'я'
-}
-
-WINDOWS_1251_RUSSIAN_MODEL = SingleByteCharSetModel(
-    charset_name="windows-1251",
-    language="Russian",
-    char_to_order_map=WINDOWS_1251_RUSSIAN_CHAR_TO_ORDER,
-    language_model=RUSSIAN_LANG_MODEL,
-    typical_positive_ratio=0.976601,
-    keep_ascii_letters=False,
-    alphabet="ЁАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяё",
-)
-
-IBM855_RUSSIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 142,  # 'A'
-    66: 143,  # 'B'
-    67: 144,  # 'C'
-    68: 145,  # 'D'
-    69: 146,  # 'E'
-    70: 147,  # 'F'
-    71: 148,  # 'G'
-    72: 149,  # 'H'
-    73: 150,  # 'I'
-    74: 151,  # 'J'
-    75: 152,  # 'K'
-    76: 74,  # 'L'
-    77: 153,  # 'M'
-    78: 75,  # 'N'
-    79: 154,  # 'O'
-    80: 155,  # 'P'
-    81: 156,  # 'Q'
-    82: 157,  # 'R'
-    83: 158,  # 'S'
-    84: 159,  # 'T'
-    85: 160,  # 'U'
-    86: 161,  # 'V'
-    87: 162,  # 'W'
-    88: 163,  # 'X'
-    89: 164,  # 'Y'
-    90: 165,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 71,  # 'a'
-    98: 172,  # 'b'
-    99: 66,  # 'c'
-    100: 173,  # 'd'
-    101: 65,  # 'e'
-    102: 174,  # 'f'
-    103: 76,  # 'g'
-    104: 175,  # 'h'
-    105: 64,  # 'i'
-    106: 176,  # 'j'
-    107: 177,  # 'k'
-    108: 77,  # 'l'
-    109: 72,  # 'm'
-    110: 178,  # 'n'
-    111: 69,  # 'o'
-    112: 67,  # 'p'
-    113: 179,  # 'q'
-    114: 78,  # 'r'
-    115: 73,  # 's'
-    116: 180,  # 't'
-    117: 181,  # 'u'
-    118: 79,  # 'v'
-    119: 182,  # 'w'
-    120: 183,  # 'x'
-    121: 184,  # 'y'
-    122: 185,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 191,  # 'ђ'
-    129: 192,  # 'Ђ'
-    130: 193,  # 'ѓ'
-    131: 194,  # 'Ѓ'
-    132: 68,  # 'ё'
-    133: 195,  # 'Ё'
-    134: 196,  # 'є'
-    135: 197,  # 'Є'
-    136: 198,  # 'ѕ'
-    137: 199,  # 'Ѕ'
-    138: 200,  # 'і'
-    139: 201,  # 'І'
-    140: 202,  # 'ї'
-    141: 203,  # 'Ї'
-    142: 204,  # 'ј'
-    143: 205,  # 'Ј'
-    144: 206,  # 'љ'
-    145: 207,  # 'Љ'
-    146: 208,  # 'њ'
-    147: 209,  # 'Њ'
-    148: 210,  # 'ћ'
-    149: 211,  # 'Ћ'
-    150: 212,  # 'ќ'
-    151: 213,  # 'Ќ'
-    152: 214,  # 'ў'
-    153: 215,  # 'Ў'
-    154: 216,  # 'џ'
-    155: 217,  # 'Џ'
-    156: 27,  # 'ю'
-    157: 59,  # 'Ю'
-    158: 54,  # 'ъ'
-    159: 70,  # 'Ъ'
-    160: 3,  # 'а'
-    161: 37,  # 'А'
-    162: 21,  # 'б'
-    163: 44,  # 'Б'
-    164: 28,  # 'ц'
-    165: 58,  # 'Ц'
-    166: 13,  # 'д'
-    167: 41,  # 'Д'
-    168: 2,  # 'е'
-    169: 48,  # 'Е'
-    170: 39,  # 'ф'
-    171: 53,  # 'Ф'
-    172: 19,  # 'г'
-    173: 46,  # 'Г'
-    174: 218,  # '«'
-    175: 219,  # '»'
-    176: 220,  # '░'
-    177: 221,  # '▒'
-    178: 222,  # '▓'
-    179: 223,  # '│'
-    180: 224,  # '┤'
-    181: 26,  # 'х'
-    182: 55,  # 'Х'
-    183: 4,  # 'и'
-    184: 42,  # 'И'
-    185: 225,  # '╣'
-    186: 226,  # '║'
-    187: 227,  # '╗'
-    188: 228,  # '╝'
-    189: 23,  # 'й'
-    190: 60,  # 'Й'
-    191: 229,  # '┐'
-    192: 230,  # '└'
-    193: 231,  # '┴'
-    194: 232,  # '┬'
-    195: 233,  # '├'
-    196: 234,  # '─'
-    197: 235,  # '┼'
-    198: 11,  # 'к'
-    199: 36,  # 'К'
-    200: 236,  # '╚'
-    201: 237,  # '╔'
-    202: 238,  # '╩'
-    203: 239,  # '╦'
-    204: 240,  # '╠'
-    205: 241,  # '═'
-    206: 242,  # '╬'
-    207: 243,  # '¤'
-    208: 8,  # 'л'
-    209: 49,  # 'Л'
-    210: 12,  # 'м'
-    211: 38,  # 'М'
-    212: 5,  # 'н'
-    213: 31,  # 'Н'
-    214: 1,  # 'о'
-    215: 34,  # 'О'
-    216: 15,  # 'п'
-    217: 244,  # '┘'
-    218: 245,  # '┌'
-    219: 246,  # '█'
-    220: 247,  # '▄'
-    221: 35,  # 'П'
-    222: 16,  # 'я'
-    223: 248,  # '▀'
-    224: 43,  # 'Я'
-    225: 9,  # 'р'
-    226: 45,  # 'Р'
-    227: 7,  # 'с'
-    228: 32,  # 'С'
-    229: 6,  # 'т'
-    230: 40,  # 'Т'
-    231: 14,  # 'у'
-    232: 52,  # 'У'
-    233: 24,  # 'ж'
-    234: 56,  # 'Ж'
-    235: 10,  # 'в'
-    236: 33,  # 'В'
-    237: 17,  # 'ь'
-    238: 61,  # 'Ь'
-    239: 249,  # '№'
-    240: 250,  # '\xad'
-    241: 18,  # 'ы'
-    242: 62,  # 'Ы'
-    243: 20,  # 'з'
-    244: 51,  # 'З'
-    245: 25,  # 'ш'
-    246: 57,  # 'Ш'
-    247: 30,  # 'э'
-    248: 47,  # 'Э'
-    249: 29,  # 'щ'
-    250: 63,  # 'Щ'
-    251: 22,  # 'ч'
-    252: 50,  # 'Ч'
-    253: 251,  # '§'
-    254: 252,  # '■'
-    255: 255,  # '\xa0'
-}
-
-IBM855_RUSSIAN_MODEL = SingleByteCharSetModel(
-    charset_name="IBM855",
-    language="Russian",
-    char_to_order_map=IBM855_RUSSIAN_CHAR_TO_ORDER,
-    language_model=RUSSIAN_LANG_MODEL,
-    typical_positive_ratio=0.976601,
-    keep_ascii_letters=False,
-    alphabet="ЁАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяё",
-)
-
-KOI8_R_RUSSIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 142,  # 'A'
-    66: 143,  # 'B'
-    67: 144,  # 'C'
-    68: 145,  # 'D'
-    69: 146,  # 'E'
-    70: 147,  # 'F'
-    71: 148,  # 'G'
-    72: 149,  # 'H'
-    73: 150,  # 'I'
-    74: 151,  # 'J'
-    75: 152,  # 'K'
-    76: 74,  # 'L'
-    77: 153,  # 'M'
-    78: 75,  # 'N'
-    79: 154,  # 'O'
-    80: 155,  # 'P'
-    81: 156,  # 'Q'
-    82: 157,  # 'R'
-    83: 158,  # 'S'
-    84: 159,  # 'T'
-    85: 160,  # 'U'
-    86: 161,  # 'V'
-    87: 162,  # 'W'
-    88: 163,  # 'X'
-    89: 164,  # 'Y'
-    90: 165,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 71,  # 'a'
-    98: 172,  # 'b'
-    99: 66,  # 'c'
-    100: 173,  # 'd'
-    101: 65,  # 'e'
-    102: 174,  # 'f'
-    103: 76,  # 'g'
-    104: 175,  # 'h'
-    105: 64,  # 'i'
-    106: 176,  # 'j'
-    107: 177,  # 'k'
-    108: 77,  # 'l'
-    109: 72,  # 'm'
-    110: 178,  # 'n'
-    111: 69,  # 'o'
-    112: 67,  # 'p'
-    113: 179,  # 'q'
-    114: 78,  # 'r'
-    115: 73,  # 's'
-    116: 180,  # 't'
-    117: 181,  # 'u'
-    118: 79,  # 'v'
-    119: 182,  # 'w'
-    120: 183,  # 'x'
-    121: 184,  # 'y'
-    122: 185,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 191,  # '─'
-    129: 192,  # '│'
-    130: 193,  # '┌'
-    131: 194,  # '┐'
-    132: 195,  # '└'
-    133: 196,  # '┘'
-    134: 197,  # '├'
-    135: 198,  # '┤'
-    136: 199,  # '┬'
-    137: 200,  # '┴'
-    138: 201,  # '┼'
-    139: 202,  # '▀'
-    140: 203,  # '▄'
-    141: 204,  # '█'
-    142: 205,  # '▌'
-    143: 206,  # '▐'
-    144: 207,  # '░'
-    145: 208,  # '▒'
-    146: 209,  # '▓'
-    147: 210,  # '⌠'
-    148: 211,  # '■'
-    149: 212,  # '∙'
-    150: 213,  # '√'
-    151: 214,  # '≈'
-    152: 215,  # '≤'
-    153: 216,  # '≥'
-    154: 217,  # '\xa0'
-    155: 218,  # '⌡'
-    156: 219,  # '°'
-    157: 220,  # '²'
-    158: 221,  # '·'
-    159: 222,  # '÷'
-    160: 223,  # '═'
-    161: 224,  # '║'
-    162: 225,  # '╒'
-    163: 68,  # 'ё'
-    164: 226,  # '╓'
-    165: 227,  # '╔'
-    166: 228,  # '╕'
-    167: 229,  # '╖'
-    168: 230,  # '╗'
-    169: 231,  # '╘'
-    170: 232,  # '╙'
-    171: 233,  # '╚'
-    172: 234,  # '╛'
-    173: 235,  # '╜'
-    174: 236,  # '╝'
-    175: 237,  # '╞'
-    176: 238,  # '╟'
-    177: 239,  # '╠'
-    178: 240,  # '╡'
-    179: 241,  # 'Ё'
-    180: 242,  # '╢'
-    181: 243,  # '╣'
-    182: 244,  # '╤'
-    183: 245,  # '╥'
-    184: 246,  # '╦'
-    185: 247,  # '╧'
-    186: 248,  # '╨'
-    187: 249,  # '╩'
-    188: 250,  # '╪'
-    189: 251,  # '╫'
-    190: 252,  # '╬'
-    191: 253,  # '©'
-    192: 27,  # 'ю'
-    193: 3,  # 'а'
-    194: 21,  # 'б'
-    195: 28,  # 'ц'
-    196: 13,  # 'д'
-    197: 2,  # 'е'
-    198: 39,  # 'ф'
-    199: 19,  # 'г'
-    200: 26,  # 'х'
-    201: 4,  # 'и'
-    202: 23,  # 'й'
-    203: 11,  # 'к'
-    204: 8,  # 'л'
-    205: 12,  # 'м'
-    206: 5,  # 'н'
-    207: 1,  # 'о'
-    208: 15,  # 'п'
-    209: 16,  # 'я'
-    210: 9,  # 'р'
-    211: 7,  # 'с'
-    212: 6,  # 'т'
-    213: 14,  # 'у'
-    214: 24,  # 'ж'
-    215: 10,  # 'в'
-    216: 17,  # 'ь'
-    217: 18,  # 'ы'
-    218: 20,  # 'з'
-    219: 25,  # 'ш'
-    220: 30,  # 'э'
-    221: 29,  # 'щ'
-    222: 22,  # 'ч'
-    223: 54,  # 'ъ'
-    224: 59,  # 'Ю'
-    225: 37,  # 'А'
-    226: 44,  # 'Б'
-    227: 58,  # 'Ц'
-    228: 41,  # 'Д'
-    229: 48,  # 'Е'
-    230: 53,  # 'Ф'
-    231: 46,  # 'Г'
-    232: 55,  # 'Х'
-    233: 42,  # 'И'
-    234: 60,  # 'Й'
-    235: 36,  # 'К'
-    236: 49,  # 'Л'
-    237: 38,  # 'М'
-    238: 31,  # 'Н'
-    239: 34,  # 'О'
-    240: 35,  # 'П'
-    241: 43,  # 'Я'
-    242: 45,  # 'Р'
-    243: 32,  # 'С'
-    244: 40,  # 'Т'
-    245: 52,  # 'У'
-    246: 56,  # 'Ж'
-    247: 33,  # 'В'
-    248: 61,  # 'Ь'
-    249: 62,  # 'Ы'
-    250: 51,  # 'З'
-    251: 57,  # 'Ш'
-    252: 47,  # 'Э'
-    253: 63,  # 'Щ'
-    254: 50,  # 'Ч'
-    255: 70,  # 'Ъ'
-}
-
-KOI8_R_RUSSIAN_MODEL = SingleByteCharSetModel(
-    charset_name="KOI8-R",
-    language="Russian",
-    char_to_order_map=KOI8_R_RUSSIAN_CHAR_TO_ORDER,
-    language_model=RUSSIAN_LANG_MODEL,
-    typical_positive_ratio=0.976601,
-    keep_ascii_letters=False,
-    alphabet="ЁАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяё",
-)
-
-MACCYRILLIC_RUSSIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 142,  # 'A'
-    66: 143,  # 'B'
-    67: 144,  # 'C'
-    68: 145,  # 'D'
-    69: 146,  # 'E'
-    70: 147,  # 'F'
-    71: 148,  # 'G'
-    72: 149,  # 'H'
-    73: 150,  # 'I'
-    74: 151,  # 'J'
-    75: 152,  # 'K'
-    76: 74,  # 'L'
-    77: 153,  # 'M'
-    78: 75,  # 'N'
-    79: 154,  # 'O'
-    80: 155,  # 'P'
-    81: 156,  # 'Q'
-    82: 157,  # 'R'
-    83: 158,  # 'S'
-    84: 159,  # 'T'
-    85: 160,  # 'U'
-    86: 161,  # 'V'
-    87: 162,  # 'W'
-    88: 163,  # 'X'
-    89: 164,  # 'Y'
-    90: 165,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 71,  # 'a'
-    98: 172,  # 'b'
-    99: 66,  # 'c'
-    100: 173,  # 'd'
-    101: 65,  # 'e'
-    102: 174,  # 'f'
-    103: 76,  # 'g'
-    104: 175,  # 'h'
-    105: 64,  # 'i'
-    106: 176,  # 'j'
-    107: 177,  # 'k'
-    108: 77,  # 'l'
-    109: 72,  # 'm'
-    110: 178,  # 'n'
-    111: 69,  # 'o'
-    112: 67,  # 'p'
-    113: 179,  # 'q'
-    114: 78,  # 'r'
-    115: 73,  # 's'
-    116: 180,  # 't'
-    117: 181,  # 'u'
-    118: 79,  # 'v'
-    119: 182,  # 'w'
-    120: 183,  # 'x'
-    121: 184,  # 'y'
-    122: 185,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 37,  # 'А'
-    129: 44,  # 'Б'
-    130: 33,  # 'В'
-    131: 46,  # 'Г'
-    132: 41,  # 'Д'
-    133: 48,  # 'Е'
-    134: 56,  # 'Ж'
-    135: 51,  # 'З'
-    136: 42,  # 'И'
-    137: 60,  # 'Й'
-    138: 36,  # 'К'
-    139: 49,  # 'Л'
-    140: 38,  # 'М'
-    141: 31,  # 'Н'
-    142: 34,  # 'О'
-    143: 35,  # 'П'
-    144: 45,  # 'Р'
-    145: 32,  # 'С'
-    146: 40,  # 'Т'
-    147: 52,  # 'У'
-    148: 53,  # 'Ф'
-    149: 55,  # 'Х'
-    150: 58,  # 'Ц'
-    151: 50,  # 'Ч'
-    152: 57,  # 'Ш'
-    153: 63,  # 'Щ'
-    154: 70,  # 'Ъ'
-    155: 62,  # 'Ы'
-    156: 61,  # 'Ь'
-    157: 47,  # 'Э'
-    158: 59,  # 'Ю'
-    159: 43,  # 'Я'
-    160: 191,  # '†'
-    161: 192,  # '°'
-    162: 193,  # 'Ґ'
-    163: 194,  # '£'
-    164: 195,  # '§'
-    165: 196,  # '•'
-    166: 197,  # '¶'
-    167: 198,  # 'І'
-    168: 199,  # '®'
-    169: 200,  # '©'
-    170: 201,  # '™'
-    171: 202,  # 'Ђ'
-    172: 203,  # 'ђ'
-    173: 204,  # '≠'
-    174: 205,  # 'Ѓ'
-    175: 206,  # 'ѓ'
-    176: 207,  # '∞'
-    177: 208,  # '±'
-    178: 209,  # '≤'
-    179: 210,  # '≥'
-    180: 211,  # 'і'
-    181: 212,  # 'µ'
-    182: 213,  # 'ґ'
-    183: 214,  # 'Ј'
-    184: 215,  # 'Є'
-    185: 216,  # 'є'
-    186: 217,  # 'Ї'
-    187: 218,  # 'ї'
-    188: 219,  # 'Љ'
-    189: 220,  # 'љ'
-    190: 221,  # 'Њ'
-    191: 222,  # 'њ'
-    192: 223,  # 'ј'
-    193: 224,  # 'Ѕ'
-    194: 225,  # '¬'
-    195: 226,  # '√'
-    196: 227,  # 'ƒ'
-    197: 228,  # '≈'
-    198: 229,  # '∆'
-    199: 230,  # '«'
-    200: 231,  # '»'
-    201: 232,  # '…'
-    202: 233,  # '\xa0'
-    203: 234,  # 'Ћ'
-    204: 235,  # 'ћ'
-    205: 236,  # 'Ќ'
-    206: 237,  # 'ќ'
-    207: 238,  # 'ѕ'
-    208: 239,  # '–'
-    209: 240,  # '—'
-    210: 241,  # '“'
-    211: 242,  # '”'
-    212: 243,  # '‘'
-    213: 244,  # '’'
-    214: 245,  # '÷'
-    215: 246,  # '„'
-    216: 247,  # 'Ў'
-    217: 248,  # 'ў'
-    218: 249,  # 'Џ'
-    219: 250,  # 'џ'
-    220: 251,  # '№'
-    221: 252,  # 'Ё'
-    222: 68,  # 'ё'
-    223: 16,  # 'я'
-    224: 3,  # 'а'
-    225: 21,  # 'б'
-    226: 10,  # 'в'
-    227: 19,  # 'г'
-    228: 13,  # 'д'
-    229: 2,  # 'е'
-    230: 24,  # 'ж'
-    231: 20,  # 'з'
-    232: 4,  # 'и'
-    233: 23,  # 'й'
-    234: 11,  # 'к'
-    235: 8,  # 'л'
-    236: 12,  # 'м'
-    237: 5,  # 'н'
-    238: 1,  # 'о'
-    239: 15,  # 'п'
-    240: 9,  # 'р'
-    241: 7,  # 'с'
-    242: 6,  # 'т'
-    243: 14,  # 'у'
-    244: 39,  # 'ф'
-    245: 26,  # 'х'
-    246: 28,  # 'ц'
-    247: 22,  # 'ч'
-    248: 25,  # 'ш'
-    249: 29,  # 'щ'
-    250: 54,  # 'ъ'
-    251: 18,  # 'ы'
-    252: 17,  # 'ь'
-    253: 30,  # 'э'
-    254: 27,  # 'ю'
-    255: 255,  # '€'
-}
-
-MACCYRILLIC_RUSSIAN_MODEL = SingleByteCharSetModel(
-    charset_name="MacCyrillic",
-    language="Russian",
-    char_to_order_map=MACCYRILLIC_RUSSIAN_CHAR_TO_ORDER,
-    language_model=RUSSIAN_LANG_MODEL,
-    typical_positive_ratio=0.976601,
-    keep_ascii_letters=False,
-    alphabet="ЁАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяё",
-)
-
-ISO_8859_5_RUSSIAN_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 142,  # 'A'
-    66: 143,  # 'B'
-    67: 144,  # 'C'
-    68: 145,  # 'D'
-    69: 146,  # 'E'
-    70: 147,  # 'F'
-    71: 148,  # 'G'
-    72: 149,  # 'H'
-    73: 150,  # 'I'
-    74: 151,  # 'J'
-    75: 152,  # 'K'
-    76: 74,  # 'L'
-    77: 153,  # 'M'
-    78: 75,  # 'N'
-    79: 154,  # 'O'
-    80: 155,  # 'P'
-    81: 156,  # 'Q'
-    82: 157,  # 'R'
-    83: 158,  # 'S'
-    84: 159,  # 'T'
-    85: 160,  # 'U'
-    86: 161,  # 'V'
-    87: 162,  # 'W'
-    88: 163,  # 'X'
-    89: 164,  # 'Y'
-    90: 165,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 71,  # 'a'
-    98: 172,  # 'b'
-    99: 66,  # 'c'
-    100: 173,  # 'd'
-    101: 65,  # 'e'
-    102: 174,  # 'f'
-    103: 76,  # 'g'
-    104: 175,  # 'h'
-    105: 64,  # 'i'
-    106: 176,  # 'j'
-    107: 177,  # 'k'
-    108: 77,  # 'l'
-    109: 72,  # 'm'
-    110: 178,  # 'n'
-    111: 69,  # 'o'
-    112: 67,  # 'p'
-    113: 179,  # 'q'
-    114: 78,  # 'r'
-    115: 73,  # 's'
-    116: 180,  # 't'
-    117: 181,  # 'u'
-    118: 79,  # 'v'
-    119: 182,  # 'w'
-    120: 183,  # 'x'
-    121: 184,  # 'y'
-    122: 185,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 191,  # '\x80'
-    129: 192,  # '\x81'
-    130: 193,  # '\x82'
-    131: 194,  # '\x83'
-    132: 195,  # '\x84'
-    133: 196,  # '\x85'
-    134: 197,  # '\x86'
-    135: 198,  # '\x87'
-    136: 199,  # '\x88'
-    137: 200,  # '\x89'
-    138: 201,  # '\x8a'
-    139: 202,  # '\x8b'
-    140: 203,  # '\x8c'
-    141: 204,  # '\x8d'
-    142: 205,  # '\x8e'
-    143: 206,  # '\x8f'
-    144: 207,  # '\x90'
-    145: 208,  # '\x91'
-    146: 209,  # '\x92'
-    147: 210,  # '\x93'
-    148: 211,  # '\x94'
-    149: 212,  # '\x95'
-    150: 213,  # '\x96'
-    151: 214,  # '\x97'
-    152: 215,  # '\x98'
-    153: 216,  # '\x99'
-    154: 217,  # '\x9a'
-    155: 218,  # '\x9b'
-    156: 219,  # '\x9c'
-    157: 220,  # '\x9d'
-    158: 221,  # '\x9e'
-    159: 222,  # '\x9f'
-    160: 223,  # '\xa0'
-    161: 224,  # 'Ё'
-    162: 225,  # 'Ђ'
-    163: 226,  # 'Ѓ'
-    164: 227,  # 'Є'
-    165: 228,  # 'Ѕ'
-    166: 229,  # 'І'
-    167: 230,  # 'Ї'
-    168: 231,  # 'Ј'
-    169: 232,  # 'Љ'
-    170: 233,  # 'Њ'
-    171: 234,  # 'Ћ'
-    172: 235,  # 'Ќ'
-    173: 236,  # '\xad'
-    174: 237,  # 'Ў'
-    175: 238,  # 'Џ'
-    176: 37,  # 'А'
-    177: 44,  # 'Б'
-    178: 33,  # 'В'
-    179: 46,  # 'Г'
-    180: 41,  # 'Д'
-    181: 48,  # 'Е'
-    182: 56,  # 'Ж'
-    183: 51,  # 'З'
-    184: 42,  # 'И'
-    185: 60,  # 'Й'
-    186: 36,  # 'К'
-    187: 49,  # 'Л'
-    188: 38,  # 'М'
-    189: 31,  # 'Н'
-    190: 34,  # 'О'
-    191: 35,  # 'П'
-    192: 45,  # 'Р'
-    193: 32,  # 'С'
-    194: 40,  # 'Т'
-    195: 52,  # 'У'
-    196: 53,  # 'Ф'
-    197: 55,  # 'Х'
-    198: 58,  # 'Ц'
-    199: 50,  # 'Ч'
-    200: 57,  # 'Ш'
-    201: 63,  # 'Щ'
-    202: 70,  # 'Ъ'
-    203: 62,  # 'Ы'
-    204: 61,  # 'Ь'
-    205: 47,  # 'Э'
-    206: 59,  # 'Ю'
-    207: 43,  # 'Я'
-    208: 3,  # 'а'
-    209: 21,  # 'б'
-    210: 10,  # 'в'
-    211: 19,  # 'г'
-    212: 13,  # 'д'
-    213: 2,  # 'е'
-    214: 24,  # 'ж'
-    215: 20,  # 'з'
-    216: 4,  # 'и'
-    217: 23,  # 'й'
-    218: 11,  # 'к'
-    219: 8,  # 'л'
-    220: 12,  # 'м'
-    221: 5,  # 'н'
-    222: 1,  # 'о'
-    223: 15,  # 'п'
-    224: 9,  # 'р'
-    225: 7,  # 'с'
-    226: 6,  # 'т'
-    227: 14,  # 'у'
-    228: 39,  # 'ф'
-    229: 26,  # 'х'
-    230: 28,  # 'ц'
-    231: 22,  # 'ч'
-    232: 25,  # 'ш'
-    233: 29,  # 'щ'
-    234: 54,  # 'ъ'
-    235: 18,  # 'ы'
-    236: 17,  # 'ь'
-    237: 30,  # 'э'
-    238: 27,  # 'ю'
-    239: 16,  # 'я'
-    240: 239,  # '№'
-    241: 68,  # 'ё'
-    242: 240,  # 'ђ'
-    243: 241,  # 'ѓ'
-    244: 242,  # 'є'
-    245: 243,  # 'ѕ'
-    246: 244,  # 'і'
-    247: 245,  # 'ї'
-    248: 246,  # 'ј'
-    249: 247,  # 'љ'
-    250: 248,  # 'њ'
-    251: 249,  # 'ћ'
-    252: 250,  # 'ќ'
-    253: 251,  # '§'
-    254: 252,  # 'ў'
-    255: 255,  # 'џ'
-}
-
-ISO_8859_5_RUSSIAN_MODEL = SingleByteCharSetModel(
-    charset_name="ISO-8859-5",
-    language="Russian",
-    char_to_order_map=ISO_8859_5_RUSSIAN_CHAR_TO_ORDER,
-    language_model=RUSSIAN_LANG_MODEL,
-    typical_positive_ratio=0.976601,
-    keep_ascii_letters=False,
-    alphabet="ЁАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяё",
-)
diff --git a/src/pip/_vendor/chardet/langthaimodel.py b/src/pip/_vendor/chardet/langthaimodel.py
deleted file mode 100644
index 489cad930e0..00000000000
--- a/src/pip/_vendor/chardet/langthaimodel.py
+++ /dev/null
@@ -1,4380 +0,0 @@
-from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel
-
-# 3: Positive
-# 2: Likely
-# 1: Unlikely
-# 0: Negative
-
-THAI_LANG_MODEL = {
-    5: {  # 'ก'
-        5: 2,  # 'ก'
-        30: 2,  # 'ข'
-        24: 2,  # 'ค'
-        8: 2,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 3,  # 'ฎ'
-        57: 2,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 2,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 3,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 2,  # 'น'
-        17: 1,  # 'บ'
-        25: 2,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 1,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 1,  # 'ย'
-        2: 3,  # 'ร'
-        61: 2,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 3,  # 'ว'
-        42: 2,  # 'ศ'
-        46: 3,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 2,  # 'ห'
-        4: 3,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 3,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 2,  # 'ื'
-        32: 2,  # 'ุ'
-        35: 1,  # 'ู'
-        11: 2,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 1,  # 'ๆ'
-        37: 3,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 2,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    30: {  # 'ข'
-        5: 1,  # 'ก'
-        30: 0,  # 'ข'
-        24: 1,  # 'ค'
-        8: 1,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 2,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 2,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 2,  # 'น'
-        17: 1,  # 'บ'
-        25: 1,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 2,  # 'ย'
-        2: 1,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 2,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 1,  # 'ห'
-        4: 3,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 3,  # 'ึ'
-        27: 1,  # 'ื'
-        32: 1,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 1,  # '็'
-        6: 2,  # '่'
-        7: 3,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    24: {  # 'ค'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 2,  # 'ค'
-        8: 2,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 2,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 2,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 0,  # 'บ'
-        25: 1,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 2,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 3,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 0,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 2,  # 'า'
-        36: 3,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 3,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 2,  # 'ู'
-        11: 1,  # 'เ'
-        28: 0,  # 'แ'
-        41: 3,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 1,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 3,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    8: {  # 'ง'
-        5: 3,  # 'ก'
-        30: 2,  # 'ข'
-        24: 3,  # 'ค'
-        8: 2,  # 'ง'
-        26: 2,  # 'จ'
-        52: 1,  # 'ฉ'
-        34: 2,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 2,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 3,  # 'น'
-        17: 2,  # 'บ'
-        25: 2,  # 'ป'
-        39: 2,  # 'ผ'
-        62: 1,  # 'ฝ'
-        31: 2,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 1,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 2,  # 'ว'
-        42: 2,  # 'ศ'
-        46: 1,  # 'ษ'
-        18: 3,  # 'ส'
-        21: 3,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 1,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 1,  # 'ื'
-        32: 1,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 3,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 3,  # 'ๆ'
-        37: 0,  # '็'
-        6: 2,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    26: {  # 'จ'
-        5: 2,  # 'ก'
-        30: 1,  # 'ข'
-        24: 0,  # 'ค'
-        8: 2,  # 'ง'
-        26: 3,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 1,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 1,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 1,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 1,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 3,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 3,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 3,  # 'ึ'
-        27: 1,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 2,  # 'ู'
-        11: 1,  # 'เ'
-        28: 1,  # 'แ'
-        41: 0,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 2,  # '่'
-        7: 2,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    52: {  # 'ฉ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 3,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 3,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 1,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 1,  # 'ะ'
-        10: 1,  # 'ั'
-        1: 1,  # 'า'
-        36: 0,  # 'ำ'
-        23: 1,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 1,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    34: {  # 'ช'
-        5: 1,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 1,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 1,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 2,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 1,  # 'ย'
-        2: 1,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 2,  # 'ั'
-        1: 3,  # 'า'
-        36: 1,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 3,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 1,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 1,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    51: {  # 'ซ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 1,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 0,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 1,  # 'ั'
-        1: 1,  # 'า'
-        36: 0,  # 'ำ'
-        23: 1,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 3,  # 'ึ'
-        27: 2,  # 'ื'
-        32: 1,  # 'ุ'
-        35: 1,  # 'ู'
-        11: 1,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 1,  # '็'
-        6: 1,  # '่'
-        7: 2,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    47: {  # 'ญ'
-        5: 1,  # 'ก'
-        30: 1,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 3,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 1,  # 'บ'
-        25: 1,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 2,  # 'ห'
-        4: 1,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 1,  # 'ะ'
-        10: 2,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 1,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 1,  # 'เ'
-        28: 1,  # 'แ'
-        41: 0,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 1,  # 'ๆ'
-        37: 0,  # '็'
-        6: 2,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    58: {  # 'ฎ'
-        5: 2,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 1,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 1,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    57: {  # 'ฏ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    49: {  # 'ฐ'
-        5: 1,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 2,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 1,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    53: {  # 'ฑ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 3,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    55: {  # 'ฒ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 1,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    43: {  # 'ณ'
-        5: 1,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 3,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 3,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 1,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 1,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 3,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 1,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 1,  # 'เ'
-        28: 1,  # 'แ'
-        41: 0,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 3,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    20: {  # 'ด'
-        5: 2,  # 'ก'
-        30: 2,  # 'ข'
-        24: 2,  # 'ค'
-        8: 3,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 2,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 1,  # 'น'
-        17: 1,  # 'บ'
-        25: 1,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 3,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 2,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 2,  # 'ห'
-        4: 1,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 2,  # 'า'
-        36: 2,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 1,  # 'ึ'
-        27: 2,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 2,  # 'ู'
-        11: 2,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 2,  # 'ๆ'
-        37: 2,  # '็'
-        6: 1,  # '่'
-        7: 3,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    19: {  # 'ต'
-        5: 2,  # 'ก'
-        30: 1,  # 'ข'
-        24: 1,  # 'ค'
-        8: 0,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 1,  # 'ต'
-        44: 2,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 2,  # 'น'
-        17: 1,  # 'บ'
-        25: 1,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 2,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 1,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 3,  # 'ส'
-        21: 0,  # 'ห'
-        4: 3,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 2,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 1,  # 'ึ'
-        27: 1,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 2,  # 'ู'
-        11: 1,  # 'เ'
-        28: 1,  # 'แ'
-        41: 1,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 2,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 2,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    44: {  # 'ถ'
-        5: 1,  # 'ก'
-        30: 0,  # 'ข'
-        24: 1,  # 'ค'
-        8: 0,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 1,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 1,  # 'น'
-        17: 2,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 1,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 0,  # 'ห'
-        4: 1,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 2,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 3,  # 'ึ'
-        27: 2,  # 'ื'
-        32: 2,  # 'ุ'
-        35: 3,  # 'ู'
-        11: 1,  # 'เ'
-        28: 1,  # 'แ'
-        41: 0,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 2,  # '่'
-        7: 3,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    14: {  # 'ท'
-        5: 1,  # 'ก'
-        30: 1,  # 'ข'
-        24: 3,  # 'ค'
-        8: 1,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 1,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 3,  # 'ธ'
-        3: 3,  # 'น'
-        17: 2,  # 'บ'
-        25: 2,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 2,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 3,  # 'ย'
-        2: 3,  # 'ร'
-        61: 1,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 2,  # 'ว'
-        42: 3,  # 'ศ'
-        46: 1,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 0,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 3,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 2,  # 'ึ'
-        27: 1,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 1,  # 'ู'
-        11: 0,  # 'เ'
-        28: 1,  # 'แ'
-        41: 0,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 1,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 2,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    48: {  # 'ธ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 1,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 1,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 2,  # 'า'
-        36: 0,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 2,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 3,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    3: {  # 'น'
-        5: 3,  # 'ก'
-        30: 2,  # 'ข'
-        24: 3,  # 'ค'
-        8: 1,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 1,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 3,  # 'ต'
-        44: 2,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 3,  # 'ธ'
-        3: 2,  # 'น'
-        17: 2,  # 'บ'
-        25: 2,  # 'ป'
-        39: 2,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 2,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 2,  # 'ย'
-        2: 2,  # 'ร'
-        61: 1,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 3,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 2,  # 'ห'
-        4: 3,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 3,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 3,  # 'ึ'
-        27: 3,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 2,  # 'ู'
-        11: 3,  # 'เ'
-        28: 2,  # 'แ'
-        41: 3,  # 'โ'
-        29: 3,  # 'ใ'
-        33: 3,  # 'ไ'
-        50: 2,  # 'ๆ'
-        37: 1,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 2,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    17: {  # 'บ'
-        5: 3,  # 'ก'
-        30: 2,  # 'ข'
-        24: 2,  # 'ค'
-        8: 1,  # 'ง'
-        26: 1,  # 'จ'
-        52: 1,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 2,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 3,  # 'บ'
-        25: 2,  # 'ป'
-        39: 2,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 0,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 3,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 2,  # 'ห'
-        4: 2,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 2,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 2,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 2,  # 'ู'
-        11: 2,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 1,  # '็'
-        6: 2,  # '่'
-        7: 2,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    25: {  # 'ป'
-        5: 2,  # 'ก'
-        30: 0,  # 'ข'
-        24: 1,  # 'ค'
-        8: 0,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 1,  # 'ฎ'
-        57: 3,  # 'ฏ'
-        49: 1,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 1,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 2,  # 'น'
-        17: 0,  # 'บ'
-        25: 1,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 1,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 0,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 1,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 1,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 1,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 1,  # 'า'
-        36: 0,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 1,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 1,  # 'เ'
-        28: 2,  # 'แ'
-        41: 0,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 3,  # '็'
-        6: 1,  # '่'
-        7: 2,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    39: {  # 'ผ'
-        5: 1,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 1,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 2,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 2,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 1,  # 'ะ'
-        10: 1,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 1,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 3,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 1,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    62: {  # 'ฝ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 1,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 1,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 1,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 2,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 2,  # '่'
-        7: 1,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    31: {  # 'พ'
-        5: 1,  # 'ก'
-        30: 1,  # 'ข'
-        24: 1,  # 'ค'
-        8: 1,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 1,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 1,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 3,  # 'น'
-        17: 2,  # 'บ'
-        25: 0,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 2,  # 'ย'
-        2: 3,  # 'ร'
-        61: 2,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 2,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 1,  # 'ห'
-        4: 2,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 1,  # 'ึ'
-        27: 3,  # 'ื'
-        32: 1,  # 'ุ'
-        35: 2,  # 'ู'
-        11: 1,  # 'เ'
-        28: 1,  # 'แ'
-        41: 0,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 1,  # '็'
-        6: 0,  # '่'
-        7: 1,  # '้'
-        38: 3,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    54: {  # 'ฟ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 1,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 2,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 1,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 0,  # 'ห'
-        4: 1,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 2,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 1,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 1,  # 'ื'
-        32: 1,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 1,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 2,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    45: {  # 'ภ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 1,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 1,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 1,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 2,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    9: {  # 'ม'
-        5: 2,  # 'ก'
-        30: 2,  # 'ข'
-        24: 2,  # 'ค'
-        8: 2,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 1,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 2,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 3,  # 'น'
-        17: 2,  # 'บ'
-        25: 2,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 3,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 1,  # 'ย'
-        2: 2,  # 'ร'
-        61: 2,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 2,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 1,  # 'ษ'
-        18: 3,  # 'ส'
-        21: 3,  # 'ห'
-        4: 3,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 1,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 3,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 3,  # 'ู'
-        11: 2,  # 'เ'
-        28: 2,  # 'แ'
-        41: 2,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 1,  # 'ๆ'
-        37: 1,  # '็'
-        6: 3,  # '่'
-        7: 2,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    16: {  # 'ย'
-        5: 3,  # 'ก'
-        30: 1,  # 'ข'
-        24: 2,  # 'ค'
-        8: 3,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 2,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 2,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 2,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 3,  # 'น'
-        17: 3,  # 'บ'
-        25: 1,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 0,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 3,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 1,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 1,  # 'ึ'
-        27: 2,  # 'ื'
-        32: 2,  # 'ุ'
-        35: 3,  # 'ู'
-        11: 2,  # 'เ'
-        28: 1,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 2,  # 'ๆ'
-        37: 1,  # '็'
-        6: 3,  # '่'
-        7: 2,  # '้'
-        38: 3,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    2: {  # 'ร'
-        5: 3,  # 'ก'
-        30: 2,  # 'ข'
-        24: 2,  # 'ค'
-        8: 3,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 2,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 3,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 3,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 2,  # 'ต'
-        44: 3,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 2,  # 'น'
-        17: 2,  # 'บ'
-        25: 3,  # 'ป'
-        39: 2,  # 'ผ'
-        62: 1,  # 'ฝ'
-        31: 2,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 2,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 3,  # 'ว'
-        42: 2,  # 'ศ'
-        46: 2,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 2,  # 'ห'
-        4: 3,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 3,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 2,  # 'ึ'
-        27: 3,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 3,  # 'ู'
-        11: 3,  # 'เ'
-        28: 3,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 3,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 3,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    61: {  # 'ฤ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 2,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 2,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    15: {  # 'ล'
-        5: 2,  # 'ก'
-        30: 3,  # 'ข'
-        24: 1,  # 'ค'
-        8: 3,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 2,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 1,  # 'น'
-        17: 2,  # 'บ'
-        25: 2,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 3,  # 'ย'
-        2: 1,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 1,  # 'ห'
-        4: 3,  # 'อ'
-        63: 2,  # 'ฯ'
-        22: 3,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 2,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 2,  # 'ึ'
-        27: 3,  # 'ื'
-        32: 2,  # 'ุ'
-        35: 3,  # 'ู'
-        11: 2,  # 'เ'
-        28: 1,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 2,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 2,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    12: {  # 'ว'
-        5: 3,  # 'ก'
-        30: 2,  # 'ข'
-        24: 1,  # 'ค'
-        8: 3,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 1,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 1,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 2,  # 'บ'
-        25: 1,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 3,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 2,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 2,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 2,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 3,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 1,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    42: {  # 'ศ'
-        5: 1,  # 'ก'
-        30: 0,  # 'ข'
-        24: 1,  # 'ค'
-        8: 0,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 1,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 1,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 2,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 2,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 2,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 2,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 3,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 2,  # 'ู'
-        11: 0,  # 'เ'
-        28: 1,  # 'แ'
-        41: 0,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    46: {  # 'ษ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 2,  # 'ฎ'
-        57: 1,  # 'ฏ'
-        49: 2,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 3,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 1,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 2,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 2,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 1,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 2,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    18: {  # 'ส'
-        5: 2,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 2,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 3,  # 'ต'
-        44: 3,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 2,  # 'บ'
-        25: 1,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 2,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 1,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 2,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 2,  # 'ห'
-        4: 3,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 3,  # 'ำ'
-        23: 3,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 2,  # 'ึ'
-        27: 3,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 3,  # 'ู'
-        11: 2,  # 'เ'
-        28: 0,  # 'แ'
-        41: 1,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 1,  # '้'
-        38: 2,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    21: {  # 'ห'
-        5: 3,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 1,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 2,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 3,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 0,  # 'บ'
-        25: 1,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 2,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 2,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 3,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 1,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 0,  # 'ำ'
-        23: 1,  # 'ิ'
-        13: 1,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 1,  # 'ุ'
-        35: 1,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 3,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 2,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    4: {  # 'อ'
-        5: 3,  # 'ก'
-        30: 1,  # 'ข'
-        24: 2,  # 'ค'
-        8: 3,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 2,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 3,  # 'น'
-        17: 3,  # 'บ'
-        25: 1,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 3,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 2,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 2,  # 'ห'
-        4: 3,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 2,  # 'ะ'
-        10: 3,  # 'ั'
-        1: 3,  # 'า'
-        36: 2,  # 'ำ'
-        23: 2,  # 'ิ'
-        13: 3,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 3,  # 'ื'
-        32: 3,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 3,  # 'เ'
-        28: 1,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 1,  # 'ๆ'
-        37: 1,  # '็'
-        6: 2,  # '่'
-        7: 2,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    63: {  # 'ฯ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    22: {  # 'ะ'
-        5: 3,  # 'ก'
-        30: 1,  # 'ข'
-        24: 2,  # 'ค'
-        8: 1,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 3,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 3,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 2,  # 'น'
-        17: 3,  # 'บ'
-        25: 2,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 2,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 2,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 2,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 3,  # 'ส'
-        21: 3,  # 'ห'
-        4: 2,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 1,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 3,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    10: {  # 'ั'
-        5: 3,  # 'ก'
-        30: 0,  # 'ข'
-        24: 1,  # 'ค'
-        8: 3,  # 'ง'
-        26: 3,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 3,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 2,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 3,  # 'ฒ'
-        43: 3,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 3,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 3,  # 'บ'
-        25: 1,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 2,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 3,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 3,  # 'ว'
-        42: 2,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 3,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    1: {  # 'า'
-        5: 3,  # 'ก'
-        30: 2,  # 'ข'
-        24: 3,  # 'ค'
-        8: 3,  # 'ง'
-        26: 3,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 3,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 2,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 3,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 3,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 2,  # 'ธ'
-        3: 3,  # 'น'
-        17: 3,  # 'บ'
-        25: 2,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 1,  # 'ฝ'
-        31: 3,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 3,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 3,  # 'ว'
-        42: 2,  # 'ศ'
-        46: 3,  # 'ษ'
-        18: 3,  # 'ส'
-        21: 3,  # 'ห'
-        4: 2,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 3,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 3,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 1,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    36: {  # 'ำ'
-        5: 2,  # 'ก'
-        30: 1,  # 'ข'
-        24: 3,  # 'ค'
-        8: 2,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 1,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 1,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 1,  # 'บ'
-        25: 1,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 0,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 3,  # 'ห'
-        4: 1,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 3,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    23: {  # 'ิ'
-        5: 3,  # 'ก'
-        30: 1,  # 'ข'
-        24: 2,  # 'ค'
-        8: 3,  # 'ง'
-        26: 3,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 3,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 2,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 3,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 3,  # 'ธ'
-        3: 3,  # 'น'
-        17: 3,  # 'บ'
-        25: 2,  # 'ป'
-        39: 2,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 3,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 2,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 2,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 3,  # 'ว'
-        42: 3,  # 'ศ'
-        46: 2,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 3,  # 'ห'
-        4: 1,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 3,  # 'เ'
-        28: 1,  # 'แ'
-        41: 1,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 2,  # '้'
-        38: 2,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    13: {  # 'ี'
-        5: 3,  # 'ก'
-        30: 2,  # 'ข'
-        24: 2,  # 'ค'
-        8: 0,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 1,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 1,  # 'น'
-        17: 2,  # 'บ'
-        25: 2,  # 'ป'
-        39: 1,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 2,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 3,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 2,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 1,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 2,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 1,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    40: {  # 'ึ'
-        5: 3,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 3,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    27: {  # 'ื'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 2,  # 'น'
-        17: 3,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 3,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    32: {  # 'ุ'
-        5: 3,  # 'ก'
-        30: 2,  # 'ข'
-        24: 3,  # 'ค'
-        8: 3,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 2,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 1,  # 'ฒ'
-        43: 3,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 3,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 2,  # 'น'
-        17: 2,  # 'บ'
-        25: 2,  # 'ป'
-        39: 2,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 1,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 1,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 2,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 1,  # 'ห'
-        4: 1,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 1,  # 'เ'
-        28: 0,  # 'แ'
-        41: 1,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 2,  # '้'
-        38: 1,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    35: {  # 'ู'
-        5: 3,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 2,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 2,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 1,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 2,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 2,  # 'น'
-        17: 0,  # 'บ'
-        25: 3,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 0,  # 'ย'
-        2: 1,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 1,  # 'เ'
-        28: 1,  # 'แ'
-        41: 1,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 3,  # '่'
-        7: 3,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    11: {  # 'เ'
-        5: 3,  # 'ก'
-        30: 3,  # 'ข'
-        24: 3,  # 'ค'
-        8: 2,  # 'ง'
-        26: 3,  # 'จ'
-        52: 3,  # 'ฉ'
-        34: 3,  # 'ช'
-        51: 2,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 1,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 3,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 3,  # 'น'
-        17: 3,  # 'บ'
-        25: 3,  # 'ป'
-        39: 2,  # 'ผ'
-        62: 1,  # 'ฝ'
-        31: 3,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 3,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 2,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 3,  # 'ว'
-        42: 2,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 3,  # 'ส'
-        21: 3,  # 'ห'
-        4: 3,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    28: {  # 'แ'
-        5: 3,  # 'ก'
-        30: 2,  # 'ข'
-        24: 2,  # 'ค'
-        8: 1,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 3,  # 'ต'
-        44: 2,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 3,  # 'บ'
-        25: 2,  # 'ป'
-        39: 3,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 2,  # 'พ'
-        54: 2,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 2,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 2,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 3,  # 'ส'
-        21: 3,  # 'ห'
-        4: 1,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    41: {  # 'โ'
-        5: 2,  # 'ก'
-        30: 1,  # 'ข'
-        24: 2,  # 'ค'
-        8: 0,  # 'ง'
-        26: 1,  # 'จ'
-        52: 1,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 2,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 1,  # 'บ'
-        25: 3,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 1,  # 'ภ'
-        9: 1,  # 'ม'
-        16: 2,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 3,  # 'ล'
-        12: 0,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 0,  # 'ห'
-        4: 2,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    29: {  # 'ใ'
-        5: 2,  # 'ก'
-        30: 0,  # 'ข'
-        24: 1,  # 'ค'
-        8: 0,  # 'ง'
-        26: 3,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 3,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 1,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 2,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 1,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 3,  # 'ส'
-        21: 3,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    33: {  # 'ไ'
-        5: 1,  # 'ก'
-        30: 2,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 3,  # 'ด'
-        19: 1,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 3,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 1,  # 'บ'
-        25: 3,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 2,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 0,  # 'ย'
-        2: 3,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 3,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 2,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    50: {  # 'ๆ'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    37: {  # '็'
-        5: 2,  # 'ก'
-        30: 1,  # 'ข'
-        24: 2,  # 'ค'
-        8: 2,  # 'ง'
-        26: 3,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 1,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 2,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 3,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 1,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 2,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 0,  # 'ห'
-        4: 1,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 1,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    6: {  # '่'
-        5: 2,  # 'ก'
-        30: 1,  # 'ข'
-        24: 2,  # 'ค'
-        8: 3,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 1,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 2,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 1,  # 'ธ'
-        3: 3,  # 'น'
-        17: 1,  # 'บ'
-        25: 2,  # 'ป'
-        39: 2,  # 'ผ'
-        62: 1,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 3,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 2,  # 'ล'
-        12: 3,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 1,  # 'ห'
-        4: 3,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 1,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 3,  # 'า'
-        36: 2,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 3,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 1,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    7: {  # '้'
-        5: 2,  # 'ก'
-        30: 1,  # 'ข'
-        24: 2,  # 'ค'
-        8: 3,  # 'ง'
-        26: 2,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 1,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 1,  # 'ด'
-        19: 2,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 2,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 3,  # 'น'
-        17: 2,  # 'บ'
-        25: 2,  # 'ป'
-        39: 2,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 3,  # 'ม'
-        16: 2,  # 'ย'
-        2: 2,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 3,  # 'ว'
-        42: 1,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 2,  # 'ส'
-        21: 2,  # 'ห'
-        4: 3,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 3,  # 'า'
-        36: 2,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 2,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 2,  # 'ใ'
-        33: 2,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    38: {  # '์'
-        5: 2,  # 'ก'
-        30: 1,  # 'ข'
-        24: 1,  # 'ค'
-        8: 0,  # 'ง'
-        26: 1,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 1,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 2,  # 'ด'
-        19: 1,  # 'ต'
-        44: 1,  # 'ถ'
-        14: 1,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 1,  # 'น'
-        17: 1,  # 'บ'
-        25: 1,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 1,  # 'พ'
-        54: 1,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 2,  # 'ม'
-        16: 0,  # 'ย'
-        2: 1,  # 'ร'
-        61: 1,  # 'ฤ'
-        15: 1,  # 'ล'
-        12: 1,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 1,  # 'ส'
-        21: 1,  # 'ห'
-        4: 2,  # 'อ'
-        63: 1,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 2,  # 'เ'
-        28: 2,  # 'แ'
-        41: 1,  # 'โ'
-        29: 1,  # 'ใ'
-        33: 1,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 0,  # '๑'
-        59: 0,  # '๒'
-        60: 0,  # '๕'
-    },
-    56: {  # '๑'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 2,  # '๑'
-        59: 1,  # '๒'
-        60: 1,  # '๕'
-    },
-    59: {  # '๒'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 1,  # '๑'
-        59: 1,  # '๒'
-        60: 3,  # '๕'
-    },
-    60: {  # '๕'
-        5: 0,  # 'ก'
-        30: 0,  # 'ข'
-        24: 0,  # 'ค'
-        8: 0,  # 'ง'
-        26: 0,  # 'จ'
-        52: 0,  # 'ฉ'
-        34: 0,  # 'ช'
-        51: 0,  # 'ซ'
-        47: 0,  # 'ญ'
-        58: 0,  # 'ฎ'
-        57: 0,  # 'ฏ'
-        49: 0,  # 'ฐ'
-        53: 0,  # 'ฑ'
-        55: 0,  # 'ฒ'
-        43: 0,  # 'ณ'
-        20: 0,  # 'ด'
-        19: 0,  # 'ต'
-        44: 0,  # 'ถ'
-        14: 0,  # 'ท'
-        48: 0,  # 'ธ'
-        3: 0,  # 'น'
-        17: 0,  # 'บ'
-        25: 0,  # 'ป'
-        39: 0,  # 'ผ'
-        62: 0,  # 'ฝ'
-        31: 0,  # 'พ'
-        54: 0,  # 'ฟ'
-        45: 0,  # 'ภ'
-        9: 0,  # 'ม'
-        16: 0,  # 'ย'
-        2: 0,  # 'ร'
-        61: 0,  # 'ฤ'
-        15: 0,  # 'ล'
-        12: 0,  # 'ว'
-        42: 0,  # 'ศ'
-        46: 0,  # 'ษ'
-        18: 0,  # 'ส'
-        21: 0,  # 'ห'
-        4: 0,  # 'อ'
-        63: 0,  # 'ฯ'
-        22: 0,  # 'ะ'
-        10: 0,  # 'ั'
-        1: 0,  # 'า'
-        36: 0,  # 'ำ'
-        23: 0,  # 'ิ'
-        13: 0,  # 'ี'
-        40: 0,  # 'ึ'
-        27: 0,  # 'ื'
-        32: 0,  # 'ุ'
-        35: 0,  # 'ู'
-        11: 0,  # 'เ'
-        28: 0,  # 'แ'
-        41: 0,  # 'โ'
-        29: 0,  # 'ใ'
-        33: 0,  # 'ไ'
-        50: 0,  # 'ๆ'
-        37: 0,  # '็'
-        6: 0,  # '่'
-        7: 0,  # '้'
-        38: 0,  # '์'
-        56: 2,  # '๑'
-        59: 1,  # '๒'
-        60: 0,  # '๕'
-    },
-}
-
-# 255: Undefined characters that did not exist in training text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-# 251: Control characters
-
-# Character Mapping Table(s):
-TIS_620_THAI_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 254,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 254,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 253,  # ' '
-    33: 253,  # '!'
-    34: 253,  # '"'
-    35: 253,  # '#'
-    36: 253,  # '$'
-    37: 253,  # '%'
-    38: 253,  # '&'
-    39: 253,  # "'"
-    40: 253,  # '('
-    41: 253,  # ')'
-    42: 253,  # '*'
-    43: 253,  # '+'
-    44: 253,  # ','
-    45: 253,  # '-'
-    46: 253,  # '.'
-    47: 253,  # '/'
-    48: 252,  # '0'
-    49: 252,  # '1'
-    50: 252,  # '2'
-    51: 252,  # '3'
-    52: 252,  # '4'
-    53: 252,  # '5'
-    54: 252,  # '6'
-    55: 252,  # '7'
-    56: 252,  # '8'
-    57: 252,  # '9'
-    58: 253,  # ':'
-    59: 253,  # ';'
-    60: 253,  # '<'
-    61: 253,  # '='
-    62: 253,  # '>'
-    63: 253,  # '?'
-    64: 253,  # '@'
-    65: 182,  # 'A'
-    66: 106,  # 'B'
-    67: 107,  # 'C'
-    68: 100,  # 'D'
-    69: 183,  # 'E'
-    70: 184,  # 'F'
-    71: 185,  # 'G'
-    72: 101,  # 'H'
-    73: 94,  # 'I'
-    74: 186,  # 'J'
-    75: 187,  # 'K'
-    76: 108,  # 'L'
-    77: 109,  # 'M'
-    78: 110,  # 'N'
-    79: 111,  # 'O'
-    80: 188,  # 'P'
-    81: 189,  # 'Q'
-    82: 190,  # 'R'
-    83: 89,  # 'S'
-    84: 95,  # 'T'
-    85: 112,  # 'U'
-    86: 113,  # 'V'
-    87: 191,  # 'W'
-    88: 192,  # 'X'
-    89: 193,  # 'Y'
-    90: 194,  # 'Z'
-    91: 253,  # '['
-    92: 253,  # '\\'
-    93: 253,  # ']'
-    94: 253,  # '^'
-    95: 253,  # '_'
-    96: 253,  # '`'
-    97: 64,  # 'a'
-    98: 72,  # 'b'
-    99: 73,  # 'c'
-    100: 114,  # 'd'
-    101: 74,  # 'e'
-    102: 115,  # 'f'
-    103: 116,  # 'g'
-    104: 102,  # 'h'
-    105: 81,  # 'i'
-    106: 201,  # 'j'
-    107: 117,  # 'k'
-    108: 90,  # 'l'
-    109: 103,  # 'm'
-    110: 78,  # 'n'
-    111: 82,  # 'o'
-    112: 96,  # 'p'
-    113: 202,  # 'q'
-    114: 91,  # 'r'
-    115: 79,  # 's'
-    116: 84,  # 't'
-    117: 104,  # 'u'
-    118: 105,  # 'v'
-    119: 97,  # 'w'
-    120: 98,  # 'x'
-    121: 92,  # 'y'
-    122: 203,  # 'z'
-    123: 253,  # '{'
-    124: 253,  # '|'
-    125: 253,  # '}'
-    126: 253,  # '~'
-    127: 253,  # '\x7f'
-    128: 209,  # '\x80'
-    129: 210,  # '\x81'
-    130: 211,  # '\x82'
-    131: 212,  # '\x83'
-    132: 213,  # '\x84'
-    133: 88,  # '\x85'
-    134: 214,  # '\x86'
-    135: 215,  # '\x87'
-    136: 216,  # '\x88'
-    137: 217,  # '\x89'
-    138: 218,  # '\x8a'
-    139: 219,  # '\x8b'
-    140: 220,  # '\x8c'
-    141: 118,  # '\x8d'
-    142: 221,  # '\x8e'
-    143: 222,  # '\x8f'
-    144: 223,  # '\x90'
-    145: 224,  # '\x91'
-    146: 99,  # '\x92'
-    147: 85,  # '\x93'
-    148: 83,  # '\x94'
-    149: 225,  # '\x95'
-    150: 226,  # '\x96'
-    151: 227,  # '\x97'
-    152: 228,  # '\x98'
-    153: 229,  # '\x99'
-    154: 230,  # '\x9a'
-    155: 231,  # '\x9b'
-    156: 232,  # '\x9c'
-    157: 233,  # '\x9d'
-    158: 234,  # '\x9e'
-    159: 235,  # '\x9f'
-    160: 236,  # None
-    161: 5,  # 'ก'
-    162: 30,  # 'ข'
-    163: 237,  # 'ฃ'
-    164: 24,  # 'ค'
-    165: 238,  # 'ฅ'
-    166: 75,  # 'ฆ'
-    167: 8,  # 'ง'
-    168: 26,  # 'จ'
-    169: 52,  # 'ฉ'
-    170: 34,  # 'ช'
-    171: 51,  # 'ซ'
-    172: 119,  # 'ฌ'
-    173: 47,  # 'ญ'
-    174: 58,  # 'ฎ'
-    175: 57,  # 'ฏ'
-    176: 49,  # 'ฐ'
-    177: 53,  # 'ฑ'
-    178: 55,  # 'ฒ'
-    179: 43,  # 'ณ'
-    180: 20,  # 'ด'
-    181: 19,  # 'ต'
-    182: 44,  # 'ถ'
-    183: 14,  # 'ท'
-    184: 48,  # 'ธ'
-    185: 3,  # 'น'
-    186: 17,  # 'บ'
-    187: 25,  # 'ป'
-    188: 39,  # 'ผ'
-    189: 62,  # 'ฝ'
-    190: 31,  # 'พ'
-    191: 54,  # 'ฟ'
-    192: 45,  # 'ภ'
-    193: 9,  # 'ม'
-    194: 16,  # 'ย'
-    195: 2,  # 'ร'
-    196: 61,  # 'ฤ'
-    197: 15,  # 'ล'
-    198: 239,  # 'ฦ'
-    199: 12,  # 'ว'
-    200: 42,  # 'ศ'
-    201: 46,  # 'ษ'
-    202: 18,  # 'ส'
-    203: 21,  # 'ห'
-    204: 76,  # 'ฬ'
-    205: 4,  # 'อ'
-    206: 66,  # 'ฮ'
-    207: 63,  # 'ฯ'
-    208: 22,  # 'ะ'
-    209: 10,  # 'ั'
-    210: 1,  # 'า'
-    211: 36,  # 'ำ'
-    212: 23,  # 'ิ'
-    213: 13,  # 'ี'
-    214: 40,  # 'ึ'
-    215: 27,  # 'ื'
-    216: 32,  # 'ุ'
-    217: 35,  # 'ู'
-    218: 86,  # 'ฺ'
-    219: 240,  # None
-    220: 241,  # None
-    221: 242,  # None
-    222: 243,  # None
-    223: 244,  # '฿'
-    224: 11,  # 'เ'
-    225: 28,  # 'แ'
-    226: 41,  # 'โ'
-    227: 29,  # 'ใ'
-    228: 33,  # 'ไ'
-    229: 245,  # 'ๅ'
-    230: 50,  # 'ๆ'
-    231: 37,  # '็'
-    232: 6,  # '่'
-    233: 7,  # '้'
-    234: 67,  # '๊'
-    235: 77,  # '๋'
-    236: 38,  # '์'
-    237: 93,  # 'ํ'
-    238: 246,  # '๎'
-    239: 247,  # '๏'
-    240: 68,  # '๐'
-    241: 56,  # '๑'
-    242: 59,  # '๒'
-    243: 65,  # '๓'
-    244: 69,  # '๔'
-    245: 60,  # '๕'
-    246: 70,  # '๖'
-    247: 80,  # '๗'
-    248: 71,  # '๘'
-    249: 87,  # '๙'
-    250: 248,  # '๚'
-    251: 249,  # '๛'
-    252: 250,  # None
-    253: 251,  # None
-    254: 252,  # None
-    255: 253,  # None
-}
-
-TIS_620_THAI_MODEL = SingleByteCharSetModel(
-    charset_name="TIS-620",
-    language="Thai",
-    char_to_order_map=TIS_620_THAI_CHAR_TO_ORDER,
-    language_model=THAI_LANG_MODEL,
-    typical_positive_ratio=0.926386,
-    keep_ascii_letters=False,
-    alphabet="กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛",
-)
diff --git a/src/pip/_vendor/chardet/langturkishmodel.py b/src/pip/_vendor/chardet/langturkishmodel.py
deleted file mode 100644
index 291857c25c8..00000000000
--- a/src/pip/_vendor/chardet/langturkishmodel.py
+++ /dev/null
@@ -1,4380 +0,0 @@
-from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel
-
-# 3: Positive
-# 2: Likely
-# 1: Unlikely
-# 0: Negative
-
-TURKISH_LANG_MODEL = {
-    23: {  # 'A'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 2,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 1,  # 'g'
-        25: 1,  # 'h'
-        3: 1,  # 'i'
-        24: 0,  # 'j'
-        10: 2,  # 'k'
-        5: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 1,  # 'r'
-        8: 1,  # 's'
-        9: 1,  # 't'
-        14: 1,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 0,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    37: {  # 'B'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 2,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 1,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 1,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 2,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 0,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 0,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    47: {  # 'C'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 1,  # 'L'
-        20: 0,  # 'M'
-        46: 1,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 1,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 2,  # 'j'
-        10: 1,  # 'k'
-        5: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 2,  # 'n'
-        15: 1,  # 'o'
-        26: 0,  # 'p'
-        7: 2,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    39: {  # 'D'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 1,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 2,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 1,  # 'l'
-        13: 3,  # 'm'
-        4: 0,  # 'n'
-        15: 1,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 1,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 1,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    29: {  # 'E'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 1,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 2,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 1,  # 'g'
-        25: 0,  # 'h'
-        3: 1,  # 'i'
-        24: 1,  # 'j'
-        10: 0,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 1,  # 's'
-        9: 1,  # 't'
-        14: 1,  # 'u'
-        32: 1,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    52: {  # 'F'
-        23: 0,  # 'A'
-        37: 1,  # 'B'
-        47: 1,  # 'C'
-        39: 1,  # 'D'
-        29: 1,  # 'E'
-        52: 2,  # 'F'
-        36: 0,  # 'G'
-        45: 2,  # 'H'
-        53: 1,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 1,  # 'N'
-        42: 1,  # 'O'
-        48: 2,  # 'P'
-        44: 1,  # 'R'
-        35: 1,  # 'S'
-        31: 1,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 2,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 1,  # 'b'
-        28: 1,  # 'c'
-        12: 1,  # 'd'
-        2: 0,  # 'e'
-        18: 1,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 2,  # 'i'
-        24: 1,  # 'j'
-        10: 0,  # 'k'
-        5: 0,  # 'l'
-        13: 1,  # 'm'
-        4: 2,  # 'n'
-        15: 1,  # 'o'
-        26: 0,  # 'p'
-        7: 2,  # 'r'
-        8: 1,  # 's'
-        9: 1,  # 't'
-        14: 1,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 1,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 2,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 2,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 2,  # 'ş'
-    },
-    36: {  # 'G'
-        23: 1,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 2,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 2,  # 'N'
-        42: 1,  # 'O'
-        48: 1,  # 'P'
-        44: 1,  # 'R'
-        35: 1,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 2,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 1,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 1,  # 'j'
-        10: 1,  # 'k'
-        5: 0,  # 'l'
-        13: 3,  # 'm'
-        4: 2,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 0,  # 'r'
-        8: 1,  # 's'
-        9: 1,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 2,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 1,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 2,  # 'ı'
-        40: 2,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    45: {  # 'H'
-        23: 0,  # 'A'
-        37: 1,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 2,  # 'G'
-        45: 1,  # 'H'
-        53: 1,  # 'I'
-        60: 0,  # 'J'
-        16: 2,  # 'K'
-        49: 1,  # 'L'
-        20: 0,  # 'M'
-        46: 1,  # 'N'
-        42: 1,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 2,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 2,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 2,  # 'i'
-        24: 0,  # 'j'
-        10: 1,  # 'k'
-        5: 0,  # 'l'
-        13: 2,  # 'm'
-        4: 0,  # 'n'
-        15: 1,  # 'o'
-        26: 1,  # 'p'
-        7: 1,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 2,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 0,  # 'ı'
-        40: 2,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    53: {  # 'I'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 2,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 0,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 0,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    60: {  # 'J'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 1,  # 'b'
-        28: 0,  # 'c'
-        12: 1,  # 'd'
-        2: 0,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 1,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 1,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 1,  # 's'
-        9: 0,  # 't'
-        14: 0,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 0,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    16: {  # 'K'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 3,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 2,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 2,  # 'a'
-        21: 3,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 1,  # 'e'
-        18: 3,  # 'f'
-        27: 3,  # 'g'
-        25: 3,  # 'h'
-        3: 3,  # 'i'
-        24: 2,  # 'j'
-        10: 3,  # 'k'
-        5: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 0,  # 'u'
-        32: 3,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 2,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 2,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    49: {  # 'L'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 2,  # 'E'
-        52: 0,  # 'F'
-        36: 1,  # 'G'
-        45: 1,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 2,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 3,  # 'b'
-        28: 0,  # 'c'
-        12: 2,  # 'd'
-        2: 0,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 2,  # 'i'
-        24: 0,  # 'j'
-        10: 1,  # 'k'
-        5: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 2,  # 'n'
-        15: 1,  # 'o'
-        26: 1,  # 'p'
-        7: 1,  # 'r'
-        8: 1,  # 's'
-        9: 1,  # 't'
-        14: 0,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 2,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 1,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    20: {  # 'M'
-        23: 1,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 2,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 1,  # 'g'
-        25: 1,  # 'h'
-        3: 2,  # 'i'
-        24: 2,  # 'j'
-        10: 2,  # 'k'
-        5: 2,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 3,  # 'r'
-        8: 0,  # 's'
-        9: 2,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 3,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    46: {  # 'N'
-        23: 0,  # 'A'
-        37: 1,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 1,  # 'G'
-        45: 1,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 1,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 1,  # 'R'
-        35: 1,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 2,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 1,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 2,  # 'j'
-        10: 1,  # 'k'
-        5: 1,  # 'l'
-        13: 3,  # 'm'
-        4: 2,  # 'n'
-        15: 1,  # 'o'
-        26: 1,  # 'p'
-        7: 1,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 1,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 2,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    42: {  # 'O'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 0,  # 'G'
-        45: 1,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 2,  # 'K'
-        49: 1,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 2,  # 'P'
-        44: 1,  # 'R'
-        35: 1,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 0,  # 'n'
-        15: 1,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 2,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 2,  # 'İ'
-        6: 1,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    48: {  # 'P'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 2,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 1,  # 'G'
-        45: 1,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 1,  # 'N'
-        42: 1,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 1,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 2,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 1,  # 'k'
-        5: 0,  # 'l'
-        13: 2,  # 'm'
-        4: 0,  # 'n'
-        15: 2,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 2,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 2,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 2,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 0,  # 'ı'
-        40: 2,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    44: {  # 'R'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 1,  # 'b'
-        28: 1,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 1,  # 'k'
-        5: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 0,  # 'n'
-        15: 1,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 1,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 1,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    35: {  # 'S'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 1,  # 'G'
-        45: 1,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 1,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 1,  # 'k'
-        5: 1,  # 'l'
-        13: 2,  # 'm'
-        4: 1,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 1,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 2,  # 'Ç'
-        50: 2,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 3,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 2,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    31: {  # 'T'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 2,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 2,  # 'b'
-        28: 0,  # 'c'
-        12: 1,  # 'd'
-        2: 3,  # 'e'
-        18: 2,  # 'f'
-        27: 2,  # 'g'
-        25: 0,  # 'h'
-        3: 1,  # 'i'
-        24: 1,  # 'j'
-        10: 2,  # 'k'
-        5: 2,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 2,  # 'p'
-        7: 2,  # 'r'
-        8: 0,  # 's'
-        9: 2,  # 't'
-        14: 2,  # 'u'
-        32: 1,  # 'v'
-        57: 1,  # 'w'
-        58: 1,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 1,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    51: {  # 'U'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 1,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 1,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 1,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 1,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 2,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 1,  # 'k'
-        5: 1,  # 'l'
-        13: 3,  # 'm'
-        4: 2,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    38: {  # 'V'
-        23: 1,  # 'A'
-        37: 1,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 1,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 2,  # 'l'
-        13: 2,  # 'm'
-        4: 0,  # 'n'
-        15: 2,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 1,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 1,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 1,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 3,  # 'ı'
-        40: 2,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    62: {  # 'W'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 0,  # 'd'
-        2: 0,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 0,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 0,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 0,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    43: {  # 'Y'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 0,  # 'G'
-        45: 1,  # 'H'
-        53: 1,  # 'I'
-        60: 0,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 2,  # 'N'
-        42: 0,  # 'O'
-        48: 2,  # 'P'
-        44: 1,  # 'R'
-        35: 1,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 2,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 1,  # 'j'
-        10: 1,  # 'k'
-        5: 1,  # 'l'
-        13: 3,  # 'm'
-        4: 0,  # 'n'
-        15: 2,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 2,  # 'Ö'
-        55: 1,  # 'Ü'
-        59: 1,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 0,  # 'ı'
-        40: 2,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    56: {  # 'Z'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 2,  # 'Z'
-        1: 2,  # 'a'
-        21: 1,  # 'b'
-        28: 0,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 2,  # 'i'
-        24: 1,  # 'j'
-        10: 0,  # 'k'
-        5: 0,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 1,  # 'r'
-        8: 1,  # 's'
-        9: 0,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 1,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 1,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    1: {  # 'a'
-        23: 3,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 3,  # 'E'
-        52: 0,  # 'F'
-        36: 1,  # 'G'
-        45: 1,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 1,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 3,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 2,  # 'Z'
-        1: 2,  # 'a'
-        21: 3,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 2,  # 'e'
-        18: 3,  # 'f'
-        27: 3,  # 'g'
-        25: 3,  # 'h'
-        3: 3,  # 'i'
-        24: 3,  # 'j'
-        10: 3,  # 'k'
-        5: 0,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        15: 1,  # 'o'
-        26: 3,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 3,  # 'v'
-        57: 2,  # 'w'
-        58: 0,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 1,  # 'î'
-        34: 1,  # 'ö'
-        17: 3,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    21: {  # 'b'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 1,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 2,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 3,  # 'g'
-        25: 1,  # 'h'
-        3: 3,  # 'i'
-        24: 2,  # 'j'
-        10: 3,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 3,  # 'p'
-        7: 1,  # 'r'
-        8: 2,  # 's'
-        9: 2,  # 't'
-        14: 2,  # 'u'
-        32: 1,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    28: {  # 'c'
-        23: 0,  # 'A'
-        37: 1,  # 'B'
-        47: 1,  # 'C'
-        39: 1,  # 'D'
-        29: 2,  # 'E'
-        52: 0,  # 'F'
-        36: 2,  # 'G'
-        45: 2,  # 'H'
-        53: 1,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 1,  # 'N'
-        42: 1,  # 'O'
-        48: 2,  # 'P'
-        44: 1,  # 'R'
-        35: 1,  # 'S'
-        31: 2,  # 'T'
-        51: 2,  # 'U'
-        38: 2,  # 'V'
-        62: 0,  # 'W'
-        43: 3,  # 'Y'
-        56: 0,  # 'Z'
-        1: 1,  # 'a'
-        21: 1,  # 'b'
-        28: 2,  # 'c'
-        12: 2,  # 'd'
-        2: 1,  # 'e'
-        18: 1,  # 'f'
-        27: 2,  # 'g'
-        25: 2,  # 'h'
-        3: 3,  # 'i'
-        24: 1,  # 'j'
-        10: 3,  # 'k'
-        5: 0,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        15: 2,  # 'o'
-        26: 2,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 1,  # 'u'
-        32: 0,  # 'v'
-        57: 1,  # 'w'
-        58: 0,  # 'x'
-        11: 2,  # 'y'
-        22: 1,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 1,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 1,  # 'î'
-        34: 2,  # 'ö'
-        17: 2,  # 'ü'
-        30: 2,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 2,  # 'ş'
-    },
-    12: {  # 'd'
-        23: 1,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 2,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 1,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 2,  # 'b'
-        28: 1,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 1,  # 'f'
-        27: 3,  # 'g'
-        25: 3,  # 'h'
-        3: 2,  # 'i'
-        24: 3,  # 'j'
-        10: 2,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 1,  # 'o'
-        26: 2,  # 'p'
-        7: 3,  # 'r'
-        8: 2,  # 's'
-        9: 2,  # 't'
-        14: 3,  # 'u'
-        32: 1,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 3,  # 'y'
-        22: 1,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 1,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    2: {  # 'e'
-        23: 2,  # 'A'
-        37: 0,  # 'B'
-        47: 2,  # 'C'
-        39: 0,  # 'D'
-        29: 3,  # 'E'
-        52: 1,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 1,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 1,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 1,  # 'R'
-        35: 0,  # 'S'
-        31: 3,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 3,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 2,  # 'e'
-        18: 3,  # 'f'
-        27: 3,  # 'g'
-        25: 3,  # 'h'
-        3: 3,  # 'i'
-        24: 3,  # 'j'
-        10: 3,  # 'k'
-        5: 0,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        15: 1,  # 'o'
-        26: 3,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 3,  # 'v'
-        57: 2,  # 'w'
-        58: 0,  # 'x'
-        11: 3,  # 'y'
-        22: 1,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 3,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    18: {  # 'f'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 2,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 1,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 2,  # 'f'
-        27: 1,  # 'g'
-        25: 1,  # 'h'
-        3: 1,  # 'i'
-        24: 1,  # 'j'
-        10: 1,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 2,  # 'p'
-        7: 1,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 1,  # 'u'
-        32: 2,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 1,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 1,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 1,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    27: {  # 'g'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 1,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 2,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 1,  # 'b'
-        28: 0,  # 'c'
-        12: 1,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 2,  # 'g'
-        25: 1,  # 'h'
-        3: 2,  # 'i'
-        24: 3,  # 'j'
-        10: 2,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 2,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 2,  # 'r'
-        8: 2,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 1,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 1,  # 'y'
-        22: 0,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    25: {  # 'h'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 2,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 1,  # 'g'
-        25: 2,  # 'h'
-        3: 2,  # 'i'
-        24: 3,  # 'j'
-        10: 3,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 1,  # 'o'
-        26: 1,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 2,  # 't'
-        14: 3,  # 'u'
-        32: 2,  # 'v'
-        57: 1,  # 'w'
-        58: 0,  # 'x'
-        11: 1,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    3: {  # 'i'
-        23: 2,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 0,  # 'N'
-        42: 1,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 1,  # 'S'
-        31: 2,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 2,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 2,  # 'f'
-        27: 3,  # 'g'
-        25: 1,  # 'h'
-        3: 3,  # 'i'
-        24: 2,  # 'j'
-        10: 3,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 1,  # 'o'
-        26: 3,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 2,  # 'v'
-        57: 1,  # 'w'
-        58: 1,  # 'x'
-        11: 3,  # 'y'
-        22: 1,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 1,  # 'Ü'
-        59: 0,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 3,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    24: {  # 'j'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 2,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 1,  # 'Z'
-        1: 3,  # 'a'
-        21: 1,  # 'b'
-        28: 1,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 2,  # 'f'
-        27: 1,  # 'g'
-        25: 1,  # 'h'
-        3: 2,  # 'i'
-        24: 1,  # 'j'
-        10: 2,  # 'k'
-        5: 2,  # 'l'
-        13: 3,  # 'm'
-        4: 2,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 2,  # 'r'
-        8: 3,  # 's'
-        9: 2,  # 't'
-        14: 3,  # 'u'
-        32: 2,  # 'v'
-        57: 0,  # 'w'
-        58: 2,  # 'x'
-        11: 1,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 1,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    10: {  # 'k'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 3,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 1,  # 'Z'
-        1: 3,  # 'a'
-        21: 2,  # 'b'
-        28: 0,  # 'c'
-        12: 2,  # 'd'
-        2: 3,  # 'e'
-        18: 1,  # 'f'
-        27: 2,  # 'g'
-        25: 2,  # 'h'
-        3: 3,  # 'i'
-        24: 2,  # 'j'
-        10: 2,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 3,  # 'p'
-        7: 2,  # 'r'
-        8: 2,  # 's'
-        9: 2,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 3,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 3,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    5: {  # 'l'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 3,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 3,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 1,  # 'e'
-        18: 3,  # 'f'
-        27: 3,  # 'g'
-        25: 2,  # 'h'
-        3: 3,  # 'i'
-        24: 2,  # 'j'
-        10: 3,  # 'k'
-        5: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 2,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 2,  # 'u'
-        32: 2,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 2,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    13: {  # 'm'
-        23: 1,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 3,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 3,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 2,  # 'a'
-        21: 3,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 2,  # 'e'
-        18: 3,  # 'f'
-        27: 3,  # 'g'
-        25: 3,  # 'h'
-        3: 3,  # 'i'
-        24: 3,  # 'j'
-        10: 3,  # 'k'
-        5: 0,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        15: 1,  # 'o'
-        26: 2,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 2,  # 'u'
-        32: 2,  # 'v'
-        57: 1,  # 'w'
-        58: 0,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 3,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    4: {  # 'n'
-        23: 1,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 1,  # 'H'
-        53: 0,  # 'I'
-        60: 2,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 2,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 2,  # 'b'
-        28: 1,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 1,  # 'f'
-        27: 2,  # 'g'
-        25: 3,  # 'h'
-        3: 2,  # 'i'
-        24: 2,  # 'j'
-        10: 3,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 1,  # 'o'
-        26: 3,  # 'p'
-        7: 2,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 2,  # 'v'
-        57: 0,  # 'w'
-        58: 2,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 2,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 1,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    15: {  # 'o'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 1,  # 'G'
-        45: 1,  # 'H'
-        53: 1,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 2,  # 'L'
-        20: 0,  # 'M'
-        46: 2,  # 'N'
-        42: 1,  # 'O'
-        48: 2,  # 'P'
-        44: 1,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 1,  # 'i'
-        24: 2,  # 'j'
-        10: 1,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 2,  # 'n'
-        15: 2,  # 'o'
-        26: 0,  # 'p'
-        7: 1,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 2,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 2,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 3,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 2,  # 'ğ'
-        41: 2,  # 'İ'
-        6: 3,  # 'ı'
-        40: 2,  # 'Ş'
-        19: 2,  # 'ş'
-    },
-    26: {  # 'p'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 1,  # 'b'
-        28: 0,  # 'c'
-        12: 1,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 1,  # 'g'
-        25: 1,  # 'h'
-        3: 2,  # 'i'
-        24: 3,  # 'j'
-        10: 1,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 2,  # 'n'
-        15: 0,  # 'o'
-        26: 2,  # 'p'
-        7: 2,  # 'r'
-        8: 1,  # 's'
-        9: 1,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 1,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 3,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 1,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    7: {  # 'r'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 1,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 2,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 2,  # 'T'
-        51: 1,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 1,  # 'Z'
-        1: 3,  # 'a'
-        21: 1,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 2,  # 'g'
-        25: 3,  # 'h'
-        3: 2,  # 'i'
-        24: 2,  # 'j'
-        10: 3,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 2,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 2,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 3,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    8: {  # 's'
-        23: 1,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 1,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 2,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 1,  # 'Z'
-        1: 3,  # 'a'
-        21: 2,  # 'b'
-        28: 1,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 2,  # 'g'
-        25: 2,  # 'h'
-        3: 2,  # 'i'
-        24: 3,  # 'j'
-        10: 3,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 3,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 2,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 2,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 2,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    9: {  # 't'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 2,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 1,  # 'Z'
-        1: 3,  # 'a'
-        21: 3,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 2,  # 'f'
-        27: 2,  # 'g'
-        25: 2,  # 'h'
-        3: 2,  # 'i'
-        24: 2,  # 'j'
-        10: 3,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 2,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 3,  # 'v'
-        57: 0,  # 'w'
-        58: 2,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 3,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 2,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    14: {  # 'u'
-        23: 3,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 3,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 1,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 2,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 3,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 2,  # 'Z'
-        1: 2,  # 'a'
-        21: 3,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 2,  # 'e'
-        18: 2,  # 'f'
-        27: 3,  # 'g'
-        25: 3,  # 'h'
-        3: 3,  # 'i'
-        24: 2,  # 'j'
-        10: 3,  # 'k'
-        5: 0,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 3,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 2,  # 'v'
-        57: 2,  # 'w'
-        58: 0,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 3,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    32: {  # 'v'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 1,  # 'j'
-        10: 1,  # 'k'
-        5: 3,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 1,  # 'r'
-        8: 2,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 1,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 1,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    57: {  # 'w'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 1,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 1,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 1,  # 'k'
-        5: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 1,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 1,  # 's'
-        9: 0,  # 't'
-        14: 1,  # 'u'
-        32: 0,  # 'v'
-        57: 2,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 0,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 1,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 0,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    58: {  # 'x'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 1,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 1,  # 'b'
-        28: 0,  # 'c'
-        12: 2,  # 'd'
-        2: 1,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 2,  # 'i'
-        24: 2,  # 'j'
-        10: 1,  # 'k'
-        5: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 2,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 1,  # 'r'
-        8: 2,  # 's'
-        9: 1,  # 't'
-        14: 0,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 1,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    11: {  # 'y'
-        23: 1,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 1,  # 'Z'
-        1: 3,  # 'a'
-        21: 1,  # 'b'
-        28: 0,  # 'c'
-        12: 2,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 2,  # 'g'
-        25: 2,  # 'h'
-        3: 2,  # 'i'
-        24: 1,  # 'j'
-        10: 2,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 2,  # 'r'
-        8: 1,  # 's'
-        9: 2,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 1,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 3,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 2,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    22: {  # 'z'
-        23: 2,  # 'A'
-        37: 2,  # 'B'
-        47: 1,  # 'C'
-        39: 2,  # 'D'
-        29: 3,  # 'E'
-        52: 1,  # 'F'
-        36: 2,  # 'G'
-        45: 2,  # 'H'
-        53: 1,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 2,  # 'N'
-        42: 2,  # 'O'
-        48: 2,  # 'P'
-        44: 1,  # 'R'
-        35: 1,  # 'S'
-        31: 3,  # 'T'
-        51: 2,  # 'U'
-        38: 2,  # 'V'
-        62: 0,  # 'W'
-        43: 2,  # 'Y'
-        56: 1,  # 'Z'
-        1: 1,  # 'a'
-        21: 2,  # 'b'
-        28: 1,  # 'c'
-        12: 2,  # 'd'
-        2: 2,  # 'e'
-        18: 3,  # 'f'
-        27: 2,  # 'g'
-        25: 2,  # 'h'
-        3: 3,  # 'i'
-        24: 2,  # 'j'
-        10: 3,  # 'k'
-        5: 0,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        15: 2,  # 'o'
-        26: 2,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 0,  # 'u'
-        32: 2,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 3,  # 'y'
-        22: 2,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 2,  # 'Ü'
-        59: 1,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 2,  # 'ö'
-        17: 2,  # 'ü'
-        30: 2,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 3,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 2,  # 'ş'
-    },
-    63: {  # '·'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 0,  # 'd'
-        2: 1,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 0,  # 'l'
-        13: 2,  # 'm'
-        4: 0,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 0,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    54: {  # 'Ç'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 1,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 1,  # 'G'
-        45: 1,  # 'H'
-        53: 1,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 1,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 2,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 1,  # 'b'
-        28: 0,  # 'c'
-        12: 1,  # 'd'
-        2: 0,  # 'e'
-        18: 0,  # 'f'
-        27: 1,  # 'g'
-        25: 0,  # 'h'
-        3: 3,  # 'i'
-        24: 0,  # 'j'
-        10: 1,  # 'k'
-        5: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 2,  # 'n'
-        15: 1,  # 'o'
-        26: 0,  # 'p'
-        7: 2,  # 'r'
-        8: 0,  # 's'
-        9: 1,  # 't'
-        14: 0,  # 'u'
-        32: 2,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 2,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    50: {  # 'Ö'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 1,  # 'D'
-        29: 2,  # 'E'
-        52: 0,  # 'F'
-        36: 1,  # 'G'
-        45: 2,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 1,  # 'N'
-        42: 2,  # 'O'
-        48: 2,  # 'P'
-        44: 1,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 2,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 2,  # 'b'
-        28: 1,  # 'c'
-        12: 2,  # 'd'
-        2: 0,  # 'e'
-        18: 1,  # 'f'
-        27: 1,  # 'g'
-        25: 1,  # 'h'
-        3: 2,  # 'i'
-        24: 0,  # 'j'
-        10: 2,  # 'k'
-        5: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 3,  # 'n'
-        15: 2,  # 'o'
-        26: 2,  # 'p'
-        7: 3,  # 'r'
-        8: 1,  # 's'
-        9: 2,  # 't'
-        14: 0,  # 'u'
-        32: 1,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 2,  # 'ö'
-        17: 2,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    55: {  # 'Ü'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 1,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 1,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 2,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 1,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 1,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 1,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 1,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 0,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    59: {  # 'â'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 1,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 1,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 2,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 0,  # 'j'
-        10: 0,  # 'k'
-        5: 0,  # 'l'
-        13: 2,  # 'm'
-        4: 0,  # 'n'
-        15: 1,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 2,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 1,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    33: {  # 'ç'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 3,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 2,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 0,  # 'Z'
-        1: 0,  # 'a'
-        21: 3,  # 'b'
-        28: 0,  # 'c'
-        12: 2,  # 'd'
-        2: 0,  # 'e'
-        18: 2,  # 'f'
-        27: 1,  # 'g'
-        25: 3,  # 'h'
-        3: 3,  # 'i'
-        24: 0,  # 'j'
-        10: 3,  # 'k'
-        5: 0,  # 'l'
-        13: 0,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 3,  # 'r'
-        8: 2,  # 's'
-        9: 3,  # 't'
-        14: 0,  # 'u'
-        32: 2,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 1,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    61: {  # 'î'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 0,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 0,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 1,  # 'Z'
-        1: 2,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 1,  # 'j'
-        10: 0,  # 'k'
-        5: 0,  # 'l'
-        13: 1,  # 'm'
-        4: 1,  # 'n'
-        15: 0,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 1,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 1,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 1,  # 'î'
-        34: 0,  # 'ö'
-        17: 0,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 1,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    34: {  # 'ö'
-        23: 0,  # 'A'
-        37: 1,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 1,  # 'G'
-        45: 1,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 1,  # 'L'
-        20: 0,  # 'M'
-        46: 1,  # 'N'
-        42: 1,  # 'O'
-        48: 2,  # 'P'
-        44: 1,  # 'R'
-        35: 1,  # 'S'
-        31: 1,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 1,  # 'Z'
-        1: 3,  # 'a'
-        21: 1,  # 'b'
-        28: 2,  # 'c'
-        12: 1,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 2,  # 'g'
-        25: 2,  # 'h'
-        3: 1,  # 'i'
-        24: 2,  # 'j'
-        10: 1,  # 'k'
-        5: 2,  # 'l'
-        13: 3,  # 'm'
-        4: 2,  # 'n'
-        15: 2,  # 'o'
-        26: 0,  # 'p'
-        7: 0,  # 'r'
-        8: 3,  # 's'
-        9: 1,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 1,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 2,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 2,  # 'ö'
-        17: 0,  # 'ü'
-        30: 2,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 1,  # 'ı'
-        40: 2,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    17: {  # 'ü'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 0,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 1,  # 'J'
-        16: 1,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 0,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 0,  # 'Y'
-        56: 1,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 0,  # 'c'
-        12: 1,  # 'd'
-        2: 3,  # 'e'
-        18: 1,  # 'f'
-        27: 2,  # 'g'
-        25: 0,  # 'h'
-        3: 1,  # 'i'
-        24: 1,  # 'j'
-        10: 2,  # 'k'
-        5: 3,  # 'l'
-        13: 2,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 2,  # 'p'
-        7: 2,  # 'r'
-        8: 3,  # 's'
-        9: 2,  # 't'
-        14: 3,  # 'u'
-        32: 1,  # 'v'
-        57: 1,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 2,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    30: {  # 'ğ'
-        23: 0,  # 'A'
-        37: 2,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 1,  # 'G'
-        45: 0,  # 'H'
-        53: 1,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 1,  # 'M'
-        46: 2,  # 'N'
-        42: 2,  # 'O'
-        48: 1,  # 'P'
-        44: 1,  # 'R'
-        35: 0,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 2,  # 'V'
-        62: 0,  # 'W'
-        43: 2,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 0,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 2,  # 'e'
-        18: 0,  # 'f'
-        27: 0,  # 'g'
-        25: 0,  # 'h'
-        3: 0,  # 'i'
-        24: 3,  # 'j'
-        10: 1,  # 'k'
-        5: 2,  # 'l'
-        13: 3,  # 'm'
-        4: 0,  # 'n'
-        15: 1,  # 'o'
-        26: 0,  # 'p'
-        7: 1,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 2,  # 'Ç'
-        50: 2,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 0,  # 'î'
-        34: 2,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 2,  # 'İ'
-        6: 2,  # 'ı'
-        40: 2,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    41: {  # 'İ'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 1,  # 'D'
-        29: 1,  # 'E'
-        52: 0,  # 'F'
-        36: 2,  # 'G'
-        45: 2,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 1,  # 'N'
-        42: 1,  # 'O'
-        48: 2,  # 'P'
-        44: 0,  # 'R'
-        35: 1,  # 'S'
-        31: 1,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 2,  # 'Y'
-        56: 0,  # 'Z'
-        1: 1,  # 'a'
-        21: 2,  # 'b'
-        28: 1,  # 'c'
-        12: 2,  # 'd'
-        2: 1,  # 'e'
-        18: 0,  # 'f'
-        27: 3,  # 'g'
-        25: 2,  # 'h'
-        3: 2,  # 'i'
-        24: 2,  # 'j'
-        10: 2,  # 'k'
-        5: 0,  # 'l'
-        13: 1,  # 'm'
-        4: 3,  # 'n'
-        15: 1,  # 'o'
-        26: 1,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 2,  # 't'
-        14: 0,  # 'u'
-        32: 0,  # 'v'
-        57: 1,  # 'w'
-        58: 0,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 1,  # 'Ü'
-        59: 1,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 1,  # 'ö'
-        17: 1,  # 'ü'
-        30: 2,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-    6: {  # 'ı'
-        23: 2,  # 'A'
-        37: 0,  # 'B'
-        47: 0,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 0,  # 'F'
-        36: 1,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 2,  # 'J'
-        16: 3,  # 'K'
-        49: 0,  # 'L'
-        20: 3,  # 'M'
-        46: 1,  # 'N'
-        42: 0,  # 'O'
-        48: 0,  # 'P'
-        44: 0,  # 'R'
-        35: 0,  # 'S'
-        31: 2,  # 'T'
-        51: 0,  # 'U'
-        38: 0,  # 'V'
-        62: 0,  # 'W'
-        43: 2,  # 'Y'
-        56: 1,  # 'Z'
-        1: 3,  # 'a'
-        21: 2,  # 'b'
-        28: 1,  # 'c'
-        12: 3,  # 'd'
-        2: 3,  # 'e'
-        18: 3,  # 'f'
-        27: 3,  # 'g'
-        25: 2,  # 'h'
-        3: 3,  # 'i'
-        24: 3,  # 'j'
-        10: 3,  # 'k'
-        5: 3,  # 'l'
-        13: 3,  # 'm'
-        4: 3,  # 'n'
-        15: 0,  # 'o'
-        26: 3,  # 'p'
-        7: 3,  # 'r'
-        8: 3,  # 's'
-        9: 3,  # 't'
-        14: 3,  # 'u'
-        32: 3,  # 'v'
-        57: 1,  # 'w'
-        58: 1,  # 'x'
-        11: 3,  # 'y'
-        22: 0,  # 'z'
-        63: 1,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 2,  # 'ç'
-        61: 0,  # 'î'
-        34: 0,  # 'ö'
-        17: 3,  # 'ü'
-        30: 0,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 3,  # 'ı'
-        40: 0,  # 'Ş'
-        19: 0,  # 'ş'
-    },
-    40: {  # 'Ş'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 1,  # 'D'
-        29: 1,  # 'E'
-        52: 0,  # 'F'
-        36: 1,  # 'G'
-        45: 2,  # 'H'
-        53: 1,  # 'I'
-        60: 0,  # 'J'
-        16: 0,  # 'K'
-        49: 0,  # 'L'
-        20: 2,  # 'M'
-        46: 1,  # 'N'
-        42: 1,  # 'O'
-        48: 2,  # 'P'
-        44: 2,  # 'R'
-        35: 1,  # 'S'
-        31: 1,  # 'T'
-        51: 0,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 2,  # 'Y'
-        56: 1,  # 'Z'
-        1: 0,  # 'a'
-        21: 2,  # 'b'
-        28: 0,  # 'c'
-        12: 2,  # 'd'
-        2: 0,  # 'e'
-        18: 3,  # 'f'
-        27: 0,  # 'g'
-        25: 2,  # 'h'
-        3: 3,  # 'i'
-        24: 2,  # 'j'
-        10: 1,  # 'k'
-        5: 0,  # 'l'
-        13: 1,  # 'm'
-        4: 3,  # 'n'
-        15: 2,  # 'o'
-        26: 0,  # 'p'
-        7: 3,  # 'r'
-        8: 2,  # 's'
-        9: 2,  # 't'
-        14: 1,  # 'u'
-        32: 3,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 2,  # 'y'
-        22: 0,  # 'z'
-        63: 0,  # '·'
-        54: 0,  # 'Ç'
-        50: 0,  # 'Ö'
-        55: 1,  # 'Ü'
-        59: 0,  # 'â'
-        33: 0,  # 'ç'
-        61: 0,  # 'î'
-        34: 2,  # 'ö'
-        17: 1,  # 'ü'
-        30: 2,  # 'ğ'
-        41: 0,  # 'İ'
-        6: 2,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 2,  # 'ş'
-    },
-    19: {  # 'ş'
-        23: 0,  # 'A'
-        37: 0,  # 'B'
-        47: 1,  # 'C'
-        39: 0,  # 'D'
-        29: 0,  # 'E'
-        52: 2,  # 'F'
-        36: 1,  # 'G'
-        45: 0,  # 'H'
-        53: 0,  # 'I'
-        60: 0,  # 'J'
-        16: 3,  # 'K'
-        49: 2,  # 'L'
-        20: 0,  # 'M'
-        46: 1,  # 'N'
-        42: 1,  # 'O'
-        48: 1,  # 'P'
-        44: 1,  # 'R'
-        35: 1,  # 'S'
-        31: 0,  # 'T'
-        51: 1,  # 'U'
-        38: 1,  # 'V'
-        62: 0,  # 'W'
-        43: 1,  # 'Y'
-        56: 0,  # 'Z'
-        1: 3,  # 'a'
-        21: 1,  # 'b'
-        28: 2,  # 'c'
-        12: 0,  # 'd'
-        2: 3,  # 'e'
-        18: 0,  # 'f'
-        27: 2,  # 'g'
-        25: 1,  # 'h'
-        3: 1,  # 'i'
-        24: 0,  # 'j'
-        10: 2,  # 'k'
-        5: 2,  # 'l'
-        13: 3,  # 'm'
-        4: 0,  # 'n'
-        15: 0,  # 'o'
-        26: 1,  # 'p'
-        7: 3,  # 'r'
-        8: 0,  # 's'
-        9: 0,  # 't'
-        14: 3,  # 'u'
-        32: 0,  # 'v'
-        57: 0,  # 'w'
-        58: 0,  # 'x'
-        11: 0,  # 'y'
-        22: 2,  # 'z'
-        63: 0,  # '·'
-        54: 1,  # 'Ç'
-        50: 2,  # 'Ö'
-        55: 0,  # 'Ü'
-        59: 0,  # 'â'
-        33: 1,  # 'ç'
-        61: 1,  # 'î'
-        34: 2,  # 'ö'
-        17: 0,  # 'ü'
-        30: 1,  # 'ğ'
-        41: 1,  # 'İ'
-        6: 1,  # 'ı'
-        40: 1,  # 'Ş'
-        19: 1,  # 'ş'
-    },
-}
-
-# 255: Undefined characters that did not exist in training text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-# 251: Control characters
-
-# Character Mapping Table(s):
-ISO_8859_9_TURKISH_CHAR_TO_ORDER = {
-    0: 255,  # '\x00'
-    1: 255,  # '\x01'
-    2: 255,  # '\x02'
-    3: 255,  # '\x03'
-    4: 255,  # '\x04'
-    5: 255,  # '\x05'
-    6: 255,  # '\x06'
-    7: 255,  # '\x07'
-    8: 255,  # '\x08'
-    9: 255,  # '\t'
-    10: 255,  # '\n'
-    11: 255,  # '\x0b'
-    12: 255,  # '\x0c'
-    13: 255,  # '\r'
-    14: 255,  # '\x0e'
-    15: 255,  # '\x0f'
-    16: 255,  # '\x10'
-    17: 255,  # '\x11'
-    18: 255,  # '\x12'
-    19: 255,  # '\x13'
-    20: 255,  # '\x14'
-    21: 255,  # '\x15'
-    22: 255,  # '\x16'
-    23: 255,  # '\x17'
-    24: 255,  # '\x18'
-    25: 255,  # '\x19'
-    26: 255,  # '\x1a'
-    27: 255,  # '\x1b'
-    28: 255,  # '\x1c'
-    29: 255,  # '\x1d'
-    30: 255,  # '\x1e'
-    31: 255,  # '\x1f'
-    32: 255,  # ' '
-    33: 255,  # '!'
-    34: 255,  # '"'
-    35: 255,  # '#'
-    36: 255,  # '$'
-    37: 255,  # '%'
-    38: 255,  # '&'
-    39: 255,  # "'"
-    40: 255,  # '('
-    41: 255,  # ')'
-    42: 255,  # '*'
-    43: 255,  # '+'
-    44: 255,  # ','
-    45: 255,  # '-'
-    46: 255,  # '.'
-    47: 255,  # '/'
-    48: 255,  # '0'
-    49: 255,  # '1'
-    50: 255,  # '2'
-    51: 255,  # '3'
-    52: 255,  # '4'
-    53: 255,  # '5'
-    54: 255,  # '6'
-    55: 255,  # '7'
-    56: 255,  # '8'
-    57: 255,  # '9'
-    58: 255,  # ':'
-    59: 255,  # ';'
-    60: 255,  # '<'
-    61: 255,  # '='
-    62: 255,  # '>'
-    63: 255,  # '?'
-    64: 255,  # '@'
-    65: 23,  # 'A'
-    66: 37,  # 'B'
-    67: 47,  # 'C'
-    68: 39,  # 'D'
-    69: 29,  # 'E'
-    70: 52,  # 'F'
-    71: 36,  # 'G'
-    72: 45,  # 'H'
-    73: 53,  # 'I'
-    74: 60,  # 'J'
-    75: 16,  # 'K'
-    76: 49,  # 'L'
-    77: 20,  # 'M'
-    78: 46,  # 'N'
-    79: 42,  # 'O'
-    80: 48,  # 'P'
-    81: 69,  # 'Q'
-    82: 44,  # 'R'
-    83: 35,  # 'S'
-    84: 31,  # 'T'
-    85: 51,  # 'U'
-    86: 38,  # 'V'
-    87: 62,  # 'W'
-    88: 65,  # 'X'
-    89: 43,  # 'Y'
-    90: 56,  # 'Z'
-    91: 255,  # '['
-    92: 255,  # '\\'
-    93: 255,  # ']'
-    94: 255,  # '^'
-    95: 255,  # '_'
-    96: 255,  # '`'
-    97: 1,  # 'a'
-    98: 21,  # 'b'
-    99: 28,  # 'c'
-    100: 12,  # 'd'
-    101: 2,  # 'e'
-    102: 18,  # 'f'
-    103: 27,  # 'g'
-    104: 25,  # 'h'
-    105: 3,  # 'i'
-    106: 24,  # 'j'
-    107: 10,  # 'k'
-    108: 5,  # 'l'
-    109: 13,  # 'm'
-    110: 4,  # 'n'
-    111: 15,  # 'o'
-    112: 26,  # 'p'
-    113: 64,  # 'q'
-    114: 7,  # 'r'
-    115: 8,  # 's'
-    116: 9,  # 't'
-    117: 14,  # 'u'
-    118: 32,  # 'v'
-    119: 57,  # 'w'
-    120: 58,  # 'x'
-    121: 11,  # 'y'
-    122: 22,  # 'z'
-    123: 255,  # '{'
-    124: 255,  # '|'
-    125: 255,  # '}'
-    126: 255,  # '~'
-    127: 255,  # '\x7f'
-    128: 180,  # '\x80'
-    129: 179,  # '\x81'
-    130: 178,  # '\x82'
-    131: 177,  # '\x83'
-    132: 176,  # '\x84'
-    133: 175,  # '\x85'
-    134: 174,  # '\x86'
-    135: 173,  # '\x87'
-    136: 172,  # '\x88'
-    137: 171,  # '\x89'
-    138: 170,  # '\x8a'
-    139: 169,  # '\x8b'
-    140: 168,  # '\x8c'
-    141: 167,  # '\x8d'
-    142: 166,  # '\x8e'
-    143: 165,  # '\x8f'
-    144: 164,  # '\x90'
-    145: 163,  # '\x91'
-    146: 162,  # '\x92'
-    147: 161,  # '\x93'
-    148: 160,  # '\x94'
-    149: 159,  # '\x95'
-    150: 101,  # '\x96'
-    151: 158,  # '\x97'
-    152: 157,  # '\x98'
-    153: 156,  # '\x99'
-    154: 155,  # '\x9a'
-    155: 154,  # '\x9b'
-    156: 153,  # '\x9c'
-    157: 152,  # '\x9d'
-    158: 151,  # '\x9e'
-    159: 106,  # '\x9f'
-    160: 150,  # '\xa0'
-    161: 149,  # '¡'
-    162: 148,  # '¢'
-    163: 147,  # '£'
-    164: 146,  # '¤'
-    165: 145,  # '¥'
-    166: 144,  # '¦'
-    167: 100,  # '§'
-    168: 143,  # '¨'
-    169: 142,  # '©'
-    170: 141,  # 'ª'
-    171: 140,  # '«'
-    172: 139,  # '¬'
-    173: 138,  # '\xad'
-    174: 137,  # '®'
-    175: 136,  # '¯'
-    176: 94,  # '°'
-    177: 80,  # '±'
-    178: 93,  # '²'
-    179: 135,  # '³'
-    180: 105,  # '´'
-    181: 134,  # 'µ'
-    182: 133,  # '¶'
-    183: 63,  # '·'
-    184: 132,  # '¸'
-    185: 131,  # '¹'
-    186: 130,  # 'º'
-    187: 129,  # '»'
-    188: 128,  # '¼'
-    189: 127,  # '½'
-    190: 126,  # '¾'
-    191: 125,  # '¿'
-    192: 124,  # 'À'
-    193: 104,  # 'Á'
-    194: 73,  # 'Â'
-    195: 99,  # 'Ã'
-    196: 79,  # 'Ä'
-    197: 85,  # 'Å'
-    198: 123,  # 'Æ'
-    199: 54,  # 'Ç'
-    200: 122,  # 'È'
-    201: 98,  # 'É'
-    202: 92,  # 'Ê'
-    203: 121,  # 'Ë'
-    204: 120,  # 'Ì'
-    205: 91,  # 'Í'
-    206: 103,  # 'Î'
-    207: 119,  # 'Ï'
-    208: 68,  # 'Ğ'
-    209: 118,  # 'Ñ'
-    210: 117,  # 'Ò'
-    211: 97,  # 'Ó'
-    212: 116,  # 'Ô'
-    213: 115,  # 'Õ'
-    214: 50,  # 'Ö'
-    215: 90,  # '×'
-    216: 114,  # 'Ø'
-    217: 113,  # 'Ù'
-    218: 112,  # 'Ú'
-    219: 111,  # 'Û'
-    220: 55,  # 'Ü'
-    221: 41,  # 'İ'
-    222: 40,  # 'Ş'
-    223: 86,  # 'ß'
-    224: 89,  # 'à'
-    225: 70,  # 'á'
-    226: 59,  # 'â'
-    227: 78,  # 'ã'
-    228: 71,  # 'ä'
-    229: 82,  # 'å'
-    230: 88,  # 'æ'
-    231: 33,  # 'ç'
-    232: 77,  # 'è'
-    233: 66,  # 'é'
-    234: 84,  # 'ê'
-    235: 83,  # 'ë'
-    236: 110,  # 'ì'
-    237: 75,  # 'í'
-    238: 61,  # 'î'
-    239: 96,  # 'ï'
-    240: 30,  # 'ğ'
-    241: 67,  # 'ñ'
-    242: 109,  # 'ò'
-    243: 74,  # 'ó'
-    244: 87,  # 'ô'
-    245: 102,  # 'õ'
-    246: 34,  # 'ö'
-    247: 95,  # '÷'
-    248: 81,  # 'ø'
-    249: 108,  # 'ù'
-    250: 76,  # 'ú'
-    251: 72,  # 'û'
-    252: 17,  # 'ü'
-    253: 6,  # 'ı'
-    254: 19,  # 'ş'
-    255: 107,  # 'ÿ'
-}
-
-ISO_8859_9_TURKISH_MODEL = SingleByteCharSetModel(
-    charset_name="ISO-8859-9",
-    language="Turkish",
-    char_to_order_map=ISO_8859_9_TURKISH_CHAR_TO_ORDER,
-    language_model=TURKISH_LANG_MODEL,
-    typical_positive_ratio=0.97029,
-    keep_ascii_letters=True,
-    alphabet="ABCDEFGHIJKLMNOPRSTUVYZabcdefghijklmnoprstuvyzÂÇÎÖÛÜâçîöûüĞğİıŞş",
-)
diff --git a/src/pip/_vendor/chardet/latin1prober.py b/src/pip/_vendor/chardet/latin1prober.py
deleted file mode 100644
index 59a01d91b87..00000000000
--- a/src/pip/_vendor/chardet/latin1prober.py
+++ /dev/null
@@ -1,147 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import List, Union
-
-from .charsetprober import CharSetProber
-from .enums import ProbingState
-
-FREQ_CAT_NUM = 4
-
-UDF = 0  # undefined
-OTH = 1  # other
-ASC = 2  # ascii capital letter
-ASS = 3  # ascii small letter
-ACV = 4  # accent capital vowel
-ACO = 5  # accent capital other
-ASV = 6  # accent small vowel
-ASO = 7  # accent small other
-CLASS_NUM = 8  # total classes
-
-# fmt: off
-Latin1_CharToClass = (
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 00 - 07
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 08 - 0F
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 10 - 17
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 18 - 1F
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 20 - 27
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 28 - 2F
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 30 - 37
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 38 - 3F
-    OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 40 - 47
-    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 48 - 4F
-    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 50 - 57
-    ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH,   # 58 - 5F
-    OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 60 - 67
-    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 68 - 6F
-    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 70 - 77
-    ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH,   # 78 - 7F
-    OTH, UDF, OTH, ASO, OTH, OTH, OTH, OTH,   # 80 - 87
-    OTH, OTH, ACO, OTH, ACO, UDF, ACO, UDF,   # 88 - 8F
-    UDF, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 90 - 97
-    OTH, OTH, ASO, OTH, ASO, UDF, ASO, ACO,   # 98 - 9F
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A0 - A7
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A8 - AF
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B0 - B7
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B8 - BF
-    ACV, ACV, ACV, ACV, ACV, ACV, ACO, ACO,   # C0 - C7
-    ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV,   # C8 - CF
-    ACO, ACO, ACV, ACV, ACV, ACV, ACV, OTH,   # D0 - D7
-    ACV, ACV, ACV, ACV, ACV, ACO, ACO, ACO,   # D8 - DF
-    ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASO,   # E0 - E7
-    ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV,   # E8 - EF
-    ASO, ASO, ASV, ASV, ASV, ASV, ASV, OTH,   # F0 - F7
-    ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO,   # F8 - FF
-)
-
-# 0 : illegal
-# 1 : very unlikely
-# 2 : normal
-# 3 : very likely
-Latin1ClassModel = (
-# UDF OTH ASC ASS ACV ACO ASV ASO
-    0,  0,  0,  0,  0,  0,  0,  0,  # UDF
-    0,  3,  3,  3,  3,  3,  3,  3,  # OTH
-    0,  3,  3,  3,  3,  3,  3,  3,  # ASC
-    0,  3,  3,  3,  1,  1,  3,  3,  # ASS
-    0,  3,  3,  3,  1,  2,  1,  2,  # ACV
-    0,  3,  3,  3,  3,  3,  3,  3,  # ACO
-    0,  3,  1,  3,  1,  1,  1,  3,  # ASV
-    0,  3,  1,  3,  1,  1,  3,  3,  # ASO
-)
-# fmt: on
-
-
-class Latin1Prober(CharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self._last_char_class = OTH
-        self._freq_counter: List[int] = []
-        self.reset()
-
-    def reset(self) -> None:
-        self._last_char_class = OTH
-        self._freq_counter = [0] * FREQ_CAT_NUM
-        super().reset()
-
-    @property
-    def charset_name(self) -> str:
-        return "ISO-8859-1"
-
-    @property
-    def language(self) -> str:
-        return ""
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        byte_str = self.remove_xml_tags(byte_str)
-        for c in byte_str:
-            char_class = Latin1_CharToClass[c]
-            freq = Latin1ClassModel[(self._last_char_class * CLASS_NUM) + char_class]
-            if freq == 0:
-                self._state = ProbingState.NOT_ME
-                break
-            self._freq_counter[freq] += 1
-            self._last_char_class = char_class
-
-        return self.state
-
-    def get_confidence(self) -> float:
-        if self.state == ProbingState.NOT_ME:
-            return 0.01
-
-        total = sum(self._freq_counter)
-        confidence = (
-            0.0
-            if total < 0.01
-            else (self._freq_counter[3] - self._freq_counter[1] * 20.0) / total
-        )
-        confidence = max(confidence, 0.0)
-        # lower the confidence of latin1 so that other more accurate
-        # detector can take priority.
-        confidence *= 0.73
-        return confidence
diff --git a/src/pip/_vendor/chardet/macromanprober.py b/src/pip/_vendor/chardet/macromanprober.py
deleted file mode 100644
index 1425d10ecaa..00000000000
--- a/src/pip/_vendor/chardet/macromanprober.py
+++ /dev/null
@@ -1,162 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# This code was modified from latin1prober.py by Rob Speer .
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Rob Speer - adapt to MacRoman encoding
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import List, Union
-
-from .charsetprober import CharSetProber
-from .enums import ProbingState
-
-FREQ_CAT_NUM = 4
-
-UDF = 0  # undefined
-OTH = 1  # other
-ASC = 2  # ascii capital letter
-ASS = 3  # ascii small letter
-ACV = 4  # accent capital vowel
-ACO = 5  # accent capital other
-ASV = 6  # accent small vowel
-ASO = 7  # accent small other
-ODD = 8  # character that is unlikely to appear
-CLASS_NUM = 9  # total classes
-
-# The change from Latin1 is that we explicitly look for extended characters
-# that are infrequently-occurring symbols, and consider them to always be
-# improbable. This should let MacRoman get out of the way of more likely
-# encodings in most situations.
-
-# fmt: off
-MacRoman_CharToClass = (
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,  # 00 - 07
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,  # 08 - 0F
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,  # 10 - 17
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,  # 18 - 1F
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,  # 20 - 27
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,  # 28 - 2F
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,  # 30 - 37
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,  # 38 - 3F
-    OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC,  # 40 - 47
-    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,  # 48 - 4F
-    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,  # 50 - 57
-    ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH,  # 58 - 5F
-    OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS,  # 60 - 67
-    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,  # 68 - 6F
-    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,  # 70 - 77
-    ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH,  # 78 - 7F
-    ACV, ACV, ACO, ACV, ACO, ACV, ACV, ASV,  # 80 - 87
-    ASV, ASV, ASV, ASV, ASV, ASO, ASV, ASV,  # 88 - 8F
-    ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASV,  # 90 - 97
-    ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV,  # 98 - 9F
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, ASO,  # A0 - A7
-    OTH, OTH, ODD, ODD, OTH, OTH, ACV, ACV,  # A8 - AF
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,  # B0 - B7
-    OTH, OTH, OTH, OTH, OTH, OTH, ASV, ASV,  # B8 - BF
-    OTH, OTH, ODD, OTH, ODD, OTH, OTH, OTH,  # C0 - C7
-    OTH, OTH, OTH, ACV, ACV, ACV, ACV, ASV,  # C8 - CF
-    OTH, OTH, OTH, OTH, OTH, OTH, OTH, ODD,  # D0 - D7
-    ASV, ACV, ODD, OTH, OTH, OTH, OTH, OTH,  # D8 - DF
-    OTH, OTH, OTH, OTH, OTH, ACV, ACV, ACV,  # E0 - E7
-    ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV,  # E8 - EF
-    ODD, ACV, ACV, ACV, ACV, ASV, ODD, ODD,  # F0 - F7
-    ODD, ODD, ODD, ODD, ODD, ODD, ODD, ODD,  # F8 - FF
-)
-
-# 0 : illegal
-# 1 : very unlikely
-# 2 : normal
-# 3 : very likely
-MacRomanClassModel = (
-# UDF OTH ASC ASS ACV ACO ASV ASO ODD
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  # UDF
-    0,  3,  3,  3,  3,  3,  3,  3,  1,  # OTH
-    0,  3,  3,  3,  3,  3,  3,  3,  1,  # ASC
-    0,  3,  3,  3,  1,  1,  3,  3,  1,  # ASS
-    0,  3,  3,  3,  1,  2,  1,  2,  1,  # ACV
-    0,  3,  3,  3,  3,  3,  3,  3,  1,  # ACO
-    0,  3,  1,  3,  1,  1,  1,  3,  1,  # ASV
-    0,  3,  1,  3,  1,  1,  3,  3,  1,  # ASO
-    0,  1,  1,  1,  1,  1,  1,  1,  1,  # ODD
-)
-# fmt: on
-
-
-class MacRomanProber(CharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self._last_char_class = OTH
-        self._freq_counter: List[int] = []
-        self.reset()
-
-    def reset(self) -> None:
-        self._last_char_class = OTH
-        self._freq_counter = [0] * FREQ_CAT_NUM
-
-        # express the prior that MacRoman is a somewhat rare encoding;
-        # this can be done by starting out in a slightly improbable state
-        # that must be overcome
-        self._freq_counter[2] = 10
-
-        super().reset()
-
-    @property
-    def charset_name(self) -> str:
-        return "MacRoman"
-
-    @property
-    def language(self) -> str:
-        return ""
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        byte_str = self.remove_xml_tags(byte_str)
-        for c in byte_str:
-            char_class = MacRoman_CharToClass[c]
-            freq = MacRomanClassModel[(self._last_char_class * CLASS_NUM) + char_class]
-            if freq == 0:
-                self._state = ProbingState.NOT_ME
-                break
-            self._freq_counter[freq] += 1
-            self._last_char_class = char_class
-
-        return self.state
-
-    def get_confidence(self) -> float:
-        if self.state == ProbingState.NOT_ME:
-            return 0.01
-
-        total = sum(self._freq_counter)
-        confidence = (
-            0.0
-            if total < 0.01
-            else (self._freq_counter[3] - self._freq_counter[1] * 20.0) / total
-        )
-        confidence = max(confidence, 0.0)
-        # lower the confidence of MacRoman so that other more accurate
-        # detector can take priority.
-        confidence *= 0.73
-        return confidence
diff --git a/src/pip/_vendor/chardet/mbcharsetprober.py b/src/pip/_vendor/chardet/mbcharsetprober.py
deleted file mode 100644
index 666307e8fe0..00000000000
--- a/src/pip/_vendor/chardet/mbcharsetprober.py
+++ /dev/null
@@ -1,95 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#   Proofpoint, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import Optional, Union
-
-from .chardistribution import CharDistributionAnalysis
-from .charsetprober import CharSetProber
-from .codingstatemachine import CodingStateMachine
-from .enums import LanguageFilter, MachineState, ProbingState
-
-
-class MultiByteCharSetProber(CharSetProber):
-    """
-    MultiByteCharSetProber
-    """
-
-    def __init__(self, lang_filter: LanguageFilter = LanguageFilter.NONE) -> None:
-        super().__init__(lang_filter=lang_filter)
-        self.distribution_analyzer: Optional[CharDistributionAnalysis] = None
-        self.coding_sm: Optional[CodingStateMachine] = None
-        self._last_char = bytearray(b"\0\0")
-
-    def reset(self) -> None:
-        super().reset()
-        if self.coding_sm:
-            self.coding_sm.reset()
-        if self.distribution_analyzer:
-            self.distribution_analyzer.reset()
-        self._last_char = bytearray(b"\0\0")
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        assert self.coding_sm is not None
-        assert self.distribution_analyzer is not None
-
-        for i, byte in enumerate(byte_str):
-            coding_state = self.coding_sm.next_state(byte)
-            if coding_state == MachineState.ERROR:
-                self.logger.debug(
-                    "%s %s prober hit error at byte %s",
-                    self.charset_name,
-                    self.language,
-                    i,
-                )
-                self._state = ProbingState.NOT_ME
-                break
-            if coding_state == MachineState.ITS_ME:
-                self._state = ProbingState.FOUND_IT
-                break
-            if coding_state == MachineState.START:
-                char_len = self.coding_sm.get_current_charlen()
-                if i == 0:
-                    self._last_char[1] = byte
-                    self.distribution_analyzer.feed(self._last_char, char_len)
-                else:
-                    self.distribution_analyzer.feed(byte_str[i - 1 : i + 1], char_len)
-
-        self._last_char[0] = byte_str[-1]
-
-        if self.state == ProbingState.DETECTING:
-            if self.distribution_analyzer.got_enough_data() and (
-                self.get_confidence() > self.SHORTCUT_THRESHOLD
-            ):
-                self._state = ProbingState.FOUND_IT
-
-        return self.state
-
-    def get_confidence(self) -> float:
-        assert self.distribution_analyzer is not None
-        return self.distribution_analyzer.get_confidence()
diff --git a/src/pip/_vendor/chardet/mbcsgroupprober.py b/src/pip/_vendor/chardet/mbcsgroupprober.py
deleted file mode 100644
index 6cb9cc7b3bc..00000000000
--- a/src/pip/_vendor/chardet/mbcsgroupprober.py
+++ /dev/null
@@ -1,57 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#   Proofpoint, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .big5prober import Big5Prober
-from .charsetgroupprober import CharSetGroupProber
-from .cp949prober import CP949Prober
-from .enums import LanguageFilter
-from .eucjpprober import EUCJPProber
-from .euckrprober import EUCKRProber
-from .euctwprober import EUCTWProber
-from .gb2312prober import GB2312Prober
-from .johabprober import JOHABProber
-from .sjisprober import SJISProber
-from .utf8prober import UTF8Prober
-
-
-class MBCSGroupProber(CharSetGroupProber):
-    def __init__(self, lang_filter: LanguageFilter = LanguageFilter.NONE) -> None:
-        super().__init__(lang_filter=lang_filter)
-        self.probers = [
-            UTF8Prober(),
-            SJISProber(),
-            EUCJPProber(),
-            GB2312Prober(),
-            EUCKRProber(),
-            CP949Prober(),
-            Big5Prober(),
-            EUCTWProber(),
-            JOHABProber(),
-        ]
-        self.reset()
diff --git a/src/pip/_vendor/chardet/mbcssm.py b/src/pip/_vendor/chardet/mbcssm.py
deleted file mode 100644
index 7bbe97e6665..00000000000
--- a/src/pip/_vendor/chardet/mbcssm.py
+++ /dev/null
@@ -1,661 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .codingstatemachinedict import CodingStateMachineDict
-from .enums import MachineState
-
-# BIG5
-
-# fmt: off
-BIG5_CLS = (
-    1, 1, 1, 1, 1, 1, 1, 1,  # 00 - 07    #allow 0x00 as legal value
-    1, 1, 1, 1, 1, 1, 0, 0,  # 08 - 0f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 10 - 17
-    1, 1, 1, 0, 1, 1, 1, 1,  # 18 - 1f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 20 - 27
-    1, 1, 1, 1, 1, 1, 1, 1,  # 28 - 2f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 30 - 37
-    1, 1, 1, 1, 1, 1, 1, 1,  # 38 - 3f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 40 - 47
-    2, 2, 2, 2, 2, 2, 2, 2,  # 48 - 4f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 50 - 57
-    2, 2, 2, 2, 2, 2, 2, 2,  # 58 - 5f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 60 - 67
-    2, 2, 2, 2, 2, 2, 2, 2,  # 68 - 6f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 70 - 77
-    2, 2, 2, 2, 2, 2, 2, 1,  # 78 - 7f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 80 - 87
-    4, 4, 4, 4, 4, 4, 4, 4,  # 88 - 8f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 90 - 97
-    4, 4, 4, 4, 4, 4, 4, 4,  # 98 - 9f
-    4, 3, 3, 3, 3, 3, 3, 3,  # a0 - a7
-    3, 3, 3, 3, 3, 3, 3, 3,  # a8 - af
-    3, 3, 3, 3, 3, 3, 3, 3,  # b0 - b7
-    3, 3, 3, 3, 3, 3, 3, 3,  # b8 - bf
-    3, 3, 3, 3, 3, 3, 3, 3,  # c0 - c7
-    3, 3, 3, 3, 3, 3, 3, 3,  # c8 - cf
-    3, 3, 3, 3, 3, 3, 3, 3,  # d0 - d7
-    3, 3, 3, 3, 3, 3, 3, 3,  # d8 - df
-    3, 3, 3, 3, 3, 3, 3, 3,  # e0 - e7
-    3, 3, 3, 3, 3, 3, 3, 3,  # e8 - ef
-    3, 3, 3, 3, 3, 3, 3, 3,  # f0 - f7
-    3, 3, 3, 3, 3, 3, 3, 0  # f8 - ff
-)
-
-BIG5_ST = (
-    MachineState.ERROR,MachineState.START,MachineState.START,     3,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#00-07
-    MachineState.ERROR,MachineState.ERROR,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ERROR,#08-0f
-    MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START#10-17
-)
-# fmt: on
-
-BIG5_CHAR_LEN_TABLE = (0, 1, 1, 2, 0)
-
-BIG5_SM_MODEL: CodingStateMachineDict = {
-    "class_table": BIG5_CLS,
-    "class_factor": 5,
-    "state_table": BIG5_ST,
-    "char_len_table": BIG5_CHAR_LEN_TABLE,
-    "name": "Big5",
-}
-
-# CP949
-# fmt: off
-CP949_CLS  = (
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,  # 00 - 0f
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1,  # 10 - 1f
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  # 20 - 2f
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  # 30 - 3f
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,  # 40 - 4f
-    4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 1, 1, 1, 1, 1,  # 50 - 5f
-    1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,  # 60 - 6f
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 1, 1, 1, 1, 1,  # 70 - 7f
-    0, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,  # 80 - 8f
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,  # 90 - 9f
-    6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,  # a0 - af
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,  # b0 - bf
-    7, 7, 7, 7, 7, 7, 9, 2, 2, 3, 2, 2, 2, 2, 2, 2,  # c0 - cf
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,  # d0 - df
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,  # e0 - ef
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,  # f0 - ff
-)
-
-CP949_ST = (
-#cls=    0      1      2      3      4      5      6      7      8      9  # previous state =
-    MachineState.ERROR,MachineState.START,     3,MachineState.ERROR,MachineState.START,MachineState.START,     4,     5,MachineState.ERROR,     6, # MachineState.START
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR, # MachineState.ERROR
-    MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME, # MachineState.ITS_ME
-    MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START, # 3
-    MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START, # 4
-    MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START, # 5
-    MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START, # 6
-)
-# fmt: on
-
-CP949_CHAR_LEN_TABLE = (0, 1, 2, 0, 1, 1, 2, 2, 0, 2)
-
-CP949_SM_MODEL: CodingStateMachineDict = {
-    "class_table": CP949_CLS,
-    "class_factor": 10,
-    "state_table": CP949_ST,
-    "char_len_table": CP949_CHAR_LEN_TABLE,
-    "name": "CP949",
-}
-
-# EUC-JP
-# fmt: off
-EUCJP_CLS = (
-    4, 4, 4, 4, 4, 4, 4, 4,  # 00 - 07
-    4, 4, 4, 4, 4, 4, 5, 5,  # 08 - 0f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 10 - 17
-    4, 4, 4, 5, 4, 4, 4, 4,  # 18 - 1f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 20 - 27
-    4, 4, 4, 4, 4, 4, 4, 4,  # 28 - 2f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 30 - 37
-    4, 4, 4, 4, 4, 4, 4, 4,  # 38 - 3f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 40 - 47
-    4, 4, 4, 4, 4, 4, 4, 4,  # 48 - 4f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 50 - 57
-    4, 4, 4, 4, 4, 4, 4, 4,  # 58 - 5f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 60 - 67
-    4, 4, 4, 4, 4, 4, 4, 4,  # 68 - 6f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 70 - 77
-    4, 4, 4, 4, 4, 4, 4, 4,  # 78 - 7f
-    5, 5, 5, 5, 5, 5, 5, 5,  # 80 - 87
-    5, 5, 5, 5, 5, 5, 1, 3,  # 88 - 8f
-    5, 5, 5, 5, 5, 5, 5, 5,  # 90 - 97
-    5, 5, 5, 5, 5, 5, 5, 5,  # 98 - 9f
-    5, 2, 2, 2, 2, 2, 2, 2,  # a0 - a7
-    2, 2, 2, 2, 2, 2, 2, 2,  # a8 - af
-    2, 2, 2, 2, 2, 2, 2, 2,  # b0 - b7
-    2, 2, 2, 2, 2, 2, 2, 2,  # b8 - bf
-    2, 2, 2, 2, 2, 2, 2, 2,  # c0 - c7
-    2, 2, 2, 2, 2, 2, 2, 2,  # c8 - cf
-    2, 2, 2, 2, 2, 2, 2, 2,  # d0 - d7
-    2, 2, 2, 2, 2, 2, 2, 2,  # d8 - df
-    0, 0, 0, 0, 0, 0, 0, 0,  # e0 - e7
-    0, 0, 0, 0, 0, 0, 0, 0,  # e8 - ef
-    0, 0, 0, 0, 0, 0, 0, 0,  # f0 - f7
-    0, 0, 0, 0, 0, 0, 0, 5  # f8 - ff
-)
-
-EUCJP_ST = (
-          3,     4,     3,     5,MachineState.START,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#00-07
-     MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,#08-0f
-     MachineState.ITS_ME,MachineState.ITS_ME,MachineState.START,MachineState.ERROR,MachineState.START,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#10-17
-     MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,     3,MachineState.ERROR,#18-1f
-          3,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START#20-27
-)
-# fmt: on
-
-EUCJP_CHAR_LEN_TABLE = (2, 2, 2, 3, 1, 0)
-
-EUCJP_SM_MODEL: CodingStateMachineDict = {
-    "class_table": EUCJP_CLS,
-    "class_factor": 6,
-    "state_table": EUCJP_ST,
-    "char_len_table": EUCJP_CHAR_LEN_TABLE,
-    "name": "EUC-JP",
-}
-
-# EUC-KR
-# fmt: off
-EUCKR_CLS  = (
-    1, 1, 1, 1, 1, 1, 1, 1,  # 00 - 07
-    1, 1, 1, 1, 1, 1, 0, 0,  # 08 - 0f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 10 - 17
-    1, 1, 1, 0, 1, 1, 1, 1,  # 18 - 1f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 20 - 27
-    1, 1, 1, 1, 1, 1, 1, 1,  # 28 - 2f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 30 - 37
-    1, 1, 1, 1, 1, 1, 1, 1,  # 38 - 3f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 40 - 47
-    1, 1, 1, 1, 1, 1, 1, 1,  # 48 - 4f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 50 - 57
-    1, 1, 1, 1, 1, 1, 1, 1,  # 58 - 5f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 60 - 67
-    1, 1, 1, 1, 1, 1, 1, 1,  # 68 - 6f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 70 - 77
-    1, 1, 1, 1, 1, 1, 1, 1,  # 78 - 7f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 80 - 87
-    0, 0, 0, 0, 0, 0, 0, 0,  # 88 - 8f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 90 - 97
-    0, 0, 0, 0, 0, 0, 0, 0,  # 98 - 9f
-    0, 2, 2, 2, 2, 2, 2, 2,  # a0 - a7
-    2, 2, 2, 2, 2, 3, 3, 3,  # a8 - af
-    2, 2, 2, 2, 2, 2, 2, 2,  # b0 - b7
-    2, 2, 2, 2, 2, 2, 2, 2,  # b8 - bf
-    2, 2, 2, 2, 2, 2, 2, 2,  # c0 - c7
-    2, 3, 2, 2, 2, 2, 2, 2,  # c8 - cf
-    2, 2, 2, 2, 2, 2, 2, 2,  # d0 - d7
-    2, 2, 2, 2, 2, 2, 2, 2,  # d8 - df
-    2, 2, 2, 2, 2, 2, 2, 2,  # e0 - e7
-    2, 2, 2, 2, 2, 2, 2, 2,  # e8 - ef
-    2, 2, 2, 2, 2, 2, 2, 2,  # f0 - f7
-    2, 2, 2, 2, 2, 2, 2, 0   # f8 - ff
-)
-
-EUCKR_ST = (
-    MachineState.ERROR,MachineState.START,     3,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#00-07
-    MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START #08-0f
-)
-# fmt: on
-
-EUCKR_CHAR_LEN_TABLE = (0, 1, 2, 0)
-
-EUCKR_SM_MODEL: CodingStateMachineDict = {
-    "class_table": EUCKR_CLS,
-    "class_factor": 4,
-    "state_table": EUCKR_ST,
-    "char_len_table": EUCKR_CHAR_LEN_TABLE,
-    "name": "EUC-KR",
-}
-
-# JOHAB
-# fmt: off
-JOHAB_CLS = (
-    4,4,4,4,4,4,4,4,  # 00 - 07
-    4,4,4,4,4,4,0,0,  # 08 - 0f
-    4,4,4,4,4,4,4,4,  # 10 - 17
-    4,4,4,0,4,4,4,4,  # 18 - 1f
-    4,4,4,4,4,4,4,4,  # 20 - 27
-    4,4,4,4,4,4,4,4,  # 28 - 2f
-    4,3,3,3,3,3,3,3,  # 30 - 37
-    3,3,3,3,3,3,3,3,  # 38 - 3f
-    3,1,1,1,1,1,1,1,  # 40 - 47
-    1,1,1,1,1,1,1,1,  # 48 - 4f
-    1,1,1,1,1,1,1,1,  # 50 - 57
-    1,1,1,1,1,1,1,1,  # 58 - 5f
-    1,1,1,1,1,1,1,1,  # 60 - 67
-    1,1,1,1,1,1,1,1,  # 68 - 6f
-    1,1,1,1,1,1,1,1,  # 70 - 77
-    1,1,1,1,1,1,1,2,  # 78 - 7f
-    6,6,6,6,8,8,8,8,  # 80 - 87
-    8,8,8,8,8,8,8,8,  # 88 - 8f
-    8,7,7,7,7,7,7,7,  # 90 - 97
-    7,7,7,7,7,7,7,7,  # 98 - 9f
-    7,7,7,7,7,7,7,7,  # a0 - a7
-    7,7,7,7,7,7,7,7,  # a8 - af
-    7,7,7,7,7,7,7,7,  # b0 - b7
-    7,7,7,7,7,7,7,7,  # b8 - bf
-    7,7,7,7,7,7,7,7,  # c0 - c7
-    7,7,7,7,7,7,7,7,  # c8 - cf
-    7,7,7,7,5,5,5,5,  # d0 - d7
-    5,9,9,9,9,9,9,5,  # d8 - df
-    9,9,9,9,9,9,9,9,  # e0 - e7
-    9,9,9,9,9,9,9,9,  # e8 - ef
-    9,9,9,9,9,9,9,9,  # f0 - f7
-    9,9,5,5,5,5,5,0   # f8 - ff
-)
-
-JOHAB_ST = (
-# cls = 0                   1                   2                   3                   4                   5                   6                   7                   8                   9
-    MachineState.ERROR ,MachineState.START ,MachineState.START ,MachineState.START ,MachineState.START ,MachineState.ERROR ,MachineState.ERROR ,3                  ,3                  ,4                  ,  # MachineState.START
-    MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,  # MachineState.ITS_ME
-    MachineState.ERROR ,MachineState.ERROR ,MachineState.ERROR ,MachineState.ERROR ,MachineState.ERROR ,MachineState.ERROR ,MachineState.ERROR ,MachineState.ERROR ,MachineState.ERROR ,MachineState.ERROR ,  # MachineState.ERROR
-    MachineState.ERROR ,MachineState.START ,MachineState.START ,MachineState.ERROR ,MachineState.ERROR ,MachineState.START ,MachineState.START ,MachineState.START ,MachineState.START ,MachineState.START ,  # 3
-    MachineState.ERROR ,MachineState.START ,MachineState.ERROR ,MachineState.START ,MachineState.ERROR ,MachineState.START ,MachineState.ERROR ,MachineState.START ,MachineState.ERROR ,MachineState.START ,  # 4
-)
-# fmt: on
-
-JOHAB_CHAR_LEN_TABLE = (0, 1, 1, 1, 1, 0, 0, 2, 2, 2)
-
-JOHAB_SM_MODEL: CodingStateMachineDict = {
-    "class_table": JOHAB_CLS,
-    "class_factor": 10,
-    "state_table": JOHAB_ST,
-    "char_len_table": JOHAB_CHAR_LEN_TABLE,
-    "name": "Johab",
-}
-
-# EUC-TW
-# fmt: off
-EUCTW_CLS = (
-    2, 2, 2, 2, 2, 2, 2, 2,  # 00 - 07
-    2, 2, 2, 2, 2, 2, 0, 0,  # 08 - 0f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 10 - 17
-    2, 2, 2, 0, 2, 2, 2, 2,  # 18 - 1f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 20 - 27
-    2, 2, 2, 2, 2, 2, 2, 2,  # 28 - 2f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 30 - 37
-    2, 2, 2, 2, 2, 2, 2, 2,  # 38 - 3f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 40 - 47
-    2, 2, 2, 2, 2, 2, 2, 2,  # 48 - 4f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 50 - 57
-    2, 2, 2, 2, 2, 2, 2, 2,  # 58 - 5f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 60 - 67
-    2, 2, 2, 2, 2, 2, 2, 2,  # 68 - 6f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 70 - 77
-    2, 2, 2, 2, 2, 2, 2, 2,  # 78 - 7f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 80 - 87
-    0, 0, 0, 0, 0, 0, 6, 0,  # 88 - 8f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 90 - 97
-    0, 0, 0, 0, 0, 0, 0, 0,  # 98 - 9f
-    0, 3, 4, 4, 4, 4, 4, 4,  # a0 - a7
-    5, 5, 1, 1, 1, 1, 1, 1,  # a8 - af
-    1, 1, 1, 1, 1, 1, 1, 1,  # b0 - b7
-    1, 1, 1, 1, 1, 1, 1, 1,  # b8 - bf
-    1, 1, 3, 1, 3, 3, 3, 3,  # c0 - c7
-    3, 3, 3, 3, 3, 3, 3, 3,  # c8 - cf
-    3, 3, 3, 3, 3, 3, 3, 3,  # d0 - d7
-    3, 3, 3, 3, 3, 3, 3, 3,  # d8 - df
-    3, 3, 3, 3, 3, 3, 3, 3,  # e0 - e7
-    3, 3, 3, 3, 3, 3, 3, 3,  # e8 - ef
-    3, 3, 3, 3, 3, 3, 3, 3,  # f0 - f7
-    3, 3, 3, 3, 3, 3, 3, 0   # f8 - ff
-)
-
-EUCTW_ST = (
-    MachineState.ERROR,MachineState.ERROR,MachineState.START,     3,     3,     3,     4,MachineState.ERROR,#00-07
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ITS_ME,MachineState.ITS_ME,#08-0f
-    MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ERROR,MachineState.START,MachineState.ERROR,#10-17
-    MachineState.START,MachineState.START,MachineState.START,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#18-1f
-         5,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.ERROR,MachineState.START,MachineState.START,#20-27
-    MachineState.START,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START #28-2f
-)
-# fmt: on
-
-EUCTW_CHAR_LEN_TABLE = (0, 0, 1, 2, 2, 2, 3)
-
-EUCTW_SM_MODEL: CodingStateMachineDict = {
-    "class_table": EUCTW_CLS,
-    "class_factor": 7,
-    "state_table": EUCTW_ST,
-    "char_len_table": EUCTW_CHAR_LEN_TABLE,
-    "name": "x-euc-tw",
-}
-
-# GB2312
-# fmt: off
-GB2312_CLS = (
-    1, 1, 1, 1, 1, 1, 1, 1,  # 00 - 07
-    1, 1, 1, 1, 1, 1, 0, 0,  # 08 - 0f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 10 - 17
-    1, 1, 1, 0, 1, 1, 1, 1,  # 18 - 1f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 20 - 27
-    1, 1, 1, 1, 1, 1, 1, 1,  # 28 - 2f
-    3, 3, 3, 3, 3, 3, 3, 3,  # 30 - 37
-    3, 3, 1, 1, 1, 1, 1, 1,  # 38 - 3f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 40 - 47
-    2, 2, 2, 2, 2, 2, 2, 2,  # 48 - 4f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 50 - 57
-    2, 2, 2, 2, 2, 2, 2, 2,  # 58 - 5f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 60 - 67
-    2, 2, 2, 2, 2, 2, 2, 2,  # 68 - 6f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 70 - 77
-    2, 2, 2, 2, 2, 2, 2, 4,  # 78 - 7f
-    5, 6, 6, 6, 6, 6, 6, 6,  # 80 - 87
-    6, 6, 6, 6, 6, 6, 6, 6,  # 88 - 8f
-    6, 6, 6, 6, 6, 6, 6, 6,  # 90 - 97
-    6, 6, 6, 6, 6, 6, 6, 6,  # 98 - 9f
-    6, 6, 6, 6, 6, 6, 6, 6,  # a0 - a7
-    6, 6, 6, 6, 6, 6, 6, 6,  # a8 - af
-    6, 6, 6, 6, 6, 6, 6, 6,  # b0 - b7
-    6, 6, 6, 6, 6, 6, 6, 6,  # b8 - bf
-    6, 6, 6, 6, 6, 6, 6, 6,  # c0 - c7
-    6, 6, 6, 6, 6, 6, 6, 6,  # c8 - cf
-    6, 6, 6, 6, 6, 6, 6, 6,  # d0 - d7
-    6, 6, 6, 6, 6, 6, 6, 6,  # d8 - df
-    6, 6, 6, 6, 6, 6, 6, 6,  # e0 - e7
-    6, 6, 6, 6, 6, 6, 6, 6,  # e8 - ef
-    6, 6, 6, 6, 6, 6, 6, 6,  # f0 - f7
-    6, 6, 6, 6, 6, 6, 6, 0   # f8 - ff
-)
-
-GB2312_ST = (
-    MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,     3,MachineState.ERROR,#00-07
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ITS_ME,MachineState.ITS_ME,#08-0f
-    MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ERROR,MachineState.ERROR,MachineState.START,#10-17
-         4,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#18-1f
-    MachineState.ERROR,MachineState.ERROR,     5,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ITS_ME,MachineState.ERROR,#20-27
-    MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.START #28-2f
-)
-# fmt: on
-
-# To be accurate, the length of class 6 can be either 2 or 4.
-# But it is not necessary to discriminate between the two since
-# it is used for frequency analysis only, and we are validating
-# each code range there as well. So it is safe to set it to be
-# 2 here.
-GB2312_CHAR_LEN_TABLE = (0, 1, 1, 1, 1, 1, 2)
-
-GB2312_SM_MODEL: CodingStateMachineDict = {
-    "class_table": GB2312_CLS,
-    "class_factor": 7,
-    "state_table": GB2312_ST,
-    "char_len_table": GB2312_CHAR_LEN_TABLE,
-    "name": "GB2312",
-}
-
-# Shift_JIS
-# fmt: off
-SJIS_CLS = (
-    1, 1, 1, 1, 1, 1, 1, 1,  # 00 - 07
-    1, 1, 1, 1, 1, 1, 0, 0,  # 08 - 0f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 10 - 17
-    1, 1, 1, 0, 1, 1, 1, 1,  # 18 - 1f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 20 - 27
-    1, 1, 1, 1, 1, 1, 1, 1,  # 28 - 2f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 30 - 37
-    1, 1, 1, 1, 1, 1, 1, 1,  # 38 - 3f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 40 - 47
-    2, 2, 2, 2, 2, 2, 2, 2,  # 48 - 4f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 50 - 57
-    2, 2, 2, 2, 2, 2, 2, 2,  # 58 - 5f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 60 - 67
-    2, 2, 2, 2, 2, 2, 2, 2,  # 68 - 6f
-    2, 2, 2, 2, 2, 2, 2, 2,  # 70 - 77
-    2, 2, 2, 2, 2, 2, 2, 1,  # 78 - 7f
-    3, 3, 3, 3, 3, 2, 2, 3,  # 80 - 87
-    3, 3, 3, 3, 3, 3, 3, 3,  # 88 - 8f
-    3, 3, 3, 3, 3, 3, 3, 3,  # 90 - 97
-    3, 3, 3, 3, 3, 3, 3, 3,  # 98 - 9f
-    #0xa0 is illegal in sjis encoding, but some pages does
-    #contain such byte. We need to be more error forgiven.
-    2, 2, 2, 2, 2, 2, 2, 2,  # a0 - a7
-    2, 2, 2, 2, 2, 2, 2, 2,  # a8 - af
-    2, 2, 2, 2, 2, 2, 2, 2,  # b0 - b7
-    2, 2, 2, 2, 2, 2, 2, 2,  # b8 - bf
-    2, 2, 2, 2, 2, 2, 2, 2,  # c0 - c7
-    2, 2, 2, 2, 2, 2, 2, 2,  # c8 - cf
-    2, 2, 2, 2, 2, 2, 2, 2,  # d0 - d7
-    2, 2, 2, 2, 2, 2, 2, 2,  # d8 - df
-    3, 3, 3, 3, 3, 3, 3, 3,  # e0 - e7
-    3, 3, 3, 3, 3, 4, 4, 4,  # e8 - ef
-    3, 3, 3, 3, 3, 3, 3, 3,  # f0 - f7
-    3, 3, 3, 3, 3, 0, 0, 0,  # f8 - ff
-)
-
-SJIS_ST = (
-    MachineState.ERROR,MachineState.START,MachineState.START,     3,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#00-07
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,#08-0f
-    MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START #10-17
-)
-# fmt: on
-
-SJIS_CHAR_LEN_TABLE = (0, 1, 1, 2, 0, 0)
-
-SJIS_SM_MODEL: CodingStateMachineDict = {
-    "class_table": SJIS_CLS,
-    "class_factor": 6,
-    "state_table": SJIS_ST,
-    "char_len_table": SJIS_CHAR_LEN_TABLE,
-    "name": "Shift_JIS",
-}
-
-# UCS2-BE
-# fmt: off
-UCS2BE_CLS = (
-    0, 0, 0, 0, 0, 0, 0, 0,  # 00 - 07
-    0, 0, 1, 0, 0, 2, 0, 0,  # 08 - 0f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 10 - 17
-    0, 0, 0, 3, 0, 0, 0, 0,  # 18 - 1f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 20 - 27
-    0, 3, 3, 3, 3, 3, 0, 0,  # 28 - 2f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 30 - 37
-    0, 0, 0, 0, 0, 0, 0, 0,  # 38 - 3f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 40 - 47
-    0, 0, 0, 0, 0, 0, 0, 0,  # 48 - 4f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 50 - 57
-    0, 0, 0, 0, 0, 0, 0, 0,  # 58 - 5f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 60 - 67
-    0, 0, 0, 0, 0, 0, 0, 0,  # 68 - 6f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 70 - 77
-    0, 0, 0, 0, 0, 0, 0, 0,  # 78 - 7f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 80 - 87
-    0, 0, 0, 0, 0, 0, 0, 0,  # 88 - 8f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 90 - 97
-    0, 0, 0, 0, 0, 0, 0, 0,  # 98 - 9f
-    0, 0, 0, 0, 0, 0, 0, 0,  # a0 - a7
-    0, 0, 0, 0, 0, 0, 0, 0,  # a8 - af
-    0, 0, 0, 0, 0, 0, 0, 0,  # b0 - b7
-    0, 0, 0, 0, 0, 0, 0, 0,  # b8 - bf
-    0, 0, 0, 0, 0, 0, 0, 0,  # c0 - c7
-    0, 0, 0, 0, 0, 0, 0, 0,  # c8 - cf
-    0, 0, 0, 0, 0, 0, 0, 0,  # d0 - d7
-    0, 0, 0, 0, 0, 0, 0, 0,  # d8 - df
-    0, 0, 0, 0, 0, 0, 0, 0,  # e0 - e7
-    0, 0, 0, 0, 0, 0, 0, 0,  # e8 - ef
-    0, 0, 0, 0, 0, 0, 0, 0,  # f0 - f7
-    0, 0, 0, 0, 0, 0, 4, 5   # f8 - ff
-)
-
-UCS2BE_ST  = (
-          5,     7,     7,MachineState.ERROR,     4,     3,MachineState.ERROR,MachineState.ERROR,#00-07
-     MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,#08-0f
-     MachineState.ITS_ME,MachineState.ITS_ME,     6,     6,     6,     6,MachineState.ERROR,MachineState.ERROR,#10-17
-          6,     6,     6,     6,     6,MachineState.ITS_ME,     6,     6,#18-1f
-          6,     6,     6,     6,     5,     7,     7,MachineState.ERROR,#20-27
-          5,     8,     6,     6,MachineState.ERROR,     6,     6,     6,#28-2f
-          6,     6,     6,     6,MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START #30-37
-)
-# fmt: on
-
-UCS2BE_CHAR_LEN_TABLE = (2, 2, 2, 0, 2, 2)
-
-UCS2BE_SM_MODEL: CodingStateMachineDict = {
-    "class_table": UCS2BE_CLS,
-    "class_factor": 6,
-    "state_table": UCS2BE_ST,
-    "char_len_table": UCS2BE_CHAR_LEN_TABLE,
-    "name": "UTF-16BE",
-}
-
-# UCS2-LE
-# fmt: off
-UCS2LE_CLS = (
-    0, 0, 0, 0, 0, 0, 0, 0,  # 00 - 07
-    0, 0, 1, 0, 0, 2, 0, 0,  # 08 - 0f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 10 - 17
-    0, 0, 0, 3, 0, 0, 0, 0,  # 18 - 1f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 20 - 27
-    0, 3, 3, 3, 3, 3, 0, 0,  # 28 - 2f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 30 - 37
-    0, 0, 0, 0, 0, 0, 0, 0,  # 38 - 3f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 40 - 47
-    0, 0, 0, 0, 0, 0, 0, 0,  # 48 - 4f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 50 - 57
-    0, 0, 0, 0, 0, 0, 0, 0,  # 58 - 5f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 60 - 67
-    0, 0, 0, 0, 0, 0, 0, 0,  # 68 - 6f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 70 - 77
-    0, 0, 0, 0, 0, 0, 0, 0,  # 78 - 7f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 80 - 87
-    0, 0, 0, 0, 0, 0, 0, 0,  # 88 - 8f
-    0, 0, 0, 0, 0, 0, 0, 0,  # 90 - 97
-    0, 0, 0, 0, 0, 0, 0, 0,  # 98 - 9f
-    0, 0, 0, 0, 0, 0, 0, 0,  # a0 - a7
-    0, 0, 0, 0, 0, 0, 0, 0,  # a8 - af
-    0, 0, 0, 0, 0, 0, 0, 0,  # b0 - b7
-    0, 0, 0, 0, 0, 0, 0, 0,  # b8 - bf
-    0, 0, 0, 0, 0, 0, 0, 0,  # c0 - c7
-    0, 0, 0, 0, 0, 0, 0, 0,  # c8 - cf
-    0, 0, 0, 0, 0, 0, 0, 0,  # d0 - d7
-    0, 0, 0, 0, 0, 0, 0, 0,  # d8 - df
-    0, 0, 0, 0, 0, 0, 0, 0,  # e0 - e7
-    0, 0, 0, 0, 0, 0, 0, 0,  # e8 - ef
-    0, 0, 0, 0, 0, 0, 0, 0,  # f0 - f7
-    0, 0, 0, 0, 0, 0, 4, 5   # f8 - ff
-)
-
-UCS2LE_ST = (
-          6,     6,     7,     6,     4,     3,MachineState.ERROR,MachineState.ERROR,#00-07
-     MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,#08-0f
-     MachineState.ITS_ME,MachineState.ITS_ME,     5,     5,     5,MachineState.ERROR,MachineState.ITS_ME,MachineState.ERROR,#10-17
-          5,     5,     5,MachineState.ERROR,     5,MachineState.ERROR,     6,     6,#18-1f
-          7,     6,     8,     8,     5,     5,     5,MachineState.ERROR,#20-27
-          5,     5,     5,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,     5,     5,#28-2f
-          5,     5,     5,MachineState.ERROR,     5,MachineState.ERROR,MachineState.START,MachineState.START #30-37
-)
-# fmt: on
-
-UCS2LE_CHAR_LEN_TABLE = (2, 2, 2, 2, 2, 2)
-
-UCS2LE_SM_MODEL: CodingStateMachineDict = {
-    "class_table": UCS2LE_CLS,
-    "class_factor": 6,
-    "state_table": UCS2LE_ST,
-    "char_len_table": UCS2LE_CHAR_LEN_TABLE,
-    "name": "UTF-16LE",
-}
-
-# UTF-8
-# fmt: off
-UTF8_CLS = (
-    1, 1, 1, 1, 1, 1, 1, 1,  # 00 - 07  #allow 0x00 as a legal value
-    1, 1, 1, 1, 1, 1, 0, 0,  # 08 - 0f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 10 - 17
-    1, 1, 1, 0, 1, 1, 1, 1,  # 18 - 1f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 20 - 27
-    1, 1, 1, 1, 1, 1, 1, 1,  # 28 - 2f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 30 - 37
-    1, 1, 1, 1, 1, 1, 1, 1,  # 38 - 3f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 40 - 47
-    1, 1, 1, 1, 1, 1, 1, 1,  # 48 - 4f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 50 - 57
-    1, 1, 1, 1, 1, 1, 1, 1,  # 58 - 5f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 60 - 67
-    1, 1, 1, 1, 1, 1, 1, 1,  # 68 - 6f
-    1, 1, 1, 1, 1, 1, 1, 1,  # 70 - 77
-    1, 1, 1, 1, 1, 1, 1, 1,  # 78 - 7f
-    2, 2, 2, 2, 3, 3, 3, 3,  # 80 - 87
-    4, 4, 4, 4, 4, 4, 4, 4,  # 88 - 8f
-    4, 4, 4, 4, 4, 4, 4, 4,  # 90 - 97
-    4, 4, 4, 4, 4, 4, 4, 4,  # 98 - 9f
-    5, 5, 5, 5, 5, 5, 5, 5,  # a0 - a7
-    5, 5, 5, 5, 5, 5, 5, 5,  # a8 - af
-    5, 5, 5, 5, 5, 5, 5, 5,  # b0 - b7
-    5, 5, 5, 5, 5, 5, 5, 5,  # b8 - bf
-    0, 0, 6, 6, 6, 6, 6, 6,  # c0 - c7
-    6, 6, 6, 6, 6, 6, 6, 6,  # c8 - cf
-    6, 6, 6, 6, 6, 6, 6, 6,  # d0 - d7
-    6, 6, 6, 6, 6, 6, 6, 6,  # d8 - df
-    7, 8, 8, 8, 8, 8, 8, 8,  # e0 - e7
-    8, 8, 8, 8, 8, 9, 8, 8,  # e8 - ef
-    10, 11, 11, 11, 11, 11, 11, 11,  # f0 - f7
-    12, 13, 13, 13, 14, 15, 0, 0    # f8 - ff
-)
-
-UTF8_ST = (
-    MachineState.ERROR,MachineState.START,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,     12,   10,#00-07
-         9,     11,     8,     7,     6,     5,     4,    3,#08-0f
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#10-17
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#18-1f
-    MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,#20-27
-    MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,MachineState.ITS_ME,#28-2f
-    MachineState.ERROR,MachineState.ERROR,     5,     5,     5,     5,MachineState.ERROR,MachineState.ERROR,#30-37
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#38-3f
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,     5,     5,     5,MachineState.ERROR,MachineState.ERROR,#40-47
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#48-4f
-    MachineState.ERROR,MachineState.ERROR,     7,     7,     7,     7,MachineState.ERROR,MachineState.ERROR,#50-57
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#58-5f
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,     7,     7,MachineState.ERROR,MachineState.ERROR,#60-67
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#68-6f
-    MachineState.ERROR,MachineState.ERROR,     9,     9,     9,     9,MachineState.ERROR,MachineState.ERROR,#70-77
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#78-7f
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,     9,MachineState.ERROR,MachineState.ERROR,#80-87
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#88-8f
-    MachineState.ERROR,MachineState.ERROR,    12,    12,    12,    12,MachineState.ERROR,MachineState.ERROR,#90-97
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#98-9f
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,    12,MachineState.ERROR,MachineState.ERROR,#a0-a7
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#a8-af
-    MachineState.ERROR,MachineState.ERROR,    12,    12,    12,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#b0-b7
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,#b8-bf
-    MachineState.ERROR,MachineState.ERROR,MachineState.START,MachineState.START,MachineState.START,MachineState.START,MachineState.ERROR,MachineState.ERROR,#c0-c7
-    MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR,MachineState.ERROR #c8-cf
-)
-# fmt: on
-
-UTF8_CHAR_LEN_TABLE = (0, 1, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5, 5, 6, 6)
-
-UTF8_SM_MODEL: CodingStateMachineDict = {
-    "class_table": UTF8_CLS,
-    "class_factor": 16,
-    "state_table": UTF8_ST,
-    "char_len_table": UTF8_CHAR_LEN_TABLE,
-    "name": "UTF-8",
-}
diff --git a/src/pip/_vendor/chardet/metadata/__init__.py b/src/pip/_vendor/chardet/metadata/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/pip/_vendor/chardet/metadata/languages.py b/src/pip/_vendor/chardet/metadata/languages.py
deleted file mode 100644
index eb40c5f0c85..00000000000
--- a/src/pip/_vendor/chardet/metadata/languages.py
+++ /dev/null
@@ -1,352 +0,0 @@
-"""
-Metadata about languages used by our model training code for our
-SingleByteCharSetProbers.  Could be used for other things in the future.
-
-This code is based on the language metadata from the uchardet project.
-"""
-
-from string import ascii_letters
-from typing import List, Optional
-
-# TODO: Add Ukrainian (KOI8-U)
-
-
-class Language:
-    """Metadata about a language useful for training models
-
-    :ivar name: The human name for the language, in English.
-    :type name: str
-    :ivar iso_code: 2-letter ISO 639-1 if possible, 3-letter ISO code otherwise,
-                    or use another catalog as a last resort.
-    :type iso_code: str
-    :ivar use_ascii: Whether or not ASCII letters should be included in trained
-                     models.
-    :type use_ascii: bool
-    :ivar charsets: The charsets we want to support and create data for.
-    :type charsets: list of str
-    :ivar alphabet: The characters in the language's alphabet. If `use_ascii` is
-                    `True`, you only need to add those not in the ASCII set.
-    :type alphabet: str
-    :ivar wiki_start_pages: The Wikipedia pages to start from if we're crawling
-                            Wikipedia for training data.
-    :type wiki_start_pages: list of str
-    """
-
-    def __init__(
-        self,
-        name: Optional[str] = None,
-        iso_code: Optional[str] = None,
-        use_ascii: bool = True,
-        charsets: Optional[List[str]] = None,
-        alphabet: Optional[str] = None,
-        wiki_start_pages: Optional[List[str]] = None,
-    ) -> None:
-        super().__init__()
-        self.name = name
-        self.iso_code = iso_code
-        self.use_ascii = use_ascii
-        self.charsets = charsets
-        if self.use_ascii:
-            if alphabet:
-                alphabet += ascii_letters
-            else:
-                alphabet = ascii_letters
-        elif not alphabet:
-            raise ValueError("Must supply alphabet if use_ascii is False")
-        self.alphabet = "".join(sorted(set(alphabet))) if alphabet else None
-        self.wiki_start_pages = wiki_start_pages
-
-    def __repr__(self) -> str:
-        param_str = ", ".join(
-            f"{k}={v!r}" for k, v in self.__dict__.items() if not k.startswith("_")
-        )
-        return f"{self.__class__.__name__}({param_str})"
-
-
-LANGUAGES = {
-    "Arabic": Language(
-        name="Arabic",
-        iso_code="ar",
-        use_ascii=False,
-        # We only support encodings that use isolated
-        # forms, because the current recommendation is
-        # that the rendering system handles presentation
-        # forms. This means we purposefully skip IBM864.
-        charsets=["ISO-8859-6", "WINDOWS-1256", "CP720", "CP864"],
-        alphabet="ءآأؤإئابةتثجحخدذرزسشصضطظعغػؼؽؾؿـفقكلمنهوىيًٌٍَُِّ",
-        wiki_start_pages=["الصفحة_الرئيسية"],
-    ),
-    "Belarusian": Language(
-        name="Belarusian",
-        iso_code="be",
-        use_ascii=False,
-        charsets=["ISO-8859-5", "WINDOWS-1251", "IBM866", "MacCyrillic"],
-        alphabet="АБВГДЕЁЖЗІЙКЛМНОПРСТУЎФХЦЧШЫЬЭЮЯабвгдеёжзійклмнопрстуўфхцчшыьэюяʼ",
-        wiki_start_pages=["Галоўная_старонка"],
-    ),
-    "Bulgarian": Language(
-        name="Bulgarian",
-        iso_code="bg",
-        use_ascii=False,
-        charsets=["ISO-8859-5", "WINDOWS-1251", "IBM855"],
-        alphabet="АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЬЮЯабвгдежзийклмнопрстуфхцчшщъьюя",
-        wiki_start_pages=["Начална_страница"],
-    ),
-    "Czech": Language(
-        name="Czech",
-        iso_code="cz",
-        use_ascii=True,
-        charsets=["ISO-8859-2", "WINDOWS-1250"],
-        alphabet="áčďéěíňóřšťúůýžÁČĎÉĚÍŇÓŘŠŤÚŮÝŽ",
-        wiki_start_pages=["Hlavní_strana"],
-    ),
-    "Danish": Language(
-        name="Danish",
-        iso_code="da",
-        use_ascii=True,
-        charsets=["ISO-8859-1", "ISO-8859-15", "WINDOWS-1252", "MacRoman"],
-        alphabet="æøåÆØÅ",
-        wiki_start_pages=["Forside"],
-    ),
-    "German": Language(
-        name="German",
-        iso_code="de",
-        use_ascii=True,
-        charsets=["ISO-8859-1", "ISO-8859-15", "WINDOWS-1252", "MacRoman"],
-        alphabet="äöüßẞÄÖÜ",
-        wiki_start_pages=["Wikipedia:Hauptseite"],
-    ),
-    "Greek": Language(
-        name="Greek",
-        iso_code="el",
-        use_ascii=False,
-        charsets=["ISO-8859-7", "WINDOWS-1253"],
-        alphabet="αβγδεζηθικλμνξοπρσςτυφχψωάέήίόύώΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΣΤΥΦΧΨΩΆΈΉΊΌΎΏ",
-        wiki_start_pages=["Πύλη:Κύρια"],
-    ),
-    "English": Language(
-        name="English",
-        iso_code="en",
-        use_ascii=True,
-        charsets=["ISO-8859-1", "WINDOWS-1252", "MacRoman"],
-        wiki_start_pages=["Main_Page"],
-    ),
-    "Esperanto": Language(
-        name="Esperanto",
-        iso_code="eo",
-        # Q, W, X, and Y not used at all
-        use_ascii=False,
-        charsets=["ISO-8859-3"],
-        alphabet="abcĉdefgĝhĥijĵklmnoprsŝtuŭvzABCĈDEFGĜHĤIJĴKLMNOPRSŜTUŬVZ",
-        wiki_start_pages=["Vikipedio:Ĉefpaĝo"],
-    ),
-    "Spanish": Language(
-        name="Spanish",
-        iso_code="es",
-        use_ascii=True,
-        charsets=["ISO-8859-1", "ISO-8859-15", "WINDOWS-1252", "MacRoman"],
-        alphabet="ñáéíóúüÑÁÉÍÓÚÜ",
-        wiki_start_pages=["Wikipedia:Portada"],
-    ),
-    "Estonian": Language(
-        name="Estonian",
-        iso_code="et",
-        use_ascii=False,
-        charsets=["ISO-8859-4", "ISO-8859-13", "WINDOWS-1257"],
-        # C, F, Š, Q, W, X, Y, Z, Ž are only for
-        # loanwords
-        alphabet="ABDEGHIJKLMNOPRSTUVÕÄÖÜabdeghijklmnoprstuvõäöü",
-        wiki_start_pages=["Esileht"],
-    ),
-    "Finnish": Language(
-        name="Finnish",
-        iso_code="fi",
-        use_ascii=True,
-        charsets=["ISO-8859-1", "ISO-8859-15", "WINDOWS-1252", "MacRoman"],
-        alphabet="ÅÄÖŠŽåäöšž",
-        wiki_start_pages=["Wikipedia:Etusivu"],
-    ),
-    "French": Language(
-        name="French",
-        iso_code="fr",
-        use_ascii=True,
-        charsets=["ISO-8859-1", "ISO-8859-15", "WINDOWS-1252", "MacRoman"],
-        alphabet="œàâçèéîïùûêŒÀÂÇÈÉÎÏÙÛÊ",
-        wiki_start_pages=["Wikipédia:Accueil_principal", "Bœuf (animal)"],
-    ),
-    "Hebrew": Language(
-        name="Hebrew",
-        iso_code="he",
-        use_ascii=False,
-        charsets=["ISO-8859-8", "WINDOWS-1255"],
-        alphabet="אבגדהוזחטיךכלםמןנסעףפץצקרשתװױײ",
-        wiki_start_pages=["עמוד_ראשי"],
-    ),
-    "Croatian": Language(
-        name="Croatian",
-        iso_code="hr",
-        # Q, W, X, Y are only used for foreign words.
-        use_ascii=False,
-        charsets=["ISO-8859-2", "WINDOWS-1250"],
-        alphabet="abcčćdđefghijklmnoprsštuvzžABCČĆDĐEFGHIJKLMNOPRSŠTUVZŽ",
-        wiki_start_pages=["Glavna_stranica"],
-    ),
-    "Hungarian": Language(
-        name="Hungarian",
-        iso_code="hu",
-        # Q, W, X, Y are only used for foreign words.
-        use_ascii=False,
-        charsets=["ISO-8859-2", "WINDOWS-1250"],
-        alphabet="abcdefghijklmnoprstuvzáéíóöőúüűABCDEFGHIJKLMNOPRSTUVZÁÉÍÓÖŐÚÜŰ",
-        wiki_start_pages=["Kezdőlap"],
-    ),
-    "Italian": Language(
-        name="Italian",
-        iso_code="it",
-        use_ascii=True,
-        charsets=["ISO-8859-1", "ISO-8859-15", "WINDOWS-1252", "MacRoman"],
-        alphabet="ÀÈÉÌÒÓÙàèéìòóù",
-        wiki_start_pages=["Pagina_principale"],
-    ),
-    "Lithuanian": Language(
-        name="Lithuanian",
-        iso_code="lt",
-        use_ascii=False,
-        charsets=["ISO-8859-13", "WINDOWS-1257", "ISO-8859-4"],
-        # Q, W, and X not used at all
-        alphabet="AĄBCČDEĘĖFGHIĮYJKLMNOPRSŠTUŲŪVZŽaąbcčdeęėfghiįyjklmnoprsštuųūvzž",
-        wiki_start_pages=["Pagrindinis_puslapis"],
-    ),
-    "Latvian": Language(
-        name="Latvian",
-        iso_code="lv",
-        use_ascii=False,
-        charsets=["ISO-8859-13", "WINDOWS-1257", "ISO-8859-4"],
-        # Q, W, X, Y are only for loanwords
-        alphabet="AĀBCČDEĒFGĢHIĪJKĶLĻMNŅOPRSŠTUŪVZŽaābcčdeēfgģhiījkķlļmnņoprsštuūvzž",
-        wiki_start_pages=["Sākumlapa"],
-    ),
-    "Macedonian": Language(
-        name="Macedonian",
-        iso_code="mk",
-        use_ascii=False,
-        charsets=["ISO-8859-5", "WINDOWS-1251", "MacCyrillic", "IBM855"],
-        alphabet="АБВГДЃЕЖЗЅИЈКЛЉМНЊОПРСТЌУФХЦЧЏШабвгдѓежзѕијклљмнњопрстќуфхцчџш",
-        wiki_start_pages=["Главна_страница"],
-    ),
-    "Dutch": Language(
-        name="Dutch",
-        iso_code="nl",
-        use_ascii=True,
-        charsets=["ISO-8859-1", "WINDOWS-1252", "MacRoman"],
-        wiki_start_pages=["Hoofdpagina"],
-    ),
-    "Polish": Language(
-        name="Polish",
-        iso_code="pl",
-        # Q and X are only used for foreign words.
-        use_ascii=False,
-        charsets=["ISO-8859-2", "WINDOWS-1250"],
-        alphabet="AĄBCĆDEĘFGHIJKLŁMNŃOÓPRSŚTUWYZŹŻaąbcćdeęfghijklłmnńoóprsśtuwyzźż",
-        wiki_start_pages=["Wikipedia:Strona_główna"],
-    ),
-    "Portuguese": Language(
-        name="Portuguese",
-        iso_code="pt",
-        use_ascii=True,
-        charsets=["ISO-8859-1", "ISO-8859-15", "WINDOWS-1252", "MacRoman"],
-        alphabet="ÁÂÃÀÇÉÊÍÓÔÕÚáâãàçéêíóôõú",
-        wiki_start_pages=["Wikipédia:Página_principal"],
-    ),
-    "Romanian": Language(
-        name="Romanian",
-        iso_code="ro",
-        use_ascii=True,
-        charsets=["ISO-8859-2", "WINDOWS-1250"],
-        alphabet="ăâîșțĂÂÎȘȚ",
-        wiki_start_pages=["Pagina_principală"],
-    ),
-    "Russian": Language(
-        name="Russian",
-        iso_code="ru",
-        use_ascii=False,
-        charsets=[
-            "ISO-8859-5",
-            "WINDOWS-1251",
-            "KOI8-R",
-            "MacCyrillic",
-            "IBM866",
-            "IBM855",
-        ],
-        alphabet="абвгдеёжзийклмнопрстуфхцчшщъыьэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ",
-        wiki_start_pages=["Заглавная_страница"],
-    ),
-    "Slovak": Language(
-        name="Slovak",
-        iso_code="sk",
-        use_ascii=True,
-        charsets=["ISO-8859-2", "WINDOWS-1250"],
-        alphabet="áäčďéíĺľňóôŕšťúýžÁÄČĎÉÍĹĽŇÓÔŔŠŤÚÝŽ",
-        wiki_start_pages=["Hlavná_stránka"],
-    ),
-    "Slovene": Language(
-        name="Slovene",
-        iso_code="sl",
-        # Q, W, X, Y are only used for foreign words.
-        use_ascii=False,
-        charsets=["ISO-8859-2", "WINDOWS-1250"],
-        alphabet="abcčdefghijklmnoprsštuvzžABCČDEFGHIJKLMNOPRSŠTUVZŽ",
-        wiki_start_pages=["Glavna_stran"],
-    ),
-    # Serbian can be written in both Latin and Cyrillic, but there's no
-    # simple way to get the Latin alphabet pages from Wikipedia through
-    # the API, so for now we just support Cyrillic.
-    "Serbian": Language(
-        name="Serbian",
-        iso_code="sr",
-        alphabet="АБВГДЂЕЖЗИЈКЛЉМНЊОПРСТЋУФХЦЧЏШабвгдђежзијклљмнњопрстћуфхцчџш",
-        charsets=["ISO-8859-5", "WINDOWS-1251", "MacCyrillic", "IBM855"],
-        wiki_start_pages=["Главна_страна"],
-    ),
-    "Thai": Language(
-        name="Thai",
-        iso_code="th",
-        use_ascii=False,
-        charsets=["ISO-8859-11", "TIS-620", "CP874"],
-        alphabet="กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛",
-        wiki_start_pages=["หน้าหลัก"],
-    ),
-    "Turkish": Language(
-        name="Turkish",
-        iso_code="tr",
-        # Q, W, and X are not used by Turkish
-        use_ascii=False,
-        charsets=["ISO-8859-3", "ISO-8859-9", "WINDOWS-1254"],
-        alphabet="abcçdefgğhıijklmnoöprsştuüvyzâîûABCÇDEFGĞHIİJKLMNOÖPRSŞTUÜVYZÂÎÛ",
-        wiki_start_pages=["Ana_Sayfa"],
-    ),
-    "Vietnamese": Language(
-        name="Vietnamese",
-        iso_code="vi",
-        use_ascii=False,
-        # Windows-1258 is the only common 8-bit
-        # Vietnamese encoding supported by Python.
-        # From Wikipedia:
-        # For systems that lack support for Unicode,
-        # dozens of 8-bit Vietnamese code pages are
-        # available.[1] The most common are VISCII
-        # (TCVN 5712:1993), VPS, and Windows-1258.[3]
-        # Where ASCII is required, such as when
-        # ensuring readability in plain text e-mail,
-        # Vietnamese letters are often encoded
-        # according to Vietnamese Quoted-Readable
-        # (VIQR) or VSCII Mnemonic (VSCII-MNEM),[4]
-        # though usage of either variable-width
-        # scheme has declined dramatically following
-        # the adoption of Unicode on the World Wide
-        # Web.
-        charsets=["WINDOWS-1258"],
-        alphabet="aăâbcdđeêghiklmnoôơpqrstuưvxyAĂÂBCDĐEÊGHIKLMNOÔƠPQRSTUƯVXY",
-        wiki_start_pages=["Chữ_Quốc_ngữ"],
-    ),
-}
diff --git a/src/pip/_vendor/chardet/resultdict.py b/src/pip/_vendor/chardet/resultdict.py
deleted file mode 100644
index 7d36e64c467..00000000000
--- a/src/pip/_vendor/chardet/resultdict.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from typing import TYPE_CHECKING, Optional
-
-if TYPE_CHECKING:
-    # TypedDict was introduced in Python 3.8.
-    #
-    # TODO: Remove the else block and TYPE_CHECKING check when dropping support
-    # for Python 3.7.
-    from typing import TypedDict
-
-    class ResultDict(TypedDict):
-        encoding: Optional[str]
-        confidence: float
-        language: Optional[str]
-
-else:
-    ResultDict = dict
diff --git a/src/pip/_vendor/chardet/sbcharsetprober.py b/src/pip/_vendor/chardet/sbcharsetprober.py
deleted file mode 100644
index 0ffbcdd2c3e..00000000000
--- a/src/pip/_vendor/chardet/sbcharsetprober.py
+++ /dev/null
@@ -1,162 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import Dict, List, NamedTuple, Optional, Union
-
-from .charsetprober import CharSetProber
-from .enums import CharacterCategory, ProbingState, SequenceLikelihood
-
-
-class SingleByteCharSetModel(NamedTuple):
-    charset_name: str
-    language: str
-    char_to_order_map: Dict[int, int]
-    language_model: Dict[int, Dict[int, int]]
-    typical_positive_ratio: float
-    keep_ascii_letters: bool
-    alphabet: str
-
-
-class SingleByteCharSetProber(CharSetProber):
-    SAMPLE_SIZE = 64
-    SB_ENOUGH_REL_THRESHOLD = 1024  # 0.25 * SAMPLE_SIZE^2
-    POSITIVE_SHORTCUT_THRESHOLD = 0.95
-    NEGATIVE_SHORTCUT_THRESHOLD = 0.05
-
-    def __init__(
-        self,
-        model: SingleByteCharSetModel,
-        is_reversed: bool = False,
-        name_prober: Optional[CharSetProber] = None,
-    ) -> None:
-        super().__init__()
-        self._model = model
-        # TRUE if we need to reverse every pair in the model lookup
-        self._reversed = is_reversed
-        # Optional auxiliary prober for name decision
-        self._name_prober = name_prober
-        self._last_order = 255
-        self._seq_counters: List[int] = []
-        self._total_seqs = 0
-        self._total_char = 0
-        self._control_char = 0
-        self._freq_char = 0
-        self.reset()
-
-    def reset(self) -> None:
-        super().reset()
-        # char order of last character
-        self._last_order = 255
-        self._seq_counters = [0] * SequenceLikelihood.get_num_categories()
-        self._total_seqs = 0
-        self._total_char = 0
-        self._control_char = 0
-        # characters that fall in our sampling range
-        self._freq_char = 0
-
-    @property
-    def charset_name(self) -> Optional[str]:
-        if self._name_prober:
-            return self._name_prober.charset_name
-        return self._model.charset_name
-
-    @property
-    def language(self) -> Optional[str]:
-        if self._name_prober:
-            return self._name_prober.language
-        return self._model.language
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        # TODO: Make filter_international_words keep things in self.alphabet
-        if not self._model.keep_ascii_letters:
-            byte_str = self.filter_international_words(byte_str)
-        else:
-            byte_str = self.remove_xml_tags(byte_str)
-        if not byte_str:
-            return self.state
-        char_to_order_map = self._model.char_to_order_map
-        language_model = self._model.language_model
-        for char in byte_str:
-            order = char_to_order_map.get(char, CharacterCategory.UNDEFINED)
-            # XXX: This was SYMBOL_CAT_ORDER before, with a value of 250, but
-            #      CharacterCategory.SYMBOL is actually 253, so we use CONTROL
-            #      to make it closer to the original intent. The only difference
-            #      is whether or not we count digits and control characters for
-            #      _total_char purposes.
-            if order < CharacterCategory.CONTROL:
-                self._total_char += 1
-            if order < self.SAMPLE_SIZE:
-                self._freq_char += 1
-                if self._last_order < self.SAMPLE_SIZE:
-                    self._total_seqs += 1
-                    if not self._reversed:
-                        lm_cat = language_model[self._last_order][order]
-                    else:
-                        lm_cat = language_model[order][self._last_order]
-                    self._seq_counters[lm_cat] += 1
-            self._last_order = order
-
-        charset_name = self._model.charset_name
-        if self.state == ProbingState.DETECTING:
-            if self._total_seqs > self.SB_ENOUGH_REL_THRESHOLD:
-                confidence = self.get_confidence()
-                if confidence > self.POSITIVE_SHORTCUT_THRESHOLD:
-                    self.logger.debug(
-                        "%s confidence = %s, we have a winner", charset_name, confidence
-                    )
-                    self._state = ProbingState.FOUND_IT
-                elif confidence < self.NEGATIVE_SHORTCUT_THRESHOLD:
-                    self.logger.debug(
-                        "%s confidence = %s, below negative shortcut threshold %s",
-                        charset_name,
-                        confidence,
-                        self.NEGATIVE_SHORTCUT_THRESHOLD,
-                    )
-                    self._state = ProbingState.NOT_ME
-
-        return self.state
-
-    def get_confidence(self) -> float:
-        r = 0.01
-        if self._total_seqs > 0:
-            r = (
-                (
-                    self._seq_counters[SequenceLikelihood.POSITIVE]
-                    + 0.25 * self._seq_counters[SequenceLikelihood.LIKELY]
-                )
-                / self._total_seqs
-                / self._model.typical_positive_ratio
-            )
-            # The more control characters (proportionnaly to the size
-            # of the text), the less confident we become in the current
-            # charset.
-            r = r * (self._total_char - self._control_char) / self._total_char
-            r = r * self._freq_char / self._total_char
-            if r >= 1.0:
-                r = 0.99
-        return r
diff --git a/src/pip/_vendor/chardet/sbcsgroupprober.py b/src/pip/_vendor/chardet/sbcsgroupprober.py
deleted file mode 100644
index 890ae8465c5..00000000000
--- a/src/pip/_vendor/chardet/sbcsgroupprober.py
+++ /dev/null
@@ -1,88 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from .charsetgroupprober import CharSetGroupProber
-from .hebrewprober import HebrewProber
-from .langbulgarianmodel import ISO_8859_5_BULGARIAN_MODEL, WINDOWS_1251_BULGARIAN_MODEL
-from .langgreekmodel import ISO_8859_7_GREEK_MODEL, WINDOWS_1253_GREEK_MODEL
-from .langhebrewmodel import WINDOWS_1255_HEBREW_MODEL
-
-# from .langhungarianmodel import (ISO_8859_2_HUNGARIAN_MODEL,
-#                                  WINDOWS_1250_HUNGARIAN_MODEL)
-from .langrussianmodel import (
-    IBM855_RUSSIAN_MODEL,
-    IBM866_RUSSIAN_MODEL,
-    ISO_8859_5_RUSSIAN_MODEL,
-    KOI8_R_RUSSIAN_MODEL,
-    MACCYRILLIC_RUSSIAN_MODEL,
-    WINDOWS_1251_RUSSIAN_MODEL,
-)
-from .langthaimodel import TIS_620_THAI_MODEL
-from .langturkishmodel import ISO_8859_9_TURKISH_MODEL
-from .sbcharsetprober import SingleByteCharSetProber
-
-
-class SBCSGroupProber(CharSetGroupProber):
-    def __init__(self) -> None:
-        super().__init__()
-        hebrew_prober = HebrewProber()
-        logical_hebrew_prober = SingleByteCharSetProber(
-            WINDOWS_1255_HEBREW_MODEL, is_reversed=False, name_prober=hebrew_prober
-        )
-        # TODO: See if using ISO-8859-8 Hebrew model works better here, since
-        #       it's actually the visual one
-        visual_hebrew_prober = SingleByteCharSetProber(
-            WINDOWS_1255_HEBREW_MODEL, is_reversed=True, name_prober=hebrew_prober
-        )
-        hebrew_prober.set_model_probers(logical_hebrew_prober, visual_hebrew_prober)
-        # TODO: ORDER MATTERS HERE. I changed the order vs what was in master
-        #       and several tests failed that did not before. Some thought
-        #       should be put into the ordering, and we should consider making
-        #       order not matter here, because that is very counter-intuitive.
-        self.probers = [
-            SingleByteCharSetProber(WINDOWS_1251_RUSSIAN_MODEL),
-            SingleByteCharSetProber(KOI8_R_RUSSIAN_MODEL),
-            SingleByteCharSetProber(ISO_8859_5_RUSSIAN_MODEL),
-            SingleByteCharSetProber(MACCYRILLIC_RUSSIAN_MODEL),
-            SingleByteCharSetProber(IBM866_RUSSIAN_MODEL),
-            SingleByteCharSetProber(IBM855_RUSSIAN_MODEL),
-            SingleByteCharSetProber(ISO_8859_7_GREEK_MODEL),
-            SingleByteCharSetProber(WINDOWS_1253_GREEK_MODEL),
-            SingleByteCharSetProber(ISO_8859_5_BULGARIAN_MODEL),
-            SingleByteCharSetProber(WINDOWS_1251_BULGARIAN_MODEL),
-            # TODO: Restore Hungarian encodings (iso-8859-2 and windows-1250)
-            #       after we retrain model.
-            # SingleByteCharSetProber(ISO_8859_2_HUNGARIAN_MODEL),
-            # SingleByteCharSetProber(WINDOWS_1250_HUNGARIAN_MODEL),
-            SingleByteCharSetProber(TIS_620_THAI_MODEL),
-            SingleByteCharSetProber(ISO_8859_9_TURKISH_MODEL),
-            hebrew_prober,
-            logical_hebrew_prober,
-            visual_hebrew_prober,
-        ]
-        self.reset()
diff --git a/src/pip/_vendor/chardet/sjisprober.py b/src/pip/_vendor/chardet/sjisprober.py
deleted file mode 100644
index 91df077961b..00000000000
--- a/src/pip/_vendor/chardet/sjisprober.py
+++ /dev/null
@@ -1,105 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import Union
-
-from .chardistribution import SJISDistributionAnalysis
-from .codingstatemachine import CodingStateMachine
-from .enums import MachineState, ProbingState
-from .jpcntx import SJISContextAnalysis
-from .mbcharsetprober import MultiByteCharSetProber
-from .mbcssm import SJIS_SM_MODEL
-
-
-class SJISProber(MultiByteCharSetProber):
-    def __init__(self) -> None:
-        super().__init__()
-        self.coding_sm = CodingStateMachine(SJIS_SM_MODEL)
-        self.distribution_analyzer = SJISDistributionAnalysis()
-        self.context_analyzer = SJISContextAnalysis()
-        self.reset()
-
-    def reset(self) -> None:
-        super().reset()
-        self.context_analyzer.reset()
-
-    @property
-    def charset_name(self) -> str:
-        return self.context_analyzer.charset_name
-
-    @property
-    def language(self) -> str:
-        return "Japanese"
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        assert self.coding_sm is not None
-        assert self.distribution_analyzer is not None
-
-        for i, byte in enumerate(byte_str):
-            coding_state = self.coding_sm.next_state(byte)
-            if coding_state == MachineState.ERROR:
-                self.logger.debug(
-                    "%s %s prober hit error at byte %s",
-                    self.charset_name,
-                    self.language,
-                    i,
-                )
-                self._state = ProbingState.NOT_ME
-                break
-            if coding_state == MachineState.ITS_ME:
-                self._state = ProbingState.FOUND_IT
-                break
-            if coding_state == MachineState.START:
-                char_len = self.coding_sm.get_current_charlen()
-                if i == 0:
-                    self._last_char[1] = byte
-                    self.context_analyzer.feed(
-                        self._last_char[2 - char_len :], char_len
-                    )
-                    self.distribution_analyzer.feed(self._last_char, char_len)
-                else:
-                    self.context_analyzer.feed(
-                        byte_str[i + 1 - char_len : i + 3 - char_len], char_len
-                    )
-                    self.distribution_analyzer.feed(byte_str[i - 1 : i + 1], char_len)
-
-        self._last_char[0] = byte_str[-1]
-
-        if self.state == ProbingState.DETECTING:
-            if self.context_analyzer.got_enough_data() and (
-                self.get_confidence() > self.SHORTCUT_THRESHOLD
-            ):
-                self._state = ProbingState.FOUND_IT
-
-        return self.state
-
-    def get_confidence(self) -> float:
-        assert self.distribution_analyzer is not None
-
-        context_conf = self.context_analyzer.get_confidence()
-        distrib_conf = self.distribution_analyzer.get_confidence()
-        return max(context_conf, distrib_conf)
diff --git a/src/pip/_vendor/chardet/universaldetector.py b/src/pip/_vendor/chardet/universaldetector.py
deleted file mode 100644
index 30c441dc28e..00000000000
--- a/src/pip/_vendor/chardet/universaldetector.py
+++ /dev/null
@@ -1,362 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#   Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-"""
-Module containing the UniversalDetector detector class, which is the primary
-class a user of ``chardet`` should use.
-
-:author: Mark Pilgrim (initial port to Python)
-:author: Shy Shalom (original C code)
-:author: Dan Blanchard (major refactoring for 3.0)
-:author: Ian Cordasco
-"""
-
-
-import codecs
-import logging
-import re
-from typing import List, Optional, Union
-
-from .charsetgroupprober import CharSetGroupProber
-from .charsetprober import CharSetProber
-from .enums import InputState, LanguageFilter, ProbingState
-from .escprober import EscCharSetProber
-from .latin1prober import Latin1Prober
-from .macromanprober import MacRomanProber
-from .mbcsgroupprober import MBCSGroupProber
-from .resultdict import ResultDict
-from .sbcsgroupprober import SBCSGroupProber
-from .utf1632prober import UTF1632Prober
-
-
-class UniversalDetector:
-    """
-    The ``UniversalDetector`` class underlies the ``chardet.detect`` function
-    and coordinates all of the different charset probers.
-
-    To get a ``dict`` containing an encoding and its confidence, you can simply
-    run:
-
-    .. code::
-
-            u = UniversalDetector()
-            u.feed(some_bytes)
-            u.close()
-            detected = u.result
-
-    """
-
-    MINIMUM_THRESHOLD = 0.20
-    HIGH_BYTE_DETECTOR = re.compile(b"[\x80-\xFF]")
-    ESC_DETECTOR = re.compile(b"(\033|~{)")
-    WIN_BYTE_DETECTOR = re.compile(b"[\x80-\x9F]")
-    ISO_WIN_MAP = {
-        "iso-8859-1": "Windows-1252",
-        "iso-8859-2": "Windows-1250",
-        "iso-8859-5": "Windows-1251",
-        "iso-8859-6": "Windows-1256",
-        "iso-8859-7": "Windows-1253",
-        "iso-8859-8": "Windows-1255",
-        "iso-8859-9": "Windows-1254",
-        "iso-8859-13": "Windows-1257",
-    }
-    # Based on https://encoding.spec.whatwg.org/#names-and-labels
-    # but altered to match Python names for encodings and remove mappings
-    # that break tests.
-    LEGACY_MAP = {
-        "ascii": "Windows-1252",
-        "iso-8859-1": "Windows-1252",
-        "tis-620": "ISO-8859-11",
-        "iso-8859-9": "Windows-1254",
-        "gb2312": "GB18030",
-        "euc-kr": "CP949",
-        "utf-16le": "UTF-16",
-    }
-
-    def __init__(
-        self,
-        lang_filter: LanguageFilter = LanguageFilter.ALL,
-        should_rename_legacy: bool = False,
-    ) -> None:
-        self._esc_charset_prober: Optional[EscCharSetProber] = None
-        self._utf1632_prober: Optional[UTF1632Prober] = None
-        self._charset_probers: List[CharSetProber] = []
-        self.result: ResultDict = {
-            "encoding": None,
-            "confidence": 0.0,
-            "language": None,
-        }
-        self.done = False
-        self._got_data = False
-        self._input_state = InputState.PURE_ASCII
-        self._last_char = b""
-        self.lang_filter = lang_filter
-        self.logger = logging.getLogger(__name__)
-        self._has_win_bytes = False
-        self.should_rename_legacy = should_rename_legacy
-        self.reset()
-
-    @property
-    def input_state(self) -> int:
-        return self._input_state
-
-    @property
-    def has_win_bytes(self) -> bool:
-        return self._has_win_bytes
-
-    @property
-    def charset_probers(self) -> List[CharSetProber]:
-        return self._charset_probers
-
-    def reset(self) -> None:
-        """
-        Reset the UniversalDetector and all of its probers back to their
-        initial states.  This is called by ``__init__``, so you only need to
-        call this directly in between analyses of different documents.
-        """
-        self.result = {"encoding": None, "confidence": 0.0, "language": None}
-        self.done = False
-        self._got_data = False
-        self._has_win_bytes = False
-        self._input_state = InputState.PURE_ASCII
-        self._last_char = b""
-        if self._esc_charset_prober:
-            self._esc_charset_prober.reset()
-        if self._utf1632_prober:
-            self._utf1632_prober.reset()
-        for prober in self._charset_probers:
-            prober.reset()
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> None:
-        """
-        Takes a chunk of a document and feeds it through all of the relevant
-        charset probers.
-
-        After calling ``feed``, you can check the value of the ``done``
-        attribute to see if you need to continue feeding the
-        ``UniversalDetector`` more data, or if it has made a prediction
-        (in the ``result`` attribute).
-
-        .. note::
-           You should always call ``close`` when you're done feeding in your
-           document if ``done`` is not already ``True``.
-        """
-        if self.done:
-            return
-
-        if not byte_str:
-            return
-
-        if not isinstance(byte_str, bytearray):
-            byte_str = bytearray(byte_str)
-
-        # First check for known BOMs, since these are guaranteed to be correct
-        if not self._got_data:
-            # If the data starts with BOM, we know it is UTF
-            if byte_str.startswith(codecs.BOM_UTF8):
-                # EF BB BF  UTF-8 with BOM
-                self.result = {
-                    "encoding": "UTF-8-SIG",
-                    "confidence": 1.0,
-                    "language": "",
-                }
-            elif byte_str.startswith((codecs.BOM_UTF32_LE, codecs.BOM_UTF32_BE)):
-                # FF FE 00 00  UTF-32, little-endian BOM
-                # 00 00 FE FF  UTF-32, big-endian BOM
-                self.result = {"encoding": "UTF-32", "confidence": 1.0, "language": ""}
-            elif byte_str.startswith(b"\xFE\xFF\x00\x00"):
-                # FE FF 00 00  UCS-4, unusual octet order BOM (3412)
-                self.result = {
-                    # TODO: This encoding is not supported by Python. Should remove?
-                    "encoding": "X-ISO-10646-UCS-4-3412",
-                    "confidence": 1.0,
-                    "language": "",
-                }
-            elif byte_str.startswith(b"\x00\x00\xFF\xFE"):
-                # 00 00 FF FE  UCS-4, unusual octet order BOM (2143)
-                self.result = {
-                    # TODO: This encoding is not supported by Python. Should remove?
-                    "encoding": "X-ISO-10646-UCS-4-2143",
-                    "confidence": 1.0,
-                    "language": "",
-                }
-            elif byte_str.startswith((codecs.BOM_LE, codecs.BOM_BE)):
-                # FF FE  UTF-16, little endian BOM
-                # FE FF  UTF-16, big endian BOM
-                self.result = {"encoding": "UTF-16", "confidence": 1.0, "language": ""}
-
-            self._got_data = True
-            if self.result["encoding"] is not None:
-                self.done = True
-                return
-
-        # If none of those matched and we've only see ASCII so far, check
-        # for high bytes and escape sequences
-        if self._input_state == InputState.PURE_ASCII:
-            if self.HIGH_BYTE_DETECTOR.search(byte_str):
-                self._input_state = InputState.HIGH_BYTE
-            elif (
-                self._input_state == InputState.PURE_ASCII
-                and self.ESC_DETECTOR.search(self._last_char + byte_str)
-            ):
-                self._input_state = InputState.ESC_ASCII
-
-        self._last_char = byte_str[-1:]
-
-        # next we will look to see if it is appears to be either a UTF-16 or
-        # UTF-32 encoding
-        if not self._utf1632_prober:
-            self._utf1632_prober = UTF1632Prober()
-
-        if self._utf1632_prober.state == ProbingState.DETECTING:
-            if self._utf1632_prober.feed(byte_str) == ProbingState.FOUND_IT:
-                self.result = {
-                    "encoding": self._utf1632_prober.charset_name,
-                    "confidence": self._utf1632_prober.get_confidence(),
-                    "language": "",
-                }
-                self.done = True
-                return
-
-        # If we've seen escape sequences, use the EscCharSetProber, which
-        # uses a simple state machine to check for known escape sequences in
-        # HZ and ISO-2022 encodings, since those are the only encodings that
-        # use such sequences.
-        if self._input_state == InputState.ESC_ASCII:
-            if not self._esc_charset_prober:
-                self._esc_charset_prober = EscCharSetProber(self.lang_filter)
-            if self._esc_charset_prober.feed(byte_str) == ProbingState.FOUND_IT:
-                self.result = {
-                    "encoding": self._esc_charset_prober.charset_name,
-                    "confidence": self._esc_charset_prober.get_confidence(),
-                    "language": self._esc_charset_prober.language,
-                }
-                self.done = True
-        # If we've seen high bytes (i.e., those with values greater than 127),
-        # we need to do more complicated checks using all our multi-byte and
-        # single-byte probers that are left.  The single-byte probers
-        # use character bigram distributions to determine the encoding, whereas
-        # the multi-byte probers use a combination of character unigram and
-        # bigram distributions.
-        elif self._input_state == InputState.HIGH_BYTE:
-            if not self._charset_probers:
-                self._charset_probers = [MBCSGroupProber(self.lang_filter)]
-                # If we're checking non-CJK encodings, use single-byte prober
-                if self.lang_filter & LanguageFilter.NON_CJK:
-                    self._charset_probers.append(SBCSGroupProber())
-                self._charset_probers.append(Latin1Prober())
-                self._charset_probers.append(MacRomanProber())
-            for prober in self._charset_probers:
-                if prober.feed(byte_str) == ProbingState.FOUND_IT:
-                    self.result = {
-                        "encoding": prober.charset_name,
-                        "confidence": prober.get_confidence(),
-                        "language": prober.language,
-                    }
-                    self.done = True
-                    break
-            if self.WIN_BYTE_DETECTOR.search(byte_str):
-                self._has_win_bytes = True
-
-    def close(self) -> ResultDict:
-        """
-        Stop analyzing the current document and come up with a final
-        prediction.
-
-        :returns:  The ``result`` attribute, a ``dict`` with the keys
-                   `encoding`, `confidence`, and `language`.
-        """
-        # Don't bother with checks if we're already done
-        if self.done:
-            return self.result
-        self.done = True
-
-        if not self._got_data:
-            self.logger.debug("no data received!")
-
-        # Default to ASCII if it is all we've seen so far
-        elif self._input_state == InputState.PURE_ASCII:
-            self.result = {"encoding": "ascii", "confidence": 1.0, "language": ""}
-
-        # If we have seen non-ASCII, return the best that met MINIMUM_THRESHOLD
-        elif self._input_state == InputState.HIGH_BYTE:
-            prober_confidence = None
-            max_prober_confidence = 0.0
-            max_prober = None
-            for prober in self._charset_probers:
-                if not prober:
-                    continue
-                prober_confidence = prober.get_confidence()
-                if prober_confidence > max_prober_confidence:
-                    max_prober_confidence = prober_confidence
-                    max_prober = prober
-            if max_prober and (max_prober_confidence > self.MINIMUM_THRESHOLD):
-                charset_name = max_prober.charset_name
-                assert charset_name is not None
-                lower_charset_name = charset_name.lower()
-                confidence = max_prober.get_confidence()
-                # Use Windows encoding name instead of ISO-8859 if we saw any
-                # extra Windows-specific bytes
-                if lower_charset_name.startswith("iso-8859"):
-                    if self._has_win_bytes:
-                        charset_name = self.ISO_WIN_MAP.get(
-                            lower_charset_name, charset_name
-                        )
-                # Rename legacy encodings with superset encodings if asked
-                if self.should_rename_legacy:
-                    charset_name = self.LEGACY_MAP.get(
-                        (charset_name or "").lower(), charset_name
-                    )
-                self.result = {
-                    "encoding": charset_name,
-                    "confidence": confidence,
-                    "language": max_prober.language,
-                }
-
-        # Log all prober confidences if none met MINIMUM_THRESHOLD
-        if self.logger.getEffectiveLevel() <= logging.DEBUG:
-            if self.result["encoding"] is None:
-                self.logger.debug("no probers hit minimum threshold")
-                for group_prober in self._charset_probers:
-                    if not group_prober:
-                        continue
-                    if isinstance(group_prober, CharSetGroupProber):
-                        for prober in group_prober.probers:
-                            self.logger.debug(
-                                "%s %s confidence = %s",
-                                prober.charset_name,
-                                prober.language,
-                                prober.get_confidence(),
-                            )
-                    else:
-                        self.logger.debug(
-                            "%s %s confidence = %s",
-                            group_prober.charset_name,
-                            group_prober.language,
-                            group_prober.get_confidence(),
-                        )
-        return self.result
diff --git a/src/pip/_vendor/chardet/utf1632prober.py b/src/pip/_vendor/chardet/utf1632prober.py
deleted file mode 100644
index 6bdec63d686..00000000000
--- a/src/pip/_vendor/chardet/utf1632prober.py
+++ /dev/null
@@ -1,225 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-#
-# Contributor(s):
-#   Jason Zavaglia
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-from typing import List, Union
-
-from .charsetprober import CharSetProber
-from .enums import ProbingState
-
-
-class UTF1632Prober(CharSetProber):
-    """
-    This class simply looks for occurrences of zero bytes, and infers
-    whether the file is UTF16 or UTF32 (low-endian or big-endian)
-    For instance, files looking like ( \0 \0 \0 [nonzero] )+
-    have a good probability to be UTF32BE.  Files looking like ( \0 [nonzero] )+
-    may be guessed to be UTF16BE, and inversely for little-endian varieties.
-    """
-
-    # how many logical characters to scan before feeling confident of prediction
-    MIN_CHARS_FOR_DETECTION = 20
-    # a fixed constant ratio of expected zeros or non-zeros in modulo-position.
-    EXPECTED_RATIO = 0.94
-
-    def __init__(self) -> None:
-        super().__init__()
-        self.position = 0
-        self.zeros_at_mod = [0] * 4
-        self.nonzeros_at_mod = [0] * 4
-        self._state = ProbingState.DETECTING
-        self.quad = [0, 0, 0, 0]
-        self.invalid_utf16be = False
-        self.invalid_utf16le = False
-        self.invalid_utf32be = False
-        self.invalid_utf32le = False
-        self.first_half_surrogate_pair_detected_16be = False
-        self.first_half_surrogate_pair_detected_16le = False
-        self.reset()
-
-    def reset(self) -> None:
-        super().reset()
-        self.position = 0
-        self.zeros_at_mod = [0] * 4
-        self.nonzeros_at_mod = [0] * 4
-        self._state = ProbingState.DETECTING
-        self.invalid_utf16be = False
-        self.invalid_utf16le = False
-        self.invalid_utf32be = False
-        self.invalid_utf32le = False
-        self.first_half_surrogate_pair_detected_16be = False
-        self.first_half_surrogate_pair_detected_16le = False
-        self.quad = [0, 0, 0, 0]
-
-    @property
-    def charset_name(self) -> str:
-        if self.is_likely_utf32be():
-            return "utf-32be"
-        if self.is_likely_utf32le():
-            return "utf-32le"
-        if self.is_likely_utf16be():
-            return "utf-16be"
-        if self.is_likely_utf16le():
-            return "utf-16le"
-        # default to something valid
-        return "utf-16"
-
-    @property
-    def language(self) -> str:
-        return ""
-
-    def approx_32bit_chars(self) -> float:
-        return max(1.0, self.position / 4.0)
-
-    def approx_16bit_chars(self) -> float:
-        return max(1.0, self.position / 2.0)
-
-    def is_likely_utf32be(self) -> bool:
-        approx_chars = self.approx_32bit_chars()
-        return approx_chars >= self.MIN_CHARS_FOR_DETECTION and (
-            self.zeros_at_mod[0] / approx_chars > self.EXPECTED_RATIO
-            and self.zeros_at_mod[1] / approx_chars > self.EXPECTED_RATIO
-            and self.zeros_at_mod[2] / approx_chars > self.EXPECTED_RATIO
-            and self.nonzeros_at_mod[3] / approx_chars > self.EXPECTED_RATIO
-            and not self.invalid_utf32be
-        )
-
-    def is_likely_utf32le(self) -> bool:
-        approx_chars = self.approx_32bit_chars()
-        return approx_chars >= self.MIN_CHARS_FOR_DETECTION and (
-            self.nonzeros_at_mod[0] / approx_chars > self.EXPECTED_RATIO
-            and self.zeros_at_mod[1] / approx_chars > self.EXPECTED_RATIO
-            and self.zeros_at_mod[2] / approx_chars > self.EXPECTED_RATIO
-            and self.zeros_at_mod[3] / approx_chars > self.EXPECTED_RATIO
-            and not self.invalid_utf32le
-        )
-
-    def is_likely_utf16be(self) -> bool:
-        approx_chars = self.approx_16bit_chars()
-        return approx_chars >= self.MIN_CHARS_FOR_DETECTION and (
-            (self.nonzeros_at_mod[1] + self.nonzeros_at_mod[3]) / approx_chars
-            > self.EXPECTED_RATIO
-            and (self.zeros_at_mod[0] + self.zeros_at_mod[2]) / approx_chars
-            > self.EXPECTED_RATIO
-            and not self.invalid_utf16be
-        )
-
-    def is_likely_utf16le(self) -> bool:
-        approx_chars = self.approx_16bit_chars()
-        return approx_chars >= self.MIN_CHARS_FOR_DETECTION and (
-            (self.nonzeros_at_mod[0] + self.nonzeros_at_mod[2]) / approx_chars
-            > self.EXPECTED_RATIO
-            and (self.zeros_at_mod[1] + self.zeros_at_mod[3]) / approx_chars
-            > self.EXPECTED_RATIO
-            and not self.invalid_utf16le
-        )
-
-    def validate_utf32_characters(self, quad: List[int]) -> None:
-        """
-        Validate if the quad of bytes is valid UTF-32.
-
-        UTF-32 is valid in the range 0x00000000 - 0x0010FFFF
-        excluding 0x0000D800 - 0x0000DFFF
-
-        https://en.wikipedia.org/wiki/UTF-32
-        """
-        if (
-            quad[0] != 0
-            or quad[1] > 0x10
-            or (quad[0] == 0 and quad[1] == 0 and 0xD8 <= quad[2] <= 0xDF)
-        ):
-            self.invalid_utf32be = True
-        if (
-            quad[3] != 0
-            or quad[2] > 0x10
-            or (quad[3] == 0 and quad[2] == 0 and 0xD8 <= quad[1] <= 0xDF)
-        ):
-            self.invalid_utf32le = True
-
-    def validate_utf16_characters(self, pair: List[int]) -> None:
-        """
-        Validate if the pair of bytes is  valid UTF-16.
-
-        UTF-16 is valid in the range 0x0000 - 0xFFFF excluding 0xD800 - 0xFFFF
-        with an exception for surrogate pairs, which must be in the range
-        0xD800-0xDBFF followed by 0xDC00-0xDFFF
-
-        https://en.wikipedia.org/wiki/UTF-16
-        """
-        if not self.first_half_surrogate_pair_detected_16be:
-            if 0xD8 <= pair[0] <= 0xDB:
-                self.first_half_surrogate_pair_detected_16be = True
-            elif 0xDC <= pair[0] <= 0xDF:
-                self.invalid_utf16be = True
-        else:
-            if 0xDC <= pair[0] <= 0xDF:
-                self.first_half_surrogate_pair_detected_16be = False
-            else:
-                self.invalid_utf16be = True
-
-        if not self.first_half_surrogate_pair_detected_16le:
-            if 0xD8 <= pair[1] <= 0xDB:
-                self.first_half_surrogate_pair_detected_16le = True
-            elif 0xDC <= pair[1] <= 0xDF:
-                self.invalid_utf16le = True
-        else:
-            if 0xDC <= pair[1] <= 0xDF:
-                self.first_half_surrogate_pair_detected_16le = False
-            else:
-                self.invalid_utf16le = True
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        for c in byte_str:
-            mod4 = self.position % 4
-            self.quad[mod4] = c
-            if mod4 == 3:
-                self.validate_utf32_characters(self.quad)
-                self.validate_utf16_characters(self.quad[0:2])
-                self.validate_utf16_characters(self.quad[2:4])
-            if c == 0:
-                self.zeros_at_mod[mod4] += 1
-            else:
-                self.nonzeros_at_mod[mod4] += 1
-            self.position += 1
-        return self.state
-
-    @property
-    def state(self) -> ProbingState:
-        if self._state in {ProbingState.NOT_ME, ProbingState.FOUND_IT}:
-            # terminal, decided states
-            return self._state
-        if self.get_confidence() > 0.80:
-            self._state = ProbingState.FOUND_IT
-        elif self.position > 4 * 1024:
-            # if we get to 4kb into the file, and we can't conclude it's UTF,
-            # let's give up
-            self._state = ProbingState.NOT_ME
-        return self._state
-
-    def get_confidence(self) -> float:
-        return (
-            0.85
-            if (
-                self.is_likely_utf16le()
-                or self.is_likely_utf16be()
-                or self.is_likely_utf32le()
-                or self.is_likely_utf32be()
-            )
-            else 0.00
-        )
diff --git a/src/pip/_vendor/chardet/utf8prober.py b/src/pip/_vendor/chardet/utf8prober.py
deleted file mode 100644
index d96354d97c2..00000000000
--- a/src/pip/_vendor/chardet/utf8prober.py
+++ /dev/null
@@ -1,82 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301  USA
-######################### END LICENSE BLOCK #########################
-
-from typing import Union
-
-from .charsetprober import CharSetProber
-from .codingstatemachine import CodingStateMachine
-from .enums import MachineState, ProbingState
-from .mbcssm import UTF8_SM_MODEL
-
-
-class UTF8Prober(CharSetProber):
-    ONE_CHAR_PROB = 0.5
-
-    def __init__(self) -> None:
-        super().__init__()
-        self.coding_sm = CodingStateMachine(UTF8_SM_MODEL)
-        self._num_mb_chars = 0
-        self.reset()
-
-    def reset(self) -> None:
-        super().reset()
-        self.coding_sm.reset()
-        self._num_mb_chars = 0
-
-    @property
-    def charset_name(self) -> str:
-        return "utf-8"
-
-    @property
-    def language(self) -> str:
-        return ""
-
-    def feed(self, byte_str: Union[bytes, bytearray]) -> ProbingState:
-        for c in byte_str:
-            coding_state = self.coding_sm.next_state(c)
-            if coding_state == MachineState.ERROR:
-                self._state = ProbingState.NOT_ME
-                break
-            if coding_state == MachineState.ITS_ME:
-                self._state = ProbingState.FOUND_IT
-                break
-            if coding_state == MachineState.START:
-                if self.coding_sm.get_current_charlen() >= 2:
-                    self._num_mb_chars += 1
-
-        if self.state == ProbingState.DETECTING:
-            if self.get_confidence() > self.SHORTCUT_THRESHOLD:
-                self._state = ProbingState.FOUND_IT
-
-        return self.state
-
-    def get_confidence(self) -> float:
-        unlike = 0.99
-        if self._num_mb_chars < 6:
-            unlike *= self.ONE_CHAR_PROB**self._num_mb_chars
-            return 1.0 - unlike
-        return unlike
diff --git a/src/pip/_vendor/chardet/version.py b/src/pip/_vendor/chardet/version.py
deleted file mode 100644
index 19dd01e0301..00000000000
--- a/src/pip/_vendor/chardet/version.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""
-This module exists only to simplify retrieving the version number of chardet
-from within setuptools and from chardet subpackages.
-
-:author: Dan Blanchard (dan.blanchard@gmail.com)
-"""
-
-__version__ = "5.2.0"
-VERSION = __version__.split(".")
diff --git a/src/pip/_vendor/charset_normalizer/LICENSE b/src/pip/_vendor/charset_normalizer/LICENSE
new file mode 100644
index 00000000000..ad82355b802
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 TAHRI Ahmed R.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/src/pip/_vendor/charset_normalizer/__init__.py b/src/pip/_vendor/charset_normalizer/__init__.py
new file mode 100644
index 00000000000..55991fc3806
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/__init__.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+"""
+Charset-Normalizer
+~~~~~~~~~~~~~~
+The Real First Universal Charset Detector.
+A library that helps you read text from an unknown charset encoding.
+Motivated by chardet, This package is trying to resolve the issue by taking a new approach.
+All IANA character set names for which the Python core library provides codecs are supported.
+
+Basic usage:
+   >>> from charset_normalizer import from_bytes
+   >>> results = from_bytes('Bсеки човек има право на образование. Oбразованието!'.encode('utf_8'))
+   >>> best_guess = results.best()
+   >>> str(best_guess)
+   'Bсеки човек има право на образование. Oбразованието!'
+
+Others methods and usages are available - see the full documentation
+at .
+:copyright: (c) 2021 by Ahmed TAHRI
+:license: MIT, see LICENSE for more details.
+"""
+import logging
+
+from .api import from_bytes, from_fp, from_path, is_binary
+from .legacy import detect
+from .models import CharsetMatch, CharsetMatches
+from .utils import set_logging_handler
+from .version import VERSION, __version__
+
+__all__ = (
+    "from_fp",
+    "from_path",
+    "from_bytes",
+    "is_binary",
+    "detect",
+    "CharsetMatch",
+    "CharsetMatches",
+    "__version__",
+    "VERSION",
+    "set_logging_handler",
+)
+
+# Attach a NullHandler to the top level logger by default
+# https://docs.python.org/3.3/howto/logging.html#configuring-logging-for-a-library
+
+logging.getLogger("charset_normalizer").addHandler(logging.NullHandler())
diff --git a/src/pip/_vendor/charset_normalizer/__main__.py b/src/pip/_vendor/charset_normalizer/__main__.py
new file mode 100644
index 00000000000..beae2ef7749
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/__main__.py
@@ -0,0 +1,4 @@
+from .cli import cli_detect
+
+if __name__ == "__main__":
+    cli_detect()
diff --git a/src/pip/_vendor/charset_normalizer/api.py b/src/pip/_vendor/charset_normalizer/api.py
new file mode 100644
index 00000000000..0ba08e3a50b
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/api.py
@@ -0,0 +1,626 @@
+import logging
+from os import PathLike
+from typing import BinaryIO, List, Optional, Set, Union
+
+from .cd import (
+    coherence_ratio,
+    encoding_languages,
+    mb_encoding_languages,
+    merge_coherence_ratios,
+)
+from .constant import IANA_SUPPORTED, TOO_BIG_SEQUENCE, TOO_SMALL_SEQUENCE, TRACE
+from .md import mess_ratio
+from .models import CharsetMatch, CharsetMatches
+from .utils import (
+    any_specified_encoding,
+    cut_sequence_chunks,
+    iana_name,
+    identify_sig_or_bom,
+    is_cp_similar,
+    is_multi_byte_encoding,
+    should_strip_sig_or_bom,
+)
+
+# Will most likely be controversial
+# logging.addLevelName(TRACE, "TRACE")
+logger = logging.getLogger("charset_normalizer")
+explain_handler = logging.StreamHandler()
+explain_handler.setFormatter(
+    logging.Formatter("%(asctime)s | %(levelname)s | %(message)s")
+)
+
+
+def from_bytes(
+    sequences: Union[bytes, bytearray],
+    steps: int = 5,
+    chunk_size: int = 512,
+    threshold: float = 0.2,
+    cp_isolation: Optional[List[str]] = None,
+    cp_exclusion: Optional[List[str]] = None,
+    preemptive_behaviour: bool = True,
+    explain: bool = False,
+    language_threshold: float = 0.1,
+    enable_fallback: bool = True,
+) -> CharsetMatches:
+    """
+    Given a raw bytes sequence, return the best possibles charset usable to render str objects.
+    If there is no results, it is a strong indicator that the source is binary/not text.
+    By default, the process will extract 5 blocks of 512o each to assess the mess and coherence of a given sequence.
+    And will give up a particular code page after 20% of measured mess. Those criteria are customizable at will.
+
+    The preemptive behavior DOES NOT replace the traditional detection workflow, it prioritize a particular code page
+    but never take it for granted. Can improve the performance.
+
+    You may want to focus your attention to some code page or/and not others, use cp_isolation and cp_exclusion for that
+    purpose.
+
+    This function will strip the SIG in the payload/sequence every time except on UTF-16, UTF-32.
+    By default the library does not setup any handler other than the NullHandler, if you choose to set the 'explain'
+    toggle to True it will alter the logger configuration to add a StreamHandler that is suitable for debugging.
+    Custom logging format and handler can be set manually.
+    """
+
+    if not isinstance(sequences, (bytearray, bytes)):
+        raise TypeError(
+            "Expected object of type bytes or bytearray, got: {0}".format(
+                type(sequences)
+            )
+        )
+
+    if explain:
+        previous_logger_level: int = logger.level
+        logger.addHandler(explain_handler)
+        logger.setLevel(TRACE)
+
+    length: int = len(sequences)
+
+    if length == 0:
+        logger.debug("Encoding detection on empty bytes, assuming utf_8 intention.")
+        if explain:
+            logger.removeHandler(explain_handler)
+            logger.setLevel(previous_logger_level or logging.WARNING)
+        return CharsetMatches([CharsetMatch(sequences, "utf_8", 0.0, False, [], "")])
+
+    if cp_isolation is not None:
+        logger.log(
+            TRACE,
+            "cp_isolation is set. use this flag for debugging purpose. "
+            "limited list of encoding allowed : %s.",
+            ", ".join(cp_isolation),
+        )
+        cp_isolation = [iana_name(cp, False) for cp in cp_isolation]
+    else:
+        cp_isolation = []
+
+    if cp_exclusion is not None:
+        logger.log(
+            TRACE,
+            "cp_exclusion is set. use this flag for debugging purpose. "
+            "limited list of encoding excluded : %s.",
+            ", ".join(cp_exclusion),
+        )
+        cp_exclusion = [iana_name(cp, False) for cp in cp_exclusion]
+    else:
+        cp_exclusion = []
+
+    if length <= (chunk_size * steps):
+        logger.log(
+            TRACE,
+            "override steps (%i) and chunk_size (%i) as content does not fit (%i byte(s) given) parameters.",
+            steps,
+            chunk_size,
+            length,
+        )
+        steps = 1
+        chunk_size = length
+
+    if steps > 1 and length / steps < chunk_size:
+        chunk_size = int(length / steps)
+
+    is_too_small_sequence: bool = len(sequences) < TOO_SMALL_SEQUENCE
+    is_too_large_sequence: bool = len(sequences) >= TOO_BIG_SEQUENCE
+
+    if is_too_small_sequence:
+        logger.log(
+            TRACE,
+            "Trying to detect encoding from a tiny portion of ({}) byte(s).".format(
+                length
+            ),
+        )
+    elif is_too_large_sequence:
+        logger.log(
+            TRACE,
+            "Using lazy str decoding because the payload is quite large, ({}) byte(s).".format(
+                length
+            ),
+        )
+
+    prioritized_encodings: List[str] = []
+
+    specified_encoding: Optional[str] = (
+        any_specified_encoding(sequences) if preemptive_behaviour else None
+    )
+
+    if specified_encoding is not None:
+        prioritized_encodings.append(specified_encoding)
+        logger.log(
+            TRACE,
+            "Detected declarative mark in sequence. Priority +1 given for %s.",
+            specified_encoding,
+        )
+
+    tested: Set[str] = set()
+    tested_but_hard_failure: List[str] = []
+    tested_but_soft_failure: List[str] = []
+
+    fallback_ascii: Optional[CharsetMatch] = None
+    fallback_u8: Optional[CharsetMatch] = None
+    fallback_specified: Optional[CharsetMatch] = None
+
+    results: CharsetMatches = CharsetMatches()
+
+    sig_encoding, sig_payload = identify_sig_or_bom(sequences)
+
+    if sig_encoding is not None:
+        prioritized_encodings.append(sig_encoding)
+        logger.log(
+            TRACE,
+            "Detected a SIG or BOM mark on first %i byte(s). Priority +1 given for %s.",
+            len(sig_payload),
+            sig_encoding,
+        )
+
+    prioritized_encodings.append("ascii")
+
+    if "utf_8" not in prioritized_encodings:
+        prioritized_encodings.append("utf_8")
+
+    for encoding_iana in prioritized_encodings + IANA_SUPPORTED:
+        if cp_isolation and encoding_iana not in cp_isolation:
+            continue
+
+        if cp_exclusion and encoding_iana in cp_exclusion:
+            continue
+
+        if encoding_iana in tested:
+            continue
+
+        tested.add(encoding_iana)
+
+        decoded_payload: Optional[str] = None
+        bom_or_sig_available: bool = sig_encoding == encoding_iana
+        strip_sig_or_bom: bool = bom_or_sig_available and should_strip_sig_or_bom(
+            encoding_iana
+        )
+
+        if encoding_iana in {"utf_16", "utf_32"} and not bom_or_sig_available:
+            logger.log(
+                TRACE,
+                "Encoding %s won't be tested as-is because it require a BOM. Will try some sub-encoder LE/BE.",
+                encoding_iana,
+            )
+            continue
+        if encoding_iana in {"utf_7"} and not bom_or_sig_available:
+            logger.log(
+                TRACE,
+                "Encoding %s won't be tested as-is because detection is unreliable without BOM/SIG.",
+                encoding_iana,
+            )
+            continue
+
+        try:
+            is_multi_byte_decoder: bool = is_multi_byte_encoding(encoding_iana)
+        except (ModuleNotFoundError, ImportError):
+            logger.log(
+                TRACE,
+                "Encoding %s does not provide an IncrementalDecoder",
+                encoding_iana,
+            )
+            continue
+
+        try:
+            if is_too_large_sequence and is_multi_byte_decoder is False:
+                str(
+                    sequences[: int(50e4)]
+                    if strip_sig_or_bom is False
+                    else sequences[len(sig_payload) : int(50e4)],
+                    encoding=encoding_iana,
+                )
+            else:
+                decoded_payload = str(
+                    sequences
+                    if strip_sig_or_bom is False
+                    else sequences[len(sig_payload) :],
+                    encoding=encoding_iana,
+                )
+        except (UnicodeDecodeError, LookupError) as e:
+            if not isinstance(e, LookupError):
+                logger.log(
+                    TRACE,
+                    "Code page %s does not fit given bytes sequence at ALL. %s",
+                    encoding_iana,
+                    str(e),
+                )
+            tested_but_hard_failure.append(encoding_iana)
+            continue
+
+        similar_soft_failure_test: bool = False
+
+        for encoding_soft_failed in tested_but_soft_failure:
+            if is_cp_similar(encoding_iana, encoding_soft_failed):
+                similar_soft_failure_test = True
+                break
+
+        if similar_soft_failure_test:
+            logger.log(
+                TRACE,
+                "%s is deemed too similar to code page %s and was consider unsuited already. Continuing!",
+                encoding_iana,
+                encoding_soft_failed,
+            )
+            continue
+
+        r_ = range(
+            0 if not bom_or_sig_available else len(sig_payload),
+            length,
+            int(length / steps),
+        )
+
+        multi_byte_bonus: bool = (
+            is_multi_byte_decoder
+            and decoded_payload is not None
+            and len(decoded_payload) < length
+        )
+
+        if multi_byte_bonus:
+            logger.log(
+                TRACE,
+                "Code page %s is a multi byte encoding table and it appear that at least one character "
+                "was encoded using n-bytes.",
+                encoding_iana,
+            )
+
+        max_chunk_gave_up: int = int(len(r_) / 4)
+
+        max_chunk_gave_up = max(max_chunk_gave_up, 2)
+        early_stop_count: int = 0
+        lazy_str_hard_failure = False
+
+        md_chunks: List[str] = []
+        md_ratios = []
+
+        try:
+            for chunk in cut_sequence_chunks(
+                sequences,
+                encoding_iana,
+                r_,
+                chunk_size,
+                bom_or_sig_available,
+                strip_sig_or_bom,
+                sig_payload,
+                is_multi_byte_decoder,
+                decoded_payload,
+            ):
+                md_chunks.append(chunk)
+
+                md_ratios.append(
+                    mess_ratio(
+                        chunk,
+                        threshold,
+                        explain is True and 1 <= len(cp_isolation) <= 2,
+                    )
+                )
+
+                if md_ratios[-1] >= threshold:
+                    early_stop_count += 1
+
+                if (early_stop_count >= max_chunk_gave_up) or (
+                    bom_or_sig_available and strip_sig_or_bom is False
+                ):
+                    break
+        except (
+            UnicodeDecodeError
+        ) as e:  # Lazy str loading may have missed something there
+            logger.log(
+                TRACE,
+                "LazyStr Loading: After MD chunk decode, code page %s does not fit given bytes sequence at ALL. %s",
+                encoding_iana,
+                str(e),
+            )
+            early_stop_count = max_chunk_gave_up
+            lazy_str_hard_failure = True
+
+        # We might want to check the sequence again with the whole content
+        # Only if initial MD tests passes
+        if (
+            not lazy_str_hard_failure
+            and is_too_large_sequence
+            and not is_multi_byte_decoder
+        ):
+            try:
+                sequences[int(50e3) :].decode(encoding_iana, errors="strict")
+            except UnicodeDecodeError as e:
+                logger.log(
+                    TRACE,
+                    "LazyStr Loading: After final lookup, code page %s does not fit given bytes sequence at ALL. %s",
+                    encoding_iana,
+                    str(e),
+                )
+                tested_but_hard_failure.append(encoding_iana)
+                continue
+
+        mean_mess_ratio: float = sum(md_ratios) / len(md_ratios) if md_ratios else 0.0
+        if mean_mess_ratio >= threshold or early_stop_count >= max_chunk_gave_up:
+            tested_but_soft_failure.append(encoding_iana)
+            logger.log(
+                TRACE,
+                "%s was excluded because of initial chaos probing. Gave up %i time(s). "
+                "Computed mean chaos is %f %%.",
+                encoding_iana,
+                early_stop_count,
+                round(mean_mess_ratio * 100, ndigits=3),
+            )
+            # Preparing those fallbacks in case we got nothing.
+            if (
+                enable_fallback
+                and encoding_iana in ["ascii", "utf_8", specified_encoding]
+                and not lazy_str_hard_failure
+            ):
+                fallback_entry = CharsetMatch(
+                    sequences, encoding_iana, threshold, False, [], decoded_payload
+                )
+                if encoding_iana == specified_encoding:
+                    fallback_specified = fallback_entry
+                elif encoding_iana == "ascii":
+                    fallback_ascii = fallback_entry
+                else:
+                    fallback_u8 = fallback_entry
+            continue
+
+        logger.log(
+            TRACE,
+            "%s passed initial chaos probing. Mean measured chaos is %f %%",
+            encoding_iana,
+            round(mean_mess_ratio * 100, ndigits=3),
+        )
+
+        if not is_multi_byte_decoder:
+            target_languages: List[str] = encoding_languages(encoding_iana)
+        else:
+            target_languages = mb_encoding_languages(encoding_iana)
+
+        if target_languages:
+            logger.log(
+                TRACE,
+                "{} should target any language(s) of {}".format(
+                    encoding_iana, str(target_languages)
+                ),
+            )
+
+        cd_ratios = []
+
+        # We shall skip the CD when its about ASCII
+        # Most of the time its not relevant to run "language-detection" on it.
+        if encoding_iana != "ascii":
+            for chunk in md_chunks:
+                chunk_languages = coherence_ratio(
+                    chunk,
+                    language_threshold,
+                    ",".join(target_languages) if target_languages else None,
+                )
+
+                cd_ratios.append(chunk_languages)
+
+        cd_ratios_merged = merge_coherence_ratios(cd_ratios)
+
+        if cd_ratios_merged:
+            logger.log(
+                TRACE,
+                "We detected language {} using {}".format(
+                    cd_ratios_merged, encoding_iana
+                ),
+            )
+
+        results.append(
+            CharsetMatch(
+                sequences,
+                encoding_iana,
+                mean_mess_ratio,
+                bom_or_sig_available,
+                cd_ratios_merged,
+                decoded_payload,
+            )
+        )
+
+        if (
+            encoding_iana in [specified_encoding, "ascii", "utf_8"]
+            and mean_mess_ratio < 0.1
+        ):
+            logger.debug(
+                "Encoding detection: %s is most likely the one.", encoding_iana
+            )
+            if explain:
+                logger.removeHandler(explain_handler)
+                logger.setLevel(previous_logger_level)
+            return CharsetMatches([results[encoding_iana]])
+
+        if encoding_iana == sig_encoding:
+            logger.debug(
+                "Encoding detection: %s is most likely the one as we detected a BOM or SIG within "
+                "the beginning of the sequence.",
+                encoding_iana,
+            )
+            if explain:
+                logger.removeHandler(explain_handler)
+                logger.setLevel(previous_logger_level)
+            return CharsetMatches([results[encoding_iana]])
+
+    if len(results) == 0:
+        if fallback_u8 or fallback_ascii or fallback_specified:
+            logger.log(
+                TRACE,
+                "Nothing got out of the detection process. Using ASCII/UTF-8/Specified fallback.",
+            )
+
+        if fallback_specified:
+            logger.debug(
+                "Encoding detection: %s will be used as a fallback match",
+                fallback_specified.encoding,
+            )
+            results.append(fallback_specified)
+        elif (
+            (fallback_u8 and fallback_ascii is None)
+            or (
+                fallback_u8
+                and fallback_ascii
+                and fallback_u8.fingerprint != fallback_ascii.fingerprint
+            )
+            or (fallback_u8 is not None)
+        ):
+            logger.debug("Encoding detection: utf_8 will be used as a fallback match")
+            results.append(fallback_u8)
+        elif fallback_ascii:
+            logger.debug("Encoding detection: ascii will be used as a fallback match")
+            results.append(fallback_ascii)
+
+    if results:
+        logger.debug(
+            "Encoding detection: Found %s as plausible (best-candidate) for content. With %i alternatives.",
+            results.best().encoding,  # type: ignore
+            len(results) - 1,
+        )
+    else:
+        logger.debug("Encoding detection: Unable to determine any suitable charset.")
+
+    if explain:
+        logger.removeHandler(explain_handler)
+        logger.setLevel(previous_logger_level)
+
+    return results
+
+
+def from_fp(
+    fp: BinaryIO,
+    steps: int = 5,
+    chunk_size: int = 512,
+    threshold: float = 0.20,
+    cp_isolation: Optional[List[str]] = None,
+    cp_exclusion: Optional[List[str]] = None,
+    preemptive_behaviour: bool = True,
+    explain: bool = False,
+    language_threshold: float = 0.1,
+    enable_fallback: bool = True,
+) -> CharsetMatches:
+    """
+    Same thing than the function from_bytes but using a file pointer that is already ready.
+    Will not close the file pointer.
+    """
+    return from_bytes(
+        fp.read(),
+        steps,
+        chunk_size,
+        threshold,
+        cp_isolation,
+        cp_exclusion,
+        preemptive_behaviour,
+        explain,
+        language_threshold,
+        enable_fallback,
+    )
+
+
+def from_path(
+    path: Union[str, bytes, PathLike],  # type: ignore[type-arg]
+    steps: int = 5,
+    chunk_size: int = 512,
+    threshold: float = 0.20,
+    cp_isolation: Optional[List[str]] = None,
+    cp_exclusion: Optional[List[str]] = None,
+    preemptive_behaviour: bool = True,
+    explain: bool = False,
+    language_threshold: float = 0.1,
+    enable_fallback: bool = True,
+) -> CharsetMatches:
+    """
+    Same thing than the function from_bytes but with one extra step. Opening and reading given file path in binary mode.
+    Can raise IOError.
+    """
+    with open(path, "rb") as fp:
+        return from_fp(
+            fp,
+            steps,
+            chunk_size,
+            threshold,
+            cp_isolation,
+            cp_exclusion,
+            preemptive_behaviour,
+            explain,
+            language_threshold,
+            enable_fallback,
+        )
+
+
+def is_binary(
+    fp_or_path_or_payload: Union[PathLike, str, BinaryIO, bytes],  # type: ignore[type-arg]
+    steps: int = 5,
+    chunk_size: int = 512,
+    threshold: float = 0.20,
+    cp_isolation: Optional[List[str]] = None,
+    cp_exclusion: Optional[List[str]] = None,
+    preemptive_behaviour: bool = True,
+    explain: bool = False,
+    language_threshold: float = 0.1,
+    enable_fallback: bool = False,
+) -> bool:
+    """
+    Detect if the given input (file, bytes, or path) points to a binary file. aka. not a string.
+    Based on the same main heuristic algorithms and default kwargs at the sole exception that fallbacks match
+    are disabled to be stricter around ASCII-compatible but unlikely to be a string.
+    """
+    if isinstance(fp_or_path_or_payload, (str, PathLike)):
+        guesses = from_path(
+            fp_or_path_or_payload,
+            steps=steps,
+            chunk_size=chunk_size,
+            threshold=threshold,
+            cp_isolation=cp_isolation,
+            cp_exclusion=cp_exclusion,
+            preemptive_behaviour=preemptive_behaviour,
+            explain=explain,
+            language_threshold=language_threshold,
+            enable_fallback=enable_fallback,
+        )
+    elif isinstance(
+        fp_or_path_or_payload,
+        (
+            bytes,
+            bytearray,
+        ),
+    ):
+        guesses = from_bytes(
+            fp_or_path_or_payload,
+            steps=steps,
+            chunk_size=chunk_size,
+            threshold=threshold,
+            cp_isolation=cp_isolation,
+            cp_exclusion=cp_exclusion,
+            preemptive_behaviour=preemptive_behaviour,
+            explain=explain,
+            language_threshold=language_threshold,
+            enable_fallback=enable_fallback,
+        )
+    else:
+        guesses = from_fp(
+            fp_or_path_or_payload,
+            steps=steps,
+            chunk_size=chunk_size,
+            threshold=threshold,
+            cp_isolation=cp_isolation,
+            cp_exclusion=cp_exclusion,
+            preemptive_behaviour=preemptive_behaviour,
+            explain=explain,
+            language_threshold=language_threshold,
+            enable_fallback=enable_fallback,
+        )
+
+    return not guesses
diff --git a/src/pip/_vendor/charset_normalizer/cd.py b/src/pip/_vendor/charset_normalizer/cd.py
new file mode 100644
index 00000000000..4ea6760c45b
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/cd.py
@@ -0,0 +1,395 @@
+import importlib
+from codecs import IncrementalDecoder
+from collections import Counter
+from functools import lru_cache
+from typing import Counter as TypeCounter, Dict, List, Optional, Tuple
+
+from .constant import (
+    FREQUENCIES,
+    KO_NAMES,
+    LANGUAGE_SUPPORTED_COUNT,
+    TOO_SMALL_SEQUENCE,
+    ZH_NAMES,
+)
+from .md import is_suspiciously_successive_range
+from .models import CoherenceMatches
+from .utils import (
+    is_accentuated,
+    is_latin,
+    is_multi_byte_encoding,
+    is_unicode_range_secondary,
+    unicode_range,
+)
+
+
+def encoding_unicode_range(iana_name: str) -> List[str]:
+    """
+    Return associated unicode ranges in a single byte code page.
+    """
+    if is_multi_byte_encoding(iana_name):
+        raise IOError("Function not supported on multi-byte code page")
+
+    decoder = importlib.import_module(
+        "encodings.{}".format(iana_name)
+    ).IncrementalDecoder
+
+    p: IncrementalDecoder = decoder(errors="ignore")
+    seen_ranges: Dict[str, int] = {}
+    character_count: int = 0
+
+    for i in range(0x40, 0xFF):
+        chunk: str = p.decode(bytes([i]))
+
+        if chunk:
+            character_range: Optional[str] = unicode_range(chunk)
+
+            if character_range is None:
+                continue
+
+            if is_unicode_range_secondary(character_range) is False:
+                if character_range not in seen_ranges:
+                    seen_ranges[character_range] = 0
+                seen_ranges[character_range] += 1
+                character_count += 1
+
+    return sorted(
+        [
+            character_range
+            for character_range in seen_ranges
+            if seen_ranges[character_range] / character_count >= 0.15
+        ]
+    )
+
+
+def unicode_range_languages(primary_range: str) -> List[str]:
+    """
+    Return inferred languages used with a unicode range.
+    """
+    languages: List[str] = []
+
+    for language, characters in FREQUENCIES.items():
+        for character in characters:
+            if unicode_range(character) == primary_range:
+                languages.append(language)
+                break
+
+    return languages
+
+
+@lru_cache()
+def encoding_languages(iana_name: str) -> List[str]:
+    """
+    Single-byte encoding language association. Some code page are heavily linked to particular language(s).
+    This function does the correspondence.
+    """
+    unicode_ranges: List[str] = encoding_unicode_range(iana_name)
+    primary_range: Optional[str] = None
+
+    for specified_range in unicode_ranges:
+        if "Latin" not in specified_range:
+            primary_range = specified_range
+            break
+
+    if primary_range is None:
+        return ["Latin Based"]
+
+    return unicode_range_languages(primary_range)
+
+
+@lru_cache()
+def mb_encoding_languages(iana_name: str) -> List[str]:
+    """
+    Multi-byte encoding language association. Some code page are heavily linked to particular language(s).
+    This function does the correspondence.
+    """
+    if (
+        iana_name.startswith("shift_")
+        or iana_name.startswith("iso2022_jp")
+        or iana_name.startswith("euc_j")
+        or iana_name == "cp932"
+    ):
+        return ["Japanese"]
+    if iana_name.startswith("gb") or iana_name in ZH_NAMES:
+        return ["Chinese"]
+    if iana_name.startswith("iso2022_kr") or iana_name in KO_NAMES:
+        return ["Korean"]
+
+    return []
+
+
+@lru_cache(maxsize=LANGUAGE_SUPPORTED_COUNT)
+def get_target_features(language: str) -> Tuple[bool, bool]:
+    """
+    Determine main aspects from a supported language if it contains accents and if is pure Latin.
+    """
+    target_have_accents: bool = False
+    target_pure_latin: bool = True
+
+    for character in FREQUENCIES[language]:
+        if not target_have_accents and is_accentuated(character):
+            target_have_accents = True
+        if target_pure_latin and is_latin(character) is False:
+            target_pure_latin = False
+
+    return target_have_accents, target_pure_latin
+
+
+def alphabet_languages(
+    characters: List[str], ignore_non_latin: bool = False
+) -> List[str]:
+    """
+    Return associated languages associated to given characters.
+    """
+    languages: List[Tuple[str, float]] = []
+
+    source_have_accents = any(is_accentuated(character) for character in characters)
+
+    for language, language_characters in FREQUENCIES.items():
+        target_have_accents, target_pure_latin = get_target_features(language)
+
+        if ignore_non_latin and target_pure_latin is False:
+            continue
+
+        if target_have_accents is False and source_have_accents:
+            continue
+
+        character_count: int = len(language_characters)
+
+        character_match_count: int = len(
+            [c for c in language_characters if c in characters]
+        )
+
+        ratio: float = character_match_count / character_count
+
+        if ratio >= 0.2:
+            languages.append((language, ratio))
+
+    languages = sorted(languages, key=lambda x: x[1], reverse=True)
+
+    return [compatible_language[0] for compatible_language in languages]
+
+
+def characters_popularity_compare(
+    language: str, ordered_characters: List[str]
+) -> float:
+    """
+    Determine if a ordered characters list (by occurrence from most appearance to rarest) match a particular language.
+    The result is a ratio between 0. (absolutely no correspondence) and 1. (near perfect fit).
+    Beware that is function is not strict on the match in order to ease the detection. (Meaning close match is 1.)
+    """
+    if language not in FREQUENCIES:
+        raise ValueError("{} not available".format(language))
+
+    character_approved_count: int = 0
+    FREQUENCIES_language_set = set(FREQUENCIES[language])
+
+    ordered_characters_count: int = len(ordered_characters)
+    target_language_characters_count: int = len(FREQUENCIES[language])
+
+    large_alphabet: bool = target_language_characters_count > 26
+
+    for character, character_rank in zip(
+        ordered_characters, range(0, ordered_characters_count)
+    ):
+        if character not in FREQUENCIES_language_set:
+            continue
+
+        character_rank_in_language: int = FREQUENCIES[language].index(character)
+        expected_projection_ratio: float = (
+            target_language_characters_count / ordered_characters_count
+        )
+        character_rank_projection: int = int(character_rank * expected_projection_ratio)
+
+        if (
+            large_alphabet is False
+            and abs(character_rank_projection - character_rank_in_language) > 4
+        ):
+            continue
+
+        if (
+            large_alphabet is True
+            and abs(character_rank_projection - character_rank_in_language)
+            < target_language_characters_count / 3
+        ):
+            character_approved_count += 1
+            continue
+
+        characters_before_source: List[str] = FREQUENCIES[language][
+            0:character_rank_in_language
+        ]
+        characters_after_source: List[str] = FREQUENCIES[language][
+            character_rank_in_language:
+        ]
+        characters_before: List[str] = ordered_characters[0:character_rank]
+        characters_after: List[str] = ordered_characters[character_rank:]
+
+        before_match_count: int = len(
+            set(characters_before) & set(characters_before_source)
+        )
+
+        after_match_count: int = len(
+            set(characters_after) & set(characters_after_source)
+        )
+
+        if len(characters_before_source) == 0 and before_match_count <= 4:
+            character_approved_count += 1
+            continue
+
+        if len(characters_after_source) == 0 and after_match_count <= 4:
+            character_approved_count += 1
+            continue
+
+        if (
+            before_match_count / len(characters_before_source) >= 0.4
+            or after_match_count / len(characters_after_source) >= 0.4
+        ):
+            character_approved_count += 1
+            continue
+
+    return character_approved_count / len(ordered_characters)
+
+
+def alpha_unicode_split(decoded_sequence: str) -> List[str]:
+    """
+    Given a decoded text sequence, return a list of str. Unicode range / alphabet separation.
+    Ex. a text containing English/Latin with a bit a Hebrew will return two items in the resulting list;
+    One containing the latin letters and the other hebrew.
+    """
+    layers: Dict[str, str] = {}
+
+    for character in decoded_sequence:
+        if character.isalpha() is False:
+            continue
+
+        character_range: Optional[str] = unicode_range(character)
+
+        if character_range is None:
+            continue
+
+        layer_target_range: Optional[str] = None
+
+        for discovered_range in layers:
+            if (
+                is_suspiciously_successive_range(discovered_range, character_range)
+                is False
+            ):
+                layer_target_range = discovered_range
+                break
+
+        if layer_target_range is None:
+            layer_target_range = character_range
+
+        if layer_target_range not in layers:
+            layers[layer_target_range] = character.lower()
+            continue
+
+        layers[layer_target_range] += character.lower()
+
+    return list(layers.values())
+
+
+def merge_coherence_ratios(results: List[CoherenceMatches]) -> CoherenceMatches:
+    """
+    This function merge results previously given by the function coherence_ratio.
+    The return type is the same as coherence_ratio.
+    """
+    per_language_ratios: Dict[str, List[float]] = {}
+    for result in results:
+        for sub_result in result:
+            language, ratio = sub_result
+            if language not in per_language_ratios:
+                per_language_ratios[language] = [ratio]
+                continue
+            per_language_ratios[language].append(ratio)
+
+    merge = [
+        (
+            language,
+            round(
+                sum(per_language_ratios[language]) / len(per_language_ratios[language]),
+                4,
+            ),
+        )
+        for language in per_language_ratios
+    ]
+
+    return sorted(merge, key=lambda x: x[1], reverse=True)
+
+
+def filter_alt_coherence_matches(results: CoherenceMatches) -> CoherenceMatches:
+    """
+    We shall NOT return "English—" in CoherenceMatches because it is an alternative
+    of "English". This function only keeps the best match and remove the em-dash in it.
+    """
+    index_results: Dict[str, List[float]] = dict()
+
+    for result in results:
+        language, ratio = result
+        no_em_name: str = language.replace("—", "")
+
+        if no_em_name not in index_results:
+            index_results[no_em_name] = []
+
+        index_results[no_em_name].append(ratio)
+
+    if any(len(index_results[e]) > 1 for e in index_results):
+        filtered_results: CoherenceMatches = []
+
+        for language in index_results:
+            filtered_results.append((language, max(index_results[language])))
+
+        return filtered_results
+
+    return results
+
+
+@lru_cache(maxsize=2048)
+def coherence_ratio(
+    decoded_sequence: str, threshold: float = 0.1, lg_inclusion: Optional[str] = None
+) -> CoherenceMatches:
+    """
+    Detect ANY language that can be identified in given sequence. The sequence will be analysed by layers.
+    A layer = Character extraction by alphabets/ranges.
+    """
+
+    results: List[Tuple[str, float]] = []
+    ignore_non_latin: bool = False
+
+    sufficient_match_count: int = 0
+
+    lg_inclusion_list = lg_inclusion.split(",") if lg_inclusion is not None else []
+    if "Latin Based" in lg_inclusion_list:
+        ignore_non_latin = True
+        lg_inclusion_list.remove("Latin Based")
+
+    for layer in alpha_unicode_split(decoded_sequence):
+        sequence_frequencies: TypeCounter[str] = Counter(layer)
+        most_common = sequence_frequencies.most_common()
+
+        character_count: int = sum(o for c, o in most_common)
+
+        if character_count <= TOO_SMALL_SEQUENCE:
+            continue
+
+        popular_character_ordered: List[str] = [c for c, o in most_common]
+
+        for language in lg_inclusion_list or alphabet_languages(
+            popular_character_ordered, ignore_non_latin
+        ):
+            ratio: float = characters_popularity_compare(
+                language, popular_character_ordered
+            )
+
+            if ratio < threshold:
+                continue
+            elif ratio >= 0.8:
+                sufficient_match_count += 1
+
+            results.append((language, round(ratio, 4)))
+
+            if sufficient_match_count >= 3:
+                break
+
+    return sorted(
+        filter_alt_coherence_matches(results), key=lambda x: x[1], reverse=True
+    )
diff --git a/src/pip/_vendor/charset_normalizer/cli/__init__.py b/src/pip/_vendor/charset_normalizer/cli/__init__.py
new file mode 100644
index 00000000000..d95fedfe572
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/cli/__init__.py
@@ -0,0 +1,6 @@
+from .__main__ import cli_detect, query_yes_no
+
+__all__ = (
+    "cli_detect",
+    "query_yes_no",
+)
diff --git a/src/pip/_vendor/charset_normalizer/cli/__main__.py b/src/pip/_vendor/charset_normalizer/cli/__main__.py
new file mode 100644
index 00000000000..d939caadb83
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/cli/__main__.py
@@ -0,0 +1,296 @@
+import argparse
+import sys
+from json import dumps
+from os.path import abspath, basename, dirname, join, realpath
+from platform import python_version
+from typing import List, Optional
+from unicodedata import unidata_version
+
+import pip._vendor.charset_normalizer.md as md_module
+from pip._vendor.charset_normalizer import from_fp
+from pip._vendor.charset_normalizer.models import CliDetectionResult
+from pip._vendor.charset_normalizer.version import __version__
+
+
+def query_yes_no(question: str, default: str = "yes") -> bool:
+    """Ask a yes/no question via input() and return their answer.
+
+    "question" is a string that is presented to the user.
+    "default" is the presumed answer if the user just hits .
+        It must be "yes" (the default), "no" or None (meaning
+        an answer is required of the user).
+
+    The "answer" return value is True for "yes" or False for "no".
+
+    Credit goes to (c) https://stackoverflow.com/questions/3041986/apt-command-line-interface-like-yes-no-input
+    """
+    valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False}
+    if default is None:
+        prompt = " [y/n] "
+    elif default == "yes":
+        prompt = " [Y/n] "
+    elif default == "no":
+        prompt = " [y/N] "
+    else:
+        raise ValueError("invalid default answer: '%s'" % default)
+
+    while True:
+        sys.stdout.write(question + prompt)
+        choice = input().lower()
+        if default is not None and choice == "":
+            return valid[default]
+        elif choice in valid:
+            return valid[choice]
+        else:
+            sys.stdout.write("Please respond with 'yes' or 'no' " "(or 'y' or 'n').\n")
+
+
+def cli_detect(argv: Optional[List[str]] = None) -> int:
+    """
+    CLI assistant using ARGV and ArgumentParser
+    :param argv:
+    :return: 0 if everything is fine, anything else equal trouble
+    """
+    parser = argparse.ArgumentParser(
+        description="The Real First Universal Charset Detector. "
+        "Discover originating encoding used on text file. "
+        "Normalize text to unicode."
+    )
+
+    parser.add_argument(
+        "files", type=argparse.FileType("rb"), nargs="+", help="File(s) to be analysed"
+    )
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="store_true",
+        default=False,
+        dest="verbose",
+        help="Display complementary information about file if any. "
+        "Stdout will contain logs about the detection process.",
+    )
+    parser.add_argument(
+        "-a",
+        "--with-alternative",
+        action="store_true",
+        default=False,
+        dest="alternatives",
+        help="Output complementary possibilities if any. Top-level JSON WILL be a list.",
+    )
+    parser.add_argument(
+        "-n",
+        "--normalize",
+        action="store_true",
+        default=False,
+        dest="normalize",
+        help="Permit to normalize input file. If not set, program does not write anything.",
+    )
+    parser.add_argument(
+        "-m",
+        "--minimal",
+        action="store_true",
+        default=False,
+        dest="minimal",
+        help="Only output the charset detected to STDOUT. Disabling JSON output.",
+    )
+    parser.add_argument(
+        "-r",
+        "--replace",
+        action="store_true",
+        default=False,
+        dest="replace",
+        help="Replace file when trying to normalize it instead of creating a new one.",
+    )
+    parser.add_argument(
+        "-f",
+        "--force",
+        action="store_true",
+        default=False,
+        dest="force",
+        help="Replace file without asking if you are sure, use this flag with caution.",
+    )
+    parser.add_argument(
+        "-t",
+        "--threshold",
+        action="store",
+        default=0.2,
+        type=float,
+        dest="threshold",
+        help="Define a custom maximum amount of chaos allowed in decoded content. 0. <= chaos <= 1.",
+    )
+    parser.add_argument(
+        "--version",
+        action="version",
+        version="Charset-Normalizer {} - Python {} - Unicode {} - SpeedUp {}".format(
+            __version__,
+            python_version(),
+            unidata_version,
+            "OFF" if md_module.__file__.lower().endswith(".py") else "ON",
+        ),
+        help="Show version information and exit.",
+    )
+
+    args = parser.parse_args(argv)
+
+    if args.replace is True and args.normalize is False:
+        print("Use --replace in addition of --normalize only.", file=sys.stderr)
+        return 1
+
+    if args.force is True and args.replace is False:
+        print("Use --force in addition of --replace only.", file=sys.stderr)
+        return 1
+
+    if args.threshold < 0.0 or args.threshold > 1.0:
+        print("--threshold VALUE should be between 0. AND 1.", file=sys.stderr)
+        return 1
+
+    x_ = []
+
+    for my_file in args.files:
+        matches = from_fp(my_file, threshold=args.threshold, explain=args.verbose)
+
+        best_guess = matches.best()
+
+        if best_guess is None:
+            print(
+                'Unable to identify originating encoding for "{}". {}'.format(
+                    my_file.name,
+                    "Maybe try increasing maximum amount of chaos."
+                    if args.threshold < 1.0
+                    else "",
+                ),
+                file=sys.stderr,
+            )
+            x_.append(
+                CliDetectionResult(
+                    abspath(my_file.name),
+                    None,
+                    [],
+                    [],
+                    "Unknown",
+                    [],
+                    False,
+                    1.0,
+                    0.0,
+                    None,
+                    True,
+                )
+            )
+        else:
+            x_.append(
+                CliDetectionResult(
+                    abspath(my_file.name),
+                    best_guess.encoding,
+                    best_guess.encoding_aliases,
+                    [
+                        cp
+                        for cp in best_guess.could_be_from_charset
+                        if cp != best_guess.encoding
+                    ],
+                    best_guess.language,
+                    best_guess.alphabets,
+                    best_guess.bom,
+                    best_guess.percent_chaos,
+                    best_guess.percent_coherence,
+                    None,
+                    True,
+                )
+            )
+
+            if len(matches) > 1 and args.alternatives:
+                for el in matches:
+                    if el != best_guess:
+                        x_.append(
+                            CliDetectionResult(
+                                abspath(my_file.name),
+                                el.encoding,
+                                el.encoding_aliases,
+                                [
+                                    cp
+                                    for cp in el.could_be_from_charset
+                                    if cp != el.encoding
+                                ],
+                                el.language,
+                                el.alphabets,
+                                el.bom,
+                                el.percent_chaos,
+                                el.percent_coherence,
+                                None,
+                                False,
+                            )
+                        )
+
+            if args.normalize is True:
+                if best_guess.encoding.startswith("utf") is True:
+                    print(
+                        '"{}" file does not need to be normalized, as it already came from unicode.'.format(
+                            my_file.name
+                        ),
+                        file=sys.stderr,
+                    )
+                    if my_file.closed is False:
+                        my_file.close()
+                    continue
+
+                dir_path = dirname(realpath(my_file.name))
+                file_name = basename(realpath(my_file.name))
+
+                o_: List[str] = file_name.split(".")
+
+                if args.replace is False:
+                    o_.insert(-1, best_guess.encoding)
+                    if my_file.closed is False:
+                        my_file.close()
+                elif (
+                    args.force is False
+                    and query_yes_no(
+                        'Are you sure to normalize "{}" by replacing it ?'.format(
+                            my_file.name
+                        ),
+                        "no",
+                    )
+                    is False
+                ):
+                    if my_file.closed is False:
+                        my_file.close()
+                    continue
+
+                try:
+                    x_[0].unicode_path = join(dir_path, ".".join(o_))
+
+                    with open(x_[0].unicode_path, "w", encoding="utf-8") as fp:
+                        fp.write(str(best_guess))
+                except IOError as e:
+                    print(str(e), file=sys.stderr)
+                    if my_file.closed is False:
+                        my_file.close()
+                    return 2
+
+        if my_file.closed is False:
+            my_file.close()
+
+    if args.minimal is False:
+        print(
+            dumps(
+                [el.__dict__ for el in x_] if len(x_) > 1 else x_[0].__dict__,
+                ensure_ascii=True,
+                indent=4,
+            )
+        )
+    else:
+        for my_file in args.files:
+            print(
+                ", ".join(
+                    [
+                        el.encoding or "undefined"
+                        for el in x_
+                        if el.path == abspath(my_file.name)
+                    ]
+                )
+            )
+
+    return 0
+
+
+if __name__ == "__main__":
+    cli_detect()
diff --git a/src/pip/_vendor/charset_normalizer/constant.py b/src/pip/_vendor/charset_normalizer/constant.py
new file mode 100644
index 00000000000..863490461ea
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/constant.py
@@ -0,0 +1,1995 @@
+# -*- coding: utf-8 -*-
+from codecs import BOM_UTF8, BOM_UTF16_BE, BOM_UTF16_LE, BOM_UTF32_BE, BOM_UTF32_LE
+from encodings.aliases import aliases
+from re import IGNORECASE, compile as re_compile
+from typing import Dict, List, Set, Union
+
+# Contain for each eligible encoding a list of/item bytes SIG/BOM
+ENCODING_MARKS: Dict[str, Union[bytes, List[bytes]]] = {
+    "utf_8": BOM_UTF8,
+    "utf_7": [
+        b"\x2b\x2f\x76\x38",
+        b"\x2b\x2f\x76\x39",
+        b"\x2b\x2f\x76\x2b",
+        b"\x2b\x2f\x76\x2f",
+        b"\x2b\x2f\x76\x38\x2d",
+    ],
+    "gb18030": b"\x84\x31\x95\x33",
+    "utf_32": [BOM_UTF32_BE, BOM_UTF32_LE],
+    "utf_16": [BOM_UTF16_BE, BOM_UTF16_LE],
+}
+
+TOO_SMALL_SEQUENCE: int = 32
+TOO_BIG_SEQUENCE: int = int(10e6)
+
+UTF8_MAXIMAL_ALLOCATION: int = 1_112_064
+
+# Up-to-date Unicode ucd/15.0.0
+UNICODE_RANGES_COMBINED: Dict[str, range] = {
+    "Control character": range(32),
+    "Basic Latin": range(32, 128),
+    "Latin-1 Supplement": range(128, 256),
+    "Latin Extended-A": range(256, 384),
+    "Latin Extended-B": range(384, 592),
+    "IPA Extensions": range(592, 688),
+    "Spacing Modifier Letters": range(688, 768),
+    "Combining Diacritical Marks": range(768, 880),
+    "Greek and Coptic": range(880, 1024),
+    "Cyrillic": range(1024, 1280),
+    "Cyrillic Supplement": range(1280, 1328),
+    "Armenian": range(1328, 1424),
+    "Hebrew": range(1424, 1536),
+    "Arabic": range(1536, 1792),
+    "Syriac": range(1792, 1872),
+    "Arabic Supplement": range(1872, 1920),
+    "Thaana": range(1920, 1984),
+    "NKo": range(1984, 2048),
+    "Samaritan": range(2048, 2112),
+    "Mandaic": range(2112, 2144),
+    "Syriac Supplement": range(2144, 2160),
+    "Arabic Extended-B": range(2160, 2208),
+    "Arabic Extended-A": range(2208, 2304),
+    "Devanagari": range(2304, 2432),
+    "Bengali": range(2432, 2560),
+    "Gurmukhi": range(2560, 2688),
+    "Gujarati": range(2688, 2816),
+    "Oriya": range(2816, 2944),
+    "Tamil": range(2944, 3072),
+    "Telugu": range(3072, 3200),
+    "Kannada": range(3200, 3328),
+    "Malayalam": range(3328, 3456),
+    "Sinhala": range(3456, 3584),
+    "Thai": range(3584, 3712),
+    "Lao": range(3712, 3840),
+    "Tibetan": range(3840, 4096),
+    "Myanmar": range(4096, 4256),
+    "Georgian": range(4256, 4352),
+    "Hangul Jamo": range(4352, 4608),
+    "Ethiopic": range(4608, 4992),
+    "Ethiopic Supplement": range(4992, 5024),
+    "Cherokee": range(5024, 5120),
+    "Unified Canadian Aboriginal Syllabics": range(5120, 5760),
+    "Ogham": range(5760, 5792),
+    "Runic": range(5792, 5888),
+    "Tagalog": range(5888, 5920),
+    "Hanunoo": range(5920, 5952),
+    "Buhid": range(5952, 5984),
+    "Tagbanwa": range(5984, 6016),
+    "Khmer": range(6016, 6144),
+    "Mongolian": range(6144, 6320),
+    "Unified Canadian Aboriginal Syllabics Extended": range(6320, 6400),
+    "Limbu": range(6400, 6480),
+    "Tai Le": range(6480, 6528),
+    "New Tai Lue": range(6528, 6624),
+    "Khmer Symbols": range(6624, 6656),
+    "Buginese": range(6656, 6688),
+    "Tai Tham": range(6688, 6832),
+    "Combining Diacritical Marks Extended": range(6832, 6912),
+    "Balinese": range(6912, 7040),
+    "Sundanese": range(7040, 7104),
+    "Batak": range(7104, 7168),
+    "Lepcha": range(7168, 7248),
+    "Ol Chiki": range(7248, 7296),
+    "Cyrillic Extended-C": range(7296, 7312),
+    "Georgian Extended": range(7312, 7360),
+    "Sundanese Supplement": range(7360, 7376),
+    "Vedic Extensions": range(7376, 7424),
+    "Phonetic Extensions": range(7424, 7552),
+    "Phonetic Extensions Supplement": range(7552, 7616),
+    "Combining Diacritical Marks Supplement": range(7616, 7680),
+    "Latin Extended Additional": range(7680, 7936),
+    "Greek Extended": range(7936, 8192),
+    "General Punctuation": range(8192, 8304),
+    "Superscripts and Subscripts": range(8304, 8352),
+    "Currency Symbols": range(8352, 8400),
+    "Combining Diacritical Marks for Symbols": range(8400, 8448),
+    "Letterlike Symbols": range(8448, 8528),
+    "Number Forms": range(8528, 8592),
+    "Arrows": range(8592, 8704),
+    "Mathematical Operators": range(8704, 8960),
+    "Miscellaneous Technical": range(8960, 9216),
+    "Control Pictures": range(9216, 9280),
+    "Optical Character Recognition": range(9280, 9312),
+    "Enclosed Alphanumerics": range(9312, 9472),
+    "Box Drawing": range(9472, 9600),
+    "Block Elements": range(9600, 9632),
+    "Geometric Shapes": range(9632, 9728),
+    "Miscellaneous Symbols": range(9728, 9984),
+    "Dingbats": range(9984, 10176),
+    "Miscellaneous Mathematical Symbols-A": range(10176, 10224),
+    "Supplemental Arrows-A": range(10224, 10240),
+    "Braille Patterns": range(10240, 10496),
+    "Supplemental Arrows-B": range(10496, 10624),
+    "Miscellaneous Mathematical Symbols-B": range(10624, 10752),
+    "Supplemental Mathematical Operators": range(10752, 11008),
+    "Miscellaneous Symbols and Arrows": range(11008, 11264),
+    "Glagolitic": range(11264, 11360),
+    "Latin Extended-C": range(11360, 11392),
+    "Coptic": range(11392, 11520),
+    "Georgian Supplement": range(11520, 11568),
+    "Tifinagh": range(11568, 11648),
+    "Ethiopic Extended": range(11648, 11744),
+    "Cyrillic Extended-A": range(11744, 11776),
+    "Supplemental Punctuation": range(11776, 11904),
+    "CJK Radicals Supplement": range(11904, 12032),
+    "Kangxi Radicals": range(12032, 12256),
+    "Ideographic Description Characters": range(12272, 12288),
+    "CJK Symbols and Punctuation": range(12288, 12352),
+    "Hiragana": range(12352, 12448),
+    "Katakana": range(12448, 12544),
+    "Bopomofo": range(12544, 12592),
+    "Hangul Compatibility Jamo": range(12592, 12688),
+    "Kanbun": range(12688, 12704),
+    "Bopomofo Extended": range(12704, 12736),
+    "CJK Strokes": range(12736, 12784),
+    "Katakana Phonetic Extensions": range(12784, 12800),
+    "Enclosed CJK Letters and Months": range(12800, 13056),
+    "CJK Compatibility": range(13056, 13312),
+    "CJK Unified Ideographs Extension A": range(13312, 19904),
+    "Yijing Hexagram Symbols": range(19904, 19968),
+    "CJK Unified Ideographs": range(19968, 40960),
+    "Yi Syllables": range(40960, 42128),
+    "Yi Radicals": range(42128, 42192),
+    "Lisu": range(42192, 42240),
+    "Vai": range(42240, 42560),
+    "Cyrillic Extended-B": range(42560, 42656),
+    "Bamum": range(42656, 42752),
+    "Modifier Tone Letters": range(42752, 42784),
+    "Latin Extended-D": range(42784, 43008),
+    "Syloti Nagri": range(43008, 43056),
+    "Common Indic Number Forms": range(43056, 43072),
+    "Phags-pa": range(43072, 43136),
+    "Saurashtra": range(43136, 43232),
+    "Devanagari Extended": range(43232, 43264),
+    "Kayah Li": range(43264, 43312),
+    "Rejang": range(43312, 43360),
+    "Hangul Jamo Extended-A": range(43360, 43392),
+    "Javanese": range(43392, 43488),
+    "Myanmar Extended-B": range(43488, 43520),
+    "Cham": range(43520, 43616),
+    "Myanmar Extended-A": range(43616, 43648),
+    "Tai Viet": range(43648, 43744),
+    "Meetei Mayek Extensions": range(43744, 43776),
+    "Ethiopic Extended-A": range(43776, 43824),
+    "Latin Extended-E": range(43824, 43888),
+    "Cherokee Supplement": range(43888, 43968),
+    "Meetei Mayek": range(43968, 44032),
+    "Hangul Syllables": range(44032, 55216),
+    "Hangul Jamo Extended-B": range(55216, 55296),
+    "High Surrogates": range(55296, 56192),
+    "High Private Use Surrogates": range(56192, 56320),
+    "Low Surrogates": range(56320, 57344),
+    "Private Use Area": range(57344, 63744),
+    "CJK Compatibility Ideographs": range(63744, 64256),
+    "Alphabetic Presentation Forms": range(64256, 64336),
+    "Arabic Presentation Forms-A": range(64336, 65024),
+    "Variation Selectors": range(65024, 65040),
+    "Vertical Forms": range(65040, 65056),
+    "Combining Half Marks": range(65056, 65072),
+    "CJK Compatibility Forms": range(65072, 65104),
+    "Small Form Variants": range(65104, 65136),
+    "Arabic Presentation Forms-B": range(65136, 65280),
+    "Halfwidth and Fullwidth Forms": range(65280, 65520),
+    "Specials": range(65520, 65536),
+    "Linear B Syllabary": range(65536, 65664),
+    "Linear B Ideograms": range(65664, 65792),
+    "Aegean Numbers": range(65792, 65856),
+    "Ancient Greek Numbers": range(65856, 65936),
+    "Ancient Symbols": range(65936, 66000),
+    "Phaistos Disc": range(66000, 66048),
+    "Lycian": range(66176, 66208),
+    "Carian": range(66208, 66272),
+    "Coptic Epact Numbers": range(66272, 66304),
+    "Old Italic": range(66304, 66352),
+    "Gothic": range(66352, 66384),
+    "Old Permic": range(66384, 66432),
+    "Ugaritic": range(66432, 66464),
+    "Old Persian": range(66464, 66528),
+    "Deseret": range(66560, 66640),
+    "Shavian": range(66640, 66688),
+    "Osmanya": range(66688, 66736),
+    "Osage": range(66736, 66816),
+    "Elbasan": range(66816, 66864),
+    "Caucasian Albanian": range(66864, 66928),
+    "Vithkuqi": range(66928, 67008),
+    "Linear A": range(67072, 67456),
+    "Latin Extended-F": range(67456, 67520),
+    "Cypriot Syllabary": range(67584, 67648),
+    "Imperial Aramaic": range(67648, 67680),
+    "Palmyrene": range(67680, 67712),
+    "Nabataean": range(67712, 67760),
+    "Hatran": range(67808, 67840),
+    "Phoenician": range(67840, 67872),
+    "Lydian": range(67872, 67904),
+    "Meroitic Hieroglyphs": range(67968, 68000),
+    "Meroitic Cursive": range(68000, 68096),
+    "Kharoshthi": range(68096, 68192),
+    "Old South Arabian": range(68192, 68224),
+    "Old North Arabian": range(68224, 68256),
+    "Manichaean": range(68288, 68352),
+    "Avestan": range(68352, 68416),
+    "Inscriptional Parthian": range(68416, 68448),
+    "Inscriptional Pahlavi": range(68448, 68480),
+    "Psalter Pahlavi": range(68480, 68528),
+    "Old Turkic": range(68608, 68688),
+    "Old Hungarian": range(68736, 68864),
+    "Hanifi Rohingya": range(68864, 68928),
+    "Rumi Numeral Symbols": range(69216, 69248),
+    "Yezidi": range(69248, 69312),
+    "Arabic Extended-C": range(69312, 69376),
+    "Old Sogdian": range(69376, 69424),
+    "Sogdian": range(69424, 69488),
+    "Old Uyghur": range(69488, 69552),
+    "Chorasmian": range(69552, 69600),
+    "Elymaic": range(69600, 69632),
+    "Brahmi": range(69632, 69760),
+    "Kaithi": range(69760, 69840),
+    "Sora Sompeng": range(69840, 69888),
+    "Chakma": range(69888, 69968),
+    "Mahajani": range(69968, 70016),
+    "Sharada": range(70016, 70112),
+    "Sinhala Archaic Numbers": range(70112, 70144),
+    "Khojki": range(70144, 70224),
+    "Multani": range(70272, 70320),
+    "Khudawadi": range(70320, 70400),
+    "Grantha": range(70400, 70528),
+    "Newa": range(70656, 70784),
+    "Tirhuta": range(70784, 70880),
+    "Siddham": range(71040, 71168),
+    "Modi": range(71168, 71264),
+    "Mongolian Supplement": range(71264, 71296),
+    "Takri": range(71296, 71376),
+    "Ahom": range(71424, 71504),
+    "Dogra": range(71680, 71760),
+    "Warang Citi": range(71840, 71936),
+    "Dives Akuru": range(71936, 72032),
+    "Nandinagari": range(72096, 72192),
+    "Zanabazar Square": range(72192, 72272),
+    "Soyombo": range(72272, 72368),
+    "Unified Canadian Aboriginal Syllabics Extended-A": range(72368, 72384),
+    "Pau Cin Hau": range(72384, 72448),
+    "Devanagari Extended-A": range(72448, 72544),
+    "Bhaiksuki": range(72704, 72816),
+    "Marchen": range(72816, 72896),
+    "Masaram Gondi": range(72960, 73056),
+    "Gunjala Gondi": range(73056, 73136),
+    "Makasar": range(73440, 73472),
+    "Kawi": range(73472, 73568),
+    "Lisu Supplement": range(73648, 73664),
+    "Tamil Supplement": range(73664, 73728),
+    "Cuneiform": range(73728, 74752),
+    "Cuneiform Numbers and Punctuation": range(74752, 74880),
+    "Early Dynastic Cuneiform": range(74880, 75088),
+    "Cypro-Minoan": range(77712, 77824),
+    "Egyptian Hieroglyphs": range(77824, 78896),
+    "Egyptian Hieroglyph Format Controls": range(78896, 78944),
+    "Anatolian Hieroglyphs": range(82944, 83584),
+    "Bamum Supplement": range(92160, 92736),
+    "Mro": range(92736, 92784),
+    "Tangsa": range(92784, 92880),
+    "Bassa Vah": range(92880, 92928),
+    "Pahawh Hmong": range(92928, 93072),
+    "Medefaidrin": range(93760, 93856),
+    "Miao": range(93952, 94112),
+    "Ideographic Symbols and Punctuation": range(94176, 94208),
+    "Tangut": range(94208, 100352),
+    "Tangut Components": range(100352, 101120),
+    "Khitan Small Script": range(101120, 101632),
+    "Tangut Supplement": range(101632, 101760),
+    "Kana Extended-B": range(110576, 110592),
+    "Kana Supplement": range(110592, 110848),
+    "Kana Extended-A": range(110848, 110896),
+    "Small Kana Extension": range(110896, 110960),
+    "Nushu": range(110960, 111360),
+    "Duployan": range(113664, 113824),
+    "Shorthand Format Controls": range(113824, 113840),
+    "Znamenny Musical Notation": range(118528, 118736),
+    "Byzantine Musical Symbols": range(118784, 119040),
+    "Musical Symbols": range(119040, 119296),
+    "Ancient Greek Musical Notation": range(119296, 119376),
+    "Kaktovik Numerals": range(119488, 119520),
+    "Mayan Numerals": range(119520, 119552),
+    "Tai Xuan Jing Symbols": range(119552, 119648),
+    "Counting Rod Numerals": range(119648, 119680),
+    "Mathematical Alphanumeric Symbols": range(119808, 120832),
+    "Sutton SignWriting": range(120832, 121520),
+    "Latin Extended-G": range(122624, 122880),
+    "Glagolitic Supplement": range(122880, 122928),
+    "Cyrillic Extended-D": range(122928, 123024),
+    "Nyiakeng Puachue Hmong": range(123136, 123216),
+    "Toto": range(123536, 123584),
+    "Wancho": range(123584, 123648),
+    "Nag Mundari": range(124112, 124160),
+    "Ethiopic Extended-B": range(124896, 124928),
+    "Mende Kikakui": range(124928, 125152),
+    "Adlam": range(125184, 125280),
+    "Indic Siyaq Numbers": range(126064, 126144),
+    "Ottoman Siyaq Numbers": range(126208, 126288),
+    "Arabic Mathematical Alphabetic Symbols": range(126464, 126720),
+    "Mahjong Tiles": range(126976, 127024),
+    "Domino Tiles": range(127024, 127136),
+    "Playing Cards": range(127136, 127232),
+    "Enclosed Alphanumeric Supplement": range(127232, 127488),
+    "Enclosed Ideographic Supplement": range(127488, 127744),
+    "Miscellaneous Symbols and Pictographs": range(127744, 128512),
+    "Emoticons range(Emoji)": range(128512, 128592),
+    "Ornamental Dingbats": range(128592, 128640),
+    "Transport and Map Symbols": range(128640, 128768),
+    "Alchemical Symbols": range(128768, 128896),
+    "Geometric Shapes Extended": range(128896, 129024),
+    "Supplemental Arrows-C": range(129024, 129280),
+    "Supplemental Symbols and Pictographs": range(129280, 129536),
+    "Chess Symbols": range(129536, 129648),
+    "Symbols and Pictographs Extended-A": range(129648, 129792),
+    "Symbols for Legacy Computing": range(129792, 130048),
+    "CJK Unified Ideographs Extension B": range(131072, 173792),
+    "CJK Unified Ideographs Extension C": range(173824, 177984),
+    "CJK Unified Ideographs Extension D": range(177984, 178208),
+    "CJK Unified Ideographs Extension E": range(178208, 183984),
+    "CJK Unified Ideographs Extension F": range(183984, 191472),
+    "CJK Compatibility Ideographs Supplement": range(194560, 195104),
+    "CJK Unified Ideographs Extension G": range(196608, 201552),
+    "CJK Unified Ideographs Extension H": range(201552, 205744),
+    "Tags": range(917504, 917632),
+    "Variation Selectors Supplement": range(917760, 918000),
+    "Supplementary Private Use Area-A": range(983040, 1048576),
+    "Supplementary Private Use Area-B": range(1048576, 1114112),
+}
+
+
+UNICODE_SECONDARY_RANGE_KEYWORD: List[str] = [
+    "Supplement",
+    "Extended",
+    "Extensions",
+    "Modifier",
+    "Marks",
+    "Punctuation",
+    "Symbols",
+    "Forms",
+    "Operators",
+    "Miscellaneous",
+    "Drawing",
+    "Block",
+    "Shapes",
+    "Supplemental",
+    "Tags",
+]
+
+RE_POSSIBLE_ENCODING_INDICATION = re_compile(
+    r"(?:(?:encoding)|(?:charset)|(?:coding))(?:[\:= ]{1,10})(?:[\"\']?)([a-zA-Z0-9\-_]+)(?:[\"\']?)",
+    IGNORECASE,
+)
+
+IANA_NO_ALIASES = [
+    "cp720",
+    "cp737",
+    "cp856",
+    "cp874",
+    "cp875",
+    "cp1006",
+    "koi8_r",
+    "koi8_t",
+    "koi8_u",
+]
+
+IANA_SUPPORTED: List[str] = sorted(
+    filter(
+        lambda x: x.endswith("_codec") is False
+        and x not in {"rot_13", "tactis", "mbcs"},
+        list(set(aliases.values())) + IANA_NO_ALIASES,
+    )
+)
+
+IANA_SUPPORTED_COUNT: int = len(IANA_SUPPORTED)
+
+# pre-computed code page that are similar using the function cp_similarity.
+IANA_SUPPORTED_SIMILAR: Dict[str, List[str]] = {
+    "cp037": ["cp1026", "cp1140", "cp273", "cp500"],
+    "cp1026": ["cp037", "cp1140", "cp273", "cp500"],
+    "cp1125": ["cp866"],
+    "cp1140": ["cp037", "cp1026", "cp273", "cp500"],
+    "cp1250": ["iso8859_2"],
+    "cp1251": ["kz1048", "ptcp154"],
+    "cp1252": ["iso8859_15", "iso8859_9", "latin_1"],
+    "cp1253": ["iso8859_7"],
+    "cp1254": ["iso8859_15", "iso8859_9", "latin_1"],
+    "cp1257": ["iso8859_13"],
+    "cp273": ["cp037", "cp1026", "cp1140", "cp500"],
+    "cp437": ["cp850", "cp858", "cp860", "cp861", "cp862", "cp863", "cp865"],
+    "cp500": ["cp037", "cp1026", "cp1140", "cp273"],
+    "cp850": ["cp437", "cp857", "cp858", "cp865"],
+    "cp857": ["cp850", "cp858", "cp865"],
+    "cp858": ["cp437", "cp850", "cp857", "cp865"],
+    "cp860": ["cp437", "cp861", "cp862", "cp863", "cp865"],
+    "cp861": ["cp437", "cp860", "cp862", "cp863", "cp865"],
+    "cp862": ["cp437", "cp860", "cp861", "cp863", "cp865"],
+    "cp863": ["cp437", "cp860", "cp861", "cp862", "cp865"],
+    "cp865": ["cp437", "cp850", "cp857", "cp858", "cp860", "cp861", "cp862", "cp863"],
+    "cp866": ["cp1125"],
+    "iso8859_10": ["iso8859_14", "iso8859_15", "iso8859_4", "iso8859_9", "latin_1"],
+    "iso8859_11": ["tis_620"],
+    "iso8859_13": ["cp1257"],
+    "iso8859_14": [
+        "iso8859_10",
+        "iso8859_15",
+        "iso8859_16",
+        "iso8859_3",
+        "iso8859_9",
+        "latin_1",
+    ],
+    "iso8859_15": [
+        "cp1252",
+        "cp1254",
+        "iso8859_10",
+        "iso8859_14",
+        "iso8859_16",
+        "iso8859_3",
+        "iso8859_9",
+        "latin_1",
+    ],
+    "iso8859_16": [
+        "iso8859_14",
+        "iso8859_15",
+        "iso8859_2",
+        "iso8859_3",
+        "iso8859_9",
+        "latin_1",
+    ],
+    "iso8859_2": ["cp1250", "iso8859_16", "iso8859_4"],
+    "iso8859_3": ["iso8859_14", "iso8859_15", "iso8859_16", "iso8859_9", "latin_1"],
+    "iso8859_4": ["iso8859_10", "iso8859_2", "iso8859_9", "latin_1"],
+    "iso8859_7": ["cp1253"],
+    "iso8859_9": [
+        "cp1252",
+        "cp1254",
+        "cp1258",
+        "iso8859_10",
+        "iso8859_14",
+        "iso8859_15",
+        "iso8859_16",
+        "iso8859_3",
+        "iso8859_4",
+        "latin_1",
+    ],
+    "kz1048": ["cp1251", "ptcp154"],
+    "latin_1": [
+        "cp1252",
+        "cp1254",
+        "cp1258",
+        "iso8859_10",
+        "iso8859_14",
+        "iso8859_15",
+        "iso8859_16",
+        "iso8859_3",
+        "iso8859_4",
+        "iso8859_9",
+    ],
+    "mac_iceland": ["mac_roman", "mac_turkish"],
+    "mac_roman": ["mac_iceland", "mac_turkish"],
+    "mac_turkish": ["mac_iceland", "mac_roman"],
+    "ptcp154": ["cp1251", "kz1048"],
+    "tis_620": ["iso8859_11"],
+}
+
+
+CHARDET_CORRESPONDENCE: Dict[str, str] = {
+    "iso2022_kr": "ISO-2022-KR",
+    "iso2022_jp": "ISO-2022-JP",
+    "euc_kr": "EUC-KR",
+    "tis_620": "TIS-620",
+    "utf_32": "UTF-32",
+    "euc_jp": "EUC-JP",
+    "koi8_r": "KOI8-R",
+    "iso8859_1": "ISO-8859-1",
+    "iso8859_2": "ISO-8859-2",
+    "iso8859_5": "ISO-8859-5",
+    "iso8859_6": "ISO-8859-6",
+    "iso8859_7": "ISO-8859-7",
+    "iso8859_8": "ISO-8859-8",
+    "utf_16": "UTF-16",
+    "cp855": "IBM855",
+    "mac_cyrillic": "MacCyrillic",
+    "gb2312": "GB2312",
+    "gb18030": "GB18030",
+    "cp932": "CP932",
+    "cp866": "IBM866",
+    "utf_8": "utf-8",
+    "utf_8_sig": "UTF-8-SIG",
+    "shift_jis": "SHIFT_JIS",
+    "big5": "Big5",
+    "cp1250": "windows-1250",
+    "cp1251": "windows-1251",
+    "cp1252": "Windows-1252",
+    "cp1253": "windows-1253",
+    "cp1255": "windows-1255",
+    "cp1256": "windows-1256",
+    "cp1254": "Windows-1254",
+    "cp949": "CP949",
+}
+
+
+COMMON_SAFE_ASCII_CHARACTERS: Set[str] = {
+    "<",
+    ">",
+    "=",
+    ":",
+    "/",
+    "&",
+    ";",
+    "{",
+    "}",
+    "[",
+    "]",
+    ",",
+    "|",
+    '"',
+    "-",
+}
+
+
+KO_NAMES: Set[str] = {"johab", "cp949", "euc_kr"}
+ZH_NAMES: Set[str] = {"big5", "cp950", "big5hkscs", "hz"}
+
+# Logging LEVEL below DEBUG
+TRACE: int = 5
+
+
+# Language label that contain the em dash "—"
+# character are to be considered alternative seq to origin
+FREQUENCIES: Dict[str, List[str]] = {
+    "English": [
+        "e",
+        "a",
+        "t",
+        "i",
+        "o",
+        "n",
+        "s",
+        "r",
+        "h",
+        "l",
+        "d",
+        "c",
+        "u",
+        "m",
+        "f",
+        "p",
+        "g",
+        "w",
+        "y",
+        "b",
+        "v",
+        "k",
+        "x",
+        "j",
+        "z",
+        "q",
+    ],
+    "English—": [
+        "e",
+        "a",
+        "t",
+        "i",
+        "o",
+        "n",
+        "s",
+        "r",
+        "h",
+        "l",
+        "d",
+        "c",
+        "m",
+        "u",
+        "f",
+        "p",
+        "g",
+        "w",
+        "b",
+        "y",
+        "v",
+        "k",
+        "j",
+        "x",
+        "z",
+        "q",
+    ],
+    "German": [
+        "e",
+        "n",
+        "i",
+        "r",
+        "s",
+        "t",
+        "a",
+        "d",
+        "h",
+        "u",
+        "l",
+        "g",
+        "o",
+        "c",
+        "m",
+        "b",
+        "f",
+        "k",
+        "w",
+        "z",
+        "p",
+        "v",
+        "ü",
+        "ä",
+        "ö",
+        "j",
+    ],
+    "French": [
+        "e",
+        "a",
+        "s",
+        "n",
+        "i",
+        "t",
+        "r",
+        "l",
+        "u",
+        "o",
+        "d",
+        "c",
+        "p",
+        "m",
+        "é",
+        "v",
+        "g",
+        "f",
+        "b",
+        "h",
+        "q",
+        "à",
+        "x",
+        "è",
+        "y",
+        "j",
+    ],
+    "Dutch": [
+        "e",
+        "n",
+        "a",
+        "i",
+        "r",
+        "t",
+        "o",
+        "d",
+        "s",
+        "l",
+        "g",
+        "h",
+        "v",
+        "m",
+        "u",
+        "k",
+        "c",
+        "p",
+        "b",
+        "w",
+        "j",
+        "z",
+        "f",
+        "y",
+        "x",
+        "ë",
+    ],
+    "Italian": [
+        "e",
+        "i",
+        "a",
+        "o",
+        "n",
+        "l",
+        "t",
+        "r",
+        "s",
+        "c",
+        "d",
+        "u",
+        "p",
+        "m",
+        "g",
+        "v",
+        "f",
+        "b",
+        "z",
+        "h",
+        "q",
+        "è",
+        "à",
+        "k",
+        "y",
+        "ò",
+    ],
+    "Polish": [
+        "a",
+        "i",
+        "o",
+        "e",
+        "n",
+        "r",
+        "z",
+        "w",
+        "s",
+        "c",
+        "t",
+        "k",
+        "y",
+        "d",
+        "p",
+        "m",
+        "u",
+        "l",
+        "j",
+        "ł",
+        "g",
+        "b",
+        "h",
+        "ą",
+        "ę",
+        "ó",
+    ],
+    "Spanish": [
+        "e",
+        "a",
+        "o",
+        "n",
+        "s",
+        "r",
+        "i",
+        "l",
+        "d",
+        "t",
+        "c",
+        "u",
+        "m",
+        "p",
+        "b",
+        "g",
+        "v",
+        "f",
+        "y",
+        "ó",
+        "h",
+        "q",
+        "í",
+        "j",
+        "z",
+        "á",
+    ],
+    "Russian": [
+        "о",
+        "а",
+        "е",
+        "и",
+        "н",
+        "с",
+        "т",
+        "р",
+        "в",
+        "л",
+        "к",
+        "м",
+        "д",
+        "п",
+        "у",
+        "г",
+        "я",
+        "ы",
+        "з",
+        "б",
+        "й",
+        "ь",
+        "ч",
+        "х",
+        "ж",
+        "ц",
+    ],
+    # Jap-Kanji
+    "Japanese": [
+        "人",
+        "一",
+        "大",
+        "亅",
+        "丁",
+        "丨",
+        "竹",
+        "笑",
+        "口",
+        "日",
+        "今",
+        "二",
+        "彳",
+        "行",
+        "十",
+        "土",
+        "丶",
+        "寸",
+        "寺",
+        "時",
+        "乙",
+        "丿",
+        "乂",
+        "气",
+        "気",
+        "冂",
+        "巾",
+        "亠",
+        "市",
+        "目",
+        "儿",
+        "見",
+        "八",
+        "小",
+        "凵",
+        "県",
+        "月",
+        "彐",
+        "門",
+        "間",
+        "木",
+        "東",
+        "山",
+        "出",
+        "本",
+        "中",
+        "刀",
+        "分",
+        "耳",
+        "又",
+        "取",
+        "最",
+        "言",
+        "田",
+        "心",
+        "思",
+        "刂",
+        "前",
+        "京",
+        "尹",
+        "事",
+        "生",
+        "厶",
+        "云",
+        "会",
+        "未",
+        "来",
+        "白",
+        "冫",
+        "楽",
+        "灬",
+        "馬",
+        "尸",
+        "尺",
+        "駅",
+        "明",
+        "耂",
+        "者",
+        "了",
+        "阝",
+        "都",
+        "高",
+        "卜",
+        "占",
+        "厂",
+        "广",
+        "店",
+        "子",
+        "申",
+        "奄",
+        "亻",
+        "俺",
+        "上",
+        "方",
+        "冖",
+        "学",
+        "衣",
+        "艮",
+        "食",
+        "自",
+    ],
+    # Jap-Katakana
+    "Japanese—": [
+        "ー",
+        "ン",
+        "ス",
+        "・",
+        "ル",
+        "ト",
+        "リ",
+        "イ",
+        "ア",
+        "ラ",
+        "ッ",
+        "ク",
+        "ド",
+        "シ",
+        "レ",
+        "ジ",
+        "タ",
+        "フ",
+        "ロ",
+        "カ",
+        "テ",
+        "マ",
+        "ィ",
+        "グ",
+        "バ",
+        "ム",
+        "プ",
+        "オ",
+        "コ",
+        "デ",
+        "ニ",
+        "ウ",
+        "メ",
+        "サ",
+        "ビ",
+        "ナ",
+        "ブ",
+        "ャ",
+        "エ",
+        "ュ",
+        "チ",
+        "キ",
+        "ズ",
+        "ダ",
+        "パ",
+        "ミ",
+        "ェ",
+        "ョ",
+        "ハ",
+        "セ",
+        "ベ",
+        "ガ",
+        "モ",
+        "ツ",
+        "ネ",
+        "ボ",
+        "ソ",
+        "ノ",
+        "ァ",
+        "ヴ",
+        "ワ",
+        "ポ",
+        "ペ",
+        "ピ",
+        "ケ",
+        "ゴ",
+        "ギ",
+        "ザ",
+        "ホ",
+        "ゲ",
+        "ォ",
+        "ヤ",
+        "ヒ",
+        "ユ",
+        "ヨ",
+        "ヘ",
+        "ゼ",
+        "ヌ",
+        "ゥ",
+        "ゾ",
+        "ヶ",
+        "ヂ",
+        "ヲ",
+        "ヅ",
+        "ヵ",
+        "ヱ",
+        "ヰ",
+        "ヮ",
+        "ヽ",
+        "゠",
+        "ヾ",
+        "ヷ",
+        "ヿ",
+        "ヸ",
+        "ヹ",
+        "ヺ",
+    ],
+    # Jap-Hiragana
+    "Japanese——": [
+        "の",
+        "に",
+        "る",
+        "た",
+        "と",
+        "は",
+        "し",
+        "い",
+        "を",
+        "で",
+        "て",
+        "が",
+        "な",
+        "れ",
+        "か",
+        "ら",
+        "さ",
+        "っ",
+        "り",
+        "す",
+        "あ",
+        "も",
+        "こ",
+        "ま",
+        "う",
+        "く",
+        "よ",
+        "き",
+        "ん",
+        "め",
+        "お",
+        "け",
+        "そ",
+        "つ",
+        "だ",
+        "や",
+        "え",
+        "ど",
+        "わ",
+        "ち",
+        "み",
+        "せ",
+        "じ",
+        "ば",
+        "へ",
+        "び",
+        "ず",
+        "ろ",
+        "ほ",
+        "げ",
+        "む",
+        "べ",
+        "ひ",
+        "ょ",
+        "ゆ",
+        "ぶ",
+        "ご",
+        "ゃ",
+        "ね",
+        "ふ",
+        "ぐ",
+        "ぎ",
+        "ぼ",
+        "ゅ",
+        "づ",
+        "ざ",
+        "ぞ",
+        "ぬ",
+        "ぜ",
+        "ぱ",
+        "ぽ",
+        "ぷ",
+        "ぴ",
+        "ぃ",
+        "ぁ",
+        "ぇ",
+        "ぺ",
+        "ゞ",
+        "ぢ",
+        "ぉ",
+        "ぅ",
+        "ゐ",
+        "ゝ",
+        "ゑ",
+        "゛",
+        "゜",
+        "ゎ",
+        "ゔ",
+        "゚",
+        "ゟ",
+        "゙",
+        "ゕ",
+        "ゖ",
+    ],
+    "Portuguese": [
+        "a",
+        "e",
+        "o",
+        "s",
+        "i",
+        "r",
+        "d",
+        "n",
+        "t",
+        "m",
+        "u",
+        "c",
+        "l",
+        "p",
+        "g",
+        "v",
+        "b",
+        "f",
+        "h",
+        "ã",
+        "q",
+        "é",
+        "ç",
+        "á",
+        "z",
+        "í",
+    ],
+    "Swedish": [
+        "e",
+        "a",
+        "n",
+        "r",
+        "t",
+        "s",
+        "i",
+        "l",
+        "d",
+        "o",
+        "m",
+        "k",
+        "g",
+        "v",
+        "h",
+        "f",
+        "u",
+        "p",
+        "ä",
+        "c",
+        "b",
+        "ö",
+        "å",
+        "y",
+        "j",
+        "x",
+    ],
+    "Chinese": [
+        "的",
+        "一",
+        "是",
+        "不",
+        "了",
+        "在",
+        "人",
+        "有",
+        "我",
+        "他",
+        "这",
+        "个",
+        "们",
+        "中",
+        "来",
+        "上",
+        "大",
+        "为",
+        "和",
+        "国",
+        "地",
+        "到",
+        "以",
+        "说",
+        "时",
+        "要",
+        "就",
+        "出",
+        "会",
+        "可",
+        "也",
+        "你",
+        "对",
+        "生",
+        "能",
+        "而",
+        "子",
+        "那",
+        "得",
+        "于",
+        "着",
+        "下",
+        "自",
+        "之",
+        "年",
+        "过",
+        "发",
+        "后",
+        "作",
+        "里",
+        "用",
+        "道",
+        "行",
+        "所",
+        "然",
+        "家",
+        "种",
+        "事",
+        "成",
+        "方",
+        "多",
+        "经",
+        "么",
+        "去",
+        "法",
+        "学",
+        "如",
+        "都",
+        "同",
+        "现",
+        "当",
+        "没",
+        "动",
+        "面",
+        "起",
+        "看",
+        "定",
+        "天",
+        "分",
+        "还",
+        "进",
+        "好",
+        "小",
+        "部",
+        "其",
+        "些",
+        "主",
+        "样",
+        "理",
+        "心",
+        "她",
+        "本",
+        "前",
+        "开",
+        "但",
+        "因",
+        "只",
+        "从",
+        "想",
+        "实",
+    ],
+    "Ukrainian": [
+        "о",
+        "а",
+        "н",
+        "і",
+        "и",
+        "р",
+        "в",
+        "т",
+        "е",
+        "с",
+        "к",
+        "л",
+        "у",
+        "д",
+        "м",
+        "п",
+        "з",
+        "я",
+        "ь",
+        "б",
+        "г",
+        "й",
+        "ч",
+        "х",
+        "ц",
+        "ї",
+    ],
+    "Norwegian": [
+        "e",
+        "r",
+        "n",
+        "t",
+        "a",
+        "s",
+        "i",
+        "o",
+        "l",
+        "d",
+        "g",
+        "k",
+        "m",
+        "v",
+        "f",
+        "p",
+        "u",
+        "b",
+        "h",
+        "å",
+        "y",
+        "j",
+        "ø",
+        "c",
+        "æ",
+        "w",
+    ],
+    "Finnish": [
+        "a",
+        "i",
+        "n",
+        "t",
+        "e",
+        "s",
+        "l",
+        "o",
+        "u",
+        "k",
+        "ä",
+        "m",
+        "r",
+        "v",
+        "j",
+        "h",
+        "p",
+        "y",
+        "d",
+        "ö",
+        "g",
+        "c",
+        "b",
+        "f",
+        "w",
+        "z",
+    ],
+    "Vietnamese": [
+        "n",
+        "h",
+        "t",
+        "i",
+        "c",
+        "g",
+        "a",
+        "o",
+        "u",
+        "m",
+        "l",
+        "r",
+        "à",
+        "đ",
+        "s",
+        "e",
+        "v",
+        "p",
+        "b",
+        "y",
+        "ư",
+        "d",
+        "á",
+        "k",
+        "ộ",
+        "ế",
+    ],
+    "Czech": [
+        "o",
+        "e",
+        "a",
+        "n",
+        "t",
+        "s",
+        "i",
+        "l",
+        "v",
+        "r",
+        "k",
+        "d",
+        "u",
+        "m",
+        "p",
+        "í",
+        "c",
+        "h",
+        "z",
+        "á",
+        "y",
+        "j",
+        "b",
+        "ě",
+        "é",
+        "ř",
+    ],
+    "Hungarian": [
+        "e",
+        "a",
+        "t",
+        "l",
+        "s",
+        "n",
+        "k",
+        "r",
+        "i",
+        "o",
+        "z",
+        "á",
+        "é",
+        "g",
+        "m",
+        "b",
+        "y",
+        "v",
+        "d",
+        "h",
+        "u",
+        "p",
+        "j",
+        "ö",
+        "f",
+        "c",
+    ],
+    "Korean": [
+        "이",
+        "다",
+        "에",
+        "의",
+        "는",
+        "로",
+        "하",
+        "을",
+        "가",
+        "고",
+        "지",
+        "서",
+        "한",
+        "은",
+        "기",
+        "으",
+        "년",
+        "대",
+        "사",
+        "시",
+        "를",
+        "리",
+        "도",
+        "인",
+        "스",
+        "일",
+    ],
+    "Indonesian": [
+        "a",
+        "n",
+        "e",
+        "i",
+        "r",
+        "t",
+        "u",
+        "s",
+        "d",
+        "k",
+        "m",
+        "l",
+        "g",
+        "p",
+        "b",
+        "o",
+        "h",
+        "y",
+        "j",
+        "c",
+        "w",
+        "f",
+        "v",
+        "z",
+        "x",
+        "q",
+    ],
+    "Turkish": [
+        "a",
+        "e",
+        "i",
+        "n",
+        "r",
+        "l",
+        "ı",
+        "k",
+        "d",
+        "t",
+        "s",
+        "m",
+        "y",
+        "u",
+        "o",
+        "b",
+        "ü",
+        "ş",
+        "v",
+        "g",
+        "z",
+        "h",
+        "c",
+        "p",
+        "ç",
+        "ğ",
+    ],
+    "Romanian": [
+        "e",
+        "i",
+        "a",
+        "r",
+        "n",
+        "t",
+        "u",
+        "l",
+        "o",
+        "c",
+        "s",
+        "d",
+        "p",
+        "m",
+        "ă",
+        "f",
+        "v",
+        "î",
+        "g",
+        "b",
+        "ș",
+        "ț",
+        "z",
+        "h",
+        "â",
+        "j",
+    ],
+    "Farsi": [
+        "ا",
+        "ی",
+        "ر",
+        "د",
+        "ن",
+        "ه",
+        "و",
+        "م",
+        "ت",
+        "ب",
+        "س",
+        "ل",
+        "ک",
+        "ش",
+        "ز",
+        "ف",
+        "گ",
+        "ع",
+        "خ",
+        "ق",
+        "ج",
+        "آ",
+        "پ",
+        "ح",
+        "ط",
+        "ص",
+    ],
+    "Arabic": [
+        "ا",
+        "ل",
+        "ي",
+        "م",
+        "و",
+        "ن",
+        "ر",
+        "ت",
+        "ب",
+        "ة",
+        "ع",
+        "د",
+        "س",
+        "ف",
+        "ه",
+        "ك",
+        "ق",
+        "أ",
+        "ح",
+        "ج",
+        "ش",
+        "ط",
+        "ص",
+        "ى",
+        "خ",
+        "إ",
+    ],
+    "Danish": [
+        "e",
+        "r",
+        "n",
+        "t",
+        "a",
+        "i",
+        "s",
+        "d",
+        "l",
+        "o",
+        "g",
+        "m",
+        "k",
+        "f",
+        "v",
+        "u",
+        "b",
+        "h",
+        "p",
+        "å",
+        "y",
+        "ø",
+        "æ",
+        "c",
+        "j",
+        "w",
+    ],
+    "Serbian": [
+        "а",
+        "и",
+        "о",
+        "е",
+        "н",
+        "р",
+        "с",
+        "у",
+        "т",
+        "к",
+        "ј",
+        "в",
+        "д",
+        "м",
+        "п",
+        "л",
+        "г",
+        "з",
+        "б",
+        "a",
+        "i",
+        "e",
+        "o",
+        "n",
+        "ц",
+        "ш",
+    ],
+    "Lithuanian": [
+        "i",
+        "a",
+        "s",
+        "o",
+        "r",
+        "e",
+        "t",
+        "n",
+        "u",
+        "k",
+        "m",
+        "l",
+        "p",
+        "v",
+        "d",
+        "j",
+        "g",
+        "ė",
+        "b",
+        "y",
+        "ų",
+        "š",
+        "ž",
+        "c",
+        "ą",
+        "į",
+    ],
+    "Slovene": [
+        "e",
+        "a",
+        "i",
+        "o",
+        "n",
+        "r",
+        "s",
+        "l",
+        "t",
+        "j",
+        "v",
+        "k",
+        "d",
+        "p",
+        "m",
+        "u",
+        "z",
+        "b",
+        "g",
+        "h",
+        "č",
+        "c",
+        "š",
+        "ž",
+        "f",
+        "y",
+    ],
+    "Slovak": [
+        "o",
+        "a",
+        "e",
+        "n",
+        "i",
+        "r",
+        "v",
+        "t",
+        "s",
+        "l",
+        "k",
+        "d",
+        "m",
+        "p",
+        "u",
+        "c",
+        "h",
+        "j",
+        "b",
+        "z",
+        "á",
+        "y",
+        "ý",
+        "í",
+        "č",
+        "é",
+    ],
+    "Hebrew": [
+        "י",
+        "ו",
+        "ה",
+        "ל",
+        "ר",
+        "ב",
+        "ת",
+        "מ",
+        "א",
+        "ש",
+        "נ",
+        "ע",
+        "ם",
+        "ד",
+        "ק",
+        "ח",
+        "פ",
+        "ס",
+        "כ",
+        "ג",
+        "ט",
+        "צ",
+        "ן",
+        "ז",
+        "ך",
+    ],
+    "Bulgarian": [
+        "а",
+        "и",
+        "о",
+        "е",
+        "н",
+        "т",
+        "р",
+        "с",
+        "в",
+        "л",
+        "к",
+        "д",
+        "п",
+        "м",
+        "з",
+        "г",
+        "я",
+        "ъ",
+        "у",
+        "б",
+        "ч",
+        "ц",
+        "й",
+        "ж",
+        "щ",
+        "х",
+    ],
+    "Croatian": [
+        "a",
+        "i",
+        "o",
+        "e",
+        "n",
+        "r",
+        "j",
+        "s",
+        "t",
+        "u",
+        "k",
+        "l",
+        "v",
+        "d",
+        "m",
+        "p",
+        "g",
+        "z",
+        "b",
+        "c",
+        "č",
+        "h",
+        "š",
+        "ž",
+        "ć",
+        "f",
+    ],
+    "Hindi": [
+        "क",
+        "र",
+        "स",
+        "न",
+        "त",
+        "म",
+        "ह",
+        "प",
+        "य",
+        "ल",
+        "व",
+        "ज",
+        "द",
+        "ग",
+        "ब",
+        "श",
+        "ट",
+        "अ",
+        "ए",
+        "थ",
+        "भ",
+        "ड",
+        "च",
+        "ध",
+        "ष",
+        "इ",
+    ],
+    "Estonian": [
+        "a",
+        "i",
+        "e",
+        "s",
+        "t",
+        "l",
+        "u",
+        "n",
+        "o",
+        "k",
+        "r",
+        "d",
+        "m",
+        "v",
+        "g",
+        "p",
+        "j",
+        "h",
+        "ä",
+        "b",
+        "õ",
+        "ü",
+        "f",
+        "c",
+        "ö",
+        "y",
+    ],
+    "Thai": [
+        "า",
+        "น",
+        "ร",
+        "อ",
+        "ก",
+        "เ",
+        "ง",
+        "ม",
+        "ย",
+        "ล",
+        "ว",
+        "ด",
+        "ท",
+        "ส",
+        "ต",
+        "ะ",
+        "ป",
+        "บ",
+        "ค",
+        "ห",
+        "แ",
+        "จ",
+        "พ",
+        "ช",
+        "ข",
+        "ใ",
+    ],
+    "Greek": [
+        "α",
+        "τ",
+        "ο",
+        "ι",
+        "ε",
+        "ν",
+        "ρ",
+        "σ",
+        "κ",
+        "η",
+        "π",
+        "ς",
+        "υ",
+        "μ",
+        "λ",
+        "ί",
+        "ό",
+        "ά",
+        "γ",
+        "έ",
+        "δ",
+        "ή",
+        "ω",
+        "χ",
+        "θ",
+        "ύ",
+    ],
+    "Tamil": [
+        "க",
+        "த",
+        "ப",
+        "ட",
+        "ர",
+        "ம",
+        "ல",
+        "ன",
+        "வ",
+        "ற",
+        "ய",
+        "ள",
+        "ச",
+        "ந",
+        "இ",
+        "ண",
+        "அ",
+        "ஆ",
+        "ழ",
+        "ங",
+        "எ",
+        "உ",
+        "ஒ",
+        "ஸ",
+    ],
+    "Kazakh": [
+        "а",
+        "ы",
+        "е",
+        "н",
+        "т",
+        "р",
+        "л",
+        "і",
+        "д",
+        "с",
+        "м",
+        "қ",
+        "к",
+        "о",
+        "б",
+        "и",
+        "у",
+        "ғ",
+        "ж",
+        "ң",
+        "з",
+        "ш",
+        "й",
+        "п",
+        "г",
+        "ө",
+    ],
+}
+
+LANGUAGE_SUPPORTED_COUNT: int = len(FREQUENCIES)
diff --git a/src/pip/_vendor/charset_normalizer/legacy.py b/src/pip/_vendor/charset_normalizer/legacy.py
new file mode 100644
index 00000000000..43aad21a9dd
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/legacy.py
@@ -0,0 +1,54 @@
+from typing import Any, Dict, Optional, Union
+from warnings import warn
+
+from .api import from_bytes
+from .constant import CHARDET_CORRESPONDENCE
+
+
+def detect(
+    byte_str: bytes, should_rename_legacy: bool = False, **kwargs: Any
+) -> Dict[str, Optional[Union[str, float]]]:
+    """
+    chardet legacy method
+    Detect the encoding of the given byte string. It should be mostly backward-compatible.
+    Encoding name will match Chardet own writing whenever possible. (Not on encoding name unsupported by it)
+    This function is deprecated and should be used to migrate your project easily, consult the documentation for
+    further information. Not planned for removal.
+
+    :param byte_str:     The byte sequence to examine.
+    :param should_rename_legacy:  Should we rename legacy encodings
+                                  to their more modern equivalents?
+    """
+    if len(kwargs):
+        warn(
+            f"charset-normalizer disregard arguments '{','.join(list(kwargs.keys()))}' in legacy function detect()"
+        )
+
+    if not isinstance(byte_str, (bytearray, bytes)):
+        raise TypeError(  # pragma: nocover
+            "Expected object of type bytes or bytearray, got: "
+            "{0}".format(type(byte_str))
+        )
+
+    if isinstance(byte_str, bytearray):
+        byte_str = bytes(byte_str)
+
+    r = from_bytes(byte_str).best()
+
+    encoding = r.encoding if r is not None else None
+    language = r.language if r is not None and r.language != "Unknown" else ""
+    confidence = 1.0 - r.chaos if r is not None else None
+
+    # Note: CharsetNormalizer does not return 'UTF-8-SIG' as the sig get stripped in the detection/normalization process
+    # but chardet does return 'utf-8-sig' and it is a valid codec name.
+    if r is not None and encoding == "utf_8" and r.bom:
+        encoding += "_sig"
+
+    if should_rename_legacy is False and encoding in CHARDET_CORRESPONDENCE:
+        encoding = CHARDET_CORRESPONDENCE[encoding]
+
+    return {
+        "encoding": encoding,
+        "language": language,
+        "confidence": confidence,
+    }
diff --git a/src/pip/_vendor/charset_normalizer/md.py b/src/pip/_vendor/charset_normalizer/md.py
new file mode 100644
index 00000000000..77897aae4f4
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/md.py
@@ -0,0 +1,615 @@
+from functools import lru_cache
+from logging import getLogger
+from typing import List, Optional
+
+from .constant import (
+    COMMON_SAFE_ASCII_CHARACTERS,
+    TRACE,
+    UNICODE_SECONDARY_RANGE_KEYWORD,
+)
+from .utils import (
+    is_accentuated,
+    is_arabic,
+    is_arabic_isolated_form,
+    is_case_variable,
+    is_cjk,
+    is_emoticon,
+    is_hangul,
+    is_hiragana,
+    is_katakana,
+    is_latin,
+    is_punctuation,
+    is_separator,
+    is_symbol,
+    is_thai,
+    is_unprintable,
+    remove_accent,
+    unicode_range,
+)
+
+
+class MessDetectorPlugin:
+    """
+    Base abstract class used for mess detection plugins.
+    All detectors MUST extend and implement given methods.
+    """
+
+    def eligible(self, character: str) -> bool:
+        """
+        Determine if given character should be fed in.
+        """
+        raise NotImplementedError  # pragma: nocover
+
+    def feed(self, character: str) -> None:
+        """
+        The main routine to be executed upon character.
+        Insert the logic in witch the text would be considered chaotic.
+        """
+        raise NotImplementedError  # pragma: nocover
+
+    def reset(self) -> None:  # pragma: no cover
+        """
+        Permit to reset the plugin to the initial state.
+        """
+        raise NotImplementedError
+
+    @property
+    def ratio(self) -> float:
+        """
+        Compute the chaos ratio based on what your feed() has seen.
+        Must NOT be lower than 0.; No restriction gt 0.
+        """
+        raise NotImplementedError  # pragma: nocover
+
+
+class TooManySymbolOrPunctuationPlugin(MessDetectorPlugin):
+    def __init__(self) -> None:
+        self._punctuation_count: int = 0
+        self._symbol_count: int = 0
+        self._character_count: int = 0
+
+        self._last_printable_char: Optional[str] = None
+        self._frenzy_symbol_in_word: bool = False
+
+    def eligible(self, character: str) -> bool:
+        return character.isprintable()
+
+    def feed(self, character: str) -> None:
+        self._character_count += 1
+
+        if (
+            character != self._last_printable_char
+            and character not in COMMON_SAFE_ASCII_CHARACTERS
+        ):
+            if is_punctuation(character):
+                self._punctuation_count += 1
+            elif (
+                character.isdigit() is False
+                and is_symbol(character)
+                and is_emoticon(character) is False
+            ):
+                self._symbol_count += 2
+
+        self._last_printable_char = character
+
+    def reset(self) -> None:  # pragma: no cover
+        self._punctuation_count = 0
+        self._character_count = 0
+        self._symbol_count = 0
+
+    @property
+    def ratio(self) -> float:
+        if self._character_count == 0:
+            return 0.0
+
+        ratio_of_punctuation: float = (
+            self._punctuation_count + self._symbol_count
+        ) / self._character_count
+
+        return ratio_of_punctuation if ratio_of_punctuation >= 0.3 else 0.0
+
+
+class TooManyAccentuatedPlugin(MessDetectorPlugin):
+    def __init__(self) -> None:
+        self._character_count: int = 0
+        self._accentuated_count: int = 0
+
+    def eligible(self, character: str) -> bool:
+        return character.isalpha()
+
+    def feed(self, character: str) -> None:
+        self._character_count += 1
+
+        if is_accentuated(character):
+            self._accentuated_count += 1
+
+    def reset(self) -> None:  # pragma: no cover
+        self._character_count = 0
+        self._accentuated_count = 0
+
+    @property
+    def ratio(self) -> float:
+        if self._character_count < 8:
+            return 0.0
+
+        ratio_of_accentuation: float = self._accentuated_count / self._character_count
+        return ratio_of_accentuation if ratio_of_accentuation >= 0.35 else 0.0
+
+
+class UnprintablePlugin(MessDetectorPlugin):
+    def __init__(self) -> None:
+        self._unprintable_count: int = 0
+        self._character_count: int = 0
+
+    def eligible(self, character: str) -> bool:
+        return True
+
+    def feed(self, character: str) -> None:
+        if is_unprintable(character):
+            self._unprintable_count += 1
+        self._character_count += 1
+
+    def reset(self) -> None:  # pragma: no cover
+        self._unprintable_count = 0
+
+    @property
+    def ratio(self) -> float:
+        if self._character_count == 0:
+            return 0.0
+
+        return (self._unprintable_count * 8) / self._character_count
+
+
+class SuspiciousDuplicateAccentPlugin(MessDetectorPlugin):
+    def __init__(self) -> None:
+        self._successive_count: int = 0
+        self._character_count: int = 0
+
+        self._last_latin_character: Optional[str] = None
+
+    def eligible(self, character: str) -> bool:
+        return character.isalpha() and is_latin(character)
+
+    def feed(self, character: str) -> None:
+        self._character_count += 1
+        if (
+            self._last_latin_character is not None
+            and is_accentuated(character)
+            and is_accentuated(self._last_latin_character)
+        ):
+            if character.isupper() and self._last_latin_character.isupper():
+                self._successive_count += 1
+            # Worse if its the same char duplicated with different accent.
+            if remove_accent(character) == remove_accent(self._last_latin_character):
+                self._successive_count += 1
+        self._last_latin_character = character
+
+    def reset(self) -> None:  # pragma: no cover
+        self._successive_count = 0
+        self._character_count = 0
+        self._last_latin_character = None
+
+    @property
+    def ratio(self) -> float:
+        if self._character_count == 0:
+            return 0.0
+
+        return (self._successive_count * 2) / self._character_count
+
+
+class SuspiciousRange(MessDetectorPlugin):
+    def __init__(self) -> None:
+        self._suspicious_successive_range_count: int = 0
+        self._character_count: int = 0
+        self._last_printable_seen: Optional[str] = None
+
+    def eligible(self, character: str) -> bool:
+        return character.isprintable()
+
+    def feed(self, character: str) -> None:
+        self._character_count += 1
+
+        if (
+            character.isspace()
+            or is_punctuation(character)
+            or character in COMMON_SAFE_ASCII_CHARACTERS
+        ):
+            self._last_printable_seen = None
+            return
+
+        if self._last_printable_seen is None:
+            self._last_printable_seen = character
+            return
+
+        unicode_range_a: Optional[str] = unicode_range(self._last_printable_seen)
+        unicode_range_b: Optional[str] = unicode_range(character)
+
+        if is_suspiciously_successive_range(unicode_range_a, unicode_range_b):
+            self._suspicious_successive_range_count += 1
+
+        self._last_printable_seen = character
+
+    def reset(self) -> None:  # pragma: no cover
+        self._character_count = 0
+        self._suspicious_successive_range_count = 0
+        self._last_printable_seen = None
+
+    @property
+    def ratio(self) -> float:
+        if self._character_count <= 24:
+            return 0.0
+
+        ratio_of_suspicious_range_usage: float = (
+            self._suspicious_successive_range_count * 2
+        ) / self._character_count
+
+        return ratio_of_suspicious_range_usage
+
+
+class SuperWeirdWordPlugin(MessDetectorPlugin):
+    def __init__(self) -> None:
+        self._word_count: int = 0
+        self._bad_word_count: int = 0
+        self._foreign_long_count: int = 0
+
+        self._is_current_word_bad: bool = False
+        self._foreign_long_watch: bool = False
+
+        self._character_count: int = 0
+        self._bad_character_count: int = 0
+
+        self._buffer: str = ""
+        self._buffer_accent_count: int = 0
+
+    def eligible(self, character: str) -> bool:
+        return True
+
+    def feed(self, character: str) -> None:
+        if character.isalpha():
+            self._buffer += character
+            if is_accentuated(character):
+                self._buffer_accent_count += 1
+            if (
+                self._foreign_long_watch is False
+                and (is_latin(character) is False or is_accentuated(character))
+                and is_cjk(character) is False
+                and is_hangul(character) is False
+                and is_katakana(character) is False
+                and is_hiragana(character) is False
+                and is_thai(character) is False
+            ):
+                self._foreign_long_watch = True
+            return
+        if not self._buffer:
+            return
+        if (
+            character.isspace() or is_punctuation(character) or is_separator(character)
+        ) and self._buffer:
+            self._word_count += 1
+            buffer_length: int = len(self._buffer)
+
+            self._character_count += buffer_length
+
+            if buffer_length >= 4:
+                if self._buffer_accent_count / buffer_length > 0.34:
+                    self._is_current_word_bad = True
+                # Word/Buffer ending with an upper case accentuated letter are so rare,
+                # that we will consider them all as suspicious. Same weight as foreign_long suspicious.
+                if (
+                    is_accentuated(self._buffer[-1])
+                    and self._buffer[-1].isupper()
+                    and all(_.isupper() for _ in self._buffer) is False
+                ):
+                    self._foreign_long_count += 1
+                    self._is_current_word_bad = True
+            if buffer_length >= 24 and self._foreign_long_watch:
+                camel_case_dst = [
+                    i
+                    for c, i in zip(self._buffer, range(0, buffer_length))
+                    if c.isupper()
+                ]
+                probable_camel_cased: bool = False
+
+                if camel_case_dst and (len(camel_case_dst) / buffer_length <= 0.3):
+                    probable_camel_cased = True
+
+                if not probable_camel_cased:
+                    self._foreign_long_count += 1
+                    self._is_current_word_bad = True
+
+            if self._is_current_word_bad:
+                self._bad_word_count += 1
+                self._bad_character_count += len(self._buffer)
+                self._is_current_word_bad = False
+
+            self._foreign_long_watch = False
+            self._buffer = ""
+            self._buffer_accent_count = 0
+        elif (
+            character not in {"<", ">", "-", "=", "~", "|", "_"}
+            and character.isdigit() is False
+            and is_symbol(character)
+        ):
+            self._is_current_word_bad = True
+            self._buffer += character
+
+    def reset(self) -> None:  # pragma: no cover
+        self._buffer = ""
+        self._is_current_word_bad = False
+        self._foreign_long_watch = False
+        self._bad_word_count = 0
+        self._word_count = 0
+        self._character_count = 0
+        self._bad_character_count = 0
+        self._foreign_long_count = 0
+
+    @property
+    def ratio(self) -> float:
+        if self._word_count <= 10 and self._foreign_long_count == 0:
+            return 0.0
+
+        return self._bad_character_count / self._character_count
+
+
+class CjkInvalidStopPlugin(MessDetectorPlugin):
+    """
+    GB(Chinese) based encoding often render the stop incorrectly when the content does not fit and
+    can be easily detected. Searching for the overuse of '丅' and '丄'.
+    """
+
+    def __init__(self) -> None:
+        self._wrong_stop_count: int = 0
+        self._cjk_character_count: int = 0
+
+    def eligible(self, character: str) -> bool:
+        return True
+
+    def feed(self, character: str) -> None:
+        if character in {"丅", "丄"}:
+            self._wrong_stop_count += 1
+            return
+        if is_cjk(character):
+            self._cjk_character_count += 1
+
+    def reset(self) -> None:  # pragma: no cover
+        self._wrong_stop_count = 0
+        self._cjk_character_count = 0
+
+    @property
+    def ratio(self) -> float:
+        if self._cjk_character_count < 16:
+            return 0.0
+        return self._wrong_stop_count / self._cjk_character_count
+
+
+class ArchaicUpperLowerPlugin(MessDetectorPlugin):
+    def __init__(self) -> None:
+        self._buf: bool = False
+
+        self._character_count_since_last_sep: int = 0
+
+        self._successive_upper_lower_count: int = 0
+        self._successive_upper_lower_count_final: int = 0
+
+        self._character_count: int = 0
+
+        self._last_alpha_seen: Optional[str] = None
+        self._current_ascii_only: bool = True
+
+    def eligible(self, character: str) -> bool:
+        return True
+
+    def feed(self, character: str) -> None:
+        is_concerned = character.isalpha() and is_case_variable(character)
+        chunk_sep = is_concerned is False
+
+        if chunk_sep and self._character_count_since_last_sep > 0:
+            if (
+                self._character_count_since_last_sep <= 64
+                and character.isdigit() is False
+                and self._current_ascii_only is False
+            ):
+                self._successive_upper_lower_count_final += (
+                    self._successive_upper_lower_count
+                )
+
+            self._successive_upper_lower_count = 0
+            self._character_count_since_last_sep = 0
+            self._last_alpha_seen = None
+            self._buf = False
+            self._character_count += 1
+            self._current_ascii_only = True
+
+            return
+
+        if self._current_ascii_only is True and character.isascii() is False:
+            self._current_ascii_only = False
+
+        if self._last_alpha_seen is not None:
+            if (character.isupper() and self._last_alpha_seen.islower()) or (
+                character.islower() and self._last_alpha_seen.isupper()
+            ):
+                if self._buf is True:
+                    self._successive_upper_lower_count += 2
+                    self._buf = False
+                else:
+                    self._buf = True
+            else:
+                self._buf = False
+
+        self._character_count += 1
+        self._character_count_since_last_sep += 1
+        self._last_alpha_seen = character
+
+    def reset(self) -> None:  # pragma: no cover
+        self._character_count = 0
+        self._character_count_since_last_sep = 0
+        self._successive_upper_lower_count = 0
+        self._successive_upper_lower_count_final = 0
+        self._last_alpha_seen = None
+        self._buf = False
+        self._current_ascii_only = True
+
+    @property
+    def ratio(self) -> float:
+        if self._character_count == 0:
+            return 0.0
+
+        return self._successive_upper_lower_count_final / self._character_count
+
+
+class ArabicIsolatedFormPlugin(MessDetectorPlugin):
+    def __init__(self) -> None:
+        self._character_count: int = 0
+        self._isolated_form_count: int = 0
+
+    def reset(self) -> None:  # pragma: no cover
+        self._character_count = 0
+        self._isolated_form_count = 0
+
+    def eligible(self, character: str) -> bool:
+        return is_arabic(character)
+
+    def feed(self, character: str) -> None:
+        self._character_count += 1
+
+        if is_arabic_isolated_form(character):
+            self._isolated_form_count += 1
+
+    @property
+    def ratio(self) -> float:
+        if self._character_count < 8:
+            return 0.0
+
+        isolated_form_usage: float = self._isolated_form_count / self._character_count
+
+        return isolated_form_usage
+
+
+@lru_cache(maxsize=1024)
+def is_suspiciously_successive_range(
+    unicode_range_a: Optional[str], unicode_range_b: Optional[str]
+) -> bool:
+    """
+    Determine if two Unicode range seen next to each other can be considered as suspicious.
+    """
+    if unicode_range_a is None or unicode_range_b is None:
+        return True
+
+    if unicode_range_a == unicode_range_b:
+        return False
+
+    if "Latin" in unicode_range_a and "Latin" in unicode_range_b:
+        return False
+
+    if "Emoticons" in unicode_range_a or "Emoticons" in unicode_range_b:
+        return False
+
+    # Latin characters can be accompanied with a combining diacritical mark
+    # eg. Vietnamese.
+    if ("Latin" in unicode_range_a or "Latin" in unicode_range_b) and (
+        "Combining" in unicode_range_a or "Combining" in unicode_range_b
+    ):
+        return False
+
+    keywords_range_a, keywords_range_b = unicode_range_a.split(
+        " "
+    ), unicode_range_b.split(" ")
+
+    for el in keywords_range_a:
+        if el in UNICODE_SECONDARY_RANGE_KEYWORD:
+            continue
+        if el in keywords_range_b:
+            return False
+
+    # Japanese Exception
+    range_a_jp_chars, range_b_jp_chars = (
+        unicode_range_a
+        in (
+            "Hiragana",
+            "Katakana",
+        ),
+        unicode_range_b in ("Hiragana", "Katakana"),
+    )
+    if (range_a_jp_chars or range_b_jp_chars) and (
+        "CJK" in unicode_range_a or "CJK" in unicode_range_b
+    ):
+        return False
+    if range_a_jp_chars and range_b_jp_chars:
+        return False
+
+    if "Hangul" in unicode_range_a or "Hangul" in unicode_range_b:
+        if "CJK" in unicode_range_a or "CJK" in unicode_range_b:
+            return False
+        if unicode_range_a == "Basic Latin" or unicode_range_b == "Basic Latin":
+            return False
+
+    # Chinese/Japanese use dedicated range for punctuation and/or separators.
+    if ("CJK" in unicode_range_a or "CJK" in unicode_range_b) or (
+        unicode_range_a in ["Katakana", "Hiragana"]
+        and unicode_range_b in ["Katakana", "Hiragana"]
+    ):
+        if "Punctuation" in unicode_range_a or "Punctuation" in unicode_range_b:
+            return False
+        if "Forms" in unicode_range_a or "Forms" in unicode_range_b:
+            return False
+        if unicode_range_a == "Basic Latin" or unicode_range_b == "Basic Latin":
+            return False
+
+    return True
+
+
+@lru_cache(maxsize=2048)
+def mess_ratio(
+    decoded_sequence: str, maximum_threshold: float = 0.2, debug: bool = False
+) -> float:
+    """
+    Compute a mess ratio given a decoded bytes sequence. The maximum threshold does stop the computation earlier.
+    """
+
+    detectors: List[MessDetectorPlugin] = [
+        md_class() for md_class in MessDetectorPlugin.__subclasses__()
+    ]
+
+    length: int = len(decoded_sequence) + 1
+
+    mean_mess_ratio: float = 0.0
+
+    if length < 512:
+        intermediary_mean_mess_ratio_calc: int = 32
+    elif length <= 1024:
+        intermediary_mean_mess_ratio_calc = 64
+    else:
+        intermediary_mean_mess_ratio_calc = 128
+
+    for character, index in zip(decoded_sequence + "\n", range(length)):
+        for detector in detectors:
+            if detector.eligible(character):
+                detector.feed(character)
+
+        if (
+            index > 0 and index % intermediary_mean_mess_ratio_calc == 0
+        ) or index == length - 1:
+            mean_mess_ratio = sum(dt.ratio for dt in detectors)
+
+            if mean_mess_ratio >= maximum_threshold:
+                break
+
+    if debug:
+        logger = getLogger("charset_normalizer")
+
+        logger.log(
+            TRACE,
+            "Mess-detector extended-analysis start. "
+            f"intermediary_mean_mess_ratio_calc={intermediary_mean_mess_ratio_calc} mean_mess_ratio={mean_mess_ratio} "
+            f"maximum_threshold={maximum_threshold}",
+        )
+
+        if len(decoded_sequence) > 16:
+            logger.log(TRACE, f"Starting with: {decoded_sequence[:16]}")
+            logger.log(TRACE, f"Ending with: {decoded_sequence[-16::]}")
+
+        for dt in detectors:  # pragma: nocover
+            logger.log(TRACE, f"{dt.__class__}: {dt.ratio}")
+
+    return round(mean_mess_ratio, 3)
diff --git a/src/pip/_vendor/charset_normalizer/models.py b/src/pip/_vendor/charset_normalizer/models.py
new file mode 100644
index 00000000000..751775d5c33
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/models.py
@@ -0,0 +1,340 @@
+from encodings.aliases import aliases
+from hashlib import sha256
+from json import dumps
+from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
+
+from .constant import TOO_BIG_SEQUENCE
+from .utils import iana_name, is_multi_byte_encoding, unicode_range
+
+
+class CharsetMatch:
+    def __init__(
+        self,
+        payload: bytes,
+        guessed_encoding: str,
+        mean_mess_ratio: float,
+        has_sig_or_bom: bool,
+        languages: "CoherenceMatches",
+        decoded_payload: Optional[str] = None,
+    ):
+        self._payload: bytes = payload
+
+        self._encoding: str = guessed_encoding
+        self._mean_mess_ratio: float = mean_mess_ratio
+        self._languages: CoherenceMatches = languages
+        self._has_sig_or_bom: bool = has_sig_or_bom
+        self._unicode_ranges: Optional[List[str]] = None
+
+        self._leaves: List[CharsetMatch] = []
+        self._mean_coherence_ratio: float = 0.0
+
+        self._output_payload: Optional[bytes] = None
+        self._output_encoding: Optional[str] = None
+
+        self._string: Optional[str] = decoded_payload
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, CharsetMatch):
+            raise TypeError(
+                "__eq__ cannot be invoked on {} and {}.".format(
+                    str(other.__class__), str(self.__class__)
+                )
+            )
+        return self.encoding == other.encoding and self.fingerprint == other.fingerprint
+
+    def __lt__(self, other: object) -> bool:
+        """
+        Implemented to make sorted available upon CharsetMatches items.
+        """
+        if not isinstance(other, CharsetMatch):
+            raise ValueError
+
+        chaos_difference: float = abs(self.chaos - other.chaos)
+        coherence_difference: float = abs(self.coherence - other.coherence)
+
+        # Below 1% difference --> Use Coherence
+        if chaos_difference < 0.01 and coherence_difference > 0.02:
+            return self.coherence > other.coherence
+        elif chaos_difference < 0.01 and coherence_difference <= 0.02:
+            # When having a difficult decision, use the result that decoded as many multi-byte as possible.
+            # preserve RAM usage!
+            if len(self._payload) >= TOO_BIG_SEQUENCE:
+                return self.chaos < other.chaos
+            return self.multi_byte_usage > other.multi_byte_usage
+
+        return self.chaos < other.chaos
+
+    @property
+    def multi_byte_usage(self) -> float:
+        return 1.0 - (len(str(self)) / len(self.raw))
+
+    def __str__(self) -> str:
+        # Lazy Str Loading
+        if self._string is None:
+            self._string = str(self._payload, self._encoding, "strict")
+        return self._string
+
+    def __repr__(self) -> str:
+        return "".format(self.encoding, self.fingerprint)
+
+    def add_submatch(self, other: "CharsetMatch") -> None:
+        if not isinstance(other, CharsetMatch) or other == self:
+            raise ValueError(
+                "Unable to add instance <{}> as a submatch of a CharsetMatch".format(
+                    other.__class__
+                )
+            )
+
+        other._string = None  # Unload RAM usage; dirty trick.
+        self._leaves.append(other)
+
+    @property
+    def encoding(self) -> str:
+        return self._encoding
+
+    @property
+    def encoding_aliases(self) -> List[str]:
+        """
+        Encoding name are known by many name, using this could help when searching for IBM855 when it's listed as CP855.
+        """
+        also_known_as: List[str] = []
+        for u, p in aliases.items():
+            if self.encoding == u:
+                also_known_as.append(p)
+            elif self.encoding == p:
+                also_known_as.append(u)
+        return also_known_as
+
+    @property
+    def bom(self) -> bool:
+        return self._has_sig_or_bom
+
+    @property
+    def byte_order_mark(self) -> bool:
+        return self._has_sig_or_bom
+
+    @property
+    def languages(self) -> List[str]:
+        """
+        Return the complete list of possible languages found in decoded sequence.
+        Usually not really useful. Returned list may be empty even if 'language' property return something != 'Unknown'.
+        """
+        return [e[0] for e in self._languages]
+
+    @property
+    def language(self) -> str:
+        """
+        Most probable language found in decoded sequence. If none were detected or inferred, the property will return
+        "Unknown".
+        """
+        if not self._languages:
+            # Trying to infer the language based on the given encoding
+            # Its either English or we should not pronounce ourselves in certain cases.
+            if "ascii" in self.could_be_from_charset:
+                return "English"
+
+            # doing it there to avoid circular import
+            from pip._vendor.charset_normalizer.cd import encoding_languages, mb_encoding_languages
+
+            languages = (
+                mb_encoding_languages(self.encoding)
+                if is_multi_byte_encoding(self.encoding)
+                else encoding_languages(self.encoding)
+            )
+
+            if len(languages) == 0 or "Latin Based" in languages:
+                return "Unknown"
+
+            return languages[0]
+
+        return self._languages[0][0]
+
+    @property
+    def chaos(self) -> float:
+        return self._mean_mess_ratio
+
+    @property
+    def coherence(self) -> float:
+        if not self._languages:
+            return 0.0
+        return self._languages[0][1]
+
+    @property
+    def percent_chaos(self) -> float:
+        return round(self.chaos * 100, ndigits=3)
+
+    @property
+    def percent_coherence(self) -> float:
+        return round(self.coherence * 100, ndigits=3)
+
+    @property
+    def raw(self) -> bytes:
+        """
+        Original untouched bytes.
+        """
+        return self._payload
+
+    @property
+    def submatch(self) -> List["CharsetMatch"]:
+        return self._leaves
+
+    @property
+    def has_submatch(self) -> bool:
+        return len(self._leaves) > 0
+
+    @property
+    def alphabets(self) -> List[str]:
+        if self._unicode_ranges is not None:
+            return self._unicode_ranges
+        # list detected ranges
+        detected_ranges: List[Optional[str]] = [
+            unicode_range(char) for char in str(self)
+        ]
+        # filter and sort
+        self._unicode_ranges = sorted(list({r for r in detected_ranges if r}))
+        return self._unicode_ranges
+
+    @property
+    def could_be_from_charset(self) -> List[str]:
+        """
+        The complete list of encoding that output the exact SAME str result and therefore could be the originating
+        encoding.
+        This list does include the encoding available in property 'encoding'.
+        """
+        return [self._encoding] + [m.encoding for m in self._leaves]
+
+    def output(self, encoding: str = "utf_8") -> bytes:
+        """
+        Method to get re-encoded bytes payload using given target encoding. Default to UTF-8.
+        Any errors will be simply ignored by the encoder NOT replaced.
+        """
+        if self._output_encoding is None or self._output_encoding != encoding:
+            self._output_encoding = encoding
+            self._output_payload = str(self).encode(encoding, "replace")
+
+        return self._output_payload  # type: ignore
+
+    @property
+    def fingerprint(self) -> str:
+        """
+        Retrieve the unique SHA256 computed using the transformed (re-encoded) payload. Not the original one.
+        """
+        return sha256(self.output()).hexdigest()
+
+
+class CharsetMatches:
+    """
+    Container with every CharsetMatch items ordered by default from most probable to the less one.
+    Act like a list(iterable) but does not implements all related methods.
+    """
+
+    def __init__(self, results: Optional[List[CharsetMatch]] = None):
+        self._results: List[CharsetMatch] = sorted(results) if results else []
+
+    def __iter__(self) -> Iterator[CharsetMatch]:
+        yield from self._results
+
+    def __getitem__(self, item: Union[int, str]) -> CharsetMatch:
+        """
+        Retrieve a single item either by its position or encoding name (alias may be used here).
+        Raise KeyError upon invalid index or encoding not present in results.
+        """
+        if isinstance(item, int):
+            return self._results[item]
+        if isinstance(item, str):
+            item = iana_name(item, False)
+            for result in self._results:
+                if item in result.could_be_from_charset:
+                    return result
+        raise KeyError
+
+    def __len__(self) -> int:
+        return len(self._results)
+
+    def __bool__(self) -> bool:
+        return len(self._results) > 0
+
+    def append(self, item: CharsetMatch) -> None:
+        """
+        Insert a single match. Will be inserted accordingly to preserve sort.
+        Can be inserted as a submatch.
+        """
+        if not isinstance(item, CharsetMatch):
+            raise ValueError(
+                "Cannot append instance '{}' to CharsetMatches".format(
+                    str(item.__class__)
+                )
+            )
+        # We should disable the submatch factoring when the input file is too heavy (conserve RAM usage)
+        if len(item.raw) <= TOO_BIG_SEQUENCE:
+            for match in self._results:
+                if match.fingerprint == item.fingerprint and match.chaos == item.chaos:
+                    match.add_submatch(item)
+                    return
+        self._results.append(item)
+        self._results = sorted(self._results)
+
+    def best(self) -> Optional["CharsetMatch"]:
+        """
+        Simply return the first match. Strict equivalent to matches[0].
+        """
+        if not self._results:
+            return None
+        return self._results[0]
+
+    def first(self) -> Optional["CharsetMatch"]:
+        """
+        Redundant method, call the method best(). Kept for BC reasons.
+        """
+        return self.best()
+
+
+CoherenceMatch = Tuple[str, float]
+CoherenceMatches = List[CoherenceMatch]
+
+
+class CliDetectionResult:
+    def __init__(
+        self,
+        path: str,
+        encoding: Optional[str],
+        encoding_aliases: List[str],
+        alternative_encodings: List[str],
+        language: str,
+        alphabets: List[str],
+        has_sig_or_bom: bool,
+        chaos: float,
+        coherence: float,
+        unicode_path: Optional[str],
+        is_preferred: bool,
+    ):
+        self.path: str = path
+        self.unicode_path: Optional[str] = unicode_path
+        self.encoding: Optional[str] = encoding
+        self.encoding_aliases: List[str] = encoding_aliases
+        self.alternative_encodings: List[str] = alternative_encodings
+        self.language: str = language
+        self.alphabets: List[str] = alphabets
+        self.has_sig_or_bom: bool = has_sig_or_bom
+        self.chaos: float = chaos
+        self.coherence: float = coherence
+        self.is_preferred: bool = is_preferred
+
+    @property
+    def __dict__(self) -> Dict[str, Any]:  # type: ignore
+        return {
+            "path": self.path,
+            "encoding": self.encoding,
+            "encoding_aliases": self.encoding_aliases,
+            "alternative_encodings": self.alternative_encodings,
+            "language": self.language,
+            "alphabets": self.alphabets,
+            "has_sig_or_bom": self.has_sig_or_bom,
+            "chaos": self.chaos,
+            "coherence": self.coherence,
+            "unicode_path": self.unicode_path,
+            "is_preferred": self.is_preferred,
+        }
+
+    def to_json(self) -> str:
+        return dumps(self.__dict__, ensure_ascii=True, indent=4)
diff --git a/src/pip/_vendor/chardet/py.typed b/src/pip/_vendor/charset_normalizer/py.typed
similarity index 100%
rename from src/pip/_vendor/chardet/py.typed
rename to src/pip/_vendor/charset_normalizer/py.typed
diff --git a/src/pip/_vendor/charset_normalizer/utils.py b/src/pip/_vendor/charset_normalizer/utils.py
new file mode 100644
index 00000000000..e5cbbf4c0dd
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/utils.py
@@ -0,0 +1,421 @@
+import importlib
+import logging
+import unicodedata
+from codecs import IncrementalDecoder
+from encodings.aliases import aliases
+from functools import lru_cache
+from re import findall
+from typing import Generator, List, Optional, Set, Tuple, Union
+
+from _multibytecodec import MultibyteIncrementalDecoder
+
+from .constant import (
+    ENCODING_MARKS,
+    IANA_SUPPORTED_SIMILAR,
+    RE_POSSIBLE_ENCODING_INDICATION,
+    UNICODE_RANGES_COMBINED,
+    UNICODE_SECONDARY_RANGE_KEYWORD,
+    UTF8_MAXIMAL_ALLOCATION,
+)
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_accentuated(character: str) -> bool:
+    try:
+        description: str = unicodedata.name(character)
+    except ValueError:
+        return False
+    return (
+        "WITH GRAVE" in description
+        or "WITH ACUTE" in description
+        or "WITH CEDILLA" in description
+        or "WITH DIAERESIS" in description
+        or "WITH CIRCUMFLEX" in description
+        or "WITH TILDE" in description
+        or "WITH MACRON" in description
+        or "WITH RING ABOVE" in description
+    )
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def remove_accent(character: str) -> str:
+    decomposed: str = unicodedata.decomposition(character)
+    if not decomposed:
+        return character
+
+    codes: List[str] = decomposed.split(" ")
+
+    return chr(int(codes[0], 16))
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def unicode_range(character: str) -> Optional[str]:
+    """
+    Retrieve the Unicode range official name from a single character.
+    """
+    character_ord: int = ord(character)
+
+    for range_name, ord_range in UNICODE_RANGES_COMBINED.items():
+        if character_ord in ord_range:
+            return range_name
+
+    return None
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_latin(character: str) -> bool:
+    try:
+        description: str = unicodedata.name(character)
+    except ValueError:
+        return False
+    return "LATIN" in description
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_punctuation(character: str) -> bool:
+    character_category: str = unicodedata.category(character)
+
+    if "P" in character_category:
+        return True
+
+    character_range: Optional[str] = unicode_range(character)
+
+    if character_range is None:
+        return False
+
+    return "Punctuation" in character_range
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_symbol(character: str) -> bool:
+    character_category: str = unicodedata.category(character)
+
+    if "S" in character_category or "N" in character_category:
+        return True
+
+    character_range: Optional[str] = unicode_range(character)
+
+    if character_range is None:
+        return False
+
+    return "Forms" in character_range and character_category != "Lo"
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_emoticon(character: str) -> bool:
+    character_range: Optional[str] = unicode_range(character)
+
+    if character_range is None:
+        return False
+
+    return "Emoticons" in character_range or "Pictographs" in character_range
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_separator(character: str) -> bool:
+    if character.isspace() or character in {"｜", "+", "<", ">"}:
+        return True
+
+    character_category: str = unicodedata.category(character)
+
+    return "Z" in character_category or character_category in {"Po", "Pd", "Pc"}
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_case_variable(character: str) -> bool:
+    return character.islower() != character.isupper()
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_cjk(character: str) -> bool:
+    try:
+        character_name = unicodedata.name(character)
+    except ValueError:
+        return False
+
+    return "CJK" in character_name
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_hiragana(character: str) -> bool:
+    try:
+        character_name = unicodedata.name(character)
+    except ValueError:
+        return False
+
+    return "HIRAGANA" in character_name
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_katakana(character: str) -> bool:
+    try:
+        character_name = unicodedata.name(character)
+    except ValueError:
+        return False
+
+    return "KATAKANA" in character_name
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_hangul(character: str) -> bool:
+    try:
+        character_name = unicodedata.name(character)
+    except ValueError:
+        return False
+
+    return "HANGUL" in character_name
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_thai(character: str) -> bool:
+    try:
+        character_name = unicodedata.name(character)
+    except ValueError:
+        return False
+
+    return "THAI" in character_name
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_arabic(character: str) -> bool:
+    try:
+        character_name = unicodedata.name(character)
+    except ValueError:
+        return False
+
+    return "ARABIC" in character_name
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_arabic_isolated_form(character: str) -> bool:
+    try:
+        character_name = unicodedata.name(character)
+    except ValueError:
+        return False
+
+    return "ARABIC" in character_name and "ISOLATED FORM" in character_name
+
+
+@lru_cache(maxsize=len(UNICODE_RANGES_COMBINED))
+def is_unicode_range_secondary(range_name: str) -> bool:
+    return any(keyword in range_name for keyword in UNICODE_SECONDARY_RANGE_KEYWORD)
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_unprintable(character: str) -> bool:
+    return (
+        character.isspace() is False  # includes \n \t \r \v
+        and character.isprintable() is False
+        and character != "\x1A"  # Why? Its the ASCII substitute character.
+        and character != "\ufeff"  # bug discovered in Python,
+        # Zero Width No-Break Space located in 	Arabic Presentation Forms-B, Unicode 1.1 not acknowledged as space.
+    )
+
+
+def any_specified_encoding(sequence: bytes, search_zone: int = 8192) -> Optional[str]:
+    """
+    Extract using ASCII-only decoder any specified encoding in the first n-bytes.
+    """
+    if not isinstance(sequence, bytes):
+        raise TypeError
+
+    seq_len: int = len(sequence)
+
+    results: List[str] = findall(
+        RE_POSSIBLE_ENCODING_INDICATION,
+        sequence[: min(seq_len, search_zone)].decode("ascii", errors="ignore"),
+    )
+
+    if len(results) == 0:
+        return None
+
+    for specified_encoding in results:
+        specified_encoding = specified_encoding.lower().replace("-", "_")
+
+        encoding_alias: str
+        encoding_iana: str
+
+        for encoding_alias, encoding_iana in aliases.items():
+            if encoding_alias == specified_encoding:
+                return encoding_iana
+            if encoding_iana == specified_encoding:
+                return encoding_iana
+
+    return None
+
+
+@lru_cache(maxsize=128)
+def is_multi_byte_encoding(name: str) -> bool:
+    """
+    Verify is a specific encoding is a multi byte one based on it IANA name
+    """
+    return name in {
+        "utf_8",
+        "utf_8_sig",
+        "utf_16",
+        "utf_16_be",
+        "utf_16_le",
+        "utf_32",
+        "utf_32_le",
+        "utf_32_be",
+        "utf_7",
+    } or issubclass(
+        importlib.import_module("encodings.{}".format(name)).IncrementalDecoder,
+        MultibyteIncrementalDecoder,
+    )
+
+
+def identify_sig_or_bom(sequence: bytes) -> Tuple[Optional[str], bytes]:
+    """
+    Identify and extract SIG/BOM in given sequence.
+    """
+
+    for iana_encoding in ENCODING_MARKS:
+        marks: Union[bytes, List[bytes]] = ENCODING_MARKS[iana_encoding]
+
+        if isinstance(marks, bytes):
+            marks = [marks]
+
+        for mark in marks:
+            if sequence.startswith(mark):
+                return iana_encoding, mark
+
+    return None, b""
+
+
+def should_strip_sig_or_bom(iana_encoding: str) -> bool:
+    return iana_encoding not in {"utf_16", "utf_32"}
+
+
+def iana_name(cp_name: str, strict: bool = True) -> str:
+    cp_name = cp_name.lower().replace("-", "_")
+
+    encoding_alias: str
+    encoding_iana: str
+
+    for encoding_alias, encoding_iana in aliases.items():
+        if cp_name in [encoding_alias, encoding_iana]:
+            return encoding_iana
+
+    if strict:
+        raise ValueError("Unable to retrieve IANA for '{}'".format(cp_name))
+
+    return cp_name
+
+
+def range_scan(decoded_sequence: str) -> List[str]:
+    ranges: Set[str] = set()
+
+    for character in decoded_sequence:
+        character_range: Optional[str] = unicode_range(character)
+
+        if character_range is None:
+            continue
+
+        ranges.add(character_range)
+
+    return list(ranges)
+
+
+def cp_similarity(iana_name_a: str, iana_name_b: str) -> float:
+    if is_multi_byte_encoding(iana_name_a) or is_multi_byte_encoding(iana_name_b):
+        return 0.0
+
+    decoder_a = importlib.import_module(
+        "encodings.{}".format(iana_name_a)
+    ).IncrementalDecoder
+    decoder_b = importlib.import_module(
+        "encodings.{}".format(iana_name_b)
+    ).IncrementalDecoder
+
+    id_a: IncrementalDecoder = decoder_a(errors="ignore")
+    id_b: IncrementalDecoder = decoder_b(errors="ignore")
+
+    character_match_count: int = 0
+
+    for i in range(255):
+        to_be_decoded: bytes = bytes([i])
+        if id_a.decode(to_be_decoded) == id_b.decode(to_be_decoded):
+            character_match_count += 1
+
+    return character_match_count / 254
+
+
+def is_cp_similar(iana_name_a: str, iana_name_b: str) -> bool:
+    """
+    Determine if two code page are at least 80% similar. IANA_SUPPORTED_SIMILAR dict was generated using
+    the function cp_similarity.
+    """
+    return (
+        iana_name_a in IANA_SUPPORTED_SIMILAR
+        and iana_name_b in IANA_SUPPORTED_SIMILAR[iana_name_a]
+    )
+
+
+def set_logging_handler(
+    name: str = "charset_normalizer",
+    level: int = logging.INFO,
+    format_string: str = "%(asctime)s | %(levelname)s | %(message)s",
+) -> None:
+    logger = logging.getLogger(name)
+    logger.setLevel(level)
+
+    handler = logging.StreamHandler()
+    handler.setFormatter(logging.Formatter(format_string))
+    logger.addHandler(handler)
+
+
+def cut_sequence_chunks(
+    sequences: bytes,
+    encoding_iana: str,
+    offsets: range,
+    chunk_size: int,
+    bom_or_sig_available: bool,
+    strip_sig_or_bom: bool,
+    sig_payload: bytes,
+    is_multi_byte_decoder: bool,
+    decoded_payload: Optional[str] = None,
+) -> Generator[str, None, None]:
+    if decoded_payload and is_multi_byte_decoder is False:
+        for i in offsets:
+            chunk = decoded_payload[i : i + chunk_size]
+            if not chunk:
+                break
+            yield chunk
+    else:
+        for i in offsets:
+            chunk_end = i + chunk_size
+            if chunk_end > len(sequences) + 8:
+                continue
+
+            cut_sequence = sequences[i : i + chunk_size]
+
+            if bom_or_sig_available and strip_sig_or_bom is False:
+                cut_sequence = sig_payload + cut_sequence
+
+            chunk = cut_sequence.decode(
+                encoding_iana,
+                errors="ignore" if is_multi_byte_decoder else "strict",
+            )
+
+            # multi-byte bad cutting detector and adjustment
+            # not the cleanest way to perform that fix but clever enough for now.
+            if is_multi_byte_decoder and i > 0:
+                chunk_partial_size_chk: int = min(chunk_size, 16)
+
+                if (
+                    decoded_payload
+                    and chunk[:chunk_partial_size_chk] not in decoded_payload
+                ):
+                    for j in range(i, i - 4, -1):
+                        cut_sequence = sequences[j:chunk_end]
+
+                        if bom_or_sig_available and strip_sig_or_bom is False:
+                            cut_sequence = sig_payload + cut_sequence
+
+                        chunk = cut_sequence.decode(encoding_iana, errors="ignore")
+
+                        if chunk[:chunk_partial_size_chk] in decoded_payload:
+                            break
+
+            yield chunk
diff --git a/src/pip/_vendor/charset_normalizer/version.py b/src/pip/_vendor/charset_normalizer/version.py
new file mode 100644
index 00000000000..5a4da4ff49b
--- /dev/null
+++ b/src/pip/_vendor/charset_normalizer/version.py
@@ -0,0 +1,6 @@
+"""
+Expose version
+"""
+
+__version__ = "3.3.2"
+VERSION = __version__.split(".")
diff --git a/src/pip/_vendor/pygments/lexer.py b/src/pip/_vendor/pygments/lexer.py
index c6634c91daa..26c5fb31ffa 100644
--- a/src/pip/_vendor/pygments/lexer.py
+++ b/src/pip/_vendor/pygments/lexer.py
@@ -207,7 +207,9 @@ def _preprocess_lexer_input(self, text):
                 text, _ = guess_decode(text)
             elif self.encoding == 'chardet':
                 try:
-                    from pip._vendor import chardet
+                    # pip vendoring note: this code is not reachable by pip,
+                    # removed import of chardet to make it clear.
+                    raise ImportError('chardet is not vendored by pip')
                 except ImportError as e:
                     raise ImportError('To enable chardet encoding guessing, '
                                       'please install the chardet library '
diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
index 10ff67ff4d2..9d4e72c60d4 100644
--- a/src/pip/_vendor/requests/__init__.py
+++ b/src/pip/_vendor/requests/__init__.py
@@ -44,12 +44,12 @@
 
 from .exceptions import RequestsDependencyWarning
 
-charset_normalizer_version = None
-
 try:
-    from pip._vendor.chardet import __version__ as chardet_version
+    from pip._vendor.charset_normalizer import __version__ as charset_normalizer_version
 except ImportError:
-    chardet_version = None
+    charset_normalizer_version = None
+
+chardet_version = None
 
 
 def check_compatibility(urllib3_version, chardet_version, charset_normalizer_version):
diff --git a/src/pip/_vendor/requests/compat.py b/src/pip/_vendor/requests/compat.py
index 9ab2bb48656..33525c52f0c 100644
--- a/src/pip/_vendor/requests/compat.py
+++ b/src/pip/_vendor/requests/compat.py
@@ -7,7 +7,7 @@
 compatibility until the next major version.
 """
 
-from pip._vendor import chardet
+from pip._vendor import charset_normalizer as chardet
 
 import sys
 
diff --git a/src/pip/_vendor/requests/help.py b/src/pip/_vendor/requests/help.py
index 2d292c2f062..17ca75eda7d 100644
--- a/src/pip/_vendor/requests/help.py
+++ b/src/pip/_vendor/requests/help.py
@@ -10,12 +10,12 @@
 
 from . import __version__ as requests_version
 
-charset_normalizer = None
-
 try:
-    from pip._vendor import chardet
+    from pip._vendor import charset_normalizer
 except ImportError:
-    chardet = None
+    charset_normalizer = None
+
+chardet = None
 
 try:
     from pip._vendor.urllib3.contrib import pyopenssl
diff --git a/src/pip/_vendor/requests/packages.py b/src/pip/_vendor/requests/packages.py
index 9582fa730f1..45787bfbe54 100644
--- a/src/pip/_vendor/requests/packages.py
+++ b/src/pip/_vendor/requests/packages.py
@@ -3,7 +3,7 @@
 # This code exists for backwards compatibility reasons.
 # I don't like it either. Just look the other way. :)
 
-for package in ('urllib3', 'idna', 'chardet'):
+for package in ('urllib3', 'idna', 'charset_normalizer'):
     vendored_package = "pip._vendor." + package
     locals()[package] = __import__(vendored_package)
     # This traversal is apparently necessary such that the identities are
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index e433acf8e04..37efce023a4 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -8,7 +8,7 @@ platformdirs==4.2.1
 pyproject-hooks==1.0.0
 requests==2.31.0
     certifi==2024.2.2
-    chardet==5.2.0
+    charset-normalizer==3.3.2
     idna==3.7
     urllib3==1.26.18
 rich==13.7.1
diff --git a/tools/vendoring/patches/pygments.patch b/tools/vendoring/patches/pygments.patch
index 035c7dcaea6..58d86c616af 100644
--- a/tools/vendoring/patches/pygments.patch
+++ b/tools/vendoring/patches/pygments.patch
@@ -2,10 +2,10 @@ This patch mainly handles tweaking imports into a form that can be transformed
 to import from the vendored namespace.
 
 diff --git a/src/pip/_vendor/pygments/cmdline.py b/src/pip/_vendor/pygments/cmdline.py
-index d9a0fdc8b..db6de0cd3 100644
+index 435231e6..b75a9d7f 100644
 --- a/src/pip/_vendor/pygments/cmdline.py
 +++ b/src/pip/_vendor/pygments/cmdline.py
-@@ -410,11 +410,11 @@ def is_only_option(opt):
+@@ -469,11 +469,11 @@ def main_inner(parser, argns):
          outfile = UnclosingTextIOWrapper(outfile, encoding=fmter.encoding)
          fmter.encoding = None
          try:
@@ -17,26 +17,41 @@ index d9a0fdc8b..db6de0cd3 100644
 -            outfile = colorama.initialise.wrap_stream(
 +            outfile = colorama_initialise.wrap_stream(
                  outfile, convert=None, strip=None, autoreset=False, wrap=True)
-
+ 
      # When using the LaTeX formatter and the option `escapeinside` is
 diff --git a/src/pip/_vendor/pygments/__main__.py b/src/pip/_vendor/pygments/__main__.py
-index c6e2517df..76255b525 100644
+index 5eb2c747..04997f49 100644
 --- a/src/pip/_vendor/pygments/__main__.py
 +++ b/src/pip/_vendor/pygments/__main__.py
 @@ -9,9 +9,9 @@
  """
-
+ 
  import sys
 -import pygments.cmdline
 +from pygments.cmdline import main
-
+ 
  try:
 -    sys.exit(pygments.cmdline.main(sys.argv))
 +    sys.exit(main(sys.argv))
  except KeyboardInterrupt:
      sys.exit(1)
+diff --git a/src/pip/_vendor/pygments/lexer.py b/src/pip/_vendor/pygments/lexer.py
+index eb5403e7..837ada12 100644
+--- a/src/pip/_vendor/pygments/lexer.py
++++ b/src/pip/_vendor/pygments/lexer.py
+@@ -207,7 +207,9 @@ class Lexer(metaclass=LexerMeta):
+                 text, _ = guess_decode(text)
+             elif self.encoding == 'chardet':
+                 try:
+-                    import chardet
++                    # pip vendoring note: this code is not reachable by pip,
++                    # removed import of chardet to make it clear.
++                    raise ImportError('chardet is not vendored by pip')
+                 except ImportError as e:
+                     raise ImportError('To enable chardet encoding guessing, '
+                                       'please install the chardet library '
 diff --git a/src/pip/_vendor/pygments/sphinxext.py b/src/pip/_vendor/pygments/sphinxext.py
-index 3ea2e36e1..23c19504c 100644
+index f935688f..e2986361 100644
 --- a/src/pip/_vendor/pygments/sphinxext.py
 +++ b/src/pip/_vendor/pygments/sphinxext.py
 @@ -91,7 +91,7 @@ class PygmentsDoc(Directive):
diff --git a/tools/vendoring/patches/requests.patch b/tools/vendoring/patches/requests.patch
index 596b729c0b9..d02eb31fbcf 100644
--- a/tools/vendoring/patches/requests.patch
+++ b/tools/vendoring/patches/requests.patch
@@ -1,5 +1,5 @@
 diff --git a/src/pip/_vendor/requests/packages.py b/src/pip/_vendor/requests/packages.py
-index 77c45c9e..9582fa73 100644
+index 77c45c9e..45787bfb 100644
 --- a/src/pip/_vendor/requests/packages.py
 +++ b/src/pip/_vendor/requests/packages.py
 @@ -1,28 +1,16 @@
@@ -19,7 +19,7 @@ index 77c45c9e..9582fa73 100644
  
 -for package in ("urllib3", "idna"):
 -    locals()[package] = __import__(package)
-+for package in ('urllib3', 'idna', 'chardet'):
++for package in ('urllib3', 'idna', 'charset_normalizer'):
 +    vendored_package = "pip._vendor." + package
 +    locals()[package] = __import__(vendored_package)
      # This traversal is apparently necessary such that the identities are
@@ -37,23 +37,22 @@ index 77c45c9e..9582fa73 100644
 -        target = target.replace(target, "chardet")
 -        sys.modules[f"requests.packages.{target}"] = sys.modules[mod]
  # Kinda cool, though, right?
-
 diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
-index 7ac8e297..1e21e7e4 100644
+index 300a16c5..a66f6024 100644
 --- a/src/pip/_vendor/requests/__init__.py
 +++ b/src/pip/_vendor/requests/__init__.py
-@@ -44,10 +44,7 @@ import urllib3
- 
- from .exceptions import RequestsDependencyWarning
+@@ -49,10 +49,7 @@ try:
+ except ImportError:
+     charset_normalizer_version = None
  
 -try:
--    from charset_normalizer import __version__ as charset_normalizer_version
+-    from chardet import __version__ as chardet_version
 -except ImportError:
--    charset_normalizer_version = None
-+charset_normalizer_version = None
+-    chardet_version = None
++chardet_version = None
  
- try:
-     from chardet import __version__ as chardet_version
+ 
+ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_version):
 @@ -118,6 +115,11 @@ except (AssertionError, ValueError):
  # if the standard library doesn't support SNI or the
  # 'ssl' library isn't available.
@@ -66,9 +65,8 @@ index 7ac8e297..1e21e7e4 100644
      try:
          import ssl
      except ImportError:
-
 diff --git a/src/pip/_vendor/requests/compat.py b/src/pip/_vendor/requests/compat.py
-index 6776163c..8ff49e46 100644
+index 6776163c..7819bb99 100644
 --- a/src/pip/_vendor/requests/compat.py
 +++ b/src/pip/_vendor/requests/compat.py
 @@ -7,10 +7,7 @@ between Python 2 and Python 3. It remains for backwards
@@ -79,7 +77,7 @@ index 6776163c..8ff49e46 100644
 -    import chardet
 -except ImportError:
 -    import charset_normalizer as chardet
-+import chardet
++import charset_normalizer as chardet
  
  import sys
  
@@ -108,26 +106,26 @@ index 6776163c..8ff49e46 100644
  # Keep OrderedDict for backwards compatibility.
  from collections import OrderedDict
 diff --git a/src/pip/_vendor/requests/help.py b/src/pip/_vendor/requests/help.py
-index 8fbcd656..c5e9c19e 100644
+index 8fbcd656..094e2046 100644
 --- a/src/pip/_vendor/requests/help.py
 +++ b/src/pip/_vendor/requests/help.py
-@@ -10,10 +10,7 @@ import urllib3
- 
- from . import __version__ as requests_version
+@@ -15,10 +15,7 @@ try:
+ except ImportError:
+     charset_normalizer = None
  
 -try:
--    import charset_normalizer
+-    import chardet
 -except ImportError:
--    charset_normalizer = None
-+charset_normalizer = None
+-    chardet = None
++chardet = None
  
  try:
-     import chardet
+     from urllib3.contrib import pyopenssl
 diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py
-index 2743144b9..38696a1fb 100644
+index be422c3e..3daf06f6 100644
 --- a/src/pip/_vendor/requests/certs.py
 +++ b/src/pip/_vendor/requests/certs.py
-@@ -11,7 +11,14 @@
+@@ -11,7 +11,14 @@ If you are packaging Requests, e.g., for a Linux distribution or a managed
  environment, you can change the definition of where() to return a separately
  packaged CA bundle.
  """
@@ -140,6 +138,6 @@ index 2743144b9..38696a1fb 100644
 +else:
 +    def where():
 +        return os.environ["_PIP_STANDALONE_CERT"]
-
+ 
  if __name__ == "__main__":
      print(where())

From 2eca4cc80c59960fa9936f417f58ad0650bf9c02 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Mon, 6 May 2024 20:06:25 +0100
Subject: [PATCH 411/992] Update AUTHORS.txt

---
 AUTHORS.txt | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 6b54ae3b17e..1b80e97c3ab 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -9,7 +9,9 @@ Adam Chainz
 Adam Tse
 Adam Wentz
 admin
+Adolfo Ochagavía
 Adrien Morison
+Agus
 ahayrapetyan
 Ahilya
 AinsworthK
@@ -63,8 +65,11 @@ Anudit Nagar
 Anuj Godase
 AQNOUCH Mohammed
 AraHaan
+arena
+arenasys
 Arindam Choudhury
 Armin Ronacher
+Arnon Yaari
 Artem
 Arun Babu Neelicattu
 Ashley Manton
@@ -102,6 +107,7 @@ Brad Erickson
 Bradley Ayers
 Brandon L. Reiss
 Brandt Bucher
+Brannon Dorsey
 Brett Randall
 Brett Rosen
 Brian Cristante
@@ -140,6 +146,7 @@ Christian Oudard
 Christoph Reiter
 Christopher Hunt
 Christopher Snyder
+chrysle
 cjc7373
 Clark Boylan
 Claudio Jolowicz
@@ -157,6 +164,7 @@ Craig Kerstiens
 Cristian Sorinel
 Cristina
 Cristina Muñoz
+ctg123
 Curtis Doty
 cytolentino
 Daan De Meyer
@@ -194,6 +202,7 @@ David Evans
 David Hewitt
 David Linke
 David Poggi
+David Poznik
 David Pursehouse
 David Runge
 David Tucker
@@ -207,6 +216,7 @@ dependabot[bot]
 derwolfe
 Desetude
 Devesh Kumar Singh
+devsagul
 Diego Caraballo
 Diego Ramirez
 DiegoCaraballo
@@ -315,6 +325,7 @@ Ian Stapleton Cordasco
 Ian Wienand
 Igor Kuzmitshov
 Igor Sobreira
+Ikko Ashimine
 Ilan Schnell
 Illia Volochii
 Ilya Baryshev
@@ -364,6 +375,7 @@ Jivan Amara
 Joe Bylund
 Joe Michelini
 John Paton
+John Sirois
 John T. Wodder II
 John-Scott Atlakson
 johnthagen
@@ -408,6 +420,7 @@ Kexuan Sun
 Kit Randel
 Klaas van Schelven
 KOLANICH
+konstin
 kpinc
 Krishna Oza
 Kumar McMillan
@@ -428,6 +441,7 @@ lorddavidiii
 Loren Carvalho
 Lucas Cimon
 Ludovic Gasc
+Luis Medel
 Lukas Geiger
 Lukas Juhrich
 Luke Macken
@@ -441,6 +455,7 @@ Marc Tamlyn
 Marcus Smith
 Mariatta
 Mark Kohler
+Mark McLoughlin
 Mark Williams
 Markus Hametner
 Martey Dodoo
@@ -457,6 +472,7 @@ Matt Bacchi
 Matt Good
 Matt Maker
 Matt Robenolt
+Matt Wozniski
 matthew
 Matthew Einhorn
 Matthew Feickert
@@ -559,7 +575,9 @@ Paweł Szramowski
 Pekka Klärck
 Peter Gessler
 Peter Lisák
+Peter Shen
 Peter Waller
+Petr Viktorin
 petr-tik
 Phaneendra Chiruvella
 Phil Elson
@@ -592,6 +610,7 @@ Quentin Pradet
 R. David Murray
 Rafael Caricio
 Ralf Schmitt
+Ran Benita
 Razzi Abuissa
 rdb
 Reece Dunham
@@ -624,6 +643,7 @@ Russell Keith-Magee
 Ryan Shepherd
 Ryan Wooden
 ryneeverett
+S. Guliaev
 Sachi King
 Salvatore Rinchiera
 sandeepkiran-js
@@ -642,6 +662,7 @@ Seth Michael Larson
 Seth Woodworth
 Shahar Epstein
 Shantanu
+shenxianpeng
 shireenrao
 Shivansh-007
 Shlomi Fish
@@ -741,6 +762,7 @@ Wolfgang Maier
 Wu Zhenyu
 XAMES3
 Xavier Fernandez
+Xianpeng Shen
 xoviat
 xtreak
 YAMAMOTO Takashi

From 530df8a2c49f7ba717cdf58311e55a05ff43b172 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Mon, 6 May 2024 20:06:26 +0100
Subject: [PATCH 412/992] Bump for release

---
 NEWS.rst                                      | 80 +++++++++++++++++++
 news/10421.feature.rst                        |  1 -
 news/10685.bugfix.rst                         |  1 -
 news/10745.doc.rst                            |  1 -
 news/10751.trivial.rst                        |  0
 news/11050.bugfix.rst                         |  1 -
 news/11221.feature.rst                        |  3 -
 news/11508.feature.rst                        |  1 -
 news/11677.feature.rst                        |  1 -
 news/11934.removal.rst                        |  1 -
 news/12043.doc.rst                            |  1 -
 news/12063.removal.rst                        |  4 -
 news/12111.feature.rst                        |  1 -
 news/12122.doc.rst                            |  3 -
 news/12165.bugfix.rst                         |  1 -
 news/12401.bugfix.rst                         |  1 -
 news/12453.feature.rst                        |  1 -
 news/12510.trivial.rst                        |  1 -
 news/12529.doc.rst                            |  1 -
 news/12533.trivial.rst                        |  0
 news/12536.bugfix.rst                         |  2 -
 news/12537.process.rst                        |  2 -
 news/12538.process.rst                        |  1 -
 news/12545.trivial.rst                        |  4 -
 news/12559.trivial.rst                        |  1 -
 news/12561.trivial.rst                        |  1 -
 news/12562.trivial.rst                        |  1 -
 news/12567.bugfix.rst                         |  1 -
 news/12576.doc.rst                            |  1 -
 news/12577.bugfix.rst                         |  1 -
 news/12579.bugfix.rst                         |  1 -
 news/12594.trivial.rst                        |  1 -
 news/12595.trivial.rst                        |  1 -
 news/12615.trivial.rst                        |  1 -
 news/12620.trivial.rst                        |  1 -
 news/12630.trivial.rst                        |  1 -
 news/12657.feature.rst                        |  1 -
 news/12666.bugfix.rst                         |  1 -
 ...a0-5535-40c4-ad79-3feb7f694ec2.trivial.rst |  0
 ...01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst | 10 ---
 ...7c-108f-48dd-80a0-489921a6b2f3.trivial.rst |  1 -
 news/4768.feature.rst                         |  1 -
 ...88-B8B3-402E-9A88-2981AD074999.trivial.rst |  0
 ...13-84ee-4d81-8465-bae74e370d0b.trivial.rst |  0
 ...72-fb26-11ee-8cc4-f72623cb6607.trivial.rst |  0
 news/6831.doc.rst                             |  1 -
 ...10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst |  0
 ...a2-df21-4e0c-9023-80f00fd71d20.trivial.rst |  0
 ...4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst |  0
 news/CacheControl.vendor.rst                  |  1 -
 ...27-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst |  1 -
 ...50-69cc-4747-8a50-24e574a0ae57.trivial.rst |  0
 ...e3-4844-4298-a46c-80768b38f652.trivial.rst |  1 -
 news/certifi.vendor.rst                       |  1 -
 news/chardet.vendor.rst                       |  1 -
 news/charset_normalizer.vendor.rst            |  1 -
 news/distro.vendor.rst                        |  1 -
 ...e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst |  5 --
 news/idna.vendor.rst                          |  1 -
 news/msgpack.vendor.rst                       |  1 -
 news/packaging.vendor.rst                     |  1 -
 news/platformdirs.vendor.rst                  |  1 -
 news/pygments.vendor.rst                      |  1 -
 news/pyparsing.vendor.rst                     |  1 -
 news/rich.vendor.rst                          |  1 -
 news/setuptools.vendor.rst                    |  1 -
 news/tenacity.vendor.rst                      |  1 -
 news/typing_extensions.vendor.rst             |  1 -
 news/urllib3.vendor.rst                       |  1 -
 src/pip/__init__.py                           |  2 +-
 70 files changed, 81 insertions(+), 84 deletions(-)
 delete mode 100644 news/10421.feature.rst
 delete mode 100644 news/10685.bugfix.rst
 delete mode 100644 news/10745.doc.rst
 delete mode 100644 news/10751.trivial.rst
 delete mode 100644 news/11050.bugfix.rst
 delete mode 100644 news/11221.feature.rst
 delete mode 100644 news/11508.feature.rst
 delete mode 100644 news/11677.feature.rst
 delete mode 100644 news/11934.removal.rst
 delete mode 100644 news/12043.doc.rst
 delete mode 100644 news/12063.removal.rst
 delete mode 100644 news/12111.feature.rst
 delete mode 100644 news/12122.doc.rst
 delete mode 100644 news/12165.bugfix.rst
 delete mode 100644 news/12401.bugfix.rst
 delete mode 100644 news/12453.feature.rst
 delete mode 100644 news/12510.trivial.rst
 delete mode 100644 news/12529.doc.rst
 delete mode 100644 news/12533.trivial.rst
 delete mode 100644 news/12536.bugfix.rst
 delete mode 100644 news/12537.process.rst
 delete mode 100644 news/12538.process.rst
 delete mode 100644 news/12545.trivial.rst
 delete mode 100644 news/12559.trivial.rst
 delete mode 100644 news/12561.trivial.rst
 delete mode 100644 news/12562.trivial.rst
 delete mode 100644 news/12567.bugfix.rst
 delete mode 100644 news/12576.doc.rst
 delete mode 100644 news/12577.bugfix.rst
 delete mode 100644 news/12579.bugfix.rst
 delete mode 100644 news/12594.trivial.rst
 delete mode 100644 news/12595.trivial.rst
 delete mode 100644 news/12615.trivial.rst
 delete mode 100644 news/12620.trivial.rst
 delete mode 100644 news/12630.trivial.rst
 delete mode 100644 news/12657.feature.rst
 delete mode 100644 news/12666.bugfix.rst
 delete mode 100644 news/23f96da0-5535-40c4-ad79-3feb7f694ec2.trivial.rst
 delete mode 100644 news/24ca5f01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst
 delete mode 100644 news/287f037c-108f-48dd-80a0-489921a6b2f3.trivial.rst
 delete mode 100644 news/4768.feature.rst
 delete mode 100644 news/4CCE4788-B8B3-402E-9A88-2981AD074999.trivial.rst
 delete mode 100644 news/514f0c13-84ee-4d81-8465-bae74e370d0b.trivial.rst
 delete mode 100644 news/5a771372-fb26-11ee-8cc4-f72623cb6607.trivial.rst
 delete mode 100644 news/6831.doc.rst
 delete mode 100644 news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst
 delete mode 100644 news/7f9639a2-df21-4e0c-9023-80f00fd71d20.trivial.rst
 delete mode 100644 news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst
 delete mode 100644 news/CacheControl.vendor.rst
 delete mode 100644 news/a870a527-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst
 delete mode 100644 news/b2631650-69cc-4747-8a50-24e574a0ae57.trivial.rst
 delete mode 100644 news/c678d9e3-4844-4298-a46c-80768b38f652.trivial.rst
 delete mode 100644 news/certifi.vendor.rst
 delete mode 100644 news/chardet.vendor.rst
 delete mode 100644 news/charset_normalizer.vendor.rst
 delete mode 100644 news/distro.vendor.rst
 delete mode 100644 news/f14947e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst
 delete mode 100644 news/idna.vendor.rst
 delete mode 100644 news/msgpack.vendor.rst
 delete mode 100644 news/packaging.vendor.rst
 delete mode 100644 news/platformdirs.vendor.rst
 delete mode 100644 news/pygments.vendor.rst
 delete mode 100644 news/pyparsing.vendor.rst
 delete mode 100644 news/rich.vendor.rst
 delete mode 100644 news/setuptools.vendor.rst
 delete mode 100644 news/tenacity.vendor.rst
 delete mode 100644 news/typing_extensions.vendor.rst
 delete mode 100644 news/urllib3.vendor.rst

diff --git a/NEWS.rst b/NEWS.rst
index ce6d8e6dd3d..eea12074d65 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,86 @@
 
 .. towncrier release notes start
 
+24.1b1 (2024-05-06)
+===================
+
+Deprecations and Removals
+-------------------------
+
+- Drop support for EOL Python 3.7. (`#11934 `_)
+- Remove support for legacy versions and dependency specifiers.
+
+  Packages with non standard-compliant versions or dependency specifiers are now ignored by the resolver.
+  Already installed packages with non standard-compliant versions or dependency specifiers
+  must be uninstalled before upgrading them. (`#12063 `_)
+
+Features
+--------
+
+- Improve performance of resolution of large dependency trees, with more caching. (`#12453 `_)
+- Further improve resolution performance of large dependency trees, by caching hash calculations. (`#12657 `_)
+- Reduce startup time of commands (e.g. show, freeze) that do not access the network by 15-30%. (`#4768 `_)
+- Reword and improve presentation of uninstallation errors. (`#10421 `_)
+- Add a 'raw' progress_bar type for simple and parsable download progress reports (`#11508 `_)
+- ``pip list`` no longer performs the pip version check unless ``--outdated`` or ``--uptodate`` is given. (`#11677 `_)
+- Use the ``data_filter`` when extracting tarballs, if it's available. (`#12111 `_)
+- Display the Project-URL value under key "Home-page" in ``pip show`` when the Home-Page metadata field is not set.
+
+  The Project-URL key detection is case-insensitive, and ignores any dashes and underscores. (`#11221 `_)
+
+Bug Fixes
+---------
+
+- Ensure ``-vv`` gets passed to any ``pip install`` build environment subprocesses. (`#12577 `_)
+- Deduplicate entries in the ``Requires`` field of ``pip show``. (`#12165 `_)
+- Fix error on checkout for subversion and bazaar with verbose mode on. (`#11050 `_)
+- Fix exception with completions when COMP_CWORD is not set (`#12401 `_)
+- Fix intermittent "cannot locate t64.exe" errors when upgrading pip. (`#12666 `_)
+- Remove duplication in invalid wheel error message (`#12579 `_)
+- Remove the incorrect pip3.x console entrypoint from the pip wheel. This console
+  script continues to be generated by pip when it installs itself. (`#12536 `_)
+- Gracefully skip VCS detection in pip freeze when PATH points to a non-directory path. (`#12567 `_)
+- Make the ``--proxy`` parameter take precedence over environment variables. (`#10685 `_)
+
+Vendored Libraries
+------------------
+
+- Add charset-normalizer 3.3.2
+- Remove chardet
+- Remove pyparsing
+- Upgrade CacheControl to 0.14.0
+- Upgrade certifi to 2024.2.2
+- Upgrade distro to 1.9.0
+- Upgrade idna to 3.7
+- Upgrade msgpack to 1.0.8
+- Upgrade packaging to 24.0
+- Upgrade platformdirs to 4.2.1
+- Upgrade pygments to 2.17.2
+- Upgrade rich to 13.7.1
+- Upgrade setuptools to 69.5.1
+- Upgrade tenacity to 8.2.3
+- Upgrade typing_extensions to 4.11.0
+- Upgrade urllib3 to 1.26.18
+
+Improved Documentation
+----------------------
+
+- Document UX research done on pip. (`#10745 `_)
+- Fix the direct usage of zipapp showing up as ``python -m pip.pyz`` rather than ``./pip.pyz`` / ``.\pip.pyz`` (`#12043 `_)
+- Add a warning explaining that the snippet in "Fallback behavior" is not a valid
+  ``pyproject.toml`` snippet for projects, and link to setuptools documentation
+  instead. (`#12122 `_)
+- The Python Support Policy has been updated. (`#12529 `_)
+- Document the environment variables that correspond with CLI options. (`#12576 `_)
+- Update architecture documentation for command line interface. (`#6831 `_)
+
+Process
+-------
+
+- Remove ``setup.py`` since all the pip project metadata is now declared in
+  ``pyproject.toml``.
+- Move remaining pip development tools configurations to ``pyproject.toml``.
+
 24.0 (2024-02-03)
 =================
 
diff --git a/news/10421.feature.rst b/news/10421.feature.rst
deleted file mode 100644
index 49bb72bc0d8..00000000000
--- a/news/10421.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Reword and improve presentation of uninstallation errors.
diff --git a/news/10685.bugfix.rst b/news/10685.bugfix.rst
deleted file mode 100644
index a0bc7ed5285..00000000000
--- a/news/10685.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Make the ``--proxy`` parameter take precedence over environment variables.
diff --git a/news/10745.doc.rst b/news/10745.doc.rst
deleted file mode 100644
index 4094f41405c..00000000000
--- a/news/10745.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Start using Rich for presenting error messages in a consistent format.
diff --git a/news/10751.trivial.rst b/news/10751.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/11050.bugfix.rst b/news/11050.bugfix.rst
deleted file mode 100644
index 01aa5ea7b1d..00000000000
--- a/news/11050.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix error on checkout for subversion and bazaar with verbose mode on.
diff --git a/news/11221.feature.rst b/news/11221.feature.rst
deleted file mode 100644
index 319cc02c4a5..00000000000
--- a/news/11221.feature.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Display the Project-URL value under key "Home-page" in ``pip show`` when the Home-Page metadata field is not set.
-
-The Project-URL key detection is case-insensitive, and ignores any dashes and underscores.
diff --git a/news/11508.feature.rst b/news/11508.feature.rst
deleted file mode 100644
index 2f0d7e2d04d..00000000000
--- a/news/11508.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add a 'raw' progress_bar type for simple and parsable download progress reports
diff --git a/news/11677.feature.rst b/news/11677.feature.rst
deleted file mode 100644
index b68a0db876b..00000000000
--- a/news/11677.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-``pip list`` no longer performs the pip version check unless ``--outdated`` or ``--uptodate`` is given.
diff --git a/news/11934.removal.rst b/news/11934.removal.rst
deleted file mode 100644
index bf146d23baa..00000000000
--- a/news/11934.removal.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop support for EOL Python 3.7.
diff --git a/news/12043.doc.rst b/news/12043.doc.rst
deleted file mode 100644
index 2c77f9b59dc..00000000000
--- a/news/12043.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix the direct usage of zipapp showing up as ``python -m pip.pyz`` rather than ``./pip.pyz`` / ``.\pip.pyz``
diff --git a/news/12063.removal.rst b/news/12063.removal.rst
deleted file mode 100644
index 03d785d69c5..00000000000
--- a/news/12063.removal.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Remove support for legacy versions and dependency specifiers. Packages with non
-standard-compliant versions or dependency specifiers are now ignored by the resolver.
-Already installed packages with non standard-compliant versions or dependency specifiers
-must be uninstalled before upgrading them.
diff --git a/news/12111.feature.rst b/news/12111.feature.rst
deleted file mode 100644
index eb03b76d826..00000000000
--- a/news/12111.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-PEP 721: Use the ``data_filter`` when extracting tarballs, if it's available.
diff --git a/news/12122.doc.rst b/news/12122.doc.rst
deleted file mode 100644
index dbc0ebb53fd..00000000000
--- a/news/12122.doc.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Add a warning explaining that the snippet in "Fallback behavior" is not a valid
-``pyproject.toml`` snippet for projects, and link to setuptools documentation
-instead.
diff --git a/news/12165.bugfix.rst b/news/12165.bugfix.rst
deleted file mode 100644
index dd09baf60dc..00000000000
--- a/news/12165.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-This change will deduplicate entries in the ``Requires`` field of ``pip show``.
diff --git a/news/12401.bugfix.rst b/news/12401.bugfix.rst
deleted file mode 100644
index 371f80011b3..00000000000
--- a/news/12401.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix exception with completions when COMP_CWORD is not set
diff --git a/news/12453.feature.rst b/news/12453.feature.rst
deleted file mode 100644
index 704cd012a90..00000000000
--- a/news/12453.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improve performance of resolution of large dependency trees, with more caching.
diff --git a/news/12510.trivial.rst b/news/12510.trivial.rst
deleted file mode 100644
index d41d5425b56..00000000000
--- a/news/12510.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update ruff to 0.2.0 and update ruff config to reflect
diff --git a/news/12529.doc.rst b/news/12529.doc.rst
deleted file mode 100644
index 20f049ac384..00000000000
--- a/news/12529.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-The Python Support Policy has been updated.
diff --git a/news/12533.trivial.rst b/news/12533.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/12536.bugfix.rst b/news/12536.bugfix.rst
deleted file mode 100644
index 248d93bdba5..00000000000
--- a/news/12536.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Remove the incorrect pip3.x console entrypoint from the pip wheel. This console
-script continues to be generated by pip when it installs itself.
diff --git a/news/12537.process.rst b/news/12537.process.rst
deleted file mode 100644
index 5fd08a84867..00000000000
--- a/news/12537.process.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Remove ``setup.py`` since all the pip project metadata is now declared in
-``pyproject.toml``.
diff --git a/news/12538.process.rst b/news/12538.process.rst
deleted file mode 100644
index 53d4496972b..00000000000
--- a/news/12538.process.rst
+++ /dev/null
@@ -1 +0,0 @@
-Move remaining pip development tools configurations to ``pyproject.toml``.
diff --git a/news/12545.trivial.rst b/news/12545.trivial.rst
deleted file mode 100644
index f373e869cfd..00000000000
--- a/news/12545.trivial.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-This change will use ``build`` to create the ``pip`` sdist for testing.
-
-It will also remove a direct ``setup.py`` invocation to install ``pip`` in
-editable mode to run from tests.
diff --git a/news/12559.trivial.rst b/news/12559.trivial.rst
deleted file mode 100644
index 80b07d0d00d..00000000000
--- a/news/12559.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix Ubuntu CI Tests
diff --git a/news/12561.trivial.rst b/news/12561.trivial.rst
deleted file mode 100644
index ecc9e4a9afa..00000000000
--- a/news/12561.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove virtualenv and setuptools installs from zipapp CI tests
diff --git a/news/12562.trivial.rst b/news/12562.trivial.rst
deleted file mode 100644
index ab88c4077bd..00000000000
--- a/news/12562.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update CI tests for Windows to run on Python 3.12
diff --git a/news/12567.bugfix.rst b/news/12567.bugfix.rst
deleted file mode 100644
index 55c6a93d6b9..00000000000
--- a/news/12567.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Gracefully skip VCS detection in pip freeze when PATH points to a non-directory path.
diff --git a/news/12576.doc.rst b/news/12576.doc.rst
deleted file mode 100644
index b82dd3d583f..00000000000
--- a/news/12576.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Document the environment variables that correspond with CLI options.
diff --git a/news/12577.bugfix.rst b/news/12577.bugfix.rst
deleted file mode 100644
index b408be6a8c9..00000000000
--- a/news/12577.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Ensure ``-vv`` gets passed to any ``pip install`` build environment subprocesses.
diff --git a/news/12579.bugfix.rst b/news/12579.bugfix.rst
deleted file mode 100644
index df189e8fbff..00000000000
--- a/news/12579.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove duplication in invalid wheel error message
diff --git a/news/12594.trivial.rst b/news/12594.trivial.rst
deleted file mode 100644
index 3d4a67b887d..00000000000
--- a/news/12594.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update Black pre-commit to 24.4.0
diff --git a/news/12595.trivial.rst b/news/12595.trivial.rst
deleted file mode 100644
index 3aad5da6745..00000000000
--- a/news/12595.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update ruff pre-commit to v0.3.6
diff --git a/news/12615.trivial.rst b/news/12615.trivial.rst
deleted file mode 100644
index ace9836ed43..00000000000
--- a/news/12615.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-uses RST substitution to put badges in 1 line.
diff --git a/news/12620.trivial.rst b/news/12620.trivial.rst
deleted file mode 100644
index 52fa571ed17..00000000000
--- a/news/12620.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Enable Python 3.13 CI tests
diff --git a/news/12630.trivial.rst b/news/12630.trivial.rst
deleted file mode 100644
index 8beb79ec366..00000000000
--- a/news/12630.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add ``render: shell`` to the bug report template to format output as code
diff --git a/news/12657.feature.rst b/news/12657.feature.rst
deleted file mode 100644
index 27e4966b9a3..00000000000
--- a/news/12657.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Further improve resolution performance of large dependency trees, by caching hash calculations.
diff --git a/news/12666.bugfix.rst b/news/12666.bugfix.rst
deleted file mode 100644
index 72a4a65155e..00000000000
--- a/news/12666.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix intermittent "cannot locate t64.exe" errors when upgrading pip.
diff --git a/news/23f96da0-5535-40c4-ad79-3feb7f694ec2.trivial.rst b/news/23f96da0-5535-40c4-ad79-3feb7f694ec2.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/24ca5f01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst b/news/24ca5f01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst
deleted file mode 100644
index 1be25395635..00000000000
--- a/news/24ca5f01-e27e-41b1-9a9c-7e3a828e22d9.trivial.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-pip uninstall and list currently depend on req_install.py which always imports
-the expensive network and index machinery. However, it's only in rare situations
-that these commands actually hit the network:
-
-- ``pip list --outdated``
-- ``pip list --uptodate``
-- ``pip uninstall --requirement ``
-
-This patch refactors req_install.py so these commands can avoid the expensive
-imports unless truly necessary.
diff --git a/news/287f037c-108f-48dd-80a0-489921a6b2f3.trivial.rst b/news/287f037c-108f-48dd-80a0-489921a6b2f3.trivial.rst
deleted file mode 100644
index 446d4f9fe9a..00000000000
--- a/news/287f037c-108f-48dd-80a0-489921a6b2f3.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add codespell pre-commit hook to catch common misspellings.
diff --git a/news/4768.feature.rst b/news/4768.feature.rst
deleted file mode 100644
index df69a245a65..00000000000
--- a/news/4768.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Reduce startup time of commands (e.g. show, freeze) that do not access the network by 15-30%.
diff --git a/news/4CCE4788-B8B3-402E-9A88-2981AD074999.trivial.rst b/news/4CCE4788-B8B3-402E-9A88-2981AD074999.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/514f0c13-84ee-4d81-8465-bae74e370d0b.trivial.rst b/news/514f0c13-84ee-4d81-8465-bae74e370d0b.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/5a771372-fb26-11ee-8cc4-f72623cb6607.trivial.rst b/news/5a771372-fb26-11ee-8cc4-f72623cb6607.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/6831.doc.rst b/news/6831.doc.rst
deleted file mode 100644
index 994fc763d6e..00000000000
--- a/news/6831.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update architecture documentation for command line interface.
diff --git a/news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst b/news/7ae28a10-04c4-4a1f-a276-4c9e04f2e0c1.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/7f9639a2-df21-4e0c-9023-80f00fd71d20.trivial.rst b/news/7f9639a2-df21-4e0c-9023-80f00fd71d20.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst b/news/91d23d4d-a9cc-442f-a569-c46e0bdc3e64.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/CacheControl.vendor.rst b/news/CacheControl.vendor.rst
deleted file mode 100644
index f6132b8332e..00000000000
--- a/news/CacheControl.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade CacheControl to 0.14.0
diff --git a/news/a870a527-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst b/news/a870a527-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst
deleted file mode 100644
index d9cbf94d387..00000000000
--- a/news/a870a527-a6ea-46fd-b4aa-c0b0d9b669b0.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Bump pre-commit hooks.
diff --git a/news/b2631650-69cc-4747-8a50-24e574a0ae57.trivial.rst b/news/b2631650-69cc-4747-8a50-24e574a0ae57.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/c678d9e3-4844-4298-a46c-80768b38f652.trivial.rst b/news/c678d9e3-4844-4298-a46c-80768b38f652.trivial.rst
deleted file mode 100644
index 8837b629849..00000000000
--- a/news/c678d9e3-4844-4298-a46c-80768b38f652.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Replace ``captured_output()`` and ``get_url_scheme()`` with stdlib alternatives.
diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
deleted file mode 100644
index d307502900d..00000000000
--- a/news/certifi.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade certifi to 2024.2.2
diff --git a/news/chardet.vendor.rst b/news/chardet.vendor.rst
deleted file mode 100644
index 2e1f3489425..00000000000
--- a/news/chardet.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-The ``chardet`` vendoring is removed (replaced by ``charset-normalizer``).
diff --git a/news/charset_normalizer.vendor.rst b/news/charset_normalizer.vendor.rst
deleted file mode 100644
index 30f1a8a6ed7..00000000000
--- a/news/charset_normalizer.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added at version 3.3.2.
diff --git a/news/distro.vendor.rst b/news/distro.vendor.rst
deleted file mode 100644
index 9929155edbe..00000000000
--- a/news/distro.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade distro to 1.9.0
diff --git a/news/f14947e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst b/news/f14947e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst
deleted file mode 100644
index 001cec34342..00000000000
--- a/news/f14947e7-deea-4e17-bdc2-dd8dab2a1fa5.trivial.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Convert numerous internal classes to dataclasses for readability and stricter
-enforcement of immutability across the codebase. A conservative approach was
-taken in selecting which classes to convert. Classes which did not convert
-cleanly into a dataclass or were "too complex" (e.g. maintains interconnected
-state) were left alone.
diff --git a/news/idna.vendor.rst b/news/idna.vendor.rst
deleted file mode 100644
index 1b8f7430aa6..00000000000
--- a/news/idna.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade idna to 3.7
diff --git a/news/msgpack.vendor.rst b/news/msgpack.vendor.rst
deleted file mode 100644
index cc45383eaa4..00000000000
--- a/news/msgpack.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade msgpack to 1.0.8
diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst
deleted file mode 100644
index 08f099e1cb3..00000000000
--- a/news/packaging.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade packaging to 24.0
diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
deleted file mode 100644
index 4c1af68710e..00000000000
--- a/news/platformdirs.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade platformdirs to 4.2.1
diff --git a/news/pygments.vendor.rst b/news/pygments.vendor.rst
deleted file mode 100644
index f3e9a6f67df..00000000000
--- a/news/pygments.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade pygments to 2.17.2
diff --git a/news/pyparsing.vendor.rst b/news/pyparsing.vendor.rst
deleted file mode 100644
index 37a586a5651..00000000000
--- a/news/pyparsing.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove pyparsing
diff --git a/news/rich.vendor.rst b/news/rich.vendor.rst
deleted file mode 100644
index b3c8f257742..00000000000
--- a/news/rich.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade rich to 13.7.1
diff --git a/news/setuptools.vendor.rst b/news/setuptools.vendor.rst
deleted file mode 100644
index 70703ddc15e..00000000000
--- a/news/setuptools.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade setuptools to 69.5.1
diff --git a/news/tenacity.vendor.rst b/news/tenacity.vendor.rst
deleted file mode 100644
index 5f37bc3f116..00000000000
--- a/news/tenacity.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade tenacity to 8.2.3
diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
deleted file mode 100644
index c605c366678..00000000000
--- a/news/typing_extensions.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade typing_extensions to 4.11.0
diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst
deleted file mode 100644
index 87c7ccfa0b5..00000000000
--- a/news/urllib3.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade urllib3 to 1.26.18
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 13523d261f0..ea72e825432 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1.dev0"
+__version__ = "24.1b1"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 1071978e7abdc96a118da39d635a3014f759acfc Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Mon, 6 May 2024 20:06:26 +0100
Subject: [PATCH 413/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index ea72e825432..cf95985fa1e 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1b1"
+__version__ = "24.1.dev1"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From e3b7f955d1fa95efcf51a803d671aa73fe97b155 Mon Sep 17 00:00:00 2001
From: shenxianpeng 
Date: Tue, 7 May 2024 06:19:57 +0000
Subject: [PATCH 414/992] Update classifier to support Python 3.13

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index bf82ec374bc..328cdce0815 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,6 +18,7 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]

From d7e09f29cfaa50bdd4b53eeb3d6b8a0f91bc3216 Mon Sep 17 00:00:00 2001
From: shenxianpeng 
Date: Tue, 7 May 2024 06:25:52 +0000
Subject: [PATCH 415/992] add news file

---
 news/12678.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12678.trivial.rst

diff --git a/news/12678.trivial.rst b/news/12678.trivial.rst
new file mode 100644
index 00000000000..57f38781bc4
--- /dev/null
+++ b/news/12678.trivial.rst
@@ -0,0 +1 @@
+Update classifier to support Python 3.13

From 692b7f00440ca6e225f94cb665696c20d27bfea9 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 7 May 2024 17:36:55 -0400
Subject: [PATCH 416/992] Remove vendored six and webencodings

urllib3 vendors six and webencodings was last used by html5lib.
---
 .pre-commit-config.yaml                       |   1 -
 MANIFEST.in                                   |   2 -
 news/six.vendor.rst                           |   1 +
 news/webencodings.vendor.rst                  |   1 +
 pyproject.toml                                |   2 -
 src/pip/_vendor/__init__.py                   |   4 -
 src/pip/_vendor/six.LICENSE                   |  18 -
 src/pip/_vendor/six.py                        | 998 ------------------
 src/pip/_vendor/six/__init__.pyi              |   1 -
 src/pip/_vendor/six/moves/__init__.pyi        |   1 -
 src/pip/_vendor/six/moves/configparser.pyi    |   1 -
 src/pip/_vendor/vendor.txt                    |   2 -
 src/pip/_vendor/webencodings.pyi              |   1 -
 src/pip/_vendor/webencodings/LICENSE          |  31 -
 src/pip/_vendor/webencodings/__init__.py      | 342 ------
 src/pip/_vendor/webencodings/labels.py        | 231 ----
 src/pip/_vendor/webencodings/mklabels.py      |  59 --
 src/pip/_vendor/webencodings/tests.py         | 153 ---
 .../_vendor/webencodings/x_user_defined.py    | 325 ------
 19 files changed, 2 insertions(+), 2172 deletions(-)
 create mode 100644 news/six.vendor.rst
 create mode 100644 news/webencodings.vendor.rst
 delete mode 100644 src/pip/_vendor/six.LICENSE
 delete mode 100644 src/pip/_vendor/six.py
 delete mode 100644 src/pip/_vendor/six/__init__.pyi
 delete mode 100644 src/pip/_vendor/six/moves/__init__.pyi
 delete mode 100644 src/pip/_vendor/six/moves/configparser.pyi
 delete mode 100644 src/pip/_vendor/webencodings.pyi
 delete mode 100644 src/pip/_vendor/webencodings/LICENSE
 delete mode 100644 src/pip/_vendor/webencodings/__init__.py
 delete mode 100644 src/pip/_vendor/webencodings/labels.py
 delete mode 100644 src/pip/_vendor/webencodings/mklabels.py
 delete mode 100644 src/pip/_vendor/webencodings/tests.py
 delete mode 100644 src/pip/_vendor/webencodings/x_user_defined.py

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 922e1440d45..4125549ab43 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -40,7 +40,6 @@ repos:
         'types-docutils==0.20.0.3',
         'types-setuptools==68.2.0.0',
         'types-freezegun==1.1.10',
-        'types-six==1.16.21.9',
         'types-pyyaml==6.0.12.12',
     ]
 
diff --git a/MANIFEST.in b/MANIFEST.in
index f896c0258e6..814da8265ca 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -29,8 +29,6 @@ recursive-include src/pip/_vendor py.typed
 recursive-include docs *.css *.py *.rst *.md
 recursive-include docs *.dot *.png
 
-exclude src/pip/_vendor/six
-exclude src/pip/_vendor/six/moves
 recursive-exclude src/pip/_vendor *.pyi
 
 prune .github
diff --git a/news/six.vendor.rst b/news/six.vendor.rst
new file mode 100644
index 00000000000..9b332be92b9
--- /dev/null
+++ b/news/six.vendor.rst
@@ -0,0 +1 @@
+Remove vendored six.
diff --git a/news/webencodings.vendor.rst b/news/webencodings.vendor.rst
new file mode 100644
index 00000000000..35b9f9b9e4c
--- /dev/null
+++ b/news/webencodings.vendor.rst
@@ -0,0 +1 @@
+Remove vendored webencodings.
diff --git a/pyproject.toml b/pyproject.toml
index bf82ec374bc..7af2982838a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -139,7 +139,6 @@ drop = [
 ]
 
 [tool.vendoring.typing-stubs]
-six = ["six.__init__", "six.moves.__init__", "six.moves.configparser"]
 distro = []
 
 [tool.vendoring.license.directories]
@@ -147,7 +146,6 @@ setuptools = "pkg_resources"
 
 [tool.vendoring.license.fallback-urls]
 distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
-webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE"
 
 ######################################################################################
 # ruff
diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
index c1884baf3d1..a0b4bf2f914 100644
--- a/src/pip/_vendor/__init__.py
+++ b/src/pip/_vendor/__init__.py
@@ -63,10 +63,6 @@ def vendored(modulename):
     vendored("colorama")
     vendored("distlib")
     vendored("distro")
-    vendored("six")
-    vendored("six.moves")
-    vendored("six.moves.urllib")
-    vendored("six.moves.urllib.parse")
     vendored("packaging")
     vendored("packaging.version")
     vendored("packaging.specifiers")
diff --git a/src/pip/_vendor/six.LICENSE b/src/pip/_vendor/six.LICENSE
deleted file mode 100644
index de6633112c1..00000000000
--- a/src/pip/_vendor/six.LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright (c) 2010-2020 Benjamin Peterson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/pip/_vendor/six.py b/src/pip/_vendor/six.py
deleted file mode 100644
index 4e15675d8b5..00000000000
--- a/src/pip/_vendor/six.py
+++ /dev/null
@@ -1,998 +0,0 @@
-# Copyright (c) 2010-2020 Benjamin Peterson
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-from __future__ import absolute_import
-
-import functools
-import itertools
-import operator
-import sys
-import types
-
-__author__ = "Benjamin Peterson "
-__version__ = "1.16.0"
-
-
-# Useful for very coarse version differentiation.
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-PY34 = sys.version_info[0:2] >= (3, 4)
-
-if PY3:
-    string_types = str,
-    integer_types = int,
-    class_types = type,
-    text_type = str
-    binary_type = bytes
-
-    MAXSIZE = sys.maxsize
-else:
-    string_types = basestring,
-    integer_types = (int, long)
-    class_types = (type, types.ClassType)
-    text_type = unicode
-    binary_type = str
-
-    if sys.platform.startswith("java"):
-        # Jython always uses 32 bits.
-        MAXSIZE = int((1 << 31) - 1)
-    else:
-        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
-        class X(object):
-
-            def __len__(self):
-                return 1 << 31
-        try:
-            len(X())
-        except OverflowError:
-            # 32-bit
-            MAXSIZE = int((1 << 31) - 1)
-        else:
-            # 64-bit
-            MAXSIZE = int((1 << 63) - 1)
-        del X
-
-if PY34:
-    from importlib.util import spec_from_loader
-else:
-    spec_from_loader = None
-
-
-def _add_doc(func, doc):
-    """Add documentation to a function."""
-    func.__doc__ = doc
-
-
-def _import_module(name):
-    """Import module, returning the module after the last dot."""
-    __import__(name)
-    return sys.modules[name]
-
-
-class _LazyDescr(object):
-
-    def __init__(self, name):
-        self.name = name
-
-    def __get__(self, obj, tp):
-        result = self._resolve()
-        setattr(obj, self.name, result)  # Invokes __set__.
-        try:
-            # This is a bit ugly, but it avoids running this again by
-            # removing this descriptor.
-            delattr(obj.__class__, self.name)
-        except AttributeError:
-            pass
-        return result
-
-
-class MovedModule(_LazyDescr):
-
-    def __init__(self, name, old, new=None):
-        super(MovedModule, self).__init__(name)
-        if PY3:
-            if new is None:
-                new = name
-            self.mod = new
-        else:
-            self.mod = old
-
-    def _resolve(self):
-        return _import_module(self.mod)
-
-    def __getattr__(self, attr):
-        _module = self._resolve()
-        value = getattr(_module, attr)
-        setattr(self, attr, value)
-        return value
-
-
-class _LazyModule(types.ModuleType):
-
-    def __init__(self, name):
-        super(_LazyModule, self).__init__(name)
-        self.__doc__ = self.__class__.__doc__
-
-    def __dir__(self):
-        attrs = ["__doc__", "__name__"]
-        attrs += [attr.name for attr in self._moved_attributes]
-        return attrs
-
-    # Subclasses should override this
-    _moved_attributes = []
-
-
-class MovedAttribute(_LazyDescr):
-
-    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
-        super(MovedAttribute, self).__init__(name)
-        if PY3:
-            if new_mod is None:
-                new_mod = name
-            self.mod = new_mod
-            if new_attr is None:
-                if old_attr is None:
-                    new_attr = name
-                else:
-                    new_attr = old_attr
-            self.attr = new_attr
-        else:
-            self.mod = old_mod
-            if old_attr is None:
-                old_attr = name
-            self.attr = old_attr
-
-    def _resolve(self):
-        module = _import_module(self.mod)
-        return getattr(module, self.attr)
-
-
-class _SixMetaPathImporter(object):
-
-    """
-    A meta path importer to import six.moves and its submodules.
-
-    This class implements a PEP302 finder and loader. It should be compatible
-    with Python 2.5 and all existing versions of Python3
-    """
-
-    def __init__(self, six_module_name):
-        self.name = six_module_name
-        self.known_modules = {}
-
-    def _add_module(self, mod, *fullnames):
-        for fullname in fullnames:
-            self.known_modules[self.name + "." + fullname] = mod
-
-    def _get_module(self, fullname):
-        return self.known_modules[self.name + "." + fullname]
-
-    def find_module(self, fullname, path=None):
-        if fullname in self.known_modules:
-            return self
-        return None
-
-    def find_spec(self, fullname, path, target=None):
-        if fullname in self.known_modules:
-            return spec_from_loader(fullname, self)
-        return None
-
-    def __get_module(self, fullname):
-        try:
-            return self.known_modules[fullname]
-        except KeyError:
-            raise ImportError("This loader does not know module " + fullname)
-
-    def load_module(self, fullname):
-        try:
-            # in case of a reload
-            return sys.modules[fullname]
-        except KeyError:
-            pass
-        mod = self.__get_module(fullname)
-        if isinstance(mod, MovedModule):
-            mod = mod._resolve()
-        else:
-            mod.__loader__ = self
-        sys.modules[fullname] = mod
-        return mod
-
-    def is_package(self, fullname):
-        """
-        Return true, if the named module is a package.
-
-        We need this method to get correct spec objects with
-        Python 3.4 (see PEP451)
-        """
-        return hasattr(self.__get_module(fullname), "__path__")
-
-    def get_code(self, fullname):
-        """Return None
-
-        Required, if is_package is implemented"""
-        self.__get_module(fullname)  # eventually raises ImportError
-        return None
-    get_source = get_code  # same as get_code
-
-    def create_module(self, spec):
-        return self.load_module(spec.name)
-
-    def exec_module(self, module):
-        pass
-
-_importer = _SixMetaPathImporter(__name__)
-
-
-class _MovedItems(_LazyModule):
-
-    """Lazy loading of moved objects"""
-    __path__ = []  # mark as package
-
-
-_moved_attributes = [
-    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
-    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
-    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
-    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
-    MovedAttribute("intern", "__builtin__", "sys"),
-    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
-    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
-    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
-    MovedAttribute("getoutput", "commands", "subprocess"),
-    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
-    MovedAttribute("reduce", "__builtin__", "functools"),
-    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
-    MovedAttribute("StringIO", "StringIO", "io"),
-    MovedAttribute("UserDict", "UserDict", "collections"),
-    MovedAttribute("UserList", "UserList", "collections"),
-    MovedAttribute("UserString", "UserString", "collections"),
-    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
-    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
-    MovedModule("builtins", "__builtin__"),
-    MovedModule("configparser", "ConfigParser"),
-    MovedModule("collections_abc", "collections", "collections.abc" if sys.version_info >= (3, 3) else "collections"),
-    MovedModule("copyreg", "copy_reg"),
-    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
-    MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"),
-    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread" if sys.version_info < (3, 9) else "_thread"),
-    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
-    MovedModule("http_cookies", "Cookie", "http.cookies"),
-    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
-    MovedModule("html_parser", "HTMLParser", "html.parser"),
-    MovedModule("http_client", "httplib", "http.client"),
-    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
-    MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"),
-    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
-    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
-    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
-    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
-    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
-    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
-    MovedModule("cPickle", "cPickle", "pickle"),
-    MovedModule("queue", "Queue"),
-    MovedModule("reprlib", "repr"),
-    MovedModule("socketserver", "SocketServer"),
-    MovedModule("_thread", "thread", "_thread"),
-    MovedModule("tkinter", "Tkinter"),
-    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
-    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
-    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
-    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
-    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
-    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
-    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
-    MovedModule("tkinter_colorchooser", "tkColorChooser",
-                "tkinter.colorchooser"),
-    MovedModule("tkinter_commondialog", "tkCommonDialog",
-                "tkinter.commondialog"),
-    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
-    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
-    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
-                "tkinter.simpledialog"),
-    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
-    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
-    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
-    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
-    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
-    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
-]
-# Add windows specific modules.
-if sys.platform == "win32":
-    _moved_attributes += [
-        MovedModule("winreg", "_winreg"),
-    ]
-
-for attr in _moved_attributes:
-    setattr(_MovedItems, attr.name, attr)
-    if isinstance(attr, MovedModule):
-        _importer._add_module(attr, "moves." + attr.name)
-del attr
-
-_MovedItems._moved_attributes = _moved_attributes
-
-moves = _MovedItems(__name__ + ".moves")
-_importer._add_module(moves, "moves")
-
-
-class Module_six_moves_urllib_parse(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_parse"""
-
-
-_urllib_parse_moved_attributes = [
-    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
-    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
-    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
-    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
-    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("quote", "urllib", "urllib.parse"),
-    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("unquote", "urllib", "urllib.parse"),
-    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"),
-    MovedAttribute("urlencode", "urllib", "urllib.parse"),
-    MovedAttribute("splitquery", "urllib", "urllib.parse"),
-    MovedAttribute("splittag", "urllib", "urllib.parse"),
-    MovedAttribute("splituser", "urllib", "urllib.parse"),
-    MovedAttribute("splitvalue", "urllib", "urllib.parse"),
-    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
-]
-for attr in _urllib_parse_moved_attributes:
-    setattr(Module_six_moves_urllib_parse, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
-                      "moves.urllib_parse", "moves.urllib.parse")
-
-
-class Module_six_moves_urllib_error(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_error"""
-
-
-_urllib_error_moved_attributes = [
-    MovedAttribute("URLError", "urllib2", "urllib.error"),
-    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
-    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
-]
-for attr in _urllib_error_moved_attributes:
-    setattr(Module_six_moves_urllib_error, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
-                      "moves.urllib_error", "moves.urllib.error")
-
-
-class Module_six_moves_urllib_request(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_request"""
-
-
-_urllib_request_moved_attributes = [
-    MovedAttribute("urlopen", "urllib2", "urllib.request"),
-    MovedAttribute("install_opener", "urllib2", "urllib.request"),
-    MovedAttribute("build_opener", "urllib2", "urllib.request"),
-    MovedAttribute("pathname2url", "urllib", "urllib.request"),
-    MovedAttribute("url2pathname", "urllib", "urllib.request"),
-    MovedAttribute("getproxies", "urllib", "urllib.request"),
-    MovedAttribute("Request", "urllib2", "urllib.request"),
-    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
-    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
-    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
-    MovedAttribute("URLopener", "urllib", "urllib.request"),
-    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
-    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
-    MovedAttribute("parse_http_list", "urllib2", "urllib.request"),
-    MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"),
-]
-for attr in _urllib_request_moved_attributes:
-    setattr(Module_six_moves_urllib_request, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
-                      "moves.urllib_request", "moves.urllib.request")
-
-
-class Module_six_moves_urllib_response(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_response"""
-
-
-_urllib_response_moved_attributes = [
-    MovedAttribute("addbase", "urllib", "urllib.response"),
-    MovedAttribute("addclosehook", "urllib", "urllib.response"),
-    MovedAttribute("addinfo", "urllib", "urllib.response"),
-    MovedAttribute("addinfourl", "urllib", "urllib.response"),
-]
-for attr in _urllib_response_moved_attributes:
-    setattr(Module_six_moves_urllib_response, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
-                      "moves.urllib_response", "moves.urllib.response")
-
-
-class Module_six_moves_urllib_robotparser(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
-
-
-_urllib_robotparser_moved_attributes = [
-    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
-]
-for attr in _urllib_robotparser_moved_attributes:
-    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
-
-_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
-                      "moves.urllib_robotparser", "moves.urllib.robotparser")
-
-
-class Module_six_moves_urllib(types.ModuleType):
-
-    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
-    __path__ = []  # mark as package
-    parse = _importer._get_module("moves.urllib_parse")
-    error = _importer._get_module("moves.urllib_error")
-    request = _importer._get_module("moves.urllib_request")
-    response = _importer._get_module("moves.urllib_response")
-    robotparser = _importer._get_module("moves.urllib_robotparser")
-
-    def __dir__(self):
-        return ['parse', 'error', 'request', 'response', 'robotparser']
-
-_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
-                      "moves.urllib")
-
-
-def add_move(move):
-    """Add an item to six.moves."""
-    setattr(_MovedItems, move.name, move)
-
-
-def remove_move(name):
-    """Remove item from six.moves."""
-    try:
-        delattr(_MovedItems, name)
-    except AttributeError:
-        try:
-            del moves.__dict__[name]
-        except KeyError:
-            raise AttributeError("no such move, %r" % (name,))
-
-
-if PY3:
-    _meth_func = "__func__"
-    _meth_self = "__self__"
-
-    _func_closure = "__closure__"
-    _func_code = "__code__"
-    _func_defaults = "__defaults__"
-    _func_globals = "__globals__"
-else:
-    _meth_func = "im_func"
-    _meth_self = "im_self"
-
-    _func_closure = "func_closure"
-    _func_code = "func_code"
-    _func_defaults = "func_defaults"
-    _func_globals = "func_globals"
-
-
-try:
-    advance_iterator = next
-except NameError:
-    def advance_iterator(it):
-        return it.next()
-next = advance_iterator
-
-
-try:
-    callable = callable
-except NameError:
-    def callable(obj):
-        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
-
-
-if PY3:
-    def get_unbound_function(unbound):
-        return unbound
-
-    create_bound_method = types.MethodType
-
-    def create_unbound_method(func, cls):
-        return func
-
-    Iterator = object
-else:
-    def get_unbound_function(unbound):
-        return unbound.im_func
-
-    def create_bound_method(func, obj):
-        return types.MethodType(func, obj, obj.__class__)
-
-    def create_unbound_method(func, cls):
-        return types.MethodType(func, None, cls)
-
-    class Iterator(object):
-
-        def next(self):
-            return type(self).__next__(self)
-
-    callable = callable
-_add_doc(get_unbound_function,
-         """Get the function out of a possibly unbound function""")
-
-
-get_method_function = operator.attrgetter(_meth_func)
-get_method_self = operator.attrgetter(_meth_self)
-get_function_closure = operator.attrgetter(_func_closure)
-get_function_code = operator.attrgetter(_func_code)
-get_function_defaults = operator.attrgetter(_func_defaults)
-get_function_globals = operator.attrgetter(_func_globals)
-
-
-if PY3:
-    def iterkeys(d, **kw):
-        return iter(d.keys(**kw))
-
-    def itervalues(d, **kw):
-        return iter(d.values(**kw))
-
-    def iteritems(d, **kw):
-        return iter(d.items(**kw))
-
-    def iterlists(d, **kw):
-        return iter(d.lists(**kw))
-
-    viewkeys = operator.methodcaller("keys")
-
-    viewvalues = operator.methodcaller("values")
-
-    viewitems = operator.methodcaller("items")
-else:
-    def iterkeys(d, **kw):
-        return d.iterkeys(**kw)
-
-    def itervalues(d, **kw):
-        return d.itervalues(**kw)
-
-    def iteritems(d, **kw):
-        return d.iteritems(**kw)
-
-    def iterlists(d, **kw):
-        return d.iterlists(**kw)
-
-    viewkeys = operator.methodcaller("viewkeys")
-
-    viewvalues = operator.methodcaller("viewvalues")
-
-    viewitems = operator.methodcaller("viewitems")
-
-_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
-_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
-_add_doc(iteritems,
-         "Return an iterator over the (key, value) pairs of a dictionary.")
-_add_doc(iterlists,
-         "Return an iterator over the (key, [values]) pairs of a dictionary.")
-
-
-if PY3:
-    def b(s):
-        return s.encode("latin-1")
-
-    def u(s):
-        return s
-    unichr = chr
-    import struct
-    int2byte = struct.Struct(">B").pack
-    del struct
-    byte2int = operator.itemgetter(0)
-    indexbytes = operator.getitem
-    iterbytes = iter
-    import io
-    StringIO = io.StringIO
-    BytesIO = io.BytesIO
-    del io
-    _assertCountEqual = "assertCountEqual"
-    if sys.version_info[1] <= 1:
-        _assertRaisesRegex = "assertRaisesRegexp"
-        _assertRegex = "assertRegexpMatches"
-        _assertNotRegex = "assertNotRegexpMatches"
-    else:
-        _assertRaisesRegex = "assertRaisesRegex"
-        _assertRegex = "assertRegex"
-        _assertNotRegex = "assertNotRegex"
-else:
-    def b(s):
-        return s
-    # Workaround for standalone backslash
-
-    def u(s):
-        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
-    unichr = unichr
-    int2byte = chr
-
-    def byte2int(bs):
-        return ord(bs[0])
-
-    def indexbytes(buf, i):
-        return ord(buf[i])
-    iterbytes = functools.partial(itertools.imap, ord)
-    import StringIO
-    StringIO = BytesIO = StringIO.StringIO
-    _assertCountEqual = "assertItemsEqual"
-    _assertRaisesRegex = "assertRaisesRegexp"
-    _assertRegex = "assertRegexpMatches"
-    _assertNotRegex = "assertNotRegexpMatches"
-_add_doc(b, """Byte literal""")
-_add_doc(u, """Text literal""")
-
-
-def assertCountEqual(self, *args, **kwargs):
-    return getattr(self, _assertCountEqual)(*args, **kwargs)
-
-
-def assertRaisesRegex(self, *args, **kwargs):
-    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
-
-
-def assertRegex(self, *args, **kwargs):
-    return getattr(self, _assertRegex)(*args, **kwargs)
-
-
-def assertNotRegex(self, *args, **kwargs):
-    return getattr(self, _assertNotRegex)(*args, **kwargs)
-
-
-if PY3:
-    exec_ = getattr(moves.builtins, "exec")
-
-    def reraise(tp, value, tb=None):
-        try:
-            if value is None:
-                value = tp()
-            if value.__traceback__ is not tb:
-                raise value.with_traceback(tb)
-            raise value
-        finally:
-            value = None
-            tb = None
-
-else:
-    def exec_(_code_, _globs_=None, _locs_=None):
-        """Execute code in a namespace."""
-        if _globs_ is None:
-            frame = sys._getframe(1)
-            _globs_ = frame.f_globals
-            if _locs_ is None:
-                _locs_ = frame.f_locals
-            del frame
-        elif _locs_ is None:
-            _locs_ = _globs_
-        exec("""exec _code_ in _globs_, _locs_""")
-
-    exec_("""def reraise(tp, value, tb=None):
-    try:
-        raise tp, value, tb
-    finally:
-        tb = None
-""")
-
-
-if sys.version_info[:2] > (3,):
-    exec_("""def raise_from(value, from_value):
-    try:
-        raise value from from_value
-    finally:
-        value = None
-""")
-else:
-    def raise_from(value, from_value):
-        raise value
-
-
-print_ = getattr(moves.builtins, "print", None)
-if print_ is None:
-    def print_(*args, **kwargs):
-        """The new-style print function for Python 2.4 and 2.5."""
-        fp = kwargs.pop("file", sys.stdout)
-        if fp is None:
-            return
-
-        def write(data):
-            if not isinstance(data, basestring):
-                data = str(data)
-            # If the file has an encoding, encode unicode with it.
-            if (isinstance(fp, file) and
-                    isinstance(data, unicode) and
-                    fp.encoding is not None):
-                errors = getattr(fp, "errors", None)
-                if errors is None:
-                    errors = "strict"
-                data = data.encode(fp.encoding, errors)
-            fp.write(data)
-        want_unicode = False
-        sep = kwargs.pop("sep", None)
-        if sep is not None:
-            if isinstance(sep, unicode):
-                want_unicode = True
-            elif not isinstance(sep, str):
-                raise TypeError("sep must be None or a string")
-        end = kwargs.pop("end", None)
-        if end is not None:
-            if isinstance(end, unicode):
-                want_unicode = True
-            elif not isinstance(end, str):
-                raise TypeError("end must be None or a string")
-        if kwargs:
-            raise TypeError("invalid keyword arguments to print()")
-        if not want_unicode:
-            for arg in args:
-                if isinstance(arg, unicode):
-                    want_unicode = True
-                    break
-        if want_unicode:
-            newline = unicode("\n")
-            space = unicode(" ")
-        else:
-            newline = "\n"
-            space = " "
-        if sep is None:
-            sep = space
-        if end is None:
-            end = newline
-        for i, arg in enumerate(args):
-            if i:
-                write(sep)
-            write(arg)
-        write(end)
-if sys.version_info[:2] < (3, 3):
-    _print = print_
-
-    def print_(*args, **kwargs):
-        fp = kwargs.get("file", sys.stdout)
-        flush = kwargs.pop("flush", False)
-        _print(*args, **kwargs)
-        if flush and fp is not None:
-            fp.flush()
-
-_add_doc(reraise, """Reraise an exception.""")
-
-if sys.version_info[0:2] < (3, 4):
-    # This does exactly the same what the :func:`py3:functools.update_wrapper`
-    # function does on Python versions after 3.2. It sets the ``__wrapped__``
-    # attribute on ``wrapper`` object and it doesn't raise an error if any of
-    # the attributes mentioned in ``assigned`` and ``updated`` are missing on
-    # ``wrapped`` object.
-    def _update_wrapper(wrapper, wrapped,
-                        assigned=functools.WRAPPER_ASSIGNMENTS,
-                        updated=functools.WRAPPER_UPDATES):
-        for attr in assigned:
-            try:
-                value = getattr(wrapped, attr)
-            except AttributeError:
-                continue
-            else:
-                setattr(wrapper, attr, value)
-        for attr in updated:
-            getattr(wrapper, attr).update(getattr(wrapped, attr, {}))
-        wrapper.__wrapped__ = wrapped
-        return wrapper
-    _update_wrapper.__doc__ = functools.update_wrapper.__doc__
-
-    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
-              updated=functools.WRAPPER_UPDATES):
-        return functools.partial(_update_wrapper, wrapped=wrapped,
-                                 assigned=assigned, updated=updated)
-    wraps.__doc__ = functools.wraps.__doc__
-
-else:
-    wraps = functools.wraps
-
-
-def with_metaclass(meta, *bases):
-    """Create a base class with a metaclass."""
-    # This requires a bit of explanation: the basic idea is to make a dummy
-    # metaclass for one level of class instantiation that replaces itself with
-    # the actual metaclass.
-    class metaclass(type):
-
-        def __new__(cls, name, this_bases, d):
-            if sys.version_info[:2] >= (3, 7):
-                # This version introduced PEP 560 that requires a bit
-                # of extra care (we mimic what is done by __build_class__).
-                resolved_bases = types.resolve_bases(bases)
-                if resolved_bases is not bases:
-                    d['__orig_bases__'] = bases
-            else:
-                resolved_bases = bases
-            return meta(name, resolved_bases, d)
-
-        @classmethod
-        def __prepare__(cls, name, this_bases):
-            return meta.__prepare__(name, bases)
-    return type.__new__(metaclass, 'temporary_class', (), {})
-
-
-def add_metaclass(metaclass):
-    """Class decorator for creating a class with a metaclass."""
-    def wrapper(cls):
-        orig_vars = cls.__dict__.copy()
-        slots = orig_vars.get('__slots__')
-        if slots is not None:
-            if isinstance(slots, str):
-                slots = [slots]
-            for slots_var in slots:
-                orig_vars.pop(slots_var)
-        orig_vars.pop('__dict__', None)
-        orig_vars.pop('__weakref__', None)
-        if hasattr(cls, '__qualname__'):
-            orig_vars['__qualname__'] = cls.__qualname__
-        return metaclass(cls.__name__, cls.__bases__, orig_vars)
-    return wrapper
-
-
-def ensure_binary(s, encoding='utf-8', errors='strict'):
-    """Coerce **s** to six.binary_type.
-
-    For Python 2:
-      - `unicode` -> encoded to `str`
-      - `str` -> `str`
-
-    For Python 3:
-      - `str` -> encoded to `bytes`
-      - `bytes` -> `bytes`
-    """
-    if isinstance(s, binary_type):
-        return s
-    if isinstance(s, text_type):
-        return s.encode(encoding, errors)
-    raise TypeError("not expecting type '%s'" % type(s))
-
-
-def ensure_str(s, encoding='utf-8', errors='strict'):
-    """Coerce *s* to `str`.
-
-    For Python 2:
-      - `unicode` -> encoded to `str`
-      - `str` -> `str`
-
-    For Python 3:
-      - `str` -> `str`
-      - `bytes` -> decoded to `str`
-    """
-    # Optimization: Fast return for the common case.
-    if type(s) is str:
-        return s
-    if PY2 and isinstance(s, text_type):
-        return s.encode(encoding, errors)
-    elif PY3 and isinstance(s, binary_type):
-        return s.decode(encoding, errors)
-    elif not isinstance(s, (text_type, binary_type)):
-        raise TypeError("not expecting type '%s'" % type(s))
-    return s
-
-
-def ensure_text(s, encoding='utf-8', errors='strict'):
-    """Coerce *s* to six.text_type.
-
-    For Python 2:
-      - `unicode` -> `unicode`
-      - `str` -> `unicode`
-
-    For Python 3:
-      - `str` -> `str`
-      - `bytes` -> decoded to `str`
-    """
-    if isinstance(s, binary_type):
-        return s.decode(encoding, errors)
-    elif isinstance(s, text_type):
-        return s
-    else:
-        raise TypeError("not expecting type '%s'" % type(s))
-
-
-def python_2_unicode_compatible(klass):
-    """
-    A class decorator that defines __unicode__ and __str__ methods under Python 2.
-    Under Python 3 it does nothing.
-
-    To support Python 2 and 3 with a single code base, define a __str__ method
-    returning text and apply this decorator to the class.
-    """
-    if PY2:
-        if '__str__' not in klass.__dict__:
-            raise ValueError("@python_2_unicode_compatible cannot be applied "
-                             "to %s because it doesn't define __str__()." %
-                             klass.__name__)
-        klass.__unicode__ = klass.__str__
-        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
-    return klass
-
-
-# Complete the moves implementation.
-# This code is at the end of this module to speed up module loading.
-# Turn this module into a package.
-__path__ = []  # required for PEP 302 and PEP 451
-__package__ = __name__  # see PEP 366 @ReservedAssignment
-if globals().get("__spec__") is not None:
-    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
-# Remove other six meta path importers, since they cause problems. This can
-# happen if six is removed from sys.modules and then reloaded. (Setuptools does
-# this for some reason.)
-if sys.meta_path:
-    for i, importer in enumerate(sys.meta_path):
-        # Here's some real nastiness: Another "instance" of the six module might
-        # be floating around. Therefore, we can't use isinstance() to check for
-        # the six meta path importer, since the other six instance will have
-        # inserted an importer with different class.
-        if (type(importer).__name__ == "_SixMetaPathImporter" and
-                importer.name == __name__):
-            del sys.meta_path[i]
-            break
-    del i, importer
-# Finally, add the importer to the meta path import hook.
-sys.meta_path.append(_importer)
diff --git a/src/pip/_vendor/six/__init__.pyi b/src/pip/_vendor/six/__init__.pyi
deleted file mode 100644
index e5c0e242278..00000000000
--- a/src/pip/_vendor/six/__init__.pyi
+++ /dev/null
@@ -1 +0,0 @@
-from six import *
\ No newline at end of file
diff --git a/src/pip/_vendor/six/moves/__init__.pyi b/src/pip/_vendor/six/moves/__init__.pyi
deleted file mode 100644
index 7a82f79db68..00000000000
--- a/src/pip/_vendor/six/moves/__init__.pyi
+++ /dev/null
@@ -1 +0,0 @@
-from six.moves import *
\ No newline at end of file
diff --git a/src/pip/_vendor/six/moves/configparser.pyi b/src/pip/_vendor/six/moves/configparser.pyi
deleted file mode 100644
index f77b3f41052..00000000000
--- a/src/pip/_vendor/six/moves/configparser.pyi
+++ /dev/null
@@ -1 +0,0 @@
-from six.moves.configparser import *
\ No newline at end of file
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 37efce023a4..50c1ed46975 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -16,8 +16,6 @@ rich==13.7.1
     typing_extensions==4.11.0
 resolvelib==1.0.1
 setuptools==69.5.1
-six==1.16.0
 tenacity==8.2.3
 tomli==2.0.1
 truststore==0.8.0
-webencodings==0.5.1
diff --git a/src/pip/_vendor/webencodings.pyi b/src/pip/_vendor/webencodings.pyi
deleted file mode 100644
index a11db4d82cb..00000000000
--- a/src/pip/_vendor/webencodings.pyi
+++ /dev/null
@@ -1 +0,0 @@
-from webencodings import *
\ No newline at end of file
diff --git a/src/pip/_vendor/webencodings/LICENSE b/src/pip/_vendor/webencodings/LICENSE
deleted file mode 100644
index 3d0d3e70595..00000000000
--- a/src/pip/_vendor/webencodings/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-Copyright (c) 2012 by Simon Sapin.
-
-Some rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/pip/_vendor/webencodings/__init__.py b/src/pip/_vendor/webencodings/__init__.py
deleted file mode 100644
index d21d697c887..00000000000
--- a/src/pip/_vendor/webencodings/__init__.py
+++ /dev/null
@@ -1,342 +0,0 @@
-# coding: utf-8
-"""
-
-    webencodings
-    ~~~~~~~~~~~~
-
-    This is a Python implementation of the `WHATWG Encoding standard
-    `. See README for details.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-from __future__ import unicode_literals
-
-import codecs
-
-from .labels import LABELS
-
-
-VERSION = '0.5.1'
-
-
-# Some names in Encoding are not valid Python aliases. Remap these.
-PYTHON_NAMES = {
-    'iso-8859-8-i': 'iso-8859-8',
-    'x-mac-cyrillic': 'mac-cyrillic',
-    'macintosh': 'mac-roman',
-    'windows-874': 'cp874'}
-
-CACHE = {}
-
-
-def ascii_lower(string):
-    r"""Transform (only) ASCII letters to lower case: A-Z is mapped to a-z.
-
-    :param string: An Unicode string.
-    :returns: A new Unicode string.
-
-    This is used for `ASCII case-insensitive
-    `_
-    matching of encoding labels.
-    The same matching is also used, among other things,
-    for `CSS keywords `_.
-
-    This is different from the :meth:`~py:str.lower` method of Unicode strings
-    which also affect non-ASCII characters,
-    sometimes mapping them into the ASCII range:
-
-        >>> keyword = u'Bac\N{KELVIN SIGN}ground'
-        >>> assert keyword.lower() == u'background'
-        >>> assert ascii_lower(keyword) != keyword.lower()
-        >>> assert ascii_lower(keyword) == u'bac\N{KELVIN SIGN}ground'
-
-    """
-    # This turns out to be faster than unicode.translate()
-    return string.encode('utf8').lower().decode('utf8')
-
-
-def lookup(label):
-    """
-    Look for an encoding by its label.
-    This is the spec’s `get an encoding
-    `_ algorithm.
-    Supported labels are listed there.
-
-    :param label: A string.
-    :returns:
-        An :class:`Encoding` object, or :obj:`None` for an unknown label.
-
-    """
-    # Only strip ASCII whitespace: U+0009, U+000A, U+000C, U+000D, and U+0020.
-    label = ascii_lower(label.strip('\t\n\f\r '))
-    name = LABELS.get(label)
-    if name is None:
-        return None
-    encoding = CACHE.get(name)
-    if encoding is None:
-        if name == 'x-user-defined':
-            from .x_user_defined import codec_info
-        else:
-            python_name = PYTHON_NAMES.get(name, name)
-            # Any python_name value that gets to here should be valid.
-            codec_info = codecs.lookup(python_name)
-        encoding = Encoding(name, codec_info)
-        CACHE[name] = encoding
-    return encoding
-
-
-def _get_encoding(encoding_or_label):
-    """
-    Accept either an encoding object or label.
-
-    :param encoding: An :class:`Encoding` object or a label string.
-    :returns: An :class:`Encoding` object.
-    :raises: :exc:`~exceptions.LookupError` for an unknown label.
-
-    """
-    if hasattr(encoding_or_label, 'codec_info'):
-        return encoding_or_label
-
-    encoding = lookup(encoding_or_label)
-    if encoding is None:
-        raise LookupError('Unknown encoding label: %r' % encoding_or_label)
-    return encoding
-
-
-class Encoding(object):
-    """Reresents a character encoding such as UTF-8,
-    that can be used for decoding or encoding.
-
-    .. attribute:: name
-
-        Canonical name of the encoding
-
-    .. attribute:: codec_info
-
-        The actual implementation of the encoding,
-        a stdlib :class:`~codecs.CodecInfo` object.
-        See :func:`codecs.register`.
-
-    """
-    def __init__(self, name, codec_info):
-        self.name = name
-        self.codec_info = codec_info
-
-    def __repr__(self):
-        return '' % self.name
-
-
-#: The UTF-8 encoding. Should be used for new content and formats.
-UTF8 = lookup('utf-8')
-
-_UTF16LE = lookup('utf-16le')
-_UTF16BE = lookup('utf-16be')
-
-
-def decode(input, fallback_encoding, errors='replace'):
-    """
-    Decode a single string.
-
-    :param input: A byte string
-    :param fallback_encoding:
-        An :class:`Encoding` object or a label string.
-        The encoding to use if :obj:`input` does note have a BOM.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-    :return:
-        A ``(output, encoding)`` tuple of an Unicode string
-        and an :obj:`Encoding`.
-
-    """
-    # Fail early if `encoding` is an invalid label.
-    fallback_encoding = _get_encoding(fallback_encoding)
-    bom_encoding, input = _detect_bom(input)
-    encoding = bom_encoding or fallback_encoding
-    return encoding.codec_info.decode(input, errors)[0], encoding
-
-
-def _detect_bom(input):
-    """Return (bom_encoding, input), with any BOM removed from the input."""
-    if input.startswith(b'\xFF\xFE'):
-        return _UTF16LE, input[2:]
-    if input.startswith(b'\xFE\xFF'):
-        return _UTF16BE, input[2:]
-    if input.startswith(b'\xEF\xBB\xBF'):
-        return UTF8, input[3:]
-    return None, input
-
-
-def encode(input, encoding=UTF8, errors='strict'):
-    """
-    Encode a single string.
-
-    :param input: An Unicode string.
-    :param encoding: An :class:`Encoding` object or a label string.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-    :return: A byte string.
-
-    """
-    return _get_encoding(encoding).codec_info.encode(input, errors)[0]
-
-
-def iter_decode(input, fallback_encoding, errors='replace'):
-    """
-    "Pull"-based decoder.
-
-    :param input:
-        An iterable of byte strings.
-
-        The input is first consumed just enough to determine the encoding
-        based on the precense of a BOM,
-        then consumed on demand when the return value is.
-    :param fallback_encoding:
-        An :class:`Encoding` object or a label string.
-        The encoding to use if :obj:`input` does note have a BOM.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-    :returns:
-        An ``(output, encoding)`` tuple.
-        :obj:`output` is an iterable of Unicode strings,
-        :obj:`encoding` is the :obj:`Encoding` that is being used.
-
-    """
-
-    decoder = IncrementalDecoder(fallback_encoding, errors)
-    generator = _iter_decode_generator(input, decoder)
-    encoding = next(generator)
-    return generator, encoding
-
-
-def _iter_decode_generator(input, decoder):
-    """Return a generator that first yields the :obj:`Encoding`,
-    then yields output chukns as Unicode strings.
-
-    """
-    decode = decoder.decode
-    input = iter(input)
-    for chunck in input:
-        output = decode(chunck)
-        if output:
-            assert decoder.encoding is not None
-            yield decoder.encoding
-            yield output
-            break
-    else:
-        # Input exhausted without determining the encoding
-        output = decode(b'', final=True)
-        assert decoder.encoding is not None
-        yield decoder.encoding
-        if output:
-            yield output
-        return
-
-    for chunck in input:
-        output = decode(chunck)
-        if output:
-            yield output
-    output = decode(b'', final=True)
-    if output:
-        yield output
-
-
-def iter_encode(input, encoding=UTF8, errors='strict'):
-    """
-    “Pull”-based encoder.
-
-    :param input: An iterable of Unicode strings.
-    :param encoding: An :class:`Encoding` object or a label string.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-    :returns: An iterable of byte strings.
-
-    """
-    # Fail early if `encoding` is an invalid label.
-    encode = IncrementalEncoder(encoding, errors).encode
-    return _iter_encode_generator(input, encode)
-
-
-def _iter_encode_generator(input, encode):
-    for chunck in input:
-        output = encode(chunck)
-        if output:
-            yield output
-    output = encode('', final=True)
-    if output:
-        yield output
-
-
-class IncrementalDecoder(object):
-    """
-    “Push”-based decoder.
-
-    :param fallback_encoding:
-        An :class:`Encoding` object or a label string.
-        The encoding to use if :obj:`input` does note have a BOM.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-
-    """
-    def __init__(self, fallback_encoding, errors='replace'):
-        # Fail early if `encoding` is an invalid label.
-        self._fallback_encoding = _get_encoding(fallback_encoding)
-        self._errors = errors
-        self._buffer = b''
-        self._decoder = None
-        #: The actual :class:`Encoding` that is being used,
-        #: or :obj:`None` if that is not determined yet.
-        #: (Ie. if there is not enough input yet to determine
-        #: if there is a BOM.)
-        self.encoding = None  # Not known yet.
-
-    def decode(self, input, final=False):
-        """Decode one chunk of the input.
-
-        :param input: A byte string.
-        :param final:
-            Indicate that no more input is available.
-            Must be :obj:`True` if this is the last call.
-        :returns: An Unicode string.
-
-        """
-        decoder = self._decoder
-        if decoder is not None:
-            return decoder(input, final)
-
-        input = self._buffer + input
-        encoding, input = _detect_bom(input)
-        if encoding is None:
-            if len(input) < 3 and not final:  # Not enough data yet.
-                self._buffer = input
-                return ''
-            else:  # No BOM
-                encoding = self._fallback_encoding
-        decoder = encoding.codec_info.incrementaldecoder(self._errors).decode
-        self._decoder = decoder
-        self.encoding = encoding
-        return decoder(input, final)
-
-
-class IncrementalEncoder(object):
-    """
-    “Push”-based encoder.
-
-    :param encoding: An :class:`Encoding` object or a label string.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-
-    .. method:: encode(input, final=False)
-
-        :param input: An Unicode string.
-        :param final:
-            Indicate that no more input is available.
-            Must be :obj:`True` if this is the last call.
-        :returns: A byte string.
-
-    """
-    def __init__(self, encoding=UTF8, errors='strict'):
-        encoding = _get_encoding(encoding)
-        self.encode = encoding.codec_info.incrementalencoder(errors).encode
diff --git a/src/pip/_vendor/webencodings/labels.py b/src/pip/_vendor/webencodings/labels.py
deleted file mode 100644
index 29cbf91ef79..00000000000
--- a/src/pip/_vendor/webencodings/labels.py
+++ /dev/null
@@ -1,231 +0,0 @@
-"""
-
-    webencodings.labels
-    ~~~~~~~~~~~~~~~~~~~
-
-    Map encoding labels to their name.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-# XXX Do not edit!
-# This file is automatically generated by mklabels.py
-
-LABELS = {
-    'unicode-1-1-utf-8':   'utf-8',
-    'utf-8':               'utf-8',
-    'utf8':                'utf-8',
-    '866':                 'ibm866',
-    'cp866':               'ibm866',
-    'csibm866':            'ibm866',
-    'ibm866':              'ibm866',
-    'csisolatin2':         'iso-8859-2',
-    'iso-8859-2':          'iso-8859-2',
-    'iso-ir-101':          'iso-8859-2',
-    'iso8859-2':           'iso-8859-2',
-    'iso88592':            'iso-8859-2',
-    'iso_8859-2':          'iso-8859-2',
-    'iso_8859-2:1987':     'iso-8859-2',
-    'l2':                  'iso-8859-2',
-    'latin2':              'iso-8859-2',
-    'csisolatin3':         'iso-8859-3',
-    'iso-8859-3':          'iso-8859-3',
-    'iso-ir-109':          'iso-8859-3',
-    'iso8859-3':           'iso-8859-3',
-    'iso88593':            'iso-8859-3',
-    'iso_8859-3':          'iso-8859-3',
-    'iso_8859-3:1988':     'iso-8859-3',
-    'l3':                  'iso-8859-3',
-    'latin3':              'iso-8859-3',
-    'csisolatin4':         'iso-8859-4',
-    'iso-8859-4':          'iso-8859-4',
-    'iso-ir-110':          'iso-8859-4',
-    'iso8859-4':           'iso-8859-4',
-    'iso88594':            'iso-8859-4',
-    'iso_8859-4':          'iso-8859-4',
-    'iso_8859-4:1988':     'iso-8859-4',
-    'l4':                  'iso-8859-4',
-    'latin4':              'iso-8859-4',
-    'csisolatincyrillic':  'iso-8859-5',
-    'cyrillic':            'iso-8859-5',
-    'iso-8859-5':          'iso-8859-5',
-    'iso-ir-144':          'iso-8859-5',
-    'iso8859-5':           'iso-8859-5',
-    'iso88595':            'iso-8859-5',
-    'iso_8859-5':          'iso-8859-5',
-    'iso_8859-5:1988':     'iso-8859-5',
-    'arabic':              'iso-8859-6',
-    'asmo-708':            'iso-8859-6',
-    'csiso88596e':         'iso-8859-6',
-    'csiso88596i':         'iso-8859-6',
-    'csisolatinarabic':    'iso-8859-6',
-    'ecma-114':            'iso-8859-6',
-    'iso-8859-6':          'iso-8859-6',
-    'iso-8859-6-e':        'iso-8859-6',
-    'iso-8859-6-i':        'iso-8859-6',
-    'iso-ir-127':          'iso-8859-6',
-    'iso8859-6':           'iso-8859-6',
-    'iso88596':            'iso-8859-6',
-    'iso_8859-6':          'iso-8859-6',
-    'iso_8859-6:1987':     'iso-8859-6',
-    'csisolatingreek':     'iso-8859-7',
-    'ecma-118':            'iso-8859-7',
-    'elot_928':            'iso-8859-7',
-    'greek':               'iso-8859-7',
-    'greek8':              'iso-8859-7',
-    'iso-8859-7':          'iso-8859-7',
-    'iso-ir-126':          'iso-8859-7',
-    'iso8859-7':           'iso-8859-7',
-    'iso88597':            'iso-8859-7',
-    'iso_8859-7':          'iso-8859-7',
-    'iso_8859-7:1987':     'iso-8859-7',
-    'sun_eu_greek':        'iso-8859-7',
-    'csiso88598e':         'iso-8859-8',
-    'csisolatinhebrew':    'iso-8859-8',
-    'hebrew':              'iso-8859-8',
-    'iso-8859-8':          'iso-8859-8',
-    'iso-8859-8-e':        'iso-8859-8',
-    'iso-ir-138':          'iso-8859-8',
-    'iso8859-8':           'iso-8859-8',
-    'iso88598':            'iso-8859-8',
-    'iso_8859-8':          'iso-8859-8',
-    'iso_8859-8:1988':     'iso-8859-8',
-    'visual':              'iso-8859-8',
-    'csiso88598i':         'iso-8859-8-i',
-    'iso-8859-8-i':        'iso-8859-8-i',
-    'logical':             'iso-8859-8-i',
-    'csisolatin6':         'iso-8859-10',
-    'iso-8859-10':         'iso-8859-10',
-    'iso-ir-157':          'iso-8859-10',
-    'iso8859-10':          'iso-8859-10',
-    'iso885910':           'iso-8859-10',
-    'l6':                  'iso-8859-10',
-    'latin6':              'iso-8859-10',
-    'iso-8859-13':         'iso-8859-13',
-    'iso8859-13':          'iso-8859-13',
-    'iso885913':           'iso-8859-13',
-    'iso-8859-14':         'iso-8859-14',
-    'iso8859-14':          'iso-8859-14',
-    'iso885914':           'iso-8859-14',
-    'csisolatin9':         'iso-8859-15',
-    'iso-8859-15':         'iso-8859-15',
-    'iso8859-15':          'iso-8859-15',
-    'iso885915':           'iso-8859-15',
-    'iso_8859-15':         'iso-8859-15',
-    'l9':                  'iso-8859-15',
-    'iso-8859-16':         'iso-8859-16',
-    'cskoi8r':             'koi8-r',
-    'koi':                 'koi8-r',
-    'koi8':                'koi8-r',
-    'koi8-r':              'koi8-r',
-    'koi8_r':              'koi8-r',
-    'koi8-u':              'koi8-u',
-    'csmacintosh':         'macintosh',
-    'mac':                 'macintosh',
-    'macintosh':           'macintosh',
-    'x-mac-roman':         'macintosh',
-    'dos-874':             'windows-874',
-    'iso-8859-11':         'windows-874',
-    'iso8859-11':          'windows-874',
-    'iso885911':           'windows-874',
-    'tis-620':             'windows-874',
-    'windows-874':         'windows-874',
-    'cp1250':              'windows-1250',
-    'windows-1250':        'windows-1250',
-    'x-cp1250':            'windows-1250',
-    'cp1251':              'windows-1251',
-    'windows-1251':        'windows-1251',
-    'x-cp1251':            'windows-1251',
-    'ansi_x3.4-1968':      'windows-1252',
-    'ascii':               'windows-1252',
-    'cp1252':              'windows-1252',
-    'cp819':               'windows-1252',
-    'csisolatin1':         'windows-1252',
-    'ibm819':              'windows-1252',
-    'iso-8859-1':          'windows-1252',
-    'iso-ir-100':          'windows-1252',
-    'iso8859-1':           'windows-1252',
-    'iso88591':            'windows-1252',
-    'iso_8859-1':          'windows-1252',
-    'iso_8859-1:1987':     'windows-1252',
-    'l1':                  'windows-1252',
-    'latin1':              'windows-1252',
-    'us-ascii':            'windows-1252',
-    'windows-1252':        'windows-1252',
-    'x-cp1252':            'windows-1252',
-    'cp1253':              'windows-1253',
-    'windows-1253':        'windows-1253',
-    'x-cp1253':            'windows-1253',
-    'cp1254':              'windows-1254',
-    'csisolatin5':         'windows-1254',
-    'iso-8859-9':          'windows-1254',
-    'iso-ir-148':          'windows-1254',
-    'iso8859-9':           'windows-1254',
-    'iso88599':            'windows-1254',
-    'iso_8859-9':          'windows-1254',
-    'iso_8859-9:1989':     'windows-1254',
-    'l5':                  'windows-1254',
-    'latin5':              'windows-1254',
-    'windows-1254':        'windows-1254',
-    'x-cp1254':            'windows-1254',
-    'cp1255':              'windows-1255',
-    'windows-1255':        'windows-1255',
-    'x-cp1255':            'windows-1255',
-    'cp1256':              'windows-1256',
-    'windows-1256':        'windows-1256',
-    'x-cp1256':            'windows-1256',
-    'cp1257':              'windows-1257',
-    'windows-1257':        'windows-1257',
-    'x-cp1257':            'windows-1257',
-    'cp1258':              'windows-1258',
-    'windows-1258':        'windows-1258',
-    'x-cp1258':            'windows-1258',
-    'x-mac-cyrillic':      'x-mac-cyrillic',
-    'x-mac-ukrainian':     'x-mac-cyrillic',
-    'chinese':             'gbk',
-    'csgb2312':            'gbk',
-    'csiso58gb231280':     'gbk',
-    'gb2312':              'gbk',
-    'gb_2312':             'gbk',
-    'gb_2312-80':          'gbk',
-    'gbk':                 'gbk',
-    'iso-ir-58':           'gbk',
-    'x-gbk':               'gbk',
-    'gb18030':             'gb18030',
-    'hz-gb-2312':          'hz-gb-2312',
-    'big5':                'big5',
-    'big5-hkscs':          'big5',
-    'cn-big5':             'big5',
-    'csbig5':              'big5',
-    'x-x-big5':            'big5',
-    'cseucpkdfmtjapanese': 'euc-jp',
-    'euc-jp':              'euc-jp',
-    'x-euc-jp':            'euc-jp',
-    'csiso2022jp':         'iso-2022-jp',
-    'iso-2022-jp':         'iso-2022-jp',
-    'csshiftjis':          'shift_jis',
-    'ms_kanji':            'shift_jis',
-    'shift-jis':           'shift_jis',
-    'shift_jis':           'shift_jis',
-    'sjis':                'shift_jis',
-    'windows-31j':         'shift_jis',
-    'x-sjis':              'shift_jis',
-    'cseuckr':             'euc-kr',
-    'csksc56011987':       'euc-kr',
-    'euc-kr':              'euc-kr',
-    'iso-ir-149':          'euc-kr',
-    'korean':              'euc-kr',
-    'ks_c_5601-1987':      'euc-kr',
-    'ks_c_5601-1989':      'euc-kr',
-    'ksc5601':             'euc-kr',
-    'ksc_5601':            'euc-kr',
-    'windows-949':         'euc-kr',
-    'csiso2022kr':         'iso-2022-kr',
-    'iso-2022-kr':         'iso-2022-kr',
-    'utf-16be':            'utf-16be',
-    'utf-16':              'utf-16le',
-    'utf-16le':            'utf-16le',
-    'x-user-defined':      'x-user-defined',
-}
diff --git a/src/pip/_vendor/webencodings/mklabels.py b/src/pip/_vendor/webencodings/mklabels.py
deleted file mode 100644
index 295dc928ba7..00000000000
--- a/src/pip/_vendor/webencodings/mklabels.py
+++ /dev/null
@@ -1,59 +0,0 @@
-"""
-
-    webencodings.mklabels
-    ~~~~~~~~~~~~~~~~~~~~~
-
-    Regenarate the webencodings.labels module.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-import json
-try:
-    from urllib import urlopen
-except ImportError:
-    from urllib.request import urlopen
-
-
-def assert_lower(string):
-    assert string == string.lower()
-    return string
-
-
-def generate(url):
-    parts = ['''\
-"""
-
-    webencodings.labels
-    ~~~~~~~~~~~~~~~~~~~
-
-    Map encoding labels to their name.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-# XXX Do not edit!
-# This file is automatically generated by mklabels.py
-
-LABELS = {
-''']
-    labels = [
-        (repr(assert_lower(label)).lstrip('u'),
-         repr(encoding['name']).lstrip('u'))
-        for category in json.loads(urlopen(url).read().decode('ascii'))
-        for encoding in category['encodings']
-        for label in encoding['labels']]
-    max_len = max(len(label) for label, name in labels)
-    parts.extend(
-        '    %s:%s %s,\n' % (label, ' ' * (max_len - len(label)), name)
-        for label, name in labels)
-    parts.append('}')
-    return ''.join(parts)
-
-
-if __name__ == '__main__':
-    print(generate('http://encoding.spec.whatwg.org/encodings.json'))
diff --git a/src/pip/_vendor/webencodings/tests.py b/src/pip/_vendor/webencodings/tests.py
deleted file mode 100644
index e12c10d0330..00000000000
--- a/src/pip/_vendor/webencodings/tests.py
+++ /dev/null
@@ -1,153 +0,0 @@
-# coding: utf-8
-"""
-
-    webencodings.tests
-    ~~~~~~~~~~~~~~~~~~
-
-    A basic test suite for Encoding.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-from __future__ import unicode_literals
-
-from . import (lookup, LABELS, decode, encode, iter_decode, iter_encode,
-               IncrementalDecoder, IncrementalEncoder, UTF8)
-
-
-def assert_raises(exception, function, *args, **kwargs):
-    try:
-        function(*args, **kwargs)
-    except exception:
-        return
-    else:  # pragma: no cover
-        raise AssertionError('Did not raise %s.' % exception)
-
-
-def test_labels():
-    assert lookup('utf-8').name == 'utf-8'
-    assert lookup('Utf-8').name == 'utf-8'
-    assert lookup('UTF-8').name == 'utf-8'
-    assert lookup('utf8').name == 'utf-8'
-    assert lookup('utf8').name == 'utf-8'
-    assert lookup('utf8 ').name == 'utf-8'
-    assert lookup(' \r\nutf8\t').name == 'utf-8'
-    assert lookup('u8') is None  # Python label.
-    assert lookup('utf-8 ') is None  # Non-ASCII white space.
-
-    assert lookup('US-ASCII').name == 'windows-1252'
-    assert lookup('iso-8859-1').name == 'windows-1252'
-    assert lookup('latin1').name == 'windows-1252'
-    assert lookup('LATIN1').name == 'windows-1252'
-    assert lookup('latin-1') is None
-    assert lookup('LATİN1') is None  # ASCII-only case insensitivity.
-
-
-def test_all_labels():
-    for label in LABELS:
-        assert decode(b'', label) == ('', lookup(label))
-        assert encode('', label) == b''
-        for repeat in [0, 1, 12]:
-            output, _ = iter_decode([b''] * repeat, label)
-            assert list(output) == []
-            assert list(iter_encode([''] * repeat, label)) == []
-        decoder = IncrementalDecoder(label)
-        assert decoder.decode(b'') == ''
-        assert decoder.decode(b'', final=True) == ''
-        encoder = IncrementalEncoder(label)
-        assert encoder.encode('') == b''
-        assert encoder.encode('', final=True) == b''
-    # All encoding names are valid labels too:
-    for name in set(LABELS.values()):
-        assert lookup(name).name == name
-
-
-def test_invalid_label():
-    assert_raises(LookupError, decode, b'\xEF\xBB\xBF\xc3\xa9', 'invalid')
-    assert_raises(LookupError, encode, 'é', 'invalid')
-    assert_raises(LookupError, iter_decode, [], 'invalid')
-    assert_raises(LookupError, iter_encode, [], 'invalid')
-    assert_raises(LookupError, IncrementalDecoder, 'invalid')
-    assert_raises(LookupError, IncrementalEncoder, 'invalid')
-
-
-def test_decode():
-    assert decode(b'\x80', 'latin1') == ('€', lookup('latin1'))
-    assert decode(b'\x80', lookup('latin1')) == ('€', lookup('latin1'))
-    assert decode(b'\xc3\xa9', 'utf8') == ('é', lookup('utf8'))
-    assert decode(b'\xc3\xa9', UTF8) == ('é', lookup('utf8'))
-    assert decode(b'\xc3\xa9', 'ascii') == ('é', lookup('ascii'))
-    assert decode(b'\xEF\xBB\xBF\xc3\xa9', 'ascii') == ('é', lookup('utf8'))  # UTF-8 with BOM
-
-    assert decode(b'\xFE\xFF\x00\xe9', 'ascii') == ('é', lookup('utf-16be'))  # UTF-16-BE with BOM
-    assert decode(b'\xFF\xFE\xe9\x00', 'ascii') == ('é', lookup('utf-16le'))  # UTF-16-LE with BOM
-    assert decode(b'\xFE\xFF\xe9\x00', 'ascii') == ('\ue900', lookup('utf-16be'))
-    assert decode(b'\xFF\xFE\x00\xe9', 'ascii') == ('\ue900', lookup('utf-16le'))
-
-    assert decode(b'\x00\xe9', 'UTF-16BE') == ('é', lookup('utf-16be'))
-    assert decode(b'\xe9\x00', 'UTF-16LE') == ('é', lookup('utf-16le'))
-    assert decode(b'\xe9\x00', 'UTF-16') == ('é', lookup('utf-16le'))
-
-    assert decode(b'\xe9\x00', 'UTF-16BE') == ('\ue900', lookup('utf-16be'))
-    assert decode(b'\x00\xe9', 'UTF-16LE') == ('\ue900', lookup('utf-16le'))
-    assert decode(b'\x00\xe9', 'UTF-16') == ('\ue900', lookup('utf-16le'))
-
-
-def test_encode():
-    assert encode('é', 'latin1') == b'\xe9'
-    assert encode('é', 'utf8') == b'\xc3\xa9'
-    assert encode('é', 'utf8') == b'\xc3\xa9'
-    assert encode('é', 'utf-16') == b'\xe9\x00'
-    assert encode('é', 'utf-16le') == b'\xe9\x00'
-    assert encode('é', 'utf-16be') == b'\x00\xe9'
-
-
-def test_iter_decode():
-    def iter_decode_to_string(input, fallback_encoding):
-        output, _encoding = iter_decode(input, fallback_encoding)
-        return ''.join(output)
-    assert iter_decode_to_string([], 'latin1') == ''
-    assert iter_decode_to_string([b''], 'latin1') == ''
-    assert iter_decode_to_string([b'\xe9'], 'latin1') == 'é'
-    assert iter_decode_to_string([b'hello'], 'latin1') == 'hello'
-    assert iter_decode_to_string([b'he', b'llo'], 'latin1') == 'hello'
-    assert iter_decode_to_string([b'hell', b'o'], 'latin1') == 'hello'
-    assert iter_decode_to_string([b'\xc3\xa9'], 'latin1') == 'é'
-    assert iter_decode_to_string([b'\xEF\xBB\xBF\xc3\xa9'], 'latin1') == 'é'
-    assert iter_decode_to_string([
-        b'\xEF\xBB\xBF', b'\xc3', b'\xa9'], 'latin1') == 'é'
-    assert iter_decode_to_string([
-        b'\xEF\xBB\xBF', b'a', b'\xc3'], 'latin1') == 'a\uFFFD'
-    assert iter_decode_to_string([
-        b'', b'\xEF', b'', b'', b'\xBB\xBF\xc3', b'\xa9'], 'latin1') == 'é'
-    assert iter_decode_to_string([b'\xEF\xBB\xBF'], 'latin1') == ''
-    assert iter_decode_to_string([b'\xEF\xBB'], 'latin1') == 'ï»'
-    assert iter_decode_to_string([b'\xFE\xFF\x00\xe9'], 'latin1') == 'é'
-    assert iter_decode_to_string([b'\xFF\xFE\xe9\x00'], 'latin1') == 'é'
-    assert iter_decode_to_string([
-        b'', b'\xFF', b'', b'', b'\xFE\xe9', b'\x00'], 'latin1') == 'é'
-    assert iter_decode_to_string([
-        b'', b'h\xe9', b'llo'], 'x-user-defined') == 'h\uF7E9llo'
-
-
-def test_iter_encode():
-    assert b''.join(iter_encode([], 'latin1')) == b''
-    assert b''.join(iter_encode([''], 'latin1')) == b''
-    assert b''.join(iter_encode(['é'], 'latin1')) == b'\xe9'
-    assert b''.join(iter_encode(['', 'é', '', ''], 'latin1')) == b'\xe9'
-    assert b''.join(iter_encode(['', 'é', '', ''], 'utf-16')) == b'\xe9\x00'
-    assert b''.join(iter_encode(['', 'é', '', ''], 'utf-16le')) == b'\xe9\x00'
-    assert b''.join(iter_encode(['', 'é', '', ''], 'utf-16be')) == b'\x00\xe9'
-    assert b''.join(iter_encode([
-        '', 'h\uF7E9', '', 'llo'], 'x-user-defined')) == b'h\xe9llo'
-
-
-def test_x_user_defined():
-    encoded = b'2,\x0c\x0b\x1aO\xd9#\xcb\x0f\xc9\xbbt\xcf\xa8\xca'
-    decoded = '2,\x0c\x0b\x1aO\uf7d9#\uf7cb\x0f\uf7c9\uf7bbt\uf7cf\uf7a8\uf7ca'
-    encoded = b'aa'
-    decoded = 'aa'
-    assert decode(encoded, 'x-user-defined') == (decoded, lookup('x-user-defined'))
-    assert encode(decoded, 'x-user-defined') == encoded
diff --git a/src/pip/_vendor/webencodings/x_user_defined.py b/src/pip/_vendor/webencodings/x_user_defined.py
deleted file mode 100644
index d16e326024c..00000000000
--- a/src/pip/_vendor/webencodings/x_user_defined.py
+++ /dev/null
@@ -1,325 +0,0 @@
-# coding: utf-8
-"""
-
-    webencodings.x_user_defined
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    An implementation of the x-user-defined encoding.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-from __future__ import unicode_literals
-
-import codecs
-
-
-### Codec APIs
-
-class Codec(codecs.Codec):
-
-    def encode(self, input, errors='strict'):
-        return codecs.charmap_encode(input, errors, encoding_table)
-
-    def decode(self, input, errors='strict'):
-        return codecs.charmap_decode(input, errors, decoding_table)
-
-
-class IncrementalEncoder(codecs.IncrementalEncoder):
-    def encode(self, input, final=False):
-        return codecs.charmap_encode(input, self.errors, encoding_table)[0]
-
-
-class IncrementalDecoder(codecs.IncrementalDecoder):
-    def decode(self, input, final=False):
-        return codecs.charmap_decode(input, self.errors, decoding_table)[0]
-
-
-class StreamWriter(Codec, codecs.StreamWriter):
-    pass
-
-
-class StreamReader(Codec, codecs.StreamReader):
-    pass
-
-
-### encodings module API
-
-codec_info = codecs.CodecInfo(
-    name='x-user-defined',
-    encode=Codec().encode,
-    decode=Codec().decode,
-    incrementalencoder=IncrementalEncoder,
-    incrementaldecoder=IncrementalDecoder,
-    streamreader=StreamReader,
-    streamwriter=StreamWriter,
-)
-
-
-### Decoding Table
-
-# Python 3:
-# for c in range(256): print('    %r' % chr(c if c < 128 else c + 0xF700))
-decoding_table = (
-    '\x00'
-    '\x01'
-    '\x02'
-    '\x03'
-    '\x04'
-    '\x05'
-    '\x06'
-    '\x07'
-    '\x08'
-    '\t'
-    '\n'
-    '\x0b'
-    '\x0c'
-    '\r'
-    '\x0e'
-    '\x0f'
-    '\x10'
-    '\x11'
-    '\x12'
-    '\x13'
-    '\x14'
-    '\x15'
-    '\x16'
-    '\x17'
-    '\x18'
-    '\x19'
-    '\x1a'
-    '\x1b'
-    '\x1c'
-    '\x1d'
-    '\x1e'
-    '\x1f'
-    ' '
-    '!'
-    '"'
-    '#'
-    '$'
-    '%'
-    '&'
-    "'"
-    '('
-    ')'
-    '*'
-    '+'
-    ','
-    '-'
-    '.'
-    '/'
-    '0'
-    '1'
-    '2'
-    '3'
-    '4'
-    '5'
-    '6'
-    '7'
-    '8'
-    '9'
-    ':'
-    ';'
-    '<'
-    '='
-    '>'
-    '?'
-    '@'
-    'A'
-    'B'
-    'C'
-    'D'
-    'E'
-    'F'
-    'G'
-    'H'
-    'I'
-    'J'
-    'K'
-    'L'
-    'M'
-    'N'
-    'O'
-    'P'
-    'Q'
-    'R'
-    'S'
-    'T'
-    'U'
-    'V'
-    'W'
-    'X'
-    'Y'
-    'Z'
-    '['
-    '\\'
-    ']'
-    '^'
-    '_'
-    '`'
-    'a'
-    'b'
-    'c'
-    'd'
-    'e'
-    'f'
-    'g'
-    'h'
-    'i'
-    'j'
-    'k'
-    'l'
-    'm'
-    'n'
-    'o'
-    'p'
-    'q'
-    'r'
-    's'
-    't'
-    'u'
-    'v'
-    'w'
-    'x'
-    'y'
-    'z'
-    '{'
-    '|'
-    '}'
-    '~'
-    '\x7f'
-    '\uf780'
-    '\uf781'
-    '\uf782'
-    '\uf783'
-    '\uf784'
-    '\uf785'
-    '\uf786'
-    '\uf787'
-    '\uf788'
-    '\uf789'
-    '\uf78a'
-    '\uf78b'
-    '\uf78c'
-    '\uf78d'
-    '\uf78e'
-    '\uf78f'
-    '\uf790'
-    '\uf791'
-    '\uf792'
-    '\uf793'
-    '\uf794'
-    '\uf795'
-    '\uf796'
-    '\uf797'
-    '\uf798'
-    '\uf799'
-    '\uf79a'
-    '\uf79b'
-    '\uf79c'
-    '\uf79d'
-    '\uf79e'
-    '\uf79f'
-    '\uf7a0'
-    '\uf7a1'
-    '\uf7a2'
-    '\uf7a3'
-    '\uf7a4'
-    '\uf7a5'
-    '\uf7a6'
-    '\uf7a7'
-    '\uf7a8'
-    '\uf7a9'
-    '\uf7aa'
-    '\uf7ab'
-    '\uf7ac'
-    '\uf7ad'
-    '\uf7ae'
-    '\uf7af'
-    '\uf7b0'
-    '\uf7b1'
-    '\uf7b2'
-    '\uf7b3'
-    '\uf7b4'
-    '\uf7b5'
-    '\uf7b6'
-    '\uf7b7'
-    '\uf7b8'
-    '\uf7b9'
-    '\uf7ba'
-    '\uf7bb'
-    '\uf7bc'
-    '\uf7bd'
-    '\uf7be'
-    '\uf7bf'
-    '\uf7c0'
-    '\uf7c1'
-    '\uf7c2'
-    '\uf7c3'
-    '\uf7c4'
-    '\uf7c5'
-    '\uf7c6'
-    '\uf7c7'
-    '\uf7c8'
-    '\uf7c9'
-    '\uf7ca'
-    '\uf7cb'
-    '\uf7cc'
-    '\uf7cd'
-    '\uf7ce'
-    '\uf7cf'
-    '\uf7d0'
-    '\uf7d1'
-    '\uf7d2'
-    '\uf7d3'
-    '\uf7d4'
-    '\uf7d5'
-    '\uf7d6'
-    '\uf7d7'
-    '\uf7d8'
-    '\uf7d9'
-    '\uf7da'
-    '\uf7db'
-    '\uf7dc'
-    '\uf7dd'
-    '\uf7de'
-    '\uf7df'
-    '\uf7e0'
-    '\uf7e1'
-    '\uf7e2'
-    '\uf7e3'
-    '\uf7e4'
-    '\uf7e5'
-    '\uf7e6'
-    '\uf7e7'
-    '\uf7e8'
-    '\uf7e9'
-    '\uf7ea'
-    '\uf7eb'
-    '\uf7ec'
-    '\uf7ed'
-    '\uf7ee'
-    '\uf7ef'
-    '\uf7f0'
-    '\uf7f1'
-    '\uf7f2'
-    '\uf7f3'
-    '\uf7f4'
-    '\uf7f5'
-    '\uf7f6'
-    '\uf7f7'
-    '\uf7f8'
-    '\uf7f9'
-    '\uf7fa'
-    '\uf7fb'
-    '\uf7fc'
-    '\uf7fd'
-    '\uf7fe'
-    '\uf7ff'
-)
-
-### Encoding table
-encoding_table = codecs.charmap_build(decoding_table)

From 9697688ca45ccebc66726bef585eeba147886396 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 7 May 2024 21:11:11 -0400
Subject: [PATCH 417/992] Disable self version check in PEP 517 pip
 subprocesses

This eliminates a (very) small unnecessary performance penalty and
reduces output clutter when the pip subprocess errors out.
---
 news/12683.feature.rst         | 2 ++
 src/pip/_internal/build_env.py | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 news/12683.feature.rst

diff --git a/news/12683.feature.rst b/news/12683.feature.rst
new file mode 100644
index 00000000000..2e949cd0762
--- /dev/null
+++ b/news/12683.feature.rst
@@ -0,0 +1,2 @@
+Disable pip's self version check when invoking a pip subprocess to install
+PEP 517 build requirements.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index 838de86474f..5cb903fa531 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -241,6 +241,7 @@ def _install_requirements(
             "--prefix",
             prefix.path,
             "--no-warn-script-location",
+            "--disable-pip-version-check",
         ]
         if logger.getEffectiveLevel() <= logging.DEBUG:
             args.append("-vv")

From b2a3986b0bd7e9f18b31228630199d2f03555d9f Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 7 May 2024 22:13:29 -0400
Subject: [PATCH 418/992] Eagerly import `self_outdated_check` when modifying
 pip

The self_outdated_check module should be loaded *before* pip is replaced
as otherwise the module is liable to blow up if there are any
incompatibities between the self_outdated_check from new pip and the old
pip already loaded.
---
 news/12675.bugfix.rst                 | 2 ++
 src/pip/_internal/commands/install.py | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 news/12675.bugfix.rst

diff --git a/news/12675.bugfix.rst b/news/12675.bugfix.rst
new file mode 100644
index 00000000000..0d448f38be1
--- /dev/null
+++ b/news/12675.bugfix.rst
@@ -0,0 +1,2 @@
+Eagerly import the self version check logic to avoid crashes while upgrading
+or downgrading pip at the same time.
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index 29276c243cc..d5b06c8c785 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -406,6 +406,12 @@ def run(self, options: Values, args: List[str]) -> int:
                 # If we're not replacing an already installed pip,
                 # we're not modifying it.
                 modifying_pip = pip_req.satisfied_by is None
+                if modifying_pip:
+                    # Eagerly import this module to avoid crashes. Otherwise, this
+                    # module would be imported *after* pip was replaced, resulting in
+                    # crashes if the new self_outdated_check module was incompatible
+                    # with the rest of pip that's already imported.
+                    import pip._internal.self_outdated_check  # noqa: F401
             protect_pip_from_modification_on_windows(modifying_pip=modifying_pip)
 
             reqs_to_build = [

From 36a61d0e3b7e99cbac83d527c670f348db218859 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Fri, 10 May 2024 23:02:53 +0100
Subject: [PATCH 419/992] Revert "Add `render: shell` to the bug report
 template to format output as code" (#12693)

---
 .github/ISSUE_TEMPLATE/bug-report.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 20e0a5dd991..e28e5408208 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -61,13 +61,11 @@ body:
       description: >-
         Provide the output of the steps above, including the commands
         themselves and pip's output/traceback etc.
-        (The output will auto-rendered as code, no need for backticks.)
 
         If you want to present output from multiple commands, please prefix
         the line containing the command with `$ `. Please also ensure that
         the "How to reproduce" section contains matching instructions for
         reproducing this.
-      render: shell
 
   - type: checkboxes
     attributes:

From 0af18ed734ff629c99edef8e1c186af29e0ac0db Mon Sep 17 00:00:00 2001
From: mrKazzila 
Date: Sat, 11 May 2024 14:27:22 +0300
Subject: [PATCH 420/992] removed the extra dot in replacement arg

---
 src/pip/_internal/metadata/importlib/_envs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/metadata/importlib/_envs.py b/src/pip/_internal/metadata/importlib/_envs.py
index 048dc55dcb2..2df738fc738 100644
--- a/src/pip/_internal/metadata/importlib/_envs.py
+++ b/src/pip/_internal/metadata/importlib/_envs.py
@@ -150,7 +150,7 @@ def find_eggs(self, location: str) -> Iterator[BaseDistribution]:
 def _emit_egg_deprecation(location: Optional[str]) -> None:
     deprecated(
         reason=f"Loading egg at {location} is deprecated.",
-        replacement="to use pip for package installation.",
+        replacement="to use pip for package installation",
         gone_in="24.3",
         issue=12330,
     )

From f436223c1f830171db79bf6027d4259dc7d43a0d Mon Sep 17 00:00:00 2001
From: Ian Wienand 
Date: Wed, 20 Oct 2021 11:47:39 +1100
Subject: [PATCH 421/992] Cut note on removing vendored cacert.pem

Since c77d4ab55ed412a3b72d0b73f504e8ddec918683 pip has not been using
ssl.ssl.get_default_verify_paths() to find the system CA bundle (which
is now under certifi anyway).

Remove this note on unbundling cacert.pem
---
 news/9be41686-c40a-4e08-84e1-936b65b74fc7.trivial.rst | 0
 src/pip/_vendor/README.rst                            | 7 +------
 2 files changed, 1 insertion(+), 6 deletions(-)
 create mode 100644 news/9be41686-c40a-4e08-84e1-936b65b74fc7.trivial.rst

diff --git a/news/9be41686-c40a-4e08-84e1-936b65b74fc7.trivial.rst b/news/9be41686-c40a-4e08-84e1-936b65b74fc7.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/pip/_vendor/README.rst b/src/pip/_vendor/README.rst
index a21314543bd..e3fe8041ce2 100644
--- a/src/pip/_vendor/README.rst
+++ b/src/pip/_vendor/README.rst
@@ -80,12 +80,7 @@ instead opt to patch the software they distribute to debundle it and make it
 rely on the global versions of the software that they already have packaged
 (which may have its own patches applied to it). We (the pip team) would prefer
 it if pip was *not* debundled in this manner due to the above reasons and
-instead we would prefer it if pip would be left intact as it is now. The one
-exception to this, is it is acceptable to remove the
-``pip/_vendor/requests/cacert.pem`` file provided you ensure that the
-``ssl.get_default_verify_paths().cafile`` API returns the correct CA bundle for
-your system. This will ensure that pip will use your system provided CA bundle
-instead of the copy bundled with pip.
+instead we would prefer it if pip would be left intact as it is now.
 
 In the longer term, if someone has a *portable* solution to the above problems,
 other than the bundling method we currently use, that doesn't add additional

From a2b23ffd477dcd90de6f1cb1f4cb75e0229d0e16 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 11 May 2024 13:26:30 -0400
Subject: [PATCH 422/992] Also patch time.time_ns() in unit tests

The logging implementation in Python 3.13.0b1 uses time.time_ns() instead
of time.time().
---
 tests/unit/test_base_command.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/unit/test_base_command.py b/tests/unit/test_base_command.py
index 80c93799d94..f9fae651422 100644
--- a/tests/unit/test_base_command.py
+++ b/tests/unit/test_base_command.py
@@ -17,8 +17,12 @@
 
 @pytest.fixture
 def fixed_time() -> Iterator[None]:
-    with patch("time.time", lambda: 1547704837.040001 + time.timezone):
-        yield
+    # Patch time so logs contain a constant timestamp. time.time_ns is used by
+    # logging starting with Python 3.13.
+    year2019 = 1547704837.040001 + time.timezone
+    with patch("time.time", lambda: year2019):
+        with patch("time.time_ns", lambda: int(year2019 * 1e9)):
+            yield
 
 
 class FakeCommand(Command):

From d2a48b2d9ab8d24182c4ba54c00f2a19293211bc Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 14 May 2024 19:43:54 -0400
Subject: [PATCH 423/992] Remove vendored colorama (#12702)

Pip's internal codebase doesn't use colorama anywhere. It was kept
around for rich, but rich 12+ doesn't need it (opting to issue the
appropriate Win32 API calls itself). pygments still imports colorama,
but it's an optional dependency for the command line interface which
pip evidently doesn't use.
---
 news/12702.feature.rst                        |   1 +
 src/pip/_vendor/__init__.py                   |   1 -
 src/pip/_vendor/colorama.pyi                  |   1 -
 src/pip/_vendor/colorama/LICENSE.txt          |  27 --
 src/pip/_vendor/colorama/__init__.py          |   7 -
 src/pip/_vendor/colorama/ansi.py              | 102 ------
 src/pip/_vendor/colorama/ansitowin32.py       | 277 -----------------
 src/pip/_vendor/colorama/initialise.py        | 121 -------
 src/pip/_vendor/colorama/tests/__init__.py    |   1 -
 src/pip/_vendor/colorama/tests/ansi_test.py   |  76 -----
 .../colorama/tests/ansitowin32_test.py        | 294 ------------------
 .../_vendor/colorama/tests/initialise_test.py | 189 -----------
 src/pip/_vendor/colorama/tests/isatty_test.py |  57 ----
 src/pip/_vendor/colorama/tests/utils.py       |  49 ---
 .../_vendor/colorama/tests/winterm_test.py    | 131 --------
 src/pip/_vendor/colorama/win32.py             | 180 -----------
 src/pip/_vendor/colorama/winterm.py           | 195 ------------
 src/pip/_vendor/pygments/cmdline.py           |   4 +-
 src/pip/_vendor/vendor.txt                    |   1 -
 tools/vendoring/patches/pygments.patch        |  18 --
 20 files changed, 3 insertions(+), 1729 deletions(-)
 create mode 100644 news/12702.feature.rst
 delete mode 100644 src/pip/_vendor/colorama.pyi
 delete mode 100644 src/pip/_vendor/colorama/LICENSE.txt
 delete mode 100644 src/pip/_vendor/colorama/__init__.py
 delete mode 100644 src/pip/_vendor/colorama/ansi.py
 delete mode 100644 src/pip/_vendor/colorama/ansitowin32.py
 delete mode 100644 src/pip/_vendor/colorama/initialise.py
 delete mode 100644 src/pip/_vendor/colorama/tests/__init__.py
 delete mode 100644 src/pip/_vendor/colorama/tests/ansi_test.py
 delete mode 100644 src/pip/_vendor/colorama/tests/ansitowin32_test.py
 delete mode 100644 src/pip/_vendor/colorama/tests/initialise_test.py
 delete mode 100644 src/pip/_vendor/colorama/tests/isatty_test.py
 delete mode 100644 src/pip/_vendor/colorama/tests/utils.py
 delete mode 100644 src/pip/_vendor/colorama/tests/winterm_test.py
 delete mode 100644 src/pip/_vendor/colorama/win32.py
 delete mode 100644 src/pip/_vendor/colorama/winterm.py

diff --git a/news/12702.feature.rst b/news/12702.feature.rst
new file mode 100644
index 00000000000..881906af662
--- /dev/null
+++ b/news/12702.feature.rst
@@ -0,0 +1 @@
+Remove vendored colorama.
diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
index a0b4bf2f914..50537ab9de1 100644
--- a/src/pip/_vendor/__init__.py
+++ b/src/pip/_vendor/__init__.py
@@ -60,7 +60,6 @@ def vendored(modulename):
     # Actually alias all of our vendored dependencies.
     vendored("cachecontrol")
     vendored("certifi")
-    vendored("colorama")
     vendored("distlib")
     vendored("distro")
     vendored("packaging")
diff --git a/src/pip/_vendor/colorama.pyi b/src/pip/_vendor/colorama.pyi
deleted file mode 100644
index 60a6c2541fd..00000000000
--- a/src/pip/_vendor/colorama.pyi
+++ /dev/null
@@ -1 +0,0 @@
-from colorama import *
\ No newline at end of file
diff --git a/src/pip/_vendor/colorama/LICENSE.txt b/src/pip/_vendor/colorama/LICENSE.txt
deleted file mode 100644
index 3105888ec14..00000000000
--- a/src/pip/_vendor/colorama/LICENSE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2010 Jonathan Hartley
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holders, nor those of its contributors
-  may be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/pip/_vendor/colorama/__init__.py b/src/pip/_vendor/colorama/__init__.py
deleted file mode 100644
index 383101cdb38..00000000000
--- a/src/pip/_vendor/colorama/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-from .initialise import init, deinit, reinit, colorama_text, just_fix_windows_console
-from .ansi import Fore, Back, Style, Cursor
-from .ansitowin32 import AnsiToWin32
-
-__version__ = '0.4.6'
-
diff --git a/src/pip/_vendor/colorama/ansi.py b/src/pip/_vendor/colorama/ansi.py
deleted file mode 100644
index 11ec695ff79..00000000000
--- a/src/pip/_vendor/colorama/ansi.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-'''
-This module generates ANSI character codes to printing colors to terminals.
-See: http://en.wikipedia.org/wiki/ANSI_escape_code
-'''
-
-CSI = '\033['
-OSC = '\033]'
-BEL = '\a'
-
-
-def code_to_chars(code):
-    return CSI + str(code) + 'm'
-
-def set_title(title):
-    return OSC + '2;' + title + BEL
-
-def clear_screen(mode=2):
-    return CSI + str(mode) + 'J'
-
-def clear_line(mode=2):
-    return CSI + str(mode) + 'K'
-
-
-class AnsiCodes(object):
-    def __init__(self):
-        # the subclasses declare class attributes which are numbers.
-        # Upon instantiation we define instance attributes, which are the same
-        # as the class attributes but wrapped with the ANSI escape sequence
-        for name in dir(self):
-            if not name.startswith('_'):
-                value = getattr(self, name)
-                setattr(self, name, code_to_chars(value))
-
-
-class AnsiCursor(object):
-    def UP(self, n=1):
-        return CSI + str(n) + 'A'
-    def DOWN(self, n=1):
-        return CSI + str(n) + 'B'
-    def FORWARD(self, n=1):
-        return CSI + str(n) + 'C'
-    def BACK(self, n=1):
-        return CSI + str(n) + 'D'
-    def POS(self, x=1, y=1):
-        return CSI + str(y) + ';' + str(x) + 'H'
-
-
-class AnsiFore(AnsiCodes):
-    BLACK           = 30
-    RED             = 31
-    GREEN           = 32
-    YELLOW          = 33
-    BLUE            = 34
-    MAGENTA         = 35
-    CYAN            = 36
-    WHITE           = 37
-    RESET           = 39
-
-    # These are fairly well supported, but not part of the standard.
-    LIGHTBLACK_EX   = 90
-    LIGHTRED_EX     = 91
-    LIGHTGREEN_EX   = 92
-    LIGHTYELLOW_EX  = 93
-    LIGHTBLUE_EX    = 94
-    LIGHTMAGENTA_EX = 95
-    LIGHTCYAN_EX    = 96
-    LIGHTWHITE_EX   = 97
-
-
-class AnsiBack(AnsiCodes):
-    BLACK           = 40
-    RED             = 41
-    GREEN           = 42
-    YELLOW          = 43
-    BLUE            = 44
-    MAGENTA         = 45
-    CYAN            = 46
-    WHITE           = 47
-    RESET           = 49
-
-    # These are fairly well supported, but not part of the standard.
-    LIGHTBLACK_EX   = 100
-    LIGHTRED_EX     = 101
-    LIGHTGREEN_EX   = 102
-    LIGHTYELLOW_EX  = 103
-    LIGHTBLUE_EX    = 104
-    LIGHTMAGENTA_EX = 105
-    LIGHTCYAN_EX    = 106
-    LIGHTWHITE_EX   = 107
-
-
-class AnsiStyle(AnsiCodes):
-    BRIGHT    = 1
-    DIM       = 2
-    NORMAL    = 22
-    RESET_ALL = 0
-
-Fore   = AnsiFore()
-Back   = AnsiBack()
-Style  = AnsiStyle()
-Cursor = AnsiCursor()
diff --git a/src/pip/_vendor/colorama/ansitowin32.py b/src/pip/_vendor/colorama/ansitowin32.py
deleted file mode 100644
index abf209e60c7..00000000000
--- a/src/pip/_vendor/colorama/ansitowin32.py
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-import re
-import sys
-import os
-
-from .ansi import AnsiFore, AnsiBack, AnsiStyle, Style, BEL
-from .winterm import enable_vt_processing, WinTerm, WinColor, WinStyle
-from .win32 import windll, winapi_test
-
-
-winterm = None
-if windll is not None:
-    winterm = WinTerm()
-
-
-class StreamWrapper(object):
-    '''
-    Wraps a stream (such as stdout), acting as a transparent proxy for all
-    attribute access apart from method 'write()', which is delegated to our
-    Converter instance.
-    '''
-    def __init__(self, wrapped, converter):
-        # double-underscore everything to prevent clashes with names of
-        # attributes on the wrapped stream object.
-        self.__wrapped = wrapped
-        self.__convertor = converter
-
-    def __getattr__(self, name):
-        return getattr(self.__wrapped, name)
-
-    def __enter__(self, *args, **kwargs):
-        # special method lookup bypasses __getattr__/__getattribute__, see
-        # https://stackoverflow.com/questions/12632894/why-doesnt-getattr-work-with-exit
-        # thus, contextlib magic methods are not proxied via __getattr__
-        return self.__wrapped.__enter__(*args, **kwargs)
-
-    def __exit__(self, *args, **kwargs):
-        return self.__wrapped.__exit__(*args, **kwargs)
-
-    def __setstate__(self, state):
-        self.__dict__ = state
-
-    def __getstate__(self):
-        return self.__dict__
-
-    def write(self, text):
-        self.__convertor.write(text)
-
-    def isatty(self):
-        stream = self.__wrapped
-        if 'PYCHARM_HOSTED' in os.environ:
-            if stream is not None and (stream is sys.__stdout__ or stream is sys.__stderr__):
-                return True
-        try:
-            stream_isatty = stream.isatty
-        except AttributeError:
-            return False
-        else:
-            return stream_isatty()
-
-    @property
-    def closed(self):
-        stream = self.__wrapped
-        try:
-            return stream.closed
-        # AttributeError in the case that the stream doesn't support being closed
-        # ValueError for the case that the stream has already been detached when atexit runs
-        except (AttributeError, ValueError):
-            return True
-
-
-class AnsiToWin32(object):
-    '''
-    Implements a 'write()' method which, on Windows, will strip ANSI character
-    sequences from the text, and if outputting to a tty, will convert them into
-    win32 function calls.
-    '''
-    ANSI_CSI_RE = re.compile('\001?\033\\[((?:\\d|;)*)([a-zA-Z])\002?')   # Control Sequence Introducer
-    ANSI_OSC_RE = re.compile('\001?\033\\]([^\a]*)(\a)\002?')             # Operating System Command
-
-    def __init__(self, wrapped, convert=None, strip=None, autoreset=False):
-        # The wrapped stream (normally sys.stdout or sys.stderr)
-        self.wrapped = wrapped
-
-        # should we reset colors to defaults after every .write()
-        self.autoreset = autoreset
-
-        # create the proxy wrapping our output stream
-        self.stream = StreamWrapper(wrapped, self)
-
-        on_windows = os.name == 'nt'
-        # We test if the WinAPI works, because even if we are on Windows
-        # we may be using a terminal that doesn't support the WinAPI
-        # (e.g. Cygwin Terminal). In this case it's up to the terminal
-        # to support the ANSI codes.
-        conversion_supported = on_windows and winapi_test()
-        try:
-            fd = wrapped.fileno()
-        except Exception:
-            fd = -1
-        system_has_native_ansi = not on_windows or enable_vt_processing(fd)
-        have_tty = not self.stream.closed and self.stream.isatty()
-        need_conversion = conversion_supported and not system_has_native_ansi
-
-        # should we strip ANSI sequences from our output?
-        if strip is None:
-            strip = need_conversion or not have_tty
-        self.strip = strip
-
-        # should we should convert ANSI sequences into win32 calls?
-        if convert is None:
-            convert = need_conversion and have_tty
-        self.convert = convert
-
-        # dict of ansi codes to win32 functions and parameters
-        self.win32_calls = self.get_win32_calls()
-
-        # are we wrapping stderr?
-        self.on_stderr = self.wrapped is sys.stderr
-
-    def should_wrap(self):
-        '''
-        True if this class is actually needed. If false, then the output
-        stream will not be affected, nor will win32 calls be issued, so
-        wrapping stdout is not actually required. This will generally be
-        False on non-Windows platforms, unless optional functionality like
-        autoreset has been requested using kwargs to init()
-        '''
-        return self.convert or self.strip or self.autoreset
-
-    def get_win32_calls(self):
-        if self.convert and winterm:
-            return {
-                AnsiStyle.RESET_ALL: (winterm.reset_all, ),
-                AnsiStyle.BRIGHT: (winterm.style, WinStyle.BRIGHT),
-                AnsiStyle.DIM: (winterm.style, WinStyle.NORMAL),
-                AnsiStyle.NORMAL: (winterm.style, WinStyle.NORMAL),
-                AnsiFore.BLACK: (winterm.fore, WinColor.BLACK),
-                AnsiFore.RED: (winterm.fore, WinColor.RED),
-                AnsiFore.GREEN: (winterm.fore, WinColor.GREEN),
-                AnsiFore.YELLOW: (winterm.fore, WinColor.YELLOW),
-                AnsiFore.BLUE: (winterm.fore, WinColor.BLUE),
-                AnsiFore.MAGENTA: (winterm.fore, WinColor.MAGENTA),
-                AnsiFore.CYAN: (winterm.fore, WinColor.CYAN),
-                AnsiFore.WHITE: (winterm.fore, WinColor.GREY),
-                AnsiFore.RESET: (winterm.fore, ),
-                AnsiFore.LIGHTBLACK_EX: (winterm.fore, WinColor.BLACK, True),
-                AnsiFore.LIGHTRED_EX: (winterm.fore, WinColor.RED, True),
-                AnsiFore.LIGHTGREEN_EX: (winterm.fore, WinColor.GREEN, True),
-                AnsiFore.LIGHTYELLOW_EX: (winterm.fore, WinColor.YELLOW, True),
-                AnsiFore.LIGHTBLUE_EX: (winterm.fore, WinColor.BLUE, True),
-                AnsiFore.LIGHTMAGENTA_EX: (winterm.fore, WinColor.MAGENTA, True),
-                AnsiFore.LIGHTCYAN_EX: (winterm.fore, WinColor.CYAN, True),
-                AnsiFore.LIGHTWHITE_EX: (winterm.fore, WinColor.GREY, True),
-                AnsiBack.BLACK: (winterm.back, WinColor.BLACK),
-                AnsiBack.RED: (winterm.back, WinColor.RED),
-                AnsiBack.GREEN: (winterm.back, WinColor.GREEN),
-                AnsiBack.YELLOW: (winterm.back, WinColor.YELLOW),
-                AnsiBack.BLUE: (winterm.back, WinColor.BLUE),
-                AnsiBack.MAGENTA: (winterm.back, WinColor.MAGENTA),
-                AnsiBack.CYAN: (winterm.back, WinColor.CYAN),
-                AnsiBack.WHITE: (winterm.back, WinColor.GREY),
-                AnsiBack.RESET: (winterm.back, ),
-                AnsiBack.LIGHTBLACK_EX: (winterm.back, WinColor.BLACK, True),
-                AnsiBack.LIGHTRED_EX: (winterm.back, WinColor.RED, True),
-                AnsiBack.LIGHTGREEN_EX: (winterm.back, WinColor.GREEN, True),
-                AnsiBack.LIGHTYELLOW_EX: (winterm.back, WinColor.YELLOW, True),
-                AnsiBack.LIGHTBLUE_EX: (winterm.back, WinColor.BLUE, True),
-                AnsiBack.LIGHTMAGENTA_EX: (winterm.back, WinColor.MAGENTA, True),
-                AnsiBack.LIGHTCYAN_EX: (winterm.back, WinColor.CYAN, True),
-                AnsiBack.LIGHTWHITE_EX: (winterm.back, WinColor.GREY, True),
-            }
-        return dict()
-
-    def write(self, text):
-        if self.strip or self.convert:
-            self.write_and_convert(text)
-        else:
-            self.wrapped.write(text)
-            self.wrapped.flush()
-        if self.autoreset:
-            self.reset_all()
-
-
-    def reset_all(self):
-        if self.convert:
-            self.call_win32('m', (0,))
-        elif not self.strip and not self.stream.closed:
-            self.wrapped.write(Style.RESET_ALL)
-
-
-    def write_and_convert(self, text):
-        '''
-        Write the given text to our wrapped stream, stripping any ANSI
-        sequences from the text, and optionally converting them into win32
-        calls.
-        '''
-        cursor = 0
-        text = self.convert_osc(text)
-        for match in self.ANSI_CSI_RE.finditer(text):
-            start, end = match.span()
-            self.write_plain_text(text, cursor, start)
-            self.convert_ansi(*match.groups())
-            cursor = end
-        self.write_plain_text(text, cursor, len(text))
-
-
-    def write_plain_text(self, text, start, end):
-        if start < end:
-            self.wrapped.write(text[start:end])
-            self.wrapped.flush()
-
-
-    def convert_ansi(self, paramstring, command):
-        if self.convert:
-            params = self.extract_params(command, paramstring)
-            self.call_win32(command, params)
-
-
-    def extract_params(self, command, paramstring):
-        if command in 'Hf':
-            params = tuple(int(p) if len(p) != 0 else 1 for p in paramstring.split(';'))
-            while len(params) < 2:
-                # defaults:
-                params = params + (1,)
-        else:
-            params = tuple(int(p) for p in paramstring.split(';') if len(p) != 0)
-            if len(params) == 0:
-                # defaults:
-                if command in 'JKm':
-                    params = (0,)
-                elif command in 'ABCD':
-                    params = (1,)
-
-        return params
-
-
-    def call_win32(self, command, params):
-        if command == 'm':
-            for param in params:
-                if param in self.win32_calls:
-                    func_args = self.win32_calls[param]
-                    func = func_args[0]
-                    args = func_args[1:]
-                    kwargs = dict(on_stderr=self.on_stderr)
-                    func(*args, **kwargs)
-        elif command in 'J':
-            winterm.erase_screen(params[0], on_stderr=self.on_stderr)
-        elif command in 'K':
-            winterm.erase_line(params[0], on_stderr=self.on_stderr)
-        elif command in 'Hf':     # cursor position - absolute
-            winterm.set_cursor_position(params, on_stderr=self.on_stderr)
-        elif command in 'ABCD':   # cursor position - relative
-            n = params[0]
-            # A - up, B - down, C - forward, D - back
-            x, y = {'A': (0, -n), 'B': (0, n), 'C': (n, 0), 'D': (-n, 0)}[command]
-            winterm.cursor_adjust(x, y, on_stderr=self.on_stderr)
-
-
-    def convert_osc(self, text):
-        for match in self.ANSI_OSC_RE.finditer(text):
-            start, end = match.span()
-            text = text[:start] + text[end:]
-            paramstring, command = match.groups()
-            if command == BEL:
-                if paramstring.count(";") == 1:
-                    params = paramstring.split(";")
-                    # 0 - change title and icon (we will only change title)
-                    # 1 - change icon (we don't support this)
-                    # 2 - change title
-                    if params[0] in '02':
-                        winterm.set_title(params[1])
-        return text
-
-
-    def flush(self):
-        self.wrapped.flush()
diff --git a/src/pip/_vendor/colorama/initialise.py b/src/pip/_vendor/colorama/initialise.py
deleted file mode 100644
index d5fd4b71fed..00000000000
--- a/src/pip/_vendor/colorama/initialise.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-import atexit
-import contextlib
-import sys
-
-from .ansitowin32 import AnsiToWin32
-
-
-def _wipe_internal_state_for_tests():
-    global orig_stdout, orig_stderr
-    orig_stdout = None
-    orig_stderr = None
-
-    global wrapped_stdout, wrapped_stderr
-    wrapped_stdout = None
-    wrapped_stderr = None
-
-    global atexit_done
-    atexit_done = False
-
-    global fixed_windows_console
-    fixed_windows_console = False
-
-    try:
-        # no-op if it wasn't registered
-        atexit.unregister(reset_all)
-    except AttributeError:
-        # python 2: no atexit.unregister. Oh well, we did our best.
-        pass
-
-
-def reset_all():
-    if AnsiToWin32 is not None:    # Issue #74: objects might become None at exit
-        AnsiToWin32(orig_stdout).reset_all()
-
-
-def init(autoreset=False, convert=None, strip=None, wrap=True):
-
-    if not wrap and any([autoreset, convert, strip]):
-        raise ValueError('wrap=False conflicts with any other arg=True')
-
-    global wrapped_stdout, wrapped_stderr
-    global orig_stdout, orig_stderr
-
-    orig_stdout = sys.stdout
-    orig_stderr = sys.stderr
-
-    if sys.stdout is None:
-        wrapped_stdout = None
-    else:
-        sys.stdout = wrapped_stdout = \
-            wrap_stream(orig_stdout, convert, strip, autoreset, wrap)
-    if sys.stderr is None:
-        wrapped_stderr = None
-    else:
-        sys.stderr = wrapped_stderr = \
-            wrap_stream(orig_stderr, convert, strip, autoreset, wrap)
-
-    global atexit_done
-    if not atexit_done:
-        atexit.register(reset_all)
-        atexit_done = True
-
-
-def deinit():
-    if orig_stdout is not None:
-        sys.stdout = orig_stdout
-    if orig_stderr is not None:
-        sys.stderr = orig_stderr
-
-
-def just_fix_windows_console():
-    global fixed_windows_console
-
-    if sys.platform != "win32":
-        return
-    if fixed_windows_console:
-        return
-    if wrapped_stdout is not None or wrapped_stderr is not None:
-        # Someone already ran init() and it did stuff, so we won't second-guess them
-        return
-
-    # On newer versions of Windows, AnsiToWin32.__init__ will implicitly enable the
-    # native ANSI support in the console as a side-effect. We only need to actually
-    # replace sys.stdout/stderr if we're in the old-style conversion mode.
-    new_stdout = AnsiToWin32(sys.stdout, convert=None, strip=None, autoreset=False)
-    if new_stdout.convert:
-        sys.stdout = new_stdout
-    new_stderr = AnsiToWin32(sys.stderr, convert=None, strip=None, autoreset=False)
-    if new_stderr.convert:
-        sys.stderr = new_stderr
-
-    fixed_windows_console = True
-
-@contextlib.contextmanager
-def colorama_text(*args, **kwargs):
-    init(*args, **kwargs)
-    try:
-        yield
-    finally:
-        deinit()
-
-
-def reinit():
-    if wrapped_stdout is not None:
-        sys.stdout = wrapped_stdout
-    if wrapped_stderr is not None:
-        sys.stderr = wrapped_stderr
-
-
-def wrap_stream(stream, convert, strip, autoreset, wrap):
-    if wrap:
-        wrapper = AnsiToWin32(stream,
-            convert=convert, strip=strip, autoreset=autoreset)
-        if wrapper.should_wrap():
-            stream = wrapper.stream
-    return stream
-
-
-# Use this for initial setup as well, to reduce code duplication
-_wipe_internal_state_for_tests()
diff --git a/src/pip/_vendor/colorama/tests/__init__.py b/src/pip/_vendor/colorama/tests/__init__.py
deleted file mode 100644
index 8c5661e93a2..00000000000
--- a/src/pip/_vendor/colorama/tests/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
diff --git a/src/pip/_vendor/colorama/tests/ansi_test.py b/src/pip/_vendor/colorama/tests/ansi_test.py
deleted file mode 100644
index 0a20c80f882..00000000000
--- a/src/pip/_vendor/colorama/tests/ansi_test.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-import sys
-from unittest import TestCase, main
-
-from ..ansi import Back, Fore, Style
-from ..ansitowin32 import AnsiToWin32
-
-stdout_orig = sys.stdout
-stderr_orig = sys.stderr
-
-
-class AnsiTest(TestCase):
-
-    def setUp(self):
-        # sanity check: stdout should be a file or StringIO object.
-        # It will only be AnsiToWin32 if init() has previously wrapped it
-        self.assertNotEqual(type(sys.stdout), AnsiToWin32)
-        self.assertNotEqual(type(sys.stderr), AnsiToWin32)
-
-    def tearDown(self):
-        sys.stdout = stdout_orig
-        sys.stderr = stderr_orig
-
-
-    def testForeAttributes(self):
-        self.assertEqual(Fore.BLACK, '\033[30m')
-        self.assertEqual(Fore.RED, '\033[31m')
-        self.assertEqual(Fore.GREEN, '\033[32m')
-        self.assertEqual(Fore.YELLOW, '\033[33m')
-        self.assertEqual(Fore.BLUE, '\033[34m')
-        self.assertEqual(Fore.MAGENTA, '\033[35m')
-        self.assertEqual(Fore.CYAN, '\033[36m')
-        self.assertEqual(Fore.WHITE, '\033[37m')
-        self.assertEqual(Fore.RESET, '\033[39m')
-
-        # Check the light, extended versions.
-        self.assertEqual(Fore.LIGHTBLACK_EX, '\033[90m')
-        self.assertEqual(Fore.LIGHTRED_EX, '\033[91m')
-        self.assertEqual(Fore.LIGHTGREEN_EX, '\033[92m')
-        self.assertEqual(Fore.LIGHTYELLOW_EX, '\033[93m')
-        self.assertEqual(Fore.LIGHTBLUE_EX, '\033[94m')
-        self.assertEqual(Fore.LIGHTMAGENTA_EX, '\033[95m')
-        self.assertEqual(Fore.LIGHTCYAN_EX, '\033[96m')
-        self.assertEqual(Fore.LIGHTWHITE_EX, '\033[97m')
-
-
-    def testBackAttributes(self):
-        self.assertEqual(Back.BLACK, '\033[40m')
-        self.assertEqual(Back.RED, '\033[41m')
-        self.assertEqual(Back.GREEN, '\033[42m')
-        self.assertEqual(Back.YELLOW, '\033[43m')
-        self.assertEqual(Back.BLUE, '\033[44m')
-        self.assertEqual(Back.MAGENTA, '\033[45m')
-        self.assertEqual(Back.CYAN, '\033[46m')
-        self.assertEqual(Back.WHITE, '\033[47m')
-        self.assertEqual(Back.RESET, '\033[49m')
-
-        # Check the light, extended versions.
-        self.assertEqual(Back.LIGHTBLACK_EX, '\033[100m')
-        self.assertEqual(Back.LIGHTRED_EX, '\033[101m')
-        self.assertEqual(Back.LIGHTGREEN_EX, '\033[102m')
-        self.assertEqual(Back.LIGHTYELLOW_EX, '\033[103m')
-        self.assertEqual(Back.LIGHTBLUE_EX, '\033[104m')
-        self.assertEqual(Back.LIGHTMAGENTA_EX, '\033[105m')
-        self.assertEqual(Back.LIGHTCYAN_EX, '\033[106m')
-        self.assertEqual(Back.LIGHTWHITE_EX, '\033[107m')
-
-
-    def testStyleAttributes(self):
-        self.assertEqual(Style.DIM, '\033[2m')
-        self.assertEqual(Style.NORMAL, '\033[22m')
-        self.assertEqual(Style.BRIGHT, '\033[1m')
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/pip/_vendor/colorama/tests/ansitowin32_test.py b/src/pip/_vendor/colorama/tests/ansitowin32_test.py
deleted file mode 100644
index 91ca551f97b..00000000000
--- a/src/pip/_vendor/colorama/tests/ansitowin32_test.py
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-from io import StringIO, TextIOWrapper
-from unittest import TestCase, main
-try:
-    from contextlib import ExitStack
-except ImportError:
-    # python 2
-    from contextlib2 import ExitStack
-
-try:
-    from unittest.mock import MagicMock, Mock, patch
-except ImportError:
-    from mock import MagicMock, Mock, patch
-
-from ..ansitowin32 import AnsiToWin32, StreamWrapper
-from ..win32 import ENABLE_VIRTUAL_TERMINAL_PROCESSING
-from .utils import osname
-
-
-class StreamWrapperTest(TestCase):
-
-    def testIsAProxy(self):
-        mockStream = Mock()
-        wrapper = StreamWrapper(mockStream, None)
-        self.assertTrue( wrapper.random_attr is mockStream.random_attr )
-
-    def testDelegatesWrite(self):
-        mockStream = Mock()
-        mockConverter = Mock()
-        wrapper = StreamWrapper(mockStream, mockConverter)
-        wrapper.write('hello')
-        self.assertTrue(mockConverter.write.call_args, (('hello',), {}))
-
-    def testDelegatesContext(self):
-        mockConverter = Mock()
-        s = StringIO()
-        with StreamWrapper(s, mockConverter) as fp:
-            fp.write(u'hello')
-        self.assertTrue(s.closed)
-
-    def testProxyNoContextManager(self):
-        mockStream = MagicMock()
-        mockStream.__enter__.side_effect = AttributeError()
-        mockConverter = Mock()
-        with self.assertRaises(AttributeError) as excinfo:
-            with StreamWrapper(mockStream, mockConverter) as wrapper:
-                wrapper.write('hello')
-
-    def test_closed_shouldnt_raise_on_closed_stream(self):
-        stream = StringIO()
-        stream.close()
-        wrapper = StreamWrapper(stream, None)
-        self.assertEqual(wrapper.closed, True)
-
-    def test_closed_shouldnt_raise_on_detached_stream(self):
-        stream = TextIOWrapper(StringIO())
-        stream.detach()
-        wrapper = StreamWrapper(stream, None)
-        self.assertEqual(wrapper.closed, True)
-
-class AnsiToWin32Test(TestCase):
-
-    def testInit(self):
-        mockStdout = Mock()
-        auto = Mock()
-        stream = AnsiToWin32(mockStdout, autoreset=auto)
-        self.assertEqual(stream.wrapped, mockStdout)
-        self.assertEqual(stream.autoreset, auto)
-
-    @patch('colorama.ansitowin32.winterm', None)
-    @patch('colorama.ansitowin32.winapi_test', lambda *_: True)
-    def testStripIsTrueOnWindows(self):
-        with osname('nt'):
-            mockStdout = Mock()
-            stream = AnsiToWin32(mockStdout)
-            self.assertTrue(stream.strip)
-
-    def testStripIsFalseOffWindows(self):
-        with osname('posix'):
-            mockStdout = Mock(closed=False)
-            stream = AnsiToWin32(mockStdout)
-            self.assertFalse(stream.strip)
-
-    def testWriteStripsAnsi(self):
-        mockStdout = Mock()
-        stream = AnsiToWin32(mockStdout)
-        stream.wrapped = Mock()
-        stream.write_and_convert = Mock()
-        stream.strip = True
-
-        stream.write('abc')
-
-        self.assertFalse(stream.wrapped.write.called)
-        self.assertEqual(stream.write_and_convert.call_args, (('abc',), {}))
-
-    def testWriteDoesNotStripAnsi(self):
-        mockStdout = Mock()
-        stream = AnsiToWin32(mockStdout)
-        stream.wrapped = Mock()
-        stream.write_and_convert = Mock()
-        stream.strip = False
-        stream.convert = False
-
-        stream.write('abc')
-
-        self.assertFalse(stream.write_and_convert.called)
-        self.assertEqual(stream.wrapped.write.call_args, (('abc',), {}))
-
-    def assert_autoresets(self, convert, autoreset=True):
-        stream = AnsiToWin32(Mock())
-        stream.convert = convert
-        stream.reset_all = Mock()
-        stream.autoreset = autoreset
-        stream.winterm = Mock()
-
-        stream.write('abc')
-
-        self.assertEqual(stream.reset_all.called, autoreset)
-
-    def testWriteAutoresets(self):
-        self.assert_autoresets(convert=True)
-        self.assert_autoresets(convert=False)
-        self.assert_autoresets(convert=True, autoreset=False)
-        self.assert_autoresets(convert=False, autoreset=False)
-
-    def testWriteAndConvertWritesPlainText(self):
-        stream = AnsiToWin32(Mock())
-        stream.write_and_convert( 'abc' )
-        self.assertEqual( stream.wrapped.write.call_args, (('abc',), {}) )
-
-    def testWriteAndConvertStripsAllValidAnsi(self):
-        stream = AnsiToWin32(Mock())
-        stream.call_win32 = Mock()
-        data = [
-            'abc\033[mdef',
-            'abc\033[0mdef',
-            'abc\033[2mdef',
-            'abc\033[02mdef',
-            'abc\033[002mdef',
-            'abc\033[40mdef',
-            'abc\033[040mdef',
-            'abc\033[0;1mdef',
-            'abc\033[40;50mdef',
-            'abc\033[50;30;40mdef',
-            'abc\033[Adef',
-            'abc\033[0Gdef',
-            'abc\033[1;20;128Hdef',
-        ]
-        for datum in data:
-            stream.wrapped.write.reset_mock()
-            stream.write_and_convert( datum )
-            self.assertEqual(
-               [args[0] for args in stream.wrapped.write.call_args_list],
-               [ ('abc',), ('def',) ]
-            )
-
-    def testWriteAndConvertSkipsEmptySnippets(self):
-        stream = AnsiToWin32(Mock())
-        stream.call_win32 = Mock()
-        stream.write_and_convert( '\033[40m\033[41m' )
-        self.assertFalse( stream.wrapped.write.called )
-
-    def testWriteAndConvertCallsWin32WithParamsAndCommand(self):
-        stream = AnsiToWin32(Mock())
-        stream.convert = True
-        stream.call_win32 = Mock()
-        stream.extract_params = Mock(return_value='params')
-        data = {
-            'abc\033[adef':         ('a', 'params'),
-            'abc\033[;;bdef':       ('b', 'params'),
-            'abc\033[0cdef':        ('c', 'params'),
-            'abc\033[;;0;;Gdef':    ('G', 'params'),
-            'abc\033[1;20;128Hdef': ('H', 'params'),
-        }
-        for datum, expected in data.items():
-            stream.call_win32.reset_mock()
-            stream.write_and_convert( datum )
-            self.assertEqual( stream.call_win32.call_args[0], expected )
-
-    def test_reset_all_shouldnt_raise_on_closed_orig_stdout(self):
-        stream = StringIO()
-        converter = AnsiToWin32(stream)
-        stream.close()
-
-        converter.reset_all()
-
-    def test_wrap_shouldnt_raise_on_closed_orig_stdout(self):
-        stream = StringIO()
-        stream.close()
-        with \
-            patch("colorama.ansitowin32.os.name", "nt"), \
-            patch("colorama.ansitowin32.winapi_test", lambda: True):
-                converter = AnsiToWin32(stream)
-        self.assertTrue(converter.strip)
-        self.assertFalse(converter.convert)
-
-    def test_wrap_shouldnt_raise_on_missing_closed_attr(self):
-        with \
-            patch("colorama.ansitowin32.os.name", "nt"), \
-            patch("colorama.ansitowin32.winapi_test", lambda: True):
-                converter = AnsiToWin32(object())
-        self.assertTrue(converter.strip)
-        self.assertFalse(converter.convert)
-
-    def testExtractParams(self):
-        stream = AnsiToWin32(Mock())
-        data = {
-            '':               (0,),
-            ';;':             (0,),
-            '2':              (2,),
-            ';;002;;':        (2,),
-            '0;1':            (0, 1),
-            ';;003;;456;;':   (3, 456),
-            '11;22;33;44;55': (11, 22, 33, 44, 55),
-        }
-        for datum, expected in data.items():
-            self.assertEqual(stream.extract_params('m', datum), expected)
-
-    def testCallWin32UsesLookup(self):
-        listener = Mock()
-        stream = AnsiToWin32(listener)
-        stream.win32_calls = {
-            1: (lambda *_, **__: listener(11),),
-            2: (lambda *_, **__: listener(22),),
-            3: (lambda *_, **__: listener(33),),
-        }
-        stream.call_win32('m', (3, 1, 99, 2))
-        self.assertEqual(
-            [a[0][0] for a in listener.call_args_list],
-            [33, 11, 22] )
-
-    def test_osc_codes(self):
-        mockStdout = Mock()
-        stream = AnsiToWin32(mockStdout, convert=True)
-        with patch('colorama.ansitowin32.winterm') as winterm:
-            data = [
-                '\033]0\x07',                      # missing arguments
-                '\033]0;foo\x08',                  # wrong OSC command
-                '\033]0;colorama_test_title\x07',  # should work
-                '\033]1;colorama_test_title\x07',  # wrong set command
-                '\033]2;colorama_test_title\x07',  # should work
-                '\033]' + ';' * 64 + '\x08',       # see issue #247
-            ]
-            for code in data:
-                stream.write(code)
-            self.assertEqual(winterm.set_title.call_count, 2)
-
-    def test_native_windows_ansi(self):
-        with ExitStack() as stack:
-            def p(a, b):
-                stack.enter_context(patch(a, b, create=True))
-            # Pretend to be on Windows
-            p("colorama.ansitowin32.os.name", "nt")
-            p("colorama.ansitowin32.winapi_test", lambda: True)
-            p("colorama.win32.winapi_test", lambda: True)
-            p("colorama.winterm.win32.windll", "non-None")
-            p("colorama.winterm.get_osfhandle", lambda _: 1234)
-
-            # Pretend that our mock stream has native ANSI support
-            p(
-                "colorama.winterm.win32.GetConsoleMode",
-                lambda _: ENABLE_VIRTUAL_TERMINAL_PROCESSING,
-            )
-            SetConsoleMode = Mock()
-            p("colorama.winterm.win32.SetConsoleMode", SetConsoleMode)
-
-            stdout = Mock()
-            stdout.closed = False
-            stdout.isatty.return_value = True
-            stdout.fileno.return_value = 1
-
-            # Our fake console says it has native vt support, so AnsiToWin32 should
-            # enable that support and do nothing else.
-            stream = AnsiToWin32(stdout)
-            SetConsoleMode.assert_called_with(1234, ENABLE_VIRTUAL_TERMINAL_PROCESSING)
-            self.assertFalse(stream.strip)
-            self.assertFalse(stream.convert)
-            self.assertFalse(stream.should_wrap())
-
-            # Now let's pretend we're on an old Windows console, that doesn't have
-            # native ANSI support.
-            p("colorama.winterm.win32.GetConsoleMode", lambda _: 0)
-            SetConsoleMode = Mock()
-            p("colorama.winterm.win32.SetConsoleMode", SetConsoleMode)
-
-            stream = AnsiToWin32(stdout)
-            SetConsoleMode.assert_called_with(1234, ENABLE_VIRTUAL_TERMINAL_PROCESSING)
-            self.assertTrue(stream.strip)
-            self.assertTrue(stream.convert)
-            self.assertTrue(stream.should_wrap())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/pip/_vendor/colorama/tests/initialise_test.py b/src/pip/_vendor/colorama/tests/initialise_test.py
deleted file mode 100644
index 89f9b07511c..00000000000
--- a/src/pip/_vendor/colorama/tests/initialise_test.py
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-import sys
-from unittest import TestCase, main, skipUnless
-
-try:
-    from unittest.mock import patch, Mock
-except ImportError:
-    from mock import patch, Mock
-
-from ..ansitowin32 import StreamWrapper
-from ..initialise import init, just_fix_windows_console, _wipe_internal_state_for_tests
-from .utils import osname, replace_by
-
-orig_stdout = sys.stdout
-orig_stderr = sys.stderr
-
-
-class InitTest(TestCase):
-
-    @skipUnless(sys.stdout.isatty(), "sys.stdout is not a tty")
-    def setUp(self):
-        # sanity check
-        self.assertNotWrapped()
-
-    def tearDown(self):
-        _wipe_internal_state_for_tests()
-        sys.stdout = orig_stdout
-        sys.stderr = orig_stderr
-
-    def assertWrapped(self):
-        self.assertIsNot(sys.stdout, orig_stdout, 'stdout should be wrapped')
-        self.assertIsNot(sys.stderr, orig_stderr, 'stderr should be wrapped')
-        self.assertTrue(isinstance(sys.stdout, StreamWrapper),
-            'bad stdout wrapper')
-        self.assertTrue(isinstance(sys.stderr, StreamWrapper),
-            'bad stderr wrapper')
-
-    def assertNotWrapped(self):
-        self.assertIs(sys.stdout, orig_stdout, 'stdout should not be wrapped')
-        self.assertIs(sys.stderr, orig_stderr, 'stderr should not be wrapped')
-
-    @patch('colorama.initialise.reset_all')
-    @patch('colorama.ansitowin32.winapi_test', lambda *_: True)
-    @patch('colorama.ansitowin32.enable_vt_processing', lambda *_: False)
-    def testInitWrapsOnWindows(self, _):
-        with osname("nt"):
-            init()
-            self.assertWrapped()
-
-    @patch('colorama.initialise.reset_all')
-    @patch('colorama.ansitowin32.winapi_test', lambda *_: False)
-    def testInitDoesntWrapOnEmulatedWindows(self, _):
-        with osname("nt"):
-            init()
-            self.assertNotWrapped()
-
-    def testInitDoesntWrapOnNonWindows(self):
-        with osname("posix"):
-            init()
-            self.assertNotWrapped()
-
-    def testInitDoesntWrapIfNone(self):
-        with replace_by(None):
-            init()
-            # We can't use assertNotWrapped here because replace_by(None)
-            # changes stdout/stderr already.
-            self.assertIsNone(sys.stdout)
-            self.assertIsNone(sys.stderr)
-
-    def testInitAutoresetOnWrapsOnAllPlatforms(self):
-        with osname("posix"):
-            init(autoreset=True)
-            self.assertWrapped()
-
-    def testInitWrapOffDoesntWrapOnWindows(self):
-        with osname("nt"):
-            init(wrap=False)
-            self.assertNotWrapped()
-
-    def testInitWrapOffIncompatibleWithAutoresetOn(self):
-        self.assertRaises(ValueError, lambda: init(autoreset=True, wrap=False))
-
-    @patch('colorama.win32.SetConsoleTextAttribute')
-    @patch('colorama.initialise.AnsiToWin32')
-    def testAutoResetPassedOn(self, mockATW32, _):
-        with osname("nt"):
-            init(autoreset=True)
-            self.assertEqual(len(mockATW32.call_args_list), 2)
-            self.assertEqual(mockATW32.call_args_list[1][1]['autoreset'], True)
-            self.assertEqual(mockATW32.call_args_list[0][1]['autoreset'], True)
-
-    @patch('colorama.initialise.AnsiToWin32')
-    def testAutoResetChangeable(self, mockATW32):
-        with osname("nt"):
-            init()
-
-            init(autoreset=True)
-            self.assertEqual(len(mockATW32.call_args_list), 4)
-            self.assertEqual(mockATW32.call_args_list[2][1]['autoreset'], True)
-            self.assertEqual(mockATW32.call_args_list[3][1]['autoreset'], True)
-
-            init()
-            self.assertEqual(len(mockATW32.call_args_list), 6)
-            self.assertEqual(
-                mockATW32.call_args_list[4][1]['autoreset'], False)
-            self.assertEqual(
-                mockATW32.call_args_list[5][1]['autoreset'], False)
-
-
-    @patch('colorama.initialise.atexit.register')
-    def testAtexitRegisteredOnlyOnce(self, mockRegister):
-        init()
-        self.assertTrue(mockRegister.called)
-        mockRegister.reset_mock()
-        init()
-        self.assertFalse(mockRegister.called)
-
-
-class JustFixWindowsConsoleTest(TestCase):
-    def _reset(self):
-        _wipe_internal_state_for_tests()
-        sys.stdout = orig_stdout
-        sys.stderr = orig_stderr
-
-    def tearDown(self):
-        self._reset()
-
-    @patch("colorama.ansitowin32.winapi_test", lambda: True)
-    def testJustFixWindowsConsole(self):
-        if sys.platform != "win32":
-            # just_fix_windows_console should be a no-op
-            just_fix_windows_console()
-            self.assertIs(sys.stdout, orig_stdout)
-            self.assertIs(sys.stderr, orig_stderr)
-        else:
-            def fake_std():
-                # Emulate stdout=not a tty, stderr=tty
-                # to check that we handle both cases correctly
-                stdout = Mock()
-                stdout.closed = False
-                stdout.isatty.return_value = False
-                stdout.fileno.return_value = 1
-                sys.stdout = stdout
-
-                stderr = Mock()
-                stderr.closed = False
-                stderr.isatty.return_value = True
-                stderr.fileno.return_value = 2
-                sys.stderr = stderr
-
-            for native_ansi in [False, True]:
-                with patch(
-                    'colorama.ansitowin32.enable_vt_processing',
-                    lambda *_: native_ansi
-                ):
-                    self._reset()
-                    fake_std()
-
-                    # Regular single-call test
-                    prev_stdout = sys.stdout
-                    prev_stderr = sys.stderr
-                    just_fix_windows_console()
-                    self.assertIs(sys.stdout, prev_stdout)
-                    if native_ansi:
-                        self.assertIs(sys.stderr, prev_stderr)
-                    else:
-                        self.assertIsNot(sys.stderr, prev_stderr)
-
-                    # second call without resetting is always a no-op
-                    prev_stdout = sys.stdout
-                    prev_stderr = sys.stderr
-                    just_fix_windows_console()
-                    self.assertIs(sys.stdout, prev_stdout)
-                    self.assertIs(sys.stderr, prev_stderr)
-
-                    self._reset()
-                    fake_std()
-
-                    # If init() runs first, just_fix_windows_console should be a no-op
-                    init()
-                    prev_stdout = sys.stdout
-                    prev_stderr = sys.stderr
-                    just_fix_windows_console()
-                    self.assertIs(prev_stdout, sys.stdout)
-                    self.assertIs(prev_stderr, sys.stderr)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/pip/_vendor/colorama/tests/isatty_test.py b/src/pip/_vendor/colorama/tests/isatty_test.py
deleted file mode 100644
index 0f84e4befe5..00000000000
--- a/src/pip/_vendor/colorama/tests/isatty_test.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-import sys
-from unittest import TestCase, main
-
-from ..ansitowin32 import StreamWrapper, AnsiToWin32
-from .utils import pycharm, replace_by, replace_original_by, StreamTTY, StreamNonTTY
-
-
-def is_a_tty(stream):
-    return StreamWrapper(stream, None).isatty()
-
-class IsattyTest(TestCase):
-
-    def test_TTY(self):
-        tty = StreamTTY()
-        self.assertTrue(is_a_tty(tty))
-        with pycharm():
-            self.assertTrue(is_a_tty(tty))
-
-    def test_nonTTY(self):
-        non_tty = StreamNonTTY()
-        self.assertFalse(is_a_tty(non_tty))
-        with pycharm():
-            self.assertFalse(is_a_tty(non_tty))
-
-    def test_withPycharm(self):
-        with pycharm():
-            self.assertTrue(is_a_tty(sys.stderr))
-            self.assertTrue(is_a_tty(sys.stdout))
-
-    def test_withPycharmTTYOverride(self):
-        tty = StreamTTY()
-        with pycharm(), replace_by(tty):
-            self.assertTrue(is_a_tty(tty))
-
-    def test_withPycharmNonTTYOverride(self):
-        non_tty = StreamNonTTY()
-        with pycharm(), replace_by(non_tty):
-            self.assertFalse(is_a_tty(non_tty))
-
-    def test_withPycharmNoneOverride(self):
-        with pycharm():
-            with replace_by(None), replace_original_by(None):
-                self.assertFalse(is_a_tty(None))
-                self.assertFalse(is_a_tty(StreamNonTTY()))
-                self.assertTrue(is_a_tty(StreamTTY()))
-
-    def test_withPycharmStreamWrapped(self):
-        with pycharm():
-            self.assertTrue(AnsiToWin32(StreamTTY()).stream.isatty())
-            self.assertFalse(AnsiToWin32(StreamNonTTY()).stream.isatty())
-            self.assertTrue(AnsiToWin32(sys.stdout).stream.isatty())
-            self.assertTrue(AnsiToWin32(sys.stderr).stream.isatty())
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/pip/_vendor/colorama/tests/utils.py b/src/pip/_vendor/colorama/tests/utils.py
deleted file mode 100644
index 472fafb4403..00000000000
--- a/src/pip/_vendor/colorama/tests/utils.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-from contextlib import contextmanager
-from io import StringIO
-import sys
-import os
-
-
-class StreamTTY(StringIO):
-    def isatty(self):
-        return True
-
-class StreamNonTTY(StringIO):
-    def isatty(self):
-        return False
-
-@contextmanager
-def osname(name):
-    orig = os.name
-    os.name = name
-    yield
-    os.name = orig
-
-@contextmanager
-def replace_by(stream):
-    orig_stdout = sys.stdout
-    orig_stderr = sys.stderr
-    sys.stdout = stream
-    sys.stderr = stream
-    yield
-    sys.stdout = orig_stdout
-    sys.stderr = orig_stderr
-
-@contextmanager
-def replace_original_by(stream):
-    orig_stdout = sys.__stdout__
-    orig_stderr = sys.__stderr__
-    sys.__stdout__ = stream
-    sys.__stderr__ = stream
-    yield
-    sys.__stdout__ = orig_stdout
-    sys.__stderr__ = orig_stderr
-
-@contextmanager
-def pycharm():
-    os.environ["PYCHARM_HOSTED"] = "1"
-    non_tty = StreamNonTTY()
-    with replace_by(non_tty), replace_original_by(non_tty):
-        yield
-    del os.environ["PYCHARM_HOSTED"]
diff --git a/src/pip/_vendor/colorama/tests/winterm_test.py b/src/pip/_vendor/colorama/tests/winterm_test.py
deleted file mode 100644
index d0955f9e608..00000000000
--- a/src/pip/_vendor/colorama/tests/winterm_test.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-import sys
-from unittest import TestCase, main, skipUnless
-
-try:
-    from unittest.mock import Mock, patch
-except ImportError:
-    from mock import Mock, patch
-
-from ..winterm import WinColor, WinStyle, WinTerm
-
-
-class WinTermTest(TestCase):
-
-    @patch('colorama.winterm.win32')
-    def testInit(self, mockWin32):
-        mockAttr = Mock()
-        mockAttr.wAttributes = 7 + 6 * 16 + 8
-        mockWin32.GetConsoleScreenBufferInfo.return_value = mockAttr
-        term = WinTerm()
-        self.assertEqual(term._fore, 7)
-        self.assertEqual(term._back, 6)
-        self.assertEqual(term._style, 8)
-
-    @skipUnless(sys.platform.startswith("win"), "requires Windows")
-    def testGetAttrs(self):
-        term = WinTerm()
-
-        term._fore = 0
-        term._back = 0
-        term._style = 0
-        self.assertEqual(term.get_attrs(), 0)
-
-        term._fore = WinColor.YELLOW
-        self.assertEqual(term.get_attrs(), WinColor.YELLOW)
-
-        term._back = WinColor.MAGENTA
-        self.assertEqual(
-            term.get_attrs(),
-            WinColor.YELLOW + WinColor.MAGENTA * 16)
-
-        term._style = WinStyle.BRIGHT
-        self.assertEqual(
-            term.get_attrs(),
-            WinColor.YELLOW + WinColor.MAGENTA * 16 + WinStyle.BRIGHT)
-
-    @patch('colorama.winterm.win32')
-    def testResetAll(self, mockWin32):
-        mockAttr = Mock()
-        mockAttr.wAttributes = 1 + 2 * 16 + 8
-        mockWin32.GetConsoleScreenBufferInfo.return_value = mockAttr
-        term = WinTerm()
-
-        term.set_console = Mock()
-        term._fore = -1
-        term._back = -1
-        term._style = -1
-
-        term.reset_all()
-
-        self.assertEqual(term._fore, 1)
-        self.assertEqual(term._back, 2)
-        self.assertEqual(term._style, 8)
-        self.assertEqual(term.set_console.called, True)
-
-    @skipUnless(sys.platform.startswith("win"), "requires Windows")
-    def testFore(self):
-        term = WinTerm()
-        term.set_console = Mock()
-        term._fore = 0
-
-        term.fore(5)
-
-        self.assertEqual(term._fore, 5)
-        self.assertEqual(term.set_console.called, True)
-
-    @skipUnless(sys.platform.startswith("win"), "requires Windows")
-    def testBack(self):
-        term = WinTerm()
-        term.set_console = Mock()
-        term._back = 0
-
-        term.back(5)
-
-        self.assertEqual(term._back, 5)
-        self.assertEqual(term.set_console.called, True)
-
-    @skipUnless(sys.platform.startswith("win"), "requires Windows")
-    def testStyle(self):
-        term = WinTerm()
-        term.set_console = Mock()
-        term._style = 0
-
-        term.style(22)
-
-        self.assertEqual(term._style, 22)
-        self.assertEqual(term.set_console.called, True)
-
-    @patch('colorama.winterm.win32')
-    def testSetConsole(self, mockWin32):
-        mockAttr = Mock()
-        mockAttr.wAttributes = 0
-        mockWin32.GetConsoleScreenBufferInfo.return_value = mockAttr
-        term = WinTerm()
-        term.windll = Mock()
-
-        term.set_console()
-
-        self.assertEqual(
-            mockWin32.SetConsoleTextAttribute.call_args,
-            ((mockWin32.STDOUT, term.get_attrs()), {})
-        )
-
-    @patch('colorama.winterm.win32')
-    def testSetConsoleOnStderr(self, mockWin32):
-        mockAttr = Mock()
-        mockAttr.wAttributes = 0
-        mockWin32.GetConsoleScreenBufferInfo.return_value = mockAttr
-        term = WinTerm()
-        term.windll = Mock()
-
-        term.set_console(on_stderr=True)
-
-        self.assertEqual(
-            mockWin32.SetConsoleTextAttribute.call_args,
-            ((mockWin32.STDERR, term.get_attrs()), {})
-        )
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/pip/_vendor/colorama/win32.py b/src/pip/_vendor/colorama/win32.py
deleted file mode 100644
index 841b0e270a3..00000000000
--- a/src/pip/_vendor/colorama/win32.py
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-
-# from winbase.h
-STDOUT = -11
-STDERR = -12
-
-ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004
-
-try:
-    import ctypes
-    from ctypes import LibraryLoader
-    windll = LibraryLoader(ctypes.WinDLL)
-    from ctypes import wintypes
-except (AttributeError, ImportError):
-    windll = None
-    SetConsoleTextAttribute = lambda *_: None
-    winapi_test = lambda *_: None
-else:
-    from ctypes import byref, Structure, c_char, POINTER
-
-    COORD = wintypes._COORD
-
-    class CONSOLE_SCREEN_BUFFER_INFO(Structure):
-        """struct in wincon.h."""
-        _fields_ = [
-            ("dwSize", COORD),
-            ("dwCursorPosition", COORD),
-            ("wAttributes", wintypes.WORD),
-            ("srWindow", wintypes.SMALL_RECT),
-            ("dwMaximumWindowSize", COORD),
-        ]
-        def __str__(self):
-            return '(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d)' % (
-                self.dwSize.Y, self.dwSize.X
-                , self.dwCursorPosition.Y, self.dwCursorPosition.X
-                , self.wAttributes
-                , self.srWindow.Top, self.srWindow.Left, self.srWindow.Bottom, self.srWindow.Right
-                , self.dwMaximumWindowSize.Y, self.dwMaximumWindowSize.X
-            )
-
-    _GetStdHandle = windll.kernel32.GetStdHandle
-    _GetStdHandle.argtypes = [
-        wintypes.DWORD,
-    ]
-    _GetStdHandle.restype = wintypes.HANDLE
-
-    _GetConsoleScreenBufferInfo = windll.kernel32.GetConsoleScreenBufferInfo
-    _GetConsoleScreenBufferInfo.argtypes = [
-        wintypes.HANDLE,
-        POINTER(CONSOLE_SCREEN_BUFFER_INFO),
-    ]
-    _GetConsoleScreenBufferInfo.restype = wintypes.BOOL
-
-    _SetConsoleTextAttribute = windll.kernel32.SetConsoleTextAttribute
-    _SetConsoleTextAttribute.argtypes = [
-        wintypes.HANDLE,
-        wintypes.WORD,
-    ]
-    _SetConsoleTextAttribute.restype = wintypes.BOOL
-
-    _SetConsoleCursorPosition = windll.kernel32.SetConsoleCursorPosition
-    _SetConsoleCursorPosition.argtypes = [
-        wintypes.HANDLE,
-        COORD,
-    ]
-    _SetConsoleCursorPosition.restype = wintypes.BOOL
-
-    _FillConsoleOutputCharacterA = windll.kernel32.FillConsoleOutputCharacterA
-    _FillConsoleOutputCharacterA.argtypes = [
-        wintypes.HANDLE,
-        c_char,
-        wintypes.DWORD,
-        COORD,
-        POINTER(wintypes.DWORD),
-    ]
-    _FillConsoleOutputCharacterA.restype = wintypes.BOOL
-
-    _FillConsoleOutputAttribute = windll.kernel32.FillConsoleOutputAttribute
-    _FillConsoleOutputAttribute.argtypes = [
-        wintypes.HANDLE,
-        wintypes.WORD,
-        wintypes.DWORD,
-        COORD,
-        POINTER(wintypes.DWORD),
-    ]
-    _FillConsoleOutputAttribute.restype = wintypes.BOOL
-
-    _SetConsoleTitleW = windll.kernel32.SetConsoleTitleW
-    _SetConsoleTitleW.argtypes = [
-        wintypes.LPCWSTR
-    ]
-    _SetConsoleTitleW.restype = wintypes.BOOL
-
-    _GetConsoleMode = windll.kernel32.GetConsoleMode
-    _GetConsoleMode.argtypes = [
-        wintypes.HANDLE,
-        POINTER(wintypes.DWORD)
-    ]
-    _GetConsoleMode.restype = wintypes.BOOL
-
-    _SetConsoleMode = windll.kernel32.SetConsoleMode
-    _SetConsoleMode.argtypes = [
-        wintypes.HANDLE,
-        wintypes.DWORD
-    ]
-    _SetConsoleMode.restype = wintypes.BOOL
-
-    def _winapi_test(handle):
-        csbi = CONSOLE_SCREEN_BUFFER_INFO()
-        success = _GetConsoleScreenBufferInfo(
-            handle, byref(csbi))
-        return bool(success)
-
-    def winapi_test():
-        return any(_winapi_test(h) for h in
-                   (_GetStdHandle(STDOUT), _GetStdHandle(STDERR)))
-
-    def GetConsoleScreenBufferInfo(stream_id=STDOUT):
-        handle = _GetStdHandle(stream_id)
-        csbi = CONSOLE_SCREEN_BUFFER_INFO()
-        success = _GetConsoleScreenBufferInfo(
-            handle, byref(csbi))
-        return csbi
-
-    def SetConsoleTextAttribute(stream_id, attrs):
-        handle = _GetStdHandle(stream_id)
-        return _SetConsoleTextAttribute(handle, attrs)
-
-    def SetConsoleCursorPosition(stream_id, position, adjust=True):
-        position = COORD(*position)
-        # If the position is out of range, do nothing.
-        if position.Y <= 0 or position.X <= 0:
-            return
-        # Adjust for Windows' SetConsoleCursorPosition:
-        #    1. being 0-based, while ANSI is 1-based.
-        #    2. expecting (x,y), while ANSI uses (y,x).
-        adjusted_position = COORD(position.Y - 1, position.X - 1)
-        if adjust:
-            # Adjust for viewport's scroll position
-            sr = GetConsoleScreenBufferInfo(STDOUT).srWindow
-            adjusted_position.Y += sr.Top
-            adjusted_position.X += sr.Left
-        # Resume normal processing
-        handle = _GetStdHandle(stream_id)
-        return _SetConsoleCursorPosition(handle, adjusted_position)
-
-    def FillConsoleOutputCharacter(stream_id, char, length, start):
-        handle = _GetStdHandle(stream_id)
-        char = c_char(char.encode())
-        length = wintypes.DWORD(length)
-        num_written = wintypes.DWORD(0)
-        # Note that this is hard-coded for ANSI (vs wide) bytes.
-        success = _FillConsoleOutputCharacterA(
-            handle, char, length, start, byref(num_written))
-        return num_written.value
-
-    def FillConsoleOutputAttribute(stream_id, attr, length, start):
-        ''' FillConsoleOutputAttribute( hConsole, csbi.wAttributes, dwConSize, coordScreen, &cCharsWritten )'''
-        handle = _GetStdHandle(stream_id)
-        attribute = wintypes.WORD(attr)
-        length = wintypes.DWORD(length)
-        num_written = wintypes.DWORD(0)
-        # Note that this is hard-coded for ANSI (vs wide) bytes.
-        return _FillConsoleOutputAttribute(
-            handle, attribute, length, start, byref(num_written))
-
-    def SetConsoleTitle(title):
-        return _SetConsoleTitleW(title)
-
-    def GetConsoleMode(handle):
-        mode = wintypes.DWORD()
-        success = _GetConsoleMode(handle, byref(mode))
-        if not success:
-            raise ctypes.WinError()
-        return mode.value
-
-    def SetConsoleMode(handle, mode):
-        success = _SetConsoleMode(handle, mode)
-        if not success:
-            raise ctypes.WinError()
diff --git a/src/pip/_vendor/colorama/winterm.py b/src/pip/_vendor/colorama/winterm.py
deleted file mode 100644
index aad867e8c80..00000000000
--- a/src/pip/_vendor/colorama/winterm.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
-try:
-    from msvcrt import get_osfhandle
-except ImportError:
-    def get_osfhandle(_):
-        raise OSError("This isn't windows!")
-
-
-from . import win32
-
-# from wincon.h
-class WinColor(object):
-    BLACK   = 0
-    BLUE    = 1
-    GREEN   = 2
-    CYAN    = 3
-    RED     = 4
-    MAGENTA = 5
-    YELLOW  = 6
-    GREY    = 7
-
-# from wincon.h
-class WinStyle(object):
-    NORMAL              = 0x00 # dim text, dim background
-    BRIGHT              = 0x08 # bright text, dim background
-    BRIGHT_BACKGROUND   = 0x80 # dim text, bright background
-
-class WinTerm(object):
-
-    def __init__(self):
-        self._default = win32.GetConsoleScreenBufferInfo(win32.STDOUT).wAttributes
-        self.set_attrs(self._default)
-        self._default_fore = self._fore
-        self._default_back = self._back
-        self._default_style = self._style
-        # In order to emulate LIGHT_EX in windows, we borrow the BRIGHT style.
-        # So that LIGHT_EX colors and BRIGHT style do not clobber each other,
-        # we track them separately, since LIGHT_EX is overwritten by Fore/Back
-        # and BRIGHT is overwritten by Style codes.
-        self._light = 0
-
-    def get_attrs(self):
-        return self._fore + self._back * 16 + (self._style | self._light)
-
-    def set_attrs(self, value):
-        self._fore = value & 7
-        self._back = (value >> 4) & 7
-        self._style = value & (WinStyle.BRIGHT | WinStyle.BRIGHT_BACKGROUND)
-
-    def reset_all(self, on_stderr=None):
-        self.set_attrs(self._default)
-        self.set_console(attrs=self._default)
-        self._light = 0
-
-    def fore(self, fore=None, light=False, on_stderr=False):
-        if fore is None:
-            fore = self._default_fore
-        self._fore = fore
-        # Emulate LIGHT_EX with BRIGHT Style
-        if light:
-            self._light |= WinStyle.BRIGHT
-        else:
-            self._light &= ~WinStyle.BRIGHT
-        self.set_console(on_stderr=on_stderr)
-
-    def back(self, back=None, light=False, on_stderr=False):
-        if back is None:
-            back = self._default_back
-        self._back = back
-        # Emulate LIGHT_EX with BRIGHT_BACKGROUND Style
-        if light:
-            self._light |= WinStyle.BRIGHT_BACKGROUND
-        else:
-            self._light &= ~WinStyle.BRIGHT_BACKGROUND
-        self.set_console(on_stderr=on_stderr)
-
-    def style(self, style=None, on_stderr=False):
-        if style is None:
-            style = self._default_style
-        self._style = style
-        self.set_console(on_stderr=on_stderr)
-
-    def set_console(self, attrs=None, on_stderr=False):
-        if attrs is None:
-            attrs = self.get_attrs()
-        handle = win32.STDOUT
-        if on_stderr:
-            handle = win32.STDERR
-        win32.SetConsoleTextAttribute(handle, attrs)
-
-    def get_position(self, handle):
-        position = win32.GetConsoleScreenBufferInfo(handle).dwCursorPosition
-        # Because Windows coordinates are 0-based,
-        # and win32.SetConsoleCursorPosition expects 1-based.
-        position.X += 1
-        position.Y += 1
-        return position
-
-    def set_cursor_position(self, position=None, on_stderr=False):
-        if position is None:
-            # I'm not currently tracking the position, so there is no default.
-            # position = self.get_position()
-            return
-        handle = win32.STDOUT
-        if on_stderr:
-            handle = win32.STDERR
-        win32.SetConsoleCursorPosition(handle, position)
-
-    def cursor_adjust(self, x, y, on_stderr=False):
-        handle = win32.STDOUT
-        if on_stderr:
-            handle = win32.STDERR
-        position = self.get_position(handle)
-        adjusted_position = (position.Y + y, position.X + x)
-        win32.SetConsoleCursorPosition(handle, adjusted_position, adjust=False)
-
-    def erase_screen(self, mode=0, on_stderr=False):
-        # 0 should clear from the cursor to the end of the screen.
-        # 1 should clear from the cursor to the beginning of the screen.
-        # 2 should clear the entire screen, and move cursor to (1,1)
-        handle = win32.STDOUT
-        if on_stderr:
-            handle = win32.STDERR
-        csbi = win32.GetConsoleScreenBufferInfo(handle)
-        # get the number of character cells in the current buffer
-        cells_in_screen = csbi.dwSize.X * csbi.dwSize.Y
-        # get number of character cells before current cursor position
-        cells_before_cursor = csbi.dwSize.X * csbi.dwCursorPosition.Y + csbi.dwCursorPosition.X
-        if mode == 0:
-            from_coord = csbi.dwCursorPosition
-            cells_to_erase = cells_in_screen - cells_before_cursor
-        elif mode == 1:
-            from_coord = win32.COORD(0, 0)
-            cells_to_erase = cells_before_cursor
-        elif mode == 2:
-            from_coord = win32.COORD(0, 0)
-            cells_to_erase = cells_in_screen
-        else:
-            # invalid mode
-            return
-        # fill the entire screen with blanks
-        win32.FillConsoleOutputCharacter(handle, ' ', cells_to_erase, from_coord)
-        # now set the buffer's attributes accordingly
-        win32.FillConsoleOutputAttribute(handle, self.get_attrs(), cells_to_erase, from_coord)
-        if mode == 2:
-            # put the cursor where needed
-            win32.SetConsoleCursorPosition(handle, (1, 1))
-
-    def erase_line(self, mode=0, on_stderr=False):
-        # 0 should clear from the cursor to the end of the line.
-        # 1 should clear from the cursor to the beginning of the line.
-        # 2 should clear the entire line.
-        handle = win32.STDOUT
-        if on_stderr:
-            handle = win32.STDERR
-        csbi = win32.GetConsoleScreenBufferInfo(handle)
-        if mode == 0:
-            from_coord = csbi.dwCursorPosition
-            cells_to_erase = csbi.dwSize.X - csbi.dwCursorPosition.X
-        elif mode == 1:
-            from_coord = win32.COORD(0, csbi.dwCursorPosition.Y)
-            cells_to_erase = csbi.dwCursorPosition.X
-        elif mode == 2:
-            from_coord = win32.COORD(0, csbi.dwCursorPosition.Y)
-            cells_to_erase = csbi.dwSize.X
-        else:
-            # invalid mode
-            return
-        # fill the entire screen with blanks
-        win32.FillConsoleOutputCharacter(handle, ' ', cells_to_erase, from_coord)
-        # now set the buffer's attributes accordingly
-        win32.FillConsoleOutputAttribute(handle, self.get_attrs(), cells_to_erase, from_coord)
-
-    def set_title(self, title):
-        win32.SetConsoleTitle(title)
-
-
-def enable_vt_processing(fd):
-    if win32.windll is None or not win32.winapi_test():
-        return False
-
-    try:
-        handle = get_osfhandle(fd)
-        mode = win32.GetConsoleMode(handle)
-        win32.SetConsoleMode(
-            handle,
-            mode | win32.ENABLE_VIRTUAL_TERMINAL_PROCESSING,
-        )
-
-        mode = win32.GetConsoleMode(handle)
-        if mode & win32.ENABLE_VIRTUAL_TERMINAL_PROCESSING:
-            return True
-    # Can get TypeError in testsuite where 'fd' is a Mock()
-    except (OSError, TypeError):
-        return False
diff --git a/src/pip/_vendor/pygments/cmdline.py b/src/pip/_vendor/pygments/cmdline.py
index eec1775ba5f..29b5608f331 100644
--- a/src/pip/_vendor/pygments/cmdline.py
+++ b/src/pip/_vendor/pygments/cmdline.py
@@ -469,11 +469,11 @@ def is_only_option(opt):
         outfile = UnclosingTextIOWrapper(outfile, encoding=fmter.encoding)
         fmter.encoding = None
         try:
-            import pip._vendor.colorama.initialise as colorama_initialise
+            import colorama.initialise
         except ImportError:
             pass
         else:
-            outfile = colorama_initialise.wrap_stream(
+            outfile = colorama.initialise.wrap_stream(
                 outfile, convert=None, strip=None, autoreset=False, wrap=True)
 
     # When using the LaTeX formatter and the option `escapeinside` is
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 50c1ed46975..2643da721fc 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -1,5 +1,4 @@
 CacheControl==0.14.0
-colorama==0.4.6
 distlib==0.3.8
 distro==1.9.0
 msgpack==1.0.8
diff --git a/tools/vendoring/patches/pygments.patch b/tools/vendoring/patches/pygments.patch
index 58d86c616af..5cc272f2c1b 100644
--- a/tools/vendoring/patches/pygments.patch
+++ b/tools/vendoring/patches/pygments.patch
@@ -1,24 +1,6 @@
 This patch mainly handles tweaking imports into a form that can be transformed
 to import from the vendored namespace.
 
-diff --git a/src/pip/_vendor/pygments/cmdline.py b/src/pip/_vendor/pygments/cmdline.py
-index 435231e6..b75a9d7f 100644
---- a/src/pip/_vendor/pygments/cmdline.py
-+++ b/src/pip/_vendor/pygments/cmdline.py
-@@ -469,11 +469,11 @@ def main_inner(parser, argns):
-         outfile = UnclosingTextIOWrapper(outfile, encoding=fmter.encoding)
-         fmter.encoding = None
-         try:
--            import colorama.initialise
-+            import colorama.initialise as colorama_initialise
-         except ImportError:
-             pass
-         else:
--            outfile = colorama.initialise.wrap_stream(
-+            outfile = colorama_initialise.wrap_stream(
-                 outfile, convert=None, strip=None, autoreset=False, wrap=True)
- 
-     # When using the LaTeX formatter and the option `escapeinside` is
 diff --git a/src/pip/_vendor/pygments/__main__.py b/src/pip/_vendor/pygments/__main__.py
 index 5eb2c747..04997f49 100644
 --- a/src/pip/_vendor/pygments/__main__.py

From 612515d2e0a6ff8676c139c096a45bc28b3456f4 Mon Sep 17 00:00:00 2001
From: Fredrik Orderud 
Date: Wed, 15 May 2024 08:21:03 -0700
Subject: [PATCH 424/992] Document how to activate truststore persistently
 (#12699)

---
 docs/html/topics/https-certificates.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/html/topics/https-certificates.md b/docs/html/topics/https-certificates.md
index 341cfc632de..0cf88b4b644 100644
--- a/docs/html/topics/https-certificates.md
+++ b/docs/html/topics/https-certificates.md
@@ -22,6 +22,7 @@ variables.
 
 ```{versionadded} 22.2
 Experimental support, behind `--use-feature=truststore`.
+As with any other CLI option, this can be enabled globally via config or environment variables.
 ```
 
 It is possible to use the system trust store, instead of the bundled certifi

From 038dc755061d6918288eae97fbec363df3607366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Wed, 22 May 2024 20:32:27 +0200
Subject: [PATCH 425/992] Update git tests to not use local partial clones
 (#12721)

This works around a git restriction to fix CVE-2024-32004.
Users affected by the error `remote: fatal: could not fetch ... from promisor remote`
should consider setting the GIT_NO_LAZY_FETCH=0 if they trust the source repo.
---
 tests/lib/local_repos.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/lib/local_repos.py b/tests/lib/local_repos.py
index a8cf4aa6c74..6827665cf7a 100644
--- a/tests/lib/local_repos.py
+++ b/tests/lib/local_repos.py
@@ -37,7 +37,7 @@ def local_checkout(
         created as a sub directory of the base temp directory.
     """
     assert "+" in remote_repo
-    vcs_name = remote_repo.split("+", 1)[0]
+    vcs_name, vcs_url = remote_repo.split("+", 1)
     repository_name = os.path.basename(remote_repo)
 
     directory = temp_path.joinpath("cache")
@@ -51,6 +51,12 @@ def local_checkout(
         assert repository_name == "INITools"
         _create_svn_initools_repo(repo_url_path)
         repo_url_path = os.path.join(repo_url_path, "trunk")
+    elif vcs_name == "git":
+        # Don't use vcs_backend.obtain() here because we don't want a partial clone:
+        # https://github.com/pypa/pip/issues/12719
+        subprocess.check_call(
+            ["git", "clone", vcs_url, repo_url_path],
+        )
     else:
         vcs_backend = vcs.get_backend(vcs_name)
         assert vcs_backend is not None

From 570f10ffc9ef735e21d396934b9652a8241036f4 Mon Sep 17 00:00:00 2001
From: Shixian Sheng 
Date: Thu, 23 May 2024 19:17:41 -0400
Subject: [PATCH 426/992] Update contribute.md

---
 docs/html/ux-research-design/contribute.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/html/ux-research-design/contribute.md b/docs/html/ux-research-design/contribute.md
index 48aab68e636..2e91d60c40e 100644
--- a/docs/html/ux-research-design/contribute.md
+++ b/docs/html/ux-research-design/contribute.md
@@ -21,4 +21,4 @@ You can help the team by testing new features as they are released to the commun
 If you believe that you have found a user experience bug in pip, or you have ideas for how pip could be made better for all users, please file an issue on the [pip issue tracker](https://github.com/pypa/pip/issues/new).
 
 You can also help improve pip’s user experience by [working on UX issues](https://github.com/pypa/pip/issues?q=is%3Aissue+label%3AUX+is%3Aopen). Issues that are ideal for new contributors are marked with “[good first issue](https://github.com/pypa/pip/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)”. Explore the
-[UX Guidance](guidance) if you have questions.
+[UX Guidance](guidance.md) if you have questions.

From fb71f4c6705e3410153196ab0c250a9e4913457e Mon Sep 17 00:00:00 2001
From: Nate Prewitt 
Date: Fri, 24 May 2024 04:03:13 -0700
Subject: [PATCH 427/992] Remove vendored charset_normalizer (#12703)

* Upgrade to Requests 2.32.0

* Remove charset_normalizer from vendored dependencies
---
 news/charset_normalizer.vendor.rst            |    5 +
 news/requests.vendor.rst                      |    1 +
 pyproject.toml                                |    2 -
 src/pip/_vendor/charset_normalizer/LICENSE    |   21 -
 .../_vendor/charset_normalizer/__init__.py    |   46 -
 .../_vendor/charset_normalizer/__main__.py    |    4 -
 src/pip/_vendor/charset_normalizer/api.py     |  626 ------
 src/pip/_vendor/charset_normalizer/cd.py      |  395 ----
 .../charset_normalizer/cli/__init__.py        |    6 -
 .../charset_normalizer/cli/__main__.py        |  296 ---
 .../_vendor/charset_normalizer/constant.py    | 1995 -----------------
 src/pip/_vendor/charset_normalizer/legacy.py  |   54 -
 src/pip/_vendor/charset_normalizer/md.py      |  615 -----
 src/pip/_vendor/charset_normalizer/models.py  |  340 ---
 src/pip/_vendor/charset_normalizer/py.typed   |    0
 src/pip/_vendor/charset_normalizer/utils.py   |  421 ----
 src/pip/_vendor/charset_normalizer/version.py |    6 -
 src/pip/_vendor/requests/__init__.py          |    9 +-
 src/pip/_vendor/requests/__version__.py       |    6 +-
 src/pip/_vendor/requests/adapters.py          |  114 +-
 src/pip/_vendor/requests/api.py               |    2 +-
 src/pip/_vendor/requests/auth.py              |    1 -
 src/pip/_vendor/requests/compat.py            |   15 +-
 src/pip/_vendor/requests/cookies.py           |   16 +-
 src/pip/_vendor/requests/exceptions.py        |   10 +
 src/pip/_vendor/requests/help.py              |    6 +-
 src/pip/_vendor/requests/models.py            |   13 +-
 src/pip/_vendor/requests/packages.py          |   13 +-
 src/pip/_vendor/requests/sessions.py          |   12 +-
 src/pip/_vendor/requests/status_codes.py      |   10 +-
 src/pip/_vendor/requests/utils.py             |   16 +-
 src/pip/_vendor/vendor.txt                    |    3 +-
 tools/vendoring/patches/requests.patch        |  144 +-
 33 files changed, 273 insertions(+), 4950 deletions(-)
 create mode 100644 news/charset_normalizer.vendor.rst
 create mode 100644 news/requests.vendor.rst
 delete mode 100644 src/pip/_vendor/charset_normalizer/LICENSE
 delete mode 100644 src/pip/_vendor/charset_normalizer/__init__.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/__main__.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/api.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/cd.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/cli/__init__.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/cli/__main__.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/constant.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/legacy.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/md.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/models.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/py.typed
 delete mode 100644 src/pip/_vendor/charset_normalizer/utils.py
 delete mode 100644 src/pip/_vendor/charset_normalizer/version.py

diff --git a/news/charset_normalizer.vendor.rst b/news/charset_normalizer.vendor.rst
new file mode 100644
index 00000000000..b4a64c7c10f
--- /dev/null
+++ b/news/charset_normalizer.vendor.rst
@@ -0,0 +1,5 @@
+Remove vendored charset_normalizer.
+
+Requests provides optional character detection support on some APIs
+when processing ambiguous bytes. This isn't relevant for pip to function
+and we're able to remove it due to recent upstream changes.
diff --git a/news/requests.vendor.rst b/news/requests.vendor.rst
new file mode 100644
index 00000000000..edae29fdbc9
--- /dev/null
+++ b/news/requests.vendor.rst
@@ -0,0 +1 @@
+Upgrade Requests to 2.32.0
diff --git a/pyproject.toml b/pyproject.toml
index 7af2982838a..8cbf9c9f4c3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -122,8 +122,6 @@ drop = [
   "bin/",
   # interpreter and OS specific msgpack libs
   "msgpack/*.so",
-  # interpreter and OS specific charset-normalizer libs
-  "charset_normalizer/*.so",
   # unneeded parts of setuptools
   "easy_install.py",
   "setuptools",
diff --git a/src/pip/_vendor/charset_normalizer/LICENSE b/src/pip/_vendor/charset_normalizer/LICENSE
deleted file mode 100644
index ad82355b802..00000000000
--- a/src/pip/_vendor/charset_normalizer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 TAHRI Ahmed R.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/src/pip/_vendor/charset_normalizer/__init__.py b/src/pip/_vendor/charset_normalizer/__init__.py
deleted file mode 100644
index 55991fc3806..00000000000
--- a/src/pip/_vendor/charset_normalizer/__init__.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Charset-Normalizer
-~~~~~~~~~~~~~~
-The Real First Universal Charset Detector.
-A library that helps you read text from an unknown charset encoding.
-Motivated by chardet, This package is trying to resolve the issue by taking a new approach.
-All IANA character set names for which the Python core library provides codecs are supported.
-
-Basic usage:
-   >>> from charset_normalizer import from_bytes
-   >>> results = from_bytes('Bсеки човек има право на образование. Oбразованието!'.encode('utf_8'))
-   >>> best_guess = results.best()
-   >>> str(best_guess)
-   'Bсеки човек има право на образование. Oбразованието!'
-
-Others methods and usages are available - see the full documentation
-at .
-:copyright: (c) 2021 by Ahmed TAHRI
-:license: MIT, see LICENSE for more details.
-"""
-import logging
-
-from .api import from_bytes, from_fp, from_path, is_binary
-from .legacy import detect
-from .models import CharsetMatch, CharsetMatches
-from .utils import set_logging_handler
-from .version import VERSION, __version__
-
-__all__ = (
-    "from_fp",
-    "from_path",
-    "from_bytes",
-    "is_binary",
-    "detect",
-    "CharsetMatch",
-    "CharsetMatches",
-    "__version__",
-    "VERSION",
-    "set_logging_handler",
-)
-
-# Attach a NullHandler to the top level logger by default
-# https://docs.python.org/3.3/howto/logging.html#configuring-logging-for-a-library
-
-logging.getLogger("charset_normalizer").addHandler(logging.NullHandler())
diff --git a/src/pip/_vendor/charset_normalizer/__main__.py b/src/pip/_vendor/charset_normalizer/__main__.py
deleted file mode 100644
index beae2ef7749..00000000000
--- a/src/pip/_vendor/charset_normalizer/__main__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from .cli import cli_detect
-
-if __name__ == "__main__":
-    cli_detect()
diff --git a/src/pip/_vendor/charset_normalizer/api.py b/src/pip/_vendor/charset_normalizer/api.py
deleted file mode 100644
index 0ba08e3a50b..00000000000
--- a/src/pip/_vendor/charset_normalizer/api.py
+++ /dev/null
@@ -1,626 +0,0 @@
-import logging
-from os import PathLike
-from typing import BinaryIO, List, Optional, Set, Union
-
-from .cd import (
-    coherence_ratio,
-    encoding_languages,
-    mb_encoding_languages,
-    merge_coherence_ratios,
-)
-from .constant import IANA_SUPPORTED, TOO_BIG_SEQUENCE, TOO_SMALL_SEQUENCE, TRACE
-from .md import mess_ratio
-from .models import CharsetMatch, CharsetMatches
-from .utils import (
-    any_specified_encoding,
-    cut_sequence_chunks,
-    iana_name,
-    identify_sig_or_bom,
-    is_cp_similar,
-    is_multi_byte_encoding,
-    should_strip_sig_or_bom,
-)
-
-# Will most likely be controversial
-# logging.addLevelName(TRACE, "TRACE")
-logger = logging.getLogger("charset_normalizer")
-explain_handler = logging.StreamHandler()
-explain_handler.setFormatter(
-    logging.Formatter("%(asctime)s | %(levelname)s | %(message)s")
-)
-
-
-def from_bytes(
-    sequences: Union[bytes, bytearray],
-    steps: int = 5,
-    chunk_size: int = 512,
-    threshold: float = 0.2,
-    cp_isolation: Optional[List[str]] = None,
-    cp_exclusion: Optional[List[str]] = None,
-    preemptive_behaviour: bool = True,
-    explain: bool = False,
-    language_threshold: float = 0.1,
-    enable_fallback: bool = True,
-) -> CharsetMatches:
-    """
-    Given a raw bytes sequence, return the best possibles charset usable to render str objects.
-    If there is no results, it is a strong indicator that the source is binary/not text.
-    By default, the process will extract 5 blocks of 512o each to assess the mess and coherence of a given sequence.
-    And will give up a particular code page after 20% of measured mess. Those criteria are customizable at will.
-
-    The preemptive behavior DOES NOT replace the traditional detection workflow, it prioritize a particular code page
-    but never take it for granted. Can improve the performance.
-
-    You may want to focus your attention to some code page or/and not others, use cp_isolation and cp_exclusion for that
-    purpose.
-
-    This function will strip the SIG in the payload/sequence every time except on UTF-16, UTF-32.
-    By default the library does not setup any handler other than the NullHandler, if you choose to set the 'explain'
-    toggle to True it will alter the logger configuration to add a StreamHandler that is suitable for debugging.
-    Custom logging format and handler can be set manually.
-    """
-
-    if not isinstance(sequences, (bytearray, bytes)):
-        raise TypeError(
-            "Expected object of type bytes or bytearray, got: {0}".format(
-                type(sequences)
-            )
-        )
-
-    if explain:
-        previous_logger_level: int = logger.level
-        logger.addHandler(explain_handler)
-        logger.setLevel(TRACE)
-
-    length: int = len(sequences)
-
-    if length == 0:
-        logger.debug("Encoding detection on empty bytes, assuming utf_8 intention.")
-        if explain:
-            logger.removeHandler(explain_handler)
-            logger.setLevel(previous_logger_level or logging.WARNING)
-        return CharsetMatches([CharsetMatch(sequences, "utf_8", 0.0, False, [], "")])
-
-    if cp_isolation is not None:
-        logger.log(
-            TRACE,
-            "cp_isolation is set. use this flag for debugging purpose. "
-            "limited list of encoding allowed : %s.",
-            ", ".join(cp_isolation),
-        )
-        cp_isolation = [iana_name(cp, False) for cp in cp_isolation]
-    else:
-        cp_isolation = []
-
-    if cp_exclusion is not None:
-        logger.log(
-            TRACE,
-            "cp_exclusion is set. use this flag for debugging purpose. "
-            "limited list of encoding excluded : %s.",
-            ", ".join(cp_exclusion),
-        )
-        cp_exclusion = [iana_name(cp, False) for cp in cp_exclusion]
-    else:
-        cp_exclusion = []
-
-    if length <= (chunk_size * steps):
-        logger.log(
-            TRACE,
-            "override steps (%i) and chunk_size (%i) as content does not fit (%i byte(s) given) parameters.",
-            steps,
-            chunk_size,
-            length,
-        )
-        steps = 1
-        chunk_size = length
-
-    if steps > 1 and length / steps < chunk_size:
-        chunk_size = int(length / steps)
-
-    is_too_small_sequence: bool = len(sequences) < TOO_SMALL_SEQUENCE
-    is_too_large_sequence: bool = len(sequences) >= TOO_BIG_SEQUENCE
-
-    if is_too_small_sequence:
-        logger.log(
-            TRACE,
-            "Trying to detect encoding from a tiny portion of ({}) byte(s).".format(
-                length
-            ),
-        )
-    elif is_too_large_sequence:
-        logger.log(
-            TRACE,
-            "Using lazy str decoding because the payload is quite large, ({}) byte(s).".format(
-                length
-            ),
-        )
-
-    prioritized_encodings: List[str] = []
-
-    specified_encoding: Optional[str] = (
-        any_specified_encoding(sequences) if preemptive_behaviour else None
-    )
-
-    if specified_encoding is not None:
-        prioritized_encodings.append(specified_encoding)
-        logger.log(
-            TRACE,
-            "Detected declarative mark in sequence. Priority +1 given for %s.",
-            specified_encoding,
-        )
-
-    tested: Set[str] = set()
-    tested_but_hard_failure: List[str] = []
-    tested_but_soft_failure: List[str] = []
-
-    fallback_ascii: Optional[CharsetMatch] = None
-    fallback_u8: Optional[CharsetMatch] = None
-    fallback_specified: Optional[CharsetMatch] = None
-
-    results: CharsetMatches = CharsetMatches()
-
-    sig_encoding, sig_payload = identify_sig_or_bom(sequences)
-
-    if sig_encoding is not None:
-        prioritized_encodings.append(sig_encoding)
-        logger.log(
-            TRACE,
-            "Detected a SIG or BOM mark on first %i byte(s). Priority +1 given for %s.",
-            len(sig_payload),
-            sig_encoding,
-        )
-
-    prioritized_encodings.append("ascii")
-
-    if "utf_8" not in prioritized_encodings:
-        prioritized_encodings.append("utf_8")
-
-    for encoding_iana in prioritized_encodings + IANA_SUPPORTED:
-        if cp_isolation and encoding_iana not in cp_isolation:
-            continue
-
-        if cp_exclusion and encoding_iana in cp_exclusion:
-            continue
-
-        if encoding_iana in tested:
-            continue
-
-        tested.add(encoding_iana)
-
-        decoded_payload: Optional[str] = None
-        bom_or_sig_available: bool = sig_encoding == encoding_iana
-        strip_sig_or_bom: bool = bom_or_sig_available and should_strip_sig_or_bom(
-            encoding_iana
-        )
-
-        if encoding_iana in {"utf_16", "utf_32"} and not bom_or_sig_available:
-            logger.log(
-                TRACE,
-                "Encoding %s won't be tested as-is because it require a BOM. Will try some sub-encoder LE/BE.",
-                encoding_iana,
-            )
-            continue
-        if encoding_iana in {"utf_7"} and not bom_or_sig_available:
-            logger.log(
-                TRACE,
-                "Encoding %s won't be tested as-is because detection is unreliable without BOM/SIG.",
-                encoding_iana,
-            )
-            continue
-
-        try:
-            is_multi_byte_decoder: bool = is_multi_byte_encoding(encoding_iana)
-        except (ModuleNotFoundError, ImportError):
-            logger.log(
-                TRACE,
-                "Encoding %s does not provide an IncrementalDecoder",
-                encoding_iana,
-            )
-            continue
-
-        try:
-            if is_too_large_sequence and is_multi_byte_decoder is False:
-                str(
-                    sequences[: int(50e4)]
-                    if strip_sig_or_bom is False
-                    else sequences[len(sig_payload) : int(50e4)],
-                    encoding=encoding_iana,
-                )
-            else:
-                decoded_payload = str(
-                    sequences
-                    if strip_sig_or_bom is False
-                    else sequences[len(sig_payload) :],
-                    encoding=encoding_iana,
-                )
-        except (UnicodeDecodeError, LookupError) as e:
-            if not isinstance(e, LookupError):
-                logger.log(
-                    TRACE,
-                    "Code page %s does not fit given bytes sequence at ALL. %s",
-                    encoding_iana,
-                    str(e),
-                )
-            tested_but_hard_failure.append(encoding_iana)
-            continue
-
-        similar_soft_failure_test: bool = False
-
-        for encoding_soft_failed in tested_but_soft_failure:
-            if is_cp_similar(encoding_iana, encoding_soft_failed):
-                similar_soft_failure_test = True
-                break
-
-        if similar_soft_failure_test:
-            logger.log(
-                TRACE,
-                "%s is deemed too similar to code page %s and was consider unsuited already. Continuing!",
-                encoding_iana,
-                encoding_soft_failed,
-            )
-            continue
-
-        r_ = range(
-            0 if not bom_or_sig_available else len(sig_payload),
-            length,
-            int(length / steps),
-        )
-
-        multi_byte_bonus: bool = (
-            is_multi_byte_decoder
-            and decoded_payload is not None
-            and len(decoded_payload) < length
-        )
-
-        if multi_byte_bonus:
-            logger.log(
-                TRACE,
-                "Code page %s is a multi byte encoding table and it appear that at least one character "
-                "was encoded using n-bytes.",
-                encoding_iana,
-            )
-
-        max_chunk_gave_up: int = int(len(r_) / 4)
-
-        max_chunk_gave_up = max(max_chunk_gave_up, 2)
-        early_stop_count: int = 0
-        lazy_str_hard_failure = False
-
-        md_chunks: List[str] = []
-        md_ratios = []
-
-        try:
-            for chunk in cut_sequence_chunks(
-                sequences,
-                encoding_iana,
-                r_,
-                chunk_size,
-                bom_or_sig_available,
-                strip_sig_or_bom,
-                sig_payload,
-                is_multi_byte_decoder,
-                decoded_payload,
-            ):
-                md_chunks.append(chunk)
-
-                md_ratios.append(
-                    mess_ratio(
-                        chunk,
-                        threshold,
-                        explain is True and 1 <= len(cp_isolation) <= 2,
-                    )
-                )
-
-                if md_ratios[-1] >= threshold:
-                    early_stop_count += 1
-
-                if (early_stop_count >= max_chunk_gave_up) or (
-                    bom_or_sig_available and strip_sig_or_bom is False
-                ):
-                    break
-        except (
-            UnicodeDecodeError
-        ) as e:  # Lazy str loading may have missed something there
-            logger.log(
-                TRACE,
-                "LazyStr Loading: After MD chunk decode, code page %s does not fit given bytes sequence at ALL. %s",
-                encoding_iana,
-                str(e),
-            )
-            early_stop_count = max_chunk_gave_up
-            lazy_str_hard_failure = True
-
-        # We might want to check the sequence again with the whole content
-        # Only if initial MD tests passes
-        if (
-            not lazy_str_hard_failure
-            and is_too_large_sequence
-            and not is_multi_byte_decoder
-        ):
-            try:
-                sequences[int(50e3) :].decode(encoding_iana, errors="strict")
-            except UnicodeDecodeError as e:
-                logger.log(
-                    TRACE,
-                    "LazyStr Loading: After final lookup, code page %s does not fit given bytes sequence at ALL. %s",
-                    encoding_iana,
-                    str(e),
-                )
-                tested_but_hard_failure.append(encoding_iana)
-                continue
-
-        mean_mess_ratio: float = sum(md_ratios) / len(md_ratios) if md_ratios else 0.0
-        if mean_mess_ratio >= threshold or early_stop_count >= max_chunk_gave_up:
-            tested_but_soft_failure.append(encoding_iana)
-            logger.log(
-                TRACE,
-                "%s was excluded because of initial chaos probing. Gave up %i time(s). "
-                "Computed mean chaos is %f %%.",
-                encoding_iana,
-                early_stop_count,
-                round(mean_mess_ratio * 100, ndigits=3),
-            )
-            # Preparing those fallbacks in case we got nothing.
-            if (
-                enable_fallback
-                and encoding_iana in ["ascii", "utf_8", specified_encoding]
-                and not lazy_str_hard_failure
-            ):
-                fallback_entry = CharsetMatch(
-                    sequences, encoding_iana, threshold, False, [], decoded_payload
-                )
-                if encoding_iana == specified_encoding:
-                    fallback_specified = fallback_entry
-                elif encoding_iana == "ascii":
-                    fallback_ascii = fallback_entry
-                else:
-                    fallback_u8 = fallback_entry
-            continue
-
-        logger.log(
-            TRACE,
-            "%s passed initial chaos probing. Mean measured chaos is %f %%",
-            encoding_iana,
-            round(mean_mess_ratio * 100, ndigits=3),
-        )
-
-        if not is_multi_byte_decoder:
-            target_languages: List[str] = encoding_languages(encoding_iana)
-        else:
-            target_languages = mb_encoding_languages(encoding_iana)
-
-        if target_languages:
-            logger.log(
-                TRACE,
-                "{} should target any language(s) of {}".format(
-                    encoding_iana, str(target_languages)
-                ),
-            )
-
-        cd_ratios = []
-
-        # We shall skip the CD when its about ASCII
-        # Most of the time its not relevant to run "language-detection" on it.
-        if encoding_iana != "ascii":
-            for chunk in md_chunks:
-                chunk_languages = coherence_ratio(
-                    chunk,
-                    language_threshold,
-                    ",".join(target_languages) if target_languages else None,
-                )
-
-                cd_ratios.append(chunk_languages)
-
-        cd_ratios_merged = merge_coherence_ratios(cd_ratios)
-
-        if cd_ratios_merged:
-            logger.log(
-                TRACE,
-                "We detected language {} using {}".format(
-                    cd_ratios_merged, encoding_iana
-                ),
-            )
-
-        results.append(
-            CharsetMatch(
-                sequences,
-                encoding_iana,
-                mean_mess_ratio,
-                bom_or_sig_available,
-                cd_ratios_merged,
-                decoded_payload,
-            )
-        )
-
-        if (
-            encoding_iana in [specified_encoding, "ascii", "utf_8"]
-            and mean_mess_ratio < 0.1
-        ):
-            logger.debug(
-                "Encoding detection: %s is most likely the one.", encoding_iana
-            )
-            if explain:
-                logger.removeHandler(explain_handler)
-                logger.setLevel(previous_logger_level)
-            return CharsetMatches([results[encoding_iana]])
-
-        if encoding_iana == sig_encoding:
-            logger.debug(
-                "Encoding detection: %s is most likely the one as we detected a BOM or SIG within "
-                "the beginning of the sequence.",
-                encoding_iana,
-            )
-            if explain:
-                logger.removeHandler(explain_handler)
-                logger.setLevel(previous_logger_level)
-            return CharsetMatches([results[encoding_iana]])
-
-    if len(results) == 0:
-        if fallback_u8 or fallback_ascii or fallback_specified:
-            logger.log(
-                TRACE,
-                "Nothing got out of the detection process. Using ASCII/UTF-8/Specified fallback.",
-            )
-
-        if fallback_specified:
-            logger.debug(
-                "Encoding detection: %s will be used as a fallback match",
-                fallback_specified.encoding,
-            )
-            results.append(fallback_specified)
-        elif (
-            (fallback_u8 and fallback_ascii is None)
-            or (
-                fallback_u8
-                and fallback_ascii
-                and fallback_u8.fingerprint != fallback_ascii.fingerprint
-            )
-            or (fallback_u8 is not None)
-        ):
-            logger.debug("Encoding detection: utf_8 will be used as a fallback match")
-            results.append(fallback_u8)
-        elif fallback_ascii:
-            logger.debug("Encoding detection: ascii will be used as a fallback match")
-            results.append(fallback_ascii)
-
-    if results:
-        logger.debug(
-            "Encoding detection: Found %s as plausible (best-candidate) for content. With %i alternatives.",
-            results.best().encoding,  # type: ignore
-            len(results) - 1,
-        )
-    else:
-        logger.debug("Encoding detection: Unable to determine any suitable charset.")
-
-    if explain:
-        logger.removeHandler(explain_handler)
-        logger.setLevel(previous_logger_level)
-
-    return results
-
-
-def from_fp(
-    fp: BinaryIO,
-    steps: int = 5,
-    chunk_size: int = 512,
-    threshold: float = 0.20,
-    cp_isolation: Optional[List[str]] = None,
-    cp_exclusion: Optional[List[str]] = None,
-    preemptive_behaviour: bool = True,
-    explain: bool = False,
-    language_threshold: float = 0.1,
-    enable_fallback: bool = True,
-) -> CharsetMatches:
-    """
-    Same thing than the function from_bytes but using a file pointer that is already ready.
-    Will not close the file pointer.
-    """
-    return from_bytes(
-        fp.read(),
-        steps,
-        chunk_size,
-        threshold,
-        cp_isolation,
-        cp_exclusion,
-        preemptive_behaviour,
-        explain,
-        language_threshold,
-        enable_fallback,
-    )
-
-
-def from_path(
-    path: Union[str, bytes, PathLike],  # type: ignore[type-arg]
-    steps: int = 5,
-    chunk_size: int = 512,
-    threshold: float = 0.20,
-    cp_isolation: Optional[List[str]] = None,
-    cp_exclusion: Optional[List[str]] = None,
-    preemptive_behaviour: bool = True,
-    explain: bool = False,
-    language_threshold: float = 0.1,
-    enable_fallback: bool = True,
-) -> CharsetMatches:
-    """
-    Same thing than the function from_bytes but with one extra step. Opening and reading given file path in binary mode.
-    Can raise IOError.
-    """
-    with open(path, "rb") as fp:
-        return from_fp(
-            fp,
-            steps,
-            chunk_size,
-            threshold,
-            cp_isolation,
-            cp_exclusion,
-            preemptive_behaviour,
-            explain,
-            language_threshold,
-            enable_fallback,
-        )
-
-
-def is_binary(
-    fp_or_path_or_payload: Union[PathLike, str, BinaryIO, bytes],  # type: ignore[type-arg]
-    steps: int = 5,
-    chunk_size: int = 512,
-    threshold: float = 0.20,
-    cp_isolation: Optional[List[str]] = None,
-    cp_exclusion: Optional[List[str]] = None,
-    preemptive_behaviour: bool = True,
-    explain: bool = False,
-    language_threshold: float = 0.1,
-    enable_fallback: bool = False,
-) -> bool:
-    """
-    Detect if the given input (file, bytes, or path) points to a binary file. aka. not a string.
-    Based on the same main heuristic algorithms and default kwargs at the sole exception that fallbacks match
-    are disabled to be stricter around ASCII-compatible but unlikely to be a string.
-    """
-    if isinstance(fp_or_path_or_payload, (str, PathLike)):
-        guesses = from_path(
-            fp_or_path_or_payload,
-            steps=steps,
-            chunk_size=chunk_size,
-            threshold=threshold,
-            cp_isolation=cp_isolation,
-            cp_exclusion=cp_exclusion,
-            preemptive_behaviour=preemptive_behaviour,
-            explain=explain,
-            language_threshold=language_threshold,
-            enable_fallback=enable_fallback,
-        )
-    elif isinstance(
-        fp_or_path_or_payload,
-        (
-            bytes,
-            bytearray,
-        ),
-    ):
-        guesses = from_bytes(
-            fp_or_path_or_payload,
-            steps=steps,
-            chunk_size=chunk_size,
-            threshold=threshold,
-            cp_isolation=cp_isolation,
-            cp_exclusion=cp_exclusion,
-            preemptive_behaviour=preemptive_behaviour,
-            explain=explain,
-            language_threshold=language_threshold,
-            enable_fallback=enable_fallback,
-        )
-    else:
-        guesses = from_fp(
-            fp_or_path_or_payload,
-            steps=steps,
-            chunk_size=chunk_size,
-            threshold=threshold,
-            cp_isolation=cp_isolation,
-            cp_exclusion=cp_exclusion,
-            preemptive_behaviour=preemptive_behaviour,
-            explain=explain,
-            language_threshold=language_threshold,
-            enable_fallback=enable_fallback,
-        )
-
-    return not guesses
diff --git a/src/pip/_vendor/charset_normalizer/cd.py b/src/pip/_vendor/charset_normalizer/cd.py
deleted file mode 100644
index 4ea6760c45b..00000000000
--- a/src/pip/_vendor/charset_normalizer/cd.py
+++ /dev/null
@@ -1,395 +0,0 @@
-import importlib
-from codecs import IncrementalDecoder
-from collections import Counter
-from functools import lru_cache
-from typing import Counter as TypeCounter, Dict, List, Optional, Tuple
-
-from .constant import (
-    FREQUENCIES,
-    KO_NAMES,
-    LANGUAGE_SUPPORTED_COUNT,
-    TOO_SMALL_SEQUENCE,
-    ZH_NAMES,
-)
-from .md import is_suspiciously_successive_range
-from .models import CoherenceMatches
-from .utils import (
-    is_accentuated,
-    is_latin,
-    is_multi_byte_encoding,
-    is_unicode_range_secondary,
-    unicode_range,
-)
-
-
-def encoding_unicode_range(iana_name: str) -> List[str]:
-    """
-    Return associated unicode ranges in a single byte code page.
-    """
-    if is_multi_byte_encoding(iana_name):
-        raise IOError("Function not supported on multi-byte code page")
-
-    decoder = importlib.import_module(
-        "encodings.{}".format(iana_name)
-    ).IncrementalDecoder
-
-    p: IncrementalDecoder = decoder(errors="ignore")
-    seen_ranges: Dict[str, int] = {}
-    character_count: int = 0
-
-    for i in range(0x40, 0xFF):
-        chunk: str = p.decode(bytes([i]))
-
-        if chunk:
-            character_range: Optional[str] = unicode_range(chunk)
-
-            if character_range is None:
-                continue
-
-            if is_unicode_range_secondary(character_range) is False:
-                if character_range not in seen_ranges:
-                    seen_ranges[character_range] = 0
-                seen_ranges[character_range] += 1
-                character_count += 1
-
-    return sorted(
-        [
-            character_range
-            for character_range in seen_ranges
-            if seen_ranges[character_range] / character_count >= 0.15
-        ]
-    )
-
-
-def unicode_range_languages(primary_range: str) -> List[str]:
-    """
-    Return inferred languages used with a unicode range.
-    """
-    languages: List[str] = []
-
-    for language, characters in FREQUENCIES.items():
-        for character in characters:
-            if unicode_range(character) == primary_range:
-                languages.append(language)
-                break
-
-    return languages
-
-
-@lru_cache()
-def encoding_languages(iana_name: str) -> List[str]:
-    """
-    Single-byte encoding language association. Some code page are heavily linked to particular language(s).
-    This function does the correspondence.
-    """
-    unicode_ranges: List[str] = encoding_unicode_range(iana_name)
-    primary_range: Optional[str] = None
-
-    for specified_range in unicode_ranges:
-        if "Latin" not in specified_range:
-            primary_range = specified_range
-            break
-
-    if primary_range is None:
-        return ["Latin Based"]
-
-    return unicode_range_languages(primary_range)
-
-
-@lru_cache()
-def mb_encoding_languages(iana_name: str) -> List[str]:
-    """
-    Multi-byte encoding language association. Some code page are heavily linked to particular language(s).
-    This function does the correspondence.
-    """
-    if (
-        iana_name.startswith("shift_")
-        or iana_name.startswith("iso2022_jp")
-        or iana_name.startswith("euc_j")
-        or iana_name == "cp932"
-    ):
-        return ["Japanese"]
-    if iana_name.startswith("gb") or iana_name in ZH_NAMES:
-        return ["Chinese"]
-    if iana_name.startswith("iso2022_kr") or iana_name in KO_NAMES:
-        return ["Korean"]
-
-    return []
-
-
-@lru_cache(maxsize=LANGUAGE_SUPPORTED_COUNT)
-def get_target_features(language: str) -> Tuple[bool, bool]:
-    """
-    Determine main aspects from a supported language if it contains accents and if is pure Latin.
-    """
-    target_have_accents: bool = False
-    target_pure_latin: bool = True
-
-    for character in FREQUENCIES[language]:
-        if not target_have_accents and is_accentuated(character):
-            target_have_accents = True
-        if target_pure_latin and is_latin(character) is False:
-            target_pure_latin = False
-
-    return target_have_accents, target_pure_latin
-
-
-def alphabet_languages(
-    characters: List[str], ignore_non_latin: bool = False
-) -> List[str]:
-    """
-    Return associated languages associated to given characters.
-    """
-    languages: List[Tuple[str, float]] = []
-
-    source_have_accents = any(is_accentuated(character) for character in characters)
-
-    for language, language_characters in FREQUENCIES.items():
-        target_have_accents, target_pure_latin = get_target_features(language)
-
-        if ignore_non_latin and target_pure_latin is False:
-            continue
-
-        if target_have_accents is False and source_have_accents:
-            continue
-
-        character_count: int = len(language_characters)
-
-        character_match_count: int = len(
-            [c for c in language_characters if c in characters]
-        )
-
-        ratio: float = character_match_count / character_count
-
-        if ratio >= 0.2:
-            languages.append((language, ratio))
-
-    languages = sorted(languages, key=lambda x: x[1], reverse=True)
-
-    return [compatible_language[0] for compatible_language in languages]
-
-
-def characters_popularity_compare(
-    language: str, ordered_characters: List[str]
-) -> float:
-    """
-    Determine if a ordered characters list (by occurrence from most appearance to rarest) match a particular language.
-    The result is a ratio between 0. (absolutely no correspondence) and 1. (near perfect fit).
-    Beware that is function is not strict on the match in order to ease the detection. (Meaning close match is 1.)
-    """
-    if language not in FREQUENCIES:
-        raise ValueError("{} not available".format(language))
-
-    character_approved_count: int = 0
-    FREQUENCIES_language_set = set(FREQUENCIES[language])
-
-    ordered_characters_count: int = len(ordered_characters)
-    target_language_characters_count: int = len(FREQUENCIES[language])
-
-    large_alphabet: bool = target_language_characters_count > 26
-
-    for character, character_rank in zip(
-        ordered_characters, range(0, ordered_characters_count)
-    ):
-        if character not in FREQUENCIES_language_set:
-            continue
-
-        character_rank_in_language: int = FREQUENCIES[language].index(character)
-        expected_projection_ratio: float = (
-            target_language_characters_count / ordered_characters_count
-        )
-        character_rank_projection: int = int(character_rank * expected_projection_ratio)
-
-        if (
-            large_alphabet is False
-            and abs(character_rank_projection - character_rank_in_language) > 4
-        ):
-            continue
-
-        if (
-            large_alphabet is True
-            and abs(character_rank_projection - character_rank_in_language)
-            < target_language_characters_count / 3
-        ):
-            character_approved_count += 1
-            continue
-
-        characters_before_source: List[str] = FREQUENCIES[language][
-            0:character_rank_in_language
-        ]
-        characters_after_source: List[str] = FREQUENCIES[language][
-            character_rank_in_language:
-        ]
-        characters_before: List[str] = ordered_characters[0:character_rank]
-        characters_after: List[str] = ordered_characters[character_rank:]
-
-        before_match_count: int = len(
-            set(characters_before) & set(characters_before_source)
-        )
-
-        after_match_count: int = len(
-            set(characters_after) & set(characters_after_source)
-        )
-
-        if len(characters_before_source) == 0 and before_match_count <= 4:
-            character_approved_count += 1
-            continue
-
-        if len(characters_after_source) == 0 and after_match_count <= 4:
-            character_approved_count += 1
-            continue
-
-        if (
-            before_match_count / len(characters_before_source) >= 0.4
-            or after_match_count / len(characters_after_source) >= 0.4
-        ):
-            character_approved_count += 1
-            continue
-
-    return character_approved_count / len(ordered_characters)
-
-
-def alpha_unicode_split(decoded_sequence: str) -> List[str]:
-    """
-    Given a decoded text sequence, return a list of str. Unicode range / alphabet separation.
-    Ex. a text containing English/Latin with a bit a Hebrew will return two items in the resulting list;
-    One containing the latin letters and the other hebrew.
-    """
-    layers: Dict[str, str] = {}
-
-    for character in decoded_sequence:
-        if character.isalpha() is False:
-            continue
-
-        character_range: Optional[str] = unicode_range(character)
-
-        if character_range is None:
-            continue
-
-        layer_target_range: Optional[str] = None
-
-        for discovered_range in layers:
-            if (
-                is_suspiciously_successive_range(discovered_range, character_range)
-                is False
-            ):
-                layer_target_range = discovered_range
-                break
-
-        if layer_target_range is None:
-            layer_target_range = character_range
-
-        if layer_target_range not in layers:
-            layers[layer_target_range] = character.lower()
-            continue
-
-        layers[layer_target_range] += character.lower()
-
-    return list(layers.values())
-
-
-def merge_coherence_ratios(results: List[CoherenceMatches]) -> CoherenceMatches:
-    """
-    This function merge results previously given by the function coherence_ratio.
-    The return type is the same as coherence_ratio.
-    """
-    per_language_ratios: Dict[str, List[float]] = {}
-    for result in results:
-        for sub_result in result:
-            language, ratio = sub_result
-            if language not in per_language_ratios:
-                per_language_ratios[language] = [ratio]
-                continue
-            per_language_ratios[language].append(ratio)
-
-    merge = [
-        (
-            language,
-            round(
-                sum(per_language_ratios[language]) / len(per_language_ratios[language]),
-                4,
-            ),
-        )
-        for language in per_language_ratios
-    ]
-
-    return sorted(merge, key=lambda x: x[1], reverse=True)
-
-
-def filter_alt_coherence_matches(results: CoherenceMatches) -> CoherenceMatches:
-    """
-    We shall NOT return "English—" in CoherenceMatches because it is an alternative
-    of "English". This function only keeps the best match and remove the em-dash in it.
-    """
-    index_results: Dict[str, List[float]] = dict()
-
-    for result in results:
-        language, ratio = result
-        no_em_name: str = language.replace("—", "")
-
-        if no_em_name not in index_results:
-            index_results[no_em_name] = []
-
-        index_results[no_em_name].append(ratio)
-
-    if any(len(index_results[e]) > 1 for e in index_results):
-        filtered_results: CoherenceMatches = []
-
-        for language in index_results:
-            filtered_results.append((language, max(index_results[language])))
-
-        return filtered_results
-
-    return results
-
-
-@lru_cache(maxsize=2048)
-def coherence_ratio(
-    decoded_sequence: str, threshold: float = 0.1, lg_inclusion: Optional[str] = None
-) -> CoherenceMatches:
-    """
-    Detect ANY language that can be identified in given sequence. The sequence will be analysed by layers.
-    A layer = Character extraction by alphabets/ranges.
-    """
-
-    results: List[Tuple[str, float]] = []
-    ignore_non_latin: bool = False
-
-    sufficient_match_count: int = 0
-
-    lg_inclusion_list = lg_inclusion.split(",") if lg_inclusion is not None else []
-    if "Latin Based" in lg_inclusion_list:
-        ignore_non_latin = True
-        lg_inclusion_list.remove("Latin Based")
-
-    for layer in alpha_unicode_split(decoded_sequence):
-        sequence_frequencies: TypeCounter[str] = Counter(layer)
-        most_common = sequence_frequencies.most_common()
-
-        character_count: int = sum(o for c, o in most_common)
-
-        if character_count <= TOO_SMALL_SEQUENCE:
-            continue
-
-        popular_character_ordered: List[str] = [c for c, o in most_common]
-
-        for language in lg_inclusion_list or alphabet_languages(
-            popular_character_ordered, ignore_non_latin
-        ):
-            ratio: float = characters_popularity_compare(
-                language, popular_character_ordered
-            )
-
-            if ratio < threshold:
-                continue
-            elif ratio >= 0.8:
-                sufficient_match_count += 1
-
-            results.append((language, round(ratio, 4)))
-
-            if sufficient_match_count >= 3:
-                break
-
-    return sorted(
-        filter_alt_coherence_matches(results), key=lambda x: x[1], reverse=True
-    )
diff --git a/src/pip/_vendor/charset_normalizer/cli/__init__.py b/src/pip/_vendor/charset_normalizer/cli/__init__.py
deleted file mode 100644
index d95fedfe572..00000000000
--- a/src/pip/_vendor/charset_normalizer/cli/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .__main__ import cli_detect, query_yes_no
-
-__all__ = (
-    "cli_detect",
-    "query_yes_no",
-)
diff --git a/src/pip/_vendor/charset_normalizer/cli/__main__.py b/src/pip/_vendor/charset_normalizer/cli/__main__.py
deleted file mode 100644
index d939caadb83..00000000000
--- a/src/pip/_vendor/charset_normalizer/cli/__main__.py
+++ /dev/null
@@ -1,296 +0,0 @@
-import argparse
-import sys
-from json import dumps
-from os.path import abspath, basename, dirname, join, realpath
-from platform import python_version
-from typing import List, Optional
-from unicodedata import unidata_version
-
-import pip._vendor.charset_normalizer.md as md_module
-from pip._vendor.charset_normalizer import from_fp
-from pip._vendor.charset_normalizer.models import CliDetectionResult
-from pip._vendor.charset_normalizer.version import __version__
-
-
-def query_yes_no(question: str, default: str = "yes") -> bool:
-    """Ask a yes/no question via input() and return their answer.
-
-    "question" is a string that is presented to the user.
-    "default" is the presumed answer if the user just hits .
-        It must be "yes" (the default), "no" or None (meaning
-        an answer is required of the user).
-
-    The "answer" return value is True for "yes" or False for "no".
-
-    Credit goes to (c) https://stackoverflow.com/questions/3041986/apt-command-line-interface-like-yes-no-input
-    """
-    valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False}
-    if default is None:
-        prompt = " [y/n] "
-    elif default == "yes":
-        prompt = " [Y/n] "
-    elif default == "no":
-        prompt = " [y/N] "
-    else:
-        raise ValueError("invalid default answer: '%s'" % default)
-
-    while True:
-        sys.stdout.write(question + prompt)
-        choice = input().lower()
-        if default is not None and choice == "":
-            return valid[default]
-        elif choice in valid:
-            return valid[choice]
-        else:
-            sys.stdout.write("Please respond with 'yes' or 'no' " "(or 'y' or 'n').\n")
-
-
-def cli_detect(argv: Optional[List[str]] = None) -> int:
-    """
-    CLI assistant using ARGV and ArgumentParser
-    :param argv:
-    :return: 0 if everything is fine, anything else equal trouble
-    """
-    parser = argparse.ArgumentParser(
-        description="The Real First Universal Charset Detector. "
-        "Discover originating encoding used on text file. "
-        "Normalize text to unicode."
-    )
-
-    parser.add_argument(
-        "files", type=argparse.FileType("rb"), nargs="+", help="File(s) to be analysed"
-    )
-    parser.add_argument(
-        "-v",
-        "--verbose",
-        action="store_true",
-        default=False,
-        dest="verbose",
-        help="Display complementary information about file if any. "
-        "Stdout will contain logs about the detection process.",
-    )
-    parser.add_argument(
-        "-a",
-        "--with-alternative",
-        action="store_true",
-        default=False,
-        dest="alternatives",
-        help="Output complementary possibilities if any. Top-level JSON WILL be a list.",
-    )
-    parser.add_argument(
-        "-n",
-        "--normalize",
-        action="store_true",
-        default=False,
-        dest="normalize",
-        help="Permit to normalize input file. If not set, program does not write anything.",
-    )
-    parser.add_argument(
-        "-m",
-        "--minimal",
-        action="store_true",
-        default=False,
-        dest="minimal",
-        help="Only output the charset detected to STDOUT. Disabling JSON output.",
-    )
-    parser.add_argument(
-        "-r",
-        "--replace",
-        action="store_true",
-        default=False,
-        dest="replace",
-        help="Replace file when trying to normalize it instead of creating a new one.",
-    )
-    parser.add_argument(
-        "-f",
-        "--force",
-        action="store_true",
-        default=False,
-        dest="force",
-        help="Replace file without asking if you are sure, use this flag with caution.",
-    )
-    parser.add_argument(
-        "-t",
-        "--threshold",
-        action="store",
-        default=0.2,
-        type=float,
-        dest="threshold",
-        help="Define a custom maximum amount of chaos allowed in decoded content. 0. <= chaos <= 1.",
-    )
-    parser.add_argument(
-        "--version",
-        action="version",
-        version="Charset-Normalizer {} - Python {} - Unicode {} - SpeedUp {}".format(
-            __version__,
-            python_version(),
-            unidata_version,
-            "OFF" if md_module.__file__.lower().endswith(".py") else "ON",
-        ),
-        help="Show version information and exit.",
-    )
-
-    args = parser.parse_args(argv)
-
-    if args.replace is True and args.normalize is False:
-        print("Use --replace in addition of --normalize only.", file=sys.stderr)
-        return 1
-
-    if args.force is True and args.replace is False:
-        print("Use --force in addition of --replace only.", file=sys.stderr)
-        return 1
-
-    if args.threshold < 0.0 or args.threshold > 1.0:
-        print("--threshold VALUE should be between 0. AND 1.", file=sys.stderr)
-        return 1
-
-    x_ = []
-
-    for my_file in args.files:
-        matches = from_fp(my_file, threshold=args.threshold, explain=args.verbose)
-
-        best_guess = matches.best()
-
-        if best_guess is None:
-            print(
-                'Unable to identify originating encoding for "{}". {}'.format(
-                    my_file.name,
-                    "Maybe try increasing maximum amount of chaos."
-                    if args.threshold < 1.0
-                    else "",
-                ),
-                file=sys.stderr,
-            )
-            x_.append(
-                CliDetectionResult(
-                    abspath(my_file.name),
-                    None,
-                    [],
-                    [],
-                    "Unknown",
-                    [],
-                    False,
-                    1.0,
-                    0.0,
-                    None,
-                    True,
-                )
-            )
-        else:
-            x_.append(
-                CliDetectionResult(
-                    abspath(my_file.name),
-                    best_guess.encoding,
-                    best_guess.encoding_aliases,
-                    [
-                        cp
-                        for cp in best_guess.could_be_from_charset
-                        if cp != best_guess.encoding
-                    ],
-                    best_guess.language,
-                    best_guess.alphabets,
-                    best_guess.bom,
-                    best_guess.percent_chaos,
-                    best_guess.percent_coherence,
-                    None,
-                    True,
-                )
-            )
-
-            if len(matches) > 1 and args.alternatives:
-                for el in matches:
-                    if el != best_guess:
-                        x_.append(
-                            CliDetectionResult(
-                                abspath(my_file.name),
-                                el.encoding,
-                                el.encoding_aliases,
-                                [
-                                    cp
-                                    for cp in el.could_be_from_charset
-                                    if cp != el.encoding
-                                ],
-                                el.language,
-                                el.alphabets,
-                                el.bom,
-                                el.percent_chaos,
-                                el.percent_coherence,
-                                None,
-                                False,
-                            )
-                        )
-
-            if args.normalize is True:
-                if best_guess.encoding.startswith("utf") is True:
-                    print(
-                        '"{}" file does not need to be normalized, as it already came from unicode.'.format(
-                            my_file.name
-                        ),
-                        file=sys.stderr,
-                    )
-                    if my_file.closed is False:
-                        my_file.close()
-                    continue
-
-                dir_path = dirname(realpath(my_file.name))
-                file_name = basename(realpath(my_file.name))
-
-                o_: List[str] = file_name.split(".")
-
-                if args.replace is False:
-                    o_.insert(-1, best_guess.encoding)
-                    if my_file.closed is False:
-                        my_file.close()
-                elif (
-                    args.force is False
-                    and query_yes_no(
-                        'Are you sure to normalize "{}" by replacing it ?'.format(
-                            my_file.name
-                        ),
-                        "no",
-                    )
-                    is False
-                ):
-                    if my_file.closed is False:
-                        my_file.close()
-                    continue
-
-                try:
-                    x_[0].unicode_path = join(dir_path, ".".join(o_))
-
-                    with open(x_[0].unicode_path, "w", encoding="utf-8") as fp:
-                        fp.write(str(best_guess))
-                except IOError as e:
-                    print(str(e), file=sys.stderr)
-                    if my_file.closed is False:
-                        my_file.close()
-                    return 2
-
-        if my_file.closed is False:
-            my_file.close()
-
-    if args.minimal is False:
-        print(
-            dumps(
-                [el.__dict__ for el in x_] if len(x_) > 1 else x_[0].__dict__,
-                ensure_ascii=True,
-                indent=4,
-            )
-        )
-    else:
-        for my_file in args.files:
-            print(
-                ", ".join(
-                    [
-                        el.encoding or "undefined"
-                        for el in x_
-                        if el.path == abspath(my_file.name)
-                    ]
-                )
-            )
-
-    return 0
-
-
-if __name__ == "__main__":
-    cli_detect()
diff --git a/src/pip/_vendor/charset_normalizer/constant.py b/src/pip/_vendor/charset_normalizer/constant.py
deleted file mode 100644
index 863490461ea..00000000000
--- a/src/pip/_vendor/charset_normalizer/constant.py
+++ /dev/null
@@ -1,1995 +0,0 @@
-# -*- coding: utf-8 -*-
-from codecs import BOM_UTF8, BOM_UTF16_BE, BOM_UTF16_LE, BOM_UTF32_BE, BOM_UTF32_LE
-from encodings.aliases import aliases
-from re import IGNORECASE, compile as re_compile
-from typing import Dict, List, Set, Union
-
-# Contain for each eligible encoding a list of/item bytes SIG/BOM
-ENCODING_MARKS: Dict[str, Union[bytes, List[bytes]]] = {
-    "utf_8": BOM_UTF8,
-    "utf_7": [
-        b"\x2b\x2f\x76\x38",
-        b"\x2b\x2f\x76\x39",
-        b"\x2b\x2f\x76\x2b",
-        b"\x2b\x2f\x76\x2f",
-        b"\x2b\x2f\x76\x38\x2d",
-    ],
-    "gb18030": b"\x84\x31\x95\x33",
-    "utf_32": [BOM_UTF32_BE, BOM_UTF32_LE],
-    "utf_16": [BOM_UTF16_BE, BOM_UTF16_LE],
-}
-
-TOO_SMALL_SEQUENCE: int = 32
-TOO_BIG_SEQUENCE: int = int(10e6)
-
-UTF8_MAXIMAL_ALLOCATION: int = 1_112_064
-
-# Up-to-date Unicode ucd/15.0.0
-UNICODE_RANGES_COMBINED: Dict[str, range] = {
-    "Control character": range(32),
-    "Basic Latin": range(32, 128),
-    "Latin-1 Supplement": range(128, 256),
-    "Latin Extended-A": range(256, 384),
-    "Latin Extended-B": range(384, 592),
-    "IPA Extensions": range(592, 688),
-    "Spacing Modifier Letters": range(688, 768),
-    "Combining Diacritical Marks": range(768, 880),
-    "Greek and Coptic": range(880, 1024),
-    "Cyrillic": range(1024, 1280),
-    "Cyrillic Supplement": range(1280, 1328),
-    "Armenian": range(1328, 1424),
-    "Hebrew": range(1424, 1536),
-    "Arabic": range(1536, 1792),
-    "Syriac": range(1792, 1872),
-    "Arabic Supplement": range(1872, 1920),
-    "Thaana": range(1920, 1984),
-    "NKo": range(1984, 2048),
-    "Samaritan": range(2048, 2112),
-    "Mandaic": range(2112, 2144),
-    "Syriac Supplement": range(2144, 2160),
-    "Arabic Extended-B": range(2160, 2208),
-    "Arabic Extended-A": range(2208, 2304),
-    "Devanagari": range(2304, 2432),
-    "Bengali": range(2432, 2560),
-    "Gurmukhi": range(2560, 2688),
-    "Gujarati": range(2688, 2816),
-    "Oriya": range(2816, 2944),
-    "Tamil": range(2944, 3072),
-    "Telugu": range(3072, 3200),
-    "Kannada": range(3200, 3328),
-    "Malayalam": range(3328, 3456),
-    "Sinhala": range(3456, 3584),
-    "Thai": range(3584, 3712),
-    "Lao": range(3712, 3840),
-    "Tibetan": range(3840, 4096),
-    "Myanmar": range(4096, 4256),
-    "Georgian": range(4256, 4352),
-    "Hangul Jamo": range(4352, 4608),
-    "Ethiopic": range(4608, 4992),
-    "Ethiopic Supplement": range(4992, 5024),
-    "Cherokee": range(5024, 5120),
-    "Unified Canadian Aboriginal Syllabics": range(5120, 5760),
-    "Ogham": range(5760, 5792),
-    "Runic": range(5792, 5888),
-    "Tagalog": range(5888, 5920),
-    "Hanunoo": range(5920, 5952),
-    "Buhid": range(5952, 5984),
-    "Tagbanwa": range(5984, 6016),
-    "Khmer": range(6016, 6144),
-    "Mongolian": range(6144, 6320),
-    "Unified Canadian Aboriginal Syllabics Extended": range(6320, 6400),
-    "Limbu": range(6400, 6480),
-    "Tai Le": range(6480, 6528),
-    "New Tai Lue": range(6528, 6624),
-    "Khmer Symbols": range(6624, 6656),
-    "Buginese": range(6656, 6688),
-    "Tai Tham": range(6688, 6832),
-    "Combining Diacritical Marks Extended": range(6832, 6912),
-    "Balinese": range(6912, 7040),
-    "Sundanese": range(7040, 7104),
-    "Batak": range(7104, 7168),
-    "Lepcha": range(7168, 7248),
-    "Ol Chiki": range(7248, 7296),
-    "Cyrillic Extended-C": range(7296, 7312),
-    "Georgian Extended": range(7312, 7360),
-    "Sundanese Supplement": range(7360, 7376),
-    "Vedic Extensions": range(7376, 7424),
-    "Phonetic Extensions": range(7424, 7552),
-    "Phonetic Extensions Supplement": range(7552, 7616),
-    "Combining Diacritical Marks Supplement": range(7616, 7680),
-    "Latin Extended Additional": range(7680, 7936),
-    "Greek Extended": range(7936, 8192),
-    "General Punctuation": range(8192, 8304),
-    "Superscripts and Subscripts": range(8304, 8352),
-    "Currency Symbols": range(8352, 8400),
-    "Combining Diacritical Marks for Symbols": range(8400, 8448),
-    "Letterlike Symbols": range(8448, 8528),
-    "Number Forms": range(8528, 8592),
-    "Arrows": range(8592, 8704),
-    "Mathematical Operators": range(8704, 8960),
-    "Miscellaneous Technical": range(8960, 9216),
-    "Control Pictures": range(9216, 9280),
-    "Optical Character Recognition": range(9280, 9312),
-    "Enclosed Alphanumerics": range(9312, 9472),
-    "Box Drawing": range(9472, 9600),
-    "Block Elements": range(9600, 9632),
-    "Geometric Shapes": range(9632, 9728),
-    "Miscellaneous Symbols": range(9728, 9984),
-    "Dingbats": range(9984, 10176),
-    "Miscellaneous Mathematical Symbols-A": range(10176, 10224),
-    "Supplemental Arrows-A": range(10224, 10240),
-    "Braille Patterns": range(10240, 10496),
-    "Supplemental Arrows-B": range(10496, 10624),
-    "Miscellaneous Mathematical Symbols-B": range(10624, 10752),
-    "Supplemental Mathematical Operators": range(10752, 11008),
-    "Miscellaneous Symbols and Arrows": range(11008, 11264),
-    "Glagolitic": range(11264, 11360),
-    "Latin Extended-C": range(11360, 11392),
-    "Coptic": range(11392, 11520),
-    "Georgian Supplement": range(11520, 11568),
-    "Tifinagh": range(11568, 11648),
-    "Ethiopic Extended": range(11648, 11744),
-    "Cyrillic Extended-A": range(11744, 11776),
-    "Supplemental Punctuation": range(11776, 11904),
-    "CJK Radicals Supplement": range(11904, 12032),
-    "Kangxi Radicals": range(12032, 12256),
-    "Ideographic Description Characters": range(12272, 12288),
-    "CJK Symbols and Punctuation": range(12288, 12352),
-    "Hiragana": range(12352, 12448),
-    "Katakana": range(12448, 12544),
-    "Bopomofo": range(12544, 12592),
-    "Hangul Compatibility Jamo": range(12592, 12688),
-    "Kanbun": range(12688, 12704),
-    "Bopomofo Extended": range(12704, 12736),
-    "CJK Strokes": range(12736, 12784),
-    "Katakana Phonetic Extensions": range(12784, 12800),
-    "Enclosed CJK Letters and Months": range(12800, 13056),
-    "CJK Compatibility": range(13056, 13312),
-    "CJK Unified Ideographs Extension A": range(13312, 19904),
-    "Yijing Hexagram Symbols": range(19904, 19968),
-    "CJK Unified Ideographs": range(19968, 40960),
-    "Yi Syllables": range(40960, 42128),
-    "Yi Radicals": range(42128, 42192),
-    "Lisu": range(42192, 42240),
-    "Vai": range(42240, 42560),
-    "Cyrillic Extended-B": range(42560, 42656),
-    "Bamum": range(42656, 42752),
-    "Modifier Tone Letters": range(42752, 42784),
-    "Latin Extended-D": range(42784, 43008),
-    "Syloti Nagri": range(43008, 43056),
-    "Common Indic Number Forms": range(43056, 43072),
-    "Phags-pa": range(43072, 43136),
-    "Saurashtra": range(43136, 43232),
-    "Devanagari Extended": range(43232, 43264),
-    "Kayah Li": range(43264, 43312),
-    "Rejang": range(43312, 43360),
-    "Hangul Jamo Extended-A": range(43360, 43392),
-    "Javanese": range(43392, 43488),
-    "Myanmar Extended-B": range(43488, 43520),
-    "Cham": range(43520, 43616),
-    "Myanmar Extended-A": range(43616, 43648),
-    "Tai Viet": range(43648, 43744),
-    "Meetei Mayek Extensions": range(43744, 43776),
-    "Ethiopic Extended-A": range(43776, 43824),
-    "Latin Extended-E": range(43824, 43888),
-    "Cherokee Supplement": range(43888, 43968),
-    "Meetei Mayek": range(43968, 44032),
-    "Hangul Syllables": range(44032, 55216),
-    "Hangul Jamo Extended-B": range(55216, 55296),
-    "High Surrogates": range(55296, 56192),
-    "High Private Use Surrogates": range(56192, 56320),
-    "Low Surrogates": range(56320, 57344),
-    "Private Use Area": range(57344, 63744),
-    "CJK Compatibility Ideographs": range(63744, 64256),
-    "Alphabetic Presentation Forms": range(64256, 64336),
-    "Arabic Presentation Forms-A": range(64336, 65024),
-    "Variation Selectors": range(65024, 65040),
-    "Vertical Forms": range(65040, 65056),
-    "Combining Half Marks": range(65056, 65072),
-    "CJK Compatibility Forms": range(65072, 65104),
-    "Small Form Variants": range(65104, 65136),
-    "Arabic Presentation Forms-B": range(65136, 65280),
-    "Halfwidth and Fullwidth Forms": range(65280, 65520),
-    "Specials": range(65520, 65536),
-    "Linear B Syllabary": range(65536, 65664),
-    "Linear B Ideograms": range(65664, 65792),
-    "Aegean Numbers": range(65792, 65856),
-    "Ancient Greek Numbers": range(65856, 65936),
-    "Ancient Symbols": range(65936, 66000),
-    "Phaistos Disc": range(66000, 66048),
-    "Lycian": range(66176, 66208),
-    "Carian": range(66208, 66272),
-    "Coptic Epact Numbers": range(66272, 66304),
-    "Old Italic": range(66304, 66352),
-    "Gothic": range(66352, 66384),
-    "Old Permic": range(66384, 66432),
-    "Ugaritic": range(66432, 66464),
-    "Old Persian": range(66464, 66528),
-    "Deseret": range(66560, 66640),
-    "Shavian": range(66640, 66688),
-    "Osmanya": range(66688, 66736),
-    "Osage": range(66736, 66816),
-    "Elbasan": range(66816, 66864),
-    "Caucasian Albanian": range(66864, 66928),
-    "Vithkuqi": range(66928, 67008),
-    "Linear A": range(67072, 67456),
-    "Latin Extended-F": range(67456, 67520),
-    "Cypriot Syllabary": range(67584, 67648),
-    "Imperial Aramaic": range(67648, 67680),
-    "Palmyrene": range(67680, 67712),
-    "Nabataean": range(67712, 67760),
-    "Hatran": range(67808, 67840),
-    "Phoenician": range(67840, 67872),
-    "Lydian": range(67872, 67904),
-    "Meroitic Hieroglyphs": range(67968, 68000),
-    "Meroitic Cursive": range(68000, 68096),
-    "Kharoshthi": range(68096, 68192),
-    "Old South Arabian": range(68192, 68224),
-    "Old North Arabian": range(68224, 68256),
-    "Manichaean": range(68288, 68352),
-    "Avestan": range(68352, 68416),
-    "Inscriptional Parthian": range(68416, 68448),
-    "Inscriptional Pahlavi": range(68448, 68480),
-    "Psalter Pahlavi": range(68480, 68528),
-    "Old Turkic": range(68608, 68688),
-    "Old Hungarian": range(68736, 68864),
-    "Hanifi Rohingya": range(68864, 68928),
-    "Rumi Numeral Symbols": range(69216, 69248),
-    "Yezidi": range(69248, 69312),
-    "Arabic Extended-C": range(69312, 69376),
-    "Old Sogdian": range(69376, 69424),
-    "Sogdian": range(69424, 69488),
-    "Old Uyghur": range(69488, 69552),
-    "Chorasmian": range(69552, 69600),
-    "Elymaic": range(69600, 69632),
-    "Brahmi": range(69632, 69760),
-    "Kaithi": range(69760, 69840),
-    "Sora Sompeng": range(69840, 69888),
-    "Chakma": range(69888, 69968),
-    "Mahajani": range(69968, 70016),
-    "Sharada": range(70016, 70112),
-    "Sinhala Archaic Numbers": range(70112, 70144),
-    "Khojki": range(70144, 70224),
-    "Multani": range(70272, 70320),
-    "Khudawadi": range(70320, 70400),
-    "Grantha": range(70400, 70528),
-    "Newa": range(70656, 70784),
-    "Tirhuta": range(70784, 70880),
-    "Siddham": range(71040, 71168),
-    "Modi": range(71168, 71264),
-    "Mongolian Supplement": range(71264, 71296),
-    "Takri": range(71296, 71376),
-    "Ahom": range(71424, 71504),
-    "Dogra": range(71680, 71760),
-    "Warang Citi": range(71840, 71936),
-    "Dives Akuru": range(71936, 72032),
-    "Nandinagari": range(72096, 72192),
-    "Zanabazar Square": range(72192, 72272),
-    "Soyombo": range(72272, 72368),
-    "Unified Canadian Aboriginal Syllabics Extended-A": range(72368, 72384),
-    "Pau Cin Hau": range(72384, 72448),
-    "Devanagari Extended-A": range(72448, 72544),
-    "Bhaiksuki": range(72704, 72816),
-    "Marchen": range(72816, 72896),
-    "Masaram Gondi": range(72960, 73056),
-    "Gunjala Gondi": range(73056, 73136),
-    "Makasar": range(73440, 73472),
-    "Kawi": range(73472, 73568),
-    "Lisu Supplement": range(73648, 73664),
-    "Tamil Supplement": range(73664, 73728),
-    "Cuneiform": range(73728, 74752),
-    "Cuneiform Numbers and Punctuation": range(74752, 74880),
-    "Early Dynastic Cuneiform": range(74880, 75088),
-    "Cypro-Minoan": range(77712, 77824),
-    "Egyptian Hieroglyphs": range(77824, 78896),
-    "Egyptian Hieroglyph Format Controls": range(78896, 78944),
-    "Anatolian Hieroglyphs": range(82944, 83584),
-    "Bamum Supplement": range(92160, 92736),
-    "Mro": range(92736, 92784),
-    "Tangsa": range(92784, 92880),
-    "Bassa Vah": range(92880, 92928),
-    "Pahawh Hmong": range(92928, 93072),
-    "Medefaidrin": range(93760, 93856),
-    "Miao": range(93952, 94112),
-    "Ideographic Symbols and Punctuation": range(94176, 94208),
-    "Tangut": range(94208, 100352),
-    "Tangut Components": range(100352, 101120),
-    "Khitan Small Script": range(101120, 101632),
-    "Tangut Supplement": range(101632, 101760),
-    "Kana Extended-B": range(110576, 110592),
-    "Kana Supplement": range(110592, 110848),
-    "Kana Extended-A": range(110848, 110896),
-    "Small Kana Extension": range(110896, 110960),
-    "Nushu": range(110960, 111360),
-    "Duployan": range(113664, 113824),
-    "Shorthand Format Controls": range(113824, 113840),
-    "Znamenny Musical Notation": range(118528, 118736),
-    "Byzantine Musical Symbols": range(118784, 119040),
-    "Musical Symbols": range(119040, 119296),
-    "Ancient Greek Musical Notation": range(119296, 119376),
-    "Kaktovik Numerals": range(119488, 119520),
-    "Mayan Numerals": range(119520, 119552),
-    "Tai Xuan Jing Symbols": range(119552, 119648),
-    "Counting Rod Numerals": range(119648, 119680),
-    "Mathematical Alphanumeric Symbols": range(119808, 120832),
-    "Sutton SignWriting": range(120832, 121520),
-    "Latin Extended-G": range(122624, 122880),
-    "Glagolitic Supplement": range(122880, 122928),
-    "Cyrillic Extended-D": range(122928, 123024),
-    "Nyiakeng Puachue Hmong": range(123136, 123216),
-    "Toto": range(123536, 123584),
-    "Wancho": range(123584, 123648),
-    "Nag Mundari": range(124112, 124160),
-    "Ethiopic Extended-B": range(124896, 124928),
-    "Mende Kikakui": range(124928, 125152),
-    "Adlam": range(125184, 125280),
-    "Indic Siyaq Numbers": range(126064, 126144),
-    "Ottoman Siyaq Numbers": range(126208, 126288),
-    "Arabic Mathematical Alphabetic Symbols": range(126464, 126720),
-    "Mahjong Tiles": range(126976, 127024),
-    "Domino Tiles": range(127024, 127136),
-    "Playing Cards": range(127136, 127232),
-    "Enclosed Alphanumeric Supplement": range(127232, 127488),
-    "Enclosed Ideographic Supplement": range(127488, 127744),
-    "Miscellaneous Symbols and Pictographs": range(127744, 128512),
-    "Emoticons range(Emoji)": range(128512, 128592),
-    "Ornamental Dingbats": range(128592, 128640),
-    "Transport and Map Symbols": range(128640, 128768),
-    "Alchemical Symbols": range(128768, 128896),
-    "Geometric Shapes Extended": range(128896, 129024),
-    "Supplemental Arrows-C": range(129024, 129280),
-    "Supplemental Symbols and Pictographs": range(129280, 129536),
-    "Chess Symbols": range(129536, 129648),
-    "Symbols and Pictographs Extended-A": range(129648, 129792),
-    "Symbols for Legacy Computing": range(129792, 130048),
-    "CJK Unified Ideographs Extension B": range(131072, 173792),
-    "CJK Unified Ideographs Extension C": range(173824, 177984),
-    "CJK Unified Ideographs Extension D": range(177984, 178208),
-    "CJK Unified Ideographs Extension E": range(178208, 183984),
-    "CJK Unified Ideographs Extension F": range(183984, 191472),
-    "CJK Compatibility Ideographs Supplement": range(194560, 195104),
-    "CJK Unified Ideographs Extension G": range(196608, 201552),
-    "CJK Unified Ideographs Extension H": range(201552, 205744),
-    "Tags": range(917504, 917632),
-    "Variation Selectors Supplement": range(917760, 918000),
-    "Supplementary Private Use Area-A": range(983040, 1048576),
-    "Supplementary Private Use Area-B": range(1048576, 1114112),
-}
-
-
-UNICODE_SECONDARY_RANGE_KEYWORD: List[str] = [
-    "Supplement",
-    "Extended",
-    "Extensions",
-    "Modifier",
-    "Marks",
-    "Punctuation",
-    "Symbols",
-    "Forms",
-    "Operators",
-    "Miscellaneous",
-    "Drawing",
-    "Block",
-    "Shapes",
-    "Supplemental",
-    "Tags",
-]
-
-RE_POSSIBLE_ENCODING_INDICATION = re_compile(
-    r"(?:(?:encoding)|(?:charset)|(?:coding))(?:[\:= ]{1,10})(?:[\"\']?)([a-zA-Z0-9\-_]+)(?:[\"\']?)",
-    IGNORECASE,
-)
-
-IANA_NO_ALIASES = [
-    "cp720",
-    "cp737",
-    "cp856",
-    "cp874",
-    "cp875",
-    "cp1006",
-    "koi8_r",
-    "koi8_t",
-    "koi8_u",
-]
-
-IANA_SUPPORTED: List[str] = sorted(
-    filter(
-        lambda x: x.endswith("_codec") is False
-        and x not in {"rot_13", "tactis", "mbcs"},
-        list(set(aliases.values())) + IANA_NO_ALIASES,
-    )
-)
-
-IANA_SUPPORTED_COUNT: int = len(IANA_SUPPORTED)
-
-# pre-computed code page that are similar using the function cp_similarity.
-IANA_SUPPORTED_SIMILAR: Dict[str, List[str]] = {
-    "cp037": ["cp1026", "cp1140", "cp273", "cp500"],
-    "cp1026": ["cp037", "cp1140", "cp273", "cp500"],
-    "cp1125": ["cp866"],
-    "cp1140": ["cp037", "cp1026", "cp273", "cp500"],
-    "cp1250": ["iso8859_2"],
-    "cp1251": ["kz1048", "ptcp154"],
-    "cp1252": ["iso8859_15", "iso8859_9", "latin_1"],
-    "cp1253": ["iso8859_7"],
-    "cp1254": ["iso8859_15", "iso8859_9", "latin_1"],
-    "cp1257": ["iso8859_13"],
-    "cp273": ["cp037", "cp1026", "cp1140", "cp500"],
-    "cp437": ["cp850", "cp858", "cp860", "cp861", "cp862", "cp863", "cp865"],
-    "cp500": ["cp037", "cp1026", "cp1140", "cp273"],
-    "cp850": ["cp437", "cp857", "cp858", "cp865"],
-    "cp857": ["cp850", "cp858", "cp865"],
-    "cp858": ["cp437", "cp850", "cp857", "cp865"],
-    "cp860": ["cp437", "cp861", "cp862", "cp863", "cp865"],
-    "cp861": ["cp437", "cp860", "cp862", "cp863", "cp865"],
-    "cp862": ["cp437", "cp860", "cp861", "cp863", "cp865"],
-    "cp863": ["cp437", "cp860", "cp861", "cp862", "cp865"],
-    "cp865": ["cp437", "cp850", "cp857", "cp858", "cp860", "cp861", "cp862", "cp863"],
-    "cp866": ["cp1125"],
-    "iso8859_10": ["iso8859_14", "iso8859_15", "iso8859_4", "iso8859_9", "latin_1"],
-    "iso8859_11": ["tis_620"],
-    "iso8859_13": ["cp1257"],
-    "iso8859_14": [
-        "iso8859_10",
-        "iso8859_15",
-        "iso8859_16",
-        "iso8859_3",
-        "iso8859_9",
-        "latin_1",
-    ],
-    "iso8859_15": [
-        "cp1252",
-        "cp1254",
-        "iso8859_10",
-        "iso8859_14",
-        "iso8859_16",
-        "iso8859_3",
-        "iso8859_9",
-        "latin_1",
-    ],
-    "iso8859_16": [
-        "iso8859_14",
-        "iso8859_15",
-        "iso8859_2",
-        "iso8859_3",
-        "iso8859_9",
-        "latin_1",
-    ],
-    "iso8859_2": ["cp1250", "iso8859_16", "iso8859_4"],
-    "iso8859_3": ["iso8859_14", "iso8859_15", "iso8859_16", "iso8859_9", "latin_1"],
-    "iso8859_4": ["iso8859_10", "iso8859_2", "iso8859_9", "latin_1"],
-    "iso8859_7": ["cp1253"],
-    "iso8859_9": [
-        "cp1252",
-        "cp1254",
-        "cp1258",
-        "iso8859_10",
-        "iso8859_14",
-        "iso8859_15",
-        "iso8859_16",
-        "iso8859_3",
-        "iso8859_4",
-        "latin_1",
-    ],
-    "kz1048": ["cp1251", "ptcp154"],
-    "latin_1": [
-        "cp1252",
-        "cp1254",
-        "cp1258",
-        "iso8859_10",
-        "iso8859_14",
-        "iso8859_15",
-        "iso8859_16",
-        "iso8859_3",
-        "iso8859_4",
-        "iso8859_9",
-    ],
-    "mac_iceland": ["mac_roman", "mac_turkish"],
-    "mac_roman": ["mac_iceland", "mac_turkish"],
-    "mac_turkish": ["mac_iceland", "mac_roman"],
-    "ptcp154": ["cp1251", "kz1048"],
-    "tis_620": ["iso8859_11"],
-}
-
-
-CHARDET_CORRESPONDENCE: Dict[str, str] = {
-    "iso2022_kr": "ISO-2022-KR",
-    "iso2022_jp": "ISO-2022-JP",
-    "euc_kr": "EUC-KR",
-    "tis_620": "TIS-620",
-    "utf_32": "UTF-32",
-    "euc_jp": "EUC-JP",
-    "koi8_r": "KOI8-R",
-    "iso8859_1": "ISO-8859-1",
-    "iso8859_2": "ISO-8859-2",
-    "iso8859_5": "ISO-8859-5",
-    "iso8859_6": "ISO-8859-6",
-    "iso8859_7": "ISO-8859-7",
-    "iso8859_8": "ISO-8859-8",
-    "utf_16": "UTF-16",
-    "cp855": "IBM855",
-    "mac_cyrillic": "MacCyrillic",
-    "gb2312": "GB2312",
-    "gb18030": "GB18030",
-    "cp932": "CP932",
-    "cp866": "IBM866",
-    "utf_8": "utf-8",
-    "utf_8_sig": "UTF-8-SIG",
-    "shift_jis": "SHIFT_JIS",
-    "big5": "Big5",
-    "cp1250": "windows-1250",
-    "cp1251": "windows-1251",
-    "cp1252": "Windows-1252",
-    "cp1253": "windows-1253",
-    "cp1255": "windows-1255",
-    "cp1256": "windows-1256",
-    "cp1254": "Windows-1254",
-    "cp949": "CP949",
-}
-
-
-COMMON_SAFE_ASCII_CHARACTERS: Set[str] = {
-    "<",
-    ">",
-    "=",
-    ":",
-    "/",
-    "&",
-    ";",
-    "{",
-    "}",
-    "[",
-    "]",
-    ",",
-    "|",
-    '"',
-    "-",
-}
-
-
-KO_NAMES: Set[str] = {"johab", "cp949", "euc_kr"}
-ZH_NAMES: Set[str] = {"big5", "cp950", "big5hkscs", "hz"}
-
-# Logging LEVEL below DEBUG
-TRACE: int = 5
-
-
-# Language label that contain the em dash "—"
-# character are to be considered alternative seq to origin
-FREQUENCIES: Dict[str, List[str]] = {
-    "English": [
-        "e",
-        "a",
-        "t",
-        "i",
-        "o",
-        "n",
-        "s",
-        "r",
-        "h",
-        "l",
-        "d",
-        "c",
-        "u",
-        "m",
-        "f",
-        "p",
-        "g",
-        "w",
-        "y",
-        "b",
-        "v",
-        "k",
-        "x",
-        "j",
-        "z",
-        "q",
-    ],
-    "English—": [
-        "e",
-        "a",
-        "t",
-        "i",
-        "o",
-        "n",
-        "s",
-        "r",
-        "h",
-        "l",
-        "d",
-        "c",
-        "m",
-        "u",
-        "f",
-        "p",
-        "g",
-        "w",
-        "b",
-        "y",
-        "v",
-        "k",
-        "j",
-        "x",
-        "z",
-        "q",
-    ],
-    "German": [
-        "e",
-        "n",
-        "i",
-        "r",
-        "s",
-        "t",
-        "a",
-        "d",
-        "h",
-        "u",
-        "l",
-        "g",
-        "o",
-        "c",
-        "m",
-        "b",
-        "f",
-        "k",
-        "w",
-        "z",
-        "p",
-        "v",
-        "ü",
-        "ä",
-        "ö",
-        "j",
-    ],
-    "French": [
-        "e",
-        "a",
-        "s",
-        "n",
-        "i",
-        "t",
-        "r",
-        "l",
-        "u",
-        "o",
-        "d",
-        "c",
-        "p",
-        "m",
-        "é",
-        "v",
-        "g",
-        "f",
-        "b",
-        "h",
-        "q",
-        "à",
-        "x",
-        "è",
-        "y",
-        "j",
-    ],
-    "Dutch": [
-        "e",
-        "n",
-        "a",
-        "i",
-        "r",
-        "t",
-        "o",
-        "d",
-        "s",
-        "l",
-        "g",
-        "h",
-        "v",
-        "m",
-        "u",
-        "k",
-        "c",
-        "p",
-        "b",
-        "w",
-        "j",
-        "z",
-        "f",
-        "y",
-        "x",
-        "ë",
-    ],
-    "Italian": [
-        "e",
-        "i",
-        "a",
-        "o",
-        "n",
-        "l",
-        "t",
-        "r",
-        "s",
-        "c",
-        "d",
-        "u",
-        "p",
-        "m",
-        "g",
-        "v",
-        "f",
-        "b",
-        "z",
-        "h",
-        "q",
-        "è",
-        "à",
-        "k",
-        "y",
-        "ò",
-    ],
-    "Polish": [
-        "a",
-        "i",
-        "o",
-        "e",
-        "n",
-        "r",
-        "z",
-        "w",
-        "s",
-        "c",
-        "t",
-        "k",
-        "y",
-        "d",
-        "p",
-        "m",
-        "u",
-        "l",
-        "j",
-        "ł",
-        "g",
-        "b",
-        "h",
-        "ą",
-        "ę",
-        "ó",
-    ],
-    "Spanish": [
-        "e",
-        "a",
-        "o",
-        "n",
-        "s",
-        "r",
-        "i",
-        "l",
-        "d",
-        "t",
-        "c",
-        "u",
-        "m",
-        "p",
-        "b",
-        "g",
-        "v",
-        "f",
-        "y",
-        "ó",
-        "h",
-        "q",
-        "í",
-        "j",
-        "z",
-        "á",
-    ],
-    "Russian": [
-        "о",
-        "а",
-        "е",
-        "и",
-        "н",
-        "с",
-        "т",
-        "р",
-        "в",
-        "л",
-        "к",
-        "м",
-        "д",
-        "п",
-        "у",
-        "г",
-        "я",
-        "ы",
-        "з",
-        "б",
-        "й",
-        "ь",
-        "ч",
-        "х",
-        "ж",
-        "ц",
-    ],
-    # Jap-Kanji
-    "Japanese": [
-        "人",
-        "一",
-        "大",
-        "亅",
-        "丁",
-        "丨",
-        "竹",
-        "笑",
-        "口",
-        "日",
-        "今",
-        "二",
-        "彳",
-        "行",
-        "十",
-        "土",
-        "丶",
-        "寸",
-        "寺",
-        "時",
-        "乙",
-        "丿",
-        "乂",
-        "气",
-        "気",
-        "冂",
-        "巾",
-        "亠",
-        "市",
-        "目",
-        "儿",
-        "見",
-        "八",
-        "小",
-        "凵",
-        "県",
-        "月",
-        "彐",
-        "門",
-        "間",
-        "木",
-        "東",
-        "山",
-        "出",
-        "本",
-        "中",
-        "刀",
-        "分",
-        "耳",
-        "又",
-        "取",
-        "最",
-        "言",
-        "田",
-        "心",
-        "思",
-        "刂",
-        "前",
-        "京",
-        "尹",
-        "事",
-        "生",
-        "厶",
-        "云",
-        "会",
-        "未",
-        "来",
-        "白",
-        "冫",
-        "楽",
-        "灬",
-        "馬",
-        "尸",
-        "尺",
-        "駅",
-        "明",
-        "耂",
-        "者",
-        "了",
-        "阝",
-        "都",
-        "高",
-        "卜",
-        "占",
-        "厂",
-        "广",
-        "店",
-        "子",
-        "申",
-        "奄",
-        "亻",
-        "俺",
-        "上",
-        "方",
-        "冖",
-        "学",
-        "衣",
-        "艮",
-        "食",
-        "自",
-    ],
-    # Jap-Katakana
-    "Japanese—": [
-        "ー",
-        "ン",
-        "ス",
-        "・",
-        "ル",
-        "ト",
-        "リ",
-        "イ",
-        "ア",
-        "ラ",
-        "ッ",
-        "ク",
-        "ド",
-        "シ",
-        "レ",
-        "ジ",
-        "タ",
-        "フ",
-        "ロ",
-        "カ",
-        "テ",
-        "マ",
-        "ィ",
-        "グ",
-        "バ",
-        "ム",
-        "プ",
-        "オ",
-        "コ",
-        "デ",
-        "ニ",
-        "ウ",
-        "メ",
-        "サ",
-        "ビ",
-        "ナ",
-        "ブ",
-        "ャ",
-        "エ",
-        "ュ",
-        "チ",
-        "キ",
-        "ズ",
-        "ダ",
-        "パ",
-        "ミ",
-        "ェ",
-        "ョ",
-        "ハ",
-        "セ",
-        "ベ",
-        "ガ",
-        "モ",
-        "ツ",
-        "ネ",
-        "ボ",
-        "ソ",
-        "ノ",
-        "ァ",
-        "ヴ",
-        "ワ",
-        "ポ",
-        "ペ",
-        "ピ",
-        "ケ",
-        "ゴ",
-        "ギ",
-        "ザ",
-        "ホ",
-        "ゲ",
-        "ォ",
-        "ヤ",
-        "ヒ",
-        "ユ",
-        "ヨ",
-        "ヘ",
-        "ゼ",
-        "ヌ",
-        "ゥ",
-        "ゾ",
-        "ヶ",
-        "ヂ",
-        "ヲ",
-        "ヅ",
-        "ヵ",
-        "ヱ",
-        "ヰ",
-        "ヮ",
-        "ヽ",
-        "゠",
-        "ヾ",
-        "ヷ",
-        "ヿ",
-        "ヸ",
-        "ヹ",
-        "ヺ",
-    ],
-    # Jap-Hiragana
-    "Japanese——": [
-        "の",
-        "に",
-        "る",
-        "た",
-        "と",
-        "は",
-        "し",
-        "い",
-        "を",
-        "で",
-        "て",
-        "が",
-        "な",
-        "れ",
-        "か",
-        "ら",
-        "さ",
-        "っ",
-        "り",
-        "す",
-        "あ",
-        "も",
-        "こ",
-        "ま",
-        "う",
-        "く",
-        "よ",
-        "き",
-        "ん",
-        "め",
-        "お",
-        "け",
-        "そ",
-        "つ",
-        "だ",
-        "や",
-        "え",
-        "ど",
-        "わ",
-        "ち",
-        "み",
-        "せ",
-        "じ",
-        "ば",
-        "へ",
-        "び",
-        "ず",
-        "ろ",
-        "ほ",
-        "げ",
-        "む",
-        "べ",
-        "ひ",
-        "ょ",
-        "ゆ",
-        "ぶ",
-        "ご",
-        "ゃ",
-        "ね",
-        "ふ",
-        "ぐ",
-        "ぎ",
-        "ぼ",
-        "ゅ",
-        "づ",
-        "ざ",
-        "ぞ",
-        "ぬ",
-        "ぜ",
-        "ぱ",
-        "ぽ",
-        "ぷ",
-        "ぴ",
-        "ぃ",
-        "ぁ",
-        "ぇ",
-        "ぺ",
-        "ゞ",
-        "ぢ",
-        "ぉ",
-        "ぅ",
-        "ゐ",
-        "ゝ",
-        "ゑ",
-        "゛",
-        "゜",
-        "ゎ",
-        "ゔ",
-        "゚",
-        "ゟ",
-        "゙",
-        "ゕ",
-        "ゖ",
-    ],
-    "Portuguese": [
-        "a",
-        "e",
-        "o",
-        "s",
-        "i",
-        "r",
-        "d",
-        "n",
-        "t",
-        "m",
-        "u",
-        "c",
-        "l",
-        "p",
-        "g",
-        "v",
-        "b",
-        "f",
-        "h",
-        "ã",
-        "q",
-        "é",
-        "ç",
-        "á",
-        "z",
-        "í",
-    ],
-    "Swedish": [
-        "e",
-        "a",
-        "n",
-        "r",
-        "t",
-        "s",
-        "i",
-        "l",
-        "d",
-        "o",
-        "m",
-        "k",
-        "g",
-        "v",
-        "h",
-        "f",
-        "u",
-        "p",
-        "ä",
-        "c",
-        "b",
-        "ö",
-        "å",
-        "y",
-        "j",
-        "x",
-    ],
-    "Chinese": [
-        "的",
-        "一",
-        "是",
-        "不",
-        "了",
-        "在",
-        "人",
-        "有",
-        "我",
-        "他",
-        "这",
-        "个",
-        "们",
-        "中",
-        "来",
-        "上",
-        "大",
-        "为",
-        "和",
-        "国",
-        "地",
-        "到",
-        "以",
-        "说",
-        "时",
-        "要",
-        "就",
-        "出",
-        "会",
-        "可",
-        "也",
-        "你",
-        "对",
-        "生",
-        "能",
-        "而",
-        "子",
-        "那",
-        "得",
-        "于",
-        "着",
-        "下",
-        "自",
-        "之",
-        "年",
-        "过",
-        "发",
-        "后",
-        "作",
-        "里",
-        "用",
-        "道",
-        "行",
-        "所",
-        "然",
-        "家",
-        "种",
-        "事",
-        "成",
-        "方",
-        "多",
-        "经",
-        "么",
-        "去",
-        "法",
-        "学",
-        "如",
-        "都",
-        "同",
-        "现",
-        "当",
-        "没",
-        "动",
-        "面",
-        "起",
-        "看",
-        "定",
-        "天",
-        "分",
-        "还",
-        "进",
-        "好",
-        "小",
-        "部",
-        "其",
-        "些",
-        "主",
-        "样",
-        "理",
-        "心",
-        "她",
-        "本",
-        "前",
-        "开",
-        "但",
-        "因",
-        "只",
-        "从",
-        "想",
-        "实",
-    ],
-    "Ukrainian": [
-        "о",
-        "а",
-        "н",
-        "і",
-        "и",
-        "р",
-        "в",
-        "т",
-        "е",
-        "с",
-        "к",
-        "л",
-        "у",
-        "д",
-        "м",
-        "п",
-        "з",
-        "я",
-        "ь",
-        "б",
-        "г",
-        "й",
-        "ч",
-        "х",
-        "ц",
-        "ї",
-    ],
-    "Norwegian": [
-        "e",
-        "r",
-        "n",
-        "t",
-        "a",
-        "s",
-        "i",
-        "o",
-        "l",
-        "d",
-        "g",
-        "k",
-        "m",
-        "v",
-        "f",
-        "p",
-        "u",
-        "b",
-        "h",
-        "å",
-        "y",
-        "j",
-        "ø",
-        "c",
-        "æ",
-        "w",
-    ],
-    "Finnish": [
-        "a",
-        "i",
-        "n",
-        "t",
-        "e",
-        "s",
-        "l",
-        "o",
-        "u",
-        "k",
-        "ä",
-        "m",
-        "r",
-        "v",
-        "j",
-        "h",
-        "p",
-        "y",
-        "d",
-        "ö",
-        "g",
-        "c",
-        "b",
-        "f",
-        "w",
-        "z",
-    ],
-    "Vietnamese": [
-        "n",
-        "h",
-        "t",
-        "i",
-        "c",
-        "g",
-        "a",
-        "o",
-        "u",
-        "m",
-        "l",
-        "r",
-        "à",
-        "đ",
-        "s",
-        "e",
-        "v",
-        "p",
-        "b",
-        "y",
-        "ư",
-        "d",
-        "á",
-        "k",
-        "ộ",
-        "ế",
-    ],
-    "Czech": [
-        "o",
-        "e",
-        "a",
-        "n",
-        "t",
-        "s",
-        "i",
-        "l",
-        "v",
-        "r",
-        "k",
-        "d",
-        "u",
-        "m",
-        "p",
-        "í",
-        "c",
-        "h",
-        "z",
-        "á",
-        "y",
-        "j",
-        "b",
-        "ě",
-        "é",
-        "ř",
-    ],
-    "Hungarian": [
-        "e",
-        "a",
-        "t",
-        "l",
-        "s",
-        "n",
-        "k",
-        "r",
-        "i",
-        "o",
-        "z",
-        "á",
-        "é",
-        "g",
-        "m",
-        "b",
-        "y",
-        "v",
-        "d",
-        "h",
-        "u",
-        "p",
-        "j",
-        "ö",
-        "f",
-        "c",
-    ],
-    "Korean": [
-        "이",
-        "다",
-        "에",
-        "의",
-        "는",
-        "로",
-        "하",
-        "을",
-        "가",
-        "고",
-        "지",
-        "서",
-        "한",
-        "은",
-        "기",
-        "으",
-        "년",
-        "대",
-        "사",
-        "시",
-        "를",
-        "리",
-        "도",
-        "인",
-        "스",
-        "일",
-    ],
-    "Indonesian": [
-        "a",
-        "n",
-        "e",
-        "i",
-        "r",
-        "t",
-        "u",
-        "s",
-        "d",
-        "k",
-        "m",
-        "l",
-        "g",
-        "p",
-        "b",
-        "o",
-        "h",
-        "y",
-        "j",
-        "c",
-        "w",
-        "f",
-        "v",
-        "z",
-        "x",
-        "q",
-    ],
-    "Turkish": [
-        "a",
-        "e",
-        "i",
-        "n",
-        "r",
-        "l",
-        "ı",
-        "k",
-        "d",
-        "t",
-        "s",
-        "m",
-        "y",
-        "u",
-        "o",
-        "b",
-        "ü",
-        "ş",
-        "v",
-        "g",
-        "z",
-        "h",
-        "c",
-        "p",
-        "ç",
-        "ğ",
-    ],
-    "Romanian": [
-        "e",
-        "i",
-        "a",
-        "r",
-        "n",
-        "t",
-        "u",
-        "l",
-        "o",
-        "c",
-        "s",
-        "d",
-        "p",
-        "m",
-        "ă",
-        "f",
-        "v",
-        "î",
-        "g",
-        "b",
-        "ș",
-        "ț",
-        "z",
-        "h",
-        "â",
-        "j",
-    ],
-    "Farsi": [
-        "ا",
-        "ی",
-        "ر",
-        "د",
-        "ن",
-        "ه",
-        "و",
-        "م",
-        "ت",
-        "ب",
-        "س",
-        "ل",
-        "ک",
-        "ش",
-        "ز",
-        "ف",
-        "گ",
-        "ع",
-        "خ",
-        "ق",
-        "ج",
-        "آ",
-        "پ",
-        "ح",
-        "ط",
-        "ص",
-    ],
-    "Arabic": [
-        "ا",
-        "ل",
-        "ي",
-        "م",
-        "و",
-        "ن",
-        "ر",
-        "ت",
-        "ب",
-        "ة",
-        "ع",
-        "د",
-        "س",
-        "ف",
-        "ه",
-        "ك",
-        "ق",
-        "أ",
-        "ح",
-        "ج",
-        "ش",
-        "ط",
-        "ص",
-        "ى",
-        "خ",
-        "إ",
-    ],
-    "Danish": [
-        "e",
-        "r",
-        "n",
-        "t",
-        "a",
-        "i",
-        "s",
-        "d",
-        "l",
-        "o",
-        "g",
-        "m",
-        "k",
-        "f",
-        "v",
-        "u",
-        "b",
-        "h",
-        "p",
-        "å",
-        "y",
-        "ø",
-        "æ",
-        "c",
-        "j",
-        "w",
-    ],
-    "Serbian": [
-        "а",
-        "и",
-        "о",
-        "е",
-        "н",
-        "р",
-        "с",
-        "у",
-        "т",
-        "к",
-        "ј",
-        "в",
-        "д",
-        "м",
-        "п",
-        "л",
-        "г",
-        "з",
-        "б",
-        "a",
-        "i",
-        "e",
-        "o",
-        "n",
-        "ц",
-        "ш",
-    ],
-    "Lithuanian": [
-        "i",
-        "a",
-        "s",
-        "o",
-        "r",
-        "e",
-        "t",
-        "n",
-        "u",
-        "k",
-        "m",
-        "l",
-        "p",
-        "v",
-        "d",
-        "j",
-        "g",
-        "ė",
-        "b",
-        "y",
-        "ų",
-        "š",
-        "ž",
-        "c",
-        "ą",
-        "į",
-    ],
-    "Slovene": [
-        "e",
-        "a",
-        "i",
-        "o",
-        "n",
-        "r",
-        "s",
-        "l",
-        "t",
-        "j",
-        "v",
-        "k",
-        "d",
-        "p",
-        "m",
-        "u",
-        "z",
-        "b",
-        "g",
-        "h",
-        "č",
-        "c",
-        "š",
-        "ž",
-        "f",
-        "y",
-    ],
-    "Slovak": [
-        "o",
-        "a",
-        "e",
-        "n",
-        "i",
-        "r",
-        "v",
-        "t",
-        "s",
-        "l",
-        "k",
-        "d",
-        "m",
-        "p",
-        "u",
-        "c",
-        "h",
-        "j",
-        "b",
-        "z",
-        "á",
-        "y",
-        "ý",
-        "í",
-        "č",
-        "é",
-    ],
-    "Hebrew": [
-        "י",
-        "ו",
-        "ה",
-        "ל",
-        "ר",
-        "ב",
-        "ת",
-        "מ",
-        "א",
-        "ש",
-        "נ",
-        "ע",
-        "ם",
-        "ד",
-        "ק",
-        "ח",
-        "פ",
-        "ס",
-        "כ",
-        "ג",
-        "ט",
-        "צ",
-        "ן",
-        "ז",
-        "ך",
-    ],
-    "Bulgarian": [
-        "а",
-        "и",
-        "о",
-        "е",
-        "н",
-        "т",
-        "р",
-        "с",
-        "в",
-        "л",
-        "к",
-        "д",
-        "п",
-        "м",
-        "з",
-        "г",
-        "я",
-        "ъ",
-        "у",
-        "б",
-        "ч",
-        "ц",
-        "й",
-        "ж",
-        "щ",
-        "х",
-    ],
-    "Croatian": [
-        "a",
-        "i",
-        "o",
-        "e",
-        "n",
-        "r",
-        "j",
-        "s",
-        "t",
-        "u",
-        "k",
-        "l",
-        "v",
-        "d",
-        "m",
-        "p",
-        "g",
-        "z",
-        "b",
-        "c",
-        "č",
-        "h",
-        "š",
-        "ž",
-        "ć",
-        "f",
-    ],
-    "Hindi": [
-        "क",
-        "र",
-        "स",
-        "न",
-        "त",
-        "म",
-        "ह",
-        "प",
-        "य",
-        "ल",
-        "व",
-        "ज",
-        "द",
-        "ग",
-        "ब",
-        "श",
-        "ट",
-        "अ",
-        "ए",
-        "थ",
-        "भ",
-        "ड",
-        "च",
-        "ध",
-        "ष",
-        "इ",
-    ],
-    "Estonian": [
-        "a",
-        "i",
-        "e",
-        "s",
-        "t",
-        "l",
-        "u",
-        "n",
-        "o",
-        "k",
-        "r",
-        "d",
-        "m",
-        "v",
-        "g",
-        "p",
-        "j",
-        "h",
-        "ä",
-        "b",
-        "õ",
-        "ü",
-        "f",
-        "c",
-        "ö",
-        "y",
-    ],
-    "Thai": [
-        "า",
-        "น",
-        "ร",
-        "อ",
-        "ก",
-        "เ",
-        "ง",
-        "ม",
-        "ย",
-        "ล",
-        "ว",
-        "ด",
-        "ท",
-        "ส",
-        "ต",
-        "ะ",
-        "ป",
-        "บ",
-        "ค",
-        "ห",
-        "แ",
-        "จ",
-        "พ",
-        "ช",
-        "ข",
-        "ใ",
-    ],
-    "Greek": [
-        "α",
-        "τ",
-        "ο",
-        "ι",
-        "ε",
-        "ν",
-        "ρ",
-        "σ",
-        "κ",
-        "η",
-        "π",
-        "ς",
-        "υ",
-        "μ",
-        "λ",
-        "ί",
-        "ό",
-        "ά",
-        "γ",
-        "έ",
-        "δ",
-        "ή",
-        "ω",
-        "χ",
-        "θ",
-        "ύ",
-    ],
-    "Tamil": [
-        "க",
-        "த",
-        "ப",
-        "ட",
-        "ர",
-        "ம",
-        "ல",
-        "ன",
-        "வ",
-        "ற",
-        "ய",
-        "ள",
-        "ச",
-        "ந",
-        "இ",
-        "ண",
-        "அ",
-        "ஆ",
-        "ழ",
-        "ங",
-        "எ",
-        "உ",
-        "ஒ",
-        "ஸ",
-    ],
-    "Kazakh": [
-        "а",
-        "ы",
-        "е",
-        "н",
-        "т",
-        "р",
-        "л",
-        "і",
-        "д",
-        "с",
-        "м",
-        "қ",
-        "к",
-        "о",
-        "б",
-        "и",
-        "у",
-        "ғ",
-        "ж",
-        "ң",
-        "з",
-        "ш",
-        "й",
-        "п",
-        "г",
-        "ө",
-    ],
-}
-
-LANGUAGE_SUPPORTED_COUNT: int = len(FREQUENCIES)
diff --git a/src/pip/_vendor/charset_normalizer/legacy.py b/src/pip/_vendor/charset_normalizer/legacy.py
deleted file mode 100644
index 43aad21a9dd..00000000000
--- a/src/pip/_vendor/charset_normalizer/legacy.py
+++ /dev/null
@@ -1,54 +0,0 @@
-from typing import Any, Dict, Optional, Union
-from warnings import warn
-
-from .api import from_bytes
-from .constant import CHARDET_CORRESPONDENCE
-
-
-def detect(
-    byte_str: bytes, should_rename_legacy: bool = False, **kwargs: Any
-) -> Dict[str, Optional[Union[str, float]]]:
-    """
-    chardet legacy method
-    Detect the encoding of the given byte string. It should be mostly backward-compatible.
-    Encoding name will match Chardet own writing whenever possible. (Not on encoding name unsupported by it)
-    This function is deprecated and should be used to migrate your project easily, consult the documentation for
-    further information. Not planned for removal.
-
-    :param byte_str:     The byte sequence to examine.
-    :param should_rename_legacy:  Should we rename legacy encodings
-                                  to their more modern equivalents?
-    """
-    if len(kwargs):
-        warn(
-            f"charset-normalizer disregard arguments '{','.join(list(kwargs.keys()))}' in legacy function detect()"
-        )
-
-    if not isinstance(byte_str, (bytearray, bytes)):
-        raise TypeError(  # pragma: nocover
-            "Expected object of type bytes or bytearray, got: "
-            "{0}".format(type(byte_str))
-        )
-
-    if isinstance(byte_str, bytearray):
-        byte_str = bytes(byte_str)
-
-    r = from_bytes(byte_str).best()
-
-    encoding = r.encoding if r is not None else None
-    language = r.language if r is not None and r.language != "Unknown" else ""
-    confidence = 1.0 - r.chaos if r is not None else None
-
-    # Note: CharsetNormalizer does not return 'UTF-8-SIG' as the sig get stripped in the detection/normalization process
-    # but chardet does return 'utf-8-sig' and it is a valid codec name.
-    if r is not None and encoding == "utf_8" and r.bom:
-        encoding += "_sig"
-
-    if should_rename_legacy is False and encoding in CHARDET_CORRESPONDENCE:
-        encoding = CHARDET_CORRESPONDENCE[encoding]
-
-    return {
-        "encoding": encoding,
-        "language": language,
-        "confidence": confidence,
-    }
diff --git a/src/pip/_vendor/charset_normalizer/md.py b/src/pip/_vendor/charset_normalizer/md.py
deleted file mode 100644
index 77897aae4f4..00000000000
--- a/src/pip/_vendor/charset_normalizer/md.py
+++ /dev/null
@@ -1,615 +0,0 @@
-from functools import lru_cache
-from logging import getLogger
-from typing import List, Optional
-
-from .constant import (
-    COMMON_SAFE_ASCII_CHARACTERS,
-    TRACE,
-    UNICODE_SECONDARY_RANGE_KEYWORD,
-)
-from .utils import (
-    is_accentuated,
-    is_arabic,
-    is_arabic_isolated_form,
-    is_case_variable,
-    is_cjk,
-    is_emoticon,
-    is_hangul,
-    is_hiragana,
-    is_katakana,
-    is_latin,
-    is_punctuation,
-    is_separator,
-    is_symbol,
-    is_thai,
-    is_unprintable,
-    remove_accent,
-    unicode_range,
-)
-
-
-class MessDetectorPlugin:
-    """
-    Base abstract class used for mess detection plugins.
-    All detectors MUST extend and implement given methods.
-    """
-
-    def eligible(self, character: str) -> bool:
-        """
-        Determine if given character should be fed in.
-        """
-        raise NotImplementedError  # pragma: nocover
-
-    def feed(self, character: str) -> None:
-        """
-        The main routine to be executed upon character.
-        Insert the logic in witch the text would be considered chaotic.
-        """
-        raise NotImplementedError  # pragma: nocover
-
-    def reset(self) -> None:  # pragma: no cover
-        """
-        Permit to reset the plugin to the initial state.
-        """
-        raise NotImplementedError
-
-    @property
-    def ratio(self) -> float:
-        """
-        Compute the chaos ratio based on what your feed() has seen.
-        Must NOT be lower than 0.; No restriction gt 0.
-        """
-        raise NotImplementedError  # pragma: nocover
-
-
-class TooManySymbolOrPunctuationPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._punctuation_count: int = 0
-        self._symbol_count: int = 0
-        self._character_count: int = 0
-
-        self._last_printable_char: Optional[str] = None
-        self._frenzy_symbol_in_word: bool = False
-
-    def eligible(self, character: str) -> bool:
-        return character.isprintable()
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-
-        if (
-            character != self._last_printable_char
-            and character not in COMMON_SAFE_ASCII_CHARACTERS
-        ):
-            if is_punctuation(character):
-                self._punctuation_count += 1
-            elif (
-                character.isdigit() is False
-                and is_symbol(character)
-                and is_emoticon(character) is False
-            ):
-                self._symbol_count += 2
-
-        self._last_printable_char = character
-
-    def reset(self) -> None:  # pragma: no cover
-        self._punctuation_count = 0
-        self._character_count = 0
-        self._symbol_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count == 0:
-            return 0.0
-
-        ratio_of_punctuation: float = (
-            self._punctuation_count + self._symbol_count
-        ) / self._character_count
-
-        return ratio_of_punctuation if ratio_of_punctuation >= 0.3 else 0.0
-
-
-class TooManyAccentuatedPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._character_count: int = 0
-        self._accentuated_count: int = 0
-
-    def eligible(self, character: str) -> bool:
-        return character.isalpha()
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-
-        if is_accentuated(character):
-            self._accentuated_count += 1
-
-    def reset(self) -> None:  # pragma: no cover
-        self._character_count = 0
-        self._accentuated_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count < 8:
-            return 0.0
-
-        ratio_of_accentuation: float = self._accentuated_count / self._character_count
-        return ratio_of_accentuation if ratio_of_accentuation >= 0.35 else 0.0
-
-
-class UnprintablePlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._unprintable_count: int = 0
-        self._character_count: int = 0
-
-    def eligible(self, character: str) -> bool:
-        return True
-
-    def feed(self, character: str) -> None:
-        if is_unprintable(character):
-            self._unprintable_count += 1
-        self._character_count += 1
-
-    def reset(self) -> None:  # pragma: no cover
-        self._unprintable_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count == 0:
-            return 0.0
-
-        return (self._unprintable_count * 8) / self._character_count
-
-
-class SuspiciousDuplicateAccentPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._successive_count: int = 0
-        self._character_count: int = 0
-
-        self._last_latin_character: Optional[str] = None
-
-    def eligible(self, character: str) -> bool:
-        return character.isalpha() and is_latin(character)
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-        if (
-            self._last_latin_character is not None
-            and is_accentuated(character)
-            and is_accentuated(self._last_latin_character)
-        ):
-            if character.isupper() and self._last_latin_character.isupper():
-                self._successive_count += 1
-            # Worse if its the same char duplicated with different accent.
-            if remove_accent(character) == remove_accent(self._last_latin_character):
-                self._successive_count += 1
-        self._last_latin_character = character
-
-    def reset(self) -> None:  # pragma: no cover
-        self._successive_count = 0
-        self._character_count = 0
-        self._last_latin_character = None
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count == 0:
-            return 0.0
-
-        return (self._successive_count * 2) / self._character_count
-
-
-class SuspiciousRange(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._suspicious_successive_range_count: int = 0
-        self._character_count: int = 0
-        self._last_printable_seen: Optional[str] = None
-
-    def eligible(self, character: str) -> bool:
-        return character.isprintable()
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-
-        if (
-            character.isspace()
-            or is_punctuation(character)
-            or character in COMMON_SAFE_ASCII_CHARACTERS
-        ):
-            self._last_printable_seen = None
-            return
-
-        if self._last_printable_seen is None:
-            self._last_printable_seen = character
-            return
-
-        unicode_range_a: Optional[str] = unicode_range(self._last_printable_seen)
-        unicode_range_b: Optional[str] = unicode_range(character)
-
-        if is_suspiciously_successive_range(unicode_range_a, unicode_range_b):
-            self._suspicious_successive_range_count += 1
-
-        self._last_printable_seen = character
-
-    def reset(self) -> None:  # pragma: no cover
-        self._character_count = 0
-        self._suspicious_successive_range_count = 0
-        self._last_printable_seen = None
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count <= 24:
-            return 0.0
-
-        ratio_of_suspicious_range_usage: float = (
-            self._suspicious_successive_range_count * 2
-        ) / self._character_count
-
-        return ratio_of_suspicious_range_usage
-
-
-class SuperWeirdWordPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._word_count: int = 0
-        self._bad_word_count: int = 0
-        self._foreign_long_count: int = 0
-
-        self._is_current_word_bad: bool = False
-        self._foreign_long_watch: bool = False
-
-        self._character_count: int = 0
-        self._bad_character_count: int = 0
-
-        self._buffer: str = ""
-        self._buffer_accent_count: int = 0
-
-    def eligible(self, character: str) -> bool:
-        return True
-
-    def feed(self, character: str) -> None:
-        if character.isalpha():
-            self._buffer += character
-            if is_accentuated(character):
-                self._buffer_accent_count += 1
-            if (
-                self._foreign_long_watch is False
-                and (is_latin(character) is False or is_accentuated(character))
-                and is_cjk(character) is False
-                and is_hangul(character) is False
-                and is_katakana(character) is False
-                and is_hiragana(character) is False
-                and is_thai(character) is False
-            ):
-                self._foreign_long_watch = True
-            return
-        if not self._buffer:
-            return
-        if (
-            character.isspace() or is_punctuation(character) or is_separator(character)
-        ) and self._buffer:
-            self._word_count += 1
-            buffer_length: int = len(self._buffer)
-
-            self._character_count += buffer_length
-
-            if buffer_length >= 4:
-                if self._buffer_accent_count / buffer_length > 0.34:
-                    self._is_current_word_bad = True
-                # Word/Buffer ending with an upper case accentuated letter are so rare,
-                # that we will consider them all as suspicious. Same weight as foreign_long suspicious.
-                if (
-                    is_accentuated(self._buffer[-1])
-                    and self._buffer[-1].isupper()
-                    and all(_.isupper() for _ in self._buffer) is False
-                ):
-                    self._foreign_long_count += 1
-                    self._is_current_word_bad = True
-            if buffer_length >= 24 and self._foreign_long_watch:
-                camel_case_dst = [
-                    i
-                    for c, i in zip(self._buffer, range(0, buffer_length))
-                    if c.isupper()
-                ]
-                probable_camel_cased: bool = False
-
-                if camel_case_dst and (len(camel_case_dst) / buffer_length <= 0.3):
-                    probable_camel_cased = True
-
-                if not probable_camel_cased:
-                    self._foreign_long_count += 1
-                    self._is_current_word_bad = True
-
-            if self._is_current_word_bad:
-                self._bad_word_count += 1
-                self._bad_character_count += len(self._buffer)
-                self._is_current_word_bad = False
-
-            self._foreign_long_watch = False
-            self._buffer = ""
-            self._buffer_accent_count = 0
-        elif (
-            character not in {"<", ">", "-", "=", "~", "|", "_"}
-            and character.isdigit() is False
-            and is_symbol(character)
-        ):
-            self._is_current_word_bad = True
-            self._buffer += character
-
-    def reset(self) -> None:  # pragma: no cover
-        self._buffer = ""
-        self._is_current_word_bad = False
-        self._foreign_long_watch = False
-        self._bad_word_count = 0
-        self._word_count = 0
-        self._character_count = 0
-        self._bad_character_count = 0
-        self._foreign_long_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._word_count <= 10 and self._foreign_long_count == 0:
-            return 0.0
-
-        return self._bad_character_count / self._character_count
-
-
-class CjkInvalidStopPlugin(MessDetectorPlugin):
-    """
-    GB(Chinese) based encoding often render the stop incorrectly when the content does not fit and
-    can be easily detected. Searching for the overuse of '丅' and '丄'.
-    """
-
-    def __init__(self) -> None:
-        self._wrong_stop_count: int = 0
-        self._cjk_character_count: int = 0
-
-    def eligible(self, character: str) -> bool:
-        return True
-
-    def feed(self, character: str) -> None:
-        if character in {"丅", "丄"}:
-            self._wrong_stop_count += 1
-            return
-        if is_cjk(character):
-            self._cjk_character_count += 1
-
-    def reset(self) -> None:  # pragma: no cover
-        self._wrong_stop_count = 0
-        self._cjk_character_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._cjk_character_count < 16:
-            return 0.0
-        return self._wrong_stop_count / self._cjk_character_count
-
-
-class ArchaicUpperLowerPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._buf: bool = False
-
-        self._character_count_since_last_sep: int = 0
-
-        self._successive_upper_lower_count: int = 0
-        self._successive_upper_lower_count_final: int = 0
-
-        self._character_count: int = 0
-
-        self._last_alpha_seen: Optional[str] = None
-        self._current_ascii_only: bool = True
-
-    def eligible(self, character: str) -> bool:
-        return True
-
-    def feed(self, character: str) -> None:
-        is_concerned = character.isalpha() and is_case_variable(character)
-        chunk_sep = is_concerned is False
-
-        if chunk_sep and self._character_count_since_last_sep > 0:
-            if (
-                self._character_count_since_last_sep <= 64
-                and character.isdigit() is False
-                and self._current_ascii_only is False
-            ):
-                self._successive_upper_lower_count_final += (
-                    self._successive_upper_lower_count
-                )
-
-            self._successive_upper_lower_count = 0
-            self._character_count_since_last_sep = 0
-            self._last_alpha_seen = None
-            self._buf = False
-            self._character_count += 1
-            self._current_ascii_only = True
-
-            return
-
-        if self._current_ascii_only is True and character.isascii() is False:
-            self._current_ascii_only = False
-
-        if self._last_alpha_seen is not None:
-            if (character.isupper() and self._last_alpha_seen.islower()) or (
-                character.islower() and self._last_alpha_seen.isupper()
-            ):
-                if self._buf is True:
-                    self._successive_upper_lower_count += 2
-                    self._buf = False
-                else:
-                    self._buf = True
-            else:
-                self._buf = False
-
-        self._character_count += 1
-        self._character_count_since_last_sep += 1
-        self._last_alpha_seen = character
-
-    def reset(self) -> None:  # pragma: no cover
-        self._character_count = 0
-        self._character_count_since_last_sep = 0
-        self._successive_upper_lower_count = 0
-        self._successive_upper_lower_count_final = 0
-        self._last_alpha_seen = None
-        self._buf = False
-        self._current_ascii_only = True
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count == 0:
-            return 0.0
-
-        return self._successive_upper_lower_count_final / self._character_count
-
-
-class ArabicIsolatedFormPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._character_count: int = 0
-        self._isolated_form_count: int = 0
-
-    def reset(self) -> None:  # pragma: no cover
-        self._character_count = 0
-        self._isolated_form_count = 0
-
-    def eligible(self, character: str) -> bool:
-        return is_arabic(character)
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-
-        if is_arabic_isolated_form(character):
-            self._isolated_form_count += 1
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count < 8:
-            return 0.0
-
-        isolated_form_usage: float = self._isolated_form_count / self._character_count
-
-        return isolated_form_usage
-
-
-@lru_cache(maxsize=1024)
-def is_suspiciously_successive_range(
-    unicode_range_a: Optional[str], unicode_range_b: Optional[str]
-) -> bool:
-    """
-    Determine if two Unicode range seen next to each other can be considered as suspicious.
-    """
-    if unicode_range_a is None or unicode_range_b is None:
-        return True
-
-    if unicode_range_a == unicode_range_b:
-        return False
-
-    if "Latin" in unicode_range_a and "Latin" in unicode_range_b:
-        return False
-
-    if "Emoticons" in unicode_range_a or "Emoticons" in unicode_range_b:
-        return False
-
-    # Latin characters can be accompanied with a combining diacritical mark
-    # eg. Vietnamese.
-    if ("Latin" in unicode_range_a or "Latin" in unicode_range_b) and (
-        "Combining" in unicode_range_a or "Combining" in unicode_range_b
-    ):
-        return False
-
-    keywords_range_a, keywords_range_b = unicode_range_a.split(
-        " "
-    ), unicode_range_b.split(" ")
-
-    for el in keywords_range_a:
-        if el in UNICODE_SECONDARY_RANGE_KEYWORD:
-            continue
-        if el in keywords_range_b:
-            return False
-
-    # Japanese Exception
-    range_a_jp_chars, range_b_jp_chars = (
-        unicode_range_a
-        in (
-            "Hiragana",
-            "Katakana",
-        ),
-        unicode_range_b in ("Hiragana", "Katakana"),
-    )
-    if (range_a_jp_chars or range_b_jp_chars) and (
-        "CJK" in unicode_range_a or "CJK" in unicode_range_b
-    ):
-        return False
-    if range_a_jp_chars and range_b_jp_chars:
-        return False
-
-    if "Hangul" in unicode_range_a or "Hangul" in unicode_range_b:
-        if "CJK" in unicode_range_a or "CJK" in unicode_range_b:
-            return False
-        if unicode_range_a == "Basic Latin" or unicode_range_b == "Basic Latin":
-            return False
-
-    # Chinese/Japanese use dedicated range for punctuation and/or separators.
-    if ("CJK" in unicode_range_a or "CJK" in unicode_range_b) or (
-        unicode_range_a in ["Katakana", "Hiragana"]
-        and unicode_range_b in ["Katakana", "Hiragana"]
-    ):
-        if "Punctuation" in unicode_range_a or "Punctuation" in unicode_range_b:
-            return False
-        if "Forms" in unicode_range_a or "Forms" in unicode_range_b:
-            return False
-        if unicode_range_a == "Basic Latin" or unicode_range_b == "Basic Latin":
-            return False
-
-    return True
-
-
-@lru_cache(maxsize=2048)
-def mess_ratio(
-    decoded_sequence: str, maximum_threshold: float = 0.2, debug: bool = False
-) -> float:
-    """
-    Compute a mess ratio given a decoded bytes sequence. The maximum threshold does stop the computation earlier.
-    """
-
-    detectors: List[MessDetectorPlugin] = [
-        md_class() for md_class in MessDetectorPlugin.__subclasses__()
-    ]
-
-    length: int = len(decoded_sequence) + 1
-
-    mean_mess_ratio: float = 0.0
-
-    if length < 512:
-        intermediary_mean_mess_ratio_calc: int = 32
-    elif length <= 1024:
-        intermediary_mean_mess_ratio_calc = 64
-    else:
-        intermediary_mean_mess_ratio_calc = 128
-
-    for character, index in zip(decoded_sequence + "\n", range(length)):
-        for detector in detectors:
-            if detector.eligible(character):
-                detector.feed(character)
-
-        if (
-            index > 0 and index % intermediary_mean_mess_ratio_calc == 0
-        ) or index == length - 1:
-            mean_mess_ratio = sum(dt.ratio for dt in detectors)
-
-            if mean_mess_ratio >= maximum_threshold:
-                break
-
-    if debug:
-        logger = getLogger("charset_normalizer")
-
-        logger.log(
-            TRACE,
-            "Mess-detector extended-analysis start. "
-            f"intermediary_mean_mess_ratio_calc={intermediary_mean_mess_ratio_calc} mean_mess_ratio={mean_mess_ratio} "
-            f"maximum_threshold={maximum_threshold}",
-        )
-
-        if len(decoded_sequence) > 16:
-            logger.log(TRACE, f"Starting with: {decoded_sequence[:16]}")
-            logger.log(TRACE, f"Ending with: {decoded_sequence[-16::]}")
-
-        for dt in detectors:  # pragma: nocover
-            logger.log(TRACE, f"{dt.__class__}: {dt.ratio}")
-
-    return round(mean_mess_ratio, 3)
diff --git a/src/pip/_vendor/charset_normalizer/models.py b/src/pip/_vendor/charset_normalizer/models.py
deleted file mode 100644
index 751775d5c33..00000000000
--- a/src/pip/_vendor/charset_normalizer/models.py
+++ /dev/null
@@ -1,340 +0,0 @@
-from encodings.aliases import aliases
-from hashlib import sha256
-from json import dumps
-from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
-
-from .constant import TOO_BIG_SEQUENCE
-from .utils import iana_name, is_multi_byte_encoding, unicode_range
-
-
-class CharsetMatch:
-    def __init__(
-        self,
-        payload: bytes,
-        guessed_encoding: str,
-        mean_mess_ratio: float,
-        has_sig_or_bom: bool,
-        languages: "CoherenceMatches",
-        decoded_payload: Optional[str] = None,
-    ):
-        self._payload: bytes = payload
-
-        self._encoding: str = guessed_encoding
-        self._mean_mess_ratio: float = mean_mess_ratio
-        self._languages: CoherenceMatches = languages
-        self._has_sig_or_bom: bool = has_sig_or_bom
-        self._unicode_ranges: Optional[List[str]] = None
-
-        self._leaves: List[CharsetMatch] = []
-        self._mean_coherence_ratio: float = 0.0
-
-        self._output_payload: Optional[bytes] = None
-        self._output_encoding: Optional[str] = None
-
-        self._string: Optional[str] = decoded_payload
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, CharsetMatch):
-            raise TypeError(
-                "__eq__ cannot be invoked on {} and {}.".format(
-                    str(other.__class__), str(self.__class__)
-                )
-            )
-        return self.encoding == other.encoding and self.fingerprint == other.fingerprint
-
-    def __lt__(self, other: object) -> bool:
-        """
-        Implemented to make sorted available upon CharsetMatches items.
-        """
-        if not isinstance(other, CharsetMatch):
-            raise ValueError
-
-        chaos_difference: float = abs(self.chaos - other.chaos)
-        coherence_difference: float = abs(self.coherence - other.coherence)
-
-        # Below 1% difference --> Use Coherence
-        if chaos_difference < 0.01 and coherence_difference > 0.02:
-            return self.coherence > other.coherence
-        elif chaos_difference < 0.01 and coherence_difference <= 0.02:
-            # When having a difficult decision, use the result that decoded as many multi-byte as possible.
-            # preserve RAM usage!
-            if len(self._payload) >= TOO_BIG_SEQUENCE:
-                return self.chaos < other.chaos
-            return self.multi_byte_usage > other.multi_byte_usage
-
-        return self.chaos < other.chaos
-
-    @property
-    def multi_byte_usage(self) -> float:
-        return 1.0 - (len(str(self)) / len(self.raw))
-
-    def __str__(self) -> str:
-        # Lazy Str Loading
-        if self._string is None:
-            self._string = str(self._payload, self._encoding, "strict")
-        return self._string
-
-    def __repr__(self) -> str:
-        return "".format(self.encoding, self.fingerprint)
-
-    def add_submatch(self, other: "CharsetMatch") -> None:
-        if not isinstance(other, CharsetMatch) or other == self:
-            raise ValueError(
-                "Unable to add instance <{}> as a submatch of a CharsetMatch".format(
-                    other.__class__
-                )
-            )
-
-        other._string = None  # Unload RAM usage; dirty trick.
-        self._leaves.append(other)
-
-    @property
-    def encoding(self) -> str:
-        return self._encoding
-
-    @property
-    def encoding_aliases(self) -> List[str]:
-        """
-        Encoding name are known by many name, using this could help when searching for IBM855 when it's listed as CP855.
-        """
-        also_known_as: List[str] = []
-        for u, p in aliases.items():
-            if self.encoding == u:
-                also_known_as.append(p)
-            elif self.encoding == p:
-                also_known_as.append(u)
-        return also_known_as
-
-    @property
-    def bom(self) -> bool:
-        return self._has_sig_or_bom
-
-    @property
-    def byte_order_mark(self) -> bool:
-        return self._has_sig_or_bom
-
-    @property
-    def languages(self) -> List[str]:
-        """
-        Return the complete list of possible languages found in decoded sequence.
-        Usually not really useful. Returned list may be empty even if 'language' property return something != 'Unknown'.
-        """
-        return [e[0] for e in self._languages]
-
-    @property
-    def language(self) -> str:
-        """
-        Most probable language found in decoded sequence. If none were detected or inferred, the property will return
-        "Unknown".
-        """
-        if not self._languages:
-            # Trying to infer the language based on the given encoding
-            # Its either English or we should not pronounce ourselves in certain cases.
-            if "ascii" in self.could_be_from_charset:
-                return "English"
-
-            # doing it there to avoid circular import
-            from pip._vendor.charset_normalizer.cd import encoding_languages, mb_encoding_languages
-
-            languages = (
-                mb_encoding_languages(self.encoding)
-                if is_multi_byte_encoding(self.encoding)
-                else encoding_languages(self.encoding)
-            )
-
-            if len(languages) == 0 or "Latin Based" in languages:
-                return "Unknown"
-
-            return languages[0]
-
-        return self._languages[0][0]
-
-    @property
-    def chaos(self) -> float:
-        return self._mean_mess_ratio
-
-    @property
-    def coherence(self) -> float:
-        if not self._languages:
-            return 0.0
-        return self._languages[0][1]
-
-    @property
-    def percent_chaos(self) -> float:
-        return round(self.chaos * 100, ndigits=3)
-
-    @property
-    def percent_coherence(self) -> float:
-        return round(self.coherence * 100, ndigits=3)
-
-    @property
-    def raw(self) -> bytes:
-        """
-        Original untouched bytes.
-        """
-        return self._payload
-
-    @property
-    def submatch(self) -> List["CharsetMatch"]:
-        return self._leaves
-
-    @property
-    def has_submatch(self) -> bool:
-        return len(self._leaves) > 0
-
-    @property
-    def alphabets(self) -> List[str]:
-        if self._unicode_ranges is not None:
-            return self._unicode_ranges
-        # list detected ranges
-        detected_ranges: List[Optional[str]] = [
-            unicode_range(char) for char in str(self)
-        ]
-        # filter and sort
-        self._unicode_ranges = sorted(list({r for r in detected_ranges if r}))
-        return self._unicode_ranges
-
-    @property
-    def could_be_from_charset(self) -> List[str]:
-        """
-        The complete list of encoding that output the exact SAME str result and therefore could be the originating
-        encoding.
-        This list does include the encoding available in property 'encoding'.
-        """
-        return [self._encoding] + [m.encoding for m in self._leaves]
-
-    def output(self, encoding: str = "utf_8") -> bytes:
-        """
-        Method to get re-encoded bytes payload using given target encoding. Default to UTF-8.
-        Any errors will be simply ignored by the encoder NOT replaced.
-        """
-        if self._output_encoding is None or self._output_encoding != encoding:
-            self._output_encoding = encoding
-            self._output_payload = str(self).encode(encoding, "replace")
-
-        return self._output_payload  # type: ignore
-
-    @property
-    def fingerprint(self) -> str:
-        """
-        Retrieve the unique SHA256 computed using the transformed (re-encoded) payload. Not the original one.
-        """
-        return sha256(self.output()).hexdigest()
-
-
-class CharsetMatches:
-    """
-    Container with every CharsetMatch items ordered by default from most probable to the less one.
-    Act like a list(iterable) but does not implements all related methods.
-    """
-
-    def __init__(self, results: Optional[List[CharsetMatch]] = None):
-        self._results: List[CharsetMatch] = sorted(results) if results else []
-
-    def __iter__(self) -> Iterator[CharsetMatch]:
-        yield from self._results
-
-    def __getitem__(self, item: Union[int, str]) -> CharsetMatch:
-        """
-        Retrieve a single item either by its position or encoding name (alias may be used here).
-        Raise KeyError upon invalid index or encoding not present in results.
-        """
-        if isinstance(item, int):
-            return self._results[item]
-        if isinstance(item, str):
-            item = iana_name(item, False)
-            for result in self._results:
-                if item in result.could_be_from_charset:
-                    return result
-        raise KeyError
-
-    def __len__(self) -> int:
-        return len(self._results)
-
-    def __bool__(self) -> bool:
-        return len(self._results) > 0
-
-    def append(self, item: CharsetMatch) -> None:
-        """
-        Insert a single match. Will be inserted accordingly to preserve sort.
-        Can be inserted as a submatch.
-        """
-        if not isinstance(item, CharsetMatch):
-            raise ValueError(
-                "Cannot append instance '{}' to CharsetMatches".format(
-                    str(item.__class__)
-                )
-            )
-        # We should disable the submatch factoring when the input file is too heavy (conserve RAM usage)
-        if len(item.raw) <= TOO_BIG_SEQUENCE:
-            for match in self._results:
-                if match.fingerprint == item.fingerprint and match.chaos == item.chaos:
-                    match.add_submatch(item)
-                    return
-        self._results.append(item)
-        self._results = sorted(self._results)
-
-    def best(self) -> Optional["CharsetMatch"]:
-        """
-        Simply return the first match. Strict equivalent to matches[0].
-        """
-        if not self._results:
-            return None
-        return self._results[0]
-
-    def first(self) -> Optional["CharsetMatch"]:
-        """
-        Redundant method, call the method best(). Kept for BC reasons.
-        """
-        return self.best()
-
-
-CoherenceMatch = Tuple[str, float]
-CoherenceMatches = List[CoherenceMatch]
-
-
-class CliDetectionResult:
-    def __init__(
-        self,
-        path: str,
-        encoding: Optional[str],
-        encoding_aliases: List[str],
-        alternative_encodings: List[str],
-        language: str,
-        alphabets: List[str],
-        has_sig_or_bom: bool,
-        chaos: float,
-        coherence: float,
-        unicode_path: Optional[str],
-        is_preferred: bool,
-    ):
-        self.path: str = path
-        self.unicode_path: Optional[str] = unicode_path
-        self.encoding: Optional[str] = encoding
-        self.encoding_aliases: List[str] = encoding_aliases
-        self.alternative_encodings: List[str] = alternative_encodings
-        self.language: str = language
-        self.alphabets: List[str] = alphabets
-        self.has_sig_or_bom: bool = has_sig_or_bom
-        self.chaos: float = chaos
-        self.coherence: float = coherence
-        self.is_preferred: bool = is_preferred
-
-    @property
-    def __dict__(self) -> Dict[str, Any]:  # type: ignore
-        return {
-            "path": self.path,
-            "encoding": self.encoding,
-            "encoding_aliases": self.encoding_aliases,
-            "alternative_encodings": self.alternative_encodings,
-            "language": self.language,
-            "alphabets": self.alphabets,
-            "has_sig_or_bom": self.has_sig_or_bom,
-            "chaos": self.chaos,
-            "coherence": self.coherence,
-            "unicode_path": self.unicode_path,
-            "is_preferred": self.is_preferred,
-        }
-
-    def to_json(self) -> str:
-        return dumps(self.__dict__, ensure_ascii=True, indent=4)
diff --git a/src/pip/_vendor/charset_normalizer/py.typed b/src/pip/_vendor/charset_normalizer/py.typed
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/pip/_vendor/charset_normalizer/utils.py b/src/pip/_vendor/charset_normalizer/utils.py
deleted file mode 100644
index e5cbbf4c0dd..00000000000
--- a/src/pip/_vendor/charset_normalizer/utils.py
+++ /dev/null
@@ -1,421 +0,0 @@
-import importlib
-import logging
-import unicodedata
-from codecs import IncrementalDecoder
-from encodings.aliases import aliases
-from functools import lru_cache
-from re import findall
-from typing import Generator, List, Optional, Set, Tuple, Union
-
-from _multibytecodec import MultibyteIncrementalDecoder
-
-from .constant import (
-    ENCODING_MARKS,
-    IANA_SUPPORTED_SIMILAR,
-    RE_POSSIBLE_ENCODING_INDICATION,
-    UNICODE_RANGES_COMBINED,
-    UNICODE_SECONDARY_RANGE_KEYWORD,
-    UTF8_MAXIMAL_ALLOCATION,
-)
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_accentuated(character: str) -> bool:
-    try:
-        description: str = unicodedata.name(character)
-    except ValueError:
-        return False
-    return (
-        "WITH GRAVE" in description
-        or "WITH ACUTE" in description
-        or "WITH CEDILLA" in description
-        or "WITH DIAERESIS" in description
-        or "WITH CIRCUMFLEX" in description
-        or "WITH TILDE" in description
-        or "WITH MACRON" in description
-        or "WITH RING ABOVE" in description
-    )
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def remove_accent(character: str) -> str:
-    decomposed: str = unicodedata.decomposition(character)
-    if not decomposed:
-        return character
-
-    codes: List[str] = decomposed.split(" ")
-
-    return chr(int(codes[0], 16))
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def unicode_range(character: str) -> Optional[str]:
-    """
-    Retrieve the Unicode range official name from a single character.
-    """
-    character_ord: int = ord(character)
-
-    for range_name, ord_range in UNICODE_RANGES_COMBINED.items():
-        if character_ord in ord_range:
-            return range_name
-
-    return None
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_latin(character: str) -> bool:
-    try:
-        description: str = unicodedata.name(character)
-    except ValueError:
-        return False
-    return "LATIN" in description
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_punctuation(character: str) -> bool:
-    character_category: str = unicodedata.category(character)
-
-    if "P" in character_category:
-        return True
-
-    character_range: Optional[str] = unicode_range(character)
-
-    if character_range is None:
-        return False
-
-    return "Punctuation" in character_range
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_symbol(character: str) -> bool:
-    character_category: str = unicodedata.category(character)
-
-    if "S" in character_category or "N" in character_category:
-        return True
-
-    character_range: Optional[str] = unicode_range(character)
-
-    if character_range is None:
-        return False
-
-    return "Forms" in character_range and character_category != "Lo"
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_emoticon(character: str) -> bool:
-    character_range: Optional[str] = unicode_range(character)
-
-    if character_range is None:
-        return False
-
-    return "Emoticons" in character_range or "Pictographs" in character_range
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_separator(character: str) -> bool:
-    if character.isspace() or character in {"｜", "+", "<", ">"}:
-        return True
-
-    character_category: str = unicodedata.category(character)
-
-    return "Z" in character_category or character_category in {"Po", "Pd", "Pc"}
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_case_variable(character: str) -> bool:
-    return character.islower() != character.isupper()
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_cjk(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:
-        return False
-
-    return "CJK" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_hiragana(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:
-        return False
-
-    return "HIRAGANA" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_katakana(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:
-        return False
-
-    return "KATAKANA" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_hangul(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:
-        return False
-
-    return "HANGUL" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_thai(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:
-        return False
-
-    return "THAI" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_arabic(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:
-        return False
-
-    return "ARABIC" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_arabic_isolated_form(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:
-        return False
-
-    return "ARABIC" in character_name and "ISOLATED FORM" in character_name
-
-
-@lru_cache(maxsize=len(UNICODE_RANGES_COMBINED))
-def is_unicode_range_secondary(range_name: str) -> bool:
-    return any(keyword in range_name for keyword in UNICODE_SECONDARY_RANGE_KEYWORD)
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_unprintable(character: str) -> bool:
-    return (
-        character.isspace() is False  # includes \n \t \r \v
-        and character.isprintable() is False
-        and character != "\x1A"  # Why? Its the ASCII substitute character.
-        and character != "\ufeff"  # bug discovered in Python,
-        # Zero Width No-Break Space located in 	Arabic Presentation Forms-B, Unicode 1.1 not acknowledged as space.
-    )
-
-
-def any_specified_encoding(sequence: bytes, search_zone: int = 8192) -> Optional[str]:
-    """
-    Extract using ASCII-only decoder any specified encoding in the first n-bytes.
-    """
-    if not isinstance(sequence, bytes):
-        raise TypeError
-
-    seq_len: int = len(sequence)
-
-    results: List[str] = findall(
-        RE_POSSIBLE_ENCODING_INDICATION,
-        sequence[: min(seq_len, search_zone)].decode("ascii", errors="ignore"),
-    )
-
-    if len(results) == 0:
-        return None
-
-    for specified_encoding in results:
-        specified_encoding = specified_encoding.lower().replace("-", "_")
-
-        encoding_alias: str
-        encoding_iana: str
-
-        for encoding_alias, encoding_iana in aliases.items():
-            if encoding_alias == specified_encoding:
-                return encoding_iana
-            if encoding_iana == specified_encoding:
-                return encoding_iana
-
-    return None
-
-
-@lru_cache(maxsize=128)
-def is_multi_byte_encoding(name: str) -> bool:
-    """
-    Verify is a specific encoding is a multi byte one based on it IANA name
-    """
-    return name in {
-        "utf_8",
-        "utf_8_sig",
-        "utf_16",
-        "utf_16_be",
-        "utf_16_le",
-        "utf_32",
-        "utf_32_le",
-        "utf_32_be",
-        "utf_7",
-    } or issubclass(
-        importlib.import_module("encodings.{}".format(name)).IncrementalDecoder,
-        MultibyteIncrementalDecoder,
-    )
-
-
-def identify_sig_or_bom(sequence: bytes) -> Tuple[Optional[str], bytes]:
-    """
-    Identify and extract SIG/BOM in given sequence.
-    """
-
-    for iana_encoding in ENCODING_MARKS:
-        marks: Union[bytes, List[bytes]] = ENCODING_MARKS[iana_encoding]
-
-        if isinstance(marks, bytes):
-            marks = [marks]
-
-        for mark in marks:
-            if sequence.startswith(mark):
-                return iana_encoding, mark
-
-    return None, b""
-
-
-def should_strip_sig_or_bom(iana_encoding: str) -> bool:
-    return iana_encoding not in {"utf_16", "utf_32"}
-
-
-def iana_name(cp_name: str, strict: bool = True) -> str:
-    cp_name = cp_name.lower().replace("-", "_")
-
-    encoding_alias: str
-    encoding_iana: str
-
-    for encoding_alias, encoding_iana in aliases.items():
-        if cp_name in [encoding_alias, encoding_iana]:
-            return encoding_iana
-
-    if strict:
-        raise ValueError("Unable to retrieve IANA for '{}'".format(cp_name))
-
-    return cp_name
-
-
-def range_scan(decoded_sequence: str) -> List[str]:
-    ranges: Set[str] = set()
-
-    for character in decoded_sequence:
-        character_range: Optional[str] = unicode_range(character)
-
-        if character_range is None:
-            continue
-
-        ranges.add(character_range)
-
-    return list(ranges)
-
-
-def cp_similarity(iana_name_a: str, iana_name_b: str) -> float:
-    if is_multi_byte_encoding(iana_name_a) or is_multi_byte_encoding(iana_name_b):
-        return 0.0
-
-    decoder_a = importlib.import_module(
-        "encodings.{}".format(iana_name_a)
-    ).IncrementalDecoder
-    decoder_b = importlib.import_module(
-        "encodings.{}".format(iana_name_b)
-    ).IncrementalDecoder
-
-    id_a: IncrementalDecoder = decoder_a(errors="ignore")
-    id_b: IncrementalDecoder = decoder_b(errors="ignore")
-
-    character_match_count: int = 0
-
-    for i in range(255):
-        to_be_decoded: bytes = bytes([i])
-        if id_a.decode(to_be_decoded) == id_b.decode(to_be_decoded):
-            character_match_count += 1
-
-    return character_match_count / 254
-
-
-def is_cp_similar(iana_name_a: str, iana_name_b: str) -> bool:
-    """
-    Determine if two code page are at least 80% similar. IANA_SUPPORTED_SIMILAR dict was generated using
-    the function cp_similarity.
-    """
-    return (
-        iana_name_a in IANA_SUPPORTED_SIMILAR
-        and iana_name_b in IANA_SUPPORTED_SIMILAR[iana_name_a]
-    )
-
-
-def set_logging_handler(
-    name: str = "charset_normalizer",
-    level: int = logging.INFO,
-    format_string: str = "%(asctime)s | %(levelname)s | %(message)s",
-) -> None:
-    logger = logging.getLogger(name)
-    logger.setLevel(level)
-
-    handler = logging.StreamHandler()
-    handler.setFormatter(logging.Formatter(format_string))
-    logger.addHandler(handler)
-
-
-def cut_sequence_chunks(
-    sequences: bytes,
-    encoding_iana: str,
-    offsets: range,
-    chunk_size: int,
-    bom_or_sig_available: bool,
-    strip_sig_or_bom: bool,
-    sig_payload: bytes,
-    is_multi_byte_decoder: bool,
-    decoded_payload: Optional[str] = None,
-) -> Generator[str, None, None]:
-    if decoded_payload and is_multi_byte_decoder is False:
-        for i in offsets:
-            chunk = decoded_payload[i : i + chunk_size]
-            if not chunk:
-                break
-            yield chunk
-    else:
-        for i in offsets:
-            chunk_end = i + chunk_size
-            if chunk_end > len(sequences) + 8:
-                continue
-
-            cut_sequence = sequences[i : i + chunk_size]
-
-            if bom_or_sig_available and strip_sig_or_bom is False:
-                cut_sequence = sig_payload + cut_sequence
-
-            chunk = cut_sequence.decode(
-                encoding_iana,
-                errors="ignore" if is_multi_byte_decoder else "strict",
-            )
-
-            # multi-byte bad cutting detector and adjustment
-            # not the cleanest way to perform that fix but clever enough for now.
-            if is_multi_byte_decoder and i > 0:
-                chunk_partial_size_chk: int = min(chunk_size, 16)
-
-                if (
-                    decoded_payload
-                    and chunk[:chunk_partial_size_chk] not in decoded_payload
-                ):
-                    for j in range(i, i - 4, -1):
-                        cut_sequence = sequences[j:chunk_end]
-
-                        if bom_or_sig_available and strip_sig_or_bom is False:
-                            cut_sequence = sig_payload + cut_sequence
-
-                        chunk = cut_sequence.decode(encoding_iana, errors="ignore")
-
-                        if chunk[:chunk_partial_size_chk] in decoded_payload:
-                            break
-
-            yield chunk
diff --git a/src/pip/_vendor/charset_normalizer/version.py b/src/pip/_vendor/charset_normalizer/version.py
deleted file mode 100644
index 5a4da4ff49b..00000000000
--- a/src/pip/_vendor/charset_normalizer/version.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""
-Expose version
-"""
-
-__version__ = "3.3.2"
-VERSION = __version__.split(".")
diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
index 9d4e72c60d4..04230fc8d9a 100644
--- a/src/pip/_vendor/requests/__init__.py
+++ b/src/pip/_vendor/requests/__init__.py
@@ -44,11 +44,7 @@
 
 from .exceptions import RequestsDependencyWarning
 
-try:
-    from pip._vendor.charset_normalizer import __version__ as charset_normalizer_version
-except ImportError:
-    charset_normalizer_version = None
-
+charset_normalizer_version = None
 chardet_version = None
 
 
@@ -80,7 +76,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
         # charset_normalizer >= 2.0.0 < 4.0.0
         assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
     else:
-        raise Exception("You need either charset_normalizer or chardet installed")
+        # pip does not need or use character detection
+        pass
 
 
 def _check_cryptography(cryptography_version):
diff --git a/src/pip/_vendor/requests/__version__.py b/src/pip/_vendor/requests/__version__.py
index 5063c3f8ee7..1ac168734ee 100644
--- a/src/pip/_vendor/requests/__version__.py
+++ b/src/pip/_vendor/requests/__version__.py
@@ -5,10 +5,10 @@
 __title__ = "requests"
 __description__ = "Python HTTP for Humans."
 __url__ = "https://requests.readthedocs.io"
-__version__ = "2.31.0"
-__build__ = 0x023100
+__version__ = "2.32.0"
+__build__ = 0x023200
 __author__ = "Kenneth Reitz"
 __author_email__ = "me@kennethreitz.org"
-__license__ = "Apache 2.0"
+__license__ = "Apache-2.0"
 __copyright__ = "Copyright Kenneth Reitz"
 __cake__ = "\u2728 \U0001f370 \u2728"
diff --git a/src/pip/_vendor/requests/adapters.py b/src/pip/_vendor/requests/adapters.py
index 10c176790b6..4d9d9c63067 100644
--- a/src/pip/_vendor/requests/adapters.py
+++ b/src/pip/_vendor/requests/adapters.py
@@ -8,6 +8,7 @@
 
 import os.path
 import socket  # noqa: F401
+import typing
 
 from pip._vendor.urllib3.exceptions import ClosedPoolError, ConnectTimeoutError
 from pip._vendor.urllib3.exceptions import HTTPError as _HTTPError
@@ -25,6 +26,7 @@
 from pip._vendor.urllib3.util import Timeout as TimeoutSauce
 from pip._vendor.urllib3.util import parse_url
 from pip._vendor.urllib3.util.retry import Retry
+from pip._vendor.urllib3.util.ssl_ import create_urllib3_context
 
 from .auth import _basic_auth_str
 from .compat import basestring, urlparse
@@ -61,11 +63,57 @@ def SOCKSProxyManager(*args, **kwargs):
         raise InvalidSchema("Missing dependencies for SOCKS support.")
 
 
+if typing.TYPE_CHECKING:
+    from .models import PreparedRequest
+
+
 DEFAULT_POOLBLOCK = False
 DEFAULT_POOLSIZE = 10
 DEFAULT_RETRIES = 0
 DEFAULT_POOL_TIMEOUT = None
 
+_preloaded_ssl_context = create_urllib3_context()
+_preloaded_ssl_context.load_verify_locations(
+    extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
+)
+
+
+def _urllib3_request_context(
+    request: "PreparedRequest",
+    verify: "bool | str | None",
+    client_cert: "typing.Tuple[str, str] | str | None",
+) -> "(typing.Dict[str, typing.Any], typing.Dict[str, typing.Any])":
+    host_params = {}
+    pool_kwargs = {}
+    parsed_request_url = urlparse(request.url)
+    scheme = parsed_request_url.scheme.lower()
+    port = parsed_request_url.port
+    cert_reqs = "CERT_REQUIRED"
+    if verify is False:
+        cert_reqs = "CERT_NONE"
+    elif verify is True:
+        pool_kwargs["ssl_context"] = _preloaded_ssl_context
+    elif isinstance(verify, str):
+        if not os.path.isdir(verify):
+            pool_kwargs["ca_certs"] = verify
+        else:
+            pool_kwargs["ca_cert_dir"] = verify
+    pool_kwargs["cert_reqs"] = cert_reqs
+    if client_cert is not None:
+        if isinstance(client_cert, tuple) and len(client_cert) == 2:
+            pool_kwargs["cert_file"] = client_cert[0]
+            pool_kwargs["key_file"] = client_cert[1]
+        else:
+            # According to our docs, we allow users to specify just the client
+            # cert path
+            pool_kwargs["cert_file"] = client_cert
+    host_params = {
+        "scheme": scheme,
+        "host": parsed_request_url.hostname,
+        "port": port,
+    }
+    return host_params, pool_kwargs
+
 
 class BaseAdapter:
     """The Base Transport Adapter"""
@@ -247,28 +295,26 @@ def cert_verify(self, conn, url, verify, cert):
         :param cert: The SSL certificate to verify.
         """
         if url.lower().startswith("https") and verify:
+            conn.cert_reqs = "CERT_REQUIRED"
 
-            cert_loc = None
-
-            # Allow self-specified cert location.
+            # Only load the CA certificates if 'verify' is a string indicating the CA bundle to use.
+            # Otherwise, if verify is a boolean, we don't load anything since
+            # the connection will be using a context with the default certificates already loaded,
+            # and this avoids a call to the slow load_verify_locations()
             if verify is not True:
+                # `verify` must be a str with a path then
                 cert_loc = verify
 
-            if not cert_loc:
-                cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
+                if not os.path.exists(cert_loc):
+                    raise OSError(
+                        f"Could not find a suitable TLS CA certificate bundle, "
+                        f"invalid path: {cert_loc}"
+                    )
 
-            if not cert_loc or not os.path.exists(cert_loc):
-                raise OSError(
-                    f"Could not find a suitable TLS CA certificate bundle, "
-                    f"invalid path: {cert_loc}"
-                )
-
-            conn.cert_reqs = "CERT_REQUIRED"
-
-            if not os.path.isdir(cert_loc):
-                conn.ca_certs = cert_loc
-            else:
-                conn.ca_cert_dir = cert_loc
+                if not os.path.isdir(cert_loc):
+                    conn.ca_certs = cert_loc
+                else:
+                    conn.ca_cert_dir = cert_loc
         else:
             conn.cert_reqs = "CERT_NONE"
             conn.ca_certs = None
@@ -328,6 +374,35 @@ def build_response(self, req, resp):
 
         return response
 
+    def _get_connection(self, request, verify, proxies=None, cert=None):
+        # Replace the existing get_connection without breaking things and
+        # ensure that TLS settings are considered when we interact with
+        # urllib3 HTTP Pools
+        proxy = select_proxy(request.url, proxies)
+        try:
+            host_params, pool_kwargs = _urllib3_request_context(request, verify, cert)
+        except ValueError as e:
+            raise InvalidURL(e, request=request)
+        if proxy:
+            proxy = prepend_scheme_if_needed(proxy, "http")
+            proxy_url = parse_url(proxy)
+            if not proxy_url.host:
+                raise InvalidProxyURL(
+                    "Please check proxy URL. It is malformed "
+                    "and could be missing the host."
+                )
+            proxy_manager = self.proxy_manager_for(proxy)
+            conn = proxy_manager.connection_from_host(
+                **host_params, pool_kwargs=pool_kwargs
+            )
+        else:
+            # Only scheme should be lower case
+            conn = self.poolmanager.connection_from_host(
+                **host_params, pool_kwargs=pool_kwargs
+            )
+
+        return conn
+
     def get_connection(self, url, proxies=None):
         """Returns a urllib3 connection for the given URL. This should not be
         called from user code, and is only exposed for use when subclassing the
@@ -391,6 +466,9 @@ def request_url(self, request, proxies):
             using_socks_proxy = proxy_scheme.startswith("socks")
 
         url = request.path_url
+        if url.startswith("//"):  # Don't confuse urllib3
+            url = f"/{url.lstrip('/')}"
+
         if is_proxied_http_request and not using_socks_proxy:
             url = urldefragauth(request.url)
 
@@ -451,7 +529,7 @@ def send(
         """
 
         try:
-            conn = self.get_connection(request.url, proxies)
+            conn = self._get_connection(request, verify, proxies=proxies, cert=cert)
         except LocationValueError as e:
             raise InvalidURL(e, request=request)
 
diff --git a/src/pip/_vendor/requests/api.py b/src/pip/_vendor/requests/api.py
index cd0b3eeac3e..5960744552e 100644
--- a/src/pip/_vendor/requests/api.py
+++ b/src/pip/_vendor/requests/api.py
@@ -25,7 +25,7 @@ def request(method, url, **kwargs):
     :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
     :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': file-tuple}``) for multipart encoding upload.
         ``file-tuple`` can be a 2-tuple ``('filename', fileobj)``, 3-tuple ``('filename', fileobj, 'content_type')``
-        or a 4-tuple ``('filename', fileobj, 'content_type', custom_headers)``, where ``'content-type'`` is a string
+        or a 4-tuple ``('filename', fileobj, 'content_type', custom_headers)``, where ``'content_type'`` is a string
         defining the content type of the given file and ``custom_headers`` a dict-like object containing additional headers
         to add for the file.
     :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
diff --git a/src/pip/_vendor/requests/auth.py b/src/pip/_vendor/requests/auth.py
index 9733686ddb3..4a7ce6dc146 100644
--- a/src/pip/_vendor/requests/auth.py
+++ b/src/pip/_vendor/requests/auth.py
@@ -258,7 +258,6 @@ def handle_401(self, r, **kwargs):
         s_auth = r.headers.get("www-authenticate", "")
 
         if "digest" in s_auth.lower() and self._thread_local.num_401_calls < 2:
-
             self._thread_local.num_401_calls += 1
             pat = re.compile(r"digest ", flags=re.IGNORECASE)
             self._thread_local.chal = parse_dict_header(pat.sub("", s_auth, count=1))
diff --git a/src/pip/_vendor/requests/compat.py b/src/pip/_vendor/requests/compat.py
index 33525c52f0c..7081da756ac 100644
--- a/src/pip/_vendor/requests/compat.py
+++ b/src/pip/_vendor/requests/compat.py
@@ -7,10 +7,21 @@
 compatibility until the next major version.
 """
 
-from pip._vendor import charset_normalizer as chardet
-
 import sys
 
+# -------------------
+# Character Detection
+# -------------------
+
+
+def _resolve_char_detection():
+    """Find supported character detection libraries."""
+    chardet = None
+    return chardet
+
+
+chardet = _resolve_char_detection()
+
 # -------
 # Pythons
 # -------
diff --git a/src/pip/_vendor/requests/cookies.py b/src/pip/_vendor/requests/cookies.py
index bf54ab237e4..f69d0cda9e1 100644
--- a/src/pip/_vendor/requests/cookies.py
+++ b/src/pip/_vendor/requests/cookies.py
@@ -2,7 +2,7 @@
 requests.cookies
 ~~~~~~~~~~~~~~~~
 
-Compatibility code to be able to use `cookielib.CookieJar` with requests.
+Compatibility code to be able to use `http.cookiejar.CookieJar` with requests.
 
 requests.utils imports from here, so be careful with imports.
 """
@@ -23,7 +23,7 @@
 class MockRequest:
     """Wraps a `requests.Request` to mimic a `urllib2.Request`.
 
-    The code in `cookielib.CookieJar` expects this interface in order to correctly
+    The code in `http.cookiejar.CookieJar` expects this interface in order to correctly
     manage cookie policies, i.e., determine whether a cookie can be set, given the
     domains of the request and the cookie.
 
@@ -76,7 +76,7 @@ def get_header(self, name, default=None):
         return self._r.headers.get(name, self._new_headers.get(name, default))
 
     def add_header(self, key, val):
-        """cookielib has no legitimate use for this method; add it back if you find one."""
+        """cookiejar has no legitimate use for this method; add it back if you find one."""
         raise NotImplementedError(
             "Cookie headers should be added with add_unredirected_header()"
         )
@@ -104,11 +104,11 @@ class MockResponse:
     """Wraps a `httplib.HTTPMessage` to mimic a `urllib.addinfourl`.
 
     ...what? Basically, expose the parsed HTTP headers from the server response
-    the way `cookielib` expects to see them.
+    the way `http.cookiejar` expects to see them.
     """
 
     def __init__(self, headers):
-        """Make a MockResponse for `cookielib` to read.
+        """Make a MockResponse for `cookiejar` to read.
 
         :param headers: a httplib.HTTPMessage or analogous carrying the headers
         """
@@ -124,7 +124,7 @@ def getheaders(self, name):
 def extract_cookies_to_jar(jar, request, response):
     """Extract the cookies from the response into a CookieJar.
 
-    :param jar: cookielib.CookieJar (not necessarily a RequestsCookieJar)
+    :param jar: http.cookiejar.CookieJar (not necessarily a RequestsCookieJar)
     :param request: our own requests.Request object
     :param response: urllib3.HTTPResponse object
     """
@@ -174,7 +174,7 @@ class CookieConflictError(RuntimeError):
 
 
 class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
-    """Compatibility class; is a cookielib.CookieJar, but exposes a dict
+    """Compatibility class; is a http.cookiejar.CookieJar, but exposes a dict
     interface.
 
     This is the CookieJar we create by default for requests and sessions that
@@ -341,7 +341,7 @@ def __setitem__(self, name, value):
         self.set(name, value)
 
     def __delitem__(self, name):
-        """Deletes a cookie given a name. Wraps ``cookielib.CookieJar``'s
+        """Deletes a cookie given a name. Wraps ``http.cookiejar.CookieJar``'s
         ``remove_cookie_by_name()``.
         """
         remove_cookie_by_name(self, name)
diff --git a/src/pip/_vendor/requests/exceptions.py b/src/pip/_vendor/requests/exceptions.py
index 168d07390df..7f3660f00d9 100644
--- a/src/pip/_vendor/requests/exceptions.py
+++ b/src/pip/_vendor/requests/exceptions.py
@@ -41,6 +41,16 @@ def __init__(self, *args, **kwargs):
         CompatJSONDecodeError.__init__(self, *args)
         InvalidJSONError.__init__(self, *self.args, **kwargs)
 
+    def __reduce__(self):
+        """
+        The __reduce__ method called when pickling the object must
+        be the one from the JSONDecodeError (be it json/simplejson)
+        as it expects all the arguments for instantiation, not just
+        one like the IOError, and the MRO would by default call the
+        __reduce__ method from the IOError due to the inheritance order.
+        """
+        return CompatJSONDecodeError.__reduce__(self)
+
 
 class HTTPError(RequestException):
     """An HTTP error occurred."""
diff --git a/src/pip/_vendor/requests/help.py b/src/pip/_vendor/requests/help.py
index 17ca75eda7d..ddbb6150d64 100644
--- a/src/pip/_vendor/requests/help.py
+++ b/src/pip/_vendor/requests/help.py
@@ -10,11 +10,7 @@
 
 from . import __version__ as requests_version
 
-try:
-    from pip._vendor import charset_normalizer
-except ImportError:
-    charset_normalizer = None
-
+charset_normalizer = None
 chardet = None
 
 try:
diff --git a/src/pip/_vendor/requests/models.py b/src/pip/_vendor/requests/models.py
index 76e6f199c00..85a008cfb56 100644
--- a/src/pip/_vendor/requests/models.py
+++ b/src/pip/_vendor/requests/models.py
@@ -170,7 +170,7 @@ def _encode_files(files, data):
                         )
                     )
 
-        for (k, v) in files:
+        for k, v in files:
             # support for explicit filename
             ft = None
             fh = None
@@ -268,7 +268,6 @@ def __init__(
         hooks=None,
         json=None,
     ):
-
         # Default empty dicts for dict params.
         data = [] if data is None else data
         files = [] if files is None else files
@@ -277,7 +276,7 @@ def __init__(
         hooks = {} if hooks is None else hooks
 
         self.hooks = default_hooks()
-        for (k, v) in list(hooks.items()):
+        for k, v in list(hooks.items()):
             self.register_hook(event=k, hook=v)
 
         self.method = method
@@ -790,7 +789,12 @@ def next(self):
     @property
     def apparent_encoding(self):
         """The apparent encoding, provided by the charset_normalizer or chardet libraries."""
-        return chardet.detect(self.content)["encoding"]
+        if chardet is not None:
+            return chardet.detect(self.content)["encoding"]
+        else:
+            # If no character detection library is available, we'll fall back
+            # to a standard Python utf-8 str.
+            return "utf-8"
 
     def iter_content(self, chunk_size=1, decode_unicode=False):
         """Iterates over the response data.  When stream=True is set on the
@@ -865,7 +869,6 @@ def iter_lines(
         for chunk in self.iter_content(
             chunk_size=chunk_size, decode_unicode=decode_unicode
         ):
-
             if pending is not None:
                 chunk = pending + chunk
 
diff --git a/src/pip/_vendor/requests/packages.py b/src/pip/_vendor/requests/packages.py
index 45787bfbe54..200c38287f4 100644
--- a/src/pip/_vendor/requests/packages.py
+++ b/src/pip/_vendor/requests/packages.py
@@ -1,9 +1,11 @@
 import sys
 
+from .compat import chardet
+
 # This code exists for backwards compatibility reasons.
 # I don't like it either. Just look the other way. :)
 
-for package in ('urllib3', 'idna', 'charset_normalizer'):
+for package in ("urllib3", "idna"):
     vendored_package = "pip._vendor." + package
     locals()[package] = __import__(vendored_package)
     # This traversal is apparently necessary such that the identities are
@@ -13,4 +15,11 @@
             unprefixed_mod = mod[len("pip._vendor."):]
             sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
 
-# Kinda cool, though, right?
+if chardet is not None:
+    target = chardet.__name__
+    for mod in list(sys.modules):
+        if mod == target or mod.startswith(f"{target}."):
+            imported_mod = sys.modules[mod]
+            sys.modules[f"requests.packages.{mod}"] = imported_mod
+            mod = mod.replace(target, "chardet")
+            sys.modules[f"requests.packages.{mod}"] = imported_mod
diff --git a/src/pip/_vendor/requests/sessions.py b/src/pip/_vendor/requests/sessions.py
index dbcf2a7b0ee..b387bc36df7 100644
--- a/src/pip/_vendor/requests/sessions.py
+++ b/src/pip/_vendor/requests/sessions.py
@@ -262,7 +262,6 @@ def resolve_redirects(
             if yield_requests:
                 yield req
             else:
-
                 resp = self.send(
                     req,
                     stream=stream,
@@ -326,7 +325,7 @@ def rebuild_proxies(self, prepared_request, proxies):
 
         # urllib3 handles proxy authorization for us in the standard adapter.
         # Avoid appending this to TLS tunneled requests where it may be leaked.
-        if not scheme.startswith('https') and username and password:
+        if not scheme.startswith("https") and username and password:
             headers["Proxy-Authorization"] = _basic_auth_str(username, password)
 
         return new_proxies
@@ -389,7 +388,6 @@ class Session(SessionRedirectMixin):
     ]
 
     def __init__(self):
-
         #: A case-insensitive dictionary of headers to be sent on each
         #: :class:`Request ` sent from this
         #: :class:`Session `.
@@ -545,6 +543,8 @@ def request(
         :type allow_redirects: bool
         :param proxies: (optional) Dictionary mapping protocol or protocol and
             hostname to the URL of the proxy.
+        :param hooks: (optional) Dictionary mapping hook name to one event or
+            list of events, event must be callable.
         :param stream: (optional) whether to immediately download the response
             content. Defaults to ``False``.
         :param verify: (optional) Either a boolean, in which case it controls whether we verify
@@ -711,7 +711,6 @@ def send(self, request, **kwargs):
 
         # Persist cookies
         if r.history:
-
             # If the hooks create history then we want those cookies too
             for resp in r.history:
                 extract_cookies_to_jar(self.cookies, resp.request, resp.raw)
@@ -759,7 +758,7 @@ def merge_environment_settings(self, url, proxies, stream, verify, cert):
             # Set environment's proxies.
             no_proxy = proxies.get("no_proxy") if proxies is not None else None
             env_proxies = get_environ_proxies(url, no_proxy=no_proxy)
-            for (k, v) in env_proxies.items():
+            for k, v in env_proxies.items():
                 proxies.setdefault(k, v)
 
             # Look for requests environment configuration
@@ -785,8 +784,7 @@ def get_adapter(self, url):
 
         :rtype: requests.adapters.BaseAdapter
         """
-        for (prefix, adapter) in self.adapters.items():
-
+        for prefix, adapter in self.adapters.items():
             if url.lower().startswith(prefix.lower()):
                 return adapter
 
diff --git a/src/pip/_vendor/requests/status_codes.py b/src/pip/_vendor/requests/status_codes.py
index 4bd072be976..c7945a2f068 100644
--- a/src/pip/_vendor/requests/status_codes.py
+++ b/src/pip/_vendor/requests/status_codes.py
@@ -24,7 +24,7 @@
     # Informational.
     100: ("continue",),
     101: ("switching_protocols",),
-    102: ("processing",),
+    102: ("processing", "early-hints"),
     103: ("checkpoint",),
     122: ("uri_too_long", "request_uri_too_long"),
     200: ("ok", "okay", "all_ok", "all_okay", "all_good", "\\o/", "✓"),
@@ -65,8 +65,8 @@
     410: ("gone",),
     411: ("length_required",),
     412: ("precondition_failed", "precondition"),
-    413: ("request_entity_too_large",),
-    414: ("request_uri_too_large",),
+    413: ("request_entity_too_large", "content_too_large"),
+    414: ("request_uri_too_large", "uri_too_long"),
     415: ("unsupported_media_type", "unsupported_media", "media_type"),
     416: (
         "requested_range_not_satisfiable",
@@ -76,10 +76,10 @@
     417: ("expectation_failed",),
     418: ("im_a_teapot", "teapot", "i_am_a_teapot"),
     421: ("misdirected_request",),
-    422: ("unprocessable_entity", "unprocessable"),
+    422: ("unprocessable_entity", "unprocessable", "unprocessable_content"),
     423: ("locked",),
     424: ("failed_dependency", "dependency"),
-    425: ("unordered_collection", "unordered"),
+    425: ("unordered_collection", "unordered", "too_early"),
     426: ("upgrade_required", "upgrade"),
     428: ("precondition_required", "precondition"),
     429: ("too_many_requests", "too_many"),
diff --git a/src/pip/_vendor/requests/utils.py b/src/pip/_vendor/requests/utils.py
index 36607eda2ec..a35ce478667 100644
--- a/src/pip/_vendor/requests/utils.py
+++ b/src/pip/_vendor/requests/utils.py
@@ -97,6 +97,8 @@ def proxy_bypass_registry(host):
         # '' string by the localhost entry and the corresponding
         # canonical entry.
         proxyOverride = proxyOverride.split(";")
+        # filter out empty strings to avoid re.match return true in the following code.
+        proxyOverride = filter(None, proxyOverride)
         # now check if we match one of the registry values.
         for test in proxyOverride:
             if test == "":
@@ -134,6 +136,9 @@ def super_len(o):
     total_length = None
     current_position = 0
 
+    if isinstance(o, str):
+        o = o.encode("utf-8")
+
     if hasattr(o, "__len__"):
         total_length = len(o)
 
@@ -466,11 +471,7 @@ def dict_from_cookiejar(cj):
     :rtype: dict
     """
 
-    cookie_dict = {}
-
-    for cookie in cj:
-        cookie_dict[cookie.name] = cookie.value
-
+    cookie_dict = {cookie.name: cookie.value for cookie in cj}
     return cookie_dict
 
 
@@ -767,6 +768,7 @@ def should_bypass_proxies(url, no_proxy):
 
     :rtype: bool
     """
+
     # Prioritize lowercase environment variables over uppercase
     # to keep a consistent behaviour with other http projects (curl, wget).
     def get_proxy(key):
@@ -862,7 +864,7 @@ def select_proxy(url, proxies):
 def resolve_proxies(request, proxies, trust_env=True):
     """This method takes proxy information from a request and configuration
     input to resolve a mapping of target proxies. This will consider settings
-    such a NO_PROXY to strip proxy configurations.
+    such as NO_PROXY to strip proxy configurations.
 
     :param request: Request or PreparedRequest
     :param proxies: A dictionary of schemes or schemes and hosts to proxy URLs
@@ -1054,7 +1056,7 @@ def _validate_header_part(header, header_part, header_validator_index):
     if not validator.match(header_part):
         header_kind = "name" if header_validator_index == 0 else "value"
         raise InvalidHeader(
-            f"Invalid leading whitespace, reserved character(s), or return"
+            f"Invalid leading whitespace, reserved character(s), or return "
             f"character(s) in header {header_kind}: {header_part!r}"
         )
 
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 2643da721fc..00d81549cb6 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -5,9 +5,8 @@ msgpack==1.0.8
 packaging==24.0
 platformdirs==4.2.1
 pyproject-hooks==1.0.0
-requests==2.31.0
+requests==2.32.0
     certifi==2024.2.2
-    charset-normalizer==3.3.2
     idna==3.7
     urllib3==1.26.18
 rich==13.7.1
diff --git a/tools/vendoring/patches/requests.patch b/tools/vendoring/patches/requests.patch
index d02eb31fbcf..c205250eeb1 100644
--- a/tools/vendoring/patches/requests.patch
+++ b/tools/vendoring/patches/requests.patch
@@ -1,42 +1,3 @@
-diff --git a/src/pip/_vendor/requests/packages.py b/src/pip/_vendor/requests/packages.py
-index 77c45c9e..45787bfb 100644
---- a/src/pip/_vendor/requests/packages.py
-+++ b/src/pip/_vendor/requests/packages.py
-@@ -1,28 +1,16 @@
- import sys
- 
--try:
--    import chardet
--except ImportError:
--    import warnings
--
--    import charset_normalizer as chardet
--
--    warnings.filterwarnings("ignore", "Trying to detect", module="charset_normalizer")
--
- # This code exists for backwards compatibility reasons.
- # I don't like it either. Just look the other way. :)
- 
--for package in ("urllib3", "idna"):
--    locals()[package] = __import__(package)
-+for package in ('urllib3', 'idna', 'charset_normalizer'):
-+    vendored_package = "pip._vendor." + package
-+    locals()[package] = __import__(vendored_package)
-     # This traversal is apparently necessary such that the identities are
-     # preserved (requests.packages.urllib3.* is urllib3.*)
-     for mod in list(sys.modules):
--        if mod == package or mod.startswith(f"{package}."):
--            sys.modules[f"requests.packages.{mod}"] = sys.modules[mod]
-+        if mod == vendored_package or mod.startswith(vendored_package + '.'):
-+            unprefixed_mod = mod[len("pip._vendor."):]
-+            sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
- 
--target = chardet.__name__
--for mod in list(sys.modules):
--    if mod == target or mod.startswith(f"{target}."):
--        target = target.replace(target, "chardet")
--        sys.modules[f"requests.packages.{target}"] = sys.modules[mod]
- # Kinda cool, though, right?
 diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
 index 300a16c5..a66f6024 100644
 --- a/src/pip/_vendor/requests/__init__.py
@@ -53,6 +14,20 @@ index 300a16c5..a66f6024 100644
  
  
  def check_compatibility(urllib3_version, chardet_version, charset_normalizer_version):
+@@ -76,11 +76,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
+         # charset_normalizer >= 2.0.0 < 4.0.0
+         assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
+     else:
+-        warnings.warn(
+-            "Unable to find acceptable character detection dependency "
+-            "(chardet or charset_normalizer).",
+-            RequestsDependencyWarning,
+-        )
++        # pip does not need or use character detection
++        pass
+
+
+ def _check_cryptography(cryptography_version):
 @@ -118,6 +115,11 @@ except (AssertionError, ValueError):
  # if the standard library doesn't support SNI or the
  # 'ssl' library isn't available.
@@ -69,18 +44,6 @@ diff --git a/src/pip/_vendor/requests/compat.py b/src/pip/_vendor/requests/compa
 index 6776163c..7819bb99 100644
 --- a/src/pip/_vendor/requests/compat.py
 +++ b/src/pip/_vendor/requests/compat.py
-@@ -7,10 +7,7 @@ between Python 2 and Python 3. It remains for backwards
- compatibility until the next major version.
- """
- 
--try:
--    import chardet
--except ImportError:
--    import charset_normalizer as chardet
-+import charset_normalizer as chardet
- 
- import sys
- 
 @@ -27,19 +24,10 @@ is_py2 = _ver[0] == 2
  #: Python 3.x?
  is_py3 = _ver[0] == 3
@@ -141,3 +104,82 @@ index be422c3e..3daf06f6 100644
  
  if __name__ == "__main__":
      print(where())
+diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
+index 9d4e72c60..04230fc8d 100644
+--- a/src/pip/_vendor/requests/__init__.py
++++ b/src/pip/_vendor/requests/__init__.py
+@@ -44,11 +44,7 @@ from pip._vendor import urllib3
+
+ from .exceptions import RequestsDependencyWarning
+
+-try:
+-    from charset_normalizer import __version__ as charset_normalizer_version
+-except ImportError:
+-    charset_normalizer_version = None
+-
++charset_normalizer_version = None
+ chardet_version = None
+
+
+diff --git a/src/pip/_vendor/requests/help.py b/src/pip/_vendor/requests/help.py
+index 17ca75eda..ddbb6150d 100644
+--- a/src/pip/_vendor/requests/help.py
++++ b/src/pip/_vendor/requests/help.py
+@@ -10,11 +10,7 @@ from pip._vendor import urllib3
+
+ from . import __version__ as requests_version
+
+-try:
+-    import charset_normalizer
+-except ImportError:
+-    charset_normalizer = None
+-
++charset_normalizer = None
+ chardet = None
+
+ try:
+--- a/src/pip/_vendor/requests/compat.py
++++ b/src/pip/_vendor/requests/compat.py
+@@ -7,7 +7,6 @@ between Python 2 and Python 3. It remains for backwards
+ compatibility until the next major version.
+ """
+
+-import importlib
+ import sys
+
+ # -------------------
+@@ -18,12 +17,6 @@ import sys
+ def _resolve_char_detection():
+     """Find supported character detection libraries."""
+     chardet = None
+-    for lib in ("chardet", "charset_normalizer"):
+-        if chardet is None:
+-            try:
+-                chardet = importlib.import_module(lib)
+-            except ImportError:
+-                pass
+     return chardet
+
+
+diff --git a/src/pip/_vendor/requests/packages.py b/src/pip/_vendor/requests/packages.py
+index 5ab3d8e25..200c38287 100644
+--- a/src/pip/_vendor/requests/packages.py
++++ b/src/pip/_vendor/requests/packages.py
+@@ -6,12 +6,14 @@ from .compat import chardet
+ # I don't like it either. Just look the other way. :)
+
+ for package in ("urllib3", "idna"):
+-    locals()[package] = __import__(package)
++    vendored_package = "pip._vendor." + package
++    locals()[package] = __import__(vendored_package)
+     # This traversal is apparently necessary such that the identities are
+     # preserved (requests.packages.urllib3.* is urllib3.*)
+     for mod in list(sys.modules):
+-        if mod == package or mod.startswith(f"{package}."):
+-            sys.modules[f"requests.packages.{mod}"] = sys.modules[mod]
++        if mod == vendored_package or mod.startswith(vendored_package + '.'):
++            unprefixed_mod = mod[len("pip._vendor."):]
++            sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
+
+ if chardet is not None:
+     target = chardet.__name__

From deededf27886379f609e9636b5b3fabbf9c6641f Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 11 May 2024 14:15:37 -0400
Subject: [PATCH 428/992] Bump black, ruff, and mypy pre-commit hooks

New mypy are:

    src/pip/_internal/cli/parser.py:70: error: Argument 1 of "format_description"
    is incompatible with supertype "HelpFormatter"; supertype defines the argument
    type as "str | None"  [override]
            def format_description(self, description: str) -> str:
                                         ^~~~~~~~~~~~~~~~
    src/pip/_internal/cli/parser.py:88: error: Argument 1 of "format_epilog" is
    incompatible with supertype "HelpFormatter"; supertype defines the argument type
    as "str | None"  [override]
            def format_epilog(self, epilog: str) -> str:
                                    ^~~~~~~~~~~
    tests/unit/test_req_uninstall.py:30: error: Missing return statement  [return]
                def iter_declared_entries(self) -> Optional[Iterator[str]]:
                ^
    Found 3 errors in 2 files (checked 296 source files)
---
 .pre-commit-config.yaml          | 8 ++++----
 src/pip/_internal/cli/parser.py  | 6 +++---
 tests/unit/test_req_uninstall.py | 5 +----
 tools/codespell-ignore.txt       | 1 +
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 922e1440d45..9b08c9bcf24 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,18 +17,18 @@ repos:
     exclude: .patch
 
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 24.4.0
+  rev: 24.4.2
   hooks:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.4.1
+  rev: v0.4.7
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.9.0
+  rev: v1.10.0
   hooks:
   - id: mypy
     exclude: tests/data
@@ -55,7 +55,7 @@ repos:
     exclude: NEWS.rst  # The errors flagged in NEWS.rst are old.
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.6
+  rev: v2.3.0
   hooks:
     - id: codespell
       exclude: AUTHORS.txt|tests/data
diff --git a/src/pip/_internal/cli/parser.py b/src/pip/_internal/cli/parser.py
index ae554b24cae..b7d7c1f600a 100644
--- a/src/pip/_internal/cli/parser.py
+++ b/src/pip/_internal/cli/parser.py
@@ -6,7 +6,7 @@
 import sys
 import textwrap
 from contextlib import suppress
-from typing import Any, Dict, Generator, List, Tuple
+from typing import Any, Dict, Generator, List, Optional, Tuple
 
 from pip._internal.cli.status_codes import UNKNOWN_ERROR
 from pip._internal.configuration import Configuration, ConfigurationError
@@ -67,7 +67,7 @@ def format_usage(self, usage: str) -> str:
         msg = "\nUsage: {}\n".format(self.indent_lines(textwrap.dedent(usage), "  "))
         return msg
 
-    def format_description(self, description: str) -> str:
+    def format_description(self, description: Optional[str]) -> str:
         # leave full control over description to us
         if description:
             if hasattr(self.parser, "main"):
@@ -85,7 +85,7 @@ def format_description(self, description: str) -> str:
         else:
             return ""
 
-    def format_epilog(self, epilog: str) -> str:
+    def format_epilog(self, epilog: Optional[str]) -> str:
         # leave full control over epilog to us
         if epilog:
             return epilog
diff --git a/tests/unit/test_req_uninstall.py b/tests/unit/test_req_uninstall.py
index 6a846e20272..b61babc343a 100644
--- a/tests/unit/test_req_uninstall.py
+++ b/tests/unit/test_req_uninstall.py
@@ -28,10 +28,7 @@ def mock_permitted(ups: UninstallPathSet, path: str) -> bool:
 def test_uninstallation_paths() -> None:
     class dist:
         def iter_declared_entries(self) -> Optional[Iterator[str]]:
-            yield "file.py"
-            yield "file.pyc"
-            yield "file.so"
-            yield "nopyc.py"
+            return iter(["file.py", "file.pyc", "file.so", "nopyc.py"])
 
         location = ""
 
diff --git a/tools/codespell-ignore.txt b/tools/codespell-ignore.txt
index 288f597353b..6856939bf0a 100644
--- a/tools/codespell-ignore.txt
+++ b/tools/codespell-ignore.txt
@@ -3,6 +3,7 @@ lousily
 followings
 # A contributor first name
 wil
+Whit
 # Codebase variable or class names
 uptodate
 afile

From ac61d71c4c48657c9ea2da9c5c0a2a78d2675e7a Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman 
Date: Wed, 5 Jun 2024 20:45:18 -0700
Subject: [PATCH 429/992] Don't assume that `LogRecord.args` is a tuple

In the context of pip, and especially when `rich=True`, I bet it *is*
true that `LogRecord.args` is always a tuple.

However, in general, this is not true. Single argument dicts actually
[are treated specially by Python's logging
infrastructure](https://github.com/python/cpython/blob/v3.11.9/Lib/logging/__init__.py#L301-L320):

    >>> def build_record(*args):
    ...   return LogRecord(name="name", level=0, pathname="pathname", lineno=42, msg="msg", args=args, exc_info=False).args
    ...
    >>> build_record({"foo": 42}, {"bar": 43})
    ({'foo': 42}, {'bar': 43})          # <-- this is a tuple!
    >>> build_record(42)
    (42,)                               # <-- this is a tuple!
    >>> build_record({"foo": 42})
    {'foo': 42}                         # <-- this is not a tuple!

This fixes https://github.com/pypa/pip/issues/12751

While I was in here, I also changed our logging story so we can actually
capture the full stacktrace when logging is turned up. That would have
been quite useful for me when debugging this issue, and would also be
useful for folks debugging keyring backends. Hopefully this is
uncontroversial. Happy to split this out into a separate PR if folks
prefer.
---
 news/12751.bugfix.rst              | 1 +
 src/pip/_internal/network/auth.py  | 4 ++++
 src/pip/_internal/utils/logging.py | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 news/12751.bugfix.rst

diff --git a/news/12751.bugfix.rst b/news/12751.bugfix.rst
new file mode 100644
index 00000000000..70c6680a8a9
--- /dev/null
+++ b/news/12751.bugfix.rst
@@ -0,0 +1 @@
+Avoid keyring logging crashes when pip is run in verbose mode.
diff --git a/src/pip/_internal/network/auth.py b/src/pip/_internal/network/auth.py
index 4705b55a7aa..1a2606ed080 100644
--- a/src/pip/_internal/network/auth.py
+++ b/src/pip/_internal/network/auth.py
@@ -271,6 +271,10 @@ def _get_keyring_auth(
         try:
             return self.keyring_provider.get_auth_info(url, username)
         except Exception as exc:
+            # Log the full exception (with stacktrace) at debug, so it'll only
+            # show up when running in verbose mode.
+            logger.debug("Keyring is skipped due to an exception", exc_info=True)
+            # Always log a shortened version of the exception.
             logger.warning(
                 "Keyring is skipped due to an exception: %s",
                 str(exc),
diff --git a/src/pip/_internal/utils/logging.py b/src/pip/_internal/utils/logging.py
index 90df257821e..41f6eb51a26 100644
--- a/src/pip/_internal/utils/logging.py
+++ b/src/pip/_internal/utils/logging.py
@@ -154,8 +154,8 @@ def emit(self, record: logging.LogRecord) -> None:
         style: Optional[Style] = None
 
         # If we are given a diagnostic error to present, present it with indentation.
-        assert isinstance(record.args, tuple)
         if getattr(record, "rich", False):
+            assert isinstance(record.args, tuple)
             (rich_renderable,) = record.args
             assert isinstance(
                 rich_renderable, (ConsoleRenderable, RichCast, str)

From d929bfe4a39019679ed442f5c6db011808de7ae8 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 10 Jun 2024 02:29:45 -0400
Subject: [PATCH 430/992] Upgrade packaging to 24.1 (#12759)

---
 news/packaging.vendor.rst                 |   1 +
 src/pip/_vendor/packaging/__init__.py     |   2 +-
 src/pip/_vendor/packaging/_elffile.py     |   8 +-
 src/pip/_vendor/packaging/_manylinux.py   |  22 ++--
 src/pip/_vendor/packaging/_musllinux.py   |  10 +-
 src/pip/_vendor/packaging/_parser.py      |  26 ++--
 src/pip/_vendor/packaging/_tokenizer.py   |  18 +--
 src/pip/_vendor/packaging/markers.py      | 115 +++++++++++++---
 src/pip/_vendor/packaging/metadata.py     | 153 ++++++++++------------
 src/pip/_vendor/packaging/requirements.py |   9 +-
 src/pip/_vendor/packaging/specifiers.py   |  56 ++++----
 src/pip/_vendor/packaging/tags.py         |  43 +++---
 src/pip/_vendor/packaging/utils.py        |  10 +-
 src/pip/_vendor/packaging/version.py      |  54 ++++----
 src/pip/_vendor/vendor.txt                |   2 +-
 15 files changed, 290 insertions(+), 239 deletions(-)
 create mode 100644 news/packaging.vendor.rst

diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst
new file mode 100644
index 00000000000..6e86a181016
--- /dev/null
+++ b/news/packaging.vendor.rst
@@ -0,0 +1 @@
+Upgrade packaging to 24.1
diff --git a/src/pip/_vendor/packaging/__init__.py b/src/pip/_vendor/packaging/__init__.py
index e7c0aa12ca9..9ba41d83579 100644
--- a/src/pip/_vendor/packaging/__init__.py
+++ b/src/pip/_vendor/packaging/__init__.py
@@ -6,7 +6,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "24.0"
+__version__ = "24.1"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
diff --git a/src/pip/_vendor/packaging/_elffile.py b/src/pip/_vendor/packaging/_elffile.py
index 6fb19b30bb5..f7a02180bfe 100644
--- a/src/pip/_vendor/packaging/_elffile.py
+++ b/src/pip/_vendor/packaging/_elffile.py
@@ -8,10 +8,12 @@
 ELF header: https://refspecs.linuxfoundation.org/elf/gabi4+/ch4.eheader.html
 """
 
+from __future__ import annotations
+
 import enum
 import os
 import struct
-from typing import IO, Optional, Tuple
+from typing import IO
 
 
 class ELFInvalid(ValueError):
@@ -87,11 +89,11 @@ def __init__(self, f: IO[bytes]) -> None:
         except struct.error as e:
             raise ELFInvalid("unable to parse machine and section information") from e
 
-    def _read(self, fmt: str) -> Tuple[int, ...]:
+    def _read(self, fmt: str) -> tuple[int, ...]:
         return struct.unpack(fmt, self._f.read(struct.calcsize(fmt)))
 
     @property
-    def interpreter(self) -> Optional[str]:
+    def interpreter(self) -> str | None:
         """
         The path recorded in the ``PT_INTERP`` section header.
         """
diff --git a/src/pip/_vendor/packaging/_manylinux.py b/src/pip/_vendor/packaging/_manylinux.py
index ad62505f3ff..08f651fbd8d 100644
--- a/src/pip/_vendor/packaging/_manylinux.py
+++ b/src/pip/_vendor/packaging/_manylinux.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import collections
 import contextlib
 import functools
@@ -5,7 +7,7 @@
 import re
 import sys
 import warnings
-from typing import Dict, Generator, Iterator, NamedTuple, Optional, Sequence, Tuple
+from typing import Generator, Iterator, NamedTuple, Sequence
 
 from ._elffile import EIClass, EIData, ELFFile, EMachine
 
@@ -17,7 +19,7 @@
 # `os.PathLike` not a generic type until Python 3.9, so sticking with `str`
 # as the type for `path` until then.
 @contextlib.contextmanager
-def _parse_elf(path: str) -> Generator[Optional[ELFFile], None, None]:
+def _parse_elf(path: str) -> Generator[ELFFile | None, None, None]:
     try:
         with open(path, "rb") as f:
             yield ELFFile(f)
@@ -72,7 +74,7 @@ def _have_compatible_abi(executable: str, archs: Sequence[str]) -> bool:
 # For now, guess what the highest minor version might be, assume it will
 # be 50 for testing. Once this actually happens, update the dictionary
 # with the actual value.
-_LAST_GLIBC_MINOR: Dict[int, int] = collections.defaultdict(lambda: 50)
+_LAST_GLIBC_MINOR: dict[int, int] = collections.defaultdict(lambda: 50)
 
 
 class _GLibCVersion(NamedTuple):
@@ -80,7 +82,7 @@ class _GLibCVersion(NamedTuple):
     minor: int
 
 
-def _glibc_version_string_confstr() -> Optional[str]:
+def _glibc_version_string_confstr() -> str | None:
     """
     Primary implementation of glibc_version_string using os.confstr.
     """
@@ -90,7 +92,7 @@ def _glibc_version_string_confstr() -> Optional[str]:
     # https://github.com/python/cpython/blob/fcf1d003bf4f0100c/Lib/platform.py#L175-L183
     try:
         # Should be a string like "glibc 2.17".
-        version_string: Optional[str] = os.confstr("CS_GNU_LIBC_VERSION")
+        version_string: str | None = os.confstr("CS_GNU_LIBC_VERSION")
         assert version_string is not None
         _, version = version_string.rsplit()
     except (AssertionError, AttributeError, OSError, ValueError):
@@ -99,7 +101,7 @@ def _glibc_version_string_confstr() -> Optional[str]:
     return version
 
 
-def _glibc_version_string_ctypes() -> Optional[str]:
+def _glibc_version_string_ctypes() -> str | None:
     """
     Fallback implementation of glibc_version_string using ctypes.
     """
@@ -143,12 +145,12 @@ def _glibc_version_string_ctypes() -> Optional[str]:
     return version_str
 
 
-def _glibc_version_string() -> Optional[str]:
+def _glibc_version_string() -> str | None:
     """Returns glibc version string, or None if not using glibc."""
     return _glibc_version_string_confstr() or _glibc_version_string_ctypes()
 
 
-def _parse_glibc_version(version_str: str) -> Tuple[int, int]:
+def _parse_glibc_version(version_str: str) -> tuple[int, int]:
     """Parse glibc version.
 
     We use a regexp instead of str.split because we want to discard any
@@ -167,8 +169,8 @@ def _parse_glibc_version(version_str: str) -> Tuple[int, int]:
     return int(m.group("major")), int(m.group("minor"))
 
 
-@functools.lru_cache()
-def _get_glibc_version() -> Tuple[int, int]:
+@functools.lru_cache
+def _get_glibc_version() -> tuple[int, int]:
     version_str = _glibc_version_string()
     if version_str is None:
         return (-1, -1)
diff --git a/src/pip/_vendor/packaging/_musllinux.py b/src/pip/_vendor/packaging/_musllinux.py
index 86419df9d70..d2bf30b5631 100644
--- a/src/pip/_vendor/packaging/_musllinux.py
+++ b/src/pip/_vendor/packaging/_musllinux.py
@@ -4,11 +4,13 @@
 linked against musl, and what musl version is used.
 """
 
+from __future__ import annotations
+
 import functools
 import re
 import subprocess
 import sys
-from typing import Iterator, NamedTuple, Optional, Sequence
+from typing import Iterator, NamedTuple, Sequence
 
 from ._elffile import ELFFile
 
@@ -18,7 +20,7 @@ class _MuslVersion(NamedTuple):
     minor: int
 
 
-def _parse_musl_version(output: str) -> Optional[_MuslVersion]:
+def _parse_musl_version(output: str) -> _MuslVersion | None:
     lines = [n for n in (n.strip() for n in output.splitlines()) if n]
     if len(lines) < 2 or lines[0][:4] != "musl":
         return None
@@ -28,8 +30,8 @@ def _parse_musl_version(output: str) -> Optional[_MuslVersion]:
     return _MuslVersion(major=int(m.group(1)), minor=int(m.group(2)))
 
 
-@functools.lru_cache()
-def _get_musl_version(executable: str) -> Optional[_MuslVersion]:
+@functools.lru_cache
+def _get_musl_version(executable: str) -> _MuslVersion | None:
     """Detect currently-running musl runtime version.
 
     This is done by checking the specified executable's dynamic linking
diff --git a/src/pip/_vendor/packaging/_parser.py b/src/pip/_vendor/packaging/_parser.py
index 684df75457c..c1238c06eab 100644
--- a/src/pip/_vendor/packaging/_parser.py
+++ b/src/pip/_vendor/packaging/_parser.py
@@ -1,11 +1,13 @@
 """Handwritten parser of dependency specifiers.
 
-The docstring for each __parse_* function contains ENBF-inspired grammar representing
+The docstring for each __parse_* function contains EBNF-inspired grammar representing
 the implementation.
 """
 
+from __future__ import annotations
+
 import ast
-from typing import Any, List, NamedTuple, Optional, Tuple, Union
+from typing import NamedTuple, Sequence, Tuple, Union
 
 from ._tokenizer import DEFAULT_RULES, Tokenizer
 
@@ -41,20 +43,16 @@ def serialize(self) -> str:
 
 MarkerVar = Union[Variable, Value]
 MarkerItem = Tuple[MarkerVar, Op, MarkerVar]
-# MarkerAtom = Union[MarkerItem, List["MarkerAtom"]]
-# MarkerList = List[Union["MarkerList", MarkerAtom, str]]
-# mypy does not support recursive type definition
-# https://github.com/python/mypy/issues/731
-MarkerAtom = Any
-MarkerList = List[Any]
+MarkerAtom = Union[MarkerItem, Sequence["MarkerAtom"]]
+MarkerList = Sequence[Union["MarkerList", MarkerAtom, str]]
 
 
 class ParsedRequirement(NamedTuple):
     name: str
     url: str
-    extras: List[str]
+    extras: list[str]
     specifier: str
-    marker: Optional[MarkerList]
+    marker: MarkerList | None
 
 
 # --------------------------------------------------------------------------------------
@@ -87,7 +85,7 @@ def _parse_requirement(tokenizer: Tokenizer) -> ParsedRequirement:
 
 def _parse_requirement_details(
     tokenizer: Tokenizer,
-) -> Tuple[str, str, Optional[MarkerList]]:
+) -> tuple[str, str, MarkerList | None]:
     """
     requirement_details = AT URL (WS requirement_marker?)?
                         | specifier WS? (requirement_marker)?
@@ -156,7 +154,7 @@ def _parse_requirement_marker(
     return marker
 
 
-def _parse_extras(tokenizer: Tokenizer) -> List[str]:
+def _parse_extras(tokenizer: Tokenizer) -> list[str]:
     """
     extras = (LEFT_BRACKET wsp* extras_list? wsp* RIGHT_BRACKET)?
     """
@@ -175,11 +173,11 @@ def _parse_extras(tokenizer: Tokenizer) -> List[str]:
     return extras
 
 
-def _parse_extras_list(tokenizer: Tokenizer) -> List[str]:
+def _parse_extras_list(tokenizer: Tokenizer) -> list[str]:
     """
     extras_list = identifier (wsp* ',' wsp* identifier)*
     """
-    extras: List[str] = []
+    extras: list[str] = []
 
     if not tokenizer.check("IDENTIFIER"):
         return extras
diff --git a/src/pip/_vendor/packaging/_tokenizer.py b/src/pip/_vendor/packaging/_tokenizer.py
index dd0d648d49a..89d041605c0 100644
--- a/src/pip/_vendor/packaging/_tokenizer.py
+++ b/src/pip/_vendor/packaging/_tokenizer.py
@@ -1,7 +1,9 @@
+from __future__ import annotations
+
 import contextlib
 import re
 from dataclasses import dataclass
-from typing import Dict, Iterator, NoReturn, Optional, Tuple, Union
+from typing import Iterator, NoReturn
 
 from .specifiers import Specifier
 
@@ -21,7 +23,7 @@ def __init__(
         message: str,
         *,
         source: str,
-        span: Tuple[int, int],
+        span: tuple[int, int],
     ) -> None:
         self.span = span
         self.message = message
@@ -34,7 +36,7 @@ def __str__(self) -> str:
         return "\n    ".join([self.message, self.source, marker])
 
 
-DEFAULT_RULES: "Dict[str, Union[str, re.Pattern[str]]]" = {
+DEFAULT_RULES: dict[str, str | re.Pattern[str]] = {
     "LEFT_PARENTHESIS": r"\(",
     "RIGHT_PARENTHESIS": r"\)",
     "LEFT_BRACKET": r"\[",
@@ -96,13 +98,13 @@ def __init__(
         self,
         source: str,
         *,
-        rules: "Dict[str, Union[str, re.Pattern[str]]]",
+        rules: dict[str, str | re.Pattern[str]],
     ) -> None:
         self.source = source
-        self.rules: Dict[str, re.Pattern[str]] = {
+        self.rules: dict[str, re.Pattern[str]] = {
             name: re.compile(pattern) for name, pattern in rules.items()
         }
-        self.next_token: Optional[Token] = None
+        self.next_token: Token | None = None
         self.position = 0
 
     def consume(self, name: str) -> None:
@@ -154,8 +156,8 @@ def raise_syntax_error(
         self,
         message: str,
         *,
-        span_start: Optional[int] = None,
-        span_end: Optional[int] = None,
+        span_start: int | None = None,
+        span_end: int | None = None,
     ) -> NoReturn:
         """Raise ParserSyntaxError at the given position."""
         span = (
diff --git a/src/pip/_vendor/packaging/markers.py b/src/pip/_vendor/packaging/markers.py
index 8b98fca7233..7ac7bb69a53 100644
--- a/src/pip/_vendor/packaging/markers.py
+++ b/src/pip/_vendor/packaging/markers.py
@@ -2,20 +2,16 @@
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
 
+from __future__ import annotations
+
 import operator
 import os
 import platform
 import sys
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union
-
-from ._parser import (
-    MarkerAtom,
-    MarkerList,
-    Op,
-    Value,
-    Variable,
-    parse_marker as _parse_marker,
-)
+from typing import Any, Callable, TypedDict, cast
+
+from ._parser import MarkerAtom, MarkerList, Op, Value, Variable
+from ._parser import parse_marker as _parse_marker
 from ._tokenizer import ParserSyntaxError
 from .specifiers import InvalidSpecifier, Specifier
 from .utils import canonicalize_name
@@ -50,6 +46,78 @@ class UndefinedEnvironmentName(ValueError):
     """
 
 
+class Environment(TypedDict):
+    implementation_name: str
+    """The implementation's identifier, e.g. ``'cpython'``."""
+
+    implementation_version: str
+    """
+    The implementation's version, e.g. ``'3.13.0a2'`` for CPython 3.13.0a2, or
+    ``'7.3.13'`` for PyPy3.10 v7.3.13.
+    """
+
+    os_name: str
+    """
+    The value of :py:data:`os.name`. The name of the operating system dependent module
+    imported, e.g. ``'posix'``.
+    """
+
+    platform_machine: str
+    """
+    Returns the machine type, e.g. ``'i386'``.
+
+    An empty string if the value cannot be determined.
+    """
+
+    platform_release: str
+    """
+    The system's release, e.g. ``'2.2.0'`` or ``'NT'``.
+
+    An empty string if the value cannot be determined.
+    """
+
+    platform_system: str
+    """
+    The system/OS name, e.g. ``'Linux'``, ``'Windows'`` or ``'Java'``.
+
+    An empty string if the value cannot be determined.
+    """
+
+    platform_version: str
+    """
+    The system's release version, e.g. ``'#3 on degas'``.
+
+    An empty string if the value cannot be determined.
+    """
+
+    python_full_version: str
+    """
+    The Python version as string ``'major.minor.patchlevel'``.
+
+    Note that unlike the Python :py:data:`sys.version`, this value will always include
+    the patchlevel (it defaults to 0).
+    """
+
+    platform_python_implementation: str
+    """
+    A string identifying the Python implementation, e.g. ``'CPython'``.
+    """
+
+    python_version: str
+    """The Python version as string ``'major.minor'``."""
+
+    sys_platform: str
+    """
+    This string contains a platform identifier that can be used to append
+    platform-specific components to :py:data:`sys.path`, for instance.
+
+    For Unix systems, except on Linux and AIX, this is the lowercased OS name as
+    returned by ``uname -s`` with the first part of the version as returned by
+    ``uname -r`` appended, e.g. ``'sunos5'`` or ``'freebsd8'``, at the time when Python
+    was built.
+    """
+
+
 def _normalize_extra_values(results: Any) -> Any:
     """
     Normalize extra values.
@@ -67,9 +135,8 @@ def _normalize_extra_values(results: Any) -> Any:
 
 
 def _format_marker(
-    marker: Union[List[str], MarkerAtom, str], first: Optional[bool] = True
+    marker: list[str] | MarkerAtom | str, first: bool | None = True
 ) -> str:
-
     assert isinstance(marker, (list, tuple, str))
 
     # Sometimes we have a structure like [[...]] which is a single item list
@@ -95,7 +162,7 @@ def _format_marker(
         return marker
 
 
-_operators: Dict[str, Operator] = {
+_operators: dict[str, Operator] = {
     "in": lambda lhs, rhs: lhs in rhs,
     "not in": lambda lhs, rhs: lhs not in rhs,
     "<": operator.lt,
@@ -115,14 +182,14 @@ def _eval_op(lhs: str, op: Op, rhs: str) -> bool:
     else:
         return spec.contains(lhs, prereleases=True)
 
-    oper: Optional[Operator] = _operators.get(op.serialize())
+    oper: Operator | None = _operators.get(op.serialize())
     if oper is None:
         raise UndefinedComparison(f"Undefined {op!r} on {lhs!r} and {rhs!r}.")
 
     return oper(lhs, rhs)
 
 
-def _normalize(*values: str, key: str) -> Tuple[str, ...]:
+def _normalize(*values: str, key: str) -> tuple[str, ...]:
     # PEP 685 – Comparison of extra names for optional distribution dependencies
     # https://peps.python.org/pep-0685/
     # > When comparing extra names, tools MUST normalize the names being
@@ -134,8 +201,8 @@ def _normalize(*values: str, key: str) -> Tuple[str, ...]:
     return values
 
 
-def _evaluate_markers(markers: MarkerList, environment: Dict[str, str]) -> bool:
-    groups: List[List[bool]] = [[]]
+def _evaluate_markers(markers: MarkerList, environment: dict[str, str]) -> bool:
+    groups: list[list[bool]] = [[]]
 
     for marker in markers:
         assert isinstance(marker, (list, tuple, str))
@@ -164,7 +231,7 @@ def _evaluate_markers(markers: MarkerList, environment: Dict[str, str]) -> bool:
     return any(all(item) for item in groups)
 
 
-def format_full_version(info: "sys._version_info") -> str:
+def format_full_version(info: sys._version_info) -> str:
     version = "{0.major}.{0.minor}.{0.micro}".format(info)
     kind = info.releaselevel
     if kind != "final":
@@ -172,7 +239,7 @@ def format_full_version(info: "sys._version_info") -> str:
     return version
 
 
-def default_environment() -> Dict[str, str]:
+def default_environment() -> Environment:
     iver = format_full_version(sys.implementation.version)
     implementation_name = sys.implementation.name
     return {
@@ -231,7 +298,7 @@ def __eq__(self, other: Any) -> bool:
 
         return str(self) == str(other)
 
-    def evaluate(self, environment: Optional[Dict[str, str]] = None) -> bool:
+    def evaluate(self, environment: dict[str, str] | None = None) -> bool:
         """Evaluate a marker.
 
         Return the boolean from evaluating the given marker against the
@@ -240,8 +307,14 @@ def evaluate(self, environment: Optional[Dict[str, str]] = None) -> bool:
 
         The environment is determined from the current Python process.
         """
-        current_environment = default_environment()
+        current_environment = cast("dict[str, str]", default_environment())
         current_environment["extra"] = ""
+        # Work around platform.python_version() returning something that is not PEP 440
+        # compliant for non-tagged Python builds. We preserve default_environment()'s
+        # behavior of returning platform.python_version() verbatim, and leave it to the
+        # caller to provide a syntactically valid version if they want to override it.
+        if current_environment["python_full_version"].endswith("+"):
+            current_environment["python_full_version"] += "local"
         if environment is not None:
             current_environment.update(environment)
             # The API used to allow setting extra to None. We need to handle this
diff --git a/src/pip/_vendor/packaging/metadata.py b/src/pip/_vendor/packaging/metadata.py
index 5e4c106c549..eb8dc844d28 100644
--- a/src/pip/_vendor/packaging/metadata.py
+++ b/src/pip/_vendor/packaging/metadata.py
@@ -1,50 +1,31 @@
+from __future__ import annotations
+
 import email.feedparser
 import email.header
 import email.message
 import email.parser
 import email.policy
-import sys
 import typing
 from typing import (
     Any,
     Callable,
-    Dict,
     Generic,
-    List,
-    Optional,
-    Tuple,
-    Type,
-    Union,
+    Literal,
+    TypedDict,
     cast,
 )
 
-from . import requirements, specifiers, utils, version as version_module
+from . import requirements, specifiers, utils
+from . import version as version_module
 
 T = typing.TypeVar("T")
-if sys.version_info[:2] >= (3, 8):  # pragma: no cover
-    from typing import Literal, TypedDict
-else:  # pragma: no cover
-    if typing.TYPE_CHECKING:
-        from pip._vendor.typing_extensions import Literal, TypedDict
-    else:
-        try:
-            from pip._vendor.typing_extensions import Literal, TypedDict
-        except ImportError:
-
-            class Literal:
-                def __init_subclass__(*_args, **_kwargs):
-                    pass
-
-            class TypedDict:
-                def __init_subclass__(*_args, **_kwargs):
-                    pass
 
 
 try:
     ExceptionGroup
 except NameError:  # pragma: no cover
 
-    class ExceptionGroup(Exception):  # noqa: N818
+    class ExceptionGroup(Exception):
         """A minimal implementation of :external:exc:`ExceptionGroup` from Python 3.11.
 
         If :external:exc:`ExceptionGroup` is already defined by Python itself,
@@ -52,9 +33,9 @@ class ExceptionGroup(Exception):  # noqa: N818
         """
 
         message: str
-        exceptions: List[Exception]
+        exceptions: list[Exception]
 
-        def __init__(self, message: str, exceptions: List[Exception]) -> None:
+        def __init__(self, message: str, exceptions: list[Exception]) -> None:
             self.message = message
             self.exceptions = exceptions
 
@@ -100,32 +81,32 @@ class RawMetadata(TypedDict, total=False):
     metadata_version: str
     name: str
     version: str
-    platforms: List[str]
+    platforms: list[str]
     summary: str
     description: str
-    keywords: List[str]
+    keywords: list[str]
     home_page: str
     author: str
     author_email: str
     license: str
 
     # Metadata 1.1 - PEP 314
-    supported_platforms: List[str]
+    supported_platforms: list[str]
     download_url: str
-    classifiers: List[str]
-    requires: List[str]
-    provides: List[str]
-    obsoletes: List[str]
+    classifiers: list[str]
+    requires: list[str]
+    provides: list[str]
+    obsoletes: list[str]
 
     # Metadata 1.2 - PEP 345
     maintainer: str
     maintainer_email: str
-    requires_dist: List[str]
-    provides_dist: List[str]
-    obsoletes_dist: List[str]
+    requires_dist: list[str]
+    provides_dist: list[str]
+    obsoletes_dist: list[str]
     requires_python: str
-    requires_external: List[str]
-    project_urls: Dict[str, str]
+    requires_external: list[str]
+    project_urls: dict[str, str]
 
     # Metadata 2.0
     # PEP 426 attempted to completely revamp the metadata format
@@ -138,10 +119,10 @@ class RawMetadata(TypedDict, total=False):
 
     # Metadata 2.1 - PEP 566
     description_content_type: str
-    provides_extra: List[str]
+    provides_extra: list[str]
 
     # Metadata 2.2 - PEP 643
-    dynamic: List[str]
+    dynamic: list[str]
 
     # Metadata 2.3 - PEP 685
     # No new fields were added in PEP 685, just some edge case were
@@ -185,12 +166,12 @@ class RawMetadata(TypedDict, total=False):
 }
 
 
-def _parse_keywords(data: str) -> List[str]:
+def _parse_keywords(data: str) -> list[str]:
     """Split a string of comma-separate keyboards into a list of keywords."""
     return [k.strip() for k in data.split(",")]
 
 
-def _parse_project_urls(data: List[str]) -> Dict[str, str]:
+def _parse_project_urls(data: list[str]) -> dict[str, str]:
     """Parse a list of label/URL string pairings separated by a comma."""
     urls = {}
     for pair in data:
@@ -230,7 +211,7 @@ def _parse_project_urls(data: List[str]) -> Dict[str, str]:
     return urls
 
 
-def _get_payload(msg: email.message.Message, source: Union[bytes, str]) -> str:
+def _get_payload(msg: email.message.Message, source: bytes | str) -> str:
     """Get the body of the message."""
     # If our source is a str, then our caller has managed encodings for us,
     # and we don't need to deal with it.
@@ -292,7 +273,7 @@ def _get_payload(msg: email.message.Message, source: Union[bytes, str]) -> str:
 _RAW_TO_EMAIL_MAPPING = {raw: email for email, raw in _EMAIL_TO_RAW_MAPPING.items()}
 
 
-def parse_email(data: Union[bytes, str]) -> Tuple[RawMetadata, Dict[str, List[str]]]:
+def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
     """Parse a distribution's metadata stored as email headers (e.g. from ``METADATA``).
 
     This function returns a two-item tuple of dicts. The first dict is of
@@ -308,8 +289,8 @@ def parse_email(data: Union[bytes, str]) -> Tuple[RawMetadata, Dict[str, List[st
     included in this dict.
 
     """
-    raw: Dict[str, Union[str, List[str], Dict[str, str]]] = {}
-    unparsed: Dict[str, List[str]] = {}
+    raw: dict[str, str | list[str] | dict[str, str]] = {}
+    unparsed: dict[str, list[str]] = {}
 
     if isinstance(data, str):
         parsed = email.parser.Parser(policy=email.policy.compat32).parsestr(data)
@@ -357,7 +338,7 @@ def parse_email(data: Union[bytes, str]) -> Tuple[RawMetadata, Dict[str, List[st
                 # The Header object stores it's data as chunks, and each chunk
                 # can be independently encoded, so we'll need to check each
                 # of them.
-                chunks: List[Tuple[bytes, Optional[str]]] = []
+                chunks: list[tuple[bytes, str | None]] = []
                 for bin, encoding in email.header.decode_header(h):
                     try:
                         bin.decode("utf8", "strict")
@@ -499,11 +480,11 @@ def __init__(
     ) -> None:
         self.added = added
 
-    def __set_name__(self, _owner: "Metadata", name: str) -> None:
+    def __set_name__(self, _owner: Metadata, name: str) -> None:
         self.name = name
         self.raw_name = _RAW_TO_EMAIL_MAPPING[name]
 
-    def __get__(self, instance: "Metadata", _owner: Type["Metadata"]) -> T:
+    def __get__(self, instance: Metadata, _owner: type[Metadata]) -> T:
         # With Python 3.8, the caching can be replaced with functools.cached_property().
         # No need to check the cache as attribute lookup will resolve into the
         # instance's __dict__ before __get__ is called.
@@ -531,7 +512,7 @@ def __get__(self, instance: "Metadata", _owner: Type["Metadata"]) -> T:
         return cast(T, value)
 
     def _invalid_metadata(
-        self, msg: str, cause: Optional[Exception] = None
+        self, msg: str, cause: Exception | None = None
     ) -> InvalidMetadata:
         exc = InvalidMetadata(
             self.raw_name, msg.format_map({"field": repr(self.raw_name)})
@@ -606,7 +587,7 @@ def _process_description_content_type(self, value: str) -> str:
             )
         return value
 
-    def _process_dynamic(self, value: List[str]) -> List[str]:
+    def _process_dynamic(self, value: list[str]) -> list[str]:
         for dynamic_field in map(str.lower, value):
             if dynamic_field in {"name", "version", "metadata-version"}:
                 raise self._invalid_metadata(
@@ -618,8 +599,8 @@ def _process_dynamic(self, value: List[str]) -> List[str]:
 
     def _process_provides_extra(
         self,
-        value: List[str],
-    ) -> List[utils.NormalizedName]:
+        value: list[str],
+    ) -> list[utils.NormalizedName]:
         normalized_names = []
         try:
             for name in value:
@@ -641,8 +622,8 @@ def _process_requires_python(self, value: str) -> specifiers.SpecifierSet:
 
     def _process_requires_dist(
         self,
-        value: List[str],
-    ) -> List[requirements.Requirement]:
+        value: list[str],
+    ) -> list[requirements.Requirement]:
         reqs = []
         try:
             for req in value:
@@ -665,7 +646,7 @@ class Metadata:
     _raw: RawMetadata
 
     @classmethod
-    def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> "Metadata":
+    def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> Metadata:
         """Create an instance from :class:`RawMetadata`.
 
         If *validate* is true, all metadata will be validated. All exceptions
@@ -675,7 +656,7 @@ def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> "Metadata":
         ins._raw = data.copy()  # Mutations occur due to caching enriched values.
 
         if validate:
-            exceptions: List[Exception] = []
+            exceptions: list[Exception] = []
             try:
                 metadata_version = ins.metadata_version
                 metadata_age = _VALID_METADATA_VERSIONS.index(metadata_version)
@@ -722,9 +703,7 @@ def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> "Metadata":
         return ins
 
     @classmethod
-    def from_email(
-        cls, data: Union[bytes, str], *, validate: bool = True
-    ) -> "Metadata":
+    def from_email(cls, data: bytes | str, *, validate: bool = True) -> Metadata:
         """Parse metadata from email headers.
 
         If *validate* is true, the metadata will be validated. All exceptions
@@ -760,66 +739,66 @@ def from_email(
     *validate* parameter)"""
     version: _Validator[version_module.Version] = _Validator()
     """:external:ref:`core-metadata-version` (required)"""
-    dynamic: _Validator[Optional[List[str]]] = _Validator(
+    dynamic: _Validator[list[str] | None] = _Validator(
         added="2.2",
     )
     """:external:ref:`core-metadata-dynamic`
     (validated against core metadata field names and lowercased)"""
-    platforms: _Validator[Optional[List[str]]] = _Validator()
+    platforms: _Validator[list[str] | None] = _Validator()
     """:external:ref:`core-metadata-platform`"""
-    supported_platforms: _Validator[Optional[List[str]]] = _Validator(added="1.1")
+    supported_platforms: _Validator[list[str] | None] = _Validator(added="1.1")
     """:external:ref:`core-metadata-supported-platform`"""
-    summary: _Validator[Optional[str]] = _Validator()
+    summary: _Validator[str | None] = _Validator()
     """:external:ref:`core-metadata-summary` (validated to contain no newlines)"""
-    description: _Validator[Optional[str]] = _Validator()  # TODO 2.1: can be in body
+    description: _Validator[str | None] = _Validator()  # TODO 2.1: can be in body
     """:external:ref:`core-metadata-description`"""
-    description_content_type: _Validator[Optional[str]] = _Validator(added="2.1")
+    description_content_type: _Validator[str | None] = _Validator(added="2.1")
     """:external:ref:`core-metadata-description-content-type` (validated)"""
-    keywords: _Validator[Optional[List[str]]] = _Validator()
+    keywords: _Validator[list[str] | None] = _Validator()
     """:external:ref:`core-metadata-keywords`"""
-    home_page: _Validator[Optional[str]] = _Validator()
+    home_page: _Validator[str | None] = _Validator()
     """:external:ref:`core-metadata-home-page`"""
-    download_url: _Validator[Optional[str]] = _Validator(added="1.1")
+    download_url: _Validator[str | None] = _Validator(added="1.1")
     """:external:ref:`core-metadata-download-url`"""
-    author: _Validator[Optional[str]] = _Validator()
+    author: _Validator[str | None] = _Validator()
     """:external:ref:`core-metadata-author`"""
-    author_email: _Validator[Optional[str]] = _Validator()
+    author_email: _Validator[str | None] = _Validator()
     """:external:ref:`core-metadata-author-email`"""
-    maintainer: _Validator[Optional[str]] = _Validator(added="1.2")
+    maintainer: _Validator[str | None] = _Validator(added="1.2")
     """:external:ref:`core-metadata-maintainer`"""
-    maintainer_email: _Validator[Optional[str]] = _Validator(added="1.2")
+    maintainer_email: _Validator[str | None] = _Validator(added="1.2")
     """:external:ref:`core-metadata-maintainer-email`"""
-    license: _Validator[Optional[str]] = _Validator()
+    license: _Validator[str | None] = _Validator()
     """:external:ref:`core-metadata-license`"""
-    classifiers: _Validator[Optional[List[str]]] = _Validator(added="1.1")
+    classifiers: _Validator[list[str] | None] = _Validator(added="1.1")
     """:external:ref:`core-metadata-classifier`"""
-    requires_dist: _Validator[Optional[List[requirements.Requirement]]] = _Validator(
+    requires_dist: _Validator[list[requirements.Requirement] | None] = _Validator(
         added="1.2"
     )
     """:external:ref:`core-metadata-requires-dist`"""
-    requires_python: _Validator[Optional[specifiers.SpecifierSet]] = _Validator(
+    requires_python: _Validator[specifiers.SpecifierSet | None] = _Validator(
         added="1.2"
     )
     """:external:ref:`core-metadata-requires-python`"""
     # Because `Requires-External` allows for non-PEP 440 version specifiers, we
     # don't do any processing on the values.
-    requires_external: _Validator[Optional[List[str]]] = _Validator(added="1.2")
+    requires_external: _Validator[list[str] | None] = _Validator(added="1.2")
     """:external:ref:`core-metadata-requires-external`"""
-    project_urls: _Validator[Optional[Dict[str, str]]] = _Validator(added="1.2")
+    project_urls: _Validator[dict[str, str] | None] = _Validator(added="1.2")
     """:external:ref:`core-metadata-project-url`"""
     # PEP 685 lets us raise an error if an extra doesn't pass `Name` validation
     # regardless of metadata version.
-    provides_extra: _Validator[Optional[List[utils.NormalizedName]]] = _Validator(
+    provides_extra: _Validator[list[utils.NormalizedName] | None] = _Validator(
         added="2.1",
     )
     """:external:ref:`core-metadata-provides-extra`"""
-    provides_dist: _Validator[Optional[List[str]]] = _Validator(added="1.2")
+    provides_dist: _Validator[list[str] | None] = _Validator(added="1.2")
     """:external:ref:`core-metadata-provides-dist`"""
-    obsoletes_dist: _Validator[Optional[List[str]]] = _Validator(added="1.2")
+    obsoletes_dist: _Validator[list[str] | None] = _Validator(added="1.2")
     """:external:ref:`core-metadata-obsoletes-dist`"""
-    requires: _Validator[Optional[List[str]]] = _Validator(added="1.1")
+    requires: _Validator[list[str] | None] = _Validator(added="1.1")
     """``Requires`` (deprecated)"""
-    provides: _Validator[Optional[List[str]]] = _Validator(added="1.1")
+    provides: _Validator[list[str] | None] = _Validator(added="1.1")
     """``Provides`` (deprecated)"""
-    obsoletes: _Validator[Optional[List[str]]] = _Validator(added="1.1")
+    obsoletes: _Validator[list[str] | None] = _Validator(added="1.1")
     """``Obsoletes`` (deprecated)"""
diff --git a/src/pip/_vendor/packaging/requirements.py b/src/pip/_vendor/packaging/requirements.py
index bdc43a7e98d..4e068c9567d 100644
--- a/src/pip/_vendor/packaging/requirements.py
+++ b/src/pip/_vendor/packaging/requirements.py
@@ -1,8 +1,9 @@
 # This file is dual licensed under the terms of the Apache License, Version
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
+from __future__ import annotations
 
-from typing import Any, Iterator, Optional, Set
+from typing import Any, Iterator
 
 from ._parser import parse_requirement as _parse_requirement
 from ._tokenizer import ParserSyntaxError
@@ -37,10 +38,10 @@ def __init__(self, requirement_string: str) -> None:
             raise InvalidRequirement(str(e)) from e
 
         self.name: str = parsed.name
-        self.url: Optional[str] = parsed.url or None
-        self.extras: Set[str] = set(parsed.extras or [])
+        self.url: str | None = parsed.url or None
+        self.extras: set[str] = set(parsed.extras or [])
         self.specifier: SpecifierSet = SpecifierSet(parsed.specifier)
-        self.marker: Optional[Marker] = None
+        self.marker: Marker | None = None
         if parsed.marker is not None:
             self.marker = Marker.__new__(Marker)
             self.marker._markers = _normalize_extra_values(parsed.marker)
diff --git a/src/pip/_vendor/packaging/specifiers.py b/src/pip/_vendor/packaging/specifiers.py
index 3a6497e44e6..f3ac480fa68 100644
--- a/src/pip/_vendor/packaging/specifiers.py
+++ b/src/pip/_vendor/packaging/specifiers.py
@@ -8,10 +8,12 @@
     from pip._vendor.packaging.version import Version
 """
 
+from __future__ import annotations
+
 import abc
 import itertools
 import re
-from typing import Callable, Iterable, Iterator, List, Optional, Tuple, TypeVar, Union
+from typing import Callable, Iterable, Iterator, TypeVar, Union
 
 from .utils import canonicalize_version
 from .version import Version
@@ -64,7 +66,7 @@ def __eq__(self, other: object) -> bool:
 
     @property
     @abc.abstractmethod
-    def prereleases(self) -> Optional[bool]:
+    def prereleases(self) -> bool | None:
         """Whether or not pre-releases as a whole are allowed.
 
         This can be set to either ``True`` or ``False`` to explicitly enable or disable
@@ -79,14 +81,14 @@ def prereleases(self, value: bool) -> None:
         """
 
     @abc.abstractmethod
-    def contains(self, item: str, prereleases: Optional[bool] = None) -> bool:
+    def contains(self, item: str, prereleases: bool | None = None) -> bool:
         """
         Determines if the given item is contained within this specifier.
         """
 
     @abc.abstractmethod
     def filter(
-        self, iterable: Iterable[UnparsedVersionVar], prereleases: Optional[bool] = None
+        self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None
     ) -> Iterator[UnparsedVersionVar]:
         """
         Takes an iterable of items and filters them so that only items which
@@ -217,7 +219,7 @@ class Specifier(BaseSpecifier):
         "===": "arbitrary",
     }
 
-    def __init__(self, spec: str = "", prereleases: Optional[bool] = None) -> None:
+    def __init__(self, spec: str = "", prereleases: bool | None = None) -> None:
         """Initialize a Specifier instance.
 
         :param spec:
@@ -234,7 +236,7 @@ def __init__(self, spec: str = "", prereleases: Optional[bool] = None) -> None:
         if not match:
             raise InvalidSpecifier(f"Invalid specifier: '{spec}'")
 
-        self._spec: Tuple[str, str] = (
+        self._spec: tuple[str, str] = (
             match.group("operator").strip(),
             match.group("version").strip(),
         )
@@ -318,7 +320,7 @@ def __str__(self) -> str:
         return "{}{}".format(*self._spec)
 
     @property
-    def _canonical_spec(self) -> Tuple[str, str]:
+    def _canonical_spec(self) -> tuple[str, str]:
         canonical_version = canonicalize_version(
             self._spec[1],
             strip_trailing_zero=(self._spec[0] != "~="),
@@ -364,7 +366,6 @@ def _get_operator(self, op: str) -> CallableOperator:
         return operator_callable
 
     def _compare_compatible(self, prospective: Version, spec: str) -> bool:
-
         # Compatible releases have an equivalent combination of >= and ==. That
         # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
         # implement this in terms of the other specifiers instead of
@@ -385,7 +386,6 @@ def _compare_compatible(self, prospective: Version, spec: str) -> bool:
         )
 
     def _compare_equal(self, prospective: Version, spec: str) -> bool:
-
         # We need special logic to handle prefix matching
         if spec.endswith(".*"):
             # In the case of prefix matching we want to ignore local segment.
@@ -429,21 +429,18 @@ def _compare_not_equal(self, prospective: Version, spec: str) -> bool:
         return not self._compare_equal(prospective, spec)
 
     def _compare_less_than_equal(self, prospective: Version, spec: str) -> bool:
-
         # NB: Local version identifiers are NOT permitted in the version
         # specifier, so local version labels can be universally removed from
         # the prospective version.
         return Version(prospective.public) <= Version(spec)
 
     def _compare_greater_than_equal(self, prospective: Version, spec: str) -> bool:
-
         # NB: Local version identifiers are NOT permitted in the version
         # specifier, so local version labels can be universally removed from
         # the prospective version.
         return Version(prospective.public) >= Version(spec)
 
     def _compare_less_than(self, prospective: Version, spec_str: str) -> bool:
-
         # Convert our spec to a Version instance, since we'll want to work with
         # it as a version.
         spec = Version(spec_str)
@@ -468,7 +465,6 @@ def _compare_less_than(self, prospective: Version, spec_str: str) -> bool:
         return True
 
     def _compare_greater_than(self, prospective: Version, spec_str: str) -> bool:
-
         # Convert our spec to a Version instance, since we'll want to work with
         # it as a version.
         spec = Version(spec_str)
@@ -501,7 +497,7 @@ def _compare_greater_than(self, prospective: Version, spec_str: str) -> bool:
     def _compare_arbitrary(self, prospective: Version, spec: str) -> bool:
         return str(prospective).lower() == str(spec).lower()
 
-    def __contains__(self, item: Union[str, Version]) -> bool:
+    def __contains__(self, item: str | Version) -> bool:
         """Return whether or not the item is contained in this specifier.
 
         :param item: The item to check for.
@@ -522,9 +518,7 @@ def __contains__(self, item: Union[str, Version]) -> bool:
         """
         return self.contains(item)
 
-    def contains(
-        self, item: UnparsedVersion, prereleases: Optional[bool] = None
-    ) -> bool:
+    def contains(self, item: UnparsedVersion, prereleases: bool | None = None) -> bool:
         """Return whether or not the item is contained in this specifier.
 
         :param item:
@@ -569,7 +563,7 @@ def contains(
         return operator_callable(normalized_item, self.version)
 
     def filter(
-        self, iterable: Iterable[UnparsedVersionVar], prereleases: Optional[bool] = None
+        self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None
     ) -> Iterator[UnparsedVersionVar]:
         """Filter items in the given iterable, that match the specifier.
 
@@ -633,7 +627,7 @@ def filter(
 _prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
 
 
-def _version_split(version: str) -> List[str]:
+def _version_split(version: str) -> list[str]:
     """Split version into components.
 
     The split components are intended for version comparison. The logic does
@@ -641,7 +635,7 @@ def _version_split(version: str) -> List[str]:
     components back with :func:`_version_join` may not produce the original
     version string.
     """
-    result: List[str] = []
+    result: list[str] = []
 
     epoch, _, rest = version.rpartition("!")
     result.append(epoch or "0")
@@ -655,7 +649,7 @@ def _version_split(version: str) -> List[str]:
     return result
 
 
-def _version_join(components: List[str]) -> str:
+def _version_join(components: list[str]) -> str:
     """Join split version components into a version string.
 
     This function assumes the input came from :func:`_version_split`, where the
@@ -672,7 +666,7 @@ def _is_not_suffix(segment: str) -> bool:
     )
 
 
-def _pad_version(left: List[str], right: List[str]) -> Tuple[List[str], List[str]]:
+def _pad_version(left: list[str], right: list[str]) -> tuple[list[str], list[str]]:
     left_split, right_split = [], []
 
     # Get the release segment of our versions
@@ -700,9 +694,7 @@ class SpecifierSet(BaseSpecifier):
     specifiers (``>=3.0,!=3.1``), or no specifier at all.
     """
 
-    def __init__(
-        self, specifiers: str = "", prereleases: Optional[bool] = None
-    ) -> None:
+    def __init__(self, specifiers: str = "", prereleases: bool | None = None) -> None:
         """Initialize a SpecifierSet instance.
 
         :param specifiers:
@@ -730,7 +722,7 @@ def __init__(
         self._prereleases = prereleases
 
     @property
-    def prereleases(self) -> Optional[bool]:
+    def prereleases(self) -> bool | None:
         # If we have been given an explicit prerelease modifier, then we'll
         # pass that through here.
         if self._prereleases is not None:
@@ -787,7 +779,7 @@ def __str__(self) -> str:
     def __hash__(self) -> int:
         return hash(self._specs)
 
-    def __and__(self, other: Union["SpecifierSet", str]) -> "SpecifierSet":
+    def __and__(self, other: SpecifierSet | str) -> SpecifierSet:
         """Return a SpecifierSet which is a combination of the two sets.
 
         :param other: The other object to combine with.
@@ -883,8 +875,8 @@ def __contains__(self, item: UnparsedVersion) -> bool:
     def contains(
         self,
         item: UnparsedVersion,
-        prereleases: Optional[bool] = None,
-        installed: Optional[bool] = None,
+        prereleases: bool | None = None,
+        installed: bool | None = None,
     ) -> bool:
         """Return whether or not the item is contained in this SpecifierSet.
 
@@ -938,7 +930,7 @@ def contains(
         return all(s.contains(item, prereleases=prereleases) for s in self._specs)
 
     def filter(
-        self, iterable: Iterable[UnparsedVersionVar], prereleases: Optional[bool] = None
+        self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None
     ) -> Iterator[UnparsedVersionVar]:
         """Filter items in the given iterable, that match the specifiers in this set.
 
@@ -995,8 +987,8 @@ def filter(
         # which will filter out any pre-releases, unless there are no final
         # releases.
         else:
-            filtered: List[UnparsedVersionVar] = []
-            found_prereleases: List[UnparsedVersionVar] = []
+            filtered: list[UnparsedVersionVar] = []
+            found_prereleases: list[UnparsedVersionVar] = []
 
             for item in iterable:
                 parsed_version = _coerce_version(item)
diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
index 89f1926137d..6667d299085 100644
--- a/src/pip/_vendor/packaging/tags.py
+++ b/src/pip/_vendor/packaging/tags.py
@@ -2,6 +2,8 @@
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
 
+from __future__ import annotations
+
 import logging
 import platform
 import re
@@ -11,15 +13,10 @@
 import sysconfig
 from importlib.machinery import EXTENSION_SUFFIXES
 from typing import (
-    Dict,
-    FrozenSet,
     Iterable,
     Iterator,
-    List,
-    Optional,
     Sequence,
     Tuple,
-    Union,
     cast,
 )
 
@@ -30,7 +27,7 @@
 PythonVersion = Sequence[int]
 MacVersion = Tuple[int, int]
 
-INTERPRETER_SHORT_NAMES: Dict[str, str] = {
+INTERPRETER_SHORT_NAMES: dict[str, str] = {
     "python": "py",  # Generic.
     "cpython": "cp",
     "pypy": "pp",
@@ -96,7 +93,7 @@ def __repr__(self) -> str:
         return f"<{self} @ {id(self)}>"
 
 
-def parse_tag(tag: str) -> FrozenSet[Tag]:
+def parse_tag(tag: str) -> frozenset[Tag]:
     """
     Parses the provided tag (e.g. `py3-none-any`) into a frozenset of Tag instances.
 
@@ -112,8 +109,8 @@ def parse_tag(tag: str) -> FrozenSet[Tag]:
     return frozenset(tags)
 
 
-def _get_config_var(name: str, warn: bool = False) -> Union[int, str, None]:
-    value: Union[int, str, None] = sysconfig.get_config_var(name)
+def _get_config_var(name: str, warn: bool = False) -> int | str | None:
+    value: int | str | None = sysconfig.get_config_var(name)
     if value is None and warn:
         logger.debug(
             "Config variable '%s' is unset, Python ABI tag may be incorrect", name
@@ -125,7 +122,7 @@ def _normalize_string(string: str) -> str:
     return string.replace(".", "_").replace("-", "_").replace(" ", "_")
 
 
-def _is_threaded_cpython(abis: List[str]) -> bool:
+def _is_threaded_cpython(abis: list[str]) -> bool:
     """
     Determine if the ABI corresponds to a threaded (`--disable-gil`) build.
 
@@ -151,7 +148,7 @@ def _abi3_applies(python_version: PythonVersion, threading: bool) -> bool:
     return len(python_version) > 1 and tuple(python_version) >= (3, 2) and not threading
 
 
-def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> List[str]:
+def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> list[str]:
     py_version = tuple(py_version)  # To allow for version comparison.
     abis = []
     version = _version_nodot(py_version[:2])
@@ -185,9 +182,9 @@ def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> List[str]:
 
 
 def cpython_tags(
-    python_version: Optional[PythonVersion] = None,
-    abis: Optional[Iterable[str]] = None,
-    platforms: Optional[Iterable[str]] = None,
+    python_version: PythonVersion | None = None,
+    abis: Iterable[str] | None = None,
+    platforms: Iterable[str] | None = None,
     *,
     warn: bool = False,
 ) -> Iterator[Tag]:
@@ -244,7 +241,7 @@ def cpython_tags(
                 yield Tag(interpreter, "abi3", platform_)
 
 
-def _generic_abi() -> List[str]:
+def _generic_abi() -> list[str]:
     """
     Return the ABI tag based on EXT_SUFFIX.
     """
@@ -286,9 +283,9 @@ def _generic_abi() -> List[str]:
 
 
 def generic_tags(
-    interpreter: Optional[str] = None,
-    abis: Optional[Iterable[str]] = None,
-    platforms: Optional[Iterable[str]] = None,
+    interpreter: str | None = None,
+    abis: Iterable[str] | None = None,
+    platforms: Iterable[str] | None = None,
     *,
     warn: bool = False,
 ) -> Iterator[Tag]:
@@ -332,9 +329,9 @@ def _py_interpreter_range(py_version: PythonVersion) -> Iterator[str]:
 
 
 def compatible_tags(
-    python_version: Optional[PythonVersion] = None,
-    interpreter: Optional[str] = None,
-    platforms: Optional[Iterable[str]] = None,
+    python_version: PythonVersion | None = None,
+    interpreter: str | None = None,
+    platforms: Iterable[str] | None = None,
 ) -> Iterator[Tag]:
     """
     Yields the sequence of tags that are compatible with a specific version of Python.
@@ -366,7 +363,7 @@ def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str:
     return "i386"
 
 
-def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> List[str]:
+def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
     formats = [cpu_arch]
     if cpu_arch == "x86_64":
         if version < (10, 4):
@@ -399,7 +396,7 @@ def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> List[str]:
 
 
 def mac_platforms(
-    version: Optional[MacVersion] = None, arch: Optional[str] = None
+    version: MacVersion | None = None, arch: str | None = None
 ) -> Iterator[str]:
     """
     Yields the platform tags for a macOS system.
diff --git a/src/pip/_vendor/packaging/utils.py b/src/pip/_vendor/packaging/utils.py
index c2c2f75aa80..d33da5bb8bd 100644
--- a/src/pip/_vendor/packaging/utils.py
+++ b/src/pip/_vendor/packaging/utils.py
@@ -2,8 +2,10 @@
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
 
+from __future__ import annotations
+
 import re
-from typing import FrozenSet, NewType, Tuple, Union, cast
+from typing import NewType, Tuple, Union, cast
 
 from .tags import Tag, parse_tag
 from .version import InvalidVersion, Version
@@ -53,7 +55,7 @@ def is_normalized_name(name: str) -> bool:
 
 
 def canonicalize_version(
-    version: Union[Version, str], *, strip_trailing_zero: bool = True
+    version: Version | str, *, strip_trailing_zero: bool = True
 ) -> str:
     """
     This is very similar to Version.__str__, but has one subtle difference
@@ -102,7 +104,7 @@ def canonicalize_version(
 
 def parse_wheel_filename(
     filename: str,
-) -> Tuple[NormalizedName, Version, BuildTag, FrozenSet[Tag]]:
+) -> tuple[NormalizedName, Version, BuildTag, frozenset[Tag]]:
     if not filename.endswith(".whl"):
         raise InvalidWheelFilename(
             f"Invalid wheel filename (extension must be '.whl'): {filename}"
@@ -143,7 +145,7 @@ def parse_wheel_filename(
     return (name, version, build, tags)
 
 
-def parse_sdist_filename(filename: str) -> Tuple[NormalizedName, Version]:
+def parse_sdist_filename(filename: str) -> tuple[NormalizedName, Version]:
     if filename.endswith(".tar.gz"):
         file_stem = filename[: -len(".tar.gz")]
     elif filename.endswith(".zip"):
diff --git a/src/pip/_vendor/packaging/version.py b/src/pip/_vendor/packaging/version.py
index 6978e2843fa..8b0a040848d 100644
--- a/src/pip/_vendor/packaging/version.py
+++ b/src/pip/_vendor/packaging/version.py
@@ -7,9 +7,11 @@
     from pip._vendor.packaging.version import parse, Version
 """
 
+from __future__ import annotations
+
 import itertools
 import re
-from typing import Any, Callable, NamedTuple, Optional, SupportsInt, Tuple, Union
+from typing import Any, Callable, NamedTuple, SupportsInt, Tuple, Union
 
 from ._structures import Infinity, InfinityType, NegativeInfinity, NegativeInfinityType
 
@@ -35,14 +37,14 @@
 
 class _Version(NamedTuple):
     epoch: int
-    release: Tuple[int, ...]
-    dev: Optional[Tuple[str, int]]
-    pre: Optional[Tuple[str, int]]
-    post: Optional[Tuple[str, int]]
-    local: Optional[LocalType]
+    release: tuple[int, ...]
+    dev: tuple[str, int] | None
+    pre: tuple[str, int] | None
+    post: tuple[str, int] | None
+    local: LocalType | None
 
 
-def parse(version: str) -> "Version":
+def parse(version: str) -> Version:
     """Parse the given version string.
 
     >>> parse('1.0.dev1')
@@ -65,7 +67,7 @@ class InvalidVersion(ValueError):
 
 
 class _BaseVersion:
-    _key: Tuple[Any, ...]
+    _key: tuple[Any, ...]
 
     def __hash__(self) -> int:
         return hash(self._key)
@@ -73,13 +75,13 @@ def __hash__(self) -> int:
     # Please keep the duplicated `isinstance` check
     # in the six comparisons hereunder
     # unless you find a way to avoid adding overhead function calls.
-    def __lt__(self, other: "_BaseVersion") -> bool:
+    def __lt__(self, other: _BaseVersion) -> bool:
         if not isinstance(other, _BaseVersion):
             return NotImplemented
 
         return self._key < other._key
 
-    def __le__(self, other: "_BaseVersion") -> bool:
+    def __le__(self, other: _BaseVersion) -> bool:
         if not isinstance(other, _BaseVersion):
             return NotImplemented
 
@@ -91,13 +93,13 @@ def __eq__(self, other: object) -> bool:
 
         return self._key == other._key
 
-    def __ge__(self, other: "_BaseVersion") -> bool:
+    def __ge__(self, other: _BaseVersion) -> bool:
         if not isinstance(other, _BaseVersion):
             return NotImplemented
 
         return self._key >= other._key
 
-    def __gt__(self, other: "_BaseVersion") -> bool:
+    def __gt__(self, other: _BaseVersion) -> bool:
         if not isinstance(other, _BaseVersion):
             return NotImplemented
 
@@ -274,7 +276,7 @@ def epoch(self) -> int:
         return self._version.epoch
 
     @property
-    def release(self) -> Tuple[int, ...]:
+    def release(self) -> tuple[int, ...]:
         """The components of the "release" segment of the version.
 
         >>> Version("1.2.3").release
@@ -290,7 +292,7 @@ def release(self) -> Tuple[int, ...]:
         return self._version.release
 
     @property
-    def pre(self) -> Optional[Tuple[str, int]]:
+    def pre(self) -> tuple[str, int] | None:
         """The pre-release segment of the version.
 
         >>> print(Version("1.2.3").pre)
@@ -305,7 +307,7 @@ def pre(self) -> Optional[Tuple[str, int]]:
         return self._version.pre
 
     @property
-    def post(self) -> Optional[int]:
+    def post(self) -> int | None:
         """The post-release number of the version.
 
         >>> print(Version("1.2.3").post)
@@ -316,7 +318,7 @@ def post(self) -> Optional[int]:
         return self._version.post[1] if self._version.post else None
 
     @property
-    def dev(self) -> Optional[int]:
+    def dev(self) -> int | None:
         """The development number of the version.
 
         >>> print(Version("1.2.3").dev)
@@ -327,7 +329,7 @@ def dev(self) -> Optional[int]:
         return self._version.dev[1] if self._version.dev else None
 
     @property
-    def local(self) -> Optional[str]:
+    def local(self) -> str | None:
         """The local version segment of the version.
 
         >>> print(Version("1.2.3").local)
@@ -450,9 +452,8 @@ def micro(self) -> int:
 
 
 def _parse_letter_version(
-    letter: Optional[str], number: Union[str, bytes, SupportsInt, None]
-) -> Optional[Tuple[str, int]]:
-
+    letter: str | None, number: str | bytes | SupportsInt | None
+) -> tuple[str, int] | None:
     if letter:
         # We consider there to be an implicit 0 in a pre-release if there is
         # not a numeral associated with it.
@@ -488,7 +489,7 @@ def _parse_letter_version(
 _local_version_separators = re.compile(r"[\._-]")
 
 
-def _parse_local_version(local: Optional[str]) -> Optional[LocalType]:
+def _parse_local_version(local: str | None) -> LocalType | None:
     """
     Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
     """
@@ -502,13 +503,12 @@ def _parse_local_version(local: Optional[str]) -> Optional[LocalType]:
 
 def _cmpkey(
     epoch: int,
-    release: Tuple[int, ...],
-    pre: Optional[Tuple[str, int]],
-    post: Optional[Tuple[str, int]],
-    dev: Optional[Tuple[str, int]],
-    local: Optional[LocalType],
+    release: tuple[int, ...],
+    pre: tuple[str, int] | None,
+    post: tuple[str, int] | None,
+    dev: tuple[str, int] | None,
+    local: LocalType | None,
 ) -> CmpKey:
-
     # When we compare a release version, we want to compare it with all of the
     # trailing zeros removed. So we'll use a reverse the list, drop all the now
     # leading zeros until we come to something non zero, then take the rest
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 00d81549cb6..3eb4b893022 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -2,7 +2,7 @@ CacheControl==0.14.0
 distlib==0.3.8
 distro==1.9.0
 msgpack==1.0.8
-packaging==24.0
+packaging==24.1
 platformdirs==4.2.1
 pyproject-hooks==1.0.0
 requests==2.32.0

From 1a55574f4a9d7beccb73fd5cfdb51b6927afa5db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Mon, 10 Jun 2024 21:36:51 +0200
Subject: [PATCH 431/992] Report detailed information about invalid
 requirements (#12715)

---
 news/12713.feature.rst                |  1 +
 src/pip/_internal/req/constructors.py | 12 ++++++------
 tests/unit/test_req.py                |  2 +-
 tests/unit/test_req_file.py           |  6 ++++--
 tests/unit/test_req_install.py        |  7 ++++++-
 5 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 news/12713.feature.rst

diff --git a/news/12713.feature.rst b/news/12713.feature.rst
new file mode 100644
index 00000000000..68a4de4a159
--- /dev/null
+++ b/news/12713.feature.rst
@@ -0,0 +1 @@
+Report informative messages about invalid requirements.
diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
index b2c9505a9a4..b8e170f2a70 100644
--- a/src/pip/_internal/req/constructors.py
+++ b/src/pip/_internal/req/constructors.py
@@ -206,8 +206,8 @@ def parse_req_from_editable(editable_req: str) -> RequirementParts:
     if name is not None:
         try:
             req: Optional[Requirement] = Requirement(name)
-        except InvalidRequirement:
-            raise InstallationError(f"Invalid requirement: '{name}'")
+        except InvalidRequirement as exc:
+            raise InstallationError(f"Invalid requirement: {name!r}: {exc}")
     else:
         req = None
 
@@ -360,7 +360,7 @@ def with_source(text: str) -> str:
     def _parse_req_string(req_as_string: str) -> Requirement:
         try:
             return get_requirement(req_as_string)
-        except InvalidRequirement:
+        except InvalidRequirement as exc:
             if os.path.sep in req_as_string:
                 add_msg = "It looks like a path."
                 add_msg += deduce_helpful_msg(req_as_string)
@@ -370,7 +370,7 @@ def _parse_req_string(req_as_string: str) -> Requirement:
                 add_msg = "= is not a valid operator. Did you mean == ?"
             else:
                 add_msg = ""
-            msg = with_source(f"Invalid requirement: {req_as_string!r}")
+            msg = with_source(f"Invalid requirement: {req_as_string!r}: {exc}")
             if add_msg:
                 msg += f"\nHint: {add_msg}"
             raise InstallationError(msg)
@@ -429,8 +429,8 @@ def install_req_from_req_string(
 ) -> InstallRequirement:
     try:
         req = get_requirement(req_string)
-    except InvalidRequirement:
-        raise InstallationError(f"Invalid requirement: '{req_string}'")
+    except InvalidRequirement as exc:
+        raise InstallationError(f"Invalid requirement: {req_string!r}: {exc}")
 
     domains_not_allowed = [
         PyPI.file_storage_domain,
diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py
index 5e3c640a55e..dd0af289e7b 100644
--- a/tests/unit/test_req.py
+++ b/tests/unit/test_req.py
@@ -734,7 +734,7 @@ def test_unidentifiable_name(self) -> None:
         with pytest.raises(InstallationError) as e:
             install_req_from_line(test_name)
         err_msg = e.value.args[0]
-        assert f"Invalid requirement: '{test_name}'" == err_msg
+        assert err_msg.startswith(f"Invalid requirement: '{test_name}'")
 
     def test_requirement_file(self) -> None:
         req_file_path = os.path.join(self.tempdir, "test.txt")
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index ce751afe258..f4f98b1901c 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -269,8 +269,10 @@ def test_error_message(self, line_processor: LineProcessor) -> None:
             )
 
         expected = (
-            "Invalid requirement: 'my-package=1.0' "
-            "(from line 3 of path/requirements.txt)\n"
+            "Invalid requirement: 'my-package=1.0': "
+            "Expected end or semicolon (after name and no valid version specifier)\n"
+            "    my-package=1.0\n"
+            "              ^ (from line 3 of path/requirements.txt)\n"
             "Hint: = is not a valid operator. Did you mean == ?"
         )
         assert str(exc.value) == expected
diff --git a/tests/unit/test_req_install.py b/tests/unit/test_req_install.py
index 4bb71a743aa..22b98f86da2 100644
--- a/tests/unit/test_req_install.py
+++ b/tests/unit/test_req_install.py
@@ -60,7 +60,12 @@ def test_install_req_from_string_invalid_requirement(self) -> None:
         with pytest.raises(InstallationError) as excinfo:
             install_req_from_req_string("http:/this/is/invalid")
 
-        assert str(excinfo.value) == ("Invalid requirement: 'http:/this/is/invalid'")
+        assert str(excinfo.value) == (
+            "Invalid requirement: 'http:/this/is/invalid': "
+            "Expected end or semicolon (after name and no valid version specifier)\n"
+            "    http:/this/is/invalid\n"
+            "        ^"
+        )
 
     def test_install_req_from_string_without_comes_from(self) -> None:
         """

From ccd7be1da6ac6cdeea45145a7d21642a3d9fad09 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Mon, 10 Jun 2024 20:37:02 +0100
Subject: [PATCH 432/992] Change the source of truth for `pkg_resources`'
 extras (#12711)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Change the source of truth for `pkg_resources`' extras

Instead of relying on the METADATA file, use the `requires.txt` file
that pkg_resources uses under the hood to get the "target" extra names
to pass into `pkg_resources`.

* Add failing test for issue 12688

---------

Co-authored-by: Pradyun Gedam 
Co-authored-by: Stéphane Bidoul 
---
 news/12688.bugfix.rst                       |  1 +
 src/pip/_internal/metadata/pkg_resources.py |  4 +---
 tests/functional/test_install_extras.py     | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 news/12688.bugfix.rst

diff --git a/news/12688.bugfix.rst b/news/12688.bugfix.rst
new file mode 100644
index 00000000000..72f8766baa3
--- /dev/null
+++ b/news/12688.bugfix.rst
@@ -0,0 +1 @@
+Accommodate for mismatches between different sources of truth for extra names, for packages generated by ``setuptools``.
diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py
index 235556781c6..4ea84f93a6f 100644
--- a/src/pip/_internal/metadata/pkg_resources.py
+++ b/src/pip/_internal/metadata/pkg_resources.py
@@ -11,7 +11,6 @@
     Mapping,
     NamedTuple,
     Optional,
-    cast,
 )
 
 from pip._vendor import pkg_resources
@@ -92,8 +91,7 @@ def __init__(self, dist: pkg_resources.Distribution) -> None:
     def _extra_mapping(self) -> Mapping[NormalizedName, str]:
         if self.__extra_mapping is None:
             self.__extra_mapping = {
-                canonicalize_name(extra): pkg_resources.safe_extra(cast(str, extra))
-                for extra in self.metadata.get_all("Provides-Extra", [])
+                canonicalize_name(extra): extra for extra in self._dist.extras
             }
 
         return self.__extra_mapping
diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py
index 4dd27bb9df3..4e74f54a2c3 100644
--- a/tests/functional/test_install_extras.py
+++ b/tests/functional/test_install_extras.py
@@ -1,6 +1,7 @@
 import re
 import textwrap
 from os.path import join
+from pathlib import Path
 
 import pytest
 
@@ -252,3 +253,23 @@ def test_install_extras(script: PipTestEnvironment) -> None:
         "a",
     )
     script.assert_installed(a="1", b="1", dep="1", meh="1")
+
+
+def test_install_setuptools_extras_inconsistency(
+    script: PipTestEnvironment, tmp_path: Path
+) -> None:
+    test_project_path = tmp_path.joinpath("test")
+    test_project_path.mkdir()
+    test_project_path.joinpath("setup.py").write_text(
+        textwrap.dedent(
+            """
+                from setuptools import setup
+                setup(
+                    name='test',
+                    version='0.1',
+                    extras_require={'extra_underscored': ['packaging']},
+                )
+            """
+        )
+    )
+    script.pip("install", "--dry-run", test_project_path)

From 9bf6b4a30a7fb173067846b43ac101cb160074c6 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Wed, 12 Jun 2024 06:49:31 +0100
Subject: [PATCH 433/992] Update AUTHORS.txt

---
 AUTHORS.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 1b80e97c3ab..f06ca7bf97b 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -275,6 +275,7 @@ Florian Briand
 Florian Rathgeber
 Francesco
 Francesco Montesano
+Fredrik Orderud
 Frost Ming
 Gabriel Curio
 Gabriel de Perthuis
@@ -511,6 +512,7 @@ Miro Hrončok
 Monica Baluna
 montefra
 Monty Taylor
+mrKazzila
 Muha Ajjan
 Nadav Wexler
 Nahuel Ambrosini
@@ -665,6 +667,7 @@ Shantanu
 shenxianpeng
 shireenrao
 Shivansh-007
+Shixian Sheng
 Shlomi Fish
 Shovan Maity
 Simeon Visser

From ece225529b648918743d5c3f59da91822e32ea3a Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Wed, 12 Jun 2024 06:53:11 +0100
Subject: [PATCH 434/992] Bump for release

---
 NEWS.rst                                      | 27 +++++++++++++++++++
 news/12675.bugfix.rst                         |  2 --
 news/12688.bugfix.rst                         |  1 -
 news/12702.feature.rst                        |  1 -
 news/12713.feature.rst                        |  1 -
 ...86-c40a-4e08-84e1-936b65b74fc7.trivial.rst |  0
 news/charset_normalizer.vendor.rst            |  5 ----
 news/packaging.vendor.rst                     |  1 -
 news/requests.vendor.rst                      |  1 -
 news/six.vendor.rst                           |  1 -
 news/webencodings.vendor.rst                  |  1 -
 src/pip/__init__.py                           |  2 +-
 12 files changed, 28 insertions(+), 15 deletions(-)
 delete mode 100644 news/12675.bugfix.rst
 delete mode 100644 news/12688.bugfix.rst
 delete mode 100644 news/12702.feature.rst
 delete mode 100644 news/12713.feature.rst
 delete mode 100644 news/9be41686-c40a-4e08-84e1-936b65b74fc7.trivial.rst
 delete mode 100644 news/charset_normalizer.vendor.rst
 delete mode 100644 news/packaging.vendor.rst
 delete mode 100644 news/requests.vendor.rst
 delete mode 100644 news/six.vendor.rst
 delete mode 100644 news/webencodings.vendor.rst

diff --git a/NEWS.rst b/NEWS.rst
index eea12074d65..f3baf4b1229 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,33 @@
 
 .. towncrier release notes start
 
+24.1b2 (2024-06-12)
+===================
+
+Features
+--------
+
+- Report informative messages about invalid requirements. (`#12713 `_)
+
+Bug Fixes
+---------
+
+- Eagerly import the self version check logic to avoid crashes while upgrading or downgrading pip at the same time. (`#12675 `_)
+- Accommodate for mismatches between different sources of truth for extra names, for packages generated by ``setuptools``. (`#12688 `_)
+- Accommodate for development versions of CPython ending in ``+`` in the version string. (`#12691 `_)
+
+Vendored Libraries
+------------------
+
+- Upgrade packaging to 24.1
+- Upgrade requests to 2.32.0
+- Remove vendored colorama
+- Remove vendored six
+- Remove vendored webencodings
+- Remove vendored charset_normalizer
+
+  ``requests`` provides optional character detection support on some APIs when processing ambiguous bytes. This isn't relevant for pip to function and we're able to remove it due to recent upstream changes.
+
 24.1b1 (2024-05-06)
 ===================
 
diff --git a/news/12675.bugfix.rst b/news/12675.bugfix.rst
deleted file mode 100644
index 0d448f38be1..00000000000
--- a/news/12675.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Eagerly import the self version check logic to avoid crashes while upgrading
-or downgrading pip at the same time.
diff --git a/news/12688.bugfix.rst b/news/12688.bugfix.rst
deleted file mode 100644
index 72f8766baa3..00000000000
--- a/news/12688.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Accommodate for mismatches between different sources of truth for extra names, for packages generated by ``setuptools``.
diff --git a/news/12702.feature.rst b/news/12702.feature.rst
deleted file mode 100644
index 881906af662..00000000000
--- a/news/12702.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove vendored colorama.
diff --git a/news/12713.feature.rst b/news/12713.feature.rst
deleted file mode 100644
index 68a4de4a159..00000000000
--- a/news/12713.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Report informative messages about invalid requirements.
diff --git a/news/9be41686-c40a-4e08-84e1-936b65b74fc7.trivial.rst b/news/9be41686-c40a-4e08-84e1-936b65b74fc7.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/charset_normalizer.vendor.rst b/news/charset_normalizer.vendor.rst
deleted file mode 100644
index b4a64c7c10f..00000000000
--- a/news/charset_normalizer.vendor.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Remove vendored charset_normalizer.
-
-Requests provides optional character detection support on some APIs
-when processing ambiguous bytes. This isn't relevant for pip to function
-and we're able to remove it due to recent upstream changes.
diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst
deleted file mode 100644
index 6e86a181016..00000000000
--- a/news/packaging.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade packaging to 24.1
diff --git a/news/requests.vendor.rst b/news/requests.vendor.rst
deleted file mode 100644
index edae29fdbc9..00000000000
--- a/news/requests.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade Requests to 2.32.0
diff --git a/news/six.vendor.rst b/news/six.vendor.rst
deleted file mode 100644
index 9b332be92b9..00000000000
--- a/news/six.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove vendored six.
diff --git a/news/webencodings.vendor.rst b/news/webencodings.vendor.rst
deleted file mode 100644
index 35b9f9b9e4c..00000000000
--- a/news/webencodings.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove vendored webencodings.
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index cf95985fa1e..dce03631aaa 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1.dev1"
+__version__ = "24.1b2"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 17c938adec74cdacf4339b7475625e195f36ca62 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Wed, 12 Jun 2024 06:53:11 +0100
Subject: [PATCH 435/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index dce03631aaa..0865ecd8a5e 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1b2"
+__version__ = "24.1.dev2"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From b2fdf3b18518decbff855f3de23e3eb14a8e0a12 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Wed, 12 Jun 2024 06:57:45 +0100
Subject: [PATCH 436/992] Pause in `prepare-release` for updating the NEWS file

This enables making fixes to the NEWS file to fix issues prior to moving
forward with the rest of the release process.
---
 noxfile.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/noxfile.py b/noxfile.py
index 92d0e243838..370e2fe630e 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -294,6 +294,11 @@ def prepare_release(session: nox.Session) -> None:
 
     session.log("# Generating NEWS")
     release.generate_news(session, version)
+    if sys.stdin.isatty():
+        input(
+            "Please review the NEWS file, make necessary edits, and stage them.\n"
+            "Press Enter to continue..."
+        )
 
     session.log(f"# Bumping for release {version}")
     release.update_version_file(version, VERSION_FILE)

From 596be042ea934b65d99b95e984e6cd574fa6b7dd Mon Sep 17 00:00:00 2001
From: Tzu-ping Chung 
Date: Wed, 19 Jun 2024 20:04:31 +0800
Subject: [PATCH 437/992] Mark failing tests on Windows + Py3.13 as xfail

This test should start passing when 3.13.0a2 is released, so the xfail
set to strict=True will start causing the CI to error at the time. We'll
remove the marker.
---
 tests/unit/test_collector.py | 18 ++++++++++++++++--
 tests/unit/test_urls.py      | 31 +++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index 2aaedeedfe8..3efa4a050bf 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -383,7 +383,14 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
         pytest.param(
             "file:///T:/path/with spaces/",
             "file:///T:/path/with%20spaces",
-            marks=pytest.mark.skipif("sys.platform != 'win32'"),
+            marks=[
+                pytest.mark.skipif("sys.platform != 'win32'"),
+                pytest.mark.xfail(
+                    reason="Failing in Python 3.13.0a1, fixed in python/cpython#113563",
+                    condition="sys.version_info >= (3, 13)",
+                    strict=True,
+                ),
+            ],
         ),
         # URL with Windows drive letter, running on non-windows
         # platform. The `:` after the drive should be quoted.
@@ -396,7 +403,14 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
         pytest.param(
             "git+file:///T:/with space/repo.git@1.0#egg=my-package-1.0",
             "git+file:///T:/with%20space/repo.git@1.0#egg=my-package-1.0",
-            marks=pytest.mark.skipif("sys.platform != 'win32'"),
+            marks=[
+                pytest.mark.skipif("sys.platform != 'win32'"),
+                pytest.mark.xfail(
+                    reason="Failing in Python 3.13.0a1, fixed in python/cpython#113563",
+                    condition="sys.version_info >= (3, 13)",
+                    strict=True,
+                ),
+            ],
         ),
         # Test a VCS URL with a Windows drive letter and revision,
         # running on non-windows platform.
diff --git a/tests/unit/test_urls.py b/tests/unit/test_urls.py
index 746d0222425..45764638ed2 100644
--- a/tests/unit/test_urls.py
+++ b/tests/unit/test_urls.py
@@ -15,12 +15,31 @@ def test_path_to_url_unix() -> None:
 
 
 @pytest.mark.skipif("sys.platform != 'win32'")
-def test_path_to_url_win() -> None:
-    assert path_to_url("c:/tmp/file") == "file:///C:/tmp/file"
-    assert path_to_url("c:\\tmp\\file") == "file:///C:/tmp/file"
-    assert path_to_url(r"\\unc\as\path") == "file://unc/as/path"
-    path = os.path.join(os.getcwd(), "file")
-    assert path_to_url("file") == "file:" + urllib.request.pathname2url(path)
+@pytest.mark.parametrize(
+    "path, url",
+    [
+        pytest.param("c:/tmp/file", "file:///C:/tmp/file", id="posix-path"),
+        pytest.param("c:\\tmp\\file", "file:///C:/tmp/file", id="nt-path"),
+        pytest.param(
+            r"\\unc\as\path",
+            "file://unc/as/path",
+            marks=pytest.mark.xfail(
+                reason="Failing in Python 3.13.0a1, fixed in python/cpython#113563",
+                condition="sys.version_info >= (3, 13)",
+                strict=True,
+            ),
+            id="unc-path",
+        ),
+    ],
+)
+def test_path_to_url_win(path: str, url: str) -> None:
+    assert path_to_url(path) == url
+
+
+@pytest.mark.skipif("sys.platform != 'win32'")
+def test_relative_path_to_url_win() -> None:
+    resolved_path = os.path.join(os.getcwd(), "file")
+    assert path_to_url("file") == "file:" + urllib.request.pathname2url(resolved_path)
 
 
 @pytest.mark.parametrize(

From 87f874fca97b507d89538f35f4653032a553e063 Mon Sep 17 00:00:00 2001
From: Tzu-ping Chung 
Date: Thu, 20 Jun 2024 11:08:45 +0800
Subject: [PATCH 438/992] Skip until 3.13.0b3 instead

---
 tests/unit/test_collector.py | 24 ++++++++----------------
 tests/unit/test_urls.py      |  7 +++----
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index 3efa4a050bf..e34104707ba 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -383,14 +383,10 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
         pytest.param(
             "file:///T:/path/with spaces/",
             "file:///T:/path/with%20spaces",
-            marks=[
-                pytest.mark.skipif("sys.platform != 'win32'"),
-                pytest.mark.xfail(
-                    reason="Failing in Python 3.13.0a1, fixed in python/cpython#113563",
-                    condition="sys.version_info >= (3, 13)",
-                    strict=True,
-                ),
-            ],
+            marks=pytest.mark.skipif(
+                "sys.platform != 'win32' or "
+                "sys.version_info == (3, 13, 0, 'beta', 2)"
+            ),
         ),
         # URL with Windows drive letter, running on non-windows
         # platform. The `:` after the drive should be quoted.
@@ -403,14 +399,10 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
         pytest.param(
             "git+file:///T:/with space/repo.git@1.0#egg=my-package-1.0",
             "git+file:///T:/with%20space/repo.git@1.0#egg=my-package-1.0",
-            marks=[
-                pytest.mark.skipif("sys.platform != 'win32'"),
-                pytest.mark.xfail(
-                    reason="Failing in Python 3.13.0a1, fixed in python/cpython#113563",
-                    condition="sys.version_info >= (3, 13)",
-                    strict=True,
-                ),
-            ],
+            marks=pytest.mark.skipif(
+                "sys.platform != 'win32' or "
+                "sys.version_info == (3, 13, 0, 'beta', 2)"
+            ),
         ),
         # Test a VCS URL with a Windows drive letter and revision,
         # running on non-windows platform.
diff --git a/tests/unit/test_urls.py b/tests/unit/test_urls.py
index 45764638ed2..ba6bc6092a5 100644
--- a/tests/unit/test_urls.py
+++ b/tests/unit/test_urls.py
@@ -23,10 +23,9 @@ def test_path_to_url_unix() -> None:
         pytest.param(
             r"\\unc\as\path",
             "file://unc/as/path",
-            marks=pytest.mark.xfail(
-                reason="Failing in Python 3.13.0a1, fixed in python/cpython#113563",
-                condition="sys.version_info >= (3, 13)",
-                strict=True,
+            marks=pytest.mark.skipif(
+                "sys.platform != 'win32' or "
+                "sys.version_info == (3, 13, 0, 'beta', 2)"
             ),
             id="unc-path",
         ),

From 205af8ed88b171fd8fc8a9ba2c75b827a7affe40 Mon Sep 17 00:00:00 2001
From: Seth Michael Larson 
Date: Thu, 20 Jun 2024 15:49:08 -0500
Subject: [PATCH 439/992] Upgrade truststore to 0.9.1 (#12707)

---
 news/truststore.vendor.rst             |  1 +
 src/pip/_vendor/truststore/__init__.py |  2 +-
 src/pip/_vendor/truststore/_api.py     | 41 ++++++++++++++++----------
 src/pip/_vendor/truststore/_macos.py   | 14 ++++-----
 src/pip/_vendor/truststore/_windows.py | 30 ++++++++++++-------
 src/pip/_vendor/vendor.txt             |  2 +-
 6 files changed, 55 insertions(+), 35 deletions(-)
 create mode 100644 news/truststore.vendor.rst

diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst
new file mode 100644
index 00000000000..08841296ff6
--- /dev/null
+++ b/news/truststore.vendor.rst
@@ -0,0 +1 @@
+Upgraded truststore to 0.9.1.
diff --git a/src/pip/_vendor/truststore/__init__.py b/src/pip/_vendor/truststore/__init__.py
index 59930f455b0..86368145a7e 100644
--- a/src/pip/_vendor/truststore/__init__.py
+++ b/src/pip/_vendor/truststore/__init__.py
@@ -10,4 +10,4 @@
 del _api, _sys  # type: ignore[name-defined] # noqa: F821
 
 __all__ = ["SSLContext", "inject_into_ssl", "extract_from_ssl"]
-__version__ = "0.8.0"
+__version__ = "0.9.1"
diff --git a/src/pip/_vendor/truststore/_api.py b/src/pip/_vendor/truststore/_api.py
index 829aff72672..b1ea3b05c6d 100644
--- a/src/pip/_vendor/truststore/_api.py
+++ b/src/pip/_vendor/truststore/_api.py
@@ -2,9 +2,10 @@
 import platform
 import socket
 import ssl
+import sys
 import typing
 
-import _ssl  # type: ignore[import]
+import _ssl  # type: ignore[import-not-found]
 
 from ._ssl_constants import (
     _original_SSLContext,
@@ -49,7 +50,7 @@ def extract_from_ssl() -> None:
     try:
         import pip._vendor.urllib3.util.ssl_ as urllib3_ssl
 
-        urllib3_ssl.SSLContext = _original_SSLContext
+        urllib3_ssl.SSLContext = _original_SSLContext  # type: ignore[assignment]
     except ImportError:
         pass
 
@@ -171,16 +172,13 @@ def cert_store_stats(self) -> dict[str, int]:
     @typing.overload
     def get_ca_certs(
         self, binary_form: typing.Literal[False] = ...
-    ) -> list[typing.Any]:
-        ...
+    ) -> list[typing.Any]: ...
 
     @typing.overload
-    def get_ca_certs(self, binary_form: typing.Literal[True] = ...) -> list[bytes]:
-        ...
+    def get_ca_certs(self, binary_form: typing.Literal[True] = ...) -> list[bytes]: ...
 
     @typing.overload
-    def get_ca_certs(self, binary_form: bool = ...) -> typing.Any:
-        ...
+    def get_ca_certs(self, binary_form: bool = ...) -> typing.Any: ...
 
     def get_ca_certs(self, binary_form: bool = False) -> list[typing.Any] | list[bytes]:
         raise NotImplementedError()
@@ -276,6 +274,25 @@ def verify_mode(self, value: ssl.VerifyMode) -> None:
         )
 
 
+# Python 3.13+ makes get_unverified_chain() a public API that only returns DER
+# encoded certificates. We detect whether we need to call public_bytes() for 3.10->3.12
+# Pre-3.13 returned None instead of an empty list from get_unverified_chain()
+if sys.version_info >= (3, 13):
+
+    def _get_unverified_chain_bytes(sslobj: ssl.SSLObject) -> list[bytes]:
+        unverified_chain = sslobj.get_unverified_chain() or ()  # type: ignore[attr-defined]
+        return [
+            cert if isinstance(cert, bytes) else cert.public_bytes(_ssl.ENCODING_DER)
+            for cert in unverified_chain
+        ]
+
+else:
+
+    def _get_unverified_chain_bytes(sslobj: ssl.SSLObject) -> list[bytes]:
+        unverified_chain = sslobj.get_unverified_chain() or ()  # type: ignore[attr-defined]
+        return [cert.public_bytes(_ssl.ENCODING_DER) for cert in unverified_chain]
+
+
 def _verify_peercerts(
     sock_or_sslobj: ssl.SSLSocket | ssl.SSLObject, server_hostname: str | None
 ) -> None:
@@ -290,13 +307,7 @@ def _verify_peercerts(
     except AttributeError:
         pass
 
-    # SSLObject.get_unverified_chain() returns 'None'
-    # if the peer sends no certificates. This is common
-    # for the server-side scenario.
-    unverified_chain: typing.Sequence[_ssl.Certificate] = (
-        sslobj.get_unverified_chain() or ()  # type: ignore[attr-defined]
-    )
-    cert_bytes = [cert.public_bytes(_ssl.ENCODING_DER) for cert in unverified_chain]
+    cert_bytes = _get_unverified_chain_bytes(sslobj)
     _verify_peercerts_impl(
         sock_or_sslobj.context, cert_bytes, server_hostname=server_hostname
     )
diff --git a/src/pip/_vendor/truststore/_macos.py b/src/pip/_vendor/truststore/_macos.py
index 7dc440bf362..b234ffec723 100644
--- a/src/pip/_vendor/truststore/_macos.py
+++ b/src/pip/_vendor/truststore/_macos.py
@@ -96,9 +96,6 @@ def _load_cdll(name: str, macos10_16_path: str) -> CDLL:
     Security.SecTrustSetAnchorCertificatesOnly.argtypes = [SecTrustRef, Boolean]
     Security.SecTrustSetAnchorCertificatesOnly.restype = OSStatus
 
-    Security.SecTrustEvaluate.argtypes = [SecTrustRef, POINTER(SecTrustResultType)]
-    Security.SecTrustEvaluate.restype = OSStatus
-
     Security.SecPolicyCreateRevocation.argtypes = [CFOptionFlags]
     Security.SecPolicyCreateRevocation.restype = SecPolicyRef
 
@@ -259,6 +256,7 @@ def _handle_osstatus(result: OSStatus, _: typing.Any, args: typing.Any) -> typin
 
 Security.SecTrustCreateWithCertificates.errcheck = _handle_osstatus  # type: ignore[assignment]
 Security.SecTrustSetAnchorCertificates.errcheck = _handle_osstatus  # type: ignore[assignment]
+Security.SecTrustSetAnchorCertificatesOnly.errcheck = _handle_osstatus  # type: ignore[assignment]
 Security.SecTrustGetTrustResult.errcheck = _handle_osstatus  # type: ignore[assignment]
 
 
@@ -417,21 +415,21 @@ def _verify_peercerts_impl(
                 CoreFoundation.CFRelease(certs)
 
         # If there are additional trust anchors to load we need to transform
-        # the list of DER-encoded certificates into a CFArray. Otherwise
-        # pass 'None' to signal that we only want system / fetched certificates.
+        # the list of DER-encoded certificates into a CFArray.
         ctx_ca_certs_der: list[bytes] | None = ssl_context.get_ca_certs(
             binary_form=True
         )
         if ctx_ca_certs_der:
             ctx_ca_certs = None
             try:
-                ctx_ca_certs = _der_certs_to_cf_cert_array(cert_chain)
+                ctx_ca_certs = _der_certs_to_cf_cert_array(ctx_ca_certs_der)
                 Security.SecTrustSetAnchorCertificates(trust, ctx_ca_certs)
             finally:
                 if ctx_ca_certs:
                     CoreFoundation.CFRelease(ctx_ca_certs)
-        else:
-            Security.SecTrustSetAnchorCertificates(trust, None)
+
+        # We always want system certificates.
+        Security.SecTrustSetAnchorCertificatesOnly(trust, False)
 
         cf_error = CoreFoundation.CFErrorRef()
         sec_trust_eval_result = Security.SecTrustEvaluateWithError(
diff --git a/src/pip/_vendor/truststore/_windows.py b/src/pip/_vendor/truststore/_windows.py
index 3de4960a1b0..3d00d467f99 100644
--- a/src/pip/_vendor/truststore/_windows.py
+++ b/src/pip/_vendor/truststore/_windows.py
@@ -325,6 +325,12 @@ def _verify_peercerts_impl(
     server_hostname: str | None = None,
 ) -> None:
     """Verify the cert_chain from the server using Windows APIs."""
+
+    # If the peer didn't send any certificates then
+    # we can't do verification. Raise an error.
+    if not cert_chain:
+        raise ssl.SSLCertVerificationError("Peer sent no certificates to verify")
+
     pCertContext = None
     hIntermediateCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, None, 0, None)
     try:
@@ -375,7 +381,7 @@ def _verify_peercerts_impl(
                 server_hostname,
                 chain_flags=chain_flags,
             )
-        except ssl.SSLCertVerificationError:
+        except ssl.SSLCertVerificationError as e:
             # If that fails but custom CA certs have been added
             # to the SSLContext using load_verify_locations,
             # try verifying using a custom chain engine
@@ -384,15 +390,19 @@ def _verify_peercerts_impl(
                 binary_form=True
             )
             if custom_ca_certs:
-                _verify_using_custom_ca_certs(
-                    ssl_context,
-                    custom_ca_certs,
-                    hIntermediateCertStore,
-                    pCertContext,
-                    pChainPara,
-                    server_hostname,
-                    chain_flags=chain_flags,
-                )
+                try:
+                    _verify_using_custom_ca_certs(
+                        ssl_context,
+                        custom_ca_certs,
+                        hIntermediateCertStore,
+                        pCertContext,
+                        pChainPara,
+                        server_hostname,
+                        chain_flags=chain_flags,
+                    )
+                # Raise the original error, not the new error.
+                except ssl.SSLCertVerificationError:
+                    raise e from None
             else:
                 raise
     finally:
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 3eb4b893022..74eb58ae709 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -16,4 +16,4 @@ resolvelib==1.0.1
 setuptools==69.5.1
 tenacity==8.2.3
 tomli==2.0.1
-truststore==0.8.0
+truststore==0.9.1

From bc877e602b5a41c19c0cfb38ee19218fa98eab1a Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Thu, 20 Jun 2024 21:50:27 +0100
Subject: [PATCH 440/992] Bump for release

---
 NEWS.rst                   | 9 +++++++++
 news/truststore.vendor.rst | 1 -
 src/pip/__init__.py        | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 news/truststore.vendor.rst

diff --git a/NEWS.rst b/NEWS.rst
index f3baf4b1229..52ac0d9627d 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,15 @@
 
 .. towncrier release notes start
 
+24.1 (2024-06-20)
+=================
+
+Vendored Libraries
+------------------
+
+- Upgrade truststore to 0.9.1.
+
+
 24.1b2 (2024-06-12)
 ===================
 
diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst
deleted file mode 100644
index 08841296ff6..00000000000
--- a/news/truststore.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgraded truststore to 0.9.1.
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 0865ecd8a5e..a452d0fe255 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1.dev2"
+__version__ = "24.1"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 53c03d9a694c3782bc5b2978fd23e2d4f373f714 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Thu, 20 Jun 2024 21:50:28 +0100
Subject: [PATCH 441/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index a452d0fe255..531eec2d928 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1"
+__version__ = "24.2.dev0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 8cdf79798ab9490c24cd8a7e965153eb789f04e6 Mon Sep 17 00:00:00 2001
From: Matthew Hughes 
Date: Tue, 18 Jun 2024 21:13:46 +0100
Subject: [PATCH 442/992] Fix directories not cleaned up after test

The `test_rmtree_errorhandler_reraises_error` test creates a directory
that the user is unable to read under pytest's `tmpdir`. Once the test
session end pytest will fail to clean this up due to permissions error
and emit a warning like:

    /home/user/src/pip/.nox/test-3-12/lib/python3.12/site-packages/_pytest/pathlib.py:98: PytestWarning: (rm_rf) error removing /tmp/pytest-of-user/garbage-23e907a9-3e54-40bd-89e4-d70150b10f61/test_rmtree_errorhandler_rerai0
    : [Errno 39] Directory not empty: 'test_rmtree_errorhandler_rerai0'
      warnings.warn(

This restores behaviour from b5c1c7620335ccfbc855c50d92cc3e788a289a3a,
that commit mentions fixing 'failing tests' though I'm not sure which
failures that addresses and if they were related to restoring the file
permissions.

Also make consistent use of `pathlib.Path` methods rather than mixing
them with `os.` methods
---
 news/d475652f-fd8b-4be8-8057-411601597bee.trivial.rst |  0
 tests/unit/test_utils.py                              | 11 +++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 news/d475652f-fd8b-4be8-8057-411601597bee.trivial.rst

diff --git a/news/d475652f-fd8b-4be8-8057-411601597bee.trivial.rst b/news/d475652f-fd8b-4be8-8057-411601597bee.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 102b0340a14..aa9e7fd56c2 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -248,10 +248,10 @@ def test_rmtree_errorhandler_reraises_error(tmpdir: Path) -> None:
     by the given unreadable directory.
     """
     # Create directory without read permission
-    subdir_path = tmpdir / "subdir"
-    subdir_path.mkdir()
-    path = str(subdir_path)
-    os.chmod(path, stat.S_IWRITE)
+    path = tmpdir / "subdir"
+    path.mkdir()
+    old_mode = path.stat().st_mode
+    path.chmod(stat.S_IWRITE)
 
     mock_func = Mock()
 
@@ -267,6 +267,9 @@ def test_rmtree_errorhandler_reraises_error(tmpdir: Path) -> None:
             rmtree_errorhandler(
                 mock_func, path, sys.exc_info()  # type: ignore[arg-type]
             )
+    finally:
+        # Restore permissions to let pytest to clean up temp dirs
+        path.chmod(old_mode)
 
     mock_func.assert_not_called()
 

From 4dd55ebd5635c89279a46fcad6a8c33529f7a875 Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Fri, 21 Jun 2024 11:26:06 +0100
Subject: [PATCH 443/992] Document the structure of our release number

---
 docs/html/development/release-process.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/html/development/release-process.rst b/docs/html/development/release-process.rst
index 21a6ca5622f..793b0170105 100644
--- a/docs/html/development/release-process.rst
+++ b/docs/html/development/release-process.rst
@@ -18,6 +18,10 @@ that month will be up to the release manager for that release. If there are
 no changes, then that release month is skipped and the next release will be
 3 months later.
 
+The version number of pip is ``YY.N``, where ``YY`` is the year of the release
+and ``N`` identifies which release of the year (0=January, 1=April, 2=July, and
+3=October).
+
 The release manager may, at their discretion, choose whether or not there
 will be a pre-release period for a release, and if there is may extend that
 period into the next month if needed.

From a58c20a39dca0fe587545c899c852dcf3d218bfa Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Fri, 21 Jun 2024 22:26:31 +0100
Subject: [PATCH 444/992] Minor release is the quarter number

---
 docs/html/development/release-process.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/html/development/release-process.rst b/docs/html/development/release-process.rst
index 793b0170105..5bf0d278b71 100644
--- a/docs/html/development/release-process.rst
+++ b/docs/html/development/release-process.rst
@@ -19,8 +19,7 @@ no changes, then that release month is skipped and the next release will be
 3 months later.
 
 The version number of pip is ``YY.N``, where ``YY`` is the year of the release
-and ``N`` identifies which release of the year (0=January, 1=April, 2=July, and
-3=October).
+and ``N`` identifies the quarter of the year (0-3).
 
 The release manager may, at their discretion, choose whether or not there
 will be a pre-release period for a release, and if there is may extend that

From 5c389ec91fa178ec3897f5b9522441f4d3922662 Mon Sep 17 00:00:00 2001
From: Matthew Hughes <34972397+matthewhughes934@users.noreply.github.com>
Date: Tue, 25 Jun 2024 13:04:26 +0100
Subject: [PATCH 445/992] Split up Windows tests relying on urlunparse
 behaviour (#12788)

There was a behavioural change to `urllib.parse.urlunparse`[1] that
affects some of our tests on Windows. With the understanding that the
new behaviour is indeed desired, split up some tests relying on this
behaviour depending on the version of Python.

The sample URL used to check this behaviour was taken from a test in the
upstream change (with the new behaviour this URL will round-trip
parsing)

[1] https://github.com/python/cpython/pull/113563
---
 ...34-f9bf-4f17-a201-6546bdb9d5d2.trivial.rst |  0
 tests/lib/__init__.py                         | 17 ++++++++++++
 tests/unit/test_collector.py                  | 27 ++++++++++++-------
 tests/unit/test_urls.py                       | 14 +++++++---
 4 files changed, 45 insertions(+), 13 deletions(-)
 create mode 100644 news/5407ea34-f9bf-4f17-a201-6546bdb9d5d2.trivial.rst

diff --git a/news/5407ea34-f9bf-4f17-a201-6546bdb9d5d2.trivial.rst b/news/5407ea34-f9bf-4f17-a201-6546bdb9d5d2.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py
index bd31b59ff2f..e318f7155d2 100644
--- a/tests/lib/__init__.py
+++ b/tests/lib/__init__.py
@@ -28,6 +28,7 @@
     Union,
     cast,
 )
+from urllib.parse import urlparse, urlunparse
 from zipfile import ZipFile
 
 import pytest
@@ -1375,3 +1376,19 @@ def __call__(
 
 
 CertFactory = Callable[[], str]
+
+# versions containing fix/backport from https://github.com/python/cpython/pull/113563
+# which changed the behavior of `urllib.parse.urlun{parse,split}`
+url = "////path/to/file"
+has_new_urlun_behavior = url == urlunparse(urlparse(url))
+
+# the above change seems to only impact tests on Windows, so just add skips for that
+skip_needs_new_urlun_behavior_win = pytest.mark.skipif(
+    sys.platform != "win32" or not has_new_urlun_behavior,
+    reason="testing windows behavior for newer CPython",
+)
+
+skip_needs_old_urlun_behavior_win = pytest.mark.skipif(
+    sys.platform != "win32" or has_new_urlun_behavior,
+    reason="testing windows behavior for older CPython",
+)
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index e34104707ba..89da25b73d8 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -35,7 +35,12 @@
     _ensure_quoted_url,
 )
 from pip._internal.network.session import PipSession
-from tests.lib import TestData, make_test_link_collector
+from tests.lib import (
+    TestData,
+    make_test_link_collector,
+    skip_needs_new_urlun_behavior_win,
+    skip_needs_old_urlun_behavior_win,
+)
 
 ACCEPT = ", ".join(
     [
@@ -383,10 +388,12 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
         pytest.param(
             "file:///T:/path/with spaces/",
             "file:///T:/path/with%20spaces",
-            marks=pytest.mark.skipif(
-                "sys.platform != 'win32' or "
-                "sys.version_info == (3, 13, 0, 'beta', 2)"
-            ),
+            marks=skip_needs_old_urlun_behavior_win,
+        ),
+        pytest.param(
+            "file:///T:/path/with spaces/",
+            "file://///T:/path/with%20spaces",
+            marks=skip_needs_new_urlun_behavior_win,
         ),
         # URL with Windows drive letter, running on non-windows
         # platform. The `:` after the drive should be quoted.
@@ -399,10 +406,12 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
         pytest.param(
             "git+file:///T:/with space/repo.git@1.0#egg=my-package-1.0",
             "git+file:///T:/with%20space/repo.git@1.0#egg=my-package-1.0",
-            marks=pytest.mark.skipif(
-                "sys.platform != 'win32' or "
-                "sys.version_info == (3, 13, 0, 'beta', 2)"
-            ),
+            marks=skip_needs_old_urlun_behavior_win,
+        ),
+        pytest.param(
+            "git+file:///T:/with space/repo.git@1.0#egg=my-package-1.0",
+            "git+file://///T:/with%20space/repo.git@1.0#egg=my-package-1.0",
+            marks=skip_needs_new_urlun_behavior_win,
         ),
         # Test a VCS URL with a Windows drive letter and revision,
         # running on non-windows platform.
diff --git a/tests/unit/test_urls.py b/tests/unit/test_urls.py
index ba6bc6092a5..c4b8db681ff 100644
--- a/tests/unit/test_urls.py
+++ b/tests/unit/test_urls.py
@@ -5,6 +5,10 @@
 import pytest
 
 from pip._internal.utils.urls import path_to_url, url_to_path
+from tests.lib import (
+    skip_needs_new_urlun_behavior_win,
+    skip_needs_old_urlun_behavior_win,
+)
 
 
 @pytest.mark.skipif("sys.platform == 'win32'")
@@ -23,12 +27,14 @@ def test_path_to_url_unix() -> None:
         pytest.param(
             r"\\unc\as\path",
             "file://unc/as/path",
-            marks=pytest.mark.skipif(
-                "sys.platform != 'win32' or "
-                "sys.version_info == (3, 13, 0, 'beta', 2)"
-            ),
+            marks=skip_needs_old_urlun_behavior_win,
             id="unc-path",
         ),
+        pytest.param(
+            r"\\unc\as\path",
+            "file:////unc/as/path",
+            marks=skip_needs_new_urlun_behavior_win,
+        ),
     ],
 )
 def test_path_to_url_win(path: str, url: str) -> None:

From 300ed75aa50e438c5bf84692964bd9ade81c4916 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Tue, 25 Jun 2024 13:03:18 -0400
Subject: [PATCH 446/992] Upgrade requests to 2.32.3 (#12784)

---
 news/12784.vendor.rst                   |   1 +
 src/pip/_vendor/requests/__version__.py |   4 +-
 src/pip/_vendor/requests/adapters.py    | 127 +++++++++++++++++++++---
 src/pip/_vendor/vendor.txt              |   2 +-
 4 files changed, 119 insertions(+), 15 deletions(-)
 create mode 100644 news/12784.vendor.rst

diff --git a/news/12784.vendor.rst b/news/12784.vendor.rst
new file mode 100644
index 00000000000..5b6d0a87188
--- /dev/null
+++ b/news/12784.vendor.rst
@@ -0,0 +1 @@
+Upgrade requests to 2.32.3
diff --git a/src/pip/_vendor/requests/__version__.py b/src/pip/_vendor/requests/__version__.py
index 1ac168734ee..2c105aca7d4 100644
--- a/src/pip/_vendor/requests/__version__.py
+++ b/src/pip/_vendor/requests/__version__.py
@@ -5,8 +5,8 @@
 __title__ = "requests"
 __description__ = "Python HTTP for Humans."
 __url__ = "https://requests.readthedocs.io"
-__version__ = "2.32.0"
-__build__ = 0x023200
+__version__ = "2.32.3"
+__build__ = 0x023203
 __author__ = "Kenneth Reitz"
 __author_email__ = "me@kennethreitz.org"
 __license__ = "Apache-2.0"
diff --git a/src/pip/_vendor/requests/adapters.py b/src/pip/_vendor/requests/adapters.py
index 4d9d9c63067..7030777465f 100644
--- a/src/pip/_vendor/requests/adapters.py
+++ b/src/pip/_vendor/requests/adapters.py
@@ -9,6 +9,7 @@
 import os.path
 import socket  # noqa: F401
 import typing
+import warnings
 
 from pip._vendor.urllib3.exceptions import ClosedPoolError, ConnectTimeoutError
 from pip._vendor.urllib3.exceptions import HTTPError as _HTTPError
@@ -72,26 +73,44 @@ def SOCKSProxyManager(*args, **kwargs):
 DEFAULT_RETRIES = 0
 DEFAULT_POOL_TIMEOUT = None
 
-_preloaded_ssl_context = create_urllib3_context()
-_preloaded_ssl_context.load_verify_locations(
-    extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
-)
+
+try:
+    import ssl  # noqa: F401
+
+    _preloaded_ssl_context = create_urllib3_context()
+    _preloaded_ssl_context.load_verify_locations(
+        extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
+    )
+except ImportError:
+    # Bypass default SSLContext creation when Python
+    # interpreter isn't built with the ssl module.
+    _preloaded_ssl_context = None
 
 
 def _urllib3_request_context(
     request: "PreparedRequest",
     verify: "bool | str | None",
     client_cert: "typing.Tuple[str, str] | str | None",
+    poolmanager: "PoolManager",
 ) -> "(typing.Dict[str, typing.Any], typing.Dict[str, typing.Any])":
     host_params = {}
     pool_kwargs = {}
     parsed_request_url = urlparse(request.url)
     scheme = parsed_request_url.scheme.lower()
     port = parsed_request_url.port
+
+    # Determine if we have and should use our default SSLContext
+    # to optimize performance on standard requests.
+    poolmanager_kwargs = getattr(poolmanager, "connection_pool_kw", {})
+    has_poolmanager_ssl_context = poolmanager_kwargs.get("ssl_context")
+    should_use_default_ssl_context = (
+        _preloaded_ssl_context is not None and not has_poolmanager_ssl_context
+    )
+
     cert_reqs = "CERT_REQUIRED"
     if verify is False:
         cert_reqs = "CERT_NONE"
-    elif verify is True:
+    elif verify is True and should_use_default_ssl_context:
         pool_kwargs["ssl_context"] = _preloaded_ssl_context
     elif isinstance(verify, str):
         if not os.path.isdir(verify):
@@ -374,13 +393,83 @@ def build_response(self, req, resp):
 
         return response
 
-    def _get_connection(self, request, verify, proxies=None, cert=None):
-        # Replace the existing get_connection without breaking things and
-        # ensure that TLS settings are considered when we interact with
-        # urllib3 HTTP Pools
+    def build_connection_pool_key_attributes(self, request, verify, cert=None):
+        """Build the PoolKey attributes used by urllib3 to return a connection.
+
+        This looks at the PreparedRequest, the user-specified verify value,
+        and the value of the cert parameter to determine what PoolKey values
+        to use to select a connection from a given urllib3 Connection Pool.
+
+        The SSL related pool key arguments are not consistently set. As of
+        this writing, use the following to determine what keys may be in that
+        dictionary:
+
+        * If ``verify`` is ``True``, ``"ssl_context"`` will be set and will be the
+          default Requests SSL Context
+        * If ``verify`` is ``False``, ``"ssl_context"`` will not be set but
+          ``"cert_reqs"`` will be set
+        * If ``verify`` is a string, (i.e., it is a user-specified trust bundle)
+          ``"ca_certs"`` will be set if the string is not a directory recognized
+          by :py:func:`os.path.isdir`, otherwise ``"ca_certs_dir"`` will be
+          set.
+        * If ``"cert"`` is specified, ``"cert_file"`` will always be set. If
+          ``"cert"`` is a tuple with a second item, ``"key_file"`` will also
+          be present
+
+        To override these settings, one may subclass this class, call this
+        method and use the above logic to change parameters as desired. For
+        example, if one wishes to use a custom :py:class:`ssl.SSLContext` one
+        must both set ``"ssl_context"`` and based on what else they require,
+        alter the other keys to ensure the desired behaviour.
+
+        :param request:
+            The PreparedReqest being sent over the connection.
+        :type request:
+            :class:`~requests.models.PreparedRequest`
+        :param verify:
+            Either a boolean, in which case it controls whether
+            we verify the server's TLS certificate, or a string, in which case it
+            must be a path to a CA bundle to use.
+        :param cert:
+            (optional) Any user-provided SSL certificate for client
+            authentication (a.k.a., mTLS). This may be a string (i.e., just
+            the path to a file which holds both certificate and key) or a
+            tuple of length 2 with the certificate file path and key file
+            path.
+        :returns:
+            A tuple of two dictionaries. The first is the "host parameters"
+            portion of the Pool Key including scheme, hostname, and port. The
+            second is a dictionary of SSLContext related parameters.
+        """
+        return _urllib3_request_context(request, verify, cert, self.poolmanager)
+
+    def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None):
+        """Returns a urllib3 connection for the given request and TLS settings.
+        This should not be called from user code, and is only exposed for use
+        when subclassing the :class:`HTTPAdapter `.
+
+        :param request:
+            The :class:`PreparedRequest ` object to be sent
+            over the connection.
+        :param verify:
+            Either a boolean, in which case it controls whether we verify the
+            server's TLS certificate, or a string, in which case it must be a
+            path to a CA bundle to use.
+        :param proxies:
+            (optional) The proxies dictionary to apply to the request.
+        :param cert:
+            (optional) Any user-provided SSL certificate to be used for client
+            authentication (a.k.a., mTLS).
+        :rtype:
+            urllib3.ConnectionPool
+        """
         proxy = select_proxy(request.url, proxies)
         try:
-            host_params, pool_kwargs = _urllib3_request_context(request, verify, cert)
+            host_params, pool_kwargs = self.build_connection_pool_key_attributes(
+                request,
+                verify,
+                cert,
+            )
         except ValueError as e:
             raise InvalidURL(e, request=request)
         if proxy:
@@ -404,7 +493,10 @@ def _get_connection(self, request, verify, proxies=None, cert=None):
         return conn
 
     def get_connection(self, url, proxies=None):
-        """Returns a urllib3 connection for the given URL. This should not be
+        """DEPRECATED: Users should move to `get_connection_with_tls_context`
+        for all subclasses of HTTPAdapter using Requests>=2.32.2.
+
+        Returns a urllib3 connection for the given URL. This should not be
         called from user code, and is only exposed for use when subclassing the
         :class:`HTTPAdapter `.
 
@@ -412,6 +504,15 @@ def get_connection(self, url, proxies=None):
         :param proxies: (optional) A Requests-style dictionary of proxies used on this request.
         :rtype: urllib3.ConnectionPool
         """
+        warnings.warn(
+            (
+                "`get_connection` has been deprecated in favor of "
+                "`get_connection_with_tls_context`. Custom HTTPAdapter subclasses "
+                "will need to migrate for Requests>=2.32.2. Please see "
+                "https://github.com/psf/requests/pull/6710 for more details."
+            ),
+            DeprecationWarning,
+        )
         proxy = select_proxy(url, proxies)
 
         if proxy:
@@ -529,7 +630,9 @@ def send(
         """
 
         try:
-            conn = self._get_connection(request, verify, proxies=proxies, cert=cert)
+            conn = self.get_connection_with_tls_context(
+                request, verify, proxies=proxies, cert=cert
+            )
         except LocationValueError as e:
             raise InvalidURL(e, request=request)
 
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 74eb58ae709..e50d946417b 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -5,7 +5,7 @@ msgpack==1.0.8
 packaging==24.1
 platformdirs==4.2.1
 pyproject-hooks==1.0.0
-requests==2.32.0
+requests==2.32.3
     certifi==2024.2.2
     idna==3.7
     urllib3==1.26.18

From 4353e0201f48119307c497f2f582da0b95111b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
Date: Sat, 22 Jun 2024 20:39:26 +0200
Subject: [PATCH 447/992] Use `--no-build-isolation` in tests to avoid using
 Internet

Add `--no-build-isolation` to the pip invocation in `pip_editable_parts`
fixture and a few tests, to avoid downloading `setuptools` wheel from
PyPI.  This change makes it possible again to run the vast majority of
pip tests (with the exception of 3 tests) offline.

Fixes #12786.
---
 tests/conftest.py                        |  1 +
 tests/functional/test_config_settings.py |  1 +
 tests/functional/test_install.py         | 13 +++++++++++--
 tests/functional/test_self_update.py     |  4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 35101cef2c3..5934e9f95d4 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -395,6 +395,7 @@ def pip_editable_parts(
             "-m",
             "pip",
             "install",
+            "--no-build-isolation",
             "--target",
             pip_self_install_path,
             "-e",
diff --git a/tests/functional/test_config_settings.py b/tests/functional/test_config_settings.py
index 3f88d9c3924..857722dd10d 100644
--- a/tests/functional/test_config_settings.py
+++ b/tests/functional/test_config_settings.py
@@ -118,6 +118,7 @@ def test_config_settings_implies_pep517(
     )
     result = script.pip(
         "wheel",
+        "--no-build-isolation",
         "--config-settings",
         "FOO=Hello",
         pkg_path,
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index eaea12a163c..8748a6b51fc 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -685,7 +685,9 @@ def test_link_hash_in_dep_fails_require_hashes(
     # Build a wheel for pkga and compute its hash.
     wheelhouse = tmp_path / "wheehouse"
     wheelhouse.mkdir()
-    script.pip("wheel", "--no-deps", "-w", wheelhouse, project_path)
+    script.pip(
+        "wheel", "--no-build-isolation", "--no-deps", "-w", wheelhouse, project_path
+    )
     digest = hashlib.sha256(
         wheelhouse.joinpath("pkga-1.0-py3-none-any.whl").read_bytes()
     ).hexdigest()
@@ -903,7 +905,14 @@ def test_editable_install__local_dir_setup_requires_with_pyproject(
         "setup(name='dummy', setup_requires=['simplewheel'])\n"
     )
 
-    script.pip("install", "--find-links", shared_data.find_links, "-e", local_dir)
+    script.pip(
+        "install",
+        "--no-build-isolation",
+        "--find-links",
+        shared_data.find_links,
+        "-e",
+        local_dir,
+    )
 
 
 def test_install_pre__setup_requires_with_pyproject(
diff --git a/tests/functional/test_self_update.py b/tests/functional/test_self_update.py
index c507552208a..1331a87c319 100644
--- a/tests/functional/test_self_update.py
+++ b/tests/functional/test_self_update.py
@@ -11,12 +11,12 @@ def test_self_update_editable(script: Any, pip_src: Any) -> None:
     # Step 1. Install pip as non-editable. This is expected to succeed as
     # the existing pip in the environment is installed in editable mode, so
     # it only places a .pth file in the environment.
-    proc = script.pip("install", pip_src)
+    proc = script.pip("install", "--no-build-isolation", pip_src)
     assert proc.returncode == 0
     # Step 2. Using the pip we just installed, install pip *again*, but
     # in editable mode. This could fail, as we'll need to uninstall the running
     # pip in order to install the new copy, and uninstalling pip while it's
     # running could fail. This test is specifically to ensure that doesn't
     # happen...
-    proc = script.pip("install", "-e", pip_src)
+    proc = script.pip("install", "--no-build-isolation", "-e", pip_src)
     assert proc.returncode == 0

From 9b686fa73d888ef792009858f8d97e10bb1c74f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
Date: Tue, 25 Jun 2024 19:40:50 +0200
Subject: [PATCH 448/992] Add missing `pyproject_hooks` to DEBUNDLED preload
 list

Otherwise, tests fail to load:

```
ImportError while loading conftest '/tmp/portage/dev-python/pip-24.1-r1/work/pip-24.1/tests/conftest.py'.
tests/conftest.py:49: in 
    from pip._internal.utils.temp_dir import global_tempdir_manager
../pip-24.1-python3_13/install/usr/lib/python3.13/site-packages/pip/_internal/utils/temp_dir.py:20: in 
    from pip._internal.utils.misc import enum, rmtree
../pip-24.1-python3_13/install/usr/lib/python3.13/site-packages/pip/_internal/utils/misc.py:38: in 
    from pip._vendor.pyproject_hooks import BuildBackendHookCaller
E   ModuleNotFoundError: No module named 'pip._vendor.pyproject_hooks'
```
---
 src/pip/_vendor/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
index 50537ab9de1..3c5c23591e1 100644
--- a/src/pip/_vendor/__init__.py
+++ b/src/pip/_vendor/__init__.py
@@ -69,6 +69,7 @@ def vendored(modulename):
     vendored("pkg_resources")
     vendored("platformdirs")
     vendored("progress")
+    vendored("pyproject_hooks")
     vendored("requests")
     vendored("requests.exceptions")
     vendored("requests.packages")

From a866308712f53780095f27d6d02fe4f25571b759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
Date: Wed, 26 Jun 2024 02:52:32 +0200
Subject: [PATCH 449/992] Remove `pep517` from DEBUNDLED preload list

---
 src/pip/_vendor/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
index 3c5c23591e1..4d3db37a6d2 100644
--- a/src/pip/_vendor/__init__.py
+++ b/src/pip/_vendor/__init__.py
@@ -65,7 +65,6 @@ def vendored(modulename):
     vendored("packaging")
     vendored("packaging.version")
     vendored("packaging.specifiers")
-    vendored("pep517")
     vendored("pkg_resources")
     vendored("platformdirs")
     vendored("progress")

From a1ae982bff01c3e625c56081b0a54e0688264cf4 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Wed, 26 Jun 2024 21:17:12 +0100
Subject: [PATCH 450/992] Update AUTHORS.txt

---
 AUTHORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index f06ca7bf97b..10317a284b2 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -478,6 +478,7 @@ matthew
 Matthew Einhorn
 Matthew Feickert
 Matthew Gilliard
+Matthew Hughes
 Matthew Iversen
 Matthew Treinish
 Matthew Trumbell

From 4bdc79e06774c8c2ed4c6bba328c5698cb6a6b48 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Wed, 26 Jun 2024 21:21:24 +0100
Subject: [PATCH 451/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index e4b9a52f4b4..531eec2d928 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1.1"
+__version__ = "24.2.dev0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From a432c7f4170b9ef798a15f035f5dfdb4cc939f35 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Wed, 26 Jun 2024 21:21:24 +0100
Subject: [PATCH 452/992] Bump for release

---
 NEWS.rst                                           | 14 ++++++++++++++
 news/12784.vendor.rst                              |  1 -
 ...407ea34-f9bf-4f17-a201-6546bdb9d5d2.trivial.rst |  0
 ...475652f-fd8b-4be8-8057-411601597bee.trivial.rst |  0
 src/pip/__init__.py                                |  2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)
 delete mode 100644 news/12784.vendor.rst
 delete mode 100644 news/5407ea34-f9bf-4f17-a201-6546bdb9d5d2.trivial.rst
 delete mode 100644 news/d475652f-fd8b-4be8-8057-411601597bee.trivial.rst

diff --git a/NEWS.rst b/NEWS.rst
index 52ac0d9627d..d541e2b552c 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,20 @@
 
 .. towncrier release notes start
 
+24.1.1 (2024-06-26)
+===================
+
+Bug Fixes
+---------
+
+- Actually use system trust stores when the truststore feature is enabled.
+
+Vendored Libraries
+------------------
+
+- Upgrade requests to 2.32.3
+
+
 24.1 (2024-06-20)
 =================
 
diff --git a/news/12784.vendor.rst b/news/12784.vendor.rst
deleted file mode 100644
index 5b6d0a87188..00000000000
--- a/news/12784.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade requests to 2.32.3
diff --git a/news/5407ea34-f9bf-4f17-a201-6546bdb9d5d2.trivial.rst b/news/5407ea34-f9bf-4f17-a201-6546bdb9d5d2.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/d475652f-fd8b-4be8-8057-411601597bee.trivial.rst b/news/d475652f-fd8b-4be8-8057-411601597bee.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 531eec2d928..e4b9a52f4b4 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.2.dev0"
+__version__ = "24.1.1"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 0d1cde36066bd0e58d1d5e37228b133d33255d2a Mon Sep 17 00:00:00 2001
From: morotti 
Date: Thu, 27 Jun 2024 13:42:03 +0100
Subject: [PATCH 453/992] Optimise logic for displaying packages at the end of
 `pip install` (#12791)

Co-authored-by: rmorotti 
Co-authored-by: Pradyun Gedam 
Co-authored-by: Richard Si 
---
 news/12791.bugfix.rst                         |  2 ++
 src/pip/_internal/commands/install.py         | 27 +++++++++++--------
 src/pip/_internal/metadata/importlib/_envs.py |  3 ++-
 3 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 news/12791.bugfix.rst

diff --git a/news/12791.bugfix.rst b/news/12791.bugfix.rst
new file mode 100644
index 00000000000..c19345d439c
--- /dev/null
+++ b/news/12791.bugfix.rst
@@ -0,0 +1,2 @@
+Improve pip install performance. The installed packages printout is
+now calculated in linear time instead of quadratic time.
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index d5b06c8c785..5e076a2d1e2 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -7,6 +7,7 @@
 from optparse import SUPPRESS_HELP, Values
 from typing import List, Optional
 
+from pip._vendor.packaging.utils import canonicalize_name
 from pip._vendor.rich import print_json
 
 from pip._internal.cache import WheelCache
@@ -472,17 +473,21 @@ def run(self, options: Values, args: List[str]) -> int:
             )
             env = get_environment(lib_locations)
 
+            # Display a summary of installed packages, with extra care to
+            # display a package name as it was requested by the user.
             installed.sort(key=operator.attrgetter("name"))
-            items = []
-            for result in installed:
-                item = result.name
-                try:
-                    installed_dist = env.get_distribution(item)
-                    if installed_dist is not None:
-                        item = f"{item}-{installed_dist.version}"
-                except Exception:
-                    pass
-                items.append(item)
+            summary = []
+            installed_versions = {}
+            for distribution in env.iter_all_distributions():
+                installed_versions[distribution.canonical_name] = distribution.version
+            for package in installed:
+                display_name = package.name
+                version = installed_versions.get(canonicalize_name(display_name), None)
+                if version:
+                    text = f"{display_name}-{version}"
+                else:
+                    text = display_name
+                summary.append(text)
 
             if conflicts is not None:
                 self._warn_about_conflicts(
@@ -490,7 +495,7 @@ def run(self, options: Values, args: List[str]) -> int:
                     resolver_variant=self.determine_resolver_variant(options),
                 )
 
-            installed_desc = " ".join(items)
+            installed_desc = " ".join(summary)
             if installed_desc:
                 write_output(
                     "Successfully installed %s",
diff --git a/src/pip/_internal/metadata/importlib/_envs.py b/src/pip/_internal/metadata/importlib/_envs.py
index 2df738fc738..c82e1ffc951 100644
--- a/src/pip/_internal/metadata/importlib/_envs.py
+++ b/src/pip/_internal/metadata/importlib/_envs.py
@@ -181,9 +181,10 @@ def _iter_distributions(self) -> Iterator[BaseDistribution]:
             yield from finder.find_linked(location)
 
     def get_distribution(self, name: str) -> Optional[BaseDistribution]:
+        canonical_name = canonicalize_name(name)
         matches = (
             distribution
             for distribution in self.iter_all_distributions()
-            if distribution.canonical_name == canonicalize_name(name)
+            if distribution.canonical_name == canonical_name
         )
         return next(matches, None)

From 47e82e23d68eb445667945849dfe54d6e788931d Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 8 Jun 2024 10:33:50 -0400
Subject: [PATCH 454/992] Cache supported tags in resolver factory

I've observed get_supported() consume up to 10% of the installation step
when installing many packages. Each call can take 1-5ms (presumably only
on Linux due to the large number of supported tags) and there is one
call for every lookup in the cache. As all of these calls are made with
no arguments, the tags can be trivially queried in advance during
factory initialization.
---
 news/12712.feature.rst                             | 2 ++
 src/pip/_internal/resolution/resolvelib/factory.py | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 news/12712.feature.rst

diff --git a/news/12712.feature.rst b/news/12712.feature.rst
new file mode 100644
index 00000000000..3a08cdb10e2
--- /dev/null
+++ b/news/12712.feature.rst
@@ -0,0 +1,2 @@
+Improve dependency resolution performance by caching platform compatibility
+tags during wheel cache lookup.
diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
index 1f31d834b04..145bdbf71a1 100644
--- a/src/pip/_internal/resolution/resolvelib/factory.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -121,6 +121,7 @@ def __init__(
         self._extras_candidate_cache: Dict[
             Tuple[int, FrozenSet[NormalizedName]], ExtrasCandidate
         ] = {}
+        self._supported_tags_cache = get_supported()
 
         if not ignore_installed:
             env = get_default_environment()
@@ -608,7 +609,7 @@ def get_wheel_cache_entry(
         return self._wheel_cache.get_cache_entry(
             link=link,
             package_name=name,
-            supported_tags=get_supported(),
+            supported_tags=self._supported_tags_cache,
         )
 
     def get_dist_to_uninstall(self, candidate: Candidate) -> Optional[BaseDistribution]:

From 581c1139e7373f5d4715f49bd74b76f68dc307b8 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 27 Jun 2024 11:41:54 -0400
Subject: [PATCH 455/992] Upgrade typing_extensions to 4.12.2

---
 news/typing_extensions.vendor.rst    |   1 +
 src/pip/_vendor/typing_extensions.py | 501 ++++++++++++++++++++++-----
 src/pip/_vendor/vendor.txt           |   2 +-
 3 files changed, 407 insertions(+), 97 deletions(-)
 create mode 100644 news/typing_extensions.vendor.rst

diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
new file mode 100644
index 00000000000..580ac5dfb2b
--- /dev/null
+++ b/news/typing_extensions.vendor.rst
@@ -0,0 +1 @@
+Upgrade typing_extensions to 4.12.2
diff --git a/src/pip/_vendor/typing_extensions.py b/src/pip/_vendor/typing_extensions.py
index d60315a6adc..e429384e76a 100644
--- a/src/pip/_vendor/typing_extensions.py
+++ b/src/pip/_vendor/typing_extensions.py
@@ -1,6 +1,7 @@
 import abc
 import collections
 import collections.abc
+import contextlib
 import functools
 import inspect
 import operator
@@ -116,6 +117,7 @@
     'MutableMapping',
     'MutableSequence',
     'MutableSet',
+    'NoDefault',
     'Optional',
     'Pattern',
     'Reversible',
@@ -134,6 +136,7 @@
 # for backward compatibility
 PEP_560 = True
 GenericMeta = type
+_PEP_696_IMPLEMENTED = sys.version_info >= (3, 13, 0, "beta")
 
 # The functions below are modified copies of typing internal helpers.
 # They are needed by _ProtocolMeta and they provide support for PEP 646.
@@ -406,17 +409,96 @@ def clear_overloads():
 AsyncIterable = typing.AsyncIterable
 AsyncIterator = typing.AsyncIterator
 Deque = typing.Deque
-ContextManager = typing.ContextManager
-AsyncContextManager = typing.AsyncContextManager
 DefaultDict = typing.DefaultDict
 OrderedDict = typing.OrderedDict
 Counter = typing.Counter
 ChainMap = typing.ChainMap
-AsyncGenerator = typing.AsyncGenerator
 Text = typing.Text
 TYPE_CHECKING = typing.TYPE_CHECKING
 
 
+if sys.version_info >= (3, 13, 0, "beta"):
+    from typing import AsyncContextManager, AsyncGenerator, ContextManager, Generator
+else:
+    def _is_dunder(attr):
+        return attr.startswith('__') and attr.endswith('__')
+
+    # Python <3.9 doesn't have typing._SpecialGenericAlias
+    _special_generic_alias_base = getattr(
+        typing, "_SpecialGenericAlias", typing._GenericAlias
+    )
+
+    class _SpecialGenericAlias(_special_generic_alias_base, _root=True):
+        def __init__(self, origin, nparams, *, inst=True, name=None, defaults=()):
+            if _special_generic_alias_base is typing._GenericAlias:
+                # Python <3.9
+                self.__origin__ = origin
+                self._nparams = nparams
+                super().__init__(origin, nparams, special=True, inst=inst, name=name)
+            else:
+                # Python >= 3.9
+                super().__init__(origin, nparams, inst=inst, name=name)
+            self._defaults = defaults
+
+        def __setattr__(self, attr, val):
+            allowed_attrs = {'_name', '_inst', '_nparams', '_defaults'}
+            if _special_generic_alias_base is typing._GenericAlias:
+                # Python <3.9
+                allowed_attrs.add("__origin__")
+            if _is_dunder(attr) or attr in allowed_attrs:
+                object.__setattr__(self, attr, val)
+            else:
+                setattr(self.__origin__, attr, val)
+
+        @typing._tp_cache
+        def __getitem__(self, params):
+            if not isinstance(params, tuple):
+                params = (params,)
+            msg = "Parameters to generic types must be types."
+            params = tuple(typing._type_check(p, msg) for p in params)
+            if (
+                self._defaults
+                and len(params) < self._nparams
+                and len(params) + len(self._defaults) >= self._nparams
+            ):
+                params = (*params, *self._defaults[len(params) - self._nparams:])
+            actual_len = len(params)
+
+            if actual_len != self._nparams:
+                if self._defaults:
+                    expected = f"at least {self._nparams - len(self._defaults)}"
+                else:
+                    expected = str(self._nparams)
+                if not self._nparams:
+                    raise TypeError(f"{self} is not a generic class")
+                raise TypeError(
+                    f"Too {'many' if actual_len > self._nparams else 'few'}"
+                    f" arguments for {self};"
+                    f" actual {actual_len}, expected {expected}"
+                )
+            return self.copy_with(params)
+
+    _NoneType = type(None)
+    Generator = _SpecialGenericAlias(
+        collections.abc.Generator, 3, defaults=(_NoneType, _NoneType)
+    )
+    AsyncGenerator = _SpecialGenericAlias(
+        collections.abc.AsyncGenerator, 2, defaults=(_NoneType,)
+    )
+    ContextManager = _SpecialGenericAlias(
+        contextlib.AbstractContextManager,
+        2,
+        name="ContextManager",
+        defaults=(typing.Optional[bool],)
+    )
+    AsyncContextManager = _SpecialGenericAlias(
+        contextlib.AbstractAsyncContextManager,
+        2,
+        name="AsyncContextManager",
+        defaults=(typing.Optional[bool],)
+    )
+
+
 _PROTO_ALLOWLIST = {
     'collections.abc': [
         'Callable', 'Awaitable', 'Iterable', 'Iterator', 'AsyncIterable',
@@ -427,23 +509,11 @@ def clear_overloads():
 }
 
 
-_EXCLUDED_ATTRS = {
-    "__abstractmethods__", "__annotations__", "__weakref__", "_is_protocol",
-    "_is_runtime_protocol", "__dict__", "__slots__", "__parameters__",
-    "__orig_bases__", "__module__", "_MutableMapping__marker", "__doc__",
-    "__subclasshook__", "__orig_class__", "__init__", "__new__",
-    "__protocol_attrs__", "__non_callable_proto_members__",
-    "__match_args__",
+_EXCLUDED_ATTRS = frozenset(typing.EXCLUDED_ATTRIBUTES) | {
+    "__match_args__", "__protocol_attrs__", "__non_callable_proto_members__",
+    "__final__",
 }
 
-if sys.version_info >= (3, 9):
-    _EXCLUDED_ATTRS.add("__class_getitem__")
-
-if sys.version_info >= (3, 12):
-    _EXCLUDED_ATTRS.add("__type_params__")
-
-_EXCLUDED_ATTRS = frozenset(_EXCLUDED_ATTRS)
-
 
 def _get_protocol_attrs(cls):
     attrs = set()
@@ -669,13 +739,18 @@ def close(self): ...
         not their type signatures!
         """
         if not issubclass(cls, typing.Generic) or not getattr(cls, '_is_protocol', False):
-            raise TypeError('@runtime_checkable can be only applied to protocol classes,'
-                            ' got %r' % cls)
+            raise TypeError(f'@runtime_checkable can be only applied to protocol classes,'
+                            f' got {cls!r}')
         cls._is_runtime_protocol = True
 
-        # Only execute the following block if it's a typing_extensions.Protocol class.
-        # typing.Protocol classes don't need it.
-        if isinstance(cls, _ProtocolMeta):
+        # typing.Protocol classes on <=3.11 break if we execute this block,
+        # because typing.Protocol classes on <=3.11 don't have a
+        # `__protocol_attrs__` attribute, and this block relies on the
+        # `__protocol_attrs__` attribute. Meanwhile, typing.Protocol classes on 3.12.2+
+        # break if we *don't* execute this block, because *they* assume that all
+        # protocol classes have a `__non_callable_proto_members__` attribute
+        # (which this block sets)
+        if isinstance(cls, _ProtocolMeta) or sys.version_info >= (3, 12, 2):
             # PEP 544 prohibits using issubclass()
             # with protocols that have non-method members.
             # See gh-113320 for why we compute this attribute here,
@@ -867,7 +942,13 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
                 tp_dict.__orig_bases__ = bases
 
             annotations = {}
-            own_annotations = ns.get('__annotations__', {})
+            if "__annotations__" in ns:
+                own_annotations = ns["__annotations__"]
+            elif "__annotate__" in ns:
+                # TODO: Use inspect.VALUE here, and make the annotations lazily evaluated
+                own_annotations = ns["__annotate__"](1)
+            else:
+                own_annotations = {}
             msg = "TypedDict('Name', {f0: t0, f1: t1, ...}); each t must be a type"
             if _TAKES_MODULE:
                 own_annotations = {
@@ -1190,7 +1271,7 @@ def __repr__(self):
 
         def __reduce__(self):
             return operator.getitem, (
-                Annotated, (self.__origin__,) + self.__metadata__
+                Annotated, (self.__origin__, *self.__metadata__)
             )
 
         def __eq__(self, other):
@@ -1316,7 +1397,7 @@ def get_args(tp):
             get_args(Callable[[], T][int]) == ([], int)
         """
         if isinstance(tp, _AnnotatedAlias):
-            return (tp.__origin__,) + tp.__metadata__
+            return (tp.__origin__, *tp.__metadata__)
         if isinstance(tp, (typing._GenericAlias, _typing_GenericAlias)):
             if getattr(tp, "_special", False):
                 return ()
@@ -1362,17 +1443,37 @@ def TypeAlias(self, parameters):
     )
 
 
+if hasattr(typing, "NoDefault"):
+    NoDefault = typing.NoDefault
+else:
+    class NoDefaultTypeMeta(type):
+        def __setattr__(cls, attr, value):
+            # TypeError is consistent with the behavior of NoneType
+            raise TypeError(
+                f"cannot set {attr!r} attribute of immutable type {cls.__name__!r}"
+            )
+
+    class NoDefaultType(metaclass=NoDefaultTypeMeta):
+        """The type of the NoDefault singleton."""
+
+        __slots__ = ()
+
+        def __new__(cls):
+            return globals().get("NoDefault") or object.__new__(cls)
+
+        def __repr__(self):
+            return "typing_extensions.NoDefault"
+
+        def __reduce__(self):
+            return "NoDefault"
+
+    NoDefault = NoDefaultType()
+    del NoDefaultType, NoDefaultTypeMeta
+
+
 def _set_default(type_param, default):
-    if isinstance(default, (tuple, list)):
-        type_param.__default__ = tuple((typing._type_check(d, "Default must be a type")
-                                        for d in default))
-    elif default != _marker:
-        if isinstance(type_param, ParamSpec) and default is ...:  # ... not valid <3.11
-            type_param.__default__ = default
-        else:
-            type_param.__default__ = typing._type_check(default, "Default must be a type")
-    else:
-        type_param.__default__ = None
+    type_param.has_default = lambda: default is not NoDefault
+    type_param.__default__ = default
 
 
 def _set_module(typevarlike):
@@ -1395,32 +1496,46 @@ def __instancecheck__(cls, __instance: Any) -> bool:
         return isinstance(__instance, cls._backported_typevarlike)
 
 
-# Add default and infer_variance parameters from PEP 696 and 695
-class TypeVar(metaclass=_TypeVarLikeMeta):
-    """Type variable."""
+if _PEP_696_IMPLEMENTED:
+    from typing import TypeVar
+else:
+    # Add default and infer_variance parameters from PEP 696 and 695
+    class TypeVar(metaclass=_TypeVarLikeMeta):
+        """Type variable."""
 
-    _backported_typevarlike = typing.TypeVar
+        _backported_typevarlike = typing.TypeVar
 
-    def __new__(cls, name, *constraints, bound=None,
-                covariant=False, contravariant=False,
-                default=_marker, infer_variance=False):
-        if hasattr(typing, "TypeAliasType"):
-            # PEP 695 implemented (3.12+), can pass infer_variance to typing.TypeVar
-            typevar = typing.TypeVar(name, *constraints, bound=bound,
-                                     covariant=covariant, contravariant=contravariant,
-                                     infer_variance=infer_variance)
-        else:
-            typevar = typing.TypeVar(name, *constraints, bound=bound,
-                                     covariant=covariant, contravariant=contravariant)
-            if infer_variance and (covariant or contravariant):
-                raise ValueError("Variance cannot be specified with infer_variance.")
-            typevar.__infer_variance__ = infer_variance
-        _set_default(typevar, default)
-        _set_module(typevar)
-        return typevar
+        def __new__(cls, name, *constraints, bound=None,
+                    covariant=False, contravariant=False,
+                    default=NoDefault, infer_variance=False):
+            if hasattr(typing, "TypeAliasType"):
+                # PEP 695 implemented (3.12+), can pass infer_variance to typing.TypeVar
+                typevar = typing.TypeVar(name, *constraints, bound=bound,
+                                         covariant=covariant, contravariant=contravariant,
+                                         infer_variance=infer_variance)
+            else:
+                typevar = typing.TypeVar(name, *constraints, bound=bound,
+                                         covariant=covariant, contravariant=contravariant)
+                if infer_variance and (covariant or contravariant):
+                    raise ValueError("Variance cannot be specified with infer_variance.")
+                typevar.__infer_variance__ = infer_variance
+
+            _set_default(typevar, default)
+            _set_module(typevar)
+
+            def _tvar_prepare_subst(alias, args):
+                if (
+                    typevar.has_default()
+                    and alias.__parameters__.index(typevar) == len(args)
+                ):
+                    args += (typevar.__default__,)
+                return args
 
-    def __init_subclass__(cls) -> None:
-        raise TypeError(f"type '{__name__}.TypeVar' is not an acceptable base type")
+            typevar.__typing_prepare_subst__ = _tvar_prepare_subst
+            return typevar
+
+        def __init_subclass__(cls) -> None:
+            raise TypeError(f"type '{__name__}.TypeVar' is not an acceptable base type")
 
 
 # Python 3.10+ has PEP 612
@@ -1485,8 +1600,12 @@ def __eq__(self, other):
                 return NotImplemented
             return self.__origin__ == other.__origin__
 
+
+if _PEP_696_IMPLEMENTED:
+    from typing import ParamSpec
+
 # 3.10+
-if hasattr(typing, 'ParamSpec'):
+elif hasattr(typing, 'ParamSpec'):
 
     # Add default parameter - PEP 696
     class ParamSpec(metaclass=_TypeVarLikeMeta):
@@ -1496,7 +1615,7 @@ class ParamSpec(metaclass=_TypeVarLikeMeta):
 
         def __new__(cls, name, *, bound=None,
                     covariant=False, contravariant=False,
-                    infer_variance=False, default=_marker):
+                    infer_variance=False, default=NoDefault):
             if hasattr(typing, "TypeAliasType"):
                 # PEP 695 implemented, can pass infer_variance to typing.TypeVar
                 paramspec = typing.ParamSpec(name, bound=bound,
@@ -1511,6 +1630,24 @@ def __new__(cls, name, *, bound=None,
 
             _set_default(paramspec, default)
             _set_module(paramspec)
+
+            def _paramspec_prepare_subst(alias, args):
+                params = alias.__parameters__
+                i = params.index(paramspec)
+                if i == len(args) and paramspec.has_default():
+                    args = [*args, paramspec.__default__]
+                if i >= len(args):
+                    raise TypeError(f"Too few arguments for {alias}")
+                # Special case where Z[[int, str, bool]] == Z[int, str, bool] in PEP 612.
+                if len(params) == 1 and not typing._is_param_expr(args[0]):
+                    assert i == 0
+                    args = (args,)
+                # Convert lists to tuples to help other libraries cache the results.
+                elif isinstance(args[i], list):
+                    args = (*args[:i], tuple(args[i]), *args[i + 1:])
+                return args
+
+            paramspec.__typing_prepare_subst__ = _paramspec_prepare_subst
             return paramspec
 
         def __init_subclass__(cls) -> None:
@@ -1579,8 +1716,8 @@ def kwargs(self):
             return ParamSpecKwargs(self)
 
         def __init__(self, name, *, bound=None, covariant=False, contravariant=False,
-                     infer_variance=False, default=_marker):
-            super().__init__([self])
+                     infer_variance=False, default=NoDefault):
+            list.__init__(self, [self])
             self.__name__ = name
             self.__covariant__ = bool(covariant)
             self.__contravariant__ = bool(contravariant)
@@ -1674,7 +1811,7 @@ def _concatenate_getitem(self, parameters):
 # 3.10+
 if hasattr(typing, 'Concatenate'):
     Concatenate = typing.Concatenate
-    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias  # noqa: F811
+    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias
 # 3.9
 elif sys.version_info[:2] >= (3, 9):
     @_ExtensionsSpecialForm
@@ -2209,6 +2346,17 @@ def __init__(self, getitem):
     class _UnpackAlias(typing._GenericAlias, _root=True):
         __class__ = typing.TypeVar
 
+        @property
+        def __typing_unpacked_tuple_args__(self):
+            assert self.__origin__ is Unpack
+            assert len(self.__args__) == 1
+            arg, = self.__args__
+            if isinstance(arg, (typing._GenericAlias, _types.GenericAlias)):
+                if arg.__origin__ is not tuple:
+                    raise TypeError("Unpack[...] must be used with a tuple type")
+                return arg.__args__
+            return None
+
     @_UnpackSpecialForm
     def Unpack(self, parameters):
         item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
@@ -2233,7 +2381,20 @@ def _is_unpack(obj):
         return isinstance(obj, _UnpackAlias)
 
 
-if hasattr(typing, "TypeVarTuple"):  # 3.11+
+if _PEP_696_IMPLEMENTED:
+    from typing import TypeVarTuple
+
+elif hasattr(typing, "TypeVarTuple"):  # 3.11+
+
+    def _unpack_args(*args):
+        newargs = []
+        for arg in args:
+            subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
+            if subargs is not None and not (subargs and subargs[-1] is ...):
+                newargs.extend(subargs)
+            else:
+                newargs.append(arg)
+        return newargs
 
     # Add default parameter - PEP 696
     class TypeVarTuple(metaclass=_TypeVarLikeMeta):
@@ -2241,10 +2402,57 @@ class TypeVarTuple(metaclass=_TypeVarLikeMeta):
 
         _backported_typevarlike = typing.TypeVarTuple
 
-        def __new__(cls, name, *, default=_marker):
+        def __new__(cls, name, *, default=NoDefault):
             tvt = typing.TypeVarTuple(name)
             _set_default(tvt, default)
             _set_module(tvt)
+
+            def _typevartuple_prepare_subst(alias, args):
+                params = alias.__parameters__
+                typevartuple_index = params.index(tvt)
+                for param in params[typevartuple_index + 1:]:
+                    if isinstance(param, TypeVarTuple):
+                        raise TypeError(
+                            f"More than one TypeVarTuple parameter in {alias}"
+                        )
+
+                alen = len(args)
+                plen = len(params)
+                left = typevartuple_index
+                right = plen - typevartuple_index - 1
+                var_tuple_index = None
+                fillarg = None
+                for k, arg in enumerate(args):
+                    if not isinstance(arg, type):
+                        subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
+                        if subargs and len(subargs) == 2 and subargs[-1] is ...:
+                            if var_tuple_index is not None:
+                                raise TypeError(
+                                    "More than one unpacked "
+                                    "arbitrary-length tuple argument"
+                                )
+                            var_tuple_index = k
+                            fillarg = subargs[0]
+                if var_tuple_index is not None:
+                    left = min(left, var_tuple_index)
+                    right = min(right, alen - var_tuple_index - 1)
+                elif left + right > alen:
+                    raise TypeError(f"Too few arguments for {alias};"
+                                    f" actual {alen}, expected at least {plen - 1}")
+                if left == alen - right and tvt.has_default():
+                    replacement = _unpack_args(tvt.__default__)
+                else:
+                    replacement = args[left: alen - right]
+
+                return (
+                    *args[:left],
+                    *([fillarg] * (typevartuple_index - left)),
+                    replacement,
+                    *([fillarg] * (plen - right - left - typevartuple_index - 1)),
+                    *args[alen - right:],
+                )
+
+            tvt.__typing_prepare_subst__ = _typevartuple_prepare_subst
             return tvt
 
         def __init_subclass__(self, *args, **kwds):
@@ -2301,7 +2509,7 @@ def get_shape(self) -> Tuple[*Ts]:
         def __iter__(self):
             yield self.__unpacked__
 
-        def __init__(self, name, *, default=_marker):
+        def __init__(self, name, *, default=NoDefault):
             self.__name__ = name
             _DefaultMixin.__init__(self, default)
 
@@ -2352,6 +2560,12 @@ def reveal_type(obj: T, /) -> T:
         return obj
 
 
+if hasattr(typing, "_ASSERT_NEVER_REPR_MAX_LENGTH"):  # 3.11+
+    _ASSERT_NEVER_REPR_MAX_LENGTH = typing._ASSERT_NEVER_REPR_MAX_LENGTH
+else:  # <=3.10
+    _ASSERT_NEVER_REPR_MAX_LENGTH = 100
+
+
 if hasattr(typing, "assert_never"):  # 3.11+
     assert_never = typing.assert_never
 else:  # <=3.10
@@ -2375,7 +2589,10 @@ def int_or_str(arg: int | str) -> None:
         At runtime, this throws an exception when called.
 
         """
-        raise AssertionError("Expected code to be unreachable")
+        value = repr(arg)
+        if len(value) > _ASSERT_NEVER_REPR_MAX_LENGTH:
+            value = value[:_ASSERT_NEVER_REPR_MAX_LENGTH] + '...'
+        raise AssertionError(f"Expected code to be unreachable, but got: {value}")
 
 
 if sys.version_info >= (3, 12):  # 3.12+
@@ -2677,11 +2894,14 @@ def _check_generic(cls, parameters, elen=_marker):
                 if alen < elen:
                     # since we validate TypeVarLike default in _collect_type_vars
                     # or _collect_parameters we can safely check parameters[alen]
-                    if getattr(parameters[alen], '__default__', None) is not None:
+                    if (
+                        getattr(parameters[alen], '__default__', NoDefault)
+                        is not NoDefault
+                    ):
                         return
 
-                    num_default_tv = sum(getattr(p, '__default__', None)
-                                         is not None for p in parameters)
+                    num_default_tv = sum(getattr(p, '__default__', NoDefault)
+                                         is not NoDefault for p in parameters)
 
                     elen -= num_default_tv
 
@@ -2711,11 +2931,14 @@ def _check_generic(cls, parameters, elen):
                 if alen < elen:
                     # since we validate TypeVarLike default in _collect_type_vars
                     # or _collect_parameters we can safely check parameters[alen]
-                    if getattr(parameters[alen], '__default__', None) is not None:
+                    if (
+                        getattr(parameters[alen], '__default__', NoDefault)
+                        is not NoDefault
+                    ):
                         return
 
-                    num_default_tv = sum(getattr(p, '__default__', None)
-                                         is not None for p in parameters)
+                    num_default_tv = sum(getattr(p, '__default__', NoDefault)
+                                         is not NoDefault for p in parameters)
 
                     elen -= num_default_tv
 
@@ -2724,7 +2947,42 @@ def _check_generic(cls, parameters, elen):
             raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments"
                             f" for {cls}; actual {alen}, expected {expect_val}")
 
-typing._check_generic = _check_generic
+if not _PEP_696_IMPLEMENTED:
+    typing._check_generic = _check_generic
+
+
+def _has_generic_or_protocol_as_origin() -> bool:
+    try:
+        frame = sys._getframe(2)
+    # - Catch AttributeError: not all Python implementations have sys._getframe()
+    # - Catch ValueError: maybe we're called from an unexpected module
+    #   and the call stack isn't deep enough
+    except (AttributeError, ValueError):
+        return False  # err on the side of leniency
+    else:
+        # If we somehow get invoked from outside typing.py,
+        # also err on the side of leniency
+        if frame.f_globals.get("__name__") != "typing":
+            return False
+        origin = frame.f_locals.get("origin")
+        # Cannot use "in" because origin may be an object with a buggy __eq__ that
+        # throws an error.
+        return origin is typing.Generic or origin is Protocol or origin is typing.Protocol
+
+
+_TYPEVARTUPLE_TYPES = {TypeVarTuple, getattr(typing, "TypeVarTuple", None)}
+
+
+def _is_unpacked_typevartuple(x) -> bool:
+    if get_origin(x) is not Unpack:
+        return False
+    args = get_args(x)
+    return (
+        bool(args)
+        and len(args) == 1
+        and type(args[0]) in _TYPEVARTUPLE_TYPES
+    )
+
 
 # Python 3.11+ _collect_type_vars was renamed to _collect_parameters
 if hasattr(typing, '_collect_type_vars'):
@@ -2737,19 +2995,29 @@ def _collect_type_vars(types, typevar_types=None):
         if typevar_types is None:
             typevar_types = typing.TypeVar
         tvars = []
-        # required TypeVarLike cannot appear after TypeVarLike with default
+
+        # A required TypeVarLike cannot appear after a TypeVarLike with a default
+        # if it was a direct call to `Generic[]` or `Protocol[]`
+        enforce_default_ordering = _has_generic_or_protocol_as_origin()
         default_encountered = False
+
+        # Also, a TypeVarLike with a default cannot appear after a TypeVarTuple
+        type_var_tuple_encountered = False
+
         for t in types:
-            if (
-                isinstance(t, typevar_types) and
-                t not in tvars and
-                not _is_unpack(t)
-            ):
-                if getattr(t, '__default__', None) is not None:
-                    default_encountered = True
-                elif default_encountered:
-                    raise TypeError(f'Type parameter {t!r} without a default'
-                                    ' follows type parameter with a default')
+            if _is_unpacked_typevartuple(t):
+                type_var_tuple_encountered = True
+            elif isinstance(t, typevar_types) and t not in tvars:
+                if enforce_default_ordering:
+                    has_default = getattr(t, '__default__', NoDefault) is not NoDefault
+                    if has_default:
+                        if type_var_tuple_encountered:
+                            raise TypeError('Type parameter with a default'
+                                            ' follows TypeVarTuple')
+                        default_encountered = True
+                    elif default_encountered:
+                        raise TypeError(f'Type parameter {t!r} without a default'
+                                        ' follows type parameter with a default')
 
                 tvars.append(t)
             if _should_collect_from_parameters(t):
@@ -2767,8 +3035,15 @@ def _collect_parameters(args):
             assert _collect_parameters((T, Callable[P, T])) == (T, P)
         """
         parameters = []
-        # required TypeVarLike cannot appear after TypeVarLike with default
+
+        # A required TypeVarLike cannot appear after a TypeVarLike with default
+        # if it was a direct call to `Generic[]` or `Protocol[]`
+        enforce_default_ordering = _has_generic_or_protocol_as_origin()
         default_encountered = False
+
+        # Also, a TypeVarLike with a default cannot appear after a TypeVarTuple
+        type_var_tuple_encountered = False
+
         for t in args:
             if isinstance(t, type):
                 # We don't want __parameters__ descriptor of a bare Python class.
@@ -2782,21 +3057,33 @@ def _collect_parameters(args):
                             parameters.append(collected)
             elif hasattr(t, '__typing_subst__'):
                 if t not in parameters:
-                    if getattr(t, '__default__', None) is not None:
-                        default_encountered = True
-                    elif default_encountered:
-                        raise TypeError(f'Type parameter {t!r} without a default'
-                                        ' follows type parameter with a default')
+                    if enforce_default_ordering:
+                        has_default = (
+                            getattr(t, '__default__', NoDefault) is not NoDefault
+                        )
+
+                        if type_var_tuple_encountered and has_default:
+                            raise TypeError('Type parameter with a default'
+                                            ' follows TypeVarTuple')
+
+                        if has_default:
+                            default_encountered = True
+                        elif default_encountered:
+                            raise TypeError(f'Type parameter {t!r} without a default'
+                                            ' follows type parameter with a default')
 
                     parameters.append(t)
             else:
+                if _is_unpacked_typevartuple(t):
+                    type_var_tuple_encountered = True
                 for x in getattr(t, '__parameters__', ()):
                     if x not in parameters:
                         parameters.append(x)
 
         return tuple(parameters)
 
-    typing._collect_parameters = _collect_parameters
+    if not _PEP_696_IMPLEMENTED:
+        typing._collect_parameters = _collect_parameters
 
 # Backport typing.NamedTuple as it exists in Python 3.13.
 # In 3.11, the ability to define generic `NamedTuple`s was supported.
@@ -2830,7 +3117,13 @@ def __new__(cls, typename, bases, ns):
                     raise TypeError(
                         'can only inherit from a NamedTuple type and Generic')
             bases = tuple(tuple if base is _NamedTuple else base for base in bases)
-            types = ns.get('__annotations__', {})
+            if "__annotations__" in ns:
+                types = ns["__annotations__"]
+            elif "__annotate__" in ns:
+                # TODO: Use inspect.VALUE here, and make the annotations lazily evaluated
+                types = ns["__annotate__"](1)
+            else:
+                types = {}
             default_names = []
             for field_name in types:
                 if field_name in ns:
@@ -2962,7 +3255,7 @@ class Employee(NamedTuple):
 if hasattr(collections.abc, "Buffer"):
     Buffer = collections.abc.Buffer
 else:
-    class Buffer(abc.ABC):
+    class Buffer(abc.ABC):  # noqa: B024
         """Base class for classes that implement the buffer protocol.
 
         The buffer protocol allows Python objects to expose a low-level
@@ -3289,6 +3582,23 @@ def __eq__(self, other: object) -> bool:
             return self.documentation == other.documentation
 
 
+_CapsuleType = getattr(_types, "CapsuleType", None)
+
+if _CapsuleType is None:
+    try:
+        import _socket
+    except ImportError:
+        pass
+    else:
+        _CAPI = getattr(_socket, "CAPI", None)
+        if _CAPI is not None:
+            _CapsuleType = type(_CAPI)
+
+if _CapsuleType is not None:
+    CapsuleType = _CapsuleType
+    __all__.append("CapsuleType")
+
+
 # Aliases for items that have always been in typing.
 # Explicitly assign these (rather than using `from typing import *` at the top),
 # so that we get a CI error if one of these is deleted from typing.py
@@ -3302,7 +3612,6 @@ def __eq__(self, other: object) -> bool:
 Dict = typing.Dict
 ForwardRef = typing.ForwardRef
 FrozenSet = typing.FrozenSet
-Generator = typing.Generator
 Generic = typing.Generic
 Hashable = typing.Hashable
 IO = typing.IO
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index e50d946417b..7e5b4e5df3c 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -11,7 +11,7 @@ requests==2.32.3
     urllib3==1.26.18
 rich==13.7.1
     pygments==2.17.2
-    typing_extensions==4.11.0
+    typing_extensions==4.12.2
 resolvelib==1.0.1
 setuptools==69.5.1
 tenacity==8.2.3

From 63b235faa005dbd4f57865670bf6c292d4f9f92c Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Thu, 27 Jun 2024 12:54:42 -0400
Subject: [PATCH 456/992] Update ruff to 0.5.0

---
 .pre-commit-config.yaml         | 2 +-
 pyproject.toml                  | 1 -
 src/pip/_internal/utils/misc.py | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dc306b0d657..7880e0cb409 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.4.7
+  rev: v0.5.0
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
diff --git a/pyproject.toml b/pyproject.toml
index 8cbf9c9f4c3..05e3beb1483 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -151,7 +151,6 @@ distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
 
 [tool.ruff]
 src = ["src"]
-target-version = "py38"
 line-length = 88
 extend-exclude = [
     "_vendor",
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index 48771c09919..0a5c67b3b65 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -149,7 +149,7 @@ def _onerror_ignore(*_args: Any) -> None:
 
 
 def _onerror_reraise(*_args: Any) -> None:
-    raise
+    raise  # noqa: PLE0704 - Bare exception used to reraise existing exception
 
 
 def rmtree_errorhandler(

From 8a9a1afb39e38928f25f5bcce289e7d65b10f9cd Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Thu, 27 Jun 2024 13:01:52 -0400
Subject: [PATCH 457/992] NEWS ENTRY

---
 news/12805.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12805.trivial.rst

diff --git a/news/12805.trivial.rst b/news/12805.trivial.rst
new file mode 100644
index 00000000000..56f61f77238
--- /dev/null
+++ b/news/12805.trivial.rst
@@ -0,0 +1 @@
+Update ruff to 0.5.0

From 88c9f31ad8a5ffe0bb31ab500b8ddd1b9ff6a5dd Mon Sep 17 00:00:00 2001
From: Eli Schwartz 
Date: Tue, 25 Jun 2024 23:39:35 -0400
Subject: [PATCH 458/992] Use the stdlib tomllib on python 3.11+

Although a tomli copy is vendored, doing this conditional import allows:
- automatically upgrading the code, when the time comes to drop py3.10
  support

- slightly simplifying debundling support, as it's no longer necessary
  to depend on a tomli(-wheel)? package on sufficiently newer versions
  of python.
---
 news/12797.vendor.rst          | 1 +
 src/pip/_internal/pyproject.py | 9 +++++++--
 src/pip/_vendor/__init__.py    | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 news/12797.vendor.rst

diff --git a/news/12797.vendor.rst b/news/12797.vendor.rst
new file mode 100644
index 00000000000..7842883ddba
--- /dev/null
+++ b/news/12797.vendor.rst
@@ -0,0 +1 @@
+Use tomllib from the stdlib if available, rather than tomli
diff --git a/src/pip/_internal/pyproject.py b/src/pip/_internal/pyproject.py
index 8de36b873ed..b9b9e3f19d9 100644
--- a/src/pip/_internal/pyproject.py
+++ b/src/pip/_internal/pyproject.py
@@ -1,9 +1,14 @@
 import importlib.util
 import os
+import sys
 from collections import namedtuple
 from typing import Any, List, Optional
 
-from pip._vendor import tomli
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    from pip._vendor import tomli as tomllib
+
 from pip._vendor.packaging.requirements import InvalidRequirement, Requirement
 
 from pip._internal.exceptions import (
@@ -61,7 +66,7 @@ def load_pyproject_toml(
 
     if has_pyproject:
         with open(pyproject_toml, encoding="utf-8") as f:
-            pp_toml = tomli.loads(f.read())
+            pp_toml = tomllib.loads(f.read())
         build_system = pp_toml.get("build-system")
     else:
         build_system = None
diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
index 50537ab9de1..748622eaf19 100644
--- a/src/pip/_vendor/__init__.py
+++ b/src/pip/_vendor/__init__.py
@@ -111,6 +111,7 @@ def vendored(modulename):
     vendored("rich.text")
     vendored("rich.traceback")
     vendored("tenacity")
-    vendored("tomli")
+    if sys.version_info < (3, 11):
+        vendored("tomli")
     vendored("truststore")
     vendored("urllib3")

From f4bac8396b9661dca11de2e77d015647ca2d780f Mon Sep 17 00:00:00 2001
From: rmorotti 
Date: Thu, 27 Jun 2024 15:43:51 +0100
Subject: [PATCH 459/992] PERF: extract files from wheel in 1MB blocks and skip
 empty files

---
 src/pip/_internal/operations/install/wheel.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index a02a193d226..9815683aabe 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -377,9 +377,11 @@ def save(self) -> None:
 
         zipinfo = self._getinfo()
 
-        with self._zip_file.open(zipinfo) as f:
-            with open(self.dest_path, "wb") as dest:
-                shutil.copyfileobj(f, dest)
+        with open(self.dest_path, "wb") as dest:
+            if zipinfo.file_size > 0:
+                with self._zip_file.open(zipinfo) as f:
+                    blocksize = min(zipinfo.file_size, 1048576)
+                    shutil.copyfileobj(f, dest, blocksize)
 
         if zip_item_is_executable(zipinfo):
             set_extracted_file_to_default_mode_plus_executable(self.dest_path)

From 1b8d2c8db293d6911c21994a8023010d696f6ffd Mon Sep 17 00:00:00 2001
From: rmorotti 
Date: Fri, 28 Jun 2024 09:36:15 +0100
Subject: [PATCH 460/992] add comment

---
 src/pip/_internal/operations/install/wheel.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index 9815683aabe..a33d6faf304 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -377,10 +377,12 @@ def save(self) -> None:
 
         zipinfo = self._getinfo()
 
+        # optimization: the file is created by open(),
+        # skip the decompression when there is 0 bytes to decompress.
         with open(self.dest_path, "wb") as dest:
             if zipinfo.file_size > 0:
                 with self._zip_file.open(zipinfo) as f:
-                    blocksize = min(zipinfo.file_size, 1048576)
+                    blocksize = min(zipinfo.file_size, 1_048_576)
                     shutil.copyfileobj(f, dest, blocksize)
 
         if zip_item_is_executable(zipinfo):

From e2577ea3e29e5a3c13327320a3929b0e5557b5cc Mon Sep 17 00:00:00 2001
From: rmorotti 
Date: Fri, 28 Jun 2024 10:10:05 +0100
Subject: [PATCH 461/992] add news item

---
 news/12803.bugfix.rst | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 news/12803.bugfix.rst

diff --git a/news/12803.bugfix.rst b/news/12803.bugfix.rst
new file mode 100644
index 00000000000..4193d33e05c
--- /dev/null
+++ b/news/12803.bugfix.rst
@@ -0,0 +1,4 @@
+Improve pip install performance. Files are now extracted in 1MB blocks,
+or in one block matching the file size for smaller files.
+A decompressor is no longer instantiated when extracting 0 bytes files,
+it is not necessary because there is no data to decompress.

From 2c107ebf958a8936f5f6bd1693a55f85659e5e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
Date: Fri, 28 Jun 2024 15:56:48 +0200
Subject: [PATCH 462/992] Add a news item for DEBUNDLED list update

---
 news/12796.vendor.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12796.vendor.rst

diff --git a/news/12796.vendor.rst b/news/12796.vendor.rst
new file mode 100644
index 00000000000..2b2fe126cfd
--- /dev/null
+++ b/news/12796.vendor.rst
@@ -0,0 +1 @@
+Update the preload list for the ``DEBUNDLED`` case.

From 52cb3827ccc1a3151a579f81199433588f7ee442 Mon Sep 17 00:00:00 2001
From: rmorotti 
Date: Mon, 1 Jul 2024 10:44:05 +0100
Subject: [PATCH 463/992] reformat 1048576 as 1024 * 1024

---
 src/pip/_internal/operations/install/wheel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index a33d6faf304..c7d9c09cc65 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -382,7 +382,7 @@ def save(self) -> None:
         with open(self.dest_path, "wb") as dest:
             if zipinfo.file_size > 0:
                 with self._zip_file.open(zipinfo) as f:
-                    blocksize = min(zipinfo.file_size, 1_048_576)
+                    blocksize = min(zipinfo.file_size, 1024 * 1024)
                     shutil.copyfileobj(f, dest, blocksize)
 
         if zip_item_is_executable(zipinfo):

From 27bcb46d51e80b1e39b94da67a7dd9dfd4aa6b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
Date: Mon, 1 Jul 2024 10:33:16 +0000
Subject: [PATCH 464/992] Update the news item per suggestion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Stéphane Bidoul 
---
 news/12796.vendor.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/12796.vendor.rst b/news/12796.vendor.rst
index 2b2fe126cfd..c8d63920d11 100644
--- a/news/12796.vendor.rst
+++ b/news/12796.vendor.rst
@@ -1 +1 @@
-Update the preload list for the ``DEBUNDLED`` case.
+Update the preload list for the ``DEBUNDLED`` case, to replace `pep517` that has been renamed to `pyproject_hooks`.

From cc0c381b09a6f28c9440ba4250c3a8cd85d336b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
Date: Tue, 2 Jul 2024 08:23:23 +0200
Subject: [PATCH 465/992] Fix code tags in the news item

---
 news/12796.vendor.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/12796.vendor.rst b/news/12796.vendor.rst
index c8d63920d11..6384a5b1476 100644
--- a/news/12796.vendor.rst
+++ b/news/12796.vendor.rst
@@ -1 +1 @@
-Update the preload list for the ``DEBUNDLED`` case, to replace `pep517` that has been renamed to `pyproject_hooks`.
+Update the preload list for the ``DEBUNDLED`` case, to replace ``pep517`` that has been renamed to ``pyproject_hooks``.

From ea8941d5b2a215d1d990f7f171e10fe9d27f6825 Mon Sep 17 00:00:00 2001
From: Petr Viktorin 
Date: Wed, 26 Jun 2024 14:59:49 +0200
Subject: [PATCH 466/992] untar_file: remove common leading directory before
 unpacking

Fixes: #12781
---
 news/12781.bugfix.rst                |  1 +
 src/pip/_internal/utils/unpacking.py | 14 +++++++--
 tests/unit/test_utils_unpacking.py   | 43 ++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 news/12781.bugfix.rst

diff --git a/news/12781.bugfix.rst b/news/12781.bugfix.rst
new file mode 100644
index 00000000000..6bd43d347db
--- /dev/null
+++ b/news/12781.bugfix.rst
@@ -0,0 +1 @@
+Fix finding hardlink targets in tar files with an ignored top-level directory.
diff --git a/src/pip/_internal/utils/unpacking.py b/src/pip/_internal/utils/unpacking.py
index 341269550ce..875e30e13ab 100644
--- a/src/pip/_internal/utils/unpacking.py
+++ b/src/pip/_internal/utils/unpacking.py
@@ -190,9 +190,19 @@ def untar_file(filename: str, location: str) -> None:
         else:
             default_mode_plus_executable = _get_default_mode_plus_executable()
 
+            if leading:
+                # Strip the leading directory from all files in the archive,
+                # including hardlink targets (which are relative to the
+                # unpack location).
+                for member in tar.getmembers():
+                    name_lead, name_rest = split_leading_dir(member.name)
+                    member.name = name_rest
+                    if member.islnk():
+                        lnk_lead, lnk_rest = split_leading_dir(member.linkname)
+                        if lnk_lead == name_lead:
+                            member.linkname = lnk_rest
+
             def pip_filter(member: tarfile.TarInfo, path: str) -> tarfile.TarInfo:
-                if leading:
-                    member.name = split_leading_dir(member.name)[1]
                 orig_mode = member.mode
                 try:
                     try:
diff --git a/tests/unit/test_utils_unpacking.py b/tests/unit/test_utils_unpacking.py
index 3fdd822e739..50500868061 100644
--- a/tests/unit/test_utils_unpacking.py
+++ b/tests/unit/test_utils_unpacking.py
@@ -197,6 +197,49 @@ def test_unpack_tar_filter(self) -> None:
 
         assert "is outside the destination" in str(e.value)
 
+    @pytest.mark.parametrize(
+        ("input_prefix", "unpack_prefix"),
+        [
+            ("", ""),
+            ("dir/", ""),  # pip ignores a common leading directory
+            ("dir/sub/", "sub/"),  # pip ignores *one* common leading directory
+        ],
+    )
+    def test_unpack_tar_links(self, input_prefix: str, unpack_prefix: str) -> None:
+        """
+        Test unpacking a *.tar with file containing hard & soft links
+        """
+        test_tar = os.path.join(self.tempdir, "test_tar_links.tar")
+        content = b"file content"
+        with tarfile.open(test_tar, "w") as mytar:
+            file_tarinfo = tarfile.TarInfo(input_prefix + "regular_file.txt")
+            file_tarinfo.size = len(content)
+            mytar.addfile(file_tarinfo, io.BytesIO(content))
+
+            hardlink_tarinfo = tarfile.TarInfo(input_prefix + "hardlink.txt")
+            hardlink_tarinfo.type = tarfile.LNKTYPE
+            hardlink_tarinfo.linkname = input_prefix + "regular_file.txt"
+            mytar.addfile(hardlink_tarinfo)
+
+            symlink_tarinfo = tarfile.TarInfo(input_prefix + "symlink.txt")
+            symlink_tarinfo.type = tarfile.SYMTYPE
+            symlink_tarinfo.linkname = "regular_file.txt"
+            mytar.addfile(symlink_tarinfo)
+
+        untar_file(test_tar, self.tempdir)
+
+        os.system(f"ls -alR {self.tempdir}")
+
+        unpack_dir = os.path.join(self.tempdir, unpack_prefix)
+        with open(os.path.join(unpack_dir, "regular_file.txt"), "rb") as f:
+            assert f.read() == content
+
+        with open(os.path.join(unpack_dir, "hardlink.txt"), "rb") as f:
+            assert f.read() == content
+
+        with open(os.path.join(unpack_dir, "symlink.txt"), "rb") as f:
+            assert f.read() == content
+
 
 def test_unpack_tar_unicode(tmpdir: Path) -> None:
     test_tar = tmpdir / "test.tar"

From 0f9250c474f6c32fa8ebd49caee57f18209c0cc5 Mon Sep 17 00:00:00 2001
From: Petr Viktorin 
Date: Wed, 26 Jun 2024 18:03:25 +0200
Subject: [PATCH 467/992] Update tests/unit/test_utils_unpacking.py

---
 tests/unit/test_utils_unpacking.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/unit/test_utils_unpacking.py b/tests/unit/test_utils_unpacking.py
index 50500868061..efccbdccb0d 100644
--- a/tests/unit/test_utils_unpacking.py
+++ b/tests/unit/test_utils_unpacking.py
@@ -228,8 +228,6 @@ def test_unpack_tar_links(self, input_prefix: str, unpack_prefix: str) -> None:
 
         untar_file(test_tar, self.tempdir)
 
-        os.system(f"ls -alR {self.tempdir}")
-
         unpack_dir = os.path.join(self.tempdir, unpack_prefix)
         with open(os.path.join(unpack_dir, "regular_file.txt"), "rb") as f:
             assert f.read() == content

From cf723877c8c3ec70bdc0d6b9f79dfde44c8bff90 Mon Sep 17 00:00:00 2001
From: Petr Viktorin 
Date: Wed, 26 Jun 2024 20:15:04 +0200
Subject: [PATCH 468/992] Add a functional test

---
 tests/functional/test_install.py | 122 +++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index eaea12a163c..1603a1afff0 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -1,9 +1,11 @@
 import hashlib
+import io
 import os
 import re
 import ssl
 import sys
 import sysconfig
+import tarfile
 import textwrap
 from os.path import curdir, join, pardir
 from pathlib import Path
@@ -2590,3 +2592,123 @@ def test_install_pip_prints_req_chain_pypi(script: PipTestEnvironment) -> None:
         f"Collecting python-openid "
         f"(from Paste[openid]==1.7.5.1->-r {req_path} (line 1))" in result.stdout
     )
+
+
+@pytest.mark.parametrize("common_prefix", ("", "linktest-1.0/"))
+def test_install_sdist_links(script: PipTestEnvironment, common_prefix: str) -> None:
+    """
+    Test installing an sdist with hard and symbolic links.
+    """
+
+    # Build an unpack an sdist that contains data files:
+    # - root.dat
+    # - sub/inner.dat
+    # and links (symbolic and hard) to both of those, both in the top-level
+    # and 'sub/' directories. That's 8 links total.
+
+    # We build the sdist from in-memory data, since the filesystem
+    # might not support both kinds of links.
+
+    sdist_path = script.scratch_path.joinpath("linktest-1.0.tar.gz")
+
+    def add_file(tar: tarfile.TarFile, name: str, content: str) -> None:
+        info = tarfile.TarInfo(common_prefix + name)
+        content_bytes = content.encode("utf-8")
+        info.size = len(content_bytes)
+        tar.addfile(info, io.BytesIO(content_bytes))
+
+    def add_link(tar: tarfile.TarFile, name: str, linktype: str, target: str) -> None:
+        info = tarfile.TarInfo(common_prefix + name)
+        info.type = {"sym": tarfile.SYMTYPE, "hard": tarfile.LNKTYPE}[linktype]
+        info.linkname = target
+        tar.addfile(info)
+
+    with tarfile.open(sdist_path, "w:gz") as sdist_tar:
+        add_file(
+            sdist_tar,
+            "PKG-INFO",
+            textwrap.dedent(
+                """
+                    Metadata-Version: 2.1
+                    Name: linktest
+                    Version: 1.0
+                """
+            ),
+        )
+
+        add_file(sdist_tar, "src/linktest/__init__.py", "")
+        add_file(sdist_tar, "src/linktest/root.dat", "Data")
+        add_file(sdist_tar, "src/linktest/sub/__init__.py", "")
+        add_file(sdist_tar, "src/linktest/sub/inner.dat", "Data")
+        linknames = []
+        pkg_root = f"{common_prefix}src/linktest"
+        for prefix, target_tag, linktype, target in [
+            ("", "root", "sym", "root.dat"),
+            ("", "root", "hard", f"{pkg_root}/root.dat"),
+            ("", "inner", "sym", "sub/inner.dat"),
+            ("", "inner", "hard", f"{pkg_root}/sub/inner.dat"),
+            ("sub/", "root", "sym", "../root.dat"),
+            ("sub/", "root", "hard", f"{pkg_root}/root.dat"),
+            ("sub/", "inner", "sym", "inner.dat"),
+            ("sub/", "inner", "hard", f"{pkg_root}/sub/inner.dat"),
+        ]:
+            name = f"{prefix}link.{target_tag}.{linktype}.dat"
+            add_link(sdist_tar, "src/linktest/" + name, linktype, target)
+            linknames.append(name)
+
+        add_file(
+            sdist_tar,
+            "pyproject.toml",
+            textwrap.dedent(
+                """
+                    [build-system]
+                    requires = ["setuptools"]
+                    build-backend = "setuptools.build_meta"
+                    [project]
+                    name = "linktest"
+                    version = "1.0"
+                    [tool.setuptools]
+                    include-package-data = true
+                    [tool.setuptools.packages.find]
+                    where = ["src"]
+                    [tool.setuptools.package-data]
+                    "*" = ["*.dat"]
+                """
+            ),
+        )
+
+        add_file(
+            sdist_tar,
+            "src/linktest/__main__.py",
+            textwrap.dedent(
+                f"""
+                    from pathlib import Path
+                    linknames = {linknames!r}
+
+                    # we could use importlib.resources here once
+                    # it has stable convenient API across supported versions
+                    res_path = Path(__file__).parent
+
+                    for name in linknames:
+                        data_text = res_path.joinpath(name).read_text()
+                        assert data_text == "Data"
+                    print(str(len(linknames)) + ' files checked')
+                """
+            ),
+        )
+
+    # Show sdist content, for debugging the test
+    result = script.run("python", "-m", "tarfile", "-vl", str(sdist_path))
+    print(result)
+
+    # Install the package
+    result = script.pip("install", str(sdist_path))
+    print(result)
+
+    # Show installed content, for debugging the test
+    result = script.pip("show", "-f", "linktest")
+    print(result)
+
+    # Run the internal test
+    result = script.run("python", "-m", "linktest")
+    assert result.stdout.strip() == "8 files checked"

From 4fd295ed4d320a40242ffc0f1efb25a1abc7cc59 Mon Sep 17 00:00:00 2001
From: Petr Viktorin 
Date: Thu, 27 Jun 2024 14:53:28 +0200
Subject: [PATCH 469/992] Use native path separator on Windows

---
 tests/functional/test_install.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 1603a1afff0..4e220328d29 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -2641,13 +2641,20 @@ def add_link(tar: tarfile.TarFile, name: str, linktype: str, target: str) -> Non
         add_file(sdist_tar, "src/linktest/sub/__init__.py", "")
         add_file(sdist_tar, "src/linktest/sub/inner.dat", "Data")
         linknames = []
+
+        # Windows requires native path separators in symlink targets.
+        # (see https://github.com/python/cpython/issues/57911)
+        # (This is not needed for hardlinks, nor for the workaround tarfile
+        # uses if symlinking is disabled.)
+        SEP = os.path.sep
+
         pkg_root = f"{common_prefix}src/linktest"
         for prefix, target_tag, linktype, target in [
             ("", "root", "sym", "root.dat"),
             ("", "root", "hard", f"{pkg_root}/root.dat"),
-            ("", "inner", "sym", "sub/inner.dat"),
+            ("", "inner", "sym", f"sub{SEP}inner.dat"),
             ("", "inner", "hard", f"{pkg_root}/sub/inner.dat"),
-            ("sub/", "root", "sym", "../root.dat"),
+            ("sub/", "root", "sym", f"..{SEP}root.dat"),
             ("sub/", "root", "hard", f"{pkg_root}/root.dat"),
             ("sub/", "inner", "sym", "inner.dat"),
             ("sub/", "inner", "hard", f"{pkg_root}/sub/inner.dat"),

From 851de85318a131eb2f518816e4c9063a59a57a1b Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 14 May 2024 19:33:28 -0400
Subject: [PATCH 470/992] Replace tenacity.retry with our own decorator

Tenacity is a 1600+ LOC dependency which is only used for a convenient
`@retry` decorator... which is used a grand total of two times. This is a
lot of code for what can be trivially reimplemented by us.

This also incidentally improves startup performance as tenacity imports
asyncio which is expensive and unnecessary for us.
---
 src/pip/_internal/utils/filesystem.py |  8 ++----
 src/pip/_internal/utils/misc.py       |  5 ++--
 src/pip/_internal/utils/retry.py      | 40 +++++++++++++++++++++++++++
 src/pip/_internal/utils/temp_dir.py   |  2 +-
 4 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 src/pip/_internal/utils/retry.py

diff --git a/src/pip/_internal/utils/filesystem.py b/src/pip/_internal/utils/filesystem.py
index 83c2df75b96..22e356cdd75 100644
--- a/src/pip/_internal/utils/filesystem.py
+++ b/src/pip/_internal/utils/filesystem.py
@@ -7,10 +7,9 @@
 from tempfile import NamedTemporaryFile
 from typing import Any, BinaryIO, Generator, List, Union, cast
 
-from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
-
 from pip._internal.utils.compat import get_path_uid
 from pip._internal.utils.misc import format_size
+from pip._internal.utils.retry import retry
 
 
 def check_path_owner(path: str) -> bool:
@@ -65,10 +64,7 @@ def adjacent_tmp_file(path: str, **kwargs: Any) -> Generator[BinaryIO, None, Non
             os.fsync(result.fileno())
 
 
-# Tenacity raises RetryError by default, explicitly raise the original exception
-_replace_retry = retry(reraise=True, stop=stop_after_delay(1), wait=wait_fixed(0.25))
-
-replace = _replace_retry(os.replace)
+replace = retry(stop_after_delay=1, wait=0.25)(os.replace)
 
 
 # test_writable_dir and _test_writable_dir_win are copied from Flit,
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index 0a5c67b3b65..16d5a1cee10 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -36,12 +36,12 @@
 
 from pip._vendor.packaging.requirements import Requirement
 from pip._vendor.pyproject_hooks import BuildBackendHookCaller
-from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
 
 from pip import __version__
 from pip._internal.exceptions import CommandError, ExternallyManagedEnvironment
 from pip._internal.locations import get_major_minor_version
 from pip._internal.utils.compat import WINDOWS
+from pip._internal.utils.retry import retry
 from pip._internal.utils.virtualenv import running_under_virtualenv
 
 __all__ = [
@@ -120,8 +120,7 @@ def get_prog() -> str:
 
 
 # Retry every half second for up to 3 seconds
-# Tenacity raises RetryError by default, explicitly raise the original exception
-@retry(reraise=True, stop=stop_after_delay(3), wait=wait_fixed(0.5))
+@retry(stop_after_delay=3, wait=0.5)
 def rmtree(
     dir: str,
     ignore_errors: bool = False,
diff --git a/src/pip/_internal/utils/retry.py b/src/pip/_internal/utils/retry.py
new file mode 100644
index 00000000000..941470b7945
--- /dev/null
+++ b/src/pip/_internal/utils/retry.py
@@ -0,0 +1,40 @@
+import functools
+from time import monotonic, sleep
+from typing import Callable, TypeVar
+
+from pip._vendor.typing_extensions import ParamSpec
+
+T = TypeVar("T")
+P = ParamSpec("P")
+
+
+def retry(
+    wait: float, stop_after_delay: float
+) -> Callable[[Callable[P, T]], Callable[P, T]]:
+    """Decorator to automatically retry a function on error.
+
+    If the function raises, the function is recalled with the same arguments
+    until it returns or the time limit is reached. When the time limit is
+    surpassed, the last exception raised is reraised.
+
+    :param wait: The time to wait after an error before retrying, in seconds.
+    :param stop_after_delay: The time limit after which retries will cease,
+        in seconds.
+    """
+
+    def wrapper(func: Callable[P, T]) -> Callable[P, T]:
+
+        @functools.wraps(func)
+        def retry_wrapped(*args: P.args, **kwargs: P.kwargs) -> T:
+            start_time = monotonic()
+            while True:
+                try:
+                    return func(*args, **kwargs)
+                except Exception:
+                    if monotonic() - start_time > stop_after_delay:
+                        raise
+                    sleep(wait)
+
+        return retry_wrapped
+
+    return wrapper
diff --git a/src/pip/_internal/utils/temp_dir.py b/src/pip/_internal/utils/temp_dir.py
index 4eec5f37f76..06668e8ab2d 100644
--- a/src/pip/_internal/utils/temp_dir.py
+++ b/src/pip/_internal/utils/temp_dir.py
@@ -208,7 +208,7 @@ def onerror(
 
         if self.ignore_cleanup_errors:
             try:
-                # first try with tenacity; retrying to handle ephemeral errors
+                # first try with @retry; retrying to handle ephemeral errors
                 rmtree(self._path, ignore_errors=False)
             except OSError:
                 # last pass ignore/log all errors

From 3d990eabecd52db209db8e4986f95aaa3cd69bda Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 14 May 2024 22:57:41 -0400
Subject: [PATCH 471/992] Remove vendored tenacity

---
 news/10822.vendor.rst                    |   1 +
 src/pip/_vendor/__init__.py              |   1 -
 src/pip/_vendor/tenacity/LICENSE         | 202 --------
 src/pip/_vendor/tenacity/__init__.py     | 608 -----------------------
 src/pip/_vendor/tenacity/_asyncio.py     |  94 ----
 src/pip/_vendor/tenacity/_utils.py       |  76 ---
 src/pip/_vendor/tenacity/after.py        |  51 --
 src/pip/_vendor/tenacity/before.py       |  46 --
 src/pip/_vendor/tenacity/before_sleep.py |  71 ---
 src/pip/_vendor/tenacity/nap.py          |  43 --
 src/pip/_vendor/tenacity/py.typed        |   0
 src/pip/_vendor/tenacity/retry.py        | 272 ----------
 src/pip/_vendor/tenacity/stop.py         | 103 ----
 src/pip/_vendor/tenacity/tornadoweb.py   |  59 ---
 src/pip/_vendor/tenacity/wait.py         | 228 ---------
 src/pip/_vendor/vendor.txt               |   1 -
 tools/vendoring/patches/tenacity.patch   |  34 --
 17 files changed, 1 insertion(+), 1889 deletions(-)
 create mode 100644 news/10822.vendor.rst
 delete mode 100644 src/pip/_vendor/tenacity/LICENSE
 delete mode 100644 src/pip/_vendor/tenacity/__init__.py
 delete mode 100644 src/pip/_vendor/tenacity/_asyncio.py
 delete mode 100644 src/pip/_vendor/tenacity/_utils.py
 delete mode 100644 src/pip/_vendor/tenacity/after.py
 delete mode 100644 src/pip/_vendor/tenacity/before.py
 delete mode 100644 src/pip/_vendor/tenacity/before_sleep.py
 delete mode 100644 src/pip/_vendor/tenacity/nap.py
 delete mode 100644 src/pip/_vendor/tenacity/py.typed
 delete mode 100644 src/pip/_vendor/tenacity/retry.py
 delete mode 100644 src/pip/_vendor/tenacity/stop.py
 delete mode 100644 src/pip/_vendor/tenacity/tornadoweb.py
 delete mode 100644 src/pip/_vendor/tenacity/wait.py
 delete mode 100644 tools/vendoring/patches/tenacity.patch

diff --git a/news/10822.vendor.rst b/news/10822.vendor.rst
new file mode 100644
index 00000000000..27a3c234091
--- /dev/null
+++ b/news/10822.vendor.rst
@@ -0,0 +1 @@
+Remove vendored tenacity.
diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
index 12be4fd9ae5..561089ccc0c 100644
--- a/src/pip/_vendor/__init__.py
+++ b/src/pip/_vendor/__init__.py
@@ -110,7 +110,6 @@ def vendored(modulename):
     vendored("rich.style")
     vendored("rich.text")
     vendored("rich.traceback")
-    vendored("tenacity")
     if sys.version_info < (3, 11):
         vendored("tomli")
     vendored("truststore")
diff --git a/src/pip/_vendor/tenacity/LICENSE b/src/pip/_vendor/tenacity/LICENSE
deleted file mode 100644
index 7a4a3ea2424..00000000000
--- a/src/pip/_vendor/tenacity/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/src/pip/_vendor/tenacity/__init__.py b/src/pip/_vendor/tenacity/__init__.py
deleted file mode 100644
index c1b0310bdfb..00000000000
--- a/src/pip/_vendor/tenacity/__init__.py
+++ /dev/null
@@ -1,608 +0,0 @@
-# Copyright 2016-2018 Julien Danjou
-# Copyright 2017 Elisey Zanko
-# Copyright 2016 Étienne Bersac
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import functools
-import sys
-import threading
-import time
-import typing as t
-import warnings
-from abc import ABC, abstractmethod
-from concurrent import futures
-from inspect import iscoroutinefunction
-
-# Import all built-in retry strategies for easier usage.
-from .retry import retry_base  # noqa
-from .retry import retry_all  # noqa
-from .retry import retry_always  # noqa
-from .retry import retry_any  # noqa
-from .retry import retry_if_exception  # noqa
-from .retry import retry_if_exception_type  # noqa
-from .retry import retry_if_exception_cause_type  # noqa
-from .retry import retry_if_not_exception_type  # noqa
-from .retry import retry_if_not_result  # noqa
-from .retry import retry_if_result  # noqa
-from .retry import retry_never  # noqa
-from .retry import retry_unless_exception_type  # noqa
-from .retry import retry_if_exception_message  # noqa
-from .retry import retry_if_not_exception_message  # noqa
-
-# Import all nap strategies for easier usage.
-from .nap import sleep  # noqa
-from .nap import sleep_using_event  # noqa
-
-# Import all built-in stop strategies for easier usage.
-from .stop import stop_after_attempt  # noqa
-from .stop import stop_after_delay  # noqa
-from .stop import stop_all  # noqa
-from .stop import stop_any  # noqa
-from .stop import stop_never  # noqa
-from .stop import stop_when_event_set  # noqa
-
-# Import all built-in wait strategies for easier usage.
-from .wait import wait_chain  # noqa
-from .wait import wait_combine  # noqa
-from .wait import wait_exponential  # noqa
-from .wait import wait_fixed  # noqa
-from .wait import wait_incrementing  # noqa
-from .wait import wait_none  # noqa
-from .wait import wait_random  # noqa
-from .wait import wait_random_exponential  # noqa
-from .wait import wait_random_exponential as wait_full_jitter  # noqa
-from .wait import wait_exponential_jitter  # noqa
-
-# Import all built-in before strategies for easier usage.
-from .before import before_log  # noqa
-from .before import before_nothing  # noqa
-
-# Import all built-in after strategies for easier usage.
-from .after import after_log  # noqa
-from .after import after_nothing  # noqa
-
-# Import all built-in after strategies for easier usage.
-from .before_sleep import before_sleep_log  # noqa
-from .before_sleep import before_sleep_nothing  # noqa
-
-# Replace a conditional import with a hard-coded None so that pip does
-# not attempt to use tornado even if it is present in the environment.
-# If tornado is non-None, tenacity will attempt to execute some code
-# that is sensitive to the version of tornado, which could break pip
-# if an old version is found.
-tornado = None  # type: ignore
-
-if t.TYPE_CHECKING:
-    import types
-
-    from .retry import RetryBaseT
-    from .stop import StopBaseT
-    from .wait import WaitBaseT
-
-
-WrappedFnReturnT = t.TypeVar("WrappedFnReturnT")
-WrappedFn = t.TypeVar("WrappedFn", bound=t.Callable[..., t.Any])
-
-
-class TryAgain(Exception):
-    """Always retry the executed function when raised."""
-
-
-NO_RESULT = object()
-
-
-class DoAttempt:
-    pass
-
-
-class DoSleep(float):
-    pass
-
-
-class BaseAction:
-    """Base class for representing actions to take by retry object.
-
-    Concrete implementations must define:
-    - __init__: to initialize all necessary fields
-    - REPR_FIELDS: class variable specifying attributes to include in repr(self)
-    - NAME: for identification in retry object methods and callbacks
-    """
-
-    REPR_FIELDS: t.Sequence[str] = ()
-    NAME: t.Optional[str] = None
-
-    def __repr__(self) -> str:
-        state_str = ", ".join(f"{field}={getattr(self, field)!r}" for field in self.REPR_FIELDS)
-        return f"{self.__class__.__name__}({state_str})"
-
-    def __str__(self) -> str:
-        return repr(self)
-
-
-class RetryAction(BaseAction):
-    REPR_FIELDS = ("sleep",)
-    NAME = "retry"
-
-    def __init__(self, sleep: t.SupportsFloat) -> None:
-        self.sleep = float(sleep)
-
-
-_unset = object()
-
-
-def _first_set(first: t.Union[t.Any, object], second: t.Any) -> t.Any:
-    return second if first is _unset else first
-
-
-class RetryError(Exception):
-    """Encapsulates the last attempt instance right before giving up."""
-
-    def __init__(self, last_attempt: "Future") -> None:
-        self.last_attempt = last_attempt
-        super().__init__(last_attempt)
-
-    def reraise(self) -> "t.NoReturn":
-        if self.last_attempt.failed:
-            raise self.last_attempt.result()
-        raise self
-
-    def __str__(self) -> str:
-        return f"{self.__class__.__name__}[{self.last_attempt}]"
-
-
-class AttemptManager:
-    """Manage attempt context."""
-
-    def __init__(self, retry_state: "RetryCallState"):
-        self.retry_state = retry_state
-
-    def __enter__(self) -> None:
-        pass
-
-    def __exit__(
-        self,
-        exc_type: t.Optional[t.Type[BaseException]],
-        exc_value: t.Optional[BaseException],
-        traceback: t.Optional["types.TracebackType"],
-    ) -> t.Optional[bool]:
-        if exc_type is not None and exc_value is not None:
-            self.retry_state.set_exception((exc_type, exc_value, traceback))
-            return True  # Swallow exception.
-        else:
-            # We don't have the result, actually.
-            self.retry_state.set_result(None)
-            return None
-
-
-class BaseRetrying(ABC):
-    def __init__(
-        self,
-        sleep: t.Callable[[t.Union[int, float]], None] = sleep,
-        stop: "StopBaseT" = stop_never,
-        wait: "WaitBaseT" = wait_none(),
-        retry: "RetryBaseT" = retry_if_exception_type(),
-        before: t.Callable[["RetryCallState"], None] = before_nothing,
-        after: t.Callable[["RetryCallState"], None] = after_nothing,
-        before_sleep: t.Optional[t.Callable[["RetryCallState"], None]] = None,
-        reraise: bool = False,
-        retry_error_cls: t.Type[RetryError] = RetryError,
-        retry_error_callback: t.Optional[t.Callable[["RetryCallState"], t.Any]] = None,
-    ):
-        self.sleep = sleep
-        self.stop = stop
-        self.wait = wait
-        self.retry = retry
-        self.before = before
-        self.after = after
-        self.before_sleep = before_sleep
-        self.reraise = reraise
-        self._local = threading.local()
-        self.retry_error_cls = retry_error_cls
-        self.retry_error_callback = retry_error_callback
-
-    def copy(
-        self,
-        sleep: t.Union[t.Callable[[t.Union[int, float]], None], object] = _unset,
-        stop: t.Union["StopBaseT", object] = _unset,
-        wait: t.Union["WaitBaseT", object] = _unset,
-        retry: t.Union[retry_base, object] = _unset,
-        before: t.Union[t.Callable[["RetryCallState"], None], object] = _unset,
-        after: t.Union[t.Callable[["RetryCallState"], None], object] = _unset,
-        before_sleep: t.Union[t.Optional[t.Callable[["RetryCallState"], None]], object] = _unset,
-        reraise: t.Union[bool, object] = _unset,
-        retry_error_cls: t.Union[t.Type[RetryError], object] = _unset,
-        retry_error_callback: t.Union[t.Optional[t.Callable[["RetryCallState"], t.Any]], object] = _unset,
-    ) -> "BaseRetrying":
-        """Copy this object with some parameters changed if needed."""
-        return self.__class__(
-            sleep=_first_set(sleep, self.sleep),
-            stop=_first_set(stop, self.stop),
-            wait=_first_set(wait, self.wait),
-            retry=_first_set(retry, self.retry),
-            before=_first_set(before, self.before),
-            after=_first_set(after, self.after),
-            before_sleep=_first_set(before_sleep, self.before_sleep),
-            reraise=_first_set(reraise, self.reraise),
-            retry_error_cls=_first_set(retry_error_cls, self.retry_error_cls),
-            retry_error_callback=_first_set(retry_error_callback, self.retry_error_callback),
-        )
-
-    def __repr__(self) -> str:
-        return (
-            f"<{self.__class__.__name__} object at 0x{id(self):x} ("
-            f"stop={self.stop}, "
-            f"wait={self.wait}, "
-            f"sleep={self.sleep}, "
-            f"retry={self.retry}, "
-            f"before={self.before}, "
-            f"after={self.after})>"
-        )
-
-    @property
-    def statistics(self) -> t.Dict[str, t.Any]:
-        """Return a dictionary of runtime statistics.
-
-        This dictionary will be empty when the controller has never been
-        ran. When it is running or has ran previously it should have (but
-        may not) have useful and/or informational keys and values when
-        running is underway and/or completed.
-
-        .. warning:: The keys in this dictionary **should** be some what
-                     stable (not changing), but there existence **may**
-                     change between major releases as new statistics are
-                     gathered or removed so before accessing keys ensure that
-                     they actually exist and handle when they do not.
-
-        .. note:: The values in this dictionary are local to the thread
-                  running call (so if multiple threads share the same retrying
-                  object - either directly or indirectly) they will each have
-                  there own view of statistics they have collected (in the
-                  future we may provide a way to aggregate the various
-                  statistics from each thread).
-        """
-        try:
-            return self._local.statistics  # type: ignore[no-any-return]
-        except AttributeError:
-            self._local.statistics = t.cast(t.Dict[str, t.Any], {})
-            return self._local.statistics
-
-    def wraps(self, f: WrappedFn) -> WrappedFn:
-        """Wrap a function for retrying.
-
-        :param f: A function to wraps for retrying.
-        """
-
-        @functools.wraps(f)
-        def wrapped_f(*args: t.Any, **kw: t.Any) -> t.Any:
-            return self(f, *args, **kw)
-
-        def retry_with(*args: t.Any, **kwargs: t.Any) -> WrappedFn:
-            return self.copy(*args, **kwargs).wraps(f)
-
-        wrapped_f.retry = self  # type: ignore[attr-defined]
-        wrapped_f.retry_with = retry_with  # type: ignore[attr-defined]
-
-        return wrapped_f  # type: ignore[return-value]
-
-    def begin(self) -> None:
-        self.statistics.clear()
-        self.statistics["start_time"] = time.monotonic()
-        self.statistics["attempt_number"] = 1
-        self.statistics["idle_for"] = 0
-
-    def iter(self, retry_state: "RetryCallState") -> t.Union[DoAttempt, DoSleep, t.Any]:  # noqa
-        fut = retry_state.outcome
-        if fut is None:
-            if self.before is not None:
-                self.before(retry_state)
-            return DoAttempt()
-
-        is_explicit_retry = fut.failed and isinstance(fut.exception(), TryAgain)
-        if not (is_explicit_retry or self.retry(retry_state)):
-            return fut.result()
-
-        if self.after is not None:
-            self.after(retry_state)
-
-        self.statistics["delay_since_first_attempt"] = retry_state.seconds_since_start
-        if self.stop(retry_state):
-            if self.retry_error_callback:
-                return self.retry_error_callback(retry_state)
-            retry_exc = self.retry_error_cls(fut)
-            if self.reraise:
-                raise retry_exc.reraise()
-            raise retry_exc from fut.exception()
-
-        if self.wait:
-            sleep = self.wait(retry_state)
-        else:
-            sleep = 0.0
-        retry_state.next_action = RetryAction(sleep)
-        retry_state.idle_for += sleep
-        self.statistics["idle_for"] += sleep
-        self.statistics["attempt_number"] += 1
-
-        if self.before_sleep is not None:
-            self.before_sleep(retry_state)
-
-        return DoSleep(sleep)
-
-    def __iter__(self) -> t.Generator[AttemptManager, None, None]:
-        self.begin()
-
-        retry_state = RetryCallState(self, fn=None, args=(), kwargs={})
-        while True:
-            do = self.iter(retry_state=retry_state)
-            if isinstance(do, DoAttempt):
-                yield AttemptManager(retry_state=retry_state)
-            elif isinstance(do, DoSleep):
-                retry_state.prepare_for_next_attempt()
-                self.sleep(do)
-            else:
-                break
-
-    @abstractmethod
-    def __call__(
-        self,
-        fn: t.Callable[..., WrappedFnReturnT],
-        *args: t.Any,
-        **kwargs: t.Any,
-    ) -> WrappedFnReturnT:
-        pass
-
-
-class Retrying(BaseRetrying):
-    """Retrying controller."""
-
-    def __call__(
-        self,
-        fn: t.Callable[..., WrappedFnReturnT],
-        *args: t.Any,
-        **kwargs: t.Any,
-    ) -> WrappedFnReturnT:
-        self.begin()
-
-        retry_state = RetryCallState(retry_object=self, fn=fn, args=args, kwargs=kwargs)
-        while True:
-            do = self.iter(retry_state=retry_state)
-            if isinstance(do, DoAttempt):
-                try:
-                    result = fn(*args, **kwargs)
-                except BaseException:  # noqa: B902
-                    retry_state.set_exception(sys.exc_info())  # type: ignore[arg-type]
-                else:
-                    retry_state.set_result(result)
-            elif isinstance(do, DoSleep):
-                retry_state.prepare_for_next_attempt()
-                self.sleep(do)
-            else:
-                return do  # type: ignore[no-any-return]
-
-
-if sys.version_info[1] >= 9:
-    FutureGenericT = futures.Future[t.Any]
-else:
-    FutureGenericT = futures.Future
-
-
-class Future(FutureGenericT):
-    """Encapsulates a (future or past) attempted call to a target function."""
-
-    def __init__(self, attempt_number: int) -> None:
-        super().__init__()
-        self.attempt_number = attempt_number
-
-    @property
-    def failed(self) -> bool:
-        """Return whether a exception is being held in this future."""
-        return self.exception() is not None
-
-    @classmethod
-    def construct(cls, attempt_number: int, value: t.Any, has_exception: bool) -> "Future":
-        """Construct a new Future object."""
-        fut = cls(attempt_number)
-        if has_exception:
-            fut.set_exception(value)
-        else:
-            fut.set_result(value)
-        return fut
-
-
-class RetryCallState:
-    """State related to a single call wrapped with Retrying."""
-
-    def __init__(
-        self,
-        retry_object: BaseRetrying,
-        fn: t.Optional[WrappedFn],
-        args: t.Any,
-        kwargs: t.Any,
-    ) -> None:
-        #: Retry call start timestamp
-        self.start_time = time.monotonic()
-        #: Retry manager object
-        self.retry_object = retry_object
-        #: Function wrapped by this retry call
-        self.fn = fn
-        #: Arguments of the function wrapped by this retry call
-        self.args = args
-        #: Keyword arguments of the function wrapped by this retry call
-        self.kwargs = kwargs
-
-        #: The number of the current attempt
-        self.attempt_number: int = 1
-        #: Last outcome (result or exception) produced by the function
-        self.outcome: t.Optional[Future] = None
-        #: Timestamp of the last outcome
-        self.outcome_timestamp: t.Optional[float] = None
-        #: Time spent sleeping in retries
-        self.idle_for: float = 0.0
-        #: Next action as decided by the retry manager
-        self.next_action: t.Optional[RetryAction] = None
-
-    @property
-    def seconds_since_start(self) -> t.Optional[float]:
-        if self.outcome_timestamp is None:
-            return None
-        return self.outcome_timestamp - self.start_time
-
-    def prepare_for_next_attempt(self) -> None:
-        self.outcome = None
-        self.outcome_timestamp = None
-        self.attempt_number += 1
-        self.next_action = None
-
-    def set_result(self, val: t.Any) -> None:
-        ts = time.monotonic()
-        fut = Future(self.attempt_number)
-        fut.set_result(val)
-        self.outcome, self.outcome_timestamp = fut, ts
-
-    def set_exception(
-        self, exc_info: t.Tuple[t.Type[BaseException], BaseException, "types.TracebackType| None"]
-    ) -> None:
-        ts = time.monotonic()
-        fut = Future(self.attempt_number)
-        fut.set_exception(exc_info[1])
-        self.outcome, self.outcome_timestamp = fut, ts
-
-    def __repr__(self) -> str:
-        if self.outcome is None:
-            result = "none yet"
-        elif self.outcome.failed:
-            exception = self.outcome.exception()
-            result = f"failed ({exception.__class__.__name__} {exception})"
-        else:
-            result = f"returned {self.outcome.result()}"
-
-        slept = float(round(self.idle_for, 2))
-        clsname = self.__class__.__name__
-        return f"<{clsname} {id(self)}: attempt #{self.attempt_number}; slept for {slept}; last result: {result}>"
-
-
-@t.overload
-def retry(func: WrappedFn) -> WrappedFn:
-    ...
-
-
-@t.overload
-def retry(
-    sleep: t.Callable[[t.Union[int, float]], t.Optional[t.Awaitable[None]]] = sleep,
-    stop: "StopBaseT" = stop_never,
-    wait: "WaitBaseT" = wait_none(),
-    retry: "RetryBaseT" = retry_if_exception_type(),
-    before: t.Callable[["RetryCallState"], None] = before_nothing,
-    after: t.Callable[["RetryCallState"], None] = after_nothing,
-    before_sleep: t.Optional[t.Callable[["RetryCallState"], None]] = None,
-    reraise: bool = False,
-    retry_error_cls: t.Type["RetryError"] = RetryError,
-    retry_error_callback: t.Optional[t.Callable[["RetryCallState"], t.Any]] = None,
-) -> t.Callable[[WrappedFn], WrappedFn]:
-    ...
-
-
-def retry(*dargs: t.Any, **dkw: t.Any) -> t.Any:
-    """Wrap a function with a new `Retrying` object.
-
-    :param dargs: positional arguments passed to Retrying object
-    :param dkw: keyword arguments passed to the Retrying object
-    """
-    # support both @retry and @retry() as valid syntax
-    if len(dargs) == 1 and callable(dargs[0]):
-        return retry()(dargs[0])
-    else:
-
-        def wrap(f: WrappedFn) -> WrappedFn:
-            if isinstance(f, retry_base):
-                warnings.warn(
-                    f"Got retry_base instance ({f.__class__.__name__}) as callable argument, "
-                    f"this will probably hang indefinitely (did you mean retry={f.__class__.__name__}(...)?)"
-                )
-            r: "BaseRetrying"
-            if iscoroutinefunction(f):
-                r = AsyncRetrying(*dargs, **dkw)
-            elif tornado and hasattr(tornado.gen, "is_coroutine_function") and tornado.gen.is_coroutine_function(f):
-                r = TornadoRetrying(*dargs, **dkw)
-            else:
-                r = Retrying(*dargs, **dkw)
-
-            return r.wraps(f)
-
-        return wrap
-
-
-from pip._vendor.tenacity._asyncio import AsyncRetrying  # noqa:E402,I100
-
-if tornado:
-    from pip._vendor.tenacity.tornadoweb import TornadoRetrying
-
-
-__all__ = [
-    "retry_base",
-    "retry_all",
-    "retry_always",
-    "retry_any",
-    "retry_if_exception",
-    "retry_if_exception_type",
-    "retry_if_exception_cause_type",
-    "retry_if_not_exception_type",
-    "retry_if_not_result",
-    "retry_if_result",
-    "retry_never",
-    "retry_unless_exception_type",
-    "retry_if_exception_message",
-    "retry_if_not_exception_message",
-    "sleep",
-    "sleep_using_event",
-    "stop_after_attempt",
-    "stop_after_delay",
-    "stop_all",
-    "stop_any",
-    "stop_never",
-    "stop_when_event_set",
-    "wait_chain",
-    "wait_combine",
-    "wait_exponential",
-    "wait_fixed",
-    "wait_incrementing",
-    "wait_none",
-    "wait_random",
-    "wait_random_exponential",
-    "wait_full_jitter",
-    "wait_exponential_jitter",
-    "before_log",
-    "before_nothing",
-    "after_log",
-    "after_nothing",
-    "before_sleep_log",
-    "before_sleep_nothing",
-    "retry",
-    "WrappedFn",
-    "TryAgain",
-    "NO_RESULT",
-    "DoAttempt",
-    "DoSleep",
-    "BaseAction",
-    "RetryAction",
-    "RetryError",
-    "AttemptManager",
-    "BaseRetrying",
-    "Retrying",
-    "Future",
-    "RetryCallState",
-    "AsyncRetrying",
-]
diff --git a/src/pip/_vendor/tenacity/_asyncio.py b/src/pip/_vendor/tenacity/_asyncio.py
deleted file mode 100644
index 2e50cd7b40e..00000000000
--- a/src/pip/_vendor/tenacity/_asyncio.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2016 Étienne Bersac
-# Copyright 2016 Julien Danjou
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import functools
-import sys
-import typing as t
-from asyncio import sleep
-
-from pip._vendor.tenacity import AttemptManager
-from pip._vendor.tenacity import BaseRetrying
-from pip._vendor.tenacity import DoAttempt
-from pip._vendor.tenacity import DoSleep
-from pip._vendor.tenacity import RetryCallState
-
-WrappedFnReturnT = t.TypeVar("WrappedFnReturnT")
-WrappedFn = t.TypeVar("WrappedFn", bound=t.Callable[..., t.Awaitable[t.Any]])
-
-
-class AsyncRetrying(BaseRetrying):
-    sleep: t.Callable[[float], t.Awaitable[t.Any]]
-
-    def __init__(self, sleep: t.Callable[[float], t.Awaitable[t.Any]] = sleep, **kwargs: t.Any) -> None:
-        super().__init__(**kwargs)
-        self.sleep = sleep
-
-    async def __call__(  # type: ignore[override]
-        self, fn: WrappedFn, *args: t.Any, **kwargs: t.Any
-    ) -> WrappedFnReturnT:
-        self.begin()
-
-        retry_state = RetryCallState(retry_object=self, fn=fn, args=args, kwargs=kwargs)
-        while True:
-            do = self.iter(retry_state=retry_state)
-            if isinstance(do, DoAttempt):
-                try:
-                    result = await fn(*args, **kwargs)
-                except BaseException:  # noqa: B902
-                    retry_state.set_exception(sys.exc_info())  # type: ignore[arg-type]
-                else:
-                    retry_state.set_result(result)
-            elif isinstance(do, DoSleep):
-                retry_state.prepare_for_next_attempt()
-                await self.sleep(do)
-            else:
-                return do  # type: ignore[no-any-return]
-
-    def __iter__(self) -> t.Generator[AttemptManager, None, None]:
-        raise TypeError("AsyncRetrying object is not iterable")
-
-    def __aiter__(self) -> "AsyncRetrying":
-        self.begin()
-        self._retry_state = RetryCallState(self, fn=None, args=(), kwargs={})
-        return self
-
-    async def __anext__(self) -> AttemptManager:
-        while True:
-            do = self.iter(retry_state=self._retry_state)
-            if do is None:
-                raise StopAsyncIteration
-            elif isinstance(do, DoAttempt):
-                return AttemptManager(retry_state=self._retry_state)
-            elif isinstance(do, DoSleep):
-                self._retry_state.prepare_for_next_attempt()
-                await self.sleep(do)
-            else:
-                raise StopAsyncIteration
-
-    def wraps(self, fn: WrappedFn) -> WrappedFn:
-        fn = super().wraps(fn)
-        # Ensure wrapper is recognized as a coroutine function.
-
-        @functools.wraps(fn)
-        async def async_wrapped(*args: t.Any, **kwargs: t.Any) -> t.Any:
-            return await fn(*args, **kwargs)
-
-        # Preserve attributes
-        async_wrapped.retry = fn.retry  # type: ignore[attr-defined]
-        async_wrapped.retry_with = fn.retry_with  # type: ignore[attr-defined]
-
-        return async_wrapped  # type: ignore[return-value]
diff --git a/src/pip/_vendor/tenacity/_utils.py b/src/pip/_vendor/tenacity/_utils.py
deleted file mode 100644
index f14ff32096e..00000000000
--- a/src/pip/_vendor/tenacity/_utils.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2016 Julien Danjou
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import sys
-import typing
-from datetime import timedelta
-
-
-# sys.maxsize:
-# An integer giving the maximum value a variable of type Py_ssize_t can take.
-MAX_WAIT = sys.maxsize / 2
-
-
-def find_ordinal(pos_num: int) -> str:
-    # See: https://en.wikipedia.org/wiki/English_numerals#Ordinal_numbers
-    if pos_num == 0:
-        return "th"
-    elif pos_num == 1:
-        return "st"
-    elif pos_num == 2:
-        return "nd"
-    elif pos_num == 3:
-        return "rd"
-    elif 4 <= pos_num <= 20:
-        return "th"
-    else:
-        return find_ordinal(pos_num % 10)
-
-
-def to_ordinal(pos_num: int) -> str:
-    return f"{pos_num}{find_ordinal(pos_num)}"
-
-
-def get_callback_name(cb: typing.Callable[..., typing.Any]) -> str:
-    """Get a callback fully-qualified name.
-
-    If no name can be produced ``repr(cb)`` is called and returned.
-    """
-    segments = []
-    try:
-        segments.append(cb.__qualname__)
-    except AttributeError:
-        try:
-            segments.append(cb.__name__)
-        except AttributeError:
-            pass
-    if not segments:
-        return repr(cb)
-    else:
-        try:
-            # When running under sphinx it appears this can be none?
-            if cb.__module__:
-                segments.insert(0, cb.__module__)
-        except AttributeError:
-            pass
-        return ".".join(segments)
-
-
-time_unit_type = typing.Union[int, float, timedelta]
-
-
-def to_seconds(time_unit: time_unit_type) -> float:
-    return float(time_unit.total_seconds() if isinstance(time_unit, timedelta) else time_unit)
diff --git a/src/pip/_vendor/tenacity/after.py b/src/pip/_vendor/tenacity/after.py
deleted file mode 100644
index 574c9bcea6e..00000000000
--- a/src/pip/_vendor/tenacity/after.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2016 Julien Danjou
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import typing
-
-from pip._vendor.tenacity import _utils
-
-if typing.TYPE_CHECKING:
-    import logging
-
-    from pip._vendor.tenacity import RetryCallState
-
-
-def after_nothing(retry_state: "RetryCallState") -> None:
-    """After call strategy that does nothing."""
-
-
-def after_log(
-    logger: "logging.Logger",
-    log_level: int,
-    sec_format: str = "%0.3f",
-) -> typing.Callable[["RetryCallState"], None]:
-    """After call strategy that logs to some logger the finished attempt."""
-
-    def log_it(retry_state: "RetryCallState") -> None:
-        if retry_state.fn is None:
-            # NOTE(sileht): can't really happen, but we must please mypy
-            fn_name = ""
-        else:
-            fn_name = _utils.get_callback_name(retry_state.fn)
-        logger.log(
-            log_level,
-            f"Finished call to '{fn_name}' "
-            f"after {sec_format % retry_state.seconds_since_start}(s), "
-            f"this was the {_utils.to_ordinal(retry_state.attempt_number)} time calling it.",
-        )
-
-    return log_it
diff --git a/src/pip/_vendor/tenacity/before.py b/src/pip/_vendor/tenacity/before.py
deleted file mode 100644
index cfd7dc72ee7..00000000000
--- a/src/pip/_vendor/tenacity/before.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2016 Julien Danjou
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import typing
-
-from pip._vendor.tenacity import _utils
-
-if typing.TYPE_CHECKING:
-    import logging
-
-    from pip._vendor.tenacity import RetryCallState
-
-
-def before_nothing(retry_state: "RetryCallState") -> None:
-    """Before call strategy that does nothing."""
-
-
-def before_log(logger: "logging.Logger", log_level: int) -> typing.Callable[["RetryCallState"], None]:
-    """Before call strategy that logs to some logger the attempt."""
-
-    def log_it(retry_state: "RetryCallState") -> None:
-        if retry_state.fn is None:
-            # NOTE(sileht): can't really happen, but we must please mypy
-            fn_name = ""
-        else:
-            fn_name = _utils.get_callback_name(retry_state.fn)
-        logger.log(
-            log_level,
-            f"Starting call to '{fn_name}', "
-            f"this is the {_utils.to_ordinal(retry_state.attempt_number)} time calling it.",
-        )
-
-    return log_it
diff --git a/src/pip/_vendor/tenacity/before_sleep.py b/src/pip/_vendor/tenacity/before_sleep.py
deleted file mode 100644
index 8c6167fb3a6..00000000000
--- a/src/pip/_vendor/tenacity/before_sleep.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2016 Julien Danjou
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import typing
-
-from pip._vendor.tenacity import _utils
-
-if typing.TYPE_CHECKING:
-    import logging
-
-    from pip._vendor.tenacity import RetryCallState
-
-
-def before_sleep_nothing(retry_state: "RetryCallState") -> None:
-    """Before call strategy that does nothing."""
-
-
-def before_sleep_log(
-    logger: "logging.Logger",
-    log_level: int,
-    exc_info: bool = False,
-) -> typing.Callable[["RetryCallState"], None]:
-    """Before call strategy that logs to some logger the attempt."""
-
-    def log_it(retry_state: "RetryCallState") -> None:
-        local_exc_info: BaseException | bool | None
-
-        if retry_state.outcome is None:
-            raise RuntimeError("log_it() called before outcome was set")
-
-        if retry_state.next_action is None:
-            raise RuntimeError("log_it() called before next_action was set")
-
-        if retry_state.outcome.failed:
-            ex = retry_state.outcome.exception()
-            verb, value = "raised", f"{ex.__class__.__name__}: {ex}"
-
-            if exc_info:
-                local_exc_info = retry_state.outcome.exception()
-            else:
-                local_exc_info = False
-        else:
-            verb, value = "returned", retry_state.outcome.result()
-            local_exc_info = False  # exc_info does not apply when no exception
-
-        if retry_state.fn is None:
-            # NOTE(sileht): can't really happen, but we must please mypy
-            fn_name = ""
-        else:
-            fn_name = _utils.get_callback_name(retry_state.fn)
-
-        logger.log(
-            log_level,
-            f"Retrying {fn_name} " f"in {retry_state.next_action.sleep} seconds as it {verb} {value}.",
-            exc_info=local_exc_info,
-        )
-
-    return log_it
diff --git a/src/pip/_vendor/tenacity/nap.py b/src/pip/_vendor/tenacity/nap.py
deleted file mode 100644
index 72aa5bfd4b6..00000000000
--- a/src/pip/_vendor/tenacity/nap.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2016 Étienne Bersac
-# Copyright 2016 Julien Danjou
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import time
-import typing
-
-if typing.TYPE_CHECKING:
-    import threading
-
-
-def sleep(seconds: float) -> None:
-    """
-    Sleep strategy that delays execution for a given number of seconds.
-
-    This is the default strategy, and may be mocked out for unit testing.
-    """
-    time.sleep(seconds)
-
-
-class sleep_using_event:
-    """Sleep strategy that waits on an event to be set."""
-
-    def __init__(self, event: "threading.Event") -> None:
-        self.event = event
-
-    def __call__(self, timeout: typing.Optional[float]) -> None:
-        # NOTE(harlowja): this may *not* actually wait for timeout
-        # seconds if the event is set (ie this may eject out early).
-        self.event.wait(timeout=timeout)
diff --git a/src/pip/_vendor/tenacity/py.typed b/src/pip/_vendor/tenacity/py.typed
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/pip/_vendor/tenacity/retry.py b/src/pip/_vendor/tenacity/retry.py
deleted file mode 100644
index 38988739d64..00000000000
--- a/src/pip/_vendor/tenacity/retry.py
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 2016–2021 Julien Danjou
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import abc
-import re
-import typing
-
-if typing.TYPE_CHECKING:
-    from pip._vendor.tenacity import RetryCallState
-
-
-class retry_base(abc.ABC):
-    """Abstract base class for retry strategies."""
-
-    @abc.abstractmethod
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        pass
-
-    def __and__(self, other: "retry_base") -> "retry_all":
-        return retry_all(self, other)
-
-    def __or__(self, other: "retry_base") -> "retry_any":
-        return retry_any(self, other)
-
-
-RetryBaseT = typing.Union[retry_base, typing.Callable[["RetryCallState"], bool]]
-
-
-class _retry_never(retry_base):
-    """Retry strategy that never rejects any result."""
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        return False
-
-
-retry_never = _retry_never()
-
-
-class _retry_always(retry_base):
-    """Retry strategy that always rejects any result."""
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        return True
-
-
-retry_always = _retry_always()
-
-
-class retry_if_exception(retry_base):
-    """Retry strategy that retries if an exception verifies a predicate."""
-
-    def __init__(self, predicate: typing.Callable[[BaseException], bool]) -> None:
-        self.predicate = predicate
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        if retry_state.outcome is None:
-            raise RuntimeError("__call__() called before outcome was set")
-
-        if retry_state.outcome.failed:
-            exception = retry_state.outcome.exception()
-            if exception is None:
-                raise RuntimeError("outcome failed but the exception is None")
-            return self.predicate(exception)
-        else:
-            return False
-
-
-class retry_if_exception_type(retry_if_exception):
-    """Retries if an exception has been raised of one or more types."""
-
-    def __init__(
-        self,
-        exception_types: typing.Union[
-            typing.Type[BaseException],
-            typing.Tuple[typing.Type[BaseException], ...],
-        ] = Exception,
-    ) -> None:
-        self.exception_types = exception_types
-        super().__init__(lambda e: isinstance(e, exception_types))
-
-
-class retry_if_not_exception_type(retry_if_exception):
-    """Retries except an exception has been raised of one or more types."""
-
-    def __init__(
-        self,
-        exception_types: typing.Union[
-            typing.Type[BaseException],
-            typing.Tuple[typing.Type[BaseException], ...],
-        ] = Exception,
-    ) -> None:
-        self.exception_types = exception_types
-        super().__init__(lambda e: not isinstance(e, exception_types))
-
-
-class retry_unless_exception_type(retry_if_exception):
-    """Retries until an exception is raised of one or more types."""
-
-    def __init__(
-        self,
-        exception_types: typing.Union[
-            typing.Type[BaseException],
-            typing.Tuple[typing.Type[BaseException], ...],
-        ] = Exception,
-    ) -> None:
-        self.exception_types = exception_types
-        super().__init__(lambda e: not isinstance(e, exception_types))
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        if retry_state.outcome is None:
-            raise RuntimeError("__call__() called before outcome was set")
-
-        # always retry if no exception was raised
-        if not retry_state.outcome.failed:
-            return True
-
-        exception = retry_state.outcome.exception()
-        if exception is None:
-            raise RuntimeError("outcome failed but the exception is None")
-        return self.predicate(exception)
-
-
-class retry_if_exception_cause_type(retry_base):
-    """Retries if any of the causes of the raised exception is of one or more types.
-
-    The check on the type of the cause of the exception is done recursively (until finding
-    an exception in the chain that has no `__cause__`)
-    """
-
-    def __init__(
-        self,
-        exception_types: typing.Union[
-            typing.Type[BaseException],
-            typing.Tuple[typing.Type[BaseException], ...],
-        ] = Exception,
-    ) -> None:
-        self.exception_cause_types = exception_types
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        if retry_state.outcome is None:
-            raise RuntimeError("__call__ called before outcome was set")
-
-        if retry_state.outcome.failed:
-            exc = retry_state.outcome.exception()
-            while exc is not None:
-                if isinstance(exc.__cause__, self.exception_cause_types):
-                    return True
-                exc = exc.__cause__
-
-        return False
-
-
-class retry_if_result(retry_base):
-    """Retries if the result verifies a predicate."""
-
-    def __init__(self, predicate: typing.Callable[[typing.Any], bool]) -> None:
-        self.predicate = predicate
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        if retry_state.outcome is None:
-            raise RuntimeError("__call__() called before outcome was set")
-
-        if not retry_state.outcome.failed:
-            return self.predicate(retry_state.outcome.result())
-        else:
-            return False
-
-
-class retry_if_not_result(retry_base):
-    """Retries if the result refutes a predicate."""
-
-    def __init__(self, predicate: typing.Callable[[typing.Any], bool]) -> None:
-        self.predicate = predicate
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        if retry_state.outcome is None:
-            raise RuntimeError("__call__() called before outcome was set")
-
-        if not retry_state.outcome.failed:
-            return not self.predicate(retry_state.outcome.result())
-        else:
-            return False
-
-
-class retry_if_exception_message(retry_if_exception):
-    """Retries if an exception message equals or matches."""
-
-    def __init__(
-        self,
-        message: typing.Optional[str] = None,
-        match: typing.Optional[str] = None,
-    ) -> None:
-        if message and match:
-            raise TypeError(f"{self.__class__.__name__}() takes either 'message' or 'match', not both")
-
-        # set predicate
-        if message:
-
-            def message_fnc(exception: BaseException) -> bool:
-                return message == str(exception)
-
-            predicate = message_fnc
-        elif match:
-            prog = re.compile(match)
-
-            def match_fnc(exception: BaseException) -> bool:
-                return bool(prog.match(str(exception)))
-
-            predicate = match_fnc
-        else:
-            raise TypeError(f"{self.__class__.__name__}() missing 1 required argument 'message' or 'match'")
-
-        super().__init__(predicate)
-
-
-class retry_if_not_exception_message(retry_if_exception_message):
-    """Retries until an exception message equals or matches."""
-
-    def __init__(
-        self,
-        message: typing.Optional[str] = None,
-        match: typing.Optional[str] = None,
-    ) -> None:
-        super().__init__(message, match)
-        # invert predicate
-        if_predicate = self.predicate
-        self.predicate = lambda *args_, **kwargs_: not if_predicate(*args_, **kwargs_)
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        if retry_state.outcome is None:
-            raise RuntimeError("__call__() called before outcome was set")
-
-        if not retry_state.outcome.failed:
-            return True
-
-        exception = retry_state.outcome.exception()
-        if exception is None:
-            raise RuntimeError("outcome failed but the exception is None")
-        return self.predicate(exception)
-
-
-class retry_any(retry_base):
-    """Retries if any of the retries condition is valid."""
-
-    def __init__(self, *retries: retry_base) -> None:
-        self.retries = retries
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        return any(r(retry_state) for r in self.retries)
-
-
-class retry_all(retry_base):
-    """Retries if all the retries condition are valid."""
-
-    def __init__(self, *retries: retry_base) -> None:
-        self.retries = retries
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        return all(r(retry_state) for r in self.retries)
diff --git a/src/pip/_vendor/tenacity/stop.py b/src/pip/_vendor/tenacity/stop.py
deleted file mode 100644
index bb23effdf86..00000000000
--- a/src/pip/_vendor/tenacity/stop.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2016–2021 Julien Danjou
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import abc
-import typing
-
-from pip._vendor.tenacity import _utils
-
-if typing.TYPE_CHECKING:
-    import threading
-
-    from pip._vendor.tenacity import RetryCallState
-
-
-class stop_base(abc.ABC):
-    """Abstract base class for stop strategies."""
-
-    @abc.abstractmethod
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        pass
-
-    def __and__(self, other: "stop_base") -> "stop_all":
-        return stop_all(self, other)
-
-    def __or__(self, other: "stop_base") -> "stop_any":
-        return stop_any(self, other)
-
-
-StopBaseT = typing.Union[stop_base, typing.Callable[["RetryCallState"], bool]]
-
-
-class stop_any(stop_base):
-    """Stop if any of the stop condition is valid."""
-
-    def __init__(self, *stops: stop_base) -> None:
-        self.stops = stops
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        return any(x(retry_state) for x in self.stops)
-
-
-class stop_all(stop_base):
-    """Stop if all the stop conditions are valid."""
-
-    def __init__(self, *stops: stop_base) -> None:
-        self.stops = stops
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        return all(x(retry_state) for x in self.stops)
-
-
-class _stop_never(stop_base):
-    """Never stop."""
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        return False
-
-
-stop_never = _stop_never()
-
-
-class stop_when_event_set(stop_base):
-    """Stop when the given event is set."""
-
-    def __init__(self, event: "threading.Event") -> None:
-        self.event = event
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        return self.event.is_set()
-
-
-class stop_after_attempt(stop_base):
-    """Stop when the previous attempt >= max_attempt."""
-
-    def __init__(self, max_attempt_number: int) -> None:
-        self.max_attempt_number = max_attempt_number
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        return retry_state.attempt_number >= self.max_attempt_number
-
-
-class stop_after_delay(stop_base):
-    """Stop when the time from the first attempt >= limit."""
-
-    def __init__(self, max_delay: _utils.time_unit_type) -> None:
-        self.max_delay = _utils.to_seconds(max_delay)
-
-    def __call__(self, retry_state: "RetryCallState") -> bool:
-        if retry_state.seconds_since_start is None:
-            raise RuntimeError("__call__() called but seconds_since_start is not set")
-        return retry_state.seconds_since_start >= self.max_delay
diff --git a/src/pip/_vendor/tenacity/tornadoweb.py b/src/pip/_vendor/tenacity/tornadoweb.py
deleted file mode 100644
index e19c30b1890..00000000000
--- a/src/pip/_vendor/tenacity/tornadoweb.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2017 Elisey Zanko
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import sys
-import typing
-
-from pip._vendor.tenacity import BaseRetrying
-from pip._vendor.tenacity import DoAttempt
-from pip._vendor.tenacity import DoSleep
-from pip._vendor.tenacity import RetryCallState
-
-from tornado import gen
-
-if typing.TYPE_CHECKING:
-    from tornado.concurrent import Future
-
-_RetValT = typing.TypeVar("_RetValT")
-
-
-class TornadoRetrying(BaseRetrying):
-    def __init__(self, sleep: "typing.Callable[[float], Future[None]]" = gen.sleep, **kwargs: typing.Any) -> None:
-        super().__init__(**kwargs)
-        self.sleep = sleep
-
-    @gen.coroutine  # type: ignore[misc]
-    def __call__(
-        self,
-        fn: "typing.Callable[..., typing.Union[typing.Generator[typing.Any, typing.Any, _RetValT], Future[_RetValT]]]",
-        *args: typing.Any,
-        **kwargs: typing.Any,
-    ) -> "typing.Generator[typing.Any, typing.Any, _RetValT]":
-        self.begin()
-
-        retry_state = RetryCallState(retry_object=self, fn=fn, args=args, kwargs=kwargs)
-        while True:
-            do = self.iter(retry_state=retry_state)
-            if isinstance(do, DoAttempt):
-                try:
-                    result = yield fn(*args, **kwargs)
-                except BaseException:  # noqa: B902
-                    retry_state.set_exception(sys.exc_info())  # type: ignore[arg-type]
-                else:
-                    retry_state.set_result(result)
-            elif isinstance(do, DoSleep):
-                retry_state.prepare_for_next_attempt()
-                yield self.sleep(do)
-            else:
-                raise gen.Return(do)
diff --git a/src/pip/_vendor/tenacity/wait.py b/src/pip/_vendor/tenacity/wait.py
deleted file mode 100644
index f9349c02836..00000000000
--- a/src/pip/_vendor/tenacity/wait.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 2016–2021 Julien Danjou
-# Copyright 2016 Joshua Harlow
-# Copyright 2013-2014 Ray Holder
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import abc
-import random
-import typing
-
-from pip._vendor.tenacity import _utils
-
-if typing.TYPE_CHECKING:
-    from pip._vendor.tenacity import RetryCallState
-
-
-class wait_base(abc.ABC):
-    """Abstract base class for wait strategies."""
-
-    @abc.abstractmethod
-    def __call__(self, retry_state: "RetryCallState") -> float:
-        pass
-
-    def __add__(self, other: "wait_base") -> "wait_combine":
-        return wait_combine(self, other)
-
-    def __radd__(self, other: "wait_base") -> typing.Union["wait_combine", "wait_base"]:
-        # make it possible to use multiple waits with the built-in sum function
-        if other == 0:  # type: ignore[comparison-overlap]
-            return self
-        return self.__add__(other)
-
-
-WaitBaseT = typing.Union[wait_base, typing.Callable[["RetryCallState"], typing.Union[float, int]]]
-
-
-class wait_fixed(wait_base):
-    """Wait strategy that waits a fixed amount of time between each retry."""
-
-    def __init__(self, wait: _utils.time_unit_type) -> None:
-        self.wait_fixed = _utils.to_seconds(wait)
-
-    def __call__(self, retry_state: "RetryCallState") -> float:
-        return self.wait_fixed
-
-
-class wait_none(wait_fixed):
-    """Wait strategy that doesn't wait at all before retrying."""
-
-    def __init__(self) -> None:
-        super().__init__(0)
-
-
-class wait_random(wait_base):
-    """Wait strategy that waits a random amount of time between min/max."""
-
-    def __init__(self, min: _utils.time_unit_type = 0, max: _utils.time_unit_type = 1) -> None:  # noqa
-        self.wait_random_min = _utils.to_seconds(min)
-        self.wait_random_max = _utils.to_seconds(max)
-
-    def __call__(self, retry_state: "RetryCallState") -> float:
-        return self.wait_random_min + (random.random() * (self.wait_random_max - self.wait_random_min))
-
-
-class wait_combine(wait_base):
-    """Combine several waiting strategies."""
-
-    def __init__(self, *strategies: wait_base) -> None:
-        self.wait_funcs = strategies
-
-    def __call__(self, retry_state: "RetryCallState") -> float:
-        return sum(x(retry_state=retry_state) for x in self.wait_funcs)
-
-
-class wait_chain(wait_base):
-    """Chain two or more waiting strategies.
-
-    If all strategies are exhausted, the very last strategy is used
-    thereafter.
-
-    For example::
-
-        @retry(wait=wait_chain(*[wait_fixed(1) for i in range(3)] +
-                               [wait_fixed(2) for j in range(5)] +
-                               [wait_fixed(5) for k in range(4)))
-        def wait_chained():
-            print("Wait 1s for 3 attempts, 2s for 5 attempts and 5s
-                   thereafter.")
-    """
-
-    def __init__(self, *strategies: wait_base) -> None:
-        self.strategies = strategies
-
-    def __call__(self, retry_state: "RetryCallState") -> float:
-        wait_func_no = min(max(retry_state.attempt_number, 1), len(self.strategies))
-        wait_func = self.strategies[wait_func_no - 1]
-        return wait_func(retry_state=retry_state)
-
-
-class wait_incrementing(wait_base):
-    """Wait an incremental amount of time after each attempt.
-
-    Starting at a starting value and incrementing by a value for each attempt
-    (and restricting the upper limit to some maximum value).
-    """
-
-    def __init__(
-        self,
-        start: _utils.time_unit_type = 0,
-        increment: _utils.time_unit_type = 100,
-        max: _utils.time_unit_type = _utils.MAX_WAIT,  # noqa
-    ) -> None:
-        self.start = _utils.to_seconds(start)
-        self.increment = _utils.to_seconds(increment)
-        self.max = _utils.to_seconds(max)
-
-    def __call__(self, retry_state: "RetryCallState") -> float:
-        result = self.start + (self.increment * (retry_state.attempt_number - 1))
-        return max(0, min(result, self.max))
-
-
-class wait_exponential(wait_base):
-    """Wait strategy that applies exponential backoff.
-
-    It allows for a customized multiplier and an ability to restrict the
-    upper and lower limits to some maximum and minimum value.
-
-    The intervals are fixed (i.e. there is no jitter), so this strategy is
-    suitable for balancing retries against latency when a required resource is
-    unavailable for an unknown duration, but *not* suitable for resolving
-    contention between multiple processes for a shared resource. Use
-    wait_random_exponential for the latter case.
-    """
-
-    def __init__(
-        self,
-        multiplier: typing.Union[int, float] = 1,
-        max: _utils.time_unit_type = _utils.MAX_WAIT,  # noqa
-        exp_base: typing.Union[int, float] = 2,
-        min: _utils.time_unit_type = 0,  # noqa
-    ) -> None:
-        self.multiplier = multiplier
-        self.min = _utils.to_seconds(min)
-        self.max = _utils.to_seconds(max)
-        self.exp_base = exp_base
-
-    def __call__(self, retry_state: "RetryCallState") -> float:
-        try:
-            exp = self.exp_base ** (retry_state.attempt_number - 1)
-            result = self.multiplier * exp
-        except OverflowError:
-            return self.max
-        return max(max(0, self.min), min(result, self.max))
-
-
-class wait_random_exponential(wait_exponential):
-    """Random wait with exponentially widening window.
-
-    An exponential backoff strategy used to mediate contention between multiple
-    uncoordinated processes for a shared resource in distributed systems. This
-    is the sense in which "exponential backoff" is meant in e.g. Ethernet
-    networking, and corresponds to the "Full Jitter" algorithm described in
-    this blog post:
-
-    https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/
-
-    Each retry occurs at a random time in a geometrically expanding interval.
-    It allows for a custom multiplier and an ability to restrict the upper
-    limit of the random interval to some maximum value.
-
-    Example::
-
-        wait_random_exponential(multiplier=0.5,  # initial window 0.5s
-                                max=60)          # max 60s timeout
-
-    When waiting for an unavailable resource to become available again, as
-    opposed to trying to resolve contention for a shared resource, the
-    wait_exponential strategy (which uses a fixed interval) may be preferable.
-
-    """
-
-    def __call__(self, retry_state: "RetryCallState") -> float:
-        high = super().__call__(retry_state=retry_state)
-        return random.uniform(0, high)
-
-
-class wait_exponential_jitter(wait_base):
-    """Wait strategy that applies exponential backoff and jitter.
-
-    It allows for a customized initial wait, maximum wait and jitter.
-
-    This implements the strategy described here:
-    https://cloud.google.com/storage/docs/retry-strategy
-
-    The wait time is min(initial * 2**n + random.uniform(0, jitter), maximum)
-    where n is the retry count.
-    """
-
-    def __init__(
-        self,
-        initial: float = 1,
-        max: float = _utils.MAX_WAIT,  # noqa
-        exp_base: float = 2,
-        jitter: float = 1,
-    ) -> None:
-        self.initial = initial
-        self.max = max
-        self.exp_base = exp_base
-        self.jitter = jitter
-
-    def __call__(self, retry_state: "RetryCallState") -> float:
-        jitter = random.uniform(0, self.jitter)
-        try:
-            exp = self.exp_base ** (retry_state.attempt_number - 1)
-            result = self.initial * exp + jitter
-        except OverflowError:
-            result = self.max
-        return max(0, min(result, self.max))
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 7e5b4e5df3c..ed9cc81b525 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -14,6 +14,5 @@ rich==13.7.1
     typing_extensions==4.12.2
 resolvelib==1.0.1
 setuptools==69.5.1
-tenacity==8.2.3
 tomli==2.0.1
 truststore==0.9.1
diff --git a/tools/vendoring/patches/tenacity.patch b/tools/vendoring/patches/tenacity.patch
deleted file mode 100644
index c87b1c5b2c3..00000000000
--- a/tools/vendoring/patches/tenacity.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/pip/_vendor/tenacity/__init__.py b/src/pip/_vendor/tenacity/__init__.py
-index 88c28d2d6..086ad46e1 100644
---- a/src/pip/_vendor/tenacity/__init__.py
-+++ b/src/pip/_vendor/tenacity/__init__.py
-@@ -82,10 +82,12 @@ from .after import after_nothing  # noqa
- from .before_sleep import before_sleep_log  # noqa
- from .before_sleep import before_sleep_nothing  # noqa
-
--try:
--    import tornado
--except ImportError:
--    tornado = None
-+# Replace a conditional import with a hard-coded None so that pip does
-+# not attempt to use tornado even if it is present in the environment.
-+# If tornado is non-None, tenacity will attempt to execute some code
-+# that is sensitive to the version of tornado, which could break pip
-+# if an old version is found.
-+tornado = None  # type: ignore
-
- if t.TYPE_CHECKING:
-     import types
-
---- a/src/pip/_vendor/tenacity/__init__.py
-+++ b/src/pip/_vendor/tenacity/__init__.py
-@@ -153,7 +153,7 @@ class RetryError(Exception):
-         self.last_attempt = last_attempt
-         super().__init__(last_attempt)
- 
--    def reraise(self) -> t.NoReturn:
-+    def reraise(self) -> "t.NoReturn":
-         if self.last_attempt.failed:
-             raise self.last_attempt.result()
-         raise self
- 

From 396fdf06afce7b942fc28272399fa9c7837b41c7 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 15 May 2024 17:16:47 -0400
Subject: [PATCH 472/992] Add unit tests for retry decorator

---
 tests/unit/test_utils_retry.py | 117 +++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 tests/unit/test_utils_retry.py

diff --git a/tests/unit/test_utils_retry.py b/tests/unit/test_utils_retry.py
new file mode 100644
index 00000000000..3ad8be69a40
--- /dev/null
+++ b/tests/unit/test_utils_retry.py
@@ -0,0 +1,117 @@
+import random
+from time import monotonic, sleep
+from typing import List, NoReturn, Tuple, Type
+from unittest.mock import Mock
+
+import pytest
+
+from pip._internal.utils.retry import retry
+
+
+def test_retry_no_error() -> None:
+    function = Mock(return_value="daylily")
+    wrapped = retry(wait=0, stop_after_delay=0.01)(function)
+    assert wrapped("eggs", alternative="spam") == "daylily"
+    function.assert_called_once_with("eggs", alternative="spam")
+
+
+def test_retry_no_error_after_retry() -> None:
+    raised = False
+
+    def _raise_once() -> str:
+        nonlocal raised
+        if not raised:
+            raised = True
+            raise RuntimeError("ham")
+        return "daylily"
+
+    function = Mock(wraps=_raise_once)
+    wrapped = retry(wait=0, stop_after_delay=0.01)(function)
+    assert wrapped() == "daylily"
+    assert function.call_count == 2
+
+
+def test_retry_last_error_is_reraised() -> None:
+    errors = []
+
+    def _raise_error() -> NoReturn:
+        error = RuntimeError(random.random())
+        errors.append(error)
+        raise error
+
+    function = Mock(wraps=_raise_error)
+    wrapped = retry(wait=0, stop_after_delay=0.01)(function)
+    try:
+        wrapped()
+    except Exception as e:
+        assert isinstance(e, RuntimeError)
+        assert e is errors[-1]
+    else:
+        assert False, "unexpected return"
+
+    assert function.call_count > 1, "expected at least one retry"
+
+
+@pytest.mark.parametrize("exc", [KeyboardInterrupt, SystemExit])
+def test_retry_ignores_base_exception(exc: Type[BaseException]) -> None:
+    function = Mock(side_effect=exc())
+    wrapped = retry(wait=0, stop_after_delay=0.01)(function)
+    with pytest.raises(exc):
+        wrapped()
+    function.assert_called_once()
+
+
+def create_timestamped_callable(sleep_per_call: float = 0) -> Tuple[Mock, List[float]]:
+    timestamps = []
+
+    def _raise_error() -> NoReturn:
+        timestamps.append(monotonic())
+        if sleep_per_call:
+            sleep(sleep_per_call)
+        raise RuntimeError
+
+    return Mock(wraps=_raise_error), timestamps
+
+
+# Use multiple of 15ms as Windows' sleep is only accurate to 15ms.
+@pytest.mark.parametrize("wait_duration", [0.015, 0.045, 0.15])
+def test_retry_wait(wait_duration: float) -> None:
+    function, timestamps = create_timestamped_callable()
+    # Only the first retry will be scheduled before the time limit is exceeded.
+    wrapped = retry(wait=wait_duration, stop_after_delay=0.01)(function)
+    start_time = monotonic()
+    with pytest.raises(RuntimeError):
+        wrapped()
+    assert len(timestamps) == 2
+    assert timestamps[1] - start_time >= wait_duration
+
+
+@pytest.mark.parametrize(
+    "call_duration, max_allowed_calls", [(0.01, 10), (0.04, 3), (0.15, 1)]
+)
+def test_retry_time_limit(call_duration: float, max_allowed_calls: int) -> None:
+    function, timestamps = create_timestamped_callable(sleep_per_call=call_duration)
+    wrapped = retry(wait=0, stop_after_delay=0.1)(function)
+
+    start_time = monotonic()
+    with pytest.raises(RuntimeError):
+        wrapped()
+    assert len(timestamps) <= max_allowed_calls
+    assert all(t - start_time <= 0.1 for t in timestamps)
+
+
+def test_retry_method() -> None:
+    class MyClass:
+        def __init__(self) -> None:
+            self.calls = 0
+
+        @retry(wait=0, stop_after_delay=0.01)
+        def method(self, string: str) -> str:
+            self.calls += 1
+            if self.calls >= 5:
+                return string
+            raise RuntimeError
+
+    o = MyClass()
+    assert o.method("orange") == "orange"
+    assert o.calls == 5

From 598e11f62a98ba862f6162571eb0acf29736535e Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 3 May 2024 18:53:33 -0400
Subject: [PATCH 473/992] Calculate candidate string versions only once in
 `get_applicable_candidates`

---
 src/pip/_internal/index/package_finder.py | 29 +++++++++++------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index fb270f22f83..0d65ce35f37 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -452,24 +452,23 @@ def get_applicable_candidates(
         # Using None infers from the specifier instead.
         allow_prereleases = self._allow_all_prereleases or None
         specifier = self._specifier
-        versions = {
-            str(v)
-            for v in specifier.filter(
-                # We turn the version object into a str here because otherwise
-                # when we're debundled but setuptools isn't, Python will see
-                # packaging.version.Version and
-                # pkg_resources._vendor.packaging.version.Version as different
-                # types. This way we'll use a str as a common data interchange
-                # format. If we stop using the pkg_resources provided specifier
-                # and start using our own, we can drop the cast to str().
-                (str(c.version) for c in candidates),
+
+        # We turn the version object into a str here because otherwise
+        # when we're debundled but setuptools isn't, Python will see
+        # packaging.version.Version and
+        # pkg_resources._vendor.packaging.version.Version as different
+        # types. This way we'll use a str as a common data interchange
+        # format. If we stop using the pkg_resources provided specifier
+        # and start using our own, we can drop the cast to str().
+        candidates_and_versions = [(c, str(c.version)) for c in candidates]
+        versions = set(
+            specifier.filter(
+                (v for _, v in candidates_and_versions),
                 prereleases=allow_prereleases,
             )
-        }
-
-        # Again, converting version to str to deal with debundling.
-        applicable_candidates = [c for c in candidates if str(c.version) in versions]
+        )
 
+        applicable_candidates = [c for c, v in candidates_and_versions if v in versions]
         filtered_applicable_candidates = filter_unallowed_hashes(
             candidates=applicable_candidates,
             hashes=self._hashes,

From 811ab0b608e704c9858cc8dcf41e35ffe3afb933 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 3 May 2024 18:57:09 -0400
Subject: [PATCH 474/992] NEWS ENTRY

---
 news/12664.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12664.feature.rst

diff --git a/news/12664.feature.rst b/news/12664.feature.rst
new file mode 100644
index 00000000000..a5f85097c62
--- /dev/null
+++ b/news/12664.feature.rst
@@ -0,0 +1 @@
+Minor performance improvement of finding applicable package candidates by not repeatedly calculating their versions

From 41772d8e7c5a6b80a3da3355928d63ffa6ff27cf Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Tue, 2 Jul 2024 19:51:22 +0100
Subject: [PATCH 475/992] Merge pull request #12799 from
 encukou/gh-12781-tar-hardlink

untar_file: remove common leading directory before unpacking
---
 news/12781.bugfix.rst                |   1 +
 src/pip/_internal/utils/unpacking.py |  14 ++-
 tests/functional/test_install.py     | 129 +++++++++++++++++++++++++++
 tests/unit/test_utils_unpacking.py   |  41 +++++++++
 4 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 news/12781.bugfix.rst

diff --git a/news/12781.bugfix.rst b/news/12781.bugfix.rst
new file mode 100644
index 00000000000..6bd43d347db
--- /dev/null
+++ b/news/12781.bugfix.rst
@@ -0,0 +1 @@
+Fix finding hardlink targets in tar files with an ignored top-level directory.
diff --git a/src/pip/_internal/utils/unpacking.py b/src/pip/_internal/utils/unpacking.py
index 341269550ce..875e30e13ab 100644
--- a/src/pip/_internal/utils/unpacking.py
+++ b/src/pip/_internal/utils/unpacking.py
@@ -190,9 +190,19 @@ def untar_file(filename: str, location: str) -> None:
         else:
             default_mode_plus_executable = _get_default_mode_plus_executable()
 
+            if leading:
+                # Strip the leading directory from all files in the archive,
+                # including hardlink targets (which are relative to the
+                # unpack location).
+                for member in tar.getmembers():
+                    name_lead, name_rest = split_leading_dir(member.name)
+                    member.name = name_rest
+                    if member.islnk():
+                        lnk_lead, lnk_rest = split_leading_dir(member.linkname)
+                        if lnk_lead == name_lead:
+                            member.linkname = lnk_rest
+
             def pip_filter(member: tarfile.TarInfo, path: str) -> tarfile.TarInfo:
-                if leading:
-                    member.name = split_leading_dir(member.name)[1]
                 orig_mode = member.mode
                 try:
                     try:
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index eaea12a163c..4e220328d29 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -1,9 +1,11 @@
 import hashlib
+import io
 import os
 import re
 import ssl
 import sys
 import sysconfig
+import tarfile
 import textwrap
 from os.path import curdir, join, pardir
 from pathlib import Path
@@ -2590,3 +2592,130 @@ def test_install_pip_prints_req_chain_pypi(script: PipTestEnvironment) -> None:
         f"Collecting python-openid "
         f"(from Paste[openid]==1.7.5.1->-r {req_path} (line 1))" in result.stdout
     )
+
+
+@pytest.mark.parametrize("common_prefix", ("", "linktest-1.0/"))
+def test_install_sdist_links(script: PipTestEnvironment, common_prefix: str) -> None:
+    """
+    Test installing an sdist with hard and symbolic links.
+    """
+
+    # Build an unpack an sdist that contains data files:
+    # - root.dat
+    # - sub/inner.dat
+    # and links (symbolic and hard) to both of those, both in the top-level
+    # and 'sub/' directories. That's 8 links total.
+
+    # We build the sdist from in-memory data, since the filesystem
+    # might not support both kinds of links.
+
+    sdist_path = script.scratch_path.joinpath("linktest-1.0.tar.gz")
+
+    def add_file(tar: tarfile.TarFile, name: str, content: str) -> None:
+        info = tarfile.TarInfo(common_prefix + name)
+        content_bytes = content.encode("utf-8")
+        info.size = len(content_bytes)
+        tar.addfile(info, io.BytesIO(content_bytes))
+
+    def add_link(tar: tarfile.TarFile, name: str, linktype: str, target: str) -> None:
+        info = tarfile.TarInfo(common_prefix + name)
+        info.type = {"sym": tarfile.SYMTYPE, "hard": tarfile.LNKTYPE}[linktype]
+        info.linkname = target
+        tar.addfile(info)
+
+    with tarfile.open(sdist_path, "w:gz") as sdist_tar:
+        add_file(
+            sdist_tar,
+            "PKG-INFO",
+            textwrap.dedent(
+                """
+                    Metadata-Version: 2.1
+                    Name: linktest
+                    Version: 1.0
+                """
+            ),
+        )
+
+        add_file(sdist_tar, "src/linktest/__init__.py", "")
+        add_file(sdist_tar, "src/linktest/root.dat", "Data")
+        add_file(sdist_tar, "src/linktest/sub/__init__.py", "")
+        add_file(sdist_tar, "src/linktest/sub/inner.dat", "Data")
+        linknames = []
+
+        # Windows requires native path separators in symlink targets.
+        # (see https://github.com/python/cpython/issues/57911)
+        # (This is not needed for hardlinks, nor for the workaround tarfile
+        # uses if symlinking is disabled.)
+        SEP = os.path.sep
+
+        pkg_root = f"{common_prefix}src/linktest"
+        for prefix, target_tag, linktype, target in [
+            ("", "root", "sym", "root.dat"),
+            ("", "root", "hard", f"{pkg_root}/root.dat"),
+            ("", "inner", "sym", f"sub{SEP}inner.dat"),
+            ("", "inner", "hard", f"{pkg_root}/sub/inner.dat"),
+            ("sub/", "root", "sym", f"..{SEP}root.dat"),
+            ("sub/", "root", "hard", f"{pkg_root}/root.dat"),
+            ("sub/", "inner", "sym", "inner.dat"),
+            ("sub/", "inner", "hard", f"{pkg_root}/sub/inner.dat"),
+        ]:
+            name = f"{prefix}link.{target_tag}.{linktype}.dat"
+            add_link(sdist_tar, "src/linktest/" + name, linktype, target)
+            linknames.append(name)
+
+        add_file(
+            sdist_tar,
+            "pyproject.toml",
+            textwrap.dedent(
+                """
+                    [build-system]
+                    requires = ["setuptools"]
+                    build-backend = "setuptools.build_meta"
+                    [project]
+                    name = "linktest"
+                    version = "1.0"
+                    [tool.setuptools]
+                    include-package-data = true
+                    [tool.setuptools.packages.find]
+                    where = ["src"]
+                    [tool.setuptools.package-data]
+                    "*" = ["*.dat"]
+                """
+            ),
+        )
+
+        add_file(
+            sdist_tar,
+            "src/linktest/__main__.py",
+            textwrap.dedent(
+                f"""
+                    from pathlib import Path
+                    linknames = {linknames!r}
+
+                    # we could use importlib.resources here once
+                    # it has stable convenient API across supported versions
+                    res_path = Path(__file__).parent
+
+                    for name in linknames:
+                        data_text = res_path.joinpath(name).read_text()
+                        assert data_text == "Data"
+                    print(str(len(linknames)) + ' files checked')
+                """
+            ),
+        )
+
+    # Show sdist content, for debugging the test
+    result = script.run("python", "-m", "tarfile", "-vl", str(sdist_path))
+    print(result)
+
+    # Install the package
+    result = script.pip("install", str(sdist_path))
+    print(result)
+
+    # Show installed content, for debugging the test
+    result = script.pip("show", "-f", "linktest")
+    print(result)
+
+    # Run the internal test
+    result = script.run("python", "-m", "linktest")
+    assert result.stdout.strip() == "8 files checked"
diff --git a/tests/unit/test_utils_unpacking.py b/tests/unit/test_utils_unpacking.py
index 3fdd822e739..efccbdccb0d 100644
--- a/tests/unit/test_utils_unpacking.py
+++ b/tests/unit/test_utils_unpacking.py
@@ -197,6 +197,47 @@ def test_unpack_tar_filter(self) -> None:
 
         assert "is outside the destination" in str(e.value)
 
+    @pytest.mark.parametrize(
+        ("input_prefix", "unpack_prefix"),
+        [
+            ("", ""),
+            ("dir/", ""),  # pip ignores a common leading directory
+            ("dir/sub/", "sub/"),  # pip ignores *one* common leading directory
+        ],
+    )
+    def test_unpack_tar_links(self, input_prefix: str, unpack_prefix: str) -> None:
+        """
+        Test unpacking a *.tar with file containing hard & soft links
+        """
+        test_tar = os.path.join(self.tempdir, "test_tar_links.tar")
+        content = b"file content"
+        with tarfile.open(test_tar, "w") as mytar:
+            file_tarinfo = tarfile.TarInfo(input_prefix + "regular_file.txt")
+            file_tarinfo.size = len(content)
+            mytar.addfile(file_tarinfo, io.BytesIO(content))
+
+            hardlink_tarinfo = tarfile.TarInfo(input_prefix + "hardlink.txt")
+            hardlink_tarinfo.type = tarfile.LNKTYPE
+            hardlink_tarinfo.linkname = input_prefix + "regular_file.txt"
+            mytar.addfile(hardlink_tarinfo)
+
+            symlink_tarinfo = tarfile.TarInfo(input_prefix + "symlink.txt")
+            symlink_tarinfo.type = tarfile.SYMTYPE
+            symlink_tarinfo.linkname = "regular_file.txt"
+            mytar.addfile(symlink_tarinfo)
+
+        untar_file(test_tar, self.tempdir)
+
+        unpack_dir = os.path.join(self.tempdir, unpack_prefix)
+        with open(os.path.join(unpack_dir, "regular_file.txt"), "rb") as f:
+            assert f.read() == content
+
+        with open(os.path.join(unpack_dir, "hardlink.txt"), "rb") as f:
+            assert f.read() == content
+
+        with open(os.path.join(unpack_dir, "symlink.txt"), "rb") as f:
+            assert f.read() == content
+
 
 def test_unpack_tar_unicode(tmpdir: Path) -> None:
     test_tar = tmpdir / "test.tar"

From a56129c58be6608e000d1510341a8e9372b9b4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Wed, 3 Jul 2024 08:29:27 +0200
Subject: [PATCH 476/992] Merge pull request #12787 from mgorny/no-isol-tests

Use `--no-build-isolation` in tests to avoid using Internet
---
 tests/conftest.py                        |  1 +
 tests/functional/test_config_settings.py |  1 +
 tests/functional/test_install.py         | 13 +++++++++++--
 tests/functional/test_self_update.py     |  4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 35101cef2c3..5934e9f95d4 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -395,6 +395,7 @@ def pip_editable_parts(
             "-m",
             "pip",
             "install",
+            "--no-build-isolation",
             "--target",
             pip_self_install_path,
             "-e",
diff --git a/tests/functional/test_config_settings.py b/tests/functional/test_config_settings.py
index 3f88d9c3924..857722dd10d 100644
--- a/tests/functional/test_config_settings.py
+++ b/tests/functional/test_config_settings.py
@@ -118,6 +118,7 @@ def test_config_settings_implies_pep517(
     )
     result = script.pip(
         "wheel",
+        "--no-build-isolation",
         "--config-settings",
         "FOO=Hello",
         pkg_path,
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 4e220328d29..0b377167bfe 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -687,7 +687,9 @@ def test_link_hash_in_dep_fails_require_hashes(
     # Build a wheel for pkga and compute its hash.
     wheelhouse = tmp_path / "wheehouse"
     wheelhouse.mkdir()
-    script.pip("wheel", "--no-deps", "-w", wheelhouse, project_path)
+    script.pip(
+        "wheel", "--no-build-isolation", "--no-deps", "-w", wheelhouse, project_path
+    )
     digest = hashlib.sha256(
         wheelhouse.joinpath("pkga-1.0-py3-none-any.whl").read_bytes()
     ).hexdigest()
@@ -905,7 +907,14 @@ def test_editable_install__local_dir_setup_requires_with_pyproject(
         "setup(name='dummy', setup_requires=['simplewheel'])\n"
     )
 
-    script.pip("install", "--find-links", shared_data.find_links, "-e", local_dir)
+    script.pip(
+        "install",
+        "--no-build-isolation",
+        "--find-links",
+        shared_data.find_links,
+        "-e",
+        local_dir,
+    )
 
 
 def test_install_pre__setup_requires_with_pyproject(
diff --git a/tests/functional/test_self_update.py b/tests/functional/test_self_update.py
index c507552208a..1331a87c319 100644
--- a/tests/functional/test_self_update.py
+++ b/tests/functional/test_self_update.py
@@ -11,12 +11,12 @@ def test_self_update_editable(script: Any, pip_src: Any) -> None:
     # Step 1. Install pip as non-editable. This is expected to succeed as
     # the existing pip in the environment is installed in editable mode, so
     # it only places a .pth file in the environment.
-    proc = script.pip("install", pip_src)
+    proc = script.pip("install", "--no-build-isolation", pip_src)
     assert proc.returncode == 0
     # Step 2. Using the pip we just installed, install pip *again*, but
     # in editable mode. This could fail, as we'll need to uninstall the running
     # pip in order to install the new copy, and uninstalling pip while it's
     # running could fail. This test is specifically to ensure that doesn't
     # happen...
-    proc = script.pip("install", "-e", pip_src)
+    proc = script.pip("install", "--no-build-isolation", "-e", pip_src)
     assert proc.returncode == 0

From 76e82a43f8fb04695e834810df64f2d9a2ff6020 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sun, 7 Jul 2024 19:33:03 +0100
Subject: [PATCH 477/992] Bump for release

---
 NEWS.rst              | 8 ++++++++
 news/12781.bugfix.rst | 1 -
 src/pip/__init__.py   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
 delete mode 100644 news/12781.bugfix.rst

diff --git a/NEWS.rst b/NEWS.rst
index d541e2b552c..3e7940c5f41 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,14 @@
 
 .. towncrier release notes start
 
+24.1.2 (2024-07-07)
+===================
+
+Bug Fixes
+---------
+
+- Fix finding hardlink targets in tar files with an ignored top-level directory. (`#12781 `_)
+
 24.1.1 (2024-06-26)
 ===================
 
diff --git a/news/12781.bugfix.rst b/news/12781.bugfix.rst
deleted file mode 100644
index 6bd43d347db..00000000000
--- a/news/12781.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix finding hardlink targets in tar files with an ignored top-level directory.
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index e4b9a52f4b4..60c2d0e20bd 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1.1"
+__version__ = "24.1.2"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 412211edd445d9313569457cdf2687c0c0eca4f2 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sun, 7 Jul 2024 19:33:04 +0100
Subject: [PATCH 478/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 60c2d0e20bd..531eec2d928 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.1.2"
+__version__ = "24.2.dev0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 457ca6e17bf3e733e38e829c11d5680832cf6219 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 7 Jul 2024 20:11:52 -0400
Subject: [PATCH 479/992] Use prerelease version of cffi for Python 3.13 tests
 (#12776)

---
 news/12776.trivial.rst | 1 +
 tests/requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 news/12776.trivial.rst

diff --git a/news/12776.trivial.rst b/news/12776.trivial.rst
new file mode 100644
index 00000000000..87d2f8e7975
--- /dev/null
+++ b/news/12776.trivial.rst
@@ -0,0 +1 @@
+Use prerelease version of CFFI for Python 3.13 testing
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 8eb02d6ca5b..5c3ef4188f7 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,4 @@
-cffi @ https://github.com/python-cffi/cffi/archive/refs/heads/main.zip ; python_version > "3.12" # Temporary workaround for Python 3.13 until next CFFI release
+cffi >= 1.17.0rc1 ; python_version > "3.12" # Temporary workaround for Python 3.13 until final CFFI release
 cryptography
 freezegun
 installer

From 34e70ba5964824ac8c52773c76c658923ee36194 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 8 Jul 2024 21:02:18 -0400
Subject: [PATCH 480/992] Defer removal of --build-option and --global-option
 to 25.0 (#12837)

We aren't in a rush to remove these and setuptools still isn't ready.
---
 src/pip/_internal/req/req_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index 213278588d2..afd0a9e5e82 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -909,7 +909,7 @@ def check_legacy_setup_py_options(
             reason="--build-option and --global-option are deprecated.",
             issue=11859,
             replacement="to use --config-settings",
-            gone_in="24.2",
+            gone_in="25.0",
         )
         logger.warning(
             "Implying --no-binary=:all: due to the presence of "

From 6b35bee52562c4b9966d6f7f7643b72305b74104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= 
Date: Wed, 10 Jul 2024 01:39:05 +0200
Subject: [PATCH 481/992] Stop explicitly listing wheel as a build dependency
 (#12728)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Stop explicitly listing wheel as a build dependency

setuptools' get_requires_for_build_wheel() hook already injects this dependency
when building wheels is requested.

See also 64d89385ce4b5ae2d05d176e7746bff0baaabafd.

* Fix typo in news fragment

Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) 

---------

Co-authored-by: Tzu-ping Chung 
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) 
---
 news/12728.feature.rst | 5 +++++
 pyproject.toml         | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 news/12728.feature.rst

diff --git a/news/12728.feature.rst b/news/12728.feature.rst
new file mode 100644
index 00000000000..923d18707e0
--- /dev/null
+++ b/news/12728.feature.rst
@@ -0,0 +1,5 @@
+``wheel`` is no longer explicitly listed as a build depepndency of ``pip``.
+``setuptools`` already injects this dependency in the ``get_requires_for_build_wheel()`` hook.
+This makes no difference for users of ``pip``.
+This makes no difference when building wheels of ``pip``.
+This avoids an unnecessary dependency on ``wheel`` when building the source distribution of ``pip``.
diff --git a/pyproject.toml b/pyproject.toml
index 05e3beb1483..cf098eea061 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,7 +41,7 @@ Changelog = "https://pip.pypa.io/en/stable/news/"
 
 [build-system]
 # The lower bound is for .
-requires = ["setuptools>=67.6.1", "wheel"]
+requires = ["setuptools>=67.6.1"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]

From bf0e5f23f31b412f7c668bbfd58ff8d15d631d3b Mon Sep 17 00:00:00 2001
From: Chris Markiewicz 
Date: Tue, 9 Jul 2024 19:41:26 -0400
Subject: [PATCH 482/992] Remove deprecation warning from vendored
 pkg_resources (#12660)

---
 news/12660.trivial.rst                      |  2 ++
 src/pip/_vendor/pkg_resources/__init__.py   | 10 ++++------
 tools/vendoring/patches/pkg_resources.patch | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 news/12660.trivial.rst

diff --git a/news/12660.trivial.rst b/news/12660.trivial.rst
new file mode 100644
index 00000000000..f02256eccbb
--- /dev/null
+++ b/news/12660.trivial.rst
@@ -0,0 +1,2 @@
+Remove (suppressed) deprecation warning from vendored ``pkg_resources``
+to ensure builds succeed with ``PYTHONWARNINGS=error``.
diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py
index 417a537d6f6..8d405a4be7b 100644
--- a/src/pip/_vendor/pkg_resources/__init__.py
+++ b/src/pip/_vendor/pkg_resources/__init__.py
@@ -99,12 +99,10 @@
 _namespace_packages = None
 
 
-warnings.warn(
-    "pkg_resources is deprecated as an API. "
-    "See https://setuptools.pypa.io/en/latest/pkg_resources.html",
-    DeprecationWarning,
-    stacklevel=2,
-)
+# Patch: Remove deprecation warning from vendored pkg_resources.
+# Setting PYTHONWARNINGS=error to verify builds produce no warnings
+# causes immediate exceptions.
+# See https://github.com/pypa/pip/issues/12243
 
 
 _PEP440_FALLBACK = re.compile(r"^v?(?P(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I)
diff --git a/tools/vendoring/patches/pkg_resources.patch b/tools/vendoring/patches/pkg_resources.patch
index a99b6c63df8..22a67930afa 100644
--- a/tools/vendoring/patches/pkg_resources.patch
+++ b/tools/vendoring/patches/pkg_resources.patch
@@ -11,3 +11,22 @@ index 3f2476a0c..8d5727d35 100644
      yield_lines,
      drop_comment,
      join_continuation,
+--- a/src/pip/_vendor/pkg_resources/__init__.py
++++ b/src/pip/_vendor/pkg_resources/__init__.py
+@@ -101,12 +101,10 @@ _namespace_handlers = None
+ _namespace_packages = None
+
+
+-warnings.warn(
+-    "pkg_resources is deprecated as an API. "
+-    "See https://setuptools.pypa.io/en/latest/pkg_resources.html",
+-    DeprecationWarning,
+-    stacklevel=2,
+-)
++# Patch: Remove deprecation warning from vendored pkg_resources.
++# Setting PYTHONWARNINGS=error to verify builds produce no warnings
++# causes immediate exceptions.
++# See https://github.com/pypa/pip/issues/12243
+
+
+ _PEP440_FALLBACK = re.compile(r"^v?(?P(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I)

From 1dbaf48568bce82465900c36be67c19f73661ad0 Mon Sep 17 00:00:00 2001
From: morotti 
Date: Wed, 10 Jul 2024 00:42:15 +0100
Subject: [PATCH 483/992] When extracting a wheel, do not recheck parent
 directories (#12782)

Co-authored-by: rmorotti 
Co-authored-by: Richard Si 
---
 news/12782.bugfix.rst                         |  2 ++
 src/pip/_internal/operations/install/wheel.py | 16 +++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 news/12782.bugfix.rst

diff --git a/news/12782.bugfix.rst b/news/12782.bugfix.rst
new file mode 100644
index 00000000000..459a2838c32
--- /dev/null
+++ b/news/12782.bugfix.rst
@@ -0,0 +1,2 @@
+Improve pip install performance by only creating required parent
+directories once, instead of before extracting every file in the wheel.
diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index a02a193d226..4b582c44c2a 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -358,12 +358,6 @@ def _getinfo(self) -> ZipInfo:
         return self._zip_file.getinfo(self.src_record_path)
 
     def save(self) -> None:
-        # directory creation is lazy and after file filtering
-        # to ensure we don't install empty dirs; empty dirs can't be
-        # uninstalled.
-        parent_dir = os.path.dirname(self.dest_path)
-        ensure_dir(parent_dir)
-
         # When we open the output file below, any existing file is truncated
         # before we start writing the new contents. This is fine in most
         # cases, but can cause a segfault if pip has loaded a shared
@@ -421,7 +415,7 @@ def make(
         return super().make(specification, options)
 
 
-def _install_wheel(
+def _install_wheel(  # noqa: C901, PLR0915 function is too long
     name: str,
     wheel_zip: ZipFile,
     wheel_path: str,
@@ -580,7 +574,15 @@ def is_entrypoint_wrapper(file: "File") -> bool:
     script_scheme_files = map(ScriptFile, script_scheme_files)
     files = chain(files, script_scheme_files)
 
+    existing_parents = set()
     for file in files:
+        # directory creation is lazy and after file filtering
+        # to ensure we don't install empty dirs; empty dirs can't be
+        # uninstalled.
+        parent_dir = os.path.dirname(file.dest_path)
+        if parent_dir not in existing_parents:
+            ensure_dir(parent_dir)
+            existing_parents.add(parent_dir)
         file.save()
         record_installed(file.src_record_path, file.dest_path, file.changed)
 

From d483ff31819ca7270653a59a4e7c15dba38118a6 Mon Sep 17 00:00:00 2001
From: Dustin Rodrigues 
Date: Tue, 9 Jul 2024 19:43:38 -0400
Subject: [PATCH 484/992] Perform case-insensitive hash comparisons (#12729)

---
 news/12680.bugfix.rst             |  1 +
 src/pip/_internal/utils/hashes.py |  2 +-
 tests/functional/test_download.py |  2 +-
 tests/functional/test_install.py  | 12 ++++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 news/12680.bugfix.rst

diff --git a/news/12680.bugfix.rst b/news/12680.bugfix.rst
new file mode 100644
index 00000000000..fa821f9f339
--- /dev/null
+++ b/news/12680.bugfix.rst
@@ -0,0 +1 @@
+Perform hash comparisons in a case-insensitive manner.
diff --git a/src/pip/_internal/utils/hashes.py b/src/pip/_internal/utils/hashes.py
index c073b09dd98..535e94fca0c 100644
--- a/src/pip/_internal/utils/hashes.py
+++ b/src/pip/_internal/utils/hashes.py
@@ -33,7 +33,7 @@ def __init__(self, hashes: Optional[Dict[str, List[str]]] = None) -> None:
         if hashes is not None:
             for alg, keys in hashes.items():
                 # Make sure values are always sorted (to ease equality checks)
-                allowed[alg] = sorted(keys)
+                allowed[alg] = [k.lower() for k in sorted(keys)]
         self._allowed = allowed
 
     def __and__(self, other: "Hashes") -> "Hashes":
diff --git a/tests/functional/test_download.py b/tests/functional/test_download.py
index 555a1163f42..450690c1675 100644
--- a/tests/functional/test_download.py
+++ b/tests/functional/test_download.py
@@ -1401,7 +1401,7 @@ def test_incorrect_metadata_hash(
     )
     assert result.returncode != 0
     expected_msg = f"""\
-        Expected sha256 WRONG-HASH
+        Expected sha256 wrong-hash
              Got        {real_hash}"""
     assert expected_msg in result.stderr
 
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 0b377167bfe..5715bfa00ed 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -621,6 +621,18 @@ def test_hashed_install_failure(script: PipTestEnvironment, tmpdir: Path) -> Non
     assert len(result.files_created) == 0
 
 
+def test_case_insensitive_hashed_install_success(
+    script: PipTestEnvironment, tmpdir: Path
+) -> None:
+    """Test that hashes that differ only by case don't halt installation."""
+    with requirements_file(
+        "simple2==1.0 --hash=sha256:9336AF72CA661E6336EB87BC7DE3E8844D853E"
+        "3848C2B9BBD2E8BF01DB88C2C7\n",
+        tmpdir,
+    ) as reqs_file:
+        script.pip_install_local("-r", reqs_file.resolve())
+
+
 def test_link_hash_pass_require_hashes(
     script: PipTestEnvironment, shared_data: TestData
 ) -> None:

From f0bb386eb071b9e9dca1f602f00b8509b257f51a Mon Sep 17 00:00:00 2001
From: q0w <43147888+q0w@users.noreply.github.com>
Date: Wed, 10 Jul 2024 02:44:03 +0300
Subject: [PATCH 485/992] Forward --no-color to the rich.Console instance
 (#11048)

Co-authored-by: Pradyun Gedam 
---
 news/11045.bugfix.rst                 | 1 +
 src/pip/_internal/cli/base_command.py | 2 ++
 tests/functional/test_no_color.py     | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 news/11045.bugfix.rst

diff --git a/news/11045.bugfix.rst b/news/11045.bugfix.rst
new file mode 100644
index 00000000000..cf08c9b8bcd
--- /dev/null
+++ b/news/11045.bugfix.rst
@@ -0,0 +1 @@
+Set ``no_color`` to global ``rich.Console`` instance.
diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py
index 09f8c75ff87..b4f37394dc1 100644
--- a/src/pip/_internal/cli/base_command.py
+++ b/src/pip/_internal/cli/base_command.py
@@ -10,6 +10,7 @@
 from optparse import Values
 from typing import Any, Callable, List, Optional, Tuple
 
+from pip._vendor.rich import reconfigure
 from pip._vendor.rich import traceback as rich_traceback
 
 from pip._internal.cli import cmdoptions
@@ -115,6 +116,7 @@ def _main(self, args: List[str]) -> int:
         # Set verbosity so that it can be used elsewhere.
         self.verbosity = options.verbose - options.quiet
 
+        reconfigure(no_color=options.no_color)
         level_number = setup_logging(
             verbosity=self.verbosity,
             no_color=options.no_color,
diff --git a/tests/functional/test_no_color.py b/tests/functional/test_no_color.py
index 99200c6e4d6..9a246be3fa2 100644
--- a/tests/functional/test_no_color.py
+++ b/tests/functional/test_no_color.py
@@ -12,6 +12,7 @@
 from tests.lib import PipTestEnvironment
 
 
+@pytest.mark.network
 @pytest.mark.skipif(shutil.which("script") is None, reason="no 'script' executable")
 def test_no_color(script: PipTestEnvironment) -> None:
     """Ensure colour output disabled when --no-color is passed."""
@@ -23,7 +24,7 @@ def test_no_color(script: PipTestEnvironment) -> None:
     # 'script' and well as the mere use of the same.
     #
     # This test will stay until someone has the time to rewrite it.
-    pip_command = "pip uninstall {} noSuchPackage"
+    pip_command = "pip download {} setuptools==62.0.0 --no-cache-dir -d /tmp/"
     if sys.platform == "darwin":
         command = f"script -q /tmp/pip-test-no-color.txt {pip_command}"
     else:
@@ -45,6 +46,7 @@ def get_run_output(option: str = "") -> str:
             return retval
         finally:
             os.unlink("/tmp/pip-test-no-color.txt")
+            os.unlink("/tmp/setuptools-62.0.0-py3-none-any.whl")
 
     assert "\x1b[3" in get_run_output(""), "Expected color in output"
     assert "\x1b[3" not in get_run_output("--no-color"), "Expected no color in output"

From 9d8e765789883a854326dfad7fe31aeb9e715200 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Tue, 9 Jul 2024 19:48:12 -0400
Subject: [PATCH 486/992] Consistently use `get_requirement` to cache
 `Requirement` construction (#12663)

---
 news/12663.feature.rst                        |  1 +
 src/pip/_internal/build_env.py                |  4 +--
 .../_internal/metadata/importlib/_dists.py    |  3 +-
 src/pip/_internal/pyproject.py                |  5 ++--
 src/pip/_internal/req/constructors.py         |  6 ++--
 src/pip/_internal/req/req_install.py          |  5 ++--
 src/pip/_internal/utils/packaging.py          |  2 +-
 tests/unit/test_req.py                        | 28 +++++++++++++------
 8 files changed, 34 insertions(+), 20 deletions(-)
 create mode 100644 news/12663.feature.rst

diff --git a/news/12663.feature.rst b/news/12663.feature.rst
new file mode 100644
index 00000000000..11300ae47d3
--- /dev/null
+++ b/news/12663.feature.rst
@@ -0,0 +1 @@
+Improve performance when the same requirement string appears many times during resolution, by consistently caching the parsed requirement string.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index 5cb903fa531..be1e0ca85d2 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -12,7 +12,6 @@
 from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple, Type, Union
 
 from pip._vendor.certifi import where
-from pip._vendor.packaging.requirements import Requirement
 from pip._vendor.packaging.version import Version
 
 from pip import __file__ as pip_location
@@ -20,6 +19,7 @@
 from pip._internal.locations import get_platlib, get_purelib, get_scheme
 from pip._internal.metadata import get_default_environment, get_environment
 from pip._internal.utils.logging import VERBOSE
+from pip._internal.utils.packaging import get_requirement
 from pip._internal.utils.subprocess import call_subprocess
 from pip._internal.utils.temp_dir import TempDirectory, tempdir_kinds
 
@@ -184,7 +184,7 @@ def check_requirements(
                 else get_default_environment()
             )
             for req_str in reqs:
-                req = Requirement(req_str)
+                req = get_requirement(req_str)
                 # We're explicitly evaluating with an empty extra value, since build
                 # environments are not provided any mechanism to select specific extras.
                 if req.marker is not None and not req.marker.evaluate({"extra": ""}):
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index f65ccb1e706..9d3bedd8a10 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -27,6 +27,7 @@
     Wheel,
 )
 from pip._internal.utils.misc import normalize_path
+from pip._internal.utils.packaging import get_requirement
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.wheel import parse_wheel, read_wheel_metadata_file
 
@@ -219,7 +220,7 @@ def iter_dependencies(self, extras: Collection[str] = ()) -> Iterable[Requiremen
         for req_string in self.metadata.get_all("Requires-Dist", []):
             # strip() because email.message.Message.get_all() may return a leading \n
             # in case a long header was wrapped.
-            req = Requirement(req_string.strip())
+            req = get_requirement(req_string.strip())
             if not req.marker:
                 yield req
             elif not extras and req.marker.evaluate({"extra": ""}):
diff --git a/src/pip/_internal/pyproject.py b/src/pip/_internal/pyproject.py
index b9b9e3f19d9..2a9cad4803e 100644
--- a/src/pip/_internal/pyproject.py
+++ b/src/pip/_internal/pyproject.py
@@ -9,13 +9,14 @@
 else:
     from pip._vendor import tomli as tomllib
 
-from pip._vendor.packaging.requirements import InvalidRequirement, Requirement
+from pip._vendor.packaging.requirements import InvalidRequirement
 
 from pip._internal.exceptions import (
     InstallationError,
     InvalidPyProjectBuildRequires,
     MissingPyProjectBuildRequires,
 )
+from pip._internal.utils.packaging import get_requirement
 
 
 def _is_list_of_str(obj: Any) -> bool:
@@ -156,7 +157,7 @@ def load_pyproject_toml(
     # Each requirement must be valid as per PEP 508
     for requirement in requires:
         try:
-            Requirement(requirement)
+            get_requirement(requirement)
         except InvalidRequirement as error:
             raise InvalidPyProjectBuildRequires(
                 package=req_name,
diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
index b8e170f2a70..d73236e05c6 100644
--- a/src/pip/_internal/req/constructors.py
+++ b/src/pip/_internal/req/constructors.py
@@ -81,7 +81,7 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme
         pre is not None and post is not None
     ), f"regex group selection for requirement {req} failed, this should never happen"
     extras: str = "[%s]" % ",".join(sorted(new_extras)) if new_extras else ""
-    return Requirement(f"{pre}{extras}{post}")
+    return get_requirement(f"{pre}{extras}{post}")
 
 
 def parse_editable(editable_req: str) -> Tuple[Optional[str], str, Set[str]]:
@@ -163,7 +163,7 @@ def check_first_requirement_in_file(filename: str) -> None:
             # If there is a line continuation, drop it, and append the next line.
             if line.endswith("\\"):
                 line = line[:-2].strip() + next(lines, "")
-            Requirement(line)
+            get_requirement(line)
             return
 
 
@@ -205,7 +205,7 @@ def parse_req_from_editable(editable_req: str) -> RequirementParts:
 
     if name is not None:
         try:
-            req: Optional[Requirement] = Requirement(name)
+            req: Optional[Requirement] = get_requirement(name)
         except InvalidRequirement as exc:
             raise InstallationError(f"Invalid requirement: {name!r}: {exc}")
     else:
diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index afd0a9e5e82..1a35189621a 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -52,6 +52,7 @@
     redact_auth_from_requirement,
     redact_auth_from_url,
 )
+from pip._internal.utils.packaging import get_requirement
 from pip._internal.utils.subprocess import runner_with_spinner_message
 from pip._internal.utils.temp_dir import TempDirectory, tempdir_kinds
 from pip._internal.utils.unpacking import unpack_file
@@ -395,7 +396,7 @@ def _set_requirement(self) -> None:
         else:
             op = "==="
 
-        self.req = Requirement(
+        self.req = get_requirement(
             "".join(
                 [
                     self.metadata["Name"],
@@ -421,7 +422,7 @@ def warn_on_mismatching_name(self) -> None:
             metadata_name,
             self.name,
         )
-        self.req = Requirement(metadata_name)
+        self.req = get_requirement(metadata_name)
 
     def check_if_exists(self, use_user_site: bool) -> None:
         """Find an installed distribution that satisfies or conflicts
diff --git a/src/pip/_internal/utils/packaging.py b/src/pip/_internal/utils/packaging.py
index b9f6af4d174..4b8fa0fe397 100644
--- a/src/pip/_internal/utils/packaging.py
+++ b/src/pip/_internal/utils/packaging.py
@@ -34,7 +34,7 @@ def check_requires_python(
     return python_version in requires_python_specifier
 
 
-@functools.lru_cache(maxsize=512)
+@functools.lru_cache(maxsize=2048)
 def get_requirement(req_string: str) -> Requirement:
     """Construct a packaging.Requirement object with caching"""
     # Parsing requirement strings is expensive, and is also expected to happen
diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py
index dd0af289e7b..3b78ead3fe3 100644
--- a/tests/unit/test_req.py
+++ b/tests/unit/test_req.py
@@ -770,11 +770,16 @@ def test_install_req_drop_extras(self, inp: str, out: str) -> None:
         without_extras = install_req_drop_extras(req)
         assert not without_extras.extras
         assert str(without_extras.req) == out
-        # should always be a copy
-        assert req is not without_extras
-        assert req.req is not without_extras.req
+
+        # if there are no extras they should be the same object,
+        # otherwise they may be a copy due to cache
+        if req.extras:
+            assert req is not without_extras
+            assert req.req is not without_extras.req
+
         # comes_from should point to original
         assert without_extras.comes_from is req
+
         # all else should be the same
         assert without_extras.link == req.link
         assert without_extras.markers == req.markers
@@ -790,9 +795,9 @@ def test_install_req_drop_extras(self, inp: str, out: str) -> None:
     @pytest.mark.parametrize(
         "inp, extras, out",
         [
-            ("pkg", {}, "pkg"),
-            ("pkg==1.0", {}, "pkg==1.0"),
-            ("pkg[ext]", {}, "pkg[ext]"),
+            ("pkg", set(), "pkg"),
+            ("pkg==1.0", set(), "pkg==1.0"),
+            ("pkg[ext]", set(), "pkg[ext]"),
             ("pkg", {"ext"}, "pkg[ext]"),
             ("pkg==1.0", {"ext"}, "pkg[ext]==1.0"),
             ("pkg==1.0", {"ext1", "ext2"}, "pkg[ext1,ext2]==1.0"),
@@ -816,9 +821,14 @@ def test_install_req_extend_extras(
         assert str(extended.req) == out
         assert extended.req is not None
         assert set(extended.extras) == set(extended.req.extras)
-        # should always be a copy
-        assert req is not extended
-        assert req.req is not extended.req
+
+        # if extras is not a subset of req.extras then the extended
+        # requirement object should not be the same, otherwise they
+        # might be a copy due to cache
+        if not extras.issubset(req.extras):
+            assert req is not extended
+            assert req.req is not extended.req
+
         # all else should be the same
         assert extended.link == req.link
         assert extended.markers == req.markers

From 601bcf82eccfbc15c1ff6cc735aafb2c9dab81a5 Mon Sep 17 00:00:00 2001
From: Charlie Marsh 
Date: Tue, 9 Jul 2024 16:50:58 -0700
Subject: [PATCH 487/992] Handle dlopen(NULL) failure in glibc fallback
 (#12716)

Co-authored-by: Pradyun Gedam 
---
 news/12716.bugfix.rst            |  1 +
 src/pip/_internal/utils/glibc.py | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 news/12716.bugfix.rst

diff --git a/news/12716.bugfix.rst b/news/12716.bugfix.rst
new file mode 100644
index 00000000000..7af794f7bb3
--- /dev/null
+++ b/news/12716.bugfix.rst
@@ -0,0 +1 @@
+Avoid dlopen failure for glibc detection in musl builds
diff --git a/src/pip/_internal/utils/glibc.py b/src/pip/_internal/utils/glibc.py
index 81342afa447..998868ff2a4 100644
--- a/src/pip/_internal/utils/glibc.py
+++ b/src/pip/_internal/utils/glibc.py
@@ -40,7 +40,20 @@ def glibc_version_string_ctypes() -> Optional[str]:
     # manpage says, "If filename is NULL, then the returned handle is for the
     # main program". This way we can let the linker do the work to figure out
     # which libc our process is actually using.
-    process_namespace = ctypes.CDLL(None)
+    #
+    # We must also handle the special case where the executable is not a
+    # dynamically linked executable. This can occur when using musl libc,
+    # for example. In this situation, dlopen() will error, leading to an
+    # OSError. Interestingly, at least in the case of musl, there is no
+    # errno set on the OSError. The single string argument used to construct
+    # OSError comes from libc itself and is therefore not portable to
+    # hard code here. In any case, failure to call dlopen() means we
+    # can't proceed, so we bail on our attempt.
+    try:
+        process_namespace = ctypes.CDLL(None)
+    except OSError:
+        return None
+
     try:
         gnu_get_libc_version = process_namespace.gnu_get_libc_version
     except AttributeError:
@@ -50,7 +63,7 @@ def glibc_version_string_ctypes() -> Optional[str]:
 
     # Call gnu_get_libc_version, which returns a string like "2.5"
     gnu_get_libc_version.restype = ctypes.c_char_p
-    version_str = gnu_get_libc_version()
+    version_str: str = gnu_get_libc_version()
     # py2 / py3 compatibility:
     if not isinstance(version_str, str):
         version_str = version_str.decode("ascii")

From ceecceea19a10eb2aea6c6543f3b38afb39cd67f Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 9 Jul 2024 19:52:48 -0400
Subject: [PATCH 488/992] importlib: Read distribution name/version from
 metadata directory names, if possible (#12656)

importlib does not cache metadata in-memory, so querying even simple
attributes like distribution names and versions can quickly become
expensive (as each access requires reading METADATA). Fortunately,
`Distribution.canonical_name` is optimized to parse the metadata
directory name to query the name if possible. This commit extends this
optimization to the finder implementation and version attribute.

.egg-info directory names tend to not include the version so they are
not considered for optimizing version lookup.

simplewheel-2.0-1-py2.py3-none-any.whl had to be modified to rename the
.dist-info directory which mistakenly included the wheel build tag (in
violation of the wheel specification).

    simplewheel/__init__.py
    simplewheel-2.0-1.dist-info/DESCRIPTION.rst
    simplewheel-2.0-1.dist-info/metadata.json
    simplewheel-2.0-1.dist-info/top_level.txt
    simplewheel-2.0-1.dist-info/WHEEL
    simplewheel-2.0-1.dist-info/METADATA
    simplewheel-2.0-1.dist-info/RECORD

Otherwise, it was mistaken for part of the version and led pip to think
the wheel was a post-release, breaking tests...

Co-authored-by: Tzu-ping Chung 
---
 news/12656.feature.rst                        |   3 ++
 ...1b-1578-4128-8db3-9aa72b3a6a84.trivial.rst |   0
 .../_internal/metadata/importlib/_compat.py   |  38 ++++++++++++++++--
 .../_internal/metadata/importlib/_dists.py    |  24 ++++-------
 src/pip/_internal/metadata/importlib/_envs.py |   9 ++---
 .../simplewheel-2.0-1-py2.py3-none-any.whl    | Bin 1872 -> 2156 bytes
 tests/functional/test_install.py              |   2 +-
 tests/functional/test_install_report.py       |   2 +-
 8 files changed, 51 insertions(+), 27 deletions(-)
 create mode 100644 news/12656.feature.rst
 create mode 100644 news/aa82171b-1578-4128-8db3-9aa72b3a6a84.trivial.rst

diff --git a/news/12656.feature.rst b/news/12656.feature.rst
new file mode 100644
index 00000000000..fdbba5484ba
--- /dev/null
+++ b/news/12656.feature.rst
@@ -0,0 +1,3 @@
+Improve discovery performance of installed packages when the
+``importlib.metadata`` backend is used to load distribution metadata
+(used by default under Python 3.11+).
diff --git a/news/aa82171b-1578-4128-8db3-9aa72b3a6a84.trivial.rst b/news/aa82171b-1578-4128-8db3-9aa72b3a6a84.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/pip/_internal/metadata/importlib/_compat.py b/src/pip/_internal/metadata/importlib/_compat.py
index 593bff23ede..ec1e815cdbd 100644
--- a/src/pip/_internal/metadata/importlib/_compat.py
+++ b/src/pip/_internal/metadata/importlib/_compat.py
@@ -1,5 +1,8 @@
 import importlib.metadata
-from typing import Any, Optional, Protocol, cast
+import os
+from typing import Any, Optional, Protocol, Tuple, cast
+
+from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
 
 
 class BadMetadata(ValueError):
@@ -43,13 +46,40 @@ def get_info_location(d: importlib.metadata.Distribution) -> Optional[BasePath]:
     return getattr(d, "_path", None)
 
 
-def get_dist_name(dist: importlib.metadata.Distribution) -> str:
-    """Get the distribution's project name.
+def parse_name_and_version_from_info_directory(
+    dist: importlib.metadata.Distribution,
+) -> Tuple[Optional[str], Optional[str]]:
+    """Get a name and version from the metadata directory name.
+
+    This is much faster than reading distribution metadata.
+    """
+    info_location = get_info_location(dist)
+    if info_location is None:
+        return None, None
+
+    stem, suffix = os.path.splitext(info_location.name)
+    if suffix == ".dist-info":
+        name, sep, version = stem.partition("-")
+        if sep:
+            return name, version
+
+    if suffix == ".egg-info":
+        name = stem.split("-", 1)[0]
+        return name, None
+
+    return None, None
+
+
+def get_dist_canonical_name(dist: importlib.metadata.Distribution) -> NormalizedName:
+    """Get the distribution's normalized name.
 
     The ``name`` attribute is only available in Python 3.10 or later. We are
     targeting exactly that, but Mypy does not know this.
     """
+    if name := parse_name_and_version_from_info_directory(dist)[0]:
+        return canonicalize_name(name)
+
     name = cast(Any, dist).name
     if not isinstance(name, str):
         raise BadMetadata(dist, reason="invalid metadata entry 'name'")
-    return name
+    return canonicalize_name(name)
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index 9d3bedd8a10..36cd326232e 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -1,6 +1,5 @@
 import email.message
 import importlib.metadata
-import os
 import pathlib
 import zipfile
 from typing import (
@@ -31,7 +30,11 @@
 from pip._internal.utils.temp_dir import TempDirectory
 from pip._internal.utils.wheel import parse_wheel, read_wheel_metadata_file
 
-from ._compat import BasePath, get_dist_name
+from ._compat import (
+    BasePath,
+    get_dist_canonical_name,
+    parse_name_and_version_from_info_directory,
+)
 
 
 class WheelDistribution(importlib.metadata.Distribution):
@@ -154,25 +157,14 @@ def installed_location(self) -> Optional[str]:
             return None
         return normalize_path(str(self._installed_location))
 
-    def _get_dist_name_from_location(self) -> Optional[str]:
-        """Try to get the name from the metadata directory name.
-
-        This is much faster than reading metadata.
-        """
-        if self._info_location is None:
-            return None
-        stem, suffix = os.path.splitext(self._info_location.name)
-        if suffix not in (".dist-info", ".egg-info"):
-            return None
-        return stem.split("-", 1)[0]
-
     @property
     def canonical_name(self) -> NormalizedName:
-        name = self._get_dist_name_from_location() or get_dist_name(self._dist)
-        return canonicalize_name(name)
+        return get_dist_canonical_name(self._dist)
 
     @property
     def version(self) -> Version:
+        if version := parse_name_and_version_from_info_directory(self._dist)[1]:
+            return parse_version(version)
         return parse_version(self._dist.version)
 
     @property
diff --git a/src/pip/_internal/metadata/importlib/_envs.py b/src/pip/_internal/metadata/importlib/_envs.py
index c82e1ffc951..70cb7a6009a 100644
--- a/src/pip/_internal/metadata/importlib/_envs.py
+++ b/src/pip/_internal/metadata/importlib/_envs.py
@@ -15,7 +15,7 @@
 from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.filetypes import WHEEL_EXTENSION
 
-from ._compat import BadMetadata, BasePath, get_dist_name, get_info_location
+from ._compat import BadMetadata, BasePath, get_dist_canonical_name, get_info_location
 from ._dists import Distribution
 
 logger = logging.getLogger(__name__)
@@ -61,14 +61,13 @@ def _find_impl(self, location: str) -> Iterator[FoundResult]:
         for dist in importlib.metadata.distributions(path=[location]):
             info_location = get_info_location(dist)
             try:
-                raw_name = get_dist_name(dist)
+                name = get_dist_canonical_name(dist)
             except BadMetadata as e:
                 logger.warning("Skipping %s due to %s", info_location, e.reason)
                 continue
-            normalized_name = canonicalize_name(raw_name)
-            if normalized_name in self._found_names:
+            if name in self._found_names:
                 continue
-            self._found_names.add(normalized_name)
+            self._found_names.add(name)
             yield dist, info_location
 
     def find(self, location: str) -> Iterator[BaseDistribution]:
diff --git a/tests/data/packages/simplewheel-2.0-1-py2.py3-none-any.whl b/tests/data/packages/simplewheel-2.0-1-py2.py3-none-any.whl
index cd34cf8a0463fea5047ffc1a8b67362646d3c7a3..ba852ba289574377fbcf49fb9d83d4646772aa42 100644
GIT binary patch
delta 983
zcmcb>_eNlXza|$02pros(I-x~{t}1>!kP>+48@tb1v#nZ8L6o`x<+~ilN(v3)Iviz
z8JI&hUyB0a(h6<{MwS=M3=Ci*)X&?`KirRti)(T}la!MZrV)B6nZ+f#nR#jX`o69q
zjxLTNj`$3me35CEg92V-f?S>bgIw?#vUwtN9wQSo%Vd8xF?)HuhJ|~$y87TVYqC01
z*~E1`!s?jDOgt|kgHP+k=NpiM`h4n_SRP<7gD@7uCL6LzXy7vqDQdVT|7G#Clw-yf
zj}kyD7#J9VxS`P-NFr&4#j0#*2rDF3(PA{fn~_Ow@?19YKqUrbb9P{wgEeaLnfjhh
z++P93)G0tmqPY&qR9H;oGt-Yv+)p0G%qU>u#BC-t!toiofK^;k9mPm#77QbSkspdT
o43T07HR_Q=Rf847U{FHP!)-Dv8!#dm*n#jM69dCkpne7h0F$Kt!2kdN

delta 819
zcmaDOaDi`ve}D)B0|N)cv27E5;&kgT@c?;TK&%bK#hJMUIjQ9tsi`@-MtTOihI%QP
z#U;9#d1?9jF0R4OL7o92p8kG%Ma3oDUq65Q%>VuIqeo1WrC6kOH3?|XO)W`GNi0d!
z%PP*#n_R=PArRq=^Qm8A`GERCP9bDYNq#|mPHI_dj$TPciT1fOx+gq!&wKcueaOTx
zIf_|IRgr)@!aZDFeI{>aE}I<5#-pJ^K(()Hh@*>Rh~s1t##w4g1QZ9kI{OE?Y<|a>
z$2fU9tGl8IGs27LAq_N&fnoB0RtZIXfgIq?$RskkkzKqV6f7{%(6|7|#1~g6fekhU
z$tmcejWBjHBQ9elA!z_5@FC_-j$;G&H`zX$-^^a1=ni=Eo*p4~hdAXlU$b
z!sP~tW>}1%`|A3=IXpQ)i-UmrK@kN54UK`!cukbmhs0ZeH!B-R6FU&v0uA}g0^$Jx
DpWfp<

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 5715bfa00ed..e82da82eef4 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -1195,7 +1195,7 @@ def test_install_nonlocal_compatible_wheel(
     )
     assert result.returncode == SUCCESS
 
-    distinfo = Path("scratch") / "target" / "simplewheel-2.0-1.dist-info"
+    distinfo = Path("scratch") / "target" / "simplewheel-2.0.dist-info"
     result.did_create(distinfo)
 
     # Test install without --target
diff --git a/tests/functional/test_install_report.py b/tests/functional/test_install_report.py
index a1e7f8375d9..a25de64a3d1 100644
--- a/tests/functional/test_install_report.py
+++ b/tests/functional/test_install_report.py
@@ -39,7 +39,7 @@ def test_install_report_basic(
     assert url.endswith("/packages/simplewheel-2.0-1-py2.py3-none-any.whl")
     assert (
         simplewheel_report["download_info"]["archive_info"]["hash"]
-        == "sha256=191d6520d0570b13580bf7642c97ddfbb46dd04da5dd2cf7bef9f32391dfe716"
+        == "sha256=71e1ca6b16ae3382a698c284013f66504f2581099b2ce4801f60e9536236ceee"
     )
 
 

From 6b54c192b351a4fed798bb42abcecf9bb03fa265 Mon Sep 17 00:00:00 2001
From: Josh Cannon <3956745+thejcannon@users.noreply.github.com>
Date: Tue, 9 Jul 2024 16:54:54 -0700
Subject: [PATCH 489/992] Fix resolution to respect ``--python-version`` when
 checking ``Requires-Python`` (#12218)

Co-authored-by: Tzu-ping Chung 
---
 news/12216.bugfix.rst                 |  1 +
 src/pip/_internal/commands/install.py |  1 +
 tests/conftest.py                     |  5 ++++-
 tests/functional/test_new_resolver.py | 24 ++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 news/12216.bugfix.rst

diff --git a/news/12216.bugfix.rst b/news/12216.bugfix.rst
new file mode 100644
index 00000000000..804bf1ee9bb
--- /dev/null
+++ b/news/12216.bugfix.rst
@@ -0,0 +1 @@
+Fix resolution to respect ``--python-version`` when checking ``Requires-Python``.
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index 5e076a2d1e2..ad45a2f2a57 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -371,6 +371,7 @@ def run(self, options: Values, args: List[str]) -> int:
                 force_reinstall=options.force_reinstall,
                 upgrade_strategy=upgrade_strategy,
                 use_pep517=options.use_pep517,
+                py_version_info=options.python_version,
             )
 
             self.trace_basic_info(finder)
diff --git a/tests/conftest.py b/tests/conftest.py
index 5934e9f95d4..9850da55d56 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -411,7 +411,10 @@ def _common_wheel_editable_install(
     tmpdir_factory: pytest.TempPathFactory, common_wheels: Path, package: str
 ) -> Path:
     wheel_candidates = list(common_wheels.glob(f"{package}-*.whl"))
-    assert len(wheel_candidates) == 1, wheel_candidates
+    assert len(wheel_candidates) == 1, (
+        f"Missing wheels in {common_wheels}, expected 1 got '{wheel_candidates}'."
+        " Are you running the tests via nox? See https://pip.pypa.io/en/latest/development/getting-started/#running-tests"
+    )
     install_dir = tmpdir_factory.mktemp(package) / "install"
     lib_install_dir = install_dir / "lib"
     bin_install_dir = install_dir / "bin"
diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py
index 774311a38e8..5be2eb93ace 100644
--- a/tests/functional/test_new_resolver.py
+++ b/tests/functional/test_new_resolver.py
@@ -418,6 +418,30 @@ def test_new_resolver_requires_python_error(script: PipTestEnvironment) -> None:
     assert message in result.stderr, str(result)
 
 
+def test_new_resolver_requires_python_ok_with_python_version_flag(
+    script: PipTestEnvironment,
+) -> None:
+    create_basic_wheel_for_package(
+        script,
+        "base",
+        "0.1.0",
+        requires_python="<3",
+    )
+    result = script.pip(
+        "install",
+        "--no-cache-dir",
+        "--no-index",
+        "--find-links",
+        script.scratch_path,
+        "--dry-run",
+        "--python-version=2",
+        "--only-binary=:all:",
+        "base",
+    )
+
+    assert not result.stderr, str(result)
+
+
 def test_new_resolver_installed(script: PipTestEnvironment) -> None:
     create_basic_wheel_for_package(
         script,

From 3228d7674451498767518432ff2a9dccf280ac0d Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 13 Jul 2024 07:21:32 -0400
Subject: [PATCH 490/992] Use higher precision time source in retry
 decorator/tests and avoid flaky failures (#12839)

I've replaced time.monotonic() with time.perf_counter() in the
retry utility and test suite since it's effectively monotonic[^1] while
providing much higher resolution (esp. on Windows).

In addition, to avoid flaky failures (originally on Windows) I've added
a margin of error to the timed tests. I've also outright disabled the
timed tests on Windows as further testing revealed that they were simply
too unreliable to be useful (I once observed a deviation of 30%).

[^1]: It's not guaranteed to be monotonic in the Python docs, but it is
      _indeed_ monotonic on all platforms we care about.
---
 src/pip/_internal/utils/retry.py |  8 +++++---
 tests/unit/test_utils_retry.py   | 24 ++++++++++++++++--------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/pip/_internal/utils/retry.py b/src/pip/_internal/utils/retry.py
index 941470b7945..abfe07286ea 100644
--- a/src/pip/_internal/utils/retry.py
+++ b/src/pip/_internal/utils/retry.py
@@ -1,5 +1,5 @@
 import functools
-from time import monotonic, sleep
+from time import perf_counter, sleep
 from typing import Callable, TypeVar
 
 from pip._vendor.typing_extensions import ParamSpec
@@ -26,12 +26,14 @@ def wrapper(func: Callable[P, T]) -> Callable[P, T]:
 
         @functools.wraps(func)
         def retry_wrapped(*args: P.args, **kwargs: P.kwargs) -> T:
-            start_time = monotonic()
+            # The performance counter is monotonic on all platforms we care
+            # about and has much better resolution than time.monotonic().
+            start_time = perf_counter()
             while True:
                 try:
                     return func(*args, **kwargs)
                 except Exception:
-                    if monotonic() - start_time > stop_after_delay:
+                    if perf_counter() - start_time > stop_after_delay:
                         raise
                     sleep(wait)
 
diff --git a/tests/unit/test_utils_retry.py b/tests/unit/test_utils_retry.py
index 3ad8be69a40..74abce6f66f 100644
--- a/tests/unit/test_utils_retry.py
+++ b/tests/unit/test_utils_retry.py
@@ -1,5 +1,6 @@
 import random
-from time import monotonic, sleep
+import sys
+from time import perf_counter, sleep
 from typing import List, NoReturn, Tuple, Type
 from unittest.mock import Mock
 
@@ -65,7 +66,7 @@ def create_timestamped_callable(sleep_per_call: float = 0) -> Tuple[Mock, List[f
     timestamps = []
 
     def _raise_error() -> NoReturn:
-        timestamps.append(monotonic())
+        timestamps.append(perf_counter())
         if sleep_per_call:
             sleep(sleep_per_call)
         raise RuntimeError
@@ -73,31 +74,38 @@ def _raise_error() -> NoReturn:
     return Mock(wraps=_raise_error), timestamps
 
 
-# Use multiple of 15ms as Windows' sleep is only accurate to 15ms.
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="Too flaky on Windows due to poor timer resolution"
+)
 @pytest.mark.parametrize("wait_duration", [0.015, 0.045, 0.15])
 def test_retry_wait(wait_duration: float) -> None:
     function, timestamps = create_timestamped_callable()
     # Only the first retry will be scheduled before the time limit is exceeded.
     wrapped = retry(wait=wait_duration, stop_after_delay=0.01)(function)
-    start_time = monotonic()
+    start_time = perf_counter()
     with pytest.raises(RuntimeError):
         wrapped()
     assert len(timestamps) == 2
-    assert timestamps[1] - start_time >= wait_duration
+    # Add a margin of 10% to permit for unavoidable variation.
+    assert timestamps[1] - start_time >= (wait_duration * 0.9)
 
 
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="Too flaky on Windows due to poor timer resolution"
+)
 @pytest.mark.parametrize(
-    "call_duration, max_allowed_calls", [(0.01, 10), (0.04, 3), (0.15, 1)]
+    "call_duration, max_allowed_calls", [(0.01, 11), (0.04, 3), (0.15, 1)]
 )
 def test_retry_time_limit(call_duration: float, max_allowed_calls: int) -> None:
     function, timestamps = create_timestamped_callable(sleep_per_call=call_duration)
     wrapped = retry(wait=0, stop_after_delay=0.1)(function)
 
-    start_time = monotonic()
+    start_time = perf_counter()
     with pytest.raises(RuntimeError):
         wrapped()
     assert len(timestamps) <= max_allowed_calls
-    assert all(t - start_time <= 0.1 for t in timestamps)
+    # Add a margin of 10% to permit for unavoidable variation.
+    assert all(t - start_time <= (0.1 * 1.1) for t in timestamps)
 
 
 def test_retry_method() -> None:

From da107971679273599fe7a7322a4b2a2c8b0a6b29 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 13 Jul 2024 10:43:36 -0400
Subject: [PATCH 491/992] Upgrade platformdirs to 4.2.2

---
 news/platformdirs.vendor.rst            |  1 +
 src/pip/_vendor/platformdirs/android.py | 47 +++++++++++++++++++------
 src/pip/_vendor/platformdirs/version.py |  4 +--
 src/pip/_vendor/vendor.txt              |  2 +-
 4 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 news/platformdirs.vendor.rst

diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
new file mode 100644
index 00000000000..b2007b95b09
--- /dev/null
+++ b/news/platformdirs.vendor.rst
@@ -0,0 +1 @@
+Upgrade platformdirs to 4.2.2
diff --git a/src/pip/_vendor/platformdirs/android.py b/src/pip/_vendor/platformdirs/android.py
index fefafd32977..afd3141c725 100644
--- a/src/pip/_vendor/platformdirs/android.py
+++ b/src/pip/_vendor/platformdirs/android.py
@@ -6,7 +6,7 @@
 import re
 import sys
 from functools import lru_cache
-from typing import cast
+from typing import TYPE_CHECKING, cast
 
 from .api import PlatformDirsABC
 
@@ -117,16 +117,33 @@ def site_runtime_dir(self) -> str:
 
 
 @lru_cache(maxsize=1)
-def _android_folder() -> str | None:
+def _android_folder() -> str | None:  # noqa: C901, PLR0912
     """:return: base folder for the Android OS or None if it cannot be found"""
-    try:
-        # First try to get a path to android app via pyjnius
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        result: str | None = context.getFilesDir().getParentFile().getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        # if fails find an android folder looking a path on the sys.path
+    result: str | None = None
+    # type checker isn't happy with our "import android", just don't do this when type checking see
+    # https://stackoverflow.com/a/61394121
+    if not TYPE_CHECKING:
+        try:
+            # First try to get a path to android app using python4android (if available)...
+            from android import mActivity  # noqa: PLC0415
+
+            context = cast("android.content.Context", mActivity.getApplicationContext())  # noqa: F821
+            result = context.getFilesDir().getParentFile().getAbsolutePath()
+        except Exception:  # noqa: BLE001
+            result = None
+    if result is None:
+        try:
+            # ...and fall back to using plain pyjnius, if python4android isn't available or doesn't deliver any useful
+            # result...
+            from jnius import autoclass  # noqa: PLC0415
+
+            context = autoclass("android.content.Context")
+            result = context.getFilesDir().getParentFile().getAbsolutePath()
+        except Exception:  # noqa: BLE001
+            result = None
+    if result is None:
+        # and if that fails, too, find an android folder looking at path on the sys.path
+        # warning: only works for apps installed under /data, not adopted storage etc.
         pattern = re.compile(r"/data/(data|user/\d+)/(.+)/files")
         for path in sys.path:
             if pattern.match(path):
@@ -134,6 +151,16 @@ def _android_folder() -> str | None:
                 break
         else:
             result = None
+    if result is None:
+        # one last try: find an android folder looking at path on the sys.path taking adopted storage paths into
+        # account
+        pattern = re.compile(r"/mnt/expand/[a-fA-F0-9-]{36}/(data|user/\d+)/(.+)/files")
+        for path in sys.path:
+            if pattern.match(path):
+                result = path.split("/files")[0]
+                break
+        else:
+            result = None
     return result
 
 
diff --git a/src/pip/_vendor/platformdirs/version.py b/src/pip/_vendor/platformdirs/version.py
index c418cd0c9af..6483ddce0bc 100644
--- a/src/pip/_vendor/platformdirs/version.py
+++ b/src/pip/_vendor/platformdirs/version.py
@@ -12,5 +12,5 @@
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.2.1'
-__version_tuple__ = version_tuple = (4, 2, 1)
+__version__ = version = '4.2.2'
+__version_tuple__ = version_tuple = (4, 2, 2)
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index ed9cc81b525..0f8c95c8919 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -3,7 +3,7 @@ distlib==0.3.8
 distro==1.9.0
 msgpack==1.0.8
 packaging==24.1
-platformdirs==4.2.1
+platformdirs==4.2.2
 pyproject-hooks==1.0.0
 requests==2.32.3
     certifi==2024.2.2

From 92940a9a98a60bc85158e23524c62df66cecfc2c Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 13 Jul 2024 10:45:01 -0400
Subject: [PATCH 492/992] Upgrade certifi to 2024.7.4

---
 news/certifi.vendor.rst             |  1 +
 src/pip/_vendor/certifi/__init__.py |  2 +-
 src/pip/_vendor/certifi/cacert.pem  | 64 +++++++++++------------------
 src/pip/_vendor/vendor.txt          |  2 +-
 4 files changed, 27 insertions(+), 42 deletions(-)
 create mode 100644 news/certifi.vendor.rst

diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
new file mode 100644
index 00000000000..bc4ad30e7f9
--- /dev/null
+++ b/news/certifi.vendor.rst
@@ -0,0 +1 @@
+Upgrade certifi to 2024.7.4
diff --git a/src/pip/_vendor/certifi/__init__.py b/src/pip/_vendor/certifi/__init__.py
index 1c91f3ec932..d321f1bc3ab 100644
--- a/src/pip/_vendor/certifi/__init__.py
+++ b/src/pip/_vendor/certifi/__init__.py
@@ -1,4 +1,4 @@
 from .core import contents, where
 
 __all__ = ["contents", "where"]
-__version__ = "2024.02.02"
+__version__ = "2024.07.04"
diff --git a/src/pip/_vendor/certifi/cacert.pem b/src/pip/_vendor/certifi/cacert.pem
index fac3c31909b..a6581589ba1 100644
--- a/src/pip/_vendor/certifi/cacert.pem
+++ b/src/pip/_vendor/certifi/cacert.pem
@@ -3485,46 +3485,6 @@ DgQWBBQxCpCPtsad0kRLgLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ
 +RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+CAezNIm8BZ/3Hobui3A=
 -----END CERTIFICATE-----
 
-# Issuer: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
-# Subject: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
-# Label: "GLOBALTRUST 2020"
-# Serial: 109160994242082918454945253
-# MD5 Fingerprint: 8a:c7:6f:cb:6d:e3:cc:a2:f1:7c:83:fa:0e:78:d7:e8
-# SHA1 Fingerprint: d0:67:c1:13:51:01:0c:aa:d0:c7:6a:65:37:31:16:26:4f:53:71:a2
-# SHA256 Fingerprint: 9a:29:6a:51:82:d1:d4:51:a2:e3:7f:43:9b:74:da:af:a2:67:52:33:29:f9:0f:9a:0d:20:07:c3:34:e2:3c:9a
------BEGIN CERTIFICATE-----
-MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkG
-A1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkw
-FwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYx
-MDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9u
-aXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWiD59b
-RatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9Z
-YybNpyrOVPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3
-QWPKzv9pj2gOlTblzLmMCcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPw
-yJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCmfecqQjuCgGOlYx8ZzHyyZqjC0203b+J+
-BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKAA1GqtH6qRNdDYfOiaxaJ
-SaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9ORJitHHmkH
-r96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj0
-4KlGDfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9Me
-dKZssCz3AwyIDMvUclOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIw
-q7ejMZdnrY8XD2zHc+0klGvIg5rQmjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2
-nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1UdIwQYMBaAFNwu
-H9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
-VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJC
-XtzoRlgHNQIw4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd
-6IwPS3BD0IL/qMy/pJTAvoe9iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf
-+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS8cE54+X1+NZK3TTN+2/BT+MAi1bi
-kvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2HcqtbepBEX4tdJP7
-wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxSvTOB
-TI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6C
-MUO+1918oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn
-4rnvyOL2NSl6dPrFf4IFYqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+I
-aFvowdlxfv1k7/9nR4hYJS8+hge9+6jlgqispdNpQ80xiEmEU5LAsTkbOYMBMMTy
-qfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
------END CERTIFICATE-----
-
 # Issuer: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
 # Subject: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
 # Label: "ANF Secure Server Root CA"
@@ -4812,3 +4772,27 @@ X273CXE2whJdV/LItM3z7gLfEdxquVeEHVlNjM7IDiPCtyaaEBRx/pOyiriA8A4Q
 ntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0o82bNSQ3+pCTE4FCxpgm
 dTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
 -----END CERTIFICATE-----
+
+# Issuer: CN=FIRMAPROFESIONAL CA ROOT-A WEB O=Firmaprofesional SA
+# Subject: CN=FIRMAPROFESIONAL CA ROOT-A WEB O=Firmaprofesional SA
+# Label: "FIRMAPROFESIONAL CA ROOT-A WEB"
+# Serial: 65916896770016886708751106294915943533
+# MD5 Fingerprint: 82:b2:ad:45:00:82:b0:66:63:f8:5f:c3:67:4e:ce:a3
+# SHA1 Fingerprint: a8:31:11:74:a6:14:15:0d:ca:77:dd:0e:e4:0c:5d:58:fc:a0:72:a5
+# SHA256 Fingerprint: be:f2:56:da:f2:6e:9c:69:bd:ec:16:02:35:97:98:f3:ca:f7:18:21:a0:3e:01:82:57:c5:3c:65:61:7f:3d:4a
+-----BEGIN CERTIFICATE-----
+MIICejCCAgCgAwIBAgIQMZch7a+JQn81QYehZ1ZMbTAKBggqhkjOPQQDAzBuMQsw
+CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE
+YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB
+IFJPT1QtQSBXRUIwHhcNMjIwNDA2MDkwMTM2WhcNNDcwMzMxMDkwMTM2WjBuMQsw
+CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE
+YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB
+IFJPT1QtQSBXRUIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHU+osEaR3xyrq89Zf
+e9MEkVz6iMYiuYMQYneEMy3pA4jU4DP37XcsSmDq5G+tbbT4TIqk5B/K6k84Si6C
+cyvHZpsKjECcfIr28jlgst7L7Ljkb+qbXbdTkBgyVcUgt5SjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAUk+FDY1w8ndYn81LsF7Kpryz3dvgwHQYDVR0O
+BBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO
+PQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgLcFBTApFw
+hVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dG
+XSaQpYXFuXqUPoeovQA=
+-----END CERTIFICATE-----
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 0f8c95c8919..668234fcb8a 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -6,7 +6,7 @@ packaging==24.1
 platformdirs==4.2.2
 pyproject-hooks==1.0.0
 requests==2.32.3
-    certifi==2024.2.2
+    certifi==2024.7.4
     idna==3.7
     urllib3==1.26.18
 rich==13.7.1

From b838d1b52e2d9ef654eac35fa97c517e06a27bda Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 13 Jul 2024 10:45:08 -0400
Subject: [PATCH 493/992] Upgrade pygments to 2.18.0

---
 news/pygments.vendor.rst                      |   1 +
 src/pip/_vendor/pygments/__init__.py          |   4 +-
 src/pip/_vendor/pygments/__main__.py          |   2 +-
 src/pip/_vendor/pygments/cmdline.py           |  24 +-
 src/pip/_vendor/pygments/console.py           |  10 +-
 src/pip/_vendor/pygments/filter.py            |   5 +-
 src/pip/_vendor/pygments/filters/__init__.py  |   8 +-
 src/pip/_vendor/pygments/formatter.py         |   7 +-
 .../_vendor/pygments/formatters/__init__.py   |  13 +-
 src/pip/_vendor/pygments/formatters/bbcode.py |   4 +-
 src/pip/_vendor/pygments/formatters/groff.py  |   6 +-
 src/pip/_vendor/pygments/formatters/html.py   |  75 +++---
 src/pip/_vendor/pygments/formatters/img.py    |  21 +-
 src/pip/_vendor/pygments/formatters/irc.py    |   2 +-
 src/pip/_vendor/pygments/formatters/latex.py  |  51 ++--
 src/pip/_vendor/pygments/formatters/other.py  |   7 +-
 .../pygments/formatters/pangomarkup.py        |   4 +-
 src/pip/_vendor/pygments/formatters/rtf.py    | 253 ++++++++++++++++--
 src/pip/_vendor/pygments/formatters/svg.py    |  37 ++-
 .../_vendor/pygments/formatters/terminal.py   |   2 +-
 .../pygments/formatters/terminal256.py        |   2 +-
 src/pip/_vendor/pygments/lexer.py             |  42 +--
 src/pip/_vendor/pygments/lexers/__init__.py   |  23 +-
 src/pip/_vendor/pygments/lexers/_mapping.py   |  21 +-
 src/pip/_vendor/pygments/lexers/python.py     |  40 +--
 src/pip/_vendor/pygments/modeline.py          |   8 +-
 src/pip/_vendor/pygments/plugin.py            |  22 +-
 src/pip/_vendor/pygments/regexopt.py          |   2 +-
 src/pip/_vendor/pygments/scanner.py           |   2 +-
 src/pip/_vendor/pygments/sphinxext.py         |  24 +-
 src/pip/_vendor/pygments/style.py             |   4 +-
 src/pip/_vendor/pygments/styles/__init__.py   |   6 +-
 src/pip/_vendor/pygments/styles/_mapping.py   |   1 +
 src/pip/_vendor/pygments/token.py             |   2 +-
 src/pip/_vendor/pygments/unistring.py         |  10 +-
 src/pip/_vendor/pygments/util.py              |  32 +--
 src/pip/_vendor/vendor.txt                    |   2 +-
 37 files changed, 487 insertions(+), 292 deletions(-)
 create mode 100644 news/pygments.vendor.rst

diff --git a/news/pygments.vendor.rst b/news/pygments.vendor.rst
new file mode 100644
index 00000000000..5232695fa02
--- /dev/null
+++ b/news/pygments.vendor.rst
@@ -0,0 +1 @@
+Upgrade pygments to 2.18.0
diff --git a/src/pip/_vendor/pygments/__init__.py b/src/pip/_vendor/pygments/__init__.py
index 5b8a3f95483..60ae9bb8508 100644
--- a/src/pip/_vendor/pygments/__init__.py
+++ b/src/pip/_vendor/pygments/__init__.py
@@ -21,12 +21,12 @@
     .. _Pygments master branch:
        https://github.com/pygments/pygments/archive/master.zip#egg=Pygments-dev
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from io import StringIO, BytesIO
 
-__version__ = '2.17.2'
+__version__ = '2.18.0'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff --git a/src/pip/_vendor/pygments/__main__.py b/src/pip/_vendor/pygments/__main__.py
index 2f7f8cbad05..dcc6e5add71 100644
--- a/src/pip/_vendor/pygments/__main__.py
+++ b/src/pip/_vendor/pygments/__main__.py
@@ -4,7 +4,7 @@
 
     Main entry point for ``python -m pygments``.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/cmdline.py b/src/pip/_vendor/pygments/cmdline.py
index 29b5608f331..0a7072eff3e 100644
--- a/src/pip/_vendor/pygments/cmdline.py
+++ b/src/pip/_vendor/pygments/cmdline.py
@@ -4,7 +4,7 @@
 
     Command line interface.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -68,19 +68,19 @@ def _print_help(what, name):
     try:
         if what == 'lexer':
             cls = get_lexer_by_name(name)
-            print("Help on the %s lexer:" % cls.name)
+            print(f"Help on the {cls.name} lexer:")
             print(dedent(cls.__doc__))
         elif what == 'formatter':
             cls = find_formatter_class(name)
-            print("Help on the %s formatter:" % cls.name)
+            print(f"Help on the {cls.name} formatter:")
             print(dedent(cls.__doc__))
         elif what == 'filter':
             cls = find_filter_class(name)
-            print("Help on the %s filter:" % name)
+            print(f"Help on the {name} filter:")
             print(dedent(cls.__doc__))
         return 0
     except (AttributeError, ValueError):
-        print("%s not found!" % what, file=sys.stderr)
+        print(f"{what} not found!", file=sys.stderr)
         return 1
 
 
@@ -97,7 +97,7 @@ def _print_list(what):
             info.append(tup)
         info.sort()
         for i in info:
-            print(('* %s\n    %s %s') % i)
+            print(('* {}\n    {} {}').format(*i))
 
     elif what == 'formatter':
         print()
@@ -112,7 +112,7 @@ def _print_list(what):
             info.append(tup)
         info.sort()
         for i in info:
-            print(('* %s\n    %s %s') % i)
+            print(('* {}\n    {} {}').format(*i))
 
     elif what == 'filter':
         print()
@@ -122,7 +122,7 @@ def _print_list(what):
         for name in get_all_filters():
             cls = find_filter_class(name)
             print("* " + name + ':')
-            print("    %s" % docstring_headline(cls))
+            print(f"    {docstring_headline(cls)}")
 
     elif what == 'style':
         print()
@@ -132,7 +132,7 @@ def _print_list(what):
         for name in get_all_styles():
             cls = get_style_by_name(name)
             print("* " + name + ':')
-            print("    %s" % docstring_headline(cls))
+            print(f"    {docstring_headline(cls)}")
 
 
 def _print_list_as_json(requested_items):
@@ -185,8 +185,8 @@ def main_inner(parser, argns):
         return 0
 
     if argns.V:
-        print('Pygments version %s, (c) 2006-2023 by Georg Brandl, Matthäus '
-              'Chajdas and contributors.' % __version__)
+        print(f'Pygments version {__version__}, (c) 2006-2024 by Georg Brandl, Matthäus '
+              'Chajdas and contributors.')
         return 0
 
     def is_only_option(opt):
@@ -659,7 +659,7 @@ def main(args=sys.argv):
         msg = info[-1].strip()
         if len(info) >= 3:
             # extract relevant file and position info
-            msg += '\n   (f%s)' % info[-2].split('\n')[0].strip()[1:]
+            msg += '\n   (f{})'.format(info[-2].split('\n')[0].strip()[1:])
         print(file=sys.stderr)
         print('*** Error while highlighting:', file=sys.stderr)
         print(msg, file=sys.stderr)
diff --git a/src/pip/_vendor/pygments/console.py b/src/pip/_vendor/pygments/console.py
index deb4937f74f..4c1a06219ca 100644
--- a/src/pip/_vendor/pygments/console.py
+++ b/src/pip/_vendor/pygments/console.py
@@ -4,7 +4,7 @@
 
     Format colored console output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -27,12 +27,12 @@
                 "brightmagenta", "brightcyan", "white"]
 
 x = 30
-for d, l in zip(dark_colors, light_colors):
-    codes[d] = esc + "%im" % x
-    codes[l] = esc + "%im" % (60 + x)
+for dark, light in zip(dark_colors, light_colors):
+    codes[dark] = esc + "%im" % x
+    codes[light] = esc + "%im" % (60 + x)
     x += 1
 
-del d, l, x
+del dark, light, x
 
 codes["white"] = codes["bold"]
 
diff --git a/src/pip/_vendor/pygments/filter.py b/src/pip/_vendor/pygments/filter.py
index dafa08d1569..aa6f76041b6 100644
--- a/src/pip/_vendor/pygments/filter.py
+++ b/src/pip/_vendor/pygments/filter.py
@@ -4,7 +4,7 @@
 
     Module that implements the default filter.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -62,8 +62,7 @@ class FunctionFilter(Filter):
 
     def __init__(self, **options):
         if not hasattr(self, 'function'):
-            raise TypeError('%r used without bound function' %
-                            self.__class__.__name__)
+            raise TypeError(f'{self.__class__.__name__!r} used without bound function')
         Filter.__init__(self, **options)
 
     def filter(self, lexer, stream):
diff --git a/src/pip/_vendor/pygments/filters/__init__.py b/src/pip/_vendor/pygments/filters/__init__.py
index 5aa9ecbb80c..9255ca224db 100644
--- a/src/pip/_vendor/pygments/filters/__init__.py
+++ b/src/pip/_vendor/pygments/filters/__init__.py
@@ -5,7 +5,7 @@
     Module containing filter lookup functions and default
     filters.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -39,7 +39,7 @@ def get_filter_by_name(filtername, **options):
     if cls:
         return cls(**options)
     else:
-        raise ClassNotFound('filter %r not found' % filtername)
+        raise ClassNotFound(f'filter {filtername!r} not found')
 
 
 def get_all_filters():
@@ -79,9 +79,9 @@ def __init__(self, **options):
         Filter.__init__(self, **options)
         tags = get_list_opt(options, 'codetags',
                             ['XXX', 'TODO', 'FIXME', 'BUG', 'NOTE'])
-        self.tag_re = re.compile(r'\b(%s)\b' % '|'.join([
+        self.tag_re = re.compile(r'\b({})\b'.format('|'.join([
             re.escape(tag) for tag in tags if tag
-        ]))
+        ])))
 
     def filter(self, lexer, stream):
         regex = self.tag_re
diff --git a/src/pip/_vendor/pygments/formatter.py b/src/pip/_vendor/pygments/formatter.py
index 3ca4892fa31..d2666037f7a 100644
--- a/src/pip/_vendor/pygments/formatter.py
+++ b/src/pip/_vendor/pygments/formatter.py
@@ -4,7 +4,7 @@
 
     Base formatter class.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -122,3 +122,8 @@ def format(self, tokensource, outfile):
             # wrap the outfile in a StreamWriter
             outfile = codecs.lookup(self.encoding)[3](outfile)
         return self.format_unencoded(tokensource, outfile)
+
+    # Allow writing Formatter[str] or Formatter[bytes]. That's equivalent to
+    # Formatter. This helps when using third-party type stubs from typeshed.
+    def __class_getitem__(cls, name):
+        return cls
diff --git a/src/pip/_vendor/pygments/formatters/__init__.py b/src/pip/_vendor/pygments/formatters/__init__.py
index 6abb45ac71f..f19e9931f07 100644
--- a/src/pip/_vendor/pygments/formatters/__init__.py
+++ b/src/pip/_vendor/pygments/formatters/__init__.py
@@ -4,7 +4,7 @@
 
     Pygments formatters.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -77,7 +77,7 @@ def get_formatter_by_name(_alias, **options):
     """
     cls = find_formatter_class(_alias)
     if cls is None:
-        raise ClassNotFound("no formatter found for name %r" % _alias)
+        raise ClassNotFound(f"no formatter found for name {_alias!r}")
     return cls(**options)
 
 
@@ -103,17 +103,16 @@ def load_formatter_from_file(filename, formattername="CustomFormatter", **option
             exec(f.read(), custom_namespace)
         # Retrieve the class `formattername` from that namespace
         if formattername not in custom_namespace:
-            raise ClassNotFound('no valid %s class found in %s' %
-                                (formattername, filename))
+            raise ClassNotFound(f'no valid {formattername} class found in {filename}')
         formatter_class = custom_namespace[formattername]
         # And finally instantiate it with the options
         return formatter_class(**options)
     except OSError as err:
-        raise ClassNotFound('cannot read %s: %s' % (filename, err))
+        raise ClassNotFound(f'cannot read {filename}: {err}')
     except ClassNotFound:
         raise
     except Exception as err:
-        raise ClassNotFound('error when loading custom formatter: %s' % err)
+        raise ClassNotFound(f'error when loading custom formatter: {err}')
 
 
 def get_formatter_for_filename(fn, **options):
@@ -135,7 +134,7 @@ def get_formatter_for_filename(fn, **options):
         for filename in cls.filenames:
             if _fn_matches(fn, filename):
                 return cls(**options)
-    raise ClassNotFound("no formatter found for file name %r" % fn)
+    raise ClassNotFound(f"no formatter found for file name {fn!r}")
 
 
 class _automodule(types.ModuleType):
diff --git a/src/pip/_vendor/pygments/formatters/bbcode.py b/src/pip/_vendor/pygments/formatters/bbcode.py
index c4db8f4ef21..5a05bd961de 100644
--- a/src/pip/_vendor/pygments/formatters/bbcode.py
+++ b/src/pip/_vendor/pygments/formatters/bbcode.py
@@ -4,7 +4,7 @@
 
     BBcode formatter.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -60,7 +60,7 @@ def _make_styles(self):
         for ttype, ndef in self.style:
             start = end = ''
             if ndef['color']:
-                start += '[color=#%s]' % ndef['color']
+                start += '[color=#{}]'.format(ndef['color'])
                 end = '[/color]' + end
             if ndef['bold']:
                 start += '[b]'
diff --git a/src/pip/_vendor/pygments/formatters/groff.py b/src/pip/_vendor/pygments/formatters/groff.py
index 30a528e668f..5c8a958f8d7 100644
--- a/src/pip/_vendor/pygments/formatters/groff.py
+++ b/src/pip/_vendor/pygments/formatters/groff.py
@@ -4,7 +4,7 @@
 
     Formatter for groff output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -63,7 +63,7 @@ def _make_styles(self):
         for ttype, ndef in self.style:
             start = end = ''
             if ndef['color']:
-                start += '\\m[%s]' % ndef['color']
+                start += '\\m[{}]'.format(ndef['color'])
                 end = '\\m[]' + end
             if ndef['bold']:
                 start += bold
@@ -72,7 +72,7 @@ def _make_styles(self):
                 start += italic
                 end = regular + end
             if ndef['bgcolor']:
-                start += '\\M[%s]' % ndef['bgcolor']
+                start += '\\M[{}]'.format(ndef['bgcolor'])
                 end = '\\M[]' + end
 
             self.styles[ttype] = start, end
diff --git a/src/pip/_vendor/pygments/formatters/html.py b/src/pip/_vendor/pygments/formatters/html.py
index 0cadcb228e7..7aa938f5119 100644
--- a/src/pip/_vendor/pygments/formatters/html.py
+++ b/src/pip/_vendor/pygments/formatters/html.py
@@ -4,7 +4,7 @@
 
     Formatter for HTML output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -62,7 +62,7 @@ def _get_ttype_class(ttype):
 CSSFILE_TEMPLATE = '''\
 /*
 generated by Pygments 
-Copyright 2006-2023 by the Pygments team.
+Copyright 2006-2024 by the Pygments team.
 Licensed under the BSD license, see LICENSE for details.
 */
 %(styledefs)s
@@ -73,7 +73,7 @@ def _get_ttype_class(ttype):
    "http://www.w3.org/TR/html4/strict.dtd">
 
 
@@ -488,7 +488,7 @@ def _create_stylesheet(self):
             name = self._get_css_class(ttype)
             style = ''
             if ndef['color']:
-                style += 'color: %s; ' % webify(ndef['color'])
+                style += 'color: {}; '.format(webify(ndef['color']))
             if ndef['bold']:
                 style += 'font-weight: bold; '
             if ndef['italic']:
@@ -496,9 +496,9 @@ def _create_stylesheet(self):
             if ndef['underline']:
                 style += 'text-decoration: underline; '
             if ndef['bgcolor']:
-                style += 'background-color: %s; ' % webify(ndef['bgcolor'])
+                style += 'background-color: {}; '.format(webify(ndef['bgcolor']))
             if ndef['border']:
-                style += 'border: 1px solid %s; ' % webify(ndef['border'])
+                style += 'border: 1px solid {}; '.format(webify(ndef['border']))
             if style:
                 t2c[ttype] = name
                 # save len(ttype) to enable ordering the styles by
@@ -530,7 +530,7 @@ def get_token_style_defs(self, arg=None):
         styles.sort()
 
         lines = [
-            '%s { %s } /* %s */' % (prefix(cls), style, repr(ttype)[6:])
+            f'{prefix(cls)} {{ {style} }} /* {repr(ttype)[6:]} */'
             for (level, ttype, cls, style) in styles
         ]
 
@@ -548,24 +548,24 @@ def get_background_style_defs(self, arg=None):
             if Text in self.ttype2class:
                 text_style = ' ' + self.class2style[self.ttype2class[Text]][0]
             lines.insert(
-                0, '%s{ background: %s;%s }' % (
+                0, '{}{{ background: {};{} }}'.format(
                     prefix(''), bg_color, text_style
                 )
             )
         if hl_color is not None:
             lines.insert(
-                0, '%s { background-color: %s }' % (prefix('hll'), hl_color)
+                0, '{} {{ background-color: {} }}'.format(prefix('hll'), hl_color)
             )
 
         return lines
 
     def get_linenos_style_defs(self):
         lines = [
-            'pre { %s }' % self._pre_style,
-            'td.linenos .normal { %s }' % self._linenos_style,
-            'span.linenos { %s }' % self._linenos_style,
-            'td.linenos .special { %s }' % self._linenos_special_style,
-            'span.linenos.special { %s }' % self._linenos_special_style,
+            f'pre {{ {self._pre_style} }}',
+            f'td.linenos .normal {{ {self._linenos_style} }}',
+            f'span.linenos {{ {self._linenos_style} }}',
+            f'td.linenos .special {{ {self._linenos_special_style} }}',
+            f'span.linenos.special {{ {self._linenos_special_style} }}',
         ]
 
         return lines
@@ -594,17 +594,15 @@ def _pre_style(self):
 
     @property
     def _linenos_style(self):
-        return 'color: %s; background-color: %s; padding-left: 5px; padding-right: 5px;' % (
-            self.style.line_number_color,
-            self.style.line_number_background_color
-        )
+        color = self.style.line_number_color
+        background_color = self.style.line_number_background_color
+        return f'color: {color}; background-color: {background_color}; padding-left: 5px; padding-right: 5px;'
 
     @property
     def _linenos_special_style(self):
-        return 'color: %s; background-color: %s; padding-left: 5px; padding-right: 5px;' % (
-            self.style.line_number_special_color,
-            self.style.line_number_special_background_color
-        )
+        color = self.style.line_number_special_color
+        background_color = self.style.line_number_special_background_color
+        return f'color: {color}; background-color: {background_color}; padding-left: 5px; padding-right: 5px;'
 
     def _decodeifneeded(self, value):
         if isinstance(value, bytes):
@@ -685,9 +683,9 @@ def _wrap_tablelinenos(self, inner):
 
             if nocls:
                 if special_line:
-                    style = ' style="%s"' % self._linenos_special_style
+                    style = f' style="{self._linenos_special_style}"'
                 else:
-                    style = ' style="%s"' % self._linenos_style
+                    style = f' style="{self._linenos_style}"'
             else:
                 if special_line:
                     style = ' class="special"'
@@ -695,7 +693,7 @@ def _wrap_tablelinenos(self, inner):
                     style = ' class="normal"'
 
             if style:
-                line = '%s' % (style, line)
+                line = f'{line}'
 
             lines.append(line)
 
@@ -744,9 +742,9 @@ def _wrap_inlinelinenos(self, inner):
 
             if nocls:
                 if special_line:
-                    style = ' style="%s"' % self._linenos_special_style
+                    style = f' style="{self._linenos_special_style}"'
                 else:
-                    style = ' style="%s"' % self._linenos_style
+                    style = f' style="{self._linenos_style}"'
             else:
                 if special_line:
                     style = ' class="linenos special"'
@@ -754,7 +752,7 @@ def _wrap_inlinelinenos(self, inner):
                     style = ' class="linenos"'
 
             if style:
-                linenos = '%s' % (style, line)
+                linenos = f'{line}'
             else:
                 linenos = line
 
@@ -791,13 +789,13 @@ def _wrap_div(self, inner):
         style = []
         if (self.noclasses and not self.nobackground and
                 self.style.background_color is not None):
-            style.append('background: %s' % (self.style.background_color,))
+            style.append(f'background: {self.style.background_color}')
         if self.cssstyles:
             style.append(self.cssstyles)
         style = '; '.join(style)
 
-        yield 0, ('')
+        yield 0, ('')
         yield from inner
         yield 0, '
\n'
 
@@ -814,7 +812,7 @@ def _wrap_pre(self, inner):
 
         # the empty span here is to keep leading empty lines from being
         # ignored by HTML parsers
-        yield 0, ('')
+        yield 0, ('')
         yield from inner
         yield 0, '
'
 
@@ -843,18 +841,18 @@ def _format_lines(self, tokensource):
             try:
                 cspan = self.span_element_openers[ttype]
             except KeyError:
-                title = ' title="%s"' % '.'.join(ttype) if self.debug_token_types else ''
+                title = ' title="{}"'.format('.'.join(ttype)) if self.debug_token_types else ''
                 if nocls:
                     css_style = self._get_css_inline_styles(ttype)
                     if css_style:
                         css_style = self.class2style[css_style][0]
-                        cspan = '' % (css_style, title)
+                        cspan = f''
                     else:
                         cspan = ''
                 else:
                     css_class = self._get_css_classes(ttype)
                     if css_class:
-                        cspan = '' % (css_class, title)
+                        cspan = f''
                     else:
                         cspan = ''
                 self.span_element_openers[ttype] = cspan
@@ -927,11 +925,10 @@ def _highlight_lines(self, tokensource):
                 if self.noclasses:
                     style = ''
                     if self.style.highlight_color is not None:
-                        style = (' style="background-color: %s"' %
-                                 (self.style.highlight_color,))
-                    yield 1, '%s' % (style, value)
+                        style = (f' style="background-color: {self.style.highlight_color}"')
+                    yield 1, f'{value}'
                 else:
-                    yield 1, '%s' % value
+                    yield 1, f'{value}'
             else:
                 yield 1, value
 
diff --git a/src/pip/_vendor/pygments/formatters/img.py b/src/pip/_vendor/pygments/formatters/img.py
index 9e66b669162..7542cfad9da 100644
--- a/src/pip/_vendor/pygments/formatters/img.py
+++ b/src/pip/_vendor/pygments/formatters/img.py
@@ -4,7 +4,7 @@
 
     Formatter for Pixmap output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import os
@@ -90,7 +90,7 @@ def __init__(self, font_name, font_size=14):
             self._create_nix()
 
     def _get_nix_font_path(self, name, style):
-        proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'],
+        proc = subprocess.Popen(['fc-list', f"{name}:style={style}", 'file'],
                                 stdout=subprocess.PIPE, stderr=None)
         stdout, _ = proc.communicate()
         if proc.returncode == 0:
@@ -110,8 +110,7 @@ def _create_nix(self):
                 self.fonts['NORMAL'] = ImageFont.truetype(path, self.font_size)
                 break
         else:
-            raise FontNotFound('No usable fonts named: "%s"' %
-                               self.font_name)
+            raise FontNotFound(f'No usable fonts named: "{self.font_name}"')
         for style in ('ITALIC', 'BOLD', 'BOLDITALIC'):
             for stylename in STYLES[style]:
                 path = self._get_nix_font_path(self.font_name, stylename)
@@ -142,8 +141,7 @@ def _create_mac(self):
                 self.fonts['NORMAL'] = ImageFont.truetype(path, self.font_size)
                 break
         else:
-            raise FontNotFound('No usable fonts named: "%s"' %
-                               self.font_name)
+            raise FontNotFound(f'No usable fonts named: "{self.font_name}"')
         for style in ('ITALIC', 'BOLD', 'BOLDITALIC'):
             for stylename in STYLES[style]:
                 path = self._get_mac_font_path(font_map, self.font_name, stylename)
@@ -160,15 +158,14 @@ def _lookup_win(self, key, basename, styles, fail=False):
         for suffix in ('', ' (TrueType)'):
             for style in styles:
                 try:
-                    valname = '%s%s%s' % (basename, style and ' '+style, suffix)
+                    valname = '{}{}{}'.format(basename, style and ' '+style, suffix)
                     val, _ = _winreg.QueryValueEx(key, valname)
                     return val
                 except OSError:
                     continue
         else:
             if fail:
-                raise FontNotFound('Font %s (%s) not found in registry' %
-                                   (basename, styles[0]))
+                raise FontNotFound(f'Font {basename} ({styles[0]}) not found in registry')
             return None
 
     def _create_win(self):
@@ -633,7 +630,11 @@ def format(self, tokensource, outfile):
                                fill=self.hl_color)
         for pos, value, font, text_fg, text_bg in self.drawables:
             if text_bg:
-                text_size = draw.textsize(text=value, font=font)
+                # see deprecations https://pillow.readthedocs.io/en/stable/releasenotes/9.2.0.html#font-size-and-offset-methods
+                if hasattr(draw, 'textsize'):
+                    text_size = draw.textsize(text=value, font=font)
+                else:
+                    text_size = font.getbbox(value)[2:]
                 draw.rectangle([pos[0], pos[1], pos[0] + text_size[0], pos[1] + text_size[1]], fill=text_bg)
             draw.text(pos, value, font=font, fill=text_fg)
         im.save(outfile, self.image_format.upper())
diff --git a/src/pip/_vendor/pygments/formatters/irc.py b/src/pip/_vendor/pygments/formatters/irc.py
index 2144d439e0f..468c2876053 100644
--- a/src/pip/_vendor/pygments/formatters/irc.py
+++ b/src/pip/_vendor/pygments/formatters/irc.py
@@ -4,7 +4,7 @@
 
     Formatter for IRC output
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/latex.py b/src/pip/_vendor/pygments/formatters/latex.py
index ca539b40f6a..0ec9089b937 100644
--- a/src/pip/_vendor/pygments/formatters/latex.py
+++ b/src/pip/_vendor/pygments/formatters/latex.py
@@ -4,7 +4,7 @@
 
     Formatter for LaTeX fancyvrb output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -23,21 +23,21 @@ def escape_tex(text, commandprefix):
     return text.replace('\\', '\x00'). \
                 replace('{', '\x01'). \
                 replace('}', '\x02'). \
-                replace('\x00', r'\%sZbs{}' % commandprefix). \
-                replace('\x01', r'\%sZob{}' % commandprefix). \
-                replace('\x02', r'\%sZcb{}' % commandprefix). \
-                replace('^', r'\%sZca{}' % commandprefix). \
-                replace('_', r'\%sZus{}' % commandprefix). \
-                replace('&', r'\%sZam{}' % commandprefix). \
-                replace('<', r'\%sZlt{}' % commandprefix). \
-                replace('>', r'\%sZgt{}' % commandprefix). \
-                replace('#', r'\%sZsh{}' % commandprefix). \
-                replace('%', r'\%sZpc{}' % commandprefix). \
-                replace('$', r'\%sZdl{}' % commandprefix). \
-                replace('-', r'\%sZhy{}' % commandprefix). \
-                replace("'", r'\%sZsq{}' % commandprefix). \
-                replace('"', r'\%sZdq{}' % commandprefix). \
-                replace('~', r'\%sZti{}' % commandprefix)
+                replace('\x00', rf'\{commandprefix}Zbs{{}}'). \
+                replace('\x01', rf'\{commandprefix}Zob{{}}'). \
+                replace('\x02', rf'\{commandprefix}Zcb{{}}'). \
+                replace('^', rf'\{commandprefix}Zca{{}}'). \
+                replace('_', rf'\{commandprefix}Zus{{}}'). \
+                replace('&', rf'\{commandprefix}Zam{{}}'). \
+                replace('<', rf'\{commandprefix}Zlt{{}}'). \
+                replace('>', rf'\{commandprefix}Zgt{{}}'). \
+                replace('#', rf'\{commandprefix}Zsh{{}}'). \
+                replace('%', rf'\{commandprefix}Zpc{{}}'). \
+                replace('$', rf'\{commandprefix}Zdl{{}}'). \
+                replace('-', rf'\{commandprefix}Zhy{{}}'). \
+                replace("'", rf'\{commandprefix}Zsq{{}}'). \
+                replace('"', rf'\{commandprefix}Zdq{{}}'). \
+                replace('~', rf'\{commandprefix}Zti{{}}')
 
 
 DOC_TEMPLATE = r'''
@@ -304,17 +304,14 @@ def rgbcolor(col):
             if ndef['mono']:
                 cmndef += r'\let\$$@ff=\textsf'
             if ndef['color']:
-                cmndef += (r'\def\$$@tc##1{\textcolor[rgb]{%s}{##1}}' %
-                           rgbcolor(ndef['color']))
+                cmndef += (r'\def\$$@tc##1{{\textcolor[rgb]{{{}}}{{##1}}}}'.format(rgbcolor(ndef['color'])))
             if ndef['border']:
-                cmndef += (r'\def\$$@bc##1{{\setlength{\fboxsep}{\string -\fboxrule}'
-                           r'\fcolorbox[rgb]{%s}{%s}{\strut ##1}}}' %
-                           (rgbcolor(ndef['border']),
+                cmndef += (r'\def\$$@bc##1{{{{\setlength{{\fboxsep}}{{\string -\fboxrule}}'
+                           r'\fcolorbox[rgb]{{{}}}{{{}}}{{\strut ##1}}}}}}'.format(rgbcolor(ndef['border']),
                             rgbcolor(ndef['bgcolor'])))
             elif ndef['bgcolor']:
-                cmndef += (r'\def\$$@bc##1{{\setlength{\fboxsep}{0pt}'
-                           r'\colorbox[rgb]{%s}{\strut ##1}}}' %
-                           rgbcolor(ndef['bgcolor']))
+                cmndef += (r'\def\$$@bc##1{{{{\setlength{{\fboxsep}}{{0pt}}'
+                           r'\colorbox[rgb]{{{}}}{{\strut ##1}}}}}}'.format(rgbcolor(ndef['bgcolor'])))
             if cmndef == '':
                 continue
             cmndef = cmndef.replace('$$', cp)
@@ -329,7 +326,7 @@ def get_style_defs(self, arg=''):
         cp = self.commandprefix
         styles = []
         for name, definition in self.cmd2def.items():
-            styles.append(r'\@namedef{%s@tok@%s}{%s}' % (cp, name, definition))
+            styles.append(rf'\@namedef{{{cp}@tok@{name}}}{{{definition}}}')
         return STYLE_TEMPLATE % {'cp': self.commandprefix,
                                  'styles': '\n'.join(styles)}
 
@@ -410,10 +407,10 @@ def format_unencoded(self, tokensource, outfile):
                 spl = value.split('\n')
                 for line in spl[:-1]:
                     if line:
-                        outfile.write("\\%s{%s}{%s}" % (cp, styleval, line))
+                        outfile.write(f"\\{cp}{{{styleval}}}{{{line}}}")
                     outfile.write('\n')
                 if spl[-1]:
-                    outfile.write("\\%s{%s}{%s}" % (cp, styleval, spl[-1]))
+                    outfile.write(f"\\{cp}{{{styleval}}}{{{spl[-1]}}}")
             else:
                 outfile.write(value)
 
diff --git a/src/pip/_vendor/pygments/formatters/other.py b/src/pip/_vendor/pygments/formatters/other.py
index 990ead48021..de8d9dcf896 100644
--- a/src/pip/_vendor/pygments/formatters/other.py
+++ b/src/pip/_vendor/pygments/formatters/other.py
@@ -4,7 +4,7 @@
 
     Other formatters: NullFormatter, RawTokenFormatter.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -74,8 +74,7 @@ def __init__(self, **options):
             try:
                 colorize(self.error_color, '')
             except KeyError:
-                raise ValueError("Invalid color %r specified" %
-                                 self.error_color)
+                raise ValueError(f"Invalid color {self.error_color!r} specified")
 
     def format(self, tokensource, outfile):
         try:
@@ -147,7 +146,7 @@ def format(self, tokensource, outfile):
         outbuf = []
         for ttype, value in tokensource:
             rawbuf.append(value)
-            outbuf.append('%s(%s, %r),\n' % (indentation, ttype, value))
+            outbuf.append(f'{indentation}({ttype}, {value!r}),\n')
 
         before = TESTCASE_BEFORE % (''.join(rawbuf),)
         during = ''.join(outbuf)
diff --git a/src/pip/_vendor/pygments/formatters/pangomarkup.py b/src/pip/_vendor/pygments/formatters/pangomarkup.py
index 6bb325d0788..dfed53ab768 100644
--- a/src/pip/_vendor/pygments/formatters/pangomarkup.py
+++ b/src/pip/_vendor/pygments/formatters/pangomarkup.py
@@ -4,7 +4,7 @@
 
     Formatter for Pango markup output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -45,7 +45,7 @@ def __init__(self, **options):
             start = ''
             end = ''
             if style['color']:
-                start += '' % style['color']
+                start += ''.format(style['color'])
                 end = '' + end
             if style['bold']:
                 start += ''
diff --git a/src/pip/_vendor/pygments/formatters/rtf.py b/src/pip/_vendor/pygments/formatters/rtf.py
index 125189c6fa5..eca2a41a1cd 100644
--- a/src/pip/_vendor/pygments/formatters/rtf.py
+++ b/src/pip/_vendor/pygments/formatters/rtf.py
@@ -4,12 +4,14 @@
 
     A formatter that generates RTF files.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
+from collections import OrderedDict
 from pip._vendor.pygments.formatter import Formatter
-from pip._vendor.pygments.util import get_int_opt, surrogatepair
+from pip._vendor.pygments.style import _ansimap
+from pip._vendor.pygments.util import get_bool_opt, get_int_opt, get_list_opt, surrogatepair
 
 
 __all__ = ['RtfFormatter']
@@ -42,6 +44,59 @@ class RtfFormatter(Formatter):
         default is 24 half-points, giving a size 12 font.
 
         .. versionadded:: 2.0
+
+    `linenos`
+        Turn on line numbering (default: ``False``).
+
+        .. versionadded:: 2.18
+
+    `lineno_fontsize`
+        Font size for line numbers. Size is specified in half points
+        (default: `fontsize`). 
+
+        .. versionadded:: 2.18
+
+    `lineno_padding`
+        Number of spaces between the (inline) line numbers and the
+        source code (default: ``2``).
+
+        .. versionadded:: 2.18
+
+    `linenostart`
+        The line number for the first line (default: ``1``).
+
+        .. versionadded:: 2.18
+
+    `linenostep`
+        If set to a number n > 1, only every nth line number is printed.
+
+        .. versionadded:: 2.18
+
+    `lineno_color`
+        Color for line numbers specified as a hex triplet, e.g. ``'5e5e5e'``. 
+        Defaults to the style's line number color if it is a hex triplet, 
+        otherwise ansi bright black.
+
+        .. versionadded:: 2.18
+
+    `hl_lines`
+        Specify a list of lines to be highlighted, as line numbers separated by
+        spaces, e.g. ``'3 7 8'``. The line numbers are relative to the input 
+        (i.e. the first line is line 1) unless `hl_linenostart` is set.
+
+        .. versionadded:: 2.18
+
+    `hl_color`
+        Color for highlighting the lines specified in `hl_lines`, specified as 
+        a hex triplet (default: style's `highlight_color`).
+
+        .. versionadded:: 2.18
+
+    `hl_linenostart`
+        If set to ``True`` line numbers in `hl_lines` are specified
+        relative to `linenostart` (default ``False``).
+
+        .. versionadded:: 2.18
     """
     name = 'RTF'
     aliases = ['rtf']
@@ -62,6 +117,40 @@ def __init__(self, **options):
         Formatter.__init__(self, **options)
         self.fontface = options.get('fontface') or ''
         self.fontsize = get_int_opt(options, 'fontsize', 0)
+        self.linenos = get_bool_opt(options, 'linenos', False)
+        self.lineno_fontsize = get_int_opt(options, 'lineno_fontsize',
+                                           self.fontsize)
+        self.lineno_padding = get_int_opt(options, 'lineno_padding', 2)
+        self.linenostart = abs(get_int_opt(options, 'linenostart', 1))
+        self.linenostep = abs(get_int_opt(options, 'linenostep', 1))
+        self.hl_linenostart = get_bool_opt(options, 'hl_linenostart', False)
+
+        self.hl_color = options.get('hl_color', '')
+        if not self.hl_color:
+            self.hl_color = self.style.highlight_color
+
+        self.hl_lines = []
+        for lineno in get_list_opt(options, 'hl_lines', []):
+            try:
+                lineno = int(lineno)
+                if self.hl_linenostart:
+                    lineno = lineno - self.linenostart + 1
+                self.hl_lines.append(lineno)
+            except ValueError:
+                pass
+
+        self.lineno_color = options.get('lineno_color', '')
+        if not self.lineno_color:
+            if  self.style.line_number_color == 'inherit':
+                # style color is the css value 'inherit'
+                # default to ansi bright-black
+                self.lineno_color = _ansimap['ansibrightblack']
+            else:
+                # style color is assumed to be a hex triplet as other
+                # colors in pygments/style.py
+                self.lineno_color = self.style.line_number_color
+
+        self.color_mapping = self._create_color_mapping()
 
     def _escape(self, text):
         return text.replace('\\', '\\\\') \
@@ -90,43 +179,145 @@ def _escape_text(self, text):
                 # Force surrogate pairs
                 buf.append('{\\u%d}{\\u%d}' % surrogatepair(cn))
 
-        return ''.join(buf).replace('\n', '\\par\n')
+        return ''.join(buf).replace('\n', '\\par')
 
-    def format_unencoded(self, tokensource, outfile):
-        # rtf 1.8 header
-        outfile.write('{\\rtf1\\ansi\\uc0\\deff0'
-                      '{\\fonttbl{\\f0\\fmodern\\fprq1\\fcharset0%s;}}'
-                      '{\\colortbl;' % (self.fontface and
-                                        ' ' + self._escape(self.fontface) or
-                                        ''))
-
-        # convert colors and save them in a mapping to access them later.
-        color_mapping = {}
+    @staticmethod
+    def hex_to_rtf_color(hex_color):
+        if hex_color[0] == "#":
+            hex_color = hex_color[1:]
+
+        return '\\red%d\\green%d\\blue%d;' % (
+                        int(hex_color[0:2], 16),
+                        int(hex_color[2:4], 16),
+                        int(hex_color[4:6], 16)
+                    )
+
+    def _split_tokens_on_newlines(self, tokensource):
+        """
+        Split tokens containing newline characters into multiple token
+        each representing a line of the input file. Needed for numbering
+        lines of e.g. multiline comments.
+        """
+        for ttype, value in tokensource:
+            if value == '\n':
+                yield (ttype, value)
+            elif "\n" in value:
+                lines = value.split("\n")
+                for line in lines[:-1]:
+                    yield (ttype, line+"\n")
+                if lines[-1]:
+                    yield (ttype, lines[-1])
+            else:
+                yield (ttype, value)
+
+    def _create_color_mapping(self):
+        """
+        Create a mapping of style hex colors to index/offset in
+        the RTF color table.
+        """
+        color_mapping = OrderedDict()
         offset = 1
+
+        if self.linenos:
+            color_mapping[self.lineno_color] = offset
+            offset += 1
+
+        if self.hl_lines:
+            color_mapping[self.hl_color] = offset
+            offset += 1
+
         for _, style in self.style:
             for color in style['color'], style['bgcolor'], style['border']:
                 if color and color not in color_mapping:
                     color_mapping[color] = offset
-                    outfile.write('\\red%d\\green%d\\blue%d;' % (
-                        int(color[0:2], 16),
-                        int(color[2:4], 16),
-                        int(color[4:6], 16)
-                    ))
                     offset += 1
-        outfile.write('}\\f0 ')
+
+        return color_mapping
+
+    @property
+    def _lineno_template(self):
+        if self.lineno_fontsize != self.fontsize:
+            return '{{\\fs{} \\cf{} %s{}}}'.format(self.lineno_fontsize,
+                          self.color_mapping[self.lineno_color],
+                          " " * self.lineno_padding)
+
+        return '{{\\cf{} %s{}}}'.format(self.color_mapping[self.lineno_color],
+                      " " * self.lineno_padding)
+
+    @property
+    def _hl_open_str(self):
+        return rf'{{\highlight{self.color_mapping[self.hl_color]} '
+
+    @property
+    def _rtf_header(self):
+        lines = []
+        # rtf 1.8 header
+        lines.append('{\\rtf1\\ansi\\uc0\\deff0'
+                     '{\\fonttbl{\\f0\\fmodern\\fprq1\\fcharset0%s;}}'
+                     % (self.fontface and ' '
+                        + self._escape(self.fontface) or ''))
+
+        # color table
+        lines.append('{\\colortbl;')
+        for color, _ in self.color_mapping.items():
+            lines.append(self.hex_to_rtf_color(color))
+        lines.append('}')
+
+        # font and fontsize
+        lines.append('\\f0\\sa0')
         if self.fontsize:
-            outfile.write('\\fs%d' % self.fontsize)
+            lines.append('\\fs%d' % self.fontsize)
+
+        # ensure Libre Office Writer imports and renders consecutive
+        # space characters the same width, needed for line numbering.
+        # https://bugs.documentfoundation.org/show_bug.cgi?id=144050
+        lines.append('\\dntblnsbdb')
+
+        return lines
+
+    def format_unencoded(self, tokensource, outfile):
+        for line in self._rtf_header:
+            outfile.write(line + "\n")
+
+        tokensource = self._split_tokens_on_newlines(tokensource)
+
+        # first pass of tokens to count lines, needed for line numbering
+        if self.linenos:
+            line_count = 0
+            tokens = [] # for copying the token source generator
+            for ttype, value in tokensource:
+                tokens.append((ttype, value))
+                if value.endswith("\n"):
+                    line_count += 1
+
+            # width of line number strings (for padding with spaces)
+            linenos_width = len(str(line_count+self.linenostart-1))
+
+            tokensource = tokens
 
         # highlight stream
+        lineno = 1
+        start_new_line = True
         for ttype, value in tokensource:
+            if start_new_line and lineno in self.hl_lines:
+                outfile.write(self._hl_open_str)
+
+            if start_new_line and self.linenos:
+                if (lineno-self.linenostart+1)%self.linenostep == 0:
+                    current_lineno = lineno + self.linenostart - 1
+                    lineno_str = str(current_lineno).rjust(linenos_width)
+                else:
+                    lineno_str = "".rjust(linenos_width)
+                outfile.write(self._lineno_template % lineno_str)
+
             while not self.style.styles_token(ttype) and ttype.parent:
                 ttype = ttype.parent
             style = self.style.style_for_token(ttype)
             buf = []
             if style['bgcolor']:
-                buf.append('\\cb%d' % color_mapping[style['bgcolor']])
+                buf.append('\\cb%d' % self.color_mapping[style['bgcolor']])
             if style['color']:
-                buf.append('\\cf%d' % color_mapping[style['color']])
+                buf.append('\\cf%d' % self.color_mapping[style['color']])
             if style['bold']:
                 buf.append('\\b')
             if style['italic']:
@@ -135,12 +326,24 @@ def format_unencoded(self, tokensource, outfile):
                 buf.append('\\ul')
             if style['border']:
                 buf.append('\\chbrdr\\chcfpat%d' %
-                           color_mapping[style['border']])
+                           self.color_mapping[style['border']])
             start = ''.join(buf)
             if start:
-                outfile.write('{%s ' % start)
+                outfile.write(f'{{{start} ')
             outfile.write(self._escape_text(value))
             if start:
                 outfile.write('}')
+            start_new_line = False
+
+            # complete line of input
+            if value.endswith("\n"):
+                # close line highlighting
+                if lineno in self.hl_lines:
+                    outfile.write('}')
+                # newline in RTF file after closing }
+                outfile.write("\n")
+
+                start_new_line = True
+                lineno += 1
 
-        outfile.write('}')
+        outfile.write('}\n')
diff --git a/src/pip/_vendor/pygments/formatters/svg.py b/src/pip/_vendor/pygments/formatters/svg.py
index a8727ed8592..d3e018ffd80 100644
--- a/src/pip/_vendor/pygments/formatters/svg.py
+++ b/src/pip/_vendor/pygments/formatters/svg.py
@@ -4,7 +4,7 @@
 
     Formatter for SVG output.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -60,11 +60,11 @@ class SvgFormatter(Formatter):
 
     `linenostep`
         If set to a number n > 1, only every nth line number is printed.
-        
+
     `linenowidth`
         Maximum width devoted to line numbers (default: ``3*ystep``, sufficient
-        for up to 4-digit line numbers. Increase width for longer code blocks).  
-        
+        for up to 4-digit line numbers. Increase width for longer code blocks).
+
     `xoffset`
         Starting offset in X direction, defaults to ``0``.
 
@@ -97,10 +97,11 @@ def __init__(self, **options):
         self.fontsize = options.get('fontsize', '14px')
         self.xoffset = get_int_opt(options, 'xoffset', 0)
         fs = self.fontsize.strip()
-        if fs.endswith('px'): fs = fs[:-2].strip()
+        if fs.endswith('px'):
+            fs = fs[:-2].strip()
         try:
             int_fs = int(fs)
-        except:
+        except ValueError:
             int_fs = 20
         self.yoffset = get_int_opt(options, 'yoffset', int_fs)
         self.ystep = get_int_opt(options, 'ystep', int_fs + 5)
@@ -122,30 +123,27 @@ def format_unencoded(self, tokensource, outfile):
         y = self.yoffset
         if not self.nowrap:
             if self.encoding:
-                outfile.write('\n' %
-                              self.encoding)
+                outfile.write(f'\n')
             else:
                 outfile.write('\n')
             outfile.write('\n')
             outfile.write('\n')
-            outfile.write('\n' %
-                          (self.fontfamily, self.fontsize))
-        
-        counter = self.linenostart 
+            outfile.write(f'\n')
+
+        counter = self.linenostart
         counter_step = self.linenostep
         counter_style = self._get_style(Comment)
         line_x = x
-        
+
         if self.linenos:
             if counter % counter_step == 0:
-                outfile.write('%s' %
-                    (x+self.linenowidth,y,counter_style,counter))
+                outfile.write(f'{counter}')
             line_x += self.linenowidth + self.ystep
             counter += 1
 
-        outfile.write('' % (line_x, y))
+        outfile.write(f'')
         for ttype, value in tokensource:
             style = self._get_style(ttype)
             tspan = style and '' or ''
@@ -159,11 +157,10 @@ def format_unencoded(self, tokensource, outfile):
                 y += self.ystep
                 outfile.write('\n')
                 if self.linenos and counter % counter_step == 0:
-                    outfile.write('%s' %
-                        (x+self.linenowidth,y,counter_style,counter))
-                
+                    outfile.write(f'{counter}')
+
                 counter += 1
-                outfile.write('' % (line_x,y))
+                outfile.write(f'')
             outfile.write(tspan + parts[-1] + tspanend)
         outfile.write('')
 
diff --git a/src/pip/_vendor/pygments/formatters/terminal.py b/src/pip/_vendor/pygments/formatters/terminal.py
index abb8770811f..51b902d3e24 100644
--- a/src/pip/_vendor/pygments/formatters/terminal.py
+++ b/src/pip/_vendor/pygments/formatters/terminal.py
@@ -4,7 +4,7 @@
 
     Formatter for terminal output with ANSI sequences.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/terminal256.py b/src/pip/_vendor/pygments/formatters/terminal256.py
index 0cfe5d1612e..5f254051a80 100644
--- a/src/pip/_vendor/pygments/formatters/terminal256.py
+++ b/src/pip/_vendor/pygments/formatters/terminal256.py
@@ -10,7 +10,7 @@
 
     Formatter version 1.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/lexer.py b/src/pip/_vendor/pygments/lexer.py
index 26c5fb31ffa..1348be58782 100644
--- a/src/pip/_vendor/pygments/lexer.py
+++ b/src/pip/_vendor/pygments/lexer.py
@@ -4,7 +4,7 @@
 
     Base lexer classes.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -67,10 +67,12 @@ class Lexer(metaclass=LexerMeta):
        :no-value:
     .. autoattribute:: priority
 
-    Lexers included in Pygments should have an additional attribute:
+    Lexers included in Pygments should have two additional attributes:
 
     .. autoattribute:: url
        :no-value:
+    .. autoattribute:: version_added
+       :no-value:
 
     Lexers included in Pygments may have additional attributes:
 
@@ -130,9 +132,12 @@ class Lexer(metaclass=LexerMeta):
     priority = 0
 
     #: URL of the language specification/definition. Used in the Pygments
-    #: documentation.
+    #: documentation. Set to an empty string to disable.
     url = None
 
+    #: Version of Pygments in which the lexer was added.
+    version_added = None
+
     #: Example file name. Relative to the ``tests/examplefiles`` directory.
     #: This is used by the documentation generator to show an example.
     _example = None
@@ -169,10 +174,9 @@ def __init__(self, **options):
 
     def __repr__(self):
         if self.options:
-            return '' % (self.__class__.__name__,
-                                                     self.options)
+            return f''
         else:
-            return '' % self.__class__.__name__
+            return f''
 
     def add_filter(self, filter_, **options):
         """
@@ -508,7 +512,7 @@ def _process_regex(cls, regex, rflags, state):
     def _process_token(cls, token):
         """Preprocess the token component of a token definition."""
         assert type(token) is _TokenType or callable(token), \
-            'token type must be simple type or callable, not %r' % (token,)
+            f'token type must be simple type or callable, not {token!r}'
         return token
 
     def _process_new_state(cls, new_state, unprocessed, processed):
@@ -524,14 +528,14 @@ def _process_new_state(cls, new_state, unprocessed, processed):
             elif new_state[:5] == '#pop:':
                 return -int(new_state[5:])
             else:
-                assert False, 'unknown new state %r' % new_state
+                assert False, f'unknown new state {new_state!r}'
         elif isinstance(new_state, combined):
             # combine a new state from existing ones
             tmp_state = '_tmp_%d' % cls._tmpname
             cls._tmpname += 1
             itokens = []
             for istate in new_state:
-                assert istate != new_state, 'circular state ref %r' % istate
+                assert istate != new_state, f'circular state ref {istate!r}'
                 itokens.extend(cls._process_state(unprocessed,
                                                   processed, istate))
             processed[tmp_state] = itokens
@@ -544,12 +548,12 @@ def _process_new_state(cls, new_state, unprocessed, processed):
                     'unknown new state ' + istate
             return new_state
         else:
-            assert False, 'unknown new state def %r' % new_state
+            assert False, f'unknown new state def {new_state!r}'
 
     def _process_state(cls, unprocessed, processed, state):
         """Preprocess a single state definition."""
-        assert type(state) is str, "wrong state name %r" % state
-        assert state[0] != '#', "invalid state name %r" % state
+        assert isinstance(state, str), f"wrong state name {state!r}"
+        assert state[0] != '#', f"invalid state name {state!r}"
         if state in processed:
             return processed[state]
         tokens = processed[state] = []
@@ -557,7 +561,7 @@ def _process_state(cls, unprocessed, processed, state):
         for tdef in unprocessed[state]:
             if isinstance(tdef, include):
                 # it's a state reference
-                assert tdef != state, "circular state reference %r" % state
+                assert tdef != state, f"circular state reference {state!r}"
                 tokens.extend(cls._process_state(unprocessed, processed,
                                                  str(tdef)))
                 continue
@@ -571,13 +575,12 @@ def _process_state(cls, unprocessed, processed, state):
                 tokens.append((re.compile('').match, None, new_state))
                 continue
 
-            assert type(tdef) is tuple, "wrong rule def %r" % tdef
+            assert type(tdef) is tuple, f"wrong rule def {tdef!r}"
 
             try:
                 rex = cls._process_regex(tdef[0], rflags, state)
             except Exception as err:
-                raise ValueError("uncompilable regex %r in state %r of %r: %s" %
-                                 (tdef[0], state, cls, err)) from err
+                raise ValueError(f"uncompilable regex {tdef[0]!r} in state {state!r} of {cls!r}: {err}") from err
 
             token = cls._process_token(tdef[1])
 
@@ -738,7 +741,7 @@ def get_tokens_unprocessed(self, text, stack=('root',)):
                         elif new_state == '#push':
                             statestack.append(statestack[-1])
                         else:
-                            assert False, "wrong state def: %r" % new_state
+                            assert False, f"wrong state def: {new_state!r}"
                         statetokens = tokendefs[statestack[-1]]
                     break
             else:
@@ -770,8 +773,7 @@ def __init__(self, text, pos, stack=None, end=None):
         self.stack = stack or ['root']
 
     def __repr__(self):
-        return 'LexerContext(%r, %r, %r)' % (
-            self.text, self.pos, self.stack)
+        return f'LexerContext({self.text!r}, {self.pos!r}, {self.stack!r})'
 
 
 class ExtendedRegexLexer(RegexLexer):
@@ -826,7 +828,7 @@ def get_tokens_unprocessed(self, text=None, context=None):
                         elif new_state == '#push':
                             ctx.stack.append(ctx.stack[-1])
                         else:
-                            assert False, "wrong state def: %r" % new_state
+                            assert False, f"wrong state def: {new_state!r}"
                         statetokens = tokendefs[ctx.stack[-1]]
                     break
             else:
diff --git a/src/pip/_vendor/pygments/lexers/__init__.py b/src/pip/_vendor/pygments/lexers/__init__.py
index 0c176dfbfd6..ac88645a1b0 100644
--- a/src/pip/_vendor/pygments/lexers/__init__.py
+++ b/src/pip/_vendor/pygments/lexers/__init__.py
@@ -4,7 +4,7 @@
 
     Pygments lexers.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -93,7 +93,7 @@ def find_lexer_class_by_name(_alias):
     .. versionadded:: 2.2
     """
     if not _alias:
-        raise ClassNotFound('no lexer for alias %r found' % _alias)
+        raise ClassNotFound(f'no lexer for alias {_alias!r} found')
     # lookup builtin lexers
     for module_name, name, aliases, _, _ in LEXERS.values():
         if _alias.lower() in aliases:
@@ -104,7 +104,7 @@ def find_lexer_class_by_name(_alias):
     for cls in find_plugin_lexers():
         if _alias.lower() in cls.aliases:
             return cls
-    raise ClassNotFound('no lexer for alias %r found' % _alias)
+    raise ClassNotFound(f'no lexer for alias {_alias!r} found')
 
 
 def get_lexer_by_name(_alias, **options):
@@ -117,7 +117,7 @@ def get_lexer_by_name(_alias, **options):
     found.
     """
     if not _alias:
-        raise ClassNotFound('no lexer for alias %r found' % _alias)
+        raise ClassNotFound(f'no lexer for alias {_alias!r} found')
 
     # lookup builtin lexers
     for module_name, name, aliases, _, _ in LEXERS.values():
@@ -129,7 +129,7 @@ def get_lexer_by_name(_alias, **options):
     for cls in find_plugin_lexers():
         if _alias.lower() in cls.aliases:
             return cls(**options)
-    raise ClassNotFound('no lexer for alias %r found' % _alias)
+    raise ClassNotFound(f'no lexer for alias {_alias!r} found')
 
 
 def load_lexer_from_file(filename, lexername="CustomLexer", **options):
@@ -154,17 +154,16 @@ def load_lexer_from_file(filename, lexername="CustomLexer", **options):
             exec(f.read(), custom_namespace)
         # Retrieve the class `lexername` from that namespace
         if lexername not in custom_namespace:
-            raise ClassNotFound('no valid %s class found in %s' %
-                                (lexername, filename))
+            raise ClassNotFound(f'no valid {lexername} class found in {filename}')
         lexer_class = custom_namespace[lexername]
         # And finally instantiate it with the options
         return lexer_class(**options)
     except OSError as err:
-        raise ClassNotFound('cannot read %s: %s' % (filename, err))
+        raise ClassNotFound(f'cannot read {filename}: {err}')
     except ClassNotFound:
         raise
     except Exception as err:
-        raise ClassNotFound('error when loading custom lexer: %s' % err)
+        raise ClassNotFound(f'error when loading custom lexer: {err}')
 
 
 def find_lexer_class_for_filename(_fn, code=None):
@@ -225,7 +224,7 @@ def get_lexer_for_filename(_fn, code=None, **options):
     """
     res = find_lexer_class_for_filename(_fn, code)
     if not res:
-        raise ClassNotFound('no lexer for filename %r found' % _fn)
+        raise ClassNotFound(f'no lexer for filename {_fn!r} found')
     return res(**options)
 
 
@@ -245,7 +244,7 @@ def get_lexer_for_mimetype(_mime, **options):
     for cls in find_plugin_lexers():
         if _mime in cls.mimetypes:
             return cls(**options)
-    raise ClassNotFound('no lexer for mimetype %r found' % _mime)
+    raise ClassNotFound(f'no lexer for mimetype {_mime!r} found')
 
 
 def _iter_lexerclasses(plugins=True):
@@ -280,7 +279,7 @@ def guess_lexer_for_filename(_fn, _text, **options):
                 matching_lexers.add(lexer)
                 primary[lexer] = False
     if not matching_lexers:
-        raise ClassNotFound('no lexer for filename %r found' % fn)
+        raise ClassNotFound(f'no lexer for filename {fn!r} found')
     if len(matching_lexers) == 1:
         return matching_lexers.pop()(**options)
     result = []
diff --git a/src/pip/_vendor/pygments/lexers/_mapping.py b/src/pip/_vendor/pygments/lexers/_mapping.py
index 1ff2b282a12..f3e5c460db3 100644
--- a/src/pip/_vendor/pygments/lexers/_mapping.py
+++ b/src/pip/_vendor/pygments/lexers/_mapping.py
@@ -46,7 +46,7 @@
     'BSTLexer': ('pip._vendor.pygments.lexers.bibtex', 'BST', ('bst', 'bst-pybtex'), ('*.bst',), ()),
     'BareLexer': ('pip._vendor.pygments.lexers.bare', 'BARE', ('bare',), ('*.bare',), ()),
     'BaseMakefileLexer': ('pip._vendor.pygments.lexers.make', 'Base Makefile', ('basemake',), (), ()),
-    'BashLexer': ('pip._vendor.pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', '.kshrc', 'kshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript', 'text/x-shellscript')),
+    'BashLexer': ('pip._vendor.pygments.lexers.shell', 'Bash', ('bash', 'sh', 'ksh', 'zsh', 'shell', 'openrc'), ('*.sh', '*.ksh', '*.bash', '*.ebuild', '*.eclass', '*.exheres-0', '*.exlib', '*.zsh', '.bashrc', 'bashrc', '.bash_*', 'bash_*', 'zshrc', '.zshrc', '.kshrc', 'kshrc', 'PKGBUILD'), ('application/x-sh', 'application/x-shellscript', 'text/x-shellscript')),
     'BashSessionLexer': ('pip._vendor.pygments.lexers.shell', 'Bash Session', ('console', 'shell-session'), ('*.sh-session', '*.shell-session'), ('application/x-shell-session', 'application/x-sh-session')),
     'BatchLexer': ('pip._vendor.pygments.lexers.shell', 'Batchfile', ('batch', 'bat', 'dosbatch', 'winbatch'), ('*.bat', '*.cmd'), ('application/x-dos-batch',)),
     'BddLexer': ('pip._vendor.pygments.lexers.bdd', 'Bdd', ('bdd',), ('*.feature',), ('text/x-bdd',)),
@@ -128,7 +128,7 @@
     'DaxLexer': ('pip._vendor.pygments.lexers.dax', 'Dax', ('dax',), ('*.dax',), ()),
     'DebianControlLexer': ('pip._vendor.pygments.lexers.installers', 'Debian Control file', ('debcontrol', 'control'), ('control',), ()),
     'DelphiLexer': ('pip._vendor.pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
-    'DesktopLexer': ('pip._vendor.pygments.lexers.configs', 'Desktop file', ('desktop',), ('*.desktop',), ()),
+    'DesktopLexer': ('pip._vendor.pygments.lexers.configs', 'Desktop file', ('desktop',), ('*.desktop',), ('application/x-desktop',)),
     'DevicetreeLexer': ('pip._vendor.pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
     'DgLexer': ('pip._vendor.pygments.lexers.python', 'dg', ('dg',), ('*.dg',), ('text/x-dg',)),
     'DiffLexer': ('pip._vendor.pygments.lexers.diff', 'Diff', ('diff', 'udiff'), ('*.diff', '*.patch'), ('text/x-diff', 'text/x-patch')),
@@ -216,8 +216,8 @@
     'HtmlSmartyLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Smarty', ('html+smarty',), (), ('text/html+smarty',)),
     'HttpLexer': ('pip._vendor.pygments.lexers.textfmts', 'HTTP', ('http',), (), ()),
     'HxmlLexer': ('pip._vendor.pygments.lexers.haxe', 'Hxml', ('haxeml', 'hxml'), ('*.hxml',), ()),
-    'HyLexer': ('pip._vendor.pygments.lexers.lisp', 'Hy', ('hylang',), ('*.hy',), ('text/x-hy', 'application/x-hy')),
-    'HybrisLexer': ('pip._vendor.pygments.lexers.scripting', 'Hybris', ('hybris', 'hy'), ('*.hy', '*.hyb'), ('text/x-hybris', 'application/x-hybris')),
+    'HyLexer': ('pip._vendor.pygments.lexers.lisp', 'Hy', ('hylang', 'hy'), ('*.hy',), ('text/x-hy', 'application/x-hy')),
+    'HybrisLexer': ('pip._vendor.pygments.lexers.scripting', 'Hybris', ('hybris',), ('*.hyb',), ('text/x-hybris', 'application/x-hybris')),
     'IDLLexer': ('pip._vendor.pygments.lexers.idl', 'IDL', ('idl',), ('*.pro',), ('text/idl',)),
     'IconLexer': ('pip._vendor.pygments.lexers.unicon', 'Icon', ('icon',), ('*.icon', '*.ICON'), ()),
     'IdrisLexer': ('pip._vendor.pygments.lexers.haskell', 'Idris', ('idris', 'idr'), ('*.idr',), ('text/x-idris',)),
@@ -234,6 +234,7 @@
     'JMESPathLexer': ('pip._vendor.pygments.lexers.jmespath', 'JMESPath', ('jmespath', 'jp'), ('*.jp',), ()),
     'JSLTLexer': ('pip._vendor.pygments.lexers.jslt', 'JSLT', ('jslt',), ('*.jslt',), ('text/x-jslt',)),
     'JagsLexer': ('pip._vendor.pygments.lexers.modeling', 'JAGS', ('jags',), ('*.jag', '*.bug'), ()),
+    'JanetLexer': ('pip._vendor.pygments.lexers.lisp', 'Janet', ('janet',), ('*.janet', '*.jdn'), ('text/x-janet', 'application/x-janet')),
     'JasminLexer': ('pip._vendor.pygments.lexers.jvm', 'Jasmin', ('jasmin', 'jasminxt'), ('*.j',), ()),
     'JavaLexer': ('pip._vendor.pygments.lexers.jvm', 'Java', ('java',), ('*.java',), ('text/x-java',)),
     'JavascriptDjangoLexer': ('pip._vendor.pygments.lexers.templates', 'JavaScript+Django/Jinja', ('javascript+django', 'js+django', 'javascript+jinja', 'js+jinja'), ('*.js.j2', '*.js.jinja2'), ('application/x-javascript+django', 'application/x-javascript+jinja', 'text/x-javascript+django', 'text/x-javascript+jinja', 'text/javascript+django', 'text/javascript+jinja')),
@@ -271,6 +272,7 @@
     'LdaprcLexer': ('pip._vendor.pygments.lexers.ldap', 'LDAP configuration file', ('ldapconf', 'ldaprc'), ('.ldaprc', 'ldaprc', 'ldap.conf'), ('text/x-ldapconf',)),
     'LdifLexer': ('pip._vendor.pygments.lexers.ldap', 'LDIF', ('ldif',), ('*.ldif',), ('text/x-ldif',)),
     'Lean3Lexer': ('pip._vendor.pygments.lexers.lean', 'Lean', ('lean', 'lean3'), ('*.lean',), ('text/x-lean', 'text/x-lean3')),
+    'Lean4Lexer': ('pip._vendor.pygments.lexers.lean', 'Lean4', ('lean4',), ('*.lean',), ('text/x-lean4',)),
     'LessCssLexer': ('pip._vendor.pygments.lexers.css', 'LessCss', ('less',), ('*.less',), ('text/x-less-css',)),
     'LighttpdConfLexer': ('pip._vendor.pygments.lexers.configs', 'Lighttpd configuration file', ('lighttpd', 'lighty'), ('lighttpd.conf',), ('text/x-lighttpd-conf',)),
     'LilyPondLexer': ('pip._vendor.pygments.lexers.lilypond', 'LilyPond', ('lilypond',), ('*.ly',), ()),
@@ -287,6 +289,7 @@
     'LogosLexer': ('pip._vendor.pygments.lexers.objective', 'Logos', ('logos',), ('*.x', '*.xi', '*.xm', '*.xmi'), ('text/x-logos',)),
     'LogtalkLexer': ('pip._vendor.pygments.lexers.prolog', 'Logtalk', ('logtalk',), ('*.lgt', '*.logtalk'), ('text/x-logtalk',)),
     'LuaLexer': ('pip._vendor.pygments.lexers.scripting', 'Lua', ('lua',), ('*.lua', '*.wlua'), ('text/x-lua', 'application/x-lua')),
+    'LuauLexer': ('pip._vendor.pygments.lexers.scripting', 'Luau', ('luau',), ('*.luau',), ()),
     'MCFunctionLexer': ('pip._vendor.pygments.lexers.minecraft', 'MCFunction', ('mcfunction', 'mcf'), ('*.mcfunction',), ('text/mcfunction',)),
     'MCSchemaLexer': ('pip._vendor.pygments.lexers.minecraft', 'MCSchema', ('mcschema',), ('*.mcschema',), ('text/mcschema',)),
     'MIMELexer': ('pip._vendor.pygments.lexers.mime', 'MIME', ('mime',), (), ('multipart/mixed', 'multipart/related', 'multipart/alternative')),
@@ -314,6 +317,7 @@
     'ModelicaLexer': ('pip._vendor.pygments.lexers.modeling', 'Modelica', ('modelica',), ('*.mo',), ('text/x-modelica',)),
     'Modula2Lexer': ('pip._vendor.pygments.lexers.modula2', 'Modula-2', ('modula2', 'm2'), ('*.def', '*.mod'), ('text/x-modula2',)),
     'MoinWikiLexer': ('pip._vendor.pygments.lexers.markup', 'MoinMoin/Trac Wiki markup', ('trac-wiki', 'moin'), (), ('text/x-trac-wiki',)),
+    'MojoLexer': ('pip._vendor.pygments.lexers.mojo', 'Mojo', ('mojo', '🔥'), ('*.mojo', '*.🔥'), ('text/x-mojo', 'application/x-mojo')),
     'MonkeyLexer': ('pip._vendor.pygments.lexers.basic', 'Monkey', ('monkey',), ('*.monkey',), ('text/x-monkey',)),
     'MonteLexer': ('pip._vendor.pygments.lexers.monte', 'Monte', ('monte',), ('*.mt',), ()),
     'MoonScriptLexer': ('pip._vendor.pygments.lexers.scripting', 'MoonScript', ('moonscript', 'moon'), ('*.moon',), ('text/x-moonscript', 'application/x-moonscript')),
@@ -362,6 +366,7 @@
     'OpaLexer': ('pip._vendor.pygments.lexers.ml', 'Opa', ('opa',), ('*.opa',), ('text/x-opa',)),
     'OpenEdgeLexer': ('pip._vendor.pygments.lexers.business', 'OpenEdge ABL', ('openedge', 'abl', 'progress'), ('*.p', '*.cls'), ('text/x-openedge', 'application/x-openedge')),
     'OpenScadLexer': ('pip._vendor.pygments.lexers.openscad', 'OpenSCAD', ('openscad',), ('*.scad',), ('application/x-openscad',)),
+    'OrgLexer': ('pip._vendor.pygments.lexers.markup', 'Org Mode', ('org', 'orgmode', 'org-mode'), ('*.org',), ('text/org',)),
     'OutputLexer': ('pip._vendor.pygments.lexers.special', 'Text output', ('output',), (), ()),
     'PacmanConfLexer': ('pip._vendor.pygments.lexers.configs', 'PacmanConf', ('pacmanconf',), ('pacman.conf',), ()),
     'PanLexer': ('pip._vendor.pygments.lexers.dsls', 'Pan', ('pan',), ('*.pan',), ()),
@@ -390,6 +395,7 @@
     'ProcfileLexer': ('pip._vendor.pygments.lexers.procfile', 'Procfile', ('procfile',), ('Procfile',), ()),
     'PrologLexer': ('pip._vendor.pygments.lexers.prolog', 'Prolog', ('prolog',), ('*.ecl', '*.prolog', '*.pro', '*.pl'), ('text/x-prolog',)),
     'PromQLLexer': ('pip._vendor.pygments.lexers.promql', 'PromQL', ('promql',), ('*.promql',), ()),
+    'PromelaLexer': ('pip._vendor.pygments.lexers.c_like', 'Promela', ('promela',), ('*.pml', '*.prom', '*.prm', '*.promela', '*.pr', '*.pm'), ('text/x-promela',)),
     'PropertiesLexer': ('pip._vendor.pygments.lexers.configs', 'Properties', ('properties', 'jproperties'), ('*.properties',), ('text/x-java-properties',)),
     'ProtoBufLexer': ('pip._vendor.pygments.lexers.dsls', 'Protocol Buffer', ('protobuf', 'proto'), ('*.proto',), ()),
     'PrqlLexer': ('pip._vendor.pygments.lexers.prql', 'PRQL', ('prql',), ('*.prql',), ('application/prql', 'application/x-prql')),
@@ -400,7 +406,7 @@
     'PyPyLogLexer': ('pip._vendor.pygments.lexers.console', 'PyPy Log', ('pypylog', 'pypy'), ('*.pypylog',), ('application/x-pypylog',)),
     'Python2Lexer': ('pip._vendor.pygments.lexers.python', 'Python 2.x', ('python2', 'py2'), (), ('text/x-python2', 'application/x-python2')),
     'Python2TracebackLexer': ('pip._vendor.pygments.lexers.python', 'Python 2.x Traceback', ('py2tb',), ('*.py2tb',), ('text/x-python2-traceback',)),
-    'PythonConsoleLexer': ('pip._vendor.pygments.lexers.python', 'Python console session', ('pycon',), (), ('text/x-python-doctest',)),
+    'PythonConsoleLexer': ('pip._vendor.pygments.lexers.python', 'Python console session', ('pycon', 'python-console'), (), ('text/x-python-doctest',)),
     'PythonLexer': ('pip._vendor.pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
     'PythonTracebackLexer': ('pip._vendor.pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
     'PythonUL4Lexer': ('pip._vendor.pygments.lexers.ul4', 'Python+UL4', ('py+ul4',), ('*.pyul4',), ()),
@@ -473,6 +479,7 @@
     'SnobolLexer': ('pip._vendor.pygments.lexers.snobol', 'Snobol', ('snobol',), ('*.snobol',), ('text/x-snobol',)),
     'SnowballLexer': ('pip._vendor.pygments.lexers.dsls', 'Snowball', ('snowball',), ('*.sbl',), ()),
     'SolidityLexer': ('pip._vendor.pygments.lexers.solidity', 'Solidity', ('solidity',), ('*.sol',), ()),
+    'SoongLexer': ('pip._vendor.pygments.lexers.soong', 'Soong', ('androidbp', 'bp', 'soong'), ('Android.bp',), ()),
     'SophiaLexer': ('pip._vendor.pygments.lexers.sophia', 'Sophia', ('sophia',), ('*.aes',), ()),
     'SourcePawnLexer': ('pip._vendor.pygments.lexers.pawn', 'SourcePawn', ('sp',), ('*.sp',), ('text/x-sourcepawn',)),
     'SourcesListLexer': ('pip._vendor.pygments.lexers.installers', 'Debian Sourcelist', ('debsources', 'sourceslist', 'sources.list'), ('sources.list',), ()),
@@ -494,6 +501,7 @@
     'TAPLexer': ('pip._vendor.pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
     'TNTLexer': ('pip._vendor.pygments.lexers.tnt', 'Typographic Number Theory', ('tnt',), ('*.tnt',), ()),
     'TOMLLexer': ('pip._vendor.pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ('application/toml',)),
+    'TactLexer': ('pip._vendor.pygments.lexers.tact', 'Tact', ('tact',), ('*.tact',), ()),
     'Tads3Lexer': ('pip._vendor.pygments.lexers.int_fiction', 'TADS 3', ('tads3',), ('*.t',), ()),
     'TalLexer': ('pip._vendor.pygments.lexers.tal', 'Tal', ('tal', 'uxntal'), ('*.tal',), ('text/x-uxntal',)),
     'TasmLexer': ('pip._vendor.pygments.lexers.asm', 'TASM', ('tasm',), ('*.asm', '*.ASM', '*.tasm'), ('text/x-tasm',)),
@@ -523,6 +531,7 @@
     'TypoScriptCssDataLexer': ('pip._vendor.pygments.lexers.typoscript', 'TypoScriptCssData', ('typoscriptcssdata',), (), ()),
     'TypoScriptHtmlDataLexer': ('pip._vendor.pygments.lexers.typoscript', 'TypoScriptHtmlData', ('typoscripthtmldata',), (), ()),
     'TypoScriptLexer': ('pip._vendor.pygments.lexers.typoscript', 'TypoScript', ('typoscript',), ('*.typoscript',), ('text/x-typoscript',)),
+    'TypstLexer': ('pip._vendor.pygments.lexers.typst', 'Typst', ('typst',), ('*.typ',), ('text/x-typst',)),
     'UL4Lexer': ('pip._vendor.pygments.lexers.ul4', 'UL4', ('ul4',), ('*.ul4',), ()),
     'UcodeLexer': ('pip._vendor.pygments.lexers.unicon', 'ucode', ('ucode',), ('*.u', '*.u1', '*.u2'), ()),
     'UniconLexer': ('pip._vendor.pygments.lexers.unicon', 'Unicon', ('unicon',), ('*.icn',), ('text/unicon',)),
@@ -537,7 +546,7 @@
     'VGLLexer': ('pip._vendor.pygments.lexers.dsls', 'VGL', ('vgl',), ('*.rpf',), ()),
     'ValaLexer': ('pip._vendor.pygments.lexers.c_like', 'Vala', ('vala', 'vapi'), ('*.vala', '*.vapi'), ('text/x-vala',)),
     'VbNetAspxLexer': ('pip._vendor.pygments.lexers.dotnet', 'aspx-vb', ('aspx-vb',), ('*.aspx', '*.asax', '*.ascx', '*.ashx', '*.asmx', '*.axd'), ()),
-    'VbNetLexer': ('pip._vendor.pygments.lexers.dotnet', 'VB.net', ('vb.net', 'vbnet', 'lobas', 'oobas', 'sobas'), ('*.vb', '*.bas'), ('text/x-vbnet', 'text/x-vba')),
+    'VbNetLexer': ('pip._vendor.pygments.lexers.dotnet', 'VB.net', ('vb.net', 'vbnet', 'lobas', 'oobas', 'sobas', 'visual-basic', 'visualbasic'), ('*.vb', '*.bas'), ('text/x-vbnet', 'text/x-vba')),
     'VelocityHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Velocity', ('html+velocity',), (), ('text/html+velocity',)),
     'VelocityLexer': ('pip._vendor.pygments.lexers.templates', 'Velocity', ('velocity',), ('*.vm', '*.fhtml'), ()),
     'VelocityXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Velocity', ('xml+velocity',), (), ('application/xml+velocity',)),
diff --git a/src/pip/_vendor/pygments/lexers/python.py b/src/pip/_vendor/pygments/lexers/python.py
index e2ce58f5a19..b2d07f20800 100644
--- a/src/pip/_vendor/pygments/lexers/python.py
+++ b/src/pip/_vendor/pygments/lexers/python.py
@@ -4,15 +4,14 @@
 
     Lexers for Python and related languages.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
-import re
 import keyword
 
-from pip._vendor.pygments.lexer import DelegatingLexer, Lexer, RegexLexer, include, \
-    bygroups, using, default, words, combined, do_insertions, this, line_re
+from pip._vendor.pygments.lexer import DelegatingLexer, RegexLexer, include, \
+    bygroups, using, default, words, combined, this
 from pip._vendor.pygments.util import get_bool_opt, shebang_matches
 from pip._vendor.pygments.token import Text, Comment, Operator, Keyword, Name, String, \
     Number, Punctuation, Generic, Other, Error, Whitespace
@@ -27,8 +26,6 @@ class PythonLexer(RegexLexer):
     """
     For Python source code (version 3.x).
 
-    .. versionadded:: 0.10
-
     .. versionchanged:: 2.5
        This is now the default ``PythonLexer``.  It is still available as the
        alias ``Python3Lexer``.
@@ -61,8 +58,9 @@ class PythonLexer(RegexLexer):
     ]
     mimetypes = ['text/x-python', 'application/x-python',
                  'text/x-python3', 'application/x-python3']
+    version_added = '0.10'
 
-    uni_name = "[%s][%s]*" % (uni.xid_start, uni.xid_continue)
+    uni_name = f"[{uni.xid_start}][{uni.xid_continue}]*"
 
     def innerstring_rules(ttype):
         return [
@@ -224,7 +222,8 @@ def fstring_rules(ttype):
              r'(match|case)\b'         # a possible keyword
              r'(?![ \t]*(?:'           # not followed by...
              r'[:,;=^&|@~)\]}]|(?:' +  # characters and keywords that mean this isn't
-             r'|'.join(keyword.kwlist) + r')\b))',                 # pattern matching
+                                       # pattern matching (but None/True/False is ok)
+             r'|'.join(k for k in keyword.kwlist if k[0].islower()) + r')\b))',
              bygroups(Text, Keyword), 'soft-keywords-inner'),
         ],
         'soft-keywords-inner': [
@@ -429,6 +428,7 @@ class Python2Lexer(RegexLexer):
     aliases = ['python2', 'py2']
     filenames = []  # now taken over by PythonLexer (3.x)
     mimetypes = ['text/x-python2', 'application/x-python2']
+    version_added = ''
 
     def innerstring_rules(ttype):
         return [
@@ -637,7 +637,7 @@ def analyse_text(text):
 
 class _PythonConsoleLexerBase(RegexLexer):
     name = 'Python console session'
-    aliases = ['pycon']
+    aliases = ['pycon', 'python-console']
     mimetypes = ['text/x-python-doctest']
 
     """Auxiliary lexer for `PythonConsoleLexer`.
@@ -696,8 +696,10 @@ class PythonConsoleLexer(DelegatingLexer):
     """
 
     name = 'Python console session'
-    aliases = ['pycon']
+    aliases = ['pycon', 'python-console']
     mimetypes = ['text/x-python-doctest']
+    url = 'https://python.org'
+    version_added = ''
 
     def __init__(self, **options):
         python3 = get_bool_opt(options, 'python3', True)
@@ -721,8 +723,6 @@ class PythonTracebackLexer(RegexLexer):
     """
     For Python 3.x tracebacks, with support for chained exceptions.
 
-    .. versionadded:: 1.0
-
     .. versionchanged:: 2.5
        This is now the default ``PythonTracebackLexer``.  It is still available
        as the alias ``Python3TracebackLexer``.
@@ -732,6 +732,8 @@ class PythonTracebackLexer(RegexLexer):
     aliases = ['pytb', 'py3tb']
     filenames = ['*.pytb', '*.py3tb']
     mimetypes = ['text/x-python-traceback', 'text/x-python3-traceback']
+    url = 'https://python.org'
+    version_added = '1.0'
 
     tokens = {
         'root': [
@@ -778,8 +780,6 @@ class Python2TracebackLexer(RegexLexer):
     """
     For Python tracebacks.
 
-    .. versionadded:: 0.7
-
     .. versionchanged:: 2.5
        This class has been renamed from ``PythonTracebackLexer``.
        ``PythonTracebackLexer`` now refers to the Python 3 variant.
@@ -789,6 +789,8 @@ class Python2TracebackLexer(RegexLexer):
     aliases = ['py2tb']
     filenames = ['*.py2tb']
     mimetypes = ['text/x-python2-traceback']
+    url = 'https://python.org'
+    version_added = '0.7'
 
     tokens = {
         'root': [
@@ -825,8 +827,6 @@ class Python2TracebackLexer(RegexLexer):
 class CythonLexer(RegexLexer):
     """
     For Pyrex and Cython source code.
-
-    .. versionadded:: 1.1
     """
 
     name = 'Cython'
@@ -834,6 +834,7 @@ class CythonLexer(RegexLexer):
     aliases = ['cython', 'pyx', 'pyrex']
     filenames = ['*.pyx', '*.pxd', '*.pxi']
     mimetypes = ['text/x-cython', 'application/x-cython']
+    version_added = '1.1'
 
     tokens = {
         'root': [
@@ -1007,13 +1008,13 @@ class DgLexer(RegexLexer):
     Lexer for dg,
     a functional and object-oriented programming language
     running on the CPython 3 VM.
-
-    .. versionadded:: 1.6
     """
     name = 'dg'
     aliases = ['dg']
     filenames = ['*.dg']
     mimetypes = ['text/x-dg']
+    url = 'http://pyos.github.io/dg'
+    version_added = '1.6'
 
     tokens = {
         'root': [
@@ -1104,13 +1105,12 @@ class DgLexer(RegexLexer):
 class NumPyLexer(PythonLexer):
     """
     A Python lexer recognizing Numerical Python builtins.
-
-    .. versionadded:: 0.10
     """
 
     name = 'NumPy'
     url = 'https://numpy.org/'
     aliases = ['numpy']
+    version_added = '0.10'
 
     # override the mimetypes to not inherit them from python
     mimetypes = []
diff --git a/src/pip/_vendor/pygments/modeline.py b/src/pip/_vendor/pygments/modeline.py
index 7b6f6a324ba..e4d9fe167bd 100644
--- a/src/pip/_vendor/pygments/modeline.py
+++ b/src/pip/_vendor/pygments/modeline.py
@@ -4,7 +4,7 @@
 
     A simple modeline parser (based on pymodeline).
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -19,7 +19,7 @@
 ''', re.VERBOSE)
 
 
-def get_filetype_from_line(l):
+def get_filetype_from_line(l): # noqa: E741
     m = modeline_re.search(l)
     if m:
         return m.group(1)
@@ -30,8 +30,8 @@ def get_filetype_from_buffer(buf, max_lines=5):
     Scan the buffer for modelines and return filetype if one is found.
     """
     lines = buf.splitlines()
-    for l in lines[-1:-max_lines-1:-1]:
-        ret = get_filetype_from_line(l)
+    for line in lines[-1:-max_lines-1:-1]:
+        ret = get_filetype_from_line(line)
         if ret:
             return ret
     for i in range(max_lines, -1, -1):
diff --git a/src/pip/_vendor/pygments/plugin.py b/src/pip/_vendor/pygments/plugin.py
index 7b722d58db0..2e462f2c2f9 100644
--- a/src/pip/_vendor/pygments/plugin.py
+++ b/src/pip/_vendor/pygments/plugin.py
@@ -2,12 +2,7 @@
     pygments.plugin
     ~~~~~~~~~~~~~~~
 
-    Pygments plugin interface. By default, this tries to use
-    ``importlib.metadata``, which is in the Python standard
-    library since Python 3.8, or its ``importlib_metadata``
-    backport for earlier versions of Python. It falls back on
-    ``pkg_resources`` if not found. Finally, if ``pkg_resources``
-    is not found either, no plugins are loaded at all.
+    Pygments plugin interface.
 
     lexer plugins::
 
@@ -34,9 +29,10 @@
         yourfilter = yourfilter:YourFilter
 
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from importlib.metadata import entry_points
 
 LEXER_ENTRY_POINT = 'pygments.lexers'
 FORMATTER_ENTRY_POINT = 'pygments.formatters'
@@ -45,18 +41,6 @@
 
 
 def iter_entry_points(group_name):
-    try:
-        from importlib.metadata import entry_points
-    except ImportError:
-        try:
-            from importlib_metadata import entry_points
-        except ImportError:
-            try:
-                from pip._vendor.pkg_resources import iter_entry_points
-            except (ImportError, OSError):
-                return []
-            else:
-                return iter_entry_points(group_name)
     groups = entry_points()
     if hasattr(groups, 'select'):
         # New interface in Python 3.10 and newer versions of the
diff --git a/src/pip/_vendor/pygments/regexopt.py b/src/pip/_vendor/pygments/regexopt.py
index 45223eccc10..c44eedbf2ad 100644
--- a/src/pip/_vendor/pygments/regexopt.py
+++ b/src/pip/_vendor/pygments/regexopt.py
@@ -5,7 +5,7 @@
     An algorithm that generates optimized regexes for matching long lists of
     literal strings.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/scanner.py b/src/pip/_vendor/pygments/scanner.py
index 32a2f303296..112da34917e 100644
--- a/src/pip/_vendor/pygments/scanner.py
+++ b/src/pip/_vendor/pygments/scanner.py
@@ -11,7 +11,7 @@
     Have a look at the `DelphiLexer` to get an idea of how to use
     this scanner.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
diff --git a/src/pip/_vendor/pygments/sphinxext.py b/src/pip/_vendor/pygments/sphinxext.py
index fc0b0270bfd..34077a2aee8 100644
--- a/src/pip/_vendor/pygments/sphinxext.py
+++ b/src/pip/_vendor/pygments/sphinxext.py
@@ -5,7 +5,7 @@
     Sphinx extension to generate automatic documentation of lexers,
     formatters and filters.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -33,6 +33,8 @@
 
     %s
 
+    %s
+
 '''
 
 FMTERDOC = '''
@@ -119,11 +121,11 @@ def format_link(name, url):
         def write_row(*columns):
             """Format a table row"""
             out = []
-            for l, c in zip(column_lengths, columns):
-                if c:
-                    out.append(c.ljust(l))
+            for length, col in zip(column_lengths, columns):
+                if col:
+                    out.append(col.ljust(length))
                 else:
-                    out.append(' '*l)
+                    out.append(' '*length)
 
             return ' '.join(out)
 
@@ -160,7 +162,7 @@ def document_lexers(self):
             self.filenames.add(mod.__file__)
             cls = getattr(mod, classname)
             if not cls.__doc__:
-                print("Warning: %s does not have a docstring." % classname)
+                print(f"Warning: {classname} does not have a docstring.")
             docstring = cls.__doc__
             if isinstance(docstring, bytes):
                 docstring = docstring.decode('utf8')
@@ -182,12 +184,18 @@ def document_lexers(self):
                     for line in content.splitlines():
                         docstring += f'          {line}\n'
 
+            if cls.version_added:
+                version_line = f'.. versionadded:: {cls.version_added}'
+            else:
+                version_line = ''
+
             modules.setdefault(module, []).append((
                 classname,
                 ', '.join(data[2]) or 'None',
                 ', '.join(data[3]).replace('*', '\\*').replace('_', '\\') or 'None',
                 ', '.join(data[4]) or 'None',
-                docstring))
+                docstring,
+                version_line))
             if module not in moduledocstrings:
                 moddoc = mod.__doc__
                 if isinstance(moddoc, bytes):
@@ -196,7 +204,7 @@ def document_lexers(self):
 
         for module, lexers in sorted(modules.items(), key=lambda x: x[0]):
             if moduledocstrings[module] is None:
-                raise Exception("Missing docstring for %s" % (module,))
+                raise Exception(f"Missing docstring for {module}")
             heading = moduledocstrings[module].splitlines()[4].strip().rstrip('.')
             out.append(MODULEDOC % (module, heading, '-'*len(heading)))
             for data in lexers:
diff --git a/src/pip/_vendor/pygments/style.py b/src/pip/_vendor/pygments/style.py
index f2f72d3bc56..076e63f831c 100644
--- a/src/pip/_vendor/pygments/style.py
+++ b/src/pip/_vendor/pygments/style.py
@@ -4,7 +4,7 @@
 
     Basic style object.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -76,7 +76,7 @@ def colorformat(text):
                 return ''
             elif text.startswith('var') or text.startswith('calc'):
                 return text
-            assert False, "wrong color format %r" % text
+            assert False, f"wrong color format {text!r}"
 
         _styles = obj._styles = {}
 
diff --git a/src/pip/_vendor/pygments/styles/__init__.py b/src/pip/_vendor/pygments/styles/__init__.py
index 23b55468e2c..712f6e69932 100644
--- a/src/pip/_vendor/pygments/styles/__init__.py
+++ b/src/pip/_vendor/pygments/styles/__init__.py
@@ -4,7 +4,7 @@
 
     Contains built-in styles.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -44,13 +44,13 @@ def get_style_by_name(name):
     try:
         mod = __import__(mod, None, None, [cls])
     except ImportError:
-        raise ClassNotFound("Could not find style module %r" % mod +
+        raise ClassNotFound(f"Could not find style module {mod!r}" +
                             (builtin and ", though it should be builtin")
                             + ".")
     try:
         return getattr(mod, cls)
     except AttributeError:
-        raise ClassNotFound("Could not find style class %r in style module." % cls)
+        raise ClassNotFound(f"Could not find style class {cls!r} in style module.")
 
 
 def get_all_styles():
diff --git a/src/pip/_vendor/pygments/styles/_mapping.py b/src/pip/_vendor/pygments/styles/_mapping.py
index 04c7ddfbb04..49a7fae92dc 100644
--- a/src/pip/_vendor/pygments/styles/_mapping.py
+++ b/src/pip/_vendor/pygments/styles/_mapping.py
@@ -9,6 +9,7 @@
     'AutumnStyle': ('pygments.styles.autumn', 'autumn', ()),
     'BlackWhiteStyle': ('pygments.styles.bw', 'bw', ()),
     'BorlandStyle': ('pygments.styles.borland', 'borland', ()),
+    'CoffeeStyle': ('pygments.styles.coffee', 'coffee', ()),
     'ColorfulStyle': ('pygments.styles.colorful', 'colorful', ()),
     'DefaultStyle': ('pygments.styles.default', 'default', ()),
     'DraculaStyle': ('pygments.styles.dracula', 'dracula', ()),
diff --git a/src/pip/_vendor/pygments/token.py b/src/pip/_vendor/pygments/token.py
index bdf2e8e2e12..f78018a7aa7 100644
--- a/src/pip/_vendor/pygments/token.py
+++ b/src/pip/_vendor/pygments/token.py
@@ -4,7 +4,7 @@
 
     Basic token types and the standard tokens.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/unistring.py b/src/pip/_vendor/pygments/unistring.py
index 39f6baeedfb..e2c3523e4bb 100644
--- a/src/pip/_vendor/pygments/unistring.py
+++ b/src/pip/_vendor/pygments/unistring.py
@@ -7,7 +7,7 @@
 
     Inspired by chartypes_create.py from the MoinMoin project.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -104,7 +104,7 @@ def _handle_runs(char_list):  # pragma: no cover
         if a == b:
             yield a
         else:
-            yield '%s-%s' % (a, b)
+            yield f'{a}-{b}'
 
 
 if __name__ == '__main__':  # pragma: no cover
@@ -141,13 +141,13 @@ def _handle_runs(char_list):  # pragma: no cover
 
         for cat in sorted(categories):
             val = ''.join(_handle_runs(categories[cat]))
-            fp.write('%s = %a\n\n' % (cat, val))
+            fp.write(f'{cat} = {val!a}\n\n')
 
         cats = sorted(categories)
         cats.remove('xid_start')
         cats.remove('xid_continue')
-        fp.write('cats = %r\n\n' % cats)
+        fp.write(f'cats = {cats!r}\n\n')
 
-        fp.write('# Generated from unidata %s\n\n' % (unicodedata.unidata_version,))
+        fp.write(f'# Generated from unidata {unicodedata.unidata_version}\n\n')
 
         fp.write(footer)
diff --git a/src/pip/_vendor/pygments/util.py b/src/pip/_vendor/pygments/util.py
index 941fdb9ec7a..83cf1049253 100644
--- a/src/pip/_vendor/pygments/util.py
+++ b/src/pip/_vendor/pygments/util.py
@@ -4,7 +4,7 @@
 
     Utility functions.
 
-    :copyright: Copyright 2006-2023 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -46,8 +46,7 @@ def get_choice_opt(options, optname, allowed, default=None, normcase=False):
     if normcase:
         string = string.lower()
     if string not in allowed:
-        raise OptionError('Value for option %s must be one of %s' %
-                          (optname, ', '.join(map(str, allowed))))
+        raise OptionError('Value for option {} must be one of {}'.format(optname, ', '.join(map(str, allowed))))
     return string
 
 
@@ -69,17 +68,15 @@ def get_bool_opt(options, optname, default=None):
     elif isinstance(string, int):
         return bool(string)
     elif not isinstance(string, str):
-        raise OptionError('Invalid type %r for option %s; use '
-                          '1/0, yes/no, true/false, on/off' % (
-                              string, optname))
+        raise OptionError(f'Invalid type {string!r} for option {optname}; use '
+                          '1/0, yes/no, true/false, on/off')
     elif string.lower() in ('1', 'yes', 'true', 'on'):
         return True
     elif string.lower() in ('0', 'no', 'false', 'off'):
         return False
     else:
-        raise OptionError('Invalid value %r for option %s; use '
-                          '1/0, yes/no, true/false, on/off' % (
-                              string, optname))
+        raise OptionError(f'Invalid value {string!r} for option {optname}; use '
+                          '1/0, yes/no, true/false, on/off')
 
 
 def get_int_opt(options, optname, default=None):
@@ -88,13 +85,11 @@ def get_int_opt(options, optname, default=None):
     try:
         return int(string)
     except TypeError:
-        raise OptionError('Invalid type %r for option %s; you '
-                          'must give an integer value' % (
-                              string, optname))
+        raise OptionError(f'Invalid type {string!r} for option {optname}; you '
+                          'must give an integer value')
     except ValueError:
-        raise OptionError('Invalid value %r for option %s; you '
-                          'must give an integer value' % (
-                              string, optname))
+        raise OptionError(f'Invalid value {string!r} for option {optname}; you '
+                          'must give an integer value')
 
 def get_list_opt(options, optname, default=None):
     """
@@ -108,9 +103,8 @@ def get_list_opt(options, optname, default=None):
     elif isinstance(val, (list, tuple)):
         return list(val)
     else:
-        raise OptionError('Invalid type %r for option %s; you '
-                          'must give a list value' % (
-                              val, optname))
+        raise OptionError(f'Invalid type {val!r} for option {optname}; you '
+                          'must give a list value')
 
 
 def docstring_headline(obj):
@@ -181,7 +175,7 @@ def shebang_matches(text, regex):
                      if x and not x.startswith('-')][-1]
         except IndexError:
             return False
-        regex = re.compile(r'^%s(\.(exe|cmd|bat|bin))?$' % regex, re.IGNORECASE)
+        regex = re.compile(rf'^{regex}(\.(exe|cmd|bat|bin))?$', re.IGNORECASE)
         if regex.search(found) is not None:
             return True
     return False
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 668234fcb8a..c72a40f4f18 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -10,7 +10,7 @@ requests==2.32.3
     idna==3.7
     urllib3==1.26.18
 rich==13.7.1
-    pygments==2.17.2
+    pygments==2.18.0
     typing_extensions==4.12.2
 resolvelib==1.0.1
 setuptools==69.5.1

From 23289a6017deb43f7240e317ef7929ed9b63f32c Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 13 Jul 2024 10:54:54 -0400
Subject: [PATCH 494/992] Upgrade setuptools to 70.3.0

---
 news/setuptools.vendor.rst                  |   1 +
 src/pip/_vendor/pkg_resources/__init__.py   | 935 ++++++++++++++------
 src/pip/_vendor/vendor.txt                  |   2 +-
 tools/vendoring/patches/pkg_resources.patch |  27 +-
 4 files changed, 659 insertions(+), 306 deletions(-)
 create mode 100644 news/setuptools.vendor.rst

diff --git a/news/setuptools.vendor.rst b/news/setuptools.vendor.rst
new file mode 100644
index 00000000000..afdd14c09dc
--- /dev/null
+++ b/news/setuptools.vendor.rst
@@ -0,0 +1 @@
+Upgrade setuptools to 70.3.0
diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py
index 8d405a4be7b..57ce7f10064 100644
--- a/src/pip/_vendor/pkg_resources/__init__.py
+++ b/src/pip/_vendor/pkg_resources/__init__.py
@@ -1,3 +1,6 @@
+# TODO: Add Generic type annotations to initialized collections.
+# For now we'd simply use implicit Any/Unknown which would add redundant annotations
+# mypy: disable-error-code="var-annotated"
 """
 Package resource API
 --------------------
@@ -17,9 +20,11 @@
 :mod:`importlib.metadata` and :pypi:`packaging` instead.
 """
 
+from __future__ import annotations
+
 import sys
 
-if sys.version_info < (3, 8):
+if sys.version_info < (3, 8):  # noqa: UP036 # Check for unsupported versions
     raise RuntimeError("Python 3.8 or later is required")
 
 import os
@@ -27,7 +32,24 @@
 import time
 import re
 import types
-from typing import List, Protocol
+from typing import (
+    Any,
+    Literal,
+    Dict,
+    Iterator,
+    Mapping,
+    MutableSequence,
+    NamedTuple,
+    NoReturn,
+    Tuple,
+    Union,
+    TYPE_CHECKING,
+    Protocol,
+    Callable,
+    Iterable,
+    TypeVar,
+    overload,
+)
 import zipfile
 import zipimport
 import warnings
@@ -46,6 +68,7 @@
 import ntpath
 import posixpath
 import importlib
+import importlib.abc
 import importlib.machinery
 from pkgutil import get_importer
 
@@ -53,6 +76,8 @@
 
 # capture these to bypass sandboxing
 from os import utime
+from os import open as os_open
+from os.path import isdir, split
 
 try:
     from os import mkdir, rename, unlink
@@ -62,41 +87,20 @@
     # no write support, probably under GAE
     WRITE_SUPPORT = False
 
-from os import open as os_open
-from os.path import isdir, split
-
 from pip._internal.utils._jaraco_text import (
     yield_lines,
     drop_comment,
     join_continuation,
 )
+from pip._vendor.packaging import markers as _packaging_markers
+from pip._vendor.packaging import requirements as _packaging_requirements
+from pip._vendor.packaging import utils as _packaging_utils
+from pip._vendor.packaging import version as _packaging_version
+from pip._vendor.platformdirs import user_cache_dir as _user_cache_dir
 
-from pip._vendor import platformdirs
-from pip._vendor import packaging
-
-__import__('pip._vendor.packaging.version')
-__import__('pip._vendor.packaging.specifiers')
-__import__('pip._vendor.packaging.requirements')
-__import__('pip._vendor.packaging.markers')
-__import__('pip._vendor.packaging.utils')
-
-# declare some globals that will be defined later to
-# satisfy the linters.
-require = None
-working_set = None
-add_activation_listener = None
-cleanup_resources = None
-resource_stream = None
-set_extraction_path = None
-resource_isdir = None
-resource_string = None
-iter_entry_points = None
-resource_listdir = None
-resource_filename = None
-resource_exists = None
-_distribution_finders = None
-_namespace_handlers = None
-_namespace_packages = None
+if TYPE_CHECKING:
+    from _typeshed import BytesPath, StrPath, StrOrBytesPath
+    from pip._vendor.typing_extensions import Self
 
 
 # Patch: Remove deprecation warning from vendored pkg_resources.
@@ -105,6 +109,37 @@
 # See https://github.com/pypa/pip/issues/12243
 
 
+_T = TypeVar("_T")
+_DistributionT = TypeVar("_DistributionT", bound="Distribution")
+# Type aliases
+_NestedStr = Union[str, Iterable[Union[str, Iterable["_NestedStr"]]]]
+_InstallerTypeT = Callable[["Requirement"], "_DistributionT"]
+_InstallerType = Callable[["Requirement"], Union["Distribution", None]]
+_PkgReqType = Union[str, "Requirement"]
+_EPDistType = Union["Distribution", _PkgReqType]
+_MetadataType = Union["IResourceProvider", None]
+_ResolvedEntryPoint = Any  # Can be any attribute in the module
+_ResourceStream = Any  # TODO / Incomplete: A readable file-like object
+# Any object works, but let's indicate we expect something like a module (optionally has __loader__ or __file__)
+_ModuleLike = Union[object, types.ModuleType]
+# Any: Should be _ModuleLike but we end up with issues where _ModuleLike doesn't have _ZipLoaderModule's __loader__
+_ProviderFactoryType = Callable[[Any], "IResourceProvider"]
+_DistFinderType = Callable[[_T, str, bool], Iterable["Distribution"]]
+_NSHandlerType = Callable[[_T, str, str, types.ModuleType], Union[str, None]]
+_AdapterT = TypeVar(
+    "_AdapterT", _DistFinderType[Any], _ProviderFactoryType, _NSHandlerType[Any]
+)
+
+
+# Use _typeshed.importlib.LoaderProtocol once available https://github.com/python/typeshed/pull/11890
+class _LoaderProtocol(Protocol):
+    def load_module(self, fullname: str, /) -> types.ModuleType: ...
+
+
+class _ZipLoaderModule(Protocol):
+    __loader__: zipimport.zipimporter
+
+
 _PEP440_FALLBACK = re.compile(r"^v?(?P(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I)
 
 
@@ -115,18 +150,18 @@ class PEP440Warning(RuntimeWarning):
     """
 
 
-parse_version = packaging.version.Version
+parse_version = _packaging_version.Version
 
 
-_state_vars = {}
+_state_vars: dict[str, str] = {}
 
 
-def _declare_state(vartype, **kw):
-    globals().update(kw)
-    _state_vars.update(dict.fromkeys(kw, vartype))
+def _declare_state(vartype: str, varname: str, initial_value: _T) -> _T:
+    _state_vars[varname] = vartype
+    return initial_value
 
 
-def __getstate__():
+def __getstate__() -> dict[str, Any]:
     state = {}
     g = globals()
     for k, v in _state_vars.items():
@@ -134,7 +169,7 @@ def __getstate__():
     return state
 
 
-def __setstate__(state):
+def __setstate__(state: dict[str, Any]) -> dict[str, Any]:
     g = globals()
     for k, v in state.items():
         g['_sset_' + _state_vars[k]](k, g[k], v)
@@ -289,17 +324,17 @@ class VersionConflict(ResolutionError):
     _template = "{self.dist} is installed but {self.req} is required"
 
     @property
-    def dist(self):
+    def dist(self) -> Distribution:
         return self.args[0]
 
     @property
-    def req(self):
+    def req(self) -> Requirement:
         return self.args[1]
 
     def report(self):
         return self._template.format(**locals())
 
-    def with_context(self, required_by):
+    def with_context(self, required_by: set[Distribution | str]):
         """
         If required_by is non-empty, return a version of self that is a
         ContextualVersionConflict.
@@ -319,7 +354,7 @@ class ContextualVersionConflict(VersionConflict):
     _template = VersionConflict._template + ' by {self.required_by}'
 
     @property
-    def required_by(self):
+    def required_by(self) -> set[str]:
         return self.args[2]
 
 
@@ -332,11 +367,11 @@ class DistributionNotFound(ResolutionError):
     )
 
     @property
-    def req(self):
+    def req(self) -> Requirement:
         return self.args[0]
 
     @property
-    def requirers(self):
+    def requirers(self) -> set[str] | None:
         return self.args[1]
 
     @property
@@ -356,7 +391,7 @@ class UnknownExtra(ResolutionError):
     """Distribution doesn't have an "extra feature" of the given name"""
 
 
-_provider_factories = {}
+_provider_factories: dict[type[_ModuleLike], _ProviderFactoryType] = {}
 
 PY_MAJOR = '{}.{}'.format(*sys.version_info)
 EGG_DIST = 3
@@ -366,7 +401,9 @@ class UnknownExtra(ResolutionError):
 DEVELOP_DIST = -1
 
 
-def register_loader_type(loader_type, provider_factory):
+def register_loader_type(
+    loader_type: type[_ModuleLike], provider_factory: _ProviderFactoryType
+):
     """Register `provider_factory` to make providers for `loader_type`
 
     `loader_type` is the type or class of a PEP 302 ``module.__loader__``,
@@ -376,7 +413,11 @@ def register_loader_type(loader_type, provider_factory):
     _provider_factories[loader_type] = provider_factory
 
 
-def get_provider(moduleOrReq):
+@overload
+def get_provider(moduleOrReq: str) -> IResourceProvider: ...
+@overload
+def get_provider(moduleOrReq: Requirement) -> Distribution: ...
+def get_provider(moduleOrReq: str | Requirement) -> IResourceProvider | Distribution:
     """Return an IResourceProvider for the named module or requirement"""
     if isinstance(moduleOrReq, Requirement):
         return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
@@ -438,7 +479,7 @@ def get_build_platform():
 get_platform = get_build_platform
 
 
-def compatible_platforms(provided, required):
+def compatible_platforms(provided: str | None, required: str | None):
     """Can code for the `provided` platform run on the `required` platform?
 
     Returns true if either platform is ``None``, or the platforms are equal.
@@ -487,89 +528,106 @@ def compatible_platforms(provided, required):
     return False
 
 
-def get_distribution(dist):
+@overload
+def get_distribution(dist: _DistributionT) -> _DistributionT: ...
+@overload
+def get_distribution(dist: _PkgReqType) -> Distribution: ...
+def get_distribution(dist: Distribution | _PkgReqType) -> Distribution:
     """Return a current distribution object for a Requirement or string"""
     if isinstance(dist, str):
         dist = Requirement.parse(dist)
     if isinstance(dist, Requirement):
-        dist = get_provider(dist)
+        # Bad type narrowing, dist has to be a Requirement here, so get_provider has to return Distribution
+        dist = get_provider(dist)  # type: ignore[assignment]
     if not isinstance(dist, Distribution):
-        raise TypeError("Expected string, Requirement, or Distribution", dist)
+        raise TypeError("Expected str, Requirement, or Distribution", dist)
     return dist
 
 
-def load_entry_point(dist, group, name):
+def load_entry_point(dist: _EPDistType, group: str, name: str) -> _ResolvedEntryPoint:
     """Return `name` entry point of `group` for `dist` or raise ImportError"""
     return get_distribution(dist).load_entry_point(group, name)
 
 
-def get_entry_map(dist, group=None):
+@overload
+def get_entry_map(
+    dist: _EPDistType, group: None = None
+) -> dict[str, dict[str, EntryPoint]]: ...
+@overload
+def get_entry_map(dist: _EPDistType, group: str) -> dict[str, EntryPoint]: ...
+def get_entry_map(dist: _EPDistType, group: str | None = None):
     """Return the entry point map for `group`, or the full entry map"""
     return get_distribution(dist).get_entry_map(group)
 
 
-def get_entry_info(dist, group, name):
+def get_entry_info(dist: _EPDistType, group: str, name: str):
     """Return the EntryPoint object for `group`+`name`, or ``None``"""
     return get_distribution(dist).get_entry_info(group, name)
 
 
 class IMetadataProvider(Protocol):
-    def has_metadata(self, name) -> bool:
+    def has_metadata(self, name: str) -> bool:
         """Does the package's distribution contain the named metadata?"""
 
-    def get_metadata(self, name):
+    def get_metadata(self, name: str) -> str:
         """The named metadata resource as a string"""
 
-    def get_metadata_lines(self, name):
+    def get_metadata_lines(self, name: str) -> Iterator[str]:
         """Yield named metadata resource as list of non-blank non-comment lines
 
         Leading and trailing whitespace is stripped from each line, and lines
         with ``#`` as the first non-blank character are omitted."""
 
-    def metadata_isdir(self, name) -> bool:
+    def metadata_isdir(self, name: str) -> bool:
         """Is the named metadata a directory?  (like ``os.path.isdir()``)"""
 
-    def metadata_listdir(self, name):
+    def metadata_listdir(self, name: str) -> list[str]:
         """List of metadata names in the directory (like ``os.listdir()``)"""
 
-    def run_script(self, script_name, namespace):
+    def run_script(self, script_name: str, namespace: dict[str, Any]) -> None:
         """Execute the named script in the supplied namespace dictionary"""
 
 
 class IResourceProvider(IMetadataProvider, Protocol):
     """An object that provides access to package resources"""
 
-    def get_resource_filename(self, manager, resource_name):
+    def get_resource_filename(
+        self, manager: ResourceManager, resource_name: str
+    ) -> str:
         """Return a true filesystem path for `resource_name`
 
-        `manager` must be an ``IResourceManager``"""
+        `manager` must be a ``ResourceManager``"""
 
-    def get_resource_stream(self, manager, resource_name):
+    def get_resource_stream(
+        self, manager: ResourceManager, resource_name: str
+    ) -> _ResourceStream:
         """Return a readable file-like object for `resource_name`
 
-        `manager` must be an ``IResourceManager``"""
+        `manager` must be a ``ResourceManager``"""
 
-    def get_resource_string(self, manager, resource_name) -> bytes:
+    def get_resource_string(
+        self, manager: ResourceManager, resource_name: str
+    ) -> bytes:
         """Return the contents of `resource_name` as :obj:`bytes`
 
-        `manager` must be an ``IResourceManager``"""
+        `manager` must be a ``ResourceManager``"""
 
-    def has_resource(self, resource_name):
+    def has_resource(self, resource_name: str) -> bool:
         """Does the package contain the named resource?"""
 
-    def resource_isdir(self, resource_name):
+    def resource_isdir(self, resource_name: str) -> bool:
         """Is the named resource a directory?  (like ``os.path.isdir()``)"""
 
-    def resource_listdir(self, resource_name):
+    def resource_listdir(self, resource_name: str) -> list[str]:
         """List of resource names in the directory (like ``os.listdir()``)"""
 
 
 class WorkingSet:
     """A collection of active distributions on sys.path (or a similar list)"""
 
-    def __init__(self, entries=None):
+    def __init__(self, entries: Iterable[str] | None = None):
         """Create working set from list of path entries (default=sys.path)"""
-        self.entries = []
+        self.entries: list[str] = []
         self.entry_keys = {}
         self.by_key = {}
         self.normalized_to_canonical_keys = {}
@@ -623,7 +681,7 @@ def _build_from_requirements(cls, req_spec):
         sys.path[:] = ws.entries
         return ws
 
-    def add_entry(self, entry):
+    def add_entry(self, entry: str):
         """Add a path item to ``.entries``, finding any distributions on it
 
         ``find_distributions(entry, True)`` is used to find distributions
@@ -638,11 +696,11 @@ def add_entry(self, entry):
         for dist in find_distributions(entry, True):
             self.add(dist, entry, False)
 
-    def __contains__(self, dist):
+    def __contains__(self, dist: Distribution) -> bool:
         """True if `dist` is the active distribution for its project"""
         return self.by_key.get(dist.key) == dist
 
-    def find(self, req):
+    def find(self, req: Requirement) -> Distribution | None:
         """Find a distribution matching requirement `req`
 
         If there is an active distribution for the requested project, this
@@ -666,7 +724,7 @@ def find(self, req):
             raise VersionConflict(dist, req)
         return dist
 
-    def iter_entry_points(self, group, name=None):
+    def iter_entry_points(self, group: str, name: str | None = None):
         """Yield entry point objects from `group` matching `name`
 
         If `name` is None, yields all entry points in `group` from all
@@ -680,7 +738,7 @@ def iter_entry_points(self, group, name=None):
             if name is None or name == entry.name
         )
 
-    def run_script(self, requires, script_name):
+    def run_script(self, requires: str, script_name: str):
         """Locate distribution for `requires` and run `script_name` script"""
         ns = sys._getframe(1).f_globals
         name = ns['__name__']
@@ -688,13 +746,13 @@ def run_script(self, requires, script_name):
         ns['__name__'] = name
         self.require(requires)[0].run_script(script_name, ns)
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[Distribution]:
         """Yield distributions for non-duplicate projects in the working set
 
         The yield order is the order in which the items' path entries were
         added to the working set.
         """
-        seen = {}
+        seen = set()
         for item in self.entries:
             if item not in self.entry_keys:
                 # workaround a cache issue
@@ -702,10 +760,16 @@ def __iter__(self):
 
             for key in self.entry_keys[item]:
                 if key not in seen:
-                    seen[key] = 1
+                    seen.add(key)
                     yield self.by_key[key]
 
-    def add(self, dist, entry=None, insert=True, replace=False):
+    def add(
+        self,
+        dist: Distribution,
+        entry: str | None = None,
+        insert: bool = True,
+        replace: bool = False,
+    ):
         """Add `dist` to working set, associated with `entry`
 
         If `entry` is unspecified, it defaults to the ``.location`` of `dist`.
@@ -729,7 +793,7 @@ def add(self, dist, entry=None, insert=True, replace=False):
             return
 
         self.by_key[dist.key] = dist
-        normalized_name = packaging.utils.canonicalize_name(dist.key)
+        normalized_name = _packaging_utils.canonicalize_name(dist.key)
         self.normalized_to_canonical_keys[normalized_name] = dist.key
         if dist.key not in keys:
             keys.append(dist.key)
@@ -737,14 +801,42 @@ def add(self, dist, entry=None, insert=True, replace=False):
             keys2.append(dist.key)
         self._added_new(dist)
 
+    @overload
     def resolve(
         self,
-        requirements,
-        env=None,
-        installer=None,
-        replace_conflicting=False,
-        extras=None,
-    ):
+        requirements: Iterable[Requirement],
+        env: Environment | None,
+        installer: _InstallerTypeT[_DistributionT],
+        replace_conflicting: bool = False,
+        extras: tuple[str, ...] | None = None,
+    ) -> list[_DistributionT]: ...
+    @overload
+    def resolve(
+        self,
+        requirements: Iterable[Requirement],
+        env: Environment | None = None,
+        *,
+        installer: _InstallerTypeT[_DistributionT],
+        replace_conflicting: bool = False,
+        extras: tuple[str, ...] | None = None,
+    ) -> list[_DistributionT]: ...
+    @overload
+    def resolve(
+        self,
+        requirements: Iterable[Requirement],
+        env: Environment | None = None,
+        installer: _InstallerType | None = None,
+        replace_conflicting: bool = False,
+        extras: tuple[str, ...] | None = None,
+    ) -> list[Distribution]: ...
+    def resolve(
+        self,
+        requirements: Iterable[Requirement],
+        env: Environment | None = None,
+        installer: _InstallerType | None | _InstallerTypeT[_DistributionT] = None,
+        replace_conflicting: bool = False,
+        extras: tuple[str, ...] | None = None,
+    ) -> list[Distribution] | list[_DistributionT]:
         """List all distributions needed to (recursively) meet `requirements`
 
         `requirements` must be a sequence of ``Requirement`` objects.  `env`,
@@ -772,7 +864,7 @@ def resolve(
         # set up the stack
         requirements = list(requirements)[::-1]
         # set of processed requirements
-        processed = {}
+        processed = set()
         # key -> dist
         best = {}
         to_activate = []
@@ -806,14 +898,14 @@ def resolve(
                 required_by[new_requirement].add(req.project_name)
                 req_extras[new_requirement] = req.extras
 
-            processed[req] = True
+            processed.add(req)
 
         # return list of distros to activate
         return to_activate
 
     def _resolve_dist(
         self, req, best, replace_conflicting, env, installer, required_by, to_activate
-    ):
+    ) -> Distribution:
         dist = best.get(req.key)
         if dist is None:
             # Find the best distribution and add it to the map
@@ -842,7 +934,41 @@ def _resolve_dist(
             raise VersionConflict(dist, req).with_context(dependent_req)
         return dist
 
-    def find_plugins(self, plugin_env, full_env=None, installer=None, fallback=True):
+    @overload
+    def find_plugins(
+        self,
+        plugin_env: Environment,
+        full_env: Environment | None,
+        installer: _InstallerTypeT[_DistributionT],
+        fallback: bool = True,
+    ) -> tuple[list[_DistributionT], dict[Distribution, Exception]]: ...
+    @overload
+    def find_plugins(
+        self,
+        plugin_env: Environment,
+        full_env: Environment | None = None,
+        *,
+        installer: _InstallerTypeT[_DistributionT],
+        fallback: bool = True,
+    ) -> tuple[list[_DistributionT], dict[Distribution, Exception]]: ...
+    @overload
+    def find_plugins(
+        self,
+        plugin_env: Environment,
+        full_env: Environment | None = None,
+        installer: _InstallerType | None = None,
+        fallback: bool = True,
+    ) -> tuple[list[Distribution], dict[Distribution, Exception]]: ...
+    def find_plugins(
+        self,
+        plugin_env: Environment,
+        full_env: Environment | None = None,
+        installer: _InstallerType | None | _InstallerTypeT[_DistributionT] = None,
+        fallback: bool = True,
+    ) -> tuple[
+        list[Distribution] | list[_DistributionT],
+        dict[Distribution, Exception],
+    ]:
         """Find all activatable distributions in `plugin_env`
 
         Example usage::
@@ -881,8 +1007,8 @@ def find_plugins(self, plugin_env, full_env=None, installer=None, fallback=True)
         # scan project names in alphabetic order
         plugin_projects.sort()
 
-        error_info = {}
-        distributions = {}
+        error_info: dict[Distribution, Exception] = {}
+        distributions: dict[Distribution, Exception | None] = {}
 
         if full_env is None:
             env = Environment(self.entries)
@@ -918,12 +1044,12 @@ def find_plugins(self, plugin_env, full_env=None, installer=None, fallback=True)
                     # success, no need to try any more versions of this project
                     break
 
-        distributions = list(distributions)
-        distributions.sort()
+        sorted_distributions = list(distributions)
+        sorted_distributions.sort()
 
-        return distributions, error_info
+        return sorted_distributions, error_info
 
-    def require(self, *requirements):
+    def require(self, *requirements: _NestedStr):
         """Ensure that distributions matching `requirements` are activated
 
         `requirements` must be a string or a (possibly-nested) sequence
@@ -939,7 +1065,9 @@ def require(self, *requirements):
 
         return needed
 
-    def subscribe(self, callback, existing=True):
+    def subscribe(
+        self, callback: Callable[[Distribution], object], existing: bool = True
+    ):
         """Invoke `callback` for all distributions
 
         If `existing=True` (default),
@@ -975,12 +1103,12 @@ def __setstate__(self, e_k_b_n_c):
         self.callbacks = callbacks[:]
 
 
-class _ReqExtras(dict):
+class _ReqExtras(Dict["Requirement", Tuple[str, ...]]):
     """
     Map each requirement to the extras that demanded it.
     """
 
-    def markers_pass(self, req, extras=None):
+    def markers_pass(self, req: Requirement, extras: tuple[str, ...] | None = None):
         """
         Evaluate markers for req against each extra that
         demanded it.
@@ -999,7 +1127,10 @@ class Environment:
     """Searchable snapshot of distributions on a search path"""
 
     def __init__(
-        self, search_path=None, platform=get_supported_platform(), python=PY_MAJOR
+        self,
+        search_path: Iterable[str] | None = None,
+        platform: str | None = get_supported_platform(),
+        python: str | None = PY_MAJOR,
     ):
         """Snapshot distributions available on a search path
 
@@ -1022,7 +1153,7 @@ def __init__(
         self.python = python
         self.scan(search_path)
 
-    def can_add(self, dist):
+    def can_add(self, dist: Distribution):
         """Is distribution `dist` acceptable for this environment?
 
         The distribution must match the platform and python version
@@ -1036,11 +1167,11 @@ def can_add(self, dist):
         )
         return py_compat and compatible_platforms(dist.platform, self.platform)
 
-    def remove(self, dist):
+    def remove(self, dist: Distribution):
         """Remove `dist` from the environment"""
         self._distmap[dist.key].remove(dist)
 
-    def scan(self, search_path=None):
+    def scan(self, search_path: Iterable[str] | None = None):
         """Scan `search_path` for distributions usable in this environment
 
         Any distributions found are added to the environment.
@@ -1055,7 +1186,7 @@ def scan(self, search_path=None):
             for dist in find_distributions(item):
                 self.add(dist)
 
-    def __getitem__(self, project_name):
+    def __getitem__(self, project_name: str) -> list[Distribution]:
         """Return a newest-to-oldest list of distributions for `project_name`
 
         Uses case-insensitive `project_name` comparison, assuming all the
@@ -1066,7 +1197,7 @@ def __getitem__(self, project_name):
         distribution_key = project_name.lower()
         return self._distmap.get(distribution_key, [])
 
-    def add(self, dist):
+    def add(self, dist: Distribution):
         """Add `dist` if we ``can_add()`` it and it has not already been added"""
         if self.can_add(dist) and dist.has_version():
             dists = self._distmap.setdefault(dist.key, [])
@@ -1074,7 +1205,29 @@ def add(self, dist):
                 dists.append(dist)
                 dists.sort(key=operator.attrgetter('hashcmp'), reverse=True)
 
-    def best_match(self, req, working_set, installer=None, replace_conflicting=False):
+    @overload
+    def best_match(
+        self,
+        req: Requirement,
+        working_set: WorkingSet,
+        installer: _InstallerTypeT[_DistributionT],
+        replace_conflicting: bool = False,
+    ) -> _DistributionT: ...
+    @overload
+    def best_match(
+        self,
+        req: Requirement,
+        working_set: WorkingSet,
+        installer: _InstallerType | None = None,
+        replace_conflicting: bool = False,
+    ) -> Distribution | None: ...
+    def best_match(
+        self,
+        req: Requirement,
+        working_set: WorkingSet,
+        installer: _InstallerType | None | _InstallerTypeT[_DistributionT] = None,
+        replace_conflicting: bool = False,
+    ) -> Distribution | None:
         """Find distribution best matching `req` and usable on `working_set`
 
         This calls the ``find(req)`` method of the `working_set` to see if a
@@ -1101,7 +1254,32 @@ def best_match(self, req, working_set, installer=None, replace_conflicting=False
         # try to download/install
         return self.obtain(req, installer)
 
-    def obtain(self, requirement, installer=None):
+    @overload
+    def obtain(
+        self,
+        requirement: Requirement,
+        installer: _InstallerTypeT[_DistributionT],
+    ) -> _DistributionT: ...
+    @overload
+    def obtain(
+        self,
+        requirement: Requirement,
+        installer: Callable[[Requirement], None] | None = None,
+    ) -> None: ...
+    @overload
+    def obtain(
+        self,
+        requirement: Requirement,
+        installer: _InstallerType | None = None,
+    ) -> Distribution | None: ...
+    def obtain(
+        self,
+        requirement: Requirement,
+        installer: Callable[[Requirement], None]
+        | _InstallerType
+        | None
+        | _InstallerTypeT[_DistributionT] = None,
+    ) -> Distribution | None:
         """Obtain a distribution matching `requirement` (e.g. via download)
 
         Obtain a distro that matches requirement (e.g. via download).  In the
@@ -1112,13 +1290,13 @@ def obtain(self, requirement, installer=None):
         to the `installer` argument."""
         return installer(requirement) if installer else None
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[str]:
         """Yield the unique project names of the available distributions"""
         for key in self._distmap.keys():
             if self[key]:
                 yield key
 
-    def __iadd__(self, other):
+    def __iadd__(self, other: Distribution | Environment):
         """In-place addition of a distribution or environment"""
         if isinstance(other, Distribution):
             self.add(other)
@@ -1130,7 +1308,7 @@ def __iadd__(self, other):
             raise TypeError("Can't add %r to environment" % (other,))
         return self
 
-    def __add__(self, other):
+    def __add__(self, other: Distribution | Environment):
         """Add an environment or distribution to an environment"""
         new = self.__class__([], platform=None, python=None)
         for env in self, other:
@@ -1157,46 +1335,54 @@ class ExtractionError(RuntimeError):
         The exception instance that caused extraction to fail
     """
 
+    manager: ResourceManager
+    cache_path: str
+    original_error: BaseException | None
+
 
 class ResourceManager:
     """Manage resource extraction and packages"""
 
-    extraction_path = None
+    extraction_path: str | None = None
 
     def __init__(self):
         self.cached_files = {}
 
-    def resource_exists(self, package_or_requirement, resource_name):
+    def resource_exists(self, package_or_requirement: _PkgReqType, resource_name: str):
         """Does the named resource exist?"""
         return get_provider(package_or_requirement).has_resource(resource_name)
 
-    def resource_isdir(self, package_or_requirement, resource_name):
+    def resource_isdir(self, package_or_requirement: _PkgReqType, resource_name: str):
         """Is the named resource an existing directory?"""
         return get_provider(package_or_requirement).resource_isdir(resource_name)
 
-    def resource_filename(self, package_or_requirement, resource_name):
+    def resource_filename(
+        self, package_or_requirement: _PkgReqType, resource_name: str
+    ):
         """Return a true filesystem path for specified resource"""
         return get_provider(package_or_requirement).get_resource_filename(
             self, resource_name
         )
 
-    def resource_stream(self, package_or_requirement, resource_name):
+    def resource_stream(self, package_or_requirement: _PkgReqType, resource_name: str):
         """Return a readable file-like object for specified resource"""
         return get_provider(package_or_requirement).get_resource_stream(
             self, resource_name
         )
 
-    def resource_string(self, package_or_requirement, resource_name) -> bytes:
+    def resource_string(
+        self, package_or_requirement: _PkgReqType, resource_name: str
+    ) -> bytes:
         """Return specified resource as :obj:`bytes`"""
         return get_provider(package_or_requirement).get_resource_string(
             self, resource_name
         )
 
-    def resource_listdir(self, package_or_requirement, resource_name):
+    def resource_listdir(self, package_or_requirement: _PkgReqType, resource_name: str):
         """List the contents of the named resource directory"""
         return get_provider(package_or_requirement).resource_listdir(resource_name)
 
-    def extraction_error(self):
+    def extraction_error(self) -> NoReturn:
         """Give an error message for problems extracting file(s)"""
 
         old_exc = sys.exc_info()[1]
@@ -1226,7 +1412,7 @@ def extraction_error(self):
         err.original_error = old_exc
         raise err
 
-    def get_cache_path(self, archive_name, names=()):
+    def get_cache_path(self, archive_name: str, names: Iterable[StrPath] = ()):
         """Return absolute location in cache for `archive_name` and `names`
 
         The parent directory of the resulting path will be created if it does
@@ -1248,7 +1434,7 @@ def get_cache_path(self, archive_name, names=()):
 
         self._warn_unsafe_extraction_path(extract_path)
 
-        self.cached_files[target_path] = 1
+        self.cached_files[target_path] = True
         return target_path
 
     @staticmethod
@@ -1278,7 +1464,7 @@ def _warn_unsafe_extraction_path(path):
             ).format(**locals())
             warnings.warn(msg, UserWarning)
 
-    def postprocess(self, tempname, filename):
+    def postprocess(self, tempname: StrOrBytesPath, filename: StrOrBytesPath):
         """Perform any platform-specific postprocessing of `tempname`
 
         This is where Mac header rewrites should be done; other platforms don't
@@ -1298,7 +1484,7 @@ def postprocess(self, tempname, filename):
             mode = ((os.stat(tempname).st_mode) | 0o555) & 0o7777
             os.chmod(tempname, mode)
 
-    def set_extraction_path(self, path):
+    def set_extraction_path(self, path: str):
         """Set the base path where resources will be extracted to, if needed.
 
         If you do not call this routine before any extractions take place, the
@@ -1322,7 +1508,7 @@ def set_extraction_path(self, path):
 
         self.extraction_path = path
 
-    def cleanup_resources(self, force=False) -> List[str]:
+    def cleanup_resources(self, force: bool = False) -> list[str]:
         """
         Delete all extracted resource files and directories, returning a list
         of the file and directory names that could not be successfully removed.
@@ -1337,18 +1523,16 @@ def cleanup_resources(self, force=False) -> List[str]:
         return []
 
 
-def get_default_cache():
+def get_default_cache() -> str:
     """
     Return the ``PYTHON_EGG_CACHE`` environment variable
     or a platform-relevant user cache dir for an app
     named "Python-Eggs".
     """
-    return os.environ.get('PYTHON_EGG_CACHE') or platformdirs.user_cache_dir(
-        appname='Python-Eggs'
-    )
+    return os.environ.get('PYTHON_EGG_CACHE') or _user_cache_dir(appname='Python-Eggs')
 
 
-def safe_name(name):
+def safe_name(name: str):
     """Convert an arbitrary string to a standard distribution name
 
     Any runs of non-alphanumeric/. characters are replaced with a single '-'.
@@ -1356,14 +1540,14 @@ def safe_name(name):
     return re.sub('[^A-Za-z0-9.]+', '-', name)
 
 
-def safe_version(version):
+def safe_version(version: str):
     """
     Convert an arbitrary string to a standard version string
     """
     try:
         # normalize the version
-        return str(packaging.version.Version(version))
-    except packaging.version.InvalidVersion:
+        return str(_packaging_version.Version(version))
+    except _packaging_version.InvalidVersion:
         version = version.replace(' ', '.')
         return re.sub('[^A-Za-z0-9.]+', '-', version)
 
@@ -1400,7 +1584,7 @@ def _safe_segment(segment):
     return re.sub(r'\.[^A-Za-z0-9]+', '.', segment).strip(".-")
 
 
-def safe_extra(extra):
+def safe_extra(extra: str):
     """Convert an arbitrary string to a standard 'extra' name
 
     Any runs of non-alphanumeric characters are replaced with a single '_',
@@ -1409,7 +1593,7 @@ def safe_extra(extra):
     return re.sub('[^A-Za-z0-9.-]+', '_', extra).lower()
 
 
-def to_filename(name):
+def to_filename(name: str):
     """Convert a project or version name to its filename-escaped form
 
     Any '-' characters are currently replaced with '_'.
@@ -1417,7 +1601,7 @@ def to_filename(name):
     return name.replace('-', '_')
 
 
-def invalid_marker(text):
+def invalid_marker(text: str):
     """
     Validate text as a PEP 508 environment marker; return an exception
     if invalid or False otherwise.
@@ -1431,7 +1615,7 @@ def invalid_marker(text):
     return False
 
 
-def evaluate_marker(text, extra=None):
+def evaluate_marker(text: str, extra: str | None = None) -> bool:
     """
     Evaluate a PEP 508 environment marker.
     Return a boolean indicating the marker result in this environment.
@@ -1440,46 +1624,48 @@ def evaluate_marker(text, extra=None):
     This implementation uses the 'pyparsing' module.
     """
     try:
-        marker = packaging.markers.Marker(text)
+        marker = _packaging_markers.Marker(text)
         return marker.evaluate()
-    except packaging.markers.InvalidMarker as e:
+    except _packaging_markers.InvalidMarker as e:
         raise SyntaxError(e) from e
 
 
 class NullProvider:
     """Try to implement resources and metadata for arbitrary PEP 302 loaders"""
 
-    egg_name = None
-    egg_info = None
-    loader = None
+    egg_name: str | None = None
+    egg_info: str | None = None
+    loader: _LoaderProtocol | None = None
 
-    def __init__(self, module):
+    def __init__(self, module: _ModuleLike):
         self.loader = getattr(module, '__loader__', None)
         self.module_path = os.path.dirname(getattr(module, '__file__', ''))
 
-    def get_resource_filename(self, manager, resource_name):
+    def get_resource_filename(self, manager: ResourceManager, resource_name: str):
         return self._fn(self.module_path, resource_name)
 
-    def get_resource_stream(self, manager, resource_name):
+    def get_resource_stream(self, manager: ResourceManager, resource_name: str):
         return io.BytesIO(self.get_resource_string(manager, resource_name))
 
-    def get_resource_string(self, manager, resource_name) -> bytes:
+    def get_resource_string(
+        self, manager: ResourceManager, resource_name: str
+    ) -> bytes:
         return self._get(self._fn(self.module_path, resource_name))
 
-    def has_resource(self, resource_name):
+    def has_resource(self, resource_name: str):
         return self._has(self._fn(self.module_path, resource_name))
 
     def _get_metadata_path(self, name):
         return self._fn(self.egg_info, name)
 
-    def has_metadata(self, name) -> bool:
+    def has_metadata(self, name: str) -> bool:
         if not self.egg_info:
             return False
 
         path = self._get_metadata_path(name)
         return self._has(path)
 
-    def get_metadata(self, name):
+    def get_metadata(self, name: str):
         if not self.egg_info:
             return ""
         path = self._get_metadata_path(name)
@@ -1492,24 +1678,24 @@ def get_metadata(self, name):
             exc.reason += ' in {} file at path: {}'.format(name, path)
             raise
 
-    def get_metadata_lines(self, name):
+    def get_metadata_lines(self, name: str) -> Iterator[str]:
         return yield_lines(self.get_metadata(name))
 
-    def resource_isdir(self, resource_name):
+    def resource_isdir(self, resource_name: str):
         return self._isdir(self._fn(self.module_path, resource_name))
 
-    def metadata_isdir(self, name) -> bool:
+    def metadata_isdir(self, name: str) -> bool:
         return bool(self.egg_info and self._isdir(self._fn(self.egg_info, name)))
 
-    def resource_listdir(self, resource_name):
+    def resource_listdir(self, resource_name: str):
         return self._listdir(self._fn(self.module_path, resource_name))
 
-    def metadata_listdir(self, name):
+    def metadata_listdir(self, name: str) -> list[str]:
         if self.egg_info:
             return self._listdir(self._fn(self.egg_info, name))
         return []
 
-    def run_script(self, script_name, namespace):
+    def run_script(self, script_name: str, namespace: dict[str, Any]):
         script = 'scripts/' + script_name
         if not self.has_metadata(script):
             raise ResolutionError(
@@ -1517,13 +1703,13 @@ def run_script(self, script_name, namespace):
                     **locals()
                 ),
             )
+
         script_text = self.get_metadata(script).replace('\r\n', '\n')
         script_text = script_text.replace('\r', '\n')
         script_filename = self._fn(self.egg_info, script)
         namespace['__file__'] = script_filename
         if os.path.exists(script_filename):
-            with open(script_filename) as fid:
-                source = fid.read()
+            source = _read_utf8_with_fallback(script_filename)
             code = compile(source, script_filename, 'exec')
             exec(code, namespace, namespace)
         else:
@@ -1548,12 +1734,16 @@ def _isdir(self, path) -> bool:
             "Can't perform this operation for unregistered loader type"
         )
 
-    def _listdir(self, path):
+    def _listdir(self, path) -> list[str]:
         raise NotImplementedError(
             "Can't perform this operation for unregistered loader type"
         )
 
-    def _fn(self, base, resource_name):
+    def _fn(self, base: str | None, resource_name: str):
+        if base is None:
+            raise TypeError(
+                "`base` parameter in `_fn` is `None`. Either override this method or check the parameter first."
+            )
         self._validate_resource_path(resource_name)
         if resource_name:
             return os.path.join(base, *resource_name.split('/'))
@@ -1616,6 +1806,7 @@ def _validate_resource_path(path):
             os.path.pardir in path.split(posixpath.sep)
             or posixpath.isabs(path)
             or ntpath.isabs(path)
+            or path.startswith("\\")
         )
         if not invalid:
             return
@@ -1623,7 +1814,7 @@ def _validate_resource_path(path):
         msg = "Use of .. or absolute path in a resource path is not allowed."
 
         # Aggressively disallow Windows absolute paths
-        if ntpath.isabs(path) and not posixpath.isabs(path):
+        if (path.startswith("\\") or ntpath.isabs(path)) and not posixpath.isabs(path):
             raise ValueError(msg)
 
         # for compatibility, warn; in future
@@ -1634,8 +1825,9 @@ def _validate_resource_path(path):
         )
 
     def _get(self, path) -> bytes:
-        if hasattr(self.loader, 'get_data'):
-            return self.loader.get_data(path)
+        if hasattr(self.loader, 'get_data') and self.loader:
+            # Already checked get_data exists
+            return self.loader.get_data(path)  # type: ignore[attr-defined]
         raise NotImplementedError(
             "Can't perform this operation for loaders without 'get_data()'"
         )
@@ -1658,7 +1850,7 @@ def _parents(path):
 class EggProvider(NullProvider):
     """Provider based on a virtual filesystem"""
 
-    def __init__(self, module):
+    def __init__(self, module: _ModuleLike):
         super().__init__(module)
         self._setup_prefix()
 
@@ -1669,7 +1861,7 @@ def _setup_prefix(self):
         egg = next(eggs, None)
         egg and self._set_egg(egg)
 
-    def _set_egg(self, path):
+    def _set_egg(self, path: str):
         self.egg_name = os.path.basename(path)
         self.egg_info = os.path.join(path, 'EGG-INFO')
         self.egg_root = path
@@ -1687,7 +1879,7 @@ def _isdir(self, path) -> bool:
     def _listdir(self, path):
         return os.listdir(path)
 
-    def get_resource_stream(self, manager, resource_name):
+    def get_resource_stream(self, manager: object, resource_name: str):
         return open(self._fn(self.module_path, resource_name), 'rb')
 
     def _get(self, path) -> bytes:
@@ -1711,7 +1903,8 @@ def _register(cls):
 class EmptyProvider(NullProvider):
     """Provider that returns nothing for all requests"""
 
-    module_path = None
+    # A special case, we don't want all Providers inheriting from NullProvider to have a potentially None module_path
+    module_path: str | None = None  # type: ignore[assignment]
 
     _isdir = _has = lambda self, path: False
 
@@ -1728,13 +1921,14 @@ def __init__(self):
 empty_provider = EmptyProvider()
 
 
-class ZipManifests(dict):
+class ZipManifests(Dict[str, "MemoizedZipManifests.manifest_mod"]):
     """
     zip manifest builder
     """
 
+    # `path` could be `StrPath | IO[bytes]` but that violates the LSP for `MemoizedZipManifests.load`
     @classmethod
-    def build(cls, path):
+    def build(cls, path: str):
         """
         Build a dictionary similar to the zipimport directory
         caches, except instead of tuples, store ZipInfo objects.
@@ -1760,9 +1954,11 @@ class MemoizedZipManifests(ZipManifests):
     Memoized zipfile manifests.
     """
 
-    manifest_mod = collections.namedtuple('manifest_mod', 'manifest mtime')
+    class manifest_mod(NamedTuple):
+        manifest: dict[str, zipfile.ZipInfo]
+        mtime: float
 
-    def load(self, path):
+    def load(self, path: str) -> dict[str, zipfile.ZipInfo]:  # type: ignore[override] # ZipManifests.load is a classmethod
         """
         Load a manifest at path or return a suitable manifest already loaded.
         """
@@ -1779,10 +1975,12 @@ def load(self, path):
 class ZipProvider(EggProvider):
     """Resource support for zips and eggs"""
 
-    eagers = None
+    eagers: list[str] | None = None
     _zip_manifests = MemoizedZipManifests()
+    # ZipProvider's loader should always be a zipimporter or equivalent
+    loader: zipimport.zipimporter
 
-    def __init__(self, module):
+    def __init__(self, module: _ZipLoaderModule):
         super().__init__(module)
         self.zip_pre = self.loader.archive + os.sep
 
@@ -1808,7 +2006,7 @@ def _parts(self, zip_path):
     def zipinfo(self):
         return self._zip_manifests.load(self.loader.archive)
 
-    def get_resource_filename(self, manager, resource_name):
+    def get_resource_filename(self, manager: ResourceManager, resource_name: str):
         if not self.egg_name:
             raise NotImplementedError(
                 "resource_filename() only supported for .egg, not .zip"
@@ -1831,7 +2029,7 @@ def _get_date_and_size(zip_stat):
         return timestamp, size
 
     # FIXME: 'ZipProvider._extract_resource' is too complex (12)
-    def _extract_resource(self, manager, zip_path):  # noqa: C901
+    def _extract_resource(self, manager: ResourceManager, zip_path) -> str:  # noqa: C901
         if zip_path in self._index():
             for name in self._index()[zip_path]:
                 last = self._extract_resource(manager, os.path.join(zip_path, name))
@@ -1842,9 +2040,13 @@ def _extract_resource(self, manager, zip_path):  # noqa: C901
 
         if not WRITE_SUPPORT:
             raise OSError(
-                '"os.rename" and "os.unlink" are not supported ' 'on this platform'
+                '"os.rename" and "os.unlink" are not supported on this platform'
             )
         try:
+            if not self.egg_name:
+                raise OSError(
+                    '"egg_name" is empty. This likely means no egg could be found from the "module_path".'
+                )
             real_path = manager.get_cache_path(self.egg_name, self._parts(zip_path))
 
             if self._is_current(real_path, zip_path):
@@ -1933,10 +2135,10 @@ def _isdir(self, fspath) -> bool:
     def _listdir(self, fspath):
         return list(self._index().get(self._zipinfo_name(fspath), ()))
 
-    def _eager_to_zip(self, resource_name):
+    def _eager_to_zip(self, resource_name: str):
         return self._zipinfo_name(self._fn(self.egg_root, resource_name))
 
-    def _resource_to_zip(self, resource_name):
+    def _resource_to_zip(self, resource_name: str):
         return self._zipinfo_name(self._fn(self.module_path, resource_name))
 
 
@@ -1955,16 +2157,16 @@ class FileMetadata(EmptyProvider):
     the provided location.
     """
 
-    def __init__(self, path):
+    def __init__(self, path: StrPath):
         self.path = path
 
     def _get_metadata_path(self, name):
         return self.path
 
-    def has_metadata(self, name) -> bool:
+    def has_metadata(self, name: str) -> bool:
         return name == 'PKG-INFO' and os.path.isfile(self.path)
 
-    def get_metadata(self, name):
+    def get_metadata(self, name: str):
         if name != 'PKG-INFO':
             raise KeyError("No metadata except PKG-INFO is available")
 
@@ -1980,7 +2182,7 @@ def _warn_on_replacement(self, metadata):
             msg = tmpl.format(**locals())
             warnings.warn(msg)
 
-    def get_metadata_lines(self, name):
+    def get_metadata_lines(self, name: str) -> Iterator[str]:
         return yield_lines(self.get_metadata(name))
 
 
@@ -2004,7 +2206,7 @@ class PathMetadata(DefaultProvider):
         dist = Distribution.from_filename(egg_path, metadata=metadata)
     """
 
-    def __init__(self, path, egg_info):
+    def __init__(self, path: str, egg_info: str):
         self.module_path = path
         self.egg_info = egg_info
 
@@ -2012,7 +2214,7 @@ def __init__(self, path, egg_info):
 class EggMetadata(ZipProvider):
     """Metadata provider for .egg files"""
 
-    def __init__(self, importer):
+    def __init__(self, importer: zipimport.zipimporter):
         """Create a metadata provider from a zipimporter"""
 
         self.zip_pre = importer.archive + os.sep
@@ -2024,10 +2226,12 @@ def __init__(self, importer):
         self._setup_prefix()
 
 
-_declare_state('dict', _distribution_finders={})
+_distribution_finders: dict[type, _DistFinderType[Any]] = _declare_state(
+    'dict', '_distribution_finders', {}
+)
 
 
-def register_finder(importer_type, distribution_finder):
+def register_finder(importer_type: type[_T], distribution_finder: _DistFinderType[_T]):
     """Register `distribution_finder` to find distributions in sys.path items
 
     `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item
@@ -2037,14 +2241,16 @@ def register_finder(importer_type, distribution_finder):
     _distribution_finders[importer_type] = distribution_finder
 
 
-def find_distributions(path_item, only=False):
+def find_distributions(path_item: str, only: bool = False):
     """Yield distributions accessible via `path_item`"""
     importer = get_importer(path_item)
     finder = _find_adapter(_distribution_finders, importer)
     return finder(importer, path_item, only)
 
 
-def find_eggs_in_zip(importer, path_item, only=False):
+def find_eggs_in_zip(
+    importer: zipimport.zipimporter, path_item: str, only: bool = False
+) -> Iterator[Distribution]:
     """
     Find eggs in zip files; possibly multiple nested eggs.
     """
@@ -2073,14 +2279,16 @@ def find_eggs_in_zip(importer, path_item, only=False):
 register_finder(zipimport.zipimporter, find_eggs_in_zip)
 
 
-def find_nothing(importer, path_item, only=False):
+def find_nothing(
+    importer: object | None, path_item: str | None, only: bool | None = False
+):
     return ()
 
 
 register_finder(object, find_nothing)
 
 
-def find_on_path(importer, path_item, only=False):
+def find_on_path(importer: object | None, path_item, only=False):
     """Yield distributions accessible on a sys.path directory"""
     path_item = _normalize_cached(path_item)
 
@@ -2135,7 +2343,7 @@ def __call__(self, fullpath):
         return iter(())
 
 
-def safe_listdir(path):
+def safe_listdir(path: StrOrBytesPath):
     """
     Attempt to list contents of path, but suppress some exceptions.
     """
@@ -2151,13 +2359,13 @@ def safe_listdir(path):
     return ()
 
 
-def distributions_from_metadata(path):
+def distributions_from_metadata(path: str):
     root = os.path.dirname(path)
     if os.path.isdir(path):
         if len(os.listdir(path)) == 0:
             # empty metadata dir; skip
             return
-        metadata = PathMetadata(root, path)
+        metadata: _MetadataType = PathMetadata(root, path)
     else:
         metadata = FileMetadata(path)
     entry = os.path.basename(path)
@@ -2173,11 +2381,10 @@ def non_empty_lines(path):
     """
     Yield non-empty lines from file at path
     """
-    with open(path) as f:
-        for line in f:
-            line = line.strip()
-            if line:
-                yield line
+    for line in _read_utf8_with_fallback(path).splitlines():
+        line = line.strip()
+        if line:
+            yield line
 
 
 def resolve_egg_link(path):
@@ -2198,11 +2405,17 @@ def resolve_egg_link(path):
 
 register_finder(importlib.machinery.FileFinder, find_on_path)
 
-_declare_state('dict', _namespace_handlers={})
-_declare_state('dict', _namespace_packages={})
+_namespace_handlers: dict[type, _NSHandlerType[Any]] = _declare_state(
+    'dict', '_namespace_handlers', {}
+)
+_namespace_packages: dict[str | None, list[str]] = _declare_state(
+    'dict', '_namespace_packages', {}
+)
 
 
-def register_namespace_handler(importer_type, namespace_handler):
+def register_namespace_handler(
+    importer_type: type[_T], namespace_handler: _NSHandlerType[_T]
+):
     """Register `namespace_handler` to declare namespace packages
 
     `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item
@@ -2257,7 +2470,7 @@ def _handle_ns(packageName, path_item):
     return subpath
 
 
-def _rebuild_mod_path(orig_path, package_name, module):
+def _rebuild_mod_path(orig_path, package_name, module: types.ModuleType):
     """
     Rebuild module.__path__ ensuring that all entries are ordered
     corresponding to their sys.path order
@@ -2291,7 +2504,7 @@ def position_in_sys_path(path):
         module.__path__ = new_path
 
 
-def declare_namespace(packageName):
+def declare_namespace(packageName: str):
     """Declare that package 'packageName' is a namespace package"""
 
     msg = (
@@ -2308,7 +2521,7 @@ def declare_namespace(packageName):
         if packageName in _namespace_packages:
             return
 
-        path = sys.path
+        path: MutableSequence[str] = sys.path
         parent, _, _ = packageName.rpartition('.')
 
         if parent:
@@ -2334,7 +2547,7 @@ def declare_namespace(packageName):
         _imp.release_lock()
 
 
-def fixup_namespace_packages(path_item, parent=None):
+def fixup_namespace_packages(path_item: str, parent: str | None = None):
     """Ensure that previously-declared namespace packages include path_item"""
     _imp.acquire_lock()
     try:
@@ -2346,7 +2559,12 @@ def fixup_namespace_packages(path_item, parent=None):
         _imp.release_lock()
 
 
-def file_ns_handler(importer, path_item, packageName, module):
+def file_ns_handler(
+    importer: object,
+    path_item: StrPath,
+    packageName: str,
+    module: types.ModuleType,
+):
     """Compute an ns-package subpath for a filesystem or zipfile importer"""
 
     subpath = os.path.join(path_item, packageName.split('.')[-1])
@@ -2366,19 +2584,28 @@ def file_ns_handler(importer, path_item, packageName, module):
 register_namespace_handler(importlib.machinery.FileFinder, file_ns_handler)
 
 
-def null_ns_handler(importer, path_item, packageName, module):
+def null_ns_handler(
+    importer: object,
+    path_item: str | None,
+    packageName: str | None,
+    module: _ModuleLike | None,
+):
     return None
 
 
 register_namespace_handler(object, null_ns_handler)
 
 
-def normalize_path(filename):
+@overload
+def normalize_path(filename: StrPath) -> str: ...
+@overload
+def normalize_path(filename: BytesPath) -> bytes: ...
+def normalize_path(filename: StrOrBytesPath):
     """Normalize a file/dir name for comparison purposes"""
     return os.path.normcase(os.path.realpath(os.path.normpath(_cygwin_patch(filename))))
 
 
-def _cygwin_patch(filename):  # pragma: nocover
+def _cygwin_patch(filename: StrOrBytesPath):  # pragma: nocover
     """
     Contrary to POSIX 2008, on Cygwin, getcwd (3) contains
     symlink components. Using
@@ -2389,9 +2616,19 @@ def _cygwin_patch(filename):  # pragma: nocover
     return os.path.abspath(filename) if sys.platform == 'cygwin' else filename
 
 
-@functools.lru_cache(maxsize=None)
-def _normalize_cached(filename):
-    return normalize_path(filename)
+if TYPE_CHECKING:
+    # https://github.com/python/mypy/issues/16261
+    # https://github.com/python/typeshed/issues/6347
+    @overload
+    def _normalize_cached(filename: StrPath) -> str: ...
+    @overload
+    def _normalize_cached(filename: BytesPath) -> bytes: ...
+    def _normalize_cached(filename: StrOrBytesPath) -> str | bytes: ...
+else:
+
+    @functools.lru_cache(maxsize=None)
+    def _normalize_cached(filename):
+        return normalize_path(filename)
 
 
 def _is_egg_path(path):
@@ -2444,7 +2681,14 @@ def _set_parent_ns(packageName):
 class EntryPoint:
     """Object representing an advertised importable object"""
 
-    def __init__(self, name, module_name, attrs=(), extras=(), dist=None):
+    def __init__(
+        self,
+        name: str,
+        module_name: str,
+        attrs: Iterable[str] = (),
+        extras: Iterable[str] = (),
+        dist: Distribution | None = None,
+    ):
         if not MODULE(module_name):
             raise ValueError("Invalid module name", module_name)
         self.name = name
@@ -2464,7 +2708,26 @@ def __str__(self):
     def __repr__(self):
         return "EntryPoint.parse(%r)" % str(self)
 
-    def load(self, require=True, *args, **kwargs):
+    @overload
+    def load(
+        self,
+        require: Literal[True] = True,
+        env: Environment | None = None,
+        installer: _InstallerType | None = None,
+    ) -> _ResolvedEntryPoint: ...
+    @overload
+    def load(
+        self,
+        require: Literal[False],
+        *args: Any,
+        **kwargs: Any,
+    ) -> _ResolvedEntryPoint: ...
+    def load(
+        self,
+        require: bool = True,
+        *args: Environment | _InstallerType | None,
+        **kwargs: Environment | _InstallerType | None,
+    ) -> _ResolvedEntryPoint:
         """
         Require packages for this EntryPoint, then resolve it.
         """
@@ -2476,10 +2739,12 @@ def load(self, require=True, *args, **kwargs):
                 stacklevel=2,
             )
         if require:
-            self.require(*args, **kwargs)
+            # We could pass `env` and `installer` directly,
+            # but keeping `*args` and `**kwargs` for backwards compatibility
+            self.require(*args, **kwargs)  # type: ignore
         return self.resolve()
 
-    def resolve(self):
+    def resolve(self) -> _ResolvedEntryPoint:
         """
         Resolve the entry point from its module and attrs.
         """
@@ -2489,9 +2754,14 @@ def resolve(self):
         except AttributeError as exc:
             raise ImportError(str(exc)) from exc
 
-    def require(self, env=None, installer=None):
-        if self.extras and not self.dist:
-            raise UnknownExtra("Can't require() without a distribution", self)
+    def require(
+        self,
+        env: Environment | None = None,
+        installer: _InstallerType | None = None,
+    ):
+        if not self.dist:
+            error_cls = UnknownExtra if self.extras else AttributeError
+            raise error_cls("Can't require() without a distribution", self)
 
         # Get the requirements for this entry point with all its extras and
         # then resolve them. We have to pass `extras` along when resolving so
@@ -2512,7 +2782,7 @@ def require(self, env=None, installer=None):
     )
 
     @classmethod
-    def parse(cls, src, dist=None):
+    def parse(cls, src: str, dist: Distribution | None = None):
         """Parse a single entry point from string `src`
 
         Entry point syntax follows the form::
@@ -2537,15 +2807,20 @@ def _parse_extras(cls, extras_spec):
             return ()
         req = Requirement.parse('x' + extras_spec)
         if req.specs:
-            raise ValueError()
+            raise ValueError
         return req.extras
 
     @classmethod
-    def parse_group(cls, group, lines, dist=None):
+    def parse_group(
+        cls,
+        group: str,
+        lines: _NestedStr,
+        dist: Distribution | None = None,
+    ):
         """Parse an entry point group"""
         if not MODULE(group):
             raise ValueError("Invalid group name", group)
-        this = {}
+        this: dict[str, Self] = {}
         for line in yield_lines(lines):
             ep = cls.parse(line, dist)
             if ep.name in this:
@@ -2554,14 +2829,19 @@ def parse_group(cls, group, lines, dist=None):
         return this
 
     @classmethod
-    def parse_map(cls, data, dist=None):
+    def parse_map(
+        cls,
+        data: str | Iterable[str] | dict[str, str | Iterable[str]],
+        dist: Distribution | None = None,
+    ):
         """Parse a map of entry point groups"""
+        _data: Iterable[tuple[str | None, str | Iterable[str]]]
         if isinstance(data, dict):
-            data = data.items()
+            _data = data.items()
         else:
-            data = split_sections(data)
-        maps = {}
-        for group, lines in data:
+            _data = split_sections(data)
+        maps: dict[str, dict[str, Self]] = {}
+        for group, lines in _data:
             if group is None:
                 if not lines:
                     continue
@@ -2595,13 +2875,13 @@ class Distribution:
 
     def __init__(
         self,
-        location=None,
-        metadata=None,
-        project_name=None,
-        version=None,
-        py_version=PY_MAJOR,
-        platform=None,
-        precedence=EGG_DIST,
+        location: str | None = None,
+        metadata: _MetadataType = None,
+        project_name: str | None = None,
+        version: str | None = None,
+        py_version: str | None = PY_MAJOR,
+        platform: str | None = None,
+        precedence: int = EGG_DIST,
     ):
         self.project_name = safe_name(project_name or 'Unknown')
         if version is not None:
@@ -2613,7 +2893,13 @@ def __init__(
         self._provider = metadata or empty_provider
 
     @classmethod
-    def from_location(cls, location, basename, metadata=None, **kw):
+    def from_location(
+        cls,
+        location: str,
+        basename: StrPath,
+        metadata: _MetadataType = None,
+        **kw: int,  # We could set `precedence` explicitly, but keeping this as `**kw` for full backwards and subclassing compatibility
+    ) -> Distribution:
         project_name, version, py_version, platform = [None] * 4
         basename, ext = os.path.splitext(basename)
         if ext.lower() in _distributionImpl:
@@ -2651,25 +2937,25 @@ def hashcmp(self):
     def __hash__(self):
         return hash(self.hashcmp)
 
-    def __lt__(self, other):
+    def __lt__(self, other: Distribution):
         return self.hashcmp < other.hashcmp
 
-    def __le__(self, other):
+    def __le__(self, other: Distribution):
         return self.hashcmp <= other.hashcmp
 
-    def __gt__(self, other):
+    def __gt__(self, other: Distribution):
         return self.hashcmp > other.hashcmp
 
-    def __ge__(self, other):
+    def __ge__(self, other: Distribution):
         return self.hashcmp >= other.hashcmp
 
-    def __eq__(self, other):
+    def __eq__(self, other: object):
         if not isinstance(other, self.__class__):
             # It's not a Distribution, so they are not equal
             return False
         return self.hashcmp == other.hashcmp
 
-    def __ne__(self, other):
+    def __ne__(self, other: object):
         return not self == other
 
     # These properties have to be lazy so that we don't have to load any
@@ -2689,12 +2975,12 @@ def parsed_version(self):
         if not hasattr(self, "_parsed_version"):
             try:
                 self._parsed_version = parse_version(self.version)
-            except packaging.version.InvalidVersion as ex:
+            except _packaging_version.InvalidVersion as ex:
                 info = f"(package: {self.project_name})"
                 if hasattr(ex, "add_note"):
                     ex.add_note(info)  # PEP 678
                     raise
-                raise packaging.version.InvalidVersion(f"{str(ex)} {info}") from None
+                raise _packaging_version.InvalidVersion(f"{str(ex)} {info}") from None
 
         return self._parsed_version
 
@@ -2702,7 +2988,7 @@ def parsed_version(self):
     def _forgiving_parsed_version(self):
         try:
             return self.parsed_version
-        except packaging.version.InvalidVersion as ex:
+        except _packaging_version.InvalidVersion as ex:
             self._parsed_version = parse_version(_forgiving_version(self.version))
 
             notes = "\n".join(getattr(ex, "__notes__", []))  # PEP 678
@@ -2752,14 +3038,14 @@ def _dep_map(self):
         return self.__dep_map
 
     @staticmethod
-    def _filter_extras(dm):
+    def _filter_extras(dm: dict[str | None, list[Requirement]]):
         """
         Given a mapping of extras to dependencies, strip off
         environment markers and filter out any dependencies
         not matching the markers.
         """
         for extra in list(filter(None, dm)):
-            new_extra = extra
+            new_extra: str | None = extra
             reqs = dm.pop(extra)
             new_extra, _, marker = extra.partition(':')
             fails_marker = marker and (
@@ -2779,10 +3065,10 @@ def _build_dep_map(self):
                 dm.setdefault(extra, []).extend(parse_requirements(reqs))
         return dm
 
-    def requires(self, extras=()):
+    def requires(self, extras: Iterable[str] = ()):
         """List of Requirements needed for this distro if `extras` are used"""
         dm = self._dep_map
-        deps = []
+        deps: list[Requirement] = []
         deps.extend(dm.get(None, ()))
         for ext in extras:
             try:
@@ -2818,12 +3104,12 @@ def _get_version(self):
         lines = self._get_metadata(self.PKG_INFO)
         return _version_from_file(lines)
 
-    def activate(self, path=None, replace=False):
+    def activate(self, path: list[str] | None = None, replace: bool = False):
         """Ensure distribution is importable on `path` (default=sys.path)"""
         if path is None:
             path = sys.path
         self.insert_on(path, replace=replace)
-        if path is sys.path:
+        if path is sys.path and self.location is not None:
             fixup_namespace_packages(self.location)
             for pkg in self._get_metadata('namespace_packages.txt'):
                 if pkg in sys.modules:
@@ -2868,45 +3154,57 @@ def __dir__(self):
         )
 
     @classmethod
-    def from_filename(cls, filename, metadata=None, **kw):
+    def from_filename(
+        cls,
+        filename: StrPath,
+        metadata: _MetadataType = None,
+        **kw: int,  # We could set `precedence` explicitly, but keeping this as `**kw` for full backwards and subclassing compatibility
+    ):
         return cls.from_location(
             _normalize_cached(filename), os.path.basename(filename), metadata, **kw
         )
 
     def as_requirement(self):
         """Return a ``Requirement`` that matches this distribution exactly"""
-        if isinstance(self.parsed_version, packaging.version.Version):
+        if isinstance(self.parsed_version, _packaging_version.Version):
             spec = "%s==%s" % (self.project_name, self.parsed_version)
         else:
             spec = "%s===%s" % (self.project_name, self.parsed_version)
 
         return Requirement.parse(spec)
 
-    def load_entry_point(self, group, name):
+    def load_entry_point(self, group: str, name: str) -> _ResolvedEntryPoint:
         """Return the `name` entry point of `group` or raise ImportError"""
         ep = self.get_entry_info(group, name)
         if ep is None:
             raise ImportError("Entry point %r not found" % ((group, name),))
         return ep.load()
 
-    def get_entry_map(self, group=None):
+    @overload
+    def get_entry_map(self, group: None = None) -> dict[str, dict[str, EntryPoint]]: ...
+    @overload
+    def get_entry_map(self, group: str) -> dict[str, EntryPoint]: ...
+    def get_entry_map(self, group: str | None = None):
         """Return the entry point map for `group`, or the full entry map"""
-        try:
-            ep_map = self._ep_map
-        except AttributeError:
-            ep_map = self._ep_map = EntryPoint.parse_map(
+        if not hasattr(self, "_ep_map"):
+            self._ep_map = EntryPoint.parse_map(
                 self._get_metadata('entry_points.txt'), self
             )
         if group is not None:
-            return ep_map.get(group, {})
-        return ep_map
+            return self._ep_map.get(group, {})
+        return self._ep_map
 
-    def get_entry_info(self, group, name):
+    def get_entry_info(self, group: str, name: str):
         """Return the EntryPoint object for `group`+`name`, or ``None``"""
         return self.get_entry_map(group).get(name)
 
     # FIXME: 'Distribution.insert_on' is too complex (13)
-    def insert_on(self, path, loc=None, replace=False):  # noqa: C901
+    def insert_on(  # noqa: C901
+        self,
+        path: list[str],
+        loc=None,
+        replace: bool = False,
+    ):
         """Ensure self.location is on path
 
         If replace=False (default):
@@ -3011,13 +3309,14 @@ def has_version(self):
             return False
         return True
 
-    def clone(self, **kw):
+    def clone(self, **kw: str | int | IResourceProvider | None):
         """Copy this distribution, substituting in any changed keyword args"""
         names = 'project_name version py_version platform location precedence'
         for attr in names.split():
             kw.setdefault(attr, getattr(self, attr, None))
         kw.setdefault('metadata', self._provider)
-        return self.__class__(**kw)
+        # Unsafely unpacking. But keeping **kw for backwards and subclassing compatibility
+        return self.__class__(**kw)  # type:ignore[arg-type]
 
     @property
     def extras(self):
@@ -3070,11 +3369,11 @@ def _dep_map(self):
             self.__dep_map = self._compute_dependencies()
             return self.__dep_map
 
-    def _compute_dependencies(self):
+    def _compute_dependencies(self) -> dict[str | None, list[Requirement]]:
         """Recompute this distribution's dependencies."""
-        dm = self.__dep_map = {None: []}
+        self.__dep_map: dict[str | None, list[Requirement]] = {None: []}
 
-        reqs = []
+        reqs: list[Requirement] = []
         # Including any condition expressions
         for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
             reqs.extend(parse_requirements(req))
@@ -3085,13 +3384,15 @@ def reqs_for_extra(extra):
                     yield req
 
         common = types.MappingProxyType(dict.fromkeys(reqs_for_extra(None)))
-        dm[None].extend(common)
+        self.__dep_map[None].extend(common)
 
         for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
             s_extra = safe_extra(extra.strip())
-            dm[s_extra] = [r for r in reqs_for_extra(extra) if r not in common]
+            self.__dep_map[s_extra] = [
+                r for r in reqs_for_extra(extra) if r not in common
+            ]
 
-        return dm
+        return self.__dep_map
 
 
 _distributionImpl = {
@@ -3114,7 +3415,7 @@ def issue_warning(*args, **kw):
     warnings.warn(stacklevel=level + 1, *args, **kw)
 
 
-def parse_requirements(strs):
+def parse_requirements(strs: _NestedStr):
     """
     Yield ``Requirement`` objects for each specification in `strs`.
 
@@ -3123,19 +3424,20 @@ def parse_requirements(strs):
     return map(Requirement, join_continuation(map(drop_comment, yield_lines(strs))))
 
 
-class RequirementParseError(packaging.requirements.InvalidRequirement):
+class RequirementParseError(_packaging_requirements.InvalidRequirement):
     "Compatibility wrapper for InvalidRequirement"
 
 
-class Requirement(packaging.requirements.Requirement):
-    def __init__(self, requirement_string):
+class Requirement(_packaging_requirements.Requirement):
+    def __init__(self, requirement_string: str):
         """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
         super().__init__(requirement_string)
         self.unsafe_name = self.name
         project_name = safe_name(self.name)
         self.project_name, self.key = project_name, project_name.lower()
         self.specs = [(spec.operator, spec.version) for spec in self.specifier]
-        self.extras = tuple(map(safe_extra, self.extras))
+        # packaging.requirements.Requirement uses a set for its extras. We use a variable-length tuple
+        self.extras: tuple[str] = tuple(map(safe_extra, self.extras))
         self.hashCmp = (
             self.key,
             self.url,
@@ -3145,13 +3447,13 @@ def __init__(self, requirement_string):
         )
         self.__hash = hash(self.hashCmp)
 
-    def __eq__(self, other):
+    def __eq__(self, other: object):
         return isinstance(other, Requirement) and self.hashCmp == other.hashCmp
 
     def __ne__(self, other):
         return not self == other
 
-    def __contains__(self, item):
+    def __contains__(self, item: Distribution | str | tuple[str, ...]) -> bool:
         if isinstance(item, Distribution):
             if item.key != self.key:
                 return False
@@ -3170,7 +3472,7 @@ def __repr__(self):
         return "Requirement.parse(%r)" % str(self)
 
     @staticmethod
-    def parse(s):
+    def parse(s: str | Iterable[str]):
         (req,) = parse_requirements(s)
         return req
 
@@ -3185,7 +3487,7 @@ def _always_object(classes):
     return classes
 
 
-def _find_adapter(registry, ob):
+def _find_adapter(registry: Mapping[type, _AdapterT], ob: object) -> _AdapterT:
     """Return an adapter factory for `ob` from `registry`"""
     types = _always_object(inspect.getmro(getattr(ob, '__class__', type(ob))))
     for t in types:
@@ -3196,7 +3498,7 @@ def _find_adapter(registry, ob):
     raise TypeError(f"Could not find adapter for {registry} and {ob}")
 
 
-def ensure_directory(path):
+def ensure_directory(path: StrOrBytesPath):
     """Ensure that the parent directory of `path` exists"""
     dirname = os.path.dirname(path)
     os.makedirs(dirname, exist_ok=True)
@@ -3215,7 +3517,7 @@ def _bypass_ensure_directory(path):
             pass
 
 
-def split_sections(s):
+def split_sections(s: _NestedStr) -> Iterator[tuple[str | None, list[str]]]:
     """Split a string or iterable thereof into (section, content) pairs
 
     Each ``section`` is a stripped version of the section header ("[section]")
@@ -3259,6 +3561,47 @@ def _mkstemp(*args, **kw):
 warnings.filterwarnings("ignore", category=PEP440Warning, append=True)
 
 
+class PkgResourcesDeprecationWarning(Warning):
+    """
+    Base class for warning about deprecations in ``pkg_resources``
+
+    This class is not derived from ``DeprecationWarning``, and as such is
+    visible by default.
+    """
+
+
+# Ported from ``setuptools`` to avoid introducing an import inter-dependency:
+_LOCALE_ENCODING = "locale" if sys.version_info >= (3, 10) else None
+
+
+def _read_utf8_with_fallback(file: str, fallback_encoding=_LOCALE_ENCODING) -> str:
+    """See setuptools.unicode_utils._read_utf8_with_fallback"""
+    try:
+        with open(file, "r", encoding="utf-8") as f:
+            return f.read()
+    except UnicodeDecodeError:  # pragma: no cover
+        msg = f"""\
+        ********************************************************************************
+        `encoding="utf-8"` fails with {file!r}, trying `encoding={fallback_encoding!r}`.
+
+        This fallback behaviour is considered **deprecated** and future versions of
+        `setuptools/pkg_resources` may not implement it.
+
+        Please encode {file!r} with "utf-8" to ensure future builds will succeed.
+
+        If this file was produced by `setuptools` itself, cleaning up the cached files
+        and re-building/re-installing the package with a newer version of `setuptools`
+        (e.g. by updating `build-system.requires` in its `pyproject.toml`)
+        might solve the problem.
+        ********************************************************************************
+        """
+        # TODO: Add a deadline?
+        #       See comment in setuptools.unicode_utils._Utf8EncodingNeeded
+        warnings.warn(msg, PkgResourcesDeprecationWarning, stacklevel=2)
+        with open(file, "r", encoding=fallback_encoding) as f:
+            return f.read()
+
+
 # from jaraco.functools 1.3
 def _call_aside(f, *args, **kwargs):
     f(*args, **kwargs)
@@ -3277,15 +3620,6 @@ def _initialize(g=globals()):
     )
 
 
-class PkgResourcesDeprecationWarning(Warning):
-    """
-    Base class for warning about deprecations in ``pkg_resources``
-
-    This class is not derived from ``DeprecationWarning``, and as such is
-    visible by default.
-    """
-
-
 @_call_aside
 def _initialize_master_working_set():
     """
@@ -3299,8 +3633,7 @@ def _initialize_master_working_set():
     Invocation by other packages is unsupported and done
     at their own risk.
     """
-    working_set = WorkingSet._build_master()
-    _declare_state('object', working_set=working_set)
+    working_set = _declare_state('object', 'working_set', WorkingSet._build_master())
 
     require = working_set.require
     iter_entry_points = working_set.iter_entry_points
@@ -3321,3 +3654,23 @@ def _initialize_master_working_set():
     # match order
     list(map(working_set.add_entry, sys.path))
     globals().update(locals())
+
+
+if TYPE_CHECKING:
+    # All of these are set by the @_call_aside methods above
+    __resource_manager = ResourceManager()  # Won't exist at runtime
+    resource_exists = __resource_manager.resource_exists
+    resource_isdir = __resource_manager.resource_isdir
+    resource_filename = __resource_manager.resource_filename
+    resource_stream = __resource_manager.resource_stream
+    resource_string = __resource_manager.resource_string
+    resource_listdir = __resource_manager.resource_listdir
+    set_extraction_path = __resource_manager.set_extraction_path
+    cleanup_resources = __resource_manager.cleanup_resources
+
+    working_set = WorkingSet()
+    require = working_set.require
+    iter_entry_points = working_set.iter_entry_points
+    add_activation_listener = working_set.subscribe
+    run_script = working_set.run_script
+    run_main = run_script
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index c72a40f4f18..fd92690602f 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -13,6 +13,6 @@ rich==13.7.1
     pygments==2.18.0
     typing_extensions==4.12.2
 resolvelib==1.0.1
-setuptools==69.5.1
+setuptools==70.3.0
 tomli==2.0.1
 truststore==0.9.1
diff --git a/tools/vendoring/patches/pkg_resources.patch b/tools/vendoring/patches/pkg_resources.patch
index 22a67930afa..98eb5e4001a 100644
--- a/tools/vendoring/patches/pkg_resources.patch
+++ b/tools/vendoring/patches/pkg_resources.patch
@@ -1,32 +1,31 @@
 diff --git a/src/pip/_vendor/pkg_resources/__init__.py b/src/pip/_vendor/pkg_resources/__init__.py
-index 3f2476a0c..8d5727d35 100644
+index d47df3f3c..415c0c432 100644
 --- a/src/pip/_vendor/pkg_resources/__init__.py
 +++ b/src/pip/_vendor/pkg_resources/__init__.py
-@@ -65,7 +65,7 @@
- from os import open as os_open
- from os.path import isdir, split
-
+@@ -87,7 +87,7 @@ except ImportError:
+     # no write support, probably under GAE
+     WRITE_SUPPORT = False
+ 
 -from pkg_resources.extern.jaraco.text import (
 +from pip._internal.utils._jaraco_text import (
      yield_lines,
      drop_comment,
      join_continuation,
---- a/src/pip/_vendor/pkg_resources/__init__.py
-+++ b/src/pip/_vendor/pkg_resources/__init__.py
-@@ -101,12 +101,10 @@ _namespace_handlers = None
- _namespace_packages = None
-
-
+@@ -102,12 +102,11 @@ if TYPE_CHECKING:
+     from _typeshed import BytesPath, StrPath, StrOrBytesPath
+     from typing_extensions import Self
+ 
 -warnings.warn(
 -    "pkg_resources is deprecated as an API. "
 -    "See https://setuptools.pypa.io/en/latest/pkg_resources.html",
 -    DeprecationWarning,
 -    stacklevel=2,
 -)
++
 +# Patch: Remove deprecation warning from vendored pkg_resources.
 +# Setting PYTHONWARNINGS=error to verify builds produce no warnings
 +# causes immediate exceptions.
 +# See https://github.com/pypa/pip/issues/12243
-
-
- _PEP440_FALLBACK = re.compile(r"^v?(?P(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I)
+ 
+ 
+ _T = TypeVar("_T")

From a3ac6ede1d6d27e53c5f677ecfe8528b7f530579 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sun, 7 Jul 2024 19:58:50 +0100
Subject: [PATCH 495/992] Install `vendoring` after parsing arguments

---
 noxfile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 370e2fe630e..51bce160490 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -190,14 +190,14 @@ def vendoring(session: nox.Session) -> None:
         "python", "-c", "import sys; sys.exit(1 if sys.version_info < (3, 10) else 0)"
     )
 
-    session.install("vendoring~=1.2.0")
-
     parser = argparse.ArgumentParser(prog="nox -s vendoring")
     parser.add_argument("--upgrade-all", action="store_true")
     parser.add_argument("--upgrade", action="append", default=[])
     parser.add_argument("--skip", action="append", default=[])
     args = parser.parse_args(session.posargs)
 
+    session.install("vendoring~=1.2.0")
+
     if not (args.upgrade or args.upgrade_all):
         session.run("vendoring", "sync", "-v")
         return

From a6cd8e47f7f30499e0299fe2ca19bd4e2e178013 Mon Sep 17 00:00:00 2001
From: Branch Vincent 
Date: Wed, 10 Jul 2024 23:08:48 -0700
Subject: [PATCH 496/992] Ignore `--require-virtualenv` for `check` and
 `freeze` commands

---
 news/12842.feature.rst               | 1 +
 src/pip/_internal/commands/check.py  | 1 +
 src/pip/_internal/commands/freeze.py | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 news/12842.feature.rst

diff --git a/news/12842.feature.rst b/news/12842.feature.rst
new file mode 100644
index 00000000000..60ebc3245f2
--- /dev/null
+++ b/news/12842.feature.rst
@@ -0,0 +1 @@
+Ignore ``--require-virtualenv`` for ``pip check`` and ``pip freeze``
diff --git a/src/pip/_internal/commands/check.py b/src/pip/_internal/commands/check.py
index 584df9f55c5..4a0297edd97 100644
--- a/src/pip/_internal/commands/check.py
+++ b/src/pip/_internal/commands/check.py
@@ -16,6 +16,7 @@
 class CheckCommand(Command):
     """Verify installed packages have compatible dependencies."""
 
+    ignore_require_venv = True
     usage = """
       %prog [options]"""
 
diff --git a/src/pip/_internal/commands/freeze.py b/src/pip/_internal/commands/freeze.py
index fd9d88a8b01..885fdfeb83b 100644
--- a/src/pip/_internal/commands/freeze.py
+++ b/src/pip/_internal/commands/freeze.py
@@ -29,6 +29,7 @@ class FreezeCommand(Command):
     packages are listed in a case-insensitive sorted order.
     """
 
+    ignore_require_venv = True
     usage = """
       %prog [options]"""
     log_streams = ("ext://sys.stderr", "ext://sys.stderr")

From 76daeb06cb094dfaeedc2eced847cb72bd779e6e Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 13 Jul 2024 17:22:28 -0400
Subject: [PATCH 497/992] Restore original permissions in unit tests to allow
 pytest to clean up (#12847)

This is necessary to address warnings like these:

  /home/ichard26/dev/oss/pip/venv/lib/python3.12/site-packages/_pytest/pathlib.py:95: PytestWarning: (rm_rf) error removing /tmp-ram/pytest-of-ichard26/garbage-ae7b86cb-23ec-453e-a72e-fd0b70d07ba2/test_safe_delete_no_perms0
  : [Errno 39] Directory not empty: '/tmp-ram/pytest-of-ichard26/garbage-ae7b86cb-23ec-453e-a72e-fd0b70d07ba2/test_safe_delete_no_perms0'
    warnings.warn(
  /home/ichard26/dev/oss/pip/venv/lib/python3.12/site-packages/_pytest/pathlib.py:95: PytestWarning: (rm_rf) error removing /tmp-ram/pytest-of-ichard26/garbage-ae7b86cb-23ec-453e-a72e-fd0b70d07ba2/test_safe_set_no_perms0
  : [Errno 39] Directory not empty: '/tmp-ram/pytest-of-ichard26/garbage-ae7b86cb-23ec-453e-a72e-fd0b70d07ba2/test_safe_set_no_perms0'
    warnings.warn(
  /home/ichard26/dev/oss/pip/venv/lib/python3.12/site-packages/_pytest/pathlib.py:95: PytestWarning: (rm_rf) error removing /tmp-ram/pytest-of-ichard26/garbage-ae7b86cb-23ec-453e-a72e-fd0b70d07ba2/test_safe_get_no_perms0
  : [Errno 39] Directory not empty: '/tmp-ram/pytest-of-ichard26/garbage-ae7b86cb-23ec-453e-a72e-fd0b70d07ba2/test_safe_get_no_perms0'
    warnings.warn(
---
 ...66-f6f9-4fb6-ac44-b5a9d468d42b.trivial.rst |  0
 tests/lib/filesystem.py                       | 15 ++++++++++++-
 tests/unit/test_network_cache.py              | 22 +++++++++----------
 3 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 news/d0281e66-f6f9-4fb6-ac44-b5a9d468d42b.trivial.rst

diff --git a/news/d0281e66-f6f9-4fb6-ac44-b5a9d468d42b.trivial.rst b/news/d0281e66-f6f9-4fb6-ac44-b5a9d468d42b.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/lib/filesystem.py b/tests/lib/filesystem.py
index 4cf003b3c0b..e05e2703e9c 100644
--- a/tests/lib/filesystem.py
+++ b/tests/lib/filesystem.py
@@ -2,9 +2,11 @@
 """
 
 import os
+from contextlib import contextmanager
 from functools import partial
 from itertools import chain
-from typing import Iterator, List, Set
+from pathlib import Path
+from typing import Iterator, List, Set, Union
 
 
 def get_filelist(base: str) -> Set[str]:
@@ -17,3 +19,14 @@ def join(dirpath: str, dirnames: List[str], filenames: List[str]) -> Iterator[st
         )
 
     return set(chain.from_iterable(join(*dirinfo) for dirinfo in os.walk(base)))
+
+
+@contextmanager
+def chmod(path: Union[str, Path], mode: int) -> Iterator[None]:
+    """Contextmanager to temporarily update a path's mode."""
+    old_mode = os.stat(path).st_mode
+    try:
+        os.chmod(path, mode)
+        yield
+    finally:
+        os.chmod(path, old_mode)
diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py
index 6a816b30090..f1ed1f7edc1 100644
--- a/tests/unit/test_network_cache.py
+++ b/tests/unit/test_network_cache.py
@@ -7,6 +7,7 @@
 from pip._vendor.cachecontrol.caches import FileCache
 
 from pip._internal.network.cache import SafeFileCache
+from tests.lib.filesystem import chmod
 
 
 @pytest.fixture(scope="function")
@@ -57,26 +58,23 @@ def test_cache_roundtrip_body(self, cache_tmpdir: Path) -> None:
     def test_safe_get_no_perms(
         self, cache_tmpdir: Path, monkeypatch: pytest.MonkeyPatch
     ) -> None:
-        os.chmod(cache_tmpdir, 000)
-
         monkeypatch.setattr(os.path, "exists", lambda x: True)
 
-        cache = SafeFileCache(os.fspath(cache_tmpdir))
-        cache.get("foo")
+        with chmod(cache_tmpdir, 000):
+            cache = SafeFileCache(os.fspath(cache_tmpdir))
+            cache.get("foo")
 
     @pytest.mark.skipif("sys.platform == 'win32'")
     def test_safe_set_no_perms(self, cache_tmpdir: Path) -> None:
-        os.chmod(cache_tmpdir, 000)
-
-        cache = SafeFileCache(os.fspath(cache_tmpdir))
-        cache.set("foo", b"bar")
+        with chmod(cache_tmpdir, 000):
+            cache = SafeFileCache(os.fspath(cache_tmpdir))
+            cache.set("foo", b"bar")
 
     @pytest.mark.skipif("sys.platform == 'win32'")
     def test_safe_delete_no_perms(self, cache_tmpdir: Path) -> None:
-        os.chmod(cache_tmpdir, 000)
-
-        cache = SafeFileCache(os.fspath(cache_tmpdir))
-        cache.delete("foo")
+        with chmod(cache_tmpdir, 000):
+            cache = SafeFileCache(os.fspath(cache_tmpdir))
+            cache.delete("foo")
 
     def test_cache_hashes_are_same(self, cache_tmpdir: Path) -> None:
         cache = SafeFileCache(os.fspath(cache_tmpdir))

From 3d49ca04a23b36a3752d8609a20a298762531246 Mon Sep 17 00:00:00 2001
From: Seth Michael Larson 
Date: Mon, 20 May 2024 12:03:50 -0400
Subject: [PATCH 498/992] Use truststore by default

---
 docs/html/topics/https-certificates.md | 45 ++++++++------------------
 news/11647.feature.rst                 |  4 +++
 src/pip/_internal/cli/cmdoptions.py    |  3 +-
 src/pip/_internal/cli/index_command.py | 30 +++++++----------
 tests/functional/test_truststore.py    | 23 +++----------
 tests/lib/certs.py                     | 15 ++++++++-
 6 files changed, 50 insertions(+), 70 deletions(-)
 create mode 100644 news/11647.feature.rst

diff --git a/docs/html/topics/https-certificates.md b/docs/html/topics/https-certificates.md
index 0cf88b4b644..e769e0dfa4d 100644
--- a/docs/html/topics/https-certificates.md
+++ b/docs/html/topics/https-certificates.md
@@ -8,8 +8,8 @@
 
 By default, pip will perform SSL certificate verification for network
 connections it makes over HTTPS. These serve to prevent man-in-the-middle
-attacks against package downloads. This does not use the system certificate
-store but, instead, uses a bundled CA certificate store from {pypi}`certifi`.
+attacks against package downloads. Pip by default uses a bundled CA certificate
+store from {pypi}`certifi`.
 
 ## Using a specific certificate store
 
@@ -20,43 +20,24 @@ variables.
 
 ## Using system certificate stores
 
-```{versionadded} 22.2
-Experimental support, behind `--use-feature=truststore`.
-As with any other CLI option, this can be enabled globally via config or environment variables.
-```
-
-It is possible to use the system trust store, instead of the bundled certifi
-certificates for verifying HTTPS certificates. This approach will typically
-support corporate proxy certificates without additional configuration.
-
-In order to use system trust stores, you need to use Python 3.10 or newer.
-
-  ```{pip-cli}
-  $ python -m pip install SomePackage --use-feature=truststore
-  [...]
-  Successfully installed SomePackage
-  ```
-
-### When to use
+```{versionadded} 24.2
 
-You should try using system trust stores when there is a custom certificate
-chain configured for your system that pip isn't aware of. Typically, this
-situation will manifest with an `SSLCertVerificationError` with the message
-"certificate verify failed: unable to get local issuer certificate":
-
-```{pip-cli}
-$ pip install -U SomePackage
-[...]
-   SSLError(SSLCertVerificationError(1, '[SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (\_ssl.c:997)'))) - skipping
 ```
 
-This error means that OpenSSL wasn't able to find a trust anchor to verify the
-chain against. Using system trust stores instead of certifi will likely solve
-this issue.
+If Python 3.10 or later is being used then by default
+system certificates are used in addition to certifi to verify HTTPS connections.
+This functionality is provided through the {pypi}`truststore` package.
 
 If you encounter a TLS/SSL error when using the `truststore` feature you should
 open an issue on the [truststore GitHub issue tracker] instead of pip's issue
 tracker. The maintainers of truststore will help diagnose and fix the issue.
 
+To opt-out of using system certificates you can pass the `--use-deprecated=legacy-certs`
+flag to pip.
+
+```{warning}
+If Python 3.9 or earlier is in use then only certifi is used to verify HTTPS connections.
+```
+
 [truststore github issue tracker]:
   https://github.com/sethmlarson/truststore/issues
diff --git a/news/11647.feature.rst b/news/11647.feature.rst
new file mode 100644
index 00000000000..26d04d49165
--- /dev/null
+++ b/news/11647.feature.rst
@@ -0,0 +1,4 @@
+Changed pip to use system certificates and certifi to verify HTTPS connections.
+This change only affects Python 3.10 or later, Python 3.9 and earlier only use certifi.
+
+To revert to previous behavior pass the flag ``--use-deprecated=legacy-certs``.
diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index a47f8a3f46a..0b7cff77bdd 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -996,6 +996,7 @@ def check_list_path_option(options: Values) -> None:
 
 # Features that are now always on. A warning is printed if they are used.
 ALWAYS_ENABLED_FEATURES = [
+    "truststore",  # always on since 24.2
     "no-binary-enable-wheel-cache",  # always on since 23.1
 ]
 
@@ -1008,7 +1009,6 @@ def check_list_path_option(options: Values) -> None:
     default=[],
     choices=[
         "fast-deps",
-        "truststore",
     ]
     + ALWAYS_ENABLED_FEATURES,
     help="Enable new functionality, that may be backward incompatible.",
@@ -1023,6 +1023,7 @@ def check_list_path_option(options: Values) -> None:
     default=[],
     choices=[
         "legacy-resolver",
+        "legacy-certs",
     ],
     help=("Enable deprecated functionality, that will be removed in the future."),
 )
diff --git a/src/pip/_internal/cli/index_command.py b/src/pip/_internal/cli/index_command.py
index 4ff7b2c3a5d..d826df1ac40 100644
--- a/src/pip/_internal/cli/index_command.py
+++ b/src/pip/_internal/cli/index_command.py
@@ -12,9 +12,10 @@
 from optparse import Values
 from typing import TYPE_CHECKING, List, Optional
 
+from pip._vendor import certifi
+
 from pip._internal.cli.base_command import Command
 from pip._internal.cli.command_context import CommandContextMixIn
-from pip._internal.exceptions import CommandError
 
 if TYPE_CHECKING:
     from ssl import SSLContext
@@ -26,7 +27,8 @@
 
 def _create_truststore_ssl_context() -> Optional["SSLContext"]:
     if sys.version_info < (3, 10):
-        raise CommandError("The truststore feature is only available for Python 3.10+")
+        logger.warning("Disabling truststore because Python version isn't 3.10+")
+        return None
 
     try:
         import ssl
@@ -36,10 +38,13 @@ def _create_truststore_ssl_context() -> Optional["SSLContext"]:
 
     try:
         from pip._vendor import truststore
-    except ImportError as e:
-        raise CommandError(f"The truststore feature is unavailable: {e}")
+    except ImportError:
+        logger.warning("Disabling truststore because platform isn't supported")
+        return None
 
-    return truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    ctx = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    ctx.load_verify_locations(certifi.where())
+    return ctx
 
 
 class SessionCommandMixin(CommandContextMixIn):
@@ -80,20 +85,14 @@ def _build_session(
         options: Values,
         retries: Optional[int] = None,
         timeout: Optional[int] = None,
-        fallback_to_certifi: bool = False,
     ) -> "PipSession":
         from pip._internal.network.session import PipSession
 
         cache_dir = options.cache_dir
         assert not cache_dir or os.path.isabs(cache_dir)
 
-        if "truststore" in options.features_enabled:
-            try:
-                ssl_context = _create_truststore_ssl_context()
-            except Exception:
-                if not fallback_to_certifi:
-                    raise
-                ssl_context = None
+        if "legacy-certs" not in options.deprecated_features_enabled:
+            ssl_context = _create_truststore_ssl_context()
         else:
             ssl_context = None
 
@@ -162,11 +161,6 @@ def handle_pip_version_check(self, options: Values) -> None:
             options,
             retries=0,
             timeout=min(5, options.timeout),
-            # This is set to ensure the function does not fail when truststore is
-            # specified in use-feature but cannot be loaded. This usually raises a
-            # CommandError and shows a nice user-facing error, but this function is not
-            # called in that try-except block.
-            fallback_to_certifi=True,
         )
         with session:
             _pip_self_version_check(session, options)
diff --git a/tests/functional/test_truststore.py b/tests/functional/test_truststore.py
index cc90343b52d..c534ddb954d 100644
--- a/tests/functional/test_truststore.py
+++ b/tests/functional/test_truststore.py
@@ -1,4 +1,3 @@
-import sys
 from typing import Any, Callable
 
 import pytest
@@ -9,25 +8,13 @@
 
 
 @pytest.fixture()
-def pip(script: PipTestEnvironment) -> PipRunner:
+def pip_no_truststore(script: PipTestEnvironment) -> PipRunner:
     def pip(*args: str, **kwargs: Any) -> TestPipResult:
-        return script.pip(*args, "--use-feature=truststore", **kwargs)
+        return script.pip(*args, "--use-deprecated=legacy-certs", **kwargs)
 
     return pip
 
 
-@pytest.mark.skipif(sys.version_info >= (3, 10), reason="3.10 can run truststore")
-def test_truststore_error_on_old_python(pip: PipRunner) -> None:
-    result = pip(
-        "install",
-        "--no-index",
-        "does-not-matter",
-        expect_error=True,
-    )
-    assert "The truststore feature is only available for Python 3.10+" in result.stderr
-
-
-@pytest.mark.skipif(sys.version_info < (3, 10), reason="3.10+ required for truststore")
 @pytest.mark.network
 @pytest.mark.parametrize(
     "package",
@@ -37,10 +24,10 @@ def test_truststore_error_on_old_python(pip: PipRunner) -> None:
     ],
     ids=["PyPI", "GitHub"],
 )
-def test_trustore_can_install(
+def test_no_truststore_can_install(
     script: PipTestEnvironment,
-    pip: PipRunner,
+    pip_no_truststore: PipRunner,
     package: str,
 ) -> None:
-    result = pip("install", package)
+    result = pip_no_truststore("install", package)
     assert "Successfully installed" in result.stdout
diff --git a/tests/lib/certs.py b/tests/lib/certs.py
index 9e6542d2d57..6f899acfe48 100644
--- a/tests/lib/certs.py
+++ b/tests/lib/certs.py
@@ -5,7 +5,7 @@
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.x509.oid import NameOID
+from cryptography.x509.oid import ExtendedKeyUsageOID, NameOID
 
 
 def make_tls_cert(hostname: str) -> Tuple[x509.Certificate, rsa.RSAPrivateKey]:
@@ -25,10 +25,23 @@ def make_tls_cert(hostname: str) -> Tuple[x509.Certificate, rsa.RSAPrivateKey]:
         .serial_number(x509.random_serial_number())
         .not_valid_before(datetime.now(timezone.utc))
         .not_valid_after(datetime.now(timezone.utc) + timedelta(days=10))
+        .add_extension(
+            x509.BasicConstraints(ca=True, path_length=9),
+            critical=True,
+        )
         .add_extension(
             x509.SubjectAlternativeName([x509.DNSName(hostname)]),
             critical=False,
         )
+        .add_extension(
+            x509.ExtendedKeyUsage(
+                [
+                    ExtendedKeyUsageOID.CLIENT_AUTH,
+                    ExtendedKeyUsageOID.SERVER_AUTH,
+                ]
+            ),
+            critical=True,
+        )
         .sign(key, hashes.SHA256(), default_backend())
     )
     return cert, key

From 540b66aa7eb5440018355fbb4ffc61f237f65717 Mon Sep 17 00:00:00 2001
From: Seth Michael Larson 
Date: Mon, 20 May 2024 15:17:51 -0400
Subject: [PATCH 499/992] Clarify the new default certificate behavior for pip

---
 docs/html/topics/https-certificates.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/html/topics/https-certificates.md b/docs/html/topics/https-certificates.md
index e769e0dfa4d..bad532a2632 100644
--- a/docs/html/topics/https-certificates.md
+++ b/docs/html/topics/https-certificates.md
@@ -8,8 +8,7 @@
 
 By default, pip will perform SSL certificate verification for network
 connections it makes over HTTPS. These serve to prevent man-in-the-middle
-attacks against package downloads. Pip by default uses a bundled CA certificate
-store from {pypi}`certifi`.
+attacks against package downloads.
 
 ## Using a specific certificate store
 
@@ -37,6 +36,10 @@ flag to pip.
 
 ```{warning}
 If Python 3.9 or earlier is in use then only certifi is used to verify HTTPS connections.
+
+The system certificate store won't be used in this case, so some situations like proxies
+with their own certificates may not work. Upgrading to at least Python 3.10 or later is
+the recommended method to resolve this issue.
 ```
 
 [truststore github issue tracker]:

From bec252f6b0458ae83b2878cbfd47839d958624f8 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Wed, 10 Jul 2024 00:45:49 +0100
Subject: [PATCH 500/992] Use `debug` level for logging truststore disablement
 on <3.10

---
 src/pip/_internal/cli/index_command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/cli/index_command.py b/src/pip/_internal/cli/index_command.py
index d826df1ac40..9991326f36b 100644
--- a/src/pip/_internal/cli/index_command.py
+++ b/src/pip/_internal/cli/index_command.py
@@ -27,7 +27,7 @@
 
 def _create_truststore_ssl_context() -> Optional["SSLContext"]:
     if sys.version_info < (3, 10):
-        logger.warning("Disabling truststore because Python version isn't 3.10+")
+        logger.debug("Disabling truststore because Python version isn't 3.10+")
         return None
 
     try:

From 71140405397e2e5dd49d2bc5f626200ab58fe74f Mon Sep 17 00:00:00 2001
From: Seth Michael Larson 
Date: Wed, 10 Jul 2024 08:37:01 -0500
Subject: [PATCH 501/992] Update docs to mention previous behavior

---
 docs/html/topics/https-certificates.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/html/topics/https-certificates.md b/docs/html/topics/https-certificates.md
index bad532a2632..05ef35e48f0 100644
--- a/docs/html/topics/https-certificates.md
+++ b/docs/html/topics/https-certificates.md
@@ -23,7 +23,12 @@ variables.
 
 ```
 
-If Python 3.10 or later is being used then by default
+```{note}
+Versions of pip prior to v24.2 did not use system certificates by default.
+To use system certificates with pip v22.2 or later, you must opt-in using the `--use-feature=truststore` CLI flag.
+```
+
+On Python 3.10 or later, by default
 system certificates are used in addition to certifi to verify HTTPS connections.
 This functionality is provided through the {pypi}`truststore` package.
 
@@ -35,7 +40,7 @@ To opt-out of using system certificates you can pass the `--use-deprecated=legac
 flag to pip.
 
 ```{warning}
-If Python 3.9 or earlier is in use then only certifi is used to verify HTTPS connections.
+On Python 3.9 or earlier, by default only certifi is used to verify HTTPS connections.
 
 The system certificate store won't be used in this case, so some situations like proxies
 with their own certificates may not work. Upgrading to at least Python 3.10 or later is

From 69874c79aa477fe9f4d7c5ece3e7668069daf5ce Mon Sep 17 00:00:00 2001
From: Seth Michael Larson 
Date: Wed, 10 Jul 2024 12:13:51 -0500
Subject: [PATCH 502/992] Add wording suggestion from review

Co-authored-by: Richard Si 
---
 docs/html/topics/https-certificates.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/html/topics/https-certificates.md b/docs/html/topics/https-certificates.md
index 05ef35e48f0..ff640575e6c 100644
--- a/docs/html/topics/https-certificates.md
+++ b/docs/html/topics/https-certificates.md
@@ -40,7 +40,8 @@ To opt-out of using system certificates you can pass the `--use-deprecated=legac
 flag to pip.
 
 ```{warning}
-On Python 3.9 or earlier, by default only certifi is used to verify HTTPS connections.
+On Python 3.9 or earlier, only certifi is used to verify HTTPS connections as
+`truststore` requires Python 3.10 or higher to function.
 
 The system certificate store won't be used in this case, so some situations like proxies
 with their own certificates may not work. Upgrading to at least Python 3.10 or later is

From db062e8574ee78fc7a61ec3aff070395dec409ff Mon Sep 17 00:00:00 2001
From: q0w <43147888+q0w@users.noreply.github.com>
Date: Sun, 14 Jul 2024 13:34:57 +0300
Subject: [PATCH 503/992] Check wheel tags in `pip check` (#11088)

---
 news/11054.feature.rst                |  1 +
 src/pip/_internal/commands/check.py   | 18 ++++++++++++--
 src/pip/_internal/operations/check.py | 34 ++++++++++++++++++++++++++-
 tests/functional/test_check.py        | 29 ++++++++++++++++++++++-
 4 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 news/11054.feature.rst

diff --git a/news/11054.feature.rst b/news/11054.feature.rst
new file mode 100644
index 00000000000..335468c12f9
--- /dev/null
+++ b/news/11054.feature.rst
@@ -0,0 +1 @@
+Check unsupported packages for the current platform.
diff --git a/src/pip/_internal/commands/check.py b/src/pip/_internal/commands/check.py
index 4a0297edd97..f54a16dc0a1 100644
--- a/src/pip/_internal/commands/check.py
+++ b/src/pip/_internal/commands/check.py
@@ -4,10 +4,13 @@
 
 from pip._internal.cli.base_command import Command
 from pip._internal.cli.status_codes import ERROR, SUCCESS
+from pip._internal.metadata import get_default_environment
 from pip._internal.operations.check import (
     check_package_set,
+    check_unsupported,
     create_package_set_from_installed,
 )
+from pip._internal.utils.compatibility_tags import get_supported
 from pip._internal.utils.misc import write_output
 
 logger = logging.getLogger(__name__)
@@ -23,6 +26,12 @@ class CheckCommand(Command):
     def run(self, options: Values, args: List[str]) -> int:
         package_set, parsing_probs = create_package_set_from_installed()
         missing, conflicting = check_package_set(package_set)
+        unsupported = list(
+            check_unsupported(
+                get_default_environment().iter_installed_distributions(),
+                get_supported(),
+            )
+        )
 
         for project_name in missing:
             version = package_set[project_name].version
@@ -45,8 +54,13 @@ def run(self, options: Values, args: List[str]) -> int:
                     dep_name,
                     dep_version,
                 )
-
-        if missing or conflicting or parsing_probs:
+        for package in unsupported:
+            write_output(
+                "%s %s is not supported on this platform",
+                package.raw_name,
+                package.version,
+            )
+        if missing or conflicting or parsing_probs or unsupported:
             return ERROR
         else:
             write_output("No broken requirements found.")
diff --git a/src/pip/_internal/operations/check.py b/src/pip/_internal/operations/check.py
index 623db76e229..4b6fbc4c375 100644
--- a/src/pip/_internal/operations/check.py
+++ b/src/pip/_internal/operations/check.py
@@ -2,14 +2,30 @@
 """
 
 import logging
-from typing import Callable, Dict, List, NamedTuple, Optional, Set, Tuple
+from contextlib import suppress
+from email.parser import Parser
+from functools import reduce
+from typing import (
+    Callable,
+    Dict,
+    FrozenSet,
+    Generator,
+    Iterable,
+    List,
+    NamedTuple,
+    Optional,
+    Set,
+    Tuple,
+)
 
 from pip._vendor.packaging.requirements import Requirement
+from pip._vendor.packaging.tags import Tag, parse_tag
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
 from pip._vendor.packaging.version import Version
 
 from pip._internal.distributions import make_distribution_for_install_requirement
 from pip._internal.metadata import get_default_environment
+from pip._internal.metadata.base import BaseDistribution
 from pip._internal.req.req_install import InstallRequirement
 
 logger = logging.getLogger(__name__)
@@ -113,6 +129,22 @@ def check_install_conflicts(to_install: List[InstallRequirement]) -> ConflictDet
     )
 
 
+def check_unsupported(
+    packages: Iterable[BaseDistribution],
+    supported_tags: Iterable[Tag],
+) -> Generator[BaseDistribution, None, None]:
+    for p in packages:
+        with suppress(FileNotFoundError):
+            wheel_file = p.read_text("WHEEL")
+            wheel_tags: FrozenSet[Tag] = reduce(
+                frozenset.union,
+                map(parse_tag, Parser().parsestr(wheel_file).get_all("Tag", [])),
+                frozenset(),
+            )
+            if wheel_tags.isdisjoint(supported_tags):
+                yield p
+
+
 def _simulate_installation_of(
     to_install: List[InstallRequirement], package_set: PackageSet
 ) -> Set[NormalizedName]:
diff --git a/tests/functional/test_check.py b/tests/functional/test_check.py
index 46ecdcc6457..f50f5593e5c 100644
--- a/tests/functional/test_check.py
+++ b/tests/functional/test_check.py
@@ -1,6 +1,10 @@
 from typing import Collection
 
-from tests.lib import PipTestEnvironment, create_test_package_with_setup
+from tests.lib import (
+    PipTestEnvironment,
+    create_really_basic_wheel,
+    create_test_package_with_setup,
+)
 
 
 def matches_expected_lines(string: str, expected_lines: Collection[str]) -> bool:
@@ -321,3 +325,26 @@ def test_check_include_work_dir_pkg(script: PipTestEnvironment) -> None:
     expected_lines = ("simple 1.0 requires missing, which is not installed.",)
     assert matches_expected_lines(result.stdout, expected_lines)
     assert result.returncode == 1
+
+
+def test_check_unsupported(
+    script: PipTestEnvironment,
+) -> None:
+    script.scratch_path.joinpath("base-0.1.0-py2.py3-none-any.whl").write_bytes(
+        create_really_basic_wheel("base", "0.1.0")
+    )
+    script.pip(
+        "install",
+        "--no-cache-dir",
+        "--no-index",
+        "--find-links",
+        script.scratch_path,
+        "base==0.1.0",
+    )
+    with open(
+        script.site_packages_path.joinpath("base-0.1.0.dist-info/WHEEL"), "a"
+    ) as f:
+        f.write("\nTag: cp310-cp310-musllinux_1_1_x86_64\n")
+    result = script.pip("check", expect_error=True)
+    assert "base 0.1.0 is not supported on this platform" in result.stdout
+    assert result.returncode == 1

From 2bb011a22f7beabecf0556927e21d0746e0bf18b Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Sun, 7 Jul 2024 15:56:34 +0100
Subject: [PATCH 504/992] Deprecate `pip install --editable` calling `setup.py
 develop`

Deprecates `pip install --editable` falling back to `setup.py develop`
when using a setuptools version that does not support PEP 660
(setuptools v63 and older).

See:
https://peps.python.org/pep-0660/
https://setuptools.pypa.io/en/latest/history.html#v64-0-0

Closes #11457.
---
 news/11457.removal.rst               |  3 +++
 src/pip/_internal/req/req_install.py | 15 +++++++++++++++
 tests/functional/test_install.py     |  7 +++++--
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 news/11457.removal.rst

diff --git a/news/11457.removal.rst b/news/11457.removal.rst
new file mode 100644
index 00000000000..7af83fde3ce
--- /dev/null
+++ b/news/11457.removal.rst
@@ -0,0 +1,3 @@
+Deprecate ``pip install --editable`` falling back to ``setup.py develop``
+when using a setuptools version that does not support :pep:`660`
+(setuptools v63 and older).
diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index 1a35189621a..834bc513356 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -825,6 +825,21 @@ def install(
         )
 
         if self.editable and not self.is_wheel:
+            deprecated(
+                reason=(
+                    f"Legacy editable install of {self} (setup.py develop) "
+                    "is deprecated."
+                ),
+                replacement=(
+                    "to add a pyproject.toml or enable --use-pep517, "
+                    "and use setuptools >= 64. "
+                    "If the resulting installation is not behaving as expected, "
+                    "try using --config-settings editable_mode=compat. "
+                    "Please consult the setuptools documentation for more information"
+                ),
+                gone_in="25.0",
+                issue=11457,
+            )
             if self.config_settings:
                 logger.warning(
                     "--config-settings ignored for legacy editable install of %s. "
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index e82da82eef4..c6b5635f8fe 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -1350,7 +1350,7 @@ def test_install_package_with_prefix(
 
 def _test_install_editable_with_prefix(
     script: PipTestEnvironment, files: Dict[str, str]
-) -> None:
+) -> TestPipResult:
     # make a dummy project
     pkga_path = script.scratch_path / "pkga"
     pkga_path.mkdir()
@@ -1378,6 +1378,8 @@ def _test_install_editable_with_prefix(
     install_path = script.scratch / site_packages / "pkga.egg-link"
     result.did_create(install_path)
 
+    return result
+
 
 @pytest.mark.network
 def test_install_editable_with_target(script: PipTestEnvironment) -> None:
@@ -1427,9 +1429,10 @@ def test_install_editable_legacy_with_prefix_setup_cfg(
 requires = ["setuptools<64", "wheel"]
 build-backend = "setuptools.build_meta"
 """
-    _test_install_editable_with_prefix(
+    result = _test_install_editable_with_prefix(
         script, {"setup.cfg": setup_cfg, "pyproject.toml": pyproject_toml}
     )
+    assert "(setup.py develop) is deprecated" in result.stderr
 
 
 def test_install_package_conflict_prefix_and_user(

From 8e1eab89b4ae172fb1c2a30f5dd7eccfabcd01d6 Mon Sep 17 00:00:00 2001
From: Jinzhe Zeng 
Date: Sun, 14 Jul 2024 19:33:58 -0400
Subject: [PATCH 505/992] =?UTF-8?q?Docs:=20`=E2=80=94-ignore-conflicts`=20?=
 =?UTF-8?q?->=20`--ignore-conflicts`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../research-results/override-conflicting-dependencies.md       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/html/ux-research-design/research-results/override-conflicting-dependencies.md b/docs/html/ux-research-design/research-results/override-conflicting-dependencies.md
index b087a8070b9..a8ef57493c1 100644
--- a/docs/html/ux-research-design/research-results/override-conflicting-dependencies.md
+++ b/docs/html/ux-research-design/research-results/override-conflicting-dependencies.md
@@ -48,7 +48,7 @@ In total, we received 415 responses to the survey.
 
 An overwhelming majority (>70%) of respondents indicated that they want some kind of override that allows them to install packages when there are dependency conflicts. Despite desiring this feature, most respondents said if it exists they would use it "not often" — this indicates that it is an advanced feature that is not critical to day-to-day usage. Nevertheless, because it would be difficult or very difficult to find a workaround (>60%), we suggest that pip should offer a override feature (see recommendations, below).
 
-Over half of the respondents said that `pip install tea coffee --ignore-conflicts` was the most ideal syntax for this command when installing multiple packages at once with a conflicting dependency. When using the `pip install —-ignore-conflicts` command, a majority (>48%) of respondents said they would prefer pip to install to the most recent version of the conflicted dependency.
+Over half of the respondents said that `pip install tea coffee --ignore-conflicts` was the most ideal syntax for this command when installing multiple packages at once with a conflicting dependency. When using the `pip install --ignore-conflicts` command, a majority (>48%) of respondents said they would prefer pip to install to the most recent version of the conflicted dependency.
 
 Most respondents suggested that installing the latest version by default is safer, because it could include security fixes or features that would be difficult to replicate on their own. They also trust that dependencies will be largely backwards-compatible. However, they said it was very important that it is necessary to have a way to override this default behavior, in case they need to use an older version of the conflicted package.
 

From 85a47baeb45cd652db911718cbe801c6adaa5122 Mon Sep 17 00:00:00 2001
From: Jinzhe Zeng 
Date: Sun, 14 Jul 2024 19:39:01 -0400
Subject: [PATCH 506/992] add news

---
 news/12851.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12851.doc.rst

diff --git a/news/12851.doc.rst b/news/12851.doc.rst
new file mode 100644
index 00000000000..844545c73ac
--- /dev/null
+++ b/news/12851.doc.rst
@@ -0,0 +1 @@
+Correct ``—-ignore-conflicts`` (including an em dash) to ``--ignore-conflicts``.

From 5e8b086b8f0e2763d0bc19fe1c23a0af987d49ce Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 15 Jul 2024 03:26:09 -0400
Subject: [PATCH 507/992] Force build to provision its own pip in nox test
 session (#12848)

Modern versions of build use the pip from the environment it's installed
in, taking advantage of --python to avoid needing to provision pip in
the temporary build environment. This is a neat optimization, but it
breaks when a broken pip is installed from a previous test run.

When this happens, you have to clear out the old Nox session environment
to get build functioning again. This is annoying and clearly works
against the goal of run_with_protected_pip() which is meant to prevent
such issues.

We can force build to provision its own pip by simply uninstalling pip
before invoking the sdist build.
---
 news/72167f18-bd68-41e1-8404-4d23e6b2652f.trivial.rst | 0
 noxfile.py                                            | 6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 news/72167f18-bd68-41e1-8404-4d23e6b2652f.trivial.rst

diff --git a/news/72167f18-bd68-41e1-8404-4d23e6b2652f.trivial.rst b/news/72167f18-bd68-41e1-8404-4d23e6b2652f.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/noxfile.py b/noxfile.py
index 51bce160490..2051362769c 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -88,8 +88,12 @@ def test(session: nox.Session) -> None:
     if os.path.exists(sdist_dir):
         shutil.rmtree(sdist_dir, ignore_errors=True)
 
+    run_with_protected_pip(session, "install", "build")
+    # build uses the pip present in the outer environment (aka the nox environment)
+    # as an optimization. This will crash if the last test run installed a broken
+    # pip, so uninstall pip to force build to provision a known good version of pip.
+    run_with_protected_pip(session, "uninstall", "pip", "-y")
     # fmt: off
-    session.install("build")
     session.run(
         "python", "-I", "-m", "build", "--sdist", "--outdir", sdist_dir,
         silent=True,

From ee7d0fbdd630fc06c4202edb5e824d87882a3eda Mon Sep 17 00:00:00 2001
From: rmorotti 
Date: Fri, 28 Jun 2024 17:11:01 +0100
Subject: [PATCH 508/992] PERF: download in chunks of 256 kB + limit progress
 bar to 5 refresh/sec

---
 news/12810.feature.rst                 |  5 +++++
 src/pip/_internal/cli/progress_bars.py |  2 +-
 src/pip/_internal/network/download.py  |  6 +++---
 src/pip/_internal/network/utils.py     |  6 ++++--
 src/pip/_internal/utils/misc.py        | 12 +++++-------
 5 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 news/12810.feature.rst

diff --git a/news/12810.feature.rst b/news/12810.feature.rst
new file mode 100644
index 00000000000..fd236947e4d
--- /dev/null
+++ b/news/12810.feature.rst
@@ -0,0 +1,5 @@
+Improve download performance. Download packages and update the
+progress bar in larger chunks of 256 kB, up from 10 kB.
+Limit the progress bar to 5 refresh per second.
+Improve hash performance. Read package files in larger chunks of 1 MB,
+up from 8192 bytes.
diff --git a/src/pip/_internal/cli/progress_bars.py b/src/pip/_internal/cli/progress_bars.py
index b842b1b316a..883359c9ce7 100644
--- a/src/pip/_internal/cli/progress_bars.py
+++ b/src/pip/_internal/cli/progress_bars.py
@@ -49,7 +49,7 @@ def _rich_progress_bar(
             TimeRemainingColumn(),
         )
 
-    progress = Progress(*columns, refresh_per_second=30)
+    progress = Progress(*columns, refresh_per_second=5)
     task_id = progress.add_task(" " * (get_indentation() + 2), total=total)
     with progress:
         for chunk in iterable:
diff --git a/src/pip/_internal/network/download.py b/src/pip/_internal/network/download.py
index 032fdd0314f..5c3bce3d2fd 100644
--- a/src/pip/_internal/network/download.py
+++ b/src/pip/_internal/network/download.py
@@ -7,7 +7,7 @@
 import os
 from typing import Iterable, Optional, Tuple
 
-from pip._vendor.requests.models import CONTENT_CHUNK_SIZE, Response
+from pip._vendor.requests.models import Response
 
 from pip._internal.cli.progress_bars import get_download_progress_renderer
 from pip._internal.exceptions import NetworkConnectionError
@@ -56,12 +56,12 @@ def _prepare_download(
         show_progress = False
     elif not total_length:
         show_progress = True
-    elif total_length > (40 * 1000):
+    elif total_length > (512 * 1024):
         show_progress = True
     else:
         show_progress = False
 
-    chunks = response_chunks(resp, CONTENT_CHUNK_SIZE)
+    chunks = response_chunks(resp)
 
     if not show_progress:
         return chunks
diff --git a/src/pip/_internal/network/utils.py b/src/pip/_internal/network/utils.py
index 134848ae526..bba4c265e89 100644
--- a/src/pip/_internal/network/utils.py
+++ b/src/pip/_internal/network/utils.py
@@ -1,6 +1,6 @@
 from typing import Dict, Generator
 
-from pip._vendor.requests.models import CONTENT_CHUNK_SIZE, Response
+from pip._vendor.requests.models import Response
 
 from pip._internal.exceptions import NetworkConnectionError
 
@@ -25,6 +25,8 @@
 # possible to make this work.
 HEADERS: Dict[str, str] = {"Accept-Encoding": "identity"}
 
+DOWNLOAD_CHUNK_SIZE = 256 * 1024
+
 
 def raise_for_status(resp: Response) -> None:
     http_error_msg = ""
@@ -55,7 +57,7 @@ def raise_for_status(resp: Response) -> None:
 
 
 def response_chunks(
-    response: Response, chunk_size: int = CONTENT_CHUNK_SIZE
+    response: Response, chunk_size: int = DOWNLOAD_CHUNK_SIZE
 ) -> Generator[bytes, None, None]:
     """Given a requests Response, provide the data chunks."""
     try:
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index 16d5a1cee10..3707e872684 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -1,7 +1,6 @@
 import errno
 import getpass
 import hashlib
-import io
 import logging
 import os
 import posixpath
@@ -70,6 +69,8 @@
 OnExc = Callable[[FunctionType, Path, BaseException], Any]
 OnErr = Callable[[FunctionType, Path, ExcInfo], Any]
 
+FILE_CHUNK_SIZE = 1024 * 1024
+
 
 def get_pip_version() -> str:
     pip_pkg_dir = os.path.join(os.path.dirname(__file__), "..", "..")
@@ -122,9 +123,7 @@ def get_prog() -> str:
 # Retry every half second for up to 3 seconds
 @retry(stop_after_delay=3, wait=0.5)
 def rmtree(
-    dir: str,
-    ignore_errors: bool = False,
-    onexc: Optional[OnExc] = None,
+    dir: str, ignore_errors: bool = False, onexc: Optional[OnExc] = None
 ) -> None:
     if ignore_errors:
         onexc = _onerror_ignore
@@ -313,7 +312,7 @@ def is_installable_dir(path: str) -> bool:
 
 
 def read_chunks(
-    file: BinaryIO, size: int = io.DEFAULT_BUFFER_SIZE
+    file: BinaryIO, size: int = FILE_CHUNK_SIZE
 ) -> Generator[bytes, None, None]:
     """Yield pieces of data from a file-like object until EOF."""
     while True:
@@ -643,8 +642,7 @@ def pairwise(iterable: Iterable[Any]) -> Iterator[Tuple[Any, Any]]:
 
 
 def partition(
-    pred: Callable[[T], bool],
-    iterable: Iterable[T],
+    pred: Callable[[T], bool], iterable: Iterable[T]
 ) -> Tuple[Iterable[T], Iterable[T]]:
     """
     Use a predicate to partition entries into false entries and true entries,

From d9c6d689ea4247964a38339a1b3b828a10138b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sviatoslav=20Sydorenko=20=28=D0=A1=D0=B2=D1=8F=D1=82=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1=D0=B8=D0=B4=D0=BE=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BA=D0=BE=29?= 
Date: Mon, 15 Jul 2024 13:58:25 +0200
Subject: [PATCH 509/992] Log ending round state during resolver debug (#12264)

---
 src/pip/_internal/resolution/resolvelib/reporter.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pip/_internal/resolution/resolvelib/reporter.py b/src/pip/_internal/resolution/resolvelib/reporter.py
index 12adeff7b6e..0594569d850 100644
--- a/src/pip/_internal/resolution/resolvelib/reporter.py
+++ b/src/pip/_internal/resolution/resolvelib/reporter.py
@@ -66,6 +66,7 @@ def starting_round(self, index: int) -> None:
 
     def ending_round(self, index: int, state: Any) -> None:
         logger.info("Reporter.ending_round(%r, state)", index)
+        logger.debug("Reporter.ending_round(%r, %r)", index, state)
 
     def ending(self, state: Any) -> None:
         logger.info("Reporter.ending(%r)", state)

From f609992014eabb877b0f967919bd517d3ead8bb6 Mon Sep 17 00:00:00 2001
From: Matthew Hughes 
Date: Tue, 25 Jun 2024 19:41:15 +0100
Subject: [PATCH 510/992] Document `pip` Discord channel

A link is provided to the PyPA Discord, rather than the specific
channel, because the former presents the user with an invite, but for
channel links I'm not sure how nice the process is for users who aren't
already part of the Discord.

The channel is only document under the development docs, since we want
to keep it focussed on questions around developing on the codebase, and
not move more general discussions from GitHub issues
---
 docs/html/development/index.rst                       | 4 +++-
 news/bcfde343-3f44-464e-9229-7af962defac6.trivial.rst | 0
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 news/bcfde343-3f44-464e-9229-7af962defac6.trivial.rst

diff --git a/docs/html/development/index.rst b/docs/html/development/index.rst
index 31df114ae1c..ed22cad7741 100644
--- a/docs/html/development/index.rst
+++ b/docs/html/development/index.rst
@@ -8,7 +8,8 @@ testing, and documentation.
 
 You can also join ``#pypa`` (general packaging discussion and user support) and
 ``#pypa-dev`` (discussion about development of packaging tools) `on Libera.chat`_,
-or the `distutils-sig mailing list`_, to ask questions or get involved.
+or the ``#pip`` channel on the `PyPA Discord`_, or the `distutils-sig mailing list`_,
+to ask questions or get involved.
 
 .. toctree::
     :maxdepth: 2
@@ -28,3 +29,4 @@ or the `distutils-sig mailing list`_, to ask questions or get involved.
 
 .. _`on Libera.chat`: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa-dev
 .. _`distutils-sig mailing list`: https://mail.python.org/mailman3/lists/distutils-sig.python.org/
+.. _`PyPA Discord`: https://discord.gg/pypa
diff --git a/news/bcfde343-3f44-464e-9229-7af962defac6.trivial.rst b/news/bcfde343-3f44-464e-9229-7af962defac6.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d

From 21e024acd92347cbb3a3354e83b96217232c0d3c Mon Sep 17 00:00:00 2001
From: Matthew Hughes 
Date: Fri, 12 Jul 2024 09:02:14 +0100
Subject: [PATCH 511/992] Remove link to `distutils-sig` mailing list

This list has been made read-only, so it's no longer possible to "ask
questions or get involved" there
---
 docs/html/development/index.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/html/development/index.rst b/docs/html/development/index.rst
index ed22cad7741..d8500756edf 100644
--- a/docs/html/development/index.rst
+++ b/docs/html/development/index.rst
@@ -8,8 +8,7 @@ testing, and documentation.
 
 You can also join ``#pypa`` (general packaging discussion and user support) and
 ``#pypa-dev`` (discussion about development of packaging tools) `on Libera.chat`_,
-or the ``#pip`` channel on the `PyPA Discord`_, or the `distutils-sig mailing list`_,
-to ask questions or get involved.
+or the ``#pip`` channel on the `PyPA Discord`_, to ask questions or get involved.
 
 .. toctree::
     :maxdepth: 2
@@ -28,5 +27,4 @@ to ask questions or get involved.
     references might be broken.
 
 .. _`on Libera.chat`: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa-dev
-.. _`distutils-sig mailing list`: https://mail.python.org/mailman3/lists/distutils-sig.python.org/
 .. _`PyPA Discord`: https://discord.gg/pypa

From be21d82e4362c00aab451ef1cf212d9a62f8e58e Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sun, 21 Jul 2024 10:13:51 +0100
Subject: [PATCH 512/992] Move exception suppression to cover more of
 self-version-check logic

This correctly suppresses issues around building networking sessions for
a self version check.
---
 src/pip/_internal/cli/index_command.py   | 20 ++++++++++++--------
 src/pip/_internal/self_outdated_check.py | 24 ++++++++++--------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/pip/_internal/cli/index_command.py b/src/pip/_internal/cli/index_command.py
index 9991326f36b..226f8da1e94 100644
--- a/src/pip/_internal/cli/index_command.py
+++ b/src/pip/_internal/cli/index_command.py
@@ -156,11 +156,15 @@ def handle_pip_version_check(self, options: Values) -> None:
         if options.disable_pip_version_check or options.no_index:
             return
 
-        # Otherwise, check if we're using the latest version of pip available.
-        session = self._build_session(
-            options,
-            retries=0,
-            timeout=min(5, options.timeout),
-        )
-        with session:
-            _pip_self_version_check(session, options)
+        try:
+            # Otherwise, check if we're using the latest version of pip available.
+            session = self._build_session(
+                options,
+                retries=0,
+                timeout=min(5, options.timeout),
+            )
+            with session:
+                _pip_self_version_check(session, options)
+        except Exception:
+            logger.warning("There was an error checking the latest version of pip.")
+            logger.debug("See below for error", exc_info=True)
diff --git a/src/pip/_internal/self_outdated_check.py b/src/pip/_internal/self_outdated_check.py
index 2185f2fb108..f9a91af9d84 100644
--- a/src/pip/_internal/self_outdated_check.py
+++ b/src/pip/_internal/self_outdated_check.py
@@ -232,17 +232,13 @@ def pip_self_version_check(session: PipSession, options: optparse.Values) -> Non
     if not installed_dist:
         return
 
-    try:
-        upgrade_prompt = _self_version_check_logic(
-            state=SelfCheckState(cache_dir=options.cache_dir),
-            current_time=datetime.datetime.now(datetime.timezone.utc),
-            local_version=installed_dist.version,
-            get_remote_version=functools.partial(
-                _get_current_remote_pip_version, session, options
-            ),
-        )
-        if upgrade_prompt is not None:
-            logger.warning("%s", upgrade_prompt, extra={"rich": True})
-    except Exception:
-        logger.warning("There was an error checking the latest version of pip.")
-        logger.debug("See below for error", exc_info=True)
+    upgrade_prompt = _self_version_check_logic(
+        state=SelfCheckState(cache_dir=options.cache_dir),
+        current_time=datetime.datetime.now(datetime.timezone.utc),
+        local_version=installed_dist.version,
+        get_remote_version=functools.partial(
+            _get_current_remote_pip_version, session, options
+        ),
+    )
+    if upgrade_prompt is not None:
+        logger.warning("%s", upgrade_prompt, extra={"rich": True})

From 3518d3293445ad43eedba116b6182185c03abda3 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sun, 21 Jul 2024 10:18:42 +0100
Subject: [PATCH 513/992] Rework how `--debug` is handled in `main`

Move the `run` call into a wrapper function and inline the exception
handling while moving the try-finally around `run` into the
nested function.

This reduces the amount of code at a deeper nesting level and moves the
self-version-check logic into the "around the run" exception catching so
that a consistent message is presented in cases of failures.
---
 src/pip/_internal/cli/base_command.py | 123 ++++++++++++--------------
 1 file changed, 59 insertions(+), 64 deletions(-)

diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py
index b4f37394dc1..bc1ab65949d 100644
--- a/src/pip/_internal/cli/base_command.py
+++ b/src/pip/_internal/cli/base_command.py
@@ -1,6 +1,5 @@
 """Base Command class, and related routines"""
 
-import functools
 import logging
 import logging.config
 import optparse
@@ -8,7 +7,7 @@
 import sys
 import traceback
 from optparse import Values
-from typing import Any, Callable, List, Optional, Tuple
+from typing import List, Optional, Tuple
 
 from pip._vendor.rich import reconfigure
 from pip._vendor.rich import traceback as rich_traceback
@@ -91,6 +90,63 @@ def handle_pip_version_check(self, options: Values) -> None:
     def run(self, options: Values, args: List[str]) -> int:
         raise NotImplementedError
 
+    def _run_wrapper(self, level_number: int, options: Values, args: List[str]) -> int:
+        def _inner_run() -> int:
+            try:
+                return self.run(options, args)
+            finally:
+                self.handle_pip_version_check(options)
+
+        if options.debug_mode:
+            rich_traceback.install(show_locals=True)
+            return _inner_run()
+
+        try:
+            status = _inner_run()
+            assert isinstance(status, int)
+            return status
+        except DiagnosticPipError as exc:
+            logger.error("%s", exc, extra={"rich": True})
+            logger.debug("Exception information:", exc_info=True)
+
+            return ERROR
+        except PreviousBuildDirError as exc:
+            logger.critical(str(exc))
+            logger.debug("Exception information:", exc_info=True)
+
+            return PREVIOUS_BUILD_DIR_ERROR
+        except (
+            InstallationError,
+            BadCommand,
+            NetworkConnectionError,
+        ) as exc:
+            logger.critical(str(exc))
+            logger.debug("Exception information:", exc_info=True)
+
+            return ERROR
+        except CommandError as exc:
+            logger.critical("%s", exc)
+            logger.debug("Exception information:", exc_info=True)
+
+            return ERROR
+        except BrokenStdoutLoggingError:
+            # Bypass our logger and write any remaining messages to
+            # stderr because stdout no longer works.
+            print("ERROR: Pipe to stdout was broken", file=sys.stderr)
+            if level_number <= logging.DEBUG:
+                traceback.print_exc(file=sys.stderr)
+
+            return ERROR
+        except KeyboardInterrupt:
+            logger.critical("Operation cancelled by user")
+            logger.debug("Exception information:", exc_info=True)
+
+            return ERROR
+        except BaseException:
+            logger.critical("Exception:", exc_info=True)
+
+            return UNKNOWN_ERROR
+
     def parse_args(self, args: List[str]) -> Tuple[Values, List[str]]:
         # factored out for testability
         return self.parser.parse_args(args)
@@ -172,65 +228,4 @@ def _main(self, args: List[str]) -> int:
                 )
                 options.cache_dir = None
 
-        def intercepts_unhandled_exc(
-            run_func: Callable[..., int]
-        ) -> Callable[..., int]:
-            @functools.wraps(run_func)
-            def exc_logging_wrapper(*args: Any) -> int:
-                try:
-                    status = run_func(*args)
-                    assert isinstance(status, int)
-                    return status
-                except DiagnosticPipError as exc:
-                    logger.error("%s", exc, extra={"rich": True})
-                    logger.debug("Exception information:", exc_info=True)
-
-                    return ERROR
-                except PreviousBuildDirError as exc:
-                    logger.critical(str(exc))
-                    logger.debug("Exception information:", exc_info=True)
-
-                    return PREVIOUS_BUILD_DIR_ERROR
-                except (
-                    InstallationError,
-                    BadCommand,
-                    NetworkConnectionError,
-                ) as exc:
-                    logger.critical(str(exc))
-                    logger.debug("Exception information:", exc_info=True)
-
-                    return ERROR
-                except CommandError as exc:
-                    logger.critical("%s", exc)
-                    logger.debug("Exception information:", exc_info=True)
-
-                    return ERROR
-                except BrokenStdoutLoggingError:
-                    # Bypass our logger and write any remaining messages to
-                    # stderr because stdout no longer works.
-                    print("ERROR: Pipe to stdout was broken", file=sys.stderr)
-                    if level_number <= logging.DEBUG:
-                        traceback.print_exc(file=sys.stderr)
-
-                    return ERROR
-                except KeyboardInterrupt:
-                    logger.critical("Operation cancelled by user")
-                    logger.debug("Exception information:", exc_info=True)
-
-                    return ERROR
-                except BaseException:
-                    logger.critical("Exception:", exc_info=True)
-
-                    return UNKNOWN_ERROR
-
-            return exc_logging_wrapper
-
-        try:
-            if not options.debug_mode:
-                run = intercepts_unhandled_exc(self.run)
-            else:
-                run = self.run
-                rich_traceback.install(show_locals=True)
-            return run(options, args)
-        finally:
-            self.handle_pip_version_check(options)
+        return self._run_wrapper(level_number, options, args)

From e50314134886d5eb5b650b3ce95abaafcb6dce10 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sun, 21 Jul 2024 11:00:40 +0100
Subject: [PATCH 514/992] Properly mock `_self_version_check_logic`

Providing a value return value ensures that downstream code does not try
to pass around invalid values.
---
 tests/unit/test_self_check_outdated.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/test_self_check_outdated.py b/tests/unit/test_self_check_outdated.py
index 6b6fcea55a9..99a556e8ac7 100644
--- a/tests/unit/test_self_check_outdated.py
+++ b/tests/unit/test_self_check_outdated.py
@@ -41,6 +41,7 @@ def test_pip_self_version_check_calls_underlying_implementation(
     # GIVEN
     mock_session = Mock()
     fake_options = Values({"cache_dir": str(tmpdir)})
+    mocked_function.return_value = None
 
     # WHEN
     self_outdated_check.pip_self_version_check(mock_session, fake_options)

From dd85c28464dbfc9b3a53c885a41c209e4700ad2d Mon Sep 17 00:00:00 2001
From: Kuntal Majumder 
Date: Wed, 24 Jul 2024 23:10:25 +0200
Subject: [PATCH 515/992] Fix invalid origin test to check all the logged
 messages

Fixes #12152
---
 news/5dac0fc9-10c7-4d77-b8dc-8ff111c9557d.trivial.rst | 0
 tests/unit/test_req.py                                | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 news/5dac0fc9-10c7-4d77-b8dc-8ff111c9557d.trivial.rst

diff --git a/news/5dac0fc9-10c7-4d77-b8dc-8ff111c9557d.trivial.rst b/news/5dac0fc9-10c7-4d77-b8dc-8ff111c9557d.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py
index 3b78ead3fe3..8a95c058706 100644
--- a/tests/unit/test_req.py
+++ b/tests/unit/test_req.py
@@ -464,7 +464,9 @@ def test_download_info_archive_cache_with_invalid_origin(
             assert len(reqset.all_requirements) == 1
             req = reqset.all_requirements[0]
             assert req.is_wheel_from_cache
-            assert "Ignoring invalid cache entry origin file" in caplog.messages[0]
+            assert any(
+                "Ignoring invalid cache entry origin file" in x for x in caplog.messages
+            )
 
     def test_download_info_local_wheel(self, data: TestData) -> None:
         """Test that download_info is set for requirements from a local wheel."""

From 184390f4f2cde0316801eb701f49dda4f7a9a6ac Mon Sep 17 00:00:00 2001
From: Xianpeng Shen 
Date: Fri, 26 Jul 2024 09:45:47 +0300
Subject: [PATCH 516/992] Update dependabot.yml to bump group updates (#12572)

Co-authored-by: Pradyun Gedam 
---
 .github/dependabot.yml | 4 ++++
 news/12572.trivial.rst | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 news/12572.trivial.rst

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8ac6b8c4984..2390d8c809e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
diff --git a/news/12572.trivial.rst b/news/12572.trivial.rst
new file mode 100644
index 00000000000..f50b78a217c
--- /dev/null
+++ b/news/12572.trivial.rst
@@ -0,0 +1 @@
+Add ``groups`` in dependabot.yml to bump group updates

From 350a0570a88b6c0d13c68f81ac08dc64f954cadf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 27 Jul 2024 15:01:29 +0100
Subject: [PATCH 517/992] Bump the github-actions group with 2 updates (#12876)

Bumps the github-actions group with 2 updates: [dorny/paths-filter](https://github.com/dorny/paths-filter) and [dessant/lock-threads](https://github.com/dessant/lock-threads).


Updates `dorny/paths-filter` from 2 to 3
- [Release notes](https://github.com/dorny/paths-filter/releases)
- [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dorny/paths-filter/compare/v2...v3)

Updates `dessant/lock-threads` from 4 to 5
- [Release notes](https://github.com/dessant/lock-threads/releases)
- [Changelog](https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dessant/lock-threads/compare/v4...v5)

---
updated-dependencies:
- dependency-name: dorny/paths-filter
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: dessant/lock-threads
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml           | 2 +-
 .github/workflows/lock-threads.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14718ddcb6b..662a8d993fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
       vendoring: ${{ steps.filter.outputs.vendoring }}
     steps:
       # For pull requests it's not necessary to checkout the code
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
diff --git a/.github/workflows/lock-threads.yml b/.github/workflows/lock-threads.yml
index dc68b683bef..367c3cca227 100644
--- a/.github/workflows/lock-threads.yml
+++ b/.github/workflows/lock-threads.yml
@@ -17,7 +17,7 @@ jobs:
     if: github.repository_owner == 'pypa'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           issue-inactive-days: '30'
           pr-inactive-days: '15'

From ef81b2eafd390fb56f62930dcd74f6e4580093e0 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sun, 28 Jul 2024 23:07:49 +0100
Subject: [PATCH 518/992] Update AUTHORS.txt

---
 AUTHORS.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 10317a284b2..dda2ac30f85 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -105,6 +105,7 @@ Bogdan Opanchuk
 BorisZZZ
 Brad Erickson
 Bradley Ayers
+Branch Vincent
 Brandon L. Reiss
 Brandt Bucher
 Brannon Dorsey
@@ -131,11 +132,13 @@ Carol Willing
 Carter Thayer
 Cass
 Chandrasekhar Atina
+Charlie Marsh
 Chih-Hsuan Yen
 Chris Brinker
 Chris Hunt
 Chris Jerdonek
 Chris Kuehl
+Chris Markiewicz
 Chris McDonough
 Chris Pawley
 Chris Pryer
@@ -234,6 +237,7 @@ Dos Moonen
 Douglas Thor
 DrFeathers
 Dustin Ingram
+Dustin Rodrigues
 Dwayne Bailey
 Ed Morley
 Edgar Ramírez
@@ -365,12 +369,14 @@ Jeff Dairiki
 Jeff Widman
 Jelmer Vernooij
 jenix21
+Jeremy Fleischman
 Jeremy Stanley
 Jeremy Zafran
 Jesse Rittner
 Jiashuo Li
 Jim Fisher
 Jim Garrison
+Jinzhe Zeng
 Jiun Bae
 Jivan Amara
 Joe Bylund
@@ -391,6 +397,7 @@ Jorge Niedbalski
 Joseph Bylund
 Joseph Long
 Josh Bronson
+Josh Cannon
 Josh Hansen
 Josh Schneier
 Joshua
@@ -425,6 +432,7 @@ konstin
 kpinc
 Krishna Oza
 Kumar McMillan
+Kuntal Majumder
 Kurt McKee
 Kyle Persohn
 lakshmanaram
@@ -513,6 +521,7 @@ Miro Hrončok
 Monica Baluna
 montefra
 Monty Taylor
+morotti
 mrKazzila
 Muha Ajjan
 Nadav Wexler
@@ -625,6 +634,7 @@ Richard Jones
 Richard Si
 Ricky Ng-Adam
 Rishi
+rmorotti
 RobberPhex
 Robert Collins
 Robert McGibbon
@@ -700,6 +710,7 @@ Stéphane Klein
 Sumana Harihareswara
 Surbhi Sharma
 Sviatoslav Sydorenko
+Sviatoslav Sydorenko (Святослав Сидоренко)
 Swat009
 Sylvain
 Takayuki SHIMIZUKAWA

From 97146c7f4cd85551f3dc261830a57f304e43c181 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sun, 28 Jul 2024 23:17:23 +0100
Subject: [PATCH 519/992] Bump for release

---
 NEWS.rst                                      | 73 +++++++++++++++++++
 news/10822.vendor.rst                         |  1 -
 news/11045.bugfix.rst                         |  1 -
 news/11054.feature.rst                        |  1 -
 news/11457.removal.rst                        |  3 -
 news/11647.feature.rst                        |  4 -
 news/12216.bugfix.rst                         |  1 -
 news/12572.trivial.rst                        |  1 -
 news/12656.feature.rst                        |  3 -
 news/12660.trivial.rst                        |  2 -
 news/12663.feature.rst                        |  1 -
 news/12664.feature.rst                        |  1 -
 news/12680.bugfix.rst                         |  1 -
 news/12683.feature.rst                        |  2 -
 news/12712.feature.rst                        |  2 -
 news/12716.bugfix.rst                         |  1 -
 news/12728.feature.rst                        |  5 --
 news/12751.bugfix.rst                         |  1 -
 news/12776.trivial.rst                        |  1 -
 news/12781.bugfix.rst                         |  1 -
 news/12782.bugfix.rst                         |  2 -
 news/12791.bugfix.rst                         |  2 -
 news/12796.vendor.rst                         |  1 -
 news/12797.vendor.rst                         |  1 -
 news/12803.bugfix.rst                         |  4 -
 news/12805.trivial.rst                        |  1 -
 news/12810.feature.rst                        |  5 --
 news/12842.feature.rst                        |  1 -
 news/12851.doc.rst                            |  1 -
 ...c9-10c7-4d77-b8dc-8ff111c9557d.trivial.rst |  0
 ...18-bd68-41e1-8404-4d23e6b2652f.trivial.rst |  0
 ...1b-1578-4128-8db3-9aa72b3a6a84.trivial.rst |  0
 ...43-3f44-464e-9229-7af962defac6.trivial.rst |  0
 news/certifi.vendor.rst                       |  1 -
 ...66-f6f9-4fb6-ac44-b5a9d468d42b.trivial.rst |  0
 news/platformdirs.vendor.rst                  |  1 -
 news/pygments.vendor.rst                      |  1 -
 news/setuptools.vendor.rst                    |  1 -
 news/typing_extensions.vendor.rst             |  1 -
 src/pip/__init__.py                           |  2 +-
 40 files changed, 74 insertions(+), 57 deletions(-)
 delete mode 100644 news/10822.vendor.rst
 delete mode 100644 news/11045.bugfix.rst
 delete mode 100644 news/11054.feature.rst
 delete mode 100644 news/11457.removal.rst
 delete mode 100644 news/11647.feature.rst
 delete mode 100644 news/12216.bugfix.rst
 delete mode 100644 news/12572.trivial.rst
 delete mode 100644 news/12656.feature.rst
 delete mode 100644 news/12660.trivial.rst
 delete mode 100644 news/12663.feature.rst
 delete mode 100644 news/12664.feature.rst
 delete mode 100644 news/12680.bugfix.rst
 delete mode 100644 news/12683.feature.rst
 delete mode 100644 news/12712.feature.rst
 delete mode 100644 news/12716.bugfix.rst
 delete mode 100644 news/12728.feature.rst
 delete mode 100644 news/12751.bugfix.rst
 delete mode 100644 news/12776.trivial.rst
 delete mode 100644 news/12781.bugfix.rst
 delete mode 100644 news/12782.bugfix.rst
 delete mode 100644 news/12791.bugfix.rst
 delete mode 100644 news/12796.vendor.rst
 delete mode 100644 news/12797.vendor.rst
 delete mode 100644 news/12803.bugfix.rst
 delete mode 100644 news/12805.trivial.rst
 delete mode 100644 news/12810.feature.rst
 delete mode 100644 news/12842.feature.rst
 delete mode 100644 news/12851.doc.rst
 delete mode 100644 news/5dac0fc9-10c7-4d77-b8dc-8ff111c9557d.trivial.rst
 delete mode 100644 news/72167f18-bd68-41e1-8404-4d23e6b2652f.trivial.rst
 delete mode 100644 news/aa82171b-1578-4128-8db3-9aa72b3a6a84.trivial.rst
 delete mode 100644 news/bcfde343-3f44-464e-9229-7af962defac6.trivial.rst
 delete mode 100644 news/certifi.vendor.rst
 delete mode 100644 news/d0281e66-f6f9-4fb6-ac44-b5a9d468d42b.trivial.rst
 delete mode 100644 news/platformdirs.vendor.rst
 delete mode 100644 news/pygments.vendor.rst
 delete mode 100644 news/setuptools.vendor.rst
 delete mode 100644 news/typing_extensions.vendor.rst

diff --git a/NEWS.rst b/NEWS.rst
index 3e7940c5f41..397277444bc 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,79 @@
 
 .. towncrier release notes start
 
+24.2 (2024-07-28)
+=================
+
+Deprecations and Removals
+-------------------------
+
+- Deprecate ``pip install --editable`` falling back to ``setup.py develop``
+  when using a setuptools version that does not support :pep:`660`
+  (setuptools v63 and older). (`#11457 `_)
+
+Features
+--------
+
+- Check unsupported packages for the current platform. (`#11054 `_)
+- Use system certificates *and* certifi certificates to verify HTTPS connections on Python 3.10+.
+  Python 3.9 and earlier only use certifi.
+
+  To revert to previous behaviour, pass the flag ``--use-deprecated=legacy-certs``. (`#11647 `_)
+- Improve discovery performance of installed packages when the ``importlib.metadata``
+  backend is used to load distribution metadata (used by default under Python 3.11+). (`#12656 `_)
+- Improve performance when the same requirement string appears many times during
+  resolution, by consistently caching the parsed requirement string. (`#12663 `_)
+- Minor performance improvement of finding applicable package candidates by not
+  repeatedly calculating their versions (`#12664 `_)
+- Disable pip's self version check when invoking a pip subprocess to install
+  PEP 517 build requirements. (`#12683 `_)
+- Improve dependency resolution performance by caching platform compatibility
+  tags during wheel cache lookup. (`#12712 `_)
+- ``wheel`` is no longer explicitly listed as a build dependency of ``pip``.
+  ``setuptools`` injects this dependency in the ``get_requires_for_build_wheel()``
+  hook and no longer needs it on newer versions. (`#12728 `_)
+- Ignore ``--require-virtualenv`` for ``pip check`` and ``pip freeze`` (`#12842 `_)
+- Improve package download and install performance.
+
+  Increase chunk sizes when downloading (256 kB, up from 10 kB) and reading files (1 MB, up from 8 kB).
+  This reduces the frequency of updates to pip's progress bar. (`#12810 `_)
+- Improve pip install performance.
+
+  Files are now extracted in 1MB blocks, or in one block matching the file size for
+  smaller files. A decompressor is no longer instantiated when extracting 0 bytes files,
+  it is not necessary because there is no data to decompress. (`#12803 `_)
+
+Bug Fixes
+---------
+
+- Set ``no_color`` to global ``rich.Console`` instance. (`#11045 `_)
+- Fix resolution to respect ``--python-version`` when checking ``Requires-Python``. (`#12216 `_)
+- Perform hash comparisons in a case-insensitive manner. (`#12680 `_)
+- Avoid ``dlopen`` failure for glibc detection in musl builds (`#12716 `_)
+- Avoid keyring logging crashes when pip is run in verbose mode. (`#12751 `_)
+- Fix finding hardlink targets in tar files with an ignored top-level directory. (`#12781 `_)
+- Improve pip install performance by only creating required parent
+  directories once, instead of before extracting every file in the wheel. (`#12782 `_)
+- Improve pip install performance by calculating installed packages printout
+  in linear time instead of quadratic time. (`#12791 `_)
+
+Vendored Libraries
+------------------
+
+- Remove vendored tenacity.
+- Update the preload list for the ``DEBUNDLED`` case, to replace ``pep517`` that has been renamed to ``pyproject_hooks``.
+- Use tomllib from the stdlib if available, rather than tomli
+- Upgrade certifi to 2024.7.4
+- Upgrade platformdirs to 4.2.2
+- Upgrade pygments to 2.18.0
+- Upgrade setuptools to 70.3.0
+- Upgrade typing_extensions to 4.12.2
+
+Improved Documentation
+----------------------
+
+- Correct ``—-ignore-conflicts`` (including an em dash) to ``--ignore-conflicts``. (`#12851 `_)
+
 24.1.2 (2024-07-07)
 ===================
 
diff --git a/news/10822.vendor.rst b/news/10822.vendor.rst
deleted file mode 100644
index 27a3c234091..00000000000
--- a/news/10822.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove vendored tenacity.
diff --git a/news/11045.bugfix.rst b/news/11045.bugfix.rst
deleted file mode 100644
index cf08c9b8bcd..00000000000
--- a/news/11045.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Set ``no_color`` to global ``rich.Console`` instance.
diff --git a/news/11054.feature.rst b/news/11054.feature.rst
deleted file mode 100644
index 335468c12f9..00000000000
--- a/news/11054.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Check unsupported packages for the current platform.
diff --git a/news/11457.removal.rst b/news/11457.removal.rst
deleted file mode 100644
index 7af83fde3ce..00000000000
--- a/news/11457.removal.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Deprecate ``pip install --editable`` falling back to ``setup.py develop``
-when using a setuptools version that does not support :pep:`660`
-(setuptools v63 and older).
diff --git a/news/11647.feature.rst b/news/11647.feature.rst
deleted file mode 100644
index 26d04d49165..00000000000
--- a/news/11647.feature.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Changed pip to use system certificates and certifi to verify HTTPS connections.
-This change only affects Python 3.10 or later, Python 3.9 and earlier only use certifi.
-
-To revert to previous behavior pass the flag ``--use-deprecated=legacy-certs``.
diff --git a/news/12216.bugfix.rst b/news/12216.bugfix.rst
deleted file mode 100644
index 804bf1ee9bb..00000000000
--- a/news/12216.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix resolution to respect ``--python-version`` when checking ``Requires-Python``.
diff --git a/news/12572.trivial.rst b/news/12572.trivial.rst
deleted file mode 100644
index f50b78a217c..00000000000
--- a/news/12572.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add ``groups`` in dependabot.yml to bump group updates
diff --git a/news/12656.feature.rst b/news/12656.feature.rst
deleted file mode 100644
index fdbba5484ba..00000000000
--- a/news/12656.feature.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Improve discovery performance of installed packages when the
-``importlib.metadata`` backend is used to load distribution metadata
-(used by default under Python 3.11+).
diff --git a/news/12660.trivial.rst b/news/12660.trivial.rst
deleted file mode 100644
index f02256eccbb..00000000000
--- a/news/12660.trivial.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Remove (suppressed) deprecation warning from vendored ``pkg_resources``
-to ensure builds succeed with ``PYTHONWARNINGS=error``.
diff --git a/news/12663.feature.rst b/news/12663.feature.rst
deleted file mode 100644
index 11300ae47d3..00000000000
--- a/news/12663.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improve performance when the same requirement string appears many times during resolution, by consistently caching the parsed requirement string.
diff --git a/news/12664.feature.rst b/news/12664.feature.rst
deleted file mode 100644
index a5f85097c62..00000000000
--- a/news/12664.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Minor performance improvement of finding applicable package candidates by not repeatedly calculating their versions
diff --git a/news/12680.bugfix.rst b/news/12680.bugfix.rst
deleted file mode 100644
index fa821f9f339..00000000000
--- a/news/12680.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Perform hash comparisons in a case-insensitive manner.
diff --git a/news/12683.feature.rst b/news/12683.feature.rst
deleted file mode 100644
index 2e949cd0762..00000000000
--- a/news/12683.feature.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Disable pip's self version check when invoking a pip subprocess to install
-PEP 517 build requirements.
diff --git a/news/12712.feature.rst b/news/12712.feature.rst
deleted file mode 100644
index 3a08cdb10e2..00000000000
--- a/news/12712.feature.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Improve dependency resolution performance by caching platform compatibility
-tags during wheel cache lookup.
diff --git a/news/12716.bugfix.rst b/news/12716.bugfix.rst
deleted file mode 100644
index 7af794f7bb3..00000000000
--- a/news/12716.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid dlopen failure for glibc detection in musl builds
diff --git a/news/12728.feature.rst b/news/12728.feature.rst
deleted file mode 100644
index 923d18707e0..00000000000
--- a/news/12728.feature.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-``wheel`` is no longer explicitly listed as a build depepndency of ``pip``.
-``setuptools`` already injects this dependency in the ``get_requires_for_build_wheel()`` hook.
-This makes no difference for users of ``pip``.
-This makes no difference when building wheels of ``pip``.
-This avoids an unnecessary dependency on ``wheel`` when building the source distribution of ``pip``.
diff --git a/news/12751.bugfix.rst b/news/12751.bugfix.rst
deleted file mode 100644
index 70c6680a8a9..00000000000
--- a/news/12751.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid keyring logging crashes when pip is run in verbose mode.
diff --git a/news/12776.trivial.rst b/news/12776.trivial.rst
deleted file mode 100644
index 87d2f8e7975..00000000000
--- a/news/12776.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use prerelease version of CFFI for Python 3.13 testing
diff --git a/news/12781.bugfix.rst b/news/12781.bugfix.rst
deleted file mode 100644
index 6bd43d347db..00000000000
--- a/news/12781.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix finding hardlink targets in tar files with an ignored top-level directory.
diff --git a/news/12782.bugfix.rst b/news/12782.bugfix.rst
deleted file mode 100644
index 459a2838c32..00000000000
--- a/news/12782.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Improve pip install performance by only creating required parent
-directories once, instead of before extracting every file in the wheel.
diff --git a/news/12791.bugfix.rst b/news/12791.bugfix.rst
deleted file mode 100644
index c19345d439c..00000000000
--- a/news/12791.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Improve pip install performance. The installed packages printout is
-now calculated in linear time instead of quadratic time.
diff --git a/news/12796.vendor.rst b/news/12796.vendor.rst
deleted file mode 100644
index 6384a5b1476..00000000000
--- a/news/12796.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update the preload list for the ``DEBUNDLED`` case, to replace ``pep517`` that has been renamed to ``pyproject_hooks``.
diff --git a/news/12797.vendor.rst b/news/12797.vendor.rst
deleted file mode 100644
index 7842883ddba..00000000000
--- a/news/12797.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use tomllib from the stdlib if available, rather than tomli
diff --git a/news/12803.bugfix.rst b/news/12803.bugfix.rst
deleted file mode 100644
index 4193d33e05c..00000000000
--- a/news/12803.bugfix.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Improve pip install performance. Files are now extracted in 1MB blocks,
-or in one block matching the file size for smaller files.
-A decompressor is no longer instantiated when extracting 0 bytes files,
-it is not necessary because there is no data to decompress.
diff --git a/news/12805.trivial.rst b/news/12805.trivial.rst
deleted file mode 100644
index 56f61f77238..00000000000
--- a/news/12805.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update ruff to 0.5.0
diff --git a/news/12810.feature.rst b/news/12810.feature.rst
deleted file mode 100644
index fd236947e4d..00000000000
--- a/news/12810.feature.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Improve download performance. Download packages and update the
-progress bar in larger chunks of 256 kB, up from 10 kB.
-Limit the progress bar to 5 refresh per second.
-Improve hash performance. Read package files in larger chunks of 1 MB,
-up from 8192 bytes.
diff --git a/news/12842.feature.rst b/news/12842.feature.rst
deleted file mode 100644
index 60ebc3245f2..00000000000
--- a/news/12842.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Ignore ``--require-virtualenv`` for ``pip check`` and ``pip freeze``
diff --git a/news/12851.doc.rst b/news/12851.doc.rst
deleted file mode 100644
index 844545c73ac..00000000000
--- a/news/12851.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Correct ``—-ignore-conflicts`` (including an em dash) to ``--ignore-conflicts``.
diff --git a/news/5dac0fc9-10c7-4d77-b8dc-8ff111c9557d.trivial.rst b/news/5dac0fc9-10c7-4d77-b8dc-8ff111c9557d.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/72167f18-bd68-41e1-8404-4d23e6b2652f.trivial.rst b/news/72167f18-bd68-41e1-8404-4d23e6b2652f.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/aa82171b-1578-4128-8db3-9aa72b3a6a84.trivial.rst b/news/aa82171b-1578-4128-8db3-9aa72b3a6a84.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/bcfde343-3f44-464e-9229-7af962defac6.trivial.rst b/news/bcfde343-3f44-464e-9229-7af962defac6.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
deleted file mode 100644
index bc4ad30e7f9..00000000000
--- a/news/certifi.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade certifi to 2024.7.4
diff --git a/news/d0281e66-f6f9-4fb6-ac44-b5a9d468d42b.trivial.rst b/news/d0281e66-f6f9-4fb6-ac44-b5a9d468d42b.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
deleted file mode 100644
index b2007b95b09..00000000000
--- a/news/platformdirs.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade platformdirs to 4.2.2
diff --git a/news/pygments.vendor.rst b/news/pygments.vendor.rst
deleted file mode 100644
index 5232695fa02..00000000000
--- a/news/pygments.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade pygments to 2.18.0
diff --git a/news/setuptools.vendor.rst b/news/setuptools.vendor.rst
deleted file mode 100644
index afdd14c09dc..00000000000
--- a/news/setuptools.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade setuptools to 70.3.0
diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
deleted file mode 100644
index 580ac5dfb2b..00000000000
--- a/news/typing_extensions.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade typing_extensions to 4.12.2
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 531eec2d928..640e922f537 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.2.dev0"
+__version__ = "24.2"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 59a9d2cc36f9a8370898fbb4eaf5bcb42b4b34f7 Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Sun, 28 Jul 2024 23:17:23 +0100
Subject: [PATCH 520/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 640e922f537..bfc5eb111a0 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.2"
+__version__ = "24.3.dev0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 7debf8cacfc8828cd13fd70ba0b18fab09d1c660 Mon Sep 17 00:00:00 2001
From: Matthew Hughes 
Date: Thu, 1 Aug 2024 20:14:42 +0100
Subject: [PATCH 521/992] Pin `towncrier` in docs requirements

For compatibility reasons, see comment
---
 docs/requirements.txt                                 | 4 +++-
 news/5ab8c2b8-cdb9-4b08-9292-24ce5a135e04.trivial.rst | 0
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 news/5ab8c2b8-cdb9-4b08-9292-24ce5a135e04.trivial.rst

diff --git a/docs/requirements.txt b/docs/requirements.txt
index debfa632b7a..b3ea82a9de1 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,7 @@
 sphinx ~= 7.0
-towncrier
+# currently incompatible with sphinxcontrib-towncrier
+# https://github.com/sphinx-contrib/sphinxcontrib-towncrier/issues/92
+towncrier < 24
 furo
 myst_parser
 sphinx-copybutton
diff --git a/news/5ab8c2b8-cdb9-4b08-9292-24ce5a135e04.trivial.rst b/news/5ab8c2b8-cdb9-4b08-9292-24ce5a135e04.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d

From bff5db744a46b701a7ba01b28b184f98b6648e69 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 15:16:38 -0400
Subject: [PATCH 522/992] Update ruff, fix E721

---
 .pre-commit-config.yaml         | 2 +-
 src/pip/_internal/utils/misc.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7880e0cb409..27816138007 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.5.0
+  rev: v0.5.6
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index 3707e872684..f6f13ed121f 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -555,7 +555,7 @@ def __str__(self) -> str:
 
     # This is useful for testing.
     def __eq__(self, other: Any) -> bool:
-        if type(self) != type(other):
+        if type(self) is not type(other):
             return False
 
         # The string being used for redaction doesn't also have to match,

From 605fdecb97b2b42ae9dfa6959d69461b47d0a124 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 15:20:12 -0400
Subject: [PATCH 523/992] NEWS ENTRY

---
 news/12893.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12893.trivial.rst

diff --git a/news/12893.trivial.rst b/news/12893.trivial.rst
new file mode 100644
index 00000000000..d0a0de14310
--- /dev/null
+++ b/news/12893.trivial.rst
@@ -0,0 +1 @@
+Update ruff in pre-commit to 0.5.6

From 57088cc15b458de6f2c1079539245c9fbe76c819 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:45:22 -0400
Subject: [PATCH 524/992] Create test specific `ruff.toml` that extends ruff
 linting rules

---
 tests/ruff.toml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tests/ruff.toml

diff --git a/tests/ruff.toml b/tests/ruff.toml
new file mode 100644
index 00000000000..366d8a5814b
--- /dev/null
+++ b/tests/ruff.toml
@@ -0,0 +1,14 @@
+# Extend the `pyproject.toml` file in the parent directory.
+extend = "../pyproject.toml"
+
+# And extend linting to include pytest specific rules and configuration
+[lint]
+extend-select = ["PT"]
+ignore = ["PT004", "PT011"]
+
+[lint.flake8-pytest-style]
+mark-parentheses = false
+fixture-parentheses = false
+parametrize-names-type = "csv"
+parametrize-values-type = "list"
+parametrize-values-row-type = "tuple"

From 611bf2401cdd702d5091e77514c585346e193c26 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 18:34:41 -0400
Subject: [PATCH 525/992] Remove IRC link from issue creation

---
 .github/ISSUE_TEMPLATE/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 416ae07000f..e45b66dc911 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,9 +3,6 @@
 
 blank_issues_enabled: false
 contact_links:
-  - name: "💬 IRC: #pypa"
-    url: https://kiwiirc.com/nextclient/#ircs://irc.libera.chat:+6697/pypa
-    about: Chat with devs
   - name: "(maintainers only) Blank issue"
     url: https://github.com/pypa/pip/issues/new
     about: For maintainers only.

From 4b8da93b561aa8c4c8eddc14bff4771b900bf4fc Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 18:42:08 -0400
Subject: [PATCH 526/992] NEWS ENTRY

---
 news/12895.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12895.trivial.rst

diff --git a/news/12895.trivial.rst b/news/12895.trivial.rst
new file mode 100644
index 00000000000..1500e45110a
--- /dev/null
+++ b/news/12895.trivial.rst
@@ -0,0 +1 @@
+Remove IRC link from create issue page

From 6d72675e47a0aee6a28a5863c1a339f814453daa Mon Sep 17 00:00:00 2001
From: Tzu-ping Chung 
Date: Mon, 5 Aug 2024 13:57:59 +0800
Subject: [PATCH 527/992] Add missing period

---
 news/12895.trivial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/12895.trivial.rst b/news/12895.trivial.rst
index 1500e45110a..ab159a6cc7d 100644
--- a/news/12895.trivial.rst
+++ b/news/12895.trivial.rst
@@ -1 +1 @@
-Remove IRC link from create issue page
+Remove IRC link from create issue page.

From ddab00befd30ee80b68ee5b671e68f759cd6d439 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Tue, 6 Aug 2024 19:13:45 -0400
Subject: [PATCH 528/992] Run All checks passed! + manual addition of spaces

---
 tests/functional/test_fast_deps.py     | 4 ++--
 tests/unit/test_collector.py           | 6 +++---
 tests/unit/test_index.py               | 6 +++---
 tests/unit/test_network_auth.py        | 2 +-
 tests/unit/test_network_utils.py       | 2 +-
 tests/unit/test_pep517.py              | 6 +++---
 tests/unit/test_pyproject_config.py    | 4 ++--
 tests/unit/test_self_check_outdated.py | 4 ++--
 tests/unit/test_utils.py               | 4 ++--
 tests/unit/test_utils_subprocess.py    | 4 ++--
 tests/unit/test_utils_unpacking.py     | 2 +-
 tests/unit/test_vcs.py                 | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/functional/test_fast_deps.py b/tests/functional/test_fast_deps.py
index 9e529c0891e..94e78d475f4 100644
--- a/tests/functional/test_fast_deps.py
+++ b/tests/functional/test_fast_deps.py
@@ -32,7 +32,7 @@ def assert_installed(script: PipTestEnvironment, names: str) -> None:
 
 @mark.network
 @mark.parametrize(
-    ("requirement", "expected"),
+    "requirement, expected",
     (
         ("Paste==3.4.2", ("Paste", "six")),
         ("Paste[flup]==3.4.2", ("Paste", "six", "flup")),
@@ -47,7 +47,7 @@ def test_install_from_pypi(
 
 @mark.network
 @mark.parametrize(
-    ("requirement", "expected"),
+    "requirement, expected",
     (
         ("Paste==3.4.2", ("Paste-3.4.2-*.whl", "six-*.whl")),
         ("Paste[flup]==3.4.2", ("Paste-3.4.2-*.whl", "six-*.whl", "flup-*")),
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index 89da25b73d8..9155f4ef036 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -259,7 +259,7 @@ def test_get_simple_response_dont_log_clear_text_password(
 
 
 @pytest.mark.parametrize(
-    ("path", "expected"),
+    "path, expected",
     [
         # Test a character that needs quoting.
         ("a b", "a%20b"),
@@ -299,7 +299,7 @@ def test_clean_url_path(path: str, expected: str, is_local_path: bool) -> None:
 
 
 @pytest.mark.parametrize(
-    ("path", "expected"),
+    "path, expected",
     [
         # Test a VCS path with a Windows drive letter and revision.
         pytest.param(
@@ -322,7 +322,7 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
 
 
 @pytest.mark.parametrize(
-    ("url", "clean_url"),
+    "url, clean_url",
     [
         # URL with hostname and port. Port separator should not be quoted.
         (
diff --git a/tests/unit/test_index.py b/tests/unit/test_index.py
index 78837b94e8b..d02c70b260e 100644
--- a/tests/unit/test_index.py
+++ b/tests/unit/test_index.py
@@ -819,7 +819,7 @@ def test_make_candidate_evaluator(
 
 
 @pytest.mark.parametrize(
-    ("fragment", "canonical_name", "expected"),
+    "fragment, canonical_name, expected",
     [
         # Trivial.
         ("pip-18.0", "pip", 3),
@@ -851,7 +851,7 @@ def test_find_name_version_sep(
 
 
 @pytest.mark.parametrize(
-    ("fragment", "canonical_name"),
+    "fragment, canonical_name",
     [
         # A dash must follow the package name.
         ("zope.interface4.5.0", "zope-interface"),
@@ -868,7 +868,7 @@ def test_find_name_version_sep_failure(fragment: str, canonical_name: str) -> No
 
 
 @pytest.mark.parametrize(
-    ("fragment", "canonical_name", "expected"),
+    "fragment, canonical_name, expected",
     [
         # Trivial.
         ("pip-18.0", "pip", "18.0"),
diff --git a/tests/unit/test_network_auth.py b/tests/unit/test_network_auth.py
index 5c12d870156..9f0eff98a7a 100644
--- a/tests/unit/test_network_auth.py
+++ b/tests/unit/test_network_auth.py
@@ -20,7 +20,7 @@ def reset_keyring() -> Iterable[None]:
 
 
 @pytest.mark.parametrize(
-    ["input_url", "url", "username", "password"],
+    "input_url, url, username, password",
     [
         (
             "http://user%40email.com:password@example.com/path",
diff --git a/tests/unit/test_network_utils.py b/tests/unit/test_network_utils.py
index 380d5741ff6..1b198c166fc 100644
--- a/tests/unit/test_network_utils.py
+++ b/tests/unit/test_network_utils.py
@@ -6,7 +6,7 @@
 
 
 @pytest.mark.parametrize(
-    ("status_code", "error_type"),
+    "status_code, error_type",
     [
         (401, "Client Error"),
         (501, "Server Error"),
diff --git a/tests/unit/test_pep517.py b/tests/unit/test_pep517.py
index 5eefbf4e77c..5333949addf 100644
--- a/tests/unit/test_pep517.py
+++ b/tests/unit/test_pep517.py
@@ -10,7 +10,7 @@
 
 
 @pytest.mark.parametrize(
-    ("source", "expected"),
+    "source, expected",
     [
         ("pep517_setup_and_pyproject", True),
         ("pep517_setup_only", False),
@@ -45,7 +45,7 @@ def test_use_pep517_rejects_setup_cfg_only(shared_data: TestData) -> None:
 
 
 @pytest.mark.parametrize(
-    ("source", "msg"),
+    "source, msg",
     [
         ("pep517_setup_and_pyproject", "specifies a build backend"),
         ("pep517_pyproject_only", "does not have a setup.py"),
@@ -71,7 +71,7 @@ def test_disabling_pep517_invalid(shared_data: TestData, source: str, msg: str)
 
 
 @pytest.mark.parametrize(
-    ("spec",), [("./foo",), ("git+https://example.com/pkg@dev#egg=myproj",)]
+    "spec", [("./foo",), ("git+https://example.com/pkg@dev#egg=myproj",)]
 )
 def test_pep517_parsing_checks_requirements(tmpdir: Path, spec: str) -> None:
     tmpdir.joinpath("pyproject.toml").write_text(
diff --git a/tests/unit/test_pyproject_config.py b/tests/unit/test_pyproject_config.py
index c7e46956055..d385cfb515d 100644
--- a/tests/unit/test_pyproject_config.py
+++ b/tests/unit/test_pyproject_config.py
@@ -6,7 +6,7 @@
 
 
 @pytest.mark.parametrize(
-    ("command", "expected"),
+    "command, expected",
     [
         ("install", True),
         ("wheel", True),
@@ -39,7 +39,7 @@ def test_set_config_empty_value() -> None:
 
 
 @pytest.mark.parametrize(
-    ("passed", "expected"),
+    "passed, expected",
     [
         (["x=hello", "x=world"], {"x": ["hello", "world"]}),
         (["x=hello", "x=world", "x=other"], {"x": ["hello", "world", "other"]}),
diff --git a/tests/unit/test_self_check_outdated.py b/tests/unit/test_self_check_outdated.py
index 99a556e8ac7..605d9182a09 100644
--- a/tests/unit/test_self_check_outdated.py
+++ b/tests/unit/test_self_check_outdated.py
@@ -16,7 +16,7 @@
 
 
 @pytest.mark.parametrize(
-    ["key", "expected"],
+    "key, expected",
     [
         (
             "/hello/world/venv",
@@ -59,7 +59,7 @@ def test_pip_self_version_check_calls_underlying_implementation(
 
 
 @pytest.mark.parametrize(
-    [
+    [  # noqa: PT006 - String representation is too long
         "installed_version",
         "remote_version",
         "stored_version",
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index aa9e7fd56c2..6ddd8afc393 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -559,7 +559,7 @@ def test_normalize_version_info(
 
 class TestGetProg:
     @pytest.mark.parametrize(
-        ("argv", "executable", "expected"),
+        "argv, executable, expected",
         [
             ("/usr/bin/pip", "", "pip"),
             ("-c", "/usr/bin/python", "/usr/bin/python -m pip"),
@@ -1061,7 +1061,7 @@ def test_format_size(size: int, expected: str) -> None:
 
 
 @pytest.mark.parametrize(
-    ("rows", "table", "sizes"),
+    "rows, table, sizes",
     [
         ([], [], []),
         (
diff --git a/tests/unit/test_utils_subprocess.py b/tests/unit/test_utils_subprocess.py
index 5f0c16595a7..65e7d6fdca9 100644
--- a/tests/unit/test_utils_subprocess.py
+++ b/tests/unit/test_utils_subprocess.py
@@ -39,7 +39,7 @@ def test_format_command_args(args: CommandArgs, expected: str) -> None:
 
 
 @pytest.mark.parametrize(
-    ("stdout_only", "expected"),
+    "stdout_only, expected",
     [
         (True, ("out\n", "out\r\n")),
         (False, ("out\nerr\n", "out\r\nerr\r\n", "err\nout\n", "err\r\nout\r\n")),
@@ -312,7 +312,7 @@ def test_info_logging_with_show_stdout_true(
         )
 
     @pytest.mark.parametrize(
-        ("exit_status", "show_stdout", "extra_ok_returncodes", "log_level", "expected"),
+        "exit_status, show_stdout, extra_ok_returncodes, log_level, expected",
         [
             # The spinner should show here because show_stdout=False means
             # the subprocess should get logged at DEBUG level, but the passed
diff --git a/tests/unit/test_utils_unpacking.py b/tests/unit/test_utils_unpacking.py
index efccbdccb0d..e0db5c4ba4a 100644
--- a/tests/unit/test_utils_unpacking.py
+++ b/tests/unit/test_utils_unpacking.py
@@ -198,7 +198,7 @@ def test_unpack_tar_filter(self) -> None:
         assert "is outside the destination" in str(e.value)
 
     @pytest.mark.parametrize(
-        ("input_prefix", "unpack_prefix"),
+        "input_prefix, unpack_prefix",
         [
             ("", ""),
             ("dir/", ""),  # pip ignores a common leading directory
diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py
index a868c9f704d..f18dc038cde 100644
--- a/tests/unit/test_vcs.py
+++ b/tests/unit/test_vcs.py
@@ -61,7 +61,7 @@ def test_rev_options_repr() -> None:
 
 
 @pytest.mark.parametrize(
-    ("vc_class", "expected1", "expected2", "kwargs"),
+    "vc_class, expected1, expected2, kwargs",
     [
         # First check VCS-specific RevOptions behavior.
         (Bazaar, [], ["-r", "123"], {}),
@@ -599,7 +599,7 @@ def test_get_git_version() -> None:
 
 
 @pytest.mark.parametrize(
-    ("version", "expected"),
+    "version, expected",
     [
         ("git version 2.17", (2, 17)),
         ("git version 2.18.1", (2, 18)),

From ac45195b0dd4005d7b4f6e18b7e4500a8d14309d Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 16:38:56 -0400
Subject: [PATCH 529/992] Run `ruff check . --select PT007 --fix
 --unsafe-fixes`

---
 tests/functional/test_download.py     |  4 +--
 tests/functional/test_fast_deps.py    |  8 ++---
 tests/functional/test_install.py      | 18 +++++------
 tests/functional/test_new_resolver.py | 10 +++---
 tests/functional/test_vcs_git.py      |  4 +--
 tests/lib/test_lib.py                 | 16 +++++-----
 tests/unit/metadata/test_metadata.py  |  4 +--
 tests/unit/test_network_auth.py       | 20 ++++++------
 tests/unit/test_options.py            | 46 +++++++++++++--------------
 tests/unit/test_vcs.py                |  4 +--
 10 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/tests/functional/test_download.py b/tests/functional/test_download.py
index 450690c1675..7827f8f33f3 100644
--- a/tests/functional/test_download.py
+++ b/tests/functional/test_download.py
@@ -1450,11 +1450,11 @@ def test_produces_error_for_mismatched_package_name_in_metadata(
 
 @pytest.mark.parametrize(
     "requirement",
-    (
+    [
         "requires-simple-extra==0.1",
         "REQUIRES_SIMPLE-EXTRA==0.1",
         "REQUIRES....simple-_-EXTRA==0.1",
-    ),
+    ],
 )
 def test_canonicalizes_package_name_before_verifying_metadata(
     download_local_html_index: Callable[..., Tuple[TestPipResult, Path]],
diff --git a/tests/functional/test_fast_deps.py b/tests/functional/test_fast_deps.py
index 94e78d475f4..a82684ce938 100644
--- a/tests/functional/test_fast_deps.py
+++ b/tests/functional/test_fast_deps.py
@@ -33,10 +33,10 @@ def assert_installed(script: PipTestEnvironment, names: str) -> None:
 @mark.network
 @mark.parametrize(
     "requirement, expected",
-    (
+    [
         ("Paste==3.4.2", ("Paste", "six")),
         ("Paste[flup]==3.4.2", ("Paste", "six", "flup")),
-    ),
+    ],
 )
 def test_install_from_pypi(
     requirement: str, expected: str, script: PipTestEnvironment
@@ -48,10 +48,10 @@ def test_install_from_pypi(
 @mark.network
 @mark.parametrize(
     "requirement, expected",
-    (
+    [
         ("Paste==3.4.2", ("Paste-3.4.2-*.whl", "six-*.whl")),
         ("Paste[flup]==3.4.2", ("Paste-3.4.2-*.whl", "six-*.whl", "flup-*")),
-    ),
+    ],
 )
 def test_download_from_pypi(
     requirement: str, expected: Iterable[str], script: PipTestEnvironment
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index c6b5635f8fe..c3f562f7f25 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -42,8 +42,8 @@
 )
 
 
-@pytest.mark.parametrize("command", ("install", "wheel"))
-@pytest.mark.parametrize("variant", ("missing_setuptools", "bad_setuptools"))
+@pytest.mark.parametrize("command", ["install", "wheel"])
+@pytest.mark.parametrize("variant", ["missing_setuptools", "bad_setuptools"])
 def test_pep518_uses_build_env(
     script: PipTestEnvironment,
     data: TestData,
@@ -243,10 +243,10 @@ def test_pep518_with_namespace_package(
     )
 
 
-@pytest.mark.parametrize("command", ("install", "wheel"))
+@pytest.mark.parametrize("command", ["install", "wheel"])
 @pytest.mark.parametrize(
     "package",
-    ("pep518_forkbomb", "pep518_twin_forkbombs_first", "pep518_twin_forkbombs_second"),
+    ["pep518_forkbomb", "pep518_twin_forkbombs_first", "pep518_twin_forkbombs_second"],
 )
 def test_pep518_forkbombs(
     script: PipTestEnvironment,
@@ -1253,7 +1253,7 @@ def test_install_nonlocal_compatible_wheel_path(
     assert result.returncode == ERROR
 
 
-@pytest.mark.parametrize("opt", ("--target", "--prefix"))
+@pytest.mark.parametrize("opt", ["--target", "--prefix"])
 def test_install_with_target_or_prefix_and_scripts_no_warning(
     opt: str, script: PipTestEnvironment
 ) -> None:
@@ -2027,7 +2027,7 @@ def test_install_pep508_with_url_in_install_requires(
 
 
 @pytest.mark.network
-@pytest.mark.parametrize("index", (PyPI.simple_url, TestPyPI.simple_url))
+@pytest.mark.parametrize("index", [PyPI.simple_url, TestPyPI.simple_url])
 def test_install_from_test_pypi_with_ext_url_dep_is_blocked(
     script: PipTestEnvironment, index: str
 ) -> None:
@@ -2392,7 +2392,7 @@ def test_install_skip_work_dir_pkg(script: PipTestEnvironment, data: TestData) -
 
 
 @pytest.mark.parametrize(
-    "package_name", ("simple-package", "simple_package", "simple.package")
+    "package_name", ["simple-package", "simple_package", "simple.package"]
 )
 def test_install_verify_package_name_normalization(
     script: PipTestEnvironment, package_name: str
@@ -2449,7 +2449,7 @@ def install_find_links(
 
 @pytest.mark.parametrize(
     "with_target_dir",
-    (True, False),
+    [True, False],
 )
 def test_install_dry_run_nothing_installed(
     script: PipTestEnvironment,
@@ -2618,7 +2618,7 @@ def test_install_pip_prints_req_chain_pypi(script: PipTestEnvironment) -> None:
     )
 
 
-@pytest.mark.parametrize("common_prefix", ("", "linktest-1.0/"))
+@pytest.mark.parametrize("common_prefix", ["", "linktest-1.0/"])
 def test_install_sdist_links(script: PipTestEnvironment, common_prefix: str) -> None:
     """
     Test installing an sdist with hard and symbolic links.
diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py
index 5be2eb93ace..abca6c48db4 100644
--- a/tests/functional/test_new_resolver.py
+++ b/tests/functional/test_new_resolver.py
@@ -2299,8 +2299,8 @@ def test_new_resolver_dont_backtrack_on_extra_if_base_constrained(
     script.assert_installed(pkg="1.0", dep="1.0")
 
 
-@pytest.mark.parametrize("swap_order", (True, False))
-@pytest.mark.parametrize("two_extras", (True, False))
+@pytest.mark.parametrize("swap_order", [True, False])
+@pytest.mark.parametrize("two_extras", [True, False])
 def test_new_resolver_dont_backtrack_on_extra_if_base_constrained_in_requirement(
     script: PipTestEnvironment, swap_order: bool, two_extras: bool
 ) -> None:
@@ -2337,8 +2337,8 @@ def test_new_resolver_dont_backtrack_on_extra_if_base_constrained_in_requirement
     script.assert_installed(pkg="1.0", dep="1.0")
 
 
-@pytest.mark.parametrize("swap_order", (True, False))
-@pytest.mark.parametrize("two_extras", (True, False))
+@pytest.mark.parametrize("swap_order", [True, False])
+@pytest.mark.parametrize("two_extras", [True, False])
 def test_new_resolver_dont_backtrack_on_conflicting_constraints_on_extras(
     tmpdir: pathlib.Path,
     virtualenv: VirtualEnvironment,
@@ -2518,7 +2518,7 @@ def test_new_resolver_works_when_failing_package_builds_are_disallowed(
     script.assert_installed(pkg2="1.0", pkg1="1.0")
 
 
-@pytest.mark.parametrize("swap_order", (True, False))
+@pytest.mark.parametrize("swap_order", [True, False])
 def test_new_resolver_comes_from_with_extra(
     script: PipTestEnvironment, swap_order: bool
 ) -> None:
diff --git a/tests/functional/test_vcs_git.py b/tests/functional/test_vcs_git.py
index 1ec09c73e47..a7276e2b6a5 100644
--- a/tests/functional/test_vcs_git.py
+++ b/tests/functional/test_vcs_git.py
@@ -319,11 +319,11 @@ def _initialize_clonetest_server(
 
 @pytest.mark.parametrize(
     "version_out, expected_message",
-    (
+    [
         ("git version -2.25.1", "Can't parse git version: git version -2.25.1"),
         ("git version 2.a.1", "Can't parse git version: git version 2.a.1"),
         ("git ver. 2.25.1", "Can't parse git version: git ver. 2.25.1"),
-    ),
+    ],
 )
 @patch("pip._internal.vcs.versioncontrol.VersionControl.run_command")
 def test_git_parse_fail_warning(
diff --git a/tests/lib/test_lib.py b/tests/lib/test_lib.py
index 09a1cc738f9..dba55a82809 100644
--- a/tests/lib/test_lib.py
+++ b/tests/lib/test_lib.py
@@ -115,11 +115,11 @@ def run_with_log_command(
 
     @pytest.mark.parametrize(
         "prefix",
-        (
+        [
             "DEBUG",
             "INFO",
             "FOO",
-        ),
+        ],
     )
     def test_run__allowed_stderr(self, script: PipTestEnvironment, prefix: str) -> None:
         """
@@ -150,10 +150,10 @@ def test_run__allow_stderr_warning(self, script: PipTestEnvironment) -> None:
 
     @pytest.mark.parametrize(
         "prefix",
-        (
+        [
             "WARNING",
             "ERROR",
-        ),
+        ],
     )
     def test_run__allow_stderr_error(
         self, script: PipTestEnvironment, prefix: str
@@ -166,10 +166,10 @@ def test_run__allow_stderr_error(
 
     @pytest.mark.parametrize(
         "prefix, expected_start",
-        (
+        [
             ("WARNING", "stderr has an unexpected warning"),
             ("ERROR", "stderr has an unexpected error"),
-        ),
+        ],
     )
     def test_run__unexpected_stderr(
         self, script: PipTestEnvironment, prefix: str, expected_start: str
@@ -227,10 +227,10 @@ def test_run__allow_stderr_warning_false_error_with_expect_stderr(
 
     @pytest.mark.parametrize(
         "arg_name",
-        (
+        [
             "expect_error",
             "allow_stderr_error",
-        ),
+        ],
     )
     def test_run__allow_stderr_warning_false_error(
         self, script: PipTestEnvironment, arg_name: str
diff --git a/tests/unit/metadata/test_metadata.py b/tests/unit/metadata/test_metadata.py
index ccc8ceb2e75..e27dac0069e 100644
--- a/tests/unit/metadata/test_metadata.py
+++ b/tests/unit/metadata/test_metadata.py
@@ -133,11 +133,11 @@ def test_dist_found_in_zip(tmp_path: Path) -> None:
 
 @pytest.mark.parametrize(
     "path",
-    (
+    [
         "/path/to/foo.egg-info".replace("/", os.path.sep),
         # Tests issue fixed by https://github.com/pypa/pip/pull/2530
         "/path/to/foo.egg-info/".replace("/", os.path.sep),
-    ),
+    ],
 )
 def test_trailing_slash_directory_metadata(path: str) -> None:
     dist = get_directory_distribution(path)
diff --git a/tests/unit/test_network_auth.py b/tests/unit/test_network_auth.py
index 9f0eff98a7a..516debf463d 100644
--- a/tests/unit/test_network_auth.py
+++ b/tests/unit/test_network_auth.py
@@ -177,7 +177,7 @@ def set_password(self, system: str, username: str, password: str) -> None:
 
 @pytest.mark.parametrize(
     "url, expect",
-    (
+    [
         ("http://example.com/path1", (None, None)),
         # path1 URLs will be resolved by netloc
         ("http://user@example.com/path3", ("user", "user!netloc")),
@@ -185,7 +185,7 @@ def set_password(self, system: str, username: str, password: str) -> None:
         # path2 URLs will be resolved by index URL
         ("http://example.com/path2/path3", (None, None)),
         ("http://foo@example.com/path2/path3", ("foo", "foo!url")),
-    ),
+    ],
 )
 def test_keyring_get_password(
     monkeypatch: pytest.MonkeyPatch,
@@ -257,7 +257,7 @@ def test_keyring_get_password_username_in_index(
 
 @pytest.mark.parametrize(
     "response_status, creds, expect_save",
-    (
+    [
         (403, ("user", "pass", True), False),
         (
             200,
@@ -269,7 +269,7 @@ def test_keyring_get_password_username_in_index(
             ("user", "pass", False),
             False,
         ),
-    ),
+    ],
 )
 def test_keyring_set_password(
     monkeypatch: pytest.MonkeyPatch,
@@ -345,11 +345,11 @@ def get_credential(self, system: str, username: str) -> Optional[Credential]:
 
 @pytest.mark.parametrize(
     "url, expect",
-    (
+    [
         ("http://example.com/path1", ("username", "netloc")),
         ("http://example.com/path2/path3", ("username", "url")),
         ("http://user2@example.com/path2/path3", ("username", "url")),
-    ),
+    ],
 )
 def test_keyring_get_credential(
     monkeypatch: pytest.MonkeyPatch, url: str, expect: Tuple[str, str]
@@ -442,7 +442,7 @@ def check_returncode(self) -> None:
 
 @pytest.mark.parametrize(
     "url, expect",
-    (
+    [
         ("http://example.com/path1", (None, None)),
         # path1 URLs will be resolved by netloc
         ("http://user@example.com/path3", ("user", "user!netloc")),
@@ -450,7 +450,7 @@ def check_returncode(self) -> None:
         # path2 URLs will be resolved by index URL
         ("http://example.com/path2/path3", (None, None)),
         ("http://foo@example.com/path2/path3", ("foo", "foo!url")),
-    ),
+    ],
 )
 def test_keyring_cli_get_password(
     monkeypatch: pytest.MonkeyPatch,
@@ -472,7 +472,7 @@ def test_keyring_cli_get_password(
 
 @pytest.mark.parametrize(
     "response_status, creds, expect_save",
-    (
+    [
         (403, ("user", "pass", True), False),
         (
             200,
@@ -484,7 +484,7 @@ def test_keyring_cli_get_password(
             ("user", "pass", False),
             False,
         ),
-    ),
+    ],
 )
 def test_keyring_cli_set_password(
     monkeypatch: pytest.MonkeyPatch,
diff --git a/tests/unit/test_options.py b/tests/unit/test_options.py
index 53074fe047c..aee64ccc932 100644
--- a/tests/unit/test_options.py
+++ b/tests/unit/test_options.py
@@ -68,7 +68,7 @@ def test_env_override_default_int(self, monkeypatch: pytest.MonkeyPatch) -> None
         options, args = cast(Tuple[Values, List[str]], main(["fake"]))
         assert options.timeout == -1
 
-    @pytest.mark.parametrize("values", (["F1"], ["F1", "F2"]))
+    @pytest.mark.parametrize("values", [["F1"], ["F1", "F2"]])
     def test_env_override_default_append(
         self, values: List[str], monkeypatch: pytest.MonkeyPatch
     ) -> None:
@@ -80,7 +80,7 @@ def test_env_override_default_append(
         options, args = cast(Tuple[Values, List[str]], main(["fake"]))
         assert options.find_links == values
 
-    @pytest.mark.parametrize("choices", (["w"], ["s", "w"]))
+    @pytest.mark.parametrize("choices", [["w"], ["s", "w"]])
     def test_env_override_default_choice(
         self, choices: List[str], monkeypatch: pytest.MonkeyPatch
     ) -> None:
@@ -92,7 +92,7 @@ def test_env_override_default_choice(
         options, args = cast(Tuple[Values, List[str]], main(["fake"]))
         assert options.exists_action == choices
 
-    @pytest.mark.parametrize("name", ("PIP_LOG_FILE", "PIP_LOCAL_LOG"))
+    @pytest.mark.parametrize("name", ["PIP_LOG_FILE", "PIP_LOCAL_LOG"])
     def test_env_alias_override_default(
         self, name: str, monkeypatch: pytest.MonkeyPatch
     ) -> None:
@@ -316,7 +316,7 @@ def tmpconfig(option: str, value: Any, section: str = "global") -> Iterator[str]
 
 
 class TestCountOptions(AddFakeCommandMixin):
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
     @pytest.mark.parametrize("value", range(4))
     def test_cli_long(self, option: str, value: int) -> None:
         flags = [f"--{option}"] * value
@@ -325,7 +325,7 @@ def test_cli_long(self, option: str, value: int) -> None:
         opt2, args2 = cast(Tuple[Values, List[str]], main(["fake"] + flags))
         assert getattr(opt1, option) == getattr(opt2, option) == value
 
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
     @pytest.mark.parametrize("value", range(1, 4))
     def test_cli_short(self, option: str, value: int) -> None:
         flag = "-" + option[0] * value
@@ -334,7 +334,7 @@ def test_cli_short(self, option: str, value: int) -> None:
         opt2, args2 = cast(Tuple[Values, List[str]], main(["fake", flag]))
         assert getattr(opt1, option) == getattr(opt2, option) == value
 
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
     @pytest.mark.parametrize("value", range(4))
     def test_env_var(
         self, option: str, value: int, monkeypatch: pytest.MonkeyPatch
@@ -344,7 +344,7 @@ def test_env_var(
         options, args = cast(Tuple[Values, List[str]], main(["fake"]))
         assert getattr(options, option) == value
 
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
     @pytest.mark.parametrize("value", range(3))
     def test_env_var_integrate_cli(
         self, option: str, value: int, monkeypatch: pytest.MonkeyPatch
@@ -354,8 +354,8 @@ def test_env_var_integrate_cli(
         options, args = cast(Tuple[Values, List[str]], main(["fake", "--" + option]))
         assert getattr(options, option) == value + 1
 
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
-    @pytest.mark.parametrize("value", (-1, "foobar"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
+    @pytest.mark.parametrize("value", [-1, "foobar"])
     def test_env_var_invalid(
         self,
         option: str,
@@ -368,8 +368,8 @@ def test_env_var_invalid(
             main(["fake"])
 
     # Undocumented, support for backward compatibility
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
-    @pytest.mark.parametrize("value", ("no", "false"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
+    @pytest.mark.parametrize("value", ["no", "false"])
     def test_env_var_false(
         self, option: str, value: str, monkeypatch: pytest.MonkeyPatch
     ) -> None:
@@ -379,8 +379,8 @@ def test_env_var_false(
         assert getattr(options, option) == 0
 
     # Undocumented, support for backward compatibility
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
-    @pytest.mark.parametrize("value", ("yes", "true"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
+    @pytest.mark.parametrize("value", ["yes", "true"])
     def test_env_var_true(
         self, option: str, value: str, monkeypatch: pytest.MonkeyPatch
     ) -> None:
@@ -389,7 +389,7 @@ def test_env_var_true(
         options, args = cast(Tuple[Values, List[str]], main(["fake"]))
         assert getattr(options, option) == 1
 
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
     @pytest.mark.parametrize("value", range(4))
     def test_config_file(
         self, option: str, value: int, monkeypatch: pytest.MonkeyPatch
@@ -400,7 +400,7 @@ def test_config_file(
             options, args = cast(Tuple[Values, List[str]], main(["fake"]))
             assert getattr(options, option) == value
 
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
     @pytest.mark.parametrize("value", range(3))
     def test_config_file_integrate_cli(
         self, option: str, value: int, monkeypatch: pytest.MonkeyPatch
@@ -413,8 +413,8 @@ def test_config_file_integrate_cli(
             )
             assert getattr(options, option) == value + 1
 
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
-    @pytest.mark.parametrize("value", (-1, "foobar"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
+    @pytest.mark.parametrize("value", [-1, "foobar"])
     def test_config_file_invalid(
         self,
         option: str,
@@ -428,8 +428,8 @@ def test_config_file_invalid(
                 main(["fake"])
 
     # Undocumented, support for backward compatibility
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
-    @pytest.mark.parametrize("value", ("no", "false"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
+    @pytest.mark.parametrize("value", ["no", "false"])
     def test_config_file_false(
         self, option: str, value: str, monkeypatch: pytest.MonkeyPatch
     ) -> None:
@@ -440,8 +440,8 @@ def test_config_file_false(
             assert getattr(options, option) == 0
 
     # Undocumented, support for backward compatibility
-    @pytest.mark.parametrize("option", ("verbose", "quiet"))
-    @pytest.mark.parametrize("value", ("yes", "true"))
+    @pytest.mark.parametrize("option", ["verbose", "quiet"])
+    @pytest.mark.parametrize("value", ["yes", "true"])
     def test_config_file_true(
         self, option: str, value: str, monkeypatch: pytest.MonkeyPatch
     ) -> None:
@@ -590,7 +590,7 @@ def test_venv_config_file_found(self, monkeypatch: pytest.MonkeyPatch) -> None:
 
     @pytest.mark.parametrize(
         "args, expect",
-        (
+        [
             ([], None),
             (["--global"], "global"),
             (["--site"], "site"),
@@ -598,7 +598,7 @@ def test_venv_config_file_found(self, monkeypatch: pytest.MonkeyPatch) -> None:
             (["--global", "--user"], PipError),
             (["--global", "--site"], PipError),
             (["--global", "--site", "--user"], PipError),
-        ),
+        ],
     )
     def test_config_file_options(
         self,
diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py
index f18dc038cde..13ef42fc43f 100644
--- a/tests/unit/test_vcs.py
+++ b/tests/unit/test_vcs.py
@@ -291,14 +291,14 @@ def test_git_resolve_revision_not_found_warning(
 
 @pytest.mark.parametrize(
     "rev_name,result",
-    (
+    [
         ("5547fa909e83df8bd743d3978d6667497983a4b7", True),
         ("5547fa909", False),
         ("5678", False),
         ("abc123", False),
         ("foo", False),
         (None, False),
-    ),
+    ],
 )
 @mock.patch("pip._internal.vcs.git.Git.get_revision")
 def test_git_is_commit_id_equal(

From ce1e1e447ae6e1346409c82f01fbe38b74a5ffcb Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 16:42:01 -0400
Subject: [PATCH 530/992] Run `ruff check . --select PT001 --fix`

---
 tests/conftest.py                                 | 2 +-
 tests/functional/test_install_config.py           | 2 +-
 tests/functional/test_install_reqs.py             | 2 +-
 tests/functional/test_new_resolver.py             | 2 +-
 tests/functional/test_new_resolver_target.py      | 2 +-
 tests/functional/test_new_resolver_user.py        | 2 +-
 tests/functional/test_pep668.py                   | 2 +-
 tests/functional/test_truststore.py               | 2 +-
 tests/functional/test_uninstall.py                | 2 +-
 tests/unit/resolution_resolvelib/test_resolver.py | 2 +-
 tests/unit/test_exceptions.py                     | 2 +-
 tests/unit/test_utils.py                          | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 9850da55d56..483d2e572be 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -216,7 +216,7 @@ def tmp_path(request: pytest.FixtureRequest, tmp_path: Path) -> Iterator[Path]:
         shutil.rmtree(tmp_path, ignore_errors=True)
 
 
-@pytest.fixture()
+@pytest.fixture
 def tmpdir(tmp_path: Path) -> Path:
     """Override Pytest's ``tmpdir`` with our pathlib implementation.
 
diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py
index 9374fade121..d111bc5f7bc 100644
--- a/tests/functional/test_install_config.py
+++ b/tests/functional/test_install_config.py
@@ -361,7 +361,7 @@ def keyring_provider_implementation(request: pytest.FixtureRequest) -> str:
     return request.param
 
 
-@pytest.fixture()
+@pytest.fixture
 def flags(
     request: pytest.FixtureRequest,
     interactive: bool,
diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index 1db749b145c..9a3bba9b1fa 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -32,7 +32,7 @@ class ArgRecordingSdistMaker(Protocol):
     def __call__(self, name: str, **kwargs: Any) -> ArgRecordingSdist: ...
 
 
-@pytest.fixture()
+@pytest.fixture
 def arg_recording_sdist_maker(
     script: PipTestEnvironment,
 ) -> ArgRecordingSdistMaker:
diff --git a/tests/functional/test_new_resolver.py b/tests/functional/test_new_resolver.py
index abca6c48db4..7ab8a0bb850 100644
--- a/tests/functional/test_new_resolver.py
+++ b/tests/functional/test_new_resolver.py
@@ -35,7 +35,7 @@ def assert_editable(script: PipTestEnvironment, *args: str) -> None:
     ), f"{args!r} not all found in {script.site_packages_path!r}"
 
 
-@pytest.fixture()
+@pytest.fixture
 def make_fake_wheel(script: PipTestEnvironment) -> MakeFakeWheel:
     def _make_fake_wheel(name: str, version: str, wheel_tag: str) -> pathlib.Path:
         wheel_house = script.scratch_path.joinpath("wheelhouse")
diff --git a/tests/functional/test_new_resolver_target.py b/tests/functional/test_new_resolver_target.py
index a81cfe5e83d..4434c276fca 100644
--- a/tests/functional/test_new_resolver_target.py
+++ b/tests/functional/test_new_resolver_target.py
@@ -10,7 +10,7 @@
 MakeFakeWheel = Callable[[str], str]
 
 
-@pytest.fixture()
+@pytest.fixture
 def make_fake_wheel(script: PipTestEnvironment) -> MakeFakeWheel:
     def _make_fake_wheel(wheel_tag: str) -> str:
         wheel_house = script.scratch_path.joinpath("wheelhouse")
diff --git a/tests/functional/test_new_resolver_user.py b/tests/functional/test_new_resolver_user.py
index 1660924f28c..5d061f9012c 100644
--- a/tests/functional/test_new_resolver_user.py
+++ b/tests/functional/test_new_resolver_user.py
@@ -91,7 +91,7 @@ def test_new_resolver_install_user_conflict_in_user_site(
     result.did_not_create(base_2_dist_info)
 
 
-@pytest.fixture()
+@pytest.fixture
 def patch_dist_in_site_packages(virtualenv: VirtualEnvironment) -> None:
     # Since the tests are run from a virtualenv, and to avoid the "Will not
     # install to the usersite because it will lack sys.path precedence..."
diff --git a/tests/functional/test_pep668.py b/tests/functional/test_pep668.py
index 3c1085668fc..a4920dfce5e 100644
--- a/tests/functional/test_pep668.py
+++ b/tests/functional/test_pep668.py
@@ -9,7 +9,7 @@
 from tests.lib.venv import VirtualEnvironment
 
 
-@pytest.fixture()
+@pytest.fixture
 def patch_check_externally_managed(virtualenv: VirtualEnvironment) -> None:
     # Since the tests are run from a virtual environment, and we can't
     # guarantee access to the actual stdlib location (where EXTERNALLY-MANAGED
diff --git a/tests/functional/test_truststore.py b/tests/functional/test_truststore.py
index c534ddb954d..8985665906e 100644
--- a/tests/functional/test_truststore.py
+++ b/tests/functional/test_truststore.py
@@ -7,7 +7,7 @@
 PipRunner = Callable[..., TestPipResult]
 
 
-@pytest.fixture()
+@pytest.fixture
 def pip_no_truststore(script: PipTestEnvironment) -> PipRunner:
     def pip(*args: str, **kwargs: Any) -> TestPipResult:
         return script.pip(*args, "--use-deprecated=legacy-certs", **kwargs)
diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py
index 5bf64119e34..58e141e54ad 100644
--- a/tests/functional/test_uninstall.py
+++ b/tests/functional/test_uninstall.py
@@ -669,7 +669,7 @@ def test_uninstall_editable_and_pip_install(
     script.assert_not_installed("FSPkg")
 
 
-@pytest.fixture()
+@pytest.fixture
 def move_easy_install_pth(script: PipTestEnvironment) -> Iterator[None]:
     """Move easy-install.pth out of the way for testing easy_install."""
     easy_install_pth = join(script.site_packages_path, "easy-install.pth")
diff --git a/tests/unit/resolution_resolvelib/test_resolver.py b/tests/unit/resolution_resolvelib/test_resolver.py
index 87c2b5f3533..b1525a20a56 100644
--- a/tests/unit/resolution_resolvelib/test_resolver.py
+++ b/tests/unit/resolution_resolvelib/test_resolver.py
@@ -16,7 +16,7 @@
 )
 
 
-@pytest.fixture()
+@pytest.fixture
 def resolver(preparer: RequirementPreparer, finder: PackageFinder) -> Resolver:
     resolver = Resolver(
         preparer=preparer,
diff --git a/tests/unit/test_exceptions.py b/tests/unit/test_exceptions.py
index 6510b569e5f..12a17dcd1f3 100644
--- a/tests/unit/test_exceptions.py
+++ b/tests/unit/test_exceptions.py
@@ -500,7 +500,7 @@ def fake_getlocale(category: int) -> Tuple[Optional[str], Optional[str]]:
 
         monkeypatch.setattr(locale, "getlocale", fake_getlocale)
 
-    @pytest.fixture()
+    @pytest.fixture
     def marker(self, tmp_path: pathlib.Path) -> pathlib.Path:
         marker = tmp_path.joinpath("EXTERNALLY-MANAGED")
         marker.touch()
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 6ddd8afc393..d1e64262de2 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -860,7 +860,7 @@ def test_hide_url() -> None:
     assert hidden_url.secret == "https://user:password@example.com"
 
 
-@pytest.fixture()
+@pytest.fixture
 def patch_deprecation_check_version() -> Iterator[None]:
     # We do this, so that the deprecation tests are easier to write.
     import pip._internal.utils.deprecation as d

From 6c86c9607d2e36c7b7e2d5f813e68906079a2c14 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:51:17 -0400
Subject: [PATCH 531/992] Run `ruff check . --select PT018 --fix` + Manual
 fixes of asserts with messages

---
 tests/functional/test_pep517.py      |  3 ++-
 tests/unit/metadata/test_metadata.py |  6 ++++--
 tests/unit/test_collector.py         |  3 ++-
 tests/unit/test_req_uninstall.py     | 12 ++++++++----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/tests/functional/test_pep517.py b/tests/functional/test_pep517.py
index 78a6c2bbc6c..ca8d4adfb59 100644
--- a/tests/functional/test_pep517.py
+++ b/tests/functional/test_pep517.py
@@ -44,7 +44,8 @@ def test_backend(tmpdir: Path, data: TestData) -> None:
     finder = make_test_finder(find_links=[data.backends])
     env.install_requirements(finder, ["dummy_backend"], "normal", kind="Installing")
     conflicting, missing = env.check_requirements(["dummy_backend"])
-    assert not conflicting and not missing
+    assert not conflicting
+    assert not missing
     assert hasattr(req.pep517_backend, "build_wheel")
     with env:
         assert req.pep517_backend is not None
diff --git a/tests/unit/metadata/test_metadata.py b/tests/unit/metadata/test_metadata.py
index e27dac0069e..caa2dea8c91 100644
--- a/tests/unit/metadata/test_metadata.py
+++ b/tests/unit/metadata/test_metadata.py
@@ -119,7 +119,8 @@ def test_dist_found_in_directory_named_whl(tmp_path: Path) -> None:
     info_path.joinpath("METADATA").write_text("Name: pkg")
     location = os.fspath(dir_path)
     dist = get_environment([location]).get_distribution("pkg")
-    assert dist is not None and dist.location is not None
+    assert dist is not None
+    assert dist.location is not None
     assert Path(dist.location) == Path(location)
 
 
@@ -127,7 +128,8 @@ def test_dist_found_in_zip(tmp_path: Path) -> None:
     location = os.fspath(tmp_path.joinpath("pkg.zip"))
     make_wheel(name="pkg", version="1").save_to(location)
     dist = get_environment([location]).get_distribution("pkg")
-    assert dist is not None and dist.location is not None
+    assert dist is not None
+    assert dist.location is not None
     assert Path(dist.location) == Path(location)
 
 
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index 9155f4ef036..c495765b66e 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -1208,4 +1208,5 @@ def test_metadata_file_info_parsing_html(
     page_url = "dummy_for_comes_from"
     base_url = "https://index.url/simple"
     link = Link.from_element(attribs, page_url, base_url)
-    assert link is not None and link.metadata_file_data == expected
+    assert link is not None
+    assert link.metadata_file_data == expected
diff --git a/tests/unit/test_req_uninstall.py b/tests/unit/test_req_uninstall.py
index b61babc343a..0523ffd7a07 100644
--- a/tests/unit/test_req_uninstall.py
+++ b/tests/unit/test_req_uninstall.py
@@ -380,8 +380,10 @@ def test_commit_symlinks(self, tmpdir: Path) -> None:
         # stash removed, links removed
         for stashed_path in stashed_paths:
             assert not os.path.lexists(stashed_path)
-        assert not os.path.lexists(dirlink) and not os.path.isdir(dirlink)
-        assert not os.path.lexists(filelink) and not os.path.isfile(filelink)
+        assert not os.path.lexists(dirlink)
+        assert not os.path.isdir(dirlink)
+        assert not os.path.lexists(filelink)
+        assert not os.path.isfile(filelink)
 
         # link targets untouched
         assert os.path.isdir(adir)
@@ -412,8 +414,10 @@ def test_rollback_symlinks(self, tmpdir: Path) -> None:
         # stash removed, links restored
         for stashed_path in stashed_paths:
             assert not os.path.lexists(stashed_path)
-        assert os.path.lexists(dirlink) and os.path.isdir(dirlink)
-        assert os.path.lexists(filelink) and os.path.isfile(filelink)
+        assert os.path.lexists(dirlink)
+        assert os.path.isdir(dirlink)
+        assert os.path.lexists(filelink)
+        assert os.path.isfile(filelink)
 
         # link targets untouched
         assert os.path.isdir(adir)

From 9e26bdcfcd64a84678c827539ca6938742a7f27d Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:50:01 -0400
Subject: [PATCH 532/992] Manual fixes of PT018

---
 tests/functional/test_install.py | 13 ++++---------
 tests/functional/test_pep517.py  |  9 ++++++---
 tests/unit/test_collector.py     | 21 ++++++++-------------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index c3f562f7f25..5fde139b6a6 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -105,16 +105,13 @@ def test_pep518_refuses_conflicting_requires(
     result = script.pip_install_local(
         "-f", script.scratch_path, project_dir, expect_error=True
     )
+    assert result.returncode != 0
     assert (
-        result.returncode != 0
-        and (
             f"Some build dependencies for {project_dir.as_uri()} conflict "
             "with PEP 517/518 supported "
             "requirements: setuptools==1.0 is incompatible with "
             "setuptools>=40.8.0."
-        )
-        in result.stderr
-    ), str(result)
+        ) in result.stderr, str(result)
 
 
 def test_pep518_refuses_invalid_requires(
@@ -2309,10 +2306,8 @@ def test_error_all_yanked_files_and_no_pin(
         expect_error=True,
     )
     # Make sure an error is raised
-    assert (
-        result.returncode == 1
-        and "ERROR: No matching distribution found for simple\n" in result.stderr
-    ), str(result)
+    assert result.returncode == 1
+    assert "ERROR: No matching distribution found for simple\n" in result.stderr, str(result)
 
 
 @pytest.mark.parametrize(
diff --git a/tests/functional/test_pep517.py b/tests/functional/test_pep517.py
index ca8d4adfb59..4e0c16358af 100644
--- a/tests/functional/test_pep517.py
+++ b/tests/functional/test_pep517.py
@@ -164,7 +164,8 @@ def test_conflicting_pep517_backend_requirements(
         "dependencies: simplewheel==1.0 is incompatible with "
         "simplewheel==2.0."
     )
-    assert result.returncode != 0 and msg in result.stderr, str(result)
+    assert result.returncode != 0
+    assert msg in result.stderr, str(result)
 
 
 def test_no_check_build_deps(
@@ -209,7 +210,8 @@ def test_validate_missing_pep517_backend_requirements(
         f"Some build dependencies for {project_dir.as_uri()} are missing: "
         "'simplewheel==1.0', 'test_backend'."
     )
-    assert result.returncode != 0 and msg in result.stderr, str(result)
+    assert result.returncode != 0
+    assert msg in result.stderr, str(result)
 
 
 def test_validate_conflicting_pep517_backend_requirements(
@@ -236,7 +238,8 @@ def test_validate_conflicting_pep517_backend_requirements(
         "dependencies: simplewheel==2.0 is incompatible with "
         "simplewheel==1.0."
     )
-    assert result.returncode != 0 and msg in result.stderr, str(result)
+    assert result.returncode != 0
+    assert msg in result.stderr, str(result)
 
 
 def test_pep517_backend_requirements_satisfied_by_prerelease(
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index c495765b66e..d62ed95dd0c 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -880,11 +880,9 @@ def test_collect_sources__file_expand_dir(data: TestData) -> None:
         project_name="",
         candidates_from_page=None,  # type: ignore[arg-type]
     )
-    assert (
-        not sources.index_urls
-        and len(sources.find_links) == 1
-        and isinstance(sources.find_links[0], _FlatDirectorySource)
-    ), (
+    assert not sources.index_urls
+    assert len(sources.find_links) == 1
+    assert isinstance(sources.find_links[0], _FlatDirectorySource), (
         "Directory source should have been found "
         f"at find-links url: {data.find_links}"
     )
@@ -909,11 +907,9 @@ def test_collect_sources__file_not_find_link(data: TestData) -> None:
         # Shouldn't be used.
         candidates_from_page=None,  # type: ignore[arg-type]
     )
-    assert (
-        not sources.find_links
-        and len(sources.index_urls) == 1
-        and isinstance(sources.index_urls[0], _IndexDirectorySource)
-    ), "Directory specified as index should be treated as a page"
+    assert not sources.find_links
+    assert len(sources.index_urls) == 1
+    assert isinstance(sources.index_urls[0], _IndexDirectorySource), "Directory specified as index should be treated as a page"
 
 
 def test_collect_sources__non_existing_path() -> None:
@@ -934,9 +930,8 @@ def test_collect_sources__non_existing_path() -> None:
         project_name=None,  # type: ignore[arg-type]
         candidates_from_page=None,  # type: ignore[arg-type]
     )
-    assert not sources.index_urls and sources.find_links == [
-        None
-    ], "Nothing should have been found"
+    assert not sources.index_urls
+    assert sources.find_links == [None], "Nothing should have been found"
 
 
 def check_links_include(links: List[Link], names: List[str]) -> None:

From 1c2eddde4a92db1f21d868b769d2fb778c246ed0 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:50:15 -0400
Subject: [PATCH 533/992] Manual fixes of PT015

---
 tests/functional/test_invalid_versions_and_specifiers.py | 2 +-
 tests/functional/test_list.py                            | 2 +-
 tests/unit/test_network_auth.py                          | 6 +++---
 tests/unit/test_req_file.py                              | 4 ++--
 tests/unit/test_utils_retry.py                           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 21ce02085fc..4867fe54beb 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -136,4 +136,4 @@ def test_show_require_invalid_version(
     elif select_backend().NAME == "pkg_resources":
         assert "Required-by: \n" in result.stdout
     else:
-        assert False, "Unknown metadata backend"
+        pytest.fail("Unknown metadata backend")
diff --git a/tests/functional/test_list.py b/tests/functional/test_list.py
index 5164c1d5c39..43998600eb6 100644
--- a/tests/functional/test_list.py
+++ b/tests/functional/test_list.py
@@ -749,4 +749,4 @@ def test_list_pep610_editable(script: PipTestEnvironment) -> None:
             assert item["editable_project_location"]
             break
     else:
-        assert False, "package 'testpkg' not found in pip list result"
+        pytest.fail("package 'testpkg' not found in pip list result")
diff --git a/tests/unit/test_network_auth.py b/tests/unit/test_network_auth.py
index 516debf463d..1743248efd1 100644
--- a/tests/unit/test_network_auth.py
+++ b/tests/unit/test_network_auth.py
@@ -291,7 +291,7 @@ def should_save_password_to_keyring(*a: Any) -> bool:
         # when _prompt_for_password indicates not to save, we should
         # never call this function
         def should_save_password_to_keyring(*a: Any) -> bool:
-            assert False, "_should_save_password_to_keyring should not be called"
+            pytest.fail("_should_save_password_to_keyring should not be called")
 
     monkeypatch.setattr(
         auth, "_should_save_password_to_keyring", should_save_password_to_keyring
@@ -333,7 +333,7 @@ def __init__(self, username: str, password: str) -> None:
             self.password = password
 
     def get_password(self, system: str, username: str) -> None:
-        assert False, "get_password should not ever be called"
+        pytest.fail("get_password should not ever be called")
 
     def get_credential(self, system: str, username: str) -> Optional[Credential]:
         if system == "http://example.com/path2/":
@@ -507,7 +507,7 @@ def should_save_password_to_keyring(*a: Any) -> bool:
         # when _prompt_for_password indicates not to save, we should
         # never call this function
         def should_save_password_to_keyring(*a: Any) -> bool:
-            assert False, "_should_save_password_to_keyring should not be called"
+            pytest.fail("_should_save_password_to_keyring should not be called")
 
     monkeypatch.setattr(
         auth, "_should_save_password_to_keyring", should_save_password_to_keyring
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index f4f98b1901c..236b666fb34 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -519,7 +519,7 @@ def get_file_content(
                 return None, "-r reqs.txt"
             elif filename == "http://me.com/me/reqs.txt":
                 return None, req_name
-            assert False, f"Unexpected file requested {filename}"
+            pytest.fail(f"Unexpected file requested {filename}")
 
         monkeypatch.setattr(
             pip._internal.req.req_file, "get_file_content", get_file_content
@@ -588,7 +588,7 @@ def get_file_content(
                 return None, f"-r {nested_req_file}"
             elif filename == nested_req_file:
                 return None, req_name
-            assert False, f"Unexpected file requested {filename}"
+            pytest.fail(f"Unexpected file requested {filename}")
 
         monkeypatch.setattr(
             pip._internal.req.req_file, "get_file_content", get_file_content
diff --git a/tests/unit/test_utils_retry.py b/tests/unit/test_utils_retry.py
index 74abce6f66f..6c554a42d99 100644
--- a/tests/unit/test_utils_retry.py
+++ b/tests/unit/test_utils_retry.py
@@ -48,7 +48,7 @@ def _raise_error() -> NoReturn:
         assert isinstance(e, RuntimeError)
         assert e is errors[-1]
     else:
-        assert False, "unexpected return"
+        assert pytest.fail("unexpected return")
 
     assert function.call_count > 1, "expected at least one retry"
 

From 362cc8f1a2812ce2a15a3f7fe2dc0834a2de94b1 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:15:36 -0400
Subject: [PATCH 534/992] Run `ruff check . --select PT022 --fix` + manual fix
 of return type

---
 tests/conftest.py                                    |  8 ++++----
 tests/unit/resolution_resolvelib/conftest.py         | 12 ++++++------
 tests/unit/resolution_resolvelib/test_requirement.py |  4 ++--
 tests/unit/test_network_cache.py                     |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 483d2e572be..e77644e4adc 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -477,7 +477,7 @@ def virtualenv_template(
     setuptools_install: Path,
     wheel_install: Path,
     coverage_install: Path,
-) -> Iterator[VirtualEnvironment]:
+) -> VirtualEnvironment:
     venv_type: VirtualEnvironmentType
     if request.config.getoption("--use-venv"):
         venv_type = "venv"
@@ -522,7 +522,7 @@ def virtualenv_template(
     # it's not reused by mistake from one of the copies.
     venv_template = tmpdir / "venv_template"
     venv.move(venv_template)
-    yield venv
+    return venv
 
 
 @pytest.fixture(scope="session")
@@ -538,14 +538,14 @@ def factory(tmpdir: Path) -> VirtualEnvironment:
 @pytest.fixture
 def virtualenv(
     virtualenv_factory: Callable[[Path], VirtualEnvironment], tmpdir: Path
-) -> Iterator[VirtualEnvironment]:
+) -> VirtualEnvironment:
     """
     Return a virtual environment which is unique to each test function
     invocation created inside of a sub directory of the test function's
     temporary directory. The returned object is a
     ``tests.lib.venv.VirtualEnvironment`` object.
     """
-    yield virtualenv_factory(tmpdir.joinpath("workspace", "venv"))
+    return virtualenv_factory(tmpdir.joinpath("workspace", "venv"))
 
 
 @pytest.fixture(scope="session")
diff --git a/tests/unit/resolution_resolvelib/conftest.py b/tests/unit/resolution_resolvelib/conftest.py
index a4ee32444e2..348396bafe2 100644
--- a/tests/unit/resolution_resolvelib/conftest.py
+++ b/tests/unit/resolution_resolvelib/conftest.py
@@ -21,13 +21,13 @@
 
 
 @pytest.fixture
-def finder(data: TestData) -> Iterator[PackageFinder]:
+def finder(data: TestData) -> PackageFinder:
     session = PipSession()
     scope = SearchScope([str(data.packages)], [], False)
     collector = LinkCollector(session, scope)
     prefs = SelectionPreferences(allow_yanked=False)
     finder = PackageFinder.create(collector, prefs)
-    yield finder
+    return finder
 
 
 @pytest.fixture
@@ -53,8 +53,8 @@ def preparer(finder: PackageFinder) -> Iterator[RequirementPreparer]:
 
 
 @pytest.fixture
-def factory(finder: PackageFinder, preparer: RequirementPreparer) -> Iterator[Factory]:
-    yield Factory(
+def factory(finder: PackageFinder, preparer: RequirementPreparer) -> Factory:
+    return Factory(
         finder=finder,
         preparer=preparer,
         make_install_req=install_req_from_line,
@@ -68,8 +68,8 @@ def factory(finder: PackageFinder, preparer: RequirementPreparer) -> Iterator[Fa
 
 
 @pytest.fixture
-def provider(factory: Factory) -> Iterator[PipProvider]:
-    yield PipProvider(
+def provider(factory: Factory) -> PipProvider:
+    return PipProvider(
         factory=factory,
         constraints={},
         ignore_dependencies=False,
diff --git a/tests/unit/resolution_resolvelib/test_requirement.py b/tests/unit/resolution_resolvelib/test_requirement.py
index b7b0395b037..79288f63e81 100644
--- a/tests/unit/resolution_resolvelib/test_requirement.py
+++ b/tests/unit/resolution_resolvelib/test_requirement.py
@@ -32,7 +32,7 @@ def _is_satisfied_by(requirement: Requirement, candidate: Candidate) -> bool:
 
 
 @pytest.fixture
-def test_cases(data: TestData) -> Iterator[List[Tuple[str, str, int]]]:
+def test_cases(data: TestData) -> List[Tuple[str, str, int]]:
     def _data_file(name: str) -> Path:
         return data.packages.joinpath(name)
 
@@ -61,7 +61,7 @@ def data_url(name: str) -> str:
         # TODO: directory, editables
     ]
 
-    yield test_cases
+    return test_cases
 
 
 def test_new_resolver_requirement_has_name(
diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py
index f1ed1f7edc1..0c2801a24bb 100644
--- a/tests/unit/test_network_cache.py
+++ b/tests/unit/test_network_cache.py
@@ -11,10 +11,10 @@
 
 
 @pytest.fixture(scope="function")
-def cache_tmpdir(tmpdir: Path) -> Iterator[Path]:
+def cache_tmpdir(tmpdir: Path) -> Path:
     cache_dir = tmpdir.joinpath("cache")
     cache_dir.mkdir(parents=True)
-    yield cache_dir
+    return cache_dir
 
 
 class TestSafeFileCache:

From 7fdc7e615dae6fef9ada96cdbce7dc56db9e9644 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:18:33 -0400
Subject: [PATCH 535/992] Run `ruff check . --select PT003,PT001 --fix
 --unsafe-fixes`

---
 tests/conftest.py                 | 2 +-
 tests/functional/test_download.py | 4 ++--
 tests/unit/test_network_auth.py   | 2 +-
 tests/unit/test_network_cache.py  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index e77644e4adc..da4ab5b9dfb 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -973,7 +973,7 @@ def do_GET(self) -> None:
             self._seen_paths.add(self.path)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def html_index_with_onetime_server(
     html_index_for_packages: Path,
 ) -> Iterator[http.server.ThreadingHTTPServer]:
diff --git a/tests/functional/test_download.py b/tests/functional/test_download.py
index 7827f8f33f3..d469e71c360 100644
--- a/tests/functional/test_download.py
+++ b/tests/functional/test_download.py
@@ -1234,7 +1234,7 @@ def test_download_use_pep517_propagation(
     assert len(downloads) == 2
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def download_local_html_index(
     script: PipTestEnvironment,
     html_index_for_packages: Path,
@@ -1265,7 +1265,7 @@ def run_for_generated_index(
     return run_for_generated_index
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def download_server_html_index(
     script: PipTestEnvironment,
     tmpdir: Path,
diff --git a/tests/unit/test_network_auth.py b/tests/unit/test_network_auth.py
index 1743248efd1..86f01e436c0 100644
--- a/tests/unit/test_network_auth.py
+++ b/tests/unit/test_network_auth.py
@@ -11,7 +11,7 @@
 from tests.lib.requests_mocks import MockConnection, MockRequest, MockResponse
 
 
-@pytest.fixture(scope="function", autouse=True)
+@pytest.fixture(autouse=True)
 def reset_keyring() -> Iterable[None]:
     yield None
     # Reset the state of the module between tests
diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py
index 0c2801a24bb..837c296ff8e 100644
--- a/tests/unit/test_network_cache.py
+++ b/tests/unit/test_network_cache.py
@@ -10,7 +10,7 @@
 from tests.lib.filesystem import chmod
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture
 def cache_tmpdir(tmpdir: Path) -> Path:
     cache_dir = tmpdir.joinpath("cache")
     cache_dir.mkdir(parents=True)

From 612d1f197afcb5128d955e3119397b7de1a67384 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:35:12 -0400
Subject: [PATCH 536/992] Manuall fix PT017

---
 tests/unit/test_utils_retry.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/unit/test_utils_retry.py b/tests/unit/test_utils_retry.py
index 6c554a42d99..4331d0e2604 100644
--- a/tests/unit/test_utils_retry.py
+++ b/tests/unit/test_utils_retry.py
@@ -42,13 +42,9 @@ def _raise_error() -> NoReturn:
 
     function = Mock(wraps=_raise_error)
     wrapped = retry(wait=0, stop_after_delay=0.01)(function)
-    try:
+    with pytest.raises(RuntimeError) as exc_info:
         wrapped()
-    except Exception as e:
-        assert isinstance(e, RuntimeError)
-        assert e is errors[-1]
-    else:
-        assert pytest.fail("unexpected return")
+    assert exc_info.value is errors[-1]
 
     assert function.call_count > 1, "expected at least one retry"
 

From b4ba73568ea927c893eaecf89a1b592fb8354a30 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:36:01 -0400
Subject: [PATCH 537/992] Manually fix PT013

---
 tests/functional/test_fast_deps.py    | 18 +++++++++---------
 tests/unit/test_network_lazy_wheel.py | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/functional/test_fast_deps.py b/tests/functional/test_fast_deps.py
index a82684ce938..549de7eff41 100644
--- a/tests/functional/test_fast_deps.py
+++ b/tests/functional/test_fast_deps.py
@@ -7,7 +7,7 @@
 from typing import Iterable
 
 from pip._vendor.packaging.utils import canonicalize_name
-from pytest import mark
+import pytest
 
 from pip._internal.utils.misc import hash_file
 from tests.lib import PipTestEnvironment, TestData, TestPipResult
@@ -30,8 +30,8 @@ def assert_installed(script: PipTestEnvironment, names: str) -> None:
     assert installed.issuperset(map(canonicalize_name, names))
 
 
-@mark.network
-@mark.parametrize(
+@pytest.mark.network
+@pytest.mark.parametrize(
     "requirement, expected",
     [
         ("Paste==3.4.2", ("Paste", "six")),
@@ -45,8 +45,8 @@ def test_install_from_pypi(
     assert_installed(script, expected)
 
 
-@mark.network
-@mark.parametrize(
+@pytest.mark.network
+@pytest.mark.parametrize(
     "requirement, expected",
     [
         ("Paste==3.4.2", ("Paste-3.4.2-*.whl", "six-*.whl")),
@@ -61,7 +61,7 @@ def test_download_from_pypi(
     assert all(fnmatch.filter(created, f) for f in expected)
 
 
-@mark.network
+@pytest.mark.network
 def test_build_wheel_with_deps(data: TestData, script: PipTestEnvironment) -> None:
     result = pip(script, "wheel", os.fspath(data.packages / "requiresPaste"))
     created = [basename(f) for f in result.files_created]
@@ -70,7 +70,7 @@ def test_build_wheel_with_deps(data: TestData, script: PipTestEnvironment) -> No
     assert fnmatch.filter(created, "six-*.whl")
 
 
-@mark.network
+@pytest.mark.network
 def test_require_hash(script: PipTestEnvironment, tmp_path: pathlib.Path) -> None:
     reqs = tmp_path / "requirements.txt"
     reqs.write_text(
@@ -91,7 +91,7 @@ def test_require_hash(script: PipTestEnvironment, tmp_path: pathlib.Path) -> Non
     assert fnmatch.filter(created, "idna-2.10*")
 
 
-@mark.network
+@pytest.mark.network
 def test_hash_mismatch(script: PipTestEnvironment, tmp_path: pathlib.Path) -> None:
     reqs = tmp_path / "requirements.txt"
     reqs.write_text("idna==2.10 --hash=sha256:irna")
@@ -105,7 +105,7 @@ def test_hash_mismatch(script: PipTestEnvironment, tmp_path: pathlib.Path) -> No
     assert "DO NOT MATCH THE HASHES" in result.stderr
 
 
-@mark.network
+@pytest.mark.network
 def test_hash_mismatch_existing_download_for_metadata_only_wheel(
     script: PipTestEnvironment, tmp_path: pathlib.Path
 ) -> None:
diff --git a/tests/unit/test_network_lazy_wheel.py b/tests/unit/test_network_lazy_wheel.py
index 79e86321793..356387d2bba 100644
--- a/tests/unit/test_network_lazy_wheel.py
+++ b/tests/unit/test_network_lazy_wheel.py
@@ -1,7 +1,7 @@
 from typing import Iterator
 
+import pytest
 from pip._vendor.packaging.version import Version
-from pytest import fixture, mark, raises
 
 from pip._internal.exceptions import InvalidWheel
 from pip._internal.network.lazy_wheel import (
@@ -25,12 +25,12 @@
 }
 
 
-@fixture
+@pytest.fixture
 def session() -> PipSession:
     return PipSession()
 
 
-@fixture
+@pytest.fixture
 def mypy_whl_no_range(mock_server: MockServer, shared_data: TestData) -> Iterator[str]:
     mypy_whl = shared_data.packages / "mypy-0.782-py3-none-any.whl"
     mock_server.set_responses([file_response(mypy_whl)])
@@ -40,7 +40,7 @@ def mypy_whl_no_range(mock_server: MockServer, shared_data: TestData) -> Iterato
     mock_server.stop()
 
 
-@mark.network
+@pytest.mark.network
 def test_dist_from_wheel_url(session: PipSession) -> None:
     """Test if the acquired distribution contain correct information."""
     dist = dist_from_wheel_url("mypy", MYPY_0_782_WHL, session)
@@ -55,12 +55,12 @@ def test_dist_from_wheel_url_no_range(
     session: PipSession, mypy_whl_no_range: str
 ) -> None:
     """Test handling when HTTP range requests are not supported."""
-    with raises(HTTPRangeRequestUnsupported):
+    with pytest.raises(HTTPRangeRequestUnsupported):
         dist_from_wheel_url("mypy", mypy_whl_no_range, session)
 
 
-@mark.network
+@pytest.mark.network
 def test_dist_from_wheel_url_not_zip(session: PipSession) -> None:
     """Test handling with the given URL does not point to a ZIP."""
-    with raises(InvalidWheel):
+    with pytest.raises(InvalidWheel):
         dist_from_wheel_url("python", "https://www.python.org/", session)

From 6d86207851c6c04f1b569d3b4bbfa6762c004fd8 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:37:23 -0400
Subject: [PATCH 538/992] Manually fix PT012

---
 tests/functional/test_install_reqs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index 9a3bba9b1fa..9e215ea46a8 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -624,9 +624,9 @@ def test_install_distribution_duplicate_extras(
 ) -> None:
     to_install = data.packages.joinpath("LocalExtras")
     package_name = f"{to_install}[bar]"
+    result = script.pip_install_local(package_name, package_name)
+    expected = f"Double requirement given: {package_name}"
     with pytest.raises(AssertionError):
-        result = script.pip_install_local(package_name, package_name)
-        expected = f"Double requirement given: {package_name}"
         assert expected in result.stderr
 
 

From 8d64ec0e98f18787cfb2462978327aa93f0bcdba Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 17:53:32 -0400
Subject: [PATCH 539/992] Fix formatting and misc linting

---
 tests/functional/test_fast_deps.py                 |  2 +-
 tests/functional/test_install.py                   | 14 ++++++++------
 .../unit/resolution_resolvelib/test_requirement.py |  2 +-
 tests/unit/test_collector.py                       |  4 +++-
 tests/unit/test_network_cache.py                   |  1 -
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/functional/test_fast_deps.py b/tests/functional/test_fast_deps.py
index 549de7eff41..5a910b89763 100644
--- a/tests/functional/test_fast_deps.py
+++ b/tests/functional/test_fast_deps.py
@@ -6,8 +6,8 @@
 from os.path import basename
 from typing import Iterable
 
-from pip._vendor.packaging.utils import canonicalize_name
 import pytest
+from pip._vendor.packaging.utils import canonicalize_name
 
 from pip._internal.utils.misc import hash_file
 from tests.lib import PipTestEnvironment, TestData, TestPipResult
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 5fde139b6a6..8c30a69b515 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -107,11 +107,11 @@ def test_pep518_refuses_conflicting_requires(
     )
     assert result.returncode != 0
     assert (
-            f"Some build dependencies for {project_dir.as_uri()} conflict "
-            "with PEP 517/518 supported "
-            "requirements: setuptools==1.0 is incompatible with "
-            "setuptools>=40.8.0."
-        ) in result.stderr, str(result)
+        f"Some build dependencies for {project_dir.as_uri()} conflict "
+        "with PEP 517/518 supported "
+        "requirements: setuptools==1.0 is incompatible with "
+        "setuptools>=40.8.0."
+    ) in result.stderr, str(result)
 
 
 def test_pep518_refuses_invalid_requires(
@@ -2307,7 +2307,9 @@ def test_error_all_yanked_files_and_no_pin(
     )
     # Make sure an error is raised
     assert result.returncode == 1
-    assert "ERROR: No matching distribution found for simple\n" in result.stderr, str(result)
+    assert "ERROR: No matching distribution found for simple\n" in result.stderr, str(
+        result
+    )
 
 
 @pytest.mark.parametrize(
diff --git a/tests/unit/resolution_resolvelib/test_requirement.py b/tests/unit/resolution_resolvelib/test_requirement.py
index 79288f63e81..436081b1d8f 100644
--- a/tests/unit/resolution_resolvelib/test_requirement.py
+++ b/tests/unit/resolution_resolvelib/test_requirement.py
@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-from typing import Iterator, List, Tuple
+from typing import List, Tuple
 
 import pytest
 from pip._vendor.resolvelib import BaseReporter, Resolver
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index d62ed95dd0c..882f82ae4fe 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -909,7 +909,9 @@ def test_collect_sources__file_not_find_link(data: TestData) -> None:
     )
     assert not sources.find_links
     assert len(sources.index_urls) == 1
-    assert isinstance(sources.index_urls[0], _IndexDirectorySource), "Directory specified as index should be treated as a page"
+    assert isinstance(
+        sources.index_urls[0], _IndexDirectorySource
+    ), "Directory specified as index should be treated as a page"
 
 
 def test_collect_sources__non_existing_path() -> None:
diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py
index 837c296ff8e..b43b36cd897 100644
--- a/tests/unit/test_network_cache.py
+++ b/tests/unit/test_network_cache.py
@@ -1,6 +1,5 @@
 import os
 from pathlib import Path
-from typing import Iterator
 from unittest.mock import Mock
 
 import pytest

From 44a3b3c5f379d3c10ce09080e475b888b2267f0e Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 18:23:25 -0400
Subject: [PATCH 540/992] Fix test_pep517_parsing_checks_requirements

---
 tests/unit/test_pep517.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/unit/test_pep517.py b/tests/unit/test_pep517.py
index 5333949addf..b9fcd9d2137 100644
--- a/tests/unit/test_pep517.py
+++ b/tests/unit/test_pep517.py
@@ -1,6 +1,7 @@
 import os
 from pathlib import Path
 from textwrap import dedent
+from typing import Tuple
 
 import pytest
 
@@ -73,12 +74,12 @@ def test_disabling_pep517_invalid(shared_data: TestData, source: str, msg: str)
 @pytest.mark.parametrize(
     "spec", [("./foo",), ("git+https://example.com/pkg@dev#egg=myproj",)]
 )
-def test_pep517_parsing_checks_requirements(tmpdir: Path, spec: str) -> None:
+def test_pep517_parsing_checks_requirements(tmpdir: Path, spec: Tuple[str]) -> None:
     tmpdir.joinpath("pyproject.toml").write_text(
         dedent(
             f"""
             [build-system]
-            requires = [{spec!r}]
+            requires = [{spec[0]!r}]
             build-backend = "foo"
             """
         )

From 4368e4953a589b4dc7fe7861e059a442d8fe340b Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Mon, 5 Aug 2024 19:50:36 -0400
Subject: [PATCH 541/992] Simplify `test_install_distribution_duplicate_extras`

---
 tests/functional/test_install_reqs.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index 9e215ea46a8..b1aed6ad3f4 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -625,9 +625,8 @@ def test_install_distribution_duplicate_extras(
     to_install = data.packages.joinpath("LocalExtras")
     package_name = f"{to_install}[bar]"
     result = script.pip_install_local(package_name, package_name)
-    expected = f"Double requirement given: {package_name}"
-    with pytest.raises(AssertionError):
-        assert expected in result.stderr
+    unexpected = f"Double requirement given: {package_name}"
+    assert unexpected not in result.stderr
 
 
 def test_install_distribution_union_with_constraints(

From 05d79d811d2914fa5980832c531593f58f000938 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 4 Aug 2024 18:04:35 -0400
Subject: [PATCH 542/992] NEWS ENTRY

---
 news/12894.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12894.trivial.rst

diff --git a/news/12894.trivial.rst b/news/12894.trivial.rst
new file mode 100644
index 00000000000..51e4c8b0338
--- /dev/null
+++ b/news/12894.trivial.rst
@@ -0,0 +1 @@
+Add Ruff's Pytest rules to the tests directory.

From db2f39b16842bc508f28b17791b92093a3d689fc Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 8 Aug 2024 19:25:25 -0400
Subject: [PATCH 543/992] Trigger test suite on bugfix releases by checking
 NEWS.rst

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 662a8d993fb..a5399d719a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,6 +55,9 @@ jobs:
               - "src/**"
               - "tests/**"
               - "noxfile.py"
+              # The test suite should also run when cutting a release
+              # (which is the only time this file is modified).
+              - "NEWS.rst"
         if: github.event_name == 'pull_request'
 
   packaging:

From 126be63b6376e3f9945c2a881a5695b727f3c415 Mon Sep 17 00:00:00 2001
From: Srishti Hegde 
Date: Wed, 14 Aug 2024 16:00:42 -0700
Subject: [PATCH 544/992] Upgrade urllib3 to 1.26.19

---
 news/urllib3.vendor.rst                   | 1 +
 src/pip/_vendor/urllib3/_version.py       | 2 +-
 src/pip/_vendor/urllib3/connection.py     | 4 ++--
 src/pip/_vendor/urllib3/connectionpool.py | 4 +++-
 src/pip/_vendor/urllib3/util/retry.py     | 4 +++-
 src/pip/_vendor/vendor.txt                | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 news/urllib3.vendor.rst

diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst
new file mode 100644
index 00000000000..d6bf838d960
--- /dev/null
+++ b/news/urllib3.vendor.rst
@@ -0,0 +1 @@
+Upgrade urllib3 to 1.26.19
diff --git a/src/pip/_vendor/urllib3/_version.py b/src/pip/_vendor/urllib3/_version.py
index 85e725eaf4d..c40db86d0a6 100644
--- a/src/pip/_vendor/urllib3/_version.py
+++ b/src/pip/_vendor/urllib3/_version.py
@@ -1,2 +1,2 @@
 # This file is protected via CODEOWNERS
-__version__ = "1.26.18"
+__version__ = "1.26.19"
diff --git a/src/pip/_vendor/urllib3/connection.py b/src/pip/_vendor/urllib3/connection.py
index 54b96b19154..de35b63d670 100644
--- a/src/pip/_vendor/urllib3/connection.py
+++ b/src/pip/_vendor/urllib3/connection.py
@@ -68,7 +68,7 @@ class BrokenPipeError(Exception):
 
 # When it comes time to update this value as a part of regular maintenance
 # (ie test_recent_date is failing) update it to ~6 months before the current date.
-RECENT_DATE = datetime.date(2022, 1, 1)
+RECENT_DATE = datetime.date(2024, 1, 1)
 
 _CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]")
 
@@ -437,7 +437,7 @@ def connect(self):
             and self.ssl_version is None
             and hasattr(self.sock, "version")
             and self.sock.version() in {"TLSv1", "TLSv1.1"}
-        ):
+        ):  # Defensive:
             warnings.warn(
                 "Negotiating TLSv1/TLSv1.1 by default is deprecated "
                 "and will be disabled in urllib3 v2.0.0. Connecting to "
diff --git a/src/pip/_vendor/urllib3/connectionpool.py b/src/pip/_vendor/urllib3/connectionpool.py
index 5a6adcbdc75..402bf670da2 100644
--- a/src/pip/_vendor/urllib3/connectionpool.py
+++ b/src/pip/_vendor/urllib3/connectionpool.py
@@ -768,7 +768,9 @@ def _is_ssl_error_message_from_http_proxy(ssl_error):
                 # so we try to cover our bases here!
                 message = " ".join(re.split("[^a-z]", str(ssl_error).lower()))
                 return (
-                    "wrong version number" in message or "unknown protocol" in message
+                    "wrong version number" in message
+                    or "unknown protocol" in message
+                    or "record layer failure" in message
                 )
 
             # Try to detect a common user error with proxies which is to
diff --git a/src/pip/_vendor/urllib3/util/retry.py b/src/pip/_vendor/urllib3/util/retry.py
index 60ef6c4f3f9..9a1e90d0b23 100644
--- a/src/pip/_vendor/urllib3/util/retry.py
+++ b/src/pip/_vendor/urllib3/util/retry.py
@@ -235,7 +235,9 @@ class Retry(object):
     RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
 
     #: Default headers to be used for ``remove_headers_on_redirect``
-    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Cookie", "Authorization"])
+    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(
+        ["Cookie", "Authorization", "Proxy-Authorization"]
+    )
 
     #: Maximum backoff time.
     DEFAULT_BACKOFF_MAX = 120
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index fd92690602f..e967abca8c5 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -8,7 +8,7 @@ pyproject-hooks==1.0.0
 requests==2.32.3
     certifi==2024.7.4
     idna==3.7
-    urllib3==1.26.18
+    urllib3==1.26.19
 rich==13.7.1
     pygments==2.18.0
     typing_extensions==4.12.2

From f78bd8187d5da5425d86c225c0c44f3ac3d22b95 Mon Sep 17 00:00:00 2001
From: Anton Zelenov 
Date: Tue, 4 Jun 2024 13:50:30 +0200
Subject: [PATCH 545/992] Build should not use global target directory when
 running from install

If the user's pip.conf includes a target directory setting,
attempting to install a package in editable mode or from source
results in a fatal error during the installation of setuptools.

The following assertion triggers:
assert not (home and prefix), "home={} prefix={}".format(home, prefix)

To avoid this issue when building a package, the target
setting should be ignored. This can be achieved by passing an empty
target when installing dependencies in the BuildEnvironment class.
---
 news/8438.bugfix.rst           | 10 ++++++++++
 src/pip/_internal/build_env.py |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 news/8438.bugfix.rst

diff --git a/news/8438.bugfix.rst b/news/8438.bugfix.rst
new file mode 100644
index 00000000000..cedd5d799ac
--- /dev/null
+++ b/news/8438.bugfix.rst
@@ -0,0 +1,10 @@
+If the user's pip.conf includes a target directory setting,
+attempting to install a package in editable mode or from source
+results in a fatal error during the installation of setuptools.
+
+The following assertion triggers:
+assert not (home and prefix), "home={} prefix={}".format(home, prefix)
+
+To avoid this issue when building a package, the target
+setting should be ignored. This can be achieved by passing an empty
+target when installing dependencies in the BuildEnvironment class.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index be1e0ca85d2..0f1e2667caf 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -242,6 +242,10 @@ def _install_requirements(
             prefix.path,
             "--no-warn-script-location",
             "--disable-pip-version-check",
+            # The prefix specified two lines above, thus
+            # target from config file or env var should be ignored
+            "--target",
+            "",
         ]
         if logger.getEffectiveLevel() <= logging.DEBUG:
             args.append("-vv")

From 7f987b363146a8f7bff5024eaec7f417e0c716ba Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 16 Aug 2024 18:22:26 -0400
Subject: [PATCH 546/992] Depricate '_' in version of wheel filename

---
 src/pip/_internal/models/wheel.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index 36d4d2e785c..63db978f1f5 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -8,6 +8,7 @@
 from pip._vendor.packaging.tags import Tag
 
 from pip._internal.exceptions import InvalidWheelFilename
+from pip._internal.utils.deprecation import deprecated
 
 
 class Wheel:
@@ -29,9 +30,25 @@ def __init__(self, filename: str) -> None:
             raise InvalidWheelFilename(f"{filename} is not a valid wheel filename.")
         self.filename = filename
         self.name = wheel_info.group("name").replace("_", "-")
-        # we'll assume "_" means "-" due to wheel naming scheme
-        # (https://github.com/pypa/pip/issues/1150)
-        self.version = wheel_info.group("ver").replace("_", "-")
+        _version = wheel_info.group("ver")
+        if "_" in _version:
+            deprecated(
+                reason=(
+                    f"Wheel filename {filename!r} uses an invalid filename format, "
+                    f"as the version part {_version!r} is not correctly normalised, "
+                    "and contains an underscore character. Future versions of pip may "
+                    "fail to recognise this wheel."
+                ),
+                replacement=(
+                    "rename the wheel to use a correctly normalised version part "
+                    "(this may require updating the version in the project metadata)"
+                ),
+                gone_in="25.1",
+                issue=12914,
+            )
+            _version = _version.replace("_", "-")
+
+        self.version = _version
         self.build_tag = wheel_info.group("build")
         self.pyversions = wheel_info.group("pyver").split(".")
         self.abis = wheel_info.group("abi").split(".")

From 541121154b6298bea5152000b9212bea2787eebe Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 16 Aug 2024 18:22:52 -0400
Subject: [PATCH 547/992] Test deprecation warning

---
 tests/unit/test_models_wheel.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/unit/test_models_wheel.py b/tests/unit/test_models_wheel.py
index c06525e089e..ee4d88c744a 100644
--- a/tests/unit/test_models_wheel.py
+++ b/tests/unit/test_models_wheel.py
@@ -3,7 +3,7 @@
 
 from pip._internal.exceptions import InvalidWheelFilename
 from pip._internal.models.wheel import Wheel
-from pip._internal.utils import compatibility_tags
+from pip._internal.utils import compatibility_tags, deprecation
 
 
 class TestWheelFile:
@@ -175,5 +175,6 @@ def test_version_underscore_conversion(self) -> None:
         Test that we convert '_' to '-' for versions parsed out of wheel
         filenames
         """
-        w = Wheel("simple-0.1_1-py2-none-any.whl")
+        with pytest.warns(deprecation.PipDeprecationWarning):
+            w = Wheel("simple-0.1_1-py2-none-any.whl")
         assert w.version == "0.1-1"

From 2c792b69bdedda2842d3cefd94c1f297d31925c7 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 16 Aug 2024 18:56:21 -0400
Subject: [PATCH 548/992] NEWS ENTRY

---
 news/12918.removal.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12918.removal.rst

diff --git a/news/12918.removal.rst b/news/12918.removal.rst
new file mode 100644
index 00000000000..c5a52cf66e1
--- /dev/null
+++ b/news/12918.removal.rst
@@ -0,0 +1 @@
+Deprecate wheel filenames that are not compliant with PEP 440.

From e85a548b56557b05701434be329d5c5837b8c069 Mon Sep 17 00:00:00 2001
From: mayeut 
Date: Thu, 15 Aug 2024 19:57:03 +0200
Subject: [PATCH 549/992] CI: Test on macOS arm64

---
 .github/workflows/ci.yml                            | 13 ++++++++++---
 ...F2CF2568-49B1-49EF-8B16-70491B9C8FDA.trivial.rst |  0
 tests/functional/test_uninstall_user.py             |  8 ++++++++
 tests/requirements.txt                              |  4 ++--
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 news/F2CF2568-49B1-49EF-8B16-70491B9C8FDA.trivial.rst

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 662a8d993fb..a75c61367db 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,8 @@ on:
   pull_request:
   schedule:
     - cron: 0 0 * * MON # Run every Monday at 00:00 UTC
+  workflow_dispatch:
+    # allow manual runs on branches without a PR
 
 env:
   # The "FORCE_COLOR" variable, when set to 1,
@@ -107,7 +109,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, macos-12]
+        os: [ubuntu-latest, macos-12, macos-latest]
         python:
           - "3.8"
           - "3.9"
@@ -130,8 +132,13 @@ jobs:
           sudo apt-get install bzr
 
       - name: Install MacOS dependencies
-        if: matrix.os == 'macos-12'
-        run: brew install breezy
+        if: runner.os == 'macOS'
+        run: |
+          DEPS=breezy
+          if ! which svn; then
+            DEPS="${DEPS} subversion"
+          fi
+          brew install ${DEPS}
 
       - run: pip install nox
 
diff --git a/news/F2CF2568-49B1-49EF-8B16-70491B9C8FDA.trivial.rst b/news/F2CF2568-49B1-49EF-8B16-70491B9C8FDA.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/functional/test_uninstall_user.py b/tests/functional/test_uninstall_user.py
index 0129d2e46a1..c49120ec28d 100644
--- a/tests/functional/test_uninstall_user.py
+++ b/tests/functional/test_uninstall_user.py
@@ -2,6 +2,8 @@
 tests specific to uninstalling --user installs
 """
 
+import platform
+import sys
 from os.path import isdir, isfile, normcase
 
 import pytest
@@ -74,6 +76,12 @@ def test_uninstall_from_usersite_with_dist_in_global_site(
         dist_info_folder = script.base_path / script.site_packages / "pkg-0.1.dist-info"
         assert isdir(dist_info_folder)
 
+    @pytest.mark.xfail(
+        sys.platform == "darwin"
+        and platform.machine() == "arm64"
+        and sys.version_info[:2] in {(3, 8), (3, 9)},
+        reason="Unexpected egg-link install path",
+    )
     def test_uninstall_editable_from_usersite(
         self, script: PipTestEnvironment, data: TestData
     ) -> None:
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 5c3ef4188f7..60e01d57e12 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -8,8 +8,8 @@ pytest-rerunfailures
 pytest-xdist
 scripttest
 setuptools
-virtualenv < 20.0 ; python_version < '3.10'
-virtualenv >= 20.0 ; python_version >= '3.10'
+virtualenv < 20.0 ; python_version < '3.10' and (sys_platform != 'darwin' or platform_machine != 'arm64')
+virtualenv >= 20.0 ; python_version >= '3.10' or (sys_platform == 'darwin' and platform_machine == 'arm64')
 werkzeug
 wheel
 tomli-w

From 9ab758653bf9296f08c4bb86213affee44bd3b37 Mon Sep 17 00:00:00 2001
From: Seth Michael Larson 
Date: Wed, 21 Aug 2024 13:03:46 -0500
Subject: [PATCH 550/992] Upgrade truststore to 0.9.2

---
 news/truststore.vendor.rst             |  1 +
 src/pip/_vendor/truststore/__init__.py | 25 ++++++++++++++++++++++++-
 src/pip/_vendor/vendor.txt             |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 news/truststore.vendor.rst

diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst
new file mode 100644
index 00000000000..b75c1316454
--- /dev/null
+++ b/news/truststore.vendor.rst
@@ -0,0 +1 @@
+Upgrade truststore to 0.9.2
diff --git a/src/pip/_vendor/truststore/__init__.py b/src/pip/_vendor/truststore/__init__.py
index 86368145a7e..b7d46aee262 100644
--- a/src/pip/_vendor/truststore/__init__.py
+++ b/src/pip/_vendor/truststore/__init__.py
@@ -5,9 +5,32 @@
 if _sys.version_info < (3, 10):
     raise ImportError("truststore requires Python 3.10 or later")
 
+# Detect Python runtimes which don't implement SSLObject.get_unverified_chain() API
+# This API only became public in Python 3.13 but was available in CPython and PyPy since 3.10.
+if _sys.version_info < (3, 13):
+    try:
+        import ssl as _ssl
+    except ImportError:
+        raise ImportError("truststore requires the 'ssl' module")
+    else:
+        _sslmem = _ssl.MemoryBIO()
+        _sslobj = _ssl.create_default_context().wrap_bio(
+            _sslmem,
+            _sslmem,
+        )
+        try:
+            while not hasattr(_sslobj, "get_unverified_chain"):
+                _sslobj = _sslobj._sslobj  # type: ignore[attr-defined]
+        except AttributeError:
+            raise ImportError(
+                "truststore requires peer certificate chain APIs to be available"
+            ) from None
+
+        del _ssl, _sslobj, _sslmem  # noqa: F821
+
 from ._api import SSLContext, extract_from_ssl, inject_into_ssl  # noqa: E402
 
 del _api, _sys  # type: ignore[name-defined] # noqa: F821
 
 __all__ = ["SSLContext", "inject_into_ssl", "extract_from_ssl"]
-__version__ = "0.9.1"
+__version__ = "0.9.2"
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index e967abca8c5..1b702c19666 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -15,4 +15,4 @@ rich==13.7.1
 resolvelib==1.0.1
 setuptools==70.3.0
 tomli==2.0.1
-truststore==0.9.1
+truststore==0.9.2

From 964229e834e8a92c7f4cc67a7a7493dcf42d213e Mon Sep 17 00:00:00 2001
From: mayeut 
Date: Sat, 24 Aug 2024 10:46:23 +0200
Subject: [PATCH 551/992] Add a comment for virtualenv

---
 tests/requirements.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 60e01d57e12..49f589b13d7 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -8,6 +8,8 @@ pytest-rerunfailures
 pytest-xdist
 scripttest
 setuptools
+# macOS (darwin) arm64 always uses virtualenv >= 20.0
+# for other platforms, it depends on python version
 virtualenv < 20.0 ; python_version < '3.10' and (sys_platform != 'darwin' or platform_machine != 'arm64')
 virtualenv >= 20.0 ; python_version >= '3.10' or (sys_platform == 'darwin' and platform_machine == 'arm64')
 werkzeug

From aa25c97732825d3f9adf22e3f319e439e807863d Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 25 Aug 2024 14:59:13 -0400
Subject: [PATCH 552/992] Update non PEP 440 wheel filename deprecation notice

---
 src/pip/_internal/models/wheel.py | 40 ++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index 63db978f1f5..27a80e92e27 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -6,6 +6,13 @@
 from typing import Dict, Iterable, List
 
 from pip._vendor.packaging.tags import Tag
+from pip._vendor.packaging.utils import (
+    InvalidVersion,
+    parse_wheel_filename,
+)
+from pip._vendor.packaging.utils import (
+    InvalidWheelFilename as PackagingInvalidWheelName,
+)
 
 from pip._internal.exceptions import InvalidWheelFilename
 from pip._internal.utils.deprecation import deprecated
@@ -32,22 +39,27 @@ def __init__(self, filename: str) -> None:
         self.name = wheel_info.group("name").replace("_", "-")
         _version = wheel_info.group("ver")
         if "_" in _version:
-            deprecated(
-                reason=(
-                    f"Wheel filename {filename!r} uses an invalid filename format, "
-                    f"as the version part {_version!r} is not correctly normalised, "
-                    "and contains an underscore character. Future versions of pip may "
-                    "fail to recognise this wheel."
-                ),
-                replacement=(
-                    "rename the wheel to use a correctly normalised version part "
-                    "(this may require updating the version in the project metadata)"
-                ),
-                gone_in="25.1",
-                issue=12914,
-            )
             _version = _version.replace("_", "-")
 
+            try:
+                parse_wheel_filename(filename)
+            except (PackagingInvalidWheelName, InvalidVersion):
+                deprecated(
+                    reason=(
+                        f"Wheel filename {filename!r} uses an invalid filename format, "
+                        f"as the version part {_version!r} is not correctly "
+                        "normalised, and contains an underscore character. Future "
+                        "versions of pip will fail to recognise this wheel."
+                    ),
+                    replacement=(
+                        "rename the wheel to use a correctly normalised "
+                        "version part (this may require updating the version "
+                        "in the project metadata)"
+                    ),
+                    gone_in="25.1",
+                    issue=12938,
+                )
+
         self.version = _version
         self.build_tag = wheel_info.group("build")
         self.pyversions = wheel_info.group("pyver").split(".")

From fbe7924ad45bd8de4f8b662741d50da678ff511e Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 25 Aug 2024 15:06:26 -0400
Subject: [PATCH 553/992] NEWS ENTRY

---
 news/12939.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12939.trivial.rst

diff --git a/news/12939.trivial.rst b/news/12939.trivial.rst
new file mode 100644
index 00000000000..c9acd4f8c54
--- /dev/null
+++ b/news/12939.trivial.rst
@@ -0,0 +1 @@
+Update non PEP 440 wheel filename deprecation notice.

From 8dd3988e8cb0ac14ae77b1e3dea893970fde7cd8 Mon Sep 17 00:00:00 2001
From: Illia Volochii 
Date: Thu, 29 Aug 2024 19:13:04 +0300
Subject: [PATCH 554/992] Upgrade urllib3 to 1.26.20

---
 news/urllib3.vendor.rst                   |  2 +-
 src/pip/_vendor/urllib3/_version.py       |  2 +-
 src/pip/_vendor/urllib3/connectionpool.py |  3 ++-
 src/pip/_vendor/urllib3/util/ssl_.py      | 17 +++++++++++++----
 src/pip/_vendor/vendor.txt                |  2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst
index d6bf838d960..6b66de2fd00 100644
--- a/news/urllib3.vendor.rst
+++ b/news/urllib3.vendor.rst
@@ -1 +1 @@
-Upgrade urllib3 to 1.26.19
+Upgrade urllib3 to 1.26.20
diff --git a/src/pip/_vendor/urllib3/_version.py b/src/pip/_vendor/urllib3/_version.py
index c40db86d0a6..d49df2a0c54 100644
--- a/src/pip/_vendor/urllib3/_version.py
+++ b/src/pip/_vendor/urllib3/_version.py
@@ -1,2 +1,2 @@
 # This file is protected via CODEOWNERS
-__version__ = "1.26.19"
+__version__ = "1.26.20"
diff --git a/src/pip/_vendor/urllib3/connectionpool.py b/src/pip/_vendor/urllib3/connectionpool.py
index 402bf670da2..0872ed77011 100644
--- a/src/pip/_vendor/urllib3/connectionpool.py
+++ b/src/pip/_vendor/urllib3/connectionpool.py
@@ -423,12 +423,13 @@ def _make_request(
             pass
         except IOError as e:
             # Python 2 and macOS/Linux
-            # EPIPE and ESHUTDOWN are BrokenPipeError on Python 2, and EPROTOTYPE is needed on macOS
+            # EPIPE and ESHUTDOWN are BrokenPipeError on Python 2, and EPROTOTYPE/ECONNRESET are needed on macOS
             # https://erickt.github.io/blog/2014/11/19/adventures-in-debugging-a-potential-osx-kernel-bug/
             if e.errno not in {
                 errno.EPIPE,
                 errno.ESHUTDOWN,
                 errno.EPROTOTYPE,
+                errno.ECONNRESET,
             }:
                 raise
 
diff --git a/src/pip/_vendor/urllib3/util/ssl_.py b/src/pip/_vendor/urllib3/util/ssl_.py
index 2b45d391d4d..0a6a0e06a0d 100644
--- a/src/pip/_vendor/urllib3/util/ssl_.py
+++ b/src/pip/_vendor/urllib3/util/ssl_.py
@@ -1,11 +1,11 @@
 from __future__ import absolute_import
 
+import hashlib
 import hmac
 import os
 import sys
 import warnings
 from binascii import hexlify, unhexlify
-from hashlib import md5, sha1, sha256
 
 from ..exceptions import (
     InsecurePlatformWarning,
@@ -24,7 +24,10 @@
 ALPN_PROTOCOLS = ["http/1.1"]
 
 # Maps the length of a digest to a possible hash function producing this digest
-HASHFUNC_MAP = {32: md5, 40: sha1, 64: sha256}
+HASHFUNC_MAP = {
+    length: getattr(hashlib, algorithm, None)
+    for length, algorithm in ((32, "md5"), (40, "sha1"), (64, "sha256"))
+}
 
 
 def _const_compare_digest_backport(a, b):
@@ -191,9 +194,15 @@ def assert_fingerprint(cert, fingerprint):
 
     fingerprint = fingerprint.replace(":", "").lower()
     digest_length = len(fingerprint)
-    hashfunc = HASHFUNC_MAP.get(digest_length)
-    if not hashfunc:
+    if digest_length not in HASHFUNC_MAP:
         raise SSLError("Fingerprint of invalid length: {0}".format(fingerprint))
+    hashfunc = HASHFUNC_MAP.get(digest_length)
+    if hashfunc is None:
+        raise SSLError(
+            "Hash function implementation unavailable for fingerprint length: {0}".format(
+                digest_length
+            )
+        )
 
     # We need encode() here for py32; works on py2 and p33.
     fingerprint_bytes = unhexlify(fingerprint.encode())
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index e967abca8c5..5c51aae0443 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -8,7 +8,7 @@ pyproject-hooks==1.0.0
 requests==2.32.3
     certifi==2024.7.4
     idna==3.7
-    urllib3==1.26.19
+    urllib3==1.26.20
 rich==13.7.1
     pygments==2.18.0
     typing_extensions==4.12.2

From 25e8720936fc99132986046eac84c8586e9444a1 Mon Sep 17 00:00:00 2001
From: mayeut 
Date: Sat, 31 Aug 2024 12:17:30 +0200
Subject: [PATCH 555/992] Remove cffi workaround in tests requirements

cffi 1.17.0 has been released on PyPI
---
 news/A454782D-6619-44D8-811F-2C1973A430BB.trivial.rst | 0
 tests/requirements.txt                                | 1 -
 2 files changed, 1 deletion(-)
 create mode 100644 news/A454782D-6619-44D8-811F-2C1973A430BB.trivial.rst

diff --git a/news/A454782D-6619-44D8-811F-2C1973A430BB.trivial.rst b/news/A454782D-6619-44D8-811F-2C1973A430BB.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 49f589b13d7..0568aea5178 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,3 @@
-cffi >= 1.17.0rc1 ; python_version > "3.12" # Temporary workaround for Python 3.13 until final CFFI release
 cryptography
 freezegun
 installer

From d73c673b57901166ad6ce46326f93fdc2aaa5f7f Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:45:45 +0300
Subject: [PATCH 556/992] Replace deprecated macos-12 with macos-13

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index abac1004638..170bd6d8b60 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -112,7 +112,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, macos-12, macos-latest]
+        os: [ubuntu-latest, macos-13, macos-latest]
         python:
           - "3.8"
           - "3.9"

From f0fb87826c049e02afe43f387dd250ad82baaa71 Mon Sep 17 00:00:00 2001
From: Kuntal Majumder 
Date: Fri, 26 Jul 2024 21:46:21 +0200
Subject: [PATCH 557/992] Detect recursively referencing requirements files

Fixes #12653
---
 news/12653.feature.rst            |  2 ++
 src/pip/_internal/req/req_file.py | 25 +++++++++++++++++++++----
 tests/unit/test_req_file.py       | 28 ++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 news/12653.feature.rst

diff --git a/news/12653.feature.rst b/news/12653.feature.rst
new file mode 100644
index 00000000000..83e1a46e6a8
--- /dev/null
+++ b/news/12653.feature.rst
@@ -0,0 +1,2 @@
+Detect recursively referencing requirements files and help users identify
+the source.
diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index 53ad8674cd8..83cacc5b836 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -324,11 +324,14 @@ def __init__(
     ) -> None:
         self._session = session
         self._line_parser = line_parser
+        self._parsed_files: dict[str, Optional[str]] = {}
 
     def parse(
         self, filename: str, constraint: bool
     ) -> Generator[ParsedLine, None, None]:
         """Parse a given file, yielding parsed lines."""
+        filename = os.path.abspath(filename)
+        self._parsed_files[filename] = None  # The primary requirements file passed
         yield from self._parse_and_recurse(filename, constraint)
 
     def _parse_and_recurse(
@@ -353,11 +356,25 @@ def _parse_and_recurse(
                 # original file and nested file are paths
                 elif not SCHEME_RE.search(req_path):
                     # do a join so relative paths work
-                    req_path = os.path.join(
-                        os.path.dirname(filename),
-                        req_path,
+                    # and then abspath so that we can identify recursive references
+                    req_path = os.path.abspath(
+                        os.path.join(
+                            os.path.dirname(filename),
+                            req_path,
+                        )
                     )
-
+                if req_path in self._parsed_files.keys():
+                    initial_file = self._parsed_files[req_path]
+                    tail = (
+                        f"and again in {initial_file}"
+                        if initial_file is not None
+                        else ""
+                    )
+                    raise RecursionError(
+                        f"{req_path} recursively references itself in {filename} {tail}"
+                    )
+                # Keeping a track where was each file first included in
+                self._parsed_files[req_path] = filename
                 yield from self._parse_and_recurse(req_path, nested_constraint)
             else:
                 yield line
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 236b666fb34..c536bdc37cf 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -345,6 +345,34 @@ def test_nested_constraints_file(
         assert reqs[0].name == req_name
         assert reqs[0].constraint
 
+    def test_recursive_requirements_file(
+        self, tmpdir: Path, session: PipSession
+    ) -> None:
+        req_files: list[Path] = []
+        req_file_count = 4
+        for i in range(req_file_count):
+            req_file = tmpdir / f"{i}.txt"
+            req_file.write_text(f"-r {(i+1) % req_file_count}.txt")
+            req_files.append(req_file)
+
+        # When the passed requirements file recursively references itself
+        with pytest.raises(
+            RecursionError,
+            match=f"{req_files[0]} recursively references itself"
+            f" in {req_files[req_file_count - 1]}",
+        ):
+            list(parse_requirements(filename=str(req_files[0]), session=session))
+
+        # When one of other the requirements file recursively references itself
+        req_files[req_file_count - 1].write_text(f"-r {req_files[req_file_count - 2]}")
+        with pytest.raises(
+            RecursionError,
+            match=f"{req_files[req_file_count - 2]} recursively references itself "
+            f"in {req_files[req_file_count - 1]} and again in"
+            f" {req_files[req_file_count - 3]}",
+        ):
+            list(parse_requirements(filename=str(req_files[0]), session=session))
+
     def test_options_on_a_requirement_line(self, line_processor: LineProcessor) -> None:
         line = (
             'SomeProject --global-option="yo3" --global-option "yo4" '

From 86a8a289c1842ae939d6650536a2d70ced20d75d Mon Sep 17 00:00:00 2001
From: Kuntal Majumder 
Date: Sat, 27 Jul 2024 22:15:55 +0200
Subject: [PATCH 558/992] Add a unit test to test the absolute path change

---
 src/pip/_internal/req/req_file.py |  5 ++--
 tests/unit/test_req_file.py       | 44 +++++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index 83cacc5b836..b8db037c7c1 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -330,8 +330,9 @@ def parse(
         self, filename: str, constraint: bool
     ) -> Generator[ParsedLine, None, None]:
         """Parse a given file, yielding parsed lines."""
-        filename = os.path.abspath(filename)
-        self._parsed_files[filename] = None  # The primary requirements file passed
+        self._parsed_files[os.path.abspath(filename)] = (
+            None  # The primary requirements file passed
+        )
         yield from self._parse_and_recurse(filename, constraint)
 
     def _parse_and_recurse(
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index c536bdc37cf..dc7e519ef04 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -9,6 +9,7 @@
 
 import pytest
 
+import pip._internal.exceptions
 import pip._internal.req.req_file  # this will be monkeypatched
 from pip._internal.exceptions import InstallationError, RequirementsFileParseError
 from pip._internal.index.package_finder import PackageFinder
@@ -358,8 +359,10 @@ def test_recursive_requirements_file(
         # When the passed requirements file recursively references itself
         with pytest.raises(
             RecursionError,
-            match=f"{req_files[0]} recursively references itself"
-            f" in {req_files[req_file_count - 1]}",
+            match=(
+                f"{req_files[0]} recursively references itself"
+                f" in {req_files[req_file_count - 1]}"
+            ),
         ):
             list(parse_requirements(filename=str(req_files[0]), session=session))
 
@@ -367,12 +370,43 @@ def test_recursive_requirements_file(
         req_files[req_file_count - 1].write_text(f"-r {req_files[req_file_count - 2]}")
         with pytest.raises(
             RecursionError,
-            match=f"{req_files[req_file_count - 2]} recursively references itself "
-            f"in {req_files[req_file_count - 1]} and again in"
-            f" {req_files[req_file_count - 3]}",
+            match=(
+                f"{req_files[req_file_count - 2]} recursively references itself "
+                f"in {req_files[req_file_count - 1]} and again in"
+                f" {req_files[req_file_count - 3]}"
+            ),
         ):
             list(parse_requirements(filename=str(req_files[0]), session=session))
 
+    def test_recursive_relative_requirements_file(
+        self, monkeypatch: pytest.MonkeyPatch, tmpdir: Path, session: PipSession
+    ) -> None:
+        root_req_file = tmpdir / "root.txt"
+        (tmpdir / "nest" / "nest").mkdir(parents=True)
+        level_1_req_file = tmpdir / "nest" / "level_1.txt"
+        level_2_req_file = tmpdir / "nest" / "nest" / "level_2.txt"
+
+        root_req_file.write_text("-r nest/level_1.txt")
+        level_1_req_file.write_text("-r nest/level_2.txt")
+        level_2_req_file.write_text("-r ../../root.txt")
+
+        with pytest.raises(
+            RecursionError,
+            match=(
+                f"{root_req_file} recursively references itself in {level_2_req_file}"
+            ),
+        ):
+            list(parse_requirements(filename=str(root_req_file), session=session))
+
+        # If we don't use absolute path, it keeps on chaining the filename resulting in
+        # a huge filename, since a != a/b/c/../../
+        monkeypatch.setattr(os.path, "abspath", lambda x: x)
+        with pytest.raises(
+            pip._internal.exceptions.InstallationError,
+            match=r"Could not open requirements file: \[Errno 36\] File name too long:",
+        ):
+            list(parse_requirements(filename=str(root_req_file), session=session))
+
     def test_options_on_a_requirement_line(self, line_processor: LineProcessor) -> None:
         line = (
             'SomeProject --global-option="yo3" --global-option "yo4" '

From 2adea729bbd0544e639675e26edb664dc82ede8a Mon Sep 17 00:00:00 2001
From: Kuntal Majumder 
Date: Sat, 27 Jul 2024 22:31:45 +0200
Subject: [PATCH 559/992] Use platform independent regex

---
 tests/unit/test_req_file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index dc7e519ef04..7df7b3ab05f 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -403,7 +403,7 @@ def test_recursive_relative_requirements_file(
         monkeypatch.setattr(os.path, "abspath", lambda x: x)
         with pytest.raises(
             pip._internal.exceptions.InstallationError,
-            match=r"Could not open requirements file: \[Errno 36\] File name too long:",
+            match="Could not open requirements file: .* File name too long:",
         ):
             list(parse_requirements(filename=str(root_req_file), session=session))
 

From 50202fdabe3bf718cca404b14fae83864e08b550 Mon Sep 17 00:00:00 2001
From: Kuntal Majumder 
Date: Sat, 27 Jul 2024 23:32:23 +0200
Subject: [PATCH 560/992] Escape Windows path forward slashes in regex

---
 tests/unit/test_req_file.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 7df7b3ab05f..4e0928ffce6 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -79,6 +79,12 @@ def parse_reqfile(
         )
 
 
+def path_to_string(p: Path) -> str:
+    # Escape the back slashes in windows path before using it
+    # in a regex
+    return str(p).replace("\\", "\\\\")
+
+
 def test_read_file_url(tmp_path: Path, session: PipSession) -> None:
     reqs = tmp_path.joinpath("requirements.txt")
     reqs.write_text("foo")
@@ -360,8 +366,8 @@ def test_recursive_requirements_file(
         with pytest.raises(
             RecursionError,
             match=(
-                f"{req_files[0]} recursively references itself"
-                f" in {req_files[req_file_count - 1]}"
+                f"{path_to_string(req_files[0])} recursively references itself"
+                f" in {path_to_string(req_files[req_file_count - 1])}"
             ),
         ):
             list(parse_requirements(filename=str(req_files[0]), session=session))
@@ -371,9 +377,10 @@ def test_recursive_requirements_file(
         with pytest.raises(
             RecursionError,
             match=(
-                f"{req_files[req_file_count - 2]} recursively references itself "
-                f"in {req_files[req_file_count - 1]} and again in"
-                f" {req_files[req_file_count - 3]}"
+                f"{path_to_string(req_files[req_file_count - 2])} recursively"
+                " references itself in"
+                f" {path_to_string(req_files[req_file_count - 1])} and again in"
+                f" {path_to_string(req_files[req_file_count - 3])}"
             ),
         ):
             list(parse_requirements(filename=str(req_files[0]), session=session))
@@ -393,7 +400,8 @@ def test_recursive_relative_requirements_file(
         with pytest.raises(
             RecursionError,
             match=(
-                f"{root_req_file} recursively references itself in {level_2_req_file}"
+                f"{path_to_string(root_req_file)} recursively references itself in"
+                f" {path_to_string(level_2_req_file)}"
             ),
         ):
             list(parse_requirements(filename=str(root_req_file), session=session))

From ed63b3d5b435d2e8741c3316bb9807cd0a8717f5 Mon Sep 17 00:00:00 2001
From: Kuntal Majumder 
Date: Sun, 28 Jul 2024 00:32:12 +0200
Subject: [PATCH 561/992] Remove inconsistent test and fix filename write

---
 tests/unit/test_req_file.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 4e0928ffce6..10a4c54c927 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -373,7 +373,10 @@ def test_recursive_requirements_file(
             list(parse_requirements(filename=str(req_files[0]), session=session))
 
         # When one of other the requirements file recursively references itself
-        req_files[req_file_count - 1].write_text(f"-r {req_files[req_file_count - 2]}")
+        req_files[req_file_count - 1].write_text(
+            # Just name since they are in the same folder
+            f"-r {req_files[req_file_count - 2].name}"
+        )
         with pytest.raises(
             RecursionError,
             match=(
@@ -386,7 +389,7 @@ def test_recursive_requirements_file(
             list(parse_requirements(filename=str(req_files[0]), session=session))
 
     def test_recursive_relative_requirements_file(
-        self, monkeypatch: pytest.MonkeyPatch, tmpdir: Path, session: PipSession
+        self, tmpdir: Path, session: PipSession
     ) -> None:
         root_req_file = tmpdir / "root.txt"
         (tmpdir / "nest" / "nest").mkdir(parents=True)
@@ -406,15 +409,6 @@ def test_recursive_relative_requirements_file(
         ):
             list(parse_requirements(filename=str(root_req_file), session=session))
 
-        # If we don't use absolute path, it keeps on chaining the filename resulting in
-        # a huge filename, since a != a/b/c/../../
-        monkeypatch.setattr(os.path, "abspath", lambda x: x)
-        with pytest.raises(
-            pip._internal.exceptions.InstallationError,
-            match="Could not open requirements file: .* File name too long:",
-        ):
-            list(parse_requirements(filename=str(root_req_file), session=session))
-
     def test_options_on_a_requirement_line(self, line_processor: LineProcessor) -> None:
         line = (
             'SomeProject --global-option="yo3" --global-option "yo4" '

From 59dbbba59d45c59cf3807b9f5be58762a6afa8a9 Mon Sep 17 00:00:00 2001
From: Kuntal Majumder 
Date: Sun, 28 Jul 2024 21:37:32 +0200
Subject: [PATCH 562/992] Use RequirementsFileParserError instead of
 RecursionError

---
 src/pip/_internal/req/req_file.py | 2 +-
 tests/unit/test_req_file.py       | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index b8db037c7c1..b15a6ea9a3e 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -371,7 +371,7 @@ def _parse_and_recurse(
                         if initial_file is not None
                         else ""
                     )
-                    raise RecursionError(
+                    raise RequirementsFileParseError(
                         f"{req_path} recursively references itself in {filename} {tail}"
                     )
                 # Keeping a track where was each file first included in
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 10a4c54c927..d0501e2c254 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -9,7 +9,6 @@
 
 import pytest
 
-import pip._internal.exceptions
 import pip._internal.req.req_file  # this will be monkeypatched
 from pip._internal.exceptions import InstallationError, RequirementsFileParseError
 from pip._internal.index.package_finder import PackageFinder
@@ -364,7 +363,7 @@ def test_recursive_requirements_file(
 
         # When the passed requirements file recursively references itself
         with pytest.raises(
-            RecursionError,
+            RequirementsFileParseError,
             match=(
                 f"{path_to_string(req_files[0])} recursively references itself"
                 f" in {path_to_string(req_files[req_file_count - 1])}"
@@ -378,7 +377,7 @@ def test_recursive_requirements_file(
             f"-r {req_files[req_file_count - 2].name}"
         )
         with pytest.raises(
-            RecursionError,
+            RequirementsFileParseError,
             match=(
                 f"{path_to_string(req_files[req_file_count - 2])} recursively"
                 " references itself in"
@@ -401,7 +400,7 @@ def test_recursive_relative_requirements_file(
         level_2_req_file.write_text("-r ../../root.txt")
 
         with pytest.raises(
-            RecursionError,
+            RequirementsFileParseError,
             match=(
                 f"{path_to_string(root_req_file)} recursively references itself in"
                 f" {path_to_string(level_2_req_file)}"

From 8d15e3b37cae43d349d3eafefc1bda0b02ab8bea Mon Sep 17 00:00:00 2001
From: Kuntal Majumder 
Date: Tue, 20 Aug 2024 20:09:48 +0200
Subject: [PATCH 563/992] Use re.escape for windows paths

---
 src/pip/_internal/req/req_file.py |  4 ++--
 tests/unit/test_req_file.py       | 21 ++++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index b15a6ea9a3e..195bde8d12e 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -367,12 +367,12 @@ def _parse_and_recurse(
                 if req_path in self._parsed_files.keys():
                     initial_file = self._parsed_files[req_path]
                     tail = (
-                        f"and again in {initial_file}"
+                        f" and again in {initial_file}"
                         if initial_file is not None
                         else ""
                     )
                     raise RequirementsFileParseError(
-                        f"{req_path} recursively references itself in {filename} {tail}"
+                        f"{req_path} recursively references itself in {filename}{tail}"
                     )
                 # Keeping a track where was each file first included in
                 self._parsed_files[req_path] = filename
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index d0501e2c254..1ddccdee58e 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -1,6 +1,7 @@
 import collections
 import logging
 import os
+import re
 import textwrap
 from optparse import Values
 from pathlib import Path
@@ -78,12 +79,6 @@ def parse_reqfile(
         )
 
 
-def path_to_string(p: Path) -> str:
-    # Escape the back slashes in windows path before using it
-    # in a regex
-    return str(p).replace("\\", "\\\\")
-
-
 def test_read_file_url(tmp_path: Path, session: PipSession) -> None:
     reqs = tmp_path.joinpath("requirements.txt")
     reqs.write_text("foo")
@@ -365,8 +360,8 @@ def test_recursive_requirements_file(
         with pytest.raises(
             RequirementsFileParseError,
             match=(
-                f"{path_to_string(req_files[0])} recursively references itself"
-                f" in {path_to_string(req_files[req_file_count - 1])}"
+                f"{re.escape(str(req_files[0]))} recursively references itself"
+                f" in {re.escape(str(req_files[req_file_count - 1]))}"
             ),
         ):
             list(parse_requirements(filename=str(req_files[0]), session=session))
@@ -379,10 +374,10 @@ def test_recursive_requirements_file(
         with pytest.raises(
             RequirementsFileParseError,
             match=(
-                f"{path_to_string(req_files[req_file_count - 2])} recursively"
+                f"{re.escape(str(req_files[req_file_count - 2]))} recursively"
                 " references itself in"
-                f" {path_to_string(req_files[req_file_count - 1])} and again in"
-                f" {path_to_string(req_files[req_file_count - 3])}"
+                f" {re.escape(str(req_files[req_file_count - 1]))} and again in"
+                f" {re.escape(str(req_files[req_file_count - 3]))}"
             ),
         ):
             list(parse_requirements(filename=str(req_files[0]), session=session))
@@ -402,8 +397,8 @@ def test_recursive_relative_requirements_file(
         with pytest.raises(
             RequirementsFileParseError,
             match=(
-                f"{path_to_string(root_req_file)} recursively references itself in"
-                f" {path_to_string(level_2_req_file)}"
+                f"{re.escape(str(root_req_file))} recursively references itself in"
+                f" {re.escape(str(level_2_req_file))}"
             ),
         ):
             list(parse_requirements(filename=str(root_req_file), session=session))

From 26c6a458bb4dc99f670230b467d22c84ac11c264 Mon Sep 17 00:00:00 2001
From: Kuntal Majumder 
Date: Tue, 3 Sep 2024 22:03:26 +0200
Subject: [PATCH 564/992] Remove redundant .keys() call

---
 src/pip/_internal/req/req_file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index 195bde8d12e..55c0726f370 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -364,7 +364,7 @@ def _parse_and_recurse(
                             req_path,
                         )
                     )
-                if req_path in self._parsed_files.keys():
+                if req_path in self._parsed_files:
                     initial_file = self._parsed_files[req_path]
                     tail = (
                         f" and again in {initial_file}"

From 80e11bf61110cb28a3985faf070f885fd096f2f7 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Tue, 3 Sep 2024 20:16:06 -0400
Subject: [PATCH 565/992] Diagnostic error on pip uninstall of invalid package

---
 src/pip/_internal/exceptions.py               | 20 +++++++++++++++++++
 .../resolution/resolvelib/candidates.py       |  9 +++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index 2587740f73a..66b13476a48 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -22,10 +22,12 @@
 if TYPE_CHECKING:
     from hashlib import _Hash
 
+    from pip._vendor.packaging.requirements import InvalidRequirement
     from pip._vendor.requests.models import Request, Response
 
     from pip._internal.metadata import BaseDistribution
     from pip._internal.req.req_install import InstallRequirement
+    from pip._internal.resolution.resolvelib.candidates import AlreadyInstalledCandidate
 
 logger = logging.getLogger(__name__)
 
@@ -775,3 +777,21 @@ def __init__(self, *, distribution: "BaseDistribution") -> None:
             ),
             hint_stmt=None,
         )
+
+class InvalidInstalledPackage(DiagnosticPipError):
+    reference = "invalid-installed-package"
+
+    def __init__(
+            self,
+            *,
+            package: "AlreadyInstalledCandidate",
+            invalid_req_exc: "InvalidRequirement",
+        ) -> None:
+        super().__init__(
+            message=Text(
+                f"Cannot uninstall {package} because it has an invalid requirement:\n"
+                f"{invalid_req_exc.args[0]}."
+                ),
+            context="Since pip 24.1+ invalid requirements can not be read by pip.",
+            hint_stmt="Please use 'pip<24.1' if you need to uninstall this package.",
+        )
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index d30d477be68..c8a0f6c91a3 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -9,6 +9,7 @@
 from pip._internal.exceptions import (
     HashError,
     InstallationSubprocessError,
+    InvalidInstalledPackage,
     MetadataInconsistent,
     MetadataInvalid,
 )
@@ -398,8 +399,12 @@ def format_for_error(self) -> str:
     def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]:
         if not with_requires:
             return
-        for r in self.dist.iter_dependencies():
-            yield from self._factory.make_requirements_from_spec(str(r), self._ireq)
+
+        try:
+            for r in self.dist.iter_dependencies():
+                yield from self._factory.make_requirements_from_spec(str(r), self._ireq)
+        except InvalidRequirement as exc:
+            raise InvalidInstalledPackage(package=self, invalid_req_exc=exc) from None
 
     def get_install_requirement(self) -> Optional[InstallRequirement]:
         return None

From 98fe9915ccd175aaa9be4632163fb7431d15b4ab Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Tue, 3 Sep 2024 20:19:23 -0400
Subject: [PATCH 566/992] Formatting

---
 src/pip/_internal/exceptions.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index 66b13476a48..b2fd081c7f2 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -778,20 +778,21 @@ def __init__(self, *, distribution: "BaseDistribution") -> None:
             hint_stmt=None,
         )
 
+
 class InvalidInstalledPackage(DiagnosticPipError):
     reference = "invalid-installed-package"
 
     def __init__(
-            self,
-            *,
-            package: "AlreadyInstalledCandidate",
-            invalid_req_exc: "InvalidRequirement",
-        ) -> None:
+        self,
+        *,
+        package: "AlreadyInstalledCandidate",
+        invalid_req_exc: "InvalidRequirement",
+    ) -> None:
         super().__init__(
             message=Text(
                 f"Cannot uninstall {package} because it has an invalid requirement:\n"
                 f"{invalid_req_exc.args[0]}."
-                ),
+            ),
             context="Since pip 24.1+ invalid requirements can not be read by pip.",
             hint_stmt="Please use 'pip<24.1' if you need to uninstall this package.",
         )

From 8b3f784ab668e33d05b08916b52dec0de8c8c8ed Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 8 Sep 2024 15:22:12 -0400
Subject: [PATCH 567/992] Update message

---
 src/pip/_internal/exceptions.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index b2fd081c7f2..bdca1426d54 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -788,11 +788,19 @@ def __init__(
         package: "AlreadyInstalledCandidate",
         invalid_req_exc: "InvalidRequirement",
     ) -> None:
+        installed_location = package.dist.installed_location
         super().__init__(
             message=Text(
-                f"Cannot uninstall {package} because it has an invalid requirement:\n"
-                f"{invalid_req_exc.args[0]}."
+                f"Cannot process installed package {package} "
+                + (f"in {installed_location!r} " if installed_location else "")
+                + f"because it has an invalid requirement:\n{invalid_req_exc.args[0]}"
+            ),
+            context=(
+                "Starting with pip 24.1, packages with invalid "
+                "requirements can not be processed."
+            ),
+            hint_stmt=(
+                "To proceed this package must be uninstalled using 'pip<24.1', "
+                "some other Python package tool, or manually deleted."
             ),
-            context="Since pip 24.1+ invalid requirements can not be read by pip.",
-            hint_stmt="Please use 'pip<24.1' if you need to uninstall this package.",
         )

From 968a190f8d75b660732b1074c8f2a3741d95002d Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 8 Sep 2024 15:23:27 -0400
Subject: [PATCH 568/992] NEWS ENTRY.

---
 news/12953.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12953.bugfix.rst

diff --git a/news/12953.bugfix.rst b/news/12953.bugfix.rst
new file mode 100644
index 00000000000..f2d0521b20e
--- /dev/null
+++ b/news/12953.bugfix.rst
@@ -0,0 +1 @@
+Display disagnostic error message when already installed package has an invalid requirement.

From 87efd2f82253da2495474e5a4d12691b45c20490 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Wed, 11 Sep 2024 13:53:43 +0800
Subject: [PATCH 569/992] Add compatibility tag handling for iOS.

---
 src/pip/_internal/utils/compatibility_tags.py | 27 +++++++++++++++++--
 tests/unit/test_models_wheel.py               | 22 +++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/utils/compatibility_tags.py b/src/pip/_internal/utils/compatibility_tags.py
index b6ed9a78e55..73fd473b618 100644
--- a/src/pip/_internal/utils/compatibility_tags.py
+++ b/src/pip/_internal/utils/compatibility_tags.py
@@ -13,9 +13,10 @@
     interpreter_name,
     interpreter_version,
     mac_platforms,
+    ios_platforms,
 )
 
-_osx_arch_pat = re.compile(r"(.+)_(\d+)_(\d+)_(.+)")
+_apple_arch_pat = re.compile(r"(.+)_(\d+)_(\d+)_(.+)")
 
 
 def version_info_to_nodot(version_info: Tuple[int, ...]) -> str:
@@ -24,7 +25,7 @@ def version_info_to_nodot(version_info: Tuple[int, ...]) -> str:
 
 
 def _mac_platforms(arch: str) -> List[str]:
-    match = _osx_arch_pat.match(arch)
+    match = _apple_arch_pat.match(arch)
     if match:
         name, major, minor, actual_arch = match.groups()
         mac_version = (int(major), int(minor))
@@ -43,6 +44,26 @@ def _mac_platforms(arch: str) -> List[str]:
     return arches
 
 
+def _ios_platforms(arch: str) -> List[str]:
+    match = _apple_arch_pat.match(arch)
+    if match:
+        name, major, minor, actual_multiarch = match.groups()
+        ios_version = (int(major), int(minor))
+        arches = [
+            # Since we have always only checked that the platform starts
+            # with "ios", for backwards-compatibility we extract the
+            # actual prefix provided by the user in case they provided
+            # something like "ioscustom_". It may be good to remove
+            # this as undocumented or deprecate it in the future.
+            "{}_{}".format(name, arch[len("ios_") :])
+            for arch in ios_platforms(ios_version, actual_multiarch)
+        ]
+    else:
+        # arch pattern didn't match (?!)
+        arches = [arch]
+    return arches
+
+
 def _custom_manylinux_platforms(arch: str) -> List[str]:
     arches = [arch]
     arch_prefix, arch_sep, arch_suffix = arch.partition("_")
@@ -68,6 +89,8 @@ def _get_custom_platforms(arch: str) -> List[str]:
     arch_prefix, arch_sep, arch_suffix = arch.partition("_")
     if arch.startswith("macosx"):
         arches = _mac_platforms(arch)
+    elif arch.startswith("ios"):
+        arches = _ios_platforms(arch)
     elif arch_prefix in ["manylinux2014", "manylinux2010"]:
         arches = _custom_manylinux_platforms(arch)
     else:
diff --git a/tests/unit/test_models_wheel.py b/tests/unit/test_models_wheel.py
index ee4d88c744a..d323dab7167 100644
--- a/tests/unit/test_models_wheel.py
+++ b/tests/unit/test_models_wheel.py
@@ -148,6 +148,28 @@ def test_not_supported_multiarch_darwin(self) -> None:
         assert not w.supported(tags=intel)
         assert not w.supported(tags=universal)
 
+    def test_supported_ios_version(self) -> None:
+        """
+        Wheels build for iOS 12.3 are supported on iOS 15.1
+        """
+        tags = compatibility_tags.get_supported(
+            "313", platforms=["ios_15_1_arm64_iphoneos"], impl="cp"
+        )
+        w = Wheel("simple-0.1-cp313-none-ios_12_3_arm64_iphoneos.whl")
+        assert w.supported(tags=tags)
+        w = Wheel("simple-0.1-cp313-none-ios_15_1_arm64_iphoneos.whl")
+        assert w.supported(tags=tags)
+
+    def test_not_supported_ios_version(self) -> None:
+        """
+        Wheels built for macOS 15.1 are not supported on 12.3
+        """
+        tags = compatibility_tags.get_supported(
+            "313", platforms=["ios_12_3_arm64_iphoneos"], impl="cp"
+        )
+        w = Wheel("simple-0.1-cp313-none-ios_15_1_arm64_iphoneos.whl")
+        assert not w.supported(tags=tags)
+
     def test_support_index_min(self) -> None:
         """
         Test results from `support_index_min`

From dd087aa1adee2f6e7936e6dcf5a95d457fb1e9bc Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Wed, 11 Sep 2024 13:54:19 +0800
Subject: [PATCH 570/992] Add patch from pypa/packaging#832.

---
 src/pip/_vendor/packaging/tags.py | 63 ++++++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 5 deletions(-)

diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
index 6667d299085..bcc6ea041b7 100644
--- a/src/pip/_vendor/packaging/tags.py
+++ b/src/pip/_vendor/packaging/tags.py
@@ -25,7 +25,7 @@
 logger = logging.getLogger(__name__)
 
 PythonVersion = Sequence[int]
-MacVersion = Tuple[int, int]
+AppleVersion = Tuple[int, int]
 
 INTERPRETER_SHORT_NAMES: dict[str, str] = {
     "python": "py",  # Generic.
@@ -363,7 +363,7 @@ def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str:
     return "i386"
 
 
-def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
+def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]:
     formats = [cpu_arch]
     if cpu_arch == "x86_64":
         if version < (10, 4):
@@ -396,7 +396,7 @@ def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
 
 
 def mac_platforms(
-    version: MacVersion | None = None, arch: str | None = None
+    version: AppleVersion | None = None, arch: str | None = None
 ) -> Iterator[str]:
     """
     Yields the platform tags for a macOS system.
@@ -408,7 +408,7 @@ def mac_platforms(
     """
     version_str, _, cpu_arch = platform.mac_ver()
     if version is None:
-        version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
+        version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2])))
         if version == (10, 16):
             # When built against an older macOS SDK, Python will report macOS 10.16
             # instead of the real version.
@@ -424,7 +424,7 @@ def mac_platforms(
                 stdout=subprocess.PIPE,
                 text=True,
             ).stdout
-            version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
+            version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2])))
     else:
         version = version
     if arch is None:
@@ -483,6 +483,57 @@ def mac_platforms(
                 )
 
 
+def ios_platforms(
+    version: AppleVersion | None = None, multiarch: str | None = None
+) -> Iterator[str]:
+    """
+    Yields the platform tags for an iOS system.
+
+    :param version: A two-item tuple specifying the iOS version to generate
+        platform tags for. Defaults to the current iOS version.
+    :param multiarch: The CPU architecture+ABI to generate platform tags for -
+        (the value used by `sys.implementation._multiarch` e.g.,
+        `arm64_iphoneos` or `x84_64_iphonesimulator`). Defaults to the current
+        multiarch value.
+    """
+    if version is None:
+        # if iOS is the current platform, ios_ver *must* be defined. However,
+        # it won't exist for CPython versions before 3.13, which causes a mypy
+        # error.
+        _, release, _, _ = platform.ios_ver()  # type: ignore[attr-defined]
+        version = cast("AppleVersion", tuple(map(int, release.split(".")[:2])))
+
+    if multiarch is None:
+        multiarch = sys.implementation._multiarch
+
+    ios_platform_template = "ios_{major}_{minor}_{multiarch}"
+
+    # Consider any major.minor version from iOS 12.0 to the version prior to the
+    # version requested by platform. 12.0 is the first iOS version that is known
+    # to have enough features to support CPython. Consider every possible minor
+    # release up to X.9. There highest the minor has ever gone is 8 (14.8 and
+    # 15.8) but having some extra candidates that won't ever match doesn't
+    # really hurt, and it saves us from having to keep an explicit list of known
+    # iOS versions in the code.
+    for major in range(12, version[0]):
+        for minor in range(0, 10):
+            yield ios_platform_template.format(
+                major=major, minor=minor, multiarch=multiarch
+            )
+
+    # Consider every minor version from X.0 to the minor version prior to the
+    # version requested by the platform.
+    for minor in range(0, version[1]):
+        yield ios_platform_template.format(
+            major=version[0], minor=minor, multiarch=multiarch
+        )
+
+    # Consider the actual X.Y version that was requested.
+    yield ios_platform_template.format(
+        major=version[0], minor=version[1], multiarch=multiarch
+    )
+
+
 def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
     linux = _normalize_string(sysconfig.get_platform())
     if not linux.startswith("linux_"):
@@ -512,6 +563,8 @@ def platform_tags() -> Iterator[str]:
     """
     if platform.system() == "Darwin":
         return mac_platforms()
+    elif platform.system() == "iOS":
+        return ios_platforms()
     elif platform.system() == "Linux":
         return _linux_platforms()
     else:

From 1448fd1eac581199a17c99a70b5ceb2cba0139a6 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Wed, 11 Sep 2024 14:02:25 +0800
Subject: [PATCH 571/992] Add changenote.

---
 news/12961.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12961.feature.rst

diff --git a/news/12961.feature.rst b/news/12961.feature.rst
new file mode 100644
index 00000000000..e4e982db13b
--- /dev/null
+++ b/news/12961.feature.rst
@@ -0,0 +1 @@
+Support for PEP 730 iOS wheels was added.

From 09cce69f52fe10d69596083d4776786abe97b37d Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Wed, 11 Sep 2024 14:14:02 +0800
Subject: [PATCH 572/992] Correct linting issue.

---
 src/pip/_internal/utils/compatibility_tags.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/utils/compatibility_tags.py b/src/pip/_internal/utils/compatibility_tags.py
index 73fd473b618..2e7b7450dce 100644
--- a/src/pip/_internal/utils/compatibility_tags.py
+++ b/src/pip/_internal/utils/compatibility_tags.py
@@ -12,8 +12,8 @@
     generic_tags,
     interpreter_name,
     interpreter_version,
-    mac_platforms,
     ios_platforms,
+    mac_platforms,
 )
 
 _apple_arch_pat = re.compile(r"(.+)_(\d+)_(\d+)_(.+)")

From 9d6e25d8599cf05982551e08d0d35d3556a70d0b Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Wed, 11 Sep 2024 14:30:42 +0800
Subject: [PATCH 573/992] Add patch file for packaging.

---
 tools/vendoring/patches/packaging.patch | 116 ++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 tools/vendoring/patches/packaging.patch

diff --git a/tools/vendoring/patches/packaging.patch b/tools/vendoring/patches/packaging.patch
new file mode 100644
index 00000000000..e952981068d
--- /dev/null
+++ b/tools/vendoring/patches/packaging.patch
@@ -0,0 +1,116 @@
+diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
+index 6667d2990..bcc6ea041 100644
+--- a/src/pip/_vendor/packaging/tags.py
++++ b/src/pip/_vendor/packaging/tags.py
+@@ -25,7 +25,7 @@ from . import _manylinux, _musllinux
+ logger = logging.getLogger(__name__)
+
+ PythonVersion = Sequence[int]
+-MacVersion = Tuple[int, int]
++AppleVersion = Tuple[int, int]
+
+ INTERPRETER_SHORT_NAMES: dict[str, str] = {
+     "python": "py",  # Generic.
+@@ -363,7 +363,7 @@ def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str:
+     return "i386"
+
+
+-def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
++def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]:
+     formats = [cpu_arch]
+     if cpu_arch == "x86_64":
+         if version < (10, 4):
+@@ -396,7 +396,7 @@ def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
+
+
+ def mac_platforms(
+-    version: MacVersion | None = None, arch: str | None = None
++    version: AppleVersion | None = None, arch: str | None = None
+ ) -> Iterator[str]:
+     """
+     Yields the platform tags for a macOS system.
+@@ -408,7 +408,7 @@ def mac_platforms(
+     """
+     version_str, _, cpu_arch = platform.mac_ver()
+     if version is None:
+-        version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
++        version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2])))
+         if version == (10, 16):
+             # When built against an older macOS SDK, Python will report macOS 10.16
+             # instead of the real version.
+@@ -424,7 +424,7 @@ def mac_platforms(
+                 stdout=subprocess.PIPE,
+                 text=True,
+             ).stdout
+-            version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
++            version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2])))
+     else:
+         version = version
+     if arch is None:
+@@ -483,6 +483,57 @@ def mac_platforms(
+                 )
+
+
++def ios_platforms(
++    version: AppleVersion | None = None, multiarch: str | None = None
++) -> Iterator[str]:
++    """
++    Yields the platform tags for an iOS system.
++
++    :param version: A two-item tuple specifying the iOS version to generate
++        platform tags for. Defaults to the current iOS version.
++    :param multiarch: The CPU architecture+ABI to generate platform tags for -
++        (the value used by `sys.implementation._multiarch` e.g.,
++        `arm64_iphoneos` or `x84_64_iphonesimulator`). Defaults to the current
++        multiarch value.
++    """
++    if version is None:
++        # if iOS is the current platform, ios_ver *must* be defined. However,
++        # it won't exist for CPython versions before 3.13, which causes a mypy
++        # error.
++        _, release, _, _ = platform.ios_ver()  # type: ignore[attr-defined]
++        version = cast("AppleVersion", tuple(map(int, release.split(".")[:2])))
++
++    if multiarch is None:
++        multiarch = sys.implementation._multiarch
++
++    ios_platform_template = "ios_{major}_{minor}_{multiarch}"
++
++    # Consider any major.minor version from iOS 12.0 to the version prior to the
++    # version requested by platform. 12.0 is the first iOS version that is known
++    # to have enough features to support CPython. Consider every possible minor
++    # release up to X.9. There highest the minor has ever gone is 8 (14.8 and
++    # 15.8) but having some extra candidates that won't ever match doesn't
++    # really hurt, and it saves us from having to keep an explicit list of known
++    # iOS versions in the code.
++    for major in range(12, version[0]):
++        for minor in range(0, 10):
++            yield ios_platform_template.format(
++                major=major, minor=minor, multiarch=multiarch
++            )
++
++    # Consider every minor version from X.0 to the minor version prior to the
++    # version requested by the platform.
++    for minor in range(0, version[1]):
++        yield ios_platform_template.format(
++            major=version[0], minor=minor, multiarch=multiarch
++        )
++
++    # Consider the actual X.Y version that was requested.
++    yield ios_platform_template.format(
++        major=version[0], minor=version[1], multiarch=multiarch
++    )
++
++
+ def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
+     linux = _normalize_string(sysconfig.get_platform())
+     if not linux.startswith("linux_"):
+@@ -512,6 +563,8 @@ def platform_tags() -> Iterator[str]:
+     """
+     if platform.system() == "Darwin":
+         return mac_platforms()
++    elif platform.system() == "iOS":
++        return ios_platforms()
+     elif platform.system() == "Linux":
+         return _linux_platforms()
+     else:

From 13dab6ca0ed3025e00670e15816f3e2579b7eea9 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Thu, 12 Sep 2024 12:23:20 +0800
Subject: [PATCH 574/992] Correct usage of invalid File URL in test.

---
 tests/functional/test_bad_url.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/test_bad_url.py b/tests/functional/test_bad_url.py
index bc3a987e6f2..b1938789867 100644
--- a/tests/functional/test_bad_url.py
+++ b/tests/functional/test_bad_url.py
@@ -8,7 +8,7 @@ def test_filenotfound_error_message(script: Any) -> None:
     # Test the error message returned when using a bad 'file:' URL.
     # make pip to fail and get an error message
     # by running "pip install -r file:nonexistent_file"
-    proc = script.pip("install", "-r", "file:unexistent_file", expect_error=True)
+    proc = script.pip("install", "-r", "file:///unexistent_file", expect_error=True)
     assert proc.returncode == 1
     expect = (
         "ERROR: 404 Client Error: FileNotFoundError for url: file:///unexistent_file"

From 0896a5b52f0a6ebe6614960d37c3f0f6227b00f2 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Thu, 12 Sep 2024 12:25:28 +0800
Subject: [PATCH 575/992] Correct usage of invalid file URL in test.

---
 tests/functional/test_bad_url.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/test_bad_url.py b/tests/functional/test_bad_url.py
index bc3a987e6f2..b1938789867 100644
--- a/tests/functional/test_bad_url.py
+++ b/tests/functional/test_bad_url.py
@@ -8,7 +8,7 @@ def test_filenotfound_error_message(script: Any) -> None:
     # Test the error message returned when using a bad 'file:' URL.
     # make pip to fail and get an error message
     # by running "pip install -r file:nonexistent_file"
-    proc = script.pip("install", "-r", "file:unexistent_file", expect_error=True)
+    proc = script.pip("install", "-r", "file:///unexistent_file", expect_error=True)
     assert proc.returncode == 1
     expect = (
         "ERROR: 404 Client Error: FileNotFoundError for url: file:///unexistent_file"

From 490364572caa16281d6f5012cd56cb607b363198 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Thu, 12 Sep 2024 12:35:21 +0800
Subject: [PATCH 576/992] Add changenote.

---
 news/12964.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12964.trivial.rst

diff --git a/news/12964.trivial.rst b/news/12964.trivial.rst
new file mode 100644
index 00000000000..1467743ff13
--- /dev/null
+++ b/news/12964.trivial.rst
@@ -0,0 +1 @@
+A valid, but non-existent URL used in a test case was corrected to be a valid URL.

From 5eaccb83008da9b2e0999642d4841b7816475394 Mon Sep 17 00:00:00 2001
From: Tzu-ping Chung 
Date: Fri, 13 Sep 2024 01:47:29 +0800
Subject: [PATCH 577/992] Also change the comment

---
 tests/functional/test_bad_url.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/test_bad_url.py b/tests/functional/test_bad_url.py
index b1938789867..7f6117e763b 100644
--- a/tests/functional/test_bad_url.py
+++ b/tests/functional/test_bad_url.py
@@ -7,7 +7,7 @@
 def test_filenotfound_error_message(script: Any) -> None:
     # Test the error message returned when using a bad 'file:' URL.
     # make pip to fail and get an error message
-    # by running "pip install -r file:nonexistent_file"
+    # by running "pip install -r file:///nonexistent_file"
     proc = script.pip("install", "-r", "file:///unexistent_file", expect_error=True)
     assert proc.returncode == 1
     expect = (

From 102d8187a1f5a4cd5de7a549fd8a9af34e89a54f Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos Orfanos
 <3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Mon, 16 Sep 2024 22:24:45 +0200
Subject: [PATCH 578/992] Enforce ruff/pyupgrade rules (UP) (#12936)

---
 pyproject.toml                                    | 2 +-
 src/pip/_internal/cli/index_command.py            | 2 +-
 src/pip/_internal/commands/list.py                | 2 +-
 src/pip/_internal/commands/search.py              | 2 +-
 src/pip/_internal/exceptions.py                   | 2 +-
 src/pip/_internal/req/constructors.py             | 2 +-
 tests/functional/test_search.py                   | 6 +++---
 tests/unit/resolution_resolvelib/test_provider.py | 2 +-
 tests/unit/resolution_resolvelib/test_resolver.py | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index cf098eea061..4d8d1181697 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -181,7 +181,7 @@ select = [
     "PLR0",
     "W",
     "RUF100",
-    "UP032",
+    "UP",
 ]
 
 [tool.ruff.lint.isort]
diff --git a/src/pip/_internal/cli/index_command.py b/src/pip/_internal/cli/index_command.py
index 226f8da1e94..db105d0fef9 100644
--- a/src/pip/_internal/cli/index_command.py
+++ b/src/pip/_internal/cli/index_command.py
@@ -54,7 +54,7 @@ class SessionCommandMixin(CommandContextMixIn):
 
     def __init__(self) -> None:
         super().__init__()
-        self._session: Optional["PipSession"] = None
+        self._session: Optional[PipSession] = None
 
     @classmethod
     def _get_index_urls(cls, options: Values) -> Optional[List[str]]:
diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index 82fc46a118f..84943702410 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -176,7 +176,7 @@ def run(self, options: Values, args: List[str]) -> int:
         if options.excludes:
             skip.update(canonicalize_name(n) for n in options.excludes)
 
-        packages: "_ProcessedDists" = [
+        packages: _ProcessedDists = [
             cast("_DistWithLatestInfo", d)
             for d in get_environment(options.path).iter_installed_distributions(
                 local_only=options.local,
diff --git a/src/pip/_internal/commands/search.py b/src/pip/_internal/commands/search.py
index e0d329d58ad..74b8d656b47 100644
--- a/src/pip/_internal/commands/search.py
+++ b/src/pip/_internal/commands/search.py
@@ -89,7 +89,7 @@ def transform_hits(hits: List[Dict[str, str]]) -> List["TransformedHit"]:
     packages with the list of versions stored inline. This converts the
     list from pypi into one we can use.
     """
-    packages: Dict[str, "TransformedHit"] = OrderedDict()
+    packages: Dict[str, TransformedHit] = OrderedDict()
     for hit in hits:
         name = hit["name"]
         summary = hit["summary"]
diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index 2587740f73a..8ceb818a35d 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -429,7 +429,7 @@ class HashErrors(InstallationError):
     """Multiple HashError instances rolled into one for reporting"""
 
     def __init__(self) -> None:
-        self.errors: List["HashError"] = []
+        self.errors: List[HashError] = []
 
     def append(self, error: "HashError") -> None:
         self.errors.append(error)
diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
index d73236e05c6..56a964f3177 100644
--- a/src/pip/_internal/req/constructors.py
+++ b/src/pip/_internal/req/constructors.py
@@ -80,7 +80,7 @@ def _set_requirement_extras(req: Requirement, new_extras: Set[str]) -> Requireme
     assert (
         pre is not None and post is not None
     ), f"regex group selection for requirement {req} failed, this should never happen"
-    extras: str = "[%s]" % ",".join(sorted(new_extras)) if new_extras else ""
+    extras: str = "[{}]".format(",".join(sorted(new_extras)) if new_extras else "")
     return get_requirement(f"{pre}{extras}{post}")
 
 
diff --git a/tests/functional/test_search.py b/tests/functional/test_search.py
index 3f784e5dd1c..3d4baeb4832 100644
--- a/tests/functional/test_search.py
+++ b/tests/functional/test_search.py
@@ -45,7 +45,7 @@ def test_pypi_xml_transformation() -> None:
             "version": "1.0",
         },
     ]
-    expected: List["TransformedHit"] = [
+    expected: List[TransformedHit] = [
         {
             "versions": ["1.0", "2.0"],
             "name": "foo",
@@ -159,7 +159,7 @@ def test_latest_prerelease_install_message(
     """
     Test documentation for installing pre-release packages is displayed
     """
-    hits: List["TransformedHit"] = [
+    hits: List[TransformedHit] = [
         {
             "name": "ni",
             "summary": "For knights who say Ni!",
@@ -188,7 +188,7 @@ def test_search_print_results_should_contain_latest_versions(
     """
     Test that printed search results contain the latest package versions
     """
-    hits: List["TransformedHit"] = [
+    hits: List[TransformedHit] = [
         {
             "name": "testlib1",
             "summary": "Test library 1.",
diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index 77d1d299a0e..5f30e2bc1dd 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -19,7 +19,7 @@ def build_requirement_information(
     install_requirement = install_req_from_req_string(name)
     # RequirementInformation is typed as a tuple, but it is a namedtupled.
     # https://github.com/sarugaku/resolvelib/blob/7bc025aa2a4e979597c438ad7b17d2e8a08a364e/src/resolvelib/resolvers.pyi#L20-L22
-    requirement_information: "PreferenceInformation" = RequirementInformation(
+    requirement_information: PreferenceInformation = RequirementInformation(
         requirement=SpecifierRequirement(install_requirement),  # type: ignore[call-arg]
         parent=parent,
     )
diff --git a/tests/unit/resolution_resolvelib/test_resolver.py b/tests/unit/resolution_resolvelib/test_resolver.py
index b1525a20a56..f2f36770fe6 100644
--- a/tests/unit/resolution_resolvelib/test_resolver.py
+++ b/tests/unit/resolution_resolvelib/test_resolver.py
@@ -38,7 +38,7 @@ def _make_graph(
 ) -> "DirectedGraph[Optional[str]]":
     """Build graph from edge declarations."""
 
-    graph: "DirectedGraph[Optional[str]]" = DirectedGraph()
+    graph: DirectedGraph[Optional[str]] = DirectedGraph()
     for parent, child in edges:
         parent = cast(str, canonicalize_name(parent)) if parent else None
         child = cast(str, canonicalize_name(child)) if child else None

From 9da160f0b53810c68e45a39de31c3927bf8fb24e Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 14 Sep 2024 14:18:04 -0400
Subject: [PATCH 579/992] New ruff config

---
 pyproject.toml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4d8d1181697..fa29a9cb020 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -185,9 +185,19 @@ select = [
 ]
 
 [tool.ruff.lint.isort]
-# Explicitly make tests "first party" as it's not in the "src" directory
-known-first-party = ["tests"]
-known-third-party = ["pip._vendor"]
+section-order = [
+  "future",
+  "standard-library",
+  "third-party",
+  "vendored",
+  "first-party",
+  "tests",
+  "local-folder",
+]
+
+[tool.ruff.lint.isort.sections]
+"vendored" = ["pip._vendor"]
+"tests" = ["tests"]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 33  # default is 10

From 9e3c779bcc08d18b7eb98b47921803ec26824eb5 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 14 Sep 2024 14:18:24 -0400
Subject: [PATCH 580/992] Run `ruff check . --fix --select I`

---
 tests/conftest.py                                        | 1 +
 tests/functional/test_build_env.py                       | 1 +
 tests/functional/test_cli.py                             | 1 +
 tests/functional/test_config_settings.py                 | 1 +
 tests/functional/test_configuration.py                   | 1 +
 tests/functional/test_debug.py                           | 2 ++
 tests/functional/test_download.py                        | 1 +
 tests/functional/test_fast_deps.py                       | 2 ++
 tests/functional/test_freeze.py                          | 2 ++
 tests/functional/test_help.py                            | 1 +
 tests/functional/test_index.py                           | 1 +
 tests/functional/test_install.py                         | 1 +
 tests/functional/test_install_direct_url.py              | 1 +
 tests/functional/test_invalid_versions_and_specifiers.py | 1 +
 tests/functional/test_list.py                            | 1 +
 tests/functional/test_new_resolver_target.py             | 1 +
 tests/functional/test_pep517.py                          | 1 +
 tests/functional/test_pip_runner_script.py               | 1 +
 tests/functional/test_search.py                          | 1 +
 tests/functional/test_show.py                            | 1 +
 tests/functional/test_uninstall.py                       | 1 +
 tests/functional/test_vcs_bazaar.py                      | 1 +
 tests/functional/test_vcs_git.py                         | 1 +
 tests/functional/test_vcs_mercurial.py                   | 1 +
 tests/functional/test_vcs_subversion.py                  | 1 +
 tests/functional/test_wheel.py                           | 1 +
 tests/lib/__init__.py                                    | 4 +++-
 tests/lib/direct_url.py                                  | 1 +
 tests/unit/metadata/test_metadata.py                     | 2 ++
 tests/unit/metadata/test_metadata_pkg_resources.py       | 1 +
 tests/unit/resolution_resolvelib/conftest.py             | 1 +
 tests/unit/resolution_resolvelib/test_requirement.py     | 2 ++
 tests/unit/resolution_resolvelib/test_resolver.py        | 1 +
 tests/unit/test_appdirs.py                               | 1 +
 tests/unit/test_collector.py                             | 2 ++
 tests/unit/test_configuration.py                         | 1 +
 tests/unit/test_exceptions.py                            | 1 +
 tests/unit/test_finder.py                                | 2 ++
 tests/unit/test_index.py                                 | 2 ++
 tests/unit/test_models_wheel.py                          | 1 +
 tests/unit/test_network_auth.py                          | 1 +
 tests/unit/test_network_cache.py                         | 2 ++
 tests/unit/test_network_download.py                      | 1 +
 tests/unit/test_network_lazy_wheel.py                    | 2 ++
 tests/unit/test_network_session.py                       | 1 +
 tests/unit/test_network_utils.py                         | 1 +
 tests/unit/test_operations_prepare.py                    | 1 +
 tests/unit/test_options.py                               | 1 +
 tests/unit/test_packaging.py                             | 1 +
 tests/unit/test_pep517.py                                | 1 +
 tests/unit/test_req.py                                   | 2 ++
 tests/unit/test_req_file.py                              | 1 +
 tests/unit/test_req_install.py                           | 1 +
 tests/unit/test_req_uninstall.py                         | 1 +
 tests/unit/test_resolution_legacy_resolver.py            | 2 ++
 tests/unit/test_self_check_outdated.py                   | 1 +
 tests/unit/test_target_python.py                         | 2 ++
 tests/unit/test_urls.py                                  | 1 +
 tests/unit/test_utils.py                                 | 1 +
 tests/unit/test_utils_unpacking.py                       | 1 +
 tests/unit/test_utils_wheel.py                           | 1 +
 tests/unit/test_vcs.py                                   | 1 +
 tests/unit/test_vcs_mercurial.py                         | 1 +
 tests/unit/test_wheel.py                                 | 2 ++
 tests/unit/test_wheel_builder.py                         | 1 +
 65 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index da4ab5b9dfb..d093eea462b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -47,6 +47,7 @@
 from pip import __file__ as pip_location
 from pip._internal.locations import _USE_SYSCONFIG
 from pip._internal.utils.temp_dir import global_tempdir_manager
+
 from tests.lib import (
     DATA_DIR,
     SRC_DIR,
diff --git a/tests/functional/test_build_env.py b/tests/functional/test_build_env.py
index 11164be0500..c950a8a6de9 100644
--- a/tests/functional/test_build_env.py
+++ b/tests/functional/test_build_env.py
@@ -6,6 +6,7 @@
 import pytest
 
 from pip._internal.build_env import BuildEnvironment, _get_system_sitepackages
+
 from tests.lib import (
     PipTestEnvironment,
     TestPipResult,
diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index e1ccf04ea1c..5be66d88eac 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -9,6 +9,7 @@
 import pytest
 
 from pip._internal.commands import commands_dict
+
 from tests.lib import PipTestEnvironment
 
 
diff --git a/tests/functional/test_config_settings.py b/tests/functional/test_config_settings.py
index 857722dd10d..4e0b12ca185 100644
--- a/tests/functional/test_config_settings.py
+++ b/tests/functional/test_config_settings.py
@@ -5,6 +5,7 @@
 from zipfile import ZipFile
 
 from pip._internal.utils.urls import path_to_url
+
 from tests.lib import PipTestEnvironment, create_basic_sdist_for_package
 
 PYPROJECT_TOML = """\
diff --git a/tests/functional/test_configuration.py b/tests/functional/test_configuration.py
index 854fb3694b1..56cac572c4f 100644
--- a/tests/functional/test_configuration.py
+++ b/tests/functional/test_configuration.py
@@ -6,6 +6,7 @@
 
 from pip._internal.cli.status_codes import ERROR
 from pip._internal.configuration import CONFIG_BASENAME, get_configuration_files
+
 from tests.lib import PipTestEnvironment
 from tests.lib.configuration_helpers import ConfigurationMixin, kinds
 from tests.lib.venv import VirtualEnvironment
diff --git a/tests/functional/test_debug.py b/tests/functional/test_debug.py
index 77d4bea335f..82557299904 100644
--- a/tests/functional/test_debug.py
+++ b/tests/functional/test_debug.py
@@ -2,10 +2,12 @@
 from typing import List
 
 import pytest
+
 from pip._vendor.packaging.version import Version
 
 from pip._internal.commands.debug import create_vendor_txt_map
 from pip._internal.utils import compatibility_tags
+
 from tests.lib import PipTestEnvironment
 
 
diff --git a/tests/functional/test_download.py b/tests/functional/test_download.py
index d469e71c360..3906885a19b 100644
--- a/tests/functional/test_download.py
+++ b/tests/functional/test_download.py
@@ -11,6 +11,7 @@
 
 from pip._internal.cli.status_codes import ERROR
 from pip._internal.utils.urls import path_to_url
+
 from tests.lib import (
     PipTestEnvironment,
     ScriptFactory,
diff --git a/tests/functional/test_fast_deps.py b/tests/functional/test_fast_deps.py
index 5a910b89763..85c9bbd7072 100644
--- a/tests/functional/test_fast_deps.py
+++ b/tests/functional/test_fast_deps.py
@@ -7,9 +7,11 @@
 from typing import Iterable
 
 import pytest
+
 from pip._vendor.packaging.utils import canonicalize_name
 
 from pip._internal.utils.misc import hash_file
+
 from tests.lib import PipTestEnvironment, TestData, TestPipResult
 
 
diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py
index b7af974ea61..0a7cedd11cb 100644
--- a/tests/functional/test_freeze.py
+++ b/tests/functional/test_freeze.py
@@ -6,9 +6,11 @@
 from pathlib import Path
 
 import pytest
+
 from pip._vendor.packaging.utils import canonicalize_name
 
 from pip._internal.models.direct_url import DirectUrl, DirInfo
+
 from tests.lib import (
     PipTestEnvironment,
     TestData,
diff --git a/tests/functional/test_help.py b/tests/functional/test_help.py
index 75414214a93..cba036927c8 100644
--- a/tests/functional/test_help.py
+++ b/tests/functional/test_help.py
@@ -5,6 +5,7 @@
 from pip._internal.cli.status_codes import ERROR, SUCCESS
 from pip._internal.commands import commands_dict, create_command
 from pip._internal.exceptions import CommandError
+
 from tests.lib import InMemoryPip, PipTestEnvironment
 
 
diff --git a/tests/functional/test_index.py b/tests/functional/test_index.py
index 43b8f09c311..5a3c27bac9d 100644
--- a/tests/functional/test_index.py
+++ b/tests/functional/test_index.py
@@ -2,6 +2,7 @@
 
 from pip._internal.cli.status_codes import ERROR, SUCCESS
 from pip._internal.commands import create_command
+
 from tests.lib import PipTestEnvironment
 
 
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 8c30a69b515..4718beb948c 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -17,6 +17,7 @@
 from pip._internal.models.index import PyPI, TestPyPI
 from pip._internal.utils.misc import rmtree
 from pip._internal.utils.urls import path_to_url
+
 from tests.lib import (
     CertFactory,
     PipTestEnvironment,
diff --git a/tests/functional/test_install_direct_url.py b/tests/functional/test_install_direct_url.py
index 139ef178e77..5aefab09cb3 100644
--- a/tests/functional/test_install_direct_url.py
+++ b/tests/functional/test_install_direct_url.py
@@ -1,6 +1,7 @@
 import pytest
 
 from pip._internal.models.direct_url import VcsInfo
+
 from tests.lib import PipTestEnvironment, TestData, _create_test_package
 from tests.lib.direct_url import get_created_direct_url
 
diff --git a/tests/functional/test_invalid_versions_and_specifiers.py b/tests/functional/test_invalid_versions_and_specifiers.py
index 4867fe54beb..6349036bf52 100644
--- a/tests/functional/test_invalid_versions_and_specifiers.py
+++ b/tests/functional/test_invalid_versions_and_specifiers.py
@@ -3,6 +3,7 @@
 import pytest
 
 from pip._internal.metadata import select_backend
+
 from tests.lib import PipTestEnvironment, TestData
 
 
diff --git a/tests/functional/test_list.py b/tests/functional/test_list.py
index 43998600eb6..e611fe7cb64 100644
--- a/tests/functional/test_list.py
+++ b/tests/functional/test_list.py
@@ -5,6 +5,7 @@
 import pytest
 
 from pip._internal.models.direct_url import DirectUrl, DirInfo
+
 from tests.lib import (
     PipTestEnvironment,
     ScriptFactory,
diff --git a/tests/functional/test_new_resolver_target.py b/tests/functional/test_new_resolver_target.py
index 4434c276fca..58b2d548b65 100644
--- a/tests/functional/test_new_resolver_target.py
+++ b/tests/functional/test_new_resolver_target.py
@@ -4,6 +4,7 @@
 import pytest
 
 from pip._internal.cli.status_codes import ERROR, SUCCESS
+
 from tests.lib import PipTestEnvironment
 from tests.lib.wheel import make_wheel
 
diff --git a/tests/functional/test_pep517.py b/tests/functional/test_pep517.py
index 4e0c16358af..fd9380d0eb6 100644
--- a/tests/functional/test_pep517.py
+++ b/tests/functional/test_pep517.py
@@ -7,6 +7,7 @@
 
 from pip._internal.build_env import BuildEnvironment
 from pip._internal.req import InstallRequirement
+
 from tests.lib import (
     PipTestEnvironment,
     TestData,
diff --git a/tests/functional/test_pip_runner_script.py b/tests/functional/test_pip_runner_script.py
index f2f879b824d..ba73f936321 100644
--- a/tests/functional/test_pip_runner_script.py
+++ b/tests/functional/test_pip_runner_script.py
@@ -2,6 +2,7 @@
 from pathlib import Path
 
 from pip import __version__
+
 from tests.lib import PipTestEnvironment
 
 
diff --git a/tests/functional/test_search.py b/tests/functional/test_search.py
index 3d4baeb4832..9491b492400 100644
--- a/tests/functional/test_search.py
+++ b/tests/functional/test_search.py
@@ -7,6 +7,7 @@
 from pip._internal.cli.status_codes import NO_MATCHES_FOUND, SUCCESS
 from pip._internal.commands import create_command
 from pip._internal.commands.search import highest_version, print_results, transform_hits
+
 from tests.lib import PipTestEnvironment
 
 if TYPE_CHECKING:
diff --git a/tests/functional/test_show.py b/tests/functional/test_show.py
index 7797de9e992..4cc1587733f 100644
--- a/tests/functional/test_show.py
+++ b/tests/functional/test_show.py
@@ -8,6 +8,7 @@
 from pip import __version__
 from pip._internal.commands.show import search_packages_info
 from pip._internal.utils.unpacking import untar_file
+
 from tests.lib import (
     PipTestEnvironment,
     TestData,
diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py
index 58e141e54ad..d86ba172002 100644
--- a/tests/functional/test_uninstall.py
+++ b/tests/functional/test_uninstall.py
@@ -12,6 +12,7 @@
 
 from pip._internal.req.constructors import install_req_from_line
 from pip._internal.utils.misc import rmtree
+
 from tests.lib import (
     PipTestEnvironment,
     TestData,
diff --git a/tests/functional/test_vcs_bazaar.py b/tests/functional/test_vcs_bazaar.py
index 63955d6e701..821427ed841 100644
--- a/tests/functional/test_vcs_bazaar.py
+++ b/tests/functional/test_vcs_bazaar.py
@@ -10,6 +10,7 @@
 
 from pip._internal.vcs.bazaar import Bazaar
 from pip._internal.vcs.versioncontrol import RemoteNotFoundError
+
 from tests.lib import PipTestEnvironment, is_bzr_installed, need_bzr
 
 
diff --git a/tests/functional/test_vcs_git.py b/tests/functional/test_vcs_git.py
index a7276e2b6a5..f917fa8b39e 100644
--- a/tests/functional/test_vcs_git.py
+++ b/tests/functional/test_vcs_git.py
@@ -13,6 +13,7 @@
 from pip._internal.utils.misc import HiddenText
 from pip._internal.vcs import vcs
 from pip._internal.vcs.git import Git, RemoteNotFoundError
+
 from tests.lib import PipTestEnvironment, _create_test_package, _git_commit
 
 
diff --git a/tests/functional/test_vcs_mercurial.py b/tests/functional/test_vcs_mercurial.py
index 9a909e71f24..a511c40aae2 100644
--- a/tests/functional/test_vcs_mercurial.py
+++ b/tests/functional/test_vcs_mercurial.py
@@ -1,6 +1,7 @@
 import os
 
 from pip._internal.vcs.mercurial import Mercurial
+
 from tests.lib import PipTestEnvironment, _create_test_package, need_mercurial
 
 
diff --git a/tests/functional/test_vcs_subversion.py b/tests/functional/test_vcs_subversion.py
index 05c20c7c145..987f481edd4 100644
--- a/tests/functional/test_vcs_subversion.py
+++ b/tests/functional/test_vcs_subversion.py
@@ -4,6 +4,7 @@
 
 from pip._internal.vcs.subversion import Subversion
 from pip._internal.vcs.versioncontrol import RemoteNotFoundError
+
 from tests.lib import PipTestEnvironment, _create_svn_repo, need_svn
 
 
diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py
index 1bddd40dc41..da2bd2d7904 100644
--- a/tests/functional/test_wheel.py
+++ b/tests/functional/test_wheel.py
@@ -8,6 +8,7 @@
 import pytest
 
 from pip._internal.cli.status_codes import ERROR
+
 from tests.lib import (
     PipTestEnvironment,
     TestData,
diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py
index e318f7155d2..df142ba4438 100644
--- a/tests/lib/__init__.py
+++ b/tests/lib/__init__.py
@@ -32,9 +32,10 @@
 from zipfile import ZipFile
 
 import pytest
-from pip._vendor.packaging.utils import canonicalize_name
 from scripttest import FoundDir, FoundFile, ProcResult, TestFileEnvironment
 
+from pip._vendor.packaging.utils import canonicalize_name
+
 from pip._internal.cli.main import main as pip_entry_point
 from pip._internal.index.collector import LinkCollector
 from pip._internal.index.package_finder import PackageFinder
@@ -44,6 +45,7 @@
 from pip._internal.models.target_python import TargetPython
 from pip._internal.network.session import PipSession
 from pip._internal.utils.egg_link import _egg_link_names
+
 from tests.lib.venv import VirtualEnvironment
 from tests.lib.wheel import make_wheel
 
diff --git a/tests/lib/direct_url.py b/tests/lib/direct_url.py
index e0dac032062..fff1ae966cd 100644
--- a/tests/lib/direct_url.py
+++ b/tests/lib/direct_url.py
@@ -4,6 +4,7 @@
 from typing import Optional
 
 from pip._internal.models.direct_url import DIRECT_URL_METADATA_NAME, DirectUrl
+
 from tests.lib import TestPipResult
 
 
diff --git a/tests/unit/metadata/test_metadata.py b/tests/unit/metadata/test_metadata.py
index caa2dea8c91..404d858bdd5 100644
--- a/tests/unit/metadata/test_metadata.py
+++ b/tests/unit/metadata/test_metadata.py
@@ -5,6 +5,7 @@
 from unittest import mock
 
 import pytest
+
 from pip._vendor.packaging.utils import NormalizedName
 
 from pip._internal.metadata import (
@@ -15,6 +16,7 @@
 )
 from pip._internal.metadata.base import FilesystemWheel
 from pip._internal.models.direct_url import DIRECT_URL_METADATA_NAME, ArchiveInfo
+
 from tests.lib.wheel import make_wheel
 
 
diff --git a/tests/unit/metadata/test_metadata_pkg_resources.py b/tests/unit/metadata/test_metadata_pkg_resources.py
index 6044c14e4ca..6b3a302fb3c 100644
--- a/tests/unit/metadata/test_metadata_pkg_resources.py
+++ b/tests/unit/metadata/test_metadata_pkg_resources.py
@@ -4,6 +4,7 @@
 from unittest import mock
 
 import pytest
+
 from pip._vendor.packaging.requirements import Requirement
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import canonicalize_name
diff --git a/tests/unit/resolution_resolvelib/conftest.py b/tests/unit/resolution_resolvelib/conftest.py
index 348396bafe2..6aa5f505dbb 100644
--- a/tests/unit/resolution_resolvelib/conftest.py
+++ b/tests/unit/resolution_resolvelib/conftest.py
@@ -17,6 +17,7 @@
 from pip._internal.resolution.resolvelib.factory import Factory
 from pip._internal.resolution.resolvelib.provider import PipProvider
 from pip._internal.utils.temp_dir import TempDirectory, global_tempdir_manager
+
 from tests.lib import TestData
 
 
diff --git a/tests/unit/resolution_resolvelib/test_requirement.py b/tests/unit/resolution_resolvelib/test_requirement.py
index 436081b1d8f..cde6256a206 100644
--- a/tests/unit/resolution_resolvelib/test_requirement.py
+++ b/tests/unit/resolution_resolvelib/test_requirement.py
@@ -3,11 +3,13 @@
 from typing import List, Tuple
 
 import pytest
+
 from pip._vendor.resolvelib import BaseReporter, Resolver
 
 from pip._internal.resolution.resolvelib.base import Candidate, Constraint, Requirement
 from pip._internal.resolution.resolvelib.factory import Factory
 from pip._internal.resolution.resolvelib.provider import PipProvider
+
 from tests.lib import TestData
 
 # NOTE: All tests are prefixed `test_rlr` (for "test resolvelib resolver").
diff --git a/tests/unit/resolution_resolvelib/test_resolver.py b/tests/unit/resolution_resolvelib/test_resolver.py
index f2f36770fe6..18238eef134 100644
--- a/tests/unit/resolution_resolvelib/test_resolver.py
+++ b/tests/unit/resolution_resolvelib/test_resolver.py
@@ -2,6 +2,7 @@
 from unittest import mock
 
 import pytest
+
 from pip._vendor.packaging.utils import canonicalize_name
 from pip._vendor.resolvelib.resolvers import Result
 from pip._vendor.resolvelib.structs import DirectedGraph
diff --git a/tests/unit/test_appdirs.py b/tests/unit/test_appdirs.py
index fd3ea143bcb..6e6521dd5c0 100644
--- a/tests/unit/test_appdirs.py
+++ b/tests/unit/test_appdirs.py
@@ -5,6 +5,7 @@
 from unittest import mock
 
 import pytest
+
 from pip._vendor import platformdirs
 
 from pip._internal.utils import appdirs
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index 882f82ae4fe..c527d5610a3 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -10,6 +10,7 @@
 from unittest import mock
 
 import pytest
+
 from pip._vendor import requests
 from pip._vendor.packaging.requirements import Requirement
 
@@ -35,6 +36,7 @@
     _ensure_quoted_url,
 )
 from pip._internal.network.session import PipSession
+
 from tests.lib import (
     TestData,
     make_test_link_collector,
diff --git a/tests/unit/test_configuration.py b/tests/unit/test_configuration.py
index 1a0acb7b411..29a268c7875 100644
--- a/tests/unit/test_configuration.py
+++ b/tests/unit/test_configuration.py
@@ -8,6 +8,7 @@
 
 from pip._internal.configuration import get_configuration_files, kinds
 from pip._internal.exceptions import ConfigurationError
+
 from tests.lib.configuration_helpers import ConfigurationMixin
 
 
diff --git a/tests/unit/test_exceptions.py b/tests/unit/test_exceptions.py
index 12a17dcd1f3..90a44348f0a 100644
--- a/tests/unit/test_exceptions.py
+++ b/tests/unit/test_exceptions.py
@@ -9,6 +9,7 @@
 from typing import Optional, Tuple
 
 import pytest
+
 from pip._vendor import rich
 
 from pip._internal.exceptions import DiagnosticPipError, ExternallyManagedEnvironment
diff --git a/tests/unit/test_finder.py b/tests/unit/test_finder.py
index 35c7e89b765..8c923dcd36f 100644
--- a/tests/unit/test_finder.py
+++ b/tests/unit/test_finder.py
@@ -3,6 +3,7 @@
 from unittest.mock import Mock, patch
 
 import pytest
+
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.tags import Tag
 from pip._vendor.packaging.version import parse as parse_version
@@ -18,6 +19,7 @@
 )
 from pip._internal.models.target_python import TargetPython
 from pip._internal.req.constructors import install_req_from_line
+
 from tests.lib import TestData, make_test_finder
 
 
diff --git a/tests/unit/test_index.py b/tests/unit/test_index.py
index d02c70b260e..8faa4a56a0a 100644
--- a/tests/unit/test_index.py
+++ b/tests/unit/test_index.py
@@ -2,6 +2,7 @@
 from typing import FrozenSet, List, Optional, Set, Tuple
 
 import pytest
+
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.tags import Tag
 
@@ -25,6 +26,7 @@
 from pip._internal.network.session import PipSession
 from pip._internal.utils.compatibility_tags import get_supported
 from pip._internal.utils.hashes import Hashes
+
 from tests.lib import CURRENT_PY_VERSION_INFO
 from tests.lib.index import make_mock_candidate
 
diff --git a/tests/unit/test_models_wheel.py b/tests/unit/test_models_wheel.py
index ee4d88c744a..3156a3ff4bc 100644
--- a/tests/unit/test_models_wheel.py
+++ b/tests/unit/test_models_wheel.py
@@ -1,4 +1,5 @@
 import pytest
+
 from pip._vendor.packaging.tags import Tag
 
 from pip._internal.exceptions import InvalidWheelFilename
diff --git a/tests/unit/test_network_auth.py b/tests/unit/test_network_auth.py
index 86f01e436c0..aec5e513ba5 100644
--- a/tests/unit/test_network_auth.py
+++ b/tests/unit/test_network_auth.py
@@ -8,6 +8,7 @@
 
 import pip._internal.network.auth
 from pip._internal.network.auth import MultiDomainBasicAuth
+
 from tests.lib.requests_mocks import MockConnection, MockRequest, MockResponse
 
 
diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py
index b43b36cd897..6bba8fc670b 100644
--- a/tests/unit/test_network_cache.py
+++ b/tests/unit/test_network_cache.py
@@ -3,9 +3,11 @@
 from unittest.mock import Mock
 
 import pytest
+
 from pip._vendor.cachecontrol.caches import FileCache
 
 from pip._internal.network.cache import SafeFileCache
+
 from tests.lib.filesystem import chmod
 
 
diff --git a/tests/unit/test_network_download.py b/tests/unit/test_network_download.py
index 53200f2e511..14998d229bf 100644
--- a/tests/unit/test_network_download.py
+++ b/tests/unit/test_network_download.py
@@ -10,6 +10,7 @@
     parse_content_disposition,
     sanitize_content_filename,
 )
+
 from tests.lib.requests_mocks import MockResponse
 
 
diff --git a/tests/unit/test_network_lazy_wheel.py b/tests/unit/test_network_lazy_wheel.py
index 356387d2bba..5d97e9e3202 100644
--- a/tests/unit/test_network_lazy_wheel.py
+++ b/tests/unit/test_network_lazy_wheel.py
@@ -1,6 +1,7 @@
 from typing import Iterator
 
 import pytest
+
 from pip._vendor.packaging.version import Version
 
 from pip._internal.exceptions import InvalidWheel
@@ -9,6 +10,7 @@
     dist_from_wheel_url,
 )
 from pip._internal.network.session import PipSession
+
 from tests.lib import TestData
 from tests.lib.server import MockServer, file_response
 
diff --git a/tests/unit/test_network_session.py b/tests/unit/test_network_session.py
index 3f1a596ad8e..fd00d5c606c 100644
--- a/tests/unit/test_network_session.py
+++ b/tests/unit/test_network_session.py
@@ -6,6 +6,7 @@
 from urllib.request import getproxies
 
 import pytest
+
 from pip._vendor import requests
 
 from pip import __version__
diff --git a/tests/unit/test_network_utils.py b/tests/unit/test_network_utils.py
index 1b198c166fc..5911583feec 100644
--- a/tests/unit/test_network_utils.py
+++ b/tests/unit/test_network_utils.py
@@ -2,6 +2,7 @@
 
 from pip._internal.exceptions import NetworkConnectionError
 from pip._internal.network.utils import raise_for_status
+
 from tests.lib.requests_mocks import MockResponse
 
 
diff --git a/tests/unit/test_operations_prepare.py b/tests/unit/test_operations_prepare.py
index d06733e8503..86e26c11801 100644
--- a/tests/unit/test_operations_prepare.py
+++ b/tests/unit/test_operations_prepare.py
@@ -14,6 +14,7 @@
 from pip._internal.network.session import PipSession
 from pip._internal.operations.prepare import unpack_url
 from pip._internal.utils.hashes import Hashes
+
 from tests.lib import TestData
 from tests.lib.requests_mocks import MockResponse
 
diff --git a/tests/unit/test_options.py b/tests/unit/test_options.py
index aee64ccc932..8f3cf7de6a6 100644
--- a/tests/unit/test_options.py
+++ b/tests/unit/test_options.py
@@ -11,6 +11,7 @@
 from pip._internal.commands import create_command
 from pip._internal.commands.configuration import ConfigurationCommand
 from pip._internal.exceptions import PipError
+
 from tests.lib.options_helpers import AddFakeCommandMixin
 
 
diff --git a/tests/unit/test_packaging.py b/tests/unit/test_packaging.py
index 88277448c2c..6b8c4cd37d8 100644
--- a/tests/unit/test_packaging.py
+++ b/tests/unit/test_packaging.py
@@ -1,6 +1,7 @@
 from typing import Optional, Tuple
 
 import pytest
+
 from pip._vendor.packaging import specifiers
 from pip._vendor.packaging.requirements import Requirement
 
diff --git a/tests/unit/test_pep517.py b/tests/unit/test_pep517.py
index b9fcd9d2137..4264bbdcac8 100644
--- a/tests/unit/test_pep517.py
+++ b/tests/unit/test_pep517.py
@@ -7,6 +7,7 @@
 
 from pip._internal.exceptions import InstallationError, InvalidPyProjectBuildRequires
 from pip._internal.req import InstallRequirement
+
 from tests.lib import TestData
 
 
diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py
index 8a95c058706..e243a718725 100644
--- a/tests/unit/test_req.py
+++ b/tests/unit/test_req.py
@@ -10,6 +10,7 @@
 from unittest import mock
 
 import pytest
+
 from pip._vendor.packaging.markers import Marker
 from pip._vendor.packaging.requirements import Requirement
 
@@ -46,6 +47,7 @@
     handle_requirement_line,
 )
 from pip._internal.resolution.legacy.resolver import Resolver
+
 from tests.lib import TestData, make_test_finder, requirements_file, wheel
 
 
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 1ddccdee58e..7593e55d679 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -28,6 +28,7 @@
     preprocess,
 )
 from pip._internal.req.req_install import InstallRequirement
+
 from tests.lib import TestData, make_test_finder, requirements_file
 
 
diff --git a/tests/unit/test_req_install.py b/tests/unit/test_req_install.py
index 22b98f86da2..79828525da4 100644
--- a/tests/unit/test_req_install.py
+++ b/tests/unit/test_req_install.py
@@ -3,6 +3,7 @@
 from pathlib import Path
 
 import pytest
+
 from pip._vendor.packaging.requirements import Requirement
 
 from pip._internal.exceptions import InstallationError
diff --git a/tests/unit/test_req_uninstall.py b/tests/unit/test_req_uninstall.py
index 0523ffd7a07..0372eac9bd9 100644
--- a/tests/unit/test_req_uninstall.py
+++ b/tests/unit/test_req_uninstall.py
@@ -16,6 +16,7 @@
     compress_for_rename,
     uninstallation_paths,
 )
+
 from tests.lib import create_file
 
 
diff --git a/tests/unit/test_resolution_legacy_resolver.py b/tests/unit/test_resolution_legacy_resolver.py
index b2f93b3d4f5..489f678c561 100644
--- a/tests/unit/test_resolution_legacy_resolver.py
+++ b/tests/unit/test_resolution_legacy_resolver.py
@@ -5,6 +5,7 @@
 from unittest import mock
 
 import pytest
+
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName
 
@@ -21,6 +22,7 @@
     Resolver,
     _check_dist_requires_python,
 )
+
 from tests.lib import TestData, make_test_finder
 from tests.lib.index import make_mock_candidate
 
diff --git a/tests/unit/test_self_check_outdated.py b/tests/unit/test_self_check_outdated.py
index 605d9182a09..38ce648a09d 100644
--- a/tests/unit/test_self_check_outdated.py
+++ b/tests/unit/test_self_check_outdated.py
@@ -10,6 +10,7 @@
 
 import pytest
 from freezegun import freeze_time
+
 from pip._vendor.packaging.version import Version
 
 from pip._internal import self_outdated_check
diff --git a/tests/unit/test_target_python.py b/tests/unit/test_target_python.py
index 31df5935ee3..63e77a3d8a9 100644
--- a/tests/unit/test_target_python.py
+++ b/tests/unit/test_target_python.py
@@ -2,9 +2,11 @@
 from unittest import mock
 
 import pytest
+
 from pip._vendor.packaging.tags import Tag
 
 from pip._internal.models.target_python import TargetPython
+
 from tests.lib import CURRENT_PY_VERSION_INFO, pyversion
 
 
diff --git a/tests/unit/test_urls.py b/tests/unit/test_urls.py
index c4b8db681ff..539bf091fb2 100644
--- a/tests/unit/test_urls.py
+++ b/tests/unit/test_urls.py
@@ -5,6 +5,7 @@
 import pytest
 
 from pip._internal.utils.urls import path_to_url, url_to_path
+
 from tests.lib import (
     skip_needs_new_urlun_behavior_win,
     skip_needs_old_urlun_behavior_win,
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index d1e64262de2..6627a89496d 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -15,6 +15,7 @@
 from unittest.mock import Mock, patch
 
 import pytest
+
 from pip._vendor.packaging.requirements import Requirement
 
 from pip._internal.exceptions import HashMismatch, HashMissing, InstallationError
diff --git a/tests/unit/test_utils_unpacking.py b/tests/unit/test_utils_unpacking.py
index e0db5c4ba4a..5f89751311a 100644
--- a/tests/unit/test_utils_unpacking.py
+++ b/tests/unit/test_utils_unpacking.py
@@ -14,6 +14,7 @@
 
 from pip._internal.exceptions import InstallationError
 from pip._internal.utils.unpacking import is_within_directory, untar_file, unzip_file
+
 from tests.lib import TestData
 
 
diff --git a/tests/unit/test_utils_wheel.py b/tests/unit/test_utils_wheel.py
index 4e8e72be64a..b31b51ccae0 100644
--- a/tests/unit/test_utils_wheel.py
+++ b/tests/unit/test_utils_wheel.py
@@ -10,6 +10,7 @@
 
 from pip._internal.exceptions import UnsupportedWheel
 from pip._internal.utils import wheel
+
 from tests.lib import TestData
 
 _ZipDir = Callable[[Path], ZipFile]
diff --git a/tests/unit/test_vcs.py b/tests/unit/test_vcs.py
index 13ef42fc43f..c9a026968f4 100644
--- a/tests/unit/test_vcs.py
+++ b/tests/unit/test_vcs.py
@@ -14,6 +14,7 @@
 from pip._internal.vcs.mercurial import Mercurial
 from pip._internal.vcs.subversion import Subversion
 from pip._internal.vcs.versioncontrol import RevOptions, VersionControl
+
 from tests.lib import is_svn_installed, need_svn
 
 
diff --git a/tests/unit/test_vcs_mercurial.py b/tests/unit/test_vcs_mercurial.py
index d8e8f6cad27..ef52795a513 100644
--- a/tests/unit/test_vcs_mercurial.py
+++ b/tests/unit/test_vcs_mercurial.py
@@ -8,6 +8,7 @@
 
 from pip._internal.utils.misc import hide_url
 from pip._internal.vcs.mercurial import Mercurial
+
 from tests.lib import need_mercurial
 
 
diff --git a/tests/unit/test_wheel.py b/tests/unit/test_wheel.py
index ed6f5821133..7b44a59e4a4 100644
--- a/tests/unit/test_wheel.py
+++ b/tests/unit/test_wheel.py
@@ -12,6 +12,7 @@
 from unittest.mock import patch
 
 import pytest
+
 from pip._vendor.packaging.requirements import Requirement
 
 from pip._internal.exceptions import InstallationError
@@ -32,6 +33,7 @@
 from pip._internal.utils.compat import WINDOWS
 from pip._internal.utils.misc import hash_file
 from pip._internal.utils.unpacking import unpack_file
+
 from tests.lib import DATA_DIR, TestData, assert_paths_equal
 from tests.lib.wheel import make_wheel
 
diff --git a/tests/unit/test_wheel_builder.py b/tests/unit/test_wheel_builder.py
index d5f372dd5cd..a657e900b42 100644
--- a/tests/unit/test_wheel_builder.py
+++ b/tests/unit/test_wheel_builder.py
@@ -11,6 +11,7 @@
 from pip._internal.operations.build.wheel_legacy import format_command_result
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.vcs.git import Git
+
 from tests.lib import _create_test_package
 
 

From 503bd5cae8a78b3a32002798331761b165a677e8 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 21 Sep 2024 21:15:34 -0400
Subject: [PATCH 581/992] NEWS ENTRY

---
 news/12974.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/12974.trivial.rst

diff --git a/news/12974.trivial.rst b/news/12974.trivial.rst
new file mode 100644
index 00000000000..d1c31fb177a
--- /dev/null
+++ b/news/12974.trivial.rst
@@ -0,0 +1 @@
+Create two new import groups, "vendored" and "import", this only affects tests.

From 5d567de48de32709b6df44c4424cb8f816a633b1 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Tue, 24 Sep 2024 17:38:56 -0700
Subject: [PATCH 582/992] Ensure iOS platform tags are correctly normalized.

---
 src/pip/_vendor/packaging/tags.py       | 1 +
 tools/vendoring/patches/packaging.patch | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
index bcc6ea041b7..9880c8aa5f3 100644
--- a/src/pip/_vendor/packaging/tags.py
+++ b/src/pip/_vendor/packaging/tags.py
@@ -505,6 +505,7 @@ def ios_platforms(
 
     if multiarch is None:
         multiarch = sys.implementation._multiarch
+    multiarch = multiarch.replace("-", "_")
 
     ios_platform_template = "ios_{major}_{minor}_{multiarch}"
 
diff --git a/tools/vendoring/patches/packaging.patch b/tools/vendoring/patches/packaging.patch
index e952981068d..a7af0749c5e 100644
--- a/tools/vendoring/patches/packaging.patch
+++ b/tools/vendoring/patches/packaging.patch
@@ -47,7 +47,7 @@ index 6667d2990..bcc6ea041 100644
      else:
          version = version
      if arch is None:
-@@ -483,6 +483,57 @@ def mac_platforms(
+@@ -483,6 +483,58 @@ def mac_platforms(
                  )
 
 
@@ -73,6 +73,7 @@ index 6667d2990..bcc6ea041 100644
 +
 +    if multiarch is None:
 +        multiarch = sys.implementation._multiarch
++    multiarch = multiarch.replace("-", "_")
 +
 +    ios_platform_template = "ios_{major}_{minor}_{multiarch}"
 +

From c28facaadcf92ace8ed098245b613e6d1bd98304 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Tue, 24 Sep 2024 17:42:44 -0700
Subject: [PATCH 583/992] Add patch to distlib to disable simple shebangs on
 cross compiles.

---
 src/pip/_vendor/distlib/scripts.py    |  6 ++++++
 tools/vendoring/patches/distlib.patch | 21 +++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py
index e16292b8330..0982e6b726e 100644
--- a/src/pip/_vendor/distlib/scripts.py
+++ b/src/pip/_vendor/distlib/scripts.py
@@ -164,6 +164,12 @@ def _build_shebang(self, executable, post_interp):
         """
         if os.name != 'posix':
             simple_shebang = True
+        elif getattr(sys, "cross_compiling", False):
+            # In a cross-compiling environment, the shebang will likely be a
+            # script; this *must* be invoked with the "safe" version of the
+            # shebang, or else using os.exec() to run the entry script will
+            # fail, raising "OSError 8 [Errno 8] Exec format error".
+            simple_shebang = False
         else:
             # Add 3 for '#!' prefix and newline suffix.
             shebang_length = len(executable) + len(post_interp) + 3
diff --git a/tools/vendoring/patches/distlib.patch b/tools/vendoring/patches/distlib.patch
index de2834710a3..f8a066bf699 100644
--- a/tools/vendoring/patches/distlib.patch
+++ b/tools/vendoring/patches/distlib.patch
@@ -5,7 +5,7 @@ index cfa45d2af..e16292b83 100644
 @@ -49,6 +49,24 @@ if __name__ == '__main__':
      sys.exit(%(func)s())
  '''
- 
+
 +# Pre-fetch the contents of all executable wrapper stubs.
 +# This is to address https://github.com/pypa/pip/issues/12666.
 +# When updating pip, we rename the old pip in place before installing the
@@ -24,9 +24,22 @@ index cfa45d2af..e16292b83 100644
 +    if r.name.endswith(".exe")
 +}
 +
- 
+
  def enquote_executable(executable):
      if ' ' in executable:
+@@ -164,6 +164,12 @@ class ScriptMaker(object):
+         """
+         if os.name != 'posix':
+             simple_shebang = True
++        elif getattr(sys, "cross_compiling", False):
++            # In a cross-compiling environment, the shebang will likely be a
++            # script; this *must* be invoked with the "safe" version of the
++            # shebang, or else using os.exec() to run the entry script will
++            # fail, raising "OSError 8 [Errno 8] Exec format error".
++            simple_shebang = False
+         else:
+             # Add 3 for '#!' prefix and newline suffix.
+             shebang_length = len(executable) + len(post_interp) + 3
 @@ -409,15 +427,11 @@ class ScriptMaker(object):
                  bits = '32'
              platform_suffix = '-arm' if get_platform() == 'win-arm64' else ''
@@ -42,6 +55,6 @@ index cfa45d2af..e16292b83 100644
                  raise ValueError(msg)
 -            return resource.bytes
 +            return WRAPPERS[name]
- 
+
      # Public API follows
- 
+

From 753742ba3e7d597d1bea43d0f88749d4bbad37c8 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Tue, 24 Sep 2024 17:50:51 -0700
Subject: [PATCH 584/992] Correct pre-commit issue.

---
 tools/vendoring/patches/distlib.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/vendoring/patches/distlib.patch b/tools/vendoring/patches/distlib.patch
index f8a066bf699..962eab1d74f 100644
--- a/tools/vendoring/patches/distlib.patch
+++ b/tools/vendoring/patches/distlib.patch
@@ -55,6 +55,6 @@ index cfa45d2af..e16292b83 100644
                  raise ValueError(msg)
 -            return resource.bytes
 +            return WRAPPERS[name]
-
+ 
      # Public API follows
-
+ 

From ec137f329541765dbca7d027391c860b87496363 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Fri, 27 Sep 2024 11:44:25 -0700
Subject: [PATCH 585/992] Update packaging patch to reflect changes from code
 review.

---
 src/pip/_vendor/packaging/tags.py       | 39 +++++++++-------
 tools/vendoring/patches/packaging.patch | 61 +++++++++++++------------
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
index 9880c8aa5f3..cb11c60b85d 100644
--- a/src/pip/_vendor/packaging/tags.py
+++ b/src/pip/_vendor/packaging/tags.py
@@ -509,30 +509,35 @@ def ios_platforms(
 
     ios_platform_template = "ios_{major}_{minor}_{multiarch}"
 
-    # Consider any major.minor version from iOS 12.0 to the version prior to the
-    # version requested by platform. 12.0 is the first iOS version that is known
-    # to have enough features to support CPython. Consider every possible minor
-    # release up to X.9. There highest the minor has ever gone is 8 (14.8 and
-    # 15.8) but having some extra candidates that won't ever match doesn't
-    # really hurt, and it saves us from having to keep an explicit list of known
-    # iOS versions in the code.
-    for major in range(12, version[0]):
-        for minor in range(0, 10):
-            yield ios_platform_template.format(
-                major=major, minor=minor, multiarch=multiarch
-            )
+    # Consider any iOS major.minor version from the version requested, down to
+    # 12.0. 12.0 is the first iOS version that is known to have enough features
+    # to support CPython. Consider every possible minor release up to X.9. There
+    # highest the minor has ever gone is 8 (14.8 and 15.8) but having some extra
+    # candidates that won't ever match doesn't really hurt, and it saves us from
+    # having to keep an explicit list of known iOS versions in the code. Return
+    # the results descending order of version number.
+
+    # If the requested major version is less than 12, there won't be any matches.
+    if version[0] < 12:
+        return
+
+    # Consider the actual X.Y version that was requested.
+    yield ios_platform_template.format(
+            major=version[0], minor=version[1], multiarch=multiarch
+        )
 
     # Consider every minor version from X.0 to the minor version prior to the
     # version requested by the platform.
-    for minor in range(0, version[1]):
+    for minor in range(version[1] - 1, -1, -1):
         yield ios_platform_template.format(
             major=version[0], minor=minor, multiarch=multiarch
         )
 
-    # Consider the actual X.Y version that was requested.
-    yield ios_platform_template.format(
-        major=version[0], minor=version[1], multiarch=multiarch
-    )
+    for major in range(version[0] - 1, 11, -1):
+        for minor in range(9, -1, -1):
+            yield ios_platform_template.format(
+                major=major, minor=minor, multiarch=multiarch
+            )
 
 
 def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
diff --git a/tools/vendoring/patches/packaging.patch b/tools/vendoring/patches/packaging.patch
index a7af0749c5e..66e57debb0d 100644
--- a/tools/vendoring/patches/packaging.patch
+++ b/tools/vendoring/patches/packaging.patch
@@ -1,28 +1,28 @@
 diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
-index 6667d2990..bcc6ea041 100644
+index 6667d2990..cb11c60b8 100644
 --- a/src/pip/_vendor/packaging/tags.py
 +++ b/src/pip/_vendor/packaging/tags.py
 @@ -25,7 +25,7 @@ from . import _manylinux, _musllinux
  logger = logging.getLogger(__name__)
-
+ 
  PythonVersion = Sequence[int]
 -MacVersion = Tuple[int, int]
 +AppleVersion = Tuple[int, int]
-
+ 
  INTERPRETER_SHORT_NAMES: dict[str, str] = {
      "python": "py",  # Generic.
 @@ -363,7 +363,7 @@ def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str:
      return "i386"
-
-
+ 
+ 
 -def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
 +def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]:
      formats = [cpu_arch]
      if cpu_arch == "x86_64":
          if version < (10, 4):
 @@ -396,7 +396,7 @@ def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
-
-
+ 
+ 
  def mac_platforms(
 -    version: MacVersion | None = None, arch: str | None = None
 +    version: AppleVersion | None = None, arch: str | None = None
@@ -47,10 +47,10 @@ index 6667d2990..bcc6ea041 100644
      else:
          version = version
      if arch is None:
-@@ -483,6 +483,58 @@ def mac_platforms(
+@@ -483,6 +483,63 @@ def mac_platforms(
                  )
-
-
+ 
+ 
 +def ios_platforms(
 +    version: AppleVersion | None = None, multiarch: str | None = None
 +) -> Iterator[str]:
@@ -77,36 +77,41 @@ index 6667d2990..bcc6ea041 100644
 +
 +    ios_platform_template = "ios_{major}_{minor}_{multiarch}"
 +
-+    # Consider any major.minor version from iOS 12.0 to the version prior to the
-+    # version requested by platform. 12.0 is the first iOS version that is known
-+    # to have enough features to support CPython. Consider every possible minor
-+    # release up to X.9. There highest the minor has ever gone is 8 (14.8 and
-+    # 15.8) but having some extra candidates that won't ever match doesn't
-+    # really hurt, and it saves us from having to keep an explicit list of known
-+    # iOS versions in the code.
-+    for major in range(12, version[0]):
-+        for minor in range(0, 10):
-+            yield ios_platform_template.format(
-+                major=major, minor=minor, multiarch=multiarch
-+            )
++    # Consider any iOS major.minor version from the version requested, down to
++    # 12.0. 12.0 is the first iOS version that is known to have enough features
++    # to support CPython. Consider every possible minor release up to X.9. There
++    # highest the minor has ever gone is 8 (14.8 and 15.8) but having some extra
++    # candidates that won't ever match doesn't really hurt, and it saves us from
++    # having to keep an explicit list of known iOS versions in the code. Return
++    # the results descending order of version number.
++
++    # If the requested major version is less than 12, there won't be any matches.
++    if version[0] < 12:
++        return
++
++    # Consider the actual X.Y version that was requested.
++    yield ios_platform_template.format(
++            major=version[0], minor=version[1], multiarch=multiarch
++        )
 +
 +    # Consider every minor version from X.0 to the minor version prior to the
 +    # version requested by the platform.
-+    for minor in range(0, version[1]):
++    for minor in range(version[1] - 1, -1, -1):
 +        yield ios_platform_template.format(
 +            major=version[0], minor=minor, multiarch=multiarch
 +        )
 +
-+    # Consider the actual X.Y version that was requested.
-+    yield ios_platform_template.format(
-+        major=version[0], minor=version[1], multiarch=multiarch
-+    )
++    for major in range(version[0] - 1, 11, -1):
++        for minor in range(9, -1, -1):
++            yield ios_platform_template.format(
++                major=major, minor=minor, multiarch=multiarch
++            )
 +
 +
  def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
      linux = _normalize_string(sysconfig.get_platform())
      if not linux.startswith("linux_"):
-@@ -512,6 +563,8 @@ def platform_tags() -> Iterator[str]:
+@@ -512,6 +569,8 @@ def platform_tags() -> Iterator[str]:
      """
      if platform.system() == "Darwin":
          return mac_platforms()

From 22cc32d654be7e33be19724f7e27d02a187c4cc9 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 27 Sep 2024 21:32:30 -0400
Subject: [PATCH 586/992] Also handle `InvalidVersion`

---
 src/pip/_internal/exceptions.py               | 22 ++++++++++++-------
 .../resolution/resolvelib/candidates.py       |  2 +-
 .../resolution/resolvelib/factory.py          | 16 +++++++++-----
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index bdca1426d54..52a18b14a18 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -15,6 +15,8 @@
 from itertools import chain, groupby, repeat
 from typing import TYPE_CHECKING, Dict, Iterator, List, Literal, Optional, Union
 
+from pip._vendor.packaging.requirements import InvalidRequirement
+from pip._vendor.packaging.version import InvalidVersion
 from pip._vendor.rich.console import Console, ConsoleOptions, RenderResult
 from pip._vendor.rich.markup import escape
 from pip._vendor.rich.text import Text
@@ -22,12 +24,10 @@
 if TYPE_CHECKING:
     from hashlib import _Hash
 
-    from pip._vendor.packaging.requirements import InvalidRequirement
     from pip._vendor.requests.models import Request, Response
 
     from pip._internal.metadata import BaseDistribution
     from pip._internal.req.req_install import InstallRequirement
-    from pip._internal.resolution.resolvelib.candidates import AlreadyInstalledCandidate
 
 logger = logging.getLogger(__name__)
 
@@ -785,19 +785,25 @@ class InvalidInstalledPackage(DiagnosticPipError):
     def __init__(
         self,
         *,
-        package: "AlreadyInstalledCandidate",
-        invalid_req_exc: "InvalidRequirement",
+        dist: "BaseDistribution",
+        invalid_exc: Union[InvalidRequirement, InvalidVersion],
     ) -> None:
-        installed_location = package.dist.installed_location
+        installed_location = dist.installed_location
+
+        if isinstance(invalid_exc, InvalidRequirement):
+            invalid_type = "requirement"
+        else:
+            invalid_type = "version"
+
         super().__init__(
             message=Text(
-                f"Cannot process installed package {package} "
+                f"Cannot process installed package {dist} "
                 + (f"in {installed_location!r} " if installed_location else "")
-                + f"because it has an invalid requirement:\n{invalid_req_exc.args[0]}"
+                + f"because it has an invalid {invalid_type}:\n{invalid_exc.args[0]}"
             ),
             context=(
                 "Starting with pip 24.1, packages with invalid "
-                "requirements can not be processed."
+                f"{invalid_type}s can not be processed."
             ),
             hint_stmt=(
                 "To proceed this package must be uninstalled using 'pip<24.1', "
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index c8a0f6c91a3..6617644fe53 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -404,7 +404,7 @@ def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requiremen
             for r in self.dist.iter_dependencies():
                 yield from self._factory.make_requirements_from_spec(str(r), self._ireq)
         except InvalidRequirement as exc:
-            raise InvalidInstalledPackage(package=self, invalid_req_exc=exc) from None
+            raise InvalidInstalledPackage(dist=self.dist, invalid_exc=exc) from None
 
     def get_install_requirement(self) -> Optional[InstallRequirement]:
         return None
diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
index 145bdbf71a1..dc6e2e12e1f 100644
--- a/src/pip/_internal/resolution/resolvelib/factory.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -23,13 +23,14 @@
 from pip._vendor.packaging.requirements import InvalidRequirement
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
-from pip._vendor.packaging.version import Version
+from pip._vendor.packaging.version import InvalidVersion, Version
 from pip._vendor.resolvelib import ResolutionImpossible
 
 from pip._internal.cache import CacheEntry, WheelCache
 from pip._internal.exceptions import (
     DistributionNotFound,
     InstallationError,
+    InvalidInstalledPackage,
     MetadataInconsistent,
     MetadataInvalid,
     UnsupportedPythonVersion,
@@ -283,10 +284,15 @@ def _get_installed_candidate() -> Optional[Candidate]:
                 installed_dist = self._installed_dists[name]
             except KeyError:
                 return None
-            # Don't use the installed distribution if its version does not fit
-            # the current dependency graph.
-            if not specifier.contains(installed_dist.version, prereleases=True):
-                return None
+
+            try:
+                # Don't use the installed distribution if its version
+                # does not fit the current dependency graph.
+                if not specifier.contains(installed_dist.version, prereleases=True):
+                    return None
+            except InvalidVersion as e:
+                raise InvalidInstalledPackage(dist=installed_dist, invalid_exc=e)
+
             candidate = self._make_candidate_from_dist(
                 dist=installed_dist,
                 extras=extras,

From a3859c1c8271887e83f6bcad38a3e1deec1c2e00 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee 
Date: Tue, 8 Oct 2024 08:20:12 +0800
Subject: [PATCH 587/992] Minor tweak to packaging patch.

---
 src/pip/_vendor/packaging/tags.py       |  4 ++--
 tools/vendoring/patches/packaging.patch | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
index cb11c60b85d..703f0ed53c0 100644
--- a/src/pip/_vendor/packaging/tags.py
+++ b/src/pip/_vendor/packaging/tags.py
@@ -523,8 +523,8 @@ def ios_platforms(
 
     # Consider the actual X.Y version that was requested.
     yield ios_platform_template.format(
-            major=version[0], minor=version[1], multiarch=multiarch
-        )
+        major=version[0], minor=version[1], multiarch=multiarch
+    )
 
     # Consider every minor version from X.0 to the minor version prior to the
     # version requested by the platform.
diff --git a/tools/vendoring/patches/packaging.patch b/tools/vendoring/patches/packaging.patch
index 66e57debb0d..1d109e55f62 100644
--- a/tools/vendoring/patches/packaging.patch
+++ b/tools/vendoring/patches/packaging.patch
@@ -4,25 +4,25 @@ index 6667d2990..cb11c60b8 100644
 +++ b/src/pip/_vendor/packaging/tags.py
 @@ -25,7 +25,7 @@ from . import _manylinux, _musllinux
  logger = logging.getLogger(__name__)
- 
+
  PythonVersion = Sequence[int]
 -MacVersion = Tuple[int, int]
 +AppleVersion = Tuple[int, int]
- 
+
  INTERPRETER_SHORT_NAMES: dict[str, str] = {
      "python": "py",  # Generic.
 @@ -363,7 +363,7 @@ def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str:
      return "i386"
- 
- 
+
+
 -def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
 +def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]:
      formats = [cpu_arch]
      if cpu_arch == "x86_64":
          if version < (10, 4):
 @@ -396,7 +396,7 @@ def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
- 
- 
+
+
  def mac_platforms(
 -    version: MacVersion | None = None, arch: str | None = None
 +    version: AppleVersion | None = None, arch: str | None = None
@@ -49,8 +49,8 @@ index 6667d2990..cb11c60b8 100644
      if arch is None:
 @@ -483,6 +483,63 @@ def mac_platforms(
                  )
- 
- 
+
+
 +def ios_platforms(
 +    version: AppleVersion | None = None, multiarch: str | None = None
 +) -> Iterator[str]:
@@ -91,8 +91,8 @@ index 6667d2990..cb11c60b8 100644
 +
 +    # Consider the actual X.Y version that was requested.
 +    yield ios_platform_template.format(
-+            major=version[0], minor=version[1], multiarch=multiarch
-+        )
++        major=version[0], minor=version[1], multiarch=multiarch
++    )
 +
 +    # Consider every minor version from X.0 to the minor version prior to the
 +    # version requested by the platform.

From 0c4cdf93fa514ecdfe2ee8dd8b3c304c195accbe Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 12 Oct 2024 11:24:42 -0400
Subject: [PATCH 588/992] Break up different exceptions and report specific
 error

---
 src/pip/_internal/models/wheel.py | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index 27a80e92e27..67318ae55a8 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -39,17 +39,15 @@ def __init__(self, filename: str) -> None:
         self.name = wheel_info.group("name").replace("_", "-")
         _version = wheel_info.group("ver")
         if "_" in _version:
-            _version = _version.replace("_", "-")
-
             try:
                 parse_wheel_filename(filename)
-            except (PackagingInvalidWheelName, InvalidVersion):
+            except InvalidVersion as e:
                 deprecated(
                     reason=(
-                        f"Wheel filename {filename!r} uses an invalid filename format, "
-                        f"as the version part {_version!r} is not correctly "
-                        "normalised, and contains an underscore character. Future "
-                        "versions of pip will fail to recognise this wheel."
+                        f"Wheel filename version part {_version!r} is not correctly "
+                        "normalised, and contained an underscore character in the "
+                        "version part. Future versions of pip will fail to recognise "
+                        f"this wheel and report the error: {e.args[0]}."
                     ),
                     replacement=(
                         "rename the wheel to use a correctly normalised "
@@ -59,6 +57,23 @@ def __init__(self, filename: str) -> None:
                     gone_in="25.1",
                     issue=12938,
                 )
+            except PackagingInvalidWheelName as e:
+                deprecated(
+                    reason=(
+                        f"The wheel filename {filename!r} is not correctly normalised. "
+                        "Future versions of pip will fail to recognise this wheel. "
+                        f"and report the error: {e.args[0]}."
+                    ),
+                    replacement=(
+                        "rename the wheel to use a correctly normalised "
+                        "name (this may require updating the version in "
+                        "the project metadata)"
+                    ),
+                    gone_in="25.1",
+                    issue=12938,
+                )
+
+            _version = _version.replace("_", "-")
 
         self.version = _version
         self.build_tag = wheel_info.group("build")

From ea05fc364e7b07d833a81cc583f7a51d366578e0 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 12 Oct 2024 19:33:49 -0400
Subject: [PATCH 589/992] Update docs to reflect 3.13's inclusion in CI

---
 docs/html/development/ci.rst | 30 ++++++++++++++++++++++--------
 docs/html/installation.md    |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/docs/html/development/ci.rst b/docs/html/development/ci.rst
index 2e950232fca..2356e804af4 100644
--- a/docs/html/development/ci.rst
+++ b/docs/html/development/ci.rst
@@ -23,6 +23,7 @@ pip support a variety of Python interpreters:
 - CPython 3.10
 - CPython 3.11
 - CPython 3.12
+- CPython 3.13
 - Latest PyPy3
 
 on different operating systems:
@@ -35,8 +36,9 @@ and on different architectures:
 
 - x64
 - x86
+- arm64 (macOS only)
 
-so 42 hypothetical interpreters.
+so 49 hypothetical interpreters.
 
 
 Checks
@@ -99,6 +101,8 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.12|               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.13|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |  Windows  +----------+-------+---------------+-----------------+
 |           |   x64    | CP3.8 |   GitHub      |   GitHub        |
@@ -107,9 +111,11 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|               |                 |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.11|   GitHub      |   GitHub        |
+|           |          | CP3.11|               |                 |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.12|               |                 |
+|           |          | CP3.12|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.13|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
@@ -123,6 +129,8 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.12|               |                 |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.13|               |                 |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   Linux   +----------+-------+---------------+-----------------+
 |           |   x64    | CP3.8 |   GitHub      |   GitHub        |
@@ -135,17 +143,21 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.12|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.13|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
-|           |  arm64   | CP3.8 |               |                 |
+|           |  arm64   | CP3.8 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |               |                 |
+|           |          | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.10|               |                 |
+|           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.11|               |                 |
+|           |          | CP3.11|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.12|               |                 |
+|           |          | CP3.12|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
+|           |          | CP3.13|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   macOS   +----------+-------+---------------+-----------------+
@@ -159,5 +171,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.12|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
+|           |          | CP3.13|   GitHub      |   GitHub        |
+|           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
diff --git a/docs/html/installation.md b/docs/html/installation.md
index 80a09f39dba..ffc8199ddc2 100644
--- a/docs/html/installation.md
+++ b/docs/html/installation.md
@@ -126,7 +126,7 @@ $ pip install --upgrade pip
 The current version of pip works on:
 
 - Windows, Linux and macOS.
-- CPython 3.8, 3.9, 3.10, 3.11, 3.12, and latest PyPy3.
+- CPython 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, and latest PyPy3.
 
 pip is tested to work on the latest patch version of the Python interpreter,
 for each of the minor versions listed above. Previous patch versions are

From 8191545518845f28b607e05bd9dde40a9c728fc8 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Sun, 13 Oct 2024 12:28:14 +0300
Subject: [PATCH 590/992] Don't test 3.12 on Windows now 3.13 is final

---
 .github/workflows/ci.yml     | 2 +-
 docs/html/development/ci.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 170bd6d8b60..2af281c7027 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -178,7 +178,7 @@ jobs:
           # - "3.9"
           # - "3.10"
           # - "3.11"
-          - "3.12"  # Comment out when 3.13 is final
+          # - "3.12"
           - "3.13"
         group: [1, 2]
 
diff --git a/docs/html/development/ci.rst b/docs/html/development/ci.rst
index 2356e804af4..ef1f7125dfe 100644
--- a/docs/html/development/ci.rst
+++ b/docs/html/development/ci.rst
@@ -113,7 +113,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.11|               |                 |
 |           |          +-------+---------------+-----------------+
-|           |          | CP3.12|   GitHub      |   GitHub        |
+|           |          | CP3.12|               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.13|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+

From e5c307289fc311fca6c677aefdfc9274354d9a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 13 Oct 2024 12:11:07 +0200
Subject: [PATCH 591/992] Postpone removal of #12330

---
 src/pip/_internal/metadata/importlib/_envs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/metadata/importlib/_envs.py b/src/pip/_internal/metadata/importlib/_envs.py
index 70cb7a6009a..4d906fd3149 100644
--- a/src/pip/_internal/metadata/importlib/_envs.py
+++ b/src/pip/_internal/metadata/importlib/_envs.py
@@ -150,7 +150,7 @@ def _emit_egg_deprecation(location: Optional[str]) -> None:
     deprecated(
         reason=f"Loading egg at {location} is deprecated.",
         replacement="to use pip for package installation",
-        gone_in="24.3",
+        gone_in="25.1",
         issue=12330,
     )
 

From ca130c6890cb1a398ef0d2eaf6f6bdd7ab8097f9 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 13 Oct 2024 13:46:08 -0400
Subject: [PATCH 592/992] Clean up PEP 440 wheel filename deprecation language

---
 src/pip/_internal/models/wheel.py | 24 ++++--------------------
 tests/unit/test_models_wheel.py   |  7 +++++++
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index 67318ae55a8..dc5cf255200 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -41,31 +41,15 @@ def __init__(self, filename: str) -> None:
         if "_" in _version:
             try:
                 parse_wheel_filename(filename)
-            except InvalidVersion as e:
-                deprecated(
-                    reason=(
-                        f"Wheel filename version part {_version!r} is not correctly "
-                        "normalised, and contained an underscore character in the "
-                        "version part. Future versions of pip will fail to recognise "
-                        f"this wheel and report the error: {e.args[0]}."
-                    ),
-                    replacement=(
-                        "rename the wheel to use a correctly normalised "
-                        "version part (this may require updating the version "
-                        "in the project metadata)"
-                    ),
-                    gone_in="25.1",
-                    issue=12938,
-                )
             except PackagingInvalidWheelName as e:
                 deprecated(
                     reason=(
-                        f"The wheel filename {filename!r} is not correctly normalised. "
-                        "Future versions of pip will fail to recognise this wheel. "
-                        f"and report the error: {e.args[0]}."
+                        f"Wheel filename {filename!r} is not correctly normalised. "
+                        "Future versions of pip will raise the following error:\n"
+                        f"{e.args[0]}\n\n"
                     ),
                     replacement=(
-                        "rename the wheel to use a correctly normalised "
+                        "to rename the wheel to use a correctly normalised "
                         "name (this may require updating the version in "
                         "the project metadata)"
                     ),
diff --git a/tests/unit/test_models_wheel.py b/tests/unit/test_models_wheel.py
index 0fcd4be874f..e87b2c107a0 100644
--- a/tests/unit/test_models_wheel.py
+++ b/tests/unit/test_models_wheel.py
@@ -201,3 +201,10 @@ def test_version_underscore_conversion(self) -> None:
         with pytest.warns(deprecation.PipDeprecationWarning):
             w = Wheel("simple-0.1_1-py2-none-any.whl")
         assert w.version == "0.1-1"
+
+    def test_invalid_wheel_warning(self) -> None:
+        """
+        Test that wheel with invalid name produces warning
+        """
+        with pytest.warns(deprecation.PipDeprecationWarning):
+            Wheel("six-1.16.0_build1-py3-none-any.whl")

From 64b9dbc0e30558bd068511640a4a07d35fa46741 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 13 Oct 2024 13:49:11 -0400
Subject: [PATCH 593/992] NEWS ENTRY

---
 news/13012.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/13012.trivial.rst

diff --git a/news/13012.trivial.rst b/news/13012.trivial.rst
new file mode 100644
index 00000000000..623523a9e09
--- /dev/null
+++ b/news/13012.trivial.rst
@@ -0,0 +1 @@
+Clean up non PEP 440 wheel filename deprecation language.

From ca302173da7000bfa5ecb85c26c68d3095450dc0 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 13 Oct 2024 13:54:19 -0400
Subject: [PATCH 594/992] Fix linting

---
 src/pip/_internal/models/wheel.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index dc5cf255200..ea8560089d3 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -6,13 +6,10 @@
 from typing import Dict, Iterable, List
 
 from pip._vendor.packaging.tags import Tag
-from pip._vendor.packaging.utils import (
-    InvalidVersion,
-    parse_wheel_filename,
-)
 from pip._vendor.packaging.utils import (
     InvalidWheelFilename as PackagingInvalidWheelName,
 )
+from pip._vendor.packaging.utils import parse_wheel_filename
 
 from pip._internal.exceptions import InvalidWheelFilename
 from pip._internal.utils.deprecation import deprecated

From a31e7d2ecdfb36144fae44a10ae266b78919f8ac Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 13 Oct 2024 13:56:05 -0400
Subject: [PATCH 595/992] Remove InvalidVersion exception catch

---
 src/pip/_internal/index/sources.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pip/_internal/index/sources.py b/src/pip/_internal/index/sources.py
index f4626d71ab4..3dafb30e6eb 100644
--- a/src/pip/_internal/index/sources.py
+++ b/src/pip/_internal/index/sources.py
@@ -6,7 +6,6 @@
 
 from pip._vendor.packaging.utils import (
     InvalidSdistFilename,
-    InvalidVersion,
     InvalidWheelFilename,
     canonicalize_name,
     parse_sdist_filename,
@@ -68,10 +67,10 @@ def _scan_directory(self) -> None:
             # otherwise not worth considering as a package
             try:
                 project_filename = parse_wheel_filename(entry.name)[0]
-            except (InvalidWheelFilename, InvalidVersion):
+            except InvalidWheelFilename:
                 try:
                     project_filename = parse_sdist_filename(entry.name)[0]
-                except (InvalidSdistFilename, InvalidVersion):
+                except InvalidSdistFilename:
                     continue
 
             self._project_name_to_urls[project_filename].append(url)

From 359d8fe316a74ddacfd7643719ef9b86f83bbeb2 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 13 Oct 2024 13:58:26 -0400
Subject: [PATCH 596/992] NEWS ENTRY

---
 news/13013.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/13013.trivial.rst

diff --git a/news/13013.trivial.rst b/news/13013.trivial.rst
new file mode 100644
index 00000000000..75e724363a3
--- /dev/null
+++ b/news/13013.trivial.rst
@@ -0,0 +1 @@
+Remove InvalidVersion exception catch for parse_{sdist,wheel}_filename.

From 4b6311aa4a27c9dcf5b13952f197d8e572e3fb13 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 12 Oct 2024 21:20:43 -0400
Subject: [PATCH 597/992] Upgrade distlib to 0.3.9

---
 news/distlib.vendor.rst               |   1 +
 src/pip/_vendor/distlib/__init__.py   |   2 +-
 src/pip/_vendor/distlib/compat.py     |   3 +-
 src/pip/_vendor/distlib/database.py   |  90 +++++--------
 src/pip/_vendor/distlib/locators.py   | 122 ++++++++---------
 src/pip/_vendor/distlib/markers.py    |  19 +--
 src/pip/_vendor/distlib/metadata.py   | 181 ++++++++++----------------
 src/pip/_vendor/distlib/scripts.py    |  85 +++++-------
 src/pip/_vendor/distlib/util.py       | 123 ++++++-----------
 src/pip/_vendor/distlib/version.py    |   3 +-
 src/pip/_vendor/distlib/wheel.py      | 129 +++++++++---------
 src/pip/_vendor/vendor.txt            |   2 +-
 tools/vendoring/patches/distlib.patch |  60 ---------
 13 files changed, 307 insertions(+), 513 deletions(-)
 create mode 100644 news/distlib.vendor.rst
 delete mode 100644 tools/vendoring/patches/distlib.patch

diff --git a/news/distlib.vendor.rst b/news/distlib.vendor.rst
new file mode 100644
index 00000000000..428113e8b67
--- /dev/null
+++ b/news/distlib.vendor.rst
@@ -0,0 +1 @@
+Upgrade distlib to 0.3.9
diff --git a/src/pip/_vendor/distlib/__init__.py b/src/pip/_vendor/distlib/__init__.py
index e999438fe94..bf0d6c6d30e 100644
--- a/src/pip/_vendor/distlib/__init__.py
+++ b/src/pip/_vendor/distlib/__init__.py
@@ -6,7 +6,7 @@
 #
 import logging
 
-__version__ = '0.3.8'
+__version__ = '0.3.9'
 
 
 class DistlibException(Exception):
diff --git a/src/pip/_vendor/distlib/compat.py b/src/pip/_vendor/distlib/compat.py
index e93dc27a3eb..ca561dd2e37 100644
--- a/src/pip/_vendor/distlib/compat.py
+++ b/src/pip/_vendor/distlib/compat.py
@@ -217,8 +217,7 @@ def which(cmd, mode=os.F_OK | os.X_OK, path=None):
         # Additionally check that `file` is not a directory, as on Windows
         # directories pass the os.access check.
         def _access_check(fn, mode):
-            return (os.path.exists(fn) and os.access(fn, mode)
-                    and not os.path.isdir(fn))
+            return (os.path.exists(fn) and os.access(fn, mode) and not os.path.isdir(fn))
 
         # If we're given a path with a directory part, look it up directly rather
         # than referring to PATH directories. This includes checking relative to the
diff --git a/src/pip/_vendor/distlib/database.py b/src/pip/_vendor/distlib/database.py
index eb3765f193b..c0f896a7d85 100644
--- a/src/pip/_vendor/distlib/database.py
+++ b/src/pip/_vendor/distlib/database.py
@@ -20,14 +20,12 @@
 from . import DistlibException, resources
 from .compat import StringIO
 from .version import get_scheme, UnsupportedVersionError
-from .metadata import (Metadata, METADATA_FILENAME, WHEEL_METADATA_FILENAME,
-                       LEGACY_METADATA_FILENAME)
-from .util import (parse_requirement, cached_property, parse_name_and_version,
-                   read_exports, write_exports, CSVReader, CSVWriter)
+from .metadata import (Metadata, METADATA_FILENAME, WHEEL_METADATA_FILENAME, LEGACY_METADATA_FILENAME)
+from .util import (parse_requirement, cached_property, parse_name_and_version, read_exports, write_exports, CSVReader,
+                   CSVWriter)
 
 __all__ = [
-    'Distribution', 'BaseInstalledDistribution', 'InstalledDistribution',
-    'EggInfoDistribution', 'DistributionPath'
+    'Distribution', 'BaseInstalledDistribution', 'InstalledDistribution', 'EggInfoDistribution', 'DistributionPath'
 ]
 
 logger = logging.getLogger(__name__)
@@ -35,8 +33,7 @@
 EXPORTS_FILENAME = 'pydist-exports.json'
 COMMANDS_FILENAME = 'pydist-commands.json'
 
-DIST_FILES = ('INSTALLER', METADATA_FILENAME, 'RECORD', 'REQUESTED',
-              'RESOURCES', EXPORTS_FILENAME, 'SHARED')
+DIST_FILES = ('INSTALLER', METADATA_FILENAME, 'RECORD', 'REQUESTED', 'RESOURCES', EXPORTS_FILENAME, 'SHARED')
 
 DISTINFO_EXT = '.dist-info'
 
@@ -134,13 +131,9 @@ def _yield_distributions(self):
                     continue
                 try:
                     if self._include_dist and entry.endswith(DISTINFO_EXT):
-                        possible_filenames = [
-                            METADATA_FILENAME, WHEEL_METADATA_FILENAME,
-                            LEGACY_METADATA_FILENAME
-                        ]
+                        possible_filenames = [METADATA_FILENAME, WHEEL_METADATA_FILENAME, LEGACY_METADATA_FILENAME]
                         for metadata_filename in possible_filenames:
-                            metadata_path = posixpath.join(
-                                entry, metadata_filename)
+                            metadata_path = posixpath.join(entry, metadata_filename)
                             pydist = finder.find(metadata_path)
                             if pydist:
                                 break
@@ -148,15 +141,11 @@ def _yield_distributions(self):
                             continue
 
                         with contextlib.closing(pydist.as_stream()) as stream:
-                            metadata = Metadata(fileobj=stream,
-                                                scheme='legacy')
+                            metadata = Metadata(fileobj=stream, scheme='legacy')
                         logger.debug('Found %s', r.path)
                         seen.add(r.path)
-                        yield new_dist_class(r.path,
-                                             metadata=metadata,
-                                             env=self)
-                    elif self._include_egg and entry.endswith(
-                            ('.egg-info', '.egg')):
+                        yield new_dist_class(r.path, metadata=metadata, env=self)
+                    elif self._include_egg and entry.endswith(('.egg-info', '.egg')):
                         logger.debug('Found %s', r.path)
                         seen.add(r.path)
                         yield old_dist_class(r.path, self)
@@ -274,8 +263,7 @@ def provides_distribution(self, name, version=None):
             try:
                 matcher = self._scheme.matcher('%s (%s)' % (name, version))
             except ValueError:
-                raise DistlibException('invalid name or version: %r, %r' %
-                                       (name, version))
+                raise DistlibException('invalid name or version: %r, %r' % (name, version))
 
         for dist in self.get_distributions():
             # We hit a problem on Travis where enum34 was installed and doesn't
@@ -390,10 +378,8 @@ def provides(self):
     def _get_requirements(self, req_attr):
         md = self.metadata
         reqts = getattr(md, req_attr)
-        logger.debug('%s: got requirements %r from metadata: %r', self.name,
-                     req_attr, reqts)
-        return set(
-            md.get_requirements(reqts, extras=self.extras, env=self.context))
+        logger.debug('%s: got requirements %r from metadata: %r', self.name, req_attr, reqts)
+        return set(md.get_requirements(reqts, extras=self.extras, env=self.context))
 
     @property
     def run_requires(self):
@@ -469,8 +455,7 @@ def __eq__(self, other):
         if type(other) is not type(self):
             result = False
         else:
-            result = (self.name == other.name and self.version == other.version
-                      and self.source_url == other.source_url)
+            result = (self.name == other.name and self.version == other.version and self.source_url == other.source_url)
         return result
 
     def __hash__(self):
@@ -561,8 +546,7 @@ def __init__(self, path, metadata=None, env=None):
             if r is None:
                 r = finder.find(LEGACY_METADATA_FILENAME)
             if r is None:
-                raise ValueError('no %s found in %s' %
-                                 (METADATA_FILENAME, path))
+                raise ValueError('no %s found in %s' % (METADATA_FILENAME, path))
             with contextlib.closing(r.as_stream()) as stream:
                 metadata = Metadata(fileobj=stream, scheme='legacy')
 
@@ -580,8 +564,7 @@ def __init__(self, path, metadata=None, env=None):
             self.modules = data.splitlines()
 
     def __repr__(self):
-        return '' % (
-            self.name, self.version, self.path)
+        return '' % (self.name, self.version, self.path)
 
     def __str__(self):
         return "%s %s" % (self.name, self.version)
@@ -703,8 +686,7 @@ def write_installed_files(self, paths, prefix, dry_run=False):
                     size = '%d' % os.path.getsize(path)
                     with open(path, 'rb') as fp:
                         hash_value = self.get_hash(fp.read())
-                if path.startswith(base) or (base_under_prefix
-                                             and path.startswith(prefix)):
+                if path.startswith(base) or (base_under_prefix and path.startswith(prefix)):
                     path = os.path.relpath(path, base)
                 writer.writerow((path, hash_value, size))
 
@@ -746,8 +728,7 @@ def check_installed_files(self):
                     with open(path, 'rb') as f:
                         actual_hash = self.get_hash(f.read(), hasher)
                         if actual_hash != hash_value:
-                            mismatches.append(
-                                (path, 'hash', hash_value, actual_hash))
+                            mismatches.append((path, 'hash', hash_value, actual_hash))
         return mismatches
 
     @cached_property
@@ -829,9 +810,8 @@ def get_distinfo_file(self, path):
             # it's an absolute path?
             distinfo_dirname, path = path.split(os.sep)[-2:]
             if distinfo_dirname != self.path.split(os.sep)[-1]:
-                raise DistlibException(
-                    'dist-info file %r does not belong to the %r %s '
-                    'distribution' % (path, self.name, self.version))
+                raise DistlibException('dist-info file %r does not belong to the %r %s '
+                                       'distribution' % (path, self.name, self.version))
 
         # The file must be relative
         if path not in DIST_FILES:
@@ -857,8 +837,7 @@ def list_distinfo_files(self):
                 yield path
 
     def __eq__(self, other):
-        return (isinstance(other, InstalledDistribution)
-                and self.path == other.path)
+        return (isinstance(other, InstalledDistribution) and self.path == other.path)
 
     # See http://docs.python.org/reference/datamodel#object.__hash__
     __hash__ = object.__hash__
@@ -911,8 +890,7 @@ def parse_requires_data(data):
                 if not line:  # pragma: no cover
                     continue
                 if line.startswith('['):  # pragma: no cover
-                    logger.warning(
-                        'Unexpected line: quitting requirement scan: %r', line)
+                    logger.warning('Unexpected line: quitting requirement scan: %r', line)
                     break
                 r = parse_requirement(line)
                 if not r:  # pragma: no cover
@@ -954,13 +932,11 @@ def parse_requires_path(req_path):
             else:
                 # FIXME handle the case where zipfile is not available
                 zipf = zipimport.zipimporter(path)
-                fileobj = StringIO(
-                    zipf.get_data('EGG-INFO/PKG-INFO').decode('utf8'))
+                fileobj = StringIO(zipf.get_data('EGG-INFO/PKG-INFO').decode('utf8'))
                 metadata = Metadata(fileobj=fileobj, scheme='legacy')
                 try:
                     data = zipf.get_data('EGG-INFO/requires.txt')
-                    tl_data = zipf.get_data('EGG-INFO/top_level.txt').decode(
-                        'utf-8')
+                    tl_data = zipf.get_data('EGG-INFO/top_level.txt').decode('utf-8')
                     requires = parse_requires_data(data.decode('utf-8'))
                 except IOError:
                     requires = None
@@ -990,8 +966,7 @@ def parse_requires_path(req_path):
         return metadata
 
     def __repr__(self):
-        return '' % (self.name, self.version,
-                                                      self.path)
+        return '' % (self.name, self.version, self.path)
 
     def __str__(self):
         return "%s %s" % (self.name, self.version)
@@ -1083,8 +1058,7 @@ def list_distinfo_files(self, absolute=False):
                                 yield line
 
     def __eq__(self, other):
-        return (isinstance(other, EggInfoDistribution)
-                and self.path == other.path)
+        return (isinstance(other, EggInfoDistribution) and self.path == other.path)
 
     # See http://docs.python.org/reference/datamodel#object.__hash__
     __hash__ = object.__hash__
@@ -1184,8 +1158,7 @@ def to_dot(self, f, skip_disconnected=True):
                 disconnected.append(dist)
             for other, label in adjs:
                 if label is not None:
-                    f.write('"%s" -> "%s" [label="%s"]\n' %
-                            (dist.name, other.name, label))
+                    f.write('"%s" -> "%s" [label="%s"]\n' % (dist.name, other.name, label))
                 else:
                     f.write('"%s" -> "%s"\n' % (dist.name, other.name))
         if not skip_disconnected and len(disconnected) > 0:
@@ -1225,8 +1198,7 @@ def topological_sort(self):
             # Remove from the adjacency list of others
             for k, v in alist.items():
                 alist[k] = [(d, r) for d, r in v if d not in to_remove]
-            logger.debug('Moving to result: %s',
-                         ['%s (%s)' % (d.name, d.version) for d in to_remove])
+            logger.debug('Moving to result: %s', ['%s (%s)' % (d.name, d.version) for d in to_remove])
             result.extend(to_remove)
         return result, list(alist.keys())
 
@@ -1261,15 +1233,13 @@ def make_graph(dists, scheme='default'):
 
     # now make the edges
     for dist in dists:
-        requires = (dist.run_requires | dist.meta_requires
-                    | dist.build_requires | dist.dev_requires)
+        requires = (dist.run_requires | dist.meta_requires | dist.build_requires | dist.dev_requires)
         for req in requires:
             try:
                 matcher = scheme.matcher(req)
             except UnsupportedVersionError:
                 # XXX compat-mode if cannot read the version
-                logger.warning('could not read version %r - using name only',
-                               req)
+                logger.warning('could not read version %r - using name only', req)
                 name = req.split()[0]
                 matcher = scheme.matcher(name)
 
diff --git a/src/pip/_vendor/distlib/locators.py b/src/pip/_vendor/distlib/locators.py
index f9f0788fc2a..222c1bf3e90 100644
--- a/src/pip/_vendor/distlib/locators.py
+++ b/src/pip/_vendor/distlib/locators.py
@@ -19,15 +19,12 @@
 import zlib
 
 from . import DistlibException
-from .compat import (urljoin, urlparse, urlunparse, url2pathname, pathname2url,
-                     queue, quote, unescape, build_opener,
-                     HTTPRedirectHandler as BaseRedirectHandler, text_type,
-                     Request, HTTPError, URLError)
+from .compat import (urljoin, urlparse, urlunparse, url2pathname, pathname2url, queue, quote, unescape, build_opener,
+                     HTTPRedirectHandler as BaseRedirectHandler, text_type, Request, HTTPError, URLError)
 from .database import Distribution, DistributionPath, make_dist
 from .metadata import Metadata, MetadataInvalidError
-from .util import (cached_property, ensure_slash, split_filename, get_project_data,
-                   parse_requirement, parse_name_and_version, ServerProxy,
-                   normalize_name)
+from .util import (cached_property, ensure_slash, split_filename, get_project_data, parse_requirement,
+                   parse_name_and_version, ServerProxy, normalize_name)
 from .version import get_scheme, UnsupportedVersionError
 from .wheel import Wheel, is_compatible
 
@@ -58,6 +55,7 @@ class RedirectHandler(BaseRedirectHandler):
     """
     A class to work around a bug in some Python 3.2.x releases.
     """
+
     # There's a bug in the base version for some 3.2.x
     # (e.g. 3.2.2 on Ubuntu Oneiric). If a Location header
     # returns e.g. /abc, it bails because it says the scheme ''
@@ -80,8 +78,7 @@ def http_error_302(self, req, fp, code, msg, headers):
                 headers.replace_header(key, newurl)
             else:
                 headers[key] = newurl
-        return BaseRedirectHandler.http_error_302(self, req, fp, code, msg,
-                                                  headers)
+        return BaseRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
 
     http_error_301 = http_error_303 = http_error_307 = http_error_302
 
@@ -92,7 +89,7 @@ class Locator(object):
     """
     source_extensions = ('.tar.gz', '.tar.bz2', '.tar', '.zip', '.tgz', '.tbz')
     binary_extensions = ('.egg', '.exe', '.whl')
-    excluded_extensions = ('.pdf',)
+    excluded_extensions = ('.pdf', )
 
     # A list of tags indicating which wheels you want to match. The default
     # value of None matches against the tags compatible with the running
@@ -100,7 +97,7 @@ class Locator(object):
     # instance to a list of tuples (pyver, abi, arch) which you want to match.
     wheel_tags = None
 
-    downloadable_extensions = source_extensions + ('.whl',)
+    downloadable_extensions = source_extensions + ('.whl', )
 
     def __init__(self, scheme='default'):
         """
@@ -200,8 +197,7 @@ def score_url(self, url):
         is_downloadable = basename.endswith(self.downloadable_extensions)
         if is_wheel:
             compatible = is_compatible(Wheel(basename), self.wheel_tags)
-        return (t.scheme == 'https', 'pypi.org' in t.netloc,
-                is_downloadable, is_wheel, compatible, basename)
+        return (t.scheme == 'https', 'pypi.org' in t.netloc, is_downloadable, is_wheel, compatible, basename)
 
     def prefer_url(self, url1, url2):
         """
@@ -239,14 +235,14 @@ def convert_url_to_download_info(self, url, project_name):
         If it is, a dictionary is returned with keys "name", "version",
         "filename" and "url"; otherwise, None is returned.
         """
+
         def same_project(name1, name2):
             return normalize_name(name1) == normalize_name(name2)
 
         result = None
         scheme, netloc, path, params, query, frag = urlparse(url)
         if frag.lower().startswith('egg='):  # pragma: no cover
-            logger.debug('%s: version hint in fragment: %r',
-                         project_name, frag)
+            logger.debug('%s: version hint in fragment: %r', project_name, frag)
         m = HASHER_HASH.match(frag)
         if m:
             algo, digest = m.groups()
@@ -270,10 +266,8 @@ def same_project(name1, name2):
                             'name': wheel.name,
                             'version': wheel.version,
                             'filename': wheel.filename,
-                            'url': urlunparse((scheme, netloc, origpath,
-                                               params, query, '')),
-                            'python-version': ', '.join(
-                                ['.'.join(list(v[2:])) for v in wheel.pyver]),
+                            'url': urlunparse((scheme, netloc, origpath, params, query, '')),
+                            'python-version': ', '.join(['.'.join(list(v[2:])) for v in wheel.pyver]),
                         }
             except Exception:  # pragma: no cover
                 logger.warning('invalid path for wheel: %s', path)
@@ -294,8 +288,7 @@ def same_project(name1, name2):
                                 'name': name,
                                 'version': version,
                                 'filename': filename,
-                                'url': urlunparse((scheme, netloc, origpath,
-                                                   params, query, '')),
+                                'url': urlunparse((scheme, netloc, origpath, params, query, '')),
                             }
                             if pyver:  # pragma: no cover
                                 result['python-version'] = pyver
@@ -371,7 +364,7 @@ def locate(self, requirement, prereleases=False):
         self.matcher = matcher = scheme.matcher(r.requirement)
         logger.debug('matcher: %s (%s)', matcher, type(matcher).__name__)
         versions = self.get_project(r.name)
-        if len(versions) > 2:   # urls and digests keys are present
+        if len(versions) > 2:  # urls and digests keys are present
             # sometimes, versions are invalid
             slist = []
             vcls = matcher.version_class
@@ -412,6 +405,7 @@ class PyPIRPCLocator(Locator):
     This locator uses XML-RPC to locate distributions. It therefore
     cannot be used with simple mirrors (that only mirror file content).
     """
+
     def __init__(self, url, **kwargs):
         """
         Initialise an instance.
@@ -461,6 +455,7 @@ class PyPIJSONLocator(Locator):
     This locator uses PyPI's JSON interface. It's very limited in functionality
     and probably not worth using.
     """
+
     def __init__(self, url, **kwargs):
         super(PyPIJSONLocator, self).__init__(**kwargs)
         self.base_url = ensure_slash(url)
@@ -498,7 +493,7 @@ def _get_project(self, name):
             # Now get other releases
             for version, infos in d['releases'].items():
                 if version == md.version:
-                    continue    # already done
+                    continue  # already done
                 omd = Metadata(scheme=self.scheme)
                 omd.name = md.name
                 omd.version = version
@@ -511,6 +506,8 @@ def _get_project(self, name):
                     odist.digests[url] = self._get_digest(info)
                     result['urls'].setdefault(version, set()).add(url)
                     result['digests'][url] = self._get_digest(info)
+
+
 #            for info in urls:
 #                md.source_url = info['url']
 #                dist.digest = self._get_digest(info)
@@ -534,7 +531,8 @@ class Page(object):
     # or immediately followed by a "rel" attribute. The attribute values can be
     # declared with double quotes, single quotes or no quotes - which leads to
     # the length of the expression.
-    _href = re.compile("""
+    _href = re.compile(
+        """
 (rel\\s*=\\s*(?:"(?P[^"]*)"|'(?P[^']*)'|(?P[^>\\s\n]*))\\s+)?
 href\\s*=\\s*(?:"(?P[^"]*)"|'(?P[^']*)'|(?P[^>\\s\n]*))
 (\\s+rel\\s*=\\s*(?:"(?P[^"]*)"|'(?P[^']*)'|(?P[^>\\s\n]*)))?
@@ -561,17 +559,16 @@ def links(self):
         about their "rel" attribute, for determining which ones to treat as
         downloads and which ones to queue for further scraping.
         """
+
         def clean(url):
             "Tidy up an URL."
             scheme, netloc, path, params, query, frag = urlparse(url)
-            return urlunparse((scheme, netloc, quote(path),
-                               params, query, frag))
+            return urlunparse((scheme, netloc, quote(path), params, query, frag))
 
         result = set()
         for match in self._href.finditer(self.data):
             d = match.groupdict('')
-            rel = (d['rel1'] or d['rel2'] or d['rel3'] or
-                   d['rel4'] or d['rel5'] or d['rel6'])
+            rel = (d['rel1'] or d['rel2'] or d['rel3'] or d['rel4'] or d['rel5'] or d['rel6'])
             url = d['url1'] or d['url2'] or d['url3']
             url = urljoin(self.base_url, url)
             url = unescape(url)
@@ -645,7 +642,7 @@ def _wait_threads(self):
         # Note that you need two loops, since you can't say which
         # thread will get each sentinel
         for t in self._threads:
-            self._to_fetch.put(None)    # sentinel
+            self._to_fetch.put(None)  # sentinel
         for t in self._threads:
             t.join()
         self._threads = []
@@ -693,7 +690,7 @@ def _process_download(self, url):
             info = self.convert_url_to_download_info(url, self.project_name)
         logger.debug('process_download: %s -> %s', url, info)
         if info:
-            with self._lock:    # needed because self.result is shared
+            with self._lock:  # needed because self.result is shared
                 self._update_version_data(self.result, info)
         return info
 
@@ -703,8 +700,7 @@ def _should_queue(self, link, referrer, rel):
         particular "rel" attribute should be queued for scraping.
         """
         scheme, netloc, path, _, _, _ = urlparse(link)
-        if path.endswith(self.source_extensions + self.binary_extensions +
-                         self.excluded_extensions):
+        if path.endswith(self.source_extensions + self.binary_extensions + self.excluded_extensions):
             result = False
         elif self.skip_externals and not link.startswith(self.base_url):
             result = False
@@ -722,8 +718,7 @@ def _should_queue(self, link, referrer, rel):
                 result = False
             else:
                 result = True
-        logger.debug('should_queue: %s (%s) from %s -> %s', link, rel,
-                     referrer, result)
+        logger.debug('should_queue: %s (%s) from %s -> %s', link, rel, referrer, result)
         return result
 
     def _fetch(self):
@@ -738,14 +733,13 @@ def _fetch(self):
             try:
                 if url:
                     page = self.get_page(url)
-                    if page is None:    # e.g. after an error
+                    if page is None:  # e.g. after an error
                         continue
                     for link, rel in page.links:
                         if link not in self._seen:
                             try:
                                 self._seen.add(link)
-                                if (not self._process_download(link) and
-                                        self._should_queue(link, url, rel)):
+                                if (not self._process_download(link) and self._should_queue(link, url, rel)):
                                     logger.debug('Queueing %s from %s', link, url)
                                     self._to_fetch.put(link)
                             except MetadataInvalidError:  # e.g. invalid versions
@@ -793,7 +787,7 @@ def get_page(self, url):
                         data = resp.read()
                         encoding = headers.get('Content-Encoding')
                         if encoding:
-                            decoder = self.decoders[encoding]   # fail if not found
+                            decoder = self.decoders[encoding]  # fail if not found
                             data = decoder(data)
                         encoding = 'utf-8'
                         m = CHARSET.search(content_type)
@@ -802,7 +796,7 @@ def get_page(self, url):
                         try:
                             data = data.decode(encoding)
                         except UnicodeError:  # pragma: no cover
-                            data = data.decode('latin-1')    # fallback
+                            data = data.decode('latin-1')  # fallback
                         result = Page(data, final_url)
                         self._page_cache[final_url] = result
                 except HTTPError as e:
@@ -815,7 +809,7 @@ def get_page(self, url):
                 except Exception as e:  # pragma: no cover
                     logger.exception('Fetch failed: %s: %s', url, e)
                 finally:
-                    self._page_cache[url] = result   # even if None (failure)
+                    self._page_cache[url] = result  # even if None (failure)
         return result
 
     _distname_re = re.compile(']*>([^<]+)<')
@@ -869,9 +863,7 @@ def _get_project(self, name):
             for fn in files:
                 if self.should_include(fn, root):
                     fn = os.path.join(root, fn)
-                    url = urlunparse(('file', '',
-                                      pathname2url(os.path.abspath(fn)),
-                                      '', '', ''))
+                    url = urlunparse(('file', '', pathname2url(os.path.abspath(fn)), '', '', ''))
                     info = self.convert_url_to_download_info(url, name)
                     if info:
                         self._update_version_data(result, info)
@@ -888,9 +880,7 @@ def get_distribution_names(self):
             for fn in files:
                 if self.should_include(fn, root):
                     fn = os.path.join(root, fn)
-                    url = urlunparse(('file', '',
-                                      pathname2url(os.path.abspath(fn)),
-                                      '', '', ''))
+                    url = urlunparse(('file', '', pathname2url(os.path.abspath(fn)), '', '', ''))
                     info = self.convert_url_to_download_info(url, None)
                     if info:
                         result.add(info['name'])
@@ -906,6 +896,7 @@ class JSONLocator(Locator):
     require archive downloads before dependencies can be determined! As you
     might imagine, that can be slow.
     """
+
     def get_distribution_names(self):
         """
         Return all the distribution names known to this locator.
@@ -922,9 +913,9 @@ def _get_project(self, name):
                 # We don't store summary in project metadata as it makes
                 # the data bigger for no benefit during dependency
                 # resolution
-                dist = make_dist(data['name'], info['version'],
-                                 summary=data.get('summary',
-                                                  'Placeholder for summary'),
+                dist = make_dist(data['name'],
+                                 info['version'],
+                                 summary=data.get('summary', 'Placeholder for summary'),
                                  scheme=self.scheme)
                 md = dist.metadata
                 md.source_url = info['url']
@@ -943,6 +934,7 @@ class DistPathLocator(Locator):
     This locator finds installed distributions in a path. It can be useful for
     adding to an :class:`AggregatingLocator`.
     """
+
     def __init__(self, distpath, **kwargs):
         """
         Initialise an instance.
@@ -960,8 +952,12 @@ def _get_project(self, name):
         else:
             result = {
                 dist.version: dist,
-                'urls': {dist.version: set([dist.source_url])},
-                'digests': {dist.version: set([None])}
+                'urls': {
+                    dist.version: set([dist.source_url])
+                },
+                'digests': {
+                    dist.version: set([None])
+                }
             }
         return result
 
@@ -970,6 +966,7 @@ class AggregatingLocator(Locator):
     """
     This class allows you to chain and/or merge a list of locators.
     """
+
     def __init__(self, *locators, **kwargs):
         """
         Initialise an instance.
@@ -1058,10 +1055,9 @@ def get_distribution_names(self):
 # We use a legacy scheme simply because most of the dists on PyPI use legacy
 # versions which don't conform to PEP 440.
 default_locator = AggregatingLocator(
-                    # JSONLocator(), # don't use as PEP 426 is withdrawn
-                    SimpleScrapingLocator('https://pypi.org/simple/',
-                                          timeout=3.0),
-                    scheme='legacy')
+    # JSONLocator(), # don't use as PEP 426 is withdrawn
+    SimpleScrapingLocator('https://pypi.org/simple/', timeout=3.0),
+    scheme='legacy')
 
 locate = default_locator.locate
 
@@ -1137,7 +1133,7 @@ def find_providers(self, reqt):
         :return: A set of distribution which can fulfill the requirement.
         """
         matcher = self.get_matcher(reqt)
-        name = matcher.key   # case-insensitive
+        name = matcher.key  # case-insensitive
         result = set()
         provided = self.provided
         if name in provided:
@@ -1179,8 +1175,7 @@ def try_to_replace(self, provider, other, problems):
                 unmatched.add(s)
         if unmatched:
             # can't replace other with provider
-            problems.add(('cantreplace', provider, other,
-                          frozenset(unmatched)))
+            problems.add(('cantreplace', provider, other, frozenset(unmatched)))
             result = False
         else:
             # can replace other with provider
@@ -1233,8 +1228,7 @@ def find(self, requirement, meta_extras=None, prereleases=False):
             dist = odist = requirement
             logger.debug('passed %s as requirement', odist)
         else:
-            dist = odist = self.locator.locate(requirement,
-                                               prereleases=prereleases)
+            dist = odist = self.locator.locate(requirement, prereleases=prereleases)
             if dist is None:
                 raise DistlibException('Unable to locate %r' % requirement)
             logger.debug('located %s', odist)
@@ -1244,7 +1238,7 @@ def find(self, requirement, meta_extras=None, prereleases=False):
         install_dists = set([odist])
         while todo:
             dist = todo.pop()
-            name = dist.key     # case-insensitive
+            name = dist.key  # case-insensitive
             if name not in self.dists_by_name:
                 self.add_distribution(dist)
             else:
@@ -1281,8 +1275,7 @@ def find(self, requirement, meta_extras=None, prereleases=False):
                         providers.add(provider)
                         if r in ireqts and dist in install_dists:
                             install_dists.add(provider)
-                            logger.debug('Adding %s to install_dists',
-                                         provider.name_and_version)
+                            logger.debug('Adding %s to install_dists', provider.name_and_version)
                 for p in providers:
                     name = p.key
                     if name not in self.dists_by_name:
@@ -1297,7 +1290,6 @@ def find(self, requirement, meta_extras=None, prereleases=False):
         for dist in dists:
             dist.build_time_dependency = dist not in install_dists
             if dist.build_time_dependency:
-                logger.debug('%s is a build-time dependency only.',
-                             dist.name_and_version)
+                logger.debug('%s is a build-time dependency only.', dist.name_and_version)
         logger.debug('find done for %s', odist)
         return dists, problems
diff --git a/src/pip/_vendor/distlib/markers.py b/src/pip/_vendor/distlib/markers.py
index 1514d460e70..3f5632be47c 100644
--- a/src/pip/_vendor/distlib/markers.py
+++ b/src/pip/_vendor/distlib/markers.py
@@ -23,8 +23,7 @@
 
 __all__ = ['interpret']
 
-_VERSION_PATTERN = re.compile(
-    r'((\d+(\.\d+)*\w*)|\'(\d+(\.\d+)*\w*)\'|\"(\d+(\.\d+)*\w*)\")')
+_VERSION_PATTERN = re.compile(r'((\d+(\.\d+)*\w*)|\'(\d+(\.\d+)*\w*)\'|\"(\d+(\.\d+)*\w*)\")')
 _VERSION_MARKERS = {'python_version', 'python_full_version'}
 
 
@@ -82,13 +81,12 @@ def evaluate(self, expr, context):
             elhs = expr['lhs']
             erhs = expr['rhs']
             if _is_literal(expr['lhs']) and _is_literal(expr['rhs']):
-                raise SyntaxError('invalid comparison: %s %s %s' %
-                                  (elhs, op, erhs))
+                raise SyntaxError('invalid comparison: %s %s %s' % (elhs, op, erhs))
 
             lhs = self.evaluate(elhs, context)
             rhs = self.evaluate(erhs, context)
-            if ((_is_version_marker(elhs) or _is_version_marker(erhs))
-                    and op in ('<', '<=', '>', '>=', '===', '==', '!=', '~=')):
+            if ((_is_version_marker(elhs) or _is_version_marker(erhs)) and
+                    op in ('<', '<=', '>', '>=', '===', '==', '!=', '~=')):
                 lhs = LV(lhs)
                 rhs = LV(rhs)
             elif _is_version_marker(elhs) and op in ('in', 'not in'):
@@ -111,8 +109,7 @@ def format_full_version(info):
         return version
 
     if hasattr(sys, 'implementation'):
-        implementation_version = format_full_version(
-            sys.implementation.version)
+        implementation_version = format_full_version(sys.implementation.version)
         implementation_name = sys.implementation.name
     else:
         implementation_version = '0'
@@ -156,11 +153,9 @@ def interpret(marker, execution_context=None):
     try:
         expr, rest = parse_marker(marker)
     except Exception as e:
-        raise SyntaxError('Unable to interpret marker syntax: %s: %s' %
-                          (marker, e))
+        raise SyntaxError('Unable to interpret marker syntax: %s: %s' % (marker, e))
     if rest and rest[0] != '#':
-        raise SyntaxError('unexpected trailing data in marker: %s: %s' %
-                          (marker, rest))
+        raise SyntaxError('unexpected trailing data in marker: %s: %s' % (marker, rest))
     context = dict(DEFAULT_CONTEXT)
     if execution_context:
         context.update(execution_context)
diff --git a/src/pip/_vendor/distlib/metadata.py b/src/pip/_vendor/distlib/metadata.py
index 7189aeef229..ce9a34b3e24 100644
--- a/src/pip/_vendor/distlib/metadata.py
+++ b/src/pip/_vendor/distlib/metadata.py
@@ -15,7 +15,6 @@
 import logging
 import re
 
-
 from . import DistlibException, __version__
 from .compat import StringIO, string_types, text_type
 from .markers import interpret
@@ -40,6 +39,7 @@ class MetadataUnrecognizedVersionError(DistlibException):
 class MetadataInvalidError(DistlibException):
     """A metadata value is invalid"""
 
+
 # public API of this module
 __all__ = ['Metadata', 'PKG_INFO_ENCODING', 'PKG_INFO_PREFERRED_VERSION']
 
@@ -52,53 +52,38 @@ class MetadataInvalidError(DistlibException):
 
 _LINE_PREFIX_1_2 = re.compile('\n       \\|')
 _LINE_PREFIX_PRE_1_2 = re.compile('\n        ')
-_241_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform',
-               'Summary', 'Description',
-               'Keywords', 'Home-page', 'Author', 'Author-email',
-               'License')
-
-_314_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform',
-               'Supported-Platform', 'Summary', 'Description',
-               'Keywords', 'Home-page', 'Author', 'Author-email',
-               'License', 'Classifier', 'Download-URL', 'Obsoletes',
+_241_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform', 'Summary', 'Description', 'Keywords', 'Home-page',
+               'Author', 'Author-email', 'License')
+
+_314_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform', 'Supported-Platform', 'Summary', 'Description',
+               'Keywords', 'Home-page', 'Author', 'Author-email', 'License', 'Classifier', 'Download-URL', 'Obsoletes',
                'Provides', 'Requires')
 
-_314_MARKERS = ('Obsoletes', 'Provides', 'Requires', 'Classifier',
-                'Download-URL')
+_314_MARKERS = ('Obsoletes', 'Provides', 'Requires', 'Classifier', 'Download-URL')
 
-_345_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform',
-               'Supported-Platform', 'Summary', 'Description',
-               'Keywords', 'Home-page', 'Author', 'Author-email',
-               'Maintainer', 'Maintainer-email', 'License',
-               'Classifier', 'Download-URL', 'Obsoletes-Dist',
-               'Project-URL', 'Provides-Dist', 'Requires-Dist',
+_345_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform', 'Supported-Platform', 'Summary', 'Description',
+               'Keywords', 'Home-page', 'Author', 'Author-email', 'Maintainer', 'Maintainer-email', 'License',
+               'Classifier', 'Download-URL', 'Obsoletes-Dist', 'Project-URL', 'Provides-Dist', 'Requires-Dist',
                'Requires-Python', 'Requires-External')
 
-_345_MARKERS = ('Provides-Dist', 'Requires-Dist', 'Requires-Python',
-                'Obsoletes-Dist', 'Requires-External', 'Maintainer',
-                'Maintainer-email', 'Project-URL')
+_345_MARKERS = ('Provides-Dist', 'Requires-Dist', 'Requires-Python', 'Obsoletes-Dist', 'Requires-External',
+                'Maintainer', 'Maintainer-email', 'Project-URL')
 
-_426_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform',
-               'Supported-Platform', 'Summary', 'Description',
-               'Keywords', 'Home-page', 'Author', 'Author-email',
-               'Maintainer', 'Maintainer-email', 'License',
-               'Classifier', 'Download-URL', 'Obsoletes-Dist',
-               'Project-URL', 'Provides-Dist', 'Requires-Dist',
-               'Requires-Python', 'Requires-External', 'Private-Version',
-               'Obsoleted-By', 'Setup-Requires-Dist', 'Extension',
-               'Provides-Extra')
+_426_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform', 'Supported-Platform', 'Summary', 'Description',
+               'Keywords', 'Home-page', 'Author', 'Author-email', 'Maintainer', 'Maintainer-email', 'License',
+               'Classifier', 'Download-URL', 'Obsoletes-Dist', 'Project-URL', 'Provides-Dist', 'Requires-Dist',
+               'Requires-Python', 'Requires-External', 'Private-Version', 'Obsoleted-By', 'Setup-Requires-Dist',
+               'Extension', 'Provides-Extra')
 
-_426_MARKERS = ('Private-Version', 'Provides-Extra', 'Obsoleted-By',
-                'Setup-Requires-Dist', 'Extension')
+_426_MARKERS = ('Private-Version', 'Provides-Extra', 'Obsoleted-By', 'Setup-Requires-Dist', 'Extension')
 
 # See issue #106: Sometimes 'Requires' and 'Provides' occur wrongly in
 # the metadata. Include them in the tuple literal below to allow them
 # (for now).
 # Ditto for Obsoletes - see issue #140.
-_566_FIELDS = _426_FIELDS + ('Description-Content-Type',
-                             'Requires', 'Provides', 'Obsoletes')
+_566_FIELDS = _426_FIELDS + ('Description-Content-Type', 'Requires', 'Provides', 'Obsoletes')
 
-_566_MARKERS = ('Description-Content-Type',)
+_566_MARKERS = ('Description-Content-Type', )
 
 _643_MARKERS = ('Dynamic', 'License-File')
 
@@ -135,6 +120,7 @@ def _version2fieldlist(version):
 
 def _best_version(fields):
     """Detect the best version depending on the fields used."""
+
     def _has_marker(keys, markers):
         return any(marker in keys for marker in markers)
 
@@ -163,12 +149,12 @@ def _has_marker(keys, markers):
             possible_versions.remove('2.2')
             logger.debug('Removed 2.2 due to %s', key)
         # if key not in _426_FIELDS and '2.0' in possible_versions:
-            # possible_versions.remove('2.0')
-            # logger.debug('Removed 2.0 due to %s', key)
+        # possible_versions.remove('2.0')
+        # logger.debug('Removed 2.0 due to %s', key)
 
     # possible_version contains qualified versions
     if len(possible_versions) == 1:
-        return possible_versions[0]   # found !
+        return possible_versions[0]  # found !
     elif len(possible_versions) == 0:
         logger.debug('Out of options - unknown metadata set: %s', fields)
         raise MetadataConflictError('Unknown metadata set')
@@ -199,28 +185,25 @@ def _has_marker(keys, markers):
     if is_2_1:
         return '2.1'
     # if is_2_2:
-        # return '2.2'
+    # return '2.2'
 
     return '2.2'
 
+
 # This follows the rules about transforming keys as described in
 # https://www.python.org/dev/peps/pep-0566/#id17
-_ATTR2FIELD = {
-    name.lower().replace("-", "_"): name for name in _ALL_FIELDS
-}
+_ATTR2FIELD = {name.lower().replace("-", "_"): name for name in _ALL_FIELDS}
 _FIELD2ATTR = {field: attr for attr, field in _ATTR2FIELD.items()}
 
 _PREDICATE_FIELDS = ('Requires-Dist', 'Obsoletes-Dist', 'Provides-Dist')
-_VERSIONS_FIELDS = ('Requires-Python',)
-_VERSION_FIELDS = ('Version',)
-_LISTFIELDS = ('Platform', 'Classifier', 'Obsoletes',
-               'Requires', 'Provides', 'Obsoletes-Dist',
-               'Provides-Dist', 'Requires-Dist', 'Requires-External',
-               'Project-URL', 'Supported-Platform', 'Setup-Requires-Dist',
+_VERSIONS_FIELDS = ('Requires-Python', )
+_VERSION_FIELDS = ('Version', )
+_LISTFIELDS = ('Platform', 'Classifier', 'Obsoletes', 'Requires', 'Provides', 'Obsoletes-Dist', 'Provides-Dist',
+               'Requires-Dist', 'Requires-External', 'Project-URL', 'Supported-Platform', 'Setup-Requires-Dist',
                'Provides-Extra', 'Extension', 'License-File')
-_LISTTUPLEFIELDS = ('Project-URL',)
+_LISTTUPLEFIELDS = ('Project-URL', )
 
-_ELEMENTSFIELD = ('Keywords',)
+_ELEMENTSFIELD = ('Keywords', )
 
 _UNICODEFIELDS = ('Author', 'Maintainer', 'Summary', 'Description')
 
@@ -252,10 +235,10 @@ class LegacyMetadata(object):
     - *mapping* is a dict-like object
     - *scheme* is a version scheme name
     """
+
     # TODO document the mapping API and UNKNOWN default key
 
-    def __init__(self, path=None, fileobj=None, mapping=None,
-                 scheme='default'):
+    def __init__(self, path=None, fileobj=None, mapping=None, scheme='default'):
         if [path, fileobj, mapping].count(None) < 2:
             raise TypeError('path, fileobj and mapping are exclusive')
         self._fields = {}
@@ -290,8 +273,7 @@ def __delitem__(self, name):
             raise KeyError(name)
 
     def __contains__(self, name):
-        return (name in self._fields or
-                self._convert_name(name) in self._fields)
+        return (name in self._fields or self._convert_name(name) in self._fields)
 
     def _convert_name(self, name):
         if name in _ALL_FIELDS:
@@ -319,12 +301,12 @@ def __getattr__(self, name):
     # Public API
     #
 
-#    dependencies = property(_get_dependencies, _set_dependencies)
-
     def get_fullname(self, filesafe=False):
-        """Return the distribution name with version.
+        """
+        Return the distribution name with version.
 
-        If filesafe is true, return a filename-escaped form."""
+        If filesafe is true, return a filename-escaped form.
+        """
         return _get_name_and_version(self['Name'], self['Version'], filesafe)
 
     def is_field(self, name):
@@ -415,6 +397,7 @@ def update(self, other=None, **kwargs):
         Keys that don't match a metadata field or that have an empty value are
         dropped.
         """
+
         def _set(key, value):
             if key in _ATTR2FIELD and value:
                 self.set(self._convert_name(key), value)
@@ -437,14 +420,12 @@ def set(self, name, value):
         """Control then set a metadata field."""
         name = self._convert_name(name)
 
-        if ((name in _ELEMENTSFIELD or name == 'Platform') and
-            not isinstance(value, (list, tuple))):
+        if ((name in _ELEMENTSFIELD or name == 'Platform') and not isinstance(value, (list, tuple))):
             if isinstance(value, string_types):
                 value = [v.strip() for v in value.split(',')]
             else:
                 value = []
-        elif (name in _LISTFIELDS and
-              not isinstance(value, (list, tuple))):
+        elif (name in _LISTFIELDS and not isinstance(value, (list, tuple))):
             if isinstance(value, string_types):
                 value = [value]
             else:
@@ -458,18 +439,14 @@ def set(self, name, value):
                 for v in value:
                     # check that the values are valid
                     if not scheme.is_valid_matcher(v.split(';')[0]):
-                        logger.warning(
-                            "'%s': '%s' is not valid (field '%s')",
-                            project_name, v, name)
+                        logger.warning("'%s': '%s' is not valid (field '%s')", project_name, v, name)
             # FIXME this rejects UNKNOWN, is that right?
             elif name in _VERSIONS_FIELDS and value is not None:
                 if not scheme.is_valid_constraint_list(value):
-                    logger.warning("'%s': '%s' is not a valid version (field '%s')",
-                                   project_name, value, name)
+                    logger.warning("'%s': '%s' is not a valid version (field '%s')", project_name, value, name)
             elif name in _VERSION_FIELDS and value is not None:
                 if not scheme.is_valid_version(value):
-                    logger.warning("'%s': '%s' is not a valid version (field '%s')",
-                                   project_name, value, name)
+                    logger.warning("'%s': '%s' is not a valid version (field '%s')", project_name, value, name)
 
         if name in _UNICODEFIELDS:
             if name == 'Description':
@@ -539,10 +516,8 @@ def are_valid_constraints(value):
             return True
 
         for fields, controller in ((_PREDICATE_FIELDS, are_valid_constraints),
-                                   (_VERSIONS_FIELDS,
-                                    scheme.is_valid_constraint_list),
-                                   (_VERSION_FIELDS,
-                                    scheme.is_valid_version)):
+                                   (_VERSIONS_FIELDS, scheme.is_valid_constraint_list), (_VERSION_FIELDS,
+                                                                                         scheme.is_valid_version)):
             for field in fields:
                 value = self.get(field, None)
                 if value is not None and not controller(value):
@@ -598,8 +573,7 @@ def items(self):
         return [(key, self[key]) for key in self.keys()]
 
     def __repr__(self):
-        return '<%s %s %s>' % (self.__class__.__name__, self.name,
-                               self.version)
+        return '<%s %s %s>' % (self.__class__.__name__, self.name, self.version)
 
 
 METADATA_FILENAME = 'pydist.json'
@@ -631,7 +605,7 @@ class Metadata(object):
     MANDATORY_KEYS = {
         'name': (),
         'version': (),
-        'summary': ('legacy',),
+        'summary': ('legacy', ),
     }
 
     INDEX_KEYS = ('name version license summary description author '
@@ -644,22 +618,21 @@ class Metadata(object):
 
     SYNTAX_VALIDATORS = {
         'metadata_version': (METADATA_VERSION_MATCHER, ()),
-        'name': (NAME_MATCHER, ('legacy',)),
-        'version': (VERSION_MATCHER, ('legacy',)),
-        'summary': (SUMMARY_MATCHER, ('legacy',)),
-        'dynamic': (FIELDNAME_MATCHER, ('legacy',)),
+        'name': (NAME_MATCHER, ('legacy', )),
+        'version': (VERSION_MATCHER, ('legacy', )),
+        'summary': (SUMMARY_MATCHER, ('legacy', )),
+        'dynamic': (FIELDNAME_MATCHER, ('legacy', )),
     }
 
     __slots__ = ('_legacy', '_data', 'scheme')
 
-    def __init__(self, path=None, fileobj=None, mapping=None,
-                 scheme='default'):
+    def __init__(self, path=None, fileobj=None, mapping=None, scheme='default'):
         if [path, fileobj, mapping].count(None) < 2:
             raise TypeError('path, fileobj and mapping are exclusive')
         self._legacy = None
         self._data = None
         self.scheme = scheme
-        #import pdb; pdb.set_trace()
+        # import pdb; pdb.set_trace()
         if mapping is not None:
             try:
                 self._validate_mapping(mapping, scheme)
@@ -693,8 +666,7 @@ def __init__(self, path=None, fileobj=None, mapping=None,
                     # The ValueError comes from the json.load - if that
                     # succeeds and we get a validation error, we want
                     # that to propagate
-                    self._legacy = LegacyMetadata(fileobj=StringIO(data),
-                                                  scheme=scheme)
+                    self._legacy = LegacyMetadata(fileobj=StringIO(data), scheme=scheme)
                     self.validate()
 
     common_keys = set(('name', 'version', 'license', 'keywords', 'summary'))
@@ -732,8 +704,7 @@ def __getattribute__(self, key):
                     result = self._legacy.get(lk)
             else:
                 value = None if maker is None else maker()
-                if key not in ('commands', 'exports', 'modules', 'namespaces',
-                               'classifiers'):
+                if key not in ('commands', 'exports', 'modules', 'namespaces', 'classifiers'):
                     result = self._data.get(key, value)
                 else:
                     # special cases for PEP 459
@@ -770,8 +741,7 @@ def _validate_value(self, key, value, scheme=None):
                 m = pattern.match(value)
                 if not m:
                     raise MetadataInvalidError("'%s' is an invalid value for "
-                                               "the '%s' property" % (value,
-                                                                    key))
+                                               "the '%s' property" % (value, key))
 
     def __setattr__(self, key, value):
         self._validate_value(key, value)
@@ -783,8 +753,7 @@ def __setattr__(self, key, value):
                 if lk is None:
                     raise NotImplementedError
                 self._legacy[lk] = value
-            elif key not in ('commands', 'exports', 'modules', 'namespaces',
-                             'classifiers'):
+            elif key not in ('commands', 'exports', 'modules', 'namespaces', 'classifiers'):
                 self._data[key] = value
             else:
                 # special cases for PEP 459
@@ -872,8 +841,7 @@ def get_requirements(self, reqts, extras=None, env=None):
                     # A recursive call, but it should terminate since 'test'
                     # has been removed from the extras
                     reqts = self._data.get('%s_requires' % key, [])
-                    result.extend(self.get_requirements(reqts, extras=extras,
-                                                        env=env))
+                    result.extend(self.get_requirements(reqts, extras=extras, env=env))
         return result
 
     @property
@@ -914,8 +882,7 @@ def validate(self):
         if self._legacy:
             missing, warnings = self._legacy.check(True)
             if missing or warnings:
-                logger.warning('Metadata: missing: %s, warnings: %s',
-                               missing, warnings)
+                logger.warning('Metadata: missing: %s, warnings: %s', missing, warnings)
         else:
             self._validate_mapping(self._data, self.scheme)
 
@@ -932,9 +899,8 @@ def _from_legacy(self):
             'metadata_version': self.METADATA_VERSION,
             'generator': self.GENERATOR,
         }
-        lmd = self._legacy.todict(True)     # skip missing ones
-        for k in ('name', 'version', 'license', 'summary', 'description',
-                  'classifier'):
+        lmd = self._legacy.todict(True)  # skip missing ones
+        for k in ('name', 'version', 'license', 'summary', 'description', 'classifier'):
             if k in lmd:
                 if k == 'classifier':
                     nk = 'classifiers'
@@ -945,14 +911,13 @@ def _from_legacy(self):
         if kw == ['']:
             kw = []
         result['keywords'] = kw
-        keys = (('requires_dist', 'run_requires'),
-                ('setup_requires_dist', 'build_requires'))
+        keys = (('requires_dist', 'run_requires'), ('setup_requires_dist', 'build_requires'))
         for ok, nk in keys:
             if ok in lmd and lmd[ok]:
                 result[nk] = [{'requires': lmd[ok]}]
         result['provides'] = self.provides
-        author = {}
-        maintainer = {}
+        # author = {}
+        # maintainer = {}
         return result
 
     LEGACY_MAPPING = {
@@ -969,6 +934,7 @@ def _from_legacy(self):
     }
 
     def _to_legacy(self):
+
         def process_entries(entries):
             reqts = set()
             for e in entries:
@@ -1037,12 +1003,10 @@ def write(self, path=None, fileobj=None, legacy=False, skip_unknown=True):
             else:
                 d = self._data
             if fileobj:
-                json.dump(d, fileobj, ensure_ascii=True, indent=2,
-                          sort_keys=True)
+                json.dump(d, fileobj, ensure_ascii=True, indent=2, sort_keys=True)
             else:
                 with codecs.open(path, 'w', 'utf-8') as f:
-                    json.dump(d, f, ensure_ascii=True, indent=2,
-                              sort_keys=True)
+                    json.dump(d, f, ensure_ascii=True, indent=2, sort_keys=True)
 
     def add_requirements(self, requirements):
         if self._legacy:
@@ -1055,7 +1019,7 @@ def add_requirements(self, requirements):
                     always = entry
                     break
             if always is None:
-                always = { 'requires': requirements }
+                always = {'requires': requirements}
                 run_requires.insert(0, always)
             else:
                 rset = set(always['requires']) | set(requirements)
@@ -1064,5 +1028,4 @@ def add_requirements(self, requirements):
     def __repr__(self):
         name = self.name or '(no name)'
         version = self.version or 'no version'
-        return '<%s %s %s (%s)>' % (self.__class__.__name__,
-                                    self.metadata_version, name, version)
+        return '<%s %s %s (%s)>' % (self.__class__.__name__, self.metadata_version, name, version)
diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py
index 0982e6b726e..b1fc705b7e6 100644
--- a/src/pip/_vendor/distlib/scripts.py
+++ b/src/pip/_vendor/distlib/scripts.py
@@ -15,8 +15,7 @@
 
 from .compat import sysconfig, detect_encoding, ZipFile
 from .resources import finder
-from .util import (FileOperator, get_export_entry, convert_path,
-                   get_executable, get_platform, in_venv)
+from .util import (FileOperator, get_export_entry, convert_path, get_executable, get_platform, in_venv)
 
 logger = logging.getLogger(__name__)
 
@@ -57,15 +56,16 @@
 # location where it was imported from. So we load everything into memory in
 # advance.
 
-# Issue 31: don't hardcode an absolute package name, but
-# determine it relative to the current package
-distlib_package = __name__.rsplit('.', 1)[0]
+if os.name == 'nt' or (os.name == 'java' and os._name == 'nt'):
+    # Issue 31: don't hardcode an absolute package name, but
+    # determine it relative to the current package
+    DISTLIB_PACKAGE = __name__.rsplit('.', 1)[0]
 
-WRAPPERS = {
-    r.name: r.bytes
-    for r in finder(distlib_package).iterator("")
-    if r.name.endswith(".exe")
-}
+    WRAPPERS = {
+        r.name: r.bytes
+        for r in finder(DISTLIB_PACKAGE).iterator("")
+        if r.name.endswith(".exe")
+    }
 
 
 def enquote_executable(executable):
@@ -97,25 +97,18 @@ class ScriptMaker(object):
 
     executable = None  # for shebangs
 
-    def __init__(self,
-                 source_dir,
-                 target_dir,
-                 add_launchers=True,
-                 dry_run=False,
-                 fileop=None):
+    def __init__(self, source_dir, target_dir, add_launchers=True, dry_run=False, fileop=None):
         self.source_dir = source_dir
         self.target_dir = target_dir
         self.add_launchers = add_launchers
         self.force = False
         self.clobber = False
         # It only makes sense to set mode bits on POSIX.
-        self.set_mode = (os.name == 'posix') or (os.name == 'java'
-                                                 and os._name == 'posix')
+        self.set_mode = (os.name == 'posix') or (os.name == 'java' and os._name == 'posix')
         self.variants = set(('', 'X.Y'))
         self._fileop = fileop or FileOperator(dry_run)
 
-        self._is_nt = os.name == 'nt' or (os.name == 'java'
-                                          and os._name == 'nt')
+        self._is_nt = os.name == 'nt' or (os.name == 'java' and os._name == 'nt')
         self.version_info = sys.version_info
 
     def _get_alternate_executable(self, executable, options):
@@ -177,15 +170,14 @@ def _build_shebang(self, executable, post_interp):
                 max_shebang_length = 512
             else:
                 max_shebang_length = 127
-            simple_shebang = ((b' ' not in executable)
-                              and (shebang_length <= max_shebang_length))
+            simple_shebang = ((b' ' not in executable) and (shebang_length <= max_shebang_length))
 
         if simple_shebang:
             result = b'#!' + executable + post_interp + b'\n'
         else:
             result = b'#!/bin/sh\n'
             result += b"'''exec' " + executable + post_interp + b' "$0" "$@"\n'
-            result += b"' '''"
+            result += b"' '''\n"
         return result
 
     def _get_shebang(self, encoding, post_interp=b'', options=None):
@@ -196,21 +188,17 @@ def _get_shebang(self, encoding, post_interp=b'', options=None):
         elif not sysconfig.is_python_build():
             executable = get_executable()
         elif in_venv():  # pragma: no cover
-            executable = os.path.join(
-                sysconfig.get_path('scripts'),
-                'python%s' % sysconfig.get_config_var('EXE'))
+            executable = os.path.join(sysconfig.get_path('scripts'), 'python%s' % sysconfig.get_config_var('EXE'))
         else:  # pragma: no cover
             if os.name == 'nt':
                 # for Python builds from source on Windows, no Python executables with
                 # a version suffix are created, so we use python.exe
-                executable = os.path.join(
-                    sysconfig.get_config_var('BINDIR'),
-                    'python%s' % (sysconfig.get_config_var('EXE')))
+                executable = os.path.join(sysconfig.get_config_var('BINDIR'),
+                                          'python%s' % (sysconfig.get_config_var('EXE')))
             else:
                 executable = os.path.join(
                     sysconfig.get_config_var('BINDIR'),
-                    'python%s%s' % (sysconfig.get_config_var('VERSION'),
-                                    sysconfig.get_config_var('EXE')))
+                    'python%s%s' % (sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('EXE')))
         if options:
             executable = self._get_alternate_executable(executable, options)
 
@@ -234,8 +222,8 @@ def _get_shebang(self, encoding, post_interp=b'', options=None):
         # check that the shebang is decodable using utf-8.
         executable = executable.encode('utf-8')
         # in case of IronPython, play safe and enable frames support
-        if (sys.platform == 'cli' and '-X:Frames' not in post_interp
-                and '-X:FullFrames' not in post_interp):  # pragma: no cover
+        if (sys.platform == 'cli' and '-X:Frames' not in post_interp and
+                '-X:FullFrames' not in post_interp):  # pragma: no cover
             post_interp += b' -X:Frames'
         shebang = self._build_shebang(executable, post_interp)
         # Python parser starts to read a script using UTF-8 until
@@ -246,8 +234,7 @@ def _get_shebang(self, encoding, post_interp=b'', options=None):
         try:
             shebang.decode('utf-8')
         except UnicodeDecodeError:  # pragma: no cover
-            raise ValueError('The shebang (%r) is not decodable from utf-8' %
-                             shebang)
+            raise ValueError('The shebang (%r) is not decodable from utf-8' % shebang)
         # If the script is encoded to a custom encoding (use a
         # #coding:xxx cookie), the shebang has to be decodable from
         # the script encoding too.
@@ -256,15 +243,12 @@ def _get_shebang(self, encoding, post_interp=b'', options=None):
                 shebang.decode(encoding)
             except UnicodeDecodeError:  # pragma: no cover
                 raise ValueError('The shebang (%r) is not decodable '
-                                 'from the script encoding (%r)' %
-                                 (shebang, encoding))
+                                 'from the script encoding (%r)' % (shebang, encoding))
         return shebang
 
     def _get_script_text(self, entry):
         return self.script_template % dict(
-            module=entry.prefix,
-            import_name=entry.suffix.split('.')[0],
-            func=entry.suffix)
+            module=entry.prefix, import_name=entry.suffix.split('.')[0], func=entry.suffix)
 
     manifest = _DEFAULT_MANIFEST
 
@@ -274,9 +258,6 @@ def get_manifest(self, exename):
 
     def _write_script(self, names, shebang, script_bytes, filenames, ext):
         use_launcher = self.add_launchers and self._is_nt
-        linesep = os.linesep.encode('utf-8')
-        if not shebang.endswith(linesep):
-            shebang += linesep
         if not use_launcher:
             script_bytes = shebang + script_bytes
         else:  # pragma: no cover
@@ -289,8 +270,7 @@ def _write_script(self, names, shebang, script_bytes, filenames, ext):
                 source_date_epoch = os.environ.get('SOURCE_DATE_EPOCH')
                 if source_date_epoch:
                     date_time = time.gmtime(int(source_date_epoch))[:6]
-                    zinfo = ZipInfo(filename='__main__.py',
-                                    date_time=date_time)
+                    zinfo = ZipInfo(filename='__main__.py', date_time=date_time)
                     zf.writestr(zinfo, script_bytes)
                 else:
                     zf.writestr('__main__.py', script_bytes)
@@ -321,8 +301,7 @@ def _write_script(self, names, shebang, script_bytes, filenames, ext):
                     except Exception:
                         pass  # still in use - ignore error
             else:
-                if self._is_nt and not outname.endswith(
-                        '.' + ext):  # pragma: no cover
+                if self._is_nt and not outname.endswith('.' + ext):  # pragma: no cover
                     outname = '%s.%s' % (outname, ext)
                 if os.path.exists(outname) and not self.clobber:
                     logger.warning('Skipping existing file %s', outname)
@@ -341,9 +320,7 @@ def get_script_filenames(self, name):
         if 'X' in self.variants:
             result.add('%s%s' % (name, self.version_info[0]))
         if 'X.Y' in self.variants:
-            result.add('%s%s%s.%s' %
-                       (name, self.variant_separator, self.version_info[0],
-                        self.version_info[1]))
+            result.add('%s%s%s.%s' % (name, self.variant_separator, self.version_info[0], self.version_info[1]))
         return result
 
     def _make_script(self, entry, filenames, options=None):
@@ -398,8 +375,7 @@ def _copy_script(self, script, filenames):
                 self._fileop.set_executable_mode([outname])
             filenames.append(outname)
         else:
-            logger.info('copying and adjusting %s -> %s', script,
-                        self.target_dir)
+            logger.info('copying and adjusting %s -> %s', script, self.target_dir)
             if not self._fileop.dry_run:
                 encoding, lines = detect_encoding(f.readline)
                 f.seek(0)
@@ -421,8 +397,7 @@ def dry_run(self):
     def dry_run(self, value):
         self._fileop.dry_run = value
 
-    if os.name == 'nt' or (os.name == 'java'
-                           and os._name == 'nt'):  # pragma: no cover
+    if os.name == 'nt' or (os.name == 'java' and os._name == 'nt'):  # pragma: no cover
         # Executable launcher support.
         # Launchers are from https://bitbucket.org/vinay.sajip/simple_launcher/
 
@@ -435,7 +410,7 @@ def _get_launcher(self, kind):
             name = '%s%s%s.exe' % (kind, bits, platform_suffix)
             if name not in WRAPPERS:
                 msg = ('Unable to find resource %s in package %s' %
-                       (name, distlib_package))
+                       (name, DISTLIB_PACKAGE))
                 raise ValueError(msg)
             return WRAPPERS[name]
 
diff --git a/src/pip/_vendor/distlib/util.py b/src/pip/_vendor/distlib/util.py
index ba58858d0fb..0d5bd7a8bf3 100644
--- a/src/pip/_vendor/distlib/util.py
+++ b/src/pip/_vendor/distlib/util.py
@@ -31,11 +31,9 @@
 import time
 
 from . import DistlibException
-from .compat import (string_types, text_type, shutil, raw_input, StringIO,
-                     cache_from_source, urlopen, urljoin, httplib, xmlrpclib,
-                     HTTPHandler, BaseConfigurator, valid_ident,
-                     Container, configparser, URLError, ZipFile, fsdecode,
-                     unquote, urlparse)
+from .compat import (string_types, text_type, shutil, raw_input, StringIO, cache_from_source, urlopen, urljoin, httplib,
+                     xmlrpclib, HTTPHandler, BaseConfigurator, valid_ident, Container, configparser, URLError, ZipFile,
+                     fsdecode, unquote, urlparse)
 
 logger = logging.getLogger(__name__)
 
@@ -88,8 +86,7 @@ def marker_var(remaining):
                 else:
                     m = STRING_CHUNK.match(remaining)
                     if not m:
-                        raise SyntaxError('error in string literal: %s' %
-                                          remaining)
+                        raise SyntaxError('error in string literal: %s' % remaining)
                     parts.append(m.groups()[0])
                     remaining = remaining[m.end():]
             else:
@@ -210,8 +207,7 @@ def get_versions(ver_remaining):
                         ver_remaining = ver_remaining[m.end():]
                         m = VERSION_IDENTIFIER.match(ver_remaining)
                         if not m:
-                            raise SyntaxError('invalid version: %s' %
-                                              ver_remaining)
+                            raise SyntaxError('invalid version: %s' % ver_remaining)
                         v = m.groups()[0]
                         versions.append((op, v))
                         ver_remaining = ver_remaining[m.end():]
@@ -224,8 +220,7 @@ def get_versions(ver_remaining):
                             break
                         m = COMPARE_OP.match(ver_remaining)
                         if not m:
-                            raise SyntaxError('invalid constraint: %s' %
-                                              ver_remaining)
+                            raise SyntaxError('invalid constraint: %s' % ver_remaining)
                     if not versions:
                         versions = None
                 return versions, ver_remaining
@@ -235,8 +230,7 @@ def get_versions(ver_remaining):
             else:
                 i = remaining.find(')', 1)
                 if i < 0:
-                    raise SyntaxError('unterminated parenthesis: %s' %
-                                      remaining)
+                    raise SyntaxError('unterminated parenthesis: %s' % remaining)
                 s = remaining[1:i]
                 remaining = remaining[i + 1:].lstrip()
                 # As a special diversion from PEP 508, allow a version number
@@ -267,14 +261,8 @@ def get_versions(ver_remaining):
     if not versions:
         rs = distname
     else:
-        rs = '%s %s' % (distname, ', '.join(
-            ['%s %s' % con for con in versions]))
-    return Container(name=distname,
-                     extras=extras,
-                     constraints=versions,
-                     marker=mark_expr,
-                     url=uri,
-                     requirement=rs)
+        rs = '%s %s' % (distname, ', '.join(['%s %s' % con for con in versions]))
+    return Container(name=distname, extras=extras, constraints=versions, marker=mark_expr, url=uri, requirement=rs)
 
 
 def get_resources_dests(resources_root, rules):
@@ -524,8 +512,7 @@ def newer(self, source, target):
         second will have the same "age".
         """
         if not os.path.exists(source):
-            raise DistlibException("file '%r' does not exist" %
-                                   os.path.abspath(source))
+            raise DistlibException("file '%r' does not exist" % os.path.abspath(source))
         if not os.path.exists(target):
             return True
 
@@ -601,12 +588,7 @@ def ensure_dir(self, path):
             if self.record:
                 self.dirs_created.add(path)
 
-    def byte_compile(self,
-                     path,
-                     optimize=False,
-                     force=False,
-                     prefix=None,
-                     hashed_invalidation=False):
+    def byte_compile(self, path, optimize=False, force=False, prefix=None, hashed_invalidation=False):
         dpath = cache_from_source(path, not optimize)
         logger.info('Byte-compiling %s to %s', path, dpath)
         if not self.dry_run:
@@ -617,12 +599,11 @@ def byte_compile(self,
                     assert path.startswith(prefix)
                     diagpath = path[len(prefix):]
             compile_kwargs = {}
-            if hashed_invalidation and hasattr(py_compile,
-                                               'PycInvalidationMode'):
-                compile_kwargs[
-                    'invalidation_mode'] = py_compile.PycInvalidationMode.CHECKED_HASH
-            py_compile.compile(path, dpath, diagpath, True,
-                               **compile_kwargs)  # raise error
+            if hashed_invalidation and hasattr(py_compile, 'PycInvalidationMode'):
+                if not isinstance(hashed_invalidation, py_compile.PycInvalidationMode):
+                    hashed_invalidation = py_compile.PycInvalidationMode.CHECKED_HASH
+                compile_kwargs['invalidation_mode'] = hashed_invalidation
+            py_compile.compile(path, dpath, diagpath, True, **compile_kwargs)  # raise error
         self.record_as_written(dpath)
         return dpath
 
@@ -716,16 +697,14 @@ def value(self):
         return resolve(self.prefix, self.suffix)
 
     def __repr__(self):  # pragma: no cover
-        return '' % (self.name, self.prefix,
-                                                self.suffix, self.flags)
+        return '' % (self.name, self.prefix, self.suffix, self.flags)
 
     def __eq__(self, other):
         if not isinstance(other, ExportEntry):
             result = False
         else:
-            result = (self.name == other.name and self.prefix == other.prefix
-                      and self.suffix == other.suffix
-                      and self.flags == other.flags)
+            result = (self.name == other.name and self.prefix == other.prefix and self.suffix == other.suffix and
+                      self.flags == other.flags)
         return result
 
     __hash__ = object.__hash__
@@ -810,7 +789,7 @@ def get_cache_base(suffix=None):
     return os.path.join(result, suffix)
 
 
-def path_to_cache_dir(path):
+def path_to_cache_dir(path, use_abspath=True):
     """
     Convert an absolute path to a directory name for use in a cache.
 
@@ -820,7 +799,7 @@ def path_to_cache_dir(path):
     #. Any occurrence of ``os.sep`` is replaced with ``'--'``.
     #. ``'.cache'`` is appended.
     """
-    d, p = os.path.splitdrive(os.path.abspath(path))
+    d, p = os.path.splitdrive(os.path.abspath(path) if use_abspath else path)
     if d:
         d = d.replace(':', '---')
     p = p.replace(os.sep, '--')
@@ -865,9 +844,8 @@ def is_string_sequence(seq):
     return result
 
 
-PROJECT_NAME_AND_VERSION = re.compile(
-    '([a-z0-9_]+([.-][a-z_][a-z0-9_]*)*)-'
-    '([a-z0-9_.+-]+)', re.I)
+PROJECT_NAME_AND_VERSION = re.compile('([a-z0-9_]+([.-][a-z_][a-z0-9_]*)*)-'
+                                      '([a-z0-9_.+-]+)', re.I)
 PYTHON_VERSION = re.compile(r'-py(\d\.?\d?)')
 
 
@@ -1003,11 +981,11 @@ def __init__(self, base):
             logger.warning('Directory \'%s\' is not private', base)
         self.base = os.path.abspath(os.path.normpath(base))
 
-    def prefix_to_dir(self, prefix):
+    def prefix_to_dir(self, prefix, use_abspath=True):
         """
         Converts a resource prefix to a directory name in the cache.
         """
-        return path_to_cache_dir(prefix)
+        return path_to_cache_dir(prefix, use_abspath=use_abspath)
 
     def clear(self):
         """
@@ -1092,8 +1070,7 @@ def publish(self, event, *args, **kwargs):
                 logger.exception('Exception during event publication')
                 value = None
             result.append(value)
-        logger.debug('publish %s: args = %s, kwargs = %s, result = %s', event,
-                     args, kwargs, result)
+        logger.debug('publish %s: args = %s, kwargs = %s, result = %s', event, args, kwargs, result)
         return result
 
 
@@ -1145,8 +1122,7 @@ def remove(self, pred, succ):
             raise ValueError('%r not a successor of %r' % (succ, pred))
 
     def is_step(self, step):
-        return (step in self._preds or step in self._succs
-                or step in self._nodes)
+        return (step in self._preds or step in self._succs or step in self._nodes)
 
     def get_steps(self, final):
         if not self.is_step(final):
@@ -1242,8 +1218,7 @@ def dot(self):
 # Unarchiving functionality for zip, tar, tgz, tbz, whl
 #
 
-ARCHIVE_EXTENSIONS = ('.tar.gz', '.tar.bz2', '.tar', '.zip', '.tgz', '.tbz',
-                      '.whl')
+ARCHIVE_EXTENSIONS = ('.tar.gz', '.tar.bz2', '.tar', '.zip', '.tgz', '.tbz', '.whl')
 
 
 def unarchive(archive_filename, dest_dir, format=None, check=True):
@@ -1474,8 +1449,7 @@ def _iglob(path_glob):
 
 
 if ssl:
-    from .compat import (HTTPSHandler as BaseHTTPSHandler, match_hostname,
-                         CertificateError)
+    from .compat import (HTTPSHandler as BaseHTTPSHandler, match_hostname, CertificateError)
 
     #
     # HTTPSConnection which verifies certificates/matches domains
@@ -1487,8 +1461,7 @@ class HTTPSConnection(httplib.HTTPSConnection):
 
         # noinspection PyPropertyAccess
         def connect(self):
-            sock = socket.create_connection((self.host, self.port),
-                                            self.timeout)
+            sock = socket.create_connection((self.host, self.port), self.timeout)
             if getattr(self, '_tunnel_host', False):
                 self.sock = sock
                 self._tunnel()
@@ -1543,9 +1516,8 @@ def https_open(self, req):
                 return self.do_open(self._conn_maker, req)
             except URLError as e:
                 if 'certificate verify failed' in str(e.reason):
-                    raise CertificateError(
-                        'Unable to verify server certificate '
-                        'for %s' % req.host)
+                    raise CertificateError('Unable to verify server certificate '
+                                           'for %s' % req.host)
                 else:
                     raise
 
@@ -1561,9 +1533,8 @@ def https_open(self, req):
     class HTTPSOnlyHandler(HTTPSHandler, HTTPHandler):
 
         def http_open(self, req):
-            raise URLError(
-                'Unexpected HTTP request on what should be a secure '
-                'connection: %s' % req)
+            raise URLError('Unexpected HTTP request on what should be a secure '
+                           'connection: %s' % req)
 
 
 #
@@ -1598,8 +1569,7 @@ def make_connection(self, host):
             kwargs['timeout'] = self.timeout
             if not self._connection or host != self._connection[0]:
                 self._extra_headers = eh
-                self._connection = host, httplib.HTTPSConnection(
-                    h, None, **kwargs)
+                self._connection = host, httplib.HTTPSConnection(h, None, **kwargs)
             return self._connection[1]
 
 
@@ -1789,10 +1759,7 @@ def reader(self, stream, context):
         stream.close()
 
     def run_command(self, cmd, **kwargs):
-        p = subprocess.Popen(cmd,
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE,
-                             **kwargs)
+        p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs)
         t1 = threading.Thread(target=self.reader, args=(p.stdout, 'stdout'))
         t1.start()
         t2 = threading.Thread(target=self.reader, args=(p.stderr, 'stderr'))
@@ -1847,10 +1814,7 @@ def read(self):
             if 'distutils' in sections:
                 # let's get the list of servers
                 index_servers = config.get('distutils', 'index-servers')
-                _servers = [
-                    server.strip() for server in index_servers.split('\n')
-                    if server.strip() != ''
-                ]
+                _servers = [server.strip() for server in index_servers.split('\n') if server.strip() != '']
                 if _servers == []:
                     # nothing set, let's try to get the default pypi
                     if 'pypi' in sections:
@@ -1861,9 +1825,7 @@ def read(self):
                         result['username'] = config.get(server, 'username')
 
                         # optional params
-                        for key, default in (('repository',
-                                              self.DEFAULT_REPOSITORY),
-                                             ('realm', self.DEFAULT_REALM),
+                        for key, default in (('repository', self.DEFAULT_REPOSITORY), ('realm', self.DEFAULT_REALM),
                                              ('password', None)):
                             if config.has_option(server, key):
                                 result[key] = config.get(server, key)
@@ -1873,11 +1835,9 @@ def read(self):
                         # work around people having "repository" for the "pypi"
                         # section of their config set to the HTTP (rather than
                         # HTTPS) URL
-                        if (server == 'pypi' and repository
-                                in (self.DEFAULT_REPOSITORY, 'pypi')):
+                        if (server == 'pypi' and repository in (self.DEFAULT_REPOSITORY, 'pypi')):
                             result['repository'] = self.DEFAULT_REPOSITORY
-                        elif (result['server'] != repository
-                              and result['repository'] != repository):
+                        elif (result['server'] != repository and result['repository'] != repository):
                             result = {}
             elif 'server-login' in sections:
                 # old format
@@ -2003,8 +1963,7 @@ def get_host_platform():
             from distutils import sysconfig
         except ImportError:
             import sysconfig
-        osname, release, machine = _osx_support.get_platform_osx(
-            sysconfig.get_config_vars(), osname, release, machine)
+        osname, release, machine = _osx_support.get_platform_osx(sysconfig.get_config_vars(), osname, release, machine)
 
     return '%s-%s-%s' % (osname, release, machine)
 
diff --git a/src/pip/_vendor/distlib/version.py b/src/pip/_vendor/distlib/version.py
index 14171ac938d..d70a96ef51e 100644
--- a/src/pip/_vendor/distlib/version.py
+++ b/src/pip/_vendor/distlib/version.py
@@ -619,8 +619,7 @@ def parse(self, s):
     def is_prerelease(self):
         result = False
         for x in self._parts:
-            if (isinstance(x, string_types) and x.startswith('*') and
-                    x < '*final'):
+            if (isinstance(x, string_types) and x.startswith('*') and x < '*final'):
                 result = True
                 break
         return result
diff --git a/src/pip/_vendor/distlib/wheel.py b/src/pip/_vendor/distlib/wheel.py
index 4a5a30e1d8d..62ab10fb3ad 100644
--- a/src/pip/_vendor/distlib/wheel.py
+++ b/src/pip/_vendor/distlib/wheel.py
@@ -25,9 +25,8 @@
 from .compat import sysconfig, ZipFile, fsdecode, text_type, filter
 from .database import InstalledDistribution
 from .metadata import Metadata, WHEEL_METADATA_FILENAME, LEGACY_METADATA_FILENAME
-from .util import (FileOperator, convert_path, CSVReader, CSVWriter, Cache,
-                   cached_property, get_cache_base, read_exports, tempdir,
-                   get_platform)
+from .util import (FileOperator, convert_path, CSVReader, CSVWriter, Cache, cached_property, get_cache_base,
+                   read_exports, tempdir, get_platform)
 from .version import NormalizedVersion, UnsupportedVersionError
 
 logger = logging.getLogger(__name__)
@@ -88,8 +87,7 @@ def _derive_abi():
 \.whl$
 ''', re.IGNORECASE | re.VERBOSE)
 
-NAME_VERSION_RE = re.compile(
-    r'''
+NAME_VERSION_RE = re.compile(r'''
 (?P[^-]+)
 -(?P\d+[^-]*)
 (-(?P\d+[^-]*))?$
@@ -235,8 +233,7 @@ def filename(self):
         arch = '.'.join(self.arch)
         # replace - with _ as a local version separator
         version = self.version.replace('-', '_')
-        return '%s-%s%s-%s-%s-%s.whl' % (self.name, version, buildver, pyver,
-                                         abi, arch)
+        return '%s-%s%s-%s-%s-%s.whl' % (self.name, version, buildver, pyver, abi, arch)
 
     @property
     def exists(self):
@@ -334,8 +331,7 @@ def get_hash(self, data, hash_kind=None):
         try:
             hasher = getattr(hashlib, hash_kind)
         except AttributeError:
-            raise DistlibException('Unsupported hash algorithm: %r' %
-                                   hash_kind)
+            raise DistlibException('Unsupported hash algorithm: %r' % hash_kind)
         result = hasher(data).digest()
         result = base64.urlsafe_b64encode(result).rstrip(b'=').decode('ascii')
         return hash_kind, result
@@ -513,7 +509,7 @@ def install(self, paths, maker, **kwargs):
         installed, and the headers, scripts, data and dist-info metadata are
         not written. If kwarg ``bytecode_hashed_invalidation`` is True, written
         bytecode will try to use file-hash based invalidation (PEP-552) on
-        supported interpreter versions (CPython 2.7+).
+        supported interpreter versions (CPython 3.7+).
 
         The return value is a :class:`InstalledDistribution` instance unless
         ``options.lib_only`` is True, in which case the return value is ``None``.
@@ -522,8 +518,7 @@ def install(self, paths, maker, **kwargs):
         dry_run = maker.dry_run
         warner = kwargs.get('warner')
         lib_only = kwargs.get('lib_only', False)
-        bc_hashed_invalidation = kwargs.get('bytecode_hashed_invalidation',
-                                            False)
+        bc_hashed_invalidation = kwargs.get('bytecode_hashed_invalidation', False)
 
         pathname = os.path.join(self.dirname, self.filename)
         name_ver = '%s-%s' % (self.name, self.version)
@@ -602,8 +597,7 @@ def install(self, paths, maker, **kwargs):
                     if lib_only and u_arcname.startswith((info_pfx, data_pfx)):
                         logger.debug('lib_only: skipping %s', u_arcname)
                         continue
-                    is_script = (u_arcname.startswith(script_pfx)
-                                 and not u_arcname.endswith('.exe'))
+                    is_script = (u_arcname.startswith(script_pfx) and not u_arcname.endswith('.exe'))
 
                     if u_arcname.startswith(data_pfx):
                         _, where, rp = u_arcname.split('/', 2)
@@ -622,8 +616,7 @@ def install(self, paths, maker, **kwargs):
                         # So ... manually preserve permission bits as given in zinfo
                         if os.name == 'posix':
                             # just set the normal permission bits
-                            os.chmod(outfile,
-                                     (zinfo.external_attr >> 16) & 0x1FF)
+                            os.chmod(outfile, (zinfo.external_attr >> 16) & 0x1FF)
                         outfiles.append(outfile)
                         # Double check the digest of the written file
                         if not dry_run and row[1]:
@@ -636,15 +629,12 @@ def install(self, paths, maker, **kwargs):
                                                            '%s' % outfile)
                         if bc and outfile.endswith('.py'):
                             try:
-                                pyc = fileop.byte_compile(
-                                    outfile,
-                                    hashed_invalidation=bc_hashed_invalidation)
+                                pyc = fileop.byte_compile(outfile, hashed_invalidation=bc_hashed_invalidation)
                                 outfiles.append(pyc)
                             except Exception:
                                 # Don't give up if byte-compilation fails,
                                 # but log it and perhaps warn the user
-                                logger.warning('Byte-compilation failed',
-                                               exc_info=True)
+                                logger.warning('Byte-compilation failed', exc_info=True)
                     else:
                         fn = os.path.basename(convert_path(arcname))
                         workname = os.path.join(workdir, fn)
@@ -732,8 +722,7 @@ def install(self, paths, maker, **kwargs):
                         outfiles.append(p)
 
                     # Write RECORD
-                    dist.write_installed_files(outfiles, paths['prefix'],
-                                               dry_run)
+                    dist.write_installed_files(outfiles, paths['prefix'], dry_run)
                 return dist
             except Exception:  # pragma: no cover
                 logger.exception('installation failed.')
@@ -746,8 +735,7 @@ def _get_dylib_cache(self):
         global cache
         if cache is None:
             # Use native string to avoid issues on 2.x: see Python #20140.
-            base = os.path.join(get_cache_base(), str('dylib-cache'),
-                                '%s.%s' % sys.version_info[:2])
+            base = os.path.join(get_cache_base(), str('dylib-cache'), '%s.%s' % sys.version_info[:2])
             cache = Cache(base)
         return cache
 
@@ -764,7 +752,7 @@ def _get_extensions(self):
                     wf = wrapper(bf)
                     extensions = json.load(wf)
                     cache = self._get_dylib_cache()
-                    prefix = cache.prefix_to_dir(pathname)
+                    prefix = cache.prefix_to_dir(self.filename, use_abspath=False)
                     cache_base = os.path.join(cache.base, prefix)
                     if not os.path.isdir(cache_base):
                         os.makedirs(cache_base)
@@ -774,8 +762,7 @@ def _get_extensions(self):
                             extract = True
                         else:
                             file_time = os.stat(dest).st_mtime
-                            file_time = datetime.datetime.fromtimestamp(
-                                file_time)
+                            file_time = datetime.datetime.fromtimestamp(file_time)
                             info = zf.getinfo(relpath)
                             wheel_time = datetime.datetime(*info.date_time)
                             extract = wheel_time > file_time
@@ -924,12 +911,10 @@ def update_version(version, path):
                 else:
                     parts = [int(s) for s in version[i + 1:].split('.')]
                     parts[-1] += 1
-                    updated = '%s+%s' % (version[:i], '.'.join(
-                        str(i) for i in parts))
+                    updated = '%s+%s' % (version[:i], '.'.join(str(i) for i in parts))
             except UnsupportedVersionError:
-                logger.debug(
-                    'Cannot update non-compliant (PEP-440) '
-                    'version %r', version)
+                logger.debug('Cannot update non-compliant (PEP-440) '
+                             'version %r', version)
             if updated:
                 md = Metadata(path=path)
                 md.version = updated
@@ -971,14 +956,11 @@ def update_version(version, path):
                     update_version(current_version, path)
                 # Decide where the new wheel goes.
                 if dest_dir is None:
-                    fd, newpath = tempfile.mkstemp(suffix='.whl',
-                                                   prefix='wheel-update-',
-                                                   dir=workdir)
+                    fd, newpath = tempfile.mkstemp(suffix='.whl', prefix='wheel-update-', dir=workdir)
                     os.close(fd)
                 else:
                     if not os.path.isdir(dest_dir):
-                        raise DistlibException('Not a directory: %r' %
-                                               dest_dir)
+                        raise DistlibException('Not a directory: %r' % dest_dir)
                     newpath = os.path.join(dest_dir, self.filename)
                 archive_paths = list(path_map.items())
                 distinfo = os.path.join(workdir, info_dir)
@@ -1005,11 +987,20 @@ def compatible_tags():
     """
     Return (pyver, abi, arch) tuples compatible with this Python.
     """
-    versions = [VER_SUFFIX]
-    major = VER_SUFFIX[0]
-    for minor in range(sys.version_info[1] - 1, -1, -1):
-        versions.append(''.join([major, str(minor)]))
+    class _Version:
+        def __init__(self, major, minor):
+            self.major = major
+            self.major_minor = (major, minor)
+            self.string = ''.join((str(major), str(minor)))
+
+        def __str__(self):
+            return self.string
+
 
+    versions = [
+        _Version(sys.version_info.major, minor_version)
+        for minor_version in range(sys.version_info.minor, -1, -1)
+    ]
     abis = []
     for suffix in _get_suffixes():
         if suffix.startswith('.abi'):
@@ -1045,35 +1036,45 @@ def compatible_tags():
                 minor -= 1
 
     # Most specific - our Python version, ABI and arch
-    for abi in abis:
-        for arch in arches:
-            result.append((''.join((IMP_PREFIX, versions[0])), abi, arch))
-            # manylinux
-            if abi != 'none' and sys.platform.startswith('linux'):
-                arch = arch.replace('linux_', '')
-                parts = _get_glibc_version()
-                if len(parts) == 2:
-                    if parts >= (2, 5):
-                        result.append((''.join((IMP_PREFIX, versions[0])), abi,
-                                       'manylinux1_%s' % arch))
-                    if parts >= (2, 12):
-                        result.append((''.join((IMP_PREFIX, versions[0])), abi,
-                                       'manylinux2010_%s' % arch))
-                    if parts >= (2, 17):
-                        result.append((''.join((IMP_PREFIX, versions[0])), abi,
-                                       'manylinux2014_%s' % arch))
-                    result.append(
-                        (''.join((IMP_PREFIX, versions[0])), abi,
-                         'manylinux_%s_%s_%s' % (parts[0], parts[1], arch)))
+    for i, version_object in enumerate(versions):
+        version = str(version_object)
+        add_abis = []
+
+        if i == 0:
+            add_abis = abis
+
+        if IMP_PREFIX == 'cp' and version_object.major_minor >= (3, 2):
+            limited_api_abi = 'abi' + str(version_object.major)
+            if limited_api_abi not in add_abis:
+                add_abis.append(limited_api_abi)
+
+        for abi in add_abis:
+            for arch in arches:
+                result.append((''.join((IMP_PREFIX, version)), abi, arch))
+                # manylinux
+                if abi != 'none' and sys.platform.startswith('linux'):
+                    arch = arch.replace('linux_', '')
+                    parts = _get_glibc_version()
+                    if len(parts) == 2:
+                        if parts >= (2, 5):
+                            result.append((''.join((IMP_PREFIX, version)), abi, 'manylinux1_%s' % arch))
+                        if parts >= (2, 12):
+                            result.append((''.join((IMP_PREFIX, version)), abi, 'manylinux2010_%s' % arch))
+                        if parts >= (2, 17):
+                            result.append((''.join((IMP_PREFIX, version)), abi, 'manylinux2014_%s' % arch))
+                        result.append((''.join(
+                            (IMP_PREFIX, version)), abi, 'manylinux_%s_%s_%s' % (parts[0], parts[1], arch)))
 
     # where no ABI / arch dependency, but IMP_PREFIX dependency
-    for i, version in enumerate(versions):
+    for i, version_object in enumerate(versions):
+        version = str(version_object)
         result.append((''.join((IMP_PREFIX, version)), 'none', 'any'))
         if i == 0:
             result.append((''.join((IMP_PREFIX, version[0])), 'none', 'any'))
 
     # no IMP_PREFIX, ABI or arch dependency
-    for i, version in enumerate(versions):
+    for i, version_object in enumerate(versions):
+        version = str(version_object)
         result.append((''.join(('py', version)), 'none', 'any'))
         if i == 0:
             result.append((''.join(('py', version[0])), 'none', 'any'))
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 8f9e3773cb3..eff20408e93 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -1,5 +1,5 @@
 CacheControl==0.14.0
-distlib==0.3.8
+distlib==0.3.9
 distro==1.9.0
 msgpack==1.0.8
 packaging==24.1
diff --git a/tools/vendoring/patches/distlib.patch b/tools/vendoring/patches/distlib.patch
deleted file mode 100644
index 962eab1d74f..00000000000
--- a/tools/vendoring/patches/distlib.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py
-index cfa45d2af..e16292b83 100644
---- a/src/pip/_vendor/distlib/scripts.py
-+++ b/src/pip/_vendor/distlib/scripts.py
-@@ -49,6 +49,24 @@ if __name__ == '__main__':
-     sys.exit(%(func)s())
- '''
-
-+# Pre-fetch the contents of all executable wrapper stubs.
-+# This is to address https://github.com/pypa/pip/issues/12666.
-+# When updating pip, we rename the old pip in place before installing the
-+# new version. If we try to fetch a wrapper *after* that rename, the finder
-+# machinery will be confused as the package is no longer available at the
-+# location where it was imported from. So we load everything into memory in
-+# advance.
-+
-+# Issue 31: don't hardcode an absolute package name, but
-+# determine it relative to the current package
-+distlib_package = __name__.rsplit('.', 1)[0]
-+
-+WRAPPERS = {
-+    r.name: r.bytes
-+    for r in finder(distlib_package).iterator("")
-+    if r.name.endswith(".exe")
-+}
-+
-
- def enquote_executable(executable):
-     if ' ' in executable:
-@@ -164,6 +164,12 @@ class ScriptMaker(object):
-         """
-         if os.name != 'posix':
-             simple_shebang = True
-+        elif getattr(sys, "cross_compiling", False):
-+            # In a cross-compiling environment, the shebang will likely be a
-+            # script; this *must* be invoked with the "safe" version of the
-+            # shebang, or else using os.exec() to run the entry script will
-+            # fail, raising "OSError 8 [Errno 8] Exec format error".
-+            simple_shebang = False
-         else:
-             # Add 3 for '#!' prefix and newline suffix.
-             shebang_length = len(executable) + len(post_interp) + 3
-@@ -409,15 +427,11 @@ class ScriptMaker(object):
-                 bits = '32'
-             platform_suffix = '-arm' if get_platform() == 'win-arm64' else ''
-             name = '%s%s%s.exe' % (kind, bits, platform_suffix)
--            # Issue 31: don't hardcode an absolute package name, but
--            # determine it relative to the current package
--            distlib_package = __name__.rsplit('.', 1)[0]
--            resource = finder(distlib_package).find(name)
--            if not resource:
-+            if name not in WRAPPERS:
-                 msg = ('Unable to find resource %s in package %s' %
-                        (name, distlib_package))
-                 raise ValueError(msg)
--            return resource.bytes
-+            return WRAPPERS[name]
- 
-     # Public API follows
- 

From 8da3358e80604eba3352e1b3da07a7731178cac7 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 12 Oct 2024 21:21:20 -0400
Subject: [PATCH 598/992] Upgrade certifi to 2024.8.30

---
 news/certifi.vendor.rst             |   1 +
 src/pip/_vendor/certifi/__init__.py |   2 +-
 src/pip/_vendor/certifi/cacert.pem  | 131 ++++++++++++++++++++++++++++
 src/pip/_vendor/vendor.txt          |   2 +-
 4 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 news/certifi.vendor.rst

diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
new file mode 100644
index 00000000000..ad9c985c3eb
--- /dev/null
+++ b/news/certifi.vendor.rst
@@ -0,0 +1 @@
+Upgrade certifi to 2024.8.30
diff --git a/src/pip/_vendor/certifi/__init__.py b/src/pip/_vendor/certifi/__init__.py
index d321f1bc3ab..f61d77fa382 100644
--- a/src/pip/_vendor/certifi/__init__.py
+++ b/src/pip/_vendor/certifi/__init__.py
@@ -1,4 +1,4 @@
 from .core import contents, where
 
 __all__ = ["contents", "where"]
-__version__ = "2024.07.04"
+__version__ = "2024.08.30"
diff --git a/src/pip/_vendor/certifi/cacert.pem b/src/pip/_vendor/certifi/cacert.pem
index a6581589ba1..3c165a1b85e 100644
--- a/src/pip/_vendor/certifi/cacert.pem
+++ b/src/pip/_vendor/certifi/cacert.pem
@@ -4796,3 +4796,134 @@ PQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgLcFBTApFw
 hVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dG
 XSaQpYXFuXqUPoeovQA=
 -----END CERTIFICATE-----
+
+# Issuer: CN=TWCA CYBER Root CA O=TAIWAN-CA OU=Root CA
+# Subject: CN=TWCA CYBER Root CA O=TAIWAN-CA OU=Root CA
+# Label: "TWCA CYBER Root CA"
+# Serial: 85076849864375384482682434040119489222
+# MD5 Fingerprint: 0b:33:a0:97:52:95:d4:a9:fd:bb:db:6e:a3:55:5b:51
+# SHA1 Fingerprint: f6:b1:1c:1a:83:38:e9:7b:db:b3:a8:c8:33:24:e0:2d:9c:7f:26:66
+# SHA256 Fingerprint: 3f:63:bb:28:14:be:17:4e:c8:b6:43:9c:f0:8d:6d:56:f0:b7:c4:05:88:3a:56:48:a3:34:42:4d:6b:3e:c5:58
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIQQAE0jMIAAAAAAAAAATzyxjANBgkqhkiG9w0BAQwFADBQ
+MQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290
+IENBMRswGQYDVQQDExJUV0NBIENZQkVSIFJvb3QgQ0EwHhcNMjIxMTIyMDY1NDI5
+WhcNNDcxMTIyMTU1OTU5WjBQMQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FO
+LUNBMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJUV0NBIENZQkVSIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG+Moe2Qkgfh1sTs6P
+40czRJzHyWmqOlt47nDSkvgEs1JSHWdyKKHfi12VCv7qze33Kc7wb3+szT3vsxxF
+avcokPFhV8UMxKNQXd7UtcsZyoC5dc4pztKFIuwCY8xEMCDa6pFbVuYdHNWdZsc/
+34bKS1PE2Y2yHer43CdTo0fhYcx9tbD47nORxc5zb87uEB8aBs/pJ2DFTxnk684i
+JkXXYJndzk834H/nY62wuFm40AZoNWDTNq5xQwTxaWV4fPMf88oon1oglWa0zbfu
+j3ikRRjpJi+NmykosaS3Om251Bw4ckVYsV7r8Cibt4LK/c/WMw+f+5eesRycnupf
+Xtuq3VTpMCEobY5583WSjCb+3MX2w7DfRFlDo7YDKPYIMKoNM+HvnKkHIuNZW0CP
+2oi3aQiotyMuRAlZN1vH4xfyIutuOVLF3lSnmMlLIJXcRolftBL5hSmO68gnFSDA
+S9TMfAxsNAwmmyYxpjyn9tnQS6Jk/zuZQXLB4HCX8SS7K8R0IrGsayIyJNN4KsDA
+oS/xUgXJP+92ZuJF2A09rZXIx4kmyA+upwMu+8Ff+iDhcK2wZSA3M2Cw1a/XDBzC
+kHDXShi8fgGwsOsVHkQGzaRP6AzRwyAQ4VRlnrZR0Bp2a0JaWHY06rc3Ga4udfmW
+5cFZ95RXKSWNOkyrTZpB0F8mAwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSdhWEUfMFib5do5E83QOGt4A1WNzAd
+BgNVHQ4EFgQUnYVhFHzBYm+XaORPN0DhreANVjcwDQYJKoZIhvcNAQEMBQADggIB
+AGSPesRiDrWIzLjHhg6hShbNcAu3p4ULs3a2D6f/CIsLJc+o1IN1KriWiLb73y0t
+tGlTITVX1olNc79pj3CjYcya2x6a4CD4bLubIp1dhDGaLIrdaqHXKGnK/nZVekZn
+68xDiBaiA9a5F/gZbG0jAn/xX9AKKSM70aoK7akXJlQKTcKlTfjF/biBzysseKNn
+TKkHmvPfXvt89YnNdJdhEGoHK4Fa0o635yDRIG4kqIQnoVesqlVYL9zZyvpoBJ7t
+RCT5dEA7IzOrg1oYJkK2bVS1FmAwbLGg+LhBoF1JSdJlBTrq/p1hvIbZv97Tujqx
+f36SNI7JAG7cmL3c7IAFrQI932XtCwP39xaEBDG6k5TY8hL4iuO/Qq+n1M0RFxbI
+Qh0UqEL20kCGoE8jypZFVmAGzbdVAaYBlGX+bgUJurSkquLvWL69J1bY73NxW0Qz
+8ppy6rBePm6pUlvscG21h483XjyMnM7k8M4MZ0HMzvaAq07MTFb1wWFZk7Q+ptq4
+NxKfKjLji7gh7MMrZQzvIt6IKTtM1/r+t+FHvpw+PoP7UV31aPcuIYXcv/Fa4nzX
+xeSDwWrruoBa3lwtcHb4yOWHh8qgnaHlIhInD0Q9HWzq1MKLL295q39QpsQZp6F6
+t5b5wR9iWqJDB0BeJsas7a5wFsWqynKKTbDPAYsDP27X
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign Root CA12 O=Cybertrust Japan Co., Ltd.
+# Subject: CN=SecureSign Root CA12 O=Cybertrust Japan Co., Ltd.
+# Label: "SecureSign Root CA12"
+# Serial: 587887345431707215246142177076162061960426065942
+# MD5 Fingerprint: c6:89:ca:64:42:9b:62:08:49:0b:1e:7f:e9:07:3d:e8
+# SHA1 Fingerprint: 7a:22:1e:3d:de:1b:06:ac:9e:c8:47:70:16:8e:3c:e5:f7:6b:06:f4
+# SHA256 Fingerprint: 3f:03:4b:b5:70:4d:44:b2:d0:85:45:a0:20:57:de:93:eb:f3:90:5f:ce:72:1a:cb:c7:30:c0:6d:da:ee:90:4e
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUZvnHwa/swlG07VOX5uaCwysckBYwDQYJKoZIhvcNAQEL
+BQAwUTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28u
+LCBMdGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExMjAeFw0yMDA0MDgw
+NTM2NDZaFw00MDA0MDgwNTM2NDZaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpD
+eWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBS
+b290IENBMTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6OcE3emhF
+KxS06+QT61d1I02PJC0W6K6OyX2kVzsqdiUzg2zqMoqUm048luT9Ub+ZyZN+v/mt
+p7JIKwccJ/VMvHASd6SFVLX9kHrko+RRWAPNEHl57muTH2SOa2SroxPjcf59q5zd
+J1M3s6oYwlkm7Fsf0uZlfO+TvdhYXAvA42VvPMfKWeP+bl+sg779XSVOKik71gur
+FzJ4pOE+lEa+Ym6b3kaosRbnhW70CEBFEaCeVESE99g2zvVQR9wsMJvuwPWW0v4J
+hscGWa5Pro4RmHvzC1KqYiaqId+OJTN5lxZJjfU+1UefNzFJM3IFTQy2VYzxV4+K
+h9GtxRESOaCtAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBRXNPN0zwRL1SXm8UC2LEzZLemgrTANBgkqhkiG9w0BAQsF
+AAOCAQEAPrvbFxbS8hQBICw4g0utvsqFepq2m2um4fylOqyttCg6r9cBg0krY6Ld
+mmQOmFxv3Y67ilQiLUoT865AQ9tPkbeGGuwAtEGBpE/6aouIs3YIcipJQMPTw4WJ
+mBClnW8Zt7vPemVV2zfrPIpyMpcemik+rY3moxtt9XUa5rBouVui7mlHJzWhhpmA
+8zNL4WukJsPvdFlseqJkth5Ew1DgDzk9qTPxpfPSvWKErI4cqc1avTc7bgoitPQV
+55FYxTpE05Uo2cBl6XLK0A+9H7MV2anjpEcJnuDLN/v9vZfVvhgaaaI5gdka9at/
+yOPiZwud9AzqVN/Ssq+xIvEg37xEHA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign Root CA14 O=Cybertrust Japan Co., Ltd.
+# Subject: CN=SecureSign Root CA14 O=Cybertrust Japan Co., Ltd.
+# Label: "SecureSign Root CA14"
+# Serial: 575790784512929437950770173562378038616896959179
+# MD5 Fingerprint: 71:0d:72:fa:92:19:65:5e:89:04:ac:16:33:f0:bc:d5
+# SHA1 Fingerprint: dd:50:c0:f7:79:b3:64:2e:74:a2:b8:9d:9f:d3:40:dd:bb:f0:f2:4f
+# SHA256 Fingerprint: 4b:00:9c:10:34:49:4f:9a:b5:6b:ba:3b:a1:d6:27:31:fc:4d:20:d8:95:5a:dc:ec:10:a9:25:60:72:61:e3:38
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIUZNtaDCBO6Ncpd8hQJ6JaJ90t8sswDQYJKoZIhvcNAQEM
+BQAwUTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28u
+LCBMdGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExNDAeFw0yMDA0MDgw
+NzA2MTlaFw00NTA0MDgwNzA2MTlaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpD
+eWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBS
+b290IENBMTQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDF0nqh1oq/
+FjHQmNE6lPxauG4iwWL3pwon71D2LrGeaBLwbCRjOfHw3xDG3rdSINVSW0KZnvOg
+vlIfX8xnbacuUKLBl422+JX1sLrcneC+y9/3OPJH9aaakpUqYllQC6KxNedlsmGy
+6pJxaeQp8E+BgQQ8sqVb1MWoWWd7VRxJq3qdwudzTe/NCcLEVxLbAQ4jeQkHO6Lo
+/IrPj8BGJJw4J+CDnRugv3gVEOuGTgpa/d/aLIJ+7sr2KeH6caH3iGicnPCNvg9J
+kdjqOvn90Ghx2+m1K06Ckm9mH+Dw3EzsytHqunQG+bOEkJTRX45zGRBdAuVwpcAQ
+0BB8b8VYSbSwbprafZX1zNoCr7gsfXmPvkPx+SgojQlD+Ajda8iLLCSxjVIHvXib
+y8posqTdDEx5YMaZ0ZPxMBoH064iwurO8YQJzOAUbn8/ftKChazcqRZOhaBgy/ac
+18izju3Gm5h1DVXoX+WViwKkrkMpKBGk5hIwAUt1ax5mnXkvpXYvHUC0bcl9eQjs
+0Wq2XSqypWa9a4X0dFbD9ed1Uigspf9mR6XU/v6eVL9lfgHWMI+lNpyiUBzuOIAB
+SMbHdPTGrMNASRZhdCyvjG817XsYAFs2PJxQDcqSMxDxJklt33UkN4Ii1+iW/RVL
+ApY+B3KVfqs9TC7XyvDf4Fg/LS8EmjijAQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBpOjCl4oaTeqYR3r6/wtbyPk
+86AwDQYJKoZIhvcNAQEMBQADggIBAJaAcgkGfpzMkwQWu6A6jZJOtxEaCnFxEM0E
+rX+lRVAQZk5KQaID2RFPeje5S+LGjzJmdSX7684/AykmjbgWHfYfM25I5uj4V7Ib
+ed87hwriZLoAymzvftAj63iP/2SbNDefNWWipAA9EiOWWF3KY4fGoweITedpdopT
+zfFP7ELyk+OZpDc8h7hi2/DsHzc/N19DzFGdtfCXwreFamgLRB7lUe6TzktuhsHS
+DCRZNhqfLJGP4xjblJUK7ZGqDpncllPjYYPGFrojutzdfhrGe0K22VoF3Jpf1d+4
+2kd92jjbrDnVHmtsKheMYc2xbXIBw8MgAGJoFjHVdqqGuw6qnsb58Nn4DSEC5MUo
+FlkRudlpcyqSeLiSV5sI8jrlL5WwWLdrIBRtFO8KvH7YVdiI2i/6GaX7i+B/OfVy
+K4XELKzvGUWSTLNhB9xNH27SgRNcmvMSZ4PPmz+Ln52kuaiWA3rF7iDeM9ovnhp6
+dB7h7sxaOgTdsxoEqBRjrLdHEoOabPXm6RUVkRqEGQ6UROcSjiVbgGcZ3GOTEAtl
+Lor6CZpO2oYofaphNdgOpygau1LgePhsumywbrmHXumZNTfxPWQrqaA0k89jL9WB
+365jJ6UeTo3cKXhZ+PmhIIynJkBugnLNeLLIjzwec+fBH7/PzqUqm9tEZDKgu39c
+JRNItX+S
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign Root CA15 O=Cybertrust Japan Co., Ltd.
+# Subject: CN=SecureSign Root CA15 O=Cybertrust Japan Co., Ltd.
+# Label: "SecureSign Root CA15"
+# Serial: 126083514594751269499665114766174399806381178503
+# MD5 Fingerprint: 13:30:fc:c4:62:a6:a9:de:b5:c1:68:af:b5:d2:31:47
+# SHA1 Fingerprint: cb:ba:83:c8:c1:5a:5d:f1:f9:73:6f:ca:d7:ef:28:13:06:4a:07:7d
+# SHA256 Fingerprint: e7:78:f0:f0:95:fe:84:37:29:cd:1a:00:82:17:9e:53:14:a9:c2:91:44:28:05:e1:fb:1d:8f:b6:b8:88:6c:3a
+-----BEGIN CERTIFICATE-----
+MIICIzCCAamgAwIBAgIUFhXHw9hJp75pDIqI7fBw+d23PocwCgYIKoZIzj0EAwMw
+UTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28uLCBM
+dGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExNTAeFw0yMDA0MDgwODMy
+NTZaFw00NTA0MDgwODMyNTZaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJl
+cnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBSb290
+IENBMTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQLUHSNZDKZmbPSYAi4Io5GdCx4
+wCtELW1fHcmuS1Iggz24FG1Th2CeX2yF2wYUleDHKP+dX+Sq8bOLbe1PL0vJSpSR
+ZHX+AezB2Ot6lHhWGENfa4HL9rzatAy2KZMIaY+jQjBAMA8GA1UdEwEB/wQFMAMB
+Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTrQciu/NWeUUj1vYv0hyCTQSvT
+9DAKBggqhkjOPQQDAwNoADBlAjEA2S6Jfl5OpBEHvVnCB96rMjhTKkZEBhd6zlHp
+4P9mLQlO4E/0BdGF9jVg3PVys0Z9AjBEmEYagoUeYWmJSwdLZrWeqrqgHkHZAXQ6
+bkU6iYAZezKYVWOr62Nuk22rGwlgMU4=
+-----END CERTIFICATE-----
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index eff20408e93..de1ad1362d7 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -6,7 +6,7 @@ packaging==24.1
 platformdirs==4.2.2
 pyproject-hooks==1.0.0
 requests==2.32.3
-    certifi==2024.7.4
+    certifi==2024.8.30
     idna==3.7
     urllib3==1.26.20
 rich==13.7.1

From faf02acaf0dd372d42fd82040f6382cd4c9b228e Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 20 Oct 2024 14:20:12 -0400
Subject: [PATCH 599/992] Simplify hint message in invalid install error

---
 src/pip/_internal/exceptions.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index ee248396d8f..e977e5253ad 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -806,7 +806,6 @@ def __init__(
                 f"{invalid_type}s can not be processed."
             ),
             hint_stmt=(
-                "To proceed this package must be uninstalled using 'pip<24.1', "
-                "some other Python package tool, or manually deleted."
+                "To proceed this package must be uninstalled."
             ),
         )

From c558a4965708e1d7cdd6ca481182db2d677e455c Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 20 Oct 2024 14:24:10 -0400
Subject: [PATCH 600/992] Fix formatting

---
 src/pip/_internal/exceptions.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index e977e5253ad..45a876a850d 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -805,7 +805,5 @@ def __init__(
                 "Starting with pip 24.1, packages with invalid "
                 f"{invalid_type}s can not be processed."
             ),
-            hint_stmt=(
-                "To proceed this package must be uninstalled."
-            ),
+            hint_stmt="To proceed this package must be uninstalled.",
         )

From b4b4449477da7e8ae081ae7351cab146c663408a Mon Sep 17 00:00:00 2001
From: hauntsaninja 
Date: Thu, 17 Oct 2024 00:45:59 -0700
Subject: [PATCH 601/992] Upgrade to mypy 1.12.1

---
 .pre-commit-config.yaml                               | 2 +-
 news/10EC0CC0-C535-4B04-8924-CBF3DAA3315D.trivial.rst | 0
 src/pip/_internal/cli/parser.py                       | 4 ++--
 src/pip/_internal/cli/progress_bars.py                | 2 +-
 src/pip/_internal/locations/_distutils.py             | 6 +++---
 src/pip/_internal/network/lazy_wheel.py               | 2 +-
 src/pip/_internal/utils/misc.py                       | 7 +------
 tests/lib/test_wheel.py                               | 2 +-
 tests/lib/wheel.py                                    | 2 +-
 9 files changed, 11 insertions(+), 16 deletions(-)
 create mode 100644 news/10EC0CC0-C535-4B04-8924-CBF3DAA3315D.trivial.rst

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 27816138007..3a0319c2356 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -28,7 +28,7 @@ repos:
       args: [--fix, --exit-non-zero-on-fix]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.10.0
+  rev: v1.12.1
   hooks:
   - id: mypy
     exclude: tests/data
diff --git a/news/10EC0CC0-C535-4B04-8924-CBF3DAA3315D.trivial.rst b/news/10EC0CC0-C535-4B04-8924-CBF3DAA3315D.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/pip/_internal/cli/parser.py b/src/pip/_internal/cli/parser.py
index b7d7c1f600a..bc4aca032d4 100644
--- a/src/pip/_internal/cli/parser.py
+++ b/src/pip/_internal/cli/parser.py
@@ -6,7 +6,7 @@
 import sys
 import textwrap
 from contextlib import suppress
-from typing import Any, Dict, Generator, List, Optional, Tuple
+from typing import Any, Dict, Generator, List, NoReturn, Optional, Tuple
 
 from pip._internal.cli.status_codes import UNKNOWN_ERROR
 from pip._internal.configuration import Configuration, ConfigurationError
@@ -289,6 +289,6 @@ def get_default_values(self) -> optparse.Values:
                 defaults[option.dest] = option.check_value(opt_str, default)
         return optparse.Values(defaults)
 
-    def error(self, msg: str) -> None:
+    def error(self, msg: str) -> NoReturn:
         self.print_usage(sys.stderr)
         self.exit(UNKNOWN_ERROR, f"{msg}\n")
diff --git a/src/pip/_internal/cli/progress_bars.py b/src/pip/_internal/cli/progress_bars.py
index 883359c9ce7..1236180c086 100644
--- a/src/pip/_internal/cli/progress_bars.py
+++ b/src/pip/_internal/cli/progress_bars.py
@@ -25,7 +25,7 @@ def _rich_progress_bar(
     iterable: Iterable[bytes],
     *,
     bar_type: str,
-    size: int,
+    size: Optional[int],
 ) -> Generator[bytes, None, None]:
     assert bar_type == "on", "This should only be used in the default mode."
 
diff --git a/src/pip/_internal/locations/_distutils.py b/src/pip/_internal/locations/_distutils.py
index 0e18c6e1e14..3d856256986 100644
--- a/src/pip/_internal/locations/_distutils.py
+++ b/src/pip/_internal/locations/_distutils.py
@@ -21,7 +21,7 @@
 from distutils.command.install import SCHEME_KEYS
 from distutils.command.install import install as distutils_install_command
 from distutils.sysconfig import get_python_lib
-from typing import Dict, List, Optional, Union, cast
+from typing import Dict, List, Optional, Union
 
 from pip._internal.models.scheme import Scheme
 from pip._internal.utils.compat import WINDOWS
@@ -64,7 +64,7 @@ def distutils_scheme(
     obj: Optional[DistutilsCommand] = None
     obj = d.get_command_obj("install", create=True)
     assert obj is not None
-    i = cast(distutils_install_command, obj)
+    i: distutils_install_command = obj
     # NOTE: setting user or home has the side-effect of creating the home dir
     # or user base for installations during finalize_options()
     # ideally, we'd prefer a scheme class that has no side-effects.
@@ -78,7 +78,7 @@ def distutils_scheme(
     i.root = root or i.root
     i.finalize_options()
 
-    scheme = {}
+    scheme: Dict[str, str] = {}
     for key in SCHEME_KEYS:
         scheme[key] = getattr(i, "install_" + key)
 
diff --git a/src/pip/_internal/network/lazy_wheel.py b/src/pip/_internal/network/lazy_wheel.py
index 82ec50d5106..03f883c1fc4 100644
--- a/src/pip/_internal/network/lazy_wheel.py
+++ b/src/pip/_internal/network/lazy_wheel.py
@@ -159,7 +159,7 @@ def _check_zip(self) -> None:
                 try:
                     # For read-only ZIP files, ZipFile only needs
                     # methods read, seek, seekable and tell.
-                    ZipFile(self)  # type: ignore
+                    ZipFile(self)
                 except BadZipFile:
                     pass
                 else:
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index f6f13ed121f..c0a3e4d3b9d 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -129,12 +129,7 @@ def rmtree(
         onexc = _onerror_ignore
     if onexc is None:
         onexc = _onerror_reraise
-    handler: OnErr = partial(
-        # `[func, path, Union[ExcInfo, BaseException]] -> Any` is equivalent to
-        # `Union[([func, path, ExcInfo] -> Any), ([func, path, BaseException] -> Any)]`.
-        cast(Union[OnExc, OnErr], rmtree_errorhandler),
-        onexc=onexc,
-    )
+    handler: OnErr = partial(rmtree_errorhandler, onexc=onexc)
     if sys.version_info >= (3, 12):
         # See https://docs.python.org/3.12/whatsnew/3.12.html#shutil.
         shutil.rmtree(dir, onexc=handler)  # type: ignore
diff --git a/tests/lib/test_wheel.py b/tests/lib/test_wheel.py
index a171484a549..abbfaf77ef5 100644
--- a/tests/lib/test_wheel.py
+++ b/tests/lib/test_wheel.py
@@ -80,7 +80,7 @@ def test_make_metadata_file_custom_value_overrides() -> None:
 
 def test_make_metadata_file_custom_contents() -> None:
     value = b"hello"
-    f = default_make_metadata(value=value)
+    f = default_make_metadata(value=value)  # type: ignore[arg-type]
     assert f is not None
     assert f.contents == value
 
diff --git a/tests/lib/wheel.py b/tests/lib/wheel.py
index 342abbacaad..e2634e72c86 100644
--- a/tests/lib/wheel.py
+++ b/tests/lib/wheel.py
@@ -109,7 +109,7 @@ def make_metadata_file(
 def make_wheel_metadata_file(
     name: str,
     version: str,
-    value: Defaulted[Optional[AnyStr]],
+    value: Defaulted[Union[bytes, str, None]],
     tags: Sequence[Tuple[str, str, str]],
     updates: Defaulted[Dict[str, HeaderValue]],
 ) -> Optional[File]:

From 0cc7375ff0a42ddfa19f23f42cb96d6d7c06d29b Mon Sep 17 00:00:00 2001
From: Seth Michael Larson 
Date: Thu, 24 Oct 2024 08:22:30 -0500
Subject: [PATCH 602/992] Upgrade vendored truststore to 0.10.0

---
 news/truststore.vendor.rst             |   2 +-
 src/pip/_vendor/truststore/__init__.py |   2 +-
 src/pip/_vendor/truststore/_api.py     |   3 +
 src/pip/_vendor/truststore/_macos.py   | 200 +++++++++++++++++--------
 src/pip/_vendor/truststore/_windows.py |   7 +-
 src/pip/_vendor/vendor.txt             |   2 +-
 6 files changed, 147 insertions(+), 69 deletions(-)

diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst
index b75c1316454..d5d1e15823f 100644
--- a/news/truststore.vendor.rst
+++ b/news/truststore.vendor.rst
@@ -1 +1 @@
-Upgrade truststore to 0.9.2
+Upgrade truststore to 0.10.0
diff --git a/src/pip/_vendor/truststore/__init__.py b/src/pip/_vendor/truststore/__init__.py
index b7d46aee262..e468bf8cebd 100644
--- a/src/pip/_vendor/truststore/__init__.py
+++ b/src/pip/_vendor/truststore/__init__.py
@@ -33,4 +33,4 @@
 del _api, _sys  # type: ignore[name-defined] # noqa: F821
 
 __all__ = ["SSLContext", "inject_into_ssl", "extract_from_ssl"]
-__version__ = "0.9.2"
+__version__ = "0.10.0"
diff --git a/src/pip/_vendor/truststore/_api.py b/src/pip/_vendor/truststore/_api.py
index b1ea3b05c6d..aeb023af756 100644
--- a/src/pip/_vendor/truststore/_api.py
+++ b/src/pip/_vendor/truststore/_api.py
@@ -169,6 +169,9 @@ def session_stats(self) -> dict[str, int]:
     def cert_store_stats(self) -> dict[str, int]:
         raise NotImplementedError()
 
+    def set_default_verify_paths(self) -> None:
+        self._ctx.set_default_verify_paths()
+
     @typing.overload
     def get_ca_certs(
         self, binary_form: typing.Literal[False] = ...
diff --git a/src/pip/_vendor/truststore/_macos.py b/src/pip/_vendor/truststore/_macos.py
index b234ffec723..34503077244 100644
--- a/src/pip/_vendor/truststore/_macos.py
+++ b/src/pip/_vendor/truststore/_macos.py
@@ -25,6 +25,8 @@
         f"Only OS X 10.8 and newer are supported, not {_mac_version_info[0]}.{_mac_version_info[1]}"
     )
 
+_is_macos_version_10_14_or_later = _mac_version_info >= (10, 14)
+
 
 def _load_cdll(name: str, macos10_16_path: str) -> CDLL:
     """Loads a CDLL by name, falling back to known path on 10.16+"""
@@ -115,6 +117,12 @@ def _load_cdll(name: str, macos10_16_path: str) -> CDLL:
     ]
     Security.SecTrustGetTrustResult.restype = OSStatus
 
+    Security.SecTrustEvaluate.argtypes = [
+        SecTrustRef,
+        POINTER(SecTrustResultType),
+    ]
+    Security.SecTrustEvaluate.restype = OSStatus
+
     Security.SecTrustRef = SecTrustRef  # type: ignore[attr-defined]
     Security.SecTrustResultType = SecTrustResultType  # type: ignore[attr-defined]
     Security.OSStatus = OSStatus  # type: ignore[attr-defined]
@@ -197,8 +205,19 @@ def _load_cdll(name: str, macos10_16_path: str) -> CDLL:
     CoreFoundation.CFStringRef = CFStringRef  # type: ignore[attr-defined]
     CoreFoundation.CFErrorRef = CFErrorRef  # type: ignore[attr-defined]
 
-except AttributeError:
-    raise ImportError("Error initializing ctypes") from None
+except AttributeError as e:
+    raise ImportError(f"Error initializing ctypes: {e}") from None
+
+# SecTrustEvaluateWithError is macOS 10.14+
+if _is_macos_version_10_14_or_later:
+    try:
+        Security.SecTrustEvaluateWithError.argtypes = [
+            SecTrustRef,
+            POINTER(CFErrorRef),
+        ]
+        Security.SecTrustEvaluateWithError.restype = c_bool
+    except AttributeError as e:
+        raise ImportError(f"Error initializing ctypes: {e}") from None
 
 
 def _handle_osstatus(result: OSStatus, _: typing.Any, args: typing.Any) -> typing.Any:
@@ -258,6 +277,7 @@ def _handle_osstatus(result: OSStatus, _: typing.Any, args: typing.Any) -> typin
 Security.SecTrustSetAnchorCertificates.errcheck = _handle_osstatus  # type: ignore[assignment]
 Security.SecTrustSetAnchorCertificatesOnly.errcheck = _handle_osstatus  # type: ignore[assignment]
 Security.SecTrustGetTrustResult.errcheck = _handle_osstatus  # type: ignore[assignment]
+Security.SecTrustEvaluate.errcheck = _handle_osstatus  # type: ignore[assignment]
 
 
 class CFConst:
@@ -365,9 +385,10 @@ def _verify_peercerts_impl(
     certs = None
     policies = None
     trust = None
-    cf_error = None
     try:
-        if server_hostname is not None:
+        # Only set a hostname on the policy if we're verifying the hostname
+        # on the leaf certificate.
+        if server_hostname is not None and ssl_context.check_hostname:
             cf_str_hostname = None
             try:
                 cf_str_hostname = _bytes_to_cf_string(server_hostname.encode("ascii"))
@@ -431,69 +452,120 @@ def _verify_peercerts_impl(
         # We always want system certificates.
         Security.SecTrustSetAnchorCertificatesOnly(trust, False)
 
-        cf_error = CoreFoundation.CFErrorRef()
-        sec_trust_eval_result = Security.SecTrustEvaluateWithError(
-            trust, ctypes.byref(cf_error)
-        )
-        # sec_trust_eval_result is a bool (0 or 1)
-        # where 1 means that the certs are trusted.
-        if sec_trust_eval_result == 1:
-            is_trusted = True
-        elif sec_trust_eval_result == 0:
-            is_trusted = False
+        # macOS 10.13 and earlier don't support SecTrustEvaluateWithError()
+        # so we use SecTrustEvaluate() which means we need to construct error
+        # messages ourselves.
+        if _is_macos_version_10_14_or_later:
+            _verify_peercerts_impl_macos_10_14(ssl_context, trust)
         else:
-            raise ssl.SSLError(
-                f"Unknown result from Security.SecTrustEvaluateWithError: {sec_trust_eval_result!r}"
-            )
-
-        cf_error_code = 0
-        if not is_trusted:
-            cf_error_code = CoreFoundation.CFErrorGetCode(cf_error)
-
-            # If the error is a known failure that we're
-            # explicitly okay with from SSLContext configuration
-            # we can set is_trusted accordingly.
-            if ssl_context.verify_mode != ssl.CERT_REQUIRED and (
-                cf_error_code == CFConst.errSecNotTrusted
-                or cf_error_code == CFConst.errSecCertificateExpired
-            ):
-                is_trusted = True
-            elif (
-                not ssl_context.check_hostname
-                and cf_error_code == CFConst.errSecHostNameMismatch
-            ):
-                is_trusted = True
-
-        # If we're still not trusted then we start to
-        # construct and raise the SSLCertVerificationError.
-        if not is_trusted:
-            cf_error_string_ref = None
-            try:
-                cf_error_string_ref = CoreFoundation.CFErrorCopyDescription(cf_error)
-
-                # Can this ever return 'None' if there's a CFError?
-                cf_error_message = (
-                    _cf_string_ref_to_str(cf_error_string_ref)
-                    or "Certificate verification failed"
-                )
-
-                # TODO: Not sure if we need the SecTrustResultType for anything?
-                # We only care whether or not it's a success or failure for now.
-                sec_trust_result_type = Security.SecTrustResultType()
-                Security.SecTrustGetTrustResult(
-                    trust, ctypes.byref(sec_trust_result_type)
-                )
-
-                err = ssl.SSLCertVerificationError(cf_error_message)
-                err.verify_message = cf_error_message
-                err.verify_code = cf_error_code
-                raise err
-            finally:
-                if cf_error_string_ref:
-                    CoreFoundation.CFRelease(cf_error_string_ref)
-
+            _verify_peercerts_impl_macos_10_13(ssl_context, trust)
     finally:
         if policies:
             CoreFoundation.CFRelease(policies)
         if trust:
             CoreFoundation.CFRelease(trust)
+
+
+def _verify_peercerts_impl_macos_10_13(
+    ssl_context: ssl.SSLContext, sec_trust_ref: typing.Any
+) -> None:
+    """Verify using 'SecTrustEvaluate' API for macOS 10.13 and earlier.
+    macOS 10.14 added the 'SecTrustEvaluateWithError' API.
+    """
+    sec_trust_result_type = Security.SecTrustResultType()
+    Security.SecTrustEvaluate(sec_trust_ref, ctypes.byref(sec_trust_result_type))
+
+    try:
+        sec_trust_result_type_as_int = int(sec_trust_result_type.value)
+    except (ValueError, TypeError):
+        sec_trust_result_type_as_int = -1
+
+    # Apple doesn't document these values in their own API docs.
+    # See: https://github.com/xybp888/iOS-SDKs/blob/master/iPhoneOS13.0.sdk/System/Library/Frameworks/Security.framework/Headers/SecTrust.h#L84
+    if (
+        ssl_context.verify_mode == ssl.CERT_REQUIRED
+        and sec_trust_result_type_as_int not in (1, 4)
+    ):
+        # Note that we're not able to ignore only hostname errors
+        # for macOS 10.13 and earlier, so check_hostname=False will
+        # still return an error.
+        sec_trust_result_type_to_message = {
+            0: "Invalid trust result type",
+            # 1: "Trust evaluation succeeded",
+            2: "User confirmation required",
+            3: "User specified that certificate is not trusted",
+            # 4: "Trust result is unspecified",
+            5: "Recoverable trust failure occurred",
+            6: "Fatal trust failure occurred",
+            7: "Other error occurred, certificate may be revoked",
+        }
+        error_message = sec_trust_result_type_to_message.get(
+            sec_trust_result_type_as_int,
+            f"Unknown trust result: {sec_trust_result_type_as_int}",
+        )
+
+        err = ssl.SSLCertVerificationError(error_message)
+        err.verify_message = error_message
+        err.verify_code = sec_trust_result_type_as_int
+        raise err
+
+
+def _verify_peercerts_impl_macos_10_14(
+    ssl_context: ssl.SSLContext, sec_trust_ref: typing.Any
+) -> None:
+    """Verify using 'SecTrustEvaluateWithError' API for macOS 10.14+."""
+    cf_error = CoreFoundation.CFErrorRef()
+    sec_trust_eval_result = Security.SecTrustEvaluateWithError(
+        sec_trust_ref, ctypes.byref(cf_error)
+    )
+    # sec_trust_eval_result is a bool (0 or 1)
+    # where 1 means that the certs are trusted.
+    if sec_trust_eval_result == 1:
+        is_trusted = True
+    elif sec_trust_eval_result == 0:
+        is_trusted = False
+    else:
+        raise ssl.SSLError(
+            f"Unknown result from Security.SecTrustEvaluateWithError: {sec_trust_eval_result!r}"
+        )
+
+    cf_error_code = 0
+    if not is_trusted:
+        cf_error_code = CoreFoundation.CFErrorGetCode(cf_error)
+
+        # If the error is a known failure that we're
+        # explicitly okay with from SSLContext configuration
+        # we can set is_trusted accordingly.
+        if ssl_context.verify_mode != ssl.CERT_REQUIRED and (
+            cf_error_code == CFConst.errSecNotTrusted
+            or cf_error_code == CFConst.errSecCertificateExpired
+        ):
+            is_trusted = True
+
+    # If we're still not trusted then we start to
+    # construct and raise the SSLCertVerificationError.
+    if not is_trusted:
+        cf_error_string_ref = None
+        try:
+            cf_error_string_ref = CoreFoundation.CFErrorCopyDescription(cf_error)
+
+            # Can this ever return 'None' if there's a CFError?
+            cf_error_message = (
+                _cf_string_ref_to_str(cf_error_string_ref)
+                or "Certificate verification failed"
+            )
+
+            # TODO: Not sure if we need the SecTrustResultType for anything?
+            # We only care whether or not it's a success or failure for now.
+            sec_trust_result_type = Security.SecTrustResultType()
+            Security.SecTrustGetTrustResult(
+                sec_trust_ref, ctypes.byref(sec_trust_result_type)
+            )
+
+            err = ssl.SSLCertVerificationError(cf_error_message)
+            err.verify_message = cf_error_message
+            err.verify_code = cf_error_code
+            raise err
+        finally:
+            if cf_error_string_ref:
+                CoreFoundation.CFRelease(cf_error_string_ref)
diff --git a/src/pip/_vendor/truststore/_windows.py b/src/pip/_vendor/truststore/_windows.py
index 3d00d467f99..a9bf9abdfc8 100644
--- a/src/pip/_vendor/truststore/_windows.py
+++ b/src/pip/_vendor/truststore/_windows.py
@@ -212,6 +212,7 @@ class CERT_CHAIN_ENGINE_CONFIG(Structure):
 CERT_CHAIN_POLICY_IGNORE_ALL_REV_UNKNOWN_FLAGS = 0x00000F00
 CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG = 0x00008000
 CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG = 0x00004000
+SECURITY_FLAG_IGNORE_CERT_CN_INVALID = 0x00001000
 AUTHTYPE_SERVER = 2
 CERT_CHAIN_POLICY_SSL = 4
 FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000
@@ -443,6 +444,10 @@ def _get_and_verify_cert_chain(
         )
         ssl_extra_cert_chain_policy_para.dwAuthType = AUTHTYPE_SERVER
         ssl_extra_cert_chain_policy_para.fdwChecks = 0
+        if ssl_context.check_hostname is False:
+            ssl_extra_cert_chain_policy_para.fdwChecks = (
+                SECURITY_FLAG_IGNORE_CERT_CN_INVALID
+            )
         if server_hostname:
             ssl_extra_cert_chain_policy_para.pwszServerName = c_wchar_p(server_hostname)
 
@@ -452,8 +457,6 @@ def _get_and_verify_cert_chain(
         )
         if ssl_context.verify_mode == ssl.CERT_NONE:
             chain_policy.dwFlags |= CERT_CHAIN_POLICY_VERIFY_MODE_NONE_FLAGS
-        if not ssl_context.check_hostname:
-            chain_policy.dwFlags |= CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG
         chain_policy.cbSize = sizeof(chain_policy)
 
         pPolicyPara = pointer(chain_policy)
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 8f9e3773cb3..d23b6735861 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -15,4 +15,4 @@ rich==13.7.1
 resolvelib==1.0.1
 setuptools==70.3.0
 tomli==2.0.1
-truststore==0.9.2
+truststore==0.10.0

From 27f8374e8dd49141bd2397c0e8e8093cf3676ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 26 Oct 2024 12:01:30 +0200
Subject: [PATCH 603/992] Update AUTHORS.txt

---
 AUTHORS.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index dda2ac30f85..8ccefbc6e59 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -57,6 +57,7 @@ Anthony Sottile
 Antoine Musso
 Anton Ovchinnikov
 Anton Patrushev
+Anton Zelenov
 Antonio Alvarado Hernandez
 Antony Lee
 Antti Kaihola
@@ -225,6 +226,7 @@ Diego Ramirez
 DiegoCaraballo
 Dimitri Merejkowsky
 Dimitri Papadopoulos
+Dimitri Papadopoulos Orfanos
 Dirk Stolle
 Dmitry Gladkov
 Dmitry Volodin
@@ -690,6 +692,7 @@ snook92
 socketubs
 Sorin Sbarnea
 Srinivas Nyayapati
+Srishti Hegde
 Stavros Korokithakis
 Stefan Scherfke
 Stefano Rivera

From cdba22f49b425fe4a57a8daf992fd6335c8010a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 26 Oct 2024 12:09:10 +0200
Subject: [PATCH 604/992] Bump for release

---
 NEWS.rst                                      | 31 +++++++++++++++++++
 ...C0-C535-4B04-8924-CBF3DAA3315D.trivial.rst |  0
 news/12653.feature.rst                        |  2 --
 news/12678.trivial.rst                        |  1 -
 news/12893.trivial.rst                        |  1 -
 news/12894.trivial.rst                        |  1 -
 news/12895.trivial.rst                        |  1 -
 news/12918.removal.rst                        |  1 -
 news/12939.trivial.rst                        |  1 -
 news/12953.bugfix.rst                         |  1 -
 news/12961.feature.rst                        |  1 -
 news/12964.trivial.rst                        |  1 -
 news/12974.trivial.rst                        |  1 -
 news/13012.trivial.rst                        |  1 -
 news/13013.trivial.rst                        |  1 -
 ...b8-cdb9-4b08-9292-24ce5a135e04.trivial.rst |  0
 news/8438.bugfix.rst                          | 10 ------
 ...2D-6619-44D8-811F-2C1973A430BB.trivial.rst |  0
 ...68-49B1-49EF-8B16-70491B9C8FDA.trivial.rst |  0
 news/certifi.vendor.rst                       |  1 -
 news/distlib.vendor.rst                       |  1 -
 news/truststore.vendor.rst                    |  1 -
 news/urllib3.vendor.rst                       |  1 -
 src/pip/__init__.py                           |  2 +-
 24 files changed, 32 insertions(+), 29 deletions(-)
 delete mode 100644 news/10EC0CC0-C535-4B04-8924-CBF3DAA3315D.trivial.rst
 delete mode 100644 news/12653.feature.rst
 delete mode 100644 news/12678.trivial.rst
 delete mode 100644 news/12893.trivial.rst
 delete mode 100644 news/12894.trivial.rst
 delete mode 100644 news/12895.trivial.rst
 delete mode 100644 news/12918.removal.rst
 delete mode 100644 news/12939.trivial.rst
 delete mode 100644 news/12953.bugfix.rst
 delete mode 100644 news/12961.feature.rst
 delete mode 100644 news/12964.trivial.rst
 delete mode 100644 news/12974.trivial.rst
 delete mode 100644 news/13012.trivial.rst
 delete mode 100644 news/13013.trivial.rst
 delete mode 100644 news/5ab8c2b8-cdb9-4b08-9292-24ce5a135e04.trivial.rst
 delete mode 100644 news/8438.bugfix.rst
 delete mode 100644 news/A454782D-6619-44D8-811F-2C1973A430BB.trivial.rst
 delete mode 100644 news/F2CF2568-49B1-49EF-8B16-70491B9C8FDA.trivial.rst
 delete mode 100644 news/certifi.vendor.rst
 delete mode 100644 news/distlib.vendor.rst
 delete mode 100644 news/truststore.vendor.rst
 delete mode 100644 news/urllib3.vendor.rst

diff --git a/NEWS.rst b/NEWS.rst
index 397277444bc..eb06d0ef39c 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,37 @@
 
 .. towncrier release notes start
 
+24.3 (2024-10-26)
+=================
+
+Deprecations and Removals
+-------------------------
+
+- Deprecate wheel filenames that are not compliant with :pep:`440`. (`#12918 `_)
+
+Features
+--------
+
+- Detect recursively referencing requirements files and help users identify
+  the source. (`#12653 `_)
+- Support for :pep:`730` iOS wheels. (`#12961 `_)
+
+Bug Fixes
+---------
+
+- Display a better error message when an already installed package has an invalid requirement. (`#12953 `_)
+- Ignore ``PIP_TARGET`` and ``pip.conf`` ``global.target`` when preparing a build environment. (`#8438 `_)
+- Restore support for macOS 10.12 and older (via truststore). (`#12901 `_)
+- Allow installing pip in editable mode in a virtual environment on Windows. (`#12666 `_)
+
+Vendored Libraries
+------------------
+
+- Upgrade certifi to 2024.8.30
+- Upgrade distlib to 0.3.9
+- Upgrade truststore to 0.10.0
+- Upgrade urllib3 to 1.26.20
+
 24.2 (2024-07-28)
 =================
 
diff --git a/news/10EC0CC0-C535-4B04-8924-CBF3DAA3315D.trivial.rst b/news/10EC0CC0-C535-4B04-8924-CBF3DAA3315D.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/12653.feature.rst b/news/12653.feature.rst
deleted file mode 100644
index 83e1a46e6a8..00000000000
--- a/news/12653.feature.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Detect recursively referencing requirements files and help users identify
-the source.
diff --git a/news/12678.trivial.rst b/news/12678.trivial.rst
deleted file mode 100644
index 57f38781bc4..00000000000
--- a/news/12678.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update classifier to support Python 3.13
diff --git a/news/12893.trivial.rst b/news/12893.trivial.rst
deleted file mode 100644
index d0a0de14310..00000000000
--- a/news/12893.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update ruff in pre-commit to 0.5.6
diff --git a/news/12894.trivial.rst b/news/12894.trivial.rst
deleted file mode 100644
index 51e4c8b0338..00000000000
--- a/news/12894.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add Ruff's Pytest rules to the tests directory.
diff --git a/news/12895.trivial.rst b/news/12895.trivial.rst
deleted file mode 100644
index ab159a6cc7d..00000000000
--- a/news/12895.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove IRC link from create issue page.
diff --git a/news/12918.removal.rst b/news/12918.removal.rst
deleted file mode 100644
index c5a52cf66e1..00000000000
--- a/news/12918.removal.rst
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate wheel filenames that are not compliant with PEP 440.
diff --git a/news/12939.trivial.rst b/news/12939.trivial.rst
deleted file mode 100644
index c9acd4f8c54..00000000000
--- a/news/12939.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update non PEP 440 wheel filename deprecation notice.
diff --git a/news/12953.bugfix.rst b/news/12953.bugfix.rst
deleted file mode 100644
index f2d0521b20e..00000000000
--- a/news/12953.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Display disagnostic error message when already installed package has an invalid requirement.
diff --git a/news/12961.feature.rst b/news/12961.feature.rst
deleted file mode 100644
index e4e982db13b..00000000000
--- a/news/12961.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Support for PEP 730 iOS wheels was added.
diff --git a/news/12964.trivial.rst b/news/12964.trivial.rst
deleted file mode 100644
index 1467743ff13..00000000000
--- a/news/12964.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-A valid, but non-existent URL used in a test case was corrected to be a valid URL.
diff --git a/news/12974.trivial.rst b/news/12974.trivial.rst
deleted file mode 100644
index d1c31fb177a..00000000000
--- a/news/12974.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Create two new import groups, "vendored" and "import", this only affects tests.
diff --git a/news/13012.trivial.rst b/news/13012.trivial.rst
deleted file mode 100644
index 623523a9e09..00000000000
--- a/news/13012.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Clean up non PEP 440 wheel filename deprecation language.
diff --git a/news/13013.trivial.rst b/news/13013.trivial.rst
deleted file mode 100644
index 75e724363a3..00000000000
--- a/news/13013.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove InvalidVersion exception catch for parse_{sdist,wheel}_filename.
diff --git a/news/5ab8c2b8-cdb9-4b08-9292-24ce5a135e04.trivial.rst b/news/5ab8c2b8-cdb9-4b08-9292-24ce5a135e04.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/8438.bugfix.rst b/news/8438.bugfix.rst
deleted file mode 100644
index cedd5d799ac..00000000000
--- a/news/8438.bugfix.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-If the user's pip.conf includes a target directory setting,
-attempting to install a package in editable mode or from source
-results in a fatal error during the installation of setuptools.
-
-The following assertion triggers:
-assert not (home and prefix), "home={} prefix={}".format(home, prefix)
-
-To avoid this issue when building a package, the target
-setting should be ignored. This can be achieved by passing an empty
-target when installing dependencies in the BuildEnvironment class.
diff --git a/news/A454782D-6619-44D8-811F-2C1973A430BB.trivial.rst b/news/A454782D-6619-44D8-811F-2C1973A430BB.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/F2CF2568-49B1-49EF-8B16-70491B9C8FDA.trivial.rst b/news/F2CF2568-49B1-49EF-8B16-70491B9C8FDA.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
deleted file mode 100644
index ad9c985c3eb..00000000000
--- a/news/certifi.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade certifi to 2024.8.30
diff --git a/news/distlib.vendor.rst b/news/distlib.vendor.rst
deleted file mode 100644
index 428113e8b67..00000000000
--- a/news/distlib.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade distlib to 0.3.9
diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst
deleted file mode 100644
index d5d1e15823f..00000000000
--- a/news/truststore.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade truststore to 0.10.0
diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst
deleted file mode 100644
index 6b66de2fd00..00000000000
--- a/news/urllib3.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade urllib3 to 1.26.20
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index bfc5eb111a0..4944cf45667 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.3.dev0"
+__version__ = "24.3"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From e1b1d51fe8d0f4b84b77206173ceb656caa2edeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 26 Oct 2024 12:09:15 +0200
Subject: [PATCH 605/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 4944cf45667..4eff4299c01 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.3"
+__version__ = "25.0.dev0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 7be54ced1cca2c850e79e8fbe9ec2b76947b2b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 27 Oct 2024 14:52:16 +0100
Subject: [PATCH 606/992] Don't fail when the same req file is included more
 than once

---
 news/13046.bugfix.rst             |  1 +
 src/pip/_internal/req/req_file.py | 23 ++++++++++++++---------
 tests/unit/test_req_file.py       | 13 +++++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 news/13046.bugfix.rst

diff --git a/news/13046.bugfix.rst b/news/13046.bugfix.rst
new file mode 100644
index 00000000000..41aae012414
--- /dev/null
+++ b/news/13046.bugfix.rst
@@ -0,0 +1 @@
+Allow multiple inclusion of the same requirements file again.
diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index 55c0726f370..eb2a1f69921 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -324,19 +324,20 @@ def __init__(
     ) -> None:
         self._session = session
         self._line_parser = line_parser
-        self._parsed_files: dict[str, Optional[str]] = {}
 
     def parse(
         self, filename: str, constraint: bool
     ) -> Generator[ParsedLine, None, None]:
         """Parse a given file, yielding parsed lines."""
-        self._parsed_files[os.path.abspath(filename)] = (
-            None  # The primary requirements file passed
+        yield from self._parse_and_recurse(
+            filename, constraint, [{os.path.abspath(filename): None}]
         )
-        yield from self._parse_and_recurse(filename, constraint)
 
     def _parse_and_recurse(
-        self, filename: str, constraint: bool
+        self,
+        filename: str,
+        constraint: bool,
+        parsed_files_stack: List[Dict[str, Optional[str]]],
     ) -> Generator[ParsedLine, None, None]:
         for line in self._parse_file(filename, constraint):
             if not line.is_requirement and (
@@ -364,8 +365,9 @@ def _parse_and_recurse(
                             req_path,
                         )
                     )
-                if req_path in self._parsed_files:
-                    initial_file = self._parsed_files[req_path]
+                parsed_files = parsed_files_stack[0]
+                if req_path in parsed_files:
+                    initial_file = parsed_files[req_path]
                     tail = (
                         f" and again in {initial_file}"
                         if initial_file is not None
@@ -375,8 +377,11 @@ def _parse_and_recurse(
                         f"{req_path} recursively references itself in {filename}{tail}"
                     )
                 # Keeping a track where was each file first included in
-                self._parsed_files[req_path] = filename
-                yield from self._parse_and_recurse(req_path, nested_constraint)
+                new_parsed_files = parsed_files.copy()
+                new_parsed_files[req_path] = filename
+                yield from self._parse_and_recurse(
+                    req_path, nested_constraint, [new_parsed_files, *parsed_files_stack]
+                )
             else:
                 yield line
 
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 7593e55d679..1cc030681db 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -347,6 +347,19 @@ def test_nested_constraints_file(
         assert reqs[0].name == req_name
         assert reqs[0].constraint
 
+    def test_repeated_requirement_files(
+        self, tmp_path: Path, session: PipSession
+    ) -> None:
+        # Test that the same requirements file can be included multiple times
+        # as long as there is no recursion. https://github.com/pypa/pip/issues/13046
+        tmp_path.joinpath("a.txt").write_text("requests")
+        tmp_path.joinpath("b.txt").write_text("-r a.txt")
+        tmp_path.joinpath("c.txt").write_text("-r a.txt\n-r b.txt")
+        parsed = parse_requirements(
+            filename=os.fspath(tmp_path.joinpath("c.txt")), session=session
+        )
+        assert [r.requirement for r in parsed] == ["requests", "requests"]
+
     def test_recursive_requirements_file(
         self, tmpdir: Path, session: PipSession
     ) -> None:

From 05293b6b55eca86490b7c2944bcc558a56064f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 27 Oct 2024 19:07:08 +0100
Subject: [PATCH 607/992] Bump for release

---
 NEWS.rst              | 10 +++++++++-
 news/13046.bugfix.rst |  1 -
 src/pip/__init__.py   |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
 delete mode 100644 news/13046.bugfix.rst

diff --git a/NEWS.rst b/NEWS.rst
index eb06d0ef39c..5ebf7141b1d 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,7 +9,15 @@
 
 .. towncrier release notes start
 
-24.3 (2024-10-26)
+24.3.1 (2024-10-27)
+===================
+
+Bug Fixes
+---------
+
+- Allow multiple nested inclusions of the same requirements file again. (`#13046 `_)
+
+24.3 (2024-10-27)
 =================
 
 Deprecations and Removals
diff --git a/news/13046.bugfix.rst b/news/13046.bugfix.rst
deleted file mode 100644
index 41aae012414..00000000000
--- a/news/13046.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Allow multiple inclusion of the same requirements file again.
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 4eff4299c01..efefccffc7a 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "25.0.dev0"
+__version__ = "24.3.1"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 0f9e23806a3cd527191039c58cce13e69abf91b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 27 Oct 2024 19:07:10 +0100
Subject: [PATCH 608/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index efefccffc7a..4eff4299c01 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "24.3.1"
+__version__ = "25.0.dev0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 69533e36615730320277ae88479348d99be4fb91 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 3 Nov 2024 14:43:19 -0500
Subject: [PATCH 609/992] Skip self version check on EXTERNALLY-MANAGED
 environments

---
 news/11820.bugfix.rst                    |  1 +
 src/pip/_internal/self_outdated_check.py | 10 +++++++++-
 tests/unit/test_self_check_outdated.py   | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 news/11820.bugfix.rst

diff --git a/news/11820.bugfix.rst b/news/11820.bugfix.rst
new file mode 100644
index 00000000000..68b23ef11ec
--- /dev/null
+++ b/news/11820.bugfix.rst
@@ -0,0 +1 @@
+The pip version self check is disabled on ``EXTERNALLY-MANAGED`` environments.
diff --git a/src/pip/_internal/self_outdated_check.py b/src/pip/_internal/self_outdated_check.py
index f9a91af9d84..2e0e3df3542 100644
--- a/src/pip/_internal/self_outdated_check.py
+++ b/src/pip/_internal/self_outdated_check.py
@@ -26,7 +26,11 @@
     get_best_invocation_for_this_python,
 )
 from pip._internal.utils.filesystem import adjacent_tmp_file, check_path_owner, replace
-from pip._internal.utils.misc import ensure_dir
+from pip._internal.utils.misc import (
+    ExternallyManagedEnvironment,
+    check_externally_managed,
+    ensure_dir,
+)
 
 _WEEK = datetime.timedelta(days=7)
 
@@ -231,6 +235,10 @@ def pip_self_version_check(session: PipSession, options: optparse.Values) -> Non
     installed_dist = get_default_environment().get_distribution("pip")
     if not installed_dist:
         return
+    try:
+        check_externally_managed()
+    except ExternallyManagedEnvironment:
+        return
 
     upgrade_prompt = _self_version_check_logic(
         state=SelfCheckState(cache_dir=options.cache_dir),
diff --git a/tests/unit/test_self_check_outdated.py b/tests/unit/test_self_check_outdated.py
index 38ce648a09d..a5310ca7b19 100644
--- a/tests/unit/test_self_check_outdated.py
+++ b/tests/unit/test_self_check_outdated.py
@@ -14,6 +14,8 @@
 from pip._vendor.packaging.version import Version
 
 from pip._internal import self_outdated_check
+from pip._internal.self_outdated_check import UpgradePrompt, pip_self_version_check
+from pip._internal.utils.misc import ExternallyManagedEnvironment
 
 
 @pytest.mark.parametrize(
@@ -185,3 +187,15 @@ def test_writes_expected_statefile(self, tmpdir: Path) -> None:
             "last_check": "2000-01-01T00:00:00+00:00",
             "pypi_version": "1.0.0",
         }
+
+
+@patch("pip._internal.self_outdated_check._self_version_check_logic")
+def test_suppressed_by_externally_managed(mocked_function: Mock, tmpdir: Path) -> None:
+    mocked_function.return_value = UpgradePrompt(old="1.0", new="2.0")
+    fake_options = Values({"cache_dir": str(tmpdir)})
+    with patch(
+        "pip._internal.self_outdated_check.check_externally_managed",
+        side_effect=ExternallyManagedEnvironment("nope"),
+    ):
+        pip_self_version_check(session=Mock(), options=fake_options)
+    mocked_function.assert_not_called()

From 099ae9703a2e15a7f90b82fa251c51be0f88d602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
Date: Sat, 9 Nov 2024 16:41:40 +0100
Subject: [PATCH 610/992] Override rich.console pipe handler for rich 13.8.0+

Explicitly override `rich.console.Console.on_broken_pipe()` to reraise
the original exception, to bring the behavior of rich 13.8.0+ in line
with older versions.  The new versions instead close output fds and exit
with error instead, which prevents pip's pipe handler from firing.
This is the minimal change needed to make pip's test suite pass after
upgrading vendored rich.

Bug #13006
Bug #13072
---
 news/13072.trivial.rst             | 0
 src/pip/_internal/utils/logging.py | 9 ++++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 news/13072.trivial.rst

diff --git a/news/13072.trivial.rst b/news/13072.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/pip/_internal/utils/logging.py b/src/pip/_internal/utils/logging.py
index 41f6eb51a26..62035fc40ec 100644
--- a/src/pip/_internal/utils/logging.py
+++ b/src/pip/_internal/utils/logging.py
@@ -137,12 +137,19 @@ def __rich_console__(
             yield Segment("\n")
 
 
+class PipConsole(Console):
+    def on_broken_pipe(self) -> None:
+        # Reraise the original exception, rich 13.8.0+ exits by default
+        # instead, preventing our handler from firing.
+        raise BrokenPipeError() from None
+
+
 class RichPipStreamHandler(RichHandler):
     KEYWORDS: ClassVar[Optional[List[str]]] = []
 
     def __init__(self, stream: Optional[TextIO], no_color: bool) -> None:
         super().__init__(
-            console=Console(file=stream, no_color=no_color, soft_wrap=True),
+            console=PipConsole(file=stream, no_color=no_color, soft_wrap=True),
             show_time=False,
             show_level=False,
             show_path=False,

From 5beed92e9b3e9342991cb5829cdc6fa6d67af721 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 6 Dec 2024 20:29:22 -0500
Subject: [PATCH 611/992] Accommodate for recent pathname2url() changes
 upstream

- UNC paths converted to URLs now start with two slashes, like earlier (yes, really)
- Trailing slashes are now preserved on Windows, matching POSIX behaviour
---
 ...bb-2dcc-43d0-83ff-c762e7e55bf9.trivial.rst |  0
 tests/lib/__init__.py                         | 17 ++++++++++++
 tests/unit/test_collector.py                  | 20 ++++++++++++--
 tests/unit/test_urls.py                       | 26 +++++++------------
 4 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 news/ba0bd1bb-2dcc-43d0-83ff-c762e7e55bf9.trivial.rst

diff --git a/news/ba0bd1bb-2dcc-43d0-83ff-c762e7e55bf9.trivial.rst b/news/ba0bd1bb-2dcc-43d0-83ff-c762e7e55bf9.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py
index df142ba4438..44fa4053b73 100644
--- a/tests/lib/__init__.py
+++ b/tests/lib/__init__.py
@@ -29,6 +29,7 @@
     cast,
 )
 from urllib.parse import urlparse, urlunparse
+from urllib.request import pathname2url
 from zipfile import ZipFile
 
 import pytest
@@ -1379,6 +1380,10 @@ def __call__(
 
 CertFactory = Callable[[], str]
 
+# -------------------------------------------------------------------------
+# Accommodations for Windows path and URL changes in recent Python releases
+# -------------------------------------------------------------------------
+
 # versions containing fix/backport from https://github.com/python/cpython/pull/113563
 # which changed the behavior of `urllib.parse.urlun{parse,split}`
 url = "////path/to/file"
@@ -1394,3 +1399,15 @@ def __call__(
     sys.platform != "win32" or has_new_urlun_behavior,
     reason="testing windows behavior for older CPython",
 )
+
+# Trailing slashes are now preserved on Windows, matching POSIX behaviour.
+# BPO: https://github.com/python/cpython/issues/126212
+does_pathname2url_preserve_trailing_slash = pathname2url("C:/foo/").endswith("/")
+skip_needs_new_pathname2url_trailing_slash_behavior_win = pytest.mark.skipif(
+    sys.platform != "win32" or not does_pathname2url_preserve_trailing_slash,
+    reason="testing windows (pathname2url) behavior for newer CPython",
+)
+skip_needs_old_pathname2url_trailing_slash_behavior_win = pytest.mark.skipif(
+    sys.platform != "win32" or does_pathname2url_preserve_trailing_slash,
+    reason="testing windows (pathname2url) behavior for older CPython",
+)
diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py
index c527d5610a3..c7760a238f2 100644
--- a/tests/unit/test_collector.py
+++ b/tests/unit/test_collector.py
@@ -40,7 +40,9 @@
 from tests.lib import (
     TestData,
     make_test_link_collector,
+    skip_needs_new_pathname2url_trailing_slash_behavior_win,
     skip_needs_new_urlun_behavior_win,
+    skip_needs_old_pathname2url_trailing_slash_behavior_win,
     skip_needs_old_urlun_behavior_win,
 )
 
@@ -390,12 +392,26 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None:
         pytest.param(
             "file:///T:/path/with spaces/",
             "file:///T:/path/with%20spaces",
-            marks=skip_needs_old_urlun_behavior_win,
+            marks=[
+                skip_needs_old_urlun_behavior_win,
+                skip_needs_old_pathname2url_trailing_slash_behavior_win,
+            ],
         ),
         pytest.param(
             "file:///T:/path/with spaces/",
             "file://///T:/path/with%20spaces",
-            marks=skip_needs_new_urlun_behavior_win,
+            marks=[
+                skip_needs_new_urlun_behavior_win,
+                skip_needs_old_pathname2url_trailing_slash_behavior_win,
+            ],
+        ),
+        pytest.param(
+            "file:///T:/path/with spaces/",
+            "file://///T:/path/with%20spaces/",
+            marks=[
+                skip_needs_new_urlun_behavior_win,
+                skip_needs_new_pathname2url_trailing_slash_behavior_win,
+            ],
         ),
         # URL with Windows drive letter, running on non-windows
         # platform. The `:` after the drive should be quoted.
diff --git a/tests/unit/test_urls.py b/tests/unit/test_urls.py
index 539bf091fb2..0c145255080 100644
--- a/tests/unit/test_urls.py
+++ b/tests/unit/test_urls.py
@@ -6,11 +6,6 @@
 
 from pip._internal.utils.urls import path_to_url, url_to_path
 
-from tests.lib import (
-    skip_needs_new_urlun_behavior_win,
-    skip_needs_old_urlun_behavior_win,
-)
-
 
 @pytest.mark.skipif("sys.platform == 'win32'")
 def test_path_to_url_unix() -> None:
@@ -25,23 +20,22 @@ def test_path_to_url_unix() -> None:
     [
         pytest.param("c:/tmp/file", "file:///C:/tmp/file", id="posix-path"),
         pytest.param("c:\\tmp\\file", "file:///C:/tmp/file", id="nt-path"),
-        pytest.param(
-            r"\\unc\as\path",
-            "file://unc/as/path",
-            marks=skip_needs_old_urlun_behavior_win,
-            id="unc-path",
-        ),
-        pytest.param(
-            r"\\unc\as\path",
-            "file:////unc/as/path",
-            marks=skip_needs_new_urlun_behavior_win,
-        ),
     ],
 )
 def test_path_to_url_win(path: str, url: str) -> None:
     assert path_to_url(path) == url
 
 
+@pytest.mark.skipif("sys.platform != 'win32'")
+def test_unc_path_to_url_win() -> None:
+    # The two and four slash forms are both acceptable for our purposes. CPython's
+    # behaviour has changed several times here, so blindly accept either.
+    # - https://github.com/python/cpython/issues/78457
+    # - https://github.com/python/cpython/issues/126205
+    url = path_to_url(r"\\unc\as\path")
+    assert url in ["file://unc/as/path", "file:////unc/as/path"]
+
+
 @pytest.mark.skipif("sys.platform != 'win32'")
 def test_relative_path_to_url_win() -> None:
     resolved_path = os.path.join(os.getcwd(), "file")

From 634bf25b5869bcfc1d2a221bfad6ed322bdeee93 Mon Sep 17 00:00:00 2001
From: Caleb Brown 
Date: Sun, 8 Dec 2024 06:37:07 +1100
Subject: [PATCH 612/992] Import self version check eagerly in install command
 to fix RCE (#13085)

The comment was preserved as it is still relevant, but a note about
preventing arbitrary code execution was added. See #13079 for the
security bug report.

Signed-off-by: Caleb Brown 
---
 news/13079.bugfix.rst                 |  1 +
 src/pip/_internal/commands/install.py | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 news/13079.bugfix.rst

diff --git a/news/13079.bugfix.rst b/news/13079.bugfix.rst
new file mode 100644
index 00000000000..5b297f5a12e
--- /dev/null
+++ b/news/13079.bugfix.rst
@@ -0,0 +1 @@
+This change fixes a security bug allowing a wheel to execute code during installation.
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index ad45a2f2a57..70acf202be9 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -10,6 +10,13 @@
 from pip._vendor.packaging.utils import canonicalize_name
 from pip._vendor.rich import print_json
 
+# Eagerly import self_outdated_check to avoid crashes. Otherwise,
+# this module would be imported *after* pip was replaced, resulting
+# in crashes if the new self_outdated_check module was incompatible
+# with the rest of pip that's already imported, or allowing a
+# wheel to execute arbitrary code on install by replacing
+# self_outdated_check.
+import pip._internal.self_outdated_check  # noqa: F401
 from pip._internal.cache import WheelCache
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.cmdoptions import make_target_python
@@ -408,12 +415,6 @@ def run(self, options: Values, args: List[str]) -> int:
                 # If we're not replacing an already installed pip,
                 # we're not modifying it.
                 modifying_pip = pip_req.satisfied_by is None
-                if modifying_pip:
-                    # Eagerly import this module to avoid crashes. Otherwise, this
-                    # module would be imported *after* pip was replaced, resulting in
-                    # crashes if the new self_outdated_check module was incompatible
-                    # with the rest of pip that's already imported.
-                    import pip._internal.self_outdated_check  # noqa: F401
             protect_pip_from_modification_on_windows(modifying_pip=modifying_pip)
 
             reqs_to_build = [

From 60cba9c3e8420c0a814982f939d843c76a59c896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 7 Dec 2024 12:33:32 +0100
Subject: [PATCH 613/992] Remove gone_in for issue 11859

---
 src/pip/_internal/req/req_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index 834bc513356..f9d1b963aec 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -925,7 +925,7 @@ def check_legacy_setup_py_options(
             reason="--build-option and --global-option are deprecated.",
             issue=11859,
             replacement="to use --config-settings",
-            gone_in="25.0",
+            gone_in=None,
         )
         logger.warning(
             "Implying --no-binary=:all: due to the presence of "

From 07c7a144108dc74e134c38d778bbd3b034b01535 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 7 Dec 2024 15:24:08 -0500
Subject: [PATCH 614/992] pre-commit autoupdate (#12898)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.6.0...v5.0.0)
- [github.com/psf/black-pre-commit-mirror: 24.4.2 → 24.10.0](https://github.com/psf/black-pre-commit-mirror/compare/24.4.2...24.10.0)
- [github.com/astral-sh/ruff-pre-commit: v0.5.6 → v0.8.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.6...v0.8.1)
- [github.com/pre-commit/mirrors-mypy: v1.12.1 → v1.13.0](https://github.com/pre-commit/mirrors-mypy/compare/v1.12.1...v1.13.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml                | 8 ++++----
 src/pip/_internal/cli/progress_bars.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3a0319c2356..3b3f73e2bba 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ exclude: 'src/pip/_vendor/'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id: check-builtin-literals
   - id: check-added-large-files
@@ -17,18 +17,18 @@ repos:
     exclude: .patch
 
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 24.4.2
+  rev: 24.10.0
   hooks:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.5.6
+  rev: v0.8.2
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.12.1
+  rev: v1.13.0
   hooks:
   - id: mypy
     exclude: tests/data
diff --git a/src/pip/_internal/cli/progress_bars.py b/src/pip/_internal/cli/progress_bars.py
index 1236180c086..3d9dde8ed88 100644
--- a/src/pip/_internal/cli/progress_bars.py
+++ b/src/pip/_internal/cli/progress_bars.py
@@ -63,7 +63,7 @@ def _raw_progress_bar(
     size: Optional[int],
 ) -> Generator[bytes, None, None]:
     def write_progress(current: int, total: int) -> None:
-        sys.stdout.write("Progress %d of %d\n" % (current, total))
+        sys.stdout.write(f"Progress {current} of {total}\n")
         sys.stdout.flush()
 
     current = 0

From dc6c4f375aa166bcc7613b95bc5e53d0b5e81b8d Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 9 Nov 2024 20:25:14 -0500
Subject: [PATCH 615/992] Upgrade CacheControl to 0.14.1

---
 news/CacheControl.vendor.rst                      | 1 +
 src/pip/_vendor/cachecontrol/__init__.py          | 3 ++-
 src/pip/_vendor/cachecontrol/adapter.py           | 4 ++--
 src/pip/_vendor/cachecontrol/cache.py             | 1 +
 src/pip/_vendor/cachecontrol/caches/file_cache.py | 2 +-
 src/pip/_vendor/cachecontrol/controller.py        | 1 +
 src/pip/_vendor/cachecontrol/filewrapper.py       | 4 ++--
 src/pip/_vendor/cachecontrol/heuristics.py        | 5 ++++-
 src/pip/_vendor/vendor.txt                        | 2 +-
 9 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 news/CacheControl.vendor.rst

diff --git a/news/CacheControl.vendor.rst b/news/CacheControl.vendor.rst
new file mode 100644
index 00000000000..be97db23956
--- /dev/null
+++ b/news/CacheControl.vendor.rst
@@ -0,0 +1 @@
+Upgrade CacheControl to 0.14.1
diff --git a/src/pip/_vendor/cachecontrol/__init__.py b/src/pip/_vendor/cachecontrol/__init__.py
index b34b0fcbd40..21916243c56 100644
--- a/src/pip/_vendor/cachecontrol/__init__.py
+++ b/src/pip/_vendor/cachecontrol/__init__.py
@@ -6,9 +6,10 @@
 
 Make it easy to import from cachecontrol without long namespaces.
 """
+
 __author__ = "Eric Larson"
 __email__ = "eric@ionrock.org"
-__version__ = "0.14.0"
+__version__ = "0.14.1"
 
 from pip._vendor.cachecontrol.adapter import CacheControlAdapter
 from pip._vendor.cachecontrol.controller import CacheController
diff --git a/src/pip/_vendor/cachecontrol/adapter.py b/src/pip/_vendor/cachecontrol/adapter.py
index fbb4ecc8876..34a9eb82798 100644
--- a/src/pip/_vendor/cachecontrol/adapter.py
+++ b/src/pip/_vendor/cachecontrol/adapter.py
@@ -77,7 +77,7 @@ def send(
 
         return resp
 
-    def build_response(
+    def build_response(  # type: ignore[override]
         self,
         request: PreparedRequest,
         response: HTTPResponse,
@@ -143,7 +143,7 @@ def _update_chunk_length(self: HTTPResponse) -> None:
                         _update_chunk_length, response
                     )
 
-        resp: Response = super().build_response(request, response)  # type: ignore[no-untyped-call]
+        resp: Response = super().build_response(request, response)
 
         # See if we should invalidate the cache.
         if request.method in self.invalidating_methods and resp.ok:
diff --git a/src/pip/_vendor/cachecontrol/cache.py b/src/pip/_vendor/cachecontrol/cache.py
index 3293b0057c7..91598e92034 100644
--- a/src/pip/_vendor/cachecontrol/cache.py
+++ b/src/pip/_vendor/cachecontrol/cache.py
@@ -6,6 +6,7 @@
 The cache object API for implementing caches. The default is a thread
 safe in-memory dictionary.
 """
+
 from __future__ import annotations
 
 from threading import Lock
diff --git a/src/pip/_vendor/cachecontrol/caches/file_cache.py b/src/pip/_vendor/cachecontrol/caches/file_cache.py
index e6e3a57947f..81d2ef46cf8 100644
--- a/src/pip/_vendor/cachecontrol/caches/file_cache.py
+++ b/src/pip/_vendor/cachecontrol/caches/file_cache.py
@@ -6,7 +6,7 @@
 import hashlib
 import os
 from textwrap import dedent
-from typing import IO, TYPE_CHECKING, Union
+from typing import IO, TYPE_CHECKING
 from pathlib import Path
 
 from pip._vendor.cachecontrol.cache import BaseCache, SeparateBodyBaseCache
diff --git a/src/pip/_vendor/cachecontrol/controller.py b/src/pip/_vendor/cachecontrol/controller.py
index d7dd86e5f70..f0ff6e1bedc 100644
--- a/src/pip/_vendor/cachecontrol/controller.py
+++ b/src/pip/_vendor/cachecontrol/controller.py
@@ -5,6 +5,7 @@
 """
 The httplib2 algorithms ported for use with requests.
 """
+
 from __future__ import annotations
 
 import calendar
diff --git a/src/pip/_vendor/cachecontrol/filewrapper.py b/src/pip/_vendor/cachecontrol/filewrapper.py
index 25143902a26..37d2fa5915e 100644
--- a/src/pip/_vendor/cachecontrol/filewrapper.py
+++ b/src/pip/_vendor/cachecontrol/filewrapper.py
@@ -38,10 +38,10 @@ def __init__(
         self.__callback = callback
 
     def __getattr__(self, name: str) -> Any:
-        # The vaguaries of garbage collection means that self.__fp is
+        # The vagaries of garbage collection means that self.__fp is
         # not always set.  By using __getattribute__ and the private
         # name[0] allows looking up the attribute value and raising an
-        # AttributeError when it doesn't exist. This stop thigns from
+        # AttributeError when it doesn't exist. This stop things from
         # infinitely recursing calls to getattr in the case where
         # self.__fp hasn't been set.
         #
diff --git a/src/pip/_vendor/cachecontrol/heuristics.py b/src/pip/_vendor/cachecontrol/heuristics.py
index f6e5634e385..b778c4f3f7a 100644
--- a/src/pip/_vendor/cachecontrol/heuristics.py
+++ b/src/pip/_vendor/cachecontrol/heuristics.py
@@ -68,7 +68,10 @@ def update_headers(self, response: HTTPResponse) -> dict[str, str]:
 
         if "expires" not in response.headers:
             date = parsedate(response.headers["date"])
-            expires = expire_after(timedelta(days=1), date=datetime(*date[:6], tzinfo=timezone.utc))  # type: ignore[index,misc]
+            expires = expire_after(
+                timedelta(days=1),
+                date=datetime(*date[:6], tzinfo=timezone.utc),  # type: ignore[index,misc]
+            )
             headers["expires"] = datetime_to_header(expires)
             headers["cache-control"] = "public"
         return headers
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 2ba053a6e54..7ed28f3933d 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -1,4 +1,4 @@
-CacheControl==0.14.0
+CacheControl==0.14.1
 distlib==0.3.9
 distro==1.9.0
 msgpack==1.0.8

From c0900b85aca97bd4030fca54ed6ac8e8b660b5bc Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 9 Nov 2024 20:25:24 -0500
Subject: [PATCH 616/992] Upgrade msgpack to 1.1.0

---
 news/msgpack.vendor.rst             |  1 +
 src/pip/_vendor/msgpack/__init__.py | 16 +++---
 src/pip/_vendor/msgpack/ext.py      |  8 +--
 src/pip/_vendor/msgpack/fallback.py | 80 +++++++++++------------------
 src/pip/_vendor/vendor.txt          |  2 +-
 5 files changed, 44 insertions(+), 63 deletions(-)
 create mode 100644 news/msgpack.vendor.rst

diff --git a/news/msgpack.vendor.rst b/news/msgpack.vendor.rst
new file mode 100644
index 00000000000..d9efb5bc3f5
--- /dev/null
+++ b/news/msgpack.vendor.rst
@@ -0,0 +1 @@
+Upgrade msgpack to 1.1.0
diff --git a/src/pip/_vendor/msgpack/__init__.py b/src/pip/_vendor/msgpack/__init__.py
index 919b86f175f..b61510544a9 100644
--- a/src/pip/_vendor/msgpack/__init__.py
+++ b/src/pip/_vendor/msgpack/__init__.py
@@ -1,20 +1,20 @@
-from .exceptions import *
-from .ext import ExtType, Timestamp
-
+# ruff: noqa: F401
 import os
 
+from .exceptions import *  # noqa: F403
+from .ext import ExtType, Timestamp
 
-version = (1, 0, 8)
-__version__ = "1.0.8"
+version = (1, 1, 0)
+__version__ = "1.1.0"
 
 
 if os.environ.get("MSGPACK_PUREPYTHON"):
-    from .fallback import Packer, unpackb, Unpacker
+    from .fallback import Packer, Unpacker, unpackb
 else:
     try:
-        from ._cmsgpack import Packer, unpackb, Unpacker
+        from ._cmsgpack import Packer, Unpacker, unpackb
     except ImportError:
-        from .fallback import Packer, unpackb, Unpacker
+        from .fallback import Packer, Unpacker, unpackb
 
 
 def pack(o, stream, **kwargs):
diff --git a/src/pip/_vendor/msgpack/ext.py b/src/pip/_vendor/msgpack/ext.py
index 02c2c43008a..9694819a7df 100644
--- a/src/pip/_vendor/msgpack/ext.py
+++ b/src/pip/_vendor/msgpack/ext.py
@@ -1,6 +1,6 @@
-from collections import namedtuple
 import datetime
 import struct
+from collections import namedtuple
 
 
 class ExtType(namedtuple("ExtType", "code data")):
@@ -157,7 +157,9 @@ def to_datetime(self):
         :rtype: `datetime.datetime`
         """
         utc = datetime.timezone.utc
-        return datetime.datetime.fromtimestamp(0, utc) + datetime.timedelta(seconds=self.to_unix())
+        return datetime.datetime.fromtimestamp(0, utc) + datetime.timedelta(
+            seconds=self.seconds, microseconds=self.nanoseconds // 1000
+        )
 
     @staticmethod
     def from_datetime(dt):
@@ -165,4 +167,4 @@ def from_datetime(dt):
 
         :rtype: Timestamp
         """
-        return Timestamp.from_unix(dt.timestamp())
+        return Timestamp(seconds=int(dt.timestamp()), nanoseconds=dt.microsecond * 1000)
diff --git a/src/pip/_vendor/msgpack/fallback.py b/src/pip/_vendor/msgpack/fallback.py
index a174162af8a..b02e47cfb91 100644
--- a/src/pip/_vendor/msgpack/fallback.py
+++ b/src/pip/_vendor/msgpack/fallback.py
@@ -1,27 +1,22 @@
 """Fallback pure Python implementation of msgpack"""
-from datetime import datetime as _DateTime
-import sys
-import struct
 
+import struct
+import sys
+from datetime import datetime as _DateTime
 
 if hasattr(sys, "pypy_version_info"):
-    # StringIO is slow on PyPy, StringIO is faster.  However: PyPy's own
-    # StringBuilder is fastest.
     from __pypy__ import newlist_hint
+    from __pypy__.builders import BytesBuilder
 
-    try:
-        from __pypy__.builders import BytesBuilder as StringBuilder
-    except ImportError:
-        from __pypy__.builders import StringBuilder
-    USING_STRINGBUILDER = True
+    _USING_STRINGBUILDER = True
 
-    class StringIO:
+    class BytesIO:
         def __init__(self, s=b""):
             if s:
-                self.builder = StringBuilder(len(s))
+                self.builder = BytesBuilder(len(s))
                 self.builder.append(s)
             else:
-                self.builder = StringBuilder()
+                self.builder = BytesBuilder()
 
         def write(self, s):
             if isinstance(s, memoryview):
@@ -34,17 +29,17 @@ def getvalue(self):
             return self.builder.build()
 
 else:
-    USING_STRINGBUILDER = False
-    from io import BytesIO as StringIO
+    from io import BytesIO
 
-    newlist_hint = lambda size: []
+    _USING_STRINGBUILDER = False
 
+    def newlist_hint(size):
+        return []
 
-from .exceptions import BufferFull, OutOfData, ExtraData, FormatError, StackError
 
+from .exceptions import BufferFull, ExtraData, FormatError, OutOfData, StackError
 from .ext import ExtType, Timestamp
 
-
 EX_SKIP = 0
 EX_CONSTRUCT = 1
 EX_READ_ARRAY_HEADER = 2
@@ -231,6 +226,7 @@ class Unpacker:
     def __init__(
         self,
         file_like=None,
+        *,
         read_size=0,
         use_list=True,
         raw=False,
@@ -333,6 +329,7 @@ def feed(self, next_bytes):
 
         # Use extend here: INPLACE_ADD += doesn't reliably typecast memoryview in jython
         self._buffer.extend(view)
+        view.release()
 
     def _consume(self):
         """Gets rid of the used parts of the buffer."""
@@ -649,32 +646,13 @@ class Packer:
         The error handler for encoding unicode. (default: 'strict')
         DO NOT USE THIS!!  This option is kept for very specific usage.
 
-    Example of streaming deserialize from file-like object::
-
-        unpacker = Unpacker(file_like)
-        for o in unpacker:
-            process(o)
-
-    Example of streaming deserialize from socket::
-
-        unpacker = Unpacker()
-        while True:
-            buf = sock.recv(1024**2)
-            if not buf:
-                break
-            unpacker.feed(buf)
-            for o in unpacker:
-                process(o)
-
-    Raises ``ExtraData`` when *packed* contains extra bytes.
-    Raises ``OutOfData`` when *packed* is incomplete.
-    Raises ``FormatError`` when *packed* is not valid msgpack.
-    Raises ``StackError`` when *packed* contains too nested.
-    Other exceptions can be raised during unpacking.
+    :param int buf_size:
+        Internal buffer size. This option is used only for C implementation.
     """
 
     def __init__(
         self,
+        *,
         default=None,
         use_single_float=False,
         autoreset=True,
@@ -682,17 +660,17 @@ def __init__(
         strict_types=False,
         datetime=False,
         unicode_errors=None,
+        buf_size=None,
     ):
         self._strict_types = strict_types
         self._use_float = use_single_float
         self._autoreset = autoreset
         self._use_bin_type = use_bin_type
-        self._buffer = StringIO()
+        self._buffer = BytesIO()
         self._datetime = bool(datetime)
         self._unicode_errors = unicode_errors or "strict"
-        if default is not None:
-            if not callable(default):
-                raise TypeError("default must be callable")
+        if default is not None and not callable(default):
+            raise TypeError("default must be callable")
         self._default = default
 
     def _pack(
@@ -823,18 +801,18 @@ def pack(self, obj):
         try:
             self._pack(obj)
         except:
-            self._buffer = StringIO()  # force reset
+            self._buffer = BytesIO()  # force reset
             raise
         if self._autoreset:
             ret = self._buffer.getvalue()
-            self._buffer = StringIO()
+            self._buffer = BytesIO()
             return ret
 
     def pack_map_pairs(self, pairs):
         self._pack_map_pairs(len(pairs), pairs)
         if self._autoreset:
             ret = self._buffer.getvalue()
-            self._buffer = StringIO()
+            self._buffer = BytesIO()
             return ret
 
     def pack_array_header(self, n):
@@ -843,7 +821,7 @@ def pack_array_header(self, n):
         self._pack_array_header(n)
         if self._autoreset:
             ret = self._buffer.getvalue()
-            self._buffer = StringIO()
+            self._buffer = BytesIO()
             return ret
 
     def pack_map_header(self, n):
@@ -852,7 +830,7 @@ def pack_map_header(self, n):
         self._pack_map_header(n)
         if self._autoreset:
             ret = self._buffer.getvalue()
-            self._buffer = StringIO()
+            self._buffer = BytesIO()
             return ret
 
     def pack_ext_type(self, typecode, data):
@@ -941,11 +919,11 @@ def reset(self):
 
         This method is useful only when autoreset=False.
         """
-        self._buffer = StringIO()
+        self._buffer = BytesIO()
 
     def getbuffer(self):
         """Return view of internal buffer."""
-        if USING_STRINGBUILDER:
+        if _USING_STRINGBUILDER:
             return memoryview(self.bytes())
         else:
             return self._buffer.getbuffer()
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 7ed28f3933d..86876767ecc 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -1,7 +1,7 @@
 CacheControl==0.14.1
 distlib==0.3.9
 distro==1.9.0
-msgpack==1.0.8
+msgpack==1.1.0
 packaging==24.1
 platformdirs==4.2.2
 pyproject-hooks==1.0.0

From 0904ed737d8db7e1605f11be561c7c3da55d434e Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 9 Nov 2024 20:26:15 -0500
Subject: [PATCH 617/992] Upgrade platformdirs to 4.3.6

---
 news/platformdirs.vendor.rst             |  1 +
 src/pip/_vendor/platformdirs/__init__.py | 24 ++++++++++++++----------
 src/pip/_vendor/platformdirs/android.py  |  2 +-
 src/pip/_vendor/platformdirs/api.py      |  6 ++++++
 src/pip/_vendor/platformdirs/macos.py    | 14 ++++++++++++++
 src/pip/_vendor/platformdirs/unix.py     |  6 ------
 src/pip/_vendor/platformdirs/version.py  |  4 ++--
 src/pip/_vendor/vendor.txt               |  2 +-
 8 files changed, 39 insertions(+), 20 deletions(-)
 create mode 100644 news/platformdirs.vendor.rst

diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
new file mode 100644
index 00000000000..360a631e567
--- /dev/null
+++ b/news/platformdirs.vendor.rst
@@ -0,0 +1 @@
+Upgrade platformdirs to 4.3.6
diff --git a/src/pip/_vendor/platformdirs/__init__.py b/src/pip/_vendor/platformdirs/__init__.py
index d58dd2b7dde..edc21fad2e9 100644
--- a/src/pip/_vendor/platformdirs/__init__.py
+++ b/src/pip/_vendor/platformdirs/__init__.py
@@ -19,18 +19,18 @@
     from pathlib import Path
     from typing import Literal
 
+if sys.platform == "win32":
+    from pip._vendor.platformdirs.windows import Windows as _Result
+elif sys.platform == "darwin":
+    from pip._vendor.platformdirs.macos import MacOS as _Result
+else:
+    from pip._vendor.platformdirs.unix import Unix as _Result
 
-def _set_platform_dir_class() -> type[PlatformDirsABC]:
-    if sys.platform == "win32":
-        from pip._vendor.platformdirs.windows import Windows as Result  # noqa: PLC0415
-    elif sys.platform == "darwin":
-        from pip._vendor.platformdirs.macos import MacOS as Result  # noqa: PLC0415
-    else:
-        from pip._vendor.platformdirs.unix import Unix as Result  # noqa: PLC0415
 
+def _set_platform_dir_class() -> type[PlatformDirsABC]:
     if os.getenv("ANDROID_DATA") == "/data" and os.getenv("ANDROID_ROOT") == "/system":
         if os.getenv("SHELL") or os.getenv("PREFIX"):
-            return Result
+            return _Result
 
         from pip._vendor.platformdirs.android import _android_folder  # noqa: PLC0415
 
@@ -39,10 +39,14 @@ def _set_platform_dir_class() -> type[PlatformDirsABC]:
 
             return Android  # return to avoid redefinition of a result
 
-    return Result
+    return _Result
 
 
-PlatformDirs = _set_platform_dir_class()  #: Currently active platform
+if TYPE_CHECKING:
+    # Work around mypy issue: https://github.com/python/mypy/issues/10962
+    PlatformDirs = _Result
+else:
+    PlatformDirs = _set_platform_dir_class()  #: Currently active platform
 AppDirs = PlatformDirs  #: Backwards compatibility with appdirs
 
 
diff --git a/src/pip/_vendor/platformdirs/android.py b/src/pip/_vendor/platformdirs/android.py
index afd3141c725..7004a852422 100644
--- a/src/pip/_vendor/platformdirs/android.py
+++ b/src/pip/_vendor/platformdirs/android.py
@@ -117,7 +117,7 @@ def site_runtime_dir(self) -> str:
 
 
 @lru_cache(maxsize=1)
-def _android_folder() -> str | None:  # noqa: C901, PLR0912
+def _android_folder() -> str | None:  # noqa: C901
     """:return: base folder for the Android OS or None if it cannot be found"""
     result: str | None = None
     # type checker isn't happy with our "import android", just don't do this when type checking see
diff --git a/src/pip/_vendor/platformdirs/api.py b/src/pip/_vendor/platformdirs/api.py
index c50caa648a6..18d660e4f8c 100644
--- a/src/pip/_vendor/platformdirs/api.py
+++ b/src/pip/_vendor/platformdirs/api.py
@@ -91,6 +91,12 @@ def _optionally_create_directory(self, path: str) -> None:
         if self.ensure_exists:
             Path(path).mkdir(parents=True, exist_ok=True)
 
+    def _first_item_as_path_if_multipath(self, directory: str) -> Path:
+        if self.multipath:
+            # If multipath is True, the first path is returned.
+            directory = directory.split(os.pathsep)[0]
+        return Path(directory)
+
     @property
     @abstractmethod
     def user_data_dir(self) -> str:
diff --git a/src/pip/_vendor/platformdirs/macos.py b/src/pip/_vendor/platformdirs/macos.py
index eb1ba5df1da..e4b0391abd7 100644
--- a/src/pip/_vendor/platformdirs/macos.py
+++ b/src/pip/_vendor/platformdirs/macos.py
@@ -4,9 +4,13 @@
 
 import os.path
 import sys
+from typing import TYPE_CHECKING
 
 from .api import PlatformDirsABC
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 
 class MacOS(PlatformDirsABC):
     """
@@ -42,6 +46,11 @@ def site_data_dir(self) -> str:
             return os.pathsep.join(path_list)
         return path_list[0]
 
+    @property
+    def site_data_path(self) -> Path:
+        """:return: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
+        return self._first_item_as_path_if_multipath(self.site_data_dir)
+
     @property
     def user_config_dir(self) -> str:
         """:return: config directory tied to the user, same as `user_data_dir`"""
@@ -74,6 +83,11 @@ def site_cache_dir(self) -> str:
             return os.pathsep.join(path_list)
         return path_list[0]
 
+    @property
+    def site_cache_path(self) -> Path:
+        """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
+        return self._first_item_as_path_if_multipath(self.site_cache_dir)
+
     @property
     def user_state_dir(self) -> str:
         """:return: state directory tied to the user, same as `user_data_dir`"""
diff --git a/src/pip/_vendor/platformdirs/unix.py b/src/pip/_vendor/platformdirs/unix.py
index 9500ade614c..f1942e92ef4 100644
--- a/src/pip/_vendor/platformdirs/unix.py
+++ b/src/pip/_vendor/platformdirs/unix.py
@@ -218,12 +218,6 @@ def site_cache_path(self) -> Path:
         """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
         return self._first_item_as_path_if_multipath(self.site_cache_dir)
 
-    def _first_item_as_path_if_multipath(self, directory: str) -> Path:
-        if self.multipath:
-            # If multipath is True, the first path is returned.
-            directory = directory.split(os.pathsep)[0]
-        return Path(directory)
-
     def iter_config_dirs(self) -> Iterator[str]:
         """:yield: all user and site configuration directories."""
         yield self.user_config_dir
diff --git a/src/pip/_vendor/platformdirs/version.py b/src/pip/_vendor/platformdirs/version.py
index 6483ddce0bc..afb49243e3d 100644
--- a/src/pip/_vendor/platformdirs/version.py
+++ b/src/pip/_vendor/platformdirs/version.py
@@ -12,5 +12,5 @@
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.2.2'
-__version_tuple__ = version_tuple = (4, 2, 2)
+__version__ = version = '4.3.6'
+__version_tuple__ = version_tuple = (4, 3, 6)
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 86876767ecc..dbcdf7135f0 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -3,7 +3,7 @@ distlib==0.3.9
 distro==1.9.0
 msgpack==1.1.0
 packaging==24.1
-platformdirs==4.2.2
+platformdirs==4.3.6
 pyproject-hooks==1.0.0
 requests==2.32.3
     certifi==2024.8.30

From c530f32ee794f6f18de9a4772e71007f8c057870 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 9 Nov 2024 20:26:24 -0500
Subject: [PATCH 618/992] Upgrade idna to 3.10

---
 news/idna.vendor.rst                 |     1 +
 src/pip/_vendor/idna/__init__.py     |     3 +-
 src/pip/_vendor/idna/codec.py        |    58 +-
 src/pip/_vendor/idna/compat.py       |    10 +-
 src/pip/_vendor/idna/core.py         |   280 +-
 src/pip/_vendor/idna/idnadata.py     |  7076 ++++++-----
 src/pip/_vendor/idna/intranges.py    |    11 +-
 src/pip/_vendor/idna/package_data.py |     3 +-
 src/pip/_vendor/idna/uts46data.py    | 16439 +++++++++++++------------
 src/pip/_vendor/vendor.txt           |     2 +-
 10 files changed, 12008 insertions(+), 11875 deletions(-)
 create mode 100644 news/idna.vendor.rst

diff --git a/news/idna.vendor.rst b/news/idna.vendor.rst
new file mode 100644
index 00000000000..ef21715c5a4
--- /dev/null
+++ b/news/idna.vendor.rst
@@ -0,0 +1 @@
+Upgrade idna to 3.10
diff --git a/src/pip/_vendor/idna/__init__.py b/src/pip/_vendor/idna/__init__.py
index a40eeafcc91..cfdc030a751 100644
--- a/src/pip/_vendor/idna/__init__.py
+++ b/src/pip/_vendor/idna/__init__.py
@@ -1,4 +1,3 @@
-from .package_data import __version__
 from .core import (
     IDNABidiError,
     IDNAError,
@@ -20,8 +19,10 @@
     valid_string_length,
 )
 from .intranges import intranges_contain
+from .package_data import __version__
 
 __all__ = [
+    "__version__",
     "IDNABidiError",
     "IDNAError",
     "InvalidCodepoint",
diff --git a/src/pip/_vendor/idna/codec.py b/src/pip/_vendor/idna/codec.py
index c855a4de6d7..913abfd6a23 100644
--- a/src/pip/_vendor/idna/codec.py
+++ b/src/pip/_vendor/idna/codec.py
@@ -1,49 +1,51 @@
-from .core import encode, decode, alabel, ulabel, IDNAError
 import codecs
 import re
-from typing import Any, Tuple, Optional
+from typing import Any, Optional, Tuple
 
-_unicode_dots_re = re.compile('[\u002e\u3002\uff0e\uff61]')
+from .core import IDNAError, alabel, decode, encode, ulabel
+
+_unicode_dots_re = re.compile("[\u002e\u3002\uff0e\uff61]")
 
-class Codec(codecs.Codec):
 
-    def encode(self, data: str, errors: str = 'strict') -> Tuple[bytes, int]:
-        if errors != 'strict':
-            raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
+class Codec(codecs.Codec):
+    def encode(self, data: str, errors: str = "strict") -> Tuple[bytes, int]:
+        if errors != "strict":
+            raise IDNAError('Unsupported error handling "{}"'.format(errors))
 
         if not data:
             return b"", 0
 
         return encode(data), len(data)
 
-    def decode(self, data: bytes, errors: str = 'strict') -> Tuple[str, int]:
-        if errors != 'strict':
-            raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
+    def decode(self, data: bytes, errors: str = "strict") -> Tuple[str, int]:
+        if errors != "strict":
+            raise IDNAError('Unsupported error handling "{}"'.format(errors))
 
         if not data:
-            return '', 0
+            return "", 0
 
         return decode(data), len(data)
 
+
 class IncrementalEncoder(codecs.BufferedIncrementalEncoder):
     def _buffer_encode(self, data: str, errors: str, final: bool) -> Tuple[bytes, int]:
-        if errors != 'strict':
-            raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
+        if errors != "strict":
+            raise IDNAError('Unsupported error handling "{}"'.format(errors))
 
         if not data:
-            return b'', 0
+            return b"", 0
 
         labels = _unicode_dots_re.split(data)
-        trailing_dot = b''
+        trailing_dot = b""
         if labels:
             if not labels[-1]:
-                trailing_dot = b'.'
+                trailing_dot = b"."
                 del labels[-1]
             elif not final:
                 # Keep potentially unfinished label until the next call
                 del labels[-1]
                 if labels:
-                    trailing_dot = b'.'
+                    trailing_dot = b"."
 
         result = []
         size = 0
@@ -54,32 +56,33 @@ def _buffer_encode(self, data: str, errors: str, final: bool) -> Tuple[bytes, in
             size += len(label)
 
         # Join with U+002E
-        result_bytes = b'.'.join(result) + trailing_dot
+        result_bytes = b".".join(result) + trailing_dot
         size += len(trailing_dot)
         return result_bytes, size
 
+
 class IncrementalDecoder(codecs.BufferedIncrementalDecoder):
     def _buffer_decode(self, data: Any, errors: str, final: bool) -> Tuple[str, int]:
-        if errors != 'strict':
-            raise IDNAError('Unsupported error handling \"{}\"'.format(errors))
+        if errors != "strict":
+            raise IDNAError('Unsupported error handling "{}"'.format(errors))
 
         if not data:
-            return ('', 0)
+            return ("", 0)
 
         if not isinstance(data, str):
-            data = str(data, 'ascii')
+            data = str(data, "ascii")
 
         labels = _unicode_dots_re.split(data)
-        trailing_dot = ''
+        trailing_dot = ""
         if labels:
             if not labels[-1]:
-                trailing_dot = '.'
+                trailing_dot = "."
                 del labels[-1]
             elif not final:
                 # Keep potentially unfinished label until the next call
                 del labels[-1]
                 if labels:
-                    trailing_dot = '.'
+                    trailing_dot = "."
 
         result = []
         size = 0
@@ -89,7 +92,7 @@ def _buffer_decode(self, data: Any, errors: str, final: bool) -> Tuple[str, int]
                 size += 1
             size += len(label)
 
-        result_str = '.'.join(result) + trailing_dot
+        result_str = ".".join(result) + trailing_dot
         size += len(trailing_dot)
         return (result_str, size)
 
@@ -103,7 +106,7 @@ class StreamReader(Codec, codecs.StreamReader):
 
 
 def search_function(name: str) -> Optional[codecs.CodecInfo]:
-    if name != 'idna2008':
+    if name != "idna2008":
         return None
     return codecs.CodecInfo(
         name=name,
@@ -115,4 +118,5 @@ def search_function(name: str) -> Optional[codecs.CodecInfo]:
         streamreader=StreamReader,
     )
 
+
 codecs.register(search_function)
diff --git a/src/pip/_vendor/idna/compat.py b/src/pip/_vendor/idna/compat.py
index 786e6bda636..1df9f2a70e6 100644
--- a/src/pip/_vendor/idna/compat.py
+++ b/src/pip/_vendor/idna/compat.py
@@ -1,13 +1,15 @@
-from .core import *
-from .codec import *
 from typing import Any, Union
 
+from .core import decode, encode
+
+
 def ToASCII(label: str) -> bytes:
     return encode(label)
 
+
 def ToUnicode(label: Union[bytes, bytearray]) -> str:
     return decode(label)
 
-def nameprep(s: Any) -> None:
-    raise NotImplementedError('IDNA 2008 does not utilise nameprep protocol')
 
+def nameprep(s: Any) -> None:
+    raise NotImplementedError("IDNA 2008 does not utilise nameprep protocol")
diff --git a/src/pip/_vendor/idna/core.py b/src/pip/_vendor/idna/core.py
index 0dae61acdbc..9115f123f02 100644
--- a/src/pip/_vendor/idna/core.py
+++ b/src/pip/_vendor/idna/core.py
@@ -1,31 +1,37 @@
-from . import idnadata
 import bisect
-import unicodedata
 import re
-from typing import Union, Optional
+import unicodedata
+from typing import Optional, Union
+
+from . import idnadata
 from .intranges import intranges_contain
 
 _virama_combining_class = 9
-_alabel_prefix = b'xn--'
-_unicode_dots_re = re.compile('[\u002e\u3002\uff0e\uff61]')
+_alabel_prefix = b"xn--"
+_unicode_dots_re = re.compile("[\u002e\u3002\uff0e\uff61]")
+
 
 class IDNAError(UnicodeError):
-    """ Base exception for all IDNA-encoding related problems """
+    """Base exception for all IDNA-encoding related problems"""
+
     pass
 
 
 class IDNABidiError(IDNAError):
-    """ Exception when bidirectional requirements are not satisfied """
+    """Exception when bidirectional requirements are not satisfied"""
+
     pass
 
 
 class InvalidCodepoint(IDNAError):
-    """ Exception when a disallowed or unallocated codepoint is used """
+    """Exception when a disallowed or unallocated codepoint is used"""
+
     pass
 
 
 class InvalidCodepointContext(IDNAError):
-    """ Exception when the codepoint is not valid in the context it is used """
+    """Exception when the codepoint is not valid in the context it is used"""
+
     pass
 
 
@@ -33,17 +39,20 @@ def _combining_class(cp: int) -> int:
     v = unicodedata.combining(chr(cp))
     if v == 0:
         if not unicodedata.name(chr(cp)):
-            raise ValueError('Unknown character in unicodedata')
+            raise ValueError("Unknown character in unicodedata")
     return v
 
+
 def _is_script(cp: str, script: str) -> bool:
     return intranges_contain(ord(cp), idnadata.scripts[script])
 
+
 def _punycode(s: str) -> bytes:
-    return s.encode('punycode')
+    return s.encode("punycode")
+
 
 def _unot(s: int) -> str:
-    return 'U+{:04X}'.format(s)
+    return "U+{:04X}".format(s)
 
 
 def valid_label_length(label: Union[bytes, str]) -> bool:
@@ -61,96 +70,106 @@ def valid_string_length(label: Union[bytes, str], trailing_dot: bool) -> bool:
 def check_bidi(label: str, check_ltr: bool = False) -> bool:
     # Bidi rules should only be applied if string contains RTL characters
     bidi_label = False
-    for (idx, cp) in enumerate(label, 1):
+    for idx, cp in enumerate(label, 1):
         direction = unicodedata.bidirectional(cp)
-        if direction == '':
+        if direction == "":
             # String likely comes from a newer version of Unicode
-            raise IDNABidiError('Unknown directionality in label {} at position {}'.format(repr(label), idx))
-        if direction in ['R', 'AL', 'AN']:
+            raise IDNABidiError("Unknown directionality in label {} at position {}".format(repr(label), idx))
+        if direction in ["R", "AL", "AN"]:
             bidi_label = True
     if not bidi_label and not check_ltr:
         return True
 
     # Bidi rule 1
     direction = unicodedata.bidirectional(label[0])
-    if direction in ['R', 'AL']:
+    if direction in ["R", "AL"]:
         rtl = True
-    elif direction == 'L':
+    elif direction == "L":
         rtl = False
     else:
-        raise IDNABidiError('First codepoint in label {} must be directionality L, R or AL'.format(repr(label)))
+        raise IDNABidiError("First codepoint in label {} must be directionality L, R or AL".format(repr(label)))
 
     valid_ending = False
-    number_type = None  # type: Optional[str]
-    for (idx, cp) in enumerate(label, 1):
+    number_type: Optional[str] = None
+    for idx, cp in enumerate(label, 1):
         direction = unicodedata.bidirectional(cp)
 
         if rtl:
             # Bidi rule 2
-            if not direction in ['R', 'AL', 'AN', 'EN', 'ES', 'CS', 'ET', 'ON', 'BN', 'NSM']:
-                raise IDNABidiError('Invalid direction for codepoint at position {} in a right-to-left label'.format(idx))
+            if direction not in [
+                "R",
+                "AL",
+                "AN",
+                "EN",
+                "ES",
+                "CS",
+                "ET",
+                "ON",
+                "BN",
+                "NSM",
+            ]:
+                raise IDNABidiError("Invalid direction for codepoint at position {} in a right-to-left label".format(idx))
             # Bidi rule 3
-            if direction in ['R', 'AL', 'EN', 'AN']:
+            if direction in ["R", "AL", "EN", "AN"]:
                 valid_ending = True
-            elif direction != 'NSM':
+            elif direction != "NSM":
                 valid_ending = False
             # Bidi rule 4
-            if direction in ['AN', 'EN']:
+            if direction in ["AN", "EN"]:
                 if not number_type:
                     number_type = direction
                 else:
                     if number_type != direction:
-                        raise IDNABidiError('Can not mix numeral types in a right-to-left label')
+                        raise IDNABidiError("Can not mix numeral types in a right-to-left label")
         else:
             # Bidi rule 5
-            if not direction in ['L', 'EN', 'ES', 'CS', 'ET', 'ON', 'BN', 'NSM']:
-                raise IDNABidiError('Invalid direction for codepoint at position {} in a left-to-right label'.format(idx))
+            if direction not in ["L", "EN", "ES", "CS", "ET", "ON", "BN", "NSM"]:
+                raise IDNABidiError("Invalid direction for codepoint at position {} in a left-to-right label".format(idx))
             # Bidi rule 6
-            if direction in ['L', 'EN']:
+            if direction in ["L", "EN"]:
                 valid_ending = True
-            elif direction != 'NSM':
+            elif direction != "NSM":
                 valid_ending = False
 
     if not valid_ending:
-        raise IDNABidiError('Label ends with illegal codepoint directionality')
+        raise IDNABidiError("Label ends with illegal codepoint directionality")
 
     return True
 
 
 def check_initial_combiner(label: str) -> bool:
-    if unicodedata.category(label[0])[0] == 'M':
-        raise IDNAError('Label begins with an illegal combining character')
+    if unicodedata.category(label[0])[0] == "M":
+        raise IDNAError("Label begins with an illegal combining character")
     return True
 
 
 def check_hyphen_ok(label: str) -> bool:
-    if label[2:4] == '--':
-        raise IDNAError('Label has disallowed hyphens in 3rd and 4th position')
-    if label[0] == '-' or label[-1] == '-':
-        raise IDNAError('Label must not start or end with a hyphen')
+    if label[2:4] == "--":
+        raise IDNAError("Label has disallowed hyphens in 3rd and 4th position")
+    if label[0] == "-" or label[-1] == "-":
+        raise IDNAError("Label must not start or end with a hyphen")
     return True
 
 
 def check_nfc(label: str) -> None:
-    if unicodedata.normalize('NFC', label) != label:
-        raise IDNAError('Label must be in Normalization Form C')
+    if unicodedata.normalize("NFC", label) != label:
+        raise IDNAError("Label must be in Normalization Form C")
 
 
 def valid_contextj(label: str, pos: int) -> bool:
     cp_value = ord(label[pos])
 
-    if cp_value == 0x200c:
-
+    if cp_value == 0x200C:
         if pos > 0:
             if _combining_class(ord(label[pos - 1])) == _virama_combining_class:
                 return True
 
         ok = False
-        for i in range(pos-1, -1, -1):
+        for i in range(pos - 1, -1, -1):
             joining_type = idnadata.joining_types.get(ord(label[i]))
-            if joining_type == ord('T'):
+            if joining_type == ord("T"):
                 continue
-            elif joining_type in [ord('L'), ord('D')]:
+            elif joining_type in [ord("L"), ord("D")]:
                 ok = True
                 break
             else:
@@ -160,63 +179,61 @@ def valid_contextj(label: str, pos: int) -> bool:
             return False
 
         ok = False
-        for i in range(pos+1, len(label)):
+        for i in range(pos + 1, len(label)):
             joining_type = idnadata.joining_types.get(ord(label[i]))
-            if joining_type == ord('T'):
+            if joining_type == ord("T"):
                 continue
-            elif joining_type in [ord('R'), ord('D')]:
+            elif joining_type in [ord("R"), ord("D")]:
                 ok = True
                 break
             else:
                 break
         return ok
 
-    if cp_value == 0x200d:
-
+    if cp_value == 0x200D:
         if pos > 0:
             if _combining_class(ord(label[pos - 1])) == _virama_combining_class:
                 return True
         return False
 
     else:
-
         return False
 
 
 def valid_contexto(label: str, pos: int, exception: bool = False) -> bool:
     cp_value = ord(label[pos])
 
-    if cp_value == 0x00b7:
-        if 0 < pos < len(label)-1:
-            if ord(label[pos - 1]) == 0x006c and ord(label[pos + 1]) == 0x006c:
+    if cp_value == 0x00B7:
+        if 0 < pos < len(label) - 1:
+            if ord(label[pos - 1]) == 0x006C and ord(label[pos + 1]) == 0x006C:
                 return True
         return False
 
     elif cp_value == 0x0375:
-        if pos < len(label)-1 and len(label) > 1:
-            return _is_script(label[pos + 1], 'Greek')
+        if pos < len(label) - 1 and len(label) > 1:
+            return _is_script(label[pos + 1], "Greek")
         return False
 
-    elif cp_value == 0x05f3 or cp_value == 0x05f4:
+    elif cp_value == 0x05F3 or cp_value == 0x05F4:
         if pos > 0:
-            return _is_script(label[pos - 1], 'Hebrew')
+            return _is_script(label[pos - 1], "Hebrew")
         return False
 
-    elif cp_value == 0x30fb:
+    elif cp_value == 0x30FB:
         for cp in label:
-            if cp == '\u30fb':
+            if cp == "\u30fb":
                 continue
-            if _is_script(cp, 'Hiragana') or _is_script(cp, 'Katakana') or _is_script(cp, 'Han'):
+            if _is_script(cp, "Hiragana") or _is_script(cp, "Katakana") or _is_script(cp, "Han"):
                 return True
         return False
 
     elif 0x660 <= cp_value <= 0x669:
         for cp in label:
-            if 0x6f0 <= ord(cp) <= 0x06f9:
+            if 0x6F0 <= ord(cp) <= 0x06F9:
                 return False
         return True
 
-    elif 0x6f0 <= cp_value <= 0x6f9:
+    elif 0x6F0 <= cp_value <= 0x6F9:
         for cp in label:
             if 0x660 <= ord(cp) <= 0x0669:
                 return False
@@ -227,37 +244,49 @@ def valid_contexto(label: str, pos: int, exception: bool = False) -> bool:
 
 def check_label(label: Union[str, bytes, bytearray]) -> None:
     if isinstance(label, (bytes, bytearray)):
-        label = label.decode('utf-8')
+        label = label.decode("utf-8")
     if len(label) == 0:
-        raise IDNAError('Empty Label')
+        raise IDNAError("Empty Label")
 
     check_nfc(label)
     check_hyphen_ok(label)
     check_initial_combiner(label)
 
-    for (pos, cp) in enumerate(label):
+    for pos, cp in enumerate(label):
         cp_value = ord(cp)
-        if intranges_contain(cp_value, idnadata.codepoint_classes['PVALID']):
+        if intranges_contain(cp_value, idnadata.codepoint_classes["PVALID"]):
             continue
-        elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTJ']):
-            if not valid_contextj(label, pos):
-                raise InvalidCodepointContext('Joiner {} not allowed at position {} in {}'.format(
-                    _unot(cp_value), pos+1, repr(label)))
-        elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTO']):
+        elif intranges_contain(cp_value, idnadata.codepoint_classes["CONTEXTJ"]):
+            try:
+                if not valid_contextj(label, pos):
+                    raise InvalidCodepointContext(
+                        "Joiner {} not allowed at position {} in {}".format(_unot(cp_value), pos + 1, repr(label))
+                    )
+            except ValueError:
+                raise IDNAError(
+                    "Unknown codepoint adjacent to joiner {} at position {} in {}".format(
+                        _unot(cp_value), pos + 1, repr(label)
+                    )
+                )
+        elif intranges_contain(cp_value, idnadata.codepoint_classes["CONTEXTO"]):
             if not valid_contexto(label, pos):
-                raise InvalidCodepointContext('Codepoint {} not allowed at position {} in {}'.format(_unot(cp_value), pos+1, repr(label)))
+                raise InvalidCodepointContext(
+                    "Codepoint {} not allowed at position {} in {}".format(_unot(cp_value), pos + 1, repr(label))
+                )
         else:
-            raise InvalidCodepoint('Codepoint {} at position {} of {} not allowed'.format(_unot(cp_value), pos+1, repr(label)))
+            raise InvalidCodepoint(
+                "Codepoint {} at position {} of {} not allowed".format(_unot(cp_value), pos + 1, repr(label))
+            )
 
     check_bidi(label)
 
 
 def alabel(label: str) -> bytes:
     try:
-        label_bytes = label.encode('ascii')
+        label_bytes = label.encode("ascii")
         ulabel(label_bytes)
         if not valid_label_length(label_bytes):
-            raise IDNAError('Label too long')
+            raise IDNAError("Label too long")
         return label_bytes
     except UnicodeEncodeError:
         pass
@@ -266,7 +295,7 @@ def alabel(label: str) -> bytes:
     label_bytes = _alabel_prefix + _punycode(label)
 
     if not valid_label_length(label_bytes):
-        raise IDNAError('Label too long')
+        raise IDNAError("Label too long")
 
     return label_bytes
 
@@ -274,7 +303,7 @@ def alabel(label: str) -> bytes:
 def ulabel(label: Union[str, bytes, bytearray]) -> str:
     if not isinstance(label, (bytes, bytearray)):
         try:
-            label_bytes = label.encode('ascii')
+            label_bytes = label.encode("ascii")
         except UnicodeEncodeError:
             check_label(label)
             return label
@@ -283,19 +312,19 @@ def ulabel(label: Union[str, bytes, bytearray]) -> str:
 
     label_bytes = label_bytes.lower()
     if label_bytes.startswith(_alabel_prefix):
-        label_bytes = label_bytes[len(_alabel_prefix):]
+        label_bytes = label_bytes[len(_alabel_prefix) :]
         if not label_bytes:
-            raise IDNAError('Malformed A-label, no Punycode eligible content found')
-        if label_bytes.decode('ascii')[-1] == '-':
-            raise IDNAError('A-label must not end with a hyphen')
+            raise IDNAError("Malformed A-label, no Punycode eligible content found")
+        if label_bytes.decode("ascii")[-1] == "-":
+            raise IDNAError("A-label must not end with a hyphen")
     else:
         check_label(label_bytes)
-        return label_bytes.decode('ascii')
+        return label_bytes.decode("ascii")
 
     try:
-        label = label_bytes.decode('punycode')
+        label = label_bytes.decode("punycode")
     except UnicodeError:
-        raise IDNAError('Invalid A-label')
+        raise IDNAError("Invalid A-label")
     check_label(label)
     return label
 
@@ -303,52 +332,60 @@ def ulabel(label: Union[str, bytes, bytearray]) -> str:
 def uts46_remap(domain: str, std3_rules: bool = True, transitional: bool = False) -> str:
     """Re-map the characters in the string according to UTS46 processing."""
     from .uts46data import uts46data
-    output = ''
+
+    output = ""
 
     for pos, char in enumerate(domain):
         code_point = ord(char)
         try:
-            uts46row = uts46data[code_point if code_point < 256 else
-                bisect.bisect_left(uts46data, (code_point, 'Z')) - 1]
+            uts46row = uts46data[code_point if code_point < 256 else bisect.bisect_left(uts46data, (code_point, "Z")) - 1]
             status = uts46row[1]
-            replacement = None  # type: Optional[str]
+            replacement: Optional[str] = None
             if len(uts46row) == 3:
                 replacement = uts46row[2]
-            if (status == 'V' or
-                    (status == 'D' and not transitional) or
-                    (status == '3' and not std3_rules and replacement is None)):
+            if (
+                status == "V"
+                or (status == "D" and not transitional)
+                or (status == "3" and not std3_rules and replacement is None)
+            ):
                 output += char
-            elif replacement is not None and (status == 'M' or
-                    (status == '3' and not std3_rules) or
-                    (status == 'D' and transitional)):
+            elif replacement is not None and (
+                status == "M" or (status == "3" and not std3_rules) or (status == "D" and transitional)
+            ):
                 output += replacement
-            elif status != 'I':
+            elif status != "I":
                 raise IndexError()
         except IndexError:
             raise InvalidCodepoint(
-                'Codepoint {} not allowed at position {} in {}'.format(
-                _unot(code_point), pos + 1, repr(domain)))
+                "Codepoint {} not allowed at position {} in {}".format(_unot(code_point), pos + 1, repr(domain))
+            )
 
-    return unicodedata.normalize('NFC', output)
+    return unicodedata.normalize("NFC", output)
 
 
-def encode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool = False, std3_rules: bool = False, transitional: bool = False) -> bytes:
+def encode(
+    s: Union[str, bytes, bytearray],
+    strict: bool = False,
+    uts46: bool = False,
+    std3_rules: bool = False,
+    transitional: bool = False,
+) -> bytes:
     if not isinstance(s, str):
         try:
-            s = str(s, 'ascii')
+            s = str(s, "ascii")
         except UnicodeDecodeError:
-            raise IDNAError('should pass a unicode string to the function rather than a byte string.')
+            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
     result = []
     if strict:
-        labels = s.split('.')
+        labels = s.split(".")
     else:
         labels = _unicode_dots_re.split(s)
-    if not labels or labels == ['']:
-        raise IDNAError('Empty domain')
-    if labels[-1] == '':
+    if not labels or labels == [""]:
+        raise IDNAError("Empty domain")
+    if labels[-1] == "":
         del labels[-1]
         trailing_dot = True
     for label in labels:
@@ -356,21 +393,26 @@ def encode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool =
         if s:
             result.append(s)
         else:
-            raise IDNAError('Empty label')
+            raise IDNAError("Empty label")
     if trailing_dot:
-        result.append(b'')
-    s = b'.'.join(result)
+        result.append(b"")
+    s = b".".join(result)
     if not valid_string_length(s, trailing_dot):
-        raise IDNAError('Domain too long')
+        raise IDNAError("Domain too long")
     return s
 
 
-def decode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool = False, std3_rules: bool = False) -> str:
+def decode(
+    s: Union[str, bytes, bytearray],
+    strict: bool = False,
+    uts46: bool = False,
+    std3_rules: bool = False,
+) -> str:
     try:
         if not isinstance(s, str):
-            s = str(s, 'ascii')
+            s = str(s, "ascii")
     except UnicodeDecodeError:
-        raise IDNAError('Invalid ASCII in A-label')
+        raise IDNAError("Invalid ASCII in A-label")
     if uts46:
         s = uts46_remap(s, std3_rules, False)
     trailing_dot = False
@@ -378,9 +420,9 @@ def decode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool =
     if not strict:
         labels = _unicode_dots_re.split(s)
     else:
-        labels = s.split('.')
-    if not labels or labels == ['']:
-        raise IDNAError('Empty domain')
+        labels = s.split(".")
+    if not labels or labels == [""]:
+        raise IDNAError("Empty domain")
     if not labels[-1]:
         del labels[-1]
         trailing_dot = True
@@ -389,7 +431,7 @@ def decode(s: Union[str, bytes, bytearray], strict: bool = False, uts46: bool =
         if s:
             result.append(s)
         else:
-            raise IDNAError('Empty label')
+            raise IDNAError("Empty label")
     if trailing_dot:
-        result.append('')
-    return '.'.join(result)
+        result.append("")
+    return ".".join(result)
diff --git a/src/pip/_vendor/idna/idnadata.py b/src/pip/_vendor/idna/idnadata.py
index c61dcf977e5..4be6004622e 100644
--- a/src/pip/_vendor/idna/idnadata.py
+++ b/src/pip/_vendor/idna/idnadata.py
@@ -1,107 +1,107 @@
 # This file is automatically generated by tools/idna-data
 
-__version__ = '15.1.0'
+__version__ = "15.1.0"
 scripts = {
-    'Greek': (
+    "Greek": (
         0x37000000374,
         0x37500000378,
-        0x37a0000037e,
-        0x37f00000380,
+        0x37A0000037E,
+        0x37F00000380,
         0x38400000385,
         0x38600000387,
-        0x3880000038b,
-        0x38c0000038d,
-        0x38e000003a2,
-        0x3a3000003e2,
-        0x3f000000400,
-        0x1d2600001d2b,
-        0x1d5d00001d62,
-        0x1d6600001d6b,
-        0x1dbf00001dc0,
-        0x1f0000001f16,
-        0x1f1800001f1e,
-        0x1f2000001f46,
-        0x1f4800001f4e,
-        0x1f5000001f58,
-        0x1f5900001f5a,
-        0x1f5b00001f5c,
-        0x1f5d00001f5e,
-        0x1f5f00001f7e,
-        0x1f8000001fb5,
-        0x1fb600001fc5,
-        0x1fc600001fd4,
-        0x1fd600001fdc,
-        0x1fdd00001ff0,
-        0x1ff200001ff5,
-        0x1ff600001fff,
+        0x3880000038B,
+        0x38C0000038D,
+        0x38E000003A2,
+        0x3A3000003E2,
+        0x3F000000400,
+        0x1D2600001D2B,
+        0x1D5D00001D62,
+        0x1D6600001D6B,
+        0x1DBF00001DC0,
+        0x1F0000001F16,
+        0x1F1800001F1E,
+        0x1F2000001F46,
+        0x1F4800001F4E,
+        0x1F5000001F58,
+        0x1F5900001F5A,
+        0x1F5B00001F5C,
+        0x1F5D00001F5E,
+        0x1F5F00001F7E,
+        0x1F8000001FB5,
+        0x1FB600001FC5,
+        0x1FC600001FD4,
+        0x1FD600001FDC,
+        0x1FDD00001FF0,
+        0x1FF200001FF5,
+        0x1FF600001FFF,
         0x212600002127,
-        0xab650000ab66,
-        0x101400001018f,
-        0x101a0000101a1,
-        0x1d2000001d246,
+        0xAB650000AB66,
+        0x101400001018F,
+        0x101A0000101A1,
+        0x1D2000001D246,
     ),
-    'Han': (
-        0x2e8000002e9a,
-        0x2e9b00002ef4,
-        0x2f0000002fd6,
+    "Han": (
+        0x2E8000002E9A,
+        0x2E9B00002EF4,
+        0x2F0000002FD6,
         0x300500003006,
         0x300700003008,
-        0x30210000302a,
-        0x30380000303c,
-        0x340000004dc0,
-        0x4e000000a000,
-        0xf9000000fa6e,
-        0xfa700000fada,
-        0x16fe200016fe4,
-        0x16ff000016ff2,
-        0x200000002a6e0,
-        0x2a7000002b73a,
-        0x2b7400002b81e,
-        0x2b8200002cea2,
-        0x2ceb00002ebe1,
-        0x2ebf00002ee5e,
-        0x2f8000002fa1e,
-        0x300000003134b,
-        0x31350000323b0,
+        0x30210000302A,
+        0x30380000303C,
+        0x340000004DC0,
+        0x4E000000A000,
+        0xF9000000FA6E,
+        0xFA700000FADA,
+        0x16FE200016FE4,
+        0x16FF000016FF2,
+        0x200000002A6E0,
+        0x2A7000002B73A,
+        0x2B7400002B81E,
+        0x2B8200002CEA2,
+        0x2CEB00002EBE1,
+        0x2EBF00002EE5E,
+        0x2F8000002FA1E,
+        0x300000003134B,
+        0x31350000323B0,
     ),
-    'Hebrew': (
-        0x591000005c8,
-        0x5d0000005eb,
-        0x5ef000005f5,
-        0xfb1d0000fb37,
-        0xfb380000fb3d,
-        0xfb3e0000fb3f,
-        0xfb400000fb42,
-        0xfb430000fb45,
-        0xfb460000fb50,
+    "Hebrew": (
+        0x591000005C8,
+        0x5D0000005EB,
+        0x5EF000005F5,
+        0xFB1D0000FB37,
+        0xFB380000FB3D,
+        0xFB3E0000FB3F,
+        0xFB400000FB42,
+        0xFB430000FB45,
+        0xFB460000FB50,
     ),
-    'Hiragana': (
+    "Hiragana": (
         0x304100003097,
-        0x309d000030a0,
-        0x1b0010001b120,
-        0x1b1320001b133,
-        0x1b1500001b153,
-        0x1f2000001f201,
+        0x309D000030A0,
+        0x1B0010001B120,
+        0x1B1320001B133,
+        0x1B1500001B153,
+        0x1F2000001F201,
     ),
-    'Katakana': (
-        0x30a1000030fb,
-        0x30fd00003100,
-        0x31f000003200,
-        0x32d0000032ff,
+    "Katakana": (
+        0x30A1000030FB,
+        0x30FD00003100,
+        0x31F000003200,
+        0x32D0000032FF,
         0x330000003358,
-        0xff660000ff70,
-        0xff710000ff9e,
-        0x1aff00001aff4,
-        0x1aff50001affc,
-        0x1affd0001afff,
-        0x1b0000001b001,
-        0x1b1200001b123,
-        0x1b1550001b156,
-        0x1b1640001b168,
+        0xFF660000FF70,
+        0xFF710000FF9E,
+        0x1AFF00001AFF4,
+        0x1AFF50001AFFC,
+        0x1AFFD0001AFFF,
+        0x1B0000001B001,
+        0x1B1200001B123,
+        0x1B1550001B156,
+        0x1B1640001B168,
     ),
 }
 joining_types = {
-    0xad: 84,
+    0xAD: 84,
     0x300: 84,
     0x301: 84,
     0x302: 84,
@@ -112,12 +112,12 @@
     0x307: 84,
     0x308: 84,
     0x309: 84,
-    0x30a: 84,
-    0x30b: 84,
-    0x30c: 84,
-    0x30d: 84,
-    0x30e: 84,
-    0x30f: 84,
+    0x30A: 84,
+    0x30B: 84,
+    0x30C: 84,
+    0x30D: 84,
+    0x30E: 84,
+    0x30F: 84,
     0x310: 84,
     0x311: 84,
     0x312: 84,
@@ -128,12 +128,12 @@
     0x317: 84,
     0x318: 84,
     0x319: 84,
-    0x31a: 84,
-    0x31b: 84,
-    0x31c: 84,
-    0x31d: 84,
-    0x31e: 84,
-    0x31f: 84,
+    0x31A: 84,
+    0x31B: 84,
+    0x31C: 84,
+    0x31D: 84,
+    0x31E: 84,
+    0x31F: 84,
     0x320: 84,
     0x321: 84,
     0x322: 84,
@@ -144,12 +144,12 @@
     0x327: 84,
     0x328: 84,
     0x329: 84,
-    0x32a: 84,
-    0x32b: 84,
-    0x32c: 84,
-    0x32d: 84,
-    0x32e: 84,
-    0x32f: 84,
+    0x32A: 84,
+    0x32B: 84,
+    0x32C: 84,
+    0x32D: 84,
+    0x32E: 84,
+    0x32F: 84,
     0x330: 84,
     0x331: 84,
     0x332: 84,
@@ -160,12 +160,12 @@
     0x337: 84,
     0x338: 84,
     0x339: 84,
-    0x33a: 84,
-    0x33b: 84,
-    0x33c: 84,
-    0x33d: 84,
-    0x33e: 84,
-    0x33f: 84,
+    0x33A: 84,
+    0x33B: 84,
+    0x33C: 84,
+    0x33D: 84,
+    0x33E: 84,
+    0x33F: 84,
     0x340: 84,
     0x341: 84,
     0x342: 84,
@@ -176,12 +176,12 @@
     0x347: 84,
     0x348: 84,
     0x349: 84,
-    0x34a: 84,
-    0x34b: 84,
-    0x34c: 84,
-    0x34d: 84,
-    0x34e: 84,
-    0x34f: 84,
+    0x34A: 84,
+    0x34B: 84,
+    0x34C: 84,
+    0x34D: 84,
+    0x34E: 84,
+    0x34F: 84,
     0x350: 84,
     0x351: 84,
     0x352: 84,
@@ -192,12 +192,12 @@
     0x357: 84,
     0x358: 84,
     0x359: 84,
-    0x35a: 84,
-    0x35b: 84,
-    0x35c: 84,
-    0x35d: 84,
-    0x35e: 84,
-    0x35f: 84,
+    0x35A: 84,
+    0x35B: 84,
+    0x35C: 84,
+    0x35D: 84,
+    0x35E: 84,
+    0x35F: 84,
     0x360: 84,
     0x361: 84,
     0x362: 84,
@@ -208,12 +208,12 @@
     0x367: 84,
     0x368: 84,
     0x369: 84,
-    0x36a: 84,
-    0x36b: 84,
-    0x36c: 84,
-    0x36d: 84,
-    0x36e: 84,
-    0x36f: 84,
+    0x36A: 84,
+    0x36B: 84,
+    0x36C: 84,
+    0x36D: 84,
+    0x36E: 84,
+    0x36F: 84,
     0x483: 84,
     0x484: 84,
     0x485: 84,
@@ -230,48 +230,48 @@
     0x597: 84,
     0x598: 84,
     0x599: 84,
-    0x59a: 84,
-    0x59b: 84,
-    0x59c: 84,
-    0x59d: 84,
-    0x59e: 84,
-    0x59f: 84,
-    0x5a0: 84,
-    0x5a1: 84,
-    0x5a2: 84,
-    0x5a3: 84,
-    0x5a4: 84,
-    0x5a5: 84,
-    0x5a6: 84,
-    0x5a7: 84,
-    0x5a8: 84,
-    0x5a9: 84,
-    0x5aa: 84,
-    0x5ab: 84,
-    0x5ac: 84,
-    0x5ad: 84,
-    0x5ae: 84,
-    0x5af: 84,
-    0x5b0: 84,
-    0x5b1: 84,
-    0x5b2: 84,
-    0x5b3: 84,
-    0x5b4: 84,
-    0x5b5: 84,
-    0x5b6: 84,
-    0x5b7: 84,
-    0x5b8: 84,
-    0x5b9: 84,
-    0x5ba: 84,
-    0x5bb: 84,
-    0x5bc: 84,
-    0x5bd: 84,
-    0x5bf: 84,
-    0x5c1: 84,
-    0x5c2: 84,
-    0x5c4: 84,
-    0x5c5: 84,
-    0x5c7: 84,
+    0x59A: 84,
+    0x59B: 84,
+    0x59C: 84,
+    0x59D: 84,
+    0x59E: 84,
+    0x59F: 84,
+    0x5A0: 84,
+    0x5A1: 84,
+    0x5A2: 84,
+    0x5A3: 84,
+    0x5A4: 84,
+    0x5A5: 84,
+    0x5A6: 84,
+    0x5A7: 84,
+    0x5A8: 84,
+    0x5A9: 84,
+    0x5AA: 84,
+    0x5AB: 84,
+    0x5AC: 84,
+    0x5AD: 84,
+    0x5AE: 84,
+    0x5AF: 84,
+    0x5B0: 84,
+    0x5B1: 84,
+    0x5B2: 84,
+    0x5B3: 84,
+    0x5B4: 84,
+    0x5B5: 84,
+    0x5B6: 84,
+    0x5B7: 84,
+    0x5B8: 84,
+    0x5B9: 84,
+    0x5BA: 84,
+    0x5BB: 84,
+    0x5BC: 84,
+    0x5BD: 84,
+    0x5BF: 84,
+    0x5C1: 84,
+    0x5C2: 84,
+    0x5C4: 84,
+    0x5C5: 84,
+    0x5C7: 84,
     0x610: 84,
     0x611: 84,
     0x612: 84,
@@ -282,8 +282,8 @@
     0x617: 84,
     0x618: 84,
     0x619: 84,
-    0x61a: 84,
-    0x61c: 84,
+    0x61A: 84,
+    0x61C: 84,
     0x620: 68,
     0x622: 82,
     0x623: 82,
@@ -293,12 +293,12 @@
     0x627: 82,
     0x628: 68,
     0x629: 82,
-    0x62a: 68,
-    0x62b: 68,
-    0x62c: 68,
-    0x62d: 68,
-    0x62e: 68,
-    0x62f: 82,
+    0x62A: 68,
+    0x62B: 68,
+    0x62C: 68,
+    0x62D: 68,
+    0x62E: 68,
+    0x62F: 82,
     0x630: 82,
     0x631: 82,
     0x632: 82,
@@ -309,12 +309,12 @@
     0x637: 68,
     0x638: 68,
     0x639: 68,
-    0x63a: 68,
-    0x63b: 68,
-    0x63c: 68,
-    0x63d: 68,
-    0x63e: 68,
-    0x63f: 68,
+    0x63A: 68,
+    0x63B: 68,
+    0x63C: 68,
+    0x63D: 68,
+    0x63E: 68,
+    0x63F: 68,
     0x640: 67,
     0x641: 68,
     0x642: 68,
@@ -325,12 +325,12 @@
     0x647: 68,
     0x648: 82,
     0x649: 68,
-    0x64a: 68,
-    0x64b: 84,
-    0x64c: 84,
-    0x64d: 84,
-    0x64e: 84,
-    0x64f: 84,
+    0x64A: 68,
+    0x64B: 84,
+    0x64C: 84,
+    0x64D: 84,
+    0x64E: 84,
+    0x64F: 84,
     0x650: 84,
     0x651: 84,
     0x652: 84,
@@ -341,14 +341,14 @@
     0x657: 84,
     0x658: 84,
     0x659: 84,
-    0x65a: 84,
-    0x65b: 84,
-    0x65c: 84,
-    0x65d: 84,
-    0x65e: 84,
-    0x65f: 84,
-    0x66e: 68,
-    0x66f: 68,
+    0x65A: 84,
+    0x65B: 84,
+    0x65C: 84,
+    0x65D: 84,
+    0x65E: 84,
+    0x65F: 84,
+    0x66E: 68,
+    0x66F: 68,
     0x670: 84,
     0x671: 82,
     0x672: 82,
@@ -358,12 +358,12 @@
     0x677: 82,
     0x678: 68,
     0x679: 68,
-    0x67a: 68,
-    0x67b: 68,
-    0x67c: 68,
-    0x67d: 68,
-    0x67e: 68,
-    0x67f: 68,
+    0x67A: 68,
+    0x67B: 68,
+    0x67C: 68,
+    0x67D: 68,
+    0x67E: 68,
+    0x67F: 68,
     0x680: 68,
     0x681: 68,
     0x682: 68,
@@ -374,12 +374,12 @@
     0x687: 68,
     0x688: 82,
     0x689: 82,
-    0x68a: 82,
-    0x68b: 82,
-    0x68c: 82,
-    0x68d: 82,
-    0x68e: 82,
-    0x68f: 82,
+    0x68A: 82,
+    0x68B: 82,
+    0x68C: 82,
+    0x68D: 82,
+    0x68E: 82,
+    0x68F: 82,
     0x690: 82,
     0x691: 82,
     0x692: 82,
@@ -390,91 +390,91 @@
     0x697: 82,
     0x698: 82,
     0x699: 82,
-    0x69a: 68,
-    0x69b: 68,
-    0x69c: 68,
-    0x69d: 68,
-    0x69e: 68,
-    0x69f: 68,
-    0x6a0: 68,
-    0x6a1: 68,
-    0x6a2: 68,
-    0x6a3: 68,
-    0x6a4: 68,
-    0x6a5: 68,
-    0x6a6: 68,
-    0x6a7: 68,
-    0x6a8: 68,
-    0x6a9: 68,
-    0x6aa: 68,
-    0x6ab: 68,
-    0x6ac: 68,
-    0x6ad: 68,
-    0x6ae: 68,
-    0x6af: 68,
-    0x6b0: 68,
-    0x6b1: 68,
-    0x6b2: 68,
-    0x6b3: 68,
-    0x6b4: 68,
-    0x6b5: 68,
-    0x6b6: 68,
-    0x6b7: 68,
-    0x6b8: 68,
-    0x6b9: 68,
-    0x6ba: 68,
-    0x6bb: 68,
-    0x6bc: 68,
-    0x6bd: 68,
-    0x6be: 68,
-    0x6bf: 68,
-    0x6c0: 82,
-    0x6c1: 68,
-    0x6c2: 68,
-    0x6c3: 82,
-    0x6c4: 82,
-    0x6c5: 82,
-    0x6c6: 82,
-    0x6c7: 82,
-    0x6c8: 82,
-    0x6c9: 82,
-    0x6ca: 82,
-    0x6cb: 82,
-    0x6cc: 68,
-    0x6cd: 82,
-    0x6ce: 68,
-    0x6cf: 82,
-    0x6d0: 68,
-    0x6d1: 68,
-    0x6d2: 82,
-    0x6d3: 82,
-    0x6d5: 82,
-    0x6d6: 84,
-    0x6d7: 84,
-    0x6d8: 84,
-    0x6d9: 84,
-    0x6da: 84,
-    0x6db: 84,
-    0x6dc: 84,
-    0x6df: 84,
-    0x6e0: 84,
-    0x6e1: 84,
-    0x6e2: 84,
-    0x6e3: 84,
-    0x6e4: 84,
-    0x6e7: 84,
-    0x6e8: 84,
-    0x6ea: 84,
-    0x6eb: 84,
-    0x6ec: 84,
-    0x6ed: 84,
-    0x6ee: 82,
-    0x6ef: 82,
-    0x6fa: 68,
-    0x6fb: 68,
-    0x6fc: 68,
-    0x6ff: 68,
-    0x70f: 84,
+    0x69A: 68,
+    0x69B: 68,
+    0x69C: 68,
+    0x69D: 68,
+    0x69E: 68,
+    0x69F: 68,
+    0x6A0: 68,
+    0x6A1: 68,
+    0x6A2: 68,
+    0x6A3: 68,
+    0x6A4: 68,
+    0x6A5: 68,
+    0x6A6: 68,
+    0x6A7: 68,
+    0x6A8: 68,
+    0x6A9: 68,
+    0x6AA: 68,
+    0x6AB: 68,
+    0x6AC: 68,
+    0x6AD: 68,
+    0x6AE: 68,
+    0x6AF: 68,
+    0x6B0: 68,
+    0x6B1: 68,
+    0x6B2: 68,
+    0x6B3: 68,
+    0x6B4: 68,
+    0x6B5: 68,
+    0x6B6: 68,
+    0x6B7: 68,
+    0x6B8: 68,
+    0x6B9: 68,
+    0x6BA: 68,
+    0x6BB: 68,
+    0x6BC: 68,
+    0x6BD: 68,
+    0x6BE: 68,
+    0x6BF: 68,
+    0x6C0: 82,
+    0x6C1: 68,
+    0x6C2: 68,
+    0x6C3: 82,
+    0x6C4: 82,
+    0x6C5: 82,
+    0x6C6: 82,
+    0x6C7: 82,
+    0x6C8: 82,
+    0x6C9: 82,
+    0x6CA: 82,
+    0x6CB: 82,
+    0x6CC: 68,
+    0x6CD: 82,
+    0x6CE: 68,
+    0x6CF: 82,
+    0x6D0: 68,
+    0x6D1: 68,
+    0x6D2: 82,
+    0x6D3: 82,
+    0x6D5: 82,
+    0x6D6: 84,
+    0x6D7: 84,
+    0x6D8: 84,
+    0x6D9: 84,
+    0x6DA: 84,
+    0x6DB: 84,
+    0x6DC: 84,
+    0x6DF: 84,
+    0x6E0: 84,
+    0x6E1: 84,
+    0x6E2: 84,
+    0x6E3: 84,
+    0x6E4: 84,
+    0x6E7: 84,
+    0x6E8: 84,
+    0x6EA: 84,
+    0x6EB: 84,
+    0x6EC: 84,
+    0x6ED: 84,
+    0x6EE: 82,
+    0x6EF: 82,
+    0x6FA: 68,
+    0x6FB: 68,
+    0x6FC: 68,
+    0x6FF: 68,
+    0x70F: 84,
     0x710: 82,
     0x711: 84,
     0x712: 68,
@@ -485,12 +485,12 @@
     0x717: 82,
     0x718: 82,
     0x719: 82,
-    0x71a: 68,
-    0x71b: 68,
-    0x71c: 68,
-    0x71d: 68,
-    0x71e: 82,
-    0x71f: 68,
+    0x71A: 68,
+    0x71B: 68,
+    0x71C: 68,
+    0x71D: 68,
+    0x71E: 82,
+    0x71F: 68,
     0x720: 68,
     0x721: 68,
     0x722: 68,
@@ -501,12 +501,12 @@
     0x727: 68,
     0x728: 82,
     0x729: 68,
-    0x72a: 82,
-    0x72b: 68,
-    0x72c: 82,
-    0x72d: 68,
-    0x72e: 68,
-    0x72f: 82,
+    0x72A: 82,
+    0x72B: 68,
+    0x72C: 82,
+    0x72D: 68,
+    0x72E: 68,
+    0x72F: 82,
     0x730: 84,
     0x731: 84,
     0x732: 84,
@@ -517,12 +517,12 @@
     0x737: 84,
     0x738: 84,
     0x739: 84,
-    0x73a: 84,
-    0x73b: 84,
-    0x73c: 84,
-    0x73d: 84,
-    0x73e: 84,
-    0x73f: 84,
+    0x73A: 84,
+    0x73B: 84,
+    0x73C: 84,
+    0x73D: 84,
+    0x73E: 84,
+    0x73F: 84,
     0x740: 84,
     0x741: 84,
     0x742: 84,
@@ -533,10 +533,10 @@
     0x747: 84,
     0x748: 84,
     0x749: 84,
-    0x74a: 84,
-    0x74d: 82,
-    0x74e: 68,
-    0x74f: 68,
+    0x74A: 84,
+    0x74D: 82,
+    0x74E: 68,
+    0x74F: 68,
     0x750: 68,
     0x751: 68,
     0x752: 68,
@@ -547,12 +547,12 @@
     0x757: 68,
     0x758: 68,
     0x759: 82,
-    0x75a: 82,
-    0x75b: 82,
-    0x75c: 68,
-    0x75d: 68,
-    0x75e: 68,
-    0x75f: 68,
+    0x75A: 82,
+    0x75B: 82,
+    0x75C: 68,
+    0x75D: 68,
+    0x75E: 68,
+    0x75F: 68,
     0x760: 68,
     0x761: 68,
     0x762: 68,
@@ -563,12 +563,12 @@
     0x767: 68,
     0x768: 68,
     0x769: 68,
-    0x76a: 68,
-    0x76b: 82,
-    0x76c: 82,
-    0x76d: 68,
-    0x76e: 68,
-    0x76f: 68,
+    0x76A: 68,
+    0x76B: 82,
+    0x76C: 82,
+    0x76D: 68,
+    0x76E: 68,
+    0x76F: 68,
     0x770: 68,
     0x771: 82,
     0x772: 68,
@@ -579,76 +579,76 @@
     0x777: 68,
     0x778: 82,
     0x779: 82,
-    0x77a: 68,
-    0x77b: 68,
-    0x77c: 68,
-    0x77d: 68,
-    0x77e: 68,
-    0x77f: 68,
-    0x7a6: 84,
-    0x7a7: 84,
-    0x7a8: 84,
-    0x7a9: 84,
-    0x7aa: 84,
-    0x7ab: 84,
-    0x7ac: 84,
-    0x7ad: 84,
-    0x7ae: 84,
-    0x7af: 84,
-    0x7b0: 84,
-    0x7ca: 68,
-    0x7cb: 68,
-    0x7cc: 68,
-    0x7cd: 68,
-    0x7ce: 68,
-    0x7cf: 68,
-    0x7d0: 68,
-    0x7d1: 68,
-    0x7d2: 68,
-    0x7d3: 68,
-    0x7d4: 68,
-    0x7d5: 68,
-    0x7d6: 68,
-    0x7d7: 68,
-    0x7d8: 68,
-    0x7d9: 68,
-    0x7da: 68,
-    0x7db: 68,
-    0x7dc: 68,
-    0x7dd: 68,
-    0x7de: 68,
-    0x7df: 68,
-    0x7e0: 68,
-    0x7e1: 68,
-    0x7e2: 68,
-    0x7e3: 68,
-    0x7e4: 68,
-    0x7e5: 68,
-    0x7e6: 68,
-    0x7e7: 68,
-    0x7e8: 68,
-    0x7e9: 68,
-    0x7ea: 68,
-    0x7eb: 84,
-    0x7ec: 84,
-    0x7ed: 84,
-    0x7ee: 84,
-    0x7ef: 84,
-    0x7f0: 84,
-    0x7f1: 84,
-    0x7f2: 84,
-    0x7f3: 84,
-    0x7fa: 67,
-    0x7fd: 84,
+    0x77A: 68,
+    0x77B: 68,
+    0x77C: 68,
+    0x77D: 68,
+    0x77E: 68,
+    0x77F: 68,
+    0x7A6: 84,
+    0x7A7: 84,
+    0x7A8: 84,
+    0x7A9: 84,
+    0x7AA: 84,
+    0x7AB: 84,
+    0x7AC: 84,
+    0x7AD: 84,
+    0x7AE: 84,
+    0x7AF: 84,
+    0x7B0: 84,
+    0x7CA: 68,
+    0x7CB: 68,
+    0x7CC: 68,
+    0x7CD: 68,
+    0x7CE: 68,
+    0x7CF: 68,
+    0x7D0: 68,
+    0x7D1: 68,
+    0x7D2: 68,
+    0x7D3: 68,
+    0x7D4: 68,
+    0x7D5: 68,
+    0x7D6: 68,
+    0x7D7: 68,
+    0x7D8: 68,
+    0x7D9: 68,
+    0x7DA: 68,
+    0x7DB: 68,
+    0x7DC: 68,
+    0x7DD: 68,
+    0x7DE: 68,
+    0x7DF: 68,
+    0x7E0: 68,
+    0x7E1: 68,
+    0x7E2: 68,
+    0x7E3: 68,
+    0x7E4: 68,
+    0x7E5: 68,
+    0x7E6: 68,
+    0x7E7: 68,
+    0x7E8: 68,
+    0x7E9: 68,
+    0x7EA: 68,
+    0x7EB: 84,
+    0x7EC: 84,
+    0x7ED: 84,
+    0x7EE: 84,
+    0x7EF: 84,
+    0x7F0: 84,
+    0x7F1: 84,
+    0x7F2: 84,
+    0x7F3: 84,
+    0x7FA: 67,
+    0x7FD: 84,
     0x816: 84,
     0x817: 84,
     0x818: 84,
     0x819: 84,
-    0x81b: 84,
-    0x81c: 84,
-    0x81d: 84,
-    0x81e: 84,
-    0x81f: 84,
+    0x81B: 84,
+    0x81C: 84,
+    0x81D: 84,
+    0x81E: 84,
+    0x81F: 84,
     0x820: 84,
     0x821: 84,
     0x822: 84,
@@ -657,10 +657,10 @@
     0x826: 84,
     0x827: 84,
     0x829: 84,
-    0x82a: 84,
-    0x82b: 84,
-    0x82c: 84,
-    0x82d: 84,
+    0x82A: 84,
+    0x82B: 84,
+    0x82C: 84,
+    0x82D: 84,
     0x840: 82,
     0x841: 68,
     0x842: 68,
@@ -671,12 +671,12 @@
     0x847: 82,
     0x848: 68,
     0x849: 82,
-    0x84a: 68,
-    0x84b: 68,
-    0x84c: 68,
-    0x84d: 68,
-    0x84e: 68,
-    0x84f: 68,
+    0x84A: 68,
+    0x84B: 68,
+    0x84C: 68,
+    0x84D: 68,
+    0x84E: 68,
+    0x84F: 68,
     0x850: 68,
     0x851: 68,
     0x852: 68,
@@ -687,8 +687,8 @@
     0x857: 82,
     0x858: 82,
     0x859: 84,
-    0x85a: 84,
-    0x85b: 84,
+    0x85A: 84,
+    0x85B: 84,
     0x860: 68,
     0x862: 68,
     0x863: 68,
@@ -697,7 +697,7 @@
     0x867: 82,
     0x868: 68,
     0x869: 82,
-    0x86a: 82,
+    0x86A: 82,
     0x870: 82,
     0x871: 82,
     0x872: 82,
@@ -708,12 +708,12 @@
     0x877: 82,
     0x878: 82,
     0x879: 82,
-    0x87a: 82,
-    0x87b: 82,
-    0x87c: 82,
-    0x87d: 82,
-    0x87e: 82,
-    0x87f: 82,
+    0x87A: 82,
+    0x87B: 82,
+    0x87C: 82,
+    0x87D: 82,
+    0x87E: 82,
+    0x87F: 82,
     0x880: 82,
     0x881: 82,
     0x882: 82,
@@ -722,117 +722,117 @@
     0x885: 67,
     0x886: 68,
     0x889: 68,
-    0x88a: 68,
-    0x88b: 68,
-    0x88c: 68,
-    0x88d: 68,
-    0x88e: 82,
+    0x88A: 68,
+    0x88B: 68,
+    0x88C: 68,
+    0x88D: 68,
+    0x88E: 82,
     0x898: 84,
     0x899: 84,
-    0x89a: 84,
-    0x89b: 84,
-    0x89c: 84,
-    0x89d: 84,
-    0x89e: 84,
-    0x89f: 84,
-    0x8a0: 68,
-    0x8a1: 68,
-    0x8a2: 68,
-    0x8a3: 68,
-    0x8a4: 68,
-    0x8a5: 68,
-    0x8a6: 68,
-    0x8a7: 68,
-    0x8a8: 68,
-    0x8a9: 68,
-    0x8aa: 82,
-    0x8ab: 82,
-    0x8ac: 82,
-    0x8ae: 82,
-    0x8af: 68,
-    0x8b0: 68,
-    0x8b1: 82,
-    0x8b2: 82,
-    0x8b3: 68,
-    0x8b4: 68,
-    0x8b5: 68,
-    0x8b6: 68,
-    0x8b7: 68,
-    0x8b8: 68,
-    0x8b9: 82,
-    0x8ba: 68,
-    0x8bb: 68,
-    0x8bc: 68,
-    0x8bd: 68,
-    0x8be: 68,
-    0x8bf: 68,
-    0x8c0: 68,
-    0x8c1: 68,
-    0x8c2: 68,
-    0x8c3: 68,
-    0x8c4: 68,
-    0x8c5: 68,
-    0x8c6: 68,
-    0x8c7: 68,
-    0x8c8: 68,
-    0x8ca: 84,
-    0x8cb: 84,
-    0x8cc: 84,
-    0x8cd: 84,
-    0x8ce: 84,
-    0x8cf: 84,
-    0x8d0: 84,
-    0x8d1: 84,
-    0x8d2: 84,
-    0x8d3: 84,
-    0x8d4: 84,
-    0x8d5: 84,
-    0x8d6: 84,
-    0x8d7: 84,
-    0x8d8: 84,
-    0x8d9: 84,
-    0x8da: 84,
-    0x8db: 84,
-    0x8dc: 84,
-    0x8dd: 84,
-    0x8de: 84,
-    0x8df: 84,
-    0x8e0: 84,
-    0x8e1: 84,
-    0x8e3: 84,
-    0x8e4: 84,
-    0x8e5: 84,
-    0x8e6: 84,
-    0x8e7: 84,
-    0x8e8: 84,
-    0x8e9: 84,
-    0x8ea: 84,
-    0x8eb: 84,
-    0x8ec: 84,
-    0x8ed: 84,
-    0x8ee: 84,
-    0x8ef: 84,
-    0x8f0: 84,
-    0x8f1: 84,
-    0x8f2: 84,
-    0x8f3: 84,
-    0x8f4: 84,
-    0x8f5: 84,
-    0x8f6: 84,
-    0x8f7: 84,
-    0x8f8: 84,
-    0x8f9: 84,
-    0x8fa: 84,
-    0x8fb: 84,
-    0x8fc: 84,
-    0x8fd: 84,
-    0x8fe: 84,
-    0x8ff: 84,
+    0x89A: 84,
+    0x89B: 84,
+    0x89C: 84,
+    0x89D: 84,
+    0x89E: 84,
+    0x89F: 84,
+    0x8A0: 68,
+    0x8A1: 68,
+    0x8A2: 68,
+    0x8A3: 68,
+    0x8A4: 68,
+    0x8A5: 68,
+    0x8A6: 68,
+    0x8A7: 68,
+    0x8A8: 68,
+    0x8A9: 68,
+    0x8AA: 82,
+    0x8AB: 82,
+    0x8AC: 82,
+    0x8AE: 82,
+    0x8AF: 68,
+    0x8B0: 68,
+    0x8B1: 82,
+    0x8B2: 82,
+    0x8B3: 68,
+    0x8B4: 68,
+    0x8B5: 68,
+    0x8B6: 68,
+    0x8B7: 68,
+    0x8B8: 68,
+    0x8B9: 82,
+    0x8BA: 68,
+    0x8BB: 68,
+    0x8BC: 68,
+    0x8BD: 68,
+    0x8BE: 68,
+    0x8BF: 68,
+    0x8C0: 68,
+    0x8C1: 68,
+    0x8C2: 68,
+    0x8C3: 68,
+    0x8C4: 68,
+    0x8C5: 68,
+    0x8C6: 68,
+    0x8C7: 68,
+    0x8C8: 68,
+    0x8CA: 84,
+    0x8CB: 84,
+    0x8CC: 84,
+    0x8CD: 84,
+    0x8CE: 84,
+    0x8CF: 84,
+    0x8D0: 84,
+    0x8D1: 84,
+    0x8D2: 84,
+    0x8D3: 84,
+    0x8D4: 84,
+    0x8D5: 84,
+    0x8D6: 84,
+    0x8D7: 84,
+    0x8D8: 84,
+    0x8D9: 84,
+    0x8DA: 84,
+    0x8DB: 84,
+    0x8DC: 84,
+    0x8DD: 84,
+    0x8DE: 84,
+    0x8DF: 84,
+    0x8E0: 84,
+    0x8E1: 84,
+    0x8E3: 84,
+    0x8E4: 84,
+    0x8E5: 84,
+    0x8E6: 84,
+    0x8E7: 84,
+    0x8E8: 84,
+    0x8E9: 84,
+    0x8EA: 84,
+    0x8EB: 84,
+    0x8EC: 84,
+    0x8ED: 84,
+    0x8EE: 84,
+    0x8EF: 84,
+    0x8F0: 84,
+    0x8F1: 84,
+    0x8F2: 84,
+    0x8F3: 84,
+    0x8F4: 84,
+    0x8F5: 84,
+    0x8F6: 84,
+    0x8F7: 84,
+    0x8F8: 84,
+    0x8F9: 84,
+    0x8FA: 84,
+    0x8FB: 84,
+    0x8FC: 84,
+    0x8FD: 84,
+    0x8FE: 84,
+    0x8FF: 84,
     0x900: 84,
     0x901: 84,
     0x902: 84,
-    0x93a: 84,
-    0x93c: 84,
+    0x93A: 84,
+    0x93C: 84,
     0x941: 84,
     0x942: 84,
     0x943: 84,
@@ -841,7 +841,7 @@
     0x946: 84,
     0x947: 84,
     0x948: 84,
-    0x94d: 84,
+    0x94D: 84,
     0x951: 84,
     0x952: 84,
     0x953: 84,
@@ -852,215 +852,215 @@
     0x962: 84,
     0x963: 84,
     0x981: 84,
-    0x9bc: 84,
-    0x9c1: 84,
-    0x9c2: 84,
-    0x9c3: 84,
-    0x9c4: 84,
-    0x9cd: 84,
-    0x9e2: 84,
-    0x9e3: 84,
-    0x9fe: 84,
-    0xa01: 84,
-    0xa02: 84,
-    0xa3c: 84,
-    0xa41: 84,
-    0xa42: 84,
-    0xa47: 84,
-    0xa48: 84,
-    0xa4b: 84,
-    0xa4c: 84,
-    0xa4d: 84,
-    0xa51: 84,
-    0xa70: 84,
-    0xa71: 84,
-    0xa75: 84,
-    0xa81: 84,
-    0xa82: 84,
-    0xabc: 84,
-    0xac1: 84,
-    0xac2: 84,
-    0xac3: 84,
-    0xac4: 84,
-    0xac5: 84,
-    0xac7: 84,
-    0xac8: 84,
-    0xacd: 84,
-    0xae2: 84,
-    0xae3: 84,
-    0xafa: 84,
-    0xafb: 84,
-    0xafc: 84,
-    0xafd: 84,
-    0xafe: 84,
-    0xaff: 84,
-    0xb01: 84,
-    0xb3c: 84,
-    0xb3f: 84,
-    0xb41: 84,
-    0xb42: 84,
-    0xb43: 84,
-    0xb44: 84,
-    0xb4d: 84,
-    0xb55: 84,
-    0xb56: 84,
-    0xb62: 84,
-    0xb63: 84,
-    0xb82: 84,
-    0xbc0: 84,
-    0xbcd: 84,
-    0xc00: 84,
-    0xc04: 84,
-    0xc3c: 84,
-    0xc3e: 84,
-    0xc3f: 84,
-    0xc40: 84,
-    0xc46: 84,
-    0xc47: 84,
-    0xc48: 84,
-    0xc4a: 84,
-    0xc4b: 84,
-    0xc4c: 84,
-    0xc4d: 84,
-    0xc55: 84,
-    0xc56: 84,
-    0xc62: 84,
-    0xc63: 84,
-    0xc81: 84,
-    0xcbc: 84,
-    0xcbf: 84,
-    0xcc6: 84,
-    0xccc: 84,
-    0xccd: 84,
-    0xce2: 84,
-    0xce3: 84,
-    0xd00: 84,
-    0xd01: 84,
-    0xd3b: 84,
-    0xd3c: 84,
-    0xd41: 84,
-    0xd42: 84,
-    0xd43: 84,
-    0xd44: 84,
-    0xd4d: 84,
-    0xd62: 84,
-    0xd63: 84,
-    0xd81: 84,
-    0xdca: 84,
-    0xdd2: 84,
-    0xdd3: 84,
-    0xdd4: 84,
-    0xdd6: 84,
-    0xe31: 84,
-    0xe34: 84,
-    0xe35: 84,
-    0xe36: 84,
-    0xe37: 84,
-    0xe38: 84,
-    0xe39: 84,
-    0xe3a: 84,
-    0xe47: 84,
-    0xe48: 84,
-    0xe49: 84,
-    0xe4a: 84,
-    0xe4b: 84,
-    0xe4c: 84,
-    0xe4d: 84,
-    0xe4e: 84,
-    0xeb1: 84,
-    0xeb4: 84,
-    0xeb5: 84,
-    0xeb6: 84,
-    0xeb7: 84,
-    0xeb8: 84,
-    0xeb9: 84,
-    0xeba: 84,
-    0xebb: 84,
-    0xebc: 84,
-    0xec8: 84,
-    0xec9: 84,
-    0xeca: 84,
-    0xecb: 84,
-    0xecc: 84,
-    0xecd: 84,
-    0xece: 84,
-    0xf18: 84,
-    0xf19: 84,
-    0xf35: 84,
-    0xf37: 84,
-    0xf39: 84,
-    0xf71: 84,
-    0xf72: 84,
-    0xf73: 84,
-    0xf74: 84,
-    0xf75: 84,
-    0xf76: 84,
-    0xf77: 84,
-    0xf78: 84,
-    0xf79: 84,
-    0xf7a: 84,
-    0xf7b: 84,
-    0xf7c: 84,
-    0xf7d: 84,
-    0xf7e: 84,
-    0xf80: 84,
-    0xf81: 84,
-    0xf82: 84,
-    0xf83: 84,
-    0xf84: 84,
-    0xf86: 84,
-    0xf87: 84,
-    0xf8d: 84,
-    0xf8e: 84,
-    0xf8f: 84,
-    0xf90: 84,
-    0xf91: 84,
-    0xf92: 84,
-    0xf93: 84,
-    0xf94: 84,
-    0xf95: 84,
-    0xf96: 84,
-    0xf97: 84,
-    0xf99: 84,
-    0xf9a: 84,
-    0xf9b: 84,
-    0xf9c: 84,
-    0xf9d: 84,
-    0xf9e: 84,
-    0xf9f: 84,
-    0xfa0: 84,
-    0xfa1: 84,
-    0xfa2: 84,
-    0xfa3: 84,
-    0xfa4: 84,
-    0xfa5: 84,
-    0xfa6: 84,
-    0xfa7: 84,
-    0xfa8: 84,
-    0xfa9: 84,
-    0xfaa: 84,
-    0xfab: 84,
-    0xfac: 84,
-    0xfad: 84,
-    0xfae: 84,
-    0xfaf: 84,
-    0xfb0: 84,
-    0xfb1: 84,
-    0xfb2: 84,
-    0xfb3: 84,
-    0xfb4: 84,
-    0xfb5: 84,
-    0xfb6: 84,
-    0xfb7: 84,
-    0xfb8: 84,
-    0xfb9: 84,
-    0xfba: 84,
-    0xfbb: 84,
-    0xfbc: 84,
-    0xfc6: 84,
-    0x102d: 84,
-    0x102e: 84,
-    0x102f: 84,
+    0x9BC: 84,
+    0x9C1: 84,
+    0x9C2: 84,
+    0x9C3: 84,
+    0x9C4: 84,
+    0x9CD: 84,
+    0x9E2: 84,
+    0x9E3: 84,
+    0x9FE: 84,
+    0xA01: 84,
+    0xA02: 84,
+    0xA3C: 84,
+    0xA41: 84,
+    0xA42: 84,
+    0xA47: 84,
+    0xA48: 84,
+    0xA4B: 84,
+    0xA4C: 84,
+    0xA4D: 84,
+    0xA51: 84,
+    0xA70: 84,
+    0xA71: 84,
+    0xA75: 84,
+    0xA81: 84,
+    0xA82: 84,
+    0xABC: 84,
+    0xAC1: 84,
+    0xAC2: 84,
+    0xAC3: 84,
+    0xAC4: 84,
+    0xAC5: 84,
+    0xAC7: 84,
+    0xAC8: 84,
+    0xACD: 84,
+    0xAE2: 84,
+    0xAE3: 84,
+    0xAFA: 84,
+    0xAFB: 84,
+    0xAFC: 84,
+    0xAFD: 84,
+    0xAFE: 84,
+    0xAFF: 84,
+    0xB01: 84,
+    0xB3C: 84,
+    0xB3F: 84,
+    0xB41: 84,
+    0xB42: 84,
+    0xB43: 84,
+    0xB44: 84,
+    0xB4D: 84,
+    0xB55: 84,
+    0xB56: 84,
+    0xB62: 84,
+    0xB63: 84,
+    0xB82: 84,
+    0xBC0: 84,
+    0xBCD: 84,
+    0xC00: 84,
+    0xC04: 84,
+    0xC3C: 84,
+    0xC3E: 84,
+    0xC3F: 84,
+    0xC40: 84,
+    0xC46: 84,
+    0xC47: 84,
+    0xC48: 84,
+    0xC4A: 84,
+    0xC4B: 84,
+    0xC4C: 84,
+    0xC4D: 84,
+    0xC55: 84,
+    0xC56: 84,
+    0xC62: 84,
+    0xC63: 84,
+    0xC81: 84,
+    0xCBC: 84,
+    0xCBF: 84,
+    0xCC6: 84,
+    0xCCC: 84,
+    0xCCD: 84,
+    0xCE2: 84,
+    0xCE3: 84,
+    0xD00: 84,
+    0xD01: 84,
+    0xD3B: 84,
+    0xD3C: 84,
+    0xD41: 84,
+    0xD42: 84,
+    0xD43: 84,
+    0xD44: 84,
+    0xD4D: 84,
+    0xD62: 84,
+    0xD63: 84,
+    0xD81: 84,
+    0xDCA: 84,
+    0xDD2: 84,
+    0xDD3: 84,
+    0xDD4: 84,
+    0xDD6: 84,
+    0xE31: 84,
+    0xE34: 84,
+    0xE35: 84,
+    0xE36: 84,
+    0xE37: 84,
+    0xE38: 84,
+    0xE39: 84,
+    0xE3A: 84,
+    0xE47: 84,
+    0xE48: 84,
+    0xE49: 84,
+    0xE4A: 84,
+    0xE4B: 84,
+    0xE4C: 84,
+    0xE4D: 84,
+    0xE4E: 84,
+    0xEB1: 84,
+    0xEB4: 84,
+    0xEB5: 84,
+    0xEB6: 84,
+    0xEB7: 84,
+    0xEB8: 84,
+    0xEB9: 84,
+    0xEBA: 84,
+    0xEBB: 84,
+    0xEBC: 84,
+    0xEC8: 84,
+    0xEC9: 84,
+    0xECA: 84,
+    0xECB: 84,
+    0xECC: 84,
+    0xECD: 84,
+    0xECE: 84,
+    0xF18: 84,
+    0xF19: 84,
+    0xF35: 84,
+    0xF37: 84,
+    0xF39: 84,
+    0xF71: 84,
+    0xF72: 84,
+    0xF73: 84,
+    0xF74: 84,
+    0xF75: 84,
+    0xF76: 84,
+    0xF77: 84,
+    0xF78: 84,
+    0xF79: 84,
+    0xF7A: 84,
+    0xF7B: 84,
+    0xF7C: 84,
+    0xF7D: 84,
+    0xF7E: 84,
+    0xF80: 84,
+    0xF81: 84,
+    0xF82: 84,
+    0xF83: 84,
+    0xF84: 84,
+    0xF86: 84,
+    0xF87: 84,
+    0xF8D: 84,
+    0xF8E: 84,
+    0xF8F: 84,
+    0xF90: 84,
+    0xF91: 84,
+    0xF92: 84,
+    0xF93: 84,
+    0xF94: 84,
+    0xF95: 84,
+    0xF96: 84,
+    0xF97: 84,
+    0xF99: 84,
+    0xF9A: 84,
+    0xF9B: 84,
+    0xF9C: 84,
+    0xF9D: 84,
+    0xF9E: 84,
+    0xF9F: 84,
+    0xFA0: 84,
+    0xFA1: 84,
+    0xFA2: 84,
+    0xFA3: 84,
+    0xFA4: 84,
+    0xFA5: 84,
+    0xFA6: 84,
+    0xFA7: 84,
+    0xFA8: 84,
+    0xFA9: 84,
+    0xFAA: 84,
+    0xFAB: 84,
+    0xFAC: 84,
+    0xFAD: 84,
+    0xFAE: 84,
+    0xFAF: 84,
+    0xFB0: 84,
+    0xFB1: 84,
+    0xFB2: 84,
+    0xFB3: 84,
+    0xFB4: 84,
+    0xFB5: 84,
+    0xFB6: 84,
+    0xFB7: 84,
+    0xFB8: 84,
+    0xFB9: 84,
+    0xFBA: 84,
+    0xFBB: 84,
+    0xFBC: 84,
+    0xFC6: 84,
+    0x102D: 84,
+    0x102E: 84,
+    0x102F: 84,
     0x1030: 84,
     0x1032: 84,
     0x1033: 84,
@@ -1069,13 +1069,13 @@
     0x1036: 84,
     0x1037: 84,
     0x1039: 84,
-    0x103a: 84,
-    0x103d: 84,
-    0x103e: 84,
+    0x103A: 84,
+    0x103D: 84,
+    0x103E: 84,
     0x1058: 84,
     0x1059: 84,
-    0x105e: 84,
-    0x105f: 84,
+    0x105E: 84,
+    0x105F: 84,
     0x1060: 84,
     0x1071: 84,
     0x1072: 84,
@@ -1084,11 +1084,11 @@
     0x1082: 84,
     0x1085: 84,
     0x1086: 84,
-    0x108d: 84,
-    0x109d: 84,
-    0x135d: 84,
-    0x135e: 84,
-    0x135f: 84,
+    0x108D: 84,
+    0x109D: 84,
+    0x135D: 84,
+    0x135E: 84,
+    0x135F: 84,
     0x1712: 84,
     0x1713: 84,
     0x1714: 84,
@@ -1098,34 +1098,34 @@
     0x1753: 84,
     0x1772: 84,
     0x1773: 84,
-    0x17b4: 84,
-    0x17b5: 84,
-    0x17b7: 84,
-    0x17b8: 84,
-    0x17b9: 84,
-    0x17ba: 84,
-    0x17bb: 84,
-    0x17bc: 84,
-    0x17bd: 84,
-    0x17c6: 84,
-    0x17c9: 84,
-    0x17ca: 84,
-    0x17cb: 84,
-    0x17cc: 84,
-    0x17cd: 84,
-    0x17ce: 84,
-    0x17cf: 84,
-    0x17d0: 84,
-    0x17d1: 84,
-    0x17d2: 84,
-    0x17d3: 84,
-    0x17dd: 84,
+    0x17B4: 84,
+    0x17B5: 84,
+    0x17B7: 84,
+    0x17B8: 84,
+    0x17B9: 84,
+    0x17BA: 84,
+    0x17BB: 84,
+    0x17BC: 84,
+    0x17BD: 84,
+    0x17C6: 84,
+    0x17C9: 84,
+    0x17CA: 84,
+    0x17CB: 84,
+    0x17CC: 84,
+    0x17CD: 84,
+    0x17CE: 84,
+    0x17CF: 84,
+    0x17D0: 84,
+    0x17D1: 84,
+    0x17D2: 84,
+    0x17D3: 84,
+    0x17DD: 84,
     0x1807: 68,
-    0x180a: 67,
-    0x180b: 84,
-    0x180c: 84,
-    0x180d: 84,
-    0x180f: 84,
+    0x180A: 67,
+    0x180B: 84,
+    0x180C: 84,
+    0x180D: 84,
+    0x180F: 84,
     0x1820: 68,
     0x1821: 68,
     0x1822: 68,
@@ -1136,12 +1136,12 @@
     0x1827: 68,
     0x1828: 68,
     0x1829: 68,
-    0x182a: 68,
-    0x182b: 68,
-    0x182c: 68,
-    0x182d: 68,
-    0x182e: 68,
-    0x182f: 68,
+    0x182A: 68,
+    0x182B: 68,
+    0x182C: 68,
+    0x182D: 68,
+    0x182E: 68,
+    0x182F: 68,
     0x1830: 68,
     0x1831: 68,
     0x1832: 68,
@@ -1152,12 +1152,12 @@
     0x1837: 68,
     0x1838: 68,
     0x1839: 68,
-    0x183a: 68,
-    0x183b: 68,
-    0x183c: 68,
-    0x183d: 68,
-    0x183e: 68,
-    0x183f: 68,
+    0x183A: 68,
+    0x183B: 68,
+    0x183C: 68,
+    0x183D: 68,
+    0x183E: 68,
+    0x183F: 68,
     0x1840: 68,
     0x1841: 68,
     0x1842: 68,
@@ -1168,12 +1168,12 @@
     0x1847: 68,
     0x1848: 68,
     0x1849: 68,
-    0x184a: 68,
-    0x184b: 68,
-    0x184c: 68,
-    0x184d: 68,
-    0x184e: 68,
-    0x184f: 68,
+    0x184A: 68,
+    0x184B: 68,
+    0x184C: 68,
+    0x184D: 68,
+    0x184E: 68,
+    0x184F: 68,
     0x1850: 68,
     0x1851: 68,
     0x1852: 68,
@@ -1184,12 +1184,12 @@
     0x1857: 68,
     0x1858: 68,
     0x1859: 68,
-    0x185a: 68,
-    0x185b: 68,
-    0x185c: 68,
-    0x185d: 68,
-    0x185e: 68,
-    0x185f: 68,
+    0x185A: 68,
+    0x185B: 68,
+    0x185C: 68,
+    0x185D: 68,
+    0x185E: 68,
+    0x185F: 68,
     0x1860: 68,
     0x1861: 68,
     0x1862: 68,
@@ -1200,12 +1200,12 @@
     0x1867: 68,
     0x1868: 68,
     0x1869: 68,
-    0x186a: 68,
-    0x186b: 68,
-    0x186c: 68,
-    0x186d: 68,
-    0x186e: 68,
-    0x186f: 68,
+    0x186A: 68,
+    0x186B: 68,
+    0x186C: 68,
+    0x186D: 68,
+    0x186E: 68,
+    0x186F: 68,
     0x1870: 68,
     0x1871: 68,
     0x1872: 68,
@@ -1220,12 +1220,12 @@
     0x1887: 68,
     0x1888: 68,
     0x1889: 68,
-    0x188a: 68,
-    0x188b: 68,
-    0x188c: 68,
-    0x188d: 68,
-    0x188e: 68,
-    0x188f: 68,
+    0x188A: 68,
+    0x188B: 68,
+    0x188C: 68,
+    0x188D: 68,
+    0x188E: 68,
+    0x188F: 68,
     0x1890: 68,
     0x1891: 68,
     0x1892: 68,
@@ -1236,23 +1236,23 @@
     0x1897: 68,
     0x1898: 68,
     0x1899: 68,
-    0x189a: 68,
-    0x189b: 68,
-    0x189c: 68,
-    0x189d: 68,
-    0x189e: 68,
-    0x189f: 68,
-    0x18a0: 68,
-    0x18a1: 68,
-    0x18a2: 68,
-    0x18a3: 68,
-    0x18a4: 68,
-    0x18a5: 68,
-    0x18a6: 68,
-    0x18a7: 68,
-    0x18a8: 68,
-    0x18a9: 84,
-    0x18aa: 68,
+    0x189A: 68,
+    0x189B: 68,
+    0x189C: 68,
+    0x189D: 68,
+    0x189E: 68,
+    0x189F: 68,
+    0x18A0: 68,
+    0x18A1: 68,
+    0x18A2: 68,
+    0x18A3: 68,
+    0x18A4: 68,
+    0x18A5: 68,
+    0x18A6: 68,
+    0x18A7: 68,
+    0x18A8: 68,
+    0x18A9: 84,
+    0x18AA: 68,
     0x1920: 84,
     0x1921: 84,
     0x1922: 84,
@@ -1260,712 +1260,712 @@
     0x1928: 84,
     0x1932: 84,
     0x1939: 84,
-    0x193a: 84,
-    0x193b: 84,
-    0x1a17: 84,
-    0x1a18: 84,
-    0x1a1b: 84,
-    0x1a56: 84,
-    0x1a58: 84,
-    0x1a59: 84,
-    0x1a5a: 84,
-    0x1a5b: 84,
-    0x1a5c: 84,
-    0x1a5d: 84,
-    0x1a5e: 84,
-    0x1a60: 84,
-    0x1a62: 84,
-    0x1a65: 84,
-    0x1a66: 84,
-    0x1a67: 84,
-    0x1a68: 84,
-    0x1a69: 84,
-    0x1a6a: 84,
-    0x1a6b: 84,
-    0x1a6c: 84,
-    0x1a73: 84,
-    0x1a74: 84,
-    0x1a75: 84,
-    0x1a76: 84,
-    0x1a77: 84,
-    0x1a78: 84,
-    0x1a79: 84,
-    0x1a7a: 84,
-    0x1a7b: 84,
-    0x1a7c: 84,
-    0x1a7f: 84,
-    0x1ab0: 84,
-    0x1ab1: 84,
-    0x1ab2: 84,
-    0x1ab3: 84,
-    0x1ab4: 84,
-    0x1ab5: 84,
-    0x1ab6: 84,
-    0x1ab7: 84,
-    0x1ab8: 84,
-    0x1ab9: 84,
-    0x1aba: 84,
-    0x1abb: 84,
-    0x1abc: 84,
-    0x1abd: 84,
-    0x1abe: 84,
-    0x1abf: 84,
-    0x1ac0: 84,
-    0x1ac1: 84,
-    0x1ac2: 84,
-    0x1ac3: 84,
-    0x1ac4: 84,
-    0x1ac5: 84,
-    0x1ac6: 84,
-    0x1ac7: 84,
-    0x1ac8: 84,
-    0x1ac9: 84,
-    0x1aca: 84,
-    0x1acb: 84,
-    0x1acc: 84,
-    0x1acd: 84,
-    0x1ace: 84,
-    0x1b00: 84,
-    0x1b01: 84,
-    0x1b02: 84,
-    0x1b03: 84,
-    0x1b34: 84,
-    0x1b36: 84,
-    0x1b37: 84,
-    0x1b38: 84,
-    0x1b39: 84,
-    0x1b3a: 84,
-    0x1b3c: 84,
-    0x1b42: 84,
-    0x1b6b: 84,
-    0x1b6c: 84,
-    0x1b6d: 84,
-    0x1b6e: 84,
-    0x1b6f: 84,
-    0x1b70: 84,
-    0x1b71: 84,
-    0x1b72: 84,
-    0x1b73: 84,
-    0x1b80: 84,
-    0x1b81: 84,
-    0x1ba2: 84,
-    0x1ba3: 84,
-    0x1ba4: 84,
-    0x1ba5: 84,
-    0x1ba8: 84,
-    0x1ba9: 84,
-    0x1bab: 84,
-    0x1bac: 84,
-    0x1bad: 84,
-    0x1be6: 84,
-    0x1be8: 84,
-    0x1be9: 84,
-    0x1bed: 84,
-    0x1bef: 84,
-    0x1bf0: 84,
-    0x1bf1: 84,
-    0x1c2c: 84,
-    0x1c2d: 84,
-    0x1c2e: 84,
-    0x1c2f: 84,
-    0x1c30: 84,
-    0x1c31: 84,
-    0x1c32: 84,
-    0x1c33: 84,
-    0x1c36: 84,
-    0x1c37: 84,
-    0x1cd0: 84,
-    0x1cd1: 84,
-    0x1cd2: 84,
-    0x1cd4: 84,
-    0x1cd5: 84,
-    0x1cd6: 84,
-    0x1cd7: 84,
-    0x1cd8: 84,
-    0x1cd9: 84,
-    0x1cda: 84,
-    0x1cdb: 84,
-    0x1cdc: 84,
-    0x1cdd: 84,
-    0x1cde: 84,
-    0x1cdf: 84,
-    0x1ce0: 84,
-    0x1ce2: 84,
-    0x1ce3: 84,
-    0x1ce4: 84,
-    0x1ce5: 84,
-    0x1ce6: 84,
-    0x1ce7: 84,
-    0x1ce8: 84,
-    0x1ced: 84,
-    0x1cf4: 84,
-    0x1cf8: 84,
-    0x1cf9: 84,
-    0x1dc0: 84,
-    0x1dc1: 84,
-    0x1dc2: 84,
-    0x1dc3: 84,
-    0x1dc4: 84,
-    0x1dc5: 84,
-    0x1dc6: 84,
-    0x1dc7: 84,
-    0x1dc8: 84,
-    0x1dc9: 84,
-    0x1dca: 84,
-    0x1dcb: 84,
-    0x1dcc: 84,
-    0x1dcd: 84,
-    0x1dce: 84,
-    0x1dcf: 84,
-    0x1dd0: 84,
-    0x1dd1: 84,
-    0x1dd2: 84,
-    0x1dd3: 84,
-    0x1dd4: 84,
-    0x1dd5: 84,
-    0x1dd6: 84,
-    0x1dd7: 84,
-    0x1dd8: 84,
-    0x1dd9: 84,
-    0x1dda: 84,
-    0x1ddb: 84,
-    0x1ddc: 84,
-    0x1ddd: 84,
-    0x1dde: 84,
-    0x1ddf: 84,
-    0x1de0: 84,
-    0x1de1: 84,
-    0x1de2: 84,
-    0x1de3: 84,
-    0x1de4: 84,
-    0x1de5: 84,
-    0x1de6: 84,
-    0x1de7: 84,
-    0x1de8: 84,
-    0x1de9: 84,
-    0x1dea: 84,
-    0x1deb: 84,
-    0x1dec: 84,
-    0x1ded: 84,
-    0x1dee: 84,
-    0x1def: 84,
-    0x1df0: 84,
-    0x1df1: 84,
-    0x1df2: 84,
-    0x1df3: 84,
-    0x1df4: 84,
-    0x1df5: 84,
-    0x1df6: 84,
-    0x1df7: 84,
-    0x1df8: 84,
-    0x1df9: 84,
-    0x1dfa: 84,
-    0x1dfb: 84,
-    0x1dfc: 84,
-    0x1dfd: 84,
-    0x1dfe: 84,
-    0x1dff: 84,
-    0x200b: 84,
-    0x200d: 67,
-    0x200e: 84,
-    0x200f: 84,
-    0x202a: 84,
-    0x202b: 84,
-    0x202c: 84,
-    0x202d: 84,
-    0x202e: 84,
+    0x193A: 84,
+    0x193B: 84,
+    0x1A17: 84,
+    0x1A18: 84,
+    0x1A1B: 84,
+    0x1A56: 84,
+    0x1A58: 84,
+    0x1A59: 84,
+    0x1A5A: 84,
+    0x1A5B: 84,
+    0x1A5C: 84,
+    0x1A5D: 84,
+    0x1A5E: 84,
+    0x1A60: 84,
+    0x1A62: 84,
+    0x1A65: 84,
+    0x1A66: 84,
+    0x1A67: 84,
+    0x1A68: 84,
+    0x1A69: 84,
+    0x1A6A: 84,
+    0x1A6B: 84,
+    0x1A6C: 84,
+    0x1A73: 84,
+    0x1A74: 84,
+    0x1A75: 84,
+    0x1A76: 84,
+    0x1A77: 84,
+    0x1A78: 84,
+    0x1A79: 84,
+    0x1A7A: 84,
+    0x1A7B: 84,
+    0x1A7C: 84,
+    0x1A7F: 84,
+    0x1AB0: 84,
+    0x1AB1: 84,
+    0x1AB2: 84,
+    0x1AB3: 84,
+    0x1AB4: 84,
+    0x1AB5: 84,
+    0x1AB6: 84,
+    0x1AB7: 84,
+    0x1AB8: 84,
+    0x1AB9: 84,
+    0x1ABA: 84,
+    0x1ABB: 84,
+    0x1ABC: 84,
+    0x1ABD: 84,
+    0x1ABE: 84,
+    0x1ABF: 84,
+    0x1AC0: 84,
+    0x1AC1: 84,
+    0x1AC2: 84,
+    0x1AC3: 84,
+    0x1AC4: 84,
+    0x1AC5: 84,
+    0x1AC6: 84,
+    0x1AC7: 84,
+    0x1AC8: 84,
+    0x1AC9: 84,
+    0x1ACA: 84,
+    0x1ACB: 84,
+    0x1ACC: 84,
+    0x1ACD: 84,
+    0x1ACE: 84,
+    0x1B00: 84,
+    0x1B01: 84,
+    0x1B02: 84,
+    0x1B03: 84,
+    0x1B34: 84,
+    0x1B36: 84,
+    0x1B37: 84,
+    0x1B38: 84,
+    0x1B39: 84,
+    0x1B3A: 84,
+    0x1B3C: 84,
+    0x1B42: 84,
+    0x1B6B: 84,
+    0x1B6C: 84,
+    0x1B6D: 84,
+    0x1B6E: 84,
+    0x1B6F: 84,
+    0x1B70: 84,
+    0x1B71: 84,
+    0x1B72: 84,
+    0x1B73: 84,
+    0x1B80: 84,
+    0x1B81: 84,
+    0x1BA2: 84,
+    0x1BA3: 84,
+    0x1BA4: 84,
+    0x1BA5: 84,
+    0x1BA8: 84,
+    0x1BA9: 84,
+    0x1BAB: 84,
+    0x1BAC: 84,
+    0x1BAD: 84,
+    0x1BE6: 84,
+    0x1BE8: 84,
+    0x1BE9: 84,
+    0x1BED: 84,
+    0x1BEF: 84,
+    0x1BF0: 84,
+    0x1BF1: 84,
+    0x1C2C: 84,
+    0x1C2D: 84,
+    0x1C2E: 84,
+    0x1C2F: 84,
+    0x1C30: 84,
+    0x1C31: 84,
+    0x1C32: 84,
+    0x1C33: 84,
+    0x1C36: 84,
+    0x1C37: 84,
+    0x1CD0: 84,
+    0x1CD1: 84,
+    0x1CD2: 84,
+    0x1CD4: 84,
+    0x1CD5: 84,
+    0x1CD6: 84,
+    0x1CD7: 84,
+    0x1CD8: 84,
+    0x1CD9: 84,
+    0x1CDA: 84,
+    0x1CDB: 84,
+    0x1CDC: 84,
+    0x1CDD: 84,
+    0x1CDE: 84,
+    0x1CDF: 84,
+    0x1CE0: 84,
+    0x1CE2: 84,
+    0x1CE3: 84,
+    0x1CE4: 84,
+    0x1CE5: 84,
+    0x1CE6: 84,
+    0x1CE7: 84,
+    0x1CE8: 84,
+    0x1CED: 84,
+    0x1CF4: 84,
+    0x1CF8: 84,
+    0x1CF9: 84,
+    0x1DC0: 84,
+    0x1DC1: 84,
+    0x1DC2: 84,
+    0x1DC3: 84,
+    0x1DC4: 84,
+    0x1DC5: 84,
+    0x1DC6: 84,
+    0x1DC7: 84,
+    0x1DC8: 84,
+    0x1DC9: 84,
+    0x1DCA: 84,
+    0x1DCB: 84,
+    0x1DCC: 84,
+    0x1DCD: 84,
+    0x1DCE: 84,
+    0x1DCF: 84,
+    0x1DD0: 84,
+    0x1DD1: 84,
+    0x1DD2: 84,
+    0x1DD3: 84,
+    0x1DD4: 84,
+    0x1DD5: 84,
+    0x1DD6: 84,
+    0x1DD7: 84,
+    0x1DD8: 84,
+    0x1DD9: 84,
+    0x1DDA: 84,
+    0x1DDB: 84,
+    0x1DDC: 84,
+    0x1DDD: 84,
+    0x1DDE: 84,
+    0x1DDF: 84,
+    0x1DE0: 84,
+    0x1DE1: 84,
+    0x1DE2: 84,
+    0x1DE3: 84,
+    0x1DE4: 84,
+    0x1DE5: 84,
+    0x1DE6: 84,
+    0x1DE7: 84,
+    0x1DE8: 84,
+    0x1DE9: 84,
+    0x1DEA: 84,
+    0x1DEB: 84,
+    0x1DEC: 84,
+    0x1DED: 84,
+    0x1DEE: 84,
+    0x1DEF: 84,
+    0x1DF0: 84,
+    0x1DF1: 84,
+    0x1DF2: 84,
+    0x1DF3: 84,
+    0x1DF4: 84,
+    0x1DF5: 84,
+    0x1DF6: 84,
+    0x1DF7: 84,
+    0x1DF8: 84,
+    0x1DF9: 84,
+    0x1DFA: 84,
+    0x1DFB: 84,
+    0x1DFC: 84,
+    0x1DFD: 84,
+    0x1DFE: 84,
+    0x1DFF: 84,
+    0x200B: 84,
+    0x200D: 67,
+    0x200E: 84,
+    0x200F: 84,
+    0x202A: 84,
+    0x202B: 84,
+    0x202C: 84,
+    0x202D: 84,
+    0x202E: 84,
     0x2060: 84,
     0x2061: 84,
     0x2062: 84,
     0x2063: 84,
     0x2064: 84,
-    0x206a: 84,
-    0x206b: 84,
-    0x206c: 84,
-    0x206d: 84,
-    0x206e: 84,
-    0x206f: 84,
-    0x20d0: 84,
-    0x20d1: 84,
-    0x20d2: 84,
-    0x20d3: 84,
-    0x20d4: 84,
-    0x20d5: 84,
-    0x20d6: 84,
-    0x20d7: 84,
-    0x20d8: 84,
-    0x20d9: 84,
-    0x20da: 84,
-    0x20db: 84,
-    0x20dc: 84,
-    0x20dd: 84,
-    0x20de: 84,
-    0x20df: 84,
-    0x20e0: 84,
-    0x20e1: 84,
-    0x20e2: 84,
-    0x20e3: 84,
-    0x20e4: 84,
-    0x20e5: 84,
-    0x20e6: 84,
-    0x20e7: 84,
-    0x20e8: 84,
-    0x20e9: 84,
-    0x20ea: 84,
-    0x20eb: 84,
-    0x20ec: 84,
-    0x20ed: 84,
-    0x20ee: 84,
-    0x20ef: 84,
-    0x20f0: 84,
-    0x2cef: 84,
-    0x2cf0: 84,
-    0x2cf1: 84,
-    0x2d7f: 84,
-    0x2de0: 84,
-    0x2de1: 84,
-    0x2de2: 84,
-    0x2de3: 84,
-    0x2de4: 84,
-    0x2de5: 84,
-    0x2de6: 84,
-    0x2de7: 84,
-    0x2de8: 84,
-    0x2de9: 84,
-    0x2dea: 84,
-    0x2deb: 84,
-    0x2dec: 84,
-    0x2ded: 84,
-    0x2dee: 84,
-    0x2def: 84,
-    0x2df0: 84,
-    0x2df1: 84,
-    0x2df2: 84,
-    0x2df3: 84,
-    0x2df4: 84,
-    0x2df5: 84,
-    0x2df6: 84,
-    0x2df7: 84,
-    0x2df8: 84,
-    0x2df9: 84,
-    0x2dfa: 84,
-    0x2dfb: 84,
-    0x2dfc: 84,
-    0x2dfd: 84,
-    0x2dfe: 84,
-    0x2dff: 84,
-    0x302a: 84,
-    0x302b: 84,
-    0x302c: 84,
-    0x302d: 84,
+    0x206A: 84,
+    0x206B: 84,
+    0x206C: 84,
+    0x206D: 84,
+    0x206E: 84,
+    0x206F: 84,
+    0x20D0: 84,
+    0x20D1: 84,
+    0x20D2: 84,
+    0x20D3: 84,
+    0x20D4: 84,
+    0x20D5: 84,
+    0x20D6: 84,
+    0x20D7: 84,
+    0x20D8: 84,
+    0x20D9: 84,
+    0x20DA: 84,
+    0x20DB: 84,
+    0x20DC: 84,
+    0x20DD: 84,
+    0x20DE: 84,
+    0x20DF: 84,
+    0x20E0: 84,
+    0x20E1: 84,
+    0x20E2: 84,
+    0x20E3: 84,
+    0x20E4: 84,
+    0x20E5: 84,
+    0x20E6: 84,
+    0x20E7: 84,
+    0x20E8: 84,
+    0x20E9: 84,
+    0x20EA: 84,
+    0x20EB: 84,
+    0x20EC: 84,
+    0x20ED: 84,
+    0x20EE: 84,
+    0x20EF: 84,
+    0x20F0: 84,
+    0x2CEF: 84,
+    0x2CF0: 84,
+    0x2CF1: 84,
+    0x2D7F: 84,
+    0x2DE0: 84,
+    0x2DE1: 84,
+    0x2DE2: 84,
+    0x2DE3: 84,
+    0x2DE4: 84,
+    0x2DE5: 84,
+    0x2DE6: 84,
+    0x2DE7: 84,
+    0x2DE8: 84,
+    0x2DE9: 84,
+    0x2DEA: 84,
+    0x2DEB: 84,
+    0x2DEC: 84,
+    0x2DED: 84,
+    0x2DEE: 84,
+    0x2DEF: 84,
+    0x2DF0: 84,
+    0x2DF1: 84,
+    0x2DF2: 84,
+    0x2DF3: 84,
+    0x2DF4: 84,
+    0x2DF5: 84,
+    0x2DF6: 84,
+    0x2DF7: 84,
+    0x2DF8: 84,
+    0x2DF9: 84,
+    0x2DFA: 84,
+    0x2DFB: 84,
+    0x2DFC: 84,
+    0x2DFD: 84,
+    0x2DFE: 84,
+    0x2DFF: 84,
+    0x302A: 84,
+    0x302B: 84,
+    0x302C: 84,
+    0x302D: 84,
     0x3099: 84,
-    0x309a: 84,
-    0xa66f: 84,
-    0xa670: 84,
-    0xa671: 84,
-    0xa672: 84,
-    0xa674: 84,
-    0xa675: 84,
-    0xa676: 84,
-    0xa677: 84,
-    0xa678: 84,
-    0xa679: 84,
-    0xa67a: 84,
-    0xa67b: 84,
-    0xa67c: 84,
-    0xa67d: 84,
-    0xa69e: 84,
-    0xa69f: 84,
-    0xa6f0: 84,
-    0xa6f1: 84,
-    0xa802: 84,
-    0xa806: 84,
-    0xa80b: 84,
-    0xa825: 84,
-    0xa826: 84,
-    0xa82c: 84,
-    0xa840: 68,
-    0xa841: 68,
-    0xa842: 68,
-    0xa843: 68,
-    0xa844: 68,
-    0xa845: 68,
-    0xa846: 68,
-    0xa847: 68,
-    0xa848: 68,
-    0xa849: 68,
-    0xa84a: 68,
-    0xa84b: 68,
-    0xa84c: 68,
-    0xa84d: 68,
-    0xa84e: 68,
-    0xa84f: 68,
-    0xa850: 68,
-    0xa851: 68,
-    0xa852: 68,
-    0xa853: 68,
-    0xa854: 68,
-    0xa855: 68,
-    0xa856: 68,
-    0xa857: 68,
-    0xa858: 68,
-    0xa859: 68,
-    0xa85a: 68,
-    0xa85b: 68,
-    0xa85c: 68,
-    0xa85d: 68,
-    0xa85e: 68,
-    0xa85f: 68,
-    0xa860: 68,
-    0xa861: 68,
-    0xa862: 68,
-    0xa863: 68,
-    0xa864: 68,
-    0xa865: 68,
-    0xa866: 68,
-    0xa867: 68,
-    0xa868: 68,
-    0xa869: 68,
-    0xa86a: 68,
-    0xa86b: 68,
-    0xa86c: 68,
-    0xa86d: 68,
-    0xa86e: 68,
-    0xa86f: 68,
-    0xa870: 68,
-    0xa871: 68,
-    0xa872: 76,
-    0xa8c4: 84,
-    0xa8c5: 84,
-    0xa8e0: 84,
-    0xa8e1: 84,
-    0xa8e2: 84,
-    0xa8e3: 84,
-    0xa8e4: 84,
-    0xa8e5: 84,
-    0xa8e6: 84,
-    0xa8e7: 84,
-    0xa8e8: 84,
-    0xa8e9: 84,
-    0xa8ea: 84,
-    0xa8eb: 84,
-    0xa8ec: 84,
-    0xa8ed: 84,
-    0xa8ee: 84,
-    0xa8ef: 84,
-    0xa8f0: 84,
-    0xa8f1: 84,
-    0xa8ff: 84,
-    0xa926: 84,
-    0xa927: 84,
-    0xa928: 84,
-    0xa929: 84,
-    0xa92a: 84,
-    0xa92b: 84,
-    0xa92c: 84,
-    0xa92d: 84,
-    0xa947: 84,
-    0xa948: 84,
-    0xa949: 84,
-    0xa94a: 84,
-    0xa94b: 84,
-    0xa94c: 84,
-    0xa94d: 84,
-    0xa94e: 84,
-    0xa94f: 84,
-    0xa950: 84,
-    0xa951: 84,
-    0xa980: 84,
-    0xa981: 84,
-    0xa982: 84,
-    0xa9b3: 84,
-    0xa9b6: 84,
-    0xa9b7: 84,
-    0xa9b8: 84,
-    0xa9b9: 84,
-    0xa9bc: 84,
-    0xa9bd: 84,
-    0xa9e5: 84,
-    0xaa29: 84,
-    0xaa2a: 84,
-    0xaa2b: 84,
-    0xaa2c: 84,
-    0xaa2d: 84,
-    0xaa2e: 84,
-    0xaa31: 84,
-    0xaa32: 84,
-    0xaa35: 84,
-    0xaa36: 84,
-    0xaa43: 84,
-    0xaa4c: 84,
-    0xaa7c: 84,
-    0xaab0: 84,
-    0xaab2: 84,
-    0xaab3: 84,
-    0xaab4: 84,
-    0xaab7: 84,
-    0xaab8: 84,
-    0xaabe: 84,
-    0xaabf: 84,
-    0xaac1: 84,
-    0xaaec: 84,
-    0xaaed: 84,
-    0xaaf6: 84,
-    0xabe5: 84,
-    0xabe8: 84,
-    0xabed: 84,
-    0xfb1e: 84,
-    0xfe00: 84,
-    0xfe01: 84,
-    0xfe02: 84,
-    0xfe03: 84,
-    0xfe04: 84,
-    0xfe05: 84,
-    0xfe06: 84,
-    0xfe07: 84,
-    0xfe08: 84,
-    0xfe09: 84,
-    0xfe0a: 84,
-    0xfe0b: 84,
-    0xfe0c: 84,
-    0xfe0d: 84,
-    0xfe0e: 84,
-    0xfe0f: 84,
-    0xfe20: 84,
-    0xfe21: 84,
-    0xfe22: 84,
-    0xfe23: 84,
-    0xfe24: 84,
-    0xfe25: 84,
-    0xfe26: 84,
-    0xfe27: 84,
-    0xfe28: 84,
-    0xfe29: 84,
-    0xfe2a: 84,
-    0xfe2b: 84,
-    0xfe2c: 84,
-    0xfe2d: 84,
-    0xfe2e: 84,
-    0xfe2f: 84,
-    0xfeff: 84,
-    0xfff9: 84,
-    0xfffa: 84,
-    0xfffb: 84,
-    0x101fd: 84,
-    0x102e0: 84,
+    0x309A: 84,
+    0xA66F: 84,
+    0xA670: 84,
+    0xA671: 84,
+    0xA672: 84,
+    0xA674: 84,
+    0xA675: 84,
+    0xA676: 84,
+    0xA677: 84,
+    0xA678: 84,
+    0xA679: 84,
+    0xA67A: 84,
+    0xA67B: 84,
+    0xA67C: 84,
+    0xA67D: 84,
+    0xA69E: 84,
+    0xA69F: 84,
+    0xA6F0: 84,
+    0xA6F1: 84,
+    0xA802: 84,
+    0xA806: 84,
+    0xA80B: 84,
+    0xA825: 84,
+    0xA826: 84,
+    0xA82C: 84,
+    0xA840: 68,
+    0xA841: 68,
+    0xA842: 68,
+    0xA843: 68,
+    0xA844: 68,
+    0xA845: 68,
+    0xA846: 68,
+    0xA847: 68,
+    0xA848: 68,
+    0xA849: 68,
+    0xA84A: 68,
+    0xA84B: 68,
+    0xA84C: 68,
+    0xA84D: 68,
+    0xA84E: 68,
+    0xA84F: 68,
+    0xA850: 68,
+    0xA851: 68,
+    0xA852: 68,
+    0xA853: 68,
+    0xA854: 68,
+    0xA855: 68,
+    0xA856: 68,
+    0xA857: 68,
+    0xA858: 68,
+    0xA859: 68,
+    0xA85A: 68,
+    0xA85B: 68,
+    0xA85C: 68,
+    0xA85D: 68,
+    0xA85E: 68,
+    0xA85F: 68,
+    0xA860: 68,
+    0xA861: 68,
+    0xA862: 68,
+    0xA863: 68,
+    0xA864: 68,
+    0xA865: 68,
+    0xA866: 68,
+    0xA867: 68,
+    0xA868: 68,
+    0xA869: 68,
+    0xA86A: 68,
+    0xA86B: 68,
+    0xA86C: 68,
+    0xA86D: 68,
+    0xA86E: 68,
+    0xA86F: 68,
+    0xA870: 68,
+    0xA871: 68,
+    0xA872: 76,
+    0xA8C4: 84,
+    0xA8C5: 84,
+    0xA8E0: 84,
+    0xA8E1: 84,
+    0xA8E2: 84,
+    0xA8E3: 84,
+    0xA8E4: 84,
+    0xA8E5: 84,
+    0xA8E6: 84,
+    0xA8E7: 84,
+    0xA8E8: 84,
+    0xA8E9: 84,
+    0xA8EA: 84,
+    0xA8EB: 84,
+    0xA8EC: 84,
+    0xA8ED: 84,
+    0xA8EE: 84,
+    0xA8EF: 84,
+    0xA8F0: 84,
+    0xA8F1: 84,
+    0xA8FF: 84,
+    0xA926: 84,
+    0xA927: 84,
+    0xA928: 84,
+    0xA929: 84,
+    0xA92A: 84,
+    0xA92B: 84,
+    0xA92C: 84,
+    0xA92D: 84,
+    0xA947: 84,
+    0xA948: 84,
+    0xA949: 84,
+    0xA94A: 84,
+    0xA94B: 84,
+    0xA94C: 84,
+    0xA94D: 84,
+    0xA94E: 84,
+    0xA94F: 84,
+    0xA950: 84,
+    0xA951: 84,
+    0xA980: 84,
+    0xA981: 84,
+    0xA982: 84,
+    0xA9B3: 84,
+    0xA9B6: 84,
+    0xA9B7: 84,
+    0xA9B8: 84,
+    0xA9B9: 84,
+    0xA9BC: 84,
+    0xA9BD: 84,
+    0xA9E5: 84,
+    0xAA29: 84,
+    0xAA2A: 84,
+    0xAA2B: 84,
+    0xAA2C: 84,
+    0xAA2D: 84,
+    0xAA2E: 84,
+    0xAA31: 84,
+    0xAA32: 84,
+    0xAA35: 84,
+    0xAA36: 84,
+    0xAA43: 84,
+    0xAA4C: 84,
+    0xAA7C: 84,
+    0xAAB0: 84,
+    0xAAB2: 84,
+    0xAAB3: 84,
+    0xAAB4: 84,
+    0xAAB7: 84,
+    0xAAB8: 84,
+    0xAABE: 84,
+    0xAABF: 84,
+    0xAAC1: 84,
+    0xAAEC: 84,
+    0xAAED: 84,
+    0xAAF6: 84,
+    0xABE5: 84,
+    0xABE8: 84,
+    0xABED: 84,
+    0xFB1E: 84,
+    0xFE00: 84,
+    0xFE01: 84,
+    0xFE02: 84,
+    0xFE03: 84,
+    0xFE04: 84,
+    0xFE05: 84,
+    0xFE06: 84,
+    0xFE07: 84,
+    0xFE08: 84,
+    0xFE09: 84,
+    0xFE0A: 84,
+    0xFE0B: 84,
+    0xFE0C: 84,
+    0xFE0D: 84,
+    0xFE0E: 84,
+    0xFE0F: 84,
+    0xFE20: 84,
+    0xFE21: 84,
+    0xFE22: 84,
+    0xFE23: 84,
+    0xFE24: 84,
+    0xFE25: 84,
+    0xFE26: 84,
+    0xFE27: 84,
+    0xFE28: 84,
+    0xFE29: 84,
+    0xFE2A: 84,
+    0xFE2B: 84,
+    0xFE2C: 84,
+    0xFE2D: 84,
+    0xFE2E: 84,
+    0xFE2F: 84,
+    0xFEFF: 84,
+    0xFFF9: 84,
+    0xFFFA: 84,
+    0xFFFB: 84,
+    0x101FD: 84,
+    0x102E0: 84,
     0x10376: 84,
     0x10377: 84,
     0x10378: 84,
     0x10379: 84,
-    0x1037a: 84,
-    0x10a01: 84,
-    0x10a02: 84,
-    0x10a03: 84,
-    0x10a05: 84,
-    0x10a06: 84,
-    0x10a0c: 84,
-    0x10a0d: 84,
-    0x10a0e: 84,
-    0x10a0f: 84,
-    0x10a38: 84,
-    0x10a39: 84,
-    0x10a3a: 84,
-    0x10a3f: 84,
-    0x10ac0: 68,
-    0x10ac1: 68,
-    0x10ac2: 68,
-    0x10ac3: 68,
-    0x10ac4: 68,
-    0x10ac5: 82,
-    0x10ac7: 82,
-    0x10ac9: 82,
-    0x10aca: 82,
-    0x10acd: 76,
-    0x10ace: 82,
-    0x10acf: 82,
-    0x10ad0: 82,
-    0x10ad1: 82,
-    0x10ad2: 82,
-    0x10ad3: 68,
-    0x10ad4: 68,
-    0x10ad5: 68,
-    0x10ad6: 68,
-    0x10ad7: 76,
-    0x10ad8: 68,
-    0x10ad9: 68,
-    0x10ada: 68,
-    0x10adb: 68,
-    0x10adc: 68,
-    0x10add: 82,
-    0x10ade: 68,
-    0x10adf: 68,
-    0x10ae0: 68,
-    0x10ae1: 82,
-    0x10ae4: 82,
-    0x10ae5: 84,
-    0x10ae6: 84,
-    0x10aeb: 68,
-    0x10aec: 68,
-    0x10aed: 68,
-    0x10aee: 68,
-    0x10aef: 82,
-    0x10b80: 68,
-    0x10b81: 82,
-    0x10b82: 68,
-    0x10b83: 82,
-    0x10b84: 82,
-    0x10b85: 82,
-    0x10b86: 68,
-    0x10b87: 68,
-    0x10b88: 68,
-    0x10b89: 82,
-    0x10b8a: 68,
-    0x10b8b: 68,
-    0x10b8c: 82,
-    0x10b8d: 68,
-    0x10b8e: 82,
-    0x10b8f: 82,
-    0x10b90: 68,
-    0x10b91: 82,
-    0x10ba9: 82,
-    0x10baa: 82,
-    0x10bab: 82,
-    0x10bac: 82,
-    0x10bad: 68,
-    0x10bae: 68,
-    0x10d00: 76,
-    0x10d01: 68,
-    0x10d02: 68,
-    0x10d03: 68,
-    0x10d04: 68,
-    0x10d05: 68,
-    0x10d06: 68,
-    0x10d07: 68,
-    0x10d08: 68,
-    0x10d09: 68,
-    0x10d0a: 68,
-    0x10d0b: 68,
-    0x10d0c: 68,
-    0x10d0d: 68,
-    0x10d0e: 68,
-    0x10d0f: 68,
-    0x10d10: 68,
-    0x10d11: 68,
-    0x10d12: 68,
-    0x10d13: 68,
-    0x10d14: 68,
-    0x10d15: 68,
-    0x10d16: 68,
-    0x10d17: 68,
-    0x10d18: 68,
-    0x10d19: 68,
-    0x10d1a: 68,
-    0x10d1b: 68,
-    0x10d1c: 68,
-    0x10d1d: 68,
-    0x10d1e: 68,
-    0x10d1f: 68,
-    0x10d20: 68,
-    0x10d21: 68,
-    0x10d22: 82,
-    0x10d23: 68,
-    0x10d24: 84,
-    0x10d25: 84,
-    0x10d26: 84,
-    0x10d27: 84,
-    0x10eab: 84,
-    0x10eac: 84,
-    0x10efd: 84,
-    0x10efe: 84,
-    0x10eff: 84,
-    0x10f30: 68,
-    0x10f31: 68,
-    0x10f32: 68,
-    0x10f33: 82,
-    0x10f34: 68,
-    0x10f35: 68,
-    0x10f36: 68,
-    0x10f37: 68,
-    0x10f38: 68,
-    0x10f39: 68,
-    0x10f3a: 68,
-    0x10f3b: 68,
-    0x10f3c: 68,
-    0x10f3d: 68,
-    0x10f3e: 68,
-    0x10f3f: 68,
-    0x10f40: 68,
-    0x10f41: 68,
-    0x10f42: 68,
-    0x10f43: 68,
-    0x10f44: 68,
-    0x10f46: 84,
-    0x10f47: 84,
-    0x10f48: 84,
-    0x10f49: 84,
-    0x10f4a: 84,
-    0x10f4b: 84,
-    0x10f4c: 84,
-    0x10f4d: 84,
-    0x10f4e: 84,
-    0x10f4f: 84,
-    0x10f50: 84,
-    0x10f51: 68,
-    0x10f52: 68,
-    0x10f53: 68,
-    0x10f54: 82,
-    0x10f70: 68,
-    0x10f71: 68,
-    0x10f72: 68,
-    0x10f73: 68,
-    0x10f74: 82,
-    0x10f75: 82,
-    0x10f76: 68,
-    0x10f77: 68,
-    0x10f78: 68,
-    0x10f79: 68,
-    0x10f7a: 68,
-    0x10f7b: 68,
-    0x10f7c: 68,
-    0x10f7d: 68,
-    0x10f7e: 68,
-    0x10f7f: 68,
-    0x10f80: 68,
-    0x10f81: 68,
-    0x10f82: 84,
-    0x10f83: 84,
-    0x10f84: 84,
-    0x10f85: 84,
-    0x10fb0: 68,
-    0x10fb2: 68,
-    0x10fb3: 68,
-    0x10fb4: 82,
-    0x10fb5: 82,
-    0x10fb6: 82,
-    0x10fb8: 68,
-    0x10fb9: 82,
-    0x10fba: 82,
-    0x10fbb: 68,
-    0x10fbc: 68,
-    0x10fbd: 82,
-    0x10fbe: 68,
-    0x10fbf: 68,
-    0x10fc1: 68,
-    0x10fc2: 82,
-    0x10fc3: 82,
-    0x10fc4: 68,
-    0x10fc9: 82,
-    0x10fca: 68,
-    0x10fcb: 76,
+    0x1037A: 84,
+    0x10A01: 84,
+    0x10A02: 84,
+    0x10A03: 84,
+    0x10A05: 84,
+    0x10A06: 84,
+    0x10A0C: 84,
+    0x10A0D: 84,
+    0x10A0E: 84,
+    0x10A0F: 84,
+    0x10A38: 84,
+    0x10A39: 84,
+    0x10A3A: 84,
+    0x10A3F: 84,
+    0x10AC0: 68,
+    0x10AC1: 68,
+    0x10AC2: 68,
+    0x10AC3: 68,
+    0x10AC4: 68,
+    0x10AC5: 82,
+    0x10AC7: 82,
+    0x10AC9: 82,
+    0x10ACA: 82,
+    0x10ACD: 76,
+    0x10ACE: 82,
+    0x10ACF: 82,
+    0x10AD0: 82,
+    0x10AD1: 82,
+    0x10AD2: 82,
+    0x10AD3: 68,
+    0x10AD4: 68,
+    0x10AD5: 68,
+    0x10AD6: 68,
+    0x10AD7: 76,
+    0x10AD8: 68,
+    0x10AD9: 68,
+    0x10ADA: 68,
+    0x10ADB: 68,
+    0x10ADC: 68,
+    0x10ADD: 82,
+    0x10ADE: 68,
+    0x10ADF: 68,
+    0x10AE0: 68,
+    0x10AE1: 82,
+    0x10AE4: 82,
+    0x10AE5: 84,
+    0x10AE6: 84,
+    0x10AEB: 68,
+    0x10AEC: 68,
+    0x10AED: 68,
+    0x10AEE: 68,
+    0x10AEF: 82,
+    0x10B80: 68,
+    0x10B81: 82,
+    0x10B82: 68,
+    0x10B83: 82,
+    0x10B84: 82,
+    0x10B85: 82,
+    0x10B86: 68,
+    0x10B87: 68,
+    0x10B88: 68,
+    0x10B89: 82,
+    0x10B8A: 68,
+    0x10B8B: 68,
+    0x10B8C: 82,
+    0x10B8D: 68,
+    0x10B8E: 82,
+    0x10B8F: 82,
+    0x10B90: 68,
+    0x10B91: 82,
+    0x10BA9: 82,
+    0x10BAA: 82,
+    0x10BAB: 82,
+    0x10BAC: 82,
+    0x10BAD: 68,
+    0x10BAE: 68,
+    0x10D00: 76,
+    0x10D01: 68,
+    0x10D02: 68,
+    0x10D03: 68,
+    0x10D04: 68,
+    0x10D05: 68,
+    0x10D06: 68,
+    0x10D07: 68,
+    0x10D08: 68,
+    0x10D09: 68,
+    0x10D0A: 68,
+    0x10D0B: 68,
+    0x10D0C: 68,
+    0x10D0D: 68,
+    0x10D0E: 68,
+    0x10D0F: 68,
+    0x10D10: 68,
+    0x10D11: 68,
+    0x10D12: 68,
+    0x10D13: 68,
+    0x10D14: 68,
+    0x10D15: 68,
+    0x10D16: 68,
+    0x10D17: 68,
+    0x10D18: 68,
+    0x10D19: 68,
+    0x10D1A: 68,
+    0x10D1B: 68,
+    0x10D1C: 68,
+    0x10D1D: 68,
+    0x10D1E: 68,
+    0x10D1F: 68,
+    0x10D20: 68,
+    0x10D21: 68,
+    0x10D22: 82,
+    0x10D23: 68,
+    0x10D24: 84,
+    0x10D25: 84,
+    0x10D26: 84,
+    0x10D27: 84,
+    0x10EAB: 84,
+    0x10EAC: 84,
+    0x10EFD: 84,
+    0x10EFE: 84,
+    0x10EFF: 84,
+    0x10F30: 68,
+    0x10F31: 68,
+    0x10F32: 68,
+    0x10F33: 82,
+    0x10F34: 68,
+    0x10F35: 68,
+    0x10F36: 68,
+    0x10F37: 68,
+    0x10F38: 68,
+    0x10F39: 68,
+    0x10F3A: 68,
+    0x10F3B: 68,
+    0x10F3C: 68,
+    0x10F3D: 68,
+    0x10F3E: 68,
+    0x10F3F: 68,
+    0x10F40: 68,
+    0x10F41: 68,
+    0x10F42: 68,
+    0x10F43: 68,
+    0x10F44: 68,
+    0x10F46: 84,
+    0x10F47: 84,
+    0x10F48: 84,
+    0x10F49: 84,
+    0x10F4A: 84,
+    0x10F4B: 84,
+    0x10F4C: 84,
+    0x10F4D: 84,
+    0x10F4E: 84,
+    0x10F4F: 84,
+    0x10F50: 84,
+    0x10F51: 68,
+    0x10F52: 68,
+    0x10F53: 68,
+    0x10F54: 82,
+    0x10F70: 68,
+    0x10F71: 68,
+    0x10F72: 68,
+    0x10F73: 68,
+    0x10F74: 82,
+    0x10F75: 82,
+    0x10F76: 68,
+    0x10F77: 68,
+    0x10F78: 68,
+    0x10F79: 68,
+    0x10F7A: 68,
+    0x10F7B: 68,
+    0x10F7C: 68,
+    0x10F7D: 68,
+    0x10F7E: 68,
+    0x10F7F: 68,
+    0x10F80: 68,
+    0x10F81: 68,
+    0x10F82: 84,
+    0x10F83: 84,
+    0x10F84: 84,
+    0x10F85: 84,
+    0x10FB0: 68,
+    0x10FB2: 68,
+    0x10FB3: 68,
+    0x10FB4: 82,
+    0x10FB5: 82,
+    0x10FB6: 82,
+    0x10FB8: 68,
+    0x10FB9: 82,
+    0x10FBA: 82,
+    0x10FBB: 68,
+    0x10FBC: 68,
+    0x10FBD: 82,
+    0x10FBE: 68,
+    0x10FBF: 68,
+    0x10FC1: 68,
+    0x10FC2: 82,
+    0x10FC3: 82,
+    0x10FC4: 68,
+    0x10FC9: 82,
+    0x10FCA: 68,
+    0x10FCB: 76,
     0x11001: 84,
     0x11038: 84,
     0x11039: 84,
-    0x1103a: 84,
-    0x1103b: 84,
-    0x1103c: 84,
-    0x1103d: 84,
-    0x1103e: 84,
-    0x1103f: 84,
+    0x1103A: 84,
+    0x1103B: 84,
+    0x1103C: 84,
+    0x1103D: 84,
+    0x1103E: 84,
+    0x1103F: 84,
     0x11040: 84,
     0x11041: 84,
     0x11042: 84,
@@ -1976,27 +1976,27 @@
     0x11070: 84,
     0x11073: 84,
     0x11074: 84,
-    0x1107f: 84,
+    0x1107F: 84,
     0x11080: 84,
     0x11081: 84,
-    0x110b3: 84,
-    0x110b4: 84,
-    0x110b5: 84,
-    0x110b6: 84,
-    0x110b9: 84,
-    0x110ba: 84,
-    0x110c2: 84,
+    0x110B3: 84,
+    0x110B4: 84,
+    0x110B5: 84,
+    0x110B6: 84,
+    0x110B9: 84,
+    0x110BA: 84,
+    0x110C2: 84,
     0x11100: 84,
     0x11101: 84,
     0x11102: 84,
     0x11127: 84,
     0x11128: 84,
     0x11129: 84,
-    0x1112a: 84,
-    0x1112b: 84,
-    0x1112d: 84,
-    0x1112e: 84,
-    0x1112f: 84,
+    0x1112A: 84,
+    0x1112B: 84,
+    0x1112D: 84,
+    0x1112E: 84,
+    0x1112F: 84,
     0x11130: 84,
     0x11131: 84,
     0x11132: 84,
@@ -2005,49 +2005,49 @@
     0x11173: 84,
     0x11180: 84,
     0x11181: 84,
-    0x111b6: 84,
-    0x111b7: 84,
-    0x111b8: 84,
-    0x111b9: 84,
-    0x111ba: 84,
-    0x111bb: 84,
-    0x111bc: 84,
-    0x111bd: 84,
-    0x111be: 84,
-    0x111c9: 84,
-    0x111ca: 84,
-    0x111cb: 84,
-    0x111cc: 84,
-    0x111cf: 84,
-    0x1122f: 84,
+    0x111B6: 84,
+    0x111B7: 84,
+    0x111B8: 84,
+    0x111B9: 84,
+    0x111BA: 84,
+    0x111BB: 84,
+    0x111BC: 84,
+    0x111BD: 84,
+    0x111BE: 84,
+    0x111C9: 84,
+    0x111CA: 84,
+    0x111CB: 84,
+    0x111CC: 84,
+    0x111CF: 84,
+    0x1122F: 84,
     0x11230: 84,
     0x11231: 84,
     0x11234: 84,
     0x11236: 84,
     0x11237: 84,
-    0x1123e: 84,
+    0x1123E: 84,
     0x11241: 84,
-    0x112df: 84,
-    0x112e3: 84,
-    0x112e4: 84,
-    0x112e5: 84,
-    0x112e6: 84,
-    0x112e7: 84,
-    0x112e8: 84,
-    0x112e9: 84,
-    0x112ea: 84,
+    0x112DF: 84,
+    0x112E3: 84,
+    0x112E4: 84,
+    0x112E5: 84,
+    0x112E6: 84,
+    0x112E7: 84,
+    0x112E8: 84,
+    0x112E9: 84,
+    0x112EA: 84,
     0x11300: 84,
     0x11301: 84,
-    0x1133b: 84,
-    0x1133c: 84,
+    0x1133B: 84,
+    0x1133C: 84,
     0x11340: 84,
     0x11366: 84,
     0x11367: 84,
     0x11368: 84,
     0x11369: 84,
-    0x1136a: 84,
-    0x1136b: 84,
-    0x1136c: 84,
+    0x1136A: 84,
+    0x1136B: 84,
+    0x1136C: 84,
     0x11370: 84,
     0x11371: 84,
     0x11372: 84,
@@ -2055,38 +2055,38 @@
     0x11374: 84,
     0x11438: 84,
     0x11439: 84,
-    0x1143a: 84,
-    0x1143b: 84,
-    0x1143c: 84,
-    0x1143d: 84,
-    0x1143e: 84,
-    0x1143f: 84,
+    0x1143A: 84,
+    0x1143B: 84,
+    0x1143C: 84,
+    0x1143D: 84,
+    0x1143E: 84,
+    0x1143F: 84,
     0x11442: 84,
     0x11443: 84,
     0x11444: 84,
     0x11446: 84,
-    0x1145e: 84,
-    0x114b3: 84,
-    0x114b4: 84,
-    0x114b5: 84,
-    0x114b6: 84,
-    0x114b7: 84,
-    0x114b8: 84,
-    0x114ba: 84,
-    0x114bf: 84,
-    0x114c0: 84,
-    0x114c2: 84,
-    0x114c3: 84,
-    0x115b2: 84,
-    0x115b3: 84,
-    0x115b4: 84,
-    0x115b5: 84,
-    0x115bc: 84,
-    0x115bd: 84,
-    0x115bf: 84,
-    0x115c0: 84,
-    0x115dc: 84,
-    0x115dd: 84,
+    0x1145E: 84,
+    0x114B3: 84,
+    0x114B4: 84,
+    0x114B5: 84,
+    0x114B6: 84,
+    0x114B7: 84,
+    0x114B8: 84,
+    0x114BA: 84,
+    0x114BF: 84,
+    0x114C0: 84,
+    0x114C2: 84,
+    0x114C3: 84,
+    0x115B2: 84,
+    0x115B3: 84,
+    0x115B4: 84,
+    0x115B5: 84,
+    0x115BC: 84,
+    0x115BD: 84,
+    0x115BF: 84,
+    0x115C0: 84,
+    0x115DC: 84,
+    0x115DD: 84,
     0x11633: 84,
     0x11634: 84,
     0x11635: 84,
@@ -2094,22 +2094,22 @@
     0x11637: 84,
     0x11638: 84,
     0x11639: 84,
-    0x1163a: 84,
-    0x1163d: 84,
-    0x1163f: 84,
+    0x1163A: 84,
+    0x1163D: 84,
+    0x1163F: 84,
     0x11640: 84,
-    0x116ab: 84,
-    0x116ad: 84,
-    0x116b0: 84,
-    0x116b1: 84,
-    0x116b2: 84,
-    0x116b3: 84,
-    0x116b4: 84,
-    0x116b5: 84,
-    0x116b7: 84,
-    0x1171d: 84,
-    0x1171e: 84,
-    0x1171f: 84,
+    0x116AB: 84,
+    0x116AD: 84,
+    0x116B0: 84,
+    0x116B1: 84,
+    0x116B2: 84,
+    0x116B3: 84,
+    0x116B4: 84,
+    0x116B5: 84,
+    0x116B7: 84,
+    0x1171D: 84,
+    0x1171E: 84,
+    0x1171F: 84,
     0x11722: 84,
     0x11723: 84,
     0x11724: 84,
@@ -2117,9 +2117,9 @@
     0x11727: 84,
     0x11728: 84,
     0x11729: 84,
-    0x1172a: 84,
-    0x1172b: 84,
-    0x1182f: 84,
+    0x1172A: 84,
+    0x1172B: 84,
+    0x1182F: 84,
     0x11830: 84,
     0x11831: 84,
     0x11832: 84,
@@ -2129,142 +2129,142 @@
     0x11836: 84,
     0x11837: 84,
     0x11839: 84,
-    0x1183a: 84,
-    0x1193b: 84,
-    0x1193c: 84,
-    0x1193e: 84,
+    0x1183A: 84,
+    0x1193B: 84,
+    0x1193C: 84,
+    0x1193E: 84,
     0x11943: 84,
-    0x119d4: 84,
-    0x119d5: 84,
-    0x119d6: 84,
-    0x119d7: 84,
-    0x119da: 84,
-    0x119db: 84,
-    0x119e0: 84,
-    0x11a01: 84,
-    0x11a02: 84,
-    0x11a03: 84,
-    0x11a04: 84,
-    0x11a05: 84,
-    0x11a06: 84,
-    0x11a07: 84,
-    0x11a08: 84,
-    0x11a09: 84,
-    0x11a0a: 84,
-    0x11a33: 84,
-    0x11a34: 84,
-    0x11a35: 84,
-    0x11a36: 84,
-    0x11a37: 84,
-    0x11a38: 84,
-    0x11a3b: 84,
-    0x11a3c: 84,
-    0x11a3d: 84,
-    0x11a3e: 84,
-    0x11a47: 84,
-    0x11a51: 84,
-    0x11a52: 84,
-    0x11a53: 84,
-    0x11a54: 84,
-    0x11a55: 84,
-    0x11a56: 84,
-    0x11a59: 84,
-    0x11a5a: 84,
-    0x11a5b: 84,
-    0x11a8a: 84,
-    0x11a8b: 84,
-    0x11a8c: 84,
-    0x11a8d: 84,
-    0x11a8e: 84,
-    0x11a8f: 84,
-    0x11a90: 84,
-    0x11a91: 84,
-    0x11a92: 84,
-    0x11a93: 84,
-    0x11a94: 84,
-    0x11a95: 84,
-    0x11a96: 84,
-    0x11a98: 84,
-    0x11a99: 84,
-    0x11c30: 84,
-    0x11c31: 84,
-    0x11c32: 84,
-    0x11c33: 84,
-    0x11c34: 84,
-    0x11c35: 84,
-    0x11c36: 84,
-    0x11c38: 84,
-    0x11c39: 84,
-    0x11c3a: 84,
-    0x11c3b: 84,
-    0x11c3c: 84,
-    0x11c3d: 84,
-    0x11c3f: 84,
-    0x11c92: 84,
-    0x11c93: 84,
-    0x11c94: 84,
-    0x11c95: 84,
-    0x11c96: 84,
-    0x11c97: 84,
-    0x11c98: 84,
-    0x11c99: 84,
-    0x11c9a: 84,
-    0x11c9b: 84,
-    0x11c9c: 84,
-    0x11c9d: 84,
-    0x11c9e: 84,
-    0x11c9f: 84,
-    0x11ca0: 84,
-    0x11ca1: 84,
-    0x11ca2: 84,
-    0x11ca3: 84,
-    0x11ca4: 84,
-    0x11ca5: 84,
-    0x11ca6: 84,
-    0x11ca7: 84,
-    0x11caa: 84,
-    0x11cab: 84,
-    0x11cac: 84,
-    0x11cad: 84,
-    0x11cae: 84,
-    0x11caf: 84,
-    0x11cb0: 84,
-    0x11cb2: 84,
-    0x11cb3: 84,
-    0x11cb5: 84,
-    0x11cb6: 84,
-    0x11d31: 84,
-    0x11d32: 84,
-    0x11d33: 84,
-    0x11d34: 84,
-    0x11d35: 84,
-    0x11d36: 84,
-    0x11d3a: 84,
-    0x11d3c: 84,
-    0x11d3d: 84,
-    0x11d3f: 84,
-    0x11d40: 84,
-    0x11d41: 84,
-    0x11d42: 84,
-    0x11d43: 84,
-    0x11d44: 84,
-    0x11d45: 84,
-    0x11d47: 84,
-    0x11d90: 84,
-    0x11d91: 84,
-    0x11d95: 84,
-    0x11d97: 84,
-    0x11ef3: 84,
-    0x11ef4: 84,
-    0x11f00: 84,
-    0x11f01: 84,
-    0x11f36: 84,
-    0x11f37: 84,
-    0x11f38: 84,
-    0x11f39: 84,
-    0x11f3a: 84,
-    0x11f40: 84,
-    0x11f42: 84,
+    0x119D4: 84,
+    0x119D5: 84,
+    0x119D6: 84,
+    0x119D7: 84,
+    0x119DA: 84,
+    0x119DB: 84,
+    0x119E0: 84,
+    0x11A01: 84,
+    0x11A02: 84,
+    0x11A03: 84,
+    0x11A04: 84,
+    0x11A05: 84,
+    0x11A06: 84,
+    0x11A07: 84,
+    0x11A08: 84,
+    0x11A09: 84,
+    0x11A0A: 84,
+    0x11A33: 84,
+    0x11A34: 84,
+    0x11A35: 84,
+    0x11A36: 84,
+    0x11A37: 84,
+    0x11A38: 84,
+    0x11A3B: 84,
+    0x11A3C: 84,
+    0x11A3D: 84,
+    0x11A3E: 84,
+    0x11A47: 84,
+    0x11A51: 84,
+    0x11A52: 84,
+    0x11A53: 84,
+    0x11A54: 84,
+    0x11A55: 84,
+    0x11A56: 84,
+    0x11A59: 84,
+    0x11A5A: 84,
+    0x11A5B: 84,
+    0x11A8A: 84,
+    0x11A8B: 84,
+    0x11A8C: 84,
+    0x11A8D: 84,
+    0x11A8E: 84,
+    0x11A8F: 84,
+    0x11A90: 84,
+    0x11A91: 84,
+    0x11A92: 84,
+    0x11A93: 84,
+    0x11A94: 84,
+    0x11A95: 84,
+    0x11A96: 84,
+    0x11A98: 84,
+    0x11A99: 84,
+    0x11C30: 84,
+    0x11C31: 84,
+    0x11C32: 84,
+    0x11C33: 84,
+    0x11C34: 84,
+    0x11C35: 84,
+    0x11C36: 84,
+    0x11C38: 84,
+    0x11C39: 84,
+    0x11C3A: 84,
+    0x11C3B: 84,
+    0x11C3C: 84,
+    0x11C3D: 84,
+    0x11C3F: 84,
+    0x11C92: 84,
+    0x11C93: 84,
+    0x11C94: 84,
+    0x11C95: 84,
+    0x11C96: 84,
+    0x11C97: 84,
+    0x11C98: 84,
+    0x11C99: 84,
+    0x11C9A: 84,
+    0x11C9B: 84,
+    0x11C9C: 84,
+    0x11C9D: 84,
+    0x11C9E: 84,
+    0x11C9F: 84,
+    0x11CA0: 84,
+    0x11CA1: 84,
+    0x11CA2: 84,
+    0x11CA3: 84,
+    0x11CA4: 84,
+    0x11CA5: 84,
+    0x11CA6: 84,
+    0x11CA7: 84,
+    0x11CAA: 84,
+    0x11CAB: 84,
+    0x11CAC: 84,
+    0x11CAD: 84,
+    0x11CAE: 84,
+    0x11CAF: 84,
+    0x11CB0: 84,
+    0x11CB2: 84,
+    0x11CB3: 84,
+    0x11CB5: 84,
+    0x11CB6: 84,
+    0x11D31: 84,
+    0x11D32: 84,
+    0x11D33: 84,
+    0x11D34: 84,
+    0x11D35: 84,
+    0x11D36: 84,
+    0x11D3A: 84,
+    0x11D3C: 84,
+    0x11D3D: 84,
+    0x11D3F: 84,
+    0x11D40: 84,
+    0x11D41: 84,
+    0x11D42: 84,
+    0x11D43: 84,
+    0x11D44: 84,
+    0x11D45: 84,
+    0x11D47: 84,
+    0x11D90: 84,
+    0x11D91: 84,
+    0x11D95: 84,
+    0x11D97: 84,
+    0x11EF3: 84,
+    0x11EF4: 84,
+    0x11F00: 84,
+    0x11F01: 84,
+    0x11F36: 84,
+    0x11F37: 84,
+    0x11F38: 84,
+    0x11F39: 84,
+    0x11F3A: 84,
+    0x11F40: 84,
+    0x11F42: 84,
     0x13430: 84,
     0x13431: 84,
     0x13432: 84,
@@ -2275,1971 +2275,1969 @@
     0x13437: 84,
     0x13438: 84,
     0x13439: 84,
-    0x1343a: 84,
-    0x1343b: 84,
-    0x1343c: 84,
-    0x1343d: 84,
-    0x1343e: 84,
-    0x1343f: 84,
+    0x1343A: 84,
+    0x1343B: 84,
+    0x1343C: 84,
+    0x1343D: 84,
+    0x1343E: 84,
+    0x1343F: 84,
     0x13440: 84,
     0x13447: 84,
     0x13448: 84,
     0x13449: 84,
-    0x1344a: 84,
-    0x1344b: 84,
-    0x1344c: 84,
-    0x1344d: 84,
-    0x1344e: 84,
-    0x1344f: 84,
+    0x1344A: 84,
+    0x1344B: 84,
+    0x1344C: 84,
+    0x1344D: 84,
+    0x1344E: 84,
+    0x1344F: 84,
     0x13450: 84,
     0x13451: 84,
     0x13452: 84,
     0x13453: 84,
     0x13454: 84,
     0x13455: 84,
-    0x16af0: 84,
-    0x16af1: 84,
-    0x16af2: 84,
-    0x16af3: 84,
-    0x16af4: 84,
-    0x16b30: 84,
-    0x16b31: 84,
-    0x16b32: 84,
-    0x16b33: 84,
-    0x16b34: 84,
-    0x16b35: 84,
-    0x16b36: 84,
-    0x16f4f: 84,
-    0x16f8f: 84,
-    0x16f90: 84,
-    0x16f91: 84,
-    0x16f92: 84,
-    0x16fe4: 84,
-    0x1bc9d: 84,
-    0x1bc9e: 84,
-    0x1bca0: 84,
-    0x1bca1: 84,
-    0x1bca2: 84,
-    0x1bca3: 84,
-    0x1cf00: 84,
-    0x1cf01: 84,
-    0x1cf02: 84,
-    0x1cf03: 84,
-    0x1cf04: 84,
-    0x1cf05: 84,
-    0x1cf06: 84,
-    0x1cf07: 84,
-    0x1cf08: 84,
-    0x1cf09: 84,
-    0x1cf0a: 84,
-    0x1cf0b: 84,
-    0x1cf0c: 84,
-    0x1cf0d: 84,
-    0x1cf0e: 84,
-    0x1cf0f: 84,
-    0x1cf10: 84,
-    0x1cf11: 84,
-    0x1cf12: 84,
-    0x1cf13: 84,
-    0x1cf14: 84,
-    0x1cf15: 84,
-    0x1cf16: 84,
-    0x1cf17: 84,
-    0x1cf18: 84,
-    0x1cf19: 84,
-    0x1cf1a: 84,
-    0x1cf1b: 84,
-    0x1cf1c: 84,
-    0x1cf1d: 84,
-    0x1cf1e: 84,
-    0x1cf1f: 84,
-    0x1cf20: 84,
-    0x1cf21: 84,
-    0x1cf22: 84,
-    0x1cf23: 84,
-    0x1cf24: 84,
-    0x1cf25: 84,
-    0x1cf26: 84,
-    0x1cf27: 84,
-    0x1cf28: 84,
-    0x1cf29: 84,
-    0x1cf2a: 84,
-    0x1cf2b: 84,
-    0x1cf2c: 84,
-    0x1cf2d: 84,
-    0x1cf30: 84,
-    0x1cf31: 84,
-    0x1cf32: 84,
-    0x1cf33: 84,
-    0x1cf34: 84,
-    0x1cf35: 84,
-    0x1cf36: 84,
-    0x1cf37: 84,
-    0x1cf38: 84,
-    0x1cf39: 84,
-    0x1cf3a: 84,
-    0x1cf3b: 84,
-    0x1cf3c: 84,
-    0x1cf3d: 84,
-    0x1cf3e: 84,
-    0x1cf3f: 84,
-    0x1cf40: 84,
-    0x1cf41: 84,
-    0x1cf42: 84,
-    0x1cf43: 84,
-    0x1cf44: 84,
-    0x1cf45: 84,
-    0x1cf46: 84,
-    0x1d167: 84,
-    0x1d168: 84,
-    0x1d169: 84,
-    0x1d173: 84,
-    0x1d174: 84,
-    0x1d175: 84,
-    0x1d176: 84,
-    0x1d177: 84,
-    0x1d178: 84,
-    0x1d179: 84,
-    0x1d17a: 84,
-    0x1d17b: 84,
-    0x1d17c: 84,
-    0x1d17d: 84,
-    0x1d17e: 84,
-    0x1d17f: 84,
-    0x1d180: 84,
-    0x1d181: 84,
-    0x1d182: 84,
-    0x1d185: 84,
-    0x1d186: 84,
-    0x1d187: 84,
-    0x1d188: 84,
-    0x1d189: 84,
-    0x1d18a: 84,
-    0x1d18b: 84,
-    0x1d1aa: 84,
-    0x1d1ab: 84,
-    0x1d1ac: 84,
-    0x1d1ad: 84,
-    0x1d242: 84,
-    0x1d243: 84,
-    0x1d244: 84,
-    0x1da00: 84,
-    0x1da01: 84,
-    0x1da02: 84,
-    0x1da03: 84,
-    0x1da04: 84,
-    0x1da05: 84,
-    0x1da06: 84,
-    0x1da07: 84,
-    0x1da08: 84,
-    0x1da09: 84,
-    0x1da0a: 84,
-    0x1da0b: 84,
-    0x1da0c: 84,
-    0x1da0d: 84,
-    0x1da0e: 84,
-    0x1da0f: 84,
-    0x1da10: 84,
-    0x1da11: 84,
-    0x1da12: 84,
-    0x1da13: 84,
-    0x1da14: 84,
-    0x1da15: 84,
-    0x1da16: 84,
-    0x1da17: 84,
-    0x1da18: 84,
-    0x1da19: 84,
-    0x1da1a: 84,
-    0x1da1b: 84,
-    0x1da1c: 84,
-    0x1da1d: 84,
-    0x1da1e: 84,
-    0x1da1f: 84,
-    0x1da20: 84,
-    0x1da21: 84,
-    0x1da22: 84,
-    0x1da23: 84,
-    0x1da24: 84,
-    0x1da25: 84,
-    0x1da26: 84,
-    0x1da27: 84,
-    0x1da28: 84,
-    0x1da29: 84,
-    0x1da2a: 84,
-    0x1da2b: 84,
-    0x1da2c: 84,
-    0x1da2d: 84,
-    0x1da2e: 84,
-    0x1da2f: 84,
-    0x1da30: 84,
-    0x1da31: 84,
-    0x1da32: 84,
-    0x1da33: 84,
-    0x1da34: 84,
-    0x1da35: 84,
-    0x1da36: 84,
-    0x1da3b: 84,
-    0x1da3c: 84,
-    0x1da3d: 84,
-    0x1da3e: 84,
-    0x1da3f: 84,
-    0x1da40: 84,
-    0x1da41: 84,
-    0x1da42: 84,
-    0x1da43: 84,
-    0x1da44: 84,
-    0x1da45: 84,
-    0x1da46: 84,
-    0x1da47: 84,
-    0x1da48: 84,
-    0x1da49: 84,
-    0x1da4a: 84,
-    0x1da4b: 84,
-    0x1da4c: 84,
-    0x1da4d: 84,
-    0x1da4e: 84,
-    0x1da4f: 84,
-    0x1da50: 84,
-    0x1da51: 84,
-    0x1da52: 84,
-    0x1da53: 84,
-    0x1da54: 84,
-    0x1da55: 84,
-    0x1da56: 84,
-    0x1da57: 84,
-    0x1da58: 84,
-    0x1da59: 84,
-    0x1da5a: 84,
-    0x1da5b: 84,
-    0x1da5c: 84,
-    0x1da5d: 84,
-    0x1da5e: 84,
-    0x1da5f: 84,
-    0x1da60: 84,
-    0x1da61: 84,
-    0x1da62: 84,
-    0x1da63: 84,
-    0x1da64: 84,
-    0x1da65: 84,
-    0x1da66: 84,
-    0x1da67: 84,
-    0x1da68: 84,
-    0x1da69: 84,
-    0x1da6a: 84,
-    0x1da6b: 84,
-    0x1da6c: 84,
-    0x1da75: 84,
-    0x1da84: 84,
-    0x1da9b: 84,
-    0x1da9c: 84,
-    0x1da9d: 84,
-    0x1da9e: 84,
-    0x1da9f: 84,
-    0x1daa1: 84,
-    0x1daa2: 84,
-    0x1daa3: 84,
-    0x1daa4: 84,
-    0x1daa5: 84,
-    0x1daa6: 84,
-    0x1daa7: 84,
-    0x1daa8: 84,
-    0x1daa9: 84,
-    0x1daaa: 84,
-    0x1daab: 84,
-    0x1daac: 84,
-    0x1daad: 84,
-    0x1daae: 84,
-    0x1daaf: 84,
-    0x1e000: 84,
-    0x1e001: 84,
-    0x1e002: 84,
-    0x1e003: 84,
-    0x1e004: 84,
-    0x1e005: 84,
-    0x1e006: 84,
-    0x1e008: 84,
-    0x1e009: 84,
-    0x1e00a: 84,
-    0x1e00b: 84,
-    0x1e00c: 84,
-    0x1e00d: 84,
-    0x1e00e: 84,
-    0x1e00f: 84,
-    0x1e010: 84,
-    0x1e011: 84,
-    0x1e012: 84,
-    0x1e013: 84,
-    0x1e014: 84,
-    0x1e015: 84,
-    0x1e016: 84,
-    0x1e017: 84,
-    0x1e018: 84,
-    0x1e01b: 84,
-    0x1e01c: 84,
-    0x1e01d: 84,
-    0x1e01e: 84,
-    0x1e01f: 84,
-    0x1e020: 84,
-    0x1e021: 84,
-    0x1e023: 84,
-    0x1e024: 84,
-    0x1e026: 84,
-    0x1e027: 84,
-    0x1e028: 84,
-    0x1e029: 84,
-    0x1e02a: 84,
-    0x1e08f: 84,
-    0x1e130: 84,
-    0x1e131: 84,
-    0x1e132: 84,
-    0x1e133: 84,
-    0x1e134: 84,
-    0x1e135: 84,
-    0x1e136: 84,
-    0x1e2ae: 84,
-    0x1e2ec: 84,
-    0x1e2ed: 84,
-    0x1e2ee: 84,
-    0x1e2ef: 84,
-    0x1e4ec: 84,
-    0x1e4ed: 84,
-    0x1e4ee: 84,
-    0x1e4ef: 84,
-    0x1e8d0: 84,
-    0x1e8d1: 84,
-    0x1e8d2: 84,
-    0x1e8d3: 84,
-    0x1e8d4: 84,
-    0x1e8d5: 84,
-    0x1e8d6: 84,
-    0x1e900: 68,
-    0x1e901: 68,
-    0x1e902: 68,
-    0x1e903: 68,
-    0x1e904: 68,
-    0x1e905: 68,
-    0x1e906: 68,
-    0x1e907: 68,
-    0x1e908: 68,
-    0x1e909: 68,
-    0x1e90a: 68,
-    0x1e90b: 68,
-    0x1e90c: 68,
-    0x1e90d: 68,
-    0x1e90e: 68,
-    0x1e90f: 68,
-    0x1e910: 68,
-    0x1e911: 68,
-    0x1e912: 68,
-    0x1e913: 68,
-    0x1e914: 68,
-    0x1e915: 68,
-    0x1e916: 68,
-    0x1e917: 68,
-    0x1e918: 68,
-    0x1e919: 68,
-    0x1e91a: 68,
-    0x1e91b: 68,
-    0x1e91c: 68,
-    0x1e91d: 68,
-    0x1e91e: 68,
-    0x1e91f: 68,
-    0x1e920: 68,
-    0x1e921: 68,
-    0x1e922: 68,
-    0x1e923: 68,
-    0x1e924: 68,
-    0x1e925: 68,
-    0x1e926: 68,
-    0x1e927: 68,
-    0x1e928: 68,
-    0x1e929: 68,
-    0x1e92a: 68,
-    0x1e92b: 68,
-    0x1e92c: 68,
-    0x1e92d: 68,
-    0x1e92e: 68,
-    0x1e92f: 68,
-    0x1e930: 68,
-    0x1e931: 68,
-    0x1e932: 68,
-    0x1e933: 68,
-    0x1e934: 68,
-    0x1e935: 68,
-    0x1e936: 68,
-    0x1e937: 68,
-    0x1e938: 68,
-    0x1e939: 68,
-    0x1e93a: 68,
-    0x1e93b: 68,
-    0x1e93c: 68,
-    0x1e93d: 68,
-    0x1e93e: 68,
-    0x1e93f: 68,
-    0x1e940: 68,
-    0x1e941: 68,
-    0x1e942: 68,
-    0x1e943: 68,
-    0x1e944: 84,
-    0x1e945: 84,
-    0x1e946: 84,
-    0x1e947: 84,
-    0x1e948: 84,
-    0x1e949: 84,
-    0x1e94a: 84,
-    0x1e94b: 84,
-    0xe0001: 84,
-    0xe0020: 84,
-    0xe0021: 84,
-    0xe0022: 84,
-    0xe0023: 84,
-    0xe0024: 84,
-    0xe0025: 84,
-    0xe0026: 84,
-    0xe0027: 84,
-    0xe0028: 84,
-    0xe0029: 84,
-    0xe002a: 84,
-    0xe002b: 84,
-    0xe002c: 84,
-    0xe002d: 84,
-    0xe002e: 84,
-    0xe002f: 84,
-    0xe0030: 84,
-    0xe0031: 84,
-    0xe0032: 84,
-    0xe0033: 84,
-    0xe0034: 84,
-    0xe0035: 84,
-    0xe0036: 84,
-    0xe0037: 84,
-    0xe0038: 84,
-    0xe0039: 84,
-    0xe003a: 84,
-    0xe003b: 84,
-    0xe003c: 84,
-    0xe003d: 84,
-    0xe003e: 84,
-    0xe003f: 84,
-    0xe0040: 84,
-    0xe0041: 84,
-    0xe0042: 84,
-    0xe0043: 84,
-    0xe0044: 84,
-    0xe0045: 84,
-    0xe0046: 84,
-    0xe0047: 84,
-    0xe0048: 84,
-    0xe0049: 84,
-    0xe004a: 84,
-    0xe004b: 84,
-    0xe004c: 84,
-    0xe004d: 84,
-    0xe004e: 84,
-    0xe004f: 84,
-    0xe0050: 84,
-    0xe0051: 84,
-    0xe0052: 84,
-    0xe0053: 84,
-    0xe0054: 84,
-    0xe0055: 84,
-    0xe0056: 84,
-    0xe0057: 84,
-    0xe0058: 84,
-    0xe0059: 84,
-    0xe005a: 84,
-    0xe005b: 84,
-    0xe005c: 84,
-    0xe005d: 84,
-    0xe005e: 84,
-    0xe005f: 84,
-    0xe0060: 84,
-    0xe0061: 84,
-    0xe0062: 84,
-    0xe0063: 84,
-    0xe0064: 84,
-    0xe0065: 84,
-    0xe0066: 84,
-    0xe0067: 84,
-    0xe0068: 84,
-    0xe0069: 84,
-    0xe006a: 84,
-    0xe006b: 84,
-    0xe006c: 84,
-    0xe006d: 84,
-    0xe006e: 84,
-    0xe006f: 84,
-    0xe0070: 84,
-    0xe0071: 84,
-    0xe0072: 84,
-    0xe0073: 84,
-    0xe0074: 84,
-    0xe0075: 84,
-    0xe0076: 84,
-    0xe0077: 84,
-    0xe0078: 84,
-    0xe0079: 84,
-    0xe007a: 84,
-    0xe007b: 84,
-    0xe007c: 84,
-    0xe007d: 84,
-    0xe007e: 84,
-    0xe007f: 84,
-    0xe0100: 84,
-    0xe0101: 84,
-    0xe0102: 84,
-    0xe0103: 84,
-    0xe0104: 84,
-    0xe0105: 84,
-    0xe0106: 84,
-    0xe0107: 84,
-    0xe0108: 84,
-    0xe0109: 84,
-    0xe010a: 84,
-    0xe010b: 84,
-    0xe010c: 84,
-    0xe010d: 84,
-    0xe010e: 84,
-    0xe010f: 84,
-    0xe0110: 84,
-    0xe0111: 84,
-    0xe0112: 84,
-    0xe0113: 84,
-    0xe0114: 84,
-    0xe0115: 84,
-    0xe0116: 84,
-    0xe0117: 84,
-    0xe0118: 84,
-    0xe0119: 84,
-    0xe011a: 84,
-    0xe011b: 84,
-    0xe011c: 84,
-    0xe011d: 84,
-    0xe011e: 84,
-    0xe011f: 84,
-    0xe0120: 84,
-    0xe0121: 84,
-    0xe0122: 84,
-    0xe0123: 84,
-    0xe0124: 84,
-    0xe0125: 84,
-    0xe0126: 84,
-    0xe0127: 84,
-    0xe0128: 84,
-    0xe0129: 84,
-    0xe012a: 84,
-    0xe012b: 84,
-    0xe012c: 84,
-    0xe012d: 84,
-    0xe012e: 84,
-    0xe012f: 84,
-    0xe0130: 84,
-    0xe0131: 84,
-    0xe0132: 84,
-    0xe0133: 84,
-    0xe0134: 84,
-    0xe0135: 84,
-    0xe0136: 84,
-    0xe0137: 84,
-    0xe0138: 84,
-    0xe0139: 84,
-    0xe013a: 84,
-    0xe013b: 84,
-    0xe013c: 84,
-    0xe013d: 84,
-    0xe013e: 84,
-    0xe013f: 84,
-    0xe0140: 84,
-    0xe0141: 84,
-    0xe0142: 84,
-    0xe0143: 84,
-    0xe0144: 84,
-    0xe0145: 84,
-    0xe0146: 84,
-    0xe0147: 84,
-    0xe0148: 84,
-    0xe0149: 84,
-    0xe014a: 84,
-    0xe014b: 84,
-    0xe014c: 84,
-    0xe014d: 84,
-    0xe014e: 84,
-    0xe014f: 84,
-    0xe0150: 84,
-    0xe0151: 84,
-    0xe0152: 84,
-    0xe0153: 84,
-    0xe0154: 84,
-    0xe0155: 84,
-    0xe0156: 84,
-    0xe0157: 84,
-    0xe0158: 84,
-    0xe0159: 84,
-    0xe015a: 84,
-    0xe015b: 84,
-    0xe015c: 84,
-    0xe015d: 84,
-    0xe015e: 84,
-    0xe015f: 84,
-    0xe0160: 84,
-    0xe0161: 84,
-    0xe0162: 84,
-    0xe0163: 84,
-    0xe0164: 84,
-    0xe0165: 84,
-    0xe0166: 84,
-    0xe0167: 84,
-    0xe0168: 84,
-    0xe0169: 84,
-    0xe016a: 84,
-    0xe016b: 84,
-    0xe016c: 84,
-    0xe016d: 84,
-    0xe016e: 84,
-    0xe016f: 84,
-    0xe0170: 84,
-    0xe0171: 84,
-    0xe0172: 84,
-    0xe0173: 84,
-    0xe0174: 84,
-    0xe0175: 84,
-    0xe0176: 84,
-    0xe0177: 84,
-    0xe0178: 84,
-    0xe0179: 84,
-    0xe017a: 84,
-    0xe017b: 84,
-    0xe017c: 84,
-    0xe017d: 84,
-    0xe017e: 84,
-    0xe017f: 84,
-    0xe0180: 84,
-    0xe0181: 84,
-    0xe0182: 84,
-    0xe0183: 84,
-    0xe0184: 84,
-    0xe0185: 84,
-    0xe0186: 84,
-    0xe0187: 84,
-    0xe0188: 84,
-    0xe0189: 84,
-    0xe018a: 84,
-    0xe018b: 84,
-    0xe018c: 84,
-    0xe018d: 84,
-    0xe018e: 84,
-    0xe018f: 84,
-    0xe0190: 84,
-    0xe0191: 84,
-    0xe0192: 84,
-    0xe0193: 84,
-    0xe0194: 84,
-    0xe0195: 84,
-    0xe0196: 84,
-    0xe0197: 84,
-    0xe0198: 84,
-    0xe0199: 84,
-    0xe019a: 84,
-    0xe019b: 84,
-    0xe019c: 84,
-    0xe019d: 84,
-    0xe019e: 84,
-    0xe019f: 84,
-    0xe01a0: 84,
-    0xe01a1: 84,
-    0xe01a2: 84,
-    0xe01a3: 84,
-    0xe01a4: 84,
-    0xe01a5: 84,
-    0xe01a6: 84,
-    0xe01a7: 84,
-    0xe01a8: 84,
-    0xe01a9: 84,
-    0xe01aa: 84,
-    0xe01ab: 84,
-    0xe01ac: 84,
-    0xe01ad: 84,
-    0xe01ae: 84,
-    0xe01af: 84,
-    0xe01b0: 84,
-    0xe01b1: 84,
-    0xe01b2: 84,
-    0xe01b3: 84,
-    0xe01b4: 84,
-    0xe01b5: 84,
-    0xe01b6: 84,
-    0xe01b7: 84,
-    0xe01b8: 84,
-    0xe01b9: 84,
-    0xe01ba: 84,
-    0xe01bb: 84,
-    0xe01bc: 84,
-    0xe01bd: 84,
-    0xe01be: 84,
-    0xe01bf: 84,
-    0xe01c0: 84,
-    0xe01c1: 84,
-    0xe01c2: 84,
-    0xe01c3: 84,
-    0xe01c4: 84,
-    0xe01c5: 84,
-    0xe01c6: 84,
-    0xe01c7: 84,
-    0xe01c8: 84,
-    0xe01c9: 84,
-    0xe01ca: 84,
-    0xe01cb: 84,
-    0xe01cc: 84,
-    0xe01cd: 84,
-    0xe01ce: 84,
-    0xe01cf: 84,
-    0xe01d0: 84,
-    0xe01d1: 84,
-    0xe01d2: 84,
-    0xe01d3: 84,
-    0xe01d4: 84,
-    0xe01d5: 84,
-    0xe01d6: 84,
-    0xe01d7: 84,
-    0xe01d8: 84,
-    0xe01d9: 84,
-    0xe01da: 84,
-    0xe01db: 84,
-    0xe01dc: 84,
-    0xe01dd: 84,
-    0xe01de: 84,
-    0xe01df: 84,
-    0xe01e0: 84,
-    0xe01e1: 84,
-    0xe01e2: 84,
-    0xe01e3: 84,
-    0xe01e4: 84,
-    0xe01e5: 84,
-    0xe01e6: 84,
-    0xe01e7: 84,
-    0xe01e8: 84,
-    0xe01e9: 84,
-    0xe01ea: 84,
-    0xe01eb: 84,
-    0xe01ec: 84,
-    0xe01ed: 84,
-    0xe01ee: 84,
-    0xe01ef: 84,
+    0x16AF0: 84,
+    0x16AF1: 84,
+    0x16AF2: 84,
+    0x16AF3: 84,
+    0x16AF4: 84,
+    0x16B30: 84,
+    0x16B31: 84,
+    0x16B32: 84,
+    0x16B33: 84,
+    0x16B34: 84,
+    0x16B35: 84,
+    0x16B36: 84,
+    0x16F4F: 84,
+    0x16F8F: 84,
+    0x16F90: 84,
+    0x16F91: 84,
+    0x16F92: 84,
+    0x16FE4: 84,
+    0x1BC9D: 84,
+    0x1BC9E: 84,
+    0x1BCA0: 84,
+    0x1BCA1: 84,
+    0x1BCA2: 84,
+    0x1BCA3: 84,
+    0x1CF00: 84,
+    0x1CF01: 84,
+    0x1CF02: 84,
+    0x1CF03: 84,
+    0x1CF04: 84,
+    0x1CF05: 84,
+    0x1CF06: 84,
+    0x1CF07: 84,
+    0x1CF08: 84,
+    0x1CF09: 84,
+    0x1CF0A: 84,
+    0x1CF0B: 84,
+    0x1CF0C: 84,
+    0x1CF0D: 84,
+    0x1CF0E: 84,
+    0x1CF0F: 84,
+    0x1CF10: 84,
+    0x1CF11: 84,
+    0x1CF12: 84,
+    0x1CF13: 84,
+    0x1CF14: 84,
+    0x1CF15: 84,
+    0x1CF16: 84,
+    0x1CF17: 84,
+    0x1CF18: 84,
+    0x1CF19: 84,
+    0x1CF1A: 84,
+    0x1CF1B: 84,
+    0x1CF1C: 84,
+    0x1CF1D: 84,
+    0x1CF1E: 84,
+    0x1CF1F: 84,
+    0x1CF20: 84,
+    0x1CF21: 84,
+    0x1CF22: 84,
+    0x1CF23: 84,
+    0x1CF24: 84,
+    0x1CF25: 84,
+    0x1CF26: 84,
+    0x1CF27: 84,
+    0x1CF28: 84,
+    0x1CF29: 84,
+    0x1CF2A: 84,
+    0x1CF2B: 84,
+    0x1CF2C: 84,
+    0x1CF2D: 84,
+    0x1CF30: 84,
+    0x1CF31: 84,
+    0x1CF32: 84,
+    0x1CF33: 84,
+    0x1CF34: 84,
+    0x1CF35: 84,
+    0x1CF36: 84,
+    0x1CF37: 84,
+    0x1CF38: 84,
+    0x1CF39: 84,
+    0x1CF3A: 84,
+    0x1CF3B: 84,
+    0x1CF3C: 84,
+    0x1CF3D: 84,
+    0x1CF3E: 84,
+    0x1CF3F: 84,
+    0x1CF40: 84,
+    0x1CF41: 84,
+    0x1CF42: 84,
+    0x1CF43: 84,
+    0x1CF44: 84,
+    0x1CF45: 84,
+    0x1CF46: 84,
+    0x1D167: 84,
+    0x1D168: 84,
+    0x1D169: 84,
+    0x1D173: 84,
+    0x1D174: 84,
+    0x1D175: 84,
+    0x1D176: 84,
+    0x1D177: 84,
+    0x1D178: 84,
+    0x1D179: 84,
+    0x1D17A: 84,
+    0x1D17B: 84,
+    0x1D17C: 84,
+    0x1D17D: 84,
+    0x1D17E: 84,
+    0x1D17F: 84,
+    0x1D180: 84,
+    0x1D181: 84,
+    0x1D182: 84,
+    0x1D185: 84,
+    0x1D186: 84,
+    0x1D187: 84,
+    0x1D188: 84,
+    0x1D189: 84,
+    0x1D18A: 84,
+    0x1D18B: 84,
+    0x1D1AA: 84,
+    0x1D1AB: 84,
+    0x1D1AC: 84,
+    0x1D1AD: 84,
+    0x1D242: 84,
+    0x1D243: 84,
+    0x1D244: 84,
+    0x1DA00: 84,
+    0x1DA01: 84,
+    0x1DA02: 84,
+    0x1DA03: 84,
+    0x1DA04: 84,
+    0x1DA05: 84,
+    0x1DA06: 84,
+    0x1DA07: 84,
+    0x1DA08: 84,
+    0x1DA09: 84,
+    0x1DA0A: 84,
+    0x1DA0B: 84,
+    0x1DA0C: 84,
+    0x1DA0D: 84,
+    0x1DA0E: 84,
+    0x1DA0F: 84,
+    0x1DA10: 84,
+    0x1DA11: 84,
+    0x1DA12: 84,
+    0x1DA13: 84,
+    0x1DA14: 84,
+    0x1DA15: 84,
+    0x1DA16: 84,
+    0x1DA17: 84,
+    0x1DA18: 84,
+    0x1DA19: 84,
+    0x1DA1A: 84,
+    0x1DA1B: 84,
+    0x1DA1C: 84,
+    0x1DA1D: 84,
+    0x1DA1E: 84,
+    0x1DA1F: 84,
+    0x1DA20: 84,
+    0x1DA21: 84,
+    0x1DA22: 84,
+    0x1DA23: 84,
+    0x1DA24: 84,
+    0x1DA25: 84,
+    0x1DA26: 84,
+    0x1DA27: 84,
+    0x1DA28: 84,
+    0x1DA29: 84,
+    0x1DA2A: 84,
+    0x1DA2B: 84,
+    0x1DA2C: 84,
+    0x1DA2D: 84,
+    0x1DA2E: 84,
+    0x1DA2F: 84,
+    0x1DA30: 84,
+    0x1DA31: 84,
+    0x1DA32: 84,
+    0x1DA33: 84,
+    0x1DA34: 84,
+    0x1DA35: 84,
+    0x1DA36: 84,
+    0x1DA3B: 84,
+    0x1DA3C: 84,
+    0x1DA3D: 84,
+    0x1DA3E: 84,
+    0x1DA3F: 84,
+    0x1DA40: 84,
+    0x1DA41: 84,
+    0x1DA42: 84,
+    0x1DA43: 84,
+    0x1DA44: 84,
+    0x1DA45: 84,
+    0x1DA46: 84,
+    0x1DA47: 84,
+    0x1DA48: 84,
+    0x1DA49: 84,
+    0x1DA4A: 84,
+    0x1DA4B: 84,
+    0x1DA4C: 84,
+    0x1DA4D: 84,
+    0x1DA4E: 84,
+    0x1DA4F: 84,
+    0x1DA50: 84,
+    0x1DA51: 84,
+    0x1DA52: 84,
+    0x1DA53: 84,
+    0x1DA54: 84,
+    0x1DA55: 84,
+    0x1DA56: 84,
+    0x1DA57: 84,
+    0x1DA58: 84,
+    0x1DA59: 84,
+    0x1DA5A: 84,
+    0x1DA5B: 84,
+    0x1DA5C: 84,
+    0x1DA5D: 84,
+    0x1DA5E: 84,
+    0x1DA5F: 84,
+    0x1DA60: 84,
+    0x1DA61: 84,
+    0x1DA62: 84,
+    0x1DA63: 84,
+    0x1DA64: 84,
+    0x1DA65: 84,
+    0x1DA66: 84,
+    0x1DA67: 84,
+    0x1DA68: 84,
+    0x1DA69: 84,
+    0x1DA6A: 84,
+    0x1DA6B: 84,
+    0x1DA6C: 84,
+    0x1DA75: 84,
+    0x1DA84: 84,
+    0x1DA9B: 84,
+    0x1DA9C: 84,
+    0x1DA9D: 84,
+    0x1DA9E: 84,
+    0x1DA9F: 84,
+    0x1DAA1: 84,
+    0x1DAA2: 84,
+    0x1DAA3: 84,
+    0x1DAA4: 84,
+    0x1DAA5: 84,
+    0x1DAA6: 84,
+    0x1DAA7: 84,
+    0x1DAA8: 84,
+    0x1DAA9: 84,
+    0x1DAAA: 84,
+    0x1DAAB: 84,
+    0x1DAAC: 84,
+    0x1DAAD: 84,
+    0x1DAAE: 84,
+    0x1DAAF: 84,
+    0x1E000: 84,
+    0x1E001: 84,
+    0x1E002: 84,
+    0x1E003: 84,
+    0x1E004: 84,
+    0x1E005: 84,
+    0x1E006: 84,
+    0x1E008: 84,
+    0x1E009: 84,
+    0x1E00A: 84,
+    0x1E00B: 84,
+    0x1E00C: 84,
+    0x1E00D: 84,
+    0x1E00E: 84,
+    0x1E00F: 84,
+    0x1E010: 84,
+    0x1E011: 84,
+    0x1E012: 84,
+    0x1E013: 84,
+    0x1E014: 84,
+    0x1E015: 84,
+    0x1E016: 84,
+    0x1E017: 84,
+    0x1E018: 84,
+    0x1E01B: 84,
+    0x1E01C: 84,
+    0x1E01D: 84,
+    0x1E01E: 84,
+    0x1E01F: 84,
+    0x1E020: 84,
+    0x1E021: 84,
+    0x1E023: 84,
+    0x1E024: 84,
+    0x1E026: 84,
+    0x1E027: 84,
+    0x1E028: 84,
+    0x1E029: 84,
+    0x1E02A: 84,
+    0x1E08F: 84,
+    0x1E130: 84,
+    0x1E131: 84,
+    0x1E132: 84,
+    0x1E133: 84,
+    0x1E134: 84,
+    0x1E135: 84,
+    0x1E136: 84,
+    0x1E2AE: 84,
+    0x1E2EC: 84,
+    0x1E2ED: 84,
+    0x1E2EE: 84,
+    0x1E2EF: 84,
+    0x1E4EC: 84,
+    0x1E4ED: 84,
+    0x1E4EE: 84,
+    0x1E4EF: 84,
+    0x1E8D0: 84,
+    0x1E8D1: 84,
+    0x1E8D2: 84,
+    0x1E8D3: 84,
+    0x1E8D4: 84,
+    0x1E8D5: 84,
+    0x1E8D6: 84,
+    0x1E900: 68,
+    0x1E901: 68,
+    0x1E902: 68,
+    0x1E903: 68,
+    0x1E904: 68,
+    0x1E905: 68,
+    0x1E906: 68,
+    0x1E907: 68,
+    0x1E908: 68,
+    0x1E909: 68,
+    0x1E90A: 68,
+    0x1E90B: 68,
+    0x1E90C: 68,
+    0x1E90D: 68,
+    0x1E90E: 68,
+    0x1E90F: 68,
+    0x1E910: 68,
+    0x1E911: 68,
+    0x1E912: 68,
+    0x1E913: 68,
+    0x1E914: 68,
+    0x1E915: 68,
+    0x1E916: 68,
+    0x1E917: 68,
+    0x1E918: 68,
+    0x1E919: 68,
+    0x1E91A: 68,
+    0x1E91B: 68,
+    0x1E91C: 68,
+    0x1E91D: 68,
+    0x1E91E: 68,
+    0x1E91F: 68,
+    0x1E920: 68,
+    0x1E921: 68,
+    0x1E922: 68,
+    0x1E923: 68,
+    0x1E924: 68,
+    0x1E925: 68,
+    0x1E926: 68,
+    0x1E927: 68,
+    0x1E928: 68,
+    0x1E929: 68,
+    0x1E92A: 68,
+    0x1E92B: 68,
+    0x1E92C: 68,
+    0x1E92D: 68,
+    0x1E92E: 68,
+    0x1E92F: 68,
+    0x1E930: 68,
+    0x1E931: 68,
+    0x1E932: 68,
+    0x1E933: 68,
+    0x1E934: 68,
+    0x1E935: 68,
+    0x1E936: 68,
+    0x1E937: 68,
+    0x1E938: 68,
+    0x1E939: 68,
+    0x1E93A: 68,
+    0x1E93B: 68,
+    0x1E93C: 68,
+    0x1E93D: 68,
+    0x1E93E: 68,
+    0x1E93F: 68,
+    0x1E940: 68,
+    0x1E941: 68,
+    0x1E942: 68,
+    0x1E943: 68,
+    0x1E944: 84,
+    0x1E945: 84,
+    0x1E946: 84,
+    0x1E947: 84,
+    0x1E948: 84,
+    0x1E949: 84,
+    0x1E94A: 84,
+    0x1E94B: 84,
+    0xE0001: 84,
+    0xE0020: 84,
+    0xE0021: 84,
+    0xE0022: 84,
+    0xE0023: 84,
+    0xE0024: 84,
+    0xE0025: 84,
+    0xE0026: 84,
+    0xE0027: 84,
+    0xE0028: 84,
+    0xE0029: 84,
+    0xE002A: 84,
+    0xE002B: 84,
+    0xE002C: 84,
+    0xE002D: 84,
+    0xE002E: 84,
+    0xE002F: 84,
+    0xE0030: 84,
+    0xE0031: 84,
+    0xE0032: 84,
+    0xE0033: 84,
+    0xE0034: 84,
+    0xE0035: 84,
+    0xE0036: 84,
+    0xE0037: 84,
+    0xE0038: 84,
+    0xE0039: 84,
+    0xE003A: 84,
+    0xE003B: 84,
+    0xE003C: 84,
+    0xE003D: 84,
+    0xE003E: 84,
+    0xE003F: 84,
+    0xE0040: 84,
+    0xE0041: 84,
+    0xE0042: 84,
+    0xE0043: 84,
+    0xE0044: 84,
+    0xE0045: 84,
+    0xE0046: 84,
+    0xE0047: 84,
+    0xE0048: 84,
+    0xE0049: 84,
+    0xE004A: 84,
+    0xE004B: 84,
+    0xE004C: 84,
+    0xE004D: 84,
+    0xE004E: 84,
+    0xE004F: 84,
+    0xE0050: 84,
+    0xE0051: 84,
+    0xE0052: 84,
+    0xE0053: 84,
+    0xE0054: 84,
+    0xE0055: 84,
+    0xE0056: 84,
+    0xE0057: 84,
+    0xE0058: 84,
+    0xE0059: 84,
+    0xE005A: 84,
+    0xE005B: 84,
+    0xE005C: 84,
+    0xE005D: 84,
+    0xE005E: 84,
+    0xE005F: 84,
+    0xE0060: 84,
+    0xE0061: 84,
+    0xE0062: 84,
+    0xE0063: 84,
+    0xE0064: 84,
+    0xE0065: 84,
+    0xE0066: 84,
+    0xE0067: 84,
+    0xE0068: 84,
+    0xE0069: 84,
+    0xE006A: 84,
+    0xE006B: 84,
+    0xE006C: 84,
+    0xE006D: 84,
+    0xE006E: 84,
+    0xE006F: 84,
+    0xE0070: 84,
+    0xE0071: 84,
+    0xE0072: 84,
+    0xE0073: 84,
+    0xE0074: 84,
+    0xE0075: 84,
+    0xE0076: 84,
+    0xE0077: 84,
+    0xE0078: 84,
+    0xE0079: 84,
+    0xE007A: 84,
+    0xE007B: 84,
+    0xE007C: 84,
+    0xE007D: 84,
+    0xE007E: 84,
+    0xE007F: 84,
+    0xE0100: 84,
+    0xE0101: 84,
+    0xE0102: 84,
+    0xE0103: 84,
+    0xE0104: 84,
+    0xE0105: 84,
+    0xE0106: 84,
+    0xE0107: 84,
+    0xE0108: 84,
+    0xE0109: 84,
+    0xE010A: 84,
+    0xE010B: 84,
+    0xE010C: 84,
+    0xE010D: 84,
+    0xE010E: 84,
+    0xE010F: 84,
+    0xE0110: 84,
+    0xE0111: 84,
+    0xE0112: 84,
+    0xE0113: 84,
+    0xE0114: 84,
+    0xE0115: 84,
+    0xE0116: 84,
+    0xE0117: 84,
+    0xE0118: 84,
+    0xE0119: 84,
+    0xE011A: 84,
+    0xE011B: 84,
+    0xE011C: 84,
+    0xE011D: 84,
+    0xE011E: 84,
+    0xE011F: 84,
+    0xE0120: 84,
+    0xE0121: 84,
+    0xE0122: 84,
+    0xE0123: 84,
+    0xE0124: 84,
+    0xE0125: 84,
+    0xE0126: 84,
+    0xE0127: 84,
+    0xE0128: 84,
+    0xE0129: 84,
+    0xE012A: 84,
+    0xE012B: 84,
+    0xE012C: 84,
+    0xE012D: 84,
+    0xE012E: 84,
+    0xE012F: 84,
+    0xE0130: 84,
+    0xE0131: 84,
+    0xE0132: 84,
+    0xE0133: 84,
+    0xE0134: 84,
+    0xE0135: 84,
+    0xE0136: 84,
+    0xE0137: 84,
+    0xE0138: 84,
+    0xE0139: 84,
+    0xE013A: 84,
+    0xE013B: 84,
+    0xE013C: 84,
+    0xE013D: 84,
+    0xE013E: 84,
+    0xE013F: 84,
+    0xE0140: 84,
+    0xE0141: 84,
+    0xE0142: 84,
+    0xE0143: 84,
+    0xE0144: 84,
+    0xE0145: 84,
+    0xE0146: 84,
+    0xE0147: 84,
+    0xE0148: 84,
+    0xE0149: 84,
+    0xE014A: 84,
+    0xE014B: 84,
+    0xE014C: 84,
+    0xE014D: 84,
+    0xE014E: 84,
+    0xE014F: 84,
+    0xE0150: 84,
+    0xE0151: 84,
+    0xE0152: 84,
+    0xE0153: 84,
+    0xE0154: 84,
+    0xE0155: 84,
+    0xE0156: 84,
+    0xE0157: 84,
+    0xE0158: 84,
+    0xE0159: 84,
+    0xE015A: 84,
+    0xE015B: 84,
+    0xE015C: 84,
+    0xE015D: 84,
+    0xE015E: 84,
+    0xE015F: 84,
+    0xE0160: 84,
+    0xE0161: 84,
+    0xE0162: 84,
+    0xE0163: 84,
+    0xE0164: 84,
+    0xE0165: 84,
+    0xE0166: 84,
+    0xE0167: 84,
+    0xE0168: 84,
+    0xE0169: 84,
+    0xE016A: 84,
+    0xE016B: 84,
+    0xE016C: 84,
+    0xE016D: 84,
+    0xE016E: 84,
+    0xE016F: 84,
+    0xE0170: 84,
+    0xE0171: 84,
+    0xE0172: 84,
+    0xE0173: 84,
+    0xE0174: 84,
+    0xE0175: 84,
+    0xE0176: 84,
+    0xE0177: 84,
+    0xE0178: 84,
+    0xE0179: 84,
+    0xE017A: 84,
+    0xE017B: 84,
+    0xE017C: 84,
+    0xE017D: 84,
+    0xE017E: 84,
+    0xE017F: 84,
+    0xE0180: 84,
+    0xE0181: 84,
+    0xE0182: 84,
+    0xE0183: 84,
+    0xE0184: 84,
+    0xE0185: 84,
+    0xE0186: 84,
+    0xE0187: 84,
+    0xE0188: 84,
+    0xE0189: 84,
+    0xE018A: 84,
+    0xE018B: 84,
+    0xE018C: 84,
+    0xE018D: 84,
+    0xE018E: 84,
+    0xE018F: 84,
+    0xE0190: 84,
+    0xE0191: 84,
+    0xE0192: 84,
+    0xE0193: 84,
+    0xE0194: 84,
+    0xE0195: 84,
+    0xE0196: 84,
+    0xE0197: 84,
+    0xE0198: 84,
+    0xE0199: 84,
+    0xE019A: 84,
+    0xE019B: 84,
+    0xE019C: 84,
+    0xE019D: 84,
+    0xE019E: 84,
+    0xE019F: 84,
+    0xE01A0: 84,
+    0xE01A1: 84,
+    0xE01A2: 84,
+    0xE01A3: 84,
+    0xE01A4: 84,
+    0xE01A5: 84,
+    0xE01A6: 84,
+    0xE01A7: 84,
+    0xE01A8: 84,
+    0xE01A9: 84,
+    0xE01AA: 84,
+    0xE01AB: 84,
+    0xE01AC: 84,
+    0xE01AD: 84,
+    0xE01AE: 84,
+    0xE01AF: 84,
+    0xE01B0: 84,
+    0xE01B1: 84,
+    0xE01B2: 84,
+    0xE01B3: 84,
+    0xE01B4: 84,
+    0xE01B5: 84,
+    0xE01B6: 84,
+    0xE01B7: 84,
+    0xE01B8: 84,
+    0xE01B9: 84,
+    0xE01BA: 84,
+    0xE01BB: 84,
+    0xE01BC: 84,
+    0xE01BD: 84,
+    0xE01BE: 84,
+    0xE01BF: 84,
+    0xE01C0: 84,
+    0xE01C1: 84,
+    0xE01C2: 84,
+    0xE01C3: 84,
+    0xE01C4: 84,
+    0xE01C5: 84,
+    0xE01C6: 84,
+    0xE01C7: 84,
+    0xE01C8: 84,
+    0xE01C9: 84,
+    0xE01CA: 84,
+    0xE01CB: 84,
+    0xE01CC: 84,
+    0xE01CD: 84,
+    0xE01CE: 84,
+    0xE01CF: 84,
+    0xE01D0: 84,
+    0xE01D1: 84,
+    0xE01D2: 84,
+    0xE01D3: 84,
+    0xE01D4: 84,
+    0xE01D5: 84,
+    0xE01D6: 84,
+    0xE01D7: 84,
+    0xE01D8: 84,
+    0xE01D9: 84,
+    0xE01DA: 84,
+    0xE01DB: 84,
+    0xE01DC: 84,
+    0xE01DD: 84,
+    0xE01DE: 84,
+    0xE01DF: 84,
+    0xE01E0: 84,
+    0xE01E1: 84,
+    0xE01E2: 84,
+    0xE01E3: 84,
+    0xE01E4: 84,
+    0xE01E5: 84,
+    0xE01E6: 84,
+    0xE01E7: 84,
+    0xE01E8: 84,
+    0xE01E9: 84,
+    0xE01EA: 84,
+    0xE01EB: 84,
+    0xE01EC: 84,
+    0xE01ED: 84,
+    0xE01EE: 84,
+    0xE01EF: 84,
 }
 codepoint_classes = {
-    'PVALID': (
-        0x2d0000002e,
-        0x300000003a,
-        0x610000007b,
-        0xdf000000f7,
-        0xf800000100,
+    "PVALID": (
+        0x2D0000002E,
+        0x300000003A,
+        0x610000007B,
+        0xDF000000F7,
+        0xF800000100,
         0x10100000102,
         0x10300000104,
         0x10500000106,
         0x10700000108,
-        0x1090000010a,
-        0x10b0000010c,
-        0x10d0000010e,
-        0x10f00000110,
+        0x1090000010A,
+        0x10B0000010C,
+        0x10D0000010E,
+        0x10F00000110,
         0x11100000112,
         0x11300000114,
         0x11500000116,
         0x11700000118,
-        0x1190000011a,
-        0x11b0000011c,
-        0x11d0000011e,
-        0x11f00000120,
+        0x1190000011A,
+        0x11B0000011C,
+        0x11D0000011E,
+        0x11F00000120,
         0x12100000122,
         0x12300000124,
         0x12500000126,
         0x12700000128,
-        0x1290000012a,
-        0x12b0000012c,
-        0x12d0000012e,
-        0x12f00000130,
+        0x1290000012A,
+        0x12B0000012C,
+        0x12D0000012E,
+        0x12F00000130,
         0x13100000132,
         0x13500000136,
         0x13700000139,
-        0x13a0000013b,
-        0x13c0000013d,
-        0x13e0000013f,
+        0x13A0000013B,
+        0x13C0000013D,
+        0x13E0000013F,
         0x14200000143,
         0x14400000145,
         0x14600000147,
         0x14800000149,
-        0x14b0000014c,
-        0x14d0000014e,
-        0x14f00000150,
+        0x14B0000014C,
+        0x14D0000014E,
+        0x14F00000150,
         0x15100000152,
         0x15300000154,
         0x15500000156,
         0x15700000158,
-        0x1590000015a,
-        0x15b0000015c,
-        0x15d0000015e,
-        0x15f00000160,
+        0x1590000015A,
+        0x15B0000015C,
+        0x15D0000015E,
+        0x15F00000160,
         0x16100000162,
         0x16300000164,
         0x16500000166,
         0x16700000168,
-        0x1690000016a,
-        0x16b0000016c,
-        0x16d0000016e,
-        0x16f00000170,
+        0x1690000016A,
+        0x16B0000016C,
+        0x16D0000016E,
+        0x16F00000170,
         0x17100000172,
         0x17300000174,
         0x17500000176,
         0x17700000178,
-        0x17a0000017b,
-        0x17c0000017d,
-        0x17e0000017f,
+        0x17A0000017B,
+        0x17C0000017D,
+        0x17E0000017F,
         0x18000000181,
         0x18300000184,
         0x18500000186,
         0x18800000189,
-        0x18c0000018e,
+        0x18C0000018E,
         0x19200000193,
         0x19500000196,
-        0x1990000019c,
-        0x19e0000019f,
-        0x1a1000001a2,
-        0x1a3000001a4,
-        0x1a5000001a6,
-        0x1a8000001a9,
-        0x1aa000001ac,
-        0x1ad000001ae,
-        0x1b0000001b1,
-        0x1b4000001b5,
-        0x1b6000001b7,
-        0x1b9000001bc,
-        0x1bd000001c4,
-        0x1ce000001cf,
-        0x1d0000001d1,
-        0x1d2000001d3,
-        0x1d4000001d5,
-        0x1d6000001d7,
-        0x1d8000001d9,
-        0x1da000001db,
-        0x1dc000001de,
-        0x1df000001e0,
-        0x1e1000001e2,
-        0x1e3000001e4,
-        0x1e5000001e6,
-        0x1e7000001e8,
-        0x1e9000001ea,
-        0x1eb000001ec,
-        0x1ed000001ee,
-        0x1ef000001f1,
-        0x1f5000001f6,
-        0x1f9000001fa,
-        0x1fb000001fc,
-        0x1fd000001fe,
-        0x1ff00000200,
+        0x1990000019C,
+        0x19E0000019F,
+        0x1A1000001A2,
+        0x1A3000001A4,
+        0x1A5000001A6,
+        0x1A8000001A9,
+        0x1AA000001AC,
+        0x1AD000001AE,
+        0x1B0000001B1,
+        0x1B4000001B5,
+        0x1B6000001B7,
+        0x1B9000001BC,
+        0x1BD000001C4,
+        0x1CE000001CF,
+        0x1D0000001D1,
+        0x1D2000001D3,
+        0x1D4000001D5,
+        0x1D6000001D7,
+        0x1D8000001D9,
+        0x1DA000001DB,
+        0x1DC000001DE,
+        0x1DF000001E0,
+        0x1E1000001E2,
+        0x1E3000001E4,
+        0x1E5000001E6,
+        0x1E7000001E8,
+        0x1E9000001EA,
+        0x1EB000001EC,
+        0x1ED000001EE,
+        0x1EF000001F1,
+        0x1F5000001F6,
+        0x1F9000001FA,
+        0x1FB000001FC,
+        0x1FD000001FE,
+        0x1FF00000200,
         0x20100000202,
         0x20300000204,
         0x20500000206,
         0x20700000208,
-        0x2090000020a,
-        0x20b0000020c,
-        0x20d0000020e,
-        0x20f00000210,
+        0x2090000020A,
+        0x20B0000020C,
+        0x20D0000020E,
+        0x20F00000210,
         0x21100000212,
         0x21300000214,
         0x21500000216,
         0x21700000218,
-        0x2190000021a,
-        0x21b0000021c,
-        0x21d0000021e,
-        0x21f00000220,
+        0x2190000021A,
+        0x21B0000021C,
+        0x21D0000021E,
+        0x21F00000220,
         0x22100000222,
         0x22300000224,
         0x22500000226,
         0x22700000228,
-        0x2290000022a,
-        0x22b0000022c,
-        0x22d0000022e,
-        0x22f00000230,
+        0x2290000022A,
+        0x22B0000022C,
+        0x22D0000022E,
+        0x22F00000230,
         0x23100000232,
-        0x2330000023a,
-        0x23c0000023d,
-        0x23f00000241,
+        0x2330000023A,
+        0x23C0000023D,
+        0x23F00000241,
         0x24200000243,
         0x24700000248,
-        0x2490000024a,
-        0x24b0000024c,
-        0x24d0000024e,
-        0x24f000002b0,
-        0x2b9000002c2,
-        0x2c6000002d2,
-        0x2ec000002ed,
-        0x2ee000002ef,
+        0x2490000024A,
+        0x24B0000024C,
+        0x24D0000024E,
+        0x24F000002B0,
+        0x2B9000002C2,
+        0x2C6000002D2,
+        0x2EC000002ED,
+        0x2EE000002EF,
         0x30000000340,
         0x34200000343,
-        0x3460000034f,
+        0x3460000034F,
         0x35000000370,
         0x37100000372,
         0x37300000374,
         0x37700000378,
-        0x37b0000037e,
+        0x37B0000037E,
         0x39000000391,
-        0x3ac000003cf,
-        0x3d7000003d8,
-        0x3d9000003da,
-        0x3db000003dc,
-        0x3dd000003de,
-        0x3df000003e0,
-        0x3e1000003e2,
-        0x3e3000003e4,
-        0x3e5000003e6,
-        0x3e7000003e8,
-        0x3e9000003ea,
-        0x3eb000003ec,
-        0x3ed000003ee,
-        0x3ef000003f0,
-        0x3f3000003f4,
-        0x3f8000003f9,
-        0x3fb000003fd,
+        0x3AC000003CF,
+        0x3D7000003D8,
+        0x3D9000003DA,
+        0x3DB000003DC,
+        0x3DD000003DE,
+        0x3DF000003E0,
+        0x3E1000003E2,
+        0x3E3000003E4,
+        0x3E5000003E6,
+        0x3E7000003E8,
+        0x3E9000003EA,
+        0x3EB000003EC,
+        0x3ED000003EE,
+        0x3EF000003F0,
+        0x3F3000003F4,
+        0x3F8000003F9,
+        0x3FB000003FD,
         0x43000000460,
         0x46100000462,
         0x46300000464,
         0x46500000466,
         0x46700000468,
-        0x4690000046a,
-        0x46b0000046c,
-        0x46d0000046e,
-        0x46f00000470,
+        0x4690000046A,
+        0x46B0000046C,
+        0x46D0000046E,
+        0x46F00000470,
         0x47100000472,
         0x47300000474,
         0x47500000476,
         0x47700000478,
-        0x4790000047a,
-        0x47b0000047c,
-        0x47d0000047e,
-        0x47f00000480,
+        0x4790000047A,
+        0x47B0000047C,
+        0x47D0000047E,
+        0x47F00000480,
         0x48100000482,
         0x48300000488,
-        0x48b0000048c,
-        0x48d0000048e,
-        0x48f00000490,
+        0x48B0000048C,
+        0x48D0000048E,
+        0x48F00000490,
         0x49100000492,
         0x49300000494,
         0x49500000496,
         0x49700000498,
-        0x4990000049a,
-        0x49b0000049c,
-        0x49d0000049e,
-        0x49f000004a0,
-        0x4a1000004a2,
-        0x4a3000004a4,
-        0x4a5000004a6,
-        0x4a7000004a8,
-        0x4a9000004aa,
-        0x4ab000004ac,
-        0x4ad000004ae,
-        0x4af000004b0,
-        0x4b1000004b2,
-        0x4b3000004b4,
-        0x4b5000004b6,
-        0x4b7000004b8,
-        0x4b9000004ba,
-        0x4bb000004bc,
-        0x4bd000004be,
-        0x4bf000004c0,
-        0x4c2000004c3,
-        0x4c4000004c5,
-        0x4c6000004c7,
-        0x4c8000004c9,
-        0x4ca000004cb,
-        0x4cc000004cd,
-        0x4ce000004d0,
-        0x4d1000004d2,
-        0x4d3000004d4,
-        0x4d5000004d6,
-        0x4d7000004d8,
-        0x4d9000004da,
-        0x4db000004dc,
-        0x4dd000004de,
-        0x4df000004e0,
-        0x4e1000004e2,
-        0x4e3000004e4,
-        0x4e5000004e6,
-        0x4e7000004e8,
-        0x4e9000004ea,
-        0x4eb000004ec,
-        0x4ed000004ee,
-        0x4ef000004f0,
-        0x4f1000004f2,
-        0x4f3000004f4,
-        0x4f5000004f6,
-        0x4f7000004f8,
-        0x4f9000004fa,
-        0x4fb000004fc,
-        0x4fd000004fe,
-        0x4ff00000500,
+        0x4990000049A,
+        0x49B0000049C,
+        0x49D0000049E,
+        0x49F000004A0,
+        0x4A1000004A2,
+        0x4A3000004A4,
+        0x4A5000004A6,
+        0x4A7000004A8,
+        0x4A9000004AA,
+        0x4AB000004AC,
+        0x4AD000004AE,
+        0x4AF000004B0,
+        0x4B1000004B2,
+        0x4B3000004B4,
+        0x4B5000004B6,
+        0x4B7000004B8,
+        0x4B9000004BA,
+        0x4BB000004BC,
+        0x4BD000004BE,
+        0x4BF000004C0,
+        0x4C2000004C3,
+        0x4C4000004C5,
+        0x4C6000004C7,
+        0x4C8000004C9,
+        0x4CA000004CB,
+        0x4CC000004CD,
+        0x4CE000004D0,
+        0x4D1000004D2,
+        0x4D3000004D4,
+        0x4D5000004D6,
+        0x4D7000004D8,
+        0x4D9000004DA,
+        0x4DB000004DC,
+        0x4DD000004DE,
+        0x4DF000004E0,
+        0x4E1000004E2,
+        0x4E3000004E4,
+        0x4E5000004E6,
+        0x4E7000004E8,
+        0x4E9000004EA,
+        0x4EB000004EC,
+        0x4ED000004EE,
+        0x4EF000004F0,
+        0x4F1000004F2,
+        0x4F3000004F4,
+        0x4F5000004F6,
+        0x4F7000004F8,
+        0x4F9000004FA,
+        0x4FB000004FC,
+        0x4FD000004FE,
+        0x4FF00000500,
         0x50100000502,
         0x50300000504,
         0x50500000506,
         0x50700000508,
-        0x5090000050a,
-        0x50b0000050c,
-        0x50d0000050e,
-        0x50f00000510,
+        0x5090000050A,
+        0x50B0000050C,
+        0x50D0000050E,
+        0x50F00000510,
         0x51100000512,
         0x51300000514,
         0x51500000516,
         0x51700000518,
-        0x5190000051a,
-        0x51b0000051c,
-        0x51d0000051e,
-        0x51f00000520,
+        0x5190000051A,
+        0x51B0000051C,
+        0x51D0000051E,
+        0x51F00000520,
         0x52100000522,
         0x52300000524,
         0x52500000526,
         0x52700000528,
-        0x5290000052a,
-        0x52b0000052c,
-        0x52d0000052e,
-        0x52f00000530,
-        0x5590000055a,
+        0x5290000052A,
+        0x52B0000052C,
+        0x52D0000052E,
+        0x52F00000530,
+        0x5590000055A,
         0x56000000587,
         0x58800000589,
-        0x591000005be,
-        0x5bf000005c0,
-        0x5c1000005c3,
-        0x5c4000005c6,
-        0x5c7000005c8,
-        0x5d0000005eb,
-        0x5ef000005f3,
-        0x6100000061b,
+        0x591000005BE,
+        0x5BF000005C0,
+        0x5C1000005C3,
+        0x5C4000005C6,
+        0x5C7000005C8,
+        0x5D0000005EB,
+        0x5EF000005F3,
+        0x6100000061B,
         0x62000000640,
         0x64100000660,
-        0x66e00000675,
-        0x679000006d4,
-        0x6d5000006dd,
-        0x6df000006e9,
-        0x6ea000006f0,
-        0x6fa00000700,
-        0x7100000074b,
-        0x74d000007b2,
-        0x7c0000007f6,
-        0x7fd000007fe,
-        0x8000000082e,
-        0x8400000085c,
-        0x8600000086b,
+        0x66E00000675,
+        0x679000006D4,
+        0x6D5000006DD,
+        0x6DF000006E9,
+        0x6EA000006F0,
+        0x6FA00000700,
+        0x7100000074B,
+        0x74D000007B2,
+        0x7C0000007F6,
+        0x7FD000007FE,
+        0x8000000082E,
+        0x8400000085C,
+        0x8600000086B,
         0x87000000888,
-        0x8890000088f,
-        0x898000008e2,
-        0x8e300000958,
+        0x8890000088F,
+        0x898000008E2,
+        0x8E300000958,
         0x96000000964,
         0x96600000970,
         0x97100000984,
-        0x9850000098d,
-        0x98f00000991,
-        0x993000009a9,
-        0x9aa000009b1,
-        0x9b2000009b3,
-        0x9b6000009ba,
-        0x9bc000009c5,
-        0x9c7000009c9,
-        0x9cb000009cf,
-        0x9d7000009d8,
-        0x9e0000009e4,
-        0x9e6000009f2,
-        0x9fc000009fd,
-        0x9fe000009ff,
-        0xa0100000a04,
-        0xa0500000a0b,
-        0xa0f00000a11,
-        0xa1300000a29,
-        0xa2a00000a31,
-        0xa3200000a33,
-        0xa3500000a36,
-        0xa3800000a3a,
-        0xa3c00000a3d,
-        0xa3e00000a43,
-        0xa4700000a49,
-        0xa4b00000a4e,
-        0xa5100000a52,
-        0xa5c00000a5d,
-        0xa6600000a76,
-        0xa8100000a84,
-        0xa8500000a8e,
-        0xa8f00000a92,
-        0xa9300000aa9,
-        0xaaa00000ab1,
-        0xab200000ab4,
-        0xab500000aba,
-        0xabc00000ac6,
-        0xac700000aca,
-        0xacb00000ace,
-        0xad000000ad1,
-        0xae000000ae4,
-        0xae600000af0,
-        0xaf900000b00,
-        0xb0100000b04,
-        0xb0500000b0d,
-        0xb0f00000b11,
-        0xb1300000b29,
-        0xb2a00000b31,
-        0xb3200000b34,
-        0xb3500000b3a,
-        0xb3c00000b45,
-        0xb4700000b49,
-        0xb4b00000b4e,
-        0xb5500000b58,
-        0xb5f00000b64,
-        0xb6600000b70,
-        0xb7100000b72,
-        0xb8200000b84,
-        0xb8500000b8b,
-        0xb8e00000b91,
-        0xb9200000b96,
-        0xb9900000b9b,
-        0xb9c00000b9d,
-        0xb9e00000ba0,
-        0xba300000ba5,
-        0xba800000bab,
-        0xbae00000bba,
-        0xbbe00000bc3,
-        0xbc600000bc9,
-        0xbca00000bce,
-        0xbd000000bd1,
-        0xbd700000bd8,
-        0xbe600000bf0,
-        0xc0000000c0d,
-        0xc0e00000c11,
-        0xc1200000c29,
-        0xc2a00000c3a,
-        0xc3c00000c45,
-        0xc4600000c49,
-        0xc4a00000c4e,
-        0xc5500000c57,
-        0xc5800000c5b,
-        0xc5d00000c5e,
-        0xc6000000c64,
-        0xc6600000c70,
-        0xc8000000c84,
-        0xc8500000c8d,
-        0xc8e00000c91,
-        0xc9200000ca9,
-        0xcaa00000cb4,
-        0xcb500000cba,
-        0xcbc00000cc5,
-        0xcc600000cc9,
-        0xcca00000cce,
-        0xcd500000cd7,
-        0xcdd00000cdf,
-        0xce000000ce4,
-        0xce600000cf0,
-        0xcf100000cf4,
-        0xd0000000d0d,
-        0xd0e00000d11,
-        0xd1200000d45,
-        0xd4600000d49,
-        0xd4a00000d4f,
-        0xd5400000d58,
-        0xd5f00000d64,
-        0xd6600000d70,
-        0xd7a00000d80,
-        0xd8100000d84,
-        0xd8500000d97,
-        0xd9a00000db2,
-        0xdb300000dbc,
-        0xdbd00000dbe,
-        0xdc000000dc7,
-        0xdca00000dcb,
-        0xdcf00000dd5,
-        0xdd600000dd7,
-        0xdd800000de0,
-        0xde600000df0,
-        0xdf200000df4,
-        0xe0100000e33,
-        0xe3400000e3b,
-        0xe4000000e4f,
-        0xe5000000e5a,
-        0xe8100000e83,
-        0xe8400000e85,
-        0xe8600000e8b,
-        0xe8c00000ea4,
-        0xea500000ea6,
-        0xea700000eb3,
-        0xeb400000ebe,
-        0xec000000ec5,
-        0xec600000ec7,
-        0xec800000ecf,
-        0xed000000eda,
-        0xede00000ee0,
-        0xf0000000f01,
-        0xf0b00000f0c,
-        0xf1800000f1a,
-        0xf2000000f2a,
-        0xf3500000f36,
-        0xf3700000f38,
-        0xf3900000f3a,
-        0xf3e00000f43,
-        0xf4400000f48,
-        0xf4900000f4d,
-        0xf4e00000f52,
-        0xf5300000f57,
-        0xf5800000f5c,
-        0xf5d00000f69,
-        0xf6a00000f6d,
-        0xf7100000f73,
-        0xf7400000f75,
-        0xf7a00000f81,
-        0xf8200000f85,
-        0xf8600000f93,
-        0xf9400000f98,
-        0xf9900000f9d,
-        0xf9e00000fa2,
-        0xfa300000fa7,
-        0xfa800000fac,
-        0xfad00000fb9,
-        0xfba00000fbd,
-        0xfc600000fc7,
-        0x10000000104a,
-        0x10500000109e,
-        0x10d0000010fb,
-        0x10fd00001100,
+        0x9850000098D,
+        0x98F00000991,
+        0x993000009A9,
+        0x9AA000009B1,
+        0x9B2000009B3,
+        0x9B6000009BA,
+        0x9BC000009C5,
+        0x9C7000009C9,
+        0x9CB000009CF,
+        0x9D7000009D8,
+        0x9E0000009E4,
+        0x9E6000009F2,
+        0x9FC000009FD,
+        0x9FE000009FF,
+        0xA0100000A04,
+        0xA0500000A0B,
+        0xA0F00000A11,
+        0xA1300000A29,
+        0xA2A00000A31,
+        0xA3200000A33,
+        0xA3500000A36,
+        0xA3800000A3A,
+        0xA3C00000A3D,
+        0xA3E00000A43,
+        0xA4700000A49,
+        0xA4B00000A4E,
+        0xA5100000A52,
+        0xA5C00000A5D,
+        0xA6600000A76,
+        0xA8100000A84,
+        0xA8500000A8E,
+        0xA8F00000A92,
+        0xA9300000AA9,
+        0xAAA00000AB1,
+        0xAB200000AB4,
+        0xAB500000ABA,
+        0xABC00000AC6,
+        0xAC700000ACA,
+        0xACB00000ACE,
+        0xAD000000AD1,
+        0xAE000000AE4,
+        0xAE600000AF0,
+        0xAF900000B00,
+        0xB0100000B04,
+        0xB0500000B0D,
+        0xB0F00000B11,
+        0xB1300000B29,
+        0xB2A00000B31,
+        0xB3200000B34,
+        0xB3500000B3A,
+        0xB3C00000B45,
+        0xB4700000B49,
+        0xB4B00000B4E,
+        0xB5500000B58,
+        0xB5F00000B64,
+        0xB6600000B70,
+        0xB7100000B72,
+        0xB8200000B84,
+        0xB8500000B8B,
+        0xB8E00000B91,
+        0xB9200000B96,
+        0xB9900000B9B,
+        0xB9C00000B9D,
+        0xB9E00000BA0,
+        0xBA300000BA5,
+        0xBA800000BAB,
+        0xBAE00000BBA,
+        0xBBE00000BC3,
+        0xBC600000BC9,
+        0xBCA00000BCE,
+        0xBD000000BD1,
+        0xBD700000BD8,
+        0xBE600000BF0,
+        0xC0000000C0D,
+        0xC0E00000C11,
+        0xC1200000C29,
+        0xC2A00000C3A,
+        0xC3C00000C45,
+        0xC4600000C49,
+        0xC4A00000C4E,
+        0xC5500000C57,
+        0xC5800000C5B,
+        0xC5D00000C5E,
+        0xC6000000C64,
+        0xC6600000C70,
+        0xC8000000C84,
+        0xC8500000C8D,
+        0xC8E00000C91,
+        0xC9200000CA9,
+        0xCAA00000CB4,
+        0xCB500000CBA,
+        0xCBC00000CC5,
+        0xCC600000CC9,
+        0xCCA00000CCE,
+        0xCD500000CD7,
+        0xCDD00000CDF,
+        0xCE000000CE4,
+        0xCE600000CF0,
+        0xCF100000CF4,
+        0xD0000000D0D,
+        0xD0E00000D11,
+        0xD1200000D45,
+        0xD4600000D49,
+        0xD4A00000D4F,
+        0xD5400000D58,
+        0xD5F00000D64,
+        0xD6600000D70,
+        0xD7A00000D80,
+        0xD8100000D84,
+        0xD8500000D97,
+        0xD9A00000DB2,
+        0xDB300000DBC,
+        0xDBD00000DBE,
+        0xDC000000DC7,
+        0xDCA00000DCB,
+        0xDCF00000DD5,
+        0xDD600000DD7,
+        0xDD800000DE0,
+        0xDE600000DF0,
+        0xDF200000DF4,
+        0xE0100000E33,
+        0xE3400000E3B,
+        0xE4000000E4F,
+        0xE5000000E5A,
+        0xE8100000E83,
+        0xE8400000E85,
+        0xE8600000E8B,
+        0xE8C00000EA4,
+        0xEA500000EA6,
+        0xEA700000EB3,
+        0xEB400000EBE,
+        0xEC000000EC5,
+        0xEC600000EC7,
+        0xEC800000ECF,
+        0xED000000EDA,
+        0xEDE00000EE0,
+        0xF0000000F01,
+        0xF0B00000F0C,
+        0xF1800000F1A,
+        0xF2000000F2A,
+        0xF3500000F36,
+        0xF3700000F38,
+        0xF3900000F3A,
+        0xF3E00000F43,
+        0xF4400000F48,
+        0xF4900000F4D,
+        0xF4E00000F52,
+        0xF5300000F57,
+        0xF5800000F5C,
+        0xF5D00000F69,
+        0xF6A00000F6D,
+        0xF7100000F73,
+        0xF7400000F75,
+        0xF7A00000F81,
+        0xF8200000F85,
+        0xF8600000F93,
+        0xF9400000F98,
+        0xF9900000F9D,
+        0xF9E00000FA2,
+        0xFA300000FA7,
+        0xFA800000FAC,
+        0xFAD00000FB9,
+        0xFBA00000FBD,
+        0xFC600000FC7,
+        0x10000000104A,
+        0x10500000109E,
+        0x10D0000010FB,
+        0x10FD00001100,
         0x120000001249,
-        0x124a0000124e,
+        0x124A0000124E,
         0x125000001257,
         0x125800001259,
-        0x125a0000125e,
+        0x125A0000125E,
         0x126000001289,
-        0x128a0000128e,
-        0x1290000012b1,
-        0x12b2000012b6,
-        0x12b8000012bf,
-        0x12c0000012c1,
-        0x12c2000012c6,
-        0x12c8000012d7,
-        0x12d800001311,
+        0x128A0000128E,
+        0x1290000012B1,
+        0x12B2000012B6,
+        0x12B8000012BF,
+        0x12C0000012C1,
+        0x12C2000012C6,
+        0x12C8000012D7,
+        0x12D800001311,
         0x131200001316,
-        0x13180000135b,
-        0x135d00001360,
+        0x13180000135B,
+        0x135D00001360,
         0x138000001390,
-        0x13a0000013f6,
-        0x14010000166d,
-        0x166f00001680,
-        0x16810000169b,
-        0x16a0000016eb,
-        0x16f1000016f9,
+        0x13A0000013F6,
+        0x14010000166D,
+        0x166F00001680,
+        0x16810000169B,
+        0x16A0000016EB,
+        0x16F1000016F9,
         0x170000001716,
-        0x171f00001735,
+        0x171F00001735,
         0x174000001754,
-        0x17600000176d,
-        0x176e00001771,
+        0x17600000176D,
+        0x176E00001771,
         0x177200001774,
-        0x1780000017b4,
-        0x17b6000017d4,
-        0x17d7000017d8,
-        0x17dc000017de,
-        0x17e0000017ea,
-        0x18100000181a,
+        0x1780000017B4,
+        0x17B6000017D4,
+        0x17D7000017D8,
+        0x17DC000017DE,
+        0x17E0000017EA,
+        0x18100000181A,
         0x182000001879,
-        0x1880000018ab,
-        0x18b0000018f6,
-        0x19000000191f,
-        0x19200000192c,
-        0x19300000193c,
-        0x19460000196e,
+        0x1880000018AB,
+        0x18B0000018F6,
+        0x19000000191F,
+        0x19200000192C,
+        0x19300000193C,
+        0x19460000196E,
         0x197000001975,
-        0x1980000019ac,
-        0x19b0000019ca,
-        0x19d0000019da,
-        0x1a0000001a1c,
-        0x1a2000001a5f,
-        0x1a6000001a7d,
-        0x1a7f00001a8a,
-        0x1a9000001a9a,
-        0x1aa700001aa8,
-        0x1ab000001abe,
-        0x1abf00001acf,
-        0x1b0000001b4d,
-        0x1b5000001b5a,
-        0x1b6b00001b74,
-        0x1b8000001bf4,
-        0x1c0000001c38,
-        0x1c4000001c4a,
-        0x1c4d00001c7e,
-        0x1cd000001cd3,
-        0x1cd400001cfb,
-        0x1d0000001d2c,
-        0x1d2f00001d30,
-        0x1d3b00001d3c,
-        0x1d4e00001d4f,
-        0x1d6b00001d78,
-        0x1d7900001d9b,
-        0x1dc000001e00,
-        0x1e0100001e02,
-        0x1e0300001e04,
-        0x1e0500001e06,
-        0x1e0700001e08,
-        0x1e0900001e0a,
-        0x1e0b00001e0c,
-        0x1e0d00001e0e,
-        0x1e0f00001e10,
-        0x1e1100001e12,
-        0x1e1300001e14,
-        0x1e1500001e16,
-        0x1e1700001e18,
-        0x1e1900001e1a,
-        0x1e1b00001e1c,
-        0x1e1d00001e1e,
-        0x1e1f00001e20,
-        0x1e2100001e22,
-        0x1e2300001e24,
-        0x1e2500001e26,
-        0x1e2700001e28,
-        0x1e2900001e2a,
-        0x1e2b00001e2c,
-        0x1e2d00001e2e,
-        0x1e2f00001e30,
-        0x1e3100001e32,
-        0x1e3300001e34,
-        0x1e3500001e36,
-        0x1e3700001e38,
-        0x1e3900001e3a,
-        0x1e3b00001e3c,
-        0x1e3d00001e3e,
-        0x1e3f00001e40,
-        0x1e4100001e42,
-        0x1e4300001e44,
-        0x1e4500001e46,
-        0x1e4700001e48,
-        0x1e4900001e4a,
-        0x1e4b00001e4c,
-        0x1e4d00001e4e,
-        0x1e4f00001e50,
-        0x1e5100001e52,
-        0x1e5300001e54,
-        0x1e5500001e56,
-        0x1e5700001e58,
-        0x1e5900001e5a,
-        0x1e5b00001e5c,
-        0x1e5d00001e5e,
-        0x1e5f00001e60,
-        0x1e6100001e62,
-        0x1e6300001e64,
-        0x1e6500001e66,
-        0x1e6700001e68,
-        0x1e6900001e6a,
-        0x1e6b00001e6c,
-        0x1e6d00001e6e,
-        0x1e6f00001e70,
-        0x1e7100001e72,
-        0x1e7300001e74,
-        0x1e7500001e76,
-        0x1e7700001e78,
-        0x1e7900001e7a,
-        0x1e7b00001e7c,
-        0x1e7d00001e7e,
-        0x1e7f00001e80,
-        0x1e8100001e82,
-        0x1e8300001e84,
-        0x1e8500001e86,
-        0x1e8700001e88,
-        0x1e8900001e8a,
-        0x1e8b00001e8c,
-        0x1e8d00001e8e,
-        0x1e8f00001e90,
-        0x1e9100001e92,
-        0x1e9300001e94,
-        0x1e9500001e9a,
-        0x1e9c00001e9e,
-        0x1e9f00001ea0,
-        0x1ea100001ea2,
-        0x1ea300001ea4,
-        0x1ea500001ea6,
-        0x1ea700001ea8,
-        0x1ea900001eaa,
-        0x1eab00001eac,
-        0x1ead00001eae,
-        0x1eaf00001eb0,
-        0x1eb100001eb2,
-        0x1eb300001eb4,
-        0x1eb500001eb6,
-        0x1eb700001eb8,
-        0x1eb900001eba,
-        0x1ebb00001ebc,
-        0x1ebd00001ebe,
-        0x1ebf00001ec0,
-        0x1ec100001ec2,
-        0x1ec300001ec4,
-        0x1ec500001ec6,
-        0x1ec700001ec8,
-        0x1ec900001eca,
-        0x1ecb00001ecc,
-        0x1ecd00001ece,
-        0x1ecf00001ed0,
-        0x1ed100001ed2,
-        0x1ed300001ed4,
-        0x1ed500001ed6,
-        0x1ed700001ed8,
-        0x1ed900001eda,
-        0x1edb00001edc,
-        0x1edd00001ede,
-        0x1edf00001ee0,
-        0x1ee100001ee2,
-        0x1ee300001ee4,
-        0x1ee500001ee6,
-        0x1ee700001ee8,
-        0x1ee900001eea,
-        0x1eeb00001eec,
-        0x1eed00001eee,
-        0x1eef00001ef0,
-        0x1ef100001ef2,
-        0x1ef300001ef4,
-        0x1ef500001ef6,
-        0x1ef700001ef8,
-        0x1ef900001efa,
-        0x1efb00001efc,
-        0x1efd00001efe,
-        0x1eff00001f08,
-        0x1f1000001f16,
-        0x1f2000001f28,
-        0x1f3000001f38,
-        0x1f4000001f46,
-        0x1f5000001f58,
-        0x1f6000001f68,
-        0x1f7000001f71,
-        0x1f7200001f73,
-        0x1f7400001f75,
-        0x1f7600001f77,
-        0x1f7800001f79,
-        0x1f7a00001f7b,
-        0x1f7c00001f7d,
-        0x1fb000001fb2,
-        0x1fb600001fb7,
-        0x1fc600001fc7,
-        0x1fd000001fd3,
-        0x1fd600001fd8,
-        0x1fe000001fe3,
-        0x1fe400001fe8,
-        0x1ff600001ff7,
-        0x214e0000214f,
+        0x1980000019AC,
+        0x19B0000019CA,
+        0x19D0000019DA,
+        0x1A0000001A1C,
+        0x1A2000001A5F,
+        0x1A6000001A7D,
+        0x1A7F00001A8A,
+        0x1A9000001A9A,
+        0x1AA700001AA8,
+        0x1AB000001ABE,
+        0x1ABF00001ACF,
+        0x1B0000001B4D,
+        0x1B5000001B5A,
+        0x1B6B00001B74,
+        0x1B8000001BF4,
+        0x1C0000001C38,
+        0x1C4000001C4A,
+        0x1C4D00001C7E,
+        0x1CD000001CD3,
+        0x1CD400001CFB,
+        0x1D0000001D2C,
+        0x1D2F00001D30,
+        0x1D3B00001D3C,
+        0x1D4E00001D4F,
+        0x1D6B00001D78,
+        0x1D7900001D9B,
+        0x1DC000001E00,
+        0x1E0100001E02,
+        0x1E0300001E04,
+        0x1E0500001E06,
+        0x1E0700001E08,
+        0x1E0900001E0A,
+        0x1E0B00001E0C,
+        0x1E0D00001E0E,
+        0x1E0F00001E10,
+        0x1E1100001E12,
+        0x1E1300001E14,
+        0x1E1500001E16,
+        0x1E1700001E18,
+        0x1E1900001E1A,
+        0x1E1B00001E1C,
+        0x1E1D00001E1E,
+        0x1E1F00001E20,
+        0x1E2100001E22,
+        0x1E2300001E24,
+        0x1E2500001E26,
+        0x1E2700001E28,
+        0x1E2900001E2A,
+        0x1E2B00001E2C,
+        0x1E2D00001E2E,
+        0x1E2F00001E30,
+        0x1E3100001E32,
+        0x1E3300001E34,
+        0x1E3500001E36,
+        0x1E3700001E38,
+        0x1E3900001E3A,
+        0x1E3B00001E3C,
+        0x1E3D00001E3E,
+        0x1E3F00001E40,
+        0x1E4100001E42,
+        0x1E4300001E44,
+        0x1E4500001E46,
+        0x1E4700001E48,
+        0x1E4900001E4A,
+        0x1E4B00001E4C,
+        0x1E4D00001E4E,
+        0x1E4F00001E50,
+        0x1E5100001E52,
+        0x1E5300001E54,
+        0x1E5500001E56,
+        0x1E5700001E58,
+        0x1E5900001E5A,
+        0x1E5B00001E5C,
+        0x1E5D00001E5E,
+        0x1E5F00001E60,
+        0x1E6100001E62,
+        0x1E6300001E64,
+        0x1E6500001E66,
+        0x1E6700001E68,
+        0x1E6900001E6A,
+        0x1E6B00001E6C,
+        0x1E6D00001E6E,
+        0x1E6F00001E70,
+        0x1E7100001E72,
+        0x1E7300001E74,
+        0x1E7500001E76,
+        0x1E7700001E78,
+        0x1E7900001E7A,
+        0x1E7B00001E7C,
+        0x1E7D00001E7E,
+        0x1E7F00001E80,
+        0x1E8100001E82,
+        0x1E8300001E84,
+        0x1E8500001E86,
+        0x1E8700001E88,
+        0x1E8900001E8A,
+        0x1E8B00001E8C,
+        0x1E8D00001E8E,
+        0x1E8F00001E90,
+        0x1E9100001E92,
+        0x1E9300001E94,
+        0x1E9500001E9A,
+        0x1E9C00001E9E,
+        0x1E9F00001EA0,
+        0x1EA100001EA2,
+        0x1EA300001EA4,
+        0x1EA500001EA6,
+        0x1EA700001EA8,
+        0x1EA900001EAA,
+        0x1EAB00001EAC,
+        0x1EAD00001EAE,
+        0x1EAF00001EB0,
+        0x1EB100001EB2,
+        0x1EB300001EB4,
+        0x1EB500001EB6,
+        0x1EB700001EB8,
+        0x1EB900001EBA,
+        0x1EBB00001EBC,
+        0x1EBD00001EBE,
+        0x1EBF00001EC0,
+        0x1EC100001EC2,
+        0x1EC300001EC4,
+        0x1EC500001EC6,
+        0x1EC700001EC8,
+        0x1EC900001ECA,
+        0x1ECB00001ECC,
+        0x1ECD00001ECE,
+        0x1ECF00001ED0,
+        0x1ED100001ED2,
+        0x1ED300001ED4,
+        0x1ED500001ED6,
+        0x1ED700001ED8,
+        0x1ED900001EDA,
+        0x1EDB00001EDC,
+        0x1EDD00001EDE,
+        0x1EDF00001EE0,
+        0x1EE100001EE2,
+        0x1EE300001EE4,
+        0x1EE500001EE6,
+        0x1EE700001EE8,
+        0x1EE900001EEA,
+        0x1EEB00001EEC,
+        0x1EED00001EEE,
+        0x1EEF00001EF0,
+        0x1EF100001EF2,
+        0x1EF300001EF4,
+        0x1EF500001EF6,
+        0x1EF700001EF8,
+        0x1EF900001EFA,
+        0x1EFB00001EFC,
+        0x1EFD00001EFE,
+        0x1EFF00001F08,
+        0x1F1000001F16,
+        0x1F2000001F28,
+        0x1F3000001F38,
+        0x1F4000001F46,
+        0x1F5000001F58,
+        0x1F6000001F68,
+        0x1F7000001F71,
+        0x1F7200001F73,
+        0x1F7400001F75,
+        0x1F7600001F77,
+        0x1F7800001F79,
+        0x1F7A00001F7B,
+        0x1F7C00001F7D,
+        0x1FB000001FB2,
+        0x1FB600001FB7,
+        0x1FC600001FC7,
+        0x1FD000001FD3,
+        0x1FD600001FD8,
+        0x1FE000001FE3,
+        0x1FE400001FE8,
+        0x1FF600001FF7,
+        0x214E0000214F,
         0x218400002185,
-        0x2c3000002c60,
-        0x2c6100002c62,
-        0x2c6500002c67,
-        0x2c6800002c69,
-        0x2c6a00002c6b,
-        0x2c6c00002c6d,
-        0x2c7100002c72,
-        0x2c7300002c75,
-        0x2c7600002c7c,
-        0x2c8100002c82,
-        0x2c8300002c84,
-        0x2c8500002c86,
-        0x2c8700002c88,
-        0x2c8900002c8a,
-        0x2c8b00002c8c,
-        0x2c8d00002c8e,
-        0x2c8f00002c90,
-        0x2c9100002c92,
-        0x2c9300002c94,
-        0x2c9500002c96,
-        0x2c9700002c98,
-        0x2c9900002c9a,
-        0x2c9b00002c9c,
-        0x2c9d00002c9e,
-        0x2c9f00002ca0,
-        0x2ca100002ca2,
-        0x2ca300002ca4,
-        0x2ca500002ca6,
-        0x2ca700002ca8,
-        0x2ca900002caa,
-        0x2cab00002cac,
-        0x2cad00002cae,
-        0x2caf00002cb0,
-        0x2cb100002cb2,
-        0x2cb300002cb4,
-        0x2cb500002cb6,
-        0x2cb700002cb8,
-        0x2cb900002cba,
-        0x2cbb00002cbc,
-        0x2cbd00002cbe,
-        0x2cbf00002cc0,
-        0x2cc100002cc2,
-        0x2cc300002cc4,
-        0x2cc500002cc6,
-        0x2cc700002cc8,
-        0x2cc900002cca,
-        0x2ccb00002ccc,
-        0x2ccd00002cce,
-        0x2ccf00002cd0,
-        0x2cd100002cd2,
-        0x2cd300002cd4,
-        0x2cd500002cd6,
-        0x2cd700002cd8,
-        0x2cd900002cda,
-        0x2cdb00002cdc,
-        0x2cdd00002cde,
-        0x2cdf00002ce0,
-        0x2ce100002ce2,
-        0x2ce300002ce5,
-        0x2cec00002ced,
-        0x2cee00002cf2,
-        0x2cf300002cf4,
-        0x2d0000002d26,
-        0x2d2700002d28,
-        0x2d2d00002d2e,
-        0x2d3000002d68,
-        0x2d7f00002d97,
-        0x2da000002da7,
-        0x2da800002daf,
-        0x2db000002db7,
-        0x2db800002dbf,
-        0x2dc000002dc7,
-        0x2dc800002dcf,
-        0x2dd000002dd7,
-        0x2dd800002ddf,
-        0x2de000002e00,
-        0x2e2f00002e30,
+        0x2C3000002C60,
+        0x2C6100002C62,
+        0x2C6500002C67,
+        0x2C6800002C69,
+        0x2C6A00002C6B,
+        0x2C6C00002C6D,
+        0x2C7100002C72,
+        0x2C7300002C75,
+        0x2C7600002C7C,
+        0x2C8100002C82,
+        0x2C8300002C84,
+        0x2C8500002C86,
+        0x2C8700002C88,
+        0x2C8900002C8A,
+        0x2C8B00002C8C,
+        0x2C8D00002C8E,
+        0x2C8F00002C90,
+        0x2C9100002C92,
+        0x2C9300002C94,
+        0x2C9500002C96,
+        0x2C9700002C98,
+        0x2C9900002C9A,
+        0x2C9B00002C9C,
+        0x2C9D00002C9E,
+        0x2C9F00002CA0,
+        0x2CA100002CA2,
+        0x2CA300002CA4,
+        0x2CA500002CA6,
+        0x2CA700002CA8,
+        0x2CA900002CAA,
+        0x2CAB00002CAC,
+        0x2CAD00002CAE,
+        0x2CAF00002CB0,
+        0x2CB100002CB2,
+        0x2CB300002CB4,
+        0x2CB500002CB6,
+        0x2CB700002CB8,
+        0x2CB900002CBA,
+        0x2CBB00002CBC,
+        0x2CBD00002CBE,
+        0x2CBF00002CC0,
+        0x2CC100002CC2,
+        0x2CC300002CC4,
+        0x2CC500002CC6,
+        0x2CC700002CC8,
+        0x2CC900002CCA,
+        0x2CCB00002CCC,
+        0x2CCD00002CCE,
+        0x2CCF00002CD0,
+        0x2CD100002CD2,
+        0x2CD300002CD4,
+        0x2CD500002CD6,
+        0x2CD700002CD8,
+        0x2CD900002CDA,
+        0x2CDB00002CDC,
+        0x2CDD00002CDE,
+        0x2CDF00002CE0,
+        0x2CE100002CE2,
+        0x2CE300002CE5,
+        0x2CEC00002CED,
+        0x2CEE00002CF2,
+        0x2CF300002CF4,
+        0x2D0000002D26,
+        0x2D2700002D28,
+        0x2D2D00002D2E,
+        0x2D3000002D68,
+        0x2D7F00002D97,
+        0x2DA000002DA7,
+        0x2DA800002DAF,
+        0x2DB000002DB7,
+        0x2DB800002DBF,
+        0x2DC000002DC7,
+        0x2DC800002DCF,
+        0x2DD000002DD7,
+        0x2DD800002DDF,
+        0x2DE000002E00,
+        0x2E2F00002E30,
         0x300500003008,
-        0x302a0000302e,
-        0x303c0000303d,
+        0x302A0000302E,
+        0x303C0000303D,
         0x304100003097,
-        0x30990000309b,
-        0x309d0000309f,
-        0x30a1000030fb,
-        0x30fc000030ff,
+        0x30990000309B,
+        0x309D0000309F,
+        0x30A1000030FB,
+        0x30FC000030FF,
         0x310500003130,
-        0x31a0000031c0,
-        0x31f000003200,
-        0x340000004dc0,
-        0x4e000000a48d,
-        0xa4d00000a4fe,
-        0xa5000000a60d,
-        0xa6100000a62c,
-        0xa6410000a642,
-        0xa6430000a644,
-        0xa6450000a646,
-        0xa6470000a648,
-        0xa6490000a64a,
-        0xa64b0000a64c,
-        0xa64d0000a64e,
-        0xa64f0000a650,
-        0xa6510000a652,
-        0xa6530000a654,
-        0xa6550000a656,
-        0xa6570000a658,
-        0xa6590000a65a,
-        0xa65b0000a65c,
-        0xa65d0000a65e,
-        0xa65f0000a660,
-        0xa6610000a662,
-        0xa6630000a664,
-        0xa6650000a666,
-        0xa6670000a668,
-        0xa6690000a66a,
-        0xa66b0000a66c,
-        0xa66d0000a670,
-        0xa6740000a67e,
-        0xa67f0000a680,
-        0xa6810000a682,
-        0xa6830000a684,
-        0xa6850000a686,
-        0xa6870000a688,
-        0xa6890000a68a,
-        0xa68b0000a68c,
-        0xa68d0000a68e,
-        0xa68f0000a690,
-        0xa6910000a692,
-        0xa6930000a694,
-        0xa6950000a696,
-        0xa6970000a698,
-        0xa6990000a69a,
-        0xa69b0000a69c,
-        0xa69e0000a6e6,
-        0xa6f00000a6f2,
-        0xa7170000a720,
-        0xa7230000a724,
-        0xa7250000a726,
-        0xa7270000a728,
-        0xa7290000a72a,
-        0xa72b0000a72c,
-        0xa72d0000a72e,
-        0xa72f0000a732,
-        0xa7330000a734,
-        0xa7350000a736,
-        0xa7370000a738,
-        0xa7390000a73a,
-        0xa73b0000a73c,
-        0xa73d0000a73e,
-        0xa73f0000a740,
-        0xa7410000a742,
-        0xa7430000a744,
-        0xa7450000a746,
-        0xa7470000a748,
-        0xa7490000a74a,
-        0xa74b0000a74c,
-        0xa74d0000a74e,
-        0xa74f0000a750,
-        0xa7510000a752,
-        0xa7530000a754,
-        0xa7550000a756,
-        0xa7570000a758,
-        0xa7590000a75a,
-        0xa75b0000a75c,
-        0xa75d0000a75e,
-        0xa75f0000a760,
-        0xa7610000a762,
-        0xa7630000a764,
-        0xa7650000a766,
-        0xa7670000a768,
-        0xa7690000a76a,
-        0xa76b0000a76c,
-        0xa76d0000a76e,
-        0xa76f0000a770,
-        0xa7710000a779,
-        0xa77a0000a77b,
-        0xa77c0000a77d,
-        0xa77f0000a780,
-        0xa7810000a782,
-        0xa7830000a784,
-        0xa7850000a786,
-        0xa7870000a789,
-        0xa78c0000a78d,
-        0xa78e0000a790,
-        0xa7910000a792,
-        0xa7930000a796,
-        0xa7970000a798,
-        0xa7990000a79a,
-        0xa79b0000a79c,
-        0xa79d0000a79e,
-        0xa79f0000a7a0,
-        0xa7a10000a7a2,
-        0xa7a30000a7a4,
-        0xa7a50000a7a6,
-        0xa7a70000a7a8,
-        0xa7a90000a7aa,
-        0xa7af0000a7b0,
-        0xa7b50000a7b6,
-        0xa7b70000a7b8,
-        0xa7b90000a7ba,
-        0xa7bb0000a7bc,
-        0xa7bd0000a7be,
-        0xa7bf0000a7c0,
-        0xa7c10000a7c2,
-        0xa7c30000a7c4,
-        0xa7c80000a7c9,
-        0xa7ca0000a7cb,
-        0xa7d10000a7d2,
-        0xa7d30000a7d4,
-        0xa7d50000a7d6,
-        0xa7d70000a7d8,
-        0xa7d90000a7da,
-        0xa7f60000a7f8,
-        0xa7fa0000a828,
-        0xa82c0000a82d,
-        0xa8400000a874,
-        0xa8800000a8c6,
-        0xa8d00000a8da,
-        0xa8e00000a8f8,
-        0xa8fb0000a8fc,
-        0xa8fd0000a92e,
-        0xa9300000a954,
-        0xa9800000a9c1,
-        0xa9cf0000a9da,
-        0xa9e00000a9ff,
-        0xaa000000aa37,
-        0xaa400000aa4e,
-        0xaa500000aa5a,
-        0xaa600000aa77,
-        0xaa7a0000aac3,
-        0xaadb0000aade,
-        0xaae00000aaf0,
-        0xaaf20000aaf7,
-        0xab010000ab07,
-        0xab090000ab0f,
-        0xab110000ab17,
-        0xab200000ab27,
-        0xab280000ab2f,
-        0xab300000ab5b,
-        0xab600000ab69,
-        0xabc00000abeb,
-        0xabec0000abee,
-        0xabf00000abfa,
-        0xac000000d7a4,
-        0xfa0e0000fa10,
-        0xfa110000fa12,
-        0xfa130000fa15,
-        0xfa1f0000fa20,
-        0xfa210000fa22,
-        0xfa230000fa25,
-        0xfa270000fa2a,
-        0xfb1e0000fb1f,
-        0xfe200000fe30,
-        0xfe730000fe74,
-        0x100000001000c,
-        0x1000d00010027,
-        0x100280001003b,
-        0x1003c0001003e,
-        0x1003f0001004e,
-        0x100500001005e,
-        0x10080000100fb,
-        0x101fd000101fe,
-        0x102800001029d,
-        0x102a0000102d1,
-        0x102e0000102e1,
+        0x31A0000031C0,
+        0x31F000003200,
+        0x340000004DC0,
+        0x4E000000A48D,
+        0xA4D00000A4FE,
+        0xA5000000A60D,
+        0xA6100000A62C,
+        0xA6410000A642,
+        0xA6430000A644,
+        0xA6450000A646,
+        0xA6470000A648,
+        0xA6490000A64A,
+        0xA64B0000A64C,
+        0xA64D0000A64E,
+        0xA64F0000A650,
+        0xA6510000A652,
+        0xA6530000A654,
+        0xA6550000A656,
+        0xA6570000A658,
+        0xA6590000A65A,
+        0xA65B0000A65C,
+        0xA65D0000A65E,
+        0xA65F0000A660,
+        0xA6610000A662,
+        0xA6630000A664,
+        0xA6650000A666,
+        0xA6670000A668,
+        0xA6690000A66A,
+        0xA66B0000A66C,
+        0xA66D0000A670,
+        0xA6740000A67E,
+        0xA67F0000A680,
+        0xA6810000A682,
+        0xA6830000A684,
+        0xA6850000A686,
+        0xA6870000A688,
+        0xA6890000A68A,
+        0xA68B0000A68C,
+        0xA68D0000A68E,
+        0xA68F0000A690,
+        0xA6910000A692,
+        0xA6930000A694,
+        0xA6950000A696,
+        0xA6970000A698,
+        0xA6990000A69A,
+        0xA69B0000A69C,
+        0xA69E0000A6E6,
+        0xA6F00000A6F2,
+        0xA7170000A720,
+        0xA7230000A724,
+        0xA7250000A726,
+        0xA7270000A728,
+        0xA7290000A72A,
+        0xA72B0000A72C,
+        0xA72D0000A72E,
+        0xA72F0000A732,
+        0xA7330000A734,
+        0xA7350000A736,
+        0xA7370000A738,
+        0xA7390000A73A,
+        0xA73B0000A73C,
+        0xA73D0000A73E,
+        0xA73F0000A740,
+        0xA7410000A742,
+        0xA7430000A744,
+        0xA7450000A746,
+        0xA7470000A748,
+        0xA7490000A74A,
+        0xA74B0000A74C,
+        0xA74D0000A74E,
+        0xA74F0000A750,
+        0xA7510000A752,
+        0xA7530000A754,
+        0xA7550000A756,
+        0xA7570000A758,
+        0xA7590000A75A,
+        0xA75B0000A75C,
+        0xA75D0000A75E,
+        0xA75F0000A760,
+        0xA7610000A762,
+        0xA7630000A764,
+        0xA7650000A766,
+        0xA7670000A768,
+        0xA7690000A76A,
+        0xA76B0000A76C,
+        0xA76D0000A76E,
+        0xA76F0000A770,
+        0xA7710000A779,
+        0xA77A0000A77B,
+        0xA77C0000A77D,
+        0xA77F0000A780,
+        0xA7810000A782,
+        0xA7830000A784,
+        0xA7850000A786,
+        0xA7870000A789,
+        0xA78C0000A78D,
+        0xA78E0000A790,
+        0xA7910000A792,
+        0xA7930000A796,
+        0xA7970000A798,
+        0xA7990000A79A,
+        0xA79B0000A79C,
+        0xA79D0000A79E,
+        0xA79F0000A7A0,
+        0xA7A10000A7A2,
+        0xA7A30000A7A4,
+        0xA7A50000A7A6,
+        0xA7A70000A7A8,
+        0xA7A90000A7AA,
+        0xA7AF0000A7B0,
+        0xA7B50000A7B6,
+        0xA7B70000A7B8,
+        0xA7B90000A7BA,
+        0xA7BB0000A7BC,
+        0xA7BD0000A7BE,
+        0xA7BF0000A7C0,
+        0xA7C10000A7C2,
+        0xA7C30000A7C4,
+        0xA7C80000A7C9,
+        0xA7CA0000A7CB,
+        0xA7D10000A7D2,
+        0xA7D30000A7D4,
+        0xA7D50000A7D6,
+        0xA7D70000A7D8,
+        0xA7D90000A7DA,
+        0xA7F60000A7F8,
+        0xA7FA0000A828,
+        0xA82C0000A82D,
+        0xA8400000A874,
+        0xA8800000A8C6,
+        0xA8D00000A8DA,
+        0xA8E00000A8F8,
+        0xA8FB0000A8FC,
+        0xA8FD0000A92E,
+        0xA9300000A954,
+        0xA9800000A9C1,
+        0xA9CF0000A9DA,
+        0xA9E00000A9FF,
+        0xAA000000AA37,
+        0xAA400000AA4E,
+        0xAA500000AA5A,
+        0xAA600000AA77,
+        0xAA7A0000AAC3,
+        0xAADB0000AADE,
+        0xAAE00000AAF0,
+        0xAAF20000AAF7,
+        0xAB010000AB07,
+        0xAB090000AB0F,
+        0xAB110000AB17,
+        0xAB200000AB27,
+        0xAB280000AB2F,
+        0xAB300000AB5B,
+        0xAB600000AB69,
+        0xABC00000ABEB,
+        0xABEC0000ABEE,
+        0xABF00000ABFA,
+        0xAC000000D7A4,
+        0xFA0E0000FA10,
+        0xFA110000FA12,
+        0xFA130000FA15,
+        0xFA1F0000FA20,
+        0xFA210000FA22,
+        0xFA230000FA25,
+        0xFA270000FA2A,
+        0xFB1E0000FB1F,
+        0xFE200000FE30,
+        0xFE730000FE74,
+        0x100000001000C,
+        0x1000D00010027,
+        0x100280001003B,
+        0x1003C0001003E,
+        0x1003F0001004E,
+        0x100500001005E,
+        0x10080000100FB,
+        0x101FD000101FE,
+        0x102800001029D,
+        0x102A0000102D1,
+        0x102E0000102E1,
         0x1030000010320,
-        0x1032d00010341,
-        0x103420001034a,
-        0x103500001037b,
-        0x103800001039e,
-        0x103a0000103c4,
-        0x103c8000103d0,
-        0x104280001049e,
-        0x104a0000104aa,
-        0x104d8000104fc,
+        0x1032D00010341,
+        0x103420001034A,
+        0x103500001037B,
+        0x103800001039E,
+        0x103A0000103C4,
+        0x103C8000103D0,
+        0x104280001049E,
+        0x104A0000104AA,
+        0x104D8000104FC,
         0x1050000010528,
         0x1053000010564,
-        0x10597000105a2,
-        0x105a3000105b2,
-        0x105b3000105ba,
-        0x105bb000105bd,
+        0x10597000105A2,
+        0x105A3000105B2,
+        0x105B3000105BA,
+        0x105BB000105BD,
         0x1060000010737,
         0x1074000010756,
         0x1076000010768,
         0x1078000010781,
         0x1080000010806,
         0x1080800010809,
-        0x1080a00010836,
+        0x1080A00010836,
         0x1083700010839,
-        0x1083c0001083d,
-        0x1083f00010856,
+        0x1083C0001083D,
+        0x1083F00010856,
         0x1086000010877,
-        0x108800001089f,
-        0x108e0000108f3,
-        0x108f4000108f6,
+        0x108800001089F,
+        0x108E0000108F3,
+        0x108F4000108F6,
         0x1090000010916,
-        0x109200001093a,
-        0x10980000109b8,
-        0x109be000109c0,
-        0x10a0000010a04,
-        0x10a0500010a07,
-        0x10a0c00010a14,
-        0x10a1500010a18,
-        0x10a1900010a36,
-        0x10a3800010a3b,
-        0x10a3f00010a40,
-        0x10a6000010a7d,
-        0x10a8000010a9d,
-        0x10ac000010ac8,
-        0x10ac900010ae7,
-        0x10b0000010b36,
-        0x10b4000010b56,
-        0x10b6000010b73,
-        0x10b8000010b92,
-        0x10c0000010c49,
-        0x10cc000010cf3,
-        0x10d0000010d28,
-        0x10d3000010d3a,
-        0x10e8000010eaa,
-        0x10eab00010ead,
-        0x10eb000010eb2,
-        0x10efd00010f1d,
-        0x10f2700010f28,
-        0x10f3000010f51,
-        0x10f7000010f86,
-        0x10fb000010fc5,
-        0x10fe000010ff7,
+        0x109200001093A,
+        0x10980000109B8,
+        0x109BE000109C0,
+        0x10A0000010A04,
+        0x10A0500010A07,
+        0x10A0C00010A14,
+        0x10A1500010A18,
+        0x10A1900010A36,
+        0x10A3800010A3B,
+        0x10A3F00010A40,
+        0x10A6000010A7D,
+        0x10A8000010A9D,
+        0x10AC000010AC8,
+        0x10AC900010AE7,
+        0x10B0000010B36,
+        0x10B4000010B56,
+        0x10B6000010B73,
+        0x10B8000010B92,
+        0x10C0000010C49,
+        0x10CC000010CF3,
+        0x10D0000010D28,
+        0x10D3000010D3A,
+        0x10E8000010EAA,
+        0x10EAB00010EAD,
+        0x10EB000010EB2,
+        0x10EFD00010F1D,
+        0x10F2700010F28,
+        0x10F3000010F51,
+        0x10F7000010F86,
+        0x10FB000010FC5,
+        0x10FE000010FF7,
         0x1100000011047,
         0x1106600011076,
-        0x1107f000110bb,
-        0x110c2000110c3,
-        0x110d0000110e9,
-        0x110f0000110fa,
+        0x1107F000110BB,
+        0x110C2000110C3,
+        0x110D0000110E9,
+        0x110F0000110FA,
         0x1110000011135,
         0x1113600011140,
         0x1114400011148,
         0x1115000011174,
         0x1117600011177,
-        0x11180000111c5,
-        0x111c9000111cd,
-        0x111ce000111db,
-        0x111dc000111dd,
+        0x11180000111C5,
+        0x111C9000111CD,
+        0x111CE000111DB,
+        0x111DC000111DD,
         0x1120000011212,
         0x1121300011238,
-        0x1123e00011242,
+        0x1123E00011242,
         0x1128000011287,
         0x1128800011289,
-        0x1128a0001128e,
-        0x1128f0001129e,
-        0x1129f000112a9,
-        0x112b0000112eb,
-        0x112f0000112fa,
+        0x1128A0001128E,
+        0x1128F0001129E,
+        0x1129F000112A9,
+        0x112B0000112EB,
+        0x112F0000112FA,
         0x1130000011304,
-        0x113050001130d,
-        0x1130f00011311,
+        0x113050001130D,
+        0x1130F00011311,
         0x1131300011329,
-        0x1132a00011331,
+        0x1132A00011331,
         0x1133200011334,
-        0x113350001133a,
-        0x1133b00011345,
+        0x113350001133A,
+        0x1133B00011345,
         0x1134700011349,
-        0x1134b0001134e,
+        0x1134B0001134E,
         0x1135000011351,
         0x1135700011358,
-        0x1135d00011364,
-        0x113660001136d,
+        0x1135D00011364,
+        0x113660001136D,
         0x1137000011375,
-        0x114000001144b,
-        0x114500001145a,
-        0x1145e00011462,
-        0x11480000114c6,
-        0x114c7000114c8,
-        0x114d0000114da,
-        0x11580000115b6,
-        0x115b8000115c1,
-        0x115d8000115de,
+        0x114000001144B,
+        0x114500001145A,
+        0x1145E00011462,
+        0x11480000114C6,
+        0x114C7000114C8,
+        0x114D0000114DA,
+        0x11580000115B6,
+        0x115B8000115C1,
+        0x115D8000115DE,
         0x1160000011641,
         0x1164400011645,
-        0x116500001165a,
-        0x11680000116b9,
-        0x116c0000116ca,
-        0x117000001171b,
-        0x1171d0001172c,
-        0x117300001173a,
+        0x116500001165A,
+        0x11680000116B9,
+        0x116C0000116CA,
+        0x117000001171B,
+        0x1171D0001172C,
+        0x117300001173A,
         0x1174000011747,
-        0x118000001183b,
-        0x118c0000118ea,
-        0x118ff00011907,
-        0x119090001190a,
-        0x1190c00011914,
+        0x118000001183B,
+        0x118C0000118EA,
+        0x118FF00011907,
+        0x119090001190A,
+        0x1190C00011914,
         0x1191500011917,
         0x1191800011936,
         0x1193700011939,
-        0x1193b00011944,
-        0x119500001195a,
-        0x119a0000119a8,
-        0x119aa000119d8,
-        0x119da000119e2,
-        0x119e3000119e5,
-        0x11a0000011a3f,
-        0x11a4700011a48,
-        0x11a5000011a9a,
-        0x11a9d00011a9e,
-        0x11ab000011af9,
-        0x11c0000011c09,
-        0x11c0a00011c37,
-        0x11c3800011c41,
-        0x11c5000011c5a,
-        0x11c7200011c90,
-        0x11c9200011ca8,
-        0x11ca900011cb7,
-        0x11d0000011d07,
-        0x11d0800011d0a,
-        0x11d0b00011d37,
-        0x11d3a00011d3b,
-        0x11d3c00011d3e,
-        0x11d3f00011d48,
-        0x11d5000011d5a,
-        0x11d6000011d66,
-        0x11d6700011d69,
-        0x11d6a00011d8f,
-        0x11d9000011d92,
-        0x11d9300011d99,
-        0x11da000011daa,
-        0x11ee000011ef7,
-        0x11f0000011f11,
-        0x11f1200011f3b,
-        0x11f3e00011f43,
-        0x11f5000011f5a,
-        0x11fb000011fb1,
-        0x120000001239a,
+        0x1193B00011944,
+        0x119500001195A,
+        0x119A0000119A8,
+        0x119AA000119D8,
+        0x119DA000119E2,
+        0x119E3000119E5,
+        0x11A0000011A3F,
+        0x11A4700011A48,
+        0x11A5000011A9A,
+        0x11A9D00011A9E,
+        0x11AB000011AF9,
+        0x11C0000011C09,
+        0x11C0A00011C37,
+        0x11C3800011C41,
+        0x11C5000011C5A,
+        0x11C7200011C90,
+        0x11C9200011CA8,
+        0x11CA900011CB7,
+        0x11D0000011D07,
+        0x11D0800011D0A,
+        0x11D0B00011D37,
+        0x11D3A00011D3B,
+        0x11D3C00011D3E,
+        0x11D3F00011D48,
+        0x11D5000011D5A,
+        0x11D6000011D66,
+        0x11D6700011D69,
+        0x11D6A00011D8F,
+        0x11D9000011D92,
+        0x11D9300011D99,
+        0x11DA000011DAA,
+        0x11EE000011EF7,
+        0x11F0000011F11,
+        0x11F1200011F3B,
+        0x11F3E00011F43,
+        0x11F5000011F5A,
+        0x11FB000011FB1,
+        0x120000001239A,
         0x1248000012544,
-        0x12f9000012ff1,
+        0x12F9000012FF1,
         0x1300000013430,
         0x1344000013456,
         0x1440000014647,
-        0x1680000016a39,
-        0x16a4000016a5f,
-        0x16a6000016a6a,
-        0x16a7000016abf,
-        0x16ac000016aca,
-        0x16ad000016aee,
-        0x16af000016af5,
-        0x16b0000016b37,
-        0x16b4000016b44,
-        0x16b5000016b5a,
-        0x16b6300016b78,
-        0x16b7d00016b90,
-        0x16e6000016e80,
-        0x16f0000016f4b,
-        0x16f4f00016f88,
-        0x16f8f00016fa0,
-        0x16fe000016fe2,
-        0x16fe300016fe5,
-        0x16ff000016ff2,
-        0x17000000187f8,
-        0x1880000018cd6,
-        0x18d0000018d09,
-        0x1aff00001aff4,
-        0x1aff50001affc,
-        0x1affd0001afff,
-        0x1b0000001b123,
-        0x1b1320001b133,
-        0x1b1500001b153,
-        0x1b1550001b156,
-        0x1b1640001b168,
-        0x1b1700001b2fc,
-        0x1bc000001bc6b,
-        0x1bc700001bc7d,
-        0x1bc800001bc89,
-        0x1bc900001bc9a,
-        0x1bc9d0001bc9f,
-        0x1cf000001cf2e,
-        0x1cf300001cf47,
-        0x1da000001da37,
-        0x1da3b0001da6d,
-        0x1da750001da76,
-        0x1da840001da85,
-        0x1da9b0001daa0,
-        0x1daa10001dab0,
-        0x1df000001df1f,
-        0x1df250001df2b,
-        0x1e0000001e007,
-        0x1e0080001e019,
-        0x1e01b0001e022,
-        0x1e0230001e025,
-        0x1e0260001e02b,
-        0x1e08f0001e090,
-        0x1e1000001e12d,
-        0x1e1300001e13e,
-        0x1e1400001e14a,
-        0x1e14e0001e14f,
-        0x1e2900001e2af,
-        0x1e2c00001e2fa,
-        0x1e4d00001e4fa,
-        0x1e7e00001e7e7,
-        0x1e7e80001e7ec,
-        0x1e7ed0001e7ef,
-        0x1e7f00001e7ff,
-        0x1e8000001e8c5,
-        0x1e8d00001e8d7,
-        0x1e9220001e94c,
-        0x1e9500001e95a,
-        0x200000002a6e0,
-        0x2a7000002b73a,
-        0x2b7400002b81e,
-        0x2b8200002cea2,
-        0x2ceb00002ebe1,
-        0x2ebf00002ee5e,
-        0x300000003134b,
-        0x31350000323b0,
+        0x1680000016A39,
+        0x16A4000016A5F,
+        0x16A6000016A6A,
+        0x16A7000016ABF,
+        0x16AC000016ACA,
+        0x16AD000016AEE,
+        0x16AF000016AF5,
+        0x16B0000016B37,
+        0x16B4000016B44,
+        0x16B5000016B5A,
+        0x16B6300016B78,
+        0x16B7D00016B90,
+        0x16E6000016E80,
+        0x16F0000016F4B,
+        0x16F4F00016F88,
+        0x16F8F00016FA0,
+        0x16FE000016FE2,
+        0x16FE300016FE5,
+        0x16FF000016FF2,
+        0x17000000187F8,
+        0x1880000018CD6,
+        0x18D0000018D09,
+        0x1AFF00001AFF4,
+        0x1AFF50001AFFC,
+        0x1AFFD0001AFFF,
+        0x1B0000001B123,
+        0x1B1320001B133,
+        0x1B1500001B153,
+        0x1B1550001B156,
+        0x1B1640001B168,
+        0x1B1700001B2FC,
+        0x1BC000001BC6B,
+        0x1BC700001BC7D,
+        0x1BC800001BC89,
+        0x1BC900001BC9A,
+        0x1BC9D0001BC9F,
+        0x1CF000001CF2E,
+        0x1CF300001CF47,
+        0x1DA000001DA37,
+        0x1DA3B0001DA6D,
+        0x1DA750001DA76,
+        0x1DA840001DA85,
+        0x1DA9B0001DAA0,
+        0x1DAA10001DAB0,
+        0x1DF000001DF1F,
+        0x1DF250001DF2B,
+        0x1E0000001E007,
+        0x1E0080001E019,
+        0x1E01B0001E022,
+        0x1E0230001E025,
+        0x1E0260001E02B,
+        0x1E08F0001E090,
+        0x1E1000001E12D,
+        0x1E1300001E13E,
+        0x1E1400001E14A,
+        0x1E14E0001E14F,
+        0x1E2900001E2AF,
+        0x1E2C00001E2FA,
+        0x1E4D00001E4FA,
+        0x1E7E00001E7E7,
+        0x1E7E80001E7EC,
+        0x1E7ED0001E7EF,
+        0x1E7F00001E7FF,
+        0x1E8000001E8C5,
+        0x1E8D00001E8D7,
+        0x1E9220001E94C,
+        0x1E9500001E95A,
+        0x200000002A6E0,
+        0x2A7000002B73A,
+        0x2B7400002B81E,
+        0x2B8200002CEA2,
+        0x2CEB00002EBE1,
+        0x2EBF00002EE5E,
+        0x300000003134B,
+        0x31350000323B0,
     ),
-    'CONTEXTJ': (
-        0x200c0000200e,
-    ),
-    'CONTEXTO': (
-        0xb7000000b8,
+    "CONTEXTJ": (0x200C0000200E,),
+    "CONTEXTO": (
+        0xB7000000B8,
         0x37500000376,
-        0x5f3000005f5,
-        0x6600000066a,
-        0x6f0000006fa,
-        0x30fb000030fc,
+        0x5F3000005F5,
+        0x6600000066A,
+        0x6F0000006FA,
+        0x30FB000030FC,
     ),
 }
diff --git a/src/pip/_vendor/idna/intranges.py b/src/pip/_vendor/idna/intranges.py
index 6a43b047534..7bfaa8d80d7 100644
--- a/src/pip/_vendor/idna/intranges.py
+++ b/src/pip/_vendor/idna/intranges.py
@@ -8,6 +8,7 @@
 import bisect
 from typing import List, Tuple
 
+
 def intranges_from_list(list_: List[int]) -> Tuple[int, ...]:
     """Represent a list of integers as a sequence of ranges:
     ((start_0, end_0), (start_1, end_1), ...), such that the original
@@ -20,18 +21,20 @@ def intranges_from_list(list_: List[int]) -> Tuple[int, ...]:
     ranges = []
     last_write = -1
     for i in range(len(sorted_list)):
-        if i+1 < len(sorted_list):
-            if sorted_list[i] == sorted_list[i+1]-1:
+        if i + 1 < len(sorted_list):
+            if sorted_list[i] == sorted_list[i + 1] - 1:
                 continue
-        current_range = sorted_list[last_write+1:i+1]
+        current_range = sorted_list[last_write + 1 : i + 1]
         ranges.append(_encode_range(current_range[0], current_range[-1] + 1))
         last_write = i
 
     return tuple(ranges)
 
+
 def _encode_range(start: int, end: int) -> int:
     return (start << 32) | end
 
+
 def _decode_range(r: int) -> Tuple[int, int]:
     return (r >> 32), (r & ((1 << 32) - 1))
 
@@ -43,7 +46,7 @@ def intranges_contain(int_: int, ranges: Tuple[int, ...]) -> bool:
     # we could be immediately ahead of a tuple (start, end)
     # with start < int_ <= end
     if pos > 0:
-        left, right = _decode_range(ranges[pos-1])
+        left, right = _decode_range(ranges[pos - 1])
         if left <= int_ < right:
             return True
     # or we could be immediately behind a tuple (int_, end)
diff --git a/src/pip/_vendor/idna/package_data.py b/src/pip/_vendor/idna/package_data.py
index ed811133633..514ff7e2e68 100644
--- a/src/pip/_vendor/idna/package_data.py
+++ b/src/pip/_vendor/idna/package_data.py
@@ -1,2 +1 @@
-__version__ = '3.7'
-
+__version__ = "3.10"
diff --git a/src/pip/_vendor/idna/uts46data.py b/src/pip/_vendor/idna/uts46data.py
index 6a1eddbfd75..eb894327410 100644
--- a/src/pip/_vendor/idna/uts46data.py
+++ b/src/pip/_vendor/idna/uts46data.py
@@ -3,8515 +3,8598 @@
 
 from typing import List, Tuple, Union
 
-
 """IDNA Mapping Table from UTS46."""
 
 
-__version__ = '15.1.0'
+__version__ = "15.1.0"
+
+
 def _seg_0() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x0, '3'),
-    (0x1, '3'),
-    (0x2, '3'),
-    (0x3, '3'),
-    (0x4, '3'),
-    (0x5, '3'),
-    (0x6, '3'),
-    (0x7, '3'),
-    (0x8, '3'),
-    (0x9, '3'),
-    (0xA, '3'),
-    (0xB, '3'),
-    (0xC, '3'),
-    (0xD, '3'),
-    (0xE, '3'),
-    (0xF, '3'),
-    (0x10, '3'),
-    (0x11, '3'),
-    (0x12, '3'),
-    (0x13, '3'),
-    (0x14, '3'),
-    (0x15, '3'),
-    (0x16, '3'),
-    (0x17, '3'),
-    (0x18, '3'),
-    (0x19, '3'),
-    (0x1A, '3'),
-    (0x1B, '3'),
-    (0x1C, '3'),
-    (0x1D, '3'),
-    (0x1E, '3'),
-    (0x1F, '3'),
-    (0x20, '3'),
-    (0x21, '3'),
-    (0x22, '3'),
-    (0x23, '3'),
-    (0x24, '3'),
-    (0x25, '3'),
-    (0x26, '3'),
-    (0x27, '3'),
-    (0x28, '3'),
-    (0x29, '3'),
-    (0x2A, '3'),
-    (0x2B, '3'),
-    (0x2C, '3'),
-    (0x2D, 'V'),
-    (0x2E, 'V'),
-    (0x2F, '3'),
-    (0x30, 'V'),
-    (0x31, 'V'),
-    (0x32, 'V'),
-    (0x33, 'V'),
-    (0x34, 'V'),
-    (0x35, 'V'),
-    (0x36, 'V'),
-    (0x37, 'V'),
-    (0x38, 'V'),
-    (0x39, 'V'),
-    (0x3A, '3'),
-    (0x3B, '3'),
-    (0x3C, '3'),
-    (0x3D, '3'),
-    (0x3E, '3'),
-    (0x3F, '3'),
-    (0x40, '3'),
-    (0x41, 'M', 'a'),
-    (0x42, 'M', 'b'),
-    (0x43, 'M', 'c'),
-    (0x44, 'M', 'd'),
-    (0x45, 'M', 'e'),
-    (0x46, 'M', 'f'),
-    (0x47, 'M', 'g'),
-    (0x48, 'M', 'h'),
-    (0x49, 'M', 'i'),
-    (0x4A, 'M', 'j'),
-    (0x4B, 'M', 'k'),
-    (0x4C, 'M', 'l'),
-    (0x4D, 'M', 'm'),
-    (0x4E, 'M', 'n'),
-    (0x4F, 'M', 'o'),
-    (0x50, 'M', 'p'),
-    (0x51, 'M', 'q'),
-    (0x52, 'M', 'r'),
-    (0x53, 'M', 's'),
-    (0x54, 'M', 't'),
-    (0x55, 'M', 'u'),
-    (0x56, 'M', 'v'),
-    (0x57, 'M', 'w'),
-    (0x58, 'M', 'x'),
-    (0x59, 'M', 'y'),
-    (0x5A, 'M', 'z'),
-    (0x5B, '3'),
-    (0x5C, '3'),
-    (0x5D, '3'),
-    (0x5E, '3'),
-    (0x5F, '3'),
-    (0x60, '3'),
-    (0x61, 'V'),
-    (0x62, 'V'),
-    (0x63, 'V'),
+        (0x0, "3"),
+        (0x1, "3"),
+        (0x2, "3"),
+        (0x3, "3"),
+        (0x4, "3"),
+        (0x5, "3"),
+        (0x6, "3"),
+        (0x7, "3"),
+        (0x8, "3"),
+        (0x9, "3"),
+        (0xA, "3"),
+        (0xB, "3"),
+        (0xC, "3"),
+        (0xD, "3"),
+        (0xE, "3"),
+        (0xF, "3"),
+        (0x10, "3"),
+        (0x11, "3"),
+        (0x12, "3"),
+        (0x13, "3"),
+        (0x14, "3"),
+        (0x15, "3"),
+        (0x16, "3"),
+        (0x17, "3"),
+        (0x18, "3"),
+        (0x19, "3"),
+        (0x1A, "3"),
+        (0x1B, "3"),
+        (0x1C, "3"),
+        (0x1D, "3"),
+        (0x1E, "3"),
+        (0x1F, "3"),
+        (0x20, "3"),
+        (0x21, "3"),
+        (0x22, "3"),
+        (0x23, "3"),
+        (0x24, "3"),
+        (0x25, "3"),
+        (0x26, "3"),
+        (0x27, "3"),
+        (0x28, "3"),
+        (0x29, "3"),
+        (0x2A, "3"),
+        (0x2B, "3"),
+        (0x2C, "3"),
+        (0x2D, "V"),
+        (0x2E, "V"),
+        (0x2F, "3"),
+        (0x30, "V"),
+        (0x31, "V"),
+        (0x32, "V"),
+        (0x33, "V"),
+        (0x34, "V"),
+        (0x35, "V"),
+        (0x36, "V"),
+        (0x37, "V"),
+        (0x38, "V"),
+        (0x39, "V"),
+        (0x3A, "3"),
+        (0x3B, "3"),
+        (0x3C, "3"),
+        (0x3D, "3"),
+        (0x3E, "3"),
+        (0x3F, "3"),
+        (0x40, "3"),
+        (0x41, "M", "a"),
+        (0x42, "M", "b"),
+        (0x43, "M", "c"),
+        (0x44, "M", "d"),
+        (0x45, "M", "e"),
+        (0x46, "M", "f"),
+        (0x47, "M", "g"),
+        (0x48, "M", "h"),
+        (0x49, "M", "i"),
+        (0x4A, "M", "j"),
+        (0x4B, "M", "k"),
+        (0x4C, "M", "l"),
+        (0x4D, "M", "m"),
+        (0x4E, "M", "n"),
+        (0x4F, "M", "o"),
+        (0x50, "M", "p"),
+        (0x51, "M", "q"),
+        (0x52, "M", "r"),
+        (0x53, "M", "s"),
+        (0x54, "M", "t"),
+        (0x55, "M", "u"),
+        (0x56, "M", "v"),
+        (0x57, "M", "w"),
+        (0x58, "M", "x"),
+        (0x59, "M", "y"),
+        (0x5A, "M", "z"),
+        (0x5B, "3"),
+        (0x5C, "3"),
+        (0x5D, "3"),
+        (0x5E, "3"),
+        (0x5F, "3"),
+        (0x60, "3"),
+        (0x61, "V"),
+        (0x62, "V"),
+        (0x63, "V"),
     ]
 
+
 def _seg_1() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x64, 'V'),
-    (0x65, 'V'),
-    (0x66, 'V'),
-    (0x67, 'V'),
-    (0x68, 'V'),
-    (0x69, 'V'),
-    (0x6A, 'V'),
-    (0x6B, 'V'),
-    (0x6C, 'V'),
-    (0x6D, 'V'),
-    (0x6E, 'V'),
-    (0x6F, 'V'),
-    (0x70, 'V'),
-    (0x71, 'V'),
-    (0x72, 'V'),
-    (0x73, 'V'),
-    (0x74, 'V'),
-    (0x75, 'V'),
-    (0x76, 'V'),
-    (0x77, 'V'),
-    (0x78, 'V'),
-    (0x79, 'V'),
-    (0x7A, 'V'),
-    (0x7B, '3'),
-    (0x7C, '3'),
-    (0x7D, '3'),
-    (0x7E, '3'),
-    (0x7F, '3'),
-    (0x80, 'X'),
-    (0x81, 'X'),
-    (0x82, 'X'),
-    (0x83, 'X'),
-    (0x84, 'X'),
-    (0x85, 'X'),
-    (0x86, 'X'),
-    (0x87, 'X'),
-    (0x88, 'X'),
-    (0x89, 'X'),
-    (0x8A, 'X'),
-    (0x8B, 'X'),
-    (0x8C, 'X'),
-    (0x8D, 'X'),
-    (0x8E, 'X'),
-    (0x8F, 'X'),
-    (0x90, 'X'),
-    (0x91, 'X'),
-    (0x92, 'X'),
-    (0x93, 'X'),
-    (0x94, 'X'),
-    (0x95, 'X'),
-    (0x96, 'X'),
-    (0x97, 'X'),
-    (0x98, 'X'),
-    (0x99, 'X'),
-    (0x9A, 'X'),
-    (0x9B, 'X'),
-    (0x9C, 'X'),
-    (0x9D, 'X'),
-    (0x9E, 'X'),
-    (0x9F, 'X'),
-    (0xA0, '3', ' '),
-    (0xA1, 'V'),
-    (0xA2, 'V'),
-    (0xA3, 'V'),
-    (0xA4, 'V'),
-    (0xA5, 'V'),
-    (0xA6, 'V'),
-    (0xA7, 'V'),
-    (0xA8, '3', ' ̈'),
-    (0xA9, 'V'),
-    (0xAA, 'M', 'a'),
-    (0xAB, 'V'),
-    (0xAC, 'V'),
-    (0xAD, 'I'),
-    (0xAE, 'V'),
-    (0xAF, '3', ' ̄'),
-    (0xB0, 'V'),
-    (0xB1, 'V'),
-    (0xB2, 'M', '2'),
-    (0xB3, 'M', '3'),
-    (0xB4, '3', ' ́'),
-    (0xB5, 'M', 'μ'),
-    (0xB6, 'V'),
-    (0xB7, 'V'),
-    (0xB8, '3', ' ̧'),
-    (0xB9, 'M', '1'),
-    (0xBA, 'M', 'o'),
-    (0xBB, 'V'),
-    (0xBC, 'M', '1⁄4'),
-    (0xBD, 'M', '1⁄2'),
-    (0xBE, 'M', '3⁄4'),
-    (0xBF, 'V'),
-    (0xC0, 'M', 'à'),
-    (0xC1, 'M', 'á'),
-    (0xC2, 'M', 'â'),
-    (0xC3, 'M', 'ã'),
-    (0xC4, 'M', 'ä'),
-    (0xC5, 'M', 'å'),
-    (0xC6, 'M', 'æ'),
-    (0xC7, 'M', 'ç'),
+        (0x64, "V"),
+        (0x65, "V"),
+        (0x66, "V"),
+        (0x67, "V"),
+        (0x68, "V"),
+        (0x69, "V"),
+        (0x6A, "V"),
+        (0x6B, "V"),
+        (0x6C, "V"),
+        (0x6D, "V"),
+        (0x6E, "V"),
+        (0x6F, "V"),
+        (0x70, "V"),
+        (0x71, "V"),
+        (0x72, "V"),
+        (0x73, "V"),
+        (0x74, "V"),
+        (0x75, "V"),
+        (0x76, "V"),
+        (0x77, "V"),
+        (0x78, "V"),
+        (0x79, "V"),
+        (0x7A, "V"),
+        (0x7B, "3"),
+        (0x7C, "3"),
+        (0x7D, "3"),
+        (0x7E, "3"),
+        (0x7F, "3"),
+        (0x80, "X"),
+        (0x81, "X"),
+        (0x82, "X"),
+        (0x83, "X"),
+        (0x84, "X"),
+        (0x85, "X"),
+        (0x86, "X"),
+        (0x87, "X"),
+        (0x88, "X"),
+        (0x89, "X"),
+        (0x8A, "X"),
+        (0x8B, "X"),
+        (0x8C, "X"),
+        (0x8D, "X"),
+        (0x8E, "X"),
+        (0x8F, "X"),
+        (0x90, "X"),
+        (0x91, "X"),
+        (0x92, "X"),
+        (0x93, "X"),
+        (0x94, "X"),
+        (0x95, "X"),
+        (0x96, "X"),
+        (0x97, "X"),
+        (0x98, "X"),
+        (0x99, "X"),
+        (0x9A, "X"),
+        (0x9B, "X"),
+        (0x9C, "X"),
+        (0x9D, "X"),
+        (0x9E, "X"),
+        (0x9F, "X"),
+        (0xA0, "3", " "),
+        (0xA1, "V"),
+        (0xA2, "V"),
+        (0xA3, "V"),
+        (0xA4, "V"),
+        (0xA5, "V"),
+        (0xA6, "V"),
+        (0xA7, "V"),
+        (0xA8, "3", " ̈"),
+        (0xA9, "V"),
+        (0xAA, "M", "a"),
+        (0xAB, "V"),
+        (0xAC, "V"),
+        (0xAD, "I"),
+        (0xAE, "V"),
+        (0xAF, "3", " ̄"),
+        (0xB0, "V"),
+        (0xB1, "V"),
+        (0xB2, "M", "2"),
+        (0xB3, "M", "3"),
+        (0xB4, "3", " ́"),
+        (0xB5, "M", "μ"),
+        (0xB6, "V"),
+        (0xB7, "V"),
+        (0xB8, "3", " ̧"),
+        (0xB9, "M", "1"),
+        (0xBA, "M", "o"),
+        (0xBB, "V"),
+        (0xBC, "M", "1⁄4"),
+        (0xBD, "M", "1⁄2"),
+        (0xBE, "M", "3⁄4"),
+        (0xBF, "V"),
+        (0xC0, "M", "à"),
+        (0xC1, "M", "á"),
+        (0xC2, "M", "â"),
+        (0xC3, "M", "ã"),
+        (0xC4, "M", "ä"),
+        (0xC5, "M", "å"),
+        (0xC6, "M", "æ"),
+        (0xC7, "M", "ç"),
     ]
 
+
 def _seg_2() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xC8, 'M', 'è'),
-    (0xC9, 'M', 'é'),
-    (0xCA, 'M', 'ê'),
-    (0xCB, 'M', 'ë'),
-    (0xCC, 'M', 'ì'),
-    (0xCD, 'M', 'í'),
-    (0xCE, 'M', 'î'),
-    (0xCF, 'M', 'ï'),
-    (0xD0, 'M', 'ð'),
-    (0xD1, 'M', 'ñ'),
-    (0xD2, 'M', 'ò'),
-    (0xD3, 'M', 'ó'),
-    (0xD4, 'M', 'ô'),
-    (0xD5, 'M', 'õ'),
-    (0xD6, 'M', 'ö'),
-    (0xD7, 'V'),
-    (0xD8, 'M', 'ø'),
-    (0xD9, 'M', 'ù'),
-    (0xDA, 'M', 'ú'),
-    (0xDB, 'M', 'û'),
-    (0xDC, 'M', 'ü'),
-    (0xDD, 'M', 'ý'),
-    (0xDE, 'M', 'þ'),
-    (0xDF, 'D', 'ss'),
-    (0xE0, 'V'),
-    (0xE1, 'V'),
-    (0xE2, 'V'),
-    (0xE3, 'V'),
-    (0xE4, 'V'),
-    (0xE5, 'V'),
-    (0xE6, 'V'),
-    (0xE7, 'V'),
-    (0xE8, 'V'),
-    (0xE9, 'V'),
-    (0xEA, 'V'),
-    (0xEB, 'V'),
-    (0xEC, 'V'),
-    (0xED, 'V'),
-    (0xEE, 'V'),
-    (0xEF, 'V'),
-    (0xF0, 'V'),
-    (0xF1, 'V'),
-    (0xF2, 'V'),
-    (0xF3, 'V'),
-    (0xF4, 'V'),
-    (0xF5, 'V'),
-    (0xF6, 'V'),
-    (0xF7, 'V'),
-    (0xF8, 'V'),
-    (0xF9, 'V'),
-    (0xFA, 'V'),
-    (0xFB, 'V'),
-    (0xFC, 'V'),
-    (0xFD, 'V'),
-    (0xFE, 'V'),
-    (0xFF, 'V'),
-    (0x100, 'M', 'ā'),
-    (0x101, 'V'),
-    (0x102, 'M', 'ă'),
-    (0x103, 'V'),
-    (0x104, 'M', 'ą'),
-    (0x105, 'V'),
-    (0x106, 'M', 'ć'),
-    (0x107, 'V'),
-    (0x108, 'M', 'ĉ'),
-    (0x109, 'V'),
-    (0x10A, 'M', 'ċ'),
-    (0x10B, 'V'),
-    (0x10C, 'M', 'č'),
-    (0x10D, 'V'),
-    (0x10E, 'M', 'ď'),
-    (0x10F, 'V'),
-    (0x110, 'M', 'đ'),
-    (0x111, 'V'),
-    (0x112, 'M', 'ē'),
-    (0x113, 'V'),
-    (0x114, 'M', 'ĕ'),
-    (0x115, 'V'),
-    (0x116, 'M', 'ė'),
-    (0x117, 'V'),
-    (0x118, 'M', 'ę'),
-    (0x119, 'V'),
-    (0x11A, 'M', 'ě'),
-    (0x11B, 'V'),
-    (0x11C, 'M', 'ĝ'),
-    (0x11D, 'V'),
-    (0x11E, 'M', 'ğ'),
-    (0x11F, 'V'),
-    (0x120, 'M', 'ġ'),
-    (0x121, 'V'),
-    (0x122, 'M', 'ģ'),
-    (0x123, 'V'),
-    (0x124, 'M', 'ĥ'),
-    (0x125, 'V'),
-    (0x126, 'M', 'ħ'),
-    (0x127, 'V'),
-    (0x128, 'M', 'ĩ'),
-    (0x129, 'V'),
-    (0x12A, 'M', 'ī'),
-    (0x12B, 'V'),
+        (0xC8, "M", "è"),
+        (0xC9, "M", "é"),
+        (0xCA, "M", "ê"),
+        (0xCB, "M", "ë"),
+        (0xCC, "M", "ì"),
+        (0xCD, "M", "í"),
+        (0xCE, "M", "î"),
+        (0xCF, "M", "ï"),
+        (0xD0, "M", "ð"),
+        (0xD1, "M", "ñ"),
+        (0xD2, "M", "ò"),
+        (0xD3, "M", "ó"),
+        (0xD4, "M", "ô"),
+        (0xD5, "M", "õ"),
+        (0xD6, "M", "ö"),
+        (0xD7, "V"),
+        (0xD8, "M", "ø"),
+        (0xD9, "M", "ù"),
+        (0xDA, "M", "ú"),
+        (0xDB, "M", "û"),
+        (0xDC, "M", "ü"),
+        (0xDD, "M", "ý"),
+        (0xDE, "M", "þ"),
+        (0xDF, "D", "ss"),
+        (0xE0, "V"),
+        (0xE1, "V"),
+        (0xE2, "V"),
+        (0xE3, "V"),
+        (0xE4, "V"),
+        (0xE5, "V"),
+        (0xE6, "V"),
+        (0xE7, "V"),
+        (0xE8, "V"),
+        (0xE9, "V"),
+        (0xEA, "V"),
+        (0xEB, "V"),
+        (0xEC, "V"),
+        (0xED, "V"),
+        (0xEE, "V"),
+        (0xEF, "V"),
+        (0xF0, "V"),
+        (0xF1, "V"),
+        (0xF2, "V"),
+        (0xF3, "V"),
+        (0xF4, "V"),
+        (0xF5, "V"),
+        (0xF6, "V"),
+        (0xF7, "V"),
+        (0xF8, "V"),
+        (0xF9, "V"),
+        (0xFA, "V"),
+        (0xFB, "V"),
+        (0xFC, "V"),
+        (0xFD, "V"),
+        (0xFE, "V"),
+        (0xFF, "V"),
+        (0x100, "M", "ā"),
+        (0x101, "V"),
+        (0x102, "M", "ă"),
+        (0x103, "V"),
+        (0x104, "M", "ą"),
+        (0x105, "V"),
+        (0x106, "M", "ć"),
+        (0x107, "V"),
+        (0x108, "M", "ĉ"),
+        (0x109, "V"),
+        (0x10A, "M", "ċ"),
+        (0x10B, "V"),
+        (0x10C, "M", "č"),
+        (0x10D, "V"),
+        (0x10E, "M", "ď"),
+        (0x10F, "V"),
+        (0x110, "M", "đ"),
+        (0x111, "V"),
+        (0x112, "M", "ē"),
+        (0x113, "V"),
+        (0x114, "M", "ĕ"),
+        (0x115, "V"),
+        (0x116, "M", "ė"),
+        (0x117, "V"),
+        (0x118, "M", "ę"),
+        (0x119, "V"),
+        (0x11A, "M", "ě"),
+        (0x11B, "V"),
+        (0x11C, "M", "ĝ"),
+        (0x11D, "V"),
+        (0x11E, "M", "ğ"),
+        (0x11F, "V"),
+        (0x120, "M", "ġ"),
+        (0x121, "V"),
+        (0x122, "M", "ģ"),
+        (0x123, "V"),
+        (0x124, "M", "ĥ"),
+        (0x125, "V"),
+        (0x126, "M", "ħ"),
+        (0x127, "V"),
+        (0x128, "M", "ĩ"),
+        (0x129, "V"),
+        (0x12A, "M", "ī"),
+        (0x12B, "V"),
     ]
 
+
 def _seg_3() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x12C, 'M', 'ĭ'),
-    (0x12D, 'V'),
-    (0x12E, 'M', 'į'),
-    (0x12F, 'V'),
-    (0x130, 'M', 'i̇'),
-    (0x131, 'V'),
-    (0x132, 'M', 'ij'),
-    (0x134, 'M', 'ĵ'),
-    (0x135, 'V'),
-    (0x136, 'M', 'ķ'),
-    (0x137, 'V'),
-    (0x139, 'M', 'ĺ'),
-    (0x13A, 'V'),
-    (0x13B, 'M', 'ļ'),
-    (0x13C, 'V'),
-    (0x13D, 'M', 'ľ'),
-    (0x13E, 'V'),
-    (0x13F, 'M', 'l·'),
-    (0x141, 'M', 'ł'),
-    (0x142, 'V'),
-    (0x143, 'M', 'ń'),
-    (0x144, 'V'),
-    (0x145, 'M', 'ņ'),
-    (0x146, 'V'),
-    (0x147, 'M', 'ň'),
-    (0x148, 'V'),
-    (0x149, 'M', 'ʼn'),
-    (0x14A, 'M', 'ŋ'),
-    (0x14B, 'V'),
-    (0x14C, 'M', 'ō'),
-    (0x14D, 'V'),
-    (0x14E, 'M', 'ŏ'),
-    (0x14F, 'V'),
-    (0x150, 'M', 'ő'),
-    (0x151, 'V'),
-    (0x152, 'M', 'œ'),
-    (0x153, 'V'),
-    (0x154, 'M', 'ŕ'),
-    (0x155, 'V'),
-    (0x156, 'M', 'ŗ'),
-    (0x157, 'V'),
-    (0x158, 'M', 'ř'),
-    (0x159, 'V'),
-    (0x15A, 'M', 'ś'),
-    (0x15B, 'V'),
-    (0x15C, 'M', 'ŝ'),
-    (0x15D, 'V'),
-    (0x15E, 'M', 'ş'),
-    (0x15F, 'V'),
-    (0x160, 'M', 'š'),
-    (0x161, 'V'),
-    (0x162, 'M', 'ţ'),
-    (0x163, 'V'),
-    (0x164, 'M', 'ť'),
-    (0x165, 'V'),
-    (0x166, 'M', 'ŧ'),
-    (0x167, 'V'),
-    (0x168, 'M', 'ũ'),
-    (0x169, 'V'),
-    (0x16A, 'M', 'ū'),
-    (0x16B, 'V'),
-    (0x16C, 'M', 'ŭ'),
-    (0x16D, 'V'),
-    (0x16E, 'M', 'ů'),
-    (0x16F, 'V'),
-    (0x170, 'M', 'ű'),
-    (0x171, 'V'),
-    (0x172, 'M', 'ų'),
-    (0x173, 'V'),
-    (0x174, 'M', 'ŵ'),
-    (0x175, 'V'),
-    (0x176, 'M', 'ŷ'),
-    (0x177, 'V'),
-    (0x178, 'M', 'ÿ'),
-    (0x179, 'M', 'ź'),
-    (0x17A, 'V'),
-    (0x17B, 'M', 'ż'),
-    (0x17C, 'V'),
-    (0x17D, 'M', 'ž'),
-    (0x17E, 'V'),
-    (0x17F, 'M', 's'),
-    (0x180, 'V'),
-    (0x181, 'M', 'ɓ'),
-    (0x182, 'M', 'ƃ'),
-    (0x183, 'V'),
-    (0x184, 'M', 'ƅ'),
-    (0x185, 'V'),
-    (0x186, 'M', 'ɔ'),
-    (0x187, 'M', 'ƈ'),
-    (0x188, 'V'),
-    (0x189, 'M', 'ɖ'),
-    (0x18A, 'M', 'ɗ'),
-    (0x18B, 'M', 'ƌ'),
-    (0x18C, 'V'),
-    (0x18E, 'M', 'ǝ'),
-    (0x18F, 'M', 'ə'),
-    (0x190, 'M', 'ɛ'),
-    (0x191, 'M', 'ƒ'),
-    (0x192, 'V'),
-    (0x193, 'M', 'ɠ'),
+        (0x12C, "M", "ĭ"),
+        (0x12D, "V"),
+        (0x12E, "M", "į"),
+        (0x12F, "V"),
+        (0x130, "M", "i̇"),
+        (0x131, "V"),
+        (0x132, "M", "ij"),
+        (0x134, "M", "ĵ"),
+        (0x135, "V"),
+        (0x136, "M", "ķ"),
+        (0x137, "V"),
+        (0x139, "M", "ĺ"),
+        (0x13A, "V"),
+        (0x13B, "M", "ļ"),
+        (0x13C, "V"),
+        (0x13D, "M", "ľ"),
+        (0x13E, "V"),
+        (0x13F, "M", "l·"),
+        (0x141, "M", "ł"),
+        (0x142, "V"),
+        (0x143, "M", "ń"),
+        (0x144, "V"),
+        (0x145, "M", "ņ"),
+        (0x146, "V"),
+        (0x147, "M", "ň"),
+        (0x148, "V"),
+        (0x149, "M", "ʼn"),
+        (0x14A, "M", "ŋ"),
+        (0x14B, "V"),
+        (0x14C, "M", "ō"),
+        (0x14D, "V"),
+        (0x14E, "M", "ŏ"),
+        (0x14F, "V"),
+        (0x150, "M", "ő"),
+        (0x151, "V"),
+        (0x152, "M", "œ"),
+        (0x153, "V"),
+        (0x154, "M", "ŕ"),
+        (0x155, "V"),
+        (0x156, "M", "ŗ"),
+        (0x157, "V"),
+        (0x158, "M", "ř"),
+        (0x159, "V"),
+        (0x15A, "M", "ś"),
+        (0x15B, "V"),
+        (0x15C, "M", "ŝ"),
+        (0x15D, "V"),
+        (0x15E, "M", "ş"),
+        (0x15F, "V"),
+        (0x160, "M", "š"),
+        (0x161, "V"),
+        (0x162, "M", "ţ"),
+        (0x163, "V"),
+        (0x164, "M", "ť"),
+        (0x165, "V"),
+        (0x166, "M", "ŧ"),
+        (0x167, "V"),
+        (0x168, "M", "ũ"),
+        (0x169, "V"),
+        (0x16A, "M", "ū"),
+        (0x16B, "V"),
+        (0x16C, "M", "ŭ"),
+        (0x16D, "V"),
+        (0x16E, "M", "ů"),
+        (0x16F, "V"),
+        (0x170, "M", "ű"),
+        (0x171, "V"),
+        (0x172, "M", "ų"),
+        (0x173, "V"),
+        (0x174, "M", "ŵ"),
+        (0x175, "V"),
+        (0x176, "M", "ŷ"),
+        (0x177, "V"),
+        (0x178, "M", "ÿ"),
+        (0x179, "M", "ź"),
+        (0x17A, "V"),
+        (0x17B, "M", "ż"),
+        (0x17C, "V"),
+        (0x17D, "M", "ž"),
+        (0x17E, "V"),
+        (0x17F, "M", "s"),
+        (0x180, "V"),
+        (0x181, "M", "ɓ"),
+        (0x182, "M", "ƃ"),
+        (0x183, "V"),
+        (0x184, "M", "ƅ"),
+        (0x185, "V"),
+        (0x186, "M", "ɔ"),
+        (0x187, "M", "ƈ"),
+        (0x188, "V"),
+        (0x189, "M", "ɖ"),
+        (0x18A, "M", "ɗ"),
+        (0x18B, "M", "ƌ"),
+        (0x18C, "V"),
+        (0x18E, "M", "ǝ"),
+        (0x18F, "M", "ə"),
+        (0x190, "M", "ɛ"),
+        (0x191, "M", "ƒ"),
+        (0x192, "V"),
+        (0x193, "M", "ɠ"),
     ]
 
+
 def _seg_4() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x194, 'M', 'ɣ'),
-    (0x195, 'V'),
-    (0x196, 'M', 'ɩ'),
-    (0x197, 'M', 'ɨ'),
-    (0x198, 'M', 'ƙ'),
-    (0x199, 'V'),
-    (0x19C, 'M', 'ɯ'),
-    (0x19D, 'M', 'ɲ'),
-    (0x19E, 'V'),
-    (0x19F, 'M', 'ɵ'),
-    (0x1A0, 'M', 'ơ'),
-    (0x1A1, 'V'),
-    (0x1A2, 'M', 'ƣ'),
-    (0x1A3, 'V'),
-    (0x1A4, 'M', 'ƥ'),
-    (0x1A5, 'V'),
-    (0x1A6, 'M', 'ʀ'),
-    (0x1A7, 'M', 'ƨ'),
-    (0x1A8, 'V'),
-    (0x1A9, 'M', 'ʃ'),
-    (0x1AA, 'V'),
-    (0x1AC, 'M', 'ƭ'),
-    (0x1AD, 'V'),
-    (0x1AE, 'M', 'ʈ'),
-    (0x1AF, 'M', 'ư'),
-    (0x1B0, 'V'),
-    (0x1B1, 'M', 'ʊ'),
-    (0x1B2, 'M', 'ʋ'),
-    (0x1B3, 'M', 'ƴ'),
-    (0x1B4, 'V'),
-    (0x1B5, 'M', 'ƶ'),
-    (0x1B6, 'V'),
-    (0x1B7, 'M', 'ʒ'),
-    (0x1B8, 'M', 'ƹ'),
-    (0x1B9, 'V'),
-    (0x1BC, 'M', 'ƽ'),
-    (0x1BD, 'V'),
-    (0x1C4, 'M', 'dž'),
-    (0x1C7, 'M', 'lj'),
-    (0x1CA, 'M', 'nj'),
-    (0x1CD, 'M', 'ǎ'),
-    (0x1CE, 'V'),
-    (0x1CF, 'M', 'ǐ'),
-    (0x1D0, 'V'),
-    (0x1D1, 'M', 'ǒ'),
-    (0x1D2, 'V'),
-    (0x1D3, 'M', 'ǔ'),
-    (0x1D4, 'V'),
-    (0x1D5, 'M', 'ǖ'),
-    (0x1D6, 'V'),
-    (0x1D7, 'M', 'ǘ'),
-    (0x1D8, 'V'),
-    (0x1D9, 'M', 'ǚ'),
-    (0x1DA, 'V'),
-    (0x1DB, 'M', 'ǜ'),
-    (0x1DC, 'V'),
-    (0x1DE, 'M', 'ǟ'),
-    (0x1DF, 'V'),
-    (0x1E0, 'M', 'ǡ'),
-    (0x1E1, 'V'),
-    (0x1E2, 'M', 'ǣ'),
-    (0x1E3, 'V'),
-    (0x1E4, 'M', 'ǥ'),
-    (0x1E5, 'V'),
-    (0x1E6, 'M', 'ǧ'),
-    (0x1E7, 'V'),
-    (0x1E8, 'M', 'ǩ'),
-    (0x1E9, 'V'),
-    (0x1EA, 'M', 'ǫ'),
-    (0x1EB, 'V'),
-    (0x1EC, 'M', 'ǭ'),
-    (0x1ED, 'V'),
-    (0x1EE, 'M', 'ǯ'),
-    (0x1EF, 'V'),
-    (0x1F1, 'M', 'dz'),
-    (0x1F4, 'M', 'ǵ'),
-    (0x1F5, 'V'),
-    (0x1F6, 'M', 'ƕ'),
-    (0x1F7, 'M', 'ƿ'),
-    (0x1F8, 'M', 'ǹ'),
-    (0x1F9, 'V'),
-    (0x1FA, 'M', 'ǻ'),
-    (0x1FB, 'V'),
-    (0x1FC, 'M', 'ǽ'),
-    (0x1FD, 'V'),
-    (0x1FE, 'M', 'ǿ'),
-    (0x1FF, 'V'),
-    (0x200, 'M', 'ȁ'),
-    (0x201, 'V'),
-    (0x202, 'M', 'ȃ'),
-    (0x203, 'V'),
-    (0x204, 'M', 'ȅ'),
-    (0x205, 'V'),
-    (0x206, 'M', 'ȇ'),
-    (0x207, 'V'),
-    (0x208, 'M', 'ȉ'),
-    (0x209, 'V'),
-    (0x20A, 'M', 'ȋ'),
-    (0x20B, 'V'),
-    (0x20C, 'M', 'ȍ'),
+        (0x194, "M", "ɣ"),
+        (0x195, "V"),
+        (0x196, "M", "ɩ"),
+        (0x197, "M", "ɨ"),
+        (0x198, "M", "ƙ"),
+        (0x199, "V"),
+        (0x19C, "M", "ɯ"),
+        (0x19D, "M", "ɲ"),
+        (0x19E, "V"),
+        (0x19F, "M", "ɵ"),
+        (0x1A0, "M", "ơ"),
+        (0x1A1, "V"),
+        (0x1A2, "M", "ƣ"),
+        (0x1A3, "V"),
+        (0x1A4, "M", "ƥ"),
+        (0x1A5, "V"),
+        (0x1A6, "M", "ʀ"),
+        (0x1A7, "M", "ƨ"),
+        (0x1A8, "V"),
+        (0x1A9, "M", "ʃ"),
+        (0x1AA, "V"),
+        (0x1AC, "M", "ƭ"),
+        (0x1AD, "V"),
+        (0x1AE, "M", "ʈ"),
+        (0x1AF, "M", "ư"),
+        (0x1B0, "V"),
+        (0x1B1, "M", "ʊ"),
+        (0x1B2, "M", "ʋ"),
+        (0x1B3, "M", "ƴ"),
+        (0x1B4, "V"),
+        (0x1B5, "M", "ƶ"),
+        (0x1B6, "V"),
+        (0x1B7, "M", "ʒ"),
+        (0x1B8, "M", "ƹ"),
+        (0x1B9, "V"),
+        (0x1BC, "M", "ƽ"),
+        (0x1BD, "V"),
+        (0x1C4, "M", "dž"),
+        (0x1C7, "M", "lj"),
+        (0x1CA, "M", "nj"),
+        (0x1CD, "M", "ǎ"),
+        (0x1CE, "V"),
+        (0x1CF, "M", "ǐ"),
+        (0x1D0, "V"),
+        (0x1D1, "M", "ǒ"),
+        (0x1D2, "V"),
+        (0x1D3, "M", "ǔ"),
+        (0x1D4, "V"),
+        (0x1D5, "M", "ǖ"),
+        (0x1D6, "V"),
+        (0x1D7, "M", "ǘ"),
+        (0x1D8, "V"),
+        (0x1D9, "M", "ǚ"),
+        (0x1DA, "V"),
+        (0x1DB, "M", "ǜ"),
+        (0x1DC, "V"),
+        (0x1DE, "M", "ǟ"),
+        (0x1DF, "V"),
+        (0x1E0, "M", "ǡ"),
+        (0x1E1, "V"),
+        (0x1E2, "M", "ǣ"),
+        (0x1E3, "V"),
+        (0x1E4, "M", "ǥ"),
+        (0x1E5, "V"),
+        (0x1E6, "M", "ǧ"),
+        (0x1E7, "V"),
+        (0x1E8, "M", "ǩ"),
+        (0x1E9, "V"),
+        (0x1EA, "M", "ǫ"),
+        (0x1EB, "V"),
+        (0x1EC, "M", "ǭ"),
+        (0x1ED, "V"),
+        (0x1EE, "M", "ǯ"),
+        (0x1EF, "V"),
+        (0x1F1, "M", "dz"),
+        (0x1F4, "M", "ǵ"),
+        (0x1F5, "V"),
+        (0x1F6, "M", "ƕ"),
+        (0x1F7, "M", "ƿ"),
+        (0x1F8, "M", "ǹ"),
+        (0x1F9, "V"),
+        (0x1FA, "M", "ǻ"),
+        (0x1FB, "V"),
+        (0x1FC, "M", "ǽ"),
+        (0x1FD, "V"),
+        (0x1FE, "M", "ǿ"),
+        (0x1FF, "V"),
+        (0x200, "M", "ȁ"),
+        (0x201, "V"),
+        (0x202, "M", "ȃ"),
+        (0x203, "V"),
+        (0x204, "M", "ȅ"),
+        (0x205, "V"),
+        (0x206, "M", "ȇ"),
+        (0x207, "V"),
+        (0x208, "M", "ȉ"),
+        (0x209, "V"),
+        (0x20A, "M", "ȋ"),
+        (0x20B, "V"),
+        (0x20C, "M", "ȍ"),
     ]
 
+
 def _seg_5() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x20D, 'V'),
-    (0x20E, 'M', 'ȏ'),
-    (0x20F, 'V'),
-    (0x210, 'M', 'ȑ'),
-    (0x211, 'V'),
-    (0x212, 'M', 'ȓ'),
-    (0x213, 'V'),
-    (0x214, 'M', 'ȕ'),
-    (0x215, 'V'),
-    (0x216, 'M', 'ȗ'),
-    (0x217, 'V'),
-    (0x218, 'M', 'ș'),
-    (0x219, 'V'),
-    (0x21A, 'M', 'ț'),
-    (0x21B, 'V'),
-    (0x21C, 'M', 'ȝ'),
-    (0x21D, 'V'),
-    (0x21E, 'M', 'ȟ'),
-    (0x21F, 'V'),
-    (0x220, 'M', 'ƞ'),
-    (0x221, 'V'),
-    (0x222, 'M', 'ȣ'),
-    (0x223, 'V'),
-    (0x224, 'M', 'ȥ'),
-    (0x225, 'V'),
-    (0x226, 'M', 'ȧ'),
-    (0x227, 'V'),
-    (0x228, 'M', 'ȩ'),
-    (0x229, 'V'),
-    (0x22A, 'M', 'ȫ'),
-    (0x22B, 'V'),
-    (0x22C, 'M', 'ȭ'),
-    (0x22D, 'V'),
-    (0x22E, 'M', 'ȯ'),
-    (0x22F, 'V'),
-    (0x230, 'M', 'ȱ'),
-    (0x231, 'V'),
-    (0x232, 'M', 'ȳ'),
-    (0x233, 'V'),
-    (0x23A, 'M', 'ⱥ'),
-    (0x23B, 'M', 'ȼ'),
-    (0x23C, 'V'),
-    (0x23D, 'M', 'ƚ'),
-    (0x23E, 'M', 'ⱦ'),
-    (0x23F, 'V'),
-    (0x241, 'M', 'ɂ'),
-    (0x242, 'V'),
-    (0x243, 'M', 'ƀ'),
-    (0x244, 'M', 'ʉ'),
-    (0x245, 'M', 'ʌ'),
-    (0x246, 'M', 'ɇ'),
-    (0x247, 'V'),
-    (0x248, 'M', 'ɉ'),
-    (0x249, 'V'),
-    (0x24A, 'M', 'ɋ'),
-    (0x24B, 'V'),
-    (0x24C, 'M', 'ɍ'),
-    (0x24D, 'V'),
-    (0x24E, 'M', 'ɏ'),
-    (0x24F, 'V'),
-    (0x2B0, 'M', 'h'),
-    (0x2B1, 'M', 'ɦ'),
-    (0x2B2, 'M', 'j'),
-    (0x2B3, 'M', 'r'),
-    (0x2B4, 'M', 'ɹ'),
-    (0x2B5, 'M', 'ɻ'),
-    (0x2B6, 'M', 'ʁ'),
-    (0x2B7, 'M', 'w'),
-    (0x2B8, 'M', 'y'),
-    (0x2B9, 'V'),
-    (0x2D8, '3', ' ̆'),
-    (0x2D9, '3', ' ̇'),
-    (0x2DA, '3', ' ̊'),
-    (0x2DB, '3', ' ̨'),
-    (0x2DC, '3', ' ̃'),
-    (0x2DD, '3', ' ̋'),
-    (0x2DE, 'V'),
-    (0x2E0, 'M', 'ɣ'),
-    (0x2E1, 'M', 'l'),
-    (0x2E2, 'M', 's'),
-    (0x2E3, 'M', 'x'),
-    (0x2E4, 'M', 'ʕ'),
-    (0x2E5, 'V'),
-    (0x340, 'M', '̀'),
-    (0x341, 'M', '́'),
-    (0x342, 'V'),
-    (0x343, 'M', '̓'),
-    (0x344, 'M', '̈́'),
-    (0x345, 'M', 'ι'),
-    (0x346, 'V'),
-    (0x34F, 'I'),
-    (0x350, 'V'),
-    (0x370, 'M', 'ͱ'),
-    (0x371, 'V'),
-    (0x372, 'M', 'ͳ'),
-    (0x373, 'V'),
-    (0x374, 'M', 'ʹ'),
-    (0x375, 'V'),
-    (0x376, 'M', 'ͷ'),
-    (0x377, 'V'),
+        (0x20D, "V"),
+        (0x20E, "M", "ȏ"),
+        (0x20F, "V"),
+        (0x210, "M", "ȑ"),
+        (0x211, "V"),
+        (0x212, "M", "ȓ"),
+        (0x213, "V"),
+        (0x214, "M", "ȕ"),
+        (0x215, "V"),
+        (0x216, "M", "ȗ"),
+        (0x217, "V"),
+        (0x218, "M", "ș"),
+        (0x219, "V"),
+        (0x21A, "M", "ț"),
+        (0x21B, "V"),
+        (0x21C, "M", "ȝ"),
+        (0x21D, "V"),
+        (0x21E, "M", "ȟ"),
+        (0x21F, "V"),
+        (0x220, "M", "ƞ"),
+        (0x221, "V"),
+        (0x222, "M", "ȣ"),
+        (0x223, "V"),
+        (0x224, "M", "ȥ"),
+        (0x225, "V"),
+        (0x226, "M", "ȧ"),
+        (0x227, "V"),
+        (0x228, "M", "ȩ"),
+        (0x229, "V"),
+        (0x22A, "M", "ȫ"),
+        (0x22B, "V"),
+        (0x22C, "M", "ȭ"),
+        (0x22D, "V"),
+        (0x22E, "M", "ȯ"),
+        (0x22F, "V"),
+        (0x230, "M", "ȱ"),
+        (0x231, "V"),
+        (0x232, "M", "ȳ"),
+        (0x233, "V"),
+        (0x23A, "M", "ⱥ"),
+        (0x23B, "M", "ȼ"),
+        (0x23C, "V"),
+        (0x23D, "M", "ƚ"),
+        (0x23E, "M", "ⱦ"),
+        (0x23F, "V"),
+        (0x241, "M", "ɂ"),
+        (0x242, "V"),
+        (0x243, "M", "ƀ"),
+        (0x244, "M", "ʉ"),
+        (0x245, "M", "ʌ"),
+        (0x246, "M", "ɇ"),
+        (0x247, "V"),
+        (0x248, "M", "ɉ"),
+        (0x249, "V"),
+        (0x24A, "M", "ɋ"),
+        (0x24B, "V"),
+        (0x24C, "M", "ɍ"),
+        (0x24D, "V"),
+        (0x24E, "M", "ɏ"),
+        (0x24F, "V"),
+        (0x2B0, "M", "h"),
+        (0x2B1, "M", "ɦ"),
+        (0x2B2, "M", "j"),
+        (0x2B3, "M", "r"),
+        (0x2B4, "M", "ɹ"),
+        (0x2B5, "M", "ɻ"),
+        (0x2B6, "M", "ʁ"),
+        (0x2B7, "M", "w"),
+        (0x2B8, "M", "y"),
+        (0x2B9, "V"),
+        (0x2D8, "3", " ̆"),
+        (0x2D9, "3", " ̇"),
+        (0x2DA, "3", " ̊"),
+        (0x2DB, "3", " ̨"),
+        (0x2DC, "3", " ̃"),
+        (0x2DD, "3", " ̋"),
+        (0x2DE, "V"),
+        (0x2E0, "M", "ɣ"),
+        (0x2E1, "M", "l"),
+        (0x2E2, "M", "s"),
+        (0x2E3, "M", "x"),
+        (0x2E4, "M", "ʕ"),
+        (0x2E5, "V"),
+        (0x340, "M", "̀"),
+        (0x341, "M", "́"),
+        (0x342, "V"),
+        (0x343, "M", "̓"),
+        (0x344, "M", "̈́"),
+        (0x345, "M", "ι"),
+        (0x346, "V"),
+        (0x34F, "I"),
+        (0x350, "V"),
+        (0x370, "M", "ͱ"),
+        (0x371, "V"),
+        (0x372, "M", "ͳ"),
+        (0x373, "V"),
+        (0x374, "M", "ʹ"),
+        (0x375, "V"),
+        (0x376, "M", "ͷ"),
+        (0x377, "V"),
     ]
 
+
 def _seg_6() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x378, 'X'),
-    (0x37A, '3', ' ι'),
-    (0x37B, 'V'),
-    (0x37E, '3', ';'),
-    (0x37F, 'M', 'ϳ'),
-    (0x380, 'X'),
-    (0x384, '3', ' ́'),
-    (0x385, '3', ' ̈́'),
-    (0x386, 'M', 'ά'),
-    (0x387, 'M', '·'),
-    (0x388, 'M', 'έ'),
-    (0x389, 'M', 'ή'),
-    (0x38A, 'M', 'ί'),
-    (0x38B, 'X'),
-    (0x38C, 'M', 'ό'),
-    (0x38D, 'X'),
-    (0x38E, 'M', 'ύ'),
-    (0x38F, 'M', 'ώ'),
-    (0x390, 'V'),
-    (0x391, 'M', 'α'),
-    (0x392, 'M', 'β'),
-    (0x393, 'M', 'γ'),
-    (0x394, 'M', 'δ'),
-    (0x395, 'M', 'ε'),
-    (0x396, 'M', 'ζ'),
-    (0x397, 'M', 'η'),
-    (0x398, 'M', 'θ'),
-    (0x399, 'M', 'ι'),
-    (0x39A, 'M', 'κ'),
-    (0x39B, 'M', 'λ'),
-    (0x39C, 'M', 'μ'),
-    (0x39D, 'M', 'ν'),
-    (0x39E, 'M', 'ξ'),
-    (0x39F, 'M', 'ο'),
-    (0x3A0, 'M', 'π'),
-    (0x3A1, 'M', 'ρ'),
-    (0x3A2, 'X'),
-    (0x3A3, 'M', 'σ'),
-    (0x3A4, 'M', 'τ'),
-    (0x3A5, 'M', 'υ'),
-    (0x3A6, 'M', 'φ'),
-    (0x3A7, 'M', 'χ'),
-    (0x3A8, 'M', 'ψ'),
-    (0x3A9, 'M', 'ω'),
-    (0x3AA, 'M', 'ϊ'),
-    (0x3AB, 'M', 'ϋ'),
-    (0x3AC, 'V'),
-    (0x3C2, 'D', 'σ'),
-    (0x3C3, 'V'),
-    (0x3CF, 'M', 'ϗ'),
-    (0x3D0, 'M', 'β'),
-    (0x3D1, 'M', 'θ'),
-    (0x3D2, 'M', 'υ'),
-    (0x3D3, 'M', 'ύ'),
-    (0x3D4, 'M', 'ϋ'),
-    (0x3D5, 'M', 'φ'),
-    (0x3D6, 'M', 'π'),
-    (0x3D7, 'V'),
-    (0x3D8, 'M', 'ϙ'),
-    (0x3D9, 'V'),
-    (0x3DA, 'M', 'ϛ'),
-    (0x3DB, 'V'),
-    (0x3DC, 'M', 'ϝ'),
-    (0x3DD, 'V'),
-    (0x3DE, 'M', 'ϟ'),
-    (0x3DF, 'V'),
-    (0x3E0, 'M', 'ϡ'),
-    (0x3E1, 'V'),
-    (0x3E2, 'M', 'ϣ'),
-    (0x3E3, 'V'),
-    (0x3E4, 'M', 'ϥ'),
-    (0x3E5, 'V'),
-    (0x3E6, 'M', 'ϧ'),
-    (0x3E7, 'V'),
-    (0x3E8, 'M', 'ϩ'),
-    (0x3E9, 'V'),
-    (0x3EA, 'M', 'ϫ'),
-    (0x3EB, 'V'),
-    (0x3EC, 'M', 'ϭ'),
-    (0x3ED, 'V'),
-    (0x3EE, 'M', 'ϯ'),
-    (0x3EF, 'V'),
-    (0x3F0, 'M', 'κ'),
-    (0x3F1, 'M', 'ρ'),
-    (0x3F2, 'M', 'σ'),
-    (0x3F3, 'V'),
-    (0x3F4, 'M', 'θ'),
-    (0x3F5, 'M', 'ε'),
-    (0x3F6, 'V'),
-    (0x3F7, 'M', 'ϸ'),
-    (0x3F8, 'V'),
-    (0x3F9, 'M', 'σ'),
-    (0x3FA, 'M', 'ϻ'),
-    (0x3FB, 'V'),
-    (0x3FD, 'M', 'ͻ'),
-    (0x3FE, 'M', 'ͼ'),
-    (0x3FF, 'M', 'ͽ'),
-    (0x400, 'M', 'ѐ'),
-    (0x401, 'M', 'ё'),
-    (0x402, 'M', 'ђ'),
+        (0x378, "X"),
+        (0x37A, "3", " ι"),
+        (0x37B, "V"),
+        (0x37E, "3", ";"),
+        (0x37F, "M", "ϳ"),
+        (0x380, "X"),
+        (0x384, "3", " ́"),
+        (0x385, "3", " ̈́"),
+        (0x386, "M", "ά"),
+        (0x387, "M", "·"),
+        (0x388, "M", "έ"),
+        (0x389, "M", "ή"),
+        (0x38A, "M", "ί"),
+        (0x38B, "X"),
+        (0x38C, "M", "ό"),
+        (0x38D, "X"),
+        (0x38E, "M", "ύ"),
+        (0x38F, "M", "ώ"),
+        (0x390, "V"),
+        (0x391, "M", "α"),
+        (0x392, "M", "β"),
+        (0x393, "M", "γ"),
+        (0x394, "M", "δ"),
+        (0x395, "M", "ε"),
+        (0x396, "M", "ζ"),
+        (0x397, "M", "η"),
+        (0x398, "M", "θ"),
+        (0x399, "M", "ι"),
+        (0x39A, "M", "κ"),
+        (0x39B, "M", "λ"),
+        (0x39C, "M", "μ"),
+        (0x39D, "M", "ν"),
+        (0x39E, "M", "ξ"),
+        (0x39F, "M", "ο"),
+        (0x3A0, "M", "π"),
+        (0x3A1, "M", "ρ"),
+        (0x3A2, "X"),
+        (0x3A3, "M", "σ"),
+        (0x3A4, "M", "τ"),
+        (0x3A5, "M", "υ"),
+        (0x3A6, "M", "φ"),
+        (0x3A7, "M", "χ"),
+        (0x3A8, "M", "ψ"),
+        (0x3A9, "M", "ω"),
+        (0x3AA, "M", "ϊ"),
+        (0x3AB, "M", "ϋ"),
+        (0x3AC, "V"),
+        (0x3C2, "D", "σ"),
+        (0x3C3, "V"),
+        (0x3CF, "M", "ϗ"),
+        (0x3D0, "M", "β"),
+        (0x3D1, "M", "θ"),
+        (0x3D2, "M", "υ"),
+        (0x3D3, "M", "ύ"),
+        (0x3D4, "M", "ϋ"),
+        (0x3D5, "M", "φ"),
+        (0x3D6, "M", "π"),
+        (0x3D7, "V"),
+        (0x3D8, "M", "ϙ"),
+        (0x3D9, "V"),
+        (0x3DA, "M", "ϛ"),
+        (0x3DB, "V"),
+        (0x3DC, "M", "ϝ"),
+        (0x3DD, "V"),
+        (0x3DE, "M", "ϟ"),
+        (0x3DF, "V"),
+        (0x3E0, "M", "ϡ"),
+        (0x3E1, "V"),
+        (0x3E2, "M", "ϣ"),
+        (0x3E3, "V"),
+        (0x3E4, "M", "ϥ"),
+        (0x3E5, "V"),
+        (0x3E6, "M", "ϧ"),
+        (0x3E7, "V"),
+        (0x3E8, "M", "ϩ"),
+        (0x3E9, "V"),
+        (0x3EA, "M", "ϫ"),
+        (0x3EB, "V"),
+        (0x3EC, "M", "ϭ"),
+        (0x3ED, "V"),
+        (0x3EE, "M", "ϯ"),
+        (0x3EF, "V"),
+        (0x3F0, "M", "κ"),
+        (0x3F1, "M", "ρ"),
+        (0x3F2, "M", "σ"),
+        (0x3F3, "V"),
+        (0x3F4, "M", "θ"),
+        (0x3F5, "M", "ε"),
+        (0x3F6, "V"),
+        (0x3F7, "M", "ϸ"),
+        (0x3F8, "V"),
+        (0x3F9, "M", "σ"),
+        (0x3FA, "M", "ϻ"),
+        (0x3FB, "V"),
+        (0x3FD, "M", "ͻ"),
+        (0x3FE, "M", "ͼ"),
+        (0x3FF, "M", "ͽ"),
+        (0x400, "M", "ѐ"),
+        (0x401, "M", "ё"),
+        (0x402, "M", "ђ"),
     ]
 
+
 def _seg_7() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x403, 'M', 'ѓ'),
-    (0x404, 'M', 'є'),
-    (0x405, 'M', 'ѕ'),
-    (0x406, 'M', 'і'),
-    (0x407, 'M', 'ї'),
-    (0x408, 'M', 'ј'),
-    (0x409, 'M', 'љ'),
-    (0x40A, 'M', 'њ'),
-    (0x40B, 'M', 'ћ'),
-    (0x40C, 'M', 'ќ'),
-    (0x40D, 'M', 'ѝ'),
-    (0x40E, 'M', 'ў'),
-    (0x40F, 'M', 'џ'),
-    (0x410, 'M', 'а'),
-    (0x411, 'M', 'б'),
-    (0x412, 'M', 'в'),
-    (0x413, 'M', 'г'),
-    (0x414, 'M', 'д'),
-    (0x415, 'M', 'е'),
-    (0x416, 'M', 'ж'),
-    (0x417, 'M', 'з'),
-    (0x418, 'M', 'и'),
-    (0x419, 'M', 'й'),
-    (0x41A, 'M', 'к'),
-    (0x41B, 'M', 'л'),
-    (0x41C, 'M', 'м'),
-    (0x41D, 'M', 'н'),
-    (0x41E, 'M', 'о'),
-    (0x41F, 'M', 'п'),
-    (0x420, 'M', 'р'),
-    (0x421, 'M', 'с'),
-    (0x422, 'M', 'т'),
-    (0x423, 'M', 'у'),
-    (0x424, 'M', 'ф'),
-    (0x425, 'M', 'х'),
-    (0x426, 'M', 'ц'),
-    (0x427, 'M', 'ч'),
-    (0x428, 'M', 'ш'),
-    (0x429, 'M', 'щ'),
-    (0x42A, 'M', 'ъ'),
-    (0x42B, 'M', 'ы'),
-    (0x42C, 'M', 'ь'),
-    (0x42D, 'M', 'э'),
-    (0x42E, 'M', 'ю'),
-    (0x42F, 'M', 'я'),
-    (0x430, 'V'),
-    (0x460, 'M', 'ѡ'),
-    (0x461, 'V'),
-    (0x462, 'M', 'ѣ'),
-    (0x463, 'V'),
-    (0x464, 'M', 'ѥ'),
-    (0x465, 'V'),
-    (0x466, 'M', 'ѧ'),
-    (0x467, 'V'),
-    (0x468, 'M', 'ѩ'),
-    (0x469, 'V'),
-    (0x46A, 'M', 'ѫ'),
-    (0x46B, 'V'),
-    (0x46C, 'M', 'ѭ'),
-    (0x46D, 'V'),
-    (0x46E, 'M', 'ѯ'),
-    (0x46F, 'V'),
-    (0x470, 'M', 'ѱ'),
-    (0x471, 'V'),
-    (0x472, 'M', 'ѳ'),
-    (0x473, 'V'),
-    (0x474, 'M', 'ѵ'),
-    (0x475, 'V'),
-    (0x476, 'M', 'ѷ'),
-    (0x477, 'V'),
-    (0x478, 'M', 'ѹ'),
-    (0x479, 'V'),
-    (0x47A, 'M', 'ѻ'),
-    (0x47B, 'V'),
-    (0x47C, 'M', 'ѽ'),
-    (0x47D, 'V'),
-    (0x47E, 'M', 'ѿ'),
-    (0x47F, 'V'),
-    (0x480, 'M', 'ҁ'),
-    (0x481, 'V'),
-    (0x48A, 'M', 'ҋ'),
-    (0x48B, 'V'),
-    (0x48C, 'M', 'ҍ'),
-    (0x48D, 'V'),
-    (0x48E, 'M', 'ҏ'),
-    (0x48F, 'V'),
-    (0x490, 'M', 'ґ'),
-    (0x491, 'V'),
-    (0x492, 'M', 'ғ'),
-    (0x493, 'V'),
-    (0x494, 'M', 'ҕ'),
-    (0x495, 'V'),
-    (0x496, 'M', 'җ'),
-    (0x497, 'V'),
-    (0x498, 'M', 'ҙ'),
-    (0x499, 'V'),
-    (0x49A, 'M', 'қ'),
-    (0x49B, 'V'),
-    (0x49C, 'M', 'ҝ'),
-    (0x49D, 'V'),
+        (0x403, "M", "ѓ"),
+        (0x404, "M", "є"),
+        (0x405, "M", "ѕ"),
+        (0x406, "M", "і"),
+        (0x407, "M", "ї"),
+        (0x408, "M", "ј"),
+        (0x409, "M", "љ"),
+        (0x40A, "M", "њ"),
+        (0x40B, "M", "ћ"),
+        (0x40C, "M", "ќ"),
+        (0x40D, "M", "ѝ"),
+        (0x40E, "M", "ў"),
+        (0x40F, "M", "џ"),
+        (0x410, "M", "а"),
+        (0x411, "M", "б"),
+        (0x412, "M", "в"),
+        (0x413, "M", "г"),
+        (0x414, "M", "д"),
+        (0x415, "M", "е"),
+        (0x416, "M", "ж"),
+        (0x417, "M", "з"),
+        (0x418, "M", "и"),
+        (0x419, "M", "й"),
+        (0x41A, "M", "к"),
+        (0x41B, "M", "л"),
+        (0x41C, "M", "м"),
+        (0x41D, "M", "н"),
+        (0x41E, "M", "о"),
+        (0x41F, "M", "п"),
+        (0x420, "M", "р"),
+        (0x421, "M", "с"),
+        (0x422, "M", "т"),
+        (0x423, "M", "у"),
+        (0x424, "M", "ф"),
+        (0x425, "M", "х"),
+        (0x426, "M", "ц"),
+        (0x427, "M", "ч"),
+        (0x428, "M", "ш"),
+        (0x429, "M", "щ"),
+        (0x42A, "M", "ъ"),
+        (0x42B, "M", "ы"),
+        (0x42C, "M", "ь"),
+        (0x42D, "M", "э"),
+        (0x42E, "M", "ю"),
+        (0x42F, "M", "я"),
+        (0x430, "V"),
+        (0x460, "M", "ѡ"),
+        (0x461, "V"),
+        (0x462, "M", "ѣ"),
+        (0x463, "V"),
+        (0x464, "M", "ѥ"),
+        (0x465, "V"),
+        (0x466, "M", "ѧ"),
+        (0x467, "V"),
+        (0x468, "M", "ѩ"),
+        (0x469, "V"),
+        (0x46A, "M", "ѫ"),
+        (0x46B, "V"),
+        (0x46C, "M", "ѭ"),
+        (0x46D, "V"),
+        (0x46E, "M", "ѯ"),
+        (0x46F, "V"),
+        (0x470, "M", "ѱ"),
+        (0x471, "V"),
+        (0x472, "M", "ѳ"),
+        (0x473, "V"),
+        (0x474, "M", "ѵ"),
+        (0x475, "V"),
+        (0x476, "M", "ѷ"),
+        (0x477, "V"),
+        (0x478, "M", "ѹ"),
+        (0x479, "V"),
+        (0x47A, "M", "ѻ"),
+        (0x47B, "V"),
+        (0x47C, "M", "ѽ"),
+        (0x47D, "V"),
+        (0x47E, "M", "ѿ"),
+        (0x47F, "V"),
+        (0x480, "M", "ҁ"),
+        (0x481, "V"),
+        (0x48A, "M", "ҋ"),
+        (0x48B, "V"),
+        (0x48C, "M", "ҍ"),
+        (0x48D, "V"),
+        (0x48E, "M", "ҏ"),
+        (0x48F, "V"),
+        (0x490, "M", "ґ"),
+        (0x491, "V"),
+        (0x492, "M", "ғ"),
+        (0x493, "V"),
+        (0x494, "M", "ҕ"),
+        (0x495, "V"),
+        (0x496, "M", "җ"),
+        (0x497, "V"),
+        (0x498, "M", "ҙ"),
+        (0x499, "V"),
+        (0x49A, "M", "қ"),
+        (0x49B, "V"),
+        (0x49C, "M", "ҝ"),
+        (0x49D, "V"),
     ]
 
+
 def _seg_8() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x49E, 'M', 'ҟ'),
-    (0x49F, 'V'),
-    (0x4A0, 'M', 'ҡ'),
-    (0x4A1, 'V'),
-    (0x4A2, 'M', 'ң'),
-    (0x4A3, 'V'),
-    (0x4A4, 'M', 'ҥ'),
-    (0x4A5, 'V'),
-    (0x4A6, 'M', 'ҧ'),
-    (0x4A7, 'V'),
-    (0x4A8, 'M', 'ҩ'),
-    (0x4A9, 'V'),
-    (0x4AA, 'M', 'ҫ'),
-    (0x4AB, 'V'),
-    (0x4AC, 'M', 'ҭ'),
-    (0x4AD, 'V'),
-    (0x4AE, 'M', 'ү'),
-    (0x4AF, 'V'),
-    (0x4B0, 'M', 'ұ'),
-    (0x4B1, 'V'),
-    (0x4B2, 'M', 'ҳ'),
-    (0x4B3, 'V'),
-    (0x4B4, 'M', 'ҵ'),
-    (0x4B5, 'V'),
-    (0x4B6, 'M', 'ҷ'),
-    (0x4B7, 'V'),
-    (0x4B8, 'M', 'ҹ'),
-    (0x4B9, 'V'),
-    (0x4BA, 'M', 'һ'),
-    (0x4BB, 'V'),
-    (0x4BC, 'M', 'ҽ'),
-    (0x4BD, 'V'),
-    (0x4BE, 'M', 'ҿ'),
-    (0x4BF, 'V'),
-    (0x4C0, 'X'),
-    (0x4C1, 'M', 'ӂ'),
-    (0x4C2, 'V'),
-    (0x4C3, 'M', 'ӄ'),
-    (0x4C4, 'V'),
-    (0x4C5, 'M', 'ӆ'),
-    (0x4C6, 'V'),
-    (0x4C7, 'M', 'ӈ'),
-    (0x4C8, 'V'),
-    (0x4C9, 'M', 'ӊ'),
-    (0x4CA, 'V'),
-    (0x4CB, 'M', 'ӌ'),
-    (0x4CC, 'V'),
-    (0x4CD, 'M', 'ӎ'),
-    (0x4CE, 'V'),
-    (0x4D0, 'M', 'ӑ'),
-    (0x4D1, 'V'),
-    (0x4D2, 'M', 'ӓ'),
-    (0x4D3, 'V'),
-    (0x4D4, 'M', 'ӕ'),
-    (0x4D5, 'V'),
-    (0x4D6, 'M', 'ӗ'),
-    (0x4D7, 'V'),
-    (0x4D8, 'M', 'ә'),
-    (0x4D9, 'V'),
-    (0x4DA, 'M', 'ӛ'),
-    (0x4DB, 'V'),
-    (0x4DC, 'M', 'ӝ'),
-    (0x4DD, 'V'),
-    (0x4DE, 'M', 'ӟ'),
-    (0x4DF, 'V'),
-    (0x4E0, 'M', 'ӡ'),
-    (0x4E1, 'V'),
-    (0x4E2, 'M', 'ӣ'),
-    (0x4E3, 'V'),
-    (0x4E4, 'M', 'ӥ'),
-    (0x4E5, 'V'),
-    (0x4E6, 'M', 'ӧ'),
-    (0x4E7, 'V'),
-    (0x4E8, 'M', 'ө'),
-    (0x4E9, 'V'),
-    (0x4EA, 'M', 'ӫ'),
-    (0x4EB, 'V'),
-    (0x4EC, 'M', 'ӭ'),
-    (0x4ED, 'V'),
-    (0x4EE, 'M', 'ӯ'),
-    (0x4EF, 'V'),
-    (0x4F0, 'M', 'ӱ'),
-    (0x4F1, 'V'),
-    (0x4F2, 'M', 'ӳ'),
-    (0x4F3, 'V'),
-    (0x4F4, 'M', 'ӵ'),
-    (0x4F5, 'V'),
-    (0x4F6, 'M', 'ӷ'),
-    (0x4F7, 'V'),
-    (0x4F8, 'M', 'ӹ'),
-    (0x4F9, 'V'),
-    (0x4FA, 'M', 'ӻ'),
-    (0x4FB, 'V'),
-    (0x4FC, 'M', 'ӽ'),
-    (0x4FD, 'V'),
-    (0x4FE, 'M', 'ӿ'),
-    (0x4FF, 'V'),
-    (0x500, 'M', 'ԁ'),
-    (0x501, 'V'),
-    (0x502, 'M', 'ԃ'),
+        (0x49E, "M", "ҟ"),
+        (0x49F, "V"),
+        (0x4A0, "M", "ҡ"),
+        (0x4A1, "V"),
+        (0x4A2, "M", "ң"),
+        (0x4A3, "V"),
+        (0x4A4, "M", "ҥ"),
+        (0x4A5, "V"),
+        (0x4A6, "M", "ҧ"),
+        (0x4A7, "V"),
+        (0x4A8, "M", "ҩ"),
+        (0x4A9, "V"),
+        (0x4AA, "M", "ҫ"),
+        (0x4AB, "V"),
+        (0x4AC, "M", "ҭ"),
+        (0x4AD, "V"),
+        (0x4AE, "M", "ү"),
+        (0x4AF, "V"),
+        (0x4B0, "M", "ұ"),
+        (0x4B1, "V"),
+        (0x4B2, "M", "ҳ"),
+        (0x4B3, "V"),
+        (0x4B4, "M", "ҵ"),
+        (0x4B5, "V"),
+        (0x4B6, "M", "ҷ"),
+        (0x4B7, "V"),
+        (0x4B8, "M", "ҹ"),
+        (0x4B9, "V"),
+        (0x4BA, "M", "һ"),
+        (0x4BB, "V"),
+        (0x4BC, "M", "ҽ"),
+        (0x4BD, "V"),
+        (0x4BE, "M", "ҿ"),
+        (0x4BF, "V"),
+        (0x4C0, "X"),
+        (0x4C1, "M", "ӂ"),
+        (0x4C2, "V"),
+        (0x4C3, "M", "ӄ"),
+        (0x4C4, "V"),
+        (0x4C5, "M", "ӆ"),
+        (0x4C6, "V"),
+        (0x4C7, "M", "ӈ"),
+        (0x4C8, "V"),
+        (0x4C9, "M", "ӊ"),
+        (0x4CA, "V"),
+        (0x4CB, "M", "ӌ"),
+        (0x4CC, "V"),
+        (0x4CD, "M", "ӎ"),
+        (0x4CE, "V"),
+        (0x4D0, "M", "ӑ"),
+        (0x4D1, "V"),
+        (0x4D2, "M", "ӓ"),
+        (0x4D3, "V"),
+        (0x4D4, "M", "ӕ"),
+        (0x4D5, "V"),
+        (0x4D6, "M", "ӗ"),
+        (0x4D7, "V"),
+        (0x4D8, "M", "ә"),
+        (0x4D9, "V"),
+        (0x4DA, "M", "ӛ"),
+        (0x4DB, "V"),
+        (0x4DC, "M", "ӝ"),
+        (0x4DD, "V"),
+        (0x4DE, "M", "ӟ"),
+        (0x4DF, "V"),
+        (0x4E0, "M", "ӡ"),
+        (0x4E1, "V"),
+        (0x4E2, "M", "ӣ"),
+        (0x4E3, "V"),
+        (0x4E4, "M", "ӥ"),
+        (0x4E5, "V"),
+        (0x4E6, "M", "ӧ"),
+        (0x4E7, "V"),
+        (0x4E8, "M", "ө"),
+        (0x4E9, "V"),
+        (0x4EA, "M", "ӫ"),
+        (0x4EB, "V"),
+        (0x4EC, "M", "ӭ"),
+        (0x4ED, "V"),
+        (0x4EE, "M", "ӯ"),
+        (0x4EF, "V"),
+        (0x4F0, "M", "ӱ"),
+        (0x4F1, "V"),
+        (0x4F2, "M", "ӳ"),
+        (0x4F3, "V"),
+        (0x4F4, "M", "ӵ"),
+        (0x4F5, "V"),
+        (0x4F6, "M", "ӷ"),
+        (0x4F7, "V"),
+        (0x4F8, "M", "ӹ"),
+        (0x4F9, "V"),
+        (0x4FA, "M", "ӻ"),
+        (0x4FB, "V"),
+        (0x4FC, "M", "ӽ"),
+        (0x4FD, "V"),
+        (0x4FE, "M", "ӿ"),
+        (0x4FF, "V"),
+        (0x500, "M", "ԁ"),
+        (0x501, "V"),
+        (0x502, "M", "ԃ"),
     ]
 
+
 def _seg_9() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x503, 'V'),
-    (0x504, 'M', 'ԅ'),
-    (0x505, 'V'),
-    (0x506, 'M', 'ԇ'),
-    (0x507, 'V'),
-    (0x508, 'M', 'ԉ'),
-    (0x509, 'V'),
-    (0x50A, 'M', 'ԋ'),
-    (0x50B, 'V'),
-    (0x50C, 'M', 'ԍ'),
-    (0x50D, 'V'),
-    (0x50E, 'M', 'ԏ'),
-    (0x50F, 'V'),
-    (0x510, 'M', 'ԑ'),
-    (0x511, 'V'),
-    (0x512, 'M', 'ԓ'),
-    (0x513, 'V'),
-    (0x514, 'M', 'ԕ'),
-    (0x515, 'V'),
-    (0x516, 'M', 'ԗ'),
-    (0x517, 'V'),
-    (0x518, 'M', 'ԙ'),
-    (0x519, 'V'),
-    (0x51A, 'M', 'ԛ'),
-    (0x51B, 'V'),
-    (0x51C, 'M', 'ԝ'),
-    (0x51D, 'V'),
-    (0x51E, 'M', 'ԟ'),
-    (0x51F, 'V'),
-    (0x520, 'M', 'ԡ'),
-    (0x521, 'V'),
-    (0x522, 'M', 'ԣ'),
-    (0x523, 'V'),
-    (0x524, 'M', 'ԥ'),
-    (0x525, 'V'),
-    (0x526, 'M', 'ԧ'),
-    (0x527, 'V'),
-    (0x528, 'M', 'ԩ'),
-    (0x529, 'V'),
-    (0x52A, 'M', 'ԫ'),
-    (0x52B, 'V'),
-    (0x52C, 'M', 'ԭ'),
-    (0x52D, 'V'),
-    (0x52E, 'M', 'ԯ'),
-    (0x52F, 'V'),
-    (0x530, 'X'),
-    (0x531, 'M', 'ա'),
-    (0x532, 'M', 'բ'),
-    (0x533, 'M', 'գ'),
-    (0x534, 'M', 'դ'),
-    (0x535, 'M', 'ե'),
-    (0x536, 'M', 'զ'),
-    (0x537, 'M', 'է'),
-    (0x538, 'M', 'ը'),
-    (0x539, 'M', 'թ'),
-    (0x53A, 'M', 'ժ'),
-    (0x53B, 'M', 'ի'),
-    (0x53C, 'M', 'լ'),
-    (0x53D, 'M', 'խ'),
-    (0x53E, 'M', 'ծ'),
-    (0x53F, 'M', 'կ'),
-    (0x540, 'M', 'հ'),
-    (0x541, 'M', 'ձ'),
-    (0x542, 'M', 'ղ'),
-    (0x543, 'M', 'ճ'),
-    (0x544, 'M', 'մ'),
-    (0x545, 'M', 'յ'),
-    (0x546, 'M', 'ն'),
-    (0x547, 'M', 'շ'),
-    (0x548, 'M', 'ո'),
-    (0x549, 'M', 'չ'),
-    (0x54A, 'M', 'պ'),
-    (0x54B, 'M', 'ջ'),
-    (0x54C, 'M', 'ռ'),
-    (0x54D, 'M', 'ս'),
-    (0x54E, 'M', 'վ'),
-    (0x54F, 'M', 'տ'),
-    (0x550, 'M', 'ր'),
-    (0x551, 'M', 'ց'),
-    (0x552, 'M', 'ւ'),
-    (0x553, 'M', 'փ'),
-    (0x554, 'M', 'ք'),
-    (0x555, 'M', 'օ'),
-    (0x556, 'M', 'ֆ'),
-    (0x557, 'X'),
-    (0x559, 'V'),
-    (0x587, 'M', 'եւ'),
-    (0x588, 'V'),
-    (0x58B, 'X'),
-    (0x58D, 'V'),
-    (0x590, 'X'),
-    (0x591, 'V'),
-    (0x5C8, 'X'),
-    (0x5D0, 'V'),
-    (0x5EB, 'X'),
-    (0x5EF, 'V'),
-    (0x5F5, 'X'),
-    (0x606, 'V'),
-    (0x61C, 'X'),
-    (0x61D, 'V'),
+        (0x503, "V"),
+        (0x504, "M", "ԅ"),
+        (0x505, "V"),
+        (0x506, "M", "ԇ"),
+        (0x507, "V"),
+        (0x508, "M", "ԉ"),
+        (0x509, "V"),
+        (0x50A, "M", "ԋ"),
+        (0x50B, "V"),
+        (0x50C, "M", "ԍ"),
+        (0x50D, "V"),
+        (0x50E, "M", "ԏ"),
+        (0x50F, "V"),
+        (0x510, "M", "ԑ"),
+        (0x511, "V"),
+        (0x512, "M", "ԓ"),
+        (0x513, "V"),
+        (0x514, "M", "ԕ"),
+        (0x515, "V"),
+        (0x516, "M", "ԗ"),
+        (0x517, "V"),
+        (0x518, "M", "ԙ"),
+        (0x519, "V"),
+        (0x51A, "M", "ԛ"),
+        (0x51B, "V"),
+        (0x51C, "M", "ԝ"),
+        (0x51D, "V"),
+        (0x51E, "M", "ԟ"),
+        (0x51F, "V"),
+        (0x520, "M", "ԡ"),
+        (0x521, "V"),
+        (0x522, "M", "ԣ"),
+        (0x523, "V"),
+        (0x524, "M", "ԥ"),
+        (0x525, "V"),
+        (0x526, "M", "ԧ"),
+        (0x527, "V"),
+        (0x528, "M", "ԩ"),
+        (0x529, "V"),
+        (0x52A, "M", "ԫ"),
+        (0x52B, "V"),
+        (0x52C, "M", "ԭ"),
+        (0x52D, "V"),
+        (0x52E, "M", "ԯ"),
+        (0x52F, "V"),
+        (0x530, "X"),
+        (0x531, "M", "ա"),
+        (0x532, "M", "բ"),
+        (0x533, "M", "գ"),
+        (0x534, "M", "դ"),
+        (0x535, "M", "ե"),
+        (0x536, "M", "զ"),
+        (0x537, "M", "է"),
+        (0x538, "M", "ը"),
+        (0x539, "M", "թ"),
+        (0x53A, "M", "ժ"),
+        (0x53B, "M", "ի"),
+        (0x53C, "M", "լ"),
+        (0x53D, "M", "խ"),
+        (0x53E, "M", "ծ"),
+        (0x53F, "M", "կ"),
+        (0x540, "M", "հ"),
+        (0x541, "M", "ձ"),
+        (0x542, "M", "ղ"),
+        (0x543, "M", "ճ"),
+        (0x544, "M", "մ"),
+        (0x545, "M", "յ"),
+        (0x546, "M", "ն"),
+        (0x547, "M", "շ"),
+        (0x548, "M", "ո"),
+        (0x549, "M", "չ"),
+        (0x54A, "M", "պ"),
+        (0x54B, "M", "ջ"),
+        (0x54C, "M", "ռ"),
+        (0x54D, "M", "ս"),
+        (0x54E, "M", "վ"),
+        (0x54F, "M", "տ"),
+        (0x550, "M", "ր"),
+        (0x551, "M", "ց"),
+        (0x552, "M", "ւ"),
+        (0x553, "M", "փ"),
+        (0x554, "M", "ք"),
+        (0x555, "M", "օ"),
+        (0x556, "M", "ֆ"),
+        (0x557, "X"),
+        (0x559, "V"),
+        (0x587, "M", "եւ"),
+        (0x588, "V"),
+        (0x58B, "X"),
+        (0x58D, "V"),
+        (0x590, "X"),
+        (0x591, "V"),
+        (0x5C8, "X"),
+        (0x5D0, "V"),
+        (0x5EB, "X"),
+        (0x5EF, "V"),
+        (0x5F5, "X"),
+        (0x606, "V"),
+        (0x61C, "X"),
+        (0x61D, "V"),
     ]
 
+
 def _seg_10() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x675, 'M', 'اٴ'),
-    (0x676, 'M', 'وٴ'),
-    (0x677, 'M', 'ۇٴ'),
-    (0x678, 'M', 'يٴ'),
-    (0x679, 'V'),
-    (0x6DD, 'X'),
-    (0x6DE, 'V'),
-    (0x70E, 'X'),
-    (0x710, 'V'),
-    (0x74B, 'X'),
-    (0x74D, 'V'),
-    (0x7B2, 'X'),
-    (0x7C0, 'V'),
-    (0x7FB, 'X'),
-    (0x7FD, 'V'),
-    (0x82E, 'X'),
-    (0x830, 'V'),
-    (0x83F, 'X'),
-    (0x840, 'V'),
-    (0x85C, 'X'),
-    (0x85E, 'V'),
-    (0x85F, 'X'),
-    (0x860, 'V'),
-    (0x86B, 'X'),
-    (0x870, 'V'),
-    (0x88F, 'X'),
-    (0x898, 'V'),
-    (0x8E2, 'X'),
-    (0x8E3, 'V'),
-    (0x958, 'M', 'क़'),
-    (0x959, 'M', 'ख़'),
-    (0x95A, 'M', 'ग़'),
-    (0x95B, 'M', 'ज़'),
-    (0x95C, 'M', 'ड़'),
-    (0x95D, 'M', 'ढ़'),
-    (0x95E, 'M', 'फ़'),
-    (0x95F, 'M', 'य़'),
-    (0x960, 'V'),
-    (0x984, 'X'),
-    (0x985, 'V'),
-    (0x98D, 'X'),
-    (0x98F, 'V'),
-    (0x991, 'X'),
-    (0x993, 'V'),
-    (0x9A9, 'X'),
-    (0x9AA, 'V'),
-    (0x9B1, 'X'),
-    (0x9B2, 'V'),
-    (0x9B3, 'X'),
-    (0x9B6, 'V'),
-    (0x9BA, 'X'),
-    (0x9BC, 'V'),
-    (0x9C5, 'X'),
-    (0x9C7, 'V'),
-    (0x9C9, 'X'),
-    (0x9CB, 'V'),
-    (0x9CF, 'X'),
-    (0x9D7, 'V'),
-    (0x9D8, 'X'),
-    (0x9DC, 'M', 'ড়'),
-    (0x9DD, 'M', 'ঢ়'),
-    (0x9DE, 'X'),
-    (0x9DF, 'M', 'য়'),
-    (0x9E0, 'V'),
-    (0x9E4, 'X'),
-    (0x9E6, 'V'),
-    (0x9FF, 'X'),
-    (0xA01, 'V'),
-    (0xA04, 'X'),
-    (0xA05, 'V'),
-    (0xA0B, 'X'),
-    (0xA0F, 'V'),
-    (0xA11, 'X'),
-    (0xA13, 'V'),
-    (0xA29, 'X'),
-    (0xA2A, 'V'),
-    (0xA31, 'X'),
-    (0xA32, 'V'),
-    (0xA33, 'M', 'ਲ਼'),
-    (0xA34, 'X'),
-    (0xA35, 'V'),
-    (0xA36, 'M', 'ਸ਼'),
-    (0xA37, 'X'),
-    (0xA38, 'V'),
-    (0xA3A, 'X'),
-    (0xA3C, 'V'),
-    (0xA3D, 'X'),
-    (0xA3E, 'V'),
-    (0xA43, 'X'),
-    (0xA47, 'V'),
-    (0xA49, 'X'),
-    (0xA4B, 'V'),
-    (0xA4E, 'X'),
-    (0xA51, 'V'),
-    (0xA52, 'X'),
-    (0xA59, 'M', 'ਖ਼'),
-    (0xA5A, 'M', 'ਗ਼'),
-    (0xA5B, 'M', 'ਜ਼'),
-    (0xA5C, 'V'),
-    (0xA5D, 'X'),
+        (0x675, "M", "اٴ"),
+        (0x676, "M", "وٴ"),
+        (0x677, "M", "ۇٴ"),
+        (0x678, "M", "يٴ"),
+        (0x679, "V"),
+        (0x6DD, "X"),
+        (0x6DE, "V"),
+        (0x70E, "X"),
+        (0x710, "V"),
+        (0x74B, "X"),
+        (0x74D, "V"),
+        (0x7B2, "X"),
+        (0x7C0, "V"),
+        (0x7FB, "X"),
+        (0x7FD, "V"),
+        (0x82E, "X"),
+        (0x830, "V"),
+        (0x83F, "X"),
+        (0x840, "V"),
+        (0x85C, "X"),
+        (0x85E, "V"),
+        (0x85F, "X"),
+        (0x860, "V"),
+        (0x86B, "X"),
+        (0x870, "V"),
+        (0x88F, "X"),
+        (0x898, "V"),
+        (0x8E2, "X"),
+        (0x8E3, "V"),
+        (0x958, "M", "क़"),
+        (0x959, "M", "ख़"),
+        (0x95A, "M", "ग़"),
+        (0x95B, "M", "ज़"),
+        (0x95C, "M", "ड़"),
+        (0x95D, "M", "ढ़"),
+        (0x95E, "M", "फ़"),
+        (0x95F, "M", "य़"),
+        (0x960, "V"),
+        (0x984, "X"),
+        (0x985, "V"),
+        (0x98D, "X"),
+        (0x98F, "V"),
+        (0x991, "X"),
+        (0x993, "V"),
+        (0x9A9, "X"),
+        (0x9AA, "V"),
+        (0x9B1, "X"),
+        (0x9B2, "V"),
+        (0x9B3, "X"),
+        (0x9B6, "V"),
+        (0x9BA, "X"),
+        (0x9BC, "V"),
+        (0x9C5, "X"),
+        (0x9C7, "V"),
+        (0x9C9, "X"),
+        (0x9CB, "V"),
+        (0x9CF, "X"),
+        (0x9D7, "V"),
+        (0x9D8, "X"),
+        (0x9DC, "M", "ড়"),
+        (0x9DD, "M", "ঢ়"),
+        (0x9DE, "X"),
+        (0x9DF, "M", "য়"),
+        (0x9E0, "V"),
+        (0x9E4, "X"),
+        (0x9E6, "V"),
+        (0x9FF, "X"),
+        (0xA01, "V"),
+        (0xA04, "X"),
+        (0xA05, "V"),
+        (0xA0B, "X"),
+        (0xA0F, "V"),
+        (0xA11, "X"),
+        (0xA13, "V"),
+        (0xA29, "X"),
+        (0xA2A, "V"),
+        (0xA31, "X"),
+        (0xA32, "V"),
+        (0xA33, "M", "ਲ਼"),
+        (0xA34, "X"),
+        (0xA35, "V"),
+        (0xA36, "M", "ਸ਼"),
+        (0xA37, "X"),
+        (0xA38, "V"),
+        (0xA3A, "X"),
+        (0xA3C, "V"),
+        (0xA3D, "X"),
+        (0xA3E, "V"),
+        (0xA43, "X"),
+        (0xA47, "V"),
+        (0xA49, "X"),
+        (0xA4B, "V"),
+        (0xA4E, "X"),
+        (0xA51, "V"),
+        (0xA52, "X"),
+        (0xA59, "M", "ਖ਼"),
+        (0xA5A, "M", "ਗ਼"),
+        (0xA5B, "M", "ਜ਼"),
+        (0xA5C, "V"),
+        (0xA5D, "X"),
     ]
 
+
 def _seg_11() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xA5E, 'M', 'ਫ਼'),
-    (0xA5F, 'X'),
-    (0xA66, 'V'),
-    (0xA77, 'X'),
-    (0xA81, 'V'),
-    (0xA84, 'X'),
-    (0xA85, 'V'),
-    (0xA8E, 'X'),
-    (0xA8F, 'V'),
-    (0xA92, 'X'),
-    (0xA93, 'V'),
-    (0xAA9, 'X'),
-    (0xAAA, 'V'),
-    (0xAB1, 'X'),
-    (0xAB2, 'V'),
-    (0xAB4, 'X'),
-    (0xAB5, 'V'),
-    (0xABA, 'X'),
-    (0xABC, 'V'),
-    (0xAC6, 'X'),
-    (0xAC7, 'V'),
-    (0xACA, 'X'),
-    (0xACB, 'V'),
-    (0xACE, 'X'),
-    (0xAD0, 'V'),
-    (0xAD1, 'X'),
-    (0xAE0, 'V'),
-    (0xAE4, 'X'),
-    (0xAE6, 'V'),
-    (0xAF2, 'X'),
-    (0xAF9, 'V'),
-    (0xB00, 'X'),
-    (0xB01, 'V'),
-    (0xB04, 'X'),
-    (0xB05, 'V'),
-    (0xB0D, 'X'),
-    (0xB0F, 'V'),
-    (0xB11, 'X'),
-    (0xB13, 'V'),
-    (0xB29, 'X'),
-    (0xB2A, 'V'),
-    (0xB31, 'X'),
-    (0xB32, 'V'),
-    (0xB34, 'X'),
-    (0xB35, 'V'),
-    (0xB3A, 'X'),
-    (0xB3C, 'V'),
-    (0xB45, 'X'),
-    (0xB47, 'V'),
-    (0xB49, 'X'),
-    (0xB4B, 'V'),
-    (0xB4E, 'X'),
-    (0xB55, 'V'),
-    (0xB58, 'X'),
-    (0xB5C, 'M', 'ଡ଼'),
-    (0xB5D, 'M', 'ଢ଼'),
-    (0xB5E, 'X'),
-    (0xB5F, 'V'),
-    (0xB64, 'X'),
-    (0xB66, 'V'),
-    (0xB78, 'X'),
-    (0xB82, 'V'),
-    (0xB84, 'X'),
-    (0xB85, 'V'),
-    (0xB8B, 'X'),
-    (0xB8E, 'V'),
-    (0xB91, 'X'),
-    (0xB92, 'V'),
-    (0xB96, 'X'),
-    (0xB99, 'V'),
-    (0xB9B, 'X'),
-    (0xB9C, 'V'),
-    (0xB9D, 'X'),
-    (0xB9E, 'V'),
-    (0xBA0, 'X'),
-    (0xBA3, 'V'),
-    (0xBA5, 'X'),
-    (0xBA8, 'V'),
-    (0xBAB, 'X'),
-    (0xBAE, 'V'),
-    (0xBBA, 'X'),
-    (0xBBE, 'V'),
-    (0xBC3, 'X'),
-    (0xBC6, 'V'),
-    (0xBC9, 'X'),
-    (0xBCA, 'V'),
-    (0xBCE, 'X'),
-    (0xBD0, 'V'),
-    (0xBD1, 'X'),
-    (0xBD7, 'V'),
-    (0xBD8, 'X'),
-    (0xBE6, 'V'),
-    (0xBFB, 'X'),
-    (0xC00, 'V'),
-    (0xC0D, 'X'),
-    (0xC0E, 'V'),
-    (0xC11, 'X'),
-    (0xC12, 'V'),
-    (0xC29, 'X'),
-    (0xC2A, 'V'),
+        (0xA5E, "M", "ਫ਼"),
+        (0xA5F, "X"),
+        (0xA66, "V"),
+        (0xA77, "X"),
+        (0xA81, "V"),
+        (0xA84, "X"),
+        (0xA85, "V"),
+        (0xA8E, "X"),
+        (0xA8F, "V"),
+        (0xA92, "X"),
+        (0xA93, "V"),
+        (0xAA9, "X"),
+        (0xAAA, "V"),
+        (0xAB1, "X"),
+        (0xAB2, "V"),
+        (0xAB4, "X"),
+        (0xAB5, "V"),
+        (0xABA, "X"),
+        (0xABC, "V"),
+        (0xAC6, "X"),
+        (0xAC7, "V"),
+        (0xACA, "X"),
+        (0xACB, "V"),
+        (0xACE, "X"),
+        (0xAD0, "V"),
+        (0xAD1, "X"),
+        (0xAE0, "V"),
+        (0xAE4, "X"),
+        (0xAE6, "V"),
+        (0xAF2, "X"),
+        (0xAF9, "V"),
+        (0xB00, "X"),
+        (0xB01, "V"),
+        (0xB04, "X"),
+        (0xB05, "V"),
+        (0xB0D, "X"),
+        (0xB0F, "V"),
+        (0xB11, "X"),
+        (0xB13, "V"),
+        (0xB29, "X"),
+        (0xB2A, "V"),
+        (0xB31, "X"),
+        (0xB32, "V"),
+        (0xB34, "X"),
+        (0xB35, "V"),
+        (0xB3A, "X"),
+        (0xB3C, "V"),
+        (0xB45, "X"),
+        (0xB47, "V"),
+        (0xB49, "X"),
+        (0xB4B, "V"),
+        (0xB4E, "X"),
+        (0xB55, "V"),
+        (0xB58, "X"),
+        (0xB5C, "M", "ଡ଼"),
+        (0xB5D, "M", "ଢ଼"),
+        (0xB5E, "X"),
+        (0xB5F, "V"),
+        (0xB64, "X"),
+        (0xB66, "V"),
+        (0xB78, "X"),
+        (0xB82, "V"),
+        (0xB84, "X"),
+        (0xB85, "V"),
+        (0xB8B, "X"),
+        (0xB8E, "V"),
+        (0xB91, "X"),
+        (0xB92, "V"),
+        (0xB96, "X"),
+        (0xB99, "V"),
+        (0xB9B, "X"),
+        (0xB9C, "V"),
+        (0xB9D, "X"),
+        (0xB9E, "V"),
+        (0xBA0, "X"),
+        (0xBA3, "V"),
+        (0xBA5, "X"),
+        (0xBA8, "V"),
+        (0xBAB, "X"),
+        (0xBAE, "V"),
+        (0xBBA, "X"),
+        (0xBBE, "V"),
+        (0xBC3, "X"),
+        (0xBC6, "V"),
+        (0xBC9, "X"),
+        (0xBCA, "V"),
+        (0xBCE, "X"),
+        (0xBD0, "V"),
+        (0xBD1, "X"),
+        (0xBD7, "V"),
+        (0xBD8, "X"),
+        (0xBE6, "V"),
+        (0xBFB, "X"),
+        (0xC00, "V"),
+        (0xC0D, "X"),
+        (0xC0E, "V"),
+        (0xC11, "X"),
+        (0xC12, "V"),
+        (0xC29, "X"),
+        (0xC2A, "V"),
     ]
 
+
 def _seg_12() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xC3A, 'X'),
-    (0xC3C, 'V'),
-    (0xC45, 'X'),
-    (0xC46, 'V'),
-    (0xC49, 'X'),
-    (0xC4A, 'V'),
-    (0xC4E, 'X'),
-    (0xC55, 'V'),
-    (0xC57, 'X'),
-    (0xC58, 'V'),
-    (0xC5B, 'X'),
-    (0xC5D, 'V'),
-    (0xC5E, 'X'),
-    (0xC60, 'V'),
-    (0xC64, 'X'),
-    (0xC66, 'V'),
-    (0xC70, 'X'),
-    (0xC77, 'V'),
-    (0xC8D, 'X'),
-    (0xC8E, 'V'),
-    (0xC91, 'X'),
-    (0xC92, 'V'),
-    (0xCA9, 'X'),
-    (0xCAA, 'V'),
-    (0xCB4, 'X'),
-    (0xCB5, 'V'),
-    (0xCBA, 'X'),
-    (0xCBC, 'V'),
-    (0xCC5, 'X'),
-    (0xCC6, 'V'),
-    (0xCC9, 'X'),
-    (0xCCA, 'V'),
-    (0xCCE, 'X'),
-    (0xCD5, 'V'),
-    (0xCD7, 'X'),
-    (0xCDD, 'V'),
-    (0xCDF, 'X'),
-    (0xCE0, 'V'),
-    (0xCE4, 'X'),
-    (0xCE6, 'V'),
-    (0xCF0, 'X'),
-    (0xCF1, 'V'),
-    (0xCF4, 'X'),
-    (0xD00, 'V'),
-    (0xD0D, 'X'),
-    (0xD0E, 'V'),
-    (0xD11, 'X'),
-    (0xD12, 'V'),
-    (0xD45, 'X'),
-    (0xD46, 'V'),
-    (0xD49, 'X'),
-    (0xD4A, 'V'),
-    (0xD50, 'X'),
-    (0xD54, 'V'),
-    (0xD64, 'X'),
-    (0xD66, 'V'),
-    (0xD80, 'X'),
-    (0xD81, 'V'),
-    (0xD84, 'X'),
-    (0xD85, 'V'),
-    (0xD97, 'X'),
-    (0xD9A, 'V'),
-    (0xDB2, 'X'),
-    (0xDB3, 'V'),
-    (0xDBC, 'X'),
-    (0xDBD, 'V'),
-    (0xDBE, 'X'),
-    (0xDC0, 'V'),
-    (0xDC7, 'X'),
-    (0xDCA, 'V'),
-    (0xDCB, 'X'),
-    (0xDCF, 'V'),
-    (0xDD5, 'X'),
-    (0xDD6, 'V'),
-    (0xDD7, 'X'),
-    (0xDD8, 'V'),
-    (0xDE0, 'X'),
-    (0xDE6, 'V'),
-    (0xDF0, 'X'),
-    (0xDF2, 'V'),
-    (0xDF5, 'X'),
-    (0xE01, 'V'),
-    (0xE33, 'M', 'ํา'),
-    (0xE34, 'V'),
-    (0xE3B, 'X'),
-    (0xE3F, 'V'),
-    (0xE5C, 'X'),
-    (0xE81, 'V'),
-    (0xE83, 'X'),
-    (0xE84, 'V'),
-    (0xE85, 'X'),
-    (0xE86, 'V'),
-    (0xE8B, 'X'),
-    (0xE8C, 'V'),
-    (0xEA4, 'X'),
-    (0xEA5, 'V'),
-    (0xEA6, 'X'),
-    (0xEA7, 'V'),
-    (0xEB3, 'M', 'ໍາ'),
-    (0xEB4, 'V'),
+        (0xC3A, "X"),
+        (0xC3C, "V"),
+        (0xC45, "X"),
+        (0xC46, "V"),
+        (0xC49, "X"),
+        (0xC4A, "V"),
+        (0xC4E, "X"),
+        (0xC55, "V"),
+        (0xC57, "X"),
+        (0xC58, "V"),
+        (0xC5B, "X"),
+        (0xC5D, "V"),
+        (0xC5E, "X"),
+        (0xC60, "V"),
+        (0xC64, "X"),
+        (0xC66, "V"),
+        (0xC70, "X"),
+        (0xC77, "V"),
+        (0xC8D, "X"),
+        (0xC8E, "V"),
+        (0xC91, "X"),
+        (0xC92, "V"),
+        (0xCA9, "X"),
+        (0xCAA, "V"),
+        (0xCB4, "X"),
+        (0xCB5, "V"),
+        (0xCBA, "X"),
+        (0xCBC, "V"),
+        (0xCC5, "X"),
+        (0xCC6, "V"),
+        (0xCC9, "X"),
+        (0xCCA, "V"),
+        (0xCCE, "X"),
+        (0xCD5, "V"),
+        (0xCD7, "X"),
+        (0xCDD, "V"),
+        (0xCDF, "X"),
+        (0xCE0, "V"),
+        (0xCE4, "X"),
+        (0xCE6, "V"),
+        (0xCF0, "X"),
+        (0xCF1, "V"),
+        (0xCF4, "X"),
+        (0xD00, "V"),
+        (0xD0D, "X"),
+        (0xD0E, "V"),
+        (0xD11, "X"),
+        (0xD12, "V"),
+        (0xD45, "X"),
+        (0xD46, "V"),
+        (0xD49, "X"),
+        (0xD4A, "V"),
+        (0xD50, "X"),
+        (0xD54, "V"),
+        (0xD64, "X"),
+        (0xD66, "V"),
+        (0xD80, "X"),
+        (0xD81, "V"),
+        (0xD84, "X"),
+        (0xD85, "V"),
+        (0xD97, "X"),
+        (0xD9A, "V"),
+        (0xDB2, "X"),
+        (0xDB3, "V"),
+        (0xDBC, "X"),
+        (0xDBD, "V"),
+        (0xDBE, "X"),
+        (0xDC0, "V"),
+        (0xDC7, "X"),
+        (0xDCA, "V"),
+        (0xDCB, "X"),
+        (0xDCF, "V"),
+        (0xDD5, "X"),
+        (0xDD6, "V"),
+        (0xDD7, "X"),
+        (0xDD8, "V"),
+        (0xDE0, "X"),
+        (0xDE6, "V"),
+        (0xDF0, "X"),
+        (0xDF2, "V"),
+        (0xDF5, "X"),
+        (0xE01, "V"),
+        (0xE33, "M", "ํา"),
+        (0xE34, "V"),
+        (0xE3B, "X"),
+        (0xE3F, "V"),
+        (0xE5C, "X"),
+        (0xE81, "V"),
+        (0xE83, "X"),
+        (0xE84, "V"),
+        (0xE85, "X"),
+        (0xE86, "V"),
+        (0xE8B, "X"),
+        (0xE8C, "V"),
+        (0xEA4, "X"),
+        (0xEA5, "V"),
+        (0xEA6, "X"),
+        (0xEA7, "V"),
+        (0xEB3, "M", "ໍາ"),
+        (0xEB4, "V"),
     ]
 
+
 def _seg_13() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xEBE, 'X'),
-    (0xEC0, 'V'),
-    (0xEC5, 'X'),
-    (0xEC6, 'V'),
-    (0xEC7, 'X'),
-    (0xEC8, 'V'),
-    (0xECF, 'X'),
-    (0xED0, 'V'),
-    (0xEDA, 'X'),
-    (0xEDC, 'M', 'ຫນ'),
-    (0xEDD, 'M', 'ຫມ'),
-    (0xEDE, 'V'),
-    (0xEE0, 'X'),
-    (0xF00, 'V'),
-    (0xF0C, 'M', '་'),
-    (0xF0D, 'V'),
-    (0xF43, 'M', 'གྷ'),
-    (0xF44, 'V'),
-    (0xF48, 'X'),
-    (0xF49, 'V'),
-    (0xF4D, 'M', 'ཌྷ'),
-    (0xF4E, 'V'),
-    (0xF52, 'M', 'དྷ'),
-    (0xF53, 'V'),
-    (0xF57, 'M', 'བྷ'),
-    (0xF58, 'V'),
-    (0xF5C, 'M', 'ཛྷ'),
-    (0xF5D, 'V'),
-    (0xF69, 'M', 'ཀྵ'),
-    (0xF6A, 'V'),
-    (0xF6D, 'X'),
-    (0xF71, 'V'),
-    (0xF73, 'M', 'ཱི'),
-    (0xF74, 'V'),
-    (0xF75, 'M', 'ཱུ'),
-    (0xF76, 'M', 'ྲྀ'),
-    (0xF77, 'M', 'ྲཱྀ'),
-    (0xF78, 'M', 'ླྀ'),
-    (0xF79, 'M', 'ླཱྀ'),
-    (0xF7A, 'V'),
-    (0xF81, 'M', 'ཱྀ'),
-    (0xF82, 'V'),
-    (0xF93, 'M', 'ྒྷ'),
-    (0xF94, 'V'),
-    (0xF98, 'X'),
-    (0xF99, 'V'),
-    (0xF9D, 'M', 'ྜྷ'),
-    (0xF9E, 'V'),
-    (0xFA2, 'M', 'ྡྷ'),
-    (0xFA3, 'V'),
-    (0xFA7, 'M', 'ྦྷ'),
-    (0xFA8, 'V'),
-    (0xFAC, 'M', 'ྫྷ'),
-    (0xFAD, 'V'),
-    (0xFB9, 'M', 'ྐྵ'),
-    (0xFBA, 'V'),
-    (0xFBD, 'X'),
-    (0xFBE, 'V'),
-    (0xFCD, 'X'),
-    (0xFCE, 'V'),
-    (0xFDB, 'X'),
-    (0x1000, 'V'),
-    (0x10A0, 'X'),
-    (0x10C7, 'M', 'ⴧ'),
-    (0x10C8, 'X'),
-    (0x10CD, 'M', 'ⴭ'),
-    (0x10CE, 'X'),
-    (0x10D0, 'V'),
-    (0x10FC, 'M', 'ნ'),
-    (0x10FD, 'V'),
-    (0x115F, 'X'),
-    (0x1161, 'V'),
-    (0x1249, 'X'),
-    (0x124A, 'V'),
-    (0x124E, 'X'),
-    (0x1250, 'V'),
-    (0x1257, 'X'),
-    (0x1258, 'V'),
-    (0x1259, 'X'),
-    (0x125A, 'V'),
-    (0x125E, 'X'),
-    (0x1260, 'V'),
-    (0x1289, 'X'),
-    (0x128A, 'V'),
-    (0x128E, 'X'),
-    (0x1290, 'V'),
-    (0x12B1, 'X'),
-    (0x12B2, 'V'),
-    (0x12B6, 'X'),
-    (0x12B8, 'V'),
-    (0x12BF, 'X'),
-    (0x12C0, 'V'),
-    (0x12C1, 'X'),
-    (0x12C2, 'V'),
-    (0x12C6, 'X'),
-    (0x12C8, 'V'),
-    (0x12D7, 'X'),
-    (0x12D8, 'V'),
-    (0x1311, 'X'),
-    (0x1312, 'V'),
+        (0xEBE, "X"),
+        (0xEC0, "V"),
+        (0xEC5, "X"),
+        (0xEC6, "V"),
+        (0xEC7, "X"),
+        (0xEC8, "V"),
+        (0xECF, "X"),
+        (0xED0, "V"),
+        (0xEDA, "X"),
+        (0xEDC, "M", "ຫນ"),
+        (0xEDD, "M", "ຫມ"),
+        (0xEDE, "V"),
+        (0xEE0, "X"),
+        (0xF00, "V"),
+        (0xF0C, "M", "་"),
+        (0xF0D, "V"),
+        (0xF43, "M", "གྷ"),
+        (0xF44, "V"),
+        (0xF48, "X"),
+        (0xF49, "V"),
+        (0xF4D, "M", "ཌྷ"),
+        (0xF4E, "V"),
+        (0xF52, "M", "དྷ"),
+        (0xF53, "V"),
+        (0xF57, "M", "བྷ"),
+        (0xF58, "V"),
+        (0xF5C, "M", "ཛྷ"),
+        (0xF5D, "V"),
+        (0xF69, "M", "ཀྵ"),
+        (0xF6A, "V"),
+        (0xF6D, "X"),
+        (0xF71, "V"),
+        (0xF73, "M", "ཱི"),
+        (0xF74, "V"),
+        (0xF75, "M", "ཱུ"),
+        (0xF76, "M", "ྲྀ"),
+        (0xF77, "M", "ྲཱྀ"),
+        (0xF78, "M", "ླྀ"),
+        (0xF79, "M", "ླཱྀ"),
+        (0xF7A, "V"),
+        (0xF81, "M", "ཱྀ"),
+        (0xF82, "V"),
+        (0xF93, "M", "ྒྷ"),
+        (0xF94, "V"),
+        (0xF98, "X"),
+        (0xF99, "V"),
+        (0xF9D, "M", "ྜྷ"),
+        (0xF9E, "V"),
+        (0xFA2, "M", "ྡྷ"),
+        (0xFA3, "V"),
+        (0xFA7, "M", "ྦྷ"),
+        (0xFA8, "V"),
+        (0xFAC, "M", "ྫྷ"),
+        (0xFAD, "V"),
+        (0xFB9, "M", "ྐྵ"),
+        (0xFBA, "V"),
+        (0xFBD, "X"),
+        (0xFBE, "V"),
+        (0xFCD, "X"),
+        (0xFCE, "V"),
+        (0xFDB, "X"),
+        (0x1000, "V"),
+        (0x10A0, "X"),
+        (0x10C7, "M", "ⴧ"),
+        (0x10C8, "X"),
+        (0x10CD, "M", "ⴭ"),
+        (0x10CE, "X"),
+        (0x10D0, "V"),
+        (0x10FC, "M", "ნ"),
+        (0x10FD, "V"),
+        (0x115F, "X"),
+        (0x1161, "V"),
+        (0x1249, "X"),
+        (0x124A, "V"),
+        (0x124E, "X"),
+        (0x1250, "V"),
+        (0x1257, "X"),
+        (0x1258, "V"),
+        (0x1259, "X"),
+        (0x125A, "V"),
+        (0x125E, "X"),
+        (0x1260, "V"),
+        (0x1289, "X"),
+        (0x128A, "V"),
+        (0x128E, "X"),
+        (0x1290, "V"),
+        (0x12B1, "X"),
+        (0x12B2, "V"),
+        (0x12B6, "X"),
+        (0x12B8, "V"),
+        (0x12BF, "X"),
+        (0x12C0, "V"),
+        (0x12C1, "X"),
+        (0x12C2, "V"),
+        (0x12C6, "X"),
+        (0x12C8, "V"),
+        (0x12D7, "X"),
+        (0x12D8, "V"),
+        (0x1311, "X"),
+        (0x1312, "V"),
     ]
 
+
 def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1316, 'X'),
-    (0x1318, 'V'),
-    (0x135B, 'X'),
-    (0x135D, 'V'),
-    (0x137D, 'X'),
-    (0x1380, 'V'),
-    (0x139A, 'X'),
-    (0x13A0, 'V'),
-    (0x13F6, 'X'),
-    (0x13F8, 'M', 'Ᏸ'),
-    (0x13F9, 'M', 'Ᏹ'),
-    (0x13FA, 'M', 'Ᏺ'),
-    (0x13FB, 'M', 'Ᏻ'),
-    (0x13FC, 'M', 'Ᏼ'),
-    (0x13FD, 'M', 'Ᏽ'),
-    (0x13FE, 'X'),
-    (0x1400, 'V'),
-    (0x1680, 'X'),
-    (0x1681, 'V'),
-    (0x169D, 'X'),
-    (0x16A0, 'V'),
-    (0x16F9, 'X'),
-    (0x1700, 'V'),
-    (0x1716, 'X'),
-    (0x171F, 'V'),
-    (0x1737, 'X'),
-    (0x1740, 'V'),
-    (0x1754, 'X'),
-    (0x1760, 'V'),
-    (0x176D, 'X'),
-    (0x176E, 'V'),
-    (0x1771, 'X'),
-    (0x1772, 'V'),
-    (0x1774, 'X'),
-    (0x1780, 'V'),
-    (0x17B4, 'X'),
-    (0x17B6, 'V'),
-    (0x17DE, 'X'),
-    (0x17E0, 'V'),
-    (0x17EA, 'X'),
-    (0x17F0, 'V'),
-    (0x17FA, 'X'),
-    (0x1800, 'V'),
-    (0x1806, 'X'),
-    (0x1807, 'V'),
-    (0x180B, 'I'),
-    (0x180E, 'X'),
-    (0x180F, 'I'),
-    (0x1810, 'V'),
-    (0x181A, 'X'),
-    (0x1820, 'V'),
-    (0x1879, 'X'),
-    (0x1880, 'V'),
-    (0x18AB, 'X'),
-    (0x18B0, 'V'),
-    (0x18F6, 'X'),
-    (0x1900, 'V'),
-    (0x191F, 'X'),
-    (0x1920, 'V'),
-    (0x192C, 'X'),
-    (0x1930, 'V'),
-    (0x193C, 'X'),
-    (0x1940, 'V'),
-    (0x1941, 'X'),
-    (0x1944, 'V'),
-    (0x196E, 'X'),
-    (0x1970, 'V'),
-    (0x1975, 'X'),
-    (0x1980, 'V'),
-    (0x19AC, 'X'),
-    (0x19B0, 'V'),
-    (0x19CA, 'X'),
-    (0x19D0, 'V'),
-    (0x19DB, 'X'),
-    (0x19DE, 'V'),
-    (0x1A1C, 'X'),
-    (0x1A1E, 'V'),
-    (0x1A5F, 'X'),
-    (0x1A60, 'V'),
-    (0x1A7D, 'X'),
-    (0x1A7F, 'V'),
-    (0x1A8A, 'X'),
-    (0x1A90, 'V'),
-    (0x1A9A, 'X'),
-    (0x1AA0, 'V'),
-    (0x1AAE, 'X'),
-    (0x1AB0, 'V'),
-    (0x1ACF, 'X'),
-    (0x1B00, 'V'),
-    (0x1B4D, 'X'),
-    (0x1B50, 'V'),
-    (0x1B7F, 'X'),
-    (0x1B80, 'V'),
-    (0x1BF4, 'X'),
-    (0x1BFC, 'V'),
-    (0x1C38, 'X'),
-    (0x1C3B, 'V'),
-    (0x1C4A, 'X'),
-    (0x1C4D, 'V'),
-    (0x1C80, 'M', 'в'),
+        (0x1316, "X"),
+        (0x1318, "V"),
+        (0x135B, "X"),
+        (0x135D, "V"),
+        (0x137D, "X"),
+        (0x1380, "V"),
+        (0x139A, "X"),
+        (0x13A0, "V"),
+        (0x13F6, "X"),
+        (0x13F8, "M", "Ᏸ"),
+        (0x13F9, "M", "Ᏹ"),
+        (0x13FA, "M", "Ᏺ"),
+        (0x13FB, "M", "Ᏻ"),
+        (0x13FC, "M", "Ᏼ"),
+        (0x13FD, "M", "Ᏽ"),
+        (0x13FE, "X"),
+        (0x1400, "V"),
+        (0x1680, "X"),
+        (0x1681, "V"),
+        (0x169D, "X"),
+        (0x16A0, "V"),
+        (0x16F9, "X"),
+        (0x1700, "V"),
+        (0x1716, "X"),
+        (0x171F, "V"),
+        (0x1737, "X"),
+        (0x1740, "V"),
+        (0x1754, "X"),
+        (0x1760, "V"),
+        (0x176D, "X"),
+        (0x176E, "V"),
+        (0x1771, "X"),
+        (0x1772, "V"),
+        (0x1774, "X"),
+        (0x1780, "V"),
+        (0x17B4, "X"),
+        (0x17B6, "V"),
+        (0x17DE, "X"),
+        (0x17E0, "V"),
+        (0x17EA, "X"),
+        (0x17F0, "V"),
+        (0x17FA, "X"),
+        (0x1800, "V"),
+        (0x1806, "X"),
+        (0x1807, "V"),
+        (0x180B, "I"),
+        (0x180E, "X"),
+        (0x180F, "I"),
+        (0x1810, "V"),
+        (0x181A, "X"),
+        (0x1820, "V"),
+        (0x1879, "X"),
+        (0x1880, "V"),
+        (0x18AB, "X"),
+        (0x18B0, "V"),
+        (0x18F6, "X"),
+        (0x1900, "V"),
+        (0x191F, "X"),
+        (0x1920, "V"),
+        (0x192C, "X"),
+        (0x1930, "V"),
+        (0x193C, "X"),
+        (0x1940, "V"),
+        (0x1941, "X"),
+        (0x1944, "V"),
+        (0x196E, "X"),
+        (0x1970, "V"),
+        (0x1975, "X"),
+        (0x1980, "V"),
+        (0x19AC, "X"),
+        (0x19B0, "V"),
+        (0x19CA, "X"),
+        (0x19D0, "V"),
+        (0x19DB, "X"),
+        (0x19DE, "V"),
+        (0x1A1C, "X"),
+        (0x1A1E, "V"),
+        (0x1A5F, "X"),
+        (0x1A60, "V"),
+        (0x1A7D, "X"),
+        (0x1A7F, "V"),
+        (0x1A8A, "X"),
+        (0x1A90, "V"),
+        (0x1A9A, "X"),
+        (0x1AA0, "V"),
+        (0x1AAE, "X"),
+        (0x1AB0, "V"),
+        (0x1ACF, "X"),
+        (0x1B00, "V"),
+        (0x1B4D, "X"),
+        (0x1B50, "V"),
+        (0x1B7F, "X"),
+        (0x1B80, "V"),
+        (0x1BF4, "X"),
+        (0x1BFC, "V"),
+        (0x1C38, "X"),
+        (0x1C3B, "V"),
+        (0x1C4A, "X"),
+        (0x1C4D, "V"),
+        (0x1C80, "M", "в"),
     ]
 
+
 def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1C81, 'M', 'д'),
-    (0x1C82, 'M', 'о'),
-    (0x1C83, 'M', 'с'),
-    (0x1C84, 'M', 'т'),
-    (0x1C86, 'M', 'ъ'),
-    (0x1C87, 'M', 'ѣ'),
-    (0x1C88, 'M', 'ꙋ'),
-    (0x1C89, 'X'),
-    (0x1C90, 'M', 'ა'),
-    (0x1C91, 'M', 'ბ'),
-    (0x1C92, 'M', 'გ'),
-    (0x1C93, 'M', 'დ'),
-    (0x1C94, 'M', 'ე'),
-    (0x1C95, 'M', 'ვ'),
-    (0x1C96, 'M', 'ზ'),
-    (0x1C97, 'M', 'თ'),
-    (0x1C98, 'M', 'ი'),
-    (0x1C99, 'M', 'კ'),
-    (0x1C9A, 'M', 'ლ'),
-    (0x1C9B, 'M', 'მ'),
-    (0x1C9C, 'M', 'ნ'),
-    (0x1C9D, 'M', 'ო'),
-    (0x1C9E, 'M', 'პ'),
-    (0x1C9F, 'M', 'ჟ'),
-    (0x1CA0, 'M', 'რ'),
-    (0x1CA1, 'M', 'ს'),
-    (0x1CA2, 'M', 'ტ'),
-    (0x1CA3, 'M', 'უ'),
-    (0x1CA4, 'M', 'ფ'),
-    (0x1CA5, 'M', 'ქ'),
-    (0x1CA6, 'M', 'ღ'),
-    (0x1CA7, 'M', 'ყ'),
-    (0x1CA8, 'M', 'შ'),
-    (0x1CA9, 'M', 'ჩ'),
-    (0x1CAA, 'M', 'ც'),
-    (0x1CAB, 'M', 'ძ'),
-    (0x1CAC, 'M', 'წ'),
-    (0x1CAD, 'M', 'ჭ'),
-    (0x1CAE, 'M', 'ხ'),
-    (0x1CAF, 'M', 'ჯ'),
-    (0x1CB0, 'M', 'ჰ'),
-    (0x1CB1, 'M', 'ჱ'),
-    (0x1CB2, 'M', 'ჲ'),
-    (0x1CB3, 'M', 'ჳ'),
-    (0x1CB4, 'M', 'ჴ'),
-    (0x1CB5, 'M', 'ჵ'),
-    (0x1CB6, 'M', 'ჶ'),
-    (0x1CB7, 'M', 'ჷ'),
-    (0x1CB8, 'M', 'ჸ'),
-    (0x1CB9, 'M', 'ჹ'),
-    (0x1CBA, 'M', 'ჺ'),
-    (0x1CBB, 'X'),
-    (0x1CBD, 'M', 'ჽ'),
-    (0x1CBE, 'M', 'ჾ'),
-    (0x1CBF, 'M', 'ჿ'),
-    (0x1CC0, 'V'),
-    (0x1CC8, 'X'),
-    (0x1CD0, 'V'),
-    (0x1CFB, 'X'),
-    (0x1D00, 'V'),
-    (0x1D2C, 'M', 'a'),
-    (0x1D2D, 'M', 'æ'),
-    (0x1D2E, 'M', 'b'),
-    (0x1D2F, 'V'),
-    (0x1D30, 'M', 'd'),
-    (0x1D31, 'M', 'e'),
-    (0x1D32, 'M', 'ǝ'),
-    (0x1D33, 'M', 'g'),
-    (0x1D34, 'M', 'h'),
-    (0x1D35, 'M', 'i'),
-    (0x1D36, 'M', 'j'),
-    (0x1D37, 'M', 'k'),
-    (0x1D38, 'M', 'l'),
-    (0x1D39, 'M', 'm'),
-    (0x1D3A, 'M', 'n'),
-    (0x1D3B, 'V'),
-    (0x1D3C, 'M', 'o'),
-    (0x1D3D, 'M', 'ȣ'),
-    (0x1D3E, 'M', 'p'),
-    (0x1D3F, 'M', 'r'),
-    (0x1D40, 'M', 't'),
-    (0x1D41, 'M', 'u'),
-    (0x1D42, 'M', 'w'),
-    (0x1D43, 'M', 'a'),
-    (0x1D44, 'M', 'ɐ'),
-    (0x1D45, 'M', 'ɑ'),
-    (0x1D46, 'M', 'ᴂ'),
-    (0x1D47, 'M', 'b'),
-    (0x1D48, 'M', 'd'),
-    (0x1D49, 'M', 'e'),
-    (0x1D4A, 'M', 'ə'),
-    (0x1D4B, 'M', 'ɛ'),
-    (0x1D4C, 'M', 'ɜ'),
-    (0x1D4D, 'M', 'g'),
-    (0x1D4E, 'V'),
-    (0x1D4F, 'M', 'k'),
-    (0x1D50, 'M', 'm'),
-    (0x1D51, 'M', 'ŋ'),
-    (0x1D52, 'M', 'o'),
-    (0x1D53, 'M', 'ɔ'),
+        (0x1C81, "M", "д"),
+        (0x1C82, "M", "о"),
+        (0x1C83, "M", "с"),
+        (0x1C84, "M", "т"),
+        (0x1C86, "M", "ъ"),
+        (0x1C87, "M", "ѣ"),
+        (0x1C88, "M", "ꙋ"),
+        (0x1C89, "X"),
+        (0x1C90, "M", "ა"),
+        (0x1C91, "M", "ბ"),
+        (0x1C92, "M", "გ"),
+        (0x1C93, "M", "დ"),
+        (0x1C94, "M", "ე"),
+        (0x1C95, "M", "ვ"),
+        (0x1C96, "M", "ზ"),
+        (0x1C97, "M", "თ"),
+        (0x1C98, "M", "ი"),
+        (0x1C99, "M", "კ"),
+        (0x1C9A, "M", "ლ"),
+        (0x1C9B, "M", "მ"),
+        (0x1C9C, "M", "ნ"),
+        (0x1C9D, "M", "ო"),
+        (0x1C9E, "M", "პ"),
+        (0x1C9F, "M", "ჟ"),
+        (0x1CA0, "M", "რ"),
+        (0x1CA1, "M", "ს"),
+        (0x1CA2, "M", "ტ"),
+        (0x1CA3, "M", "უ"),
+        (0x1CA4, "M", "ფ"),
+        (0x1CA5, "M", "ქ"),
+        (0x1CA6, "M", "ღ"),
+        (0x1CA7, "M", "ყ"),
+        (0x1CA8, "M", "შ"),
+        (0x1CA9, "M", "ჩ"),
+        (0x1CAA, "M", "ც"),
+        (0x1CAB, "M", "ძ"),
+        (0x1CAC, "M", "წ"),
+        (0x1CAD, "M", "ჭ"),
+        (0x1CAE, "M", "ხ"),
+        (0x1CAF, "M", "ჯ"),
+        (0x1CB0, "M", "ჰ"),
+        (0x1CB1, "M", "ჱ"),
+        (0x1CB2, "M", "ჲ"),
+        (0x1CB3, "M", "ჳ"),
+        (0x1CB4, "M", "ჴ"),
+        (0x1CB5, "M", "ჵ"),
+        (0x1CB6, "M", "ჶ"),
+        (0x1CB7, "M", "ჷ"),
+        (0x1CB8, "M", "ჸ"),
+        (0x1CB9, "M", "ჹ"),
+        (0x1CBA, "M", "ჺ"),
+        (0x1CBB, "X"),
+        (0x1CBD, "M", "ჽ"),
+        (0x1CBE, "M", "ჾ"),
+        (0x1CBF, "M", "ჿ"),
+        (0x1CC0, "V"),
+        (0x1CC8, "X"),
+        (0x1CD0, "V"),
+        (0x1CFB, "X"),
+        (0x1D00, "V"),
+        (0x1D2C, "M", "a"),
+        (0x1D2D, "M", "æ"),
+        (0x1D2E, "M", "b"),
+        (0x1D2F, "V"),
+        (0x1D30, "M", "d"),
+        (0x1D31, "M", "e"),
+        (0x1D32, "M", "ǝ"),
+        (0x1D33, "M", "g"),
+        (0x1D34, "M", "h"),
+        (0x1D35, "M", "i"),
+        (0x1D36, "M", "j"),
+        (0x1D37, "M", "k"),
+        (0x1D38, "M", "l"),
+        (0x1D39, "M", "m"),
+        (0x1D3A, "M", "n"),
+        (0x1D3B, "V"),
+        (0x1D3C, "M", "o"),
+        (0x1D3D, "M", "ȣ"),
+        (0x1D3E, "M", "p"),
+        (0x1D3F, "M", "r"),
+        (0x1D40, "M", "t"),
+        (0x1D41, "M", "u"),
+        (0x1D42, "M", "w"),
+        (0x1D43, "M", "a"),
+        (0x1D44, "M", "ɐ"),
+        (0x1D45, "M", "ɑ"),
+        (0x1D46, "M", "ᴂ"),
+        (0x1D47, "M", "b"),
+        (0x1D48, "M", "d"),
+        (0x1D49, "M", "e"),
+        (0x1D4A, "M", "ə"),
+        (0x1D4B, "M", "ɛ"),
+        (0x1D4C, "M", "ɜ"),
+        (0x1D4D, "M", "g"),
+        (0x1D4E, "V"),
+        (0x1D4F, "M", "k"),
+        (0x1D50, "M", "m"),
+        (0x1D51, "M", "ŋ"),
+        (0x1D52, "M", "o"),
+        (0x1D53, "M", "ɔ"),
     ]
 
+
 def _seg_16() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D54, 'M', 'ᴖ'),
-    (0x1D55, 'M', 'ᴗ'),
-    (0x1D56, 'M', 'p'),
-    (0x1D57, 'M', 't'),
-    (0x1D58, 'M', 'u'),
-    (0x1D59, 'M', 'ᴝ'),
-    (0x1D5A, 'M', 'ɯ'),
-    (0x1D5B, 'M', 'v'),
-    (0x1D5C, 'M', 'ᴥ'),
-    (0x1D5D, 'M', 'β'),
-    (0x1D5E, 'M', 'γ'),
-    (0x1D5F, 'M', 'δ'),
-    (0x1D60, 'M', 'φ'),
-    (0x1D61, 'M', 'χ'),
-    (0x1D62, 'M', 'i'),
-    (0x1D63, 'M', 'r'),
-    (0x1D64, 'M', 'u'),
-    (0x1D65, 'M', 'v'),
-    (0x1D66, 'M', 'β'),
-    (0x1D67, 'M', 'γ'),
-    (0x1D68, 'M', 'ρ'),
-    (0x1D69, 'M', 'φ'),
-    (0x1D6A, 'M', 'χ'),
-    (0x1D6B, 'V'),
-    (0x1D78, 'M', 'н'),
-    (0x1D79, 'V'),
-    (0x1D9B, 'M', 'ɒ'),
-    (0x1D9C, 'M', 'c'),
-    (0x1D9D, 'M', 'ɕ'),
-    (0x1D9E, 'M', 'ð'),
-    (0x1D9F, 'M', 'ɜ'),
-    (0x1DA0, 'M', 'f'),
-    (0x1DA1, 'M', 'ɟ'),
-    (0x1DA2, 'M', 'ɡ'),
-    (0x1DA3, 'M', 'ɥ'),
-    (0x1DA4, 'M', 'ɨ'),
-    (0x1DA5, 'M', 'ɩ'),
-    (0x1DA6, 'M', 'ɪ'),
-    (0x1DA7, 'M', 'ᵻ'),
-    (0x1DA8, 'M', 'ʝ'),
-    (0x1DA9, 'M', 'ɭ'),
-    (0x1DAA, 'M', 'ᶅ'),
-    (0x1DAB, 'M', 'ʟ'),
-    (0x1DAC, 'M', 'ɱ'),
-    (0x1DAD, 'M', 'ɰ'),
-    (0x1DAE, 'M', 'ɲ'),
-    (0x1DAF, 'M', 'ɳ'),
-    (0x1DB0, 'M', 'ɴ'),
-    (0x1DB1, 'M', 'ɵ'),
-    (0x1DB2, 'M', 'ɸ'),
-    (0x1DB3, 'M', 'ʂ'),
-    (0x1DB4, 'M', 'ʃ'),
-    (0x1DB5, 'M', 'ƫ'),
-    (0x1DB6, 'M', 'ʉ'),
-    (0x1DB7, 'M', 'ʊ'),
-    (0x1DB8, 'M', 'ᴜ'),
-    (0x1DB9, 'M', 'ʋ'),
-    (0x1DBA, 'M', 'ʌ'),
-    (0x1DBB, 'M', 'z'),
-    (0x1DBC, 'M', 'ʐ'),
-    (0x1DBD, 'M', 'ʑ'),
-    (0x1DBE, 'M', 'ʒ'),
-    (0x1DBF, 'M', 'θ'),
-    (0x1DC0, 'V'),
-    (0x1E00, 'M', 'ḁ'),
-    (0x1E01, 'V'),
-    (0x1E02, 'M', 'ḃ'),
-    (0x1E03, 'V'),
-    (0x1E04, 'M', 'ḅ'),
-    (0x1E05, 'V'),
-    (0x1E06, 'M', 'ḇ'),
-    (0x1E07, 'V'),
-    (0x1E08, 'M', 'ḉ'),
-    (0x1E09, 'V'),
-    (0x1E0A, 'M', 'ḋ'),
-    (0x1E0B, 'V'),
-    (0x1E0C, 'M', 'ḍ'),
-    (0x1E0D, 'V'),
-    (0x1E0E, 'M', 'ḏ'),
-    (0x1E0F, 'V'),
-    (0x1E10, 'M', 'ḑ'),
-    (0x1E11, 'V'),
-    (0x1E12, 'M', 'ḓ'),
-    (0x1E13, 'V'),
-    (0x1E14, 'M', 'ḕ'),
-    (0x1E15, 'V'),
-    (0x1E16, 'M', 'ḗ'),
-    (0x1E17, 'V'),
-    (0x1E18, 'M', 'ḙ'),
-    (0x1E19, 'V'),
-    (0x1E1A, 'M', 'ḛ'),
-    (0x1E1B, 'V'),
-    (0x1E1C, 'M', 'ḝ'),
-    (0x1E1D, 'V'),
-    (0x1E1E, 'M', 'ḟ'),
-    (0x1E1F, 'V'),
-    (0x1E20, 'M', 'ḡ'),
-    (0x1E21, 'V'),
-    (0x1E22, 'M', 'ḣ'),
-    (0x1E23, 'V'),
+        (0x1D54, "M", "ᴖ"),
+        (0x1D55, "M", "ᴗ"),
+        (0x1D56, "M", "p"),
+        (0x1D57, "M", "t"),
+        (0x1D58, "M", "u"),
+        (0x1D59, "M", "ᴝ"),
+        (0x1D5A, "M", "ɯ"),
+        (0x1D5B, "M", "v"),
+        (0x1D5C, "M", "ᴥ"),
+        (0x1D5D, "M", "β"),
+        (0x1D5E, "M", "γ"),
+        (0x1D5F, "M", "δ"),
+        (0x1D60, "M", "φ"),
+        (0x1D61, "M", "χ"),
+        (0x1D62, "M", "i"),
+        (0x1D63, "M", "r"),
+        (0x1D64, "M", "u"),
+        (0x1D65, "M", "v"),
+        (0x1D66, "M", "β"),
+        (0x1D67, "M", "γ"),
+        (0x1D68, "M", "ρ"),
+        (0x1D69, "M", "φ"),
+        (0x1D6A, "M", "χ"),
+        (0x1D6B, "V"),
+        (0x1D78, "M", "н"),
+        (0x1D79, "V"),
+        (0x1D9B, "M", "ɒ"),
+        (0x1D9C, "M", "c"),
+        (0x1D9D, "M", "ɕ"),
+        (0x1D9E, "M", "ð"),
+        (0x1D9F, "M", "ɜ"),
+        (0x1DA0, "M", "f"),
+        (0x1DA1, "M", "ɟ"),
+        (0x1DA2, "M", "ɡ"),
+        (0x1DA3, "M", "ɥ"),
+        (0x1DA4, "M", "ɨ"),
+        (0x1DA5, "M", "ɩ"),
+        (0x1DA6, "M", "ɪ"),
+        (0x1DA7, "M", "ᵻ"),
+        (0x1DA8, "M", "ʝ"),
+        (0x1DA9, "M", "ɭ"),
+        (0x1DAA, "M", "ᶅ"),
+        (0x1DAB, "M", "ʟ"),
+        (0x1DAC, "M", "ɱ"),
+        (0x1DAD, "M", "ɰ"),
+        (0x1DAE, "M", "ɲ"),
+        (0x1DAF, "M", "ɳ"),
+        (0x1DB0, "M", "ɴ"),
+        (0x1DB1, "M", "ɵ"),
+        (0x1DB2, "M", "ɸ"),
+        (0x1DB3, "M", "ʂ"),
+        (0x1DB4, "M", "ʃ"),
+        (0x1DB5, "M", "ƫ"),
+        (0x1DB6, "M", "ʉ"),
+        (0x1DB7, "M", "ʊ"),
+        (0x1DB8, "M", "ᴜ"),
+        (0x1DB9, "M", "ʋ"),
+        (0x1DBA, "M", "ʌ"),
+        (0x1DBB, "M", "z"),
+        (0x1DBC, "M", "ʐ"),
+        (0x1DBD, "M", "ʑ"),
+        (0x1DBE, "M", "ʒ"),
+        (0x1DBF, "M", "θ"),
+        (0x1DC0, "V"),
+        (0x1E00, "M", "ḁ"),
+        (0x1E01, "V"),
+        (0x1E02, "M", "ḃ"),
+        (0x1E03, "V"),
+        (0x1E04, "M", "ḅ"),
+        (0x1E05, "V"),
+        (0x1E06, "M", "ḇ"),
+        (0x1E07, "V"),
+        (0x1E08, "M", "ḉ"),
+        (0x1E09, "V"),
+        (0x1E0A, "M", "ḋ"),
+        (0x1E0B, "V"),
+        (0x1E0C, "M", "ḍ"),
+        (0x1E0D, "V"),
+        (0x1E0E, "M", "ḏ"),
+        (0x1E0F, "V"),
+        (0x1E10, "M", "ḑ"),
+        (0x1E11, "V"),
+        (0x1E12, "M", "ḓ"),
+        (0x1E13, "V"),
+        (0x1E14, "M", "ḕ"),
+        (0x1E15, "V"),
+        (0x1E16, "M", "ḗ"),
+        (0x1E17, "V"),
+        (0x1E18, "M", "ḙ"),
+        (0x1E19, "V"),
+        (0x1E1A, "M", "ḛ"),
+        (0x1E1B, "V"),
+        (0x1E1C, "M", "ḝ"),
+        (0x1E1D, "V"),
+        (0x1E1E, "M", "ḟ"),
+        (0x1E1F, "V"),
+        (0x1E20, "M", "ḡ"),
+        (0x1E21, "V"),
+        (0x1E22, "M", "ḣ"),
+        (0x1E23, "V"),
     ]
 
+
 def _seg_17() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1E24, 'M', 'ḥ'),
-    (0x1E25, 'V'),
-    (0x1E26, 'M', 'ḧ'),
-    (0x1E27, 'V'),
-    (0x1E28, 'M', 'ḩ'),
-    (0x1E29, 'V'),
-    (0x1E2A, 'M', 'ḫ'),
-    (0x1E2B, 'V'),
-    (0x1E2C, 'M', 'ḭ'),
-    (0x1E2D, 'V'),
-    (0x1E2E, 'M', 'ḯ'),
-    (0x1E2F, 'V'),
-    (0x1E30, 'M', 'ḱ'),
-    (0x1E31, 'V'),
-    (0x1E32, 'M', 'ḳ'),
-    (0x1E33, 'V'),
-    (0x1E34, 'M', 'ḵ'),
-    (0x1E35, 'V'),
-    (0x1E36, 'M', 'ḷ'),
-    (0x1E37, 'V'),
-    (0x1E38, 'M', 'ḹ'),
-    (0x1E39, 'V'),
-    (0x1E3A, 'M', 'ḻ'),
-    (0x1E3B, 'V'),
-    (0x1E3C, 'M', 'ḽ'),
-    (0x1E3D, 'V'),
-    (0x1E3E, 'M', 'ḿ'),
-    (0x1E3F, 'V'),
-    (0x1E40, 'M', 'ṁ'),
-    (0x1E41, 'V'),
-    (0x1E42, 'M', 'ṃ'),
-    (0x1E43, 'V'),
-    (0x1E44, 'M', 'ṅ'),
-    (0x1E45, 'V'),
-    (0x1E46, 'M', 'ṇ'),
-    (0x1E47, 'V'),
-    (0x1E48, 'M', 'ṉ'),
-    (0x1E49, 'V'),
-    (0x1E4A, 'M', 'ṋ'),
-    (0x1E4B, 'V'),
-    (0x1E4C, 'M', 'ṍ'),
-    (0x1E4D, 'V'),
-    (0x1E4E, 'M', 'ṏ'),
-    (0x1E4F, 'V'),
-    (0x1E50, 'M', 'ṑ'),
-    (0x1E51, 'V'),
-    (0x1E52, 'M', 'ṓ'),
-    (0x1E53, 'V'),
-    (0x1E54, 'M', 'ṕ'),
-    (0x1E55, 'V'),
-    (0x1E56, 'M', 'ṗ'),
-    (0x1E57, 'V'),
-    (0x1E58, 'M', 'ṙ'),
-    (0x1E59, 'V'),
-    (0x1E5A, 'M', 'ṛ'),
-    (0x1E5B, 'V'),
-    (0x1E5C, 'M', 'ṝ'),
-    (0x1E5D, 'V'),
-    (0x1E5E, 'M', 'ṟ'),
-    (0x1E5F, 'V'),
-    (0x1E60, 'M', 'ṡ'),
-    (0x1E61, 'V'),
-    (0x1E62, 'M', 'ṣ'),
-    (0x1E63, 'V'),
-    (0x1E64, 'M', 'ṥ'),
-    (0x1E65, 'V'),
-    (0x1E66, 'M', 'ṧ'),
-    (0x1E67, 'V'),
-    (0x1E68, 'M', 'ṩ'),
-    (0x1E69, 'V'),
-    (0x1E6A, 'M', 'ṫ'),
-    (0x1E6B, 'V'),
-    (0x1E6C, 'M', 'ṭ'),
-    (0x1E6D, 'V'),
-    (0x1E6E, 'M', 'ṯ'),
-    (0x1E6F, 'V'),
-    (0x1E70, 'M', 'ṱ'),
-    (0x1E71, 'V'),
-    (0x1E72, 'M', 'ṳ'),
-    (0x1E73, 'V'),
-    (0x1E74, 'M', 'ṵ'),
-    (0x1E75, 'V'),
-    (0x1E76, 'M', 'ṷ'),
-    (0x1E77, 'V'),
-    (0x1E78, 'M', 'ṹ'),
-    (0x1E79, 'V'),
-    (0x1E7A, 'M', 'ṻ'),
-    (0x1E7B, 'V'),
-    (0x1E7C, 'M', 'ṽ'),
-    (0x1E7D, 'V'),
-    (0x1E7E, 'M', 'ṿ'),
-    (0x1E7F, 'V'),
-    (0x1E80, 'M', 'ẁ'),
-    (0x1E81, 'V'),
-    (0x1E82, 'M', 'ẃ'),
-    (0x1E83, 'V'),
-    (0x1E84, 'M', 'ẅ'),
-    (0x1E85, 'V'),
-    (0x1E86, 'M', 'ẇ'),
-    (0x1E87, 'V'),
+        (0x1E24, "M", "ḥ"),
+        (0x1E25, "V"),
+        (0x1E26, "M", "ḧ"),
+        (0x1E27, "V"),
+        (0x1E28, "M", "ḩ"),
+        (0x1E29, "V"),
+        (0x1E2A, "M", "ḫ"),
+        (0x1E2B, "V"),
+        (0x1E2C, "M", "ḭ"),
+        (0x1E2D, "V"),
+        (0x1E2E, "M", "ḯ"),
+        (0x1E2F, "V"),
+        (0x1E30, "M", "ḱ"),
+        (0x1E31, "V"),
+        (0x1E32, "M", "ḳ"),
+        (0x1E33, "V"),
+        (0x1E34, "M", "ḵ"),
+        (0x1E35, "V"),
+        (0x1E36, "M", "ḷ"),
+        (0x1E37, "V"),
+        (0x1E38, "M", "ḹ"),
+        (0x1E39, "V"),
+        (0x1E3A, "M", "ḻ"),
+        (0x1E3B, "V"),
+        (0x1E3C, "M", "ḽ"),
+        (0x1E3D, "V"),
+        (0x1E3E, "M", "ḿ"),
+        (0x1E3F, "V"),
+        (0x1E40, "M", "ṁ"),
+        (0x1E41, "V"),
+        (0x1E42, "M", "ṃ"),
+        (0x1E43, "V"),
+        (0x1E44, "M", "ṅ"),
+        (0x1E45, "V"),
+        (0x1E46, "M", "ṇ"),
+        (0x1E47, "V"),
+        (0x1E48, "M", "ṉ"),
+        (0x1E49, "V"),
+        (0x1E4A, "M", "ṋ"),
+        (0x1E4B, "V"),
+        (0x1E4C, "M", "ṍ"),
+        (0x1E4D, "V"),
+        (0x1E4E, "M", "ṏ"),
+        (0x1E4F, "V"),
+        (0x1E50, "M", "ṑ"),
+        (0x1E51, "V"),
+        (0x1E52, "M", "ṓ"),
+        (0x1E53, "V"),
+        (0x1E54, "M", "ṕ"),
+        (0x1E55, "V"),
+        (0x1E56, "M", "ṗ"),
+        (0x1E57, "V"),
+        (0x1E58, "M", "ṙ"),
+        (0x1E59, "V"),
+        (0x1E5A, "M", "ṛ"),
+        (0x1E5B, "V"),
+        (0x1E5C, "M", "ṝ"),
+        (0x1E5D, "V"),
+        (0x1E5E, "M", "ṟ"),
+        (0x1E5F, "V"),
+        (0x1E60, "M", "ṡ"),
+        (0x1E61, "V"),
+        (0x1E62, "M", "ṣ"),
+        (0x1E63, "V"),
+        (0x1E64, "M", "ṥ"),
+        (0x1E65, "V"),
+        (0x1E66, "M", "ṧ"),
+        (0x1E67, "V"),
+        (0x1E68, "M", "ṩ"),
+        (0x1E69, "V"),
+        (0x1E6A, "M", "ṫ"),
+        (0x1E6B, "V"),
+        (0x1E6C, "M", "ṭ"),
+        (0x1E6D, "V"),
+        (0x1E6E, "M", "ṯ"),
+        (0x1E6F, "V"),
+        (0x1E70, "M", "ṱ"),
+        (0x1E71, "V"),
+        (0x1E72, "M", "ṳ"),
+        (0x1E73, "V"),
+        (0x1E74, "M", "ṵ"),
+        (0x1E75, "V"),
+        (0x1E76, "M", "ṷ"),
+        (0x1E77, "V"),
+        (0x1E78, "M", "ṹ"),
+        (0x1E79, "V"),
+        (0x1E7A, "M", "ṻ"),
+        (0x1E7B, "V"),
+        (0x1E7C, "M", "ṽ"),
+        (0x1E7D, "V"),
+        (0x1E7E, "M", "ṿ"),
+        (0x1E7F, "V"),
+        (0x1E80, "M", "ẁ"),
+        (0x1E81, "V"),
+        (0x1E82, "M", "ẃ"),
+        (0x1E83, "V"),
+        (0x1E84, "M", "ẅ"),
+        (0x1E85, "V"),
+        (0x1E86, "M", "ẇ"),
+        (0x1E87, "V"),
     ]
 
+
 def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1E88, 'M', 'ẉ'),
-    (0x1E89, 'V'),
-    (0x1E8A, 'M', 'ẋ'),
-    (0x1E8B, 'V'),
-    (0x1E8C, 'M', 'ẍ'),
-    (0x1E8D, 'V'),
-    (0x1E8E, 'M', 'ẏ'),
-    (0x1E8F, 'V'),
-    (0x1E90, 'M', 'ẑ'),
-    (0x1E91, 'V'),
-    (0x1E92, 'M', 'ẓ'),
-    (0x1E93, 'V'),
-    (0x1E94, 'M', 'ẕ'),
-    (0x1E95, 'V'),
-    (0x1E9A, 'M', 'aʾ'),
-    (0x1E9B, 'M', 'ṡ'),
-    (0x1E9C, 'V'),
-    (0x1E9E, 'M', 'ß'),
-    (0x1E9F, 'V'),
-    (0x1EA0, 'M', 'ạ'),
-    (0x1EA1, 'V'),
-    (0x1EA2, 'M', 'ả'),
-    (0x1EA3, 'V'),
-    (0x1EA4, 'M', 'ấ'),
-    (0x1EA5, 'V'),
-    (0x1EA6, 'M', 'ầ'),
-    (0x1EA7, 'V'),
-    (0x1EA8, 'M', 'ẩ'),
-    (0x1EA9, 'V'),
-    (0x1EAA, 'M', 'ẫ'),
-    (0x1EAB, 'V'),
-    (0x1EAC, 'M', 'ậ'),
-    (0x1EAD, 'V'),
-    (0x1EAE, 'M', 'ắ'),
-    (0x1EAF, 'V'),
-    (0x1EB0, 'M', 'ằ'),
-    (0x1EB1, 'V'),
-    (0x1EB2, 'M', 'ẳ'),
-    (0x1EB3, 'V'),
-    (0x1EB4, 'M', 'ẵ'),
-    (0x1EB5, 'V'),
-    (0x1EB6, 'M', 'ặ'),
-    (0x1EB7, 'V'),
-    (0x1EB8, 'M', 'ẹ'),
-    (0x1EB9, 'V'),
-    (0x1EBA, 'M', 'ẻ'),
-    (0x1EBB, 'V'),
-    (0x1EBC, 'M', 'ẽ'),
-    (0x1EBD, 'V'),
-    (0x1EBE, 'M', 'ế'),
-    (0x1EBF, 'V'),
-    (0x1EC0, 'M', 'ề'),
-    (0x1EC1, 'V'),
-    (0x1EC2, 'M', 'ể'),
-    (0x1EC3, 'V'),
-    (0x1EC4, 'M', 'ễ'),
-    (0x1EC5, 'V'),
-    (0x1EC6, 'M', 'ệ'),
-    (0x1EC7, 'V'),
-    (0x1EC8, 'M', 'ỉ'),
-    (0x1EC9, 'V'),
-    (0x1ECA, 'M', 'ị'),
-    (0x1ECB, 'V'),
-    (0x1ECC, 'M', 'ọ'),
-    (0x1ECD, 'V'),
-    (0x1ECE, 'M', 'ỏ'),
-    (0x1ECF, 'V'),
-    (0x1ED0, 'M', 'ố'),
-    (0x1ED1, 'V'),
-    (0x1ED2, 'M', 'ồ'),
-    (0x1ED3, 'V'),
-    (0x1ED4, 'M', 'ổ'),
-    (0x1ED5, 'V'),
-    (0x1ED6, 'M', 'ỗ'),
-    (0x1ED7, 'V'),
-    (0x1ED8, 'M', 'ộ'),
-    (0x1ED9, 'V'),
-    (0x1EDA, 'M', 'ớ'),
-    (0x1EDB, 'V'),
-    (0x1EDC, 'M', 'ờ'),
-    (0x1EDD, 'V'),
-    (0x1EDE, 'M', 'ở'),
-    (0x1EDF, 'V'),
-    (0x1EE0, 'M', 'ỡ'),
-    (0x1EE1, 'V'),
-    (0x1EE2, 'M', 'ợ'),
-    (0x1EE3, 'V'),
-    (0x1EE4, 'M', 'ụ'),
-    (0x1EE5, 'V'),
-    (0x1EE6, 'M', 'ủ'),
-    (0x1EE7, 'V'),
-    (0x1EE8, 'M', 'ứ'),
-    (0x1EE9, 'V'),
-    (0x1EEA, 'M', 'ừ'),
-    (0x1EEB, 'V'),
-    (0x1EEC, 'M', 'ử'),
-    (0x1EED, 'V'),
-    (0x1EEE, 'M', 'ữ'),
-    (0x1EEF, 'V'),
-    (0x1EF0, 'M', 'ự'),
+        (0x1E88, "M", "ẉ"),
+        (0x1E89, "V"),
+        (0x1E8A, "M", "ẋ"),
+        (0x1E8B, "V"),
+        (0x1E8C, "M", "ẍ"),
+        (0x1E8D, "V"),
+        (0x1E8E, "M", "ẏ"),
+        (0x1E8F, "V"),
+        (0x1E90, "M", "ẑ"),
+        (0x1E91, "V"),
+        (0x1E92, "M", "ẓ"),
+        (0x1E93, "V"),
+        (0x1E94, "M", "ẕ"),
+        (0x1E95, "V"),
+        (0x1E9A, "M", "aʾ"),
+        (0x1E9B, "M", "ṡ"),
+        (0x1E9C, "V"),
+        (0x1E9E, "M", "ß"),
+        (0x1E9F, "V"),
+        (0x1EA0, "M", "ạ"),
+        (0x1EA1, "V"),
+        (0x1EA2, "M", "ả"),
+        (0x1EA3, "V"),
+        (0x1EA4, "M", "ấ"),
+        (0x1EA5, "V"),
+        (0x1EA6, "M", "ầ"),
+        (0x1EA7, "V"),
+        (0x1EA8, "M", "ẩ"),
+        (0x1EA9, "V"),
+        (0x1EAA, "M", "ẫ"),
+        (0x1EAB, "V"),
+        (0x1EAC, "M", "ậ"),
+        (0x1EAD, "V"),
+        (0x1EAE, "M", "ắ"),
+        (0x1EAF, "V"),
+        (0x1EB0, "M", "ằ"),
+        (0x1EB1, "V"),
+        (0x1EB2, "M", "ẳ"),
+        (0x1EB3, "V"),
+        (0x1EB4, "M", "ẵ"),
+        (0x1EB5, "V"),
+        (0x1EB6, "M", "ặ"),
+        (0x1EB7, "V"),
+        (0x1EB8, "M", "ẹ"),
+        (0x1EB9, "V"),
+        (0x1EBA, "M", "ẻ"),
+        (0x1EBB, "V"),
+        (0x1EBC, "M", "ẽ"),
+        (0x1EBD, "V"),
+        (0x1EBE, "M", "ế"),
+        (0x1EBF, "V"),
+        (0x1EC0, "M", "ề"),
+        (0x1EC1, "V"),
+        (0x1EC2, "M", "ể"),
+        (0x1EC3, "V"),
+        (0x1EC4, "M", "ễ"),
+        (0x1EC5, "V"),
+        (0x1EC6, "M", "ệ"),
+        (0x1EC7, "V"),
+        (0x1EC8, "M", "ỉ"),
+        (0x1EC9, "V"),
+        (0x1ECA, "M", "ị"),
+        (0x1ECB, "V"),
+        (0x1ECC, "M", "ọ"),
+        (0x1ECD, "V"),
+        (0x1ECE, "M", "ỏ"),
+        (0x1ECF, "V"),
+        (0x1ED0, "M", "ố"),
+        (0x1ED1, "V"),
+        (0x1ED2, "M", "ồ"),
+        (0x1ED3, "V"),
+        (0x1ED4, "M", "ổ"),
+        (0x1ED5, "V"),
+        (0x1ED6, "M", "ỗ"),
+        (0x1ED7, "V"),
+        (0x1ED8, "M", "ộ"),
+        (0x1ED9, "V"),
+        (0x1EDA, "M", "ớ"),
+        (0x1EDB, "V"),
+        (0x1EDC, "M", "ờ"),
+        (0x1EDD, "V"),
+        (0x1EDE, "M", "ở"),
+        (0x1EDF, "V"),
+        (0x1EE0, "M", "ỡ"),
+        (0x1EE1, "V"),
+        (0x1EE2, "M", "ợ"),
+        (0x1EE3, "V"),
+        (0x1EE4, "M", "ụ"),
+        (0x1EE5, "V"),
+        (0x1EE6, "M", "ủ"),
+        (0x1EE7, "V"),
+        (0x1EE8, "M", "ứ"),
+        (0x1EE9, "V"),
+        (0x1EEA, "M", "ừ"),
+        (0x1EEB, "V"),
+        (0x1EEC, "M", "ử"),
+        (0x1EED, "V"),
+        (0x1EEE, "M", "ữ"),
+        (0x1EEF, "V"),
+        (0x1EF0, "M", "ự"),
     ]
 
+
 def _seg_19() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1EF1, 'V'),
-    (0x1EF2, 'M', 'ỳ'),
-    (0x1EF3, 'V'),
-    (0x1EF4, 'M', 'ỵ'),
-    (0x1EF5, 'V'),
-    (0x1EF6, 'M', 'ỷ'),
-    (0x1EF7, 'V'),
-    (0x1EF8, 'M', 'ỹ'),
-    (0x1EF9, 'V'),
-    (0x1EFA, 'M', 'ỻ'),
-    (0x1EFB, 'V'),
-    (0x1EFC, 'M', 'ỽ'),
-    (0x1EFD, 'V'),
-    (0x1EFE, 'M', 'ỿ'),
-    (0x1EFF, 'V'),
-    (0x1F08, 'M', 'ἀ'),
-    (0x1F09, 'M', 'ἁ'),
-    (0x1F0A, 'M', 'ἂ'),
-    (0x1F0B, 'M', 'ἃ'),
-    (0x1F0C, 'M', 'ἄ'),
-    (0x1F0D, 'M', 'ἅ'),
-    (0x1F0E, 'M', 'ἆ'),
-    (0x1F0F, 'M', 'ἇ'),
-    (0x1F10, 'V'),
-    (0x1F16, 'X'),
-    (0x1F18, 'M', 'ἐ'),
-    (0x1F19, 'M', 'ἑ'),
-    (0x1F1A, 'M', 'ἒ'),
-    (0x1F1B, 'M', 'ἓ'),
-    (0x1F1C, 'M', 'ἔ'),
-    (0x1F1D, 'M', 'ἕ'),
-    (0x1F1E, 'X'),
-    (0x1F20, 'V'),
-    (0x1F28, 'M', 'ἠ'),
-    (0x1F29, 'M', 'ἡ'),
-    (0x1F2A, 'M', 'ἢ'),
-    (0x1F2B, 'M', 'ἣ'),
-    (0x1F2C, 'M', 'ἤ'),
-    (0x1F2D, 'M', 'ἥ'),
-    (0x1F2E, 'M', 'ἦ'),
-    (0x1F2F, 'M', 'ἧ'),
-    (0x1F30, 'V'),
-    (0x1F38, 'M', 'ἰ'),
-    (0x1F39, 'M', 'ἱ'),
-    (0x1F3A, 'M', 'ἲ'),
-    (0x1F3B, 'M', 'ἳ'),
-    (0x1F3C, 'M', 'ἴ'),
-    (0x1F3D, 'M', 'ἵ'),
-    (0x1F3E, 'M', 'ἶ'),
-    (0x1F3F, 'M', 'ἷ'),
-    (0x1F40, 'V'),
-    (0x1F46, 'X'),
-    (0x1F48, 'M', 'ὀ'),
-    (0x1F49, 'M', 'ὁ'),
-    (0x1F4A, 'M', 'ὂ'),
-    (0x1F4B, 'M', 'ὃ'),
-    (0x1F4C, 'M', 'ὄ'),
-    (0x1F4D, 'M', 'ὅ'),
-    (0x1F4E, 'X'),
-    (0x1F50, 'V'),
-    (0x1F58, 'X'),
-    (0x1F59, 'M', 'ὑ'),
-    (0x1F5A, 'X'),
-    (0x1F5B, 'M', 'ὓ'),
-    (0x1F5C, 'X'),
-    (0x1F5D, 'M', 'ὕ'),
-    (0x1F5E, 'X'),
-    (0x1F5F, 'M', 'ὗ'),
-    (0x1F60, 'V'),
-    (0x1F68, 'M', 'ὠ'),
-    (0x1F69, 'M', 'ὡ'),
-    (0x1F6A, 'M', 'ὢ'),
-    (0x1F6B, 'M', 'ὣ'),
-    (0x1F6C, 'M', 'ὤ'),
-    (0x1F6D, 'M', 'ὥ'),
-    (0x1F6E, 'M', 'ὦ'),
-    (0x1F6F, 'M', 'ὧ'),
-    (0x1F70, 'V'),
-    (0x1F71, 'M', 'ά'),
-    (0x1F72, 'V'),
-    (0x1F73, 'M', 'έ'),
-    (0x1F74, 'V'),
-    (0x1F75, 'M', 'ή'),
-    (0x1F76, 'V'),
-    (0x1F77, 'M', 'ί'),
-    (0x1F78, 'V'),
-    (0x1F79, 'M', 'ό'),
-    (0x1F7A, 'V'),
-    (0x1F7B, 'M', 'ύ'),
-    (0x1F7C, 'V'),
-    (0x1F7D, 'M', 'ώ'),
-    (0x1F7E, 'X'),
-    (0x1F80, 'M', 'ἀι'),
-    (0x1F81, 'M', 'ἁι'),
-    (0x1F82, 'M', 'ἂι'),
-    (0x1F83, 'M', 'ἃι'),
-    (0x1F84, 'M', 'ἄι'),
-    (0x1F85, 'M', 'ἅι'),
-    (0x1F86, 'M', 'ἆι'),
-    (0x1F87, 'M', 'ἇι'),
+        (0x1EF1, "V"),
+        (0x1EF2, "M", "ỳ"),
+        (0x1EF3, "V"),
+        (0x1EF4, "M", "ỵ"),
+        (0x1EF5, "V"),
+        (0x1EF6, "M", "ỷ"),
+        (0x1EF7, "V"),
+        (0x1EF8, "M", "ỹ"),
+        (0x1EF9, "V"),
+        (0x1EFA, "M", "ỻ"),
+        (0x1EFB, "V"),
+        (0x1EFC, "M", "ỽ"),
+        (0x1EFD, "V"),
+        (0x1EFE, "M", "ỿ"),
+        (0x1EFF, "V"),
+        (0x1F08, "M", "ἀ"),
+        (0x1F09, "M", "ἁ"),
+        (0x1F0A, "M", "ἂ"),
+        (0x1F0B, "M", "ἃ"),
+        (0x1F0C, "M", "ἄ"),
+        (0x1F0D, "M", "ἅ"),
+        (0x1F0E, "M", "ἆ"),
+        (0x1F0F, "M", "ἇ"),
+        (0x1F10, "V"),
+        (0x1F16, "X"),
+        (0x1F18, "M", "ἐ"),
+        (0x1F19, "M", "ἑ"),
+        (0x1F1A, "M", "ἒ"),
+        (0x1F1B, "M", "ἓ"),
+        (0x1F1C, "M", "ἔ"),
+        (0x1F1D, "M", "ἕ"),
+        (0x1F1E, "X"),
+        (0x1F20, "V"),
+        (0x1F28, "M", "ἠ"),
+        (0x1F29, "M", "ἡ"),
+        (0x1F2A, "M", "ἢ"),
+        (0x1F2B, "M", "ἣ"),
+        (0x1F2C, "M", "ἤ"),
+        (0x1F2D, "M", "ἥ"),
+        (0x1F2E, "M", "ἦ"),
+        (0x1F2F, "M", "ἧ"),
+        (0x1F30, "V"),
+        (0x1F38, "M", "ἰ"),
+        (0x1F39, "M", "ἱ"),
+        (0x1F3A, "M", "ἲ"),
+        (0x1F3B, "M", "ἳ"),
+        (0x1F3C, "M", "ἴ"),
+        (0x1F3D, "M", "ἵ"),
+        (0x1F3E, "M", "ἶ"),
+        (0x1F3F, "M", "ἷ"),
+        (0x1F40, "V"),
+        (0x1F46, "X"),
+        (0x1F48, "M", "ὀ"),
+        (0x1F49, "M", "ὁ"),
+        (0x1F4A, "M", "ὂ"),
+        (0x1F4B, "M", "ὃ"),
+        (0x1F4C, "M", "ὄ"),
+        (0x1F4D, "M", "ὅ"),
+        (0x1F4E, "X"),
+        (0x1F50, "V"),
+        (0x1F58, "X"),
+        (0x1F59, "M", "ὑ"),
+        (0x1F5A, "X"),
+        (0x1F5B, "M", "ὓ"),
+        (0x1F5C, "X"),
+        (0x1F5D, "M", "ὕ"),
+        (0x1F5E, "X"),
+        (0x1F5F, "M", "ὗ"),
+        (0x1F60, "V"),
+        (0x1F68, "M", "ὠ"),
+        (0x1F69, "M", "ὡ"),
+        (0x1F6A, "M", "ὢ"),
+        (0x1F6B, "M", "ὣ"),
+        (0x1F6C, "M", "ὤ"),
+        (0x1F6D, "M", "ὥ"),
+        (0x1F6E, "M", "ὦ"),
+        (0x1F6F, "M", "ὧ"),
+        (0x1F70, "V"),
+        (0x1F71, "M", "ά"),
+        (0x1F72, "V"),
+        (0x1F73, "M", "έ"),
+        (0x1F74, "V"),
+        (0x1F75, "M", "ή"),
+        (0x1F76, "V"),
+        (0x1F77, "M", "ί"),
+        (0x1F78, "V"),
+        (0x1F79, "M", "ό"),
+        (0x1F7A, "V"),
+        (0x1F7B, "M", "ύ"),
+        (0x1F7C, "V"),
+        (0x1F7D, "M", "ώ"),
+        (0x1F7E, "X"),
+        (0x1F80, "M", "ἀι"),
+        (0x1F81, "M", "ἁι"),
+        (0x1F82, "M", "ἂι"),
+        (0x1F83, "M", "ἃι"),
+        (0x1F84, "M", "ἄι"),
+        (0x1F85, "M", "ἅι"),
+        (0x1F86, "M", "ἆι"),
+        (0x1F87, "M", "ἇι"),
     ]
 
+
 def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1F88, 'M', 'ἀι'),
-    (0x1F89, 'M', 'ἁι'),
-    (0x1F8A, 'M', 'ἂι'),
-    (0x1F8B, 'M', 'ἃι'),
-    (0x1F8C, 'M', 'ἄι'),
-    (0x1F8D, 'M', 'ἅι'),
-    (0x1F8E, 'M', 'ἆι'),
-    (0x1F8F, 'M', 'ἇι'),
-    (0x1F90, 'M', 'ἠι'),
-    (0x1F91, 'M', 'ἡι'),
-    (0x1F92, 'M', 'ἢι'),
-    (0x1F93, 'M', 'ἣι'),
-    (0x1F94, 'M', 'ἤι'),
-    (0x1F95, 'M', 'ἥι'),
-    (0x1F96, 'M', 'ἦι'),
-    (0x1F97, 'M', 'ἧι'),
-    (0x1F98, 'M', 'ἠι'),
-    (0x1F99, 'M', 'ἡι'),
-    (0x1F9A, 'M', 'ἢι'),
-    (0x1F9B, 'M', 'ἣι'),
-    (0x1F9C, 'M', 'ἤι'),
-    (0x1F9D, 'M', 'ἥι'),
-    (0x1F9E, 'M', 'ἦι'),
-    (0x1F9F, 'M', 'ἧι'),
-    (0x1FA0, 'M', 'ὠι'),
-    (0x1FA1, 'M', 'ὡι'),
-    (0x1FA2, 'M', 'ὢι'),
-    (0x1FA3, 'M', 'ὣι'),
-    (0x1FA4, 'M', 'ὤι'),
-    (0x1FA5, 'M', 'ὥι'),
-    (0x1FA6, 'M', 'ὦι'),
-    (0x1FA7, 'M', 'ὧι'),
-    (0x1FA8, 'M', 'ὠι'),
-    (0x1FA9, 'M', 'ὡι'),
-    (0x1FAA, 'M', 'ὢι'),
-    (0x1FAB, 'M', 'ὣι'),
-    (0x1FAC, 'M', 'ὤι'),
-    (0x1FAD, 'M', 'ὥι'),
-    (0x1FAE, 'M', 'ὦι'),
-    (0x1FAF, 'M', 'ὧι'),
-    (0x1FB0, 'V'),
-    (0x1FB2, 'M', 'ὰι'),
-    (0x1FB3, 'M', 'αι'),
-    (0x1FB4, 'M', 'άι'),
-    (0x1FB5, 'X'),
-    (0x1FB6, 'V'),
-    (0x1FB7, 'M', 'ᾶι'),
-    (0x1FB8, 'M', 'ᾰ'),
-    (0x1FB9, 'M', 'ᾱ'),
-    (0x1FBA, 'M', 'ὰ'),
-    (0x1FBB, 'M', 'ά'),
-    (0x1FBC, 'M', 'αι'),
-    (0x1FBD, '3', ' ̓'),
-    (0x1FBE, 'M', 'ι'),
-    (0x1FBF, '3', ' ̓'),
-    (0x1FC0, '3', ' ͂'),
-    (0x1FC1, '3', ' ̈͂'),
-    (0x1FC2, 'M', 'ὴι'),
-    (0x1FC3, 'M', 'ηι'),
-    (0x1FC4, 'M', 'ήι'),
-    (0x1FC5, 'X'),
-    (0x1FC6, 'V'),
-    (0x1FC7, 'M', 'ῆι'),
-    (0x1FC8, 'M', 'ὲ'),
-    (0x1FC9, 'M', 'έ'),
-    (0x1FCA, 'M', 'ὴ'),
-    (0x1FCB, 'M', 'ή'),
-    (0x1FCC, 'M', 'ηι'),
-    (0x1FCD, '3', ' ̓̀'),
-    (0x1FCE, '3', ' ̓́'),
-    (0x1FCF, '3', ' ̓͂'),
-    (0x1FD0, 'V'),
-    (0x1FD3, 'M', 'ΐ'),
-    (0x1FD4, 'X'),
-    (0x1FD6, 'V'),
-    (0x1FD8, 'M', 'ῐ'),
-    (0x1FD9, 'M', 'ῑ'),
-    (0x1FDA, 'M', 'ὶ'),
-    (0x1FDB, 'M', 'ί'),
-    (0x1FDC, 'X'),
-    (0x1FDD, '3', ' ̔̀'),
-    (0x1FDE, '3', ' ̔́'),
-    (0x1FDF, '3', ' ̔͂'),
-    (0x1FE0, 'V'),
-    (0x1FE3, 'M', 'ΰ'),
-    (0x1FE4, 'V'),
-    (0x1FE8, 'M', 'ῠ'),
-    (0x1FE9, 'M', 'ῡ'),
-    (0x1FEA, 'M', 'ὺ'),
-    (0x1FEB, 'M', 'ύ'),
-    (0x1FEC, 'M', 'ῥ'),
-    (0x1FED, '3', ' ̈̀'),
-    (0x1FEE, '3', ' ̈́'),
-    (0x1FEF, '3', '`'),
-    (0x1FF0, 'X'),
-    (0x1FF2, 'M', 'ὼι'),
-    (0x1FF3, 'M', 'ωι'),
-    (0x1FF4, 'M', 'ώι'),
-    (0x1FF5, 'X'),
-    (0x1FF6, 'V'),
+        (0x1F88, "M", "ἀι"),
+        (0x1F89, "M", "ἁι"),
+        (0x1F8A, "M", "ἂι"),
+        (0x1F8B, "M", "ἃι"),
+        (0x1F8C, "M", "ἄι"),
+        (0x1F8D, "M", "ἅι"),
+        (0x1F8E, "M", "ἆι"),
+        (0x1F8F, "M", "ἇι"),
+        (0x1F90, "M", "ἠι"),
+        (0x1F91, "M", "ἡι"),
+        (0x1F92, "M", "ἢι"),
+        (0x1F93, "M", "ἣι"),
+        (0x1F94, "M", "ἤι"),
+        (0x1F95, "M", "ἥι"),
+        (0x1F96, "M", "ἦι"),
+        (0x1F97, "M", "ἧι"),
+        (0x1F98, "M", "ἠι"),
+        (0x1F99, "M", "ἡι"),
+        (0x1F9A, "M", "ἢι"),
+        (0x1F9B, "M", "ἣι"),
+        (0x1F9C, "M", "ἤι"),
+        (0x1F9D, "M", "ἥι"),
+        (0x1F9E, "M", "ἦι"),
+        (0x1F9F, "M", "ἧι"),
+        (0x1FA0, "M", "ὠι"),
+        (0x1FA1, "M", "ὡι"),
+        (0x1FA2, "M", "ὢι"),
+        (0x1FA3, "M", "ὣι"),
+        (0x1FA4, "M", "ὤι"),
+        (0x1FA5, "M", "ὥι"),
+        (0x1FA6, "M", "ὦι"),
+        (0x1FA7, "M", "ὧι"),
+        (0x1FA8, "M", "ὠι"),
+        (0x1FA9, "M", "ὡι"),
+        (0x1FAA, "M", "ὢι"),
+        (0x1FAB, "M", "ὣι"),
+        (0x1FAC, "M", "ὤι"),
+        (0x1FAD, "M", "ὥι"),
+        (0x1FAE, "M", "ὦι"),
+        (0x1FAF, "M", "ὧι"),
+        (0x1FB0, "V"),
+        (0x1FB2, "M", "ὰι"),
+        (0x1FB3, "M", "αι"),
+        (0x1FB4, "M", "άι"),
+        (0x1FB5, "X"),
+        (0x1FB6, "V"),
+        (0x1FB7, "M", "ᾶι"),
+        (0x1FB8, "M", "ᾰ"),
+        (0x1FB9, "M", "ᾱ"),
+        (0x1FBA, "M", "ὰ"),
+        (0x1FBB, "M", "ά"),
+        (0x1FBC, "M", "αι"),
+        (0x1FBD, "3", " ̓"),
+        (0x1FBE, "M", "ι"),
+        (0x1FBF, "3", " ̓"),
+        (0x1FC0, "3", " ͂"),
+        (0x1FC1, "3", " ̈͂"),
+        (0x1FC2, "M", "ὴι"),
+        (0x1FC3, "M", "ηι"),
+        (0x1FC4, "M", "ήι"),
+        (0x1FC5, "X"),
+        (0x1FC6, "V"),
+        (0x1FC7, "M", "ῆι"),
+        (0x1FC8, "M", "ὲ"),
+        (0x1FC9, "M", "έ"),
+        (0x1FCA, "M", "ὴ"),
+        (0x1FCB, "M", "ή"),
+        (0x1FCC, "M", "ηι"),
+        (0x1FCD, "3", " ̓̀"),
+        (0x1FCE, "3", " ̓́"),
+        (0x1FCF, "3", " ̓͂"),
+        (0x1FD0, "V"),
+        (0x1FD3, "M", "ΐ"),
+        (0x1FD4, "X"),
+        (0x1FD6, "V"),
+        (0x1FD8, "M", "ῐ"),
+        (0x1FD9, "M", "ῑ"),
+        (0x1FDA, "M", "ὶ"),
+        (0x1FDB, "M", "ί"),
+        (0x1FDC, "X"),
+        (0x1FDD, "3", " ̔̀"),
+        (0x1FDE, "3", " ̔́"),
+        (0x1FDF, "3", " ̔͂"),
+        (0x1FE0, "V"),
+        (0x1FE3, "M", "ΰ"),
+        (0x1FE4, "V"),
+        (0x1FE8, "M", "ῠ"),
+        (0x1FE9, "M", "ῡ"),
+        (0x1FEA, "M", "ὺ"),
+        (0x1FEB, "M", "ύ"),
+        (0x1FEC, "M", "ῥ"),
+        (0x1FED, "3", " ̈̀"),
+        (0x1FEE, "3", " ̈́"),
+        (0x1FEF, "3", "`"),
+        (0x1FF0, "X"),
+        (0x1FF2, "M", "ὼι"),
+        (0x1FF3, "M", "ωι"),
+        (0x1FF4, "M", "ώι"),
+        (0x1FF5, "X"),
+        (0x1FF6, "V"),
     ]
 
+
 def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1FF7, 'M', 'ῶι'),
-    (0x1FF8, 'M', 'ὸ'),
-    (0x1FF9, 'M', 'ό'),
-    (0x1FFA, 'M', 'ὼ'),
-    (0x1FFB, 'M', 'ώ'),
-    (0x1FFC, 'M', 'ωι'),
-    (0x1FFD, '3', ' ́'),
-    (0x1FFE, '3', ' ̔'),
-    (0x1FFF, 'X'),
-    (0x2000, '3', ' '),
-    (0x200B, 'I'),
-    (0x200C, 'D', ''),
-    (0x200E, 'X'),
-    (0x2010, 'V'),
-    (0x2011, 'M', '‐'),
-    (0x2012, 'V'),
-    (0x2017, '3', ' ̳'),
-    (0x2018, 'V'),
-    (0x2024, 'X'),
-    (0x2027, 'V'),
-    (0x2028, 'X'),
-    (0x202F, '3', ' '),
-    (0x2030, 'V'),
-    (0x2033, 'M', '′′'),
-    (0x2034, 'M', '′′′'),
-    (0x2035, 'V'),
-    (0x2036, 'M', '‵‵'),
-    (0x2037, 'M', '‵‵‵'),
-    (0x2038, 'V'),
-    (0x203C, '3', '!!'),
-    (0x203D, 'V'),
-    (0x203E, '3', ' ̅'),
-    (0x203F, 'V'),
-    (0x2047, '3', '??'),
-    (0x2048, '3', '?!'),
-    (0x2049, '3', '!?'),
-    (0x204A, 'V'),
-    (0x2057, 'M', '′′′′'),
-    (0x2058, 'V'),
-    (0x205F, '3', ' '),
-    (0x2060, 'I'),
-    (0x2061, 'X'),
-    (0x2064, 'I'),
-    (0x2065, 'X'),
-    (0x2070, 'M', '0'),
-    (0x2071, 'M', 'i'),
-    (0x2072, 'X'),
-    (0x2074, 'M', '4'),
-    (0x2075, 'M', '5'),
-    (0x2076, 'M', '6'),
-    (0x2077, 'M', '7'),
-    (0x2078, 'M', '8'),
-    (0x2079, 'M', '9'),
-    (0x207A, '3', '+'),
-    (0x207B, 'M', '−'),
-    (0x207C, '3', '='),
-    (0x207D, '3', '('),
-    (0x207E, '3', ')'),
-    (0x207F, 'M', 'n'),
-    (0x2080, 'M', '0'),
-    (0x2081, 'M', '1'),
-    (0x2082, 'M', '2'),
-    (0x2083, 'M', '3'),
-    (0x2084, 'M', '4'),
-    (0x2085, 'M', '5'),
-    (0x2086, 'M', '6'),
-    (0x2087, 'M', '7'),
-    (0x2088, 'M', '8'),
-    (0x2089, 'M', '9'),
-    (0x208A, '3', '+'),
-    (0x208B, 'M', '−'),
-    (0x208C, '3', '='),
-    (0x208D, '3', '('),
-    (0x208E, '3', ')'),
-    (0x208F, 'X'),
-    (0x2090, 'M', 'a'),
-    (0x2091, 'M', 'e'),
-    (0x2092, 'M', 'o'),
-    (0x2093, 'M', 'x'),
-    (0x2094, 'M', 'ə'),
-    (0x2095, 'M', 'h'),
-    (0x2096, 'M', 'k'),
-    (0x2097, 'M', 'l'),
-    (0x2098, 'M', 'm'),
-    (0x2099, 'M', 'n'),
-    (0x209A, 'M', 'p'),
-    (0x209B, 'M', 's'),
-    (0x209C, 'M', 't'),
-    (0x209D, 'X'),
-    (0x20A0, 'V'),
-    (0x20A8, 'M', 'rs'),
-    (0x20A9, 'V'),
-    (0x20C1, 'X'),
-    (0x20D0, 'V'),
-    (0x20F1, 'X'),
-    (0x2100, '3', 'a/c'),
-    (0x2101, '3', 'a/s'),
-    (0x2102, 'M', 'c'),
-    (0x2103, 'M', '°c'),
-    (0x2104, 'V'),
+        (0x1FF7, "M", "ῶι"),
+        (0x1FF8, "M", "ὸ"),
+        (0x1FF9, "M", "ό"),
+        (0x1FFA, "M", "ὼ"),
+        (0x1FFB, "M", "ώ"),
+        (0x1FFC, "M", "ωι"),
+        (0x1FFD, "3", " ́"),
+        (0x1FFE, "3", " ̔"),
+        (0x1FFF, "X"),
+        (0x2000, "3", " "),
+        (0x200B, "I"),
+        (0x200C, "D", ""),
+        (0x200E, "X"),
+        (0x2010, "V"),
+        (0x2011, "M", "‐"),
+        (0x2012, "V"),
+        (0x2017, "3", " ̳"),
+        (0x2018, "V"),
+        (0x2024, "X"),
+        (0x2027, "V"),
+        (0x2028, "X"),
+        (0x202F, "3", " "),
+        (0x2030, "V"),
+        (0x2033, "M", "′′"),
+        (0x2034, "M", "′′′"),
+        (0x2035, "V"),
+        (0x2036, "M", "‵‵"),
+        (0x2037, "M", "‵‵‵"),
+        (0x2038, "V"),
+        (0x203C, "3", "!!"),
+        (0x203D, "V"),
+        (0x203E, "3", " ̅"),
+        (0x203F, "V"),
+        (0x2047, "3", "??"),
+        (0x2048, "3", "?!"),
+        (0x2049, "3", "!?"),
+        (0x204A, "V"),
+        (0x2057, "M", "′′′′"),
+        (0x2058, "V"),
+        (0x205F, "3", " "),
+        (0x2060, "I"),
+        (0x2061, "X"),
+        (0x2064, "I"),
+        (0x2065, "X"),
+        (0x2070, "M", "0"),
+        (0x2071, "M", "i"),
+        (0x2072, "X"),
+        (0x2074, "M", "4"),
+        (0x2075, "M", "5"),
+        (0x2076, "M", "6"),
+        (0x2077, "M", "7"),
+        (0x2078, "M", "8"),
+        (0x2079, "M", "9"),
+        (0x207A, "3", "+"),
+        (0x207B, "M", "−"),
+        (0x207C, "3", "="),
+        (0x207D, "3", "("),
+        (0x207E, "3", ")"),
+        (0x207F, "M", "n"),
+        (0x2080, "M", "0"),
+        (0x2081, "M", "1"),
+        (0x2082, "M", "2"),
+        (0x2083, "M", "3"),
+        (0x2084, "M", "4"),
+        (0x2085, "M", "5"),
+        (0x2086, "M", "6"),
+        (0x2087, "M", "7"),
+        (0x2088, "M", "8"),
+        (0x2089, "M", "9"),
+        (0x208A, "3", "+"),
+        (0x208B, "M", "−"),
+        (0x208C, "3", "="),
+        (0x208D, "3", "("),
+        (0x208E, "3", ")"),
+        (0x208F, "X"),
+        (0x2090, "M", "a"),
+        (0x2091, "M", "e"),
+        (0x2092, "M", "o"),
+        (0x2093, "M", "x"),
+        (0x2094, "M", "ə"),
+        (0x2095, "M", "h"),
+        (0x2096, "M", "k"),
+        (0x2097, "M", "l"),
+        (0x2098, "M", "m"),
+        (0x2099, "M", "n"),
+        (0x209A, "M", "p"),
+        (0x209B, "M", "s"),
+        (0x209C, "M", "t"),
+        (0x209D, "X"),
+        (0x20A0, "V"),
+        (0x20A8, "M", "rs"),
+        (0x20A9, "V"),
+        (0x20C1, "X"),
+        (0x20D0, "V"),
+        (0x20F1, "X"),
+        (0x2100, "3", "a/c"),
+        (0x2101, "3", "a/s"),
+        (0x2102, "M", "c"),
+        (0x2103, "M", "°c"),
+        (0x2104, "V"),
     ]
 
+
 def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2105, '3', 'c/o'),
-    (0x2106, '3', 'c/u'),
-    (0x2107, 'M', 'ɛ'),
-    (0x2108, 'V'),
-    (0x2109, 'M', '°f'),
-    (0x210A, 'M', 'g'),
-    (0x210B, 'M', 'h'),
-    (0x210F, 'M', 'ħ'),
-    (0x2110, 'M', 'i'),
-    (0x2112, 'M', 'l'),
-    (0x2114, 'V'),
-    (0x2115, 'M', 'n'),
-    (0x2116, 'M', 'no'),
-    (0x2117, 'V'),
-    (0x2119, 'M', 'p'),
-    (0x211A, 'M', 'q'),
-    (0x211B, 'M', 'r'),
-    (0x211E, 'V'),
-    (0x2120, 'M', 'sm'),
-    (0x2121, 'M', 'tel'),
-    (0x2122, 'M', 'tm'),
-    (0x2123, 'V'),
-    (0x2124, 'M', 'z'),
-    (0x2125, 'V'),
-    (0x2126, 'M', 'ω'),
-    (0x2127, 'V'),
-    (0x2128, 'M', 'z'),
-    (0x2129, 'V'),
-    (0x212A, 'M', 'k'),
-    (0x212B, 'M', 'å'),
-    (0x212C, 'M', 'b'),
-    (0x212D, 'M', 'c'),
-    (0x212E, 'V'),
-    (0x212F, 'M', 'e'),
-    (0x2131, 'M', 'f'),
-    (0x2132, 'X'),
-    (0x2133, 'M', 'm'),
-    (0x2134, 'M', 'o'),
-    (0x2135, 'M', 'א'),
-    (0x2136, 'M', 'ב'),
-    (0x2137, 'M', 'ג'),
-    (0x2138, 'M', 'ד'),
-    (0x2139, 'M', 'i'),
-    (0x213A, 'V'),
-    (0x213B, 'M', 'fax'),
-    (0x213C, 'M', 'π'),
-    (0x213D, 'M', 'γ'),
-    (0x213F, 'M', 'π'),
-    (0x2140, 'M', '∑'),
-    (0x2141, 'V'),
-    (0x2145, 'M', 'd'),
-    (0x2147, 'M', 'e'),
-    (0x2148, 'M', 'i'),
-    (0x2149, 'M', 'j'),
-    (0x214A, 'V'),
-    (0x2150, 'M', '1⁄7'),
-    (0x2151, 'M', '1⁄9'),
-    (0x2152, 'M', '1⁄10'),
-    (0x2153, 'M', '1⁄3'),
-    (0x2154, 'M', '2⁄3'),
-    (0x2155, 'M', '1⁄5'),
-    (0x2156, 'M', '2⁄5'),
-    (0x2157, 'M', '3⁄5'),
-    (0x2158, 'M', '4⁄5'),
-    (0x2159, 'M', '1⁄6'),
-    (0x215A, 'M', '5⁄6'),
-    (0x215B, 'M', '1⁄8'),
-    (0x215C, 'M', '3⁄8'),
-    (0x215D, 'M', '5⁄8'),
-    (0x215E, 'M', '7⁄8'),
-    (0x215F, 'M', '1⁄'),
-    (0x2160, 'M', 'i'),
-    (0x2161, 'M', 'ii'),
-    (0x2162, 'M', 'iii'),
-    (0x2163, 'M', 'iv'),
-    (0x2164, 'M', 'v'),
-    (0x2165, 'M', 'vi'),
-    (0x2166, 'M', 'vii'),
-    (0x2167, 'M', 'viii'),
-    (0x2168, 'M', 'ix'),
-    (0x2169, 'M', 'x'),
-    (0x216A, 'M', 'xi'),
-    (0x216B, 'M', 'xii'),
-    (0x216C, 'M', 'l'),
-    (0x216D, 'M', 'c'),
-    (0x216E, 'M', 'd'),
-    (0x216F, 'M', 'm'),
-    (0x2170, 'M', 'i'),
-    (0x2171, 'M', 'ii'),
-    (0x2172, 'M', 'iii'),
-    (0x2173, 'M', 'iv'),
-    (0x2174, 'M', 'v'),
-    (0x2175, 'M', 'vi'),
-    (0x2176, 'M', 'vii'),
-    (0x2177, 'M', 'viii'),
-    (0x2178, 'M', 'ix'),
-    (0x2179, 'M', 'x'),
-    (0x217A, 'M', 'xi'),
-    (0x217B, 'M', 'xii'),
-    (0x217C, 'M', 'l'),
+        (0x2105, "3", "c/o"),
+        (0x2106, "3", "c/u"),
+        (0x2107, "M", "ɛ"),
+        (0x2108, "V"),
+        (0x2109, "M", "°f"),
+        (0x210A, "M", "g"),
+        (0x210B, "M", "h"),
+        (0x210F, "M", "ħ"),
+        (0x2110, "M", "i"),
+        (0x2112, "M", "l"),
+        (0x2114, "V"),
+        (0x2115, "M", "n"),
+        (0x2116, "M", "no"),
+        (0x2117, "V"),
+        (0x2119, "M", "p"),
+        (0x211A, "M", "q"),
+        (0x211B, "M", "r"),
+        (0x211E, "V"),
+        (0x2120, "M", "sm"),
+        (0x2121, "M", "tel"),
+        (0x2122, "M", "tm"),
+        (0x2123, "V"),
+        (0x2124, "M", "z"),
+        (0x2125, "V"),
+        (0x2126, "M", "ω"),
+        (0x2127, "V"),
+        (0x2128, "M", "z"),
+        (0x2129, "V"),
+        (0x212A, "M", "k"),
+        (0x212B, "M", "å"),
+        (0x212C, "M", "b"),
+        (0x212D, "M", "c"),
+        (0x212E, "V"),
+        (0x212F, "M", "e"),
+        (0x2131, "M", "f"),
+        (0x2132, "X"),
+        (0x2133, "M", "m"),
+        (0x2134, "M", "o"),
+        (0x2135, "M", "א"),
+        (0x2136, "M", "ב"),
+        (0x2137, "M", "ג"),
+        (0x2138, "M", "ד"),
+        (0x2139, "M", "i"),
+        (0x213A, "V"),
+        (0x213B, "M", "fax"),
+        (0x213C, "M", "π"),
+        (0x213D, "M", "γ"),
+        (0x213F, "M", "π"),
+        (0x2140, "M", "∑"),
+        (0x2141, "V"),
+        (0x2145, "M", "d"),
+        (0x2147, "M", "e"),
+        (0x2148, "M", "i"),
+        (0x2149, "M", "j"),
+        (0x214A, "V"),
+        (0x2150, "M", "1⁄7"),
+        (0x2151, "M", "1⁄9"),
+        (0x2152, "M", "1⁄10"),
+        (0x2153, "M", "1⁄3"),
+        (0x2154, "M", "2⁄3"),
+        (0x2155, "M", "1⁄5"),
+        (0x2156, "M", "2⁄5"),
+        (0x2157, "M", "3⁄5"),
+        (0x2158, "M", "4⁄5"),
+        (0x2159, "M", "1⁄6"),
+        (0x215A, "M", "5⁄6"),
+        (0x215B, "M", "1⁄8"),
+        (0x215C, "M", "3⁄8"),
+        (0x215D, "M", "5⁄8"),
+        (0x215E, "M", "7⁄8"),
+        (0x215F, "M", "1⁄"),
+        (0x2160, "M", "i"),
+        (0x2161, "M", "ii"),
+        (0x2162, "M", "iii"),
+        (0x2163, "M", "iv"),
+        (0x2164, "M", "v"),
+        (0x2165, "M", "vi"),
+        (0x2166, "M", "vii"),
+        (0x2167, "M", "viii"),
+        (0x2168, "M", "ix"),
+        (0x2169, "M", "x"),
+        (0x216A, "M", "xi"),
+        (0x216B, "M", "xii"),
+        (0x216C, "M", "l"),
+        (0x216D, "M", "c"),
+        (0x216E, "M", "d"),
+        (0x216F, "M", "m"),
+        (0x2170, "M", "i"),
+        (0x2171, "M", "ii"),
+        (0x2172, "M", "iii"),
+        (0x2173, "M", "iv"),
+        (0x2174, "M", "v"),
+        (0x2175, "M", "vi"),
+        (0x2176, "M", "vii"),
+        (0x2177, "M", "viii"),
+        (0x2178, "M", "ix"),
+        (0x2179, "M", "x"),
+        (0x217A, "M", "xi"),
+        (0x217B, "M", "xii"),
+        (0x217C, "M", "l"),
     ]
 
+
 def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x217D, 'M', 'c'),
-    (0x217E, 'M', 'd'),
-    (0x217F, 'M', 'm'),
-    (0x2180, 'V'),
-    (0x2183, 'X'),
-    (0x2184, 'V'),
-    (0x2189, 'M', '0⁄3'),
-    (0x218A, 'V'),
-    (0x218C, 'X'),
-    (0x2190, 'V'),
-    (0x222C, 'M', '∫∫'),
-    (0x222D, 'M', '∫∫∫'),
-    (0x222E, 'V'),
-    (0x222F, 'M', '∮∮'),
-    (0x2230, 'M', '∮∮∮'),
-    (0x2231, 'V'),
-    (0x2329, 'M', '〈'),
-    (0x232A, 'M', '〉'),
-    (0x232B, 'V'),
-    (0x2427, 'X'),
-    (0x2440, 'V'),
-    (0x244B, 'X'),
-    (0x2460, 'M', '1'),
-    (0x2461, 'M', '2'),
-    (0x2462, 'M', '3'),
-    (0x2463, 'M', '4'),
-    (0x2464, 'M', '5'),
-    (0x2465, 'M', '6'),
-    (0x2466, 'M', '7'),
-    (0x2467, 'M', '8'),
-    (0x2468, 'M', '9'),
-    (0x2469, 'M', '10'),
-    (0x246A, 'M', '11'),
-    (0x246B, 'M', '12'),
-    (0x246C, 'M', '13'),
-    (0x246D, 'M', '14'),
-    (0x246E, 'M', '15'),
-    (0x246F, 'M', '16'),
-    (0x2470, 'M', '17'),
-    (0x2471, 'M', '18'),
-    (0x2472, 'M', '19'),
-    (0x2473, 'M', '20'),
-    (0x2474, '3', '(1)'),
-    (0x2475, '3', '(2)'),
-    (0x2476, '3', '(3)'),
-    (0x2477, '3', '(4)'),
-    (0x2478, '3', '(5)'),
-    (0x2479, '3', '(6)'),
-    (0x247A, '3', '(7)'),
-    (0x247B, '3', '(8)'),
-    (0x247C, '3', '(9)'),
-    (0x247D, '3', '(10)'),
-    (0x247E, '3', '(11)'),
-    (0x247F, '3', '(12)'),
-    (0x2480, '3', '(13)'),
-    (0x2481, '3', '(14)'),
-    (0x2482, '3', '(15)'),
-    (0x2483, '3', '(16)'),
-    (0x2484, '3', '(17)'),
-    (0x2485, '3', '(18)'),
-    (0x2486, '3', '(19)'),
-    (0x2487, '3', '(20)'),
-    (0x2488, 'X'),
-    (0x249C, '3', '(a)'),
-    (0x249D, '3', '(b)'),
-    (0x249E, '3', '(c)'),
-    (0x249F, '3', '(d)'),
-    (0x24A0, '3', '(e)'),
-    (0x24A1, '3', '(f)'),
-    (0x24A2, '3', '(g)'),
-    (0x24A3, '3', '(h)'),
-    (0x24A4, '3', '(i)'),
-    (0x24A5, '3', '(j)'),
-    (0x24A6, '3', '(k)'),
-    (0x24A7, '3', '(l)'),
-    (0x24A8, '3', '(m)'),
-    (0x24A9, '3', '(n)'),
-    (0x24AA, '3', '(o)'),
-    (0x24AB, '3', '(p)'),
-    (0x24AC, '3', '(q)'),
-    (0x24AD, '3', '(r)'),
-    (0x24AE, '3', '(s)'),
-    (0x24AF, '3', '(t)'),
-    (0x24B0, '3', '(u)'),
-    (0x24B1, '3', '(v)'),
-    (0x24B2, '3', '(w)'),
-    (0x24B3, '3', '(x)'),
-    (0x24B4, '3', '(y)'),
-    (0x24B5, '3', '(z)'),
-    (0x24B6, 'M', 'a'),
-    (0x24B7, 'M', 'b'),
-    (0x24B8, 'M', 'c'),
-    (0x24B9, 'M', 'd'),
-    (0x24BA, 'M', 'e'),
-    (0x24BB, 'M', 'f'),
-    (0x24BC, 'M', 'g'),
-    (0x24BD, 'M', 'h'),
-    (0x24BE, 'M', 'i'),
-    (0x24BF, 'M', 'j'),
-    (0x24C0, 'M', 'k'),
+        (0x217D, "M", "c"),
+        (0x217E, "M", "d"),
+        (0x217F, "M", "m"),
+        (0x2180, "V"),
+        (0x2183, "X"),
+        (0x2184, "V"),
+        (0x2189, "M", "0⁄3"),
+        (0x218A, "V"),
+        (0x218C, "X"),
+        (0x2190, "V"),
+        (0x222C, "M", "∫∫"),
+        (0x222D, "M", "∫∫∫"),
+        (0x222E, "V"),
+        (0x222F, "M", "∮∮"),
+        (0x2230, "M", "∮∮∮"),
+        (0x2231, "V"),
+        (0x2329, "M", "〈"),
+        (0x232A, "M", "〉"),
+        (0x232B, "V"),
+        (0x2427, "X"),
+        (0x2440, "V"),
+        (0x244B, "X"),
+        (0x2460, "M", "1"),
+        (0x2461, "M", "2"),
+        (0x2462, "M", "3"),
+        (0x2463, "M", "4"),
+        (0x2464, "M", "5"),
+        (0x2465, "M", "6"),
+        (0x2466, "M", "7"),
+        (0x2467, "M", "8"),
+        (0x2468, "M", "9"),
+        (0x2469, "M", "10"),
+        (0x246A, "M", "11"),
+        (0x246B, "M", "12"),
+        (0x246C, "M", "13"),
+        (0x246D, "M", "14"),
+        (0x246E, "M", "15"),
+        (0x246F, "M", "16"),
+        (0x2470, "M", "17"),
+        (0x2471, "M", "18"),
+        (0x2472, "M", "19"),
+        (0x2473, "M", "20"),
+        (0x2474, "3", "(1)"),
+        (0x2475, "3", "(2)"),
+        (0x2476, "3", "(3)"),
+        (0x2477, "3", "(4)"),
+        (0x2478, "3", "(5)"),
+        (0x2479, "3", "(6)"),
+        (0x247A, "3", "(7)"),
+        (0x247B, "3", "(8)"),
+        (0x247C, "3", "(9)"),
+        (0x247D, "3", "(10)"),
+        (0x247E, "3", "(11)"),
+        (0x247F, "3", "(12)"),
+        (0x2480, "3", "(13)"),
+        (0x2481, "3", "(14)"),
+        (0x2482, "3", "(15)"),
+        (0x2483, "3", "(16)"),
+        (0x2484, "3", "(17)"),
+        (0x2485, "3", "(18)"),
+        (0x2486, "3", "(19)"),
+        (0x2487, "3", "(20)"),
+        (0x2488, "X"),
+        (0x249C, "3", "(a)"),
+        (0x249D, "3", "(b)"),
+        (0x249E, "3", "(c)"),
+        (0x249F, "3", "(d)"),
+        (0x24A0, "3", "(e)"),
+        (0x24A1, "3", "(f)"),
+        (0x24A2, "3", "(g)"),
+        (0x24A3, "3", "(h)"),
+        (0x24A4, "3", "(i)"),
+        (0x24A5, "3", "(j)"),
+        (0x24A6, "3", "(k)"),
+        (0x24A7, "3", "(l)"),
+        (0x24A8, "3", "(m)"),
+        (0x24A9, "3", "(n)"),
+        (0x24AA, "3", "(o)"),
+        (0x24AB, "3", "(p)"),
+        (0x24AC, "3", "(q)"),
+        (0x24AD, "3", "(r)"),
+        (0x24AE, "3", "(s)"),
+        (0x24AF, "3", "(t)"),
+        (0x24B0, "3", "(u)"),
+        (0x24B1, "3", "(v)"),
+        (0x24B2, "3", "(w)"),
+        (0x24B3, "3", "(x)"),
+        (0x24B4, "3", "(y)"),
+        (0x24B5, "3", "(z)"),
+        (0x24B6, "M", "a"),
+        (0x24B7, "M", "b"),
+        (0x24B8, "M", "c"),
+        (0x24B9, "M", "d"),
+        (0x24BA, "M", "e"),
+        (0x24BB, "M", "f"),
+        (0x24BC, "M", "g"),
+        (0x24BD, "M", "h"),
+        (0x24BE, "M", "i"),
+        (0x24BF, "M", "j"),
+        (0x24C0, "M", "k"),
     ]
 
+
 def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x24C1, 'M', 'l'),
-    (0x24C2, 'M', 'm'),
-    (0x24C3, 'M', 'n'),
-    (0x24C4, 'M', 'o'),
-    (0x24C5, 'M', 'p'),
-    (0x24C6, 'M', 'q'),
-    (0x24C7, 'M', 'r'),
-    (0x24C8, 'M', 's'),
-    (0x24C9, 'M', 't'),
-    (0x24CA, 'M', 'u'),
-    (0x24CB, 'M', 'v'),
-    (0x24CC, 'M', 'w'),
-    (0x24CD, 'M', 'x'),
-    (0x24CE, 'M', 'y'),
-    (0x24CF, 'M', 'z'),
-    (0x24D0, 'M', 'a'),
-    (0x24D1, 'M', 'b'),
-    (0x24D2, 'M', 'c'),
-    (0x24D3, 'M', 'd'),
-    (0x24D4, 'M', 'e'),
-    (0x24D5, 'M', 'f'),
-    (0x24D6, 'M', 'g'),
-    (0x24D7, 'M', 'h'),
-    (0x24D8, 'M', 'i'),
-    (0x24D9, 'M', 'j'),
-    (0x24DA, 'M', 'k'),
-    (0x24DB, 'M', 'l'),
-    (0x24DC, 'M', 'm'),
-    (0x24DD, 'M', 'n'),
-    (0x24DE, 'M', 'o'),
-    (0x24DF, 'M', 'p'),
-    (0x24E0, 'M', 'q'),
-    (0x24E1, 'M', 'r'),
-    (0x24E2, 'M', 's'),
-    (0x24E3, 'M', 't'),
-    (0x24E4, 'M', 'u'),
-    (0x24E5, 'M', 'v'),
-    (0x24E6, 'M', 'w'),
-    (0x24E7, 'M', 'x'),
-    (0x24E8, 'M', 'y'),
-    (0x24E9, 'M', 'z'),
-    (0x24EA, 'M', '0'),
-    (0x24EB, 'V'),
-    (0x2A0C, 'M', '∫∫∫∫'),
-    (0x2A0D, 'V'),
-    (0x2A74, '3', '::='),
-    (0x2A75, '3', '=='),
-    (0x2A76, '3', '==='),
-    (0x2A77, 'V'),
-    (0x2ADC, 'M', '⫝̸'),
-    (0x2ADD, 'V'),
-    (0x2B74, 'X'),
-    (0x2B76, 'V'),
-    (0x2B96, 'X'),
-    (0x2B97, 'V'),
-    (0x2C00, 'M', 'ⰰ'),
-    (0x2C01, 'M', 'ⰱ'),
-    (0x2C02, 'M', 'ⰲ'),
-    (0x2C03, 'M', 'ⰳ'),
-    (0x2C04, 'M', 'ⰴ'),
-    (0x2C05, 'M', 'ⰵ'),
-    (0x2C06, 'M', 'ⰶ'),
-    (0x2C07, 'M', 'ⰷ'),
-    (0x2C08, 'M', 'ⰸ'),
-    (0x2C09, 'M', 'ⰹ'),
-    (0x2C0A, 'M', 'ⰺ'),
-    (0x2C0B, 'M', 'ⰻ'),
-    (0x2C0C, 'M', 'ⰼ'),
-    (0x2C0D, 'M', 'ⰽ'),
-    (0x2C0E, 'M', 'ⰾ'),
-    (0x2C0F, 'M', 'ⰿ'),
-    (0x2C10, 'M', 'ⱀ'),
-    (0x2C11, 'M', 'ⱁ'),
-    (0x2C12, 'M', 'ⱂ'),
-    (0x2C13, 'M', 'ⱃ'),
-    (0x2C14, 'M', 'ⱄ'),
-    (0x2C15, 'M', 'ⱅ'),
-    (0x2C16, 'M', 'ⱆ'),
-    (0x2C17, 'M', 'ⱇ'),
-    (0x2C18, 'M', 'ⱈ'),
-    (0x2C19, 'M', 'ⱉ'),
-    (0x2C1A, 'M', 'ⱊ'),
-    (0x2C1B, 'M', 'ⱋ'),
-    (0x2C1C, 'M', 'ⱌ'),
-    (0x2C1D, 'M', 'ⱍ'),
-    (0x2C1E, 'M', 'ⱎ'),
-    (0x2C1F, 'M', 'ⱏ'),
-    (0x2C20, 'M', 'ⱐ'),
-    (0x2C21, 'M', 'ⱑ'),
-    (0x2C22, 'M', 'ⱒ'),
-    (0x2C23, 'M', 'ⱓ'),
-    (0x2C24, 'M', 'ⱔ'),
-    (0x2C25, 'M', 'ⱕ'),
-    (0x2C26, 'M', 'ⱖ'),
-    (0x2C27, 'M', 'ⱗ'),
-    (0x2C28, 'M', 'ⱘ'),
-    (0x2C29, 'M', 'ⱙ'),
-    (0x2C2A, 'M', 'ⱚ'),
-    (0x2C2B, 'M', 'ⱛ'),
-    (0x2C2C, 'M', 'ⱜ'),
+        (0x24C1, "M", "l"),
+        (0x24C2, "M", "m"),
+        (0x24C3, "M", "n"),
+        (0x24C4, "M", "o"),
+        (0x24C5, "M", "p"),
+        (0x24C6, "M", "q"),
+        (0x24C7, "M", "r"),
+        (0x24C8, "M", "s"),
+        (0x24C9, "M", "t"),
+        (0x24CA, "M", "u"),
+        (0x24CB, "M", "v"),
+        (0x24CC, "M", "w"),
+        (0x24CD, "M", "x"),
+        (0x24CE, "M", "y"),
+        (0x24CF, "M", "z"),
+        (0x24D0, "M", "a"),
+        (0x24D1, "M", "b"),
+        (0x24D2, "M", "c"),
+        (0x24D3, "M", "d"),
+        (0x24D4, "M", "e"),
+        (0x24D5, "M", "f"),
+        (0x24D6, "M", "g"),
+        (0x24D7, "M", "h"),
+        (0x24D8, "M", "i"),
+        (0x24D9, "M", "j"),
+        (0x24DA, "M", "k"),
+        (0x24DB, "M", "l"),
+        (0x24DC, "M", "m"),
+        (0x24DD, "M", "n"),
+        (0x24DE, "M", "o"),
+        (0x24DF, "M", "p"),
+        (0x24E0, "M", "q"),
+        (0x24E1, "M", "r"),
+        (0x24E2, "M", "s"),
+        (0x24E3, "M", "t"),
+        (0x24E4, "M", "u"),
+        (0x24E5, "M", "v"),
+        (0x24E6, "M", "w"),
+        (0x24E7, "M", "x"),
+        (0x24E8, "M", "y"),
+        (0x24E9, "M", "z"),
+        (0x24EA, "M", "0"),
+        (0x24EB, "V"),
+        (0x2A0C, "M", "∫∫∫∫"),
+        (0x2A0D, "V"),
+        (0x2A74, "3", "::="),
+        (0x2A75, "3", "=="),
+        (0x2A76, "3", "==="),
+        (0x2A77, "V"),
+        (0x2ADC, "M", "⫝̸"),
+        (0x2ADD, "V"),
+        (0x2B74, "X"),
+        (0x2B76, "V"),
+        (0x2B96, "X"),
+        (0x2B97, "V"),
+        (0x2C00, "M", "ⰰ"),
+        (0x2C01, "M", "ⰱ"),
+        (0x2C02, "M", "ⰲ"),
+        (0x2C03, "M", "ⰳ"),
+        (0x2C04, "M", "ⰴ"),
+        (0x2C05, "M", "ⰵ"),
+        (0x2C06, "M", "ⰶ"),
+        (0x2C07, "M", "ⰷ"),
+        (0x2C08, "M", "ⰸ"),
+        (0x2C09, "M", "ⰹ"),
+        (0x2C0A, "M", "ⰺ"),
+        (0x2C0B, "M", "ⰻ"),
+        (0x2C0C, "M", "ⰼ"),
+        (0x2C0D, "M", "ⰽ"),
+        (0x2C0E, "M", "ⰾ"),
+        (0x2C0F, "M", "ⰿ"),
+        (0x2C10, "M", "ⱀ"),
+        (0x2C11, "M", "ⱁ"),
+        (0x2C12, "M", "ⱂ"),
+        (0x2C13, "M", "ⱃ"),
+        (0x2C14, "M", "ⱄ"),
+        (0x2C15, "M", "ⱅ"),
+        (0x2C16, "M", "ⱆ"),
+        (0x2C17, "M", "ⱇ"),
+        (0x2C18, "M", "ⱈ"),
+        (0x2C19, "M", "ⱉ"),
+        (0x2C1A, "M", "ⱊ"),
+        (0x2C1B, "M", "ⱋ"),
+        (0x2C1C, "M", "ⱌ"),
+        (0x2C1D, "M", "ⱍ"),
+        (0x2C1E, "M", "ⱎ"),
+        (0x2C1F, "M", "ⱏ"),
+        (0x2C20, "M", "ⱐ"),
+        (0x2C21, "M", "ⱑ"),
+        (0x2C22, "M", "ⱒ"),
+        (0x2C23, "M", "ⱓ"),
+        (0x2C24, "M", "ⱔ"),
+        (0x2C25, "M", "ⱕ"),
+        (0x2C26, "M", "ⱖ"),
+        (0x2C27, "M", "ⱗ"),
+        (0x2C28, "M", "ⱘ"),
+        (0x2C29, "M", "ⱙ"),
+        (0x2C2A, "M", "ⱚ"),
+        (0x2C2B, "M", "ⱛ"),
+        (0x2C2C, "M", "ⱜ"),
     ]
 
+
 def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2C2D, 'M', 'ⱝ'),
-    (0x2C2E, 'M', 'ⱞ'),
-    (0x2C2F, 'M', 'ⱟ'),
-    (0x2C30, 'V'),
-    (0x2C60, 'M', 'ⱡ'),
-    (0x2C61, 'V'),
-    (0x2C62, 'M', 'ɫ'),
-    (0x2C63, 'M', 'ᵽ'),
-    (0x2C64, 'M', 'ɽ'),
-    (0x2C65, 'V'),
-    (0x2C67, 'M', 'ⱨ'),
-    (0x2C68, 'V'),
-    (0x2C69, 'M', 'ⱪ'),
-    (0x2C6A, 'V'),
-    (0x2C6B, 'M', 'ⱬ'),
-    (0x2C6C, 'V'),
-    (0x2C6D, 'M', 'ɑ'),
-    (0x2C6E, 'M', 'ɱ'),
-    (0x2C6F, 'M', 'ɐ'),
-    (0x2C70, 'M', 'ɒ'),
-    (0x2C71, 'V'),
-    (0x2C72, 'M', 'ⱳ'),
-    (0x2C73, 'V'),
-    (0x2C75, 'M', 'ⱶ'),
-    (0x2C76, 'V'),
-    (0x2C7C, 'M', 'j'),
-    (0x2C7D, 'M', 'v'),
-    (0x2C7E, 'M', 'ȿ'),
-    (0x2C7F, 'M', 'ɀ'),
-    (0x2C80, 'M', 'ⲁ'),
-    (0x2C81, 'V'),
-    (0x2C82, 'M', 'ⲃ'),
-    (0x2C83, 'V'),
-    (0x2C84, 'M', 'ⲅ'),
-    (0x2C85, 'V'),
-    (0x2C86, 'M', 'ⲇ'),
-    (0x2C87, 'V'),
-    (0x2C88, 'M', 'ⲉ'),
-    (0x2C89, 'V'),
-    (0x2C8A, 'M', 'ⲋ'),
-    (0x2C8B, 'V'),
-    (0x2C8C, 'M', 'ⲍ'),
-    (0x2C8D, 'V'),
-    (0x2C8E, 'M', 'ⲏ'),
-    (0x2C8F, 'V'),
-    (0x2C90, 'M', 'ⲑ'),
-    (0x2C91, 'V'),
-    (0x2C92, 'M', 'ⲓ'),
-    (0x2C93, 'V'),
-    (0x2C94, 'M', 'ⲕ'),
-    (0x2C95, 'V'),
-    (0x2C96, 'M', 'ⲗ'),
-    (0x2C97, 'V'),
-    (0x2C98, 'M', 'ⲙ'),
-    (0x2C99, 'V'),
-    (0x2C9A, 'M', 'ⲛ'),
-    (0x2C9B, 'V'),
-    (0x2C9C, 'M', 'ⲝ'),
-    (0x2C9D, 'V'),
-    (0x2C9E, 'M', 'ⲟ'),
-    (0x2C9F, 'V'),
-    (0x2CA0, 'M', 'ⲡ'),
-    (0x2CA1, 'V'),
-    (0x2CA2, 'M', 'ⲣ'),
-    (0x2CA3, 'V'),
-    (0x2CA4, 'M', 'ⲥ'),
-    (0x2CA5, 'V'),
-    (0x2CA6, 'M', 'ⲧ'),
-    (0x2CA7, 'V'),
-    (0x2CA8, 'M', 'ⲩ'),
-    (0x2CA9, 'V'),
-    (0x2CAA, 'M', 'ⲫ'),
-    (0x2CAB, 'V'),
-    (0x2CAC, 'M', 'ⲭ'),
-    (0x2CAD, 'V'),
-    (0x2CAE, 'M', 'ⲯ'),
-    (0x2CAF, 'V'),
-    (0x2CB0, 'M', 'ⲱ'),
-    (0x2CB1, 'V'),
-    (0x2CB2, 'M', 'ⲳ'),
-    (0x2CB3, 'V'),
-    (0x2CB4, 'M', 'ⲵ'),
-    (0x2CB5, 'V'),
-    (0x2CB6, 'M', 'ⲷ'),
-    (0x2CB7, 'V'),
-    (0x2CB8, 'M', 'ⲹ'),
-    (0x2CB9, 'V'),
-    (0x2CBA, 'M', 'ⲻ'),
-    (0x2CBB, 'V'),
-    (0x2CBC, 'M', 'ⲽ'),
-    (0x2CBD, 'V'),
-    (0x2CBE, 'M', 'ⲿ'),
-    (0x2CBF, 'V'),
-    (0x2CC0, 'M', 'ⳁ'),
-    (0x2CC1, 'V'),
-    (0x2CC2, 'M', 'ⳃ'),
-    (0x2CC3, 'V'),
-    (0x2CC4, 'M', 'ⳅ'),
-    (0x2CC5, 'V'),
-    (0x2CC6, 'M', 'ⳇ'),
+        (0x2C2D, "M", "ⱝ"),
+        (0x2C2E, "M", "ⱞ"),
+        (0x2C2F, "M", "ⱟ"),
+        (0x2C30, "V"),
+        (0x2C60, "M", "ⱡ"),
+        (0x2C61, "V"),
+        (0x2C62, "M", "ɫ"),
+        (0x2C63, "M", "ᵽ"),
+        (0x2C64, "M", "ɽ"),
+        (0x2C65, "V"),
+        (0x2C67, "M", "ⱨ"),
+        (0x2C68, "V"),
+        (0x2C69, "M", "ⱪ"),
+        (0x2C6A, "V"),
+        (0x2C6B, "M", "ⱬ"),
+        (0x2C6C, "V"),
+        (0x2C6D, "M", "ɑ"),
+        (0x2C6E, "M", "ɱ"),
+        (0x2C6F, "M", "ɐ"),
+        (0x2C70, "M", "ɒ"),
+        (0x2C71, "V"),
+        (0x2C72, "M", "ⱳ"),
+        (0x2C73, "V"),
+        (0x2C75, "M", "ⱶ"),
+        (0x2C76, "V"),
+        (0x2C7C, "M", "j"),
+        (0x2C7D, "M", "v"),
+        (0x2C7E, "M", "ȿ"),
+        (0x2C7F, "M", "ɀ"),
+        (0x2C80, "M", "ⲁ"),
+        (0x2C81, "V"),
+        (0x2C82, "M", "ⲃ"),
+        (0x2C83, "V"),
+        (0x2C84, "M", "ⲅ"),
+        (0x2C85, "V"),
+        (0x2C86, "M", "ⲇ"),
+        (0x2C87, "V"),
+        (0x2C88, "M", "ⲉ"),
+        (0x2C89, "V"),
+        (0x2C8A, "M", "ⲋ"),
+        (0x2C8B, "V"),
+        (0x2C8C, "M", "ⲍ"),
+        (0x2C8D, "V"),
+        (0x2C8E, "M", "ⲏ"),
+        (0x2C8F, "V"),
+        (0x2C90, "M", "ⲑ"),
+        (0x2C91, "V"),
+        (0x2C92, "M", "ⲓ"),
+        (0x2C93, "V"),
+        (0x2C94, "M", "ⲕ"),
+        (0x2C95, "V"),
+        (0x2C96, "M", "ⲗ"),
+        (0x2C97, "V"),
+        (0x2C98, "M", "ⲙ"),
+        (0x2C99, "V"),
+        (0x2C9A, "M", "ⲛ"),
+        (0x2C9B, "V"),
+        (0x2C9C, "M", "ⲝ"),
+        (0x2C9D, "V"),
+        (0x2C9E, "M", "ⲟ"),
+        (0x2C9F, "V"),
+        (0x2CA0, "M", "ⲡ"),
+        (0x2CA1, "V"),
+        (0x2CA2, "M", "ⲣ"),
+        (0x2CA3, "V"),
+        (0x2CA4, "M", "ⲥ"),
+        (0x2CA5, "V"),
+        (0x2CA6, "M", "ⲧ"),
+        (0x2CA7, "V"),
+        (0x2CA8, "M", "ⲩ"),
+        (0x2CA9, "V"),
+        (0x2CAA, "M", "ⲫ"),
+        (0x2CAB, "V"),
+        (0x2CAC, "M", "ⲭ"),
+        (0x2CAD, "V"),
+        (0x2CAE, "M", "ⲯ"),
+        (0x2CAF, "V"),
+        (0x2CB0, "M", "ⲱ"),
+        (0x2CB1, "V"),
+        (0x2CB2, "M", "ⲳ"),
+        (0x2CB3, "V"),
+        (0x2CB4, "M", "ⲵ"),
+        (0x2CB5, "V"),
+        (0x2CB6, "M", "ⲷ"),
+        (0x2CB7, "V"),
+        (0x2CB8, "M", "ⲹ"),
+        (0x2CB9, "V"),
+        (0x2CBA, "M", "ⲻ"),
+        (0x2CBB, "V"),
+        (0x2CBC, "M", "ⲽ"),
+        (0x2CBD, "V"),
+        (0x2CBE, "M", "ⲿ"),
+        (0x2CBF, "V"),
+        (0x2CC0, "M", "ⳁ"),
+        (0x2CC1, "V"),
+        (0x2CC2, "M", "ⳃ"),
+        (0x2CC3, "V"),
+        (0x2CC4, "M", "ⳅ"),
+        (0x2CC5, "V"),
+        (0x2CC6, "M", "ⳇ"),
     ]
 
+
 def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2CC7, 'V'),
-    (0x2CC8, 'M', 'ⳉ'),
-    (0x2CC9, 'V'),
-    (0x2CCA, 'M', 'ⳋ'),
-    (0x2CCB, 'V'),
-    (0x2CCC, 'M', 'ⳍ'),
-    (0x2CCD, 'V'),
-    (0x2CCE, 'M', 'ⳏ'),
-    (0x2CCF, 'V'),
-    (0x2CD0, 'M', 'ⳑ'),
-    (0x2CD1, 'V'),
-    (0x2CD2, 'M', 'ⳓ'),
-    (0x2CD3, 'V'),
-    (0x2CD4, 'M', 'ⳕ'),
-    (0x2CD5, 'V'),
-    (0x2CD6, 'M', 'ⳗ'),
-    (0x2CD7, 'V'),
-    (0x2CD8, 'M', 'ⳙ'),
-    (0x2CD9, 'V'),
-    (0x2CDA, 'M', 'ⳛ'),
-    (0x2CDB, 'V'),
-    (0x2CDC, 'M', 'ⳝ'),
-    (0x2CDD, 'V'),
-    (0x2CDE, 'M', 'ⳟ'),
-    (0x2CDF, 'V'),
-    (0x2CE0, 'M', 'ⳡ'),
-    (0x2CE1, 'V'),
-    (0x2CE2, 'M', 'ⳣ'),
-    (0x2CE3, 'V'),
-    (0x2CEB, 'M', 'ⳬ'),
-    (0x2CEC, 'V'),
-    (0x2CED, 'M', 'ⳮ'),
-    (0x2CEE, 'V'),
-    (0x2CF2, 'M', 'ⳳ'),
-    (0x2CF3, 'V'),
-    (0x2CF4, 'X'),
-    (0x2CF9, 'V'),
-    (0x2D26, 'X'),
-    (0x2D27, 'V'),
-    (0x2D28, 'X'),
-    (0x2D2D, 'V'),
-    (0x2D2E, 'X'),
-    (0x2D30, 'V'),
-    (0x2D68, 'X'),
-    (0x2D6F, 'M', 'ⵡ'),
-    (0x2D70, 'V'),
-    (0x2D71, 'X'),
-    (0x2D7F, 'V'),
-    (0x2D97, 'X'),
-    (0x2DA0, 'V'),
-    (0x2DA7, 'X'),
-    (0x2DA8, 'V'),
-    (0x2DAF, 'X'),
-    (0x2DB0, 'V'),
-    (0x2DB7, 'X'),
-    (0x2DB8, 'V'),
-    (0x2DBF, 'X'),
-    (0x2DC0, 'V'),
-    (0x2DC7, 'X'),
-    (0x2DC8, 'V'),
-    (0x2DCF, 'X'),
-    (0x2DD0, 'V'),
-    (0x2DD7, 'X'),
-    (0x2DD8, 'V'),
-    (0x2DDF, 'X'),
-    (0x2DE0, 'V'),
-    (0x2E5E, 'X'),
-    (0x2E80, 'V'),
-    (0x2E9A, 'X'),
-    (0x2E9B, 'V'),
-    (0x2E9F, 'M', '母'),
-    (0x2EA0, 'V'),
-    (0x2EF3, 'M', '龟'),
-    (0x2EF4, 'X'),
-    (0x2F00, 'M', '一'),
-    (0x2F01, 'M', '丨'),
-    (0x2F02, 'M', '丶'),
-    (0x2F03, 'M', '丿'),
-    (0x2F04, 'M', '乙'),
-    (0x2F05, 'M', '亅'),
-    (0x2F06, 'M', '二'),
-    (0x2F07, 'M', '亠'),
-    (0x2F08, 'M', '人'),
-    (0x2F09, 'M', '儿'),
-    (0x2F0A, 'M', '入'),
-    (0x2F0B, 'M', '八'),
-    (0x2F0C, 'M', '冂'),
-    (0x2F0D, 'M', '冖'),
-    (0x2F0E, 'M', '冫'),
-    (0x2F0F, 'M', '几'),
-    (0x2F10, 'M', '凵'),
-    (0x2F11, 'M', '刀'),
-    (0x2F12, 'M', '力'),
-    (0x2F13, 'M', '勹'),
-    (0x2F14, 'M', '匕'),
-    (0x2F15, 'M', '匚'),
-    (0x2F16, 'M', '匸'),
-    (0x2F17, 'M', '十'),
-    (0x2F18, 'M', '卜'),
-    (0x2F19, 'M', '卩'),
+        (0x2CC7, "V"),
+        (0x2CC8, "M", "ⳉ"),
+        (0x2CC9, "V"),
+        (0x2CCA, "M", "ⳋ"),
+        (0x2CCB, "V"),
+        (0x2CCC, "M", "ⳍ"),
+        (0x2CCD, "V"),
+        (0x2CCE, "M", "ⳏ"),
+        (0x2CCF, "V"),
+        (0x2CD0, "M", "ⳑ"),
+        (0x2CD1, "V"),
+        (0x2CD2, "M", "ⳓ"),
+        (0x2CD3, "V"),
+        (0x2CD4, "M", "ⳕ"),
+        (0x2CD5, "V"),
+        (0x2CD6, "M", "ⳗ"),
+        (0x2CD7, "V"),
+        (0x2CD8, "M", "ⳙ"),
+        (0x2CD9, "V"),
+        (0x2CDA, "M", "ⳛ"),
+        (0x2CDB, "V"),
+        (0x2CDC, "M", "ⳝ"),
+        (0x2CDD, "V"),
+        (0x2CDE, "M", "ⳟ"),
+        (0x2CDF, "V"),
+        (0x2CE0, "M", "ⳡ"),
+        (0x2CE1, "V"),
+        (0x2CE2, "M", "ⳣ"),
+        (0x2CE3, "V"),
+        (0x2CEB, "M", "ⳬ"),
+        (0x2CEC, "V"),
+        (0x2CED, "M", "ⳮ"),
+        (0x2CEE, "V"),
+        (0x2CF2, "M", "ⳳ"),
+        (0x2CF3, "V"),
+        (0x2CF4, "X"),
+        (0x2CF9, "V"),
+        (0x2D26, "X"),
+        (0x2D27, "V"),
+        (0x2D28, "X"),
+        (0x2D2D, "V"),
+        (0x2D2E, "X"),
+        (0x2D30, "V"),
+        (0x2D68, "X"),
+        (0x2D6F, "M", "ⵡ"),
+        (0x2D70, "V"),
+        (0x2D71, "X"),
+        (0x2D7F, "V"),
+        (0x2D97, "X"),
+        (0x2DA0, "V"),
+        (0x2DA7, "X"),
+        (0x2DA8, "V"),
+        (0x2DAF, "X"),
+        (0x2DB0, "V"),
+        (0x2DB7, "X"),
+        (0x2DB8, "V"),
+        (0x2DBF, "X"),
+        (0x2DC0, "V"),
+        (0x2DC7, "X"),
+        (0x2DC8, "V"),
+        (0x2DCF, "X"),
+        (0x2DD0, "V"),
+        (0x2DD7, "X"),
+        (0x2DD8, "V"),
+        (0x2DDF, "X"),
+        (0x2DE0, "V"),
+        (0x2E5E, "X"),
+        (0x2E80, "V"),
+        (0x2E9A, "X"),
+        (0x2E9B, "V"),
+        (0x2E9F, "M", "母"),
+        (0x2EA0, "V"),
+        (0x2EF3, "M", "龟"),
+        (0x2EF4, "X"),
+        (0x2F00, "M", "一"),
+        (0x2F01, "M", "丨"),
+        (0x2F02, "M", "丶"),
+        (0x2F03, "M", "丿"),
+        (0x2F04, "M", "乙"),
+        (0x2F05, "M", "亅"),
+        (0x2F06, "M", "二"),
+        (0x2F07, "M", "亠"),
+        (0x2F08, "M", "人"),
+        (0x2F09, "M", "儿"),
+        (0x2F0A, "M", "入"),
+        (0x2F0B, "M", "八"),
+        (0x2F0C, "M", "冂"),
+        (0x2F0D, "M", "冖"),
+        (0x2F0E, "M", "冫"),
+        (0x2F0F, "M", "几"),
+        (0x2F10, "M", "凵"),
+        (0x2F11, "M", "刀"),
+        (0x2F12, "M", "力"),
+        (0x2F13, "M", "勹"),
+        (0x2F14, "M", "匕"),
+        (0x2F15, "M", "匚"),
+        (0x2F16, "M", "匸"),
+        (0x2F17, "M", "十"),
+        (0x2F18, "M", "卜"),
+        (0x2F19, "M", "卩"),
     ]
 
+
 def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F1A, 'M', '厂'),
-    (0x2F1B, 'M', '厶'),
-    (0x2F1C, 'M', '又'),
-    (0x2F1D, 'M', '口'),
-    (0x2F1E, 'M', '囗'),
-    (0x2F1F, 'M', '土'),
-    (0x2F20, 'M', '士'),
-    (0x2F21, 'M', '夂'),
-    (0x2F22, 'M', '夊'),
-    (0x2F23, 'M', '夕'),
-    (0x2F24, 'M', '大'),
-    (0x2F25, 'M', '女'),
-    (0x2F26, 'M', '子'),
-    (0x2F27, 'M', '宀'),
-    (0x2F28, 'M', '寸'),
-    (0x2F29, 'M', '小'),
-    (0x2F2A, 'M', '尢'),
-    (0x2F2B, 'M', '尸'),
-    (0x2F2C, 'M', '屮'),
-    (0x2F2D, 'M', '山'),
-    (0x2F2E, 'M', '巛'),
-    (0x2F2F, 'M', '工'),
-    (0x2F30, 'M', '己'),
-    (0x2F31, 'M', '巾'),
-    (0x2F32, 'M', '干'),
-    (0x2F33, 'M', '幺'),
-    (0x2F34, 'M', '广'),
-    (0x2F35, 'M', '廴'),
-    (0x2F36, 'M', '廾'),
-    (0x2F37, 'M', '弋'),
-    (0x2F38, 'M', '弓'),
-    (0x2F39, 'M', '彐'),
-    (0x2F3A, 'M', '彡'),
-    (0x2F3B, 'M', '彳'),
-    (0x2F3C, 'M', '心'),
-    (0x2F3D, 'M', '戈'),
-    (0x2F3E, 'M', '戶'),
-    (0x2F3F, 'M', '手'),
-    (0x2F40, 'M', '支'),
-    (0x2F41, 'M', '攴'),
-    (0x2F42, 'M', '文'),
-    (0x2F43, 'M', '斗'),
-    (0x2F44, 'M', '斤'),
-    (0x2F45, 'M', '方'),
-    (0x2F46, 'M', '无'),
-    (0x2F47, 'M', '日'),
-    (0x2F48, 'M', '曰'),
-    (0x2F49, 'M', '月'),
-    (0x2F4A, 'M', '木'),
-    (0x2F4B, 'M', '欠'),
-    (0x2F4C, 'M', '止'),
-    (0x2F4D, 'M', '歹'),
-    (0x2F4E, 'M', '殳'),
-    (0x2F4F, 'M', '毋'),
-    (0x2F50, 'M', '比'),
-    (0x2F51, 'M', '毛'),
-    (0x2F52, 'M', '氏'),
-    (0x2F53, 'M', '气'),
-    (0x2F54, 'M', '水'),
-    (0x2F55, 'M', '火'),
-    (0x2F56, 'M', '爪'),
-    (0x2F57, 'M', '父'),
-    (0x2F58, 'M', '爻'),
-    (0x2F59, 'M', '爿'),
-    (0x2F5A, 'M', '片'),
-    (0x2F5B, 'M', '牙'),
-    (0x2F5C, 'M', '牛'),
-    (0x2F5D, 'M', '犬'),
-    (0x2F5E, 'M', '玄'),
-    (0x2F5F, 'M', '玉'),
-    (0x2F60, 'M', '瓜'),
-    (0x2F61, 'M', '瓦'),
-    (0x2F62, 'M', '甘'),
-    (0x2F63, 'M', '生'),
-    (0x2F64, 'M', '用'),
-    (0x2F65, 'M', '田'),
-    (0x2F66, 'M', '疋'),
-    (0x2F67, 'M', '疒'),
-    (0x2F68, 'M', '癶'),
-    (0x2F69, 'M', '白'),
-    (0x2F6A, 'M', '皮'),
-    (0x2F6B, 'M', '皿'),
-    (0x2F6C, 'M', '目'),
-    (0x2F6D, 'M', '矛'),
-    (0x2F6E, 'M', '矢'),
-    (0x2F6F, 'M', '石'),
-    (0x2F70, 'M', '示'),
-    (0x2F71, 'M', '禸'),
-    (0x2F72, 'M', '禾'),
-    (0x2F73, 'M', '穴'),
-    (0x2F74, 'M', '立'),
-    (0x2F75, 'M', '竹'),
-    (0x2F76, 'M', '米'),
-    (0x2F77, 'M', '糸'),
-    (0x2F78, 'M', '缶'),
-    (0x2F79, 'M', '网'),
-    (0x2F7A, 'M', '羊'),
-    (0x2F7B, 'M', '羽'),
-    (0x2F7C, 'M', '老'),
-    (0x2F7D, 'M', '而'),
+        (0x2F1A, "M", "厂"),
+        (0x2F1B, "M", "厶"),
+        (0x2F1C, "M", "又"),
+        (0x2F1D, "M", "口"),
+        (0x2F1E, "M", "囗"),
+        (0x2F1F, "M", "土"),
+        (0x2F20, "M", "士"),
+        (0x2F21, "M", "夂"),
+        (0x2F22, "M", "夊"),
+        (0x2F23, "M", "夕"),
+        (0x2F24, "M", "大"),
+        (0x2F25, "M", "女"),
+        (0x2F26, "M", "子"),
+        (0x2F27, "M", "宀"),
+        (0x2F28, "M", "寸"),
+        (0x2F29, "M", "小"),
+        (0x2F2A, "M", "尢"),
+        (0x2F2B, "M", "尸"),
+        (0x2F2C, "M", "屮"),
+        (0x2F2D, "M", "山"),
+        (0x2F2E, "M", "巛"),
+        (0x2F2F, "M", "工"),
+        (0x2F30, "M", "己"),
+        (0x2F31, "M", "巾"),
+        (0x2F32, "M", "干"),
+        (0x2F33, "M", "幺"),
+        (0x2F34, "M", "广"),
+        (0x2F35, "M", "廴"),
+        (0x2F36, "M", "廾"),
+        (0x2F37, "M", "弋"),
+        (0x2F38, "M", "弓"),
+        (0x2F39, "M", "彐"),
+        (0x2F3A, "M", "彡"),
+        (0x2F3B, "M", "彳"),
+        (0x2F3C, "M", "心"),
+        (0x2F3D, "M", "戈"),
+        (0x2F3E, "M", "戶"),
+        (0x2F3F, "M", "手"),
+        (0x2F40, "M", "支"),
+        (0x2F41, "M", "攴"),
+        (0x2F42, "M", "文"),
+        (0x2F43, "M", "斗"),
+        (0x2F44, "M", "斤"),
+        (0x2F45, "M", "方"),
+        (0x2F46, "M", "无"),
+        (0x2F47, "M", "日"),
+        (0x2F48, "M", "曰"),
+        (0x2F49, "M", "月"),
+        (0x2F4A, "M", "木"),
+        (0x2F4B, "M", "欠"),
+        (0x2F4C, "M", "止"),
+        (0x2F4D, "M", "歹"),
+        (0x2F4E, "M", "殳"),
+        (0x2F4F, "M", "毋"),
+        (0x2F50, "M", "比"),
+        (0x2F51, "M", "毛"),
+        (0x2F52, "M", "氏"),
+        (0x2F53, "M", "气"),
+        (0x2F54, "M", "水"),
+        (0x2F55, "M", "火"),
+        (0x2F56, "M", "爪"),
+        (0x2F57, "M", "父"),
+        (0x2F58, "M", "爻"),
+        (0x2F59, "M", "爿"),
+        (0x2F5A, "M", "片"),
+        (0x2F5B, "M", "牙"),
+        (0x2F5C, "M", "牛"),
+        (0x2F5D, "M", "犬"),
+        (0x2F5E, "M", "玄"),
+        (0x2F5F, "M", "玉"),
+        (0x2F60, "M", "瓜"),
+        (0x2F61, "M", "瓦"),
+        (0x2F62, "M", "甘"),
+        (0x2F63, "M", "生"),
+        (0x2F64, "M", "用"),
+        (0x2F65, "M", "田"),
+        (0x2F66, "M", "疋"),
+        (0x2F67, "M", "疒"),
+        (0x2F68, "M", "癶"),
+        (0x2F69, "M", "白"),
+        (0x2F6A, "M", "皮"),
+        (0x2F6B, "M", "皿"),
+        (0x2F6C, "M", "目"),
+        (0x2F6D, "M", "矛"),
+        (0x2F6E, "M", "矢"),
+        (0x2F6F, "M", "石"),
+        (0x2F70, "M", "示"),
+        (0x2F71, "M", "禸"),
+        (0x2F72, "M", "禾"),
+        (0x2F73, "M", "穴"),
+        (0x2F74, "M", "立"),
+        (0x2F75, "M", "竹"),
+        (0x2F76, "M", "米"),
+        (0x2F77, "M", "糸"),
+        (0x2F78, "M", "缶"),
+        (0x2F79, "M", "网"),
+        (0x2F7A, "M", "羊"),
+        (0x2F7B, "M", "羽"),
+        (0x2F7C, "M", "老"),
+        (0x2F7D, "M", "而"),
     ]
 
+
 def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F7E, 'M', '耒'),
-    (0x2F7F, 'M', '耳'),
-    (0x2F80, 'M', '聿'),
-    (0x2F81, 'M', '肉'),
-    (0x2F82, 'M', '臣'),
-    (0x2F83, 'M', '自'),
-    (0x2F84, 'M', '至'),
-    (0x2F85, 'M', '臼'),
-    (0x2F86, 'M', '舌'),
-    (0x2F87, 'M', '舛'),
-    (0x2F88, 'M', '舟'),
-    (0x2F89, 'M', '艮'),
-    (0x2F8A, 'M', '色'),
-    (0x2F8B, 'M', '艸'),
-    (0x2F8C, 'M', '虍'),
-    (0x2F8D, 'M', '虫'),
-    (0x2F8E, 'M', '血'),
-    (0x2F8F, 'M', '行'),
-    (0x2F90, 'M', '衣'),
-    (0x2F91, 'M', '襾'),
-    (0x2F92, 'M', '見'),
-    (0x2F93, 'M', '角'),
-    (0x2F94, 'M', '言'),
-    (0x2F95, 'M', '谷'),
-    (0x2F96, 'M', '豆'),
-    (0x2F97, 'M', '豕'),
-    (0x2F98, 'M', '豸'),
-    (0x2F99, 'M', '貝'),
-    (0x2F9A, 'M', '赤'),
-    (0x2F9B, 'M', '走'),
-    (0x2F9C, 'M', '足'),
-    (0x2F9D, 'M', '身'),
-    (0x2F9E, 'M', '車'),
-    (0x2F9F, 'M', '辛'),
-    (0x2FA0, 'M', '辰'),
-    (0x2FA1, 'M', '辵'),
-    (0x2FA2, 'M', '邑'),
-    (0x2FA3, 'M', '酉'),
-    (0x2FA4, 'M', '釆'),
-    (0x2FA5, 'M', '里'),
-    (0x2FA6, 'M', '金'),
-    (0x2FA7, 'M', '長'),
-    (0x2FA8, 'M', '門'),
-    (0x2FA9, 'M', '阜'),
-    (0x2FAA, 'M', '隶'),
-    (0x2FAB, 'M', '隹'),
-    (0x2FAC, 'M', '雨'),
-    (0x2FAD, 'M', '靑'),
-    (0x2FAE, 'M', '非'),
-    (0x2FAF, 'M', '面'),
-    (0x2FB0, 'M', '革'),
-    (0x2FB1, 'M', '韋'),
-    (0x2FB2, 'M', '韭'),
-    (0x2FB3, 'M', '音'),
-    (0x2FB4, 'M', '頁'),
-    (0x2FB5, 'M', '風'),
-    (0x2FB6, 'M', '飛'),
-    (0x2FB7, 'M', '食'),
-    (0x2FB8, 'M', '首'),
-    (0x2FB9, 'M', '香'),
-    (0x2FBA, 'M', '馬'),
-    (0x2FBB, 'M', '骨'),
-    (0x2FBC, 'M', '高'),
-    (0x2FBD, 'M', '髟'),
-    (0x2FBE, 'M', '鬥'),
-    (0x2FBF, 'M', '鬯'),
-    (0x2FC0, 'M', '鬲'),
-    (0x2FC1, 'M', '鬼'),
-    (0x2FC2, 'M', '魚'),
-    (0x2FC3, 'M', '鳥'),
-    (0x2FC4, 'M', '鹵'),
-    (0x2FC5, 'M', '鹿'),
-    (0x2FC6, 'M', '麥'),
-    (0x2FC7, 'M', '麻'),
-    (0x2FC8, 'M', '黃'),
-    (0x2FC9, 'M', '黍'),
-    (0x2FCA, 'M', '黑'),
-    (0x2FCB, 'M', '黹'),
-    (0x2FCC, 'M', '黽'),
-    (0x2FCD, 'M', '鼎'),
-    (0x2FCE, 'M', '鼓'),
-    (0x2FCF, 'M', '鼠'),
-    (0x2FD0, 'M', '鼻'),
-    (0x2FD1, 'M', '齊'),
-    (0x2FD2, 'M', '齒'),
-    (0x2FD3, 'M', '龍'),
-    (0x2FD4, 'M', '龜'),
-    (0x2FD5, 'M', '龠'),
-    (0x2FD6, 'X'),
-    (0x3000, '3', ' '),
-    (0x3001, 'V'),
-    (0x3002, 'M', '.'),
-    (0x3003, 'V'),
-    (0x3036, 'M', '〒'),
-    (0x3037, 'V'),
-    (0x3038, 'M', '十'),
-    (0x3039, 'M', '卄'),
-    (0x303A, 'M', '卅'),
-    (0x303B, 'V'),
-    (0x3040, 'X'),
+        (0x2F7E, "M", "耒"),
+        (0x2F7F, "M", "耳"),
+        (0x2F80, "M", "聿"),
+        (0x2F81, "M", "肉"),
+        (0x2F82, "M", "臣"),
+        (0x2F83, "M", "自"),
+        (0x2F84, "M", "至"),
+        (0x2F85, "M", "臼"),
+        (0x2F86, "M", "舌"),
+        (0x2F87, "M", "舛"),
+        (0x2F88, "M", "舟"),
+        (0x2F89, "M", "艮"),
+        (0x2F8A, "M", "色"),
+        (0x2F8B, "M", "艸"),
+        (0x2F8C, "M", "虍"),
+        (0x2F8D, "M", "虫"),
+        (0x2F8E, "M", "血"),
+        (0x2F8F, "M", "行"),
+        (0x2F90, "M", "衣"),
+        (0x2F91, "M", "襾"),
+        (0x2F92, "M", "見"),
+        (0x2F93, "M", "角"),
+        (0x2F94, "M", "言"),
+        (0x2F95, "M", "谷"),
+        (0x2F96, "M", "豆"),
+        (0x2F97, "M", "豕"),
+        (0x2F98, "M", "豸"),
+        (0x2F99, "M", "貝"),
+        (0x2F9A, "M", "赤"),
+        (0x2F9B, "M", "走"),
+        (0x2F9C, "M", "足"),
+        (0x2F9D, "M", "身"),
+        (0x2F9E, "M", "車"),
+        (0x2F9F, "M", "辛"),
+        (0x2FA0, "M", "辰"),
+        (0x2FA1, "M", "辵"),
+        (0x2FA2, "M", "邑"),
+        (0x2FA3, "M", "酉"),
+        (0x2FA4, "M", "釆"),
+        (0x2FA5, "M", "里"),
+        (0x2FA6, "M", "金"),
+        (0x2FA7, "M", "長"),
+        (0x2FA8, "M", "門"),
+        (0x2FA9, "M", "阜"),
+        (0x2FAA, "M", "隶"),
+        (0x2FAB, "M", "隹"),
+        (0x2FAC, "M", "雨"),
+        (0x2FAD, "M", "靑"),
+        (0x2FAE, "M", "非"),
+        (0x2FAF, "M", "面"),
+        (0x2FB0, "M", "革"),
+        (0x2FB1, "M", "韋"),
+        (0x2FB2, "M", "韭"),
+        (0x2FB3, "M", "音"),
+        (0x2FB4, "M", "頁"),
+        (0x2FB5, "M", "風"),
+        (0x2FB6, "M", "飛"),
+        (0x2FB7, "M", "食"),
+        (0x2FB8, "M", "首"),
+        (0x2FB9, "M", "香"),
+        (0x2FBA, "M", "馬"),
+        (0x2FBB, "M", "骨"),
+        (0x2FBC, "M", "高"),
+        (0x2FBD, "M", "髟"),
+        (0x2FBE, "M", "鬥"),
+        (0x2FBF, "M", "鬯"),
+        (0x2FC0, "M", "鬲"),
+        (0x2FC1, "M", "鬼"),
+        (0x2FC2, "M", "魚"),
+        (0x2FC3, "M", "鳥"),
+        (0x2FC4, "M", "鹵"),
+        (0x2FC5, "M", "鹿"),
+        (0x2FC6, "M", "麥"),
+        (0x2FC7, "M", "麻"),
+        (0x2FC8, "M", "黃"),
+        (0x2FC9, "M", "黍"),
+        (0x2FCA, "M", "黑"),
+        (0x2FCB, "M", "黹"),
+        (0x2FCC, "M", "黽"),
+        (0x2FCD, "M", "鼎"),
+        (0x2FCE, "M", "鼓"),
+        (0x2FCF, "M", "鼠"),
+        (0x2FD0, "M", "鼻"),
+        (0x2FD1, "M", "齊"),
+        (0x2FD2, "M", "齒"),
+        (0x2FD3, "M", "龍"),
+        (0x2FD4, "M", "龜"),
+        (0x2FD5, "M", "龠"),
+        (0x2FD6, "X"),
+        (0x3000, "3", " "),
+        (0x3001, "V"),
+        (0x3002, "M", "."),
+        (0x3003, "V"),
+        (0x3036, "M", "〒"),
+        (0x3037, "V"),
+        (0x3038, "M", "十"),
+        (0x3039, "M", "卄"),
+        (0x303A, "M", "卅"),
+        (0x303B, "V"),
+        (0x3040, "X"),
     ]
 
+
 def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x3041, 'V'),
-    (0x3097, 'X'),
-    (0x3099, 'V'),
-    (0x309B, '3', ' ゙'),
-    (0x309C, '3', ' ゚'),
-    (0x309D, 'V'),
-    (0x309F, 'M', 'より'),
-    (0x30A0, 'V'),
-    (0x30FF, 'M', 'コト'),
-    (0x3100, 'X'),
-    (0x3105, 'V'),
-    (0x3130, 'X'),
-    (0x3131, 'M', 'ᄀ'),
-    (0x3132, 'M', 'ᄁ'),
-    (0x3133, 'M', 'ᆪ'),
-    (0x3134, 'M', 'ᄂ'),
-    (0x3135, 'M', 'ᆬ'),
-    (0x3136, 'M', 'ᆭ'),
-    (0x3137, 'M', 'ᄃ'),
-    (0x3138, 'M', 'ᄄ'),
-    (0x3139, 'M', 'ᄅ'),
-    (0x313A, 'M', 'ᆰ'),
-    (0x313B, 'M', 'ᆱ'),
-    (0x313C, 'M', 'ᆲ'),
-    (0x313D, 'M', 'ᆳ'),
-    (0x313E, 'M', 'ᆴ'),
-    (0x313F, 'M', 'ᆵ'),
-    (0x3140, 'M', 'ᄚ'),
-    (0x3141, 'M', 'ᄆ'),
-    (0x3142, 'M', 'ᄇ'),
-    (0x3143, 'M', 'ᄈ'),
-    (0x3144, 'M', 'ᄡ'),
-    (0x3145, 'M', 'ᄉ'),
-    (0x3146, 'M', 'ᄊ'),
-    (0x3147, 'M', 'ᄋ'),
-    (0x3148, 'M', 'ᄌ'),
-    (0x3149, 'M', 'ᄍ'),
-    (0x314A, 'M', 'ᄎ'),
-    (0x314B, 'M', 'ᄏ'),
-    (0x314C, 'M', 'ᄐ'),
-    (0x314D, 'M', 'ᄑ'),
-    (0x314E, 'M', 'ᄒ'),
-    (0x314F, 'M', 'ᅡ'),
-    (0x3150, 'M', 'ᅢ'),
-    (0x3151, 'M', 'ᅣ'),
-    (0x3152, 'M', 'ᅤ'),
-    (0x3153, 'M', 'ᅥ'),
-    (0x3154, 'M', 'ᅦ'),
-    (0x3155, 'M', 'ᅧ'),
-    (0x3156, 'M', 'ᅨ'),
-    (0x3157, 'M', 'ᅩ'),
-    (0x3158, 'M', 'ᅪ'),
-    (0x3159, 'M', 'ᅫ'),
-    (0x315A, 'M', 'ᅬ'),
-    (0x315B, 'M', 'ᅭ'),
-    (0x315C, 'M', 'ᅮ'),
-    (0x315D, 'M', 'ᅯ'),
-    (0x315E, 'M', 'ᅰ'),
-    (0x315F, 'M', 'ᅱ'),
-    (0x3160, 'M', 'ᅲ'),
-    (0x3161, 'M', 'ᅳ'),
-    (0x3162, 'M', 'ᅴ'),
-    (0x3163, 'M', 'ᅵ'),
-    (0x3164, 'X'),
-    (0x3165, 'M', 'ᄔ'),
-    (0x3166, 'M', 'ᄕ'),
-    (0x3167, 'M', 'ᇇ'),
-    (0x3168, 'M', 'ᇈ'),
-    (0x3169, 'M', 'ᇌ'),
-    (0x316A, 'M', 'ᇎ'),
-    (0x316B, 'M', 'ᇓ'),
-    (0x316C, 'M', 'ᇗ'),
-    (0x316D, 'M', 'ᇙ'),
-    (0x316E, 'M', 'ᄜ'),
-    (0x316F, 'M', 'ᇝ'),
-    (0x3170, 'M', 'ᇟ'),
-    (0x3171, 'M', 'ᄝ'),
-    (0x3172, 'M', 'ᄞ'),
-    (0x3173, 'M', 'ᄠ'),
-    (0x3174, 'M', 'ᄢ'),
-    (0x3175, 'M', 'ᄣ'),
-    (0x3176, 'M', 'ᄧ'),
-    (0x3177, 'M', 'ᄩ'),
-    (0x3178, 'M', 'ᄫ'),
-    (0x3179, 'M', 'ᄬ'),
-    (0x317A, 'M', 'ᄭ'),
-    (0x317B, 'M', 'ᄮ'),
-    (0x317C, 'M', 'ᄯ'),
-    (0x317D, 'M', 'ᄲ'),
-    (0x317E, 'M', 'ᄶ'),
-    (0x317F, 'M', 'ᅀ'),
-    (0x3180, 'M', 'ᅇ'),
-    (0x3181, 'M', 'ᅌ'),
-    (0x3182, 'M', 'ᇱ'),
-    (0x3183, 'M', 'ᇲ'),
-    (0x3184, 'M', 'ᅗ'),
-    (0x3185, 'M', 'ᅘ'),
-    (0x3186, 'M', 'ᅙ'),
-    (0x3187, 'M', 'ᆄ'),
-    (0x3188, 'M', 'ᆅ'),
+        (0x3041, "V"),
+        (0x3097, "X"),
+        (0x3099, "V"),
+        (0x309B, "3", " ゙"),
+        (0x309C, "3", " ゚"),
+        (0x309D, "V"),
+        (0x309F, "M", "より"),
+        (0x30A0, "V"),
+        (0x30FF, "M", "コト"),
+        (0x3100, "X"),
+        (0x3105, "V"),
+        (0x3130, "X"),
+        (0x3131, "M", "ᄀ"),
+        (0x3132, "M", "ᄁ"),
+        (0x3133, "M", "ᆪ"),
+        (0x3134, "M", "ᄂ"),
+        (0x3135, "M", "ᆬ"),
+        (0x3136, "M", "ᆭ"),
+        (0x3137, "M", "ᄃ"),
+        (0x3138, "M", "ᄄ"),
+        (0x3139, "M", "ᄅ"),
+        (0x313A, "M", "ᆰ"),
+        (0x313B, "M", "ᆱ"),
+        (0x313C, "M", "ᆲ"),
+        (0x313D, "M", "ᆳ"),
+        (0x313E, "M", "ᆴ"),
+        (0x313F, "M", "ᆵ"),
+        (0x3140, "M", "ᄚ"),
+        (0x3141, "M", "ᄆ"),
+        (0x3142, "M", "ᄇ"),
+        (0x3143, "M", "ᄈ"),
+        (0x3144, "M", "ᄡ"),
+        (0x3145, "M", "ᄉ"),
+        (0x3146, "M", "ᄊ"),
+        (0x3147, "M", "ᄋ"),
+        (0x3148, "M", "ᄌ"),
+        (0x3149, "M", "ᄍ"),
+        (0x314A, "M", "ᄎ"),
+        (0x314B, "M", "ᄏ"),
+        (0x314C, "M", "ᄐ"),
+        (0x314D, "M", "ᄑ"),
+        (0x314E, "M", "ᄒ"),
+        (0x314F, "M", "ᅡ"),
+        (0x3150, "M", "ᅢ"),
+        (0x3151, "M", "ᅣ"),
+        (0x3152, "M", "ᅤ"),
+        (0x3153, "M", "ᅥ"),
+        (0x3154, "M", "ᅦ"),
+        (0x3155, "M", "ᅧ"),
+        (0x3156, "M", "ᅨ"),
+        (0x3157, "M", "ᅩ"),
+        (0x3158, "M", "ᅪ"),
+        (0x3159, "M", "ᅫ"),
+        (0x315A, "M", "ᅬ"),
+        (0x315B, "M", "ᅭ"),
+        (0x315C, "M", "ᅮ"),
+        (0x315D, "M", "ᅯ"),
+        (0x315E, "M", "ᅰ"),
+        (0x315F, "M", "ᅱ"),
+        (0x3160, "M", "ᅲ"),
+        (0x3161, "M", "ᅳ"),
+        (0x3162, "M", "ᅴ"),
+        (0x3163, "M", "ᅵ"),
+        (0x3164, "X"),
+        (0x3165, "M", "ᄔ"),
+        (0x3166, "M", "ᄕ"),
+        (0x3167, "M", "ᇇ"),
+        (0x3168, "M", "ᇈ"),
+        (0x3169, "M", "ᇌ"),
+        (0x316A, "M", "ᇎ"),
+        (0x316B, "M", "ᇓ"),
+        (0x316C, "M", "ᇗ"),
+        (0x316D, "M", "ᇙ"),
+        (0x316E, "M", "ᄜ"),
+        (0x316F, "M", "ᇝ"),
+        (0x3170, "M", "ᇟ"),
+        (0x3171, "M", "ᄝ"),
+        (0x3172, "M", "ᄞ"),
+        (0x3173, "M", "ᄠ"),
+        (0x3174, "M", "ᄢ"),
+        (0x3175, "M", "ᄣ"),
+        (0x3176, "M", "ᄧ"),
+        (0x3177, "M", "ᄩ"),
+        (0x3178, "M", "ᄫ"),
+        (0x3179, "M", "ᄬ"),
+        (0x317A, "M", "ᄭ"),
+        (0x317B, "M", "ᄮ"),
+        (0x317C, "M", "ᄯ"),
+        (0x317D, "M", "ᄲ"),
+        (0x317E, "M", "ᄶ"),
+        (0x317F, "M", "ᅀ"),
+        (0x3180, "M", "ᅇ"),
+        (0x3181, "M", "ᅌ"),
+        (0x3182, "M", "ᇱ"),
+        (0x3183, "M", "ᇲ"),
+        (0x3184, "M", "ᅗ"),
+        (0x3185, "M", "ᅘ"),
+        (0x3186, "M", "ᅙ"),
+        (0x3187, "M", "ᆄ"),
+        (0x3188, "M", "ᆅ"),
     ]
 
+
 def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x3189, 'M', 'ᆈ'),
-    (0x318A, 'M', 'ᆑ'),
-    (0x318B, 'M', 'ᆒ'),
-    (0x318C, 'M', 'ᆔ'),
-    (0x318D, 'M', 'ᆞ'),
-    (0x318E, 'M', 'ᆡ'),
-    (0x318F, 'X'),
-    (0x3190, 'V'),
-    (0x3192, 'M', '一'),
-    (0x3193, 'M', '二'),
-    (0x3194, 'M', '三'),
-    (0x3195, 'M', '四'),
-    (0x3196, 'M', '上'),
-    (0x3197, 'M', '中'),
-    (0x3198, 'M', '下'),
-    (0x3199, 'M', '甲'),
-    (0x319A, 'M', '乙'),
-    (0x319B, 'M', '丙'),
-    (0x319C, 'M', '丁'),
-    (0x319D, 'M', '天'),
-    (0x319E, 'M', '地'),
-    (0x319F, 'M', '人'),
-    (0x31A0, 'V'),
-    (0x31E4, 'X'),
-    (0x31F0, 'V'),
-    (0x3200, '3', '(ᄀ)'),
-    (0x3201, '3', '(ᄂ)'),
-    (0x3202, '3', '(ᄃ)'),
-    (0x3203, '3', '(ᄅ)'),
-    (0x3204, '3', '(ᄆ)'),
-    (0x3205, '3', '(ᄇ)'),
-    (0x3206, '3', '(ᄉ)'),
-    (0x3207, '3', '(ᄋ)'),
-    (0x3208, '3', '(ᄌ)'),
-    (0x3209, '3', '(ᄎ)'),
-    (0x320A, '3', '(ᄏ)'),
-    (0x320B, '3', '(ᄐ)'),
-    (0x320C, '3', '(ᄑ)'),
-    (0x320D, '3', '(ᄒ)'),
-    (0x320E, '3', '(가)'),
-    (0x320F, '3', '(나)'),
-    (0x3210, '3', '(다)'),
-    (0x3211, '3', '(라)'),
-    (0x3212, '3', '(마)'),
-    (0x3213, '3', '(바)'),
-    (0x3214, '3', '(사)'),
-    (0x3215, '3', '(아)'),
-    (0x3216, '3', '(자)'),
-    (0x3217, '3', '(차)'),
-    (0x3218, '3', '(카)'),
-    (0x3219, '3', '(타)'),
-    (0x321A, '3', '(파)'),
-    (0x321B, '3', '(하)'),
-    (0x321C, '3', '(주)'),
-    (0x321D, '3', '(오전)'),
-    (0x321E, '3', '(오후)'),
-    (0x321F, 'X'),
-    (0x3220, '3', '(一)'),
-    (0x3221, '3', '(二)'),
-    (0x3222, '3', '(三)'),
-    (0x3223, '3', '(四)'),
-    (0x3224, '3', '(五)'),
-    (0x3225, '3', '(六)'),
-    (0x3226, '3', '(七)'),
-    (0x3227, '3', '(八)'),
-    (0x3228, '3', '(九)'),
-    (0x3229, '3', '(十)'),
-    (0x322A, '3', '(月)'),
-    (0x322B, '3', '(火)'),
-    (0x322C, '3', '(水)'),
-    (0x322D, '3', '(木)'),
-    (0x322E, '3', '(金)'),
-    (0x322F, '3', '(土)'),
-    (0x3230, '3', '(日)'),
-    (0x3231, '3', '(株)'),
-    (0x3232, '3', '(有)'),
-    (0x3233, '3', '(社)'),
-    (0x3234, '3', '(名)'),
-    (0x3235, '3', '(特)'),
-    (0x3236, '3', '(財)'),
-    (0x3237, '3', '(祝)'),
-    (0x3238, '3', '(労)'),
-    (0x3239, '3', '(代)'),
-    (0x323A, '3', '(呼)'),
-    (0x323B, '3', '(学)'),
-    (0x323C, '3', '(監)'),
-    (0x323D, '3', '(企)'),
-    (0x323E, '3', '(資)'),
-    (0x323F, '3', '(協)'),
-    (0x3240, '3', '(祭)'),
-    (0x3241, '3', '(休)'),
-    (0x3242, '3', '(自)'),
-    (0x3243, '3', '(至)'),
-    (0x3244, 'M', '問'),
-    (0x3245, 'M', '幼'),
-    (0x3246, 'M', '文'),
-    (0x3247, 'M', '箏'),
-    (0x3248, 'V'),
-    (0x3250, 'M', 'pte'),
-    (0x3251, 'M', '21'),
+        (0x3189, "M", "ᆈ"),
+        (0x318A, "M", "ᆑ"),
+        (0x318B, "M", "ᆒ"),
+        (0x318C, "M", "ᆔ"),
+        (0x318D, "M", "ᆞ"),
+        (0x318E, "M", "ᆡ"),
+        (0x318F, "X"),
+        (0x3190, "V"),
+        (0x3192, "M", "一"),
+        (0x3193, "M", "二"),
+        (0x3194, "M", "三"),
+        (0x3195, "M", "四"),
+        (0x3196, "M", "上"),
+        (0x3197, "M", "中"),
+        (0x3198, "M", "下"),
+        (0x3199, "M", "甲"),
+        (0x319A, "M", "乙"),
+        (0x319B, "M", "丙"),
+        (0x319C, "M", "丁"),
+        (0x319D, "M", "天"),
+        (0x319E, "M", "地"),
+        (0x319F, "M", "人"),
+        (0x31A0, "V"),
+        (0x31E4, "X"),
+        (0x31F0, "V"),
+        (0x3200, "3", "(ᄀ)"),
+        (0x3201, "3", "(ᄂ)"),
+        (0x3202, "3", "(ᄃ)"),
+        (0x3203, "3", "(ᄅ)"),
+        (0x3204, "3", "(ᄆ)"),
+        (0x3205, "3", "(ᄇ)"),
+        (0x3206, "3", "(ᄉ)"),
+        (0x3207, "3", "(ᄋ)"),
+        (0x3208, "3", "(ᄌ)"),
+        (0x3209, "3", "(ᄎ)"),
+        (0x320A, "3", "(ᄏ)"),
+        (0x320B, "3", "(ᄐ)"),
+        (0x320C, "3", "(ᄑ)"),
+        (0x320D, "3", "(ᄒ)"),
+        (0x320E, "3", "(가)"),
+        (0x320F, "3", "(나)"),
+        (0x3210, "3", "(다)"),
+        (0x3211, "3", "(라)"),
+        (0x3212, "3", "(마)"),
+        (0x3213, "3", "(바)"),
+        (0x3214, "3", "(사)"),
+        (0x3215, "3", "(아)"),
+        (0x3216, "3", "(자)"),
+        (0x3217, "3", "(차)"),
+        (0x3218, "3", "(카)"),
+        (0x3219, "3", "(타)"),
+        (0x321A, "3", "(파)"),
+        (0x321B, "3", "(하)"),
+        (0x321C, "3", "(주)"),
+        (0x321D, "3", "(오전)"),
+        (0x321E, "3", "(오후)"),
+        (0x321F, "X"),
+        (0x3220, "3", "(一)"),
+        (0x3221, "3", "(二)"),
+        (0x3222, "3", "(三)"),
+        (0x3223, "3", "(四)"),
+        (0x3224, "3", "(五)"),
+        (0x3225, "3", "(六)"),
+        (0x3226, "3", "(七)"),
+        (0x3227, "3", "(八)"),
+        (0x3228, "3", "(九)"),
+        (0x3229, "3", "(十)"),
+        (0x322A, "3", "(月)"),
+        (0x322B, "3", "(火)"),
+        (0x322C, "3", "(水)"),
+        (0x322D, "3", "(木)"),
+        (0x322E, "3", "(金)"),
+        (0x322F, "3", "(土)"),
+        (0x3230, "3", "(日)"),
+        (0x3231, "3", "(株)"),
+        (0x3232, "3", "(有)"),
+        (0x3233, "3", "(社)"),
+        (0x3234, "3", "(名)"),
+        (0x3235, "3", "(特)"),
+        (0x3236, "3", "(財)"),
+        (0x3237, "3", "(祝)"),
+        (0x3238, "3", "(労)"),
+        (0x3239, "3", "(代)"),
+        (0x323A, "3", "(呼)"),
+        (0x323B, "3", "(学)"),
+        (0x323C, "3", "(監)"),
+        (0x323D, "3", "(企)"),
+        (0x323E, "3", "(資)"),
+        (0x323F, "3", "(協)"),
+        (0x3240, "3", "(祭)"),
+        (0x3241, "3", "(休)"),
+        (0x3242, "3", "(自)"),
+        (0x3243, "3", "(至)"),
+        (0x3244, "M", "問"),
+        (0x3245, "M", "幼"),
+        (0x3246, "M", "文"),
+        (0x3247, "M", "箏"),
+        (0x3248, "V"),
+        (0x3250, "M", "pte"),
+        (0x3251, "M", "21"),
     ]
 
+
 def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x3252, 'M', '22'),
-    (0x3253, 'M', '23'),
-    (0x3254, 'M', '24'),
-    (0x3255, 'M', '25'),
-    (0x3256, 'M', '26'),
-    (0x3257, 'M', '27'),
-    (0x3258, 'M', '28'),
-    (0x3259, 'M', '29'),
-    (0x325A, 'M', '30'),
-    (0x325B, 'M', '31'),
-    (0x325C, 'M', '32'),
-    (0x325D, 'M', '33'),
-    (0x325E, 'M', '34'),
-    (0x325F, 'M', '35'),
-    (0x3260, 'M', 'ᄀ'),
-    (0x3261, 'M', 'ᄂ'),
-    (0x3262, 'M', 'ᄃ'),
-    (0x3263, 'M', 'ᄅ'),
-    (0x3264, 'M', 'ᄆ'),
-    (0x3265, 'M', 'ᄇ'),
-    (0x3266, 'M', 'ᄉ'),
-    (0x3267, 'M', 'ᄋ'),
-    (0x3268, 'M', 'ᄌ'),
-    (0x3269, 'M', 'ᄎ'),
-    (0x326A, 'M', 'ᄏ'),
-    (0x326B, 'M', 'ᄐ'),
-    (0x326C, 'M', 'ᄑ'),
-    (0x326D, 'M', 'ᄒ'),
-    (0x326E, 'M', '가'),
-    (0x326F, 'M', '나'),
-    (0x3270, 'M', '다'),
-    (0x3271, 'M', '라'),
-    (0x3272, 'M', '마'),
-    (0x3273, 'M', '바'),
-    (0x3274, 'M', '사'),
-    (0x3275, 'M', '아'),
-    (0x3276, 'M', '자'),
-    (0x3277, 'M', '차'),
-    (0x3278, 'M', '카'),
-    (0x3279, 'M', '타'),
-    (0x327A, 'M', '파'),
-    (0x327B, 'M', '하'),
-    (0x327C, 'M', '참고'),
-    (0x327D, 'M', '주의'),
-    (0x327E, 'M', '우'),
-    (0x327F, 'V'),
-    (0x3280, 'M', '一'),
-    (0x3281, 'M', '二'),
-    (0x3282, 'M', '三'),
-    (0x3283, 'M', '四'),
-    (0x3284, 'M', '五'),
-    (0x3285, 'M', '六'),
-    (0x3286, 'M', '七'),
-    (0x3287, 'M', '八'),
-    (0x3288, 'M', '九'),
-    (0x3289, 'M', '十'),
-    (0x328A, 'M', '月'),
-    (0x328B, 'M', '火'),
-    (0x328C, 'M', '水'),
-    (0x328D, 'M', '木'),
-    (0x328E, 'M', '金'),
-    (0x328F, 'M', '土'),
-    (0x3290, 'M', '日'),
-    (0x3291, 'M', '株'),
-    (0x3292, 'M', '有'),
-    (0x3293, 'M', '社'),
-    (0x3294, 'M', '名'),
-    (0x3295, 'M', '特'),
-    (0x3296, 'M', '財'),
-    (0x3297, 'M', '祝'),
-    (0x3298, 'M', '労'),
-    (0x3299, 'M', '秘'),
-    (0x329A, 'M', '男'),
-    (0x329B, 'M', '女'),
-    (0x329C, 'M', '適'),
-    (0x329D, 'M', '優'),
-    (0x329E, 'M', '印'),
-    (0x329F, 'M', '注'),
-    (0x32A0, 'M', '項'),
-    (0x32A1, 'M', '休'),
-    (0x32A2, 'M', '写'),
-    (0x32A3, 'M', '正'),
-    (0x32A4, 'M', '上'),
-    (0x32A5, 'M', '中'),
-    (0x32A6, 'M', '下'),
-    (0x32A7, 'M', '左'),
-    (0x32A8, 'M', '右'),
-    (0x32A9, 'M', '医'),
-    (0x32AA, 'M', '宗'),
-    (0x32AB, 'M', '学'),
-    (0x32AC, 'M', '監'),
-    (0x32AD, 'M', '企'),
-    (0x32AE, 'M', '資'),
-    (0x32AF, 'M', '協'),
-    (0x32B0, 'M', '夜'),
-    (0x32B1, 'M', '36'),
-    (0x32B2, 'M', '37'),
-    (0x32B3, 'M', '38'),
-    (0x32B4, 'M', '39'),
-    (0x32B5, 'M', '40'),
+        (0x3252, "M", "22"),
+        (0x3253, "M", "23"),
+        (0x3254, "M", "24"),
+        (0x3255, "M", "25"),
+        (0x3256, "M", "26"),
+        (0x3257, "M", "27"),
+        (0x3258, "M", "28"),
+        (0x3259, "M", "29"),
+        (0x325A, "M", "30"),
+        (0x325B, "M", "31"),
+        (0x325C, "M", "32"),
+        (0x325D, "M", "33"),
+        (0x325E, "M", "34"),
+        (0x325F, "M", "35"),
+        (0x3260, "M", "ᄀ"),
+        (0x3261, "M", "ᄂ"),
+        (0x3262, "M", "ᄃ"),
+        (0x3263, "M", "ᄅ"),
+        (0x3264, "M", "ᄆ"),
+        (0x3265, "M", "ᄇ"),
+        (0x3266, "M", "ᄉ"),
+        (0x3267, "M", "ᄋ"),
+        (0x3268, "M", "ᄌ"),
+        (0x3269, "M", "ᄎ"),
+        (0x326A, "M", "ᄏ"),
+        (0x326B, "M", "ᄐ"),
+        (0x326C, "M", "ᄑ"),
+        (0x326D, "M", "ᄒ"),
+        (0x326E, "M", "가"),
+        (0x326F, "M", "나"),
+        (0x3270, "M", "다"),
+        (0x3271, "M", "라"),
+        (0x3272, "M", "마"),
+        (0x3273, "M", "바"),
+        (0x3274, "M", "사"),
+        (0x3275, "M", "아"),
+        (0x3276, "M", "자"),
+        (0x3277, "M", "차"),
+        (0x3278, "M", "카"),
+        (0x3279, "M", "타"),
+        (0x327A, "M", "파"),
+        (0x327B, "M", "하"),
+        (0x327C, "M", "참고"),
+        (0x327D, "M", "주의"),
+        (0x327E, "M", "우"),
+        (0x327F, "V"),
+        (0x3280, "M", "一"),
+        (0x3281, "M", "二"),
+        (0x3282, "M", "三"),
+        (0x3283, "M", "四"),
+        (0x3284, "M", "五"),
+        (0x3285, "M", "六"),
+        (0x3286, "M", "七"),
+        (0x3287, "M", "八"),
+        (0x3288, "M", "九"),
+        (0x3289, "M", "十"),
+        (0x328A, "M", "月"),
+        (0x328B, "M", "火"),
+        (0x328C, "M", "水"),
+        (0x328D, "M", "木"),
+        (0x328E, "M", "金"),
+        (0x328F, "M", "土"),
+        (0x3290, "M", "日"),
+        (0x3291, "M", "株"),
+        (0x3292, "M", "有"),
+        (0x3293, "M", "社"),
+        (0x3294, "M", "名"),
+        (0x3295, "M", "特"),
+        (0x3296, "M", "財"),
+        (0x3297, "M", "祝"),
+        (0x3298, "M", "労"),
+        (0x3299, "M", "秘"),
+        (0x329A, "M", "男"),
+        (0x329B, "M", "女"),
+        (0x329C, "M", "適"),
+        (0x329D, "M", "優"),
+        (0x329E, "M", "印"),
+        (0x329F, "M", "注"),
+        (0x32A0, "M", "項"),
+        (0x32A1, "M", "休"),
+        (0x32A2, "M", "写"),
+        (0x32A3, "M", "正"),
+        (0x32A4, "M", "上"),
+        (0x32A5, "M", "中"),
+        (0x32A6, "M", "下"),
+        (0x32A7, "M", "左"),
+        (0x32A8, "M", "右"),
+        (0x32A9, "M", "医"),
+        (0x32AA, "M", "宗"),
+        (0x32AB, "M", "学"),
+        (0x32AC, "M", "監"),
+        (0x32AD, "M", "企"),
+        (0x32AE, "M", "資"),
+        (0x32AF, "M", "協"),
+        (0x32B0, "M", "夜"),
+        (0x32B1, "M", "36"),
+        (0x32B2, "M", "37"),
+        (0x32B3, "M", "38"),
+        (0x32B4, "M", "39"),
+        (0x32B5, "M", "40"),
     ]
 
+
 def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x32B6, 'M', '41'),
-    (0x32B7, 'M', '42'),
-    (0x32B8, 'M', '43'),
-    (0x32B9, 'M', '44'),
-    (0x32BA, 'M', '45'),
-    (0x32BB, 'M', '46'),
-    (0x32BC, 'M', '47'),
-    (0x32BD, 'M', '48'),
-    (0x32BE, 'M', '49'),
-    (0x32BF, 'M', '50'),
-    (0x32C0, 'M', '1月'),
-    (0x32C1, 'M', '2月'),
-    (0x32C2, 'M', '3月'),
-    (0x32C3, 'M', '4月'),
-    (0x32C4, 'M', '5月'),
-    (0x32C5, 'M', '6月'),
-    (0x32C6, 'M', '7月'),
-    (0x32C7, 'M', '8月'),
-    (0x32C8, 'M', '9月'),
-    (0x32C9, 'M', '10月'),
-    (0x32CA, 'M', '11月'),
-    (0x32CB, 'M', '12月'),
-    (0x32CC, 'M', 'hg'),
-    (0x32CD, 'M', 'erg'),
-    (0x32CE, 'M', 'ev'),
-    (0x32CF, 'M', 'ltd'),
-    (0x32D0, 'M', 'ア'),
-    (0x32D1, 'M', 'イ'),
-    (0x32D2, 'M', 'ウ'),
-    (0x32D3, 'M', 'エ'),
-    (0x32D4, 'M', 'オ'),
-    (0x32D5, 'M', 'カ'),
-    (0x32D6, 'M', 'キ'),
-    (0x32D7, 'M', 'ク'),
-    (0x32D8, 'M', 'ケ'),
-    (0x32D9, 'M', 'コ'),
-    (0x32DA, 'M', 'サ'),
-    (0x32DB, 'M', 'シ'),
-    (0x32DC, 'M', 'ス'),
-    (0x32DD, 'M', 'セ'),
-    (0x32DE, 'M', 'ソ'),
-    (0x32DF, 'M', 'タ'),
-    (0x32E0, 'M', 'チ'),
-    (0x32E1, 'M', 'ツ'),
-    (0x32E2, 'M', 'テ'),
-    (0x32E3, 'M', 'ト'),
-    (0x32E4, 'M', 'ナ'),
-    (0x32E5, 'M', 'ニ'),
-    (0x32E6, 'M', 'ヌ'),
-    (0x32E7, 'M', 'ネ'),
-    (0x32E8, 'M', 'ノ'),
-    (0x32E9, 'M', 'ハ'),
-    (0x32EA, 'M', 'ヒ'),
-    (0x32EB, 'M', 'フ'),
-    (0x32EC, 'M', 'ヘ'),
-    (0x32ED, 'M', 'ホ'),
-    (0x32EE, 'M', 'マ'),
-    (0x32EF, 'M', 'ミ'),
-    (0x32F0, 'M', 'ム'),
-    (0x32F1, 'M', 'メ'),
-    (0x32F2, 'M', 'モ'),
-    (0x32F3, 'M', 'ヤ'),
-    (0x32F4, 'M', 'ユ'),
-    (0x32F5, 'M', 'ヨ'),
-    (0x32F6, 'M', 'ラ'),
-    (0x32F7, 'M', 'リ'),
-    (0x32F8, 'M', 'ル'),
-    (0x32F9, 'M', 'レ'),
-    (0x32FA, 'M', 'ロ'),
-    (0x32FB, 'M', 'ワ'),
-    (0x32FC, 'M', 'ヰ'),
-    (0x32FD, 'M', 'ヱ'),
-    (0x32FE, 'M', 'ヲ'),
-    (0x32FF, 'M', '令和'),
-    (0x3300, 'M', 'アパート'),
-    (0x3301, 'M', 'アルファ'),
-    (0x3302, 'M', 'アンペア'),
-    (0x3303, 'M', 'アール'),
-    (0x3304, 'M', 'イニング'),
-    (0x3305, 'M', 'インチ'),
-    (0x3306, 'M', 'ウォン'),
-    (0x3307, 'M', 'エスクード'),
-    (0x3308, 'M', 'エーカー'),
-    (0x3309, 'M', 'オンス'),
-    (0x330A, 'M', 'オーム'),
-    (0x330B, 'M', 'カイリ'),
-    (0x330C, 'M', 'カラット'),
-    (0x330D, 'M', 'カロリー'),
-    (0x330E, 'M', 'ガロン'),
-    (0x330F, 'M', 'ガンマ'),
-    (0x3310, 'M', 'ギガ'),
-    (0x3311, 'M', 'ギニー'),
-    (0x3312, 'M', 'キュリー'),
-    (0x3313, 'M', 'ギルダー'),
-    (0x3314, 'M', 'キロ'),
-    (0x3315, 'M', 'キログラム'),
-    (0x3316, 'M', 'キロメートル'),
-    (0x3317, 'M', 'キロワット'),
-    (0x3318, 'M', 'グラム'),
-    (0x3319, 'M', 'グラムトン'),
+        (0x32B6, "M", "41"),
+        (0x32B7, "M", "42"),
+        (0x32B8, "M", "43"),
+        (0x32B9, "M", "44"),
+        (0x32BA, "M", "45"),
+        (0x32BB, "M", "46"),
+        (0x32BC, "M", "47"),
+        (0x32BD, "M", "48"),
+        (0x32BE, "M", "49"),
+        (0x32BF, "M", "50"),
+        (0x32C0, "M", "1月"),
+        (0x32C1, "M", "2月"),
+        (0x32C2, "M", "3月"),
+        (0x32C3, "M", "4月"),
+        (0x32C4, "M", "5月"),
+        (0x32C5, "M", "6月"),
+        (0x32C6, "M", "7月"),
+        (0x32C7, "M", "8月"),
+        (0x32C8, "M", "9月"),
+        (0x32C9, "M", "10月"),
+        (0x32CA, "M", "11月"),
+        (0x32CB, "M", "12月"),
+        (0x32CC, "M", "hg"),
+        (0x32CD, "M", "erg"),
+        (0x32CE, "M", "ev"),
+        (0x32CF, "M", "ltd"),
+        (0x32D0, "M", "ア"),
+        (0x32D1, "M", "イ"),
+        (0x32D2, "M", "ウ"),
+        (0x32D3, "M", "エ"),
+        (0x32D4, "M", "オ"),
+        (0x32D5, "M", "カ"),
+        (0x32D6, "M", "キ"),
+        (0x32D7, "M", "ク"),
+        (0x32D8, "M", "ケ"),
+        (0x32D9, "M", "コ"),
+        (0x32DA, "M", "サ"),
+        (0x32DB, "M", "シ"),
+        (0x32DC, "M", "ス"),
+        (0x32DD, "M", "セ"),
+        (0x32DE, "M", "ソ"),
+        (0x32DF, "M", "タ"),
+        (0x32E0, "M", "チ"),
+        (0x32E1, "M", "ツ"),
+        (0x32E2, "M", "テ"),
+        (0x32E3, "M", "ト"),
+        (0x32E4, "M", "ナ"),
+        (0x32E5, "M", "ニ"),
+        (0x32E6, "M", "ヌ"),
+        (0x32E7, "M", "ネ"),
+        (0x32E8, "M", "ノ"),
+        (0x32E9, "M", "ハ"),
+        (0x32EA, "M", "ヒ"),
+        (0x32EB, "M", "フ"),
+        (0x32EC, "M", "ヘ"),
+        (0x32ED, "M", "ホ"),
+        (0x32EE, "M", "マ"),
+        (0x32EF, "M", "ミ"),
+        (0x32F0, "M", "ム"),
+        (0x32F1, "M", "メ"),
+        (0x32F2, "M", "モ"),
+        (0x32F3, "M", "ヤ"),
+        (0x32F4, "M", "ユ"),
+        (0x32F5, "M", "ヨ"),
+        (0x32F6, "M", "ラ"),
+        (0x32F7, "M", "リ"),
+        (0x32F8, "M", "ル"),
+        (0x32F9, "M", "レ"),
+        (0x32FA, "M", "ロ"),
+        (0x32FB, "M", "ワ"),
+        (0x32FC, "M", "ヰ"),
+        (0x32FD, "M", "ヱ"),
+        (0x32FE, "M", "ヲ"),
+        (0x32FF, "M", "令和"),
+        (0x3300, "M", "アパート"),
+        (0x3301, "M", "アルファ"),
+        (0x3302, "M", "アンペア"),
+        (0x3303, "M", "アール"),
+        (0x3304, "M", "イニング"),
+        (0x3305, "M", "インチ"),
+        (0x3306, "M", "ウォン"),
+        (0x3307, "M", "エスクード"),
+        (0x3308, "M", "エーカー"),
+        (0x3309, "M", "オンス"),
+        (0x330A, "M", "オーム"),
+        (0x330B, "M", "カイリ"),
+        (0x330C, "M", "カラット"),
+        (0x330D, "M", "カロリー"),
+        (0x330E, "M", "ガロン"),
+        (0x330F, "M", "ガンマ"),
+        (0x3310, "M", "ギガ"),
+        (0x3311, "M", "ギニー"),
+        (0x3312, "M", "キュリー"),
+        (0x3313, "M", "ギルダー"),
+        (0x3314, "M", "キロ"),
+        (0x3315, "M", "キログラム"),
+        (0x3316, "M", "キロメートル"),
+        (0x3317, "M", "キロワット"),
+        (0x3318, "M", "グラム"),
+        (0x3319, "M", "グラムトン"),
     ]
 
+
 def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x331A, 'M', 'クルゼイロ'),
-    (0x331B, 'M', 'クローネ'),
-    (0x331C, 'M', 'ケース'),
-    (0x331D, 'M', 'コルナ'),
-    (0x331E, 'M', 'コーポ'),
-    (0x331F, 'M', 'サイクル'),
-    (0x3320, 'M', 'サンチーム'),
-    (0x3321, 'M', 'シリング'),
-    (0x3322, 'M', 'センチ'),
-    (0x3323, 'M', 'セント'),
-    (0x3324, 'M', 'ダース'),
-    (0x3325, 'M', 'デシ'),
-    (0x3326, 'M', 'ドル'),
-    (0x3327, 'M', 'トン'),
-    (0x3328, 'M', 'ナノ'),
-    (0x3329, 'M', 'ノット'),
-    (0x332A, 'M', 'ハイツ'),
-    (0x332B, 'M', 'パーセント'),
-    (0x332C, 'M', 'パーツ'),
-    (0x332D, 'M', 'バーレル'),
-    (0x332E, 'M', 'ピアストル'),
-    (0x332F, 'M', 'ピクル'),
-    (0x3330, 'M', 'ピコ'),
-    (0x3331, 'M', 'ビル'),
-    (0x3332, 'M', 'ファラッド'),
-    (0x3333, 'M', 'フィート'),
-    (0x3334, 'M', 'ブッシェル'),
-    (0x3335, 'M', 'フラン'),
-    (0x3336, 'M', 'ヘクタール'),
-    (0x3337, 'M', 'ペソ'),
-    (0x3338, 'M', 'ペニヒ'),
-    (0x3339, 'M', 'ヘルツ'),
-    (0x333A, 'M', 'ペンス'),
-    (0x333B, 'M', 'ページ'),
-    (0x333C, 'M', 'ベータ'),
-    (0x333D, 'M', 'ポイント'),
-    (0x333E, 'M', 'ボルト'),
-    (0x333F, 'M', 'ホン'),
-    (0x3340, 'M', 'ポンド'),
-    (0x3341, 'M', 'ホール'),
-    (0x3342, 'M', 'ホーン'),
-    (0x3343, 'M', 'マイクロ'),
-    (0x3344, 'M', 'マイル'),
-    (0x3345, 'M', 'マッハ'),
-    (0x3346, 'M', 'マルク'),
-    (0x3347, 'M', 'マンション'),
-    (0x3348, 'M', 'ミクロン'),
-    (0x3349, 'M', 'ミリ'),
-    (0x334A, 'M', 'ミリバール'),
-    (0x334B, 'M', 'メガ'),
-    (0x334C, 'M', 'メガトン'),
-    (0x334D, 'M', 'メートル'),
-    (0x334E, 'M', 'ヤード'),
-    (0x334F, 'M', 'ヤール'),
-    (0x3350, 'M', 'ユアン'),
-    (0x3351, 'M', 'リットル'),
-    (0x3352, 'M', 'リラ'),
-    (0x3353, 'M', 'ルピー'),
-    (0x3354, 'M', 'ルーブル'),
-    (0x3355, 'M', 'レム'),
-    (0x3356, 'M', 'レントゲン'),
-    (0x3357, 'M', 'ワット'),
-    (0x3358, 'M', '0点'),
-    (0x3359, 'M', '1点'),
-    (0x335A, 'M', '2点'),
-    (0x335B, 'M', '3点'),
-    (0x335C, 'M', '4点'),
-    (0x335D, 'M', '5点'),
-    (0x335E, 'M', '6点'),
-    (0x335F, 'M', '7点'),
-    (0x3360, 'M', '8点'),
-    (0x3361, 'M', '9点'),
-    (0x3362, 'M', '10点'),
-    (0x3363, 'M', '11点'),
-    (0x3364, 'M', '12点'),
-    (0x3365, 'M', '13点'),
-    (0x3366, 'M', '14点'),
-    (0x3367, 'M', '15点'),
-    (0x3368, 'M', '16点'),
-    (0x3369, 'M', '17点'),
-    (0x336A, 'M', '18点'),
-    (0x336B, 'M', '19点'),
-    (0x336C, 'M', '20点'),
-    (0x336D, 'M', '21点'),
-    (0x336E, 'M', '22点'),
-    (0x336F, 'M', '23点'),
-    (0x3370, 'M', '24点'),
-    (0x3371, 'M', 'hpa'),
-    (0x3372, 'M', 'da'),
-    (0x3373, 'M', 'au'),
-    (0x3374, 'M', 'bar'),
-    (0x3375, 'M', 'ov'),
-    (0x3376, 'M', 'pc'),
-    (0x3377, 'M', 'dm'),
-    (0x3378, 'M', 'dm2'),
-    (0x3379, 'M', 'dm3'),
-    (0x337A, 'M', 'iu'),
-    (0x337B, 'M', '平成'),
-    (0x337C, 'M', '昭和'),
-    (0x337D, 'M', '大正'),
+        (0x331A, "M", "クルゼイロ"),
+        (0x331B, "M", "クローネ"),
+        (0x331C, "M", "ケース"),
+        (0x331D, "M", "コルナ"),
+        (0x331E, "M", "コーポ"),
+        (0x331F, "M", "サイクル"),
+        (0x3320, "M", "サンチーム"),
+        (0x3321, "M", "シリング"),
+        (0x3322, "M", "センチ"),
+        (0x3323, "M", "セント"),
+        (0x3324, "M", "ダース"),
+        (0x3325, "M", "デシ"),
+        (0x3326, "M", "ドル"),
+        (0x3327, "M", "トン"),
+        (0x3328, "M", "ナノ"),
+        (0x3329, "M", "ノット"),
+        (0x332A, "M", "ハイツ"),
+        (0x332B, "M", "パーセント"),
+        (0x332C, "M", "パーツ"),
+        (0x332D, "M", "バーレル"),
+        (0x332E, "M", "ピアストル"),
+        (0x332F, "M", "ピクル"),
+        (0x3330, "M", "ピコ"),
+        (0x3331, "M", "ビル"),
+        (0x3332, "M", "ファラッド"),
+        (0x3333, "M", "フィート"),
+        (0x3334, "M", "ブッシェル"),
+        (0x3335, "M", "フラン"),
+        (0x3336, "M", "ヘクタール"),
+        (0x3337, "M", "ペソ"),
+        (0x3338, "M", "ペニヒ"),
+        (0x3339, "M", "ヘルツ"),
+        (0x333A, "M", "ペンス"),
+        (0x333B, "M", "ページ"),
+        (0x333C, "M", "ベータ"),
+        (0x333D, "M", "ポイント"),
+        (0x333E, "M", "ボルト"),
+        (0x333F, "M", "ホン"),
+        (0x3340, "M", "ポンド"),
+        (0x3341, "M", "ホール"),
+        (0x3342, "M", "ホーン"),
+        (0x3343, "M", "マイクロ"),
+        (0x3344, "M", "マイル"),
+        (0x3345, "M", "マッハ"),
+        (0x3346, "M", "マルク"),
+        (0x3347, "M", "マンション"),
+        (0x3348, "M", "ミクロン"),
+        (0x3349, "M", "ミリ"),
+        (0x334A, "M", "ミリバール"),
+        (0x334B, "M", "メガ"),
+        (0x334C, "M", "メガトン"),
+        (0x334D, "M", "メートル"),
+        (0x334E, "M", "ヤード"),
+        (0x334F, "M", "ヤール"),
+        (0x3350, "M", "ユアン"),
+        (0x3351, "M", "リットル"),
+        (0x3352, "M", "リラ"),
+        (0x3353, "M", "ルピー"),
+        (0x3354, "M", "ルーブル"),
+        (0x3355, "M", "レム"),
+        (0x3356, "M", "レントゲン"),
+        (0x3357, "M", "ワット"),
+        (0x3358, "M", "0点"),
+        (0x3359, "M", "1点"),
+        (0x335A, "M", "2点"),
+        (0x335B, "M", "3点"),
+        (0x335C, "M", "4点"),
+        (0x335D, "M", "5点"),
+        (0x335E, "M", "6点"),
+        (0x335F, "M", "7点"),
+        (0x3360, "M", "8点"),
+        (0x3361, "M", "9点"),
+        (0x3362, "M", "10点"),
+        (0x3363, "M", "11点"),
+        (0x3364, "M", "12点"),
+        (0x3365, "M", "13点"),
+        (0x3366, "M", "14点"),
+        (0x3367, "M", "15点"),
+        (0x3368, "M", "16点"),
+        (0x3369, "M", "17点"),
+        (0x336A, "M", "18点"),
+        (0x336B, "M", "19点"),
+        (0x336C, "M", "20点"),
+        (0x336D, "M", "21点"),
+        (0x336E, "M", "22点"),
+        (0x336F, "M", "23点"),
+        (0x3370, "M", "24点"),
+        (0x3371, "M", "hpa"),
+        (0x3372, "M", "da"),
+        (0x3373, "M", "au"),
+        (0x3374, "M", "bar"),
+        (0x3375, "M", "ov"),
+        (0x3376, "M", "pc"),
+        (0x3377, "M", "dm"),
+        (0x3378, "M", "dm2"),
+        (0x3379, "M", "dm3"),
+        (0x337A, "M", "iu"),
+        (0x337B, "M", "平成"),
+        (0x337C, "M", "昭和"),
+        (0x337D, "M", "大正"),
     ]
 
+
 def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x337E, 'M', '明治'),
-    (0x337F, 'M', '株式会社'),
-    (0x3380, 'M', 'pa'),
-    (0x3381, 'M', 'na'),
-    (0x3382, 'M', 'μa'),
-    (0x3383, 'M', 'ma'),
-    (0x3384, 'M', 'ka'),
-    (0x3385, 'M', 'kb'),
-    (0x3386, 'M', 'mb'),
-    (0x3387, 'M', 'gb'),
-    (0x3388, 'M', 'cal'),
-    (0x3389, 'M', 'kcal'),
-    (0x338A, 'M', 'pf'),
-    (0x338B, 'M', 'nf'),
-    (0x338C, 'M', 'μf'),
-    (0x338D, 'M', 'μg'),
-    (0x338E, 'M', 'mg'),
-    (0x338F, 'M', 'kg'),
-    (0x3390, 'M', 'hz'),
-    (0x3391, 'M', 'khz'),
-    (0x3392, 'M', 'mhz'),
-    (0x3393, 'M', 'ghz'),
-    (0x3394, 'M', 'thz'),
-    (0x3395, 'M', 'μl'),
-    (0x3396, 'M', 'ml'),
-    (0x3397, 'M', 'dl'),
-    (0x3398, 'M', 'kl'),
-    (0x3399, 'M', 'fm'),
-    (0x339A, 'M', 'nm'),
-    (0x339B, 'M', 'μm'),
-    (0x339C, 'M', 'mm'),
-    (0x339D, 'M', 'cm'),
-    (0x339E, 'M', 'km'),
-    (0x339F, 'M', 'mm2'),
-    (0x33A0, 'M', 'cm2'),
-    (0x33A1, 'M', 'm2'),
-    (0x33A2, 'M', 'km2'),
-    (0x33A3, 'M', 'mm3'),
-    (0x33A4, 'M', 'cm3'),
-    (0x33A5, 'M', 'm3'),
-    (0x33A6, 'M', 'km3'),
-    (0x33A7, 'M', 'm∕s'),
-    (0x33A8, 'M', 'm∕s2'),
-    (0x33A9, 'M', 'pa'),
-    (0x33AA, 'M', 'kpa'),
-    (0x33AB, 'M', 'mpa'),
-    (0x33AC, 'M', 'gpa'),
-    (0x33AD, 'M', 'rad'),
-    (0x33AE, 'M', 'rad∕s'),
-    (0x33AF, 'M', 'rad∕s2'),
-    (0x33B0, 'M', 'ps'),
-    (0x33B1, 'M', 'ns'),
-    (0x33B2, 'M', 'μs'),
-    (0x33B3, 'M', 'ms'),
-    (0x33B4, 'M', 'pv'),
-    (0x33B5, 'M', 'nv'),
-    (0x33B6, 'M', 'μv'),
-    (0x33B7, 'M', 'mv'),
-    (0x33B8, 'M', 'kv'),
-    (0x33B9, 'M', 'mv'),
-    (0x33BA, 'M', 'pw'),
-    (0x33BB, 'M', 'nw'),
-    (0x33BC, 'M', 'μw'),
-    (0x33BD, 'M', 'mw'),
-    (0x33BE, 'M', 'kw'),
-    (0x33BF, 'M', 'mw'),
-    (0x33C0, 'M', 'kω'),
-    (0x33C1, 'M', 'mω'),
-    (0x33C2, 'X'),
-    (0x33C3, 'M', 'bq'),
-    (0x33C4, 'M', 'cc'),
-    (0x33C5, 'M', 'cd'),
-    (0x33C6, 'M', 'c∕kg'),
-    (0x33C7, 'X'),
-    (0x33C8, 'M', 'db'),
-    (0x33C9, 'M', 'gy'),
-    (0x33CA, 'M', 'ha'),
-    (0x33CB, 'M', 'hp'),
-    (0x33CC, 'M', 'in'),
-    (0x33CD, 'M', 'kk'),
-    (0x33CE, 'M', 'km'),
-    (0x33CF, 'M', 'kt'),
-    (0x33D0, 'M', 'lm'),
-    (0x33D1, 'M', 'ln'),
-    (0x33D2, 'M', 'log'),
-    (0x33D3, 'M', 'lx'),
-    (0x33D4, 'M', 'mb'),
-    (0x33D5, 'M', 'mil'),
-    (0x33D6, 'M', 'mol'),
-    (0x33D7, 'M', 'ph'),
-    (0x33D8, 'X'),
-    (0x33D9, 'M', 'ppm'),
-    (0x33DA, 'M', 'pr'),
-    (0x33DB, 'M', 'sr'),
-    (0x33DC, 'M', 'sv'),
-    (0x33DD, 'M', 'wb'),
-    (0x33DE, 'M', 'v∕m'),
-    (0x33DF, 'M', 'a∕m'),
-    (0x33E0, 'M', '1日'),
-    (0x33E1, 'M', '2日'),
+        (0x337E, "M", "明治"),
+        (0x337F, "M", "株式会社"),
+        (0x3380, "M", "pa"),
+        (0x3381, "M", "na"),
+        (0x3382, "M", "μa"),
+        (0x3383, "M", "ma"),
+        (0x3384, "M", "ka"),
+        (0x3385, "M", "kb"),
+        (0x3386, "M", "mb"),
+        (0x3387, "M", "gb"),
+        (0x3388, "M", "cal"),
+        (0x3389, "M", "kcal"),
+        (0x338A, "M", "pf"),
+        (0x338B, "M", "nf"),
+        (0x338C, "M", "μf"),
+        (0x338D, "M", "μg"),
+        (0x338E, "M", "mg"),
+        (0x338F, "M", "kg"),
+        (0x3390, "M", "hz"),
+        (0x3391, "M", "khz"),
+        (0x3392, "M", "mhz"),
+        (0x3393, "M", "ghz"),
+        (0x3394, "M", "thz"),
+        (0x3395, "M", "μl"),
+        (0x3396, "M", "ml"),
+        (0x3397, "M", "dl"),
+        (0x3398, "M", "kl"),
+        (0x3399, "M", "fm"),
+        (0x339A, "M", "nm"),
+        (0x339B, "M", "μm"),
+        (0x339C, "M", "mm"),
+        (0x339D, "M", "cm"),
+        (0x339E, "M", "km"),
+        (0x339F, "M", "mm2"),
+        (0x33A0, "M", "cm2"),
+        (0x33A1, "M", "m2"),
+        (0x33A2, "M", "km2"),
+        (0x33A3, "M", "mm3"),
+        (0x33A4, "M", "cm3"),
+        (0x33A5, "M", "m3"),
+        (0x33A6, "M", "km3"),
+        (0x33A7, "M", "m∕s"),
+        (0x33A8, "M", "m∕s2"),
+        (0x33A9, "M", "pa"),
+        (0x33AA, "M", "kpa"),
+        (0x33AB, "M", "mpa"),
+        (0x33AC, "M", "gpa"),
+        (0x33AD, "M", "rad"),
+        (0x33AE, "M", "rad∕s"),
+        (0x33AF, "M", "rad∕s2"),
+        (0x33B0, "M", "ps"),
+        (0x33B1, "M", "ns"),
+        (0x33B2, "M", "μs"),
+        (0x33B3, "M", "ms"),
+        (0x33B4, "M", "pv"),
+        (0x33B5, "M", "nv"),
+        (0x33B6, "M", "μv"),
+        (0x33B7, "M", "mv"),
+        (0x33B8, "M", "kv"),
+        (0x33B9, "M", "mv"),
+        (0x33BA, "M", "pw"),
+        (0x33BB, "M", "nw"),
+        (0x33BC, "M", "μw"),
+        (0x33BD, "M", "mw"),
+        (0x33BE, "M", "kw"),
+        (0x33BF, "M", "mw"),
+        (0x33C0, "M", "kω"),
+        (0x33C1, "M", "mω"),
+        (0x33C2, "X"),
+        (0x33C3, "M", "bq"),
+        (0x33C4, "M", "cc"),
+        (0x33C5, "M", "cd"),
+        (0x33C6, "M", "c∕kg"),
+        (0x33C7, "X"),
+        (0x33C8, "M", "db"),
+        (0x33C9, "M", "gy"),
+        (0x33CA, "M", "ha"),
+        (0x33CB, "M", "hp"),
+        (0x33CC, "M", "in"),
+        (0x33CD, "M", "kk"),
+        (0x33CE, "M", "km"),
+        (0x33CF, "M", "kt"),
+        (0x33D0, "M", "lm"),
+        (0x33D1, "M", "ln"),
+        (0x33D2, "M", "log"),
+        (0x33D3, "M", "lx"),
+        (0x33D4, "M", "mb"),
+        (0x33D5, "M", "mil"),
+        (0x33D6, "M", "mol"),
+        (0x33D7, "M", "ph"),
+        (0x33D8, "X"),
+        (0x33D9, "M", "ppm"),
+        (0x33DA, "M", "pr"),
+        (0x33DB, "M", "sr"),
+        (0x33DC, "M", "sv"),
+        (0x33DD, "M", "wb"),
+        (0x33DE, "M", "v∕m"),
+        (0x33DF, "M", "a∕m"),
+        (0x33E0, "M", "1日"),
+        (0x33E1, "M", "2日"),
     ]
 
+
 def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x33E2, 'M', '3日'),
-    (0x33E3, 'M', '4日'),
-    (0x33E4, 'M', '5日'),
-    (0x33E5, 'M', '6日'),
-    (0x33E6, 'M', '7日'),
-    (0x33E7, 'M', '8日'),
-    (0x33E8, 'M', '9日'),
-    (0x33E9, 'M', '10日'),
-    (0x33EA, 'M', '11日'),
-    (0x33EB, 'M', '12日'),
-    (0x33EC, 'M', '13日'),
-    (0x33ED, 'M', '14日'),
-    (0x33EE, 'M', '15日'),
-    (0x33EF, 'M', '16日'),
-    (0x33F0, 'M', '17日'),
-    (0x33F1, 'M', '18日'),
-    (0x33F2, 'M', '19日'),
-    (0x33F3, 'M', '20日'),
-    (0x33F4, 'M', '21日'),
-    (0x33F5, 'M', '22日'),
-    (0x33F6, 'M', '23日'),
-    (0x33F7, 'M', '24日'),
-    (0x33F8, 'M', '25日'),
-    (0x33F9, 'M', '26日'),
-    (0x33FA, 'M', '27日'),
-    (0x33FB, 'M', '28日'),
-    (0x33FC, 'M', '29日'),
-    (0x33FD, 'M', '30日'),
-    (0x33FE, 'M', '31日'),
-    (0x33FF, 'M', 'gal'),
-    (0x3400, 'V'),
-    (0xA48D, 'X'),
-    (0xA490, 'V'),
-    (0xA4C7, 'X'),
-    (0xA4D0, 'V'),
-    (0xA62C, 'X'),
-    (0xA640, 'M', 'ꙁ'),
-    (0xA641, 'V'),
-    (0xA642, 'M', 'ꙃ'),
-    (0xA643, 'V'),
-    (0xA644, 'M', 'ꙅ'),
-    (0xA645, 'V'),
-    (0xA646, 'M', 'ꙇ'),
-    (0xA647, 'V'),
-    (0xA648, 'M', 'ꙉ'),
-    (0xA649, 'V'),
-    (0xA64A, 'M', 'ꙋ'),
-    (0xA64B, 'V'),
-    (0xA64C, 'M', 'ꙍ'),
-    (0xA64D, 'V'),
-    (0xA64E, 'M', 'ꙏ'),
-    (0xA64F, 'V'),
-    (0xA650, 'M', 'ꙑ'),
-    (0xA651, 'V'),
-    (0xA652, 'M', 'ꙓ'),
-    (0xA653, 'V'),
-    (0xA654, 'M', 'ꙕ'),
-    (0xA655, 'V'),
-    (0xA656, 'M', 'ꙗ'),
-    (0xA657, 'V'),
-    (0xA658, 'M', 'ꙙ'),
-    (0xA659, 'V'),
-    (0xA65A, 'M', 'ꙛ'),
-    (0xA65B, 'V'),
-    (0xA65C, 'M', 'ꙝ'),
-    (0xA65D, 'V'),
-    (0xA65E, 'M', 'ꙟ'),
-    (0xA65F, 'V'),
-    (0xA660, 'M', 'ꙡ'),
-    (0xA661, 'V'),
-    (0xA662, 'M', 'ꙣ'),
-    (0xA663, 'V'),
-    (0xA664, 'M', 'ꙥ'),
-    (0xA665, 'V'),
-    (0xA666, 'M', 'ꙧ'),
-    (0xA667, 'V'),
-    (0xA668, 'M', 'ꙩ'),
-    (0xA669, 'V'),
-    (0xA66A, 'M', 'ꙫ'),
-    (0xA66B, 'V'),
-    (0xA66C, 'M', 'ꙭ'),
-    (0xA66D, 'V'),
-    (0xA680, 'M', 'ꚁ'),
-    (0xA681, 'V'),
-    (0xA682, 'M', 'ꚃ'),
-    (0xA683, 'V'),
-    (0xA684, 'M', 'ꚅ'),
-    (0xA685, 'V'),
-    (0xA686, 'M', 'ꚇ'),
-    (0xA687, 'V'),
-    (0xA688, 'M', 'ꚉ'),
-    (0xA689, 'V'),
-    (0xA68A, 'M', 'ꚋ'),
-    (0xA68B, 'V'),
-    (0xA68C, 'M', 'ꚍ'),
-    (0xA68D, 'V'),
-    (0xA68E, 'M', 'ꚏ'),
-    (0xA68F, 'V'),
-    (0xA690, 'M', 'ꚑ'),
-    (0xA691, 'V'),
+        (0x33E2, "M", "3日"),
+        (0x33E3, "M", "4日"),
+        (0x33E4, "M", "5日"),
+        (0x33E5, "M", "6日"),
+        (0x33E6, "M", "7日"),
+        (0x33E7, "M", "8日"),
+        (0x33E8, "M", "9日"),
+        (0x33E9, "M", "10日"),
+        (0x33EA, "M", "11日"),
+        (0x33EB, "M", "12日"),
+        (0x33EC, "M", "13日"),
+        (0x33ED, "M", "14日"),
+        (0x33EE, "M", "15日"),
+        (0x33EF, "M", "16日"),
+        (0x33F0, "M", "17日"),
+        (0x33F1, "M", "18日"),
+        (0x33F2, "M", "19日"),
+        (0x33F3, "M", "20日"),
+        (0x33F4, "M", "21日"),
+        (0x33F5, "M", "22日"),
+        (0x33F6, "M", "23日"),
+        (0x33F7, "M", "24日"),
+        (0x33F8, "M", "25日"),
+        (0x33F9, "M", "26日"),
+        (0x33FA, "M", "27日"),
+        (0x33FB, "M", "28日"),
+        (0x33FC, "M", "29日"),
+        (0x33FD, "M", "30日"),
+        (0x33FE, "M", "31日"),
+        (0x33FF, "M", "gal"),
+        (0x3400, "V"),
+        (0xA48D, "X"),
+        (0xA490, "V"),
+        (0xA4C7, "X"),
+        (0xA4D0, "V"),
+        (0xA62C, "X"),
+        (0xA640, "M", "ꙁ"),
+        (0xA641, "V"),
+        (0xA642, "M", "ꙃ"),
+        (0xA643, "V"),
+        (0xA644, "M", "ꙅ"),
+        (0xA645, "V"),
+        (0xA646, "M", "ꙇ"),
+        (0xA647, "V"),
+        (0xA648, "M", "ꙉ"),
+        (0xA649, "V"),
+        (0xA64A, "M", "ꙋ"),
+        (0xA64B, "V"),
+        (0xA64C, "M", "ꙍ"),
+        (0xA64D, "V"),
+        (0xA64E, "M", "ꙏ"),
+        (0xA64F, "V"),
+        (0xA650, "M", "ꙑ"),
+        (0xA651, "V"),
+        (0xA652, "M", "ꙓ"),
+        (0xA653, "V"),
+        (0xA654, "M", "ꙕ"),
+        (0xA655, "V"),
+        (0xA656, "M", "ꙗ"),
+        (0xA657, "V"),
+        (0xA658, "M", "ꙙ"),
+        (0xA659, "V"),
+        (0xA65A, "M", "ꙛ"),
+        (0xA65B, "V"),
+        (0xA65C, "M", "ꙝ"),
+        (0xA65D, "V"),
+        (0xA65E, "M", "ꙟ"),
+        (0xA65F, "V"),
+        (0xA660, "M", "ꙡ"),
+        (0xA661, "V"),
+        (0xA662, "M", "ꙣ"),
+        (0xA663, "V"),
+        (0xA664, "M", "ꙥ"),
+        (0xA665, "V"),
+        (0xA666, "M", "ꙧ"),
+        (0xA667, "V"),
+        (0xA668, "M", "ꙩ"),
+        (0xA669, "V"),
+        (0xA66A, "M", "ꙫ"),
+        (0xA66B, "V"),
+        (0xA66C, "M", "ꙭ"),
+        (0xA66D, "V"),
+        (0xA680, "M", "ꚁ"),
+        (0xA681, "V"),
+        (0xA682, "M", "ꚃ"),
+        (0xA683, "V"),
+        (0xA684, "M", "ꚅ"),
+        (0xA685, "V"),
+        (0xA686, "M", "ꚇ"),
+        (0xA687, "V"),
+        (0xA688, "M", "ꚉ"),
+        (0xA689, "V"),
+        (0xA68A, "M", "ꚋ"),
+        (0xA68B, "V"),
+        (0xA68C, "M", "ꚍ"),
+        (0xA68D, "V"),
+        (0xA68E, "M", "ꚏ"),
+        (0xA68F, "V"),
+        (0xA690, "M", "ꚑ"),
+        (0xA691, "V"),
     ]
 
+
 def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xA692, 'M', 'ꚓ'),
-    (0xA693, 'V'),
-    (0xA694, 'M', 'ꚕ'),
-    (0xA695, 'V'),
-    (0xA696, 'M', 'ꚗ'),
-    (0xA697, 'V'),
-    (0xA698, 'M', 'ꚙ'),
-    (0xA699, 'V'),
-    (0xA69A, 'M', 'ꚛ'),
-    (0xA69B, 'V'),
-    (0xA69C, 'M', 'ъ'),
-    (0xA69D, 'M', 'ь'),
-    (0xA69E, 'V'),
-    (0xA6F8, 'X'),
-    (0xA700, 'V'),
-    (0xA722, 'M', 'ꜣ'),
-    (0xA723, 'V'),
-    (0xA724, 'M', 'ꜥ'),
-    (0xA725, 'V'),
-    (0xA726, 'M', 'ꜧ'),
-    (0xA727, 'V'),
-    (0xA728, 'M', 'ꜩ'),
-    (0xA729, 'V'),
-    (0xA72A, 'M', 'ꜫ'),
-    (0xA72B, 'V'),
-    (0xA72C, 'M', 'ꜭ'),
-    (0xA72D, 'V'),
-    (0xA72E, 'M', 'ꜯ'),
-    (0xA72F, 'V'),
-    (0xA732, 'M', 'ꜳ'),
-    (0xA733, 'V'),
-    (0xA734, 'M', 'ꜵ'),
-    (0xA735, 'V'),
-    (0xA736, 'M', 'ꜷ'),
-    (0xA737, 'V'),
-    (0xA738, 'M', 'ꜹ'),
-    (0xA739, 'V'),
-    (0xA73A, 'M', 'ꜻ'),
-    (0xA73B, 'V'),
-    (0xA73C, 'M', 'ꜽ'),
-    (0xA73D, 'V'),
-    (0xA73E, 'M', 'ꜿ'),
-    (0xA73F, 'V'),
-    (0xA740, 'M', 'ꝁ'),
-    (0xA741, 'V'),
-    (0xA742, 'M', 'ꝃ'),
-    (0xA743, 'V'),
-    (0xA744, 'M', 'ꝅ'),
-    (0xA745, 'V'),
-    (0xA746, 'M', 'ꝇ'),
-    (0xA747, 'V'),
-    (0xA748, 'M', 'ꝉ'),
-    (0xA749, 'V'),
-    (0xA74A, 'M', 'ꝋ'),
-    (0xA74B, 'V'),
-    (0xA74C, 'M', 'ꝍ'),
-    (0xA74D, 'V'),
-    (0xA74E, 'M', 'ꝏ'),
-    (0xA74F, 'V'),
-    (0xA750, 'M', 'ꝑ'),
-    (0xA751, 'V'),
-    (0xA752, 'M', 'ꝓ'),
-    (0xA753, 'V'),
-    (0xA754, 'M', 'ꝕ'),
-    (0xA755, 'V'),
-    (0xA756, 'M', 'ꝗ'),
-    (0xA757, 'V'),
-    (0xA758, 'M', 'ꝙ'),
-    (0xA759, 'V'),
-    (0xA75A, 'M', 'ꝛ'),
-    (0xA75B, 'V'),
-    (0xA75C, 'M', 'ꝝ'),
-    (0xA75D, 'V'),
-    (0xA75E, 'M', 'ꝟ'),
-    (0xA75F, 'V'),
-    (0xA760, 'M', 'ꝡ'),
-    (0xA761, 'V'),
-    (0xA762, 'M', 'ꝣ'),
-    (0xA763, 'V'),
-    (0xA764, 'M', 'ꝥ'),
-    (0xA765, 'V'),
-    (0xA766, 'M', 'ꝧ'),
-    (0xA767, 'V'),
-    (0xA768, 'M', 'ꝩ'),
-    (0xA769, 'V'),
-    (0xA76A, 'M', 'ꝫ'),
-    (0xA76B, 'V'),
-    (0xA76C, 'M', 'ꝭ'),
-    (0xA76D, 'V'),
-    (0xA76E, 'M', 'ꝯ'),
-    (0xA76F, 'V'),
-    (0xA770, 'M', 'ꝯ'),
-    (0xA771, 'V'),
-    (0xA779, 'M', 'ꝺ'),
-    (0xA77A, 'V'),
-    (0xA77B, 'M', 'ꝼ'),
-    (0xA77C, 'V'),
-    (0xA77D, 'M', 'ᵹ'),
-    (0xA77E, 'M', 'ꝿ'),
-    (0xA77F, 'V'),
+        (0xA692, "M", "ꚓ"),
+        (0xA693, "V"),
+        (0xA694, "M", "ꚕ"),
+        (0xA695, "V"),
+        (0xA696, "M", "ꚗ"),
+        (0xA697, "V"),
+        (0xA698, "M", "ꚙ"),
+        (0xA699, "V"),
+        (0xA69A, "M", "ꚛ"),
+        (0xA69B, "V"),
+        (0xA69C, "M", "ъ"),
+        (0xA69D, "M", "ь"),
+        (0xA69E, "V"),
+        (0xA6F8, "X"),
+        (0xA700, "V"),
+        (0xA722, "M", "ꜣ"),
+        (0xA723, "V"),
+        (0xA724, "M", "ꜥ"),
+        (0xA725, "V"),
+        (0xA726, "M", "ꜧ"),
+        (0xA727, "V"),
+        (0xA728, "M", "ꜩ"),
+        (0xA729, "V"),
+        (0xA72A, "M", "ꜫ"),
+        (0xA72B, "V"),
+        (0xA72C, "M", "ꜭ"),
+        (0xA72D, "V"),
+        (0xA72E, "M", "ꜯ"),
+        (0xA72F, "V"),
+        (0xA732, "M", "ꜳ"),
+        (0xA733, "V"),
+        (0xA734, "M", "ꜵ"),
+        (0xA735, "V"),
+        (0xA736, "M", "ꜷ"),
+        (0xA737, "V"),
+        (0xA738, "M", "ꜹ"),
+        (0xA739, "V"),
+        (0xA73A, "M", "ꜻ"),
+        (0xA73B, "V"),
+        (0xA73C, "M", "ꜽ"),
+        (0xA73D, "V"),
+        (0xA73E, "M", "ꜿ"),
+        (0xA73F, "V"),
+        (0xA740, "M", "ꝁ"),
+        (0xA741, "V"),
+        (0xA742, "M", "ꝃ"),
+        (0xA743, "V"),
+        (0xA744, "M", "ꝅ"),
+        (0xA745, "V"),
+        (0xA746, "M", "ꝇ"),
+        (0xA747, "V"),
+        (0xA748, "M", "ꝉ"),
+        (0xA749, "V"),
+        (0xA74A, "M", "ꝋ"),
+        (0xA74B, "V"),
+        (0xA74C, "M", "ꝍ"),
+        (0xA74D, "V"),
+        (0xA74E, "M", "ꝏ"),
+        (0xA74F, "V"),
+        (0xA750, "M", "ꝑ"),
+        (0xA751, "V"),
+        (0xA752, "M", "ꝓ"),
+        (0xA753, "V"),
+        (0xA754, "M", "ꝕ"),
+        (0xA755, "V"),
+        (0xA756, "M", "ꝗ"),
+        (0xA757, "V"),
+        (0xA758, "M", "ꝙ"),
+        (0xA759, "V"),
+        (0xA75A, "M", "ꝛ"),
+        (0xA75B, "V"),
+        (0xA75C, "M", "ꝝ"),
+        (0xA75D, "V"),
+        (0xA75E, "M", "ꝟ"),
+        (0xA75F, "V"),
+        (0xA760, "M", "ꝡ"),
+        (0xA761, "V"),
+        (0xA762, "M", "ꝣ"),
+        (0xA763, "V"),
+        (0xA764, "M", "ꝥ"),
+        (0xA765, "V"),
+        (0xA766, "M", "ꝧ"),
+        (0xA767, "V"),
+        (0xA768, "M", "ꝩ"),
+        (0xA769, "V"),
+        (0xA76A, "M", "ꝫ"),
+        (0xA76B, "V"),
+        (0xA76C, "M", "ꝭ"),
+        (0xA76D, "V"),
+        (0xA76E, "M", "ꝯ"),
+        (0xA76F, "V"),
+        (0xA770, "M", "ꝯ"),
+        (0xA771, "V"),
+        (0xA779, "M", "ꝺ"),
+        (0xA77A, "V"),
+        (0xA77B, "M", "ꝼ"),
+        (0xA77C, "V"),
+        (0xA77D, "M", "ᵹ"),
+        (0xA77E, "M", "ꝿ"),
+        (0xA77F, "V"),
     ]
 
+
 def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xA780, 'M', 'ꞁ'),
-    (0xA781, 'V'),
-    (0xA782, 'M', 'ꞃ'),
-    (0xA783, 'V'),
-    (0xA784, 'M', 'ꞅ'),
-    (0xA785, 'V'),
-    (0xA786, 'M', 'ꞇ'),
-    (0xA787, 'V'),
-    (0xA78B, 'M', 'ꞌ'),
-    (0xA78C, 'V'),
-    (0xA78D, 'M', 'ɥ'),
-    (0xA78E, 'V'),
-    (0xA790, 'M', 'ꞑ'),
-    (0xA791, 'V'),
-    (0xA792, 'M', 'ꞓ'),
-    (0xA793, 'V'),
-    (0xA796, 'M', 'ꞗ'),
-    (0xA797, 'V'),
-    (0xA798, 'M', 'ꞙ'),
-    (0xA799, 'V'),
-    (0xA79A, 'M', 'ꞛ'),
-    (0xA79B, 'V'),
-    (0xA79C, 'M', 'ꞝ'),
-    (0xA79D, 'V'),
-    (0xA79E, 'M', 'ꞟ'),
-    (0xA79F, 'V'),
-    (0xA7A0, 'M', 'ꞡ'),
-    (0xA7A1, 'V'),
-    (0xA7A2, 'M', 'ꞣ'),
-    (0xA7A3, 'V'),
-    (0xA7A4, 'M', 'ꞥ'),
-    (0xA7A5, 'V'),
-    (0xA7A6, 'M', 'ꞧ'),
-    (0xA7A7, 'V'),
-    (0xA7A8, 'M', 'ꞩ'),
-    (0xA7A9, 'V'),
-    (0xA7AA, 'M', 'ɦ'),
-    (0xA7AB, 'M', 'ɜ'),
-    (0xA7AC, 'M', 'ɡ'),
-    (0xA7AD, 'M', 'ɬ'),
-    (0xA7AE, 'M', 'ɪ'),
-    (0xA7AF, 'V'),
-    (0xA7B0, 'M', 'ʞ'),
-    (0xA7B1, 'M', 'ʇ'),
-    (0xA7B2, 'M', 'ʝ'),
-    (0xA7B3, 'M', 'ꭓ'),
-    (0xA7B4, 'M', 'ꞵ'),
-    (0xA7B5, 'V'),
-    (0xA7B6, 'M', 'ꞷ'),
-    (0xA7B7, 'V'),
-    (0xA7B8, 'M', 'ꞹ'),
-    (0xA7B9, 'V'),
-    (0xA7BA, 'M', 'ꞻ'),
-    (0xA7BB, 'V'),
-    (0xA7BC, 'M', 'ꞽ'),
-    (0xA7BD, 'V'),
-    (0xA7BE, 'M', 'ꞿ'),
-    (0xA7BF, 'V'),
-    (0xA7C0, 'M', 'ꟁ'),
-    (0xA7C1, 'V'),
-    (0xA7C2, 'M', 'ꟃ'),
-    (0xA7C3, 'V'),
-    (0xA7C4, 'M', 'ꞔ'),
-    (0xA7C5, 'M', 'ʂ'),
-    (0xA7C6, 'M', 'ᶎ'),
-    (0xA7C7, 'M', 'ꟈ'),
-    (0xA7C8, 'V'),
-    (0xA7C9, 'M', 'ꟊ'),
-    (0xA7CA, 'V'),
-    (0xA7CB, 'X'),
-    (0xA7D0, 'M', 'ꟑ'),
-    (0xA7D1, 'V'),
-    (0xA7D2, 'X'),
-    (0xA7D3, 'V'),
-    (0xA7D4, 'X'),
-    (0xA7D5, 'V'),
-    (0xA7D6, 'M', 'ꟗ'),
-    (0xA7D7, 'V'),
-    (0xA7D8, 'M', 'ꟙ'),
-    (0xA7D9, 'V'),
-    (0xA7DA, 'X'),
-    (0xA7F2, 'M', 'c'),
-    (0xA7F3, 'M', 'f'),
-    (0xA7F4, 'M', 'q'),
-    (0xA7F5, 'M', 'ꟶ'),
-    (0xA7F6, 'V'),
-    (0xA7F8, 'M', 'ħ'),
-    (0xA7F9, 'M', 'œ'),
-    (0xA7FA, 'V'),
-    (0xA82D, 'X'),
-    (0xA830, 'V'),
-    (0xA83A, 'X'),
-    (0xA840, 'V'),
-    (0xA878, 'X'),
-    (0xA880, 'V'),
-    (0xA8C6, 'X'),
-    (0xA8CE, 'V'),
-    (0xA8DA, 'X'),
-    (0xA8E0, 'V'),
-    (0xA954, 'X'),
+        (0xA780, "M", "ꞁ"),
+        (0xA781, "V"),
+        (0xA782, "M", "ꞃ"),
+        (0xA783, "V"),
+        (0xA784, "M", "ꞅ"),
+        (0xA785, "V"),
+        (0xA786, "M", "ꞇ"),
+        (0xA787, "V"),
+        (0xA78B, "M", "ꞌ"),
+        (0xA78C, "V"),
+        (0xA78D, "M", "ɥ"),
+        (0xA78E, "V"),
+        (0xA790, "M", "ꞑ"),
+        (0xA791, "V"),
+        (0xA792, "M", "ꞓ"),
+        (0xA793, "V"),
+        (0xA796, "M", "ꞗ"),
+        (0xA797, "V"),
+        (0xA798, "M", "ꞙ"),
+        (0xA799, "V"),
+        (0xA79A, "M", "ꞛ"),
+        (0xA79B, "V"),
+        (0xA79C, "M", "ꞝ"),
+        (0xA79D, "V"),
+        (0xA79E, "M", "ꞟ"),
+        (0xA79F, "V"),
+        (0xA7A0, "M", "ꞡ"),
+        (0xA7A1, "V"),
+        (0xA7A2, "M", "ꞣ"),
+        (0xA7A3, "V"),
+        (0xA7A4, "M", "ꞥ"),
+        (0xA7A5, "V"),
+        (0xA7A6, "M", "ꞧ"),
+        (0xA7A7, "V"),
+        (0xA7A8, "M", "ꞩ"),
+        (0xA7A9, "V"),
+        (0xA7AA, "M", "ɦ"),
+        (0xA7AB, "M", "ɜ"),
+        (0xA7AC, "M", "ɡ"),
+        (0xA7AD, "M", "ɬ"),
+        (0xA7AE, "M", "ɪ"),
+        (0xA7AF, "V"),
+        (0xA7B0, "M", "ʞ"),
+        (0xA7B1, "M", "ʇ"),
+        (0xA7B2, "M", "ʝ"),
+        (0xA7B3, "M", "ꭓ"),
+        (0xA7B4, "M", "ꞵ"),
+        (0xA7B5, "V"),
+        (0xA7B6, "M", "ꞷ"),
+        (0xA7B7, "V"),
+        (0xA7B8, "M", "ꞹ"),
+        (0xA7B9, "V"),
+        (0xA7BA, "M", "ꞻ"),
+        (0xA7BB, "V"),
+        (0xA7BC, "M", "ꞽ"),
+        (0xA7BD, "V"),
+        (0xA7BE, "M", "ꞿ"),
+        (0xA7BF, "V"),
+        (0xA7C0, "M", "ꟁ"),
+        (0xA7C1, "V"),
+        (0xA7C2, "M", "ꟃ"),
+        (0xA7C3, "V"),
+        (0xA7C4, "M", "ꞔ"),
+        (0xA7C5, "M", "ʂ"),
+        (0xA7C6, "M", "ᶎ"),
+        (0xA7C7, "M", "ꟈ"),
+        (0xA7C8, "V"),
+        (0xA7C9, "M", "ꟊ"),
+        (0xA7CA, "V"),
+        (0xA7CB, "X"),
+        (0xA7D0, "M", "ꟑ"),
+        (0xA7D1, "V"),
+        (0xA7D2, "X"),
+        (0xA7D3, "V"),
+        (0xA7D4, "X"),
+        (0xA7D5, "V"),
+        (0xA7D6, "M", "ꟗ"),
+        (0xA7D7, "V"),
+        (0xA7D8, "M", "ꟙ"),
+        (0xA7D9, "V"),
+        (0xA7DA, "X"),
+        (0xA7F2, "M", "c"),
+        (0xA7F3, "M", "f"),
+        (0xA7F4, "M", "q"),
+        (0xA7F5, "M", "ꟶ"),
+        (0xA7F6, "V"),
+        (0xA7F8, "M", "ħ"),
+        (0xA7F9, "M", "œ"),
+        (0xA7FA, "V"),
+        (0xA82D, "X"),
+        (0xA830, "V"),
+        (0xA83A, "X"),
+        (0xA840, "V"),
+        (0xA878, "X"),
+        (0xA880, "V"),
+        (0xA8C6, "X"),
+        (0xA8CE, "V"),
+        (0xA8DA, "X"),
+        (0xA8E0, "V"),
+        (0xA954, "X"),
     ]
 
+
 def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xA95F, 'V'),
-    (0xA97D, 'X'),
-    (0xA980, 'V'),
-    (0xA9CE, 'X'),
-    (0xA9CF, 'V'),
-    (0xA9DA, 'X'),
-    (0xA9DE, 'V'),
-    (0xA9FF, 'X'),
-    (0xAA00, 'V'),
-    (0xAA37, 'X'),
-    (0xAA40, 'V'),
-    (0xAA4E, 'X'),
-    (0xAA50, 'V'),
-    (0xAA5A, 'X'),
-    (0xAA5C, 'V'),
-    (0xAAC3, 'X'),
-    (0xAADB, 'V'),
-    (0xAAF7, 'X'),
-    (0xAB01, 'V'),
-    (0xAB07, 'X'),
-    (0xAB09, 'V'),
-    (0xAB0F, 'X'),
-    (0xAB11, 'V'),
-    (0xAB17, 'X'),
-    (0xAB20, 'V'),
-    (0xAB27, 'X'),
-    (0xAB28, 'V'),
-    (0xAB2F, 'X'),
-    (0xAB30, 'V'),
-    (0xAB5C, 'M', 'ꜧ'),
-    (0xAB5D, 'M', 'ꬷ'),
-    (0xAB5E, 'M', 'ɫ'),
-    (0xAB5F, 'M', 'ꭒ'),
-    (0xAB60, 'V'),
-    (0xAB69, 'M', 'ʍ'),
-    (0xAB6A, 'V'),
-    (0xAB6C, 'X'),
-    (0xAB70, 'M', 'Ꭰ'),
-    (0xAB71, 'M', 'Ꭱ'),
-    (0xAB72, 'M', 'Ꭲ'),
-    (0xAB73, 'M', 'Ꭳ'),
-    (0xAB74, 'M', 'Ꭴ'),
-    (0xAB75, 'M', 'Ꭵ'),
-    (0xAB76, 'M', 'Ꭶ'),
-    (0xAB77, 'M', 'Ꭷ'),
-    (0xAB78, 'M', 'Ꭸ'),
-    (0xAB79, 'M', 'Ꭹ'),
-    (0xAB7A, 'M', 'Ꭺ'),
-    (0xAB7B, 'M', 'Ꭻ'),
-    (0xAB7C, 'M', 'Ꭼ'),
-    (0xAB7D, 'M', 'Ꭽ'),
-    (0xAB7E, 'M', 'Ꭾ'),
-    (0xAB7F, 'M', 'Ꭿ'),
-    (0xAB80, 'M', 'Ꮀ'),
-    (0xAB81, 'M', 'Ꮁ'),
-    (0xAB82, 'M', 'Ꮂ'),
-    (0xAB83, 'M', 'Ꮃ'),
-    (0xAB84, 'M', 'Ꮄ'),
-    (0xAB85, 'M', 'Ꮅ'),
-    (0xAB86, 'M', 'Ꮆ'),
-    (0xAB87, 'M', 'Ꮇ'),
-    (0xAB88, 'M', 'Ꮈ'),
-    (0xAB89, 'M', 'Ꮉ'),
-    (0xAB8A, 'M', 'Ꮊ'),
-    (0xAB8B, 'M', 'Ꮋ'),
-    (0xAB8C, 'M', 'Ꮌ'),
-    (0xAB8D, 'M', 'Ꮍ'),
-    (0xAB8E, 'M', 'Ꮎ'),
-    (0xAB8F, 'M', 'Ꮏ'),
-    (0xAB90, 'M', 'Ꮐ'),
-    (0xAB91, 'M', 'Ꮑ'),
-    (0xAB92, 'M', 'Ꮒ'),
-    (0xAB93, 'M', 'Ꮓ'),
-    (0xAB94, 'M', 'Ꮔ'),
-    (0xAB95, 'M', 'Ꮕ'),
-    (0xAB96, 'M', 'Ꮖ'),
-    (0xAB97, 'M', 'Ꮗ'),
-    (0xAB98, 'M', 'Ꮘ'),
-    (0xAB99, 'M', 'Ꮙ'),
-    (0xAB9A, 'M', 'Ꮚ'),
-    (0xAB9B, 'M', 'Ꮛ'),
-    (0xAB9C, 'M', 'Ꮜ'),
-    (0xAB9D, 'M', 'Ꮝ'),
-    (0xAB9E, 'M', 'Ꮞ'),
-    (0xAB9F, 'M', 'Ꮟ'),
-    (0xABA0, 'M', 'Ꮠ'),
-    (0xABA1, 'M', 'Ꮡ'),
-    (0xABA2, 'M', 'Ꮢ'),
-    (0xABA3, 'M', 'Ꮣ'),
-    (0xABA4, 'M', 'Ꮤ'),
-    (0xABA5, 'M', 'Ꮥ'),
-    (0xABA6, 'M', 'Ꮦ'),
-    (0xABA7, 'M', 'Ꮧ'),
-    (0xABA8, 'M', 'Ꮨ'),
-    (0xABA9, 'M', 'Ꮩ'),
-    (0xABAA, 'M', 'Ꮪ'),
-    (0xABAB, 'M', 'Ꮫ'),
-    (0xABAC, 'M', 'Ꮬ'),
-    (0xABAD, 'M', 'Ꮭ'),
-    (0xABAE, 'M', 'Ꮮ'),
+        (0xA95F, "V"),
+        (0xA97D, "X"),
+        (0xA980, "V"),
+        (0xA9CE, "X"),
+        (0xA9CF, "V"),
+        (0xA9DA, "X"),
+        (0xA9DE, "V"),
+        (0xA9FF, "X"),
+        (0xAA00, "V"),
+        (0xAA37, "X"),
+        (0xAA40, "V"),
+        (0xAA4E, "X"),
+        (0xAA50, "V"),
+        (0xAA5A, "X"),
+        (0xAA5C, "V"),
+        (0xAAC3, "X"),
+        (0xAADB, "V"),
+        (0xAAF7, "X"),
+        (0xAB01, "V"),
+        (0xAB07, "X"),
+        (0xAB09, "V"),
+        (0xAB0F, "X"),
+        (0xAB11, "V"),
+        (0xAB17, "X"),
+        (0xAB20, "V"),
+        (0xAB27, "X"),
+        (0xAB28, "V"),
+        (0xAB2F, "X"),
+        (0xAB30, "V"),
+        (0xAB5C, "M", "ꜧ"),
+        (0xAB5D, "M", "ꬷ"),
+        (0xAB5E, "M", "ɫ"),
+        (0xAB5F, "M", "ꭒ"),
+        (0xAB60, "V"),
+        (0xAB69, "M", "ʍ"),
+        (0xAB6A, "V"),
+        (0xAB6C, "X"),
+        (0xAB70, "M", "Ꭰ"),
+        (0xAB71, "M", "Ꭱ"),
+        (0xAB72, "M", "Ꭲ"),
+        (0xAB73, "M", "Ꭳ"),
+        (0xAB74, "M", "Ꭴ"),
+        (0xAB75, "M", "Ꭵ"),
+        (0xAB76, "M", "Ꭶ"),
+        (0xAB77, "M", "Ꭷ"),
+        (0xAB78, "M", "Ꭸ"),
+        (0xAB79, "M", "Ꭹ"),
+        (0xAB7A, "M", "Ꭺ"),
+        (0xAB7B, "M", "Ꭻ"),
+        (0xAB7C, "M", "Ꭼ"),
+        (0xAB7D, "M", "Ꭽ"),
+        (0xAB7E, "M", "Ꭾ"),
+        (0xAB7F, "M", "Ꭿ"),
+        (0xAB80, "M", "Ꮀ"),
+        (0xAB81, "M", "Ꮁ"),
+        (0xAB82, "M", "Ꮂ"),
+        (0xAB83, "M", "Ꮃ"),
+        (0xAB84, "M", "Ꮄ"),
+        (0xAB85, "M", "Ꮅ"),
+        (0xAB86, "M", "Ꮆ"),
+        (0xAB87, "M", "Ꮇ"),
+        (0xAB88, "M", "Ꮈ"),
+        (0xAB89, "M", "Ꮉ"),
+        (0xAB8A, "M", "Ꮊ"),
+        (0xAB8B, "M", "Ꮋ"),
+        (0xAB8C, "M", "Ꮌ"),
+        (0xAB8D, "M", "Ꮍ"),
+        (0xAB8E, "M", "Ꮎ"),
+        (0xAB8F, "M", "Ꮏ"),
+        (0xAB90, "M", "Ꮐ"),
+        (0xAB91, "M", "Ꮑ"),
+        (0xAB92, "M", "Ꮒ"),
+        (0xAB93, "M", "Ꮓ"),
+        (0xAB94, "M", "Ꮔ"),
+        (0xAB95, "M", "Ꮕ"),
+        (0xAB96, "M", "Ꮖ"),
+        (0xAB97, "M", "Ꮗ"),
+        (0xAB98, "M", "Ꮘ"),
+        (0xAB99, "M", "Ꮙ"),
+        (0xAB9A, "M", "Ꮚ"),
+        (0xAB9B, "M", "Ꮛ"),
+        (0xAB9C, "M", "Ꮜ"),
+        (0xAB9D, "M", "Ꮝ"),
+        (0xAB9E, "M", "Ꮞ"),
+        (0xAB9F, "M", "Ꮟ"),
+        (0xABA0, "M", "Ꮠ"),
+        (0xABA1, "M", "Ꮡ"),
+        (0xABA2, "M", "Ꮢ"),
+        (0xABA3, "M", "Ꮣ"),
+        (0xABA4, "M", "Ꮤ"),
+        (0xABA5, "M", "Ꮥ"),
+        (0xABA6, "M", "Ꮦ"),
+        (0xABA7, "M", "Ꮧ"),
+        (0xABA8, "M", "Ꮨ"),
+        (0xABA9, "M", "Ꮩ"),
+        (0xABAA, "M", "Ꮪ"),
+        (0xABAB, "M", "Ꮫ"),
+        (0xABAC, "M", "Ꮬ"),
+        (0xABAD, "M", "Ꮭ"),
+        (0xABAE, "M", "Ꮮ"),
     ]
 
+
 def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xABAF, 'M', 'Ꮯ'),
-    (0xABB0, 'M', 'Ꮰ'),
-    (0xABB1, 'M', 'Ꮱ'),
-    (0xABB2, 'M', 'Ꮲ'),
-    (0xABB3, 'M', 'Ꮳ'),
-    (0xABB4, 'M', 'Ꮴ'),
-    (0xABB5, 'M', 'Ꮵ'),
-    (0xABB6, 'M', 'Ꮶ'),
-    (0xABB7, 'M', 'Ꮷ'),
-    (0xABB8, 'M', 'Ꮸ'),
-    (0xABB9, 'M', 'Ꮹ'),
-    (0xABBA, 'M', 'Ꮺ'),
-    (0xABBB, 'M', 'Ꮻ'),
-    (0xABBC, 'M', 'Ꮼ'),
-    (0xABBD, 'M', 'Ꮽ'),
-    (0xABBE, 'M', 'Ꮾ'),
-    (0xABBF, 'M', 'Ꮿ'),
-    (0xABC0, 'V'),
-    (0xABEE, 'X'),
-    (0xABF0, 'V'),
-    (0xABFA, 'X'),
-    (0xAC00, 'V'),
-    (0xD7A4, 'X'),
-    (0xD7B0, 'V'),
-    (0xD7C7, 'X'),
-    (0xD7CB, 'V'),
-    (0xD7FC, 'X'),
-    (0xF900, 'M', '豈'),
-    (0xF901, 'M', '更'),
-    (0xF902, 'M', '車'),
-    (0xF903, 'M', '賈'),
-    (0xF904, 'M', '滑'),
-    (0xF905, 'M', '串'),
-    (0xF906, 'M', '句'),
-    (0xF907, 'M', '龜'),
-    (0xF909, 'M', '契'),
-    (0xF90A, 'M', '金'),
-    (0xF90B, 'M', '喇'),
-    (0xF90C, 'M', '奈'),
-    (0xF90D, 'M', '懶'),
-    (0xF90E, 'M', '癩'),
-    (0xF90F, 'M', '羅'),
-    (0xF910, 'M', '蘿'),
-    (0xF911, 'M', '螺'),
-    (0xF912, 'M', '裸'),
-    (0xF913, 'M', '邏'),
-    (0xF914, 'M', '樂'),
-    (0xF915, 'M', '洛'),
-    (0xF916, 'M', '烙'),
-    (0xF917, 'M', '珞'),
-    (0xF918, 'M', '落'),
-    (0xF919, 'M', '酪'),
-    (0xF91A, 'M', '駱'),
-    (0xF91B, 'M', '亂'),
-    (0xF91C, 'M', '卵'),
-    (0xF91D, 'M', '欄'),
-    (0xF91E, 'M', '爛'),
-    (0xF91F, 'M', '蘭'),
-    (0xF920, 'M', '鸞'),
-    (0xF921, 'M', '嵐'),
-    (0xF922, 'M', '濫'),
-    (0xF923, 'M', '藍'),
-    (0xF924, 'M', '襤'),
-    (0xF925, 'M', '拉'),
-    (0xF926, 'M', '臘'),
-    (0xF927, 'M', '蠟'),
-    (0xF928, 'M', '廊'),
-    (0xF929, 'M', '朗'),
-    (0xF92A, 'M', '浪'),
-    (0xF92B, 'M', '狼'),
-    (0xF92C, 'M', '郎'),
-    (0xF92D, 'M', '來'),
-    (0xF92E, 'M', '冷'),
-    (0xF92F, 'M', '勞'),
-    (0xF930, 'M', '擄'),
-    (0xF931, 'M', '櫓'),
-    (0xF932, 'M', '爐'),
-    (0xF933, 'M', '盧'),
-    (0xF934, 'M', '老'),
-    (0xF935, 'M', '蘆'),
-    (0xF936, 'M', '虜'),
-    (0xF937, 'M', '路'),
-    (0xF938, 'M', '露'),
-    (0xF939, 'M', '魯'),
-    (0xF93A, 'M', '鷺'),
-    (0xF93B, 'M', '碌'),
-    (0xF93C, 'M', '祿'),
-    (0xF93D, 'M', '綠'),
-    (0xF93E, 'M', '菉'),
-    (0xF93F, 'M', '錄'),
-    (0xF940, 'M', '鹿'),
-    (0xF941, 'M', '論'),
-    (0xF942, 'M', '壟'),
-    (0xF943, 'M', '弄'),
-    (0xF944, 'M', '籠'),
-    (0xF945, 'M', '聾'),
-    (0xF946, 'M', '牢'),
-    (0xF947, 'M', '磊'),
-    (0xF948, 'M', '賂'),
-    (0xF949, 'M', '雷'),
+        (0xABAF, "M", "Ꮯ"),
+        (0xABB0, "M", "Ꮰ"),
+        (0xABB1, "M", "Ꮱ"),
+        (0xABB2, "M", "Ꮲ"),
+        (0xABB3, "M", "Ꮳ"),
+        (0xABB4, "M", "Ꮴ"),
+        (0xABB5, "M", "Ꮵ"),
+        (0xABB6, "M", "Ꮶ"),
+        (0xABB7, "M", "Ꮷ"),
+        (0xABB8, "M", "Ꮸ"),
+        (0xABB9, "M", "Ꮹ"),
+        (0xABBA, "M", "Ꮺ"),
+        (0xABBB, "M", "Ꮻ"),
+        (0xABBC, "M", "Ꮼ"),
+        (0xABBD, "M", "Ꮽ"),
+        (0xABBE, "M", "Ꮾ"),
+        (0xABBF, "M", "Ꮿ"),
+        (0xABC0, "V"),
+        (0xABEE, "X"),
+        (0xABF0, "V"),
+        (0xABFA, "X"),
+        (0xAC00, "V"),
+        (0xD7A4, "X"),
+        (0xD7B0, "V"),
+        (0xD7C7, "X"),
+        (0xD7CB, "V"),
+        (0xD7FC, "X"),
+        (0xF900, "M", "豈"),
+        (0xF901, "M", "更"),
+        (0xF902, "M", "車"),
+        (0xF903, "M", "賈"),
+        (0xF904, "M", "滑"),
+        (0xF905, "M", "串"),
+        (0xF906, "M", "句"),
+        (0xF907, "M", "龜"),
+        (0xF909, "M", "契"),
+        (0xF90A, "M", "金"),
+        (0xF90B, "M", "喇"),
+        (0xF90C, "M", "奈"),
+        (0xF90D, "M", "懶"),
+        (0xF90E, "M", "癩"),
+        (0xF90F, "M", "羅"),
+        (0xF910, "M", "蘿"),
+        (0xF911, "M", "螺"),
+        (0xF912, "M", "裸"),
+        (0xF913, "M", "邏"),
+        (0xF914, "M", "樂"),
+        (0xF915, "M", "洛"),
+        (0xF916, "M", "烙"),
+        (0xF917, "M", "珞"),
+        (0xF918, "M", "落"),
+        (0xF919, "M", "酪"),
+        (0xF91A, "M", "駱"),
+        (0xF91B, "M", "亂"),
+        (0xF91C, "M", "卵"),
+        (0xF91D, "M", "欄"),
+        (0xF91E, "M", "爛"),
+        (0xF91F, "M", "蘭"),
+        (0xF920, "M", "鸞"),
+        (0xF921, "M", "嵐"),
+        (0xF922, "M", "濫"),
+        (0xF923, "M", "藍"),
+        (0xF924, "M", "襤"),
+        (0xF925, "M", "拉"),
+        (0xF926, "M", "臘"),
+        (0xF927, "M", "蠟"),
+        (0xF928, "M", "廊"),
+        (0xF929, "M", "朗"),
+        (0xF92A, "M", "浪"),
+        (0xF92B, "M", "狼"),
+        (0xF92C, "M", "郎"),
+        (0xF92D, "M", "來"),
+        (0xF92E, "M", "冷"),
+        (0xF92F, "M", "勞"),
+        (0xF930, "M", "擄"),
+        (0xF931, "M", "櫓"),
+        (0xF932, "M", "爐"),
+        (0xF933, "M", "盧"),
+        (0xF934, "M", "老"),
+        (0xF935, "M", "蘆"),
+        (0xF936, "M", "虜"),
+        (0xF937, "M", "路"),
+        (0xF938, "M", "露"),
+        (0xF939, "M", "魯"),
+        (0xF93A, "M", "鷺"),
+        (0xF93B, "M", "碌"),
+        (0xF93C, "M", "祿"),
+        (0xF93D, "M", "綠"),
+        (0xF93E, "M", "菉"),
+        (0xF93F, "M", "錄"),
+        (0xF940, "M", "鹿"),
+        (0xF941, "M", "論"),
+        (0xF942, "M", "壟"),
+        (0xF943, "M", "弄"),
+        (0xF944, "M", "籠"),
+        (0xF945, "M", "聾"),
+        (0xF946, "M", "牢"),
+        (0xF947, "M", "磊"),
+        (0xF948, "M", "賂"),
+        (0xF949, "M", "雷"),
     ]
 
+
 def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xF94A, 'M', '壘'),
-    (0xF94B, 'M', '屢'),
-    (0xF94C, 'M', '樓'),
-    (0xF94D, 'M', '淚'),
-    (0xF94E, 'M', '漏'),
-    (0xF94F, 'M', '累'),
-    (0xF950, 'M', '縷'),
-    (0xF951, 'M', '陋'),
-    (0xF952, 'M', '勒'),
-    (0xF953, 'M', '肋'),
-    (0xF954, 'M', '凜'),
-    (0xF955, 'M', '凌'),
-    (0xF956, 'M', '稜'),
-    (0xF957, 'M', '綾'),
-    (0xF958, 'M', '菱'),
-    (0xF959, 'M', '陵'),
-    (0xF95A, 'M', '讀'),
-    (0xF95B, 'M', '拏'),
-    (0xF95C, 'M', '樂'),
-    (0xF95D, 'M', '諾'),
-    (0xF95E, 'M', '丹'),
-    (0xF95F, 'M', '寧'),
-    (0xF960, 'M', '怒'),
-    (0xF961, 'M', '率'),
-    (0xF962, 'M', '異'),
-    (0xF963, 'M', '北'),
-    (0xF964, 'M', '磻'),
-    (0xF965, 'M', '便'),
-    (0xF966, 'M', '復'),
-    (0xF967, 'M', '不'),
-    (0xF968, 'M', '泌'),
-    (0xF969, 'M', '數'),
-    (0xF96A, 'M', '索'),
-    (0xF96B, 'M', '參'),
-    (0xF96C, 'M', '塞'),
-    (0xF96D, 'M', '省'),
-    (0xF96E, 'M', '葉'),
-    (0xF96F, 'M', '說'),
-    (0xF970, 'M', '殺'),
-    (0xF971, 'M', '辰'),
-    (0xF972, 'M', '沈'),
-    (0xF973, 'M', '拾'),
-    (0xF974, 'M', '若'),
-    (0xF975, 'M', '掠'),
-    (0xF976, 'M', '略'),
-    (0xF977, 'M', '亮'),
-    (0xF978, 'M', '兩'),
-    (0xF979, 'M', '凉'),
-    (0xF97A, 'M', '梁'),
-    (0xF97B, 'M', '糧'),
-    (0xF97C, 'M', '良'),
-    (0xF97D, 'M', '諒'),
-    (0xF97E, 'M', '量'),
-    (0xF97F, 'M', '勵'),
-    (0xF980, 'M', '呂'),
-    (0xF981, 'M', '女'),
-    (0xF982, 'M', '廬'),
-    (0xF983, 'M', '旅'),
-    (0xF984, 'M', '濾'),
-    (0xF985, 'M', '礪'),
-    (0xF986, 'M', '閭'),
-    (0xF987, 'M', '驪'),
-    (0xF988, 'M', '麗'),
-    (0xF989, 'M', '黎'),
-    (0xF98A, 'M', '力'),
-    (0xF98B, 'M', '曆'),
-    (0xF98C, 'M', '歷'),
-    (0xF98D, 'M', '轢'),
-    (0xF98E, 'M', '年'),
-    (0xF98F, 'M', '憐'),
-    (0xF990, 'M', '戀'),
-    (0xF991, 'M', '撚'),
-    (0xF992, 'M', '漣'),
-    (0xF993, 'M', '煉'),
-    (0xF994, 'M', '璉'),
-    (0xF995, 'M', '秊'),
-    (0xF996, 'M', '練'),
-    (0xF997, 'M', '聯'),
-    (0xF998, 'M', '輦'),
-    (0xF999, 'M', '蓮'),
-    (0xF99A, 'M', '連'),
-    (0xF99B, 'M', '鍊'),
-    (0xF99C, 'M', '列'),
-    (0xF99D, 'M', '劣'),
-    (0xF99E, 'M', '咽'),
-    (0xF99F, 'M', '烈'),
-    (0xF9A0, 'M', '裂'),
-    (0xF9A1, 'M', '說'),
-    (0xF9A2, 'M', '廉'),
-    (0xF9A3, 'M', '念'),
-    (0xF9A4, 'M', '捻'),
-    (0xF9A5, 'M', '殮'),
-    (0xF9A6, 'M', '簾'),
-    (0xF9A7, 'M', '獵'),
-    (0xF9A8, 'M', '令'),
-    (0xF9A9, 'M', '囹'),
-    (0xF9AA, 'M', '寧'),
-    (0xF9AB, 'M', '嶺'),
-    (0xF9AC, 'M', '怜'),
-    (0xF9AD, 'M', '玲'),
+        (0xF94A, "M", "壘"),
+        (0xF94B, "M", "屢"),
+        (0xF94C, "M", "樓"),
+        (0xF94D, "M", "淚"),
+        (0xF94E, "M", "漏"),
+        (0xF94F, "M", "累"),
+        (0xF950, "M", "縷"),
+        (0xF951, "M", "陋"),
+        (0xF952, "M", "勒"),
+        (0xF953, "M", "肋"),
+        (0xF954, "M", "凜"),
+        (0xF955, "M", "凌"),
+        (0xF956, "M", "稜"),
+        (0xF957, "M", "綾"),
+        (0xF958, "M", "菱"),
+        (0xF959, "M", "陵"),
+        (0xF95A, "M", "讀"),
+        (0xF95B, "M", "拏"),
+        (0xF95C, "M", "樂"),
+        (0xF95D, "M", "諾"),
+        (0xF95E, "M", "丹"),
+        (0xF95F, "M", "寧"),
+        (0xF960, "M", "怒"),
+        (0xF961, "M", "率"),
+        (0xF962, "M", "異"),
+        (0xF963, "M", "北"),
+        (0xF964, "M", "磻"),
+        (0xF965, "M", "便"),
+        (0xF966, "M", "復"),
+        (0xF967, "M", "不"),
+        (0xF968, "M", "泌"),
+        (0xF969, "M", "數"),
+        (0xF96A, "M", "索"),
+        (0xF96B, "M", "參"),
+        (0xF96C, "M", "塞"),
+        (0xF96D, "M", "省"),
+        (0xF96E, "M", "葉"),
+        (0xF96F, "M", "說"),
+        (0xF970, "M", "殺"),
+        (0xF971, "M", "辰"),
+        (0xF972, "M", "沈"),
+        (0xF973, "M", "拾"),
+        (0xF974, "M", "若"),
+        (0xF975, "M", "掠"),
+        (0xF976, "M", "略"),
+        (0xF977, "M", "亮"),
+        (0xF978, "M", "兩"),
+        (0xF979, "M", "凉"),
+        (0xF97A, "M", "梁"),
+        (0xF97B, "M", "糧"),
+        (0xF97C, "M", "良"),
+        (0xF97D, "M", "諒"),
+        (0xF97E, "M", "量"),
+        (0xF97F, "M", "勵"),
+        (0xF980, "M", "呂"),
+        (0xF981, "M", "女"),
+        (0xF982, "M", "廬"),
+        (0xF983, "M", "旅"),
+        (0xF984, "M", "濾"),
+        (0xF985, "M", "礪"),
+        (0xF986, "M", "閭"),
+        (0xF987, "M", "驪"),
+        (0xF988, "M", "麗"),
+        (0xF989, "M", "黎"),
+        (0xF98A, "M", "力"),
+        (0xF98B, "M", "曆"),
+        (0xF98C, "M", "歷"),
+        (0xF98D, "M", "轢"),
+        (0xF98E, "M", "年"),
+        (0xF98F, "M", "憐"),
+        (0xF990, "M", "戀"),
+        (0xF991, "M", "撚"),
+        (0xF992, "M", "漣"),
+        (0xF993, "M", "煉"),
+        (0xF994, "M", "璉"),
+        (0xF995, "M", "秊"),
+        (0xF996, "M", "練"),
+        (0xF997, "M", "聯"),
+        (0xF998, "M", "輦"),
+        (0xF999, "M", "蓮"),
+        (0xF99A, "M", "連"),
+        (0xF99B, "M", "鍊"),
+        (0xF99C, "M", "列"),
+        (0xF99D, "M", "劣"),
+        (0xF99E, "M", "咽"),
+        (0xF99F, "M", "烈"),
+        (0xF9A0, "M", "裂"),
+        (0xF9A1, "M", "說"),
+        (0xF9A2, "M", "廉"),
+        (0xF9A3, "M", "念"),
+        (0xF9A4, "M", "捻"),
+        (0xF9A5, "M", "殮"),
+        (0xF9A6, "M", "簾"),
+        (0xF9A7, "M", "獵"),
+        (0xF9A8, "M", "令"),
+        (0xF9A9, "M", "囹"),
+        (0xF9AA, "M", "寧"),
+        (0xF9AB, "M", "嶺"),
+        (0xF9AC, "M", "怜"),
+        (0xF9AD, "M", "玲"),
     ]
 
+
 def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xF9AE, 'M', '瑩'),
-    (0xF9AF, 'M', '羚'),
-    (0xF9B0, 'M', '聆'),
-    (0xF9B1, 'M', '鈴'),
-    (0xF9B2, 'M', '零'),
-    (0xF9B3, 'M', '靈'),
-    (0xF9B4, 'M', '領'),
-    (0xF9B5, 'M', '例'),
-    (0xF9B6, 'M', '禮'),
-    (0xF9B7, 'M', '醴'),
-    (0xF9B8, 'M', '隸'),
-    (0xF9B9, 'M', '惡'),
-    (0xF9BA, 'M', '了'),
-    (0xF9BB, 'M', '僚'),
-    (0xF9BC, 'M', '寮'),
-    (0xF9BD, 'M', '尿'),
-    (0xF9BE, 'M', '料'),
-    (0xF9BF, 'M', '樂'),
-    (0xF9C0, 'M', '燎'),
-    (0xF9C1, 'M', '療'),
-    (0xF9C2, 'M', '蓼'),
-    (0xF9C3, 'M', '遼'),
-    (0xF9C4, 'M', '龍'),
-    (0xF9C5, 'M', '暈'),
-    (0xF9C6, 'M', '阮'),
-    (0xF9C7, 'M', '劉'),
-    (0xF9C8, 'M', '杻'),
-    (0xF9C9, 'M', '柳'),
-    (0xF9CA, 'M', '流'),
-    (0xF9CB, 'M', '溜'),
-    (0xF9CC, 'M', '琉'),
-    (0xF9CD, 'M', '留'),
-    (0xF9CE, 'M', '硫'),
-    (0xF9CF, 'M', '紐'),
-    (0xF9D0, 'M', '類'),
-    (0xF9D1, 'M', '六'),
-    (0xF9D2, 'M', '戮'),
-    (0xF9D3, 'M', '陸'),
-    (0xF9D4, 'M', '倫'),
-    (0xF9D5, 'M', '崙'),
-    (0xF9D6, 'M', '淪'),
-    (0xF9D7, 'M', '輪'),
-    (0xF9D8, 'M', '律'),
-    (0xF9D9, 'M', '慄'),
-    (0xF9DA, 'M', '栗'),
-    (0xF9DB, 'M', '率'),
-    (0xF9DC, 'M', '隆'),
-    (0xF9DD, 'M', '利'),
-    (0xF9DE, 'M', '吏'),
-    (0xF9DF, 'M', '履'),
-    (0xF9E0, 'M', '易'),
-    (0xF9E1, 'M', '李'),
-    (0xF9E2, 'M', '梨'),
-    (0xF9E3, 'M', '泥'),
-    (0xF9E4, 'M', '理'),
-    (0xF9E5, 'M', '痢'),
-    (0xF9E6, 'M', '罹'),
-    (0xF9E7, 'M', '裏'),
-    (0xF9E8, 'M', '裡'),
-    (0xF9E9, 'M', '里'),
-    (0xF9EA, 'M', '離'),
-    (0xF9EB, 'M', '匿'),
-    (0xF9EC, 'M', '溺'),
-    (0xF9ED, 'M', '吝'),
-    (0xF9EE, 'M', '燐'),
-    (0xF9EF, 'M', '璘'),
-    (0xF9F0, 'M', '藺'),
-    (0xF9F1, 'M', '隣'),
-    (0xF9F2, 'M', '鱗'),
-    (0xF9F3, 'M', '麟'),
-    (0xF9F4, 'M', '林'),
-    (0xF9F5, 'M', '淋'),
-    (0xF9F6, 'M', '臨'),
-    (0xF9F7, 'M', '立'),
-    (0xF9F8, 'M', '笠'),
-    (0xF9F9, 'M', '粒'),
-    (0xF9FA, 'M', '狀'),
-    (0xF9FB, 'M', '炙'),
-    (0xF9FC, 'M', '識'),
-    (0xF9FD, 'M', '什'),
-    (0xF9FE, 'M', '茶'),
-    (0xF9FF, 'M', '刺'),
-    (0xFA00, 'M', '切'),
-    (0xFA01, 'M', '度'),
-    (0xFA02, 'M', '拓'),
-    (0xFA03, 'M', '糖'),
-    (0xFA04, 'M', '宅'),
-    (0xFA05, 'M', '洞'),
-    (0xFA06, 'M', '暴'),
-    (0xFA07, 'M', '輻'),
-    (0xFA08, 'M', '行'),
-    (0xFA09, 'M', '降'),
-    (0xFA0A, 'M', '見'),
-    (0xFA0B, 'M', '廓'),
-    (0xFA0C, 'M', '兀'),
-    (0xFA0D, 'M', '嗀'),
-    (0xFA0E, 'V'),
-    (0xFA10, 'M', '塚'),
-    (0xFA11, 'V'),
-    (0xFA12, 'M', '晴'),
+        (0xF9AE, "M", "瑩"),
+        (0xF9AF, "M", "羚"),
+        (0xF9B0, "M", "聆"),
+        (0xF9B1, "M", "鈴"),
+        (0xF9B2, "M", "零"),
+        (0xF9B3, "M", "靈"),
+        (0xF9B4, "M", "領"),
+        (0xF9B5, "M", "例"),
+        (0xF9B6, "M", "禮"),
+        (0xF9B7, "M", "醴"),
+        (0xF9B8, "M", "隸"),
+        (0xF9B9, "M", "惡"),
+        (0xF9BA, "M", "了"),
+        (0xF9BB, "M", "僚"),
+        (0xF9BC, "M", "寮"),
+        (0xF9BD, "M", "尿"),
+        (0xF9BE, "M", "料"),
+        (0xF9BF, "M", "樂"),
+        (0xF9C0, "M", "燎"),
+        (0xF9C1, "M", "療"),
+        (0xF9C2, "M", "蓼"),
+        (0xF9C3, "M", "遼"),
+        (0xF9C4, "M", "龍"),
+        (0xF9C5, "M", "暈"),
+        (0xF9C6, "M", "阮"),
+        (0xF9C7, "M", "劉"),
+        (0xF9C8, "M", "杻"),
+        (0xF9C9, "M", "柳"),
+        (0xF9CA, "M", "流"),
+        (0xF9CB, "M", "溜"),
+        (0xF9CC, "M", "琉"),
+        (0xF9CD, "M", "留"),
+        (0xF9CE, "M", "硫"),
+        (0xF9CF, "M", "紐"),
+        (0xF9D0, "M", "類"),
+        (0xF9D1, "M", "六"),
+        (0xF9D2, "M", "戮"),
+        (0xF9D3, "M", "陸"),
+        (0xF9D4, "M", "倫"),
+        (0xF9D5, "M", "崙"),
+        (0xF9D6, "M", "淪"),
+        (0xF9D7, "M", "輪"),
+        (0xF9D8, "M", "律"),
+        (0xF9D9, "M", "慄"),
+        (0xF9DA, "M", "栗"),
+        (0xF9DB, "M", "率"),
+        (0xF9DC, "M", "隆"),
+        (0xF9DD, "M", "利"),
+        (0xF9DE, "M", "吏"),
+        (0xF9DF, "M", "履"),
+        (0xF9E0, "M", "易"),
+        (0xF9E1, "M", "李"),
+        (0xF9E2, "M", "梨"),
+        (0xF9E3, "M", "泥"),
+        (0xF9E4, "M", "理"),
+        (0xF9E5, "M", "痢"),
+        (0xF9E6, "M", "罹"),
+        (0xF9E7, "M", "裏"),
+        (0xF9E8, "M", "裡"),
+        (0xF9E9, "M", "里"),
+        (0xF9EA, "M", "離"),
+        (0xF9EB, "M", "匿"),
+        (0xF9EC, "M", "溺"),
+        (0xF9ED, "M", "吝"),
+        (0xF9EE, "M", "燐"),
+        (0xF9EF, "M", "璘"),
+        (0xF9F0, "M", "藺"),
+        (0xF9F1, "M", "隣"),
+        (0xF9F2, "M", "鱗"),
+        (0xF9F3, "M", "麟"),
+        (0xF9F4, "M", "林"),
+        (0xF9F5, "M", "淋"),
+        (0xF9F6, "M", "臨"),
+        (0xF9F7, "M", "立"),
+        (0xF9F8, "M", "笠"),
+        (0xF9F9, "M", "粒"),
+        (0xF9FA, "M", "狀"),
+        (0xF9FB, "M", "炙"),
+        (0xF9FC, "M", "識"),
+        (0xF9FD, "M", "什"),
+        (0xF9FE, "M", "茶"),
+        (0xF9FF, "M", "刺"),
+        (0xFA00, "M", "切"),
+        (0xFA01, "M", "度"),
+        (0xFA02, "M", "拓"),
+        (0xFA03, "M", "糖"),
+        (0xFA04, "M", "宅"),
+        (0xFA05, "M", "洞"),
+        (0xFA06, "M", "暴"),
+        (0xFA07, "M", "輻"),
+        (0xFA08, "M", "行"),
+        (0xFA09, "M", "降"),
+        (0xFA0A, "M", "見"),
+        (0xFA0B, "M", "廓"),
+        (0xFA0C, "M", "兀"),
+        (0xFA0D, "M", "嗀"),
+        (0xFA0E, "V"),
+        (0xFA10, "M", "塚"),
+        (0xFA11, "V"),
+        (0xFA12, "M", "晴"),
     ]
 
+
 def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFA13, 'V'),
-    (0xFA15, 'M', '凞'),
-    (0xFA16, 'M', '猪'),
-    (0xFA17, 'M', '益'),
-    (0xFA18, 'M', '礼'),
-    (0xFA19, 'M', '神'),
-    (0xFA1A, 'M', '祥'),
-    (0xFA1B, 'M', '福'),
-    (0xFA1C, 'M', '靖'),
-    (0xFA1D, 'M', '精'),
-    (0xFA1E, 'M', '羽'),
-    (0xFA1F, 'V'),
-    (0xFA20, 'M', '蘒'),
-    (0xFA21, 'V'),
-    (0xFA22, 'M', '諸'),
-    (0xFA23, 'V'),
-    (0xFA25, 'M', '逸'),
-    (0xFA26, 'M', '都'),
-    (0xFA27, 'V'),
-    (0xFA2A, 'M', '飯'),
-    (0xFA2B, 'M', '飼'),
-    (0xFA2C, 'M', '館'),
-    (0xFA2D, 'M', '鶴'),
-    (0xFA2E, 'M', '郞'),
-    (0xFA2F, 'M', '隷'),
-    (0xFA30, 'M', '侮'),
-    (0xFA31, 'M', '僧'),
-    (0xFA32, 'M', '免'),
-    (0xFA33, 'M', '勉'),
-    (0xFA34, 'M', '勤'),
-    (0xFA35, 'M', '卑'),
-    (0xFA36, 'M', '喝'),
-    (0xFA37, 'M', '嘆'),
-    (0xFA38, 'M', '器'),
-    (0xFA39, 'M', '塀'),
-    (0xFA3A, 'M', '墨'),
-    (0xFA3B, 'M', '層'),
-    (0xFA3C, 'M', '屮'),
-    (0xFA3D, 'M', '悔'),
-    (0xFA3E, 'M', '慨'),
-    (0xFA3F, 'M', '憎'),
-    (0xFA40, 'M', '懲'),
-    (0xFA41, 'M', '敏'),
-    (0xFA42, 'M', '既'),
-    (0xFA43, 'M', '暑'),
-    (0xFA44, 'M', '梅'),
-    (0xFA45, 'M', '海'),
-    (0xFA46, 'M', '渚'),
-    (0xFA47, 'M', '漢'),
-    (0xFA48, 'M', '煮'),
-    (0xFA49, 'M', '爫'),
-    (0xFA4A, 'M', '琢'),
-    (0xFA4B, 'M', '碑'),
-    (0xFA4C, 'M', '社'),
-    (0xFA4D, 'M', '祉'),
-    (0xFA4E, 'M', '祈'),
-    (0xFA4F, 'M', '祐'),
-    (0xFA50, 'M', '祖'),
-    (0xFA51, 'M', '祝'),
-    (0xFA52, 'M', '禍'),
-    (0xFA53, 'M', '禎'),
-    (0xFA54, 'M', '穀'),
-    (0xFA55, 'M', '突'),
-    (0xFA56, 'M', '節'),
-    (0xFA57, 'M', '練'),
-    (0xFA58, 'M', '縉'),
-    (0xFA59, 'M', '繁'),
-    (0xFA5A, 'M', '署'),
-    (0xFA5B, 'M', '者'),
-    (0xFA5C, 'M', '臭'),
-    (0xFA5D, 'M', '艹'),
-    (0xFA5F, 'M', '著'),
-    (0xFA60, 'M', '褐'),
-    (0xFA61, 'M', '視'),
-    (0xFA62, 'M', '謁'),
-    (0xFA63, 'M', '謹'),
-    (0xFA64, 'M', '賓'),
-    (0xFA65, 'M', '贈'),
-    (0xFA66, 'M', '辶'),
-    (0xFA67, 'M', '逸'),
-    (0xFA68, 'M', '難'),
-    (0xFA69, 'M', '響'),
-    (0xFA6A, 'M', '頻'),
-    (0xFA6B, 'M', '恵'),
-    (0xFA6C, 'M', '𤋮'),
-    (0xFA6D, 'M', '舘'),
-    (0xFA6E, 'X'),
-    (0xFA70, 'M', '並'),
-    (0xFA71, 'M', '况'),
-    (0xFA72, 'M', '全'),
-    (0xFA73, 'M', '侀'),
-    (0xFA74, 'M', '充'),
-    (0xFA75, 'M', '冀'),
-    (0xFA76, 'M', '勇'),
-    (0xFA77, 'M', '勺'),
-    (0xFA78, 'M', '喝'),
-    (0xFA79, 'M', '啕'),
-    (0xFA7A, 'M', '喙'),
-    (0xFA7B, 'M', '嗢'),
-    (0xFA7C, 'M', '塚'),
+        (0xFA13, "V"),
+        (0xFA15, "M", "凞"),
+        (0xFA16, "M", "猪"),
+        (0xFA17, "M", "益"),
+        (0xFA18, "M", "礼"),
+        (0xFA19, "M", "神"),
+        (0xFA1A, "M", "祥"),
+        (0xFA1B, "M", "福"),
+        (0xFA1C, "M", "靖"),
+        (0xFA1D, "M", "精"),
+        (0xFA1E, "M", "羽"),
+        (0xFA1F, "V"),
+        (0xFA20, "M", "蘒"),
+        (0xFA21, "V"),
+        (0xFA22, "M", "諸"),
+        (0xFA23, "V"),
+        (0xFA25, "M", "逸"),
+        (0xFA26, "M", "都"),
+        (0xFA27, "V"),
+        (0xFA2A, "M", "飯"),
+        (0xFA2B, "M", "飼"),
+        (0xFA2C, "M", "館"),
+        (0xFA2D, "M", "鶴"),
+        (0xFA2E, "M", "郞"),
+        (0xFA2F, "M", "隷"),
+        (0xFA30, "M", "侮"),
+        (0xFA31, "M", "僧"),
+        (0xFA32, "M", "免"),
+        (0xFA33, "M", "勉"),
+        (0xFA34, "M", "勤"),
+        (0xFA35, "M", "卑"),
+        (0xFA36, "M", "喝"),
+        (0xFA37, "M", "嘆"),
+        (0xFA38, "M", "器"),
+        (0xFA39, "M", "塀"),
+        (0xFA3A, "M", "墨"),
+        (0xFA3B, "M", "層"),
+        (0xFA3C, "M", "屮"),
+        (0xFA3D, "M", "悔"),
+        (0xFA3E, "M", "慨"),
+        (0xFA3F, "M", "憎"),
+        (0xFA40, "M", "懲"),
+        (0xFA41, "M", "敏"),
+        (0xFA42, "M", "既"),
+        (0xFA43, "M", "暑"),
+        (0xFA44, "M", "梅"),
+        (0xFA45, "M", "海"),
+        (0xFA46, "M", "渚"),
+        (0xFA47, "M", "漢"),
+        (0xFA48, "M", "煮"),
+        (0xFA49, "M", "爫"),
+        (0xFA4A, "M", "琢"),
+        (0xFA4B, "M", "碑"),
+        (0xFA4C, "M", "社"),
+        (0xFA4D, "M", "祉"),
+        (0xFA4E, "M", "祈"),
+        (0xFA4F, "M", "祐"),
+        (0xFA50, "M", "祖"),
+        (0xFA51, "M", "祝"),
+        (0xFA52, "M", "禍"),
+        (0xFA53, "M", "禎"),
+        (0xFA54, "M", "穀"),
+        (0xFA55, "M", "突"),
+        (0xFA56, "M", "節"),
+        (0xFA57, "M", "練"),
+        (0xFA58, "M", "縉"),
+        (0xFA59, "M", "繁"),
+        (0xFA5A, "M", "署"),
+        (0xFA5B, "M", "者"),
+        (0xFA5C, "M", "臭"),
+        (0xFA5D, "M", "艹"),
+        (0xFA5F, "M", "著"),
+        (0xFA60, "M", "褐"),
+        (0xFA61, "M", "視"),
+        (0xFA62, "M", "謁"),
+        (0xFA63, "M", "謹"),
+        (0xFA64, "M", "賓"),
+        (0xFA65, "M", "贈"),
+        (0xFA66, "M", "辶"),
+        (0xFA67, "M", "逸"),
+        (0xFA68, "M", "難"),
+        (0xFA69, "M", "響"),
+        (0xFA6A, "M", "頻"),
+        (0xFA6B, "M", "恵"),
+        (0xFA6C, "M", "𤋮"),
+        (0xFA6D, "M", "舘"),
+        (0xFA6E, "X"),
+        (0xFA70, "M", "並"),
+        (0xFA71, "M", "况"),
+        (0xFA72, "M", "全"),
+        (0xFA73, "M", "侀"),
+        (0xFA74, "M", "充"),
+        (0xFA75, "M", "冀"),
+        (0xFA76, "M", "勇"),
+        (0xFA77, "M", "勺"),
+        (0xFA78, "M", "喝"),
+        (0xFA79, "M", "啕"),
+        (0xFA7A, "M", "喙"),
+        (0xFA7B, "M", "嗢"),
+        (0xFA7C, "M", "塚"),
     ]
 
+
 def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFA7D, 'M', '墳'),
-    (0xFA7E, 'M', '奄'),
-    (0xFA7F, 'M', '奔'),
-    (0xFA80, 'M', '婢'),
-    (0xFA81, 'M', '嬨'),
-    (0xFA82, 'M', '廒'),
-    (0xFA83, 'M', '廙'),
-    (0xFA84, 'M', '彩'),
-    (0xFA85, 'M', '徭'),
-    (0xFA86, 'M', '惘'),
-    (0xFA87, 'M', '慎'),
-    (0xFA88, 'M', '愈'),
-    (0xFA89, 'M', '憎'),
-    (0xFA8A, 'M', '慠'),
-    (0xFA8B, 'M', '懲'),
-    (0xFA8C, 'M', '戴'),
-    (0xFA8D, 'M', '揄'),
-    (0xFA8E, 'M', '搜'),
-    (0xFA8F, 'M', '摒'),
-    (0xFA90, 'M', '敖'),
-    (0xFA91, 'M', '晴'),
-    (0xFA92, 'M', '朗'),
-    (0xFA93, 'M', '望'),
-    (0xFA94, 'M', '杖'),
-    (0xFA95, 'M', '歹'),
-    (0xFA96, 'M', '殺'),
-    (0xFA97, 'M', '流'),
-    (0xFA98, 'M', '滛'),
-    (0xFA99, 'M', '滋'),
-    (0xFA9A, 'M', '漢'),
-    (0xFA9B, 'M', '瀞'),
-    (0xFA9C, 'M', '煮'),
-    (0xFA9D, 'M', '瞧'),
-    (0xFA9E, 'M', '爵'),
-    (0xFA9F, 'M', '犯'),
-    (0xFAA0, 'M', '猪'),
-    (0xFAA1, 'M', '瑱'),
-    (0xFAA2, 'M', '甆'),
-    (0xFAA3, 'M', '画'),
-    (0xFAA4, 'M', '瘝'),
-    (0xFAA5, 'M', '瘟'),
-    (0xFAA6, 'M', '益'),
-    (0xFAA7, 'M', '盛'),
-    (0xFAA8, 'M', '直'),
-    (0xFAA9, 'M', '睊'),
-    (0xFAAA, 'M', '着'),
-    (0xFAAB, 'M', '磌'),
-    (0xFAAC, 'M', '窱'),
-    (0xFAAD, 'M', '節'),
-    (0xFAAE, 'M', '类'),
-    (0xFAAF, 'M', '絛'),
-    (0xFAB0, 'M', '練'),
-    (0xFAB1, 'M', '缾'),
-    (0xFAB2, 'M', '者'),
-    (0xFAB3, 'M', '荒'),
-    (0xFAB4, 'M', '華'),
-    (0xFAB5, 'M', '蝹'),
-    (0xFAB6, 'M', '襁'),
-    (0xFAB7, 'M', '覆'),
-    (0xFAB8, 'M', '視'),
-    (0xFAB9, 'M', '調'),
-    (0xFABA, 'M', '諸'),
-    (0xFABB, 'M', '請'),
-    (0xFABC, 'M', '謁'),
-    (0xFABD, 'M', '諾'),
-    (0xFABE, 'M', '諭'),
-    (0xFABF, 'M', '謹'),
-    (0xFAC0, 'M', '變'),
-    (0xFAC1, 'M', '贈'),
-    (0xFAC2, 'M', '輸'),
-    (0xFAC3, 'M', '遲'),
-    (0xFAC4, 'M', '醙'),
-    (0xFAC5, 'M', '鉶'),
-    (0xFAC6, 'M', '陼'),
-    (0xFAC7, 'M', '難'),
-    (0xFAC8, 'M', '靖'),
-    (0xFAC9, 'M', '韛'),
-    (0xFACA, 'M', '響'),
-    (0xFACB, 'M', '頋'),
-    (0xFACC, 'M', '頻'),
-    (0xFACD, 'M', '鬒'),
-    (0xFACE, 'M', '龜'),
-    (0xFACF, 'M', '𢡊'),
-    (0xFAD0, 'M', '𢡄'),
-    (0xFAD1, 'M', '𣏕'),
-    (0xFAD2, 'M', '㮝'),
-    (0xFAD3, 'M', '䀘'),
-    (0xFAD4, 'M', '䀹'),
-    (0xFAD5, 'M', '𥉉'),
-    (0xFAD6, 'M', '𥳐'),
-    (0xFAD7, 'M', '𧻓'),
-    (0xFAD8, 'M', '齃'),
-    (0xFAD9, 'M', '龎'),
-    (0xFADA, 'X'),
-    (0xFB00, 'M', 'ff'),
-    (0xFB01, 'M', 'fi'),
-    (0xFB02, 'M', 'fl'),
-    (0xFB03, 'M', 'ffi'),
-    (0xFB04, 'M', 'ffl'),
-    (0xFB05, 'M', 'st'),
+        (0xFA7D, "M", "墳"),
+        (0xFA7E, "M", "奄"),
+        (0xFA7F, "M", "奔"),
+        (0xFA80, "M", "婢"),
+        (0xFA81, "M", "嬨"),
+        (0xFA82, "M", "廒"),
+        (0xFA83, "M", "廙"),
+        (0xFA84, "M", "彩"),
+        (0xFA85, "M", "徭"),
+        (0xFA86, "M", "惘"),
+        (0xFA87, "M", "慎"),
+        (0xFA88, "M", "愈"),
+        (0xFA89, "M", "憎"),
+        (0xFA8A, "M", "慠"),
+        (0xFA8B, "M", "懲"),
+        (0xFA8C, "M", "戴"),
+        (0xFA8D, "M", "揄"),
+        (0xFA8E, "M", "搜"),
+        (0xFA8F, "M", "摒"),
+        (0xFA90, "M", "敖"),
+        (0xFA91, "M", "晴"),
+        (0xFA92, "M", "朗"),
+        (0xFA93, "M", "望"),
+        (0xFA94, "M", "杖"),
+        (0xFA95, "M", "歹"),
+        (0xFA96, "M", "殺"),
+        (0xFA97, "M", "流"),
+        (0xFA98, "M", "滛"),
+        (0xFA99, "M", "滋"),
+        (0xFA9A, "M", "漢"),
+        (0xFA9B, "M", "瀞"),
+        (0xFA9C, "M", "煮"),
+        (0xFA9D, "M", "瞧"),
+        (0xFA9E, "M", "爵"),
+        (0xFA9F, "M", "犯"),
+        (0xFAA0, "M", "猪"),
+        (0xFAA1, "M", "瑱"),
+        (0xFAA2, "M", "甆"),
+        (0xFAA3, "M", "画"),
+        (0xFAA4, "M", "瘝"),
+        (0xFAA5, "M", "瘟"),
+        (0xFAA6, "M", "益"),
+        (0xFAA7, "M", "盛"),
+        (0xFAA8, "M", "直"),
+        (0xFAA9, "M", "睊"),
+        (0xFAAA, "M", "着"),
+        (0xFAAB, "M", "磌"),
+        (0xFAAC, "M", "窱"),
+        (0xFAAD, "M", "節"),
+        (0xFAAE, "M", "类"),
+        (0xFAAF, "M", "絛"),
+        (0xFAB0, "M", "練"),
+        (0xFAB1, "M", "缾"),
+        (0xFAB2, "M", "者"),
+        (0xFAB3, "M", "荒"),
+        (0xFAB4, "M", "華"),
+        (0xFAB5, "M", "蝹"),
+        (0xFAB6, "M", "襁"),
+        (0xFAB7, "M", "覆"),
+        (0xFAB8, "M", "視"),
+        (0xFAB9, "M", "調"),
+        (0xFABA, "M", "諸"),
+        (0xFABB, "M", "請"),
+        (0xFABC, "M", "謁"),
+        (0xFABD, "M", "諾"),
+        (0xFABE, "M", "諭"),
+        (0xFABF, "M", "謹"),
+        (0xFAC0, "M", "變"),
+        (0xFAC1, "M", "贈"),
+        (0xFAC2, "M", "輸"),
+        (0xFAC3, "M", "遲"),
+        (0xFAC4, "M", "醙"),
+        (0xFAC5, "M", "鉶"),
+        (0xFAC6, "M", "陼"),
+        (0xFAC7, "M", "難"),
+        (0xFAC8, "M", "靖"),
+        (0xFAC9, "M", "韛"),
+        (0xFACA, "M", "響"),
+        (0xFACB, "M", "頋"),
+        (0xFACC, "M", "頻"),
+        (0xFACD, "M", "鬒"),
+        (0xFACE, "M", "龜"),
+        (0xFACF, "M", "𢡊"),
+        (0xFAD0, "M", "𢡄"),
+        (0xFAD1, "M", "𣏕"),
+        (0xFAD2, "M", "㮝"),
+        (0xFAD3, "M", "䀘"),
+        (0xFAD4, "M", "䀹"),
+        (0xFAD5, "M", "𥉉"),
+        (0xFAD6, "M", "𥳐"),
+        (0xFAD7, "M", "𧻓"),
+        (0xFAD8, "M", "齃"),
+        (0xFAD9, "M", "龎"),
+        (0xFADA, "X"),
+        (0xFB00, "M", "ff"),
+        (0xFB01, "M", "fi"),
+        (0xFB02, "M", "fl"),
+        (0xFB03, "M", "ffi"),
+        (0xFB04, "M", "ffl"),
+        (0xFB05, "M", "st"),
     ]
 
+
 def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFB07, 'X'),
-    (0xFB13, 'M', 'մն'),
-    (0xFB14, 'M', 'մե'),
-    (0xFB15, 'M', 'մի'),
-    (0xFB16, 'M', 'վն'),
-    (0xFB17, 'M', 'մխ'),
-    (0xFB18, 'X'),
-    (0xFB1D, 'M', 'יִ'),
-    (0xFB1E, 'V'),
-    (0xFB1F, 'M', 'ײַ'),
-    (0xFB20, 'M', 'ע'),
-    (0xFB21, 'M', 'א'),
-    (0xFB22, 'M', 'ד'),
-    (0xFB23, 'M', 'ה'),
-    (0xFB24, 'M', 'כ'),
-    (0xFB25, 'M', 'ל'),
-    (0xFB26, 'M', 'ם'),
-    (0xFB27, 'M', 'ר'),
-    (0xFB28, 'M', 'ת'),
-    (0xFB29, '3', '+'),
-    (0xFB2A, 'M', 'שׁ'),
-    (0xFB2B, 'M', 'שׂ'),
-    (0xFB2C, 'M', 'שּׁ'),
-    (0xFB2D, 'M', 'שּׂ'),
-    (0xFB2E, 'M', 'אַ'),
-    (0xFB2F, 'M', 'אָ'),
-    (0xFB30, 'M', 'אּ'),
-    (0xFB31, 'M', 'בּ'),
-    (0xFB32, 'M', 'גּ'),
-    (0xFB33, 'M', 'דּ'),
-    (0xFB34, 'M', 'הּ'),
-    (0xFB35, 'M', 'וּ'),
-    (0xFB36, 'M', 'זּ'),
-    (0xFB37, 'X'),
-    (0xFB38, 'M', 'טּ'),
-    (0xFB39, 'M', 'יּ'),
-    (0xFB3A, 'M', 'ךּ'),
-    (0xFB3B, 'M', 'כּ'),
-    (0xFB3C, 'M', 'לּ'),
-    (0xFB3D, 'X'),
-    (0xFB3E, 'M', 'מּ'),
-    (0xFB3F, 'X'),
-    (0xFB40, 'M', 'נּ'),
-    (0xFB41, 'M', 'סּ'),
-    (0xFB42, 'X'),
-    (0xFB43, 'M', 'ףּ'),
-    (0xFB44, 'M', 'פּ'),
-    (0xFB45, 'X'),
-    (0xFB46, 'M', 'צּ'),
-    (0xFB47, 'M', 'קּ'),
-    (0xFB48, 'M', 'רּ'),
-    (0xFB49, 'M', 'שּ'),
-    (0xFB4A, 'M', 'תּ'),
-    (0xFB4B, 'M', 'וֹ'),
-    (0xFB4C, 'M', 'בֿ'),
-    (0xFB4D, 'M', 'כֿ'),
-    (0xFB4E, 'M', 'פֿ'),
-    (0xFB4F, 'M', 'אל'),
-    (0xFB50, 'M', 'ٱ'),
-    (0xFB52, 'M', 'ٻ'),
-    (0xFB56, 'M', 'پ'),
-    (0xFB5A, 'M', 'ڀ'),
-    (0xFB5E, 'M', 'ٺ'),
-    (0xFB62, 'M', 'ٿ'),
-    (0xFB66, 'M', 'ٹ'),
-    (0xFB6A, 'M', 'ڤ'),
-    (0xFB6E, 'M', 'ڦ'),
-    (0xFB72, 'M', 'ڄ'),
-    (0xFB76, 'M', 'ڃ'),
-    (0xFB7A, 'M', 'چ'),
-    (0xFB7E, 'M', 'ڇ'),
-    (0xFB82, 'M', 'ڍ'),
-    (0xFB84, 'M', 'ڌ'),
-    (0xFB86, 'M', 'ڎ'),
-    (0xFB88, 'M', 'ڈ'),
-    (0xFB8A, 'M', 'ژ'),
-    (0xFB8C, 'M', 'ڑ'),
-    (0xFB8E, 'M', 'ک'),
-    (0xFB92, 'M', 'گ'),
-    (0xFB96, 'M', 'ڳ'),
-    (0xFB9A, 'M', 'ڱ'),
-    (0xFB9E, 'M', 'ں'),
-    (0xFBA0, 'M', 'ڻ'),
-    (0xFBA4, 'M', 'ۀ'),
-    (0xFBA6, 'M', 'ہ'),
-    (0xFBAA, 'M', 'ھ'),
-    (0xFBAE, 'M', 'ے'),
-    (0xFBB0, 'M', 'ۓ'),
-    (0xFBB2, 'V'),
-    (0xFBC3, 'X'),
-    (0xFBD3, 'M', 'ڭ'),
-    (0xFBD7, 'M', 'ۇ'),
-    (0xFBD9, 'M', 'ۆ'),
-    (0xFBDB, 'M', 'ۈ'),
-    (0xFBDD, 'M', 'ۇٴ'),
-    (0xFBDE, 'M', 'ۋ'),
-    (0xFBE0, 'M', 'ۅ'),
-    (0xFBE2, 'M', 'ۉ'),
-    (0xFBE4, 'M', 'ې'),
-    (0xFBE8, 'M', 'ى'),
+        (0xFB07, "X"),
+        (0xFB13, "M", "մն"),
+        (0xFB14, "M", "մե"),
+        (0xFB15, "M", "մի"),
+        (0xFB16, "M", "վն"),
+        (0xFB17, "M", "մխ"),
+        (0xFB18, "X"),
+        (0xFB1D, "M", "יִ"),
+        (0xFB1E, "V"),
+        (0xFB1F, "M", "ײַ"),
+        (0xFB20, "M", "ע"),
+        (0xFB21, "M", "א"),
+        (0xFB22, "M", "ד"),
+        (0xFB23, "M", "ה"),
+        (0xFB24, "M", "כ"),
+        (0xFB25, "M", "ל"),
+        (0xFB26, "M", "ם"),
+        (0xFB27, "M", "ר"),
+        (0xFB28, "M", "ת"),
+        (0xFB29, "3", "+"),
+        (0xFB2A, "M", "שׁ"),
+        (0xFB2B, "M", "שׂ"),
+        (0xFB2C, "M", "שּׁ"),
+        (0xFB2D, "M", "שּׂ"),
+        (0xFB2E, "M", "אַ"),
+        (0xFB2F, "M", "אָ"),
+        (0xFB30, "M", "אּ"),
+        (0xFB31, "M", "בּ"),
+        (0xFB32, "M", "גּ"),
+        (0xFB33, "M", "דּ"),
+        (0xFB34, "M", "הּ"),
+        (0xFB35, "M", "וּ"),
+        (0xFB36, "M", "זּ"),
+        (0xFB37, "X"),
+        (0xFB38, "M", "טּ"),
+        (0xFB39, "M", "יּ"),
+        (0xFB3A, "M", "ךּ"),
+        (0xFB3B, "M", "כּ"),
+        (0xFB3C, "M", "לּ"),
+        (0xFB3D, "X"),
+        (0xFB3E, "M", "מּ"),
+        (0xFB3F, "X"),
+        (0xFB40, "M", "נּ"),
+        (0xFB41, "M", "סּ"),
+        (0xFB42, "X"),
+        (0xFB43, "M", "ףּ"),
+        (0xFB44, "M", "פּ"),
+        (0xFB45, "X"),
+        (0xFB46, "M", "צּ"),
+        (0xFB47, "M", "קּ"),
+        (0xFB48, "M", "רּ"),
+        (0xFB49, "M", "שּ"),
+        (0xFB4A, "M", "תּ"),
+        (0xFB4B, "M", "וֹ"),
+        (0xFB4C, "M", "בֿ"),
+        (0xFB4D, "M", "כֿ"),
+        (0xFB4E, "M", "פֿ"),
+        (0xFB4F, "M", "אל"),
+        (0xFB50, "M", "ٱ"),
+        (0xFB52, "M", "ٻ"),
+        (0xFB56, "M", "پ"),
+        (0xFB5A, "M", "ڀ"),
+        (0xFB5E, "M", "ٺ"),
+        (0xFB62, "M", "ٿ"),
+        (0xFB66, "M", "ٹ"),
+        (0xFB6A, "M", "ڤ"),
+        (0xFB6E, "M", "ڦ"),
+        (0xFB72, "M", "ڄ"),
+        (0xFB76, "M", "ڃ"),
+        (0xFB7A, "M", "چ"),
+        (0xFB7E, "M", "ڇ"),
+        (0xFB82, "M", "ڍ"),
+        (0xFB84, "M", "ڌ"),
+        (0xFB86, "M", "ڎ"),
+        (0xFB88, "M", "ڈ"),
+        (0xFB8A, "M", "ژ"),
+        (0xFB8C, "M", "ڑ"),
+        (0xFB8E, "M", "ک"),
+        (0xFB92, "M", "گ"),
+        (0xFB96, "M", "ڳ"),
+        (0xFB9A, "M", "ڱ"),
+        (0xFB9E, "M", "ں"),
+        (0xFBA0, "M", "ڻ"),
+        (0xFBA4, "M", "ۀ"),
+        (0xFBA6, "M", "ہ"),
+        (0xFBAA, "M", "ھ"),
+        (0xFBAE, "M", "ے"),
+        (0xFBB0, "M", "ۓ"),
+        (0xFBB2, "V"),
+        (0xFBC3, "X"),
+        (0xFBD3, "M", "ڭ"),
+        (0xFBD7, "M", "ۇ"),
+        (0xFBD9, "M", "ۆ"),
+        (0xFBDB, "M", "ۈ"),
+        (0xFBDD, "M", "ۇٴ"),
+        (0xFBDE, "M", "ۋ"),
+        (0xFBE0, "M", "ۅ"),
+        (0xFBE2, "M", "ۉ"),
+        (0xFBE4, "M", "ې"),
+        (0xFBE8, "M", "ى"),
     ]
 
+
 def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFBEA, 'M', 'ئا'),
-    (0xFBEC, 'M', 'ئە'),
-    (0xFBEE, 'M', 'ئو'),
-    (0xFBF0, 'M', 'ئۇ'),
-    (0xFBF2, 'M', 'ئۆ'),
-    (0xFBF4, 'M', 'ئۈ'),
-    (0xFBF6, 'M', 'ئې'),
-    (0xFBF9, 'M', 'ئى'),
-    (0xFBFC, 'M', 'ی'),
-    (0xFC00, 'M', 'ئج'),
-    (0xFC01, 'M', 'ئح'),
-    (0xFC02, 'M', 'ئم'),
-    (0xFC03, 'M', 'ئى'),
-    (0xFC04, 'M', 'ئي'),
-    (0xFC05, 'M', 'بج'),
-    (0xFC06, 'M', 'بح'),
-    (0xFC07, 'M', 'بخ'),
-    (0xFC08, 'M', 'بم'),
-    (0xFC09, 'M', 'بى'),
-    (0xFC0A, 'M', 'بي'),
-    (0xFC0B, 'M', 'تج'),
-    (0xFC0C, 'M', 'تح'),
-    (0xFC0D, 'M', 'تخ'),
-    (0xFC0E, 'M', 'تم'),
-    (0xFC0F, 'M', 'تى'),
-    (0xFC10, 'M', 'تي'),
-    (0xFC11, 'M', 'ثج'),
-    (0xFC12, 'M', 'ثم'),
-    (0xFC13, 'M', 'ثى'),
-    (0xFC14, 'M', 'ثي'),
-    (0xFC15, 'M', 'جح'),
-    (0xFC16, 'M', 'جم'),
-    (0xFC17, 'M', 'حج'),
-    (0xFC18, 'M', 'حم'),
-    (0xFC19, 'M', 'خج'),
-    (0xFC1A, 'M', 'خح'),
-    (0xFC1B, 'M', 'خم'),
-    (0xFC1C, 'M', 'سج'),
-    (0xFC1D, 'M', 'سح'),
-    (0xFC1E, 'M', 'سخ'),
-    (0xFC1F, 'M', 'سم'),
-    (0xFC20, 'M', 'صح'),
-    (0xFC21, 'M', 'صم'),
-    (0xFC22, 'M', 'ضج'),
-    (0xFC23, 'M', 'ضح'),
-    (0xFC24, 'M', 'ضخ'),
-    (0xFC25, 'M', 'ضم'),
-    (0xFC26, 'M', 'طح'),
-    (0xFC27, 'M', 'طم'),
-    (0xFC28, 'M', 'ظم'),
-    (0xFC29, 'M', 'عج'),
-    (0xFC2A, 'M', 'عم'),
-    (0xFC2B, 'M', 'غج'),
-    (0xFC2C, 'M', 'غم'),
-    (0xFC2D, 'M', 'فج'),
-    (0xFC2E, 'M', 'فح'),
-    (0xFC2F, 'M', 'فخ'),
-    (0xFC30, 'M', 'فم'),
-    (0xFC31, 'M', 'فى'),
-    (0xFC32, 'M', 'في'),
-    (0xFC33, 'M', 'قح'),
-    (0xFC34, 'M', 'قم'),
-    (0xFC35, 'M', 'قى'),
-    (0xFC36, 'M', 'قي'),
-    (0xFC37, 'M', 'كا'),
-    (0xFC38, 'M', 'كج'),
-    (0xFC39, 'M', 'كح'),
-    (0xFC3A, 'M', 'كخ'),
-    (0xFC3B, 'M', 'كل'),
-    (0xFC3C, 'M', 'كم'),
-    (0xFC3D, 'M', 'كى'),
-    (0xFC3E, 'M', 'كي'),
-    (0xFC3F, 'M', 'لج'),
-    (0xFC40, 'M', 'لح'),
-    (0xFC41, 'M', 'لخ'),
-    (0xFC42, 'M', 'لم'),
-    (0xFC43, 'M', 'لى'),
-    (0xFC44, 'M', 'لي'),
-    (0xFC45, 'M', 'مج'),
-    (0xFC46, 'M', 'مح'),
-    (0xFC47, 'M', 'مخ'),
-    (0xFC48, 'M', 'مم'),
-    (0xFC49, 'M', 'مى'),
-    (0xFC4A, 'M', 'مي'),
-    (0xFC4B, 'M', 'نج'),
-    (0xFC4C, 'M', 'نح'),
-    (0xFC4D, 'M', 'نخ'),
-    (0xFC4E, 'M', 'نم'),
-    (0xFC4F, 'M', 'نى'),
-    (0xFC50, 'M', 'ني'),
-    (0xFC51, 'M', 'هج'),
-    (0xFC52, 'M', 'هم'),
-    (0xFC53, 'M', 'هى'),
-    (0xFC54, 'M', 'هي'),
-    (0xFC55, 'M', 'يج'),
-    (0xFC56, 'M', 'يح'),
-    (0xFC57, 'M', 'يخ'),
-    (0xFC58, 'M', 'يم'),
-    (0xFC59, 'M', 'يى'),
-    (0xFC5A, 'M', 'يي'),
+        (0xFBEA, "M", "ئا"),
+        (0xFBEC, "M", "ئە"),
+        (0xFBEE, "M", "ئو"),
+        (0xFBF0, "M", "ئۇ"),
+        (0xFBF2, "M", "ئۆ"),
+        (0xFBF4, "M", "ئۈ"),
+        (0xFBF6, "M", "ئې"),
+        (0xFBF9, "M", "ئى"),
+        (0xFBFC, "M", "ی"),
+        (0xFC00, "M", "ئج"),
+        (0xFC01, "M", "ئح"),
+        (0xFC02, "M", "ئم"),
+        (0xFC03, "M", "ئى"),
+        (0xFC04, "M", "ئي"),
+        (0xFC05, "M", "بج"),
+        (0xFC06, "M", "بح"),
+        (0xFC07, "M", "بخ"),
+        (0xFC08, "M", "بم"),
+        (0xFC09, "M", "بى"),
+        (0xFC0A, "M", "بي"),
+        (0xFC0B, "M", "تج"),
+        (0xFC0C, "M", "تح"),
+        (0xFC0D, "M", "تخ"),
+        (0xFC0E, "M", "تم"),
+        (0xFC0F, "M", "تى"),
+        (0xFC10, "M", "تي"),
+        (0xFC11, "M", "ثج"),
+        (0xFC12, "M", "ثم"),
+        (0xFC13, "M", "ثى"),
+        (0xFC14, "M", "ثي"),
+        (0xFC15, "M", "جح"),
+        (0xFC16, "M", "جم"),
+        (0xFC17, "M", "حج"),
+        (0xFC18, "M", "حم"),
+        (0xFC19, "M", "خج"),
+        (0xFC1A, "M", "خح"),
+        (0xFC1B, "M", "خم"),
+        (0xFC1C, "M", "سج"),
+        (0xFC1D, "M", "سح"),
+        (0xFC1E, "M", "سخ"),
+        (0xFC1F, "M", "سم"),
+        (0xFC20, "M", "صح"),
+        (0xFC21, "M", "صم"),
+        (0xFC22, "M", "ضج"),
+        (0xFC23, "M", "ضح"),
+        (0xFC24, "M", "ضخ"),
+        (0xFC25, "M", "ضم"),
+        (0xFC26, "M", "طح"),
+        (0xFC27, "M", "طم"),
+        (0xFC28, "M", "ظم"),
+        (0xFC29, "M", "عج"),
+        (0xFC2A, "M", "عم"),
+        (0xFC2B, "M", "غج"),
+        (0xFC2C, "M", "غم"),
+        (0xFC2D, "M", "فج"),
+        (0xFC2E, "M", "فح"),
+        (0xFC2F, "M", "فخ"),
+        (0xFC30, "M", "فم"),
+        (0xFC31, "M", "فى"),
+        (0xFC32, "M", "في"),
+        (0xFC33, "M", "قح"),
+        (0xFC34, "M", "قم"),
+        (0xFC35, "M", "قى"),
+        (0xFC36, "M", "قي"),
+        (0xFC37, "M", "كا"),
+        (0xFC38, "M", "كج"),
+        (0xFC39, "M", "كح"),
+        (0xFC3A, "M", "كخ"),
+        (0xFC3B, "M", "كل"),
+        (0xFC3C, "M", "كم"),
+        (0xFC3D, "M", "كى"),
+        (0xFC3E, "M", "كي"),
+        (0xFC3F, "M", "لج"),
+        (0xFC40, "M", "لح"),
+        (0xFC41, "M", "لخ"),
+        (0xFC42, "M", "لم"),
+        (0xFC43, "M", "لى"),
+        (0xFC44, "M", "لي"),
+        (0xFC45, "M", "مج"),
+        (0xFC46, "M", "مح"),
+        (0xFC47, "M", "مخ"),
+        (0xFC48, "M", "مم"),
+        (0xFC49, "M", "مى"),
+        (0xFC4A, "M", "مي"),
+        (0xFC4B, "M", "نج"),
+        (0xFC4C, "M", "نح"),
+        (0xFC4D, "M", "نخ"),
+        (0xFC4E, "M", "نم"),
+        (0xFC4F, "M", "نى"),
+        (0xFC50, "M", "ني"),
+        (0xFC51, "M", "هج"),
+        (0xFC52, "M", "هم"),
+        (0xFC53, "M", "هى"),
+        (0xFC54, "M", "هي"),
+        (0xFC55, "M", "يج"),
+        (0xFC56, "M", "يح"),
+        (0xFC57, "M", "يخ"),
+        (0xFC58, "M", "يم"),
+        (0xFC59, "M", "يى"),
+        (0xFC5A, "M", "يي"),
     ]
 
+
 def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFC5B, 'M', 'ذٰ'),
-    (0xFC5C, 'M', 'رٰ'),
-    (0xFC5D, 'M', 'ىٰ'),
-    (0xFC5E, '3', ' ٌّ'),
-    (0xFC5F, '3', ' ٍّ'),
-    (0xFC60, '3', ' َّ'),
-    (0xFC61, '3', ' ُّ'),
-    (0xFC62, '3', ' ِّ'),
-    (0xFC63, '3', ' ّٰ'),
-    (0xFC64, 'M', 'ئر'),
-    (0xFC65, 'M', 'ئز'),
-    (0xFC66, 'M', 'ئم'),
-    (0xFC67, 'M', 'ئن'),
-    (0xFC68, 'M', 'ئى'),
-    (0xFC69, 'M', 'ئي'),
-    (0xFC6A, 'M', 'بر'),
-    (0xFC6B, 'M', 'بز'),
-    (0xFC6C, 'M', 'بم'),
-    (0xFC6D, 'M', 'بن'),
-    (0xFC6E, 'M', 'بى'),
-    (0xFC6F, 'M', 'بي'),
-    (0xFC70, 'M', 'تر'),
-    (0xFC71, 'M', 'تز'),
-    (0xFC72, 'M', 'تم'),
-    (0xFC73, 'M', 'تن'),
-    (0xFC74, 'M', 'تى'),
-    (0xFC75, 'M', 'تي'),
-    (0xFC76, 'M', 'ثر'),
-    (0xFC77, 'M', 'ثز'),
-    (0xFC78, 'M', 'ثم'),
-    (0xFC79, 'M', 'ثن'),
-    (0xFC7A, 'M', 'ثى'),
-    (0xFC7B, 'M', 'ثي'),
-    (0xFC7C, 'M', 'فى'),
-    (0xFC7D, 'M', 'في'),
-    (0xFC7E, 'M', 'قى'),
-    (0xFC7F, 'M', 'قي'),
-    (0xFC80, 'M', 'كا'),
-    (0xFC81, 'M', 'كل'),
-    (0xFC82, 'M', 'كم'),
-    (0xFC83, 'M', 'كى'),
-    (0xFC84, 'M', 'كي'),
-    (0xFC85, 'M', 'لم'),
-    (0xFC86, 'M', 'لى'),
-    (0xFC87, 'M', 'لي'),
-    (0xFC88, 'M', 'ما'),
-    (0xFC89, 'M', 'مم'),
-    (0xFC8A, 'M', 'نر'),
-    (0xFC8B, 'M', 'نز'),
-    (0xFC8C, 'M', 'نم'),
-    (0xFC8D, 'M', 'نن'),
-    (0xFC8E, 'M', 'نى'),
-    (0xFC8F, 'M', 'ني'),
-    (0xFC90, 'M', 'ىٰ'),
-    (0xFC91, 'M', 'ير'),
-    (0xFC92, 'M', 'يز'),
-    (0xFC93, 'M', 'يم'),
-    (0xFC94, 'M', 'ين'),
-    (0xFC95, 'M', 'يى'),
-    (0xFC96, 'M', 'يي'),
-    (0xFC97, 'M', 'ئج'),
-    (0xFC98, 'M', 'ئح'),
-    (0xFC99, 'M', 'ئخ'),
-    (0xFC9A, 'M', 'ئم'),
-    (0xFC9B, 'M', 'ئه'),
-    (0xFC9C, 'M', 'بج'),
-    (0xFC9D, 'M', 'بح'),
-    (0xFC9E, 'M', 'بخ'),
-    (0xFC9F, 'M', 'بم'),
-    (0xFCA0, 'M', 'به'),
-    (0xFCA1, 'M', 'تج'),
-    (0xFCA2, 'M', 'تح'),
-    (0xFCA3, 'M', 'تخ'),
-    (0xFCA4, 'M', 'تم'),
-    (0xFCA5, 'M', 'ته'),
-    (0xFCA6, 'M', 'ثم'),
-    (0xFCA7, 'M', 'جح'),
-    (0xFCA8, 'M', 'جم'),
-    (0xFCA9, 'M', 'حج'),
-    (0xFCAA, 'M', 'حم'),
-    (0xFCAB, 'M', 'خج'),
-    (0xFCAC, 'M', 'خم'),
-    (0xFCAD, 'M', 'سج'),
-    (0xFCAE, 'M', 'سح'),
-    (0xFCAF, 'M', 'سخ'),
-    (0xFCB0, 'M', 'سم'),
-    (0xFCB1, 'M', 'صح'),
-    (0xFCB2, 'M', 'صخ'),
-    (0xFCB3, 'M', 'صم'),
-    (0xFCB4, 'M', 'ضج'),
-    (0xFCB5, 'M', 'ضح'),
-    (0xFCB6, 'M', 'ضخ'),
-    (0xFCB7, 'M', 'ضم'),
-    (0xFCB8, 'M', 'طح'),
-    (0xFCB9, 'M', 'ظم'),
-    (0xFCBA, 'M', 'عج'),
-    (0xFCBB, 'M', 'عم'),
-    (0xFCBC, 'M', 'غج'),
-    (0xFCBD, 'M', 'غم'),
-    (0xFCBE, 'M', 'فج'),
+        (0xFC5B, "M", "ذٰ"),
+        (0xFC5C, "M", "رٰ"),
+        (0xFC5D, "M", "ىٰ"),
+        (0xFC5E, "3", " ٌّ"),
+        (0xFC5F, "3", " ٍّ"),
+        (0xFC60, "3", " َّ"),
+        (0xFC61, "3", " ُّ"),
+        (0xFC62, "3", " ِّ"),
+        (0xFC63, "3", " ّٰ"),
+        (0xFC64, "M", "ئر"),
+        (0xFC65, "M", "ئز"),
+        (0xFC66, "M", "ئم"),
+        (0xFC67, "M", "ئن"),
+        (0xFC68, "M", "ئى"),
+        (0xFC69, "M", "ئي"),
+        (0xFC6A, "M", "بر"),
+        (0xFC6B, "M", "بز"),
+        (0xFC6C, "M", "بم"),
+        (0xFC6D, "M", "بن"),
+        (0xFC6E, "M", "بى"),
+        (0xFC6F, "M", "بي"),
+        (0xFC70, "M", "تر"),
+        (0xFC71, "M", "تز"),
+        (0xFC72, "M", "تم"),
+        (0xFC73, "M", "تن"),
+        (0xFC74, "M", "تى"),
+        (0xFC75, "M", "تي"),
+        (0xFC76, "M", "ثر"),
+        (0xFC77, "M", "ثز"),
+        (0xFC78, "M", "ثم"),
+        (0xFC79, "M", "ثن"),
+        (0xFC7A, "M", "ثى"),
+        (0xFC7B, "M", "ثي"),
+        (0xFC7C, "M", "فى"),
+        (0xFC7D, "M", "في"),
+        (0xFC7E, "M", "قى"),
+        (0xFC7F, "M", "قي"),
+        (0xFC80, "M", "كا"),
+        (0xFC81, "M", "كل"),
+        (0xFC82, "M", "كم"),
+        (0xFC83, "M", "كى"),
+        (0xFC84, "M", "كي"),
+        (0xFC85, "M", "لم"),
+        (0xFC86, "M", "لى"),
+        (0xFC87, "M", "لي"),
+        (0xFC88, "M", "ما"),
+        (0xFC89, "M", "مم"),
+        (0xFC8A, "M", "نر"),
+        (0xFC8B, "M", "نز"),
+        (0xFC8C, "M", "نم"),
+        (0xFC8D, "M", "نن"),
+        (0xFC8E, "M", "نى"),
+        (0xFC8F, "M", "ني"),
+        (0xFC90, "M", "ىٰ"),
+        (0xFC91, "M", "ير"),
+        (0xFC92, "M", "يز"),
+        (0xFC93, "M", "يم"),
+        (0xFC94, "M", "ين"),
+        (0xFC95, "M", "يى"),
+        (0xFC96, "M", "يي"),
+        (0xFC97, "M", "ئج"),
+        (0xFC98, "M", "ئح"),
+        (0xFC99, "M", "ئخ"),
+        (0xFC9A, "M", "ئم"),
+        (0xFC9B, "M", "ئه"),
+        (0xFC9C, "M", "بج"),
+        (0xFC9D, "M", "بح"),
+        (0xFC9E, "M", "بخ"),
+        (0xFC9F, "M", "بم"),
+        (0xFCA0, "M", "به"),
+        (0xFCA1, "M", "تج"),
+        (0xFCA2, "M", "تح"),
+        (0xFCA3, "M", "تخ"),
+        (0xFCA4, "M", "تم"),
+        (0xFCA5, "M", "ته"),
+        (0xFCA6, "M", "ثم"),
+        (0xFCA7, "M", "جح"),
+        (0xFCA8, "M", "جم"),
+        (0xFCA9, "M", "حج"),
+        (0xFCAA, "M", "حم"),
+        (0xFCAB, "M", "خج"),
+        (0xFCAC, "M", "خم"),
+        (0xFCAD, "M", "سج"),
+        (0xFCAE, "M", "سح"),
+        (0xFCAF, "M", "سخ"),
+        (0xFCB0, "M", "سم"),
+        (0xFCB1, "M", "صح"),
+        (0xFCB2, "M", "صخ"),
+        (0xFCB3, "M", "صم"),
+        (0xFCB4, "M", "ضج"),
+        (0xFCB5, "M", "ضح"),
+        (0xFCB6, "M", "ضخ"),
+        (0xFCB7, "M", "ضم"),
+        (0xFCB8, "M", "طح"),
+        (0xFCB9, "M", "ظم"),
+        (0xFCBA, "M", "عج"),
+        (0xFCBB, "M", "عم"),
+        (0xFCBC, "M", "غج"),
+        (0xFCBD, "M", "غم"),
+        (0xFCBE, "M", "فج"),
     ]
 
+
 def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFCBF, 'M', 'فح'),
-    (0xFCC0, 'M', 'فخ'),
-    (0xFCC1, 'M', 'فم'),
-    (0xFCC2, 'M', 'قح'),
-    (0xFCC3, 'M', 'قم'),
-    (0xFCC4, 'M', 'كج'),
-    (0xFCC5, 'M', 'كح'),
-    (0xFCC6, 'M', 'كخ'),
-    (0xFCC7, 'M', 'كل'),
-    (0xFCC8, 'M', 'كم'),
-    (0xFCC9, 'M', 'لج'),
-    (0xFCCA, 'M', 'لح'),
-    (0xFCCB, 'M', 'لخ'),
-    (0xFCCC, 'M', 'لم'),
-    (0xFCCD, 'M', 'له'),
-    (0xFCCE, 'M', 'مج'),
-    (0xFCCF, 'M', 'مح'),
-    (0xFCD0, 'M', 'مخ'),
-    (0xFCD1, 'M', 'مم'),
-    (0xFCD2, 'M', 'نج'),
-    (0xFCD3, 'M', 'نح'),
-    (0xFCD4, 'M', 'نخ'),
-    (0xFCD5, 'M', 'نم'),
-    (0xFCD6, 'M', 'نه'),
-    (0xFCD7, 'M', 'هج'),
-    (0xFCD8, 'M', 'هم'),
-    (0xFCD9, 'M', 'هٰ'),
-    (0xFCDA, 'M', 'يج'),
-    (0xFCDB, 'M', 'يح'),
-    (0xFCDC, 'M', 'يخ'),
-    (0xFCDD, 'M', 'يم'),
-    (0xFCDE, 'M', 'يه'),
-    (0xFCDF, 'M', 'ئم'),
-    (0xFCE0, 'M', 'ئه'),
-    (0xFCE1, 'M', 'بم'),
-    (0xFCE2, 'M', 'به'),
-    (0xFCE3, 'M', 'تم'),
-    (0xFCE4, 'M', 'ته'),
-    (0xFCE5, 'M', 'ثم'),
-    (0xFCE6, 'M', 'ثه'),
-    (0xFCE7, 'M', 'سم'),
-    (0xFCE8, 'M', 'سه'),
-    (0xFCE9, 'M', 'شم'),
-    (0xFCEA, 'M', 'شه'),
-    (0xFCEB, 'M', 'كل'),
-    (0xFCEC, 'M', 'كم'),
-    (0xFCED, 'M', 'لم'),
-    (0xFCEE, 'M', 'نم'),
-    (0xFCEF, 'M', 'نه'),
-    (0xFCF0, 'M', 'يم'),
-    (0xFCF1, 'M', 'يه'),
-    (0xFCF2, 'M', 'ـَّ'),
-    (0xFCF3, 'M', 'ـُّ'),
-    (0xFCF4, 'M', 'ـِّ'),
-    (0xFCF5, 'M', 'طى'),
-    (0xFCF6, 'M', 'طي'),
-    (0xFCF7, 'M', 'عى'),
-    (0xFCF8, 'M', 'عي'),
-    (0xFCF9, 'M', 'غى'),
-    (0xFCFA, 'M', 'غي'),
-    (0xFCFB, 'M', 'سى'),
-    (0xFCFC, 'M', 'سي'),
-    (0xFCFD, 'M', 'شى'),
-    (0xFCFE, 'M', 'شي'),
-    (0xFCFF, 'M', 'حى'),
-    (0xFD00, 'M', 'حي'),
-    (0xFD01, 'M', 'جى'),
-    (0xFD02, 'M', 'جي'),
-    (0xFD03, 'M', 'خى'),
-    (0xFD04, 'M', 'خي'),
-    (0xFD05, 'M', 'صى'),
-    (0xFD06, 'M', 'صي'),
-    (0xFD07, 'M', 'ضى'),
-    (0xFD08, 'M', 'ضي'),
-    (0xFD09, 'M', 'شج'),
-    (0xFD0A, 'M', 'شح'),
-    (0xFD0B, 'M', 'شخ'),
-    (0xFD0C, 'M', 'شم'),
-    (0xFD0D, 'M', 'شر'),
-    (0xFD0E, 'M', 'سر'),
-    (0xFD0F, 'M', 'صر'),
-    (0xFD10, 'M', 'ضر'),
-    (0xFD11, 'M', 'طى'),
-    (0xFD12, 'M', 'طي'),
-    (0xFD13, 'M', 'عى'),
-    (0xFD14, 'M', 'عي'),
-    (0xFD15, 'M', 'غى'),
-    (0xFD16, 'M', 'غي'),
-    (0xFD17, 'M', 'سى'),
-    (0xFD18, 'M', 'سي'),
-    (0xFD19, 'M', 'شى'),
-    (0xFD1A, 'M', 'شي'),
-    (0xFD1B, 'M', 'حى'),
-    (0xFD1C, 'M', 'حي'),
-    (0xFD1D, 'M', 'جى'),
-    (0xFD1E, 'M', 'جي'),
-    (0xFD1F, 'M', 'خى'),
-    (0xFD20, 'M', 'خي'),
-    (0xFD21, 'M', 'صى'),
-    (0xFD22, 'M', 'صي'),
+        (0xFCBF, "M", "فح"),
+        (0xFCC0, "M", "فخ"),
+        (0xFCC1, "M", "فم"),
+        (0xFCC2, "M", "قح"),
+        (0xFCC3, "M", "قم"),
+        (0xFCC4, "M", "كج"),
+        (0xFCC5, "M", "كح"),
+        (0xFCC6, "M", "كخ"),
+        (0xFCC7, "M", "كل"),
+        (0xFCC8, "M", "كم"),
+        (0xFCC9, "M", "لج"),
+        (0xFCCA, "M", "لح"),
+        (0xFCCB, "M", "لخ"),
+        (0xFCCC, "M", "لم"),
+        (0xFCCD, "M", "له"),
+        (0xFCCE, "M", "مج"),
+        (0xFCCF, "M", "مح"),
+        (0xFCD0, "M", "مخ"),
+        (0xFCD1, "M", "مم"),
+        (0xFCD2, "M", "نج"),
+        (0xFCD3, "M", "نح"),
+        (0xFCD4, "M", "نخ"),
+        (0xFCD5, "M", "نم"),
+        (0xFCD6, "M", "نه"),
+        (0xFCD7, "M", "هج"),
+        (0xFCD8, "M", "هم"),
+        (0xFCD9, "M", "هٰ"),
+        (0xFCDA, "M", "يج"),
+        (0xFCDB, "M", "يح"),
+        (0xFCDC, "M", "يخ"),
+        (0xFCDD, "M", "يم"),
+        (0xFCDE, "M", "يه"),
+        (0xFCDF, "M", "ئم"),
+        (0xFCE0, "M", "ئه"),
+        (0xFCE1, "M", "بم"),
+        (0xFCE2, "M", "به"),
+        (0xFCE3, "M", "تم"),
+        (0xFCE4, "M", "ته"),
+        (0xFCE5, "M", "ثم"),
+        (0xFCE6, "M", "ثه"),
+        (0xFCE7, "M", "سم"),
+        (0xFCE8, "M", "سه"),
+        (0xFCE9, "M", "شم"),
+        (0xFCEA, "M", "شه"),
+        (0xFCEB, "M", "كل"),
+        (0xFCEC, "M", "كم"),
+        (0xFCED, "M", "لم"),
+        (0xFCEE, "M", "نم"),
+        (0xFCEF, "M", "نه"),
+        (0xFCF0, "M", "يم"),
+        (0xFCF1, "M", "يه"),
+        (0xFCF2, "M", "ـَّ"),
+        (0xFCF3, "M", "ـُّ"),
+        (0xFCF4, "M", "ـِّ"),
+        (0xFCF5, "M", "طى"),
+        (0xFCF6, "M", "طي"),
+        (0xFCF7, "M", "عى"),
+        (0xFCF8, "M", "عي"),
+        (0xFCF9, "M", "غى"),
+        (0xFCFA, "M", "غي"),
+        (0xFCFB, "M", "سى"),
+        (0xFCFC, "M", "سي"),
+        (0xFCFD, "M", "شى"),
+        (0xFCFE, "M", "شي"),
+        (0xFCFF, "M", "حى"),
+        (0xFD00, "M", "حي"),
+        (0xFD01, "M", "جى"),
+        (0xFD02, "M", "جي"),
+        (0xFD03, "M", "خى"),
+        (0xFD04, "M", "خي"),
+        (0xFD05, "M", "صى"),
+        (0xFD06, "M", "صي"),
+        (0xFD07, "M", "ضى"),
+        (0xFD08, "M", "ضي"),
+        (0xFD09, "M", "شج"),
+        (0xFD0A, "M", "شح"),
+        (0xFD0B, "M", "شخ"),
+        (0xFD0C, "M", "شم"),
+        (0xFD0D, "M", "شر"),
+        (0xFD0E, "M", "سر"),
+        (0xFD0F, "M", "صر"),
+        (0xFD10, "M", "ضر"),
+        (0xFD11, "M", "طى"),
+        (0xFD12, "M", "طي"),
+        (0xFD13, "M", "عى"),
+        (0xFD14, "M", "عي"),
+        (0xFD15, "M", "غى"),
+        (0xFD16, "M", "غي"),
+        (0xFD17, "M", "سى"),
+        (0xFD18, "M", "سي"),
+        (0xFD19, "M", "شى"),
+        (0xFD1A, "M", "شي"),
+        (0xFD1B, "M", "حى"),
+        (0xFD1C, "M", "حي"),
+        (0xFD1D, "M", "جى"),
+        (0xFD1E, "M", "جي"),
+        (0xFD1F, "M", "خى"),
+        (0xFD20, "M", "خي"),
+        (0xFD21, "M", "صى"),
+        (0xFD22, "M", "صي"),
     ]
 
+
 def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFD23, 'M', 'ضى'),
-    (0xFD24, 'M', 'ضي'),
-    (0xFD25, 'M', 'شج'),
-    (0xFD26, 'M', 'شح'),
-    (0xFD27, 'M', 'شخ'),
-    (0xFD28, 'M', 'شم'),
-    (0xFD29, 'M', 'شر'),
-    (0xFD2A, 'M', 'سر'),
-    (0xFD2B, 'M', 'صر'),
-    (0xFD2C, 'M', 'ضر'),
-    (0xFD2D, 'M', 'شج'),
-    (0xFD2E, 'M', 'شح'),
-    (0xFD2F, 'M', 'شخ'),
-    (0xFD30, 'M', 'شم'),
-    (0xFD31, 'M', 'سه'),
-    (0xFD32, 'M', 'شه'),
-    (0xFD33, 'M', 'طم'),
-    (0xFD34, 'M', 'سج'),
-    (0xFD35, 'M', 'سح'),
-    (0xFD36, 'M', 'سخ'),
-    (0xFD37, 'M', 'شج'),
-    (0xFD38, 'M', 'شح'),
-    (0xFD39, 'M', 'شخ'),
-    (0xFD3A, 'M', 'طم'),
-    (0xFD3B, 'M', 'ظم'),
-    (0xFD3C, 'M', 'اً'),
-    (0xFD3E, 'V'),
-    (0xFD50, 'M', 'تجم'),
-    (0xFD51, 'M', 'تحج'),
-    (0xFD53, 'M', 'تحم'),
-    (0xFD54, 'M', 'تخم'),
-    (0xFD55, 'M', 'تمج'),
-    (0xFD56, 'M', 'تمح'),
-    (0xFD57, 'M', 'تمخ'),
-    (0xFD58, 'M', 'جمح'),
-    (0xFD5A, 'M', 'حمي'),
-    (0xFD5B, 'M', 'حمى'),
-    (0xFD5C, 'M', 'سحج'),
-    (0xFD5D, 'M', 'سجح'),
-    (0xFD5E, 'M', 'سجى'),
-    (0xFD5F, 'M', 'سمح'),
-    (0xFD61, 'M', 'سمج'),
-    (0xFD62, 'M', 'سمم'),
-    (0xFD64, 'M', 'صحح'),
-    (0xFD66, 'M', 'صمم'),
-    (0xFD67, 'M', 'شحم'),
-    (0xFD69, 'M', 'شجي'),
-    (0xFD6A, 'M', 'شمخ'),
-    (0xFD6C, 'M', 'شمم'),
-    (0xFD6E, 'M', 'ضحى'),
-    (0xFD6F, 'M', 'ضخم'),
-    (0xFD71, 'M', 'طمح'),
-    (0xFD73, 'M', 'طمم'),
-    (0xFD74, 'M', 'طمي'),
-    (0xFD75, 'M', 'عجم'),
-    (0xFD76, 'M', 'عمم'),
-    (0xFD78, 'M', 'عمى'),
-    (0xFD79, 'M', 'غمم'),
-    (0xFD7A, 'M', 'غمي'),
-    (0xFD7B, 'M', 'غمى'),
-    (0xFD7C, 'M', 'فخم'),
-    (0xFD7E, 'M', 'قمح'),
-    (0xFD7F, 'M', 'قمم'),
-    (0xFD80, 'M', 'لحم'),
-    (0xFD81, 'M', 'لحي'),
-    (0xFD82, 'M', 'لحى'),
-    (0xFD83, 'M', 'لجج'),
-    (0xFD85, 'M', 'لخم'),
-    (0xFD87, 'M', 'لمح'),
-    (0xFD89, 'M', 'محج'),
-    (0xFD8A, 'M', 'محم'),
-    (0xFD8B, 'M', 'محي'),
-    (0xFD8C, 'M', 'مجح'),
-    (0xFD8D, 'M', 'مجم'),
-    (0xFD8E, 'M', 'مخج'),
-    (0xFD8F, 'M', 'مخم'),
-    (0xFD90, 'X'),
-    (0xFD92, 'M', 'مجخ'),
-    (0xFD93, 'M', 'همج'),
-    (0xFD94, 'M', 'همم'),
-    (0xFD95, 'M', 'نحم'),
-    (0xFD96, 'M', 'نحى'),
-    (0xFD97, 'M', 'نجم'),
-    (0xFD99, 'M', 'نجى'),
-    (0xFD9A, 'M', 'نمي'),
-    (0xFD9B, 'M', 'نمى'),
-    (0xFD9C, 'M', 'يمم'),
-    (0xFD9E, 'M', 'بخي'),
-    (0xFD9F, 'M', 'تجي'),
-    (0xFDA0, 'M', 'تجى'),
-    (0xFDA1, 'M', 'تخي'),
-    (0xFDA2, 'M', 'تخى'),
-    (0xFDA3, 'M', 'تمي'),
-    (0xFDA4, 'M', 'تمى'),
-    (0xFDA5, 'M', 'جمي'),
-    (0xFDA6, 'M', 'جحى'),
-    (0xFDA7, 'M', 'جمى'),
-    (0xFDA8, 'M', 'سخى'),
-    (0xFDA9, 'M', 'صحي'),
-    (0xFDAA, 'M', 'شحي'),
+        (0xFD23, "M", "ضى"),
+        (0xFD24, "M", "ضي"),
+        (0xFD25, "M", "شج"),
+        (0xFD26, "M", "شح"),
+        (0xFD27, "M", "شخ"),
+        (0xFD28, "M", "شم"),
+        (0xFD29, "M", "شر"),
+        (0xFD2A, "M", "سر"),
+        (0xFD2B, "M", "صر"),
+        (0xFD2C, "M", "ضر"),
+        (0xFD2D, "M", "شج"),
+        (0xFD2E, "M", "شح"),
+        (0xFD2F, "M", "شخ"),
+        (0xFD30, "M", "شم"),
+        (0xFD31, "M", "سه"),
+        (0xFD32, "M", "شه"),
+        (0xFD33, "M", "طم"),
+        (0xFD34, "M", "سج"),
+        (0xFD35, "M", "سح"),
+        (0xFD36, "M", "سخ"),
+        (0xFD37, "M", "شج"),
+        (0xFD38, "M", "شح"),
+        (0xFD39, "M", "شخ"),
+        (0xFD3A, "M", "طم"),
+        (0xFD3B, "M", "ظم"),
+        (0xFD3C, "M", "اً"),
+        (0xFD3E, "V"),
+        (0xFD50, "M", "تجم"),
+        (0xFD51, "M", "تحج"),
+        (0xFD53, "M", "تحم"),
+        (0xFD54, "M", "تخم"),
+        (0xFD55, "M", "تمج"),
+        (0xFD56, "M", "تمح"),
+        (0xFD57, "M", "تمخ"),
+        (0xFD58, "M", "جمح"),
+        (0xFD5A, "M", "حمي"),
+        (0xFD5B, "M", "حمى"),
+        (0xFD5C, "M", "سحج"),
+        (0xFD5D, "M", "سجح"),
+        (0xFD5E, "M", "سجى"),
+        (0xFD5F, "M", "سمح"),
+        (0xFD61, "M", "سمج"),
+        (0xFD62, "M", "سمم"),
+        (0xFD64, "M", "صحح"),
+        (0xFD66, "M", "صمم"),
+        (0xFD67, "M", "شحم"),
+        (0xFD69, "M", "شجي"),
+        (0xFD6A, "M", "شمخ"),
+        (0xFD6C, "M", "شمم"),
+        (0xFD6E, "M", "ضحى"),
+        (0xFD6F, "M", "ضخم"),
+        (0xFD71, "M", "طمح"),
+        (0xFD73, "M", "طمم"),
+        (0xFD74, "M", "طمي"),
+        (0xFD75, "M", "عجم"),
+        (0xFD76, "M", "عمم"),
+        (0xFD78, "M", "عمى"),
+        (0xFD79, "M", "غمم"),
+        (0xFD7A, "M", "غمي"),
+        (0xFD7B, "M", "غمى"),
+        (0xFD7C, "M", "فخم"),
+        (0xFD7E, "M", "قمح"),
+        (0xFD7F, "M", "قمم"),
+        (0xFD80, "M", "لحم"),
+        (0xFD81, "M", "لحي"),
+        (0xFD82, "M", "لحى"),
+        (0xFD83, "M", "لجج"),
+        (0xFD85, "M", "لخم"),
+        (0xFD87, "M", "لمح"),
+        (0xFD89, "M", "محج"),
+        (0xFD8A, "M", "محم"),
+        (0xFD8B, "M", "محي"),
+        (0xFD8C, "M", "مجح"),
+        (0xFD8D, "M", "مجم"),
+        (0xFD8E, "M", "مخج"),
+        (0xFD8F, "M", "مخم"),
+        (0xFD90, "X"),
+        (0xFD92, "M", "مجخ"),
+        (0xFD93, "M", "همج"),
+        (0xFD94, "M", "همم"),
+        (0xFD95, "M", "نحم"),
+        (0xFD96, "M", "نحى"),
+        (0xFD97, "M", "نجم"),
+        (0xFD99, "M", "نجى"),
+        (0xFD9A, "M", "نمي"),
+        (0xFD9B, "M", "نمى"),
+        (0xFD9C, "M", "يمم"),
+        (0xFD9E, "M", "بخي"),
+        (0xFD9F, "M", "تجي"),
+        (0xFDA0, "M", "تجى"),
+        (0xFDA1, "M", "تخي"),
+        (0xFDA2, "M", "تخى"),
+        (0xFDA3, "M", "تمي"),
+        (0xFDA4, "M", "تمى"),
+        (0xFDA5, "M", "جمي"),
+        (0xFDA6, "M", "جحى"),
+        (0xFDA7, "M", "جمى"),
+        (0xFDA8, "M", "سخى"),
+        (0xFDA9, "M", "صحي"),
+        (0xFDAA, "M", "شحي"),
     ]
 
+
 def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFDAB, 'M', 'ضحي'),
-    (0xFDAC, 'M', 'لجي'),
-    (0xFDAD, 'M', 'لمي'),
-    (0xFDAE, 'M', 'يحي'),
-    (0xFDAF, 'M', 'يجي'),
-    (0xFDB0, 'M', 'يمي'),
-    (0xFDB1, 'M', 'ممي'),
-    (0xFDB2, 'M', 'قمي'),
-    (0xFDB3, 'M', 'نحي'),
-    (0xFDB4, 'M', 'قمح'),
-    (0xFDB5, 'M', 'لحم'),
-    (0xFDB6, 'M', 'عمي'),
-    (0xFDB7, 'M', 'كمي'),
-    (0xFDB8, 'M', 'نجح'),
-    (0xFDB9, 'M', 'مخي'),
-    (0xFDBA, 'M', 'لجم'),
-    (0xFDBB, 'M', 'كمم'),
-    (0xFDBC, 'M', 'لجم'),
-    (0xFDBD, 'M', 'نجح'),
-    (0xFDBE, 'M', 'جحي'),
-    (0xFDBF, 'M', 'حجي'),
-    (0xFDC0, 'M', 'مجي'),
-    (0xFDC1, 'M', 'فمي'),
-    (0xFDC2, 'M', 'بحي'),
-    (0xFDC3, 'M', 'كمم'),
-    (0xFDC4, 'M', 'عجم'),
-    (0xFDC5, 'M', 'صمم'),
-    (0xFDC6, 'M', 'سخي'),
-    (0xFDC7, 'M', 'نجي'),
-    (0xFDC8, 'X'),
-    (0xFDCF, 'V'),
-    (0xFDD0, 'X'),
-    (0xFDF0, 'M', 'صلے'),
-    (0xFDF1, 'M', 'قلے'),
-    (0xFDF2, 'M', 'الله'),
-    (0xFDF3, 'M', 'اكبر'),
-    (0xFDF4, 'M', 'محمد'),
-    (0xFDF5, 'M', 'صلعم'),
-    (0xFDF6, 'M', 'رسول'),
-    (0xFDF7, 'M', 'عليه'),
-    (0xFDF8, 'M', 'وسلم'),
-    (0xFDF9, 'M', 'صلى'),
-    (0xFDFA, '3', 'صلى الله عليه وسلم'),
-    (0xFDFB, '3', 'جل جلاله'),
-    (0xFDFC, 'M', 'ریال'),
-    (0xFDFD, 'V'),
-    (0xFE00, 'I'),
-    (0xFE10, '3', ','),
-    (0xFE11, 'M', '、'),
-    (0xFE12, 'X'),
-    (0xFE13, '3', ':'),
-    (0xFE14, '3', ';'),
-    (0xFE15, '3', '!'),
-    (0xFE16, '3', '?'),
-    (0xFE17, 'M', '〖'),
-    (0xFE18, 'M', '〗'),
-    (0xFE19, 'X'),
-    (0xFE20, 'V'),
-    (0xFE30, 'X'),
-    (0xFE31, 'M', '—'),
-    (0xFE32, 'M', '–'),
-    (0xFE33, '3', '_'),
-    (0xFE35, '3', '('),
-    (0xFE36, '3', ')'),
-    (0xFE37, '3', '{'),
-    (0xFE38, '3', '}'),
-    (0xFE39, 'M', '〔'),
-    (0xFE3A, 'M', '〕'),
-    (0xFE3B, 'M', '【'),
-    (0xFE3C, 'M', '】'),
-    (0xFE3D, 'M', '《'),
-    (0xFE3E, 'M', '》'),
-    (0xFE3F, 'M', '〈'),
-    (0xFE40, 'M', '〉'),
-    (0xFE41, 'M', '「'),
-    (0xFE42, 'M', '」'),
-    (0xFE43, 'M', '『'),
-    (0xFE44, 'M', '』'),
-    (0xFE45, 'V'),
-    (0xFE47, '3', '['),
-    (0xFE48, '3', ']'),
-    (0xFE49, '3', ' ̅'),
-    (0xFE4D, '3', '_'),
-    (0xFE50, '3', ','),
-    (0xFE51, 'M', '、'),
-    (0xFE52, 'X'),
-    (0xFE54, '3', ';'),
-    (0xFE55, '3', ':'),
-    (0xFE56, '3', '?'),
-    (0xFE57, '3', '!'),
-    (0xFE58, 'M', '—'),
-    (0xFE59, '3', '('),
-    (0xFE5A, '3', ')'),
-    (0xFE5B, '3', '{'),
-    (0xFE5C, '3', '}'),
-    (0xFE5D, 'M', '〔'),
-    (0xFE5E, 'M', '〕'),
-    (0xFE5F, '3', '#'),
-    (0xFE60, '3', '&'),
-    (0xFE61, '3', '*'),
+        (0xFDAB, "M", "ضحي"),
+        (0xFDAC, "M", "لجي"),
+        (0xFDAD, "M", "لمي"),
+        (0xFDAE, "M", "يحي"),
+        (0xFDAF, "M", "يجي"),
+        (0xFDB0, "M", "يمي"),
+        (0xFDB1, "M", "ممي"),
+        (0xFDB2, "M", "قمي"),
+        (0xFDB3, "M", "نحي"),
+        (0xFDB4, "M", "قمح"),
+        (0xFDB5, "M", "لحم"),
+        (0xFDB6, "M", "عمي"),
+        (0xFDB7, "M", "كمي"),
+        (0xFDB8, "M", "نجح"),
+        (0xFDB9, "M", "مخي"),
+        (0xFDBA, "M", "لجم"),
+        (0xFDBB, "M", "كمم"),
+        (0xFDBC, "M", "لجم"),
+        (0xFDBD, "M", "نجح"),
+        (0xFDBE, "M", "جحي"),
+        (0xFDBF, "M", "حجي"),
+        (0xFDC0, "M", "مجي"),
+        (0xFDC1, "M", "فمي"),
+        (0xFDC2, "M", "بحي"),
+        (0xFDC3, "M", "كمم"),
+        (0xFDC4, "M", "عجم"),
+        (0xFDC5, "M", "صمم"),
+        (0xFDC6, "M", "سخي"),
+        (0xFDC7, "M", "نجي"),
+        (0xFDC8, "X"),
+        (0xFDCF, "V"),
+        (0xFDD0, "X"),
+        (0xFDF0, "M", "صلے"),
+        (0xFDF1, "M", "قلے"),
+        (0xFDF2, "M", "الله"),
+        (0xFDF3, "M", "اكبر"),
+        (0xFDF4, "M", "محمد"),
+        (0xFDF5, "M", "صلعم"),
+        (0xFDF6, "M", "رسول"),
+        (0xFDF7, "M", "عليه"),
+        (0xFDF8, "M", "وسلم"),
+        (0xFDF9, "M", "صلى"),
+        (0xFDFA, "3", "صلى الله عليه وسلم"),
+        (0xFDFB, "3", "جل جلاله"),
+        (0xFDFC, "M", "ریال"),
+        (0xFDFD, "V"),
+        (0xFE00, "I"),
+        (0xFE10, "3", ","),
+        (0xFE11, "M", "、"),
+        (0xFE12, "X"),
+        (0xFE13, "3", ":"),
+        (0xFE14, "3", ";"),
+        (0xFE15, "3", "!"),
+        (0xFE16, "3", "?"),
+        (0xFE17, "M", "〖"),
+        (0xFE18, "M", "〗"),
+        (0xFE19, "X"),
+        (0xFE20, "V"),
+        (0xFE30, "X"),
+        (0xFE31, "M", "—"),
+        (0xFE32, "M", "–"),
+        (0xFE33, "3", "_"),
+        (0xFE35, "3", "("),
+        (0xFE36, "3", ")"),
+        (0xFE37, "3", "{"),
+        (0xFE38, "3", "}"),
+        (0xFE39, "M", "〔"),
+        (0xFE3A, "M", "〕"),
+        (0xFE3B, "M", "【"),
+        (0xFE3C, "M", "】"),
+        (0xFE3D, "M", "《"),
+        (0xFE3E, "M", "》"),
+        (0xFE3F, "M", "〈"),
+        (0xFE40, "M", "〉"),
+        (0xFE41, "M", "「"),
+        (0xFE42, "M", "」"),
+        (0xFE43, "M", "『"),
+        (0xFE44, "M", "』"),
+        (0xFE45, "V"),
+        (0xFE47, "3", "["),
+        (0xFE48, "3", "]"),
+        (0xFE49, "3", " ̅"),
+        (0xFE4D, "3", "_"),
+        (0xFE50, "3", ","),
+        (0xFE51, "M", "、"),
+        (0xFE52, "X"),
+        (0xFE54, "3", ";"),
+        (0xFE55, "3", ":"),
+        (0xFE56, "3", "?"),
+        (0xFE57, "3", "!"),
+        (0xFE58, "M", "—"),
+        (0xFE59, "3", "("),
+        (0xFE5A, "3", ")"),
+        (0xFE5B, "3", "{"),
+        (0xFE5C, "3", "}"),
+        (0xFE5D, "M", "〔"),
+        (0xFE5E, "M", "〕"),
+        (0xFE5F, "3", "#"),
+        (0xFE60, "3", "&"),
+        (0xFE61, "3", "*"),
     ]
 
+
 def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFE62, '3', '+'),
-    (0xFE63, 'M', '-'),
-    (0xFE64, '3', '<'),
-    (0xFE65, '3', '>'),
-    (0xFE66, '3', '='),
-    (0xFE67, 'X'),
-    (0xFE68, '3', '\\'),
-    (0xFE69, '3', '$'),
-    (0xFE6A, '3', '%'),
-    (0xFE6B, '3', '@'),
-    (0xFE6C, 'X'),
-    (0xFE70, '3', ' ً'),
-    (0xFE71, 'M', 'ـً'),
-    (0xFE72, '3', ' ٌ'),
-    (0xFE73, 'V'),
-    (0xFE74, '3', ' ٍ'),
-    (0xFE75, 'X'),
-    (0xFE76, '3', ' َ'),
-    (0xFE77, 'M', 'ـَ'),
-    (0xFE78, '3', ' ُ'),
-    (0xFE79, 'M', 'ـُ'),
-    (0xFE7A, '3', ' ِ'),
-    (0xFE7B, 'M', 'ـِ'),
-    (0xFE7C, '3', ' ّ'),
-    (0xFE7D, 'M', 'ـّ'),
-    (0xFE7E, '3', ' ْ'),
-    (0xFE7F, 'M', 'ـْ'),
-    (0xFE80, 'M', 'ء'),
-    (0xFE81, 'M', 'آ'),
-    (0xFE83, 'M', 'أ'),
-    (0xFE85, 'M', 'ؤ'),
-    (0xFE87, 'M', 'إ'),
-    (0xFE89, 'M', 'ئ'),
-    (0xFE8D, 'M', 'ا'),
-    (0xFE8F, 'M', 'ب'),
-    (0xFE93, 'M', 'ة'),
-    (0xFE95, 'M', 'ت'),
-    (0xFE99, 'M', 'ث'),
-    (0xFE9D, 'M', 'ج'),
-    (0xFEA1, 'M', 'ح'),
-    (0xFEA5, 'M', 'خ'),
-    (0xFEA9, 'M', 'د'),
-    (0xFEAB, 'M', 'ذ'),
-    (0xFEAD, 'M', 'ر'),
-    (0xFEAF, 'M', 'ز'),
-    (0xFEB1, 'M', 'س'),
-    (0xFEB5, 'M', 'ش'),
-    (0xFEB9, 'M', 'ص'),
-    (0xFEBD, 'M', 'ض'),
-    (0xFEC1, 'M', 'ط'),
-    (0xFEC5, 'M', 'ظ'),
-    (0xFEC9, 'M', 'ع'),
-    (0xFECD, 'M', 'غ'),
-    (0xFED1, 'M', 'ف'),
-    (0xFED5, 'M', 'ق'),
-    (0xFED9, 'M', 'ك'),
-    (0xFEDD, 'M', 'ل'),
-    (0xFEE1, 'M', 'م'),
-    (0xFEE5, 'M', 'ن'),
-    (0xFEE9, 'M', 'ه'),
-    (0xFEED, 'M', 'و'),
-    (0xFEEF, 'M', 'ى'),
-    (0xFEF1, 'M', 'ي'),
-    (0xFEF5, 'M', 'لآ'),
-    (0xFEF7, 'M', 'لأ'),
-    (0xFEF9, 'M', 'لإ'),
-    (0xFEFB, 'M', 'لا'),
-    (0xFEFD, 'X'),
-    (0xFEFF, 'I'),
-    (0xFF00, 'X'),
-    (0xFF01, '3', '!'),
-    (0xFF02, '3', '"'),
-    (0xFF03, '3', '#'),
-    (0xFF04, '3', '$'),
-    (0xFF05, '3', '%'),
-    (0xFF06, '3', '&'),
-    (0xFF07, '3', '\''),
-    (0xFF08, '3', '('),
-    (0xFF09, '3', ')'),
-    (0xFF0A, '3', '*'),
-    (0xFF0B, '3', '+'),
-    (0xFF0C, '3', ','),
-    (0xFF0D, 'M', '-'),
-    (0xFF0E, 'M', '.'),
-    (0xFF0F, '3', '/'),
-    (0xFF10, 'M', '0'),
-    (0xFF11, 'M', '1'),
-    (0xFF12, 'M', '2'),
-    (0xFF13, 'M', '3'),
-    (0xFF14, 'M', '4'),
-    (0xFF15, 'M', '5'),
-    (0xFF16, 'M', '6'),
-    (0xFF17, 'M', '7'),
-    (0xFF18, 'M', '8'),
-    (0xFF19, 'M', '9'),
-    (0xFF1A, '3', ':'),
-    (0xFF1B, '3', ';'),
-    (0xFF1C, '3', '<'),
-    (0xFF1D, '3', '='),
-    (0xFF1E, '3', '>'),
+        (0xFE62, "3", "+"),
+        (0xFE63, "M", "-"),
+        (0xFE64, "3", "<"),
+        (0xFE65, "3", ">"),
+        (0xFE66, "3", "="),
+        (0xFE67, "X"),
+        (0xFE68, "3", "\\"),
+        (0xFE69, "3", "$"),
+        (0xFE6A, "3", "%"),
+        (0xFE6B, "3", "@"),
+        (0xFE6C, "X"),
+        (0xFE70, "3", " ً"),
+        (0xFE71, "M", "ـً"),
+        (0xFE72, "3", " ٌ"),
+        (0xFE73, "V"),
+        (0xFE74, "3", " ٍ"),
+        (0xFE75, "X"),
+        (0xFE76, "3", " َ"),
+        (0xFE77, "M", "ـَ"),
+        (0xFE78, "3", " ُ"),
+        (0xFE79, "M", "ـُ"),
+        (0xFE7A, "3", " ِ"),
+        (0xFE7B, "M", "ـِ"),
+        (0xFE7C, "3", " ّ"),
+        (0xFE7D, "M", "ـّ"),
+        (0xFE7E, "3", " ْ"),
+        (0xFE7F, "M", "ـْ"),
+        (0xFE80, "M", "ء"),
+        (0xFE81, "M", "آ"),
+        (0xFE83, "M", "أ"),
+        (0xFE85, "M", "ؤ"),
+        (0xFE87, "M", "إ"),
+        (0xFE89, "M", "ئ"),
+        (0xFE8D, "M", "ا"),
+        (0xFE8F, "M", "ب"),
+        (0xFE93, "M", "ة"),
+        (0xFE95, "M", "ت"),
+        (0xFE99, "M", "ث"),
+        (0xFE9D, "M", "ج"),
+        (0xFEA1, "M", "ح"),
+        (0xFEA5, "M", "خ"),
+        (0xFEA9, "M", "د"),
+        (0xFEAB, "M", "ذ"),
+        (0xFEAD, "M", "ر"),
+        (0xFEAF, "M", "ز"),
+        (0xFEB1, "M", "س"),
+        (0xFEB5, "M", "ش"),
+        (0xFEB9, "M", "ص"),
+        (0xFEBD, "M", "ض"),
+        (0xFEC1, "M", "ط"),
+        (0xFEC5, "M", "ظ"),
+        (0xFEC9, "M", "ع"),
+        (0xFECD, "M", "غ"),
+        (0xFED1, "M", "ف"),
+        (0xFED5, "M", "ق"),
+        (0xFED9, "M", "ك"),
+        (0xFEDD, "M", "ل"),
+        (0xFEE1, "M", "م"),
+        (0xFEE5, "M", "ن"),
+        (0xFEE9, "M", "ه"),
+        (0xFEED, "M", "و"),
+        (0xFEEF, "M", "ى"),
+        (0xFEF1, "M", "ي"),
+        (0xFEF5, "M", "لآ"),
+        (0xFEF7, "M", "لأ"),
+        (0xFEF9, "M", "لإ"),
+        (0xFEFB, "M", "لا"),
+        (0xFEFD, "X"),
+        (0xFEFF, "I"),
+        (0xFF00, "X"),
+        (0xFF01, "3", "!"),
+        (0xFF02, "3", '"'),
+        (0xFF03, "3", "#"),
+        (0xFF04, "3", "$"),
+        (0xFF05, "3", "%"),
+        (0xFF06, "3", "&"),
+        (0xFF07, "3", "'"),
+        (0xFF08, "3", "("),
+        (0xFF09, "3", ")"),
+        (0xFF0A, "3", "*"),
+        (0xFF0B, "3", "+"),
+        (0xFF0C, "3", ","),
+        (0xFF0D, "M", "-"),
+        (0xFF0E, "M", "."),
+        (0xFF0F, "3", "/"),
+        (0xFF10, "M", "0"),
+        (0xFF11, "M", "1"),
+        (0xFF12, "M", "2"),
+        (0xFF13, "M", "3"),
+        (0xFF14, "M", "4"),
+        (0xFF15, "M", "5"),
+        (0xFF16, "M", "6"),
+        (0xFF17, "M", "7"),
+        (0xFF18, "M", "8"),
+        (0xFF19, "M", "9"),
+        (0xFF1A, "3", ":"),
+        (0xFF1B, "3", ";"),
+        (0xFF1C, "3", "<"),
+        (0xFF1D, "3", "="),
+        (0xFF1E, "3", ">"),
     ]
 
+
 def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFF1F, '3', '?'),
-    (0xFF20, '3', '@'),
-    (0xFF21, 'M', 'a'),
-    (0xFF22, 'M', 'b'),
-    (0xFF23, 'M', 'c'),
-    (0xFF24, 'M', 'd'),
-    (0xFF25, 'M', 'e'),
-    (0xFF26, 'M', 'f'),
-    (0xFF27, 'M', 'g'),
-    (0xFF28, 'M', 'h'),
-    (0xFF29, 'M', 'i'),
-    (0xFF2A, 'M', 'j'),
-    (0xFF2B, 'M', 'k'),
-    (0xFF2C, 'M', 'l'),
-    (0xFF2D, 'M', 'm'),
-    (0xFF2E, 'M', 'n'),
-    (0xFF2F, 'M', 'o'),
-    (0xFF30, 'M', 'p'),
-    (0xFF31, 'M', 'q'),
-    (0xFF32, 'M', 'r'),
-    (0xFF33, 'M', 's'),
-    (0xFF34, 'M', 't'),
-    (0xFF35, 'M', 'u'),
-    (0xFF36, 'M', 'v'),
-    (0xFF37, 'M', 'w'),
-    (0xFF38, 'M', 'x'),
-    (0xFF39, 'M', 'y'),
-    (0xFF3A, 'M', 'z'),
-    (0xFF3B, '3', '['),
-    (0xFF3C, '3', '\\'),
-    (0xFF3D, '3', ']'),
-    (0xFF3E, '3', '^'),
-    (0xFF3F, '3', '_'),
-    (0xFF40, '3', '`'),
-    (0xFF41, 'M', 'a'),
-    (0xFF42, 'M', 'b'),
-    (0xFF43, 'M', 'c'),
-    (0xFF44, 'M', 'd'),
-    (0xFF45, 'M', 'e'),
-    (0xFF46, 'M', 'f'),
-    (0xFF47, 'M', 'g'),
-    (0xFF48, 'M', 'h'),
-    (0xFF49, 'M', 'i'),
-    (0xFF4A, 'M', 'j'),
-    (0xFF4B, 'M', 'k'),
-    (0xFF4C, 'M', 'l'),
-    (0xFF4D, 'M', 'm'),
-    (0xFF4E, 'M', 'n'),
-    (0xFF4F, 'M', 'o'),
-    (0xFF50, 'M', 'p'),
-    (0xFF51, 'M', 'q'),
-    (0xFF52, 'M', 'r'),
-    (0xFF53, 'M', 's'),
-    (0xFF54, 'M', 't'),
-    (0xFF55, 'M', 'u'),
-    (0xFF56, 'M', 'v'),
-    (0xFF57, 'M', 'w'),
-    (0xFF58, 'M', 'x'),
-    (0xFF59, 'M', 'y'),
-    (0xFF5A, 'M', 'z'),
-    (0xFF5B, '3', '{'),
-    (0xFF5C, '3', '|'),
-    (0xFF5D, '3', '}'),
-    (0xFF5E, '3', '~'),
-    (0xFF5F, 'M', '⦅'),
-    (0xFF60, 'M', '⦆'),
-    (0xFF61, 'M', '.'),
-    (0xFF62, 'M', '「'),
-    (0xFF63, 'M', '」'),
-    (0xFF64, 'M', '、'),
-    (0xFF65, 'M', '・'),
-    (0xFF66, 'M', 'ヲ'),
-    (0xFF67, 'M', 'ァ'),
-    (0xFF68, 'M', 'ィ'),
-    (0xFF69, 'M', 'ゥ'),
-    (0xFF6A, 'M', 'ェ'),
-    (0xFF6B, 'M', 'ォ'),
-    (0xFF6C, 'M', 'ャ'),
-    (0xFF6D, 'M', 'ュ'),
-    (0xFF6E, 'M', 'ョ'),
-    (0xFF6F, 'M', 'ッ'),
-    (0xFF70, 'M', 'ー'),
-    (0xFF71, 'M', 'ア'),
-    (0xFF72, 'M', 'イ'),
-    (0xFF73, 'M', 'ウ'),
-    (0xFF74, 'M', 'エ'),
-    (0xFF75, 'M', 'オ'),
-    (0xFF76, 'M', 'カ'),
-    (0xFF77, 'M', 'キ'),
-    (0xFF78, 'M', 'ク'),
-    (0xFF79, 'M', 'ケ'),
-    (0xFF7A, 'M', 'コ'),
-    (0xFF7B, 'M', 'サ'),
-    (0xFF7C, 'M', 'シ'),
-    (0xFF7D, 'M', 'ス'),
-    (0xFF7E, 'M', 'セ'),
-    (0xFF7F, 'M', 'ソ'),
-    (0xFF80, 'M', 'タ'),
-    (0xFF81, 'M', 'チ'),
-    (0xFF82, 'M', 'ツ'),
+        (0xFF1F, "3", "?"),
+        (0xFF20, "3", "@"),
+        (0xFF21, "M", "a"),
+        (0xFF22, "M", "b"),
+        (0xFF23, "M", "c"),
+        (0xFF24, "M", "d"),
+        (0xFF25, "M", "e"),
+        (0xFF26, "M", "f"),
+        (0xFF27, "M", "g"),
+        (0xFF28, "M", "h"),
+        (0xFF29, "M", "i"),
+        (0xFF2A, "M", "j"),
+        (0xFF2B, "M", "k"),
+        (0xFF2C, "M", "l"),
+        (0xFF2D, "M", "m"),
+        (0xFF2E, "M", "n"),
+        (0xFF2F, "M", "o"),
+        (0xFF30, "M", "p"),
+        (0xFF31, "M", "q"),
+        (0xFF32, "M", "r"),
+        (0xFF33, "M", "s"),
+        (0xFF34, "M", "t"),
+        (0xFF35, "M", "u"),
+        (0xFF36, "M", "v"),
+        (0xFF37, "M", "w"),
+        (0xFF38, "M", "x"),
+        (0xFF39, "M", "y"),
+        (0xFF3A, "M", "z"),
+        (0xFF3B, "3", "["),
+        (0xFF3C, "3", "\\"),
+        (0xFF3D, "3", "]"),
+        (0xFF3E, "3", "^"),
+        (0xFF3F, "3", "_"),
+        (0xFF40, "3", "`"),
+        (0xFF41, "M", "a"),
+        (0xFF42, "M", "b"),
+        (0xFF43, "M", "c"),
+        (0xFF44, "M", "d"),
+        (0xFF45, "M", "e"),
+        (0xFF46, "M", "f"),
+        (0xFF47, "M", "g"),
+        (0xFF48, "M", "h"),
+        (0xFF49, "M", "i"),
+        (0xFF4A, "M", "j"),
+        (0xFF4B, "M", "k"),
+        (0xFF4C, "M", "l"),
+        (0xFF4D, "M", "m"),
+        (0xFF4E, "M", "n"),
+        (0xFF4F, "M", "o"),
+        (0xFF50, "M", "p"),
+        (0xFF51, "M", "q"),
+        (0xFF52, "M", "r"),
+        (0xFF53, "M", "s"),
+        (0xFF54, "M", "t"),
+        (0xFF55, "M", "u"),
+        (0xFF56, "M", "v"),
+        (0xFF57, "M", "w"),
+        (0xFF58, "M", "x"),
+        (0xFF59, "M", "y"),
+        (0xFF5A, "M", "z"),
+        (0xFF5B, "3", "{"),
+        (0xFF5C, "3", "|"),
+        (0xFF5D, "3", "}"),
+        (0xFF5E, "3", "~"),
+        (0xFF5F, "M", "⦅"),
+        (0xFF60, "M", "⦆"),
+        (0xFF61, "M", "."),
+        (0xFF62, "M", "「"),
+        (0xFF63, "M", "」"),
+        (0xFF64, "M", "、"),
+        (0xFF65, "M", "・"),
+        (0xFF66, "M", "ヲ"),
+        (0xFF67, "M", "ァ"),
+        (0xFF68, "M", "ィ"),
+        (0xFF69, "M", "ゥ"),
+        (0xFF6A, "M", "ェ"),
+        (0xFF6B, "M", "ォ"),
+        (0xFF6C, "M", "ャ"),
+        (0xFF6D, "M", "ュ"),
+        (0xFF6E, "M", "ョ"),
+        (0xFF6F, "M", "ッ"),
+        (0xFF70, "M", "ー"),
+        (0xFF71, "M", "ア"),
+        (0xFF72, "M", "イ"),
+        (0xFF73, "M", "ウ"),
+        (0xFF74, "M", "エ"),
+        (0xFF75, "M", "オ"),
+        (0xFF76, "M", "カ"),
+        (0xFF77, "M", "キ"),
+        (0xFF78, "M", "ク"),
+        (0xFF79, "M", "ケ"),
+        (0xFF7A, "M", "コ"),
+        (0xFF7B, "M", "サ"),
+        (0xFF7C, "M", "シ"),
+        (0xFF7D, "M", "ス"),
+        (0xFF7E, "M", "セ"),
+        (0xFF7F, "M", "ソ"),
+        (0xFF80, "M", "タ"),
+        (0xFF81, "M", "チ"),
+        (0xFF82, "M", "ツ"),
     ]
 
+
 def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFF83, 'M', 'テ'),
-    (0xFF84, 'M', 'ト'),
-    (0xFF85, 'M', 'ナ'),
-    (0xFF86, 'M', 'ニ'),
-    (0xFF87, 'M', 'ヌ'),
-    (0xFF88, 'M', 'ネ'),
-    (0xFF89, 'M', 'ノ'),
-    (0xFF8A, 'M', 'ハ'),
-    (0xFF8B, 'M', 'ヒ'),
-    (0xFF8C, 'M', 'フ'),
-    (0xFF8D, 'M', 'ヘ'),
-    (0xFF8E, 'M', 'ホ'),
-    (0xFF8F, 'M', 'マ'),
-    (0xFF90, 'M', 'ミ'),
-    (0xFF91, 'M', 'ム'),
-    (0xFF92, 'M', 'メ'),
-    (0xFF93, 'M', 'モ'),
-    (0xFF94, 'M', 'ヤ'),
-    (0xFF95, 'M', 'ユ'),
-    (0xFF96, 'M', 'ヨ'),
-    (0xFF97, 'M', 'ラ'),
-    (0xFF98, 'M', 'リ'),
-    (0xFF99, 'M', 'ル'),
-    (0xFF9A, 'M', 'レ'),
-    (0xFF9B, 'M', 'ロ'),
-    (0xFF9C, 'M', 'ワ'),
-    (0xFF9D, 'M', 'ン'),
-    (0xFF9E, 'M', '゙'),
-    (0xFF9F, 'M', '゚'),
-    (0xFFA0, 'X'),
-    (0xFFA1, 'M', 'ᄀ'),
-    (0xFFA2, 'M', 'ᄁ'),
-    (0xFFA3, 'M', 'ᆪ'),
-    (0xFFA4, 'M', 'ᄂ'),
-    (0xFFA5, 'M', 'ᆬ'),
-    (0xFFA6, 'M', 'ᆭ'),
-    (0xFFA7, 'M', 'ᄃ'),
-    (0xFFA8, 'M', 'ᄄ'),
-    (0xFFA9, 'M', 'ᄅ'),
-    (0xFFAA, 'M', 'ᆰ'),
-    (0xFFAB, 'M', 'ᆱ'),
-    (0xFFAC, 'M', 'ᆲ'),
-    (0xFFAD, 'M', 'ᆳ'),
-    (0xFFAE, 'M', 'ᆴ'),
-    (0xFFAF, 'M', 'ᆵ'),
-    (0xFFB0, 'M', 'ᄚ'),
-    (0xFFB1, 'M', 'ᄆ'),
-    (0xFFB2, 'M', 'ᄇ'),
-    (0xFFB3, 'M', 'ᄈ'),
-    (0xFFB4, 'M', 'ᄡ'),
-    (0xFFB5, 'M', 'ᄉ'),
-    (0xFFB6, 'M', 'ᄊ'),
-    (0xFFB7, 'M', 'ᄋ'),
-    (0xFFB8, 'M', 'ᄌ'),
-    (0xFFB9, 'M', 'ᄍ'),
-    (0xFFBA, 'M', 'ᄎ'),
-    (0xFFBB, 'M', 'ᄏ'),
-    (0xFFBC, 'M', 'ᄐ'),
-    (0xFFBD, 'M', 'ᄑ'),
-    (0xFFBE, 'M', 'ᄒ'),
-    (0xFFBF, 'X'),
-    (0xFFC2, 'M', 'ᅡ'),
-    (0xFFC3, 'M', 'ᅢ'),
-    (0xFFC4, 'M', 'ᅣ'),
-    (0xFFC5, 'M', 'ᅤ'),
-    (0xFFC6, 'M', 'ᅥ'),
-    (0xFFC7, 'M', 'ᅦ'),
-    (0xFFC8, 'X'),
-    (0xFFCA, 'M', 'ᅧ'),
-    (0xFFCB, 'M', 'ᅨ'),
-    (0xFFCC, 'M', 'ᅩ'),
-    (0xFFCD, 'M', 'ᅪ'),
-    (0xFFCE, 'M', 'ᅫ'),
-    (0xFFCF, 'M', 'ᅬ'),
-    (0xFFD0, 'X'),
-    (0xFFD2, 'M', 'ᅭ'),
-    (0xFFD3, 'M', 'ᅮ'),
-    (0xFFD4, 'M', 'ᅯ'),
-    (0xFFD5, 'M', 'ᅰ'),
-    (0xFFD6, 'M', 'ᅱ'),
-    (0xFFD7, 'M', 'ᅲ'),
-    (0xFFD8, 'X'),
-    (0xFFDA, 'M', 'ᅳ'),
-    (0xFFDB, 'M', 'ᅴ'),
-    (0xFFDC, 'M', 'ᅵ'),
-    (0xFFDD, 'X'),
-    (0xFFE0, 'M', '¢'),
-    (0xFFE1, 'M', '£'),
-    (0xFFE2, 'M', '¬'),
-    (0xFFE3, '3', ' ̄'),
-    (0xFFE4, 'M', '¦'),
-    (0xFFE5, 'M', '¥'),
-    (0xFFE6, 'M', '₩'),
-    (0xFFE7, 'X'),
-    (0xFFE8, 'M', '│'),
-    (0xFFE9, 'M', '←'),
-    (0xFFEA, 'M', '↑'),
-    (0xFFEB, 'M', '→'),
-    (0xFFEC, 'M', '↓'),
-    (0xFFED, 'M', '■'),
+        (0xFF83, "M", "テ"),
+        (0xFF84, "M", "ト"),
+        (0xFF85, "M", "ナ"),
+        (0xFF86, "M", "ニ"),
+        (0xFF87, "M", "ヌ"),
+        (0xFF88, "M", "ネ"),
+        (0xFF89, "M", "ノ"),
+        (0xFF8A, "M", "ハ"),
+        (0xFF8B, "M", "ヒ"),
+        (0xFF8C, "M", "フ"),
+        (0xFF8D, "M", "ヘ"),
+        (0xFF8E, "M", "ホ"),
+        (0xFF8F, "M", "マ"),
+        (0xFF90, "M", "ミ"),
+        (0xFF91, "M", "ム"),
+        (0xFF92, "M", "メ"),
+        (0xFF93, "M", "モ"),
+        (0xFF94, "M", "ヤ"),
+        (0xFF95, "M", "ユ"),
+        (0xFF96, "M", "ヨ"),
+        (0xFF97, "M", "ラ"),
+        (0xFF98, "M", "リ"),
+        (0xFF99, "M", "ル"),
+        (0xFF9A, "M", "レ"),
+        (0xFF9B, "M", "ロ"),
+        (0xFF9C, "M", "ワ"),
+        (0xFF9D, "M", "ン"),
+        (0xFF9E, "M", "゙"),
+        (0xFF9F, "M", "゚"),
+        (0xFFA0, "X"),
+        (0xFFA1, "M", "ᄀ"),
+        (0xFFA2, "M", "ᄁ"),
+        (0xFFA3, "M", "ᆪ"),
+        (0xFFA4, "M", "ᄂ"),
+        (0xFFA5, "M", "ᆬ"),
+        (0xFFA6, "M", "ᆭ"),
+        (0xFFA7, "M", "ᄃ"),
+        (0xFFA8, "M", "ᄄ"),
+        (0xFFA9, "M", "ᄅ"),
+        (0xFFAA, "M", "ᆰ"),
+        (0xFFAB, "M", "ᆱ"),
+        (0xFFAC, "M", "ᆲ"),
+        (0xFFAD, "M", "ᆳ"),
+        (0xFFAE, "M", "ᆴ"),
+        (0xFFAF, "M", "ᆵ"),
+        (0xFFB0, "M", "ᄚ"),
+        (0xFFB1, "M", "ᄆ"),
+        (0xFFB2, "M", "ᄇ"),
+        (0xFFB3, "M", "ᄈ"),
+        (0xFFB4, "M", "ᄡ"),
+        (0xFFB5, "M", "ᄉ"),
+        (0xFFB6, "M", "ᄊ"),
+        (0xFFB7, "M", "ᄋ"),
+        (0xFFB8, "M", "ᄌ"),
+        (0xFFB9, "M", "ᄍ"),
+        (0xFFBA, "M", "ᄎ"),
+        (0xFFBB, "M", "ᄏ"),
+        (0xFFBC, "M", "ᄐ"),
+        (0xFFBD, "M", "ᄑ"),
+        (0xFFBE, "M", "ᄒ"),
+        (0xFFBF, "X"),
+        (0xFFC2, "M", "ᅡ"),
+        (0xFFC3, "M", "ᅢ"),
+        (0xFFC4, "M", "ᅣ"),
+        (0xFFC5, "M", "ᅤ"),
+        (0xFFC6, "M", "ᅥ"),
+        (0xFFC7, "M", "ᅦ"),
+        (0xFFC8, "X"),
+        (0xFFCA, "M", "ᅧ"),
+        (0xFFCB, "M", "ᅨ"),
+        (0xFFCC, "M", "ᅩ"),
+        (0xFFCD, "M", "ᅪ"),
+        (0xFFCE, "M", "ᅫ"),
+        (0xFFCF, "M", "ᅬ"),
+        (0xFFD0, "X"),
+        (0xFFD2, "M", "ᅭ"),
+        (0xFFD3, "M", "ᅮ"),
+        (0xFFD4, "M", "ᅯ"),
+        (0xFFD5, "M", "ᅰ"),
+        (0xFFD6, "M", "ᅱ"),
+        (0xFFD7, "M", "ᅲ"),
+        (0xFFD8, "X"),
+        (0xFFDA, "M", "ᅳ"),
+        (0xFFDB, "M", "ᅴ"),
+        (0xFFDC, "M", "ᅵ"),
+        (0xFFDD, "X"),
+        (0xFFE0, "M", "¢"),
+        (0xFFE1, "M", "£"),
+        (0xFFE2, "M", "¬"),
+        (0xFFE3, "3", " ̄"),
+        (0xFFE4, "M", "¦"),
+        (0xFFE5, "M", "¥"),
+        (0xFFE6, "M", "₩"),
+        (0xFFE7, "X"),
+        (0xFFE8, "M", "│"),
+        (0xFFE9, "M", "←"),
+        (0xFFEA, "M", "↑"),
+        (0xFFEB, "M", "→"),
+        (0xFFEC, "M", "↓"),
+        (0xFFED, "M", "■"),
     ]
 
+
 def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0xFFEE, 'M', '○'),
-    (0xFFEF, 'X'),
-    (0x10000, 'V'),
-    (0x1000C, 'X'),
-    (0x1000D, 'V'),
-    (0x10027, 'X'),
-    (0x10028, 'V'),
-    (0x1003B, 'X'),
-    (0x1003C, 'V'),
-    (0x1003E, 'X'),
-    (0x1003F, 'V'),
-    (0x1004E, 'X'),
-    (0x10050, 'V'),
-    (0x1005E, 'X'),
-    (0x10080, 'V'),
-    (0x100FB, 'X'),
-    (0x10100, 'V'),
-    (0x10103, 'X'),
-    (0x10107, 'V'),
-    (0x10134, 'X'),
-    (0x10137, 'V'),
-    (0x1018F, 'X'),
-    (0x10190, 'V'),
-    (0x1019D, 'X'),
-    (0x101A0, 'V'),
-    (0x101A1, 'X'),
-    (0x101D0, 'V'),
-    (0x101FE, 'X'),
-    (0x10280, 'V'),
-    (0x1029D, 'X'),
-    (0x102A0, 'V'),
-    (0x102D1, 'X'),
-    (0x102E0, 'V'),
-    (0x102FC, 'X'),
-    (0x10300, 'V'),
-    (0x10324, 'X'),
-    (0x1032D, 'V'),
-    (0x1034B, 'X'),
-    (0x10350, 'V'),
-    (0x1037B, 'X'),
-    (0x10380, 'V'),
-    (0x1039E, 'X'),
-    (0x1039F, 'V'),
-    (0x103C4, 'X'),
-    (0x103C8, 'V'),
-    (0x103D6, 'X'),
-    (0x10400, 'M', '𐐨'),
-    (0x10401, 'M', '𐐩'),
-    (0x10402, 'M', '𐐪'),
-    (0x10403, 'M', '𐐫'),
-    (0x10404, 'M', '𐐬'),
-    (0x10405, 'M', '𐐭'),
-    (0x10406, 'M', '𐐮'),
-    (0x10407, 'M', '𐐯'),
-    (0x10408, 'M', '𐐰'),
-    (0x10409, 'M', '𐐱'),
-    (0x1040A, 'M', '𐐲'),
-    (0x1040B, 'M', '𐐳'),
-    (0x1040C, 'M', '𐐴'),
-    (0x1040D, 'M', '𐐵'),
-    (0x1040E, 'M', '𐐶'),
-    (0x1040F, 'M', '𐐷'),
-    (0x10410, 'M', '𐐸'),
-    (0x10411, 'M', '𐐹'),
-    (0x10412, 'M', '𐐺'),
-    (0x10413, 'M', '𐐻'),
-    (0x10414, 'M', '𐐼'),
-    (0x10415, 'M', '𐐽'),
-    (0x10416, 'M', '𐐾'),
-    (0x10417, 'M', '𐐿'),
-    (0x10418, 'M', '𐑀'),
-    (0x10419, 'M', '𐑁'),
-    (0x1041A, 'M', '𐑂'),
-    (0x1041B, 'M', '𐑃'),
-    (0x1041C, 'M', '𐑄'),
-    (0x1041D, 'M', '𐑅'),
-    (0x1041E, 'M', '𐑆'),
-    (0x1041F, 'M', '𐑇'),
-    (0x10420, 'M', '𐑈'),
-    (0x10421, 'M', '𐑉'),
-    (0x10422, 'M', '𐑊'),
-    (0x10423, 'M', '𐑋'),
-    (0x10424, 'M', '𐑌'),
-    (0x10425, 'M', '𐑍'),
-    (0x10426, 'M', '𐑎'),
-    (0x10427, 'M', '𐑏'),
-    (0x10428, 'V'),
-    (0x1049E, 'X'),
-    (0x104A0, 'V'),
-    (0x104AA, 'X'),
-    (0x104B0, 'M', '𐓘'),
-    (0x104B1, 'M', '𐓙'),
-    (0x104B2, 'M', '𐓚'),
-    (0x104B3, 'M', '𐓛'),
-    (0x104B4, 'M', '𐓜'),
-    (0x104B5, 'M', '𐓝'),
-    (0x104B6, 'M', '𐓞'),
-    (0x104B7, 'M', '𐓟'),
-    (0x104B8, 'M', '𐓠'),
-    (0x104B9, 'M', '𐓡'),
+        (0xFFEE, "M", "○"),
+        (0xFFEF, "X"),
+        (0x10000, "V"),
+        (0x1000C, "X"),
+        (0x1000D, "V"),
+        (0x10027, "X"),
+        (0x10028, "V"),
+        (0x1003B, "X"),
+        (0x1003C, "V"),
+        (0x1003E, "X"),
+        (0x1003F, "V"),
+        (0x1004E, "X"),
+        (0x10050, "V"),
+        (0x1005E, "X"),
+        (0x10080, "V"),
+        (0x100FB, "X"),
+        (0x10100, "V"),
+        (0x10103, "X"),
+        (0x10107, "V"),
+        (0x10134, "X"),
+        (0x10137, "V"),
+        (0x1018F, "X"),
+        (0x10190, "V"),
+        (0x1019D, "X"),
+        (0x101A0, "V"),
+        (0x101A1, "X"),
+        (0x101D0, "V"),
+        (0x101FE, "X"),
+        (0x10280, "V"),
+        (0x1029D, "X"),
+        (0x102A0, "V"),
+        (0x102D1, "X"),
+        (0x102E0, "V"),
+        (0x102FC, "X"),
+        (0x10300, "V"),
+        (0x10324, "X"),
+        (0x1032D, "V"),
+        (0x1034B, "X"),
+        (0x10350, "V"),
+        (0x1037B, "X"),
+        (0x10380, "V"),
+        (0x1039E, "X"),
+        (0x1039F, "V"),
+        (0x103C4, "X"),
+        (0x103C8, "V"),
+        (0x103D6, "X"),
+        (0x10400, "M", "𐐨"),
+        (0x10401, "M", "𐐩"),
+        (0x10402, "M", "𐐪"),
+        (0x10403, "M", "𐐫"),
+        (0x10404, "M", "𐐬"),
+        (0x10405, "M", "𐐭"),
+        (0x10406, "M", "𐐮"),
+        (0x10407, "M", "𐐯"),
+        (0x10408, "M", "𐐰"),
+        (0x10409, "M", "𐐱"),
+        (0x1040A, "M", "𐐲"),
+        (0x1040B, "M", "𐐳"),
+        (0x1040C, "M", "𐐴"),
+        (0x1040D, "M", "𐐵"),
+        (0x1040E, "M", "𐐶"),
+        (0x1040F, "M", "𐐷"),
+        (0x10410, "M", "𐐸"),
+        (0x10411, "M", "𐐹"),
+        (0x10412, "M", "𐐺"),
+        (0x10413, "M", "𐐻"),
+        (0x10414, "M", "𐐼"),
+        (0x10415, "M", "𐐽"),
+        (0x10416, "M", "𐐾"),
+        (0x10417, "M", "𐐿"),
+        (0x10418, "M", "𐑀"),
+        (0x10419, "M", "𐑁"),
+        (0x1041A, "M", "𐑂"),
+        (0x1041B, "M", "𐑃"),
+        (0x1041C, "M", "𐑄"),
+        (0x1041D, "M", "𐑅"),
+        (0x1041E, "M", "𐑆"),
+        (0x1041F, "M", "𐑇"),
+        (0x10420, "M", "𐑈"),
+        (0x10421, "M", "𐑉"),
+        (0x10422, "M", "𐑊"),
+        (0x10423, "M", "𐑋"),
+        (0x10424, "M", "𐑌"),
+        (0x10425, "M", "𐑍"),
+        (0x10426, "M", "𐑎"),
+        (0x10427, "M", "𐑏"),
+        (0x10428, "V"),
+        (0x1049E, "X"),
+        (0x104A0, "V"),
+        (0x104AA, "X"),
+        (0x104B0, "M", "𐓘"),
+        (0x104B1, "M", "𐓙"),
+        (0x104B2, "M", "𐓚"),
+        (0x104B3, "M", "𐓛"),
+        (0x104B4, "M", "𐓜"),
+        (0x104B5, "M", "𐓝"),
+        (0x104B6, "M", "𐓞"),
+        (0x104B7, "M", "𐓟"),
+        (0x104B8, "M", "𐓠"),
+        (0x104B9, "M", "𐓡"),
     ]
 
+
 def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x104BA, 'M', '𐓢'),
-    (0x104BB, 'M', '𐓣'),
-    (0x104BC, 'M', '𐓤'),
-    (0x104BD, 'M', '𐓥'),
-    (0x104BE, 'M', '𐓦'),
-    (0x104BF, 'M', '𐓧'),
-    (0x104C0, 'M', '𐓨'),
-    (0x104C1, 'M', '𐓩'),
-    (0x104C2, 'M', '𐓪'),
-    (0x104C3, 'M', '𐓫'),
-    (0x104C4, 'M', '𐓬'),
-    (0x104C5, 'M', '𐓭'),
-    (0x104C6, 'M', '𐓮'),
-    (0x104C7, 'M', '𐓯'),
-    (0x104C8, 'M', '𐓰'),
-    (0x104C9, 'M', '𐓱'),
-    (0x104CA, 'M', '𐓲'),
-    (0x104CB, 'M', '𐓳'),
-    (0x104CC, 'M', '𐓴'),
-    (0x104CD, 'M', '𐓵'),
-    (0x104CE, 'M', '𐓶'),
-    (0x104CF, 'M', '𐓷'),
-    (0x104D0, 'M', '𐓸'),
-    (0x104D1, 'M', '𐓹'),
-    (0x104D2, 'M', '𐓺'),
-    (0x104D3, 'M', '𐓻'),
-    (0x104D4, 'X'),
-    (0x104D8, 'V'),
-    (0x104FC, 'X'),
-    (0x10500, 'V'),
-    (0x10528, 'X'),
-    (0x10530, 'V'),
-    (0x10564, 'X'),
-    (0x1056F, 'V'),
-    (0x10570, 'M', '𐖗'),
-    (0x10571, 'M', '𐖘'),
-    (0x10572, 'M', '𐖙'),
-    (0x10573, 'M', '𐖚'),
-    (0x10574, 'M', '𐖛'),
-    (0x10575, 'M', '𐖜'),
-    (0x10576, 'M', '𐖝'),
-    (0x10577, 'M', '𐖞'),
-    (0x10578, 'M', '𐖟'),
-    (0x10579, 'M', '𐖠'),
-    (0x1057A, 'M', '𐖡'),
-    (0x1057B, 'X'),
-    (0x1057C, 'M', '𐖣'),
-    (0x1057D, 'M', '𐖤'),
-    (0x1057E, 'M', '𐖥'),
-    (0x1057F, 'M', '𐖦'),
-    (0x10580, 'M', '𐖧'),
-    (0x10581, 'M', '𐖨'),
-    (0x10582, 'M', '𐖩'),
-    (0x10583, 'M', '𐖪'),
-    (0x10584, 'M', '𐖫'),
-    (0x10585, 'M', '𐖬'),
-    (0x10586, 'M', '𐖭'),
-    (0x10587, 'M', '𐖮'),
-    (0x10588, 'M', '𐖯'),
-    (0x10589, 'M', '𐖰'),
-    (0x1058A, 'M', '𐖱'),
-    (0x1058B, 'X'),
-    (0x1058C, 'M', '𐖳'),
-    (0x1058D, 'M', '𐖴'),
-    (0x1058E, 'M', '𐖵'),
-    (0x1058F, 'M', '𐖶'),
-    (0x10590, 'M', '𐖷'),
-    (0x10591, 'M', '𐖸'),
-    (0x10592, 'M', '𐖹'),
-    (0x10593, 'X'),
-    (0x10594, 'M', '𐖻'),
-    (0x10595, 'M', '𐖼'),
-    (0x10596, 'X'),
-    (0x10597, 'V'),
-    (0x105A2, 'X'),
-    (0x105A3, 'V'),
-    (0x105B2, 'X'),
-    (0x105B3, 'V'),
-    (0x105BA, 'X'),
-    (0x105BB, 'V'),
-    (0x105BD, 'X'),
-    (0x10600, 'V'),
-    (0x10737, 'X'),
-    (0x10740, 'V'),
-    (0x10756, 'X'),
-    (0x10760, 'V'),
-    (0x10768, 'X'),
-    (0x10780, 'V'),
-    (0x10781, 'M', 'ː'),
-    (0x10782, 'M', 'ˑ'),
-    (0x10783, 'M', 'æ'),
-    (0x10784, 'M', 'ʙ'),
-    (0x10785, 'M', 'ɓ'),
-    (0x10786, 'X'),
-    (0x10787, 'M', 'ʣ'),
-    (0x10788, 'M', 'ꭦ'),
-    (0x10789, 'M', 'ʥ'),
-    (0x1078A, 'M', 'ʤ'),
-    (0x1078B, 'M', 'ɖ'),
-    (0x1078C, 'M', 'ɗ'),
+        (0x104BA, "M", "𐓢"),
+        (0x104BB, "M", "𐓣"),
+        (0x104BC, "M", "𐓤"),
+        (0x104BD, "M", "𐓥"),
+        (0x104BE, "M", "𐓦"),
+        (0x104BF, "M", "𐓧"),
+        (0x104C0, "M", "𐓨"),
+        (0x104C1, "M", "𐓩"),
+        (0x104C2, "M", "𐓪"),
+        (0x104C3, "M", "𐓫"),
+        (0x104C4, "M", "𐓬"),
+        (0x104C5, "M", "𐓭"),
+        (0x104C6, "M", "𐓮"),
+        (0x104C7, "M", "𐓯"),
+        (0x104C8, "M", "𐓰"),
+        (0x104C9, "M", "𐓱"),
+        (0x104CA, "M", "𐓲"),
+        (0x104CB, "M", "𐓳"),
+        (0x104CC, "M", "𐓴"),
+        (0x104CD, "M", "𐓵"),
+        (0x104CE, "M", "𐓶"),
+        (0x104CF, "M", "𐓷"),
+        (0x104D0, "M", "𐓸"),
+        (0x104D1, "M", "𐓹"),
+        (0x104D2, "M", "𐓺"),
+        (0x104D3, "M", "𐓻"),
+        (0x104D4, "X"),
+        (0x104D8, "V"),
+        (0x104FC, "X"),
+        (0x10500, "V"),
+        (0x10528, "X"),
+        (0x10530, "V"),
+        (0x10564, "X"),
+        (0x1056F, "V"),
+        (0x10570, "M", "𐖗"),
+        (0x10571, "M", "𐖘"),
+        (0x10572, "M", "𐖙"),
+        (0x10573, "M", "𐖚"),
+        (0x10574, "M", "𐖛"),
+        (0x10575, "M", "𐖜"),
+        (0x10576, "M", "𐖝"),
+        (0x10577, "M", "𐖞"),
+        (0x10578, "M", "𐖟"),
+        (0x10579, "M", "𐖠"),
+        (0x1057A, "M", "𐖡"),
+        (0x1057B, "X"),
+        (0x1057C, "M", "𐖣"),
+        (0x1057D, "M", "𐖤"),
+        (0x1057E, "M", "𐖥"),
+        (0x1057F, "M", "𐖦"),
+        (0x10580, "M", "𐖧"),
+        (0x10581, "M", "𐖨"),
+        (0x10582, "M", "𐖩"),
+        (0x10583, "M", "𐖪"),
+        (0x10584, "M", "𐖫"),
+        (0x10585, "M", "𐖬"),
+        (0x10586, "M", "𐖭"),
+        (0x10587, "M", "𐖮"),
+        (0x10588, "M", "𐖯"),
+        (0x10589, "M", "𐖰"),
+        (0x1058A, "M", "𐖱"),
+        (0x1058B, "X"),
+        (0x1058C, "M", "𐖳"),
+        (0x1058D, "M", "𐖴"),
+        (0x1058E, "M", "𐖵"),
+        (0x1058F, "M", "𐖶"),
+        (0x10590, "M", "𐖷"),
+        (0x10591, "M", "𐖸"),
+        (0x10592, "M", "𐖹"),
+        (0x10593, "X"),
+        (0x10594, "M", "𐖻"),
+        (0x10595, "M", "𐖼"),
+        (0x10596, "X"),
+        (0x10597, "V"),
+        (0x105A2, "X"),
+        (0x105A3, "V"),
+        (0x105B2, "X"),
+        (0x105B3, "V"),
+        (0x105BA, "X"),
+        (0x105BB, "V"),
+        (0x105BD, "X"),
+        (0x10600, "V"),
+        (0x10737, "X"),
+        (0x10740, "V"),
+        (0x10756, "X"),
+        (0x10760, "V"),
+        (0x10768, "X"),
+        (0x10780, "V"),
+        (0x10781, "M", "ː"),
+        (0x10782, "M", "ˑ"),
+        (0x10783, "M", "æ"),
+        (0x10784, "M", "ʙ"),
+        (0x10785, "M", "ɓ"),
+        (0x10786, "X"),
+        (0x10787, "M", "ʣ"),
+        (0x10788, "M", "ꭦ"),
+        (0x10789, "M", "ʥ"),
+        (0x1078A, "M", "ʤ"),
+        (0x1078B, "M", "ɖ"),
+        (0x1078C, "M", "ɗ"),
     ]
 
+
 def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1078D, 'M', 'ᶑ'),
-    (0x1078E, 'M', 'ɘ'),
-    (0x1078F, 'M', 'ɞ'),
-    (0x10790, 'M', 'ʩ'),
-    (0x10791, 'M', 'ɤ'),
-    (0x10792, 'M', 'ɢ'),
-    (0x10793, 'M', 'ɠ'),
-    (0x10794, 'M', 'ʛ'),
-    (0x10795, 'M', 'ħ'),
-    (0x10796, 'M', 'ʜ'),
-    (0x10797, 'M', 'ɧ'),
-    (0x10798, 'M', 'ʄ'),
-    (0x10799, 'M', 'ʪ'),
-    (0x1079A, 'M', 'ʫ'),
-    (0x1079B, 'M', 'ɬ'),
-    (0x1079C, 'M', '𝼄'),
-    (0x1079D, 'M', 'ꞎ'),
-    (0x1079E, 'M', 'ɮ'),
-    (0x1079F, 'M', '𝼅'),
-    (0x107A0, 'M', 'ʎ'),
-    (0x107A1, 'M', '𝼆'),
-    (0x107A2, 'M', 'ø'),
-    (0x107A3, 'M', 'ɶ'),
-    (0x107A4, 'M', 'ɷ'),
-    (0x107A5, 'M', 'q'),
-    (0x107A6, 'M', 'ɺ'),
-    (0x107A7, 'M', '𝼈'),
-    (0x107A8, 'M', 'ɽ'),
-    (0x107A9, 'M', 'ɾ'),
-    (0x107AA, 'M', 'ʀ'),
-    (0x107AB, 'M', 'ʨ'),
-    (0x107AC, 'M', 'ʦ'),
-    (0x107AD, 'M', 'ꭧ'),
-    (0x107AE, 'M', 'ʧ'),
-    (0x107AF, 'M', 'ʈ'),
-    (0x107B0, 'M', 'ⱱ'),
-    (0x107B1, 'X'),
-    (0x107B2, 'M', 'ʏ'),
-    (0x107B3, 'M', 'ʡ'),
-    (0x107B4, 'M', 'ʢ'),
-    (0x107B5, 'M', 'ʘ'),
-    (0x107B6, 'M', 'ǀ'),
-    (0x107B7, 'M', 'ǁ'),
-    (0x107B8, 'M', 'ǂ'),
-    (0x107B9, 'M', '𝼊'),
-    (0x107BA, 'M', '𝼞'),
-    (0x107BB, 'X'),
-    (0x10800, 'V'),
-    (0x10806, 'X'),
-    (0x10808, 'V'),
-    (0x10809, 'X'),
-    (0x1080A, 'V'),
-    (0x10836, 'X'),
-    (0x10837, 'V'),
-    (0x10839, 'X'),
-    (0x1083C, 'V'),
-    (0x1083D, 'X'),
-    (0x1083F, 'V'),
-    (0x10856, 'X'),
-    (0x10857, 'V'),
-    (0x1089F, 'X'),
-    (0x108A7, 'V'),
-    (0x108B0, 'X'),
-    (0x108E0, 'V'),
-    (0x108F3, 'X'),
-    (0x108F4, 'V'),
-    (0x108F6, 'X'),
-    (0x108FB, 'V'),
-    (0x1091C, 'X'),
-    (0x1091F, 'V'),
-    (0x1093A, 'X'),
-    (0x1093F, 'V'),
-    (0x10940, 'X'),
-    (0x10980, 'V'),
-    (0x109B8, 'X'),
-    (0x109BC, 'V'),
-    (0x109D0, 'X'),
-    (0x109D2, 'V'),
-    (0x10A04, 'X'),
-    (0x10A05, 'V'),
-    (0x10A07, 'X'),
-    (0x10A0C, 'V'),
-    (0x10A14, 'X'),
-    (0x10A15, 'V'),
-    (0x10A18, 'X'),
-    (0x10A19, 'V'),
-    (0x10A36, 'X'),
-    (0x10A38, 'V'),
-    (0x10A3B, 'X'),
-    (0x10A3F, 'V'),
-    (0x10A49, 'X'),
-    (0x10A50, 'V'),
-    (0x10A59, 'X'),
-    (0x10A60, 'V'),
-    (0x10AA0, 'X'),
-    (0x10AC0, 'V'),
-    (0x10AE7, 'X'),
-    (0x10AEB, 'V'),
-    (0x10AF7, 'X'),
-    (0x10B00, 'V'),
+        (0x1078D, "M", "ᶑ"),
+        (0x1078E, "M", "ɘ"),
+        (0x1078F, "M", "ɞ"),
+        (0x10790, "M", "ʩ"),
+        (0x10791, "M", "ɤ"),
+        (0x10792, "M", "ɢ"),
+        (0x10793, "M", "ɠ"),
+        (0x10794, "M", "ʛ"),
+        (0x10795, "M", "ħ"),
+        (0x10796, "M", "ʜ"),
+        (0x10797, "M", "ɧ"),
+        (0x10798, "M", "ʄ"),
+        (0x10799, "M", "ʪ"),
+        (0x1079A, "M", "ʫ"),
+        (0x1079B, "M", "ɬ"),
+        (0x1079C, "M", "𝼄"),
+        (0x1079D, "M", "ꞎ"),
+        (0x1079E, "M", "ɮ"),
+        (0x1079F, "M", "𝼅"),
+        (0x107A0, "M", "ʎ"),
+        (0x107A1, "M", "𝼆"),
+        (0x107A2, "M", "ø"),
+        (0x107A3, "M", "ɶ"),
+        (0x107A4, "M", "ɷ"),
+        (0x107A5, "M", "q"),
+        (0x107A6, "M", "ɺ"),
+        (0x107A7, "M", "𝼈"),
+        (0x107A8, "M", "ɽ"),
+        (0x107A9, "M", "ɾ"),
+        (0x107AA, "M", "ʀ"),
+        (0x107AB, "M", "ʨ"),
+        (0x107AC, "M", "ʦ"),
+        (0x107AD, "M", "ꭧ"),
+        (0x107AE, "M", "ʧ"),
+        (0x107AF, "M", "ʈ"),
+        (0x107B0, "M", "ⱱ"),
+        (0x107B1, "X"),
+        (0x107B2, "M", "ʏ"),
+        (0x107B3, "M", "ʡ"),
+        (0x107B4, "M", "ʢ"),
+        (0x107B5, "M", "ʘ"),
+        (0x107B6, "M", "ǀ"),
+        (0x107B7, "M", "ǁ"),
+        (0x107B8, "M", "ǂ"),
+        (0x107B9, "M", "𝼊"),
+        (0x107BA, "M", "𝼞"),
+        (0x107BB, "X"),
+        (0x10800, "V"),
+        (0x10806, "X"),
+        (0x10808, "V"),
+        (0x10809, "X"),
+        (0x1080A, "V"),
+        (0x10836, "X"),
+        (0x10837, "V"),
+        (0x10839, "X"),
+        (0x1083C, "V"),
+        (0x1083D, "X"),
+        (0x1083F, "V"),
+        (0x10856, "X"),
+        (0x10857, "V"),
+        (0x1089F, "X"),
+        (0x108A7, "V"),
+        (0x108B0, "X"),
+        (0x108E0, "V"),
+        (0x108F3, "X"),
+        (0x108F4, "V"),
+        (0x108F6, "X"),
+        (0x108FB, "V"),
+        (0x1091C, "X"),
+        (0x1091F, "V"),
+        (0x1093A, "X"),
+        (0x1093F, "V"),
+        (0x10940, "X"),
+        (0x10980, "V"),
+        (0x109B8, "X"),
+        (0x109BC, "V"),
+        (0x109D0, "X"),
+        (0x109D2, "V"),
+        (0x10A04, "X"),
+        (0x10A05, "V"),
+        (0x10A07, "X"),
+        (0x10A0C, "V"),
+        (0x10A14, "X"),
+        (0x10A15, "V"),
+        (0x10A18, "X"),
+        (0x10A19, "V"),
+        (0x10A36, "X"),
+        (0x10A38, "V"),
+        (0x10A3B, "X"),
+        (0x10A3F, "V"),
+        (0x10A49, "X"),
+        (0x10A50, "V"),
+        (0x10A59, "X"),
+        (0x10A60, "V"),
+        (0x10AA0, "X"),
+        (0x10AC0, "V"),
+        (0x10AE7, "X"),
+        (0x10AEB, "V"),
+        (0x10AF7, "X"),
+        (0x10B00, "V"),
     ]
 
+
 def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x10B36, 'X'),
-    (0x10B39, 'V'),
-    (0x10B56, 'X'),
-    (0x10B58, 'V'),
-    (0x10B73, 'X'),
-    (0x10B78, 'V'),
-    (0x10B92, 'X'),
-    (0x10B99, 'V'),
-    (0x10B9D, 'X'),
-    (0x10BA9, 'V'),
-    (0x10BB0, 'X'),
-    (0x10C00, 'V'),
-    (0x10C49, 'X'),
-    (0x10C80, 'M', '𐳀'),
-    (0x10C81, 'M', '𐳁'),
-    (0x10C82, 'M', '𐳂'),
-    (0x10C83, 'M', '𐳃'),
-    (0x10C84, 'M', '𐳄'),
-    (0x10C85, 'M', '𐳅'),
-    (0x10C86, 'M', '𐳆'),
-    (0x10C87, 'M', '𐳇'),
-    (0x10C88, 'M', '𐳈'),
-    (0x10C89, 'M', '𐳉'),
-    (0x10C8A, 'M', '𐳊'),
-    (0x10C8B, 'M', '𐳋'),
-    (0x10C8C, 'M', '𐳌'),
-    (0x10C8D, 'M', '𐳍'),
-    (0x10C8E, 'M', '𐳎'),
-    (0x10C8F, 'M', '𐳏'),
-    (0x10C90, 'M', '𐳐'),
-    (0x10C91, 'M', '𐳑'),
-    (0x10C92, 'M', '𐳒'),
-    (0x10C93, 'M', '𐳓'),
-    (0x10C94, 'M', '𐳔'),
-    (0x10C95, 'M', '𐳕'),
-    (0x10C96, 'M', '𐳖'),
-    (0x10C97, 'M', '𐳗'),
-    (0x10C98, 'M', '𐳘'),
-    (0x10C99, 'M', '𐳙'),
-    (0x10C9A, 'M', '𐳚'),
-    (0x10C9B, 'M', '𐳛'),
-    (0x10C9C, 'M', '𐳜'),
-    (0x10C9D, 'M', '𐳝'),
-    (0x10C9E, 'M', '𐳞'),
-    (0x10C9F, 'M', '𐳟'),
-    (0x10CA0, 'M', '𐳠'),
-    (0x10CA1, 'M', '𐳡'),
-    (0x10CA2, 'M', '𐳢'),
-    (0x10CA3, 'M', '𐳣'),
-    (0x10CA4, 'M', '𐳤'),
-    (0x10CA5, 'M', '𐳥'),
-    (0x10CA6, 'M', '𐳦'),
-    (0x10CA7, 'M', '𐳧'),
-    (0x10CA8, 'M', '𐳨'),
-    (0x10CA9, 'M', '𐳩'),
-    (0x10CAA, 'M', '𐳪'),
-    (0x10CAB, 'M', '𐳫'),
-    (0x10CAC, 'M', '𐳬'),
-    (0x10CAD, 'M', '𐳭'),
-    (0x10CAE, 'M', '𐳮'),
-    (0x10CAF, 'M', '𐳯'),
-    (0x10CB0, 'M', '𐳰'),
-    (0x10CB1, 'M', '𐳱'),
-    (0x10CB2, 'M', '𐳲'),
-    (0x10CB3, 'X'),
-    (0x10CC0, 'V'),
-    (0x10CF3, 'X'),
-    (0x10CFA, 'V'),
-    (0x10D28, 'X'),
-    (0x10D30, 'V'),
-    (0x10D3A, 'X'),
-    (0x10E60, 'V'),
-    (0x10E7F, 'X'),
-    (0x10E80, 'V'),
-    (0x10EAA, 'X'),
-    (0x10EAB, 'V'),
-    (0x10EAE, 'X'),
-    (0x10EB0, 'V'),
-    (0x10EB2, 'X'),
-    (0x10EFD, 'V'),
-    (0x10F28, 'X'),
-    (0x10F30, 'V'),
-    (0x10F5A, 'X'),
-    (0x10F70, 'V'),
-    (0x10F8A, 'X'),
-    (0x10FB0, 'V'),
-    (0x10FCC, 'X'),
-    (0x10FE0, 'V'),
-    (0x10FF7, 'X'),
-    (0x11000, 'V'),
-    (0x1104E, 'X'),
-    (0x11052, 'V'),
-    (0x11076, 'X'),
-    (0x1107F, 'V'),
-    (0x110BD, 'X'),
-    (0x110BE, 'V'),
-    (0x110C3, 'X'),
-    (0x110D0, 'V'),
-    (0x110E9, 'X'),
-    (0x110F0, 'V'),
+        (0x10B36, "X"),
+        (0x10B39, "V"),
+        (0x10B56, "X"),
+        (0x10B58, "V"),
+        (0x10B73, "X"),
+        (0x10B78, "V"),
+        (0x10B92, "X"),
+        (0x10B99, "V"),
+        (0x10B9D, "X"),
+        (0x10BA9, "V"),
+        (0x10BB0, "X"),
+        (0x10C00, "V"),
+        (0x10C49, "X"),
+        (0x10C80, "M", "𐳀"),
+        (0x10C81, "M", "𐳁"),
+        (0x10C82, "M", "𐳂"),
+        (0x10C83, "M", "𐳃"),
+        (0x10C84, "M", "𐳄"),
+        (0x10C85, "M", "𐳅"),
+        (0x10C86, "M", "𐳆"),
+        (0x10C87, "M", "𐳇"),
+        (0x10C88, "M", "𐳈"),
+        (0x10C89, "M", "𐳉"),
+        (0x10C8A, "M", "𐳊"),
+        (0x10C8B, "M", "𐳋"),
+        (0x10C8C, "M", "𐳌"),
+        (0x10C8D, "M", "𐳍"),
+        (0x10C8E, "M", "𐳎"),
+        (0x10C8F, "M", "𐳏"),
+        (0x10C90, "M", "𐳐"),
+        (0x10C91, "M", "𐳑"),
+        (0x10C92, "M", "𐳒"),
+        (0x10C93, "M", "𐳓"),
+        (0x10C94, "M", "𐳔"),
+        (0x10C95, "M", "𐳕"),
+        (0x10C96, "M", "𐳖"),
+        (0x10C97, "M", "𐳗"),
+        (0x10C98, "M", "𐳘"),
+        (0x10C99, "M", "𐳙"),
+        (0x10C9A, "M", "𐳚"),
+        (0x10C9B, "M", "𐳛"),
+        (0x10C9C, "M", "𐳜"),
+        (0x10C9D, "M", "𐳝"),
+        (0x10C9E, "M", "𐳞"),
+        (0x10C9F, "M", "𐳟"),
+        (0x10CA0, "M", "𐳠"),
+        (0x10CA1, "M", "𐳡"),
+        (0x10CA2, "M", "𐳢"),
+        (0x10CA3, "M", "𐳣"),
+        (0x10CA4, "M", "𐳤"),
+        (0x10CA5, "M", "𐳥"),
+        (0x10CA6, "M", "𐳦"),
+        (0x10CA7, "M", "𐳧"),
+        (0x10CA8, "M", "𐳨"),
+        (0x10CA9, "M", "𐳩"),
+        (0x10CAA, "M", "𐳪"),
+        (0x10CAB, "M", "𐳫"),
+        (0x10CAC, "M", "𐳬"),
+        (0x10CAD, "M", "𐳭"),
+        (0x10CAE, "M", "𐳮"),
+        (0x10CAF, "M", "𐳯"),
+        (0x10CB0, "M", "𐳰"),
+        (0x10CB1, "M", "𐳱"),
+        (0x10CB2, "M", "𐳲"),
+        (0x10CB3, "X"),
+        (0x10CC0, "V"),
+        (0x10CF3, "X"),
+        (0x10CFA, "V"),
+        (0x10D28, "X"),
+        (0x10D30, "V"),
+        (0x10D3A, "X"),
+        (0x10E60, "V"),
+        (0x10E7F, "X"),
+        (0x10E80, "V"),
+        (0x10EAA, "X"),
+        (0x10EAB, "V"),
+        (0x10EAE, "X"),
+        (0x10EB0, "V"),
+        (0x10EB2, "X"),
+        (0x10EFD, "V"),
+        (0x10F28, "X"),
+        (0x10F30, "V"),
+        (0x10F5A, "X"),
+        (0x10F70, "V"),
+        (0x10F8A, "X"),
+        (0x10FB0, "V"),
+        (0x10FCC, "X"),
+        (0x10FE0, "V"),
+        (0x10FF7, "X"),
+        (0x11000, "V"),
+        (0x1104E, "X"),
+        (0x11052, "V"),
+        (0x11076, "X"),
+        (0x1107F, "V"),
+        (0x110BD, "X"),
+        (0x110BE, "V"),
+        (0x110C3, "X"),
+        (0x110D0, "V"),
+        (0x110E9, "X"),
+        (0x110F0, "V"),
     ]
 
+
 def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x110FA, 'X'),
-    (0x11100, 'V'),
-    (0x11135, 'X'),
-    (0x11136, 'V'),
-    (0x11148, 'X'),
-    (0x11150, 'V'),
-    (0x11177, 'X'),
-    (0x11180, 'V'),
-    (0x111E0, 'X'),
-    (0x111E1, 'V'),
-    (0x111F5, 'X'),
-    (0x11200, 'V'),
-    (0x11212, 'X'),
-    (0x11213, 'V'),
-    (0x11242, 'X'),
-    (0x11280, 'V'),
-    (0x11287, 'X'),
-    (0x11288, 'V'),
-    (0x11289, 'X'),
-    (0x1128A, 'V'),
-    (0x1128E, 'X'),
-    (0x1128F, 'V'),
-    (0x1129E, 'X'),
-    (0x1129F, 'V'),
-    (0x112AA, 'X'),
-    (0x112B0, 'V'),
-    (0x112EB, 'X'),
-    (0x112F0, 'V'),
-    (0x112FA, 'X'),
-    (0x11300, 'V'),
-    (0x11304, 'X'),
-    (0x11305, 'V'),
-    (0x1130D, 'X'),
-    (0x1130F, 'V'),
-    (0x11311, 'X'),
-    (0x11313, 'V'),
-    (0x11329, 'X'),
-    (0x1132A, 'V'),
-    (0x11331, 'X'),
-    (0x11332, 'V'),
-    (0x11334, 'X'),
-    (0x11335, 'V'),
-    (0x1133A, 'X'),
-    (0x1133B, 'V'),
-    (0x11345, 'X'),
-    (0x11347, 'V'),
-    (0x11349, 'X'),
-    (0x1134B, 'V'),
-    (0x1134E, 'X'),
-    (0x11350, 'V'),
-    (0x11351, 'X'),
-    (0x11357, 'V'),
-    (0x11358, 'X'),
-    (0x1135D, 'V'),
-    (0x11364, 'X'),
-    (0x11366, 'V'),
-    (0x1136D, 'X'),
-    (0x11370, 'V'),
-    (0x11375, 'X'),
-    (0x11400, 'V'),
-    (0x1145C, 'X'),
-    (0x1145D, 'V'),
-    (0x11462, 'X'),
-    (0x11480, 'V'),
-    (0x114C8, 'X'),
-    (0x114D0, 'V'),
-    (0x114DA, 'X'),
-    (0x11580, 'V'),
-    (0x115B6, 'X'),
-    (0x115B8, 'V'),
-    (0x115DE, 'X'),
-    (0x11600, 'V'),
-    (0x11645, 'X'),
-    (0x11650, 'V'),
-    (0x1165A, 'X'),
-    (0x11660, 'V'),
-    (0x1166D, 'X'),
-    (0x11680, 'V'),
-    (0x116BA, 'X'),
-    (0x116C0, 'V'),
-    (0x116CA, 'X'),
-    (0x11700, 'V'),
-    (0x1171B, 'X'),
-    (0x1171D, 'V'),
-    (0x1172C, 'X'),
-    (0x11730, 'V'),
-    (0x11747, 'X'),
-    (0x11800, 'V'),
-    (0x1183C, 'X'),
-    (0x118A0, 'M', '𑣀'),
-    (0x118A1, 'M', '𑣁'),
-    (0x118A2, 'M', '𑣂'),
-    (0x118A3, 'M', '𑣃'),
-    (0x118A4, 'M', '𑣄'),
-    (0x118A5, 'M', '𑣅'),
-    (0x118A6, 'M', '𑣆'),
-    (0x118A7, 'M', '𑣇'),
-    (0x118A8, 'M', '𑣈'),
-    (0x118A9, 'M', '𑣉'),
-    (0x118AA, 'M', '𑣊'),
+        (0x110FA, "X"),
+        (0x11100, "V"),
+        (0x11135, "X"),
+        (0x11136, "V"),
+        (0x11148, "X"),
+        (0x11150, "V"),
+        (0x11177, "X"),
+        (0x11180, "V"),
+        (0x111E0, "X"),
+        (0x111E1, "V"),
+        (0x111F5, "X"),
+        (0x11200, "V"),
+        (0x11212, "X"),
+        (0x11213, "V"),
+        (0x11242, "X"),
+        (0x11280, "V"),
+        (0x11287, "X"),
+        (0x11288, "V"),
+        (0x11289, "X"),
+        (0x1128A, "V"),
+        (0x1128E, "X"),
+        (0x1128F, "V"),
+        (0x1129E, "X"),
+        (0x1129F, "V"),
+        (0x112AA, "X"),
+        (0x112B0, "V"),
+        (0x112EB, "X"),
+        (0x112F0, "V"),
+        (0x112FA, "X"),
+        (0x11300, "V"),
+        (0x11304, "X"),
+        (0x11305, "V"),
+        (0x1130D, "X"),
+        (0x1130F, "V"),
+        (0x11311, "X"),
+        (0x11313, "V"),
+        (0x11329, "X"),
+        (0x1132A, "V"),
+        (0x11331, "X"),
+        (0x11332, "V"),
+        (0x11334, "X"),
+        (0x11335, "V"),
+        (0x1133A, "X"),
+        (0x1133B, "V"),
+        (0x11345, "X"),
+        (0x11347, "V"),
+        (0x11349, "X"),
+        (0x1134B, "V"),
+        (0x1134E, "X"),
+        (0x11350, "V"),
+        (0x11351, "X"),
+        (0x11357, "V"),
+        (0x11358, "X"),
+        (0x1135D, "V"),
+        (0x11364, "X"),
+        (0x11366, "V"),
+        (0x1136D, "X"),
+        (0x11370, "V"),
+        (0x11375, "X"),
+        (0x11400, "V"),
+        (0x1145C, "X"),
+        (0x1145D, "V"),
+        (0x11462, "X"),
+        (0x11480, "V"),
+        (0x114C8, "X"),
+        (0x114D0, "V"),
+        (0x114DA, "X"),
+        (0x11580, "V"),
+        (0x115B6, "X"),
+        (0x115B8, "V"),
+        (0x115DE, "X"),
+        (0x11600, "V"),
+        (0x11645, "X"),
+        (0x11650, "V"),
+        (0x1165A, "X"),
+        (0x11660, "V"),
+        (0x1166D, "X"),
+        (0x11680, "V"),
+        (0x116BA, "X"),
+        (0x116C0, "V"),
+        (0x116CA, "X"),
+        (0x11700, "V"),
+        (0x1171B, "X"),
+        (0x1171D, "V"),
+        (0x1172C, "X"),
+        (0x11730, "V"),
+        (0x11747, "X"),
+        (0x11800, "V"),
+        (0x1183C, "X"),
+        (0x118A0, "M", "𑣀"),
+        (0x118A1, "M", "𑣁"),
+        (0x118A2, "M", "𑣂"),
+        (0x118A3, "M", "𑣃"),
+        (0x118A4, "M", "𑣄"),
+        (0x118A5, "M", "𑣅"),
+        (0x118A6, "M", "𑣆"),
+        (0x118A7, "M", "𑣇"),
+        (0x118A8, "M", "𑣈"),
+        (0x118A9, "M", "𑣉"),
+        (0x118AA, "M", "𑣊"),
     ]
 
+
 def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x118AB, 'M', '𑣋'),
-    (0x118AC, 'M', '𑣌'),
-    (0x118AD, 'M', '𑣍'),
-    (0x118AE, 'M', '𑣎'),
-    (0x118AF, 'M', '𑣏'),
-    (0x118B0, 'M', '𑣐'),
-    (0x118B1, 'M', '𑣑'),
-    (0x118B2, 'M', '𑣒'),
-    (0x118B3, 'M', '𑣓'),
-    (0x118B4, 'M', '𑣔'),
-    (0x118B5, 'M', '𑣕'),
-    (0x118B6, 'M', '𑣖'),
-    (0x118B7, 'M', '𑣗'),
-    (0x118B8, 'M', '𑣘'),
-    (0x118B9, 'M', '𑣙'),
-    (0x118BA, 'M', '𑣚'),
-    (0x118BB, 'M', '𑣛'),
-    (0x118BC, 'M', '𑣜'),
-    (0x118BD, 'M', '𑣝'),
-    (0x118BE, 'M', '𑣞'),
-    (0x118BF, 'M', '𑣟'),
-    (0x118C0, 'V'),
-    (0x118F3, 'X'),
-    (0x118FF, 'V'),
-    (0x11907, 'X'),
-    (0x11909, 'V'),
-    (0x1190A, 'X'),
-    (0x1190C, 'V'),
-    (0x11914, 'X'),
-    (0x11915, 'V'),
-    (0x11917, 'X'),
-    (0x11918, 'V'),
-    (0x11936, 'X'),
-    (0x11937, 'V'),
-    (0x11939, 'X'),
-    (0x1193B, 'V'),
-    (0x11947, 'X'),
-    (0x11950, 'V'),
-    (0x1195A, 'X'),
-    (0x119A0, 'V'),
-    (0x119A8, 'X'),
-    (0x119AA, 'V'),
-    (0x119D8, 'X'),
-    (0x119DA, 'V'),
-    (0x119E5, 'X'),
-    (0x11A00, 'V'),
-    (0x11A48, 'X'),
-    (0x11A50, 'V'),
-    (0x11AA3, 'X'),
-    (0x11AB0, 'V'),
-    (0x11AF9, 'X'),
-    (0x11B00, 'V'),
-    (0x11B0A, 'X'),
-    (0x11C00, 'V'),
-    (0x11C09, 'X'),
-    (0x11C0A, 'V'),
-    (0x11C37, 'X'),
-    (0x11C38, 'V'),
-    (0x11C46, 'X'),
-    (0x11C50, 'V'),
-    (0x11C6D, 'X'),
-    (0x11C70, 'V'),
-    (0x11C90, 'X'),
-    (0x11C92, 'V'),
-    (0x11CA8, 'X'),
-    (0x11CA9, 'V'),
-    (0x11CB7, 'X'),
-    (0x11D00, 'V'),
-    (0x11D07, 'X'),
-    (0x11D08, 'V'),
-    (0x11D0A, 'X'),
-    (0x11D0B, 'V'),
-    (0x11D37, 'X'),
-    (0x11D3A, 'V'),
-    (0x11D3B, 'X'),
-    (0x11D3C, 'V'),
-    (0x11D3E, 'X'),
-    (0x11D3F, 'V'),
-    (0x11D48, 'X'),
-    (0x11D50, 'V'),
-    (0x11D5A, 'X'),
-    (0x11D60, 'V'),
-    (0x11D66, 'X'),
-    (0x11D67, 'V'),
-    (0x11D69, 'X'),
-    (0x11D6A, 'V'),
-    (0x11D8F, 'X'),
-    (0x11D90, 'V'),
-    (0x11D92, 'X'),
-    (0x11D93, 'V'),
-    (0x11D99, 'X'),
-    (0x11DA0, 'V'),
-    (0x11DAA, 'X'),
-    (0x11EE0, 'V'),
-    (0x11EF9, 'X'),
-    (0x11F00, 'V'),
-    (0x11F11, 'X'),
-    (0x11F12, 'V'),
-    (0x11F3B, 'X'),
-    (0x11F3E, 'V'),
+        (0x118AB, "M", "𑣋"),
+        (0x118AC, "M", "𑣌"),
+        (0x118AD, "M", "𑣍"),
+        (0x118AE, "M", "𑣎"),
+        (0x118AF, "M", "𑣏"),
+        (0x118B0, "M", "𑣐"),
+        (0x118B1, "M", "𑣑"),
+        (0x118B2, "M", "𑣒"),
+        (0x118B3, "M", "𑣓"),
+        (0x118B4, "M", "𑣔"),
+        (0x118B5, "M", "𑣕"),
+        (0x118B6, "M", "𑣖"),
+        (0x118B7, "M", "𑣗"),
+        (0x118B8, "M", "𑣘"),
+        (0x118B9, "M", "𑣙"),
+        (0x118BA, "M", "𑣚"),
+        (0x118BB, "M", "𑣛"),
+        (0x118BC, "M", "𑣜"),
+        (0x118BD, "M", "𑣝"),
+        (0x118BE, "M", "𑣞"),
+        (0x118BF, "M", "𑣟"),
+        (0x118C0, "V"),
+        (0x118F3, "X"),
+        (0x118FF, "V"),
+        (0x11907, "X"),
+        (0x11909, "V"),
+        (0x1190A, "X"),
+        (0x1190C, "V"),
+        (0x11914, "X"),
+        (0x11915, "V"),
+        (0x11917, "X"),
+        (0x11918, "V"),
+        (0x11936, "X"),
+        (0x11937, "V"),
+        (0x11939, "X"),
+        (0x1193B, "V"),
+        (0x11947, "X"),
+        (0x11950, "V"),
+        (0x1195A, "X"),
+        (0x119A0, "V"),
+        (0x119A8, "X"),
+        (0x119AA, "V"),
+        (0x119D8, "X"),
+        (0x119DA, "V"),
+        (0x119E5, "X"),
+        (0x11A00, "V"),
+        (0x11A48, "X"),
+        (0x11A50, "V"),
+        (0x11AA3, "X"),
+        (0x11AB0, "V"),
+        (0x11AF9, "X"),
+        (0x11B00, "V"),
+        (0x11B0A, "X"),
+        (0x11C00, "V"),
+        (0x11C09, "X"),
+        (0x11C0A, "V"),
+        (0x11C37, "X"),
+        (0x11C38, "V"),
+        (0x11C46, "X"),
+        (0x11C50, "V"),
+        (0x11C6D, "X"),
+        (0x11C70, "V"),
+        (0x11C90, "X"),
+        (0x11C92, "V"),
+        (0x11CA8, "X"),
+        (0x11CA9, "V"),
+        (0x11CB7, "X"),
+        (0x11D00, "V"),
+        (0x11D07, "X"),
+        (0x11D08, "V"),
+        (0x11D0A, "X"),
+        (0x11D0B, "V"),
+        (0x11D37, "X"),
+        (0x11D3A, "V"),
+        (0x11D3B, "X"),
+        (0x11D3C, "V"),
+        (0x11D3E, "X"),
+        (0x11D3F, "V"),
+        (0x11D48, "X"),
+        (0x11D50, "V"),
+        (0x11D5A, "X"),
+        (0x11D60, "V"),
+        (0x11D66, "X"),
+        (0x11D67, "V"),
+        (0x11D69, "X"),
+        (0x11D6A, "V"),
+        (0x11D8F, "X"),
+        (0x11D90, "V"),
+        (0x11D92, "X"),
+        (0x11D93, "V"),
+        (0x11D99, "X"),
+        (0x11DA0, "V"),
+        (0x11DAA, "X"),
+        (0x11EE0, "V"),
+        (0x11EF9, "X"),
+        (0x11F00, "V"),
+        (0x11F11, "X"),
+        (0x11F12, "V"),
+        (0x11F3B, "X"),
+        (0x11F3E, "V"),
     ]
 
+
 def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x11F5A, 'X'),
-    (0x11FB0, 'V'),
-    (0x11FB1, 'X'),
-    (0x11FC0, 'V'),
-    (0x11FF2, 'X'),
-    (0x11FFF, 'V'),
-    (0x1239A, 'X'),
-    (0x12400, 'V'),
-    (0x1246F, 'X'),
-    (0x12470, 'V'),
-    (0x12475, 'X'),
-    (0x12480, 'V'),
-    (0x12544, 'X'),
-    (0x12F90, 'V'),
-    (0x12FF3, 'X'),
-    (0x13000, 'V'),
-    (0x13430, 'X'),
-    (0x13440, 'V'),
-    (0x13456, 'X'),
-    (0x14400, 'V'),
-    (0x14647, 'X'),
-    (0x16800, 'V'),
-    (0x16A39, 'X'),
-    (0x16A40, 'V'),
-    (0x16A5F, 'X'),
-    (0x16A60, 'V'),
-    (0x16A6A, 'X'),
-    (0x16A6E, 'V'),
-    (0x16ABF, 'X'),
-    (0x16AC0, 'V'),
-    (0x16ACA, 'X'),
-    (0x16AD0, 'V'),
-    (0x16AEE, 'X'),
-    (0x16AF0, 'V'),
-    (0x16AF6, 'X'),
-    (0x16B00, 'V'),
-    (0x16B46, 'X'),
-    (0x16B50, 'V'),
-    (0x16B5A, 'X'),
-    (0x16B5B, 'V'),
-    (0x16B62, 'X'),
-    (0x16B63, 'V'),
-    (0x16B78, 'X'),
-    (0x16B7D, 'V'),
-    (0x16B90, 'X'),
-    (0x16E40, 'M', '𖹠'),
-    (0x16E41, 'M', '𖹡'),
-    (0x16E42, 'M', '𖹢'),
-    (0x16E43, 'M', '𖹣'),
-    (0x16E44, 'M', '𖹤'),
-    (0x16E45, 'M', '𖹥'),
-    (0x16E46, 'M', '𖹦'),
-    (0x16E47, 'M', '𖹧'),
-    (0x16E48, 'M', '𖹨'),
-    (0x16E49, 'M', '𖹩'),
-    (0x16E4A, 'M', '𖹪'),
-    (0x16E4B, 'M', '𖹫'),
-    (0x16E4C, 'M', '𖹬'),
-    (0x16E4D, 'M', '𖹭'),
-    (0x16E4E, 'M', '𖹮'),
-    (0x16E4F, 'M', '𖹯'),
-    (0x16E50, 'M', '𖹰'),
-    (0x16E51, 'M', '𖹱'),
-    (0x16E52, 'M', '𖹲'),
-    (0x16E53, 'M', '𖹳'),
-    (0x16E54, 'M', '𖹴'),
-    (0x16E55, 'M', '𖹵'),
-    (0x16E56, 'M', '𖹶'),
-    (0x16E57, 'M', '𖹷'),
-    (0x16E58, 'M', '𖹸'),
-    (0x16E59, 'M', '𖹹'),
-    (0x16E5A, 'M', '𖹺'),
-    (0x16E5B, 'M', '𖹻'),
-    (0x16E5C, 'M', '𖹼'),
-    (0x16E5D, 'M', '𖹽'),
-    (0x16E5E, 'M', '𖹾'),
-    (0x16E5F, 'M', '𖹿'),
-    (0x16E60, 'V'),
-    (0x16E9B, 'X'),
-    (0x16F00, 'V'),
-    (0x16F4B, 'X'),
-    (0x16F4F, 'V'),
-    (0x16F88, 'X'),
-    (0x16F8F, 'V'),
-    (0x16FA0, 'X'),
-    (0x16FE0, 'V'),
-    (0x16FE5, 'X'),
-    (0x16FF0, 'V'),
-    (0x16FF2, 'X'),
-    (0x17000, 'V'),
-    (0x187F8, 'X'),
-    (0x18800, 'V'),
-    (0x18CD6, 'X'),
-    (0x18D00, 'V'),
-    (0x18D09, 'X'),
-    (0x1AFF0, 'V'),
-    (0x1AFF4, 'X'),
-    (0x1AFF5, 'V'),
-    (0x1AFFC, 'X'),
-    (0x1AFFD, 'V'),
+        (0x11F5A, "X"),
+        (0x11FB0, "V"),
+        (0x11FB1, "X"),
+        (0x11FC0, "V"),
+        (0x11FF2, "X"),
+        (0x11FFF, "V"),
+        (0x1239A, "X"),
+        (0x12400, "V"),
+        (0x1246F, "X"),
+        (0x12470, "V"),
+        (0x12475, "X"),
+        (0x12480, "V"),
+        (0x12544, "X"),
+        (0x12F90, "V"),
+        (0x12FF3, "X"),
+        (0x13000, "V"),
+        (0x13430, "X"),
+        (0x13440, "V"),
+        (0x13456, "X"),
+        (0x14400, "V"),
+        (0x14647, "X"),
+        (0x16800, "V"),
+        (0x16A39, "X"),
+        (0x16A40, "V"),
+        (0x16A5F, "X"),
+        (0x16A60, "V"),
+        (0x16A6A, "X"),
+        (0x16A6E, "V"),
+        (0x16ABF, "X"),
+        (0x16AC0, "V"),
+        (0x16ACA, "X"),
+        (0x16AD0, "V"),
+        (0x16AEE, "X"),
+        (0x16AF0, "V"),
+        (0x16AF6, "X"),
+        (0x16B00, "V"),
+        (0x16B46, "X"),
+        (0x16B50, "V"),
+        (0x16B5A, "X"),
+        (0x16B5B, "V"),
+        (0x16B62, "X"),
+        (0x16B63, "V"),
+        (0x16B78, "X"),
+        (0x16B7D, "V"),
+        (0x16B90, "X"),
+        (0x16E40, "M", "𖹠"),
+        (0x16E41, "M", "𖹡"),
+        (0x16E42, "M", "𖹢"),
+        (0x16E43, "M", "𖹣"),
+        (0x16E44, "M", "𖹤"),
+        (0x16E45, "M", "𖹥"),
+        (0x16E46, "M", "𖹦"),
+        (0x16E47, "M", "𖹧"),
+        (0x16E48, "M", "𖹨"),
+        (0x16E49, "M", "𖹩"),
+        (0x16E4A, "M", "𖹪"),
+        (0x16E4B, "M", "𖹫"),
+        (0x16E4C, "M", "𖹬"),
+        (0x16E4D, "M", "𖹭"),
+        (0x16E4E, "M", "𖹮"),
+        (0x16E4F, "M", "𖹯"),
+        (0x16E50, "M", "𖹰"),
+        (0x16E51, "M", "𖹱"),
+        (0x16E52, "M", "𖹲"),
+        (0x16E53, "M", "𖹳"),
+        (0x16E54, "M", "𖹴"),
+        (0x16E55, "M", "𖹵"),
+        (0x16E56, "M", "𖹶"),
+        (0x16E57, "M", "𖹷"),
+        (0x16E58, "M", "𖹸"),
+        (0x16E59, "M", "𖹹"),
+        (0x16E5A, "M", "𖹺"),
+        (0x16E5B, "M", "𖹻"),
+        (0x16E5C, "M", "𖹼"),
+        (0x16E5D, "M", "𖹽"),
+        (0x16E5E, "M", "𖹾"),
+        (0x16E5F, "M", "𖹿"),
+        (0x16E60, "V"),
+        (0x16E9B, "X"),
+        (0x16F00, "V"),
+        (0x16F4B, "X"),
+        (0x16F4F, "V"),
+        (0x16F88, "X"),
+        (0x16F8F, "V"),
+        (0x16FA0, "X"),
+        (0x16FE0, "V"),
+        (0x16FE5, "X"),
+        (0x16FF0, "V"),
+        (0x16FF2, "X"),
+        (0x17000, "V"),
+        (0x187F8, "X"),
+        (0x18800, "V"),
+        (0x18CD6, "X"),
+        (0x18D00, "V"),
+        (0x18D09, "X"),
+        (0x1AFF0, "V"),
+        (0x1AFF4, "X"),
+        (0x1AFF5, "V"),
+        (0x1AFFC, "X"),
+        (0x1AFFD, "V"),
     ]
 
+
 def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1AFFF, 'X'),
-    (0x1B000, 'V'),
-    (0x1B123, 'X'),
-    (0x1B132, 'V'),
-    (0x1B133, 'X'),
-    (0x1B150, 'V'),
-    (0x1B153, 'X'),
-    (0x1B155, 'V'),
-    (0x1B156, 'X'),
-    (0x1B164, 'V'),
-    (0x1B168, 'X'),
-    (0x1B170, 'V'),
-    (0x1B2FC, 'X'),
-    (0x1BC00, 'V'),
-    (0x1BC6B, 'X'),
-    (0x1BC70, 'V'),
-    (0x1BC7D, 'X'),
-    (0x1BC80, 'V'),
-    (0x1BC89, 'X'),
-    (0x1BC90, 'V'),
-    (0x1BC9A, 'X'),
-    (0x1BC9C, 'V'),
-    (0x1BCA0, 'I'),
-    (0x1BCA4, 'X'),
-    (0x1CF00, 'V'),
-    (0x1CF2E, 'X'),
-    (0x1CF30, 'V'),
-    (0x1CF47, 'X'),
-    (0x1CF50, 'V'),
-    (0x1CFC4, 'X'),
-    (0x1D000, 'V'),
-    (0x1D0F6, 'X'),
-    (0x1D100, 'V'),
-    (0x1D127, 'X'),
-    (0x1D129, 'V'),
-    (0x1D15E, 'M', '𝅗𝅥'),
-    (0x1D15F, 'M', '𝅘𝅥'),
-    (0x1D160, 'M', '𝅘𝅥𝅮'),
-    (0x1D161, 'M', '𝅘𝅥𝅯'),
-    (0x1D162, 'M', '𝅘𝅥𝅰'),
-    (0x1D163, 'M', '𝅘𝅥𝅱'),
-    (0x1D164, 'M', '𝅘𝅥𝅲'),
-    (0x1D165, 'V'),
-    (0x1D173, 'X'),
-    (0x1D17B, 'V'),
-    (0x1D1BB, 'M', '𝆹𝅥'),
-    (0x1D1BC, 'M', '𝆺𝅥'),
-    (0x1D1BD, 'M', '𝆹𝅥𝅮'),
-    (0x1D1BE, 'M', '𝆺𝅥𝅮'),
-    (0x1D1BF, 'M', '𝆹𝅥𝅯'),
-    (0x1D1C0, 'M', '𝆺𝅥𝅯'),
-    (0x1D1C1, 'V'),
-    (0x1D1EB, 'X'),
-    (0x1D200, 'V'),
-    (0x1D246, 'X'),
-    (0x1D2C0, 'V'),
-    (0x1D2D4, 'X'),
-    (0x1D2E0, 'V'),
-    (0x1D2F4, 'X'),
-    (0x1D300, 'V'),
-    (0x1D357, 'X'),
-    (0x1D360, 'V'),
-    (0x1D379, 'X'),
-    (0x1D400, 'M', 'a'),
-    (0x1D401, 'M', 'b'),
-    (0x1D402, 'M', 'c'),
-    (0x1D403, 'M', 'd'),
-    (0x1D404, 'M', 'e'),
-    (0x1D405, 'M', 'f'),
-    (0x1D406, 'M', 'g'),
-    (0x1D407, 'M', 'h'),
-    (0x1D408, 'M', 'i'),
-    (0x1D409, 'M', 'j'),
-    (0x1D40A, 'M', 'k'),
-    (0x1D40B, 'M', 'l'),
-    (0x1D40C, 'M', 'm'),
-    (0x1D40D, 'M', 'n'),
-    (0x1D40E, 'M', 'o'),
-    (0x1D40F, 'M', 'p'),
-    (0x1D410, 'M', 'q'),
-    (0x1D411, 'M', 'r'),
-    (0x1D412, 'M', 's'),
-    (0x1D413, 'M', 't'),
-    (0x1D414, 'M', 'u'),
-    (0x1D415, 'M', 'v'),
-    (0x1D416, 'M', 'w'),
-    (0x1D417, 'M', 'x'),
-    (0x1D418, 'M', 'y'),
-    (0x1D419, 'M', 'z'),
-    (0x1D41A, 'M', 'a'),
-    (0x1D41B, 'M', 'b'),
-    (0x1D41C, 'M', 'c'),
-    (0x1D41D, 'M', 'd'),
-    (0x1D41E, 'M', 'e'),
-    (0x1D41F, 'M', 'f'),
-    (0x1D420, 'M', 'g'),
-    (0x1D421, 'M', 'h'),
-    (0x1D422, 'M', 'i'),
-    (0x1D423, 'M', 'j'),
-    (0x1D424, 'M', 'k'),
+        (0x1AFFF, "X"),
+        (0x1B000, "V"),
+        (0x1B123, "X"),
+        (0x1B132, "V"),
+        (0x1B133, "X"),
+        (0x1B150, "V"),
+        (0x1B153, "X"),
+        (0x1B155, "V"),
+        (0x1B156, "X"),
+        (0x1B164, "V"),
+        (0x1B168, "X"),
+        (0x1B170, "V"),
+        (0x1B2FC, "X"),
+        (0x1BC00, "V"),
+        (0x1BC6B, "X"),
+        (0x1BC70, "V"),
+        (0x1BC7D, "X"),
+        (0x1BC80, "V"),
+        (0x1BC89, "X"),
+        (0x1BC90, "V"),
+        (0x1BC9A, "X"),
+        (0x1BC9C, "V"),
+        (0x1BCA0, "I"),
+        (0x1BCA4, "X"),
+        (0x1CF00, "V"),
+        (0x1CF2E, "X"),
+        (0x1CF30, "V"),
+        (0x1CF47, "X"),
+        (0x1CF50, "V"),
+        (0x1CFC4, "X"),
+        (0x1D000, "V"),
+        (0x1D0F6, "X"),
+        (0x1D100, "V"),
+        (0x1D127, "X"),
+        (0x1D129, "V"),
+        (0x1D15E, "M", "𝅗𝅥"),
+        (0x1D15F, "M", "𝅘𝅥"),
+        (0x1D160, "M", "𝅘𝅥𝅮"),
+        (0x1D161, "M", "𝅘𝅥𝅯"),
+        (0x1D162, "M", "𝅘𝅥𝅰"),
+        (0x1D163, "M", "𝅘𝅥𝅱"),
+        (0x1D164, "M", "𝅘𝅥𝅲"),
+        (0x1D165, "V"),
+        (0x1D173, "X"),
+        (0x1D17B, "V"),
+        (0x1D1BB, "M", "𝆹𝅥"),
+        (0x1D1BC, "M", "𝆺𝅥"),
+        (0x1D1BD, "M", "𝆹𝅥𝅮"),
+        (0x1D1BE, "M", "𝆺𝅥𝅮"),
+        (0x1D1BF, "M", "𝆹𝅥𝅯"),
+        (0x1D1C0, "M", "𝆺𝅥𝅯"),
+        (0x1D1C1, "V"),
+        (0x1D1EB, "X"),
+        (0x1D200, "V"),
+        (0x1D246, "X"),
+        (0x1D2C0, "V"),
+        (0x1D2D4, "X"),
+        (0x1D2E0, "V"),
+        (0x1D2F4, "X"),
+        (0x1D300, "V"),
+        (0x1D357, "X"),
+        (0x1D360, "V"),
+        (0x1D379, "X"),
+        (0x1D400, "M", "a"),
+        (0x1D401, "M", "b"),
+        (0x1D402, "M", "c"),
+        (0x1D403, "M", "d"),
+        (0x1D404, "M", "e"),
+        (0x1D405, "M", "f"),
+        (0x1D406, "M", "g"),
+        (0x1D407, "M", "h"),
+        (0x1D408, "M", "i"),
+        (0x1D409, "M", "j"),
+        (0x1D40A, "M", "k"),
+        (0x1D40B, "M", "l"),
+        (0x1D40C, "M", "m"),
+        (0x1D40D, "M", "n"),
+        (0x1D40E, "M", "o"),
+        (0x1D40F, "M", "p"),
+        (0x1D410, "M", "q"),
+        (0x1D411, "M", "r"),
+        (0x1D412, "M", "s"),
+        (0x1D413, "M", "t"),
+        (0x1D414, "M", "u"),
+        (0x1D415, "M", "v"),
+        (0x1D416, "M", "w"),
+        (0x1D417, "M", "x"),
+        (0x1D418, "M", "y"),
+        (0x1D419, "M", "z"),
+        (0x1D41A, "M", "a"),
+        (0x1D41B, "M", "b"),
+        (0x1D41C, "M", "c"),
+        (0x1D41D, "M", "d"),
+        (0x1D41E, "M", "e"),
+        (0x1D41F, "M", "f"),
+        (0x1D420, "M", "g"),
+        (0x1D421, "M", "h"),
+        (0x1D422, "M", "i"),
+        (0x1D423, "M", "j"),
+        (0x1D424, "M", "k"),
     ]
 
+
 def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D425, 'M', 'l'),
-    (0x1D426, 'M', 'm'),
-    (0x1D427, 'M', 'n'),
-    (0x1D428, 'M', 'o'),
-    (0x1D429, 'M', 'p'),
-    (0x1D42A, 'M', 'q'),
-    (0x1D42B, 'M', 'r'),
-    (0x1D42C, 'M', 's'),
-    (0x1D42D, 'M', 't'),
-    (0x1D42E, 'M', 'u'),
-    (0x1D42F, 'M', 'v'),
-    (0x1D430, 'M', 'w'),
-    (0x1D431, 'M', 'x'),
-    (0x1D432, 'M', 'y'),
-    (0x1D433, 'M', 'z'),
-    (0x1D434, 'M', 'a'),
-    (0x1D435, 'M', 'b'),
-    (0x1D436, 'M', 'c'),
-    (0x1D437, 'M', 'd'),
-    (0x1D438, 'M', 'e'),
-    (0x1D439, 'M', 'f'),
-    (0x1D43A, 'M', 'g'),
-    (0x1D43B, 'M', 'h'),
-    (0x1D43C, 'M', 'i'),
-    (0x1D43D, 'M', 'j'),
-    (0x1D43E, 'M', 'k'),
-    (0x1D43F, 'M', 'l'),
-    (0x1D440, 'M', 'm'),
-    (0x1D441, 'M', 'n'),
-    (0x1D442, 'M', 'o'),
-    (0x1D443, 'M', 'p'),
-    (0x1D444, 'M', 'q'),
-    (0x1D445, 'M', 'r'),
-    (0x1D446, 'M', 's'),
-    (0x1D447, 'M', 't'),
-    (0x1D448, 'M', 'u'),
-    (0x1D449, 'M', 'v'),
-    (0x1D44A, 'M', 'w'),
-    (0x1D44B, 'M', 'x'),
-    (0x1D44C, 'M', 'y'),
-    (0x1D44D, 'M', 'z'),
-    (0x1D44E, 'M', 'a'),
-    (0x1D44F, 'M', 'b'),
-    (0x1D450, 'M', 'c'),
-    (0x1D451, 'M', 'd'),
-    (0x1D452, 'M', 'e'),
-    (0x1D453, 'M', 'f'),
-    (0x1D454, 'M', 'g'),
-    (0x1D455, 'X'),
-    (0x1D456, 'M', 'i'),
-    (0x1D457, 'M', 'j'),
-    (0x1D458, 'M', 'k'),
-    (0x1D459, 'M', 'l'),
-    (0x1D45A, 'M', 'm'),
-    (0x1D45B, 'M', 'n'),
-    (0x1D45C, 'M', 'o'),
-    (0x1D45D, 'M', 'p'),
-    (0x1D45E, 'M', 'q'),
-    (0x1D45F, 'M', 'r'),
-    (0x1D460, 'M', 's'),
-    (0x1D461, 'M', 't'),
-    (0x1D462, 'M', 'u'),
-    (0x1D463, 'M', 'v'),
-    (0x1D464, 'M', 'w'),
-    (0x1D465, 'M', 'x'),
-    (0x1D466, 'M', 'y'),
-    (0x1D467, 'M', 'z'),
-    (0x1D468, 'M', 'a'),
-    (0x1D469, 'M', 'b'),
-    (0x1D46A, 'M', 'c'),
-    (0x1D46B, 'M', 'd'),
-    (0x1D46C, 'M', 'e'),
-    (0x1D46D, 'M', 'f'),
-    (0x1D46E, 'M', 'g'),
-    (0x1D46F, 'M', 'h'),
-    (0x1D470, 'M', 'i'),
-    (0x1D471, 'M', 'j'),
-    (0x1D472, 'M', 'k'),
-    (0x1D473, 'M', 'l'),
-    (0x1D474, 'M', 'm'),
-    (0x1D475, 'M', 'n'),
-    (0x1D476, 'M', 'o'),
-    (0x1D477, 'M', 'p'),
-    (0x1D478, 'M', 'q'),
-    (0x1D479, 'M', 'r'),
-    (0x1D47A, 'M', 's'),
-    (0x1D47B, 'M', 't'),
-    (0x1D47C, 'M', 'u'),
-    (0x1D47D, 'M', 'v'),
-    (0x1D47E, 'M', 'w'),
-    (0x1D47F, 'M', 'x'),
-    (0x1D480, 'M', 'y'),
-    (0x1D481, 'M', 'z'),
-    (0x1D482, 'M', 'a'),
-    (0x1D483, 'M', 'b'),
-    (0x1D484, 'M', 'c'),
-    (0x1D485, 'M', 'd'),
-    (0x1D486, 'M', 'e'),
-    (0x1D487, 'M', 'f'),
-    (0x1D488, 'M', 'g'),
+        (0x1D425, "M", "l"),
+        (0x1D426, "M", "m"),
+        (0x1D427, "M", "n"),
+        (0x1D428, "M", "o"),
+        (0x1D429, "M", "p"),
+        (0x1D42A, "M", "q"),
+        (0x1D42B, "M", "r"),
+        (0x1D42C, "M", "s"),
+        (0x1D42D, "M", "t"),
+        (0x1D42E, "M", "u"),
+        (0x1D42F, "M", "v"),
+        (0x1D430, "M", "w"),
+        (0x1D431, "M", "x"),
+        (0x1D432, "M", "y"),
+        (0x1D433, "M", "z"),
+        (0x1D434, "M", "a"),
+        (0x1D435, "M", "b"),
+        (0x1D436, "M", "c"),
+        (0x1D437, "M", "d"),
+        (0x1D438, "M", "e"),
+        (0x1D439, "M", "f"),
+        (0x1D43A, "M", "g"),
+        (0x1D43B, "M", "h"),
+        (0x1D43C, "M", "i"),
+        (0x1D43D, "M", "j"),
+        (0x1D43E, "M", "k"),
+        (0x1D43F, "M", "l"),
+        (0x1D440, "M", "m"),
+        (0x1D441, "M", "n"),
+        (0x1D442, "M", "o"),
+        (0x1D443, "M", "p"),
+        (0x1D444, "M", "q"),
+        (0x1D445, "M", "r"),
+        (0x1D446, "M", "s"),
+        (0x1D447, "M", "t"),
+        (0x1D448, "M", "u"),
+        (0x1D449, "M", "v"),
+        (0x1D44A, "M", "w"),
+        (0x1D44B, "M", "x"),
+        (0x1D44C, "M", "y"),
+        (0x1D44D, "M", "z"),
+        (0x1D44E, "M", "a"),
+        (0x1D44F, "M", "b"),
+        (0x1D450, "M", "c"),
+        (0x1D451, "M", "d"),
+        (0x1D452, "M", "e"),
+        (0x1D453, "M", "f"),
+        (0x1D454, "M", "g"),
+        (0x1D455, "X"),
+        (0x1D456, "M", "i"),
+        (0x1D457, "M", "j"),
+        (0x1D458, "M", "k"),
+        (0x1D459, "M", "l"),
+        (0x1D45A, "M", "m"),
+        (0x1D45B, "M", "n"),
+        (0x1D45C, "M", "o"),
+        (0x1D45D, "M", "p"),
+        (0x1D45E, "M", "q"),
+        (0x1D45F, "M", "r"),
+        (0x1D460, "M", "s"),
+        (0x1D461, "M", "t"),
+        (0x1D462, "M", "u"),
+        (0x1D463, "M", "v"),
+        (0x1D464, "M", "w"),
+        (0x1D465, "M", "x"),
+        (0x1D466, "M", "y"),
+        (0x1D467, "M", "z"),
+        (0x1D468, "M", "a"),
+        (0x1D469, "M", "b"),
+        (0x1D46A, "M", "c"),
+        (0x1D46B, "M", "d"),
+        (0x1D46C, "M", "e"),
+        (0x1D46D, "M", "f"),
+        (0x1D46E, "M", "g"),
+        (0x1D46F, "M", "h"),
+        (0x1D470, "M", "i"),
+        (0x1D471, "M", "j"),
+        (0x1D472, "M", "k"),
+        (0x1D473, "M", "l"),
+        (0x1D474, "M", "m"),
+        (0x1D475, "M", "n"),
+        (0x1D476, "M", "o"),
+        (0x1D477, "M", "p"),
+        (0x1D478, "M", "q"),
+        (0x1D479, "M", "r"),
+        (0x1D47A, "M", "s"),
+        (0x1D47B, "M", "t"),
+        (0x1D47C, "M", "u"),
+        (0x1D47D, "M", "v"),
+        (0x1D47E, "M", "w"),
+        (0x1D47F, "M", "x"),
+        (0x1D480, "M", "y"),
+        (0x1D481, "M", "z"),
+        (0x1D482, "M", "a"),
+        (0x1D483, "M", "b"),
+        (0x1D484, "M", "c"),
+        (0x1D485, "M", "d"),
+        (0x1D486, "M", "e"),
+        (0x1D487, "M", "f"),
+        (0x1D488, "M", "g"),
     ]
 
+
 def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D489, 'M', 'h'),
-    (0x1D48A, 'M', 'i'),
-    (0x1D48B, 'M', 'j'),
-    (0x1D48C, 'M', 'k'),
-    (0x1D48D, 'M', 'l'),
-    (0x1D48E, 'M', 'm'),
-    (0x1D48F, 'M', 'n'),
-    (0x1D490, 'M', 'o'),
-    (0x1D491, 'M', 'p'),
-    (0x1D492, 'M', 'q'),
-    (0x1D493, 'M', 'r'),
-    (0x1D494, 'M', 's'),
-    (0x1D495, 'M', 't'),
-    (0x1D496, 'M', 'u'),
-    (0x1D497, 'M', 'v'),
-    (0x1D498, 'M', 'w'),
-    (0x1D499, 'M', 'x'),
-    (0x1D49A, 'M', 'y'),
-    (0x1D49B, 'M', 'z'),
-    (0x1D49C, 'M', 'a'),
-    (0x1D49D, 'X'),
-    (0x1D49E, 'M', 'c'),
-    (0x1D49F, 'M', 'd'),
-    (0x1D4A0, 'X'),
-    (0x1D4A2, 'M', 'g'),
-    (0x1D4A3, 'X'),
-    (0x1D4A5, 'M', 'j'),
-    (0x1D4A6, 'M', 'k'),
-    (0x1D4A7, 'X'),
-    (0x1D4A9, 'M', 'n'),
-    (0x1D4AA, 'M', 'o'),
-    (0x1D4AB, 'M', 'p'),
-    (0x1D4AC, 'M', 'q'),
-    (0x1D4AD, 'X'),
-    (0x1D4AE, 'M', 's'),
-    (0x1D4AF, 'M', 't'),
-    (0x1D4B0, 'M', 'u'),
-    (0x1D4B1, 'M', 'v'),
-    (0x1D4B2, 'M', 'w'),
-    (0x1D4B3, 'M', 'x'),
-    (0x1D4B4, 'M', 'y'),
-    (0x1D4B5, 'M', 'z'),
-    (0x1D4B6, 'M', 'a'),
-    (0x1D4B7, 'M', 'b'),
-    (0x1D4B8, 'M', 'c'),
-    (0x1D4B9, 'M', 'd'),
-    (0x1D4BA, 'X'),
-    (0x1D4BB, 'M', 'f'),
-    (0x1D4BC, 'X'),
-    (0x1D4BD, 'M', 'h'),
-    (0x1D4BE, 'M', 'i'),
-    (0x1D4BF, 'M', 'j'),
-    (0x1D4C0, 'M', 'k'),
-    (0x1D4C1, 'M', 'l'),
-    (0x1D4C2, 'M', 'm'),
-    (0x1D4C3, 'M', 'n'),
-    (0x1D4C4, 'X'),
-    (0x1D4C5, 'M', 'p'),
-    (0x1D4C6, 'M', 'q'),
-    (0x1D4C7, 'M', 'r'),
-    (0x1D4C8, 'M', 's'),
-    (0x1D4C9, 'M', 't'),
-    (0x1D4CA, 'M', 'u'),
-    (0x1D4CB, 'M', 'v'),
-    (0x1D4CC, 'M', 'w'),
-    (0x1D4CD, 'M', 'x'),
-    (0x1D4CE, 'M', 'y'),
-    (0x1D4CF, 'M', 'z'),
-    (0x1D4D0, 'M', 'a'),
-    (0x1D4D1, 'M', 'b'),
-    (0x1D4D2, 'M', 'c'),
-    (0x1D4D3, 'M', 'd'),
-    (0x1D4D4, 'M', 'e'),
-    (0x1D4D5, 'M', 'f'),
-    (0x1D4D6, 'M', 'g'),
-    (0x1D4D7, 'M', 'h'),
-    (0x1D4D8, 'M', 'i'),
-    (0x1D4D9, 'M', 'j'),
-    (0x1D4DA, 'M', 'k'),
-    (0x1D4DB, 'M', 'l'),
-    (0x1D4DC, 'M', 'm'),
-    (0x1D4DD, 'M', 'n'),
-    (0x1D4DE, 'M', 'o'),
-    (0x1D4DF, 'M', 'p'),
-    (0x1D4E0, 'M', 'q'),
-    (0x1D4E1, 'M', 'r'),
-    (0x1D4E2, 'M', 's'),
-    (0x1D4E3, 'M', 't'),
-    (0x1D4E4, 'M', 'u'),
-    (0x1D4E5, 'M', 'v'),
-    (0x1D4E6, 'M', 'w'),
-    (0x1D4E7, 'M', 'x'),
-    (0x1D4E8, 'M', 'y'),
-    (0x1D4E9, 'M', 'z'),
-    (0x1D4EA, 'M', 'a'),
-    (0x1D4EB, 'M', 'b'),
-    (0x1D4EC, 'M', 'c'),
-    (0x1D4ED, 'M', 'd'),
-    (0x1D4EE, 'M', 'e'),
-    (0x1D4EF, 'M', 'f'),
+        (0x1D489, "M", "h"),
+        (0x1D48A, "M", "i"),
+        (0x1D48B, "M", "j"),
+        (0x1D48C, "M", "k"),
+        (0x1D48D, "M", "l"),
+        (0x1D48E, "M", "m"),
+        (0x1D48F, "M", "n"),
+        (0x1D490, "M", "o"),
+        (0x1D491, "M", "p"),
+        (0x1D492, "M", "q"),
+        (0x1D493, "M", "r"),
+        (0x1D494, "M", "s"),
+        (0x1D495, "M", "t"),
+        (0x1D496, "M", "u"),
+        (0x1D497, "M", "v"),
+        (0x1D498, "M", "w"),
+        (0x1D499, "M", "x"),
+        (0x1D49A, "M", "y"),
+        (0x1D49B, "M", "z"),
+        (0x1D49C, "M", "a"),
+        (0x1D49D, "X"),
+        (0x1D49E, "M", "c"),
+        (0x1D49F, "M", "d"),
+        (0x1D4A0, "X"),
+        (0x1D4A2, "M", "g"),
+        (0x1D4A3, "X"),
+        (0x1D4A5, "M", "j"),
+        (0x1D4A6, "M", "k"),
+        (0x1D4A7, "X"),
+        (0x1D4A9, "M", "n"),
+        (0x1D4AA, "M", "o"),
+        (0x1D4AB, "M", "p"),
+        (0x1D4AC, "M", "q"),
+        (0x1D4AD, "X"),
+        (0x1D4AE, "M", "s"),
+        (0x1D4AF, "M", "t"),
+        (0x1D4B0, "M", "u"),
+        (0x1D4B1, "M", "v"),
+        (0x1D4B2, "M", "w"),
+        (0x1D4B3, "M", "x"),
+        (0x1D4B4, "M", "y"),
+        (0x1D4B5, "M", "z"),
+        (0x1D4B6, "M", "a"),
+        (0x1D4B7, "M", "b"),
+        (0x1D4B8, "M", "c"),
+        (0x1D4B9, "M", "d"),
+        (0x1D4BA, "X"),
+        (0x1D4BB, "M", "f"),
+        (0x1D4BC, "X"),
+        (0x1D4BD, "M", "h"),
+        (0x1D4BE, "M", "i"),
+        (0x1D4BF, "M", "j"),
+        (0x1D4C0, "M", "k"),
+        (0x1D4C1, "M", "l"),
+        (0x1D4C2, "M", "m"),
+        (0x1D4C3, "M", "n"),
+        (0x1D4C4, "X"),
+        (0x1D4C5, "M", "p"),
+        (0x1D4C6, "M", "q"),
+        (0x1D4C7, "M", "r"),
+        (0x1D4C8, "M", "s"),
+        (0x1D4C9, "M", "t"),
+        (0x1D4CA, "M", "u"),
+        (0x1D4CB, "M", "v"),
+        (0x1D4CC, "M", "w"),
+        (0x1D4CD, "M", "x"),
+        (0x1D4CE, "M", "y"),
+        (0x1D4CF, "M", "z"),
+        (0x1D4D0, "M", "a"),
+        (0x1D4D1, "M", "b"),
+        (0x1D4D2, "M", "c"),
+        (0x1D4D3, "M", "d"),
+        (0x1D4D4, "M", "e"),
+        (0x1D4D5, "M", "f"),
+        (0x1D4D6, "M", "g"),
+        (0x1D4D7, "M", "h"),
+        (0x1D4D8, "M", "i"),
+        (0x1D4D9, "M", "j"),
+        (0x1D4DA, "M", "k"),
+        (0x1D4DB, "M", "l"),
+        (0x1D4DC, "M", "m"),
+        (0x1D4DD, "M", "n"),
+        (0x1D4DE, "M", "o"),
+        (0x1D4DF, "M", "p"),
+        (0x1D4E0, "M", "q"),
+        (0x1D4E1, "M", "r"),
+        (0x1D4E2, "M", "s"),
+        (0x1D4E3, "M", "t"),
+        (0x1D4E4, "M", "u"),
+        (0x1D4E5, "M", "v"),
+        (0x1D4E6, "M", "w"),
+        (0x1D4E7, "M", "x"),
+        (0x1D4E8, "M", "y"),
+        (0x1D4E9, "M", "z"),
+        (0x1D4EA, "M", "a"),
+        (0x1D4EB, "M", "b"),
+        (0x1D4EC, "M", "c"),
+        (0x1D4ED, "M", "d"),
+        (0x1D4EE, "M", "e"),
+        (0x1D4EF, "M", "f"),
     ]
 
+
 def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D4F0, 'M', 'g'),
-    (0x1D4F1, 'M', 'h'),
-    (0x1D4F2, 'M', 'i'),
-    (0x1D4F3, 'M', 'j'),
-    (0x1D4F4, 'M', 'k'),
-    (0x1D4F5, 'M', 'l'),
-    (0x1D4F6, 'M', 'm'),
-    (0x1D4F7, 'M', 'n'),
-    (0x1D4F8, 'M', 'o'),
-    (0x1D4F9, 'M', 'p'),
-    (0x1D4FA, 'M', 'q'),
-    (0x1D4FB, 'M', 'r'),
-    (0x1D4FC, 'M', 's'),
-    (0x1D4FD, 'M', 't'),
-    (0x1D4FE, 'M', 'u'),
-    (0x1D4FF, 'M', 'v'),
-    (0x1D500, 'M', 'w'),
-    (0x1D501, 'M', 'x'),
-    (0x1D502, 'M', 'y'),
-    (0x1D503, 'M', 'z'),
-    (0x1D504, 'M', 'a'),
-    (0x1D505, 'M', 'b'),
-    (0x1D506, 'X'),
-    (0x1D507, 'M', 'd'),
-    (0x1D508, 'M', 'e'),
-    (0x1D509, 'M', 'f'),
-    (0x1D50A, 'M', 'g'),
-    (0x1D50B, 'X'),
-    (0x1D50D, 'M', 'j'),
-    (0x1D50E, 'M', 'k'),
-    (0x1D50F, 'M', 'l'),
-    (0x1D510, 'M', 'm'),
-    (0x1D511, 'M', 'n'),
-    (0x1D512, 'M', 'o'),
-    (0x1D513, 'M', 'p'),
-    (0x1D514, 'M', 'q'),
-    (0x1D515, 'X'),
-    (0x1D516, 'M', 's'),
-    (0x1D517, 'M', 't'),
-    (0x1D518, 'M', 'u'),
-    (0x1D519, 'M', 'v'),
-    (0x1D51A, 'M', 'w'),
-    (0x1D51B, 'M', 'x'),
-    (0x1D51C, 'M', 'y'),
-    (0x1D51D, 'X'),
-    (0x1D51E, 'M', 'a'),
-    (0x1D51F, 'M', 'b'),
-    (0x1D520, 'M', 'c'),
-    (0x1D521, 'M', 'd'),
-    (0x1D522, 'M', 'e'),
-    (0x1D523, 'M', 'f'),
-    (0x1D524, 'M', 'g'),
-    (0x1D525, 'M', 'h'),
-    (0x1D526, 'M', 'i'),
-    (0x1D527, 'M', 'j'),
-    (0x1D528, 'M', 'k'),
-    (0x1D529, 'M', 'l'),
-    (0x1D52A, 'M', 'm'),
-    (0x1D52B, 'M', 'n'),
-    (0x1D52C, 'M', 'o'),
-    (0x1D52D, 'M', 'p'),
-    (0x1D52E, 'M', 'q'),
-    (0x1D52F, 'M', 'r'),
-    (0x1D530, 'M', 's'),
-    (0x1D531, 'M', 't'),
-    (0x1D532, 'M', 'u'),
-    (0x1D533, 'M', 'v'),
-    (0x1D534, 'M', 'w'),
-    (0x1D535, 'M', 'x'),
-    (0x1D536, 'M', 'y'),
-    (0x1D537, 'M', 'z'),
-    (0x1D538, 'M', 'a'),
-    (0x1D539, 'M', 'b'),
-    (0x1D53A, 'X'),
-    (0x1D53B, 'M', 'd'),
-    (0x1D53C, 'M', 'e'),
-    (0x1D53D, 'M', 'f'),
-    (0x1D53E, 'M', 'g'),
-    (0x1D53F, 'X'),
-    (0x1D540, 'M', 'i'),
-    (0x1D541, 'M', 'j'),
-    (0x1D542, 'M', 'k'),
-    (0x1D543, 'M', 'l'),
-    (0x1D544, 'M', 'm'),
-    (0x1D545, 'X'),
-    (0x1D546, 'M', 'o'),
-    (0x1D547, 'X'),
-    (0x1D54A, 'M', 's'),
-    (0x1D54B, 'M', 't'),
-    (0x1D54C, 'M', 'u'),
-    (0x1D54D, 'M', 'v'),
-    (0x1D54E, 'M', 'w'),
-    (0x1D54F, 'M', 'x'),
-    (0x1D550, 'M', 'y'),
-    (0x1D551, 'X'),
-    (0x1D552, 'M', 'a'),
-    (0x1D553, 'M', 'b'),
-    (0x1D554, 'M', 'c'),
-    (0x1D555, 'M', 'd'),
-    (0x1D556, 'M', 'e'),
+        (0x1D4F0, "M", "g"),
+        (0x1D4F1, "M", "h"),
+        (0x1D4F2, "M", "i"),
+        (0x1D4F3, "M", "j"),
+        (0x1D4F4, "M", "k"),
+        (0x1D4F5, "M", "l"),
+        (0x1D4F6, "M", "m"),
+        (0x1D4F7, "M", "n"),
+        (0x1D4F8, "M", "o"),
+        (0x1D4F9, "M", "p"),
+        (0x1D4FA, "M", "q"),
+        (0x1D4FB, "M", "r"),
+        (0x1D4FC, "M", "s"),
+        (0x1D4FD, "M", "t"),
+        (0x1D4FE, "M", "u"),
+        (0x1D4FF, "M", "v"),
+        (0x1D500, "M", "w"),
+        (0x1D501, "M", "x"),
+        (0x1D502, "M", "y"),
+        (0x1D503, "M", "z"),
+        (0x1D504, "M", "a"),
+        (0x1D505, "M", "b"),
+        (0x1D506, "X"),
+        (0x1D507, "M", "d"),
+        (0x1D508, "M", "e"),
+        (0x1D509, "M", "f"),
+        (0x1D50A, "M", "g"),
+        (0x1D50B, "X"),
+        (0x1D50D, "M", "j"),
+        (0x1D50E, "M", "k"),
+        (0x1D50F, "M", "l"),
+        (0x1D510, "M", "m"),
+        (0x1D511, "M", "n"),
+        (0x1D512, "M", "o"),
+        (0x1D513, "M", "p"),
+        (0x1D514, "M", "q"),
+        (0x1D515, "X"),
+        (0x1D516, "M", "s"),
+        (0x1D517, "M", "t"),
+        (0x1D518, "M", "u"),
+        (0x1D519, "M", "v"),
+        (0x1D51A, "M", "w"),
+        (0x1D51B, "M", "x"),
+        (0x1D51C, "M", "y"),
+        (0x1D51D, "X"),
+        (0x1D51E, "M", "a"),
+        (0x1D51F, "M", "b"),
+        (0x1D520, "M", "c"),
+        (0x1D521, "M", "d"),
+        (0x1D522, "M", "e"),
+        (0x1D523, "M", "f"),
+        (0x1D524, "M", "g"),
+        (0x1D525, "M", "h"),
+        (0x1D526, "M", "i"),
+        (0x1D527, "M", "j"),
+        (0x1D528, "M", "k"),
+        (0x1D529, "M", "l"),
+        (0x1D52A, "M", "m"),
+        (0x1D52B, "M", "n"),
+        (0x1D52C, "M", "o"),
+        (0x1D52D, "M", "p"),
+        (0x1D52E, "M", "q"),
+        (0x1D52F, "M", "r"),
+        (0x1D530, "M", "s"),
+        (0x1D531, "M", "t"),
+        (0x1D532, "M", "u"),
+        (0x1D533, "M", "v"),
+        (0x1D534, "M", "w"),
+        (0x1D535, "M", "x"),
+        (0x1D536, "M", "y"),
+        (0x1D537, "M", "z"),
+        (0x1D538, "M", "a"),
+        (0x1D539, "M", "b"),
+        (0x1D53A, "X"),
+        (0x1D53B, "M", "d"),
+        (0x1D53C, "M", "e"),
+        (0x1D53D, "M", "f"),
+        (0x1D53E, "M", "g"),
+        (0x1D53F, "X"),
+        (0x1D540, "M", "i"),
+        (0x1D541, "M", "j"),
+        (0x1D542, "M", "k"),
+        (0x1D543, "M", "l"),
+        (0x1D544, "M", "m"),
+        (0x1D545, "X"),
+        (0x1D546, "M", "o"),
+        (0x1D547, "X"),
+        (0x1D54A, "M", "s"),
+        (0x1D54B, "M", "t"),
+        (0x1D54C, "M", "u"),
+        (0x1D54D, "M", "v"),
+        (0x1D54E, "M", "w"),
+        (0x1D54F, "M", "x"),
+        (0x1D550, "M", "y"),
+        (0x1D551, "X"),
+        (0x1D552, "M", "a"),
+        (0x1D553, "M", "b"),
+        (0x1D554, "M", "c"),
+        (0x1D555, "M", "d"),
+        (0x1D556, "M", "e"),
     ]
 
+
 def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D557, 'M', 'f'),
-    (0x1D558, 'M', 'g'),
-    (0x1D559, 'M', 'h'),
-    (0x1D55A, 'M', 'i'),
-    (0x1D55B, 'M', 'j'),
-    (0x1D55C, 'M', 'k'),
-    (0x1D55D, 'M', 'l'),
-    (0x1D55E, 'M', 'm'),
-    (0x1D55F, 'M', 'n'),
-    (0x1D560, 'M', 'o'),
-    (0x1D561, 'M', 'p'),
-    (0x1D562, 'M', 'q'),
-    (0x1D563, 'M', 'r'),
-    (0x1D564, 'M', 's'),
-    (0x1D565, 'M', 't'),
-    (0x1D566, 'M', 'u'),
-    (0x1D567, 'M', 'v'),
-    (0x1D568, 'M', 'w'),
-    (0x1D569, 'M', 'x'),
-    (0x1D56A, 'M', 'y'),
-    (0x1D56B, 'M', 'z'),
-    (0x1D56C, 'M', 'a'),
-    (0x1D56D, 'M', 'b'),
-    (0x1D56E, 'M', 'c'),
-    (0x1D56F, 'M', 'd'),
-    (0x1D570, 'M', 'e'),
-    (0x1D571, 'M', 'f'),
-    (0x1D572, 'M', 'g'),
-    (0x1D573, 'M', 'h'),
-    (0x1D574, 'M', 'i'),
-    (0x1D575, 'M', 'j'),
-    (0x1D576, 'M', 'k'),
-    (0x1D577, 'M', 'l'),
-    (0x1D578, 'M', 'm'),
-    (0x1D579, 'M', 'n'),
-    (0x1D57A, 'M', 'o'),
-    (0x1D57B, 'M', 'p'),
-    (0x1D57C, 'M', 'q'),
-    (0x1D57D, 'M', 'r'),
-    (0x1D57E, 'M', 's'),
-    (0x1D57F, 'M', 't'),
-    (0x1D580, 'M', 'u'),
-    (0x1D581, 'M', 'v'),
-    (0x1D582, 'M', 'w'),
-    (0x1D583, 'M', 'x'),
-    (0x1D584, 'M', 'y'),
-    (0x1D585, 'M', 'z'),
-    (0x1D586, 'M', 'a'),
-    (0x1D587, 'M', 'b'),
-    (0x1D588, 'M', 'c'),
-    (0x1D589, 'M', 'd'),
-    (0x1D58A, 'M', 'e'),
-    (0x1D58B, 'M', 'f'),
-    (0x1D58C, 'M', 'g'),
-    (0x1D58D, 'M', 'h'),
-    (0x1D58E, 'M', 'i'),
-    (0x1D58F, 'M', 'j'),
-    (0x1D590, 'M', 'k'),
-    (0x1D591, 'M', 'l'),
-    (0x1D592, 'M', 'm'),
-    (0x1D593, 'M', 'n'),
-    (0x1D594, 'M', 'o'),
-    (0x1D595, 'M', 'p'),
-    (0x1D596, 'M', 'q'),
-    (0x1D597, 'M', 'r'),
-    (0x1D598, 'M', 's'),
-    (0x1D599, 'M', 't'),
-    (0x1D59A, 'M', 'u'),
-    (0x1D59B, 'M', 'v'),
-    (0x1D59C, 'M', 'w'),
-    (0x1D59D, 'M', 'x'),
-    (0x1D59E, 'M', 'y'),
-    (0x1D59F, 'M', 'z'),
-    (0x1D5A0, 'M', 'a'),
-    (0x1D5A1, 'M', 'b'),
-    (0x1D5A2, 'M', 'c'),
-    (0x1D5A3, 'M', 'd'),
-    (0x1D5A4, 'M', 'e'),
-    (0x1D5A5, 'M', 'f'),
-    (0x1D5A6, 'M', 'g'),
-    (0x1D5A7, 'M', 'h'),
-    (0x1D5A8, 'M', 'i'),
-    (0x1D5A9, 'M', 'j'),
-    (0x1D5AA, 'M', 'k'),
-    (0x1D5AB, 'M', 'l'),
-    (0x1D5AC, 'M', 'm'),
-    (0x1D5AD, 'M', 'n'),
-    (0x1D5AE, 'M', 'o'),
-    (0x1D5AF, 'M', 'p'),
-    (0x1D5B0, 'M', 'q'),
-    (0x1D5B1, 'M', 'r'),
-    (0x1D5B2, 'M', 's'),
-    (0x1D5B3, 'M', 't'),
-    (0x1D5B4, 'M', 'u'),
-    (0x1D5B5, 'M', 'v'),
-    (0x1D5B6, 'M', 'w'),
-    (0x1D5B7, 'M', 'x'),
-    (0x1D5B8, 'M', 'y'),
-    (0x1D5B9, 'M', 'z'),
-    (0x1D5BA, 'M', 'a'),
+        (0x1D557, "M", "f"),
+        (0x1D558, "M", "g"),
+        (0x1D559, "M", "h"),
+        (0x1D55A, "M", "i"),
+        (0x1D55B, "M", "j"),
+        (0x1D55C, "M", "k"),
+        (0x1D55D, "M", "l"),
+        (0x1D55E, "M", "m"),
+        (0x1D55F, "M", "n"),
+        (0x1D560, "M", "o"),
+        (0x1D561, "M", "p"),
+        (0x1D562, "M", "q"),
+        (0x1D563, "M", "r"),
+        (0x1D564, "M", "s"),
+        (0x1D565, "M", "t"),
+        (0x1D566, "M", "u"),
+        (0x1D567, "M", "v"),
+        (0x1D568, "M", "w"),
+        (0x1D569, "M", "x"),
+        (0x1D56A, "M", "y"),
+        (0x1D56B, "M", "z"),
+        (0x1D56C, "M", "a"),
+        (0x1D56D, "M", "b"),
+        (0x1D56E, "M", "c"),
+        (0x1D56F, "M", "d"),
+        (0x1D570, "M", "e"),
+        (0x1D571, "M", "f"),
+        (0x1D572, "M", "g"),
+        (0x1D573, "M", "h"),
+        (0x1D574, "M", "i"),
+        (0x1D575, "M", "j"),
+        (0x1D576, "M", "k"),
+        (0x1D577, "M", "l"),
+        (0x1D578, "M", "m"),
+        (0x1D579, "M", "n"),
+        (0x1D57A, "M", "o"),
+        (0x1D57B, "M", "p"),
+        (0x1D57C, "M", "q"),
+        (0x1D57D, "M", "r"),
+        (0x1D57E, "M", "s"),
+        (0x1D57F, "M", "t"),
+        (0x1D580, "M", "u"),
+        (0x1D581, "M", "v"),
+        (0x1D582, "M", "w"),
+        (0x1D583, "M", "x"),
+        (0x1D584, "M", "y"),
+        (0x1D585, "M", "z"),
+        (0x1D586, "M", "a"),
+        (0x1D587, "M", "b"),
+        (0x1D588, "M", "c"),
+        (0x1D589, "M", "d"),
+        (0x1D58A, "M", "e"),
+        (0x1D58B, "M", "f"),
+        (0x1D58C, "M", "g"),
+        (0x1D58D, "M", "h"),
+        (0x1D58E, "M", "i"),
+        (0x1D58F, "M", "j"),
+        (0x1D590, "M", "k"),
+        (0x1D591, "M", "l"),
+        (0x1D592, "M", "m"),
+        (0x1D593, "M", "n"),
+        (0x1D594, "M", "o"),
+        (0x1D595, "M", "p"),
+        (0x1D596, "M", "q"),
+        (0x1D597, "M", "r"),
+        (0x1D598, "M", "s"),
+        (0x1D599, "M", "t"),
+        (0x1D59A, "M", "u"),
+        (0x1D59B, "M", "v"),
+        (0x1D59C, "M", "w"),
+        (0x1D59D, "M", "x"),
+        (0x1D59E, "M", "y"),
+        (0x1D59F, "M", "z"),
+        (0x1D5A0, "M", "a"),
+        (0x1D5A1, "M", "b"),
+        (0x1D5A2, "M", "c"),
+        (0x1D5A3, "M", "d"),
+        (0x1D5A4, "M", "e"),
+        (0x1D5A5, "M", "f"),
+        (0x1D5A6, "M", "g"),
+        (0x1D5A7, "M", "h"),
+        (0x1D5A8, "M", "i"),
+        (0x1D5A9, "M", "j"),
+        (0x1D5AA, "M", "k"),
+        (0x1D5AB, "M", "l"),
+        (0x1D5AC, "M", "m"),
+        (0x1D5AD, "M", "n"),
+        (0x1D5AE, "M", "o"),
+        (0x1D5AF, "M", "p"),
+        (0x1D5B0, "M", "q"),
+        (0x1D5B1, "M", "r"),
+        (0x1D5B2, "M", "s"),
+        (0x1D5B3, "M", "t"),
+        (0x1D5B4, "M", "u"),
+        (0x1D5B5, "M", "v"),
+        (0x1D5B6, "M", "w"),
+        (0x1D5B7, "M", "x"),
+        (0x1D5B8, "M", "y"),
+        (0x1D5B9, "M", "z"),
+        (0x1D5BA, "M", "a"),
     ]
 
+
 def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D5BB, 'M', 'b'),
-    (0x1D5BC, 'M', 'c'),
-    (0x1D5BD, 'M', 'd'),
-    (0x1D5BE, 'M', 'e'),
-    (0x1D5BF, 'M', 'f'),
-    (0x1D5C0, 'M', 'g'),
-    (0x1D5C1, 'M', 'h'),
-    (0x1D5C2, 'M', 'i'),
-    (0x1D5C3, 'M', 'j'),
-    (0x1D5C4, 'M', 'k'),
-    (0x1D5C5, 'M', 'l'),
-    (0x1D5C6, 'M', 'm'),
-    (0x1D5C7, 'M', 'n'),
-    (0x1D5C8, 'M', 'o'),
-    (0x1D5C9, 'M', 'p'),
-    (0x1D5CA, 'M', 'q'),
-    (0x1D5CB, 'M', 'r'),
-    (0x1D5CC, 'M', 's'),
-    (0x1D5CD, 'M', 't'),
-    (0x1D5CE, 'M', 'u'),
-    (0x1D5CF, 'M', 'v'),
-    (0x1D5D0, 'M', 'w'),
-    (0x1D5D1, 'M', 'x'),
-    (0x1D5D2, 'M', 'y'),
-    (0x1D5D3, 'M', 'z'),
-    (0x1D5D4, 'M', 'a'),
-    (0x1D5D5, 'M', 'b'),
-    (0x1D5D6, 'M', 'c'),
-    (0x1D5D7, 'M', 'd'),
-    (0x1D5D8, 'M', 'e'),
-    (0x1D5D9, 'M', 'f'),
-    (0x1D5DA, 'M', 'g'),
-    (0x1D5DB, 'M', 'h'),
-    (0x1D5DC, 'M', 'i'),
-    (0x1D5DD, 'M', 'j'),
-    (0x1D5DE, 'M', 'k'),
-    (0x1D5DF, 'M', 'l'),
-    (0x1D5E0, 'M', 'm'),
-    (0x1D5E1, 'M', 'n'),
-    (0x1D5E2, 'M', 'o'),
-    (0x1D5E3, 'M', 'p'),
-    (0x1D5E4, 'M', 'q'),
-    (0x1D5E5, 'M', 'r'),
-    (0x1D5E6, 'M', 's'),
-    (0x1D5E7, 'M', 't'),
-    (0x1D5E8, 'M', 'u'),
-    (0x1D5E9, 'M', 'v'),
-    (0x1D5EA, 'M', 'w'),
-    (0x1D5EB, 'M', 'x'),
-    (0x1D5EC, 'M', 'y'),
-    (0x1D5ED, 'M', 'z'),
-    (0x1D5EE, 'M', 'a'),
-    (0x1D5EF, 'M', 'b'),
-    (0x1D5F0, 'M', 'c'),
-    (0x1D5F1, 'M', 'd'),
-    (0x1D5F2, 'M', 'e'),
-    (0x1D5F3, 'M', 'f'),
-    (0x1D5F4, 'M', 'g'),
-    (0x1D5F5, 'M', 'h'),
-    (0x1D5F6, 'M', 'i'),
-    (0x1D5F7, 'M', 'j'),
-    (0x1D5F8, 'M', 'k'),
-    (0x1D5F9, 'M', 'l'),
-    (0x1D5FA, 'M', 'm'),
-    (0x1D5FB, 'M', 'n'),
-    (0x1D5FC, 'M', 'o'),
-    (0x1D5FD, 'M', 'p'),
-    (0x1D5FE, 'M', 'q'),
-    (0x1D5FF, 'M', 'r'),
-    (0x1D600, 'M', 's'),
-    (0x1D601, 'M', 't'),
-    (0x1D602, 'M', 'u'),
-    (0x1D603, 'M', 'v'),
-    (0x1D604, 'M', 'w'),
-    (0x1D605, 'M', 'x'),
-    (0x1D606, 'M', 'y'),
-    (0x1D607, 'M', 'z'),
-    (0x1D608, 'M', 'a'),
-    (0x1D609, 'M', 'b'),
-    (0x1D60A, 'M', 'c'),
-    (0x1D60B, 'M', 'd'),
-    (0x1D60C, 'M', 'e'),
-    (0x1D60D, 'M', 'f'),
-    (0x1D60E, 'M', 'g'),
-    (0x1D60F, 'M', 'h'),
-    (0x1D610, 'M', 'i'),
-    (0x1D611, 'M', 'j'),
-    (0x1D612, 'M', 'k'),
-    (0x1D613, 'M', 'l'),
-    (0x1D614, 'M', 'm'),
-    (0x1D615, 'M', 'n'),
-    (0x1D616, 'M', 'o'),
-    (0x1D617, 'M', 'p'),
-    (0x1D618, 'M', 'q'),
-    (0x1D619, 'M', 'r'),
-    (0x1D61A, 'M', 's'),
-    (0x1D61B, 'M', 't'),
-    (0x1D61C, 'M', 'u'),
-    (0x1D61D, 'M', 'v'),
-    (0x1D61E, 'M', 'w'),
+        (0x1D5BB, "M", "b"),
+        (0x1D5BC, "M", "c"),
+        (0x1D5BD, "M", "d"),
+        (0x1D5BE, "M", "e"),
+        (0x1D5BF, "M", "f"),
+        (0x1D5C0, "M", "g"),
+        (0x1D5C1, "M", "h"),
+        (0x1D5C2, "M", "i"),
+        (0x1D5C3, "M", "j"),
+        (0x1D5C4, "M", "k"),
+        (0x1D5C5, "M", "l"),
+        (0x1D5C6, "M", "m"),
+        (0x1D5C7, "M", "n"),
+        (0x1D5C8, "M", "o"),
+        (0x1D5C9, "M", "p"),
+        (0x1D5CA, "M", "q"),
+        (0x1D5CB, "M", "r"),
+        (0x1D5CC, "M", "s"),
+        (0x1D5CD, "M", "t"),
+        (0x1D5CE, "M", "u"),
+        (0x1D5CF, "M", "v"),
+        (0x1D5D0, "M", "w"),
+        (0x1D5D1, "M", "x"),
+        (0x1D5D2, "M", "y"),
+        (0x1D5D3, "M", "z"),
+        (0x1D5D4, "M", "a"),
+        (0x1D5D5, "M", "b"),
+        (0x1D5D6, "M", "c"),
+        (0x1D5D7, "M", "d"),
+        (0x1D5D8, "M", "e"),
+        (0x1D5D9, "M", "f"),
+        (0x1D5DA, "M", "g"),
+        (0x1D5DB, "M", "h"),
+        (0x1D5DC, "M", "i"),
+        (0x1D5DD, "M", "j"),
+        (0x1D5DE, "M", "k"),
+        (0x1D5DF, "M", "l"),
+        (0x1D5E0, "M", "m"),
+        (0x1D5E1, "M", "n"),
+        (0x1D5E2, "M", "o"),
+        (0x1D5E3, "M", "p"),
+        (0x1D5E4, "M", "q"),
+        (0x1D5E5, "M", "r"),
+        (0x1D5E6, "M", "s"),
+        (0x1D5E7, "M", "t"),
+        (0x1D5E8, "M", "u"),
+        (0x1D5E9, "M", "v"),
+        (0x1D5EA, "M", "w"),
+        (0x1D5EB, "M", "x"),
+        (0x1D5EC, "M", "y"),
+        (0x1D5ED, "M", "z"),
+        (0x1D5EE, "M", "a"),
+        (0x1D5EF, "M", "b"),
+        (0x1D5F0, "M", "c"),
+        (0x1D5F1, "M", "d"),
+        (0x1D5F2, "M", "e"),
+        (0x1D5F3, "M", "f"),
+        (0x1D5F4, "M", "g"),
+        (0x1D5F5, "M", "h"),
+        (0x1D5F6, "M", "i"),
+        (0x1D5F7, "M", "j"),
+        (0x1D5F8, "M", "k"),
+        (0x1D5F9, "M", "l"),
+        (0x1D5FA, "M", "m"),
+        (0x1D5FB, "M", "n"),
+        (0x1D5FC, "M", "o"),
+        (0x1D5FD, "M", "p"),
+        (0x1D5FE, "M", "q"),
+        (0x1D5FF, "M", "r"),
+        (0x1D600, "M", "s"),
+        (0x1D601, "M", "t"),
+        (0x1D602, "M", "u"),
+        (0x1D603, "M", "v"),
+        (0x1D604, "M", "w"),
+        (0x1D605, "M", "x"),
+        (0x1D606, "M", "y"),
+        (0x1D607, "M", "z"),
+        (0x1D608, "M", "a"),
+        (0x1D609, "M", "b"),
+        (0x1D60A, "M", "c"),
+        (0x1D60B, "M", "d"),
+        (0x1D60C, "M", "e"),
+        (0x1D60D, "M", "f"),
+        (0x1D60E, "M", "g"),
+        (0x1D60F, "M", "h"),
+        (0x1D610, "M", "i"),
+        (0x1D611, "M", "j"),
+        (0x1D612, "M", "k"),
+        (0x1D613, "M", "l"),
+        (0x1D614, "M", "m"),
+        (0x1D615, "M", "n"),
+        (0x1D616, "M", "o"),
+        (0x1D617, "M", "p"),
+        (0x1D618, "M", "q"),
+        (0x1D619, "M", "r"),
+        (0x1D61A, "M", "s"),
+        (0x1D61B, "M", "t"),
+        (0x1D61C, "M", "u"),
+        (0x1D61D, "M", "v"),
+        (0x1D61E, "M", "w"),
     ]
 
+
 def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D61F, 'M', 'x'),
-    (0x1D620, 'M', 'y'),
-    (0x1D621, 'M', 'z'),
-    (0x1D622, 'M', 'a'),
-    (0x1D623, 'M', 'b'),
-    (0x1D624, 'M', 'c'),
-    (0x1D625, 'M', 'd'),
-    (0x1D626, 'M', 'e'),
-    (0x1D627, 'M', 'f'),
-    (0x1D628, 'M', 'g'),
-    (0x1D629, 'M', 'h'),
-    (0x1D62A, 'M', 'i'),
-    (0x1D62B, 'M', 'j'),
-    (0x1D62C, 'M', 'k'),
-    (0x1D62D, 'M', 'l'),
-    (0x1D62E, 'M', 'm'),
-    (0x1D62F, 'M', 'n'),
-    (0x1D630, 'M', 'o'),
-    (0x1D631, 'M', 'p'),
-    (0x1D632, 'M', 'q'),
-    (0x1D633, 'M', 'r'),
-    (0x1D634, 'M', 's'),
-    (0x1D635, 'M', 't'),
-    (0x1D636, 'M', 'u'),
-    (0x1D637, 'M', 'v'),
-    (0x1D638, 'M', 'w'),
-    (0x1D639, 'M', 'x'),
-    (0x1D63A, 'M', 'y'),
-    (0x1D63B, 'M', 'z'),
-    (0x1D63C, 'M', 'a'),
-    (0x1D63D, 'M', 'b'),
-    (0x1D63E, 'M', 'c'),
-    (0x1D63F, 'M', 'd'),
-    (0x1D640, 'M', 'e'),
-    (0x1D641, 'M', 'f'),
-    (0x1D642, 'M', 'g'),
-    (0x1D643, 'M', 'h'),
-    (0x1D644, 'M', 'i'),
-    (0x1D645, 'M', 'j'),
-    (0x1D646, 'M', 'k'),
-    (0x1D647, 'M', 'l'),
-    (0x1D648, 'M', 'm'),
-    (0x1D649, 'M', 'n'),
-    (0x1D64A, 'M', 'o'),
-    (0x1D64B, 'M', 'p'),
-    (0x1D64C, 'M', 'q'),
-    (0x1D64D, 'M', 'r'),
-    (0x1D64E, 'M', 's'),
-    (0x1D64F, 'M', 't'),
-    (0x1D650, 'M', 'u'),
-    (0x1D651, 'M', 'v'),
-    (0x1D652, 'M', 'w'),
-    (0x1D653, 'M', 'x'),
-    (0x1D654, 'M', 'y'),
-    (0x1D655, 'M', 'z'),
-    (0x1D656, 'M', 'a'),
-    (0x1D657, 'M', 'b'),
-    (0x1D658, 'M', 'c'),
-    (0x1D659, 'M', 'd'),
-    (0x1D65A, 'M', 'e'),
-    (0x1D65B, 'M', 'f'),
-    (0x1D65C, 'M', 'g'),
-    (0x1D65D, 'M', 'h'),
-    (0x1D65E, 'M', 'i'),
-    (0x1D65F, 'M', 'j'),
-    (0x1D660, 'M', 'k'),
-    (0x1D661, 'M', 'l'),
-    (0x1D662, 'M', 'm'),
-    (0x1D663, 'M', 'n'),
-    (0x1D664, 'M', 'o'),
-    (0x1D665, 'M', 'p'),
-    (0x1D666, 'M', 'q'),
-    (0x1D667, 'M', 'r'),
-    (0x1D668, 'M', 's'),
-    (0x1D669, 'M', 't'),
-    (0x1D66A, 'M', 'u'),
-    (0x1D66B, 'M', 'v'),
-    (0x1D66C, 'M', 'w'),
-    (0x1D66D, 'M', 'x'),
-    (0x1D66E, 'M', 'y'),
-    (0x1D66F, 'M', 'z'),
-    (0x1D670, 'M', 'a'),
-    (0x1D671, 'M', 'b'),
-    (0x1D672, 'M', 'c'),
-    (0x1D673, 'M', 'd'),
-    (0x1D674, 'M', 'e'),
-    (0x1D675, 'M', 'f'),
-    (0x1D676, 'M', 'g'),
-    (0x1D677, 'M', 'h'),
-    (0x1D678, 'M', 'i'),
-    (0x1D679, 'M', 'j'),
-    (0x1D67A, 'M', 'k'),
-    (0x1D67B, 'M', 'l'),
-    (0x1D67C, 'M', 'm'),
-    (0x1D67D, 'M', 'n'),
-    (0x1D67E, 'M', 'o'),
-    (0x1D67F, 'M', 'p'),
-    (0x1D680, 'M', 'q'),
-    (0x1D681, 'M', 'r'),
-    (0x1D682, 'M', 's'),
+        (0x1D61F, "M", "x"),
+        (0x1D620, "M", "y"),
+        (0x1D621, "M", "z"),
+        (0x1D622, "M", "a"),
+        (0x1D623, "M", "b"),
+        (0x1D624, "M", "c"),
+        (0x1D625, "M", "d"),
+        (0x1D626, "M", "e"),
+        (0x1D627, "M", "f"),
+        (0x1D628, "M", "g"),
+        (0x1D629, "M", "h"),
+        (0x1D62A, "M", "i"),
+        (0x1D62B, "M", "j"),
+        (0x1D62C, "M", "k"),
+        (0x1D62D, "M", "l"),
+        (0x1D62E, "M", "m"),
+        (0x1D62F, "M", "n"),
+        (0x1D630, "M", "o"),
+        (0x1D631, "M", "p"),
+        (0x1D632, "M", "q"),
+        (0x1D633, "M", "r"),
+        (0x1D634, "M", "s"),
+        (0x1D635, "M", "t"),
+        (0x1D636, "M", "u"),
+        (0x1D637, "M", "v"),
+        (0x1D638, "M", "w"),
+        (0x1D639, "M", "x"),
+        (0x1D63A, "M", "y"),
+        (0x1D63B, "M", "z"),
+        (0x1D63C, "M", "a"),
+        (0x1D63D, "M", "b"),
+        (0x1D63E, "M", "c"),
+        (0x1D63F, "M", "d"),
+        (0x1D640, "M", "e"),
+        (0x1D641, "M", "f"),
+        (0x1D642, "M", "g"),
+        (0x1D643, "M", "h"),
+        (0x1D644, "M", "i"),
+        (0x1D645, "M", "j"),
+        (0x1D646, "M", "k"),
+        (0x1D647, "M", "l"),
+        (0x1D648, "M", "m"),
+        (0x1D649, "M", "n"),
+        (0x1D64A, "M", "o"),
+        (0x1D64B, "M", "p"),
+        (0x1D64C, "M", "q"),
+        (0x1D64D, "M", "r"),
+        (0x1D64E, "M", "s"),
+        (0x1D64F, "M", "t"),
+        (0x1D650, "M", "u"),
+        (0x1D651, "M", "v"),
+        (0x1D652, "M", "w"),
+        (0x1D653, "M", "x"),
+        (0x1D654, "M", "y"),
+        (0x1D655, "M", "z"),
+        (0x1D656, "M", "a"),
+        (0x1D657, "M", "b"),
+        (0x1D658, "M", "c"),
+        (0x1D659, "M", "d"),
+        (0x1D65A, "M", "e"),
+        (0x1D65B, "M", "f"),
+        (0x1D65C, "M", "g"),
+        (0x1D65D, "M", "h"),
+        (0x1D65E, "M", "i"),
+        (0x1D65F, "M", "j"),
+        (0x1D660, "M", "k"),
+        (0x1D661, "M", "l"),
+        (0x1D662, "M", "m"),
+        (0x1D663, "M", "n"),
+        (0x1D664, "M", "o"),
+        (0x1D665, "M", "p"),
+        (0x1D666, "M", "q"),
+        (0x1D667, "M", "r"),
+        (0x1D668, "M", "s"),
+        (0x1D669, "M", "t"),
+        (0x1D66A, "M", "u"),
+        (0x1D66B, "M", "v"),
+        (0x1D66C, "M", "w"),
+        (0x1D66D, "M", "x"),
+        (0x1D66E, "M", "y"),
+        (0x1D66F, "M", "z"),
+        (0x1D670, "M", "a"),
+        (0x1D671, "M", "b"),
+        (0x1D672, "M", "c"),
+        (0x1D673, "M", "d"),
+        (0x1D674, "M", "e"),
+        (0x1D675, "M", "f"),
+        (0x1D676, "M", "g"),
+        (0x1D677, "M", "h"),
+        (0x1D678, "M", "i"),
+        (0x1D679, "M", "j"),
+        (0x1D67A, "M", "k"),
+        (0x1D67B, "M", "l"),
+        (0x1D67C, "M", "m"),
+        (0x1D67D, "M", "n"),
+        (0x1D67E, "M", "o"),
+        (0x1D67F, "M", "p"),
+        (0x1D680, "M", "q"),
+        (0x1D681, "M", "r"),
+        (0x1D682, "M", "s"),
     ]
 
+
 def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D683, 'M', 't'),
-    (0x1D684, 'M', 'u'),
-    (0x1D685, 'M', 'v'),
-    (0x1D686, 'M', 'w'),
-    (0x1D687, 'M', 'x'),
-    (0x1D688, 'M', 'y'),
-    (0x1D689, 'M', 'z'),
-    (0x1D68A, 'M', 'a'),
-    (0x1D68B, 'M', 'b'),
-    (0x1D68C, 'M', 'c'),
-    (0x1D68D, 'M', 'd'),
-    (0x1D68E, 'M', 'e'),
-    (0x1D68F, 'M', 'f'),
-    (0x1D690, 'M', 'g'),
-    (0x1D691, 'M', 'h'),
-    (0x1D692, 'M', 'i'),
-    (0x1D693, 'M', 'j'),
-    (0x1D694, 'M', 'k'),
-    (0x1D695, 'M', 'l'),
-    (0x1D696, 'M', 'm'),
-    (0x1D697, 'M', 'n'),
-    (0x1D698, 'M', 'o'),
-    (0x1D699, 'M', 'p'),
-    (0x1D69A, 'M', 'q'),
-    (0x1D69B, 'M', 'r'),
-    (0x1D69C, 'M', 's'),
-    (0x1D69D, 'M', 't'),
-    (0x1D69E, 'M', 'u'),
-    (0x1D69F, 'M', 'v'),
-    (0x1D6A0, 'M', 'w'),
-    (0x1D6A1, 'M', 'x'),
-    (0x1D6A2, 'M', 'y'),
-    (0x1D6A3, 'M', 'z'),
-    (0x1D6A4, 'M', 'ı'),
-    (0x1D6A5, 'M', 'ȷ'),
-    (0x1D6A6, 'X'),
-    (0x1D6A8, 'M', 'α'),
-    (0x1D6A9, 'M', 'β'),
-    (0x1D6AA, 'M', 'γ'),
-    (0x1D6AB, 'M', 'δ'),
-    (0x1D6AC, 'M', 'ε'),
-    (0x1D6AD, 'M', 'ζ'),
-    (0x1D6AE, 'M', 'η'),
-    (0x1D6AF, 'M', 'θ'),
-    (0x1D6B0, 'M', 'ι'),
-    (0x1D6B1, 'M', 'κ'),
-    (0x1D6B2, 'M', 'λ'),
-    (0x1D6B3, 'M', 'μ'),
-    (0x1D6B4, 'M', 'ν'),
-    (0x1D6B5, 'M', 'ξ'),
-    (0x1D6B6, 'M', 'ο'),
-    (0x1D6B7, 'M', 'π'),
-    (0x1D6B8, 'M', 'ρ'),
-    (0x1D6B9, 'M', 'θ'),
-    (0x1D6BA, 'M', 'σ'),
-    (0x1D6BB, 'M', 'τ'),
-    (0x1D6BC, 'M', 'υ'),
-    (0x1D6BD, 'M', 'φ'),
-    (0x1D6BE, 'M', 'χ'),
-    (0x1D6BF, 'M', 'ψ'),
-    (0x1D6C0, 'M', 'ω'),
-    (0x1D6C1, 'M', '∇'),
-    (0x1D6C2, 'M', 'α'),
-    (0x1D6C3, 'M', 'β'),
-    (0x1D6C4, 'M', 'γ'),
-    (0x1D6C5, 'M', 'δ'),
-    (0x1D6C6, 'M', 'ε'),
-    (0x1D6C7, 'M', 'ζ'),
-    (0x1D6C8, 'M', 'η'),
-    (0x1D6C9, 'M', 'θ'),
-    (0x1D6CA, 'M', 'ι'),
-    (0x1D6CB, 'M', 'κ'),
-    (0x1D6CC, 'M', 'λ'),
-    (0x1D6CD, 'M', 'μ'),
-    (0x1D6CE, 'M', 'ν'),
-    (0x1D6CF, 'M', 'ξ'),
-    (0x1D6D0, 'M', 'ο'),
-    (0x1D6D1, 'M', 'π'),
-    (0x1D6D2, 'M', 'ρ'),
-    (0x1D6D3, 'M', 'σ'),
-    (0x1D6D5, 'M', 'τ'),
-    (0x1D6D6, 'M', 'υ'),
-    (0x1D6D7, 'M', 'φ'),
-    (0x1D6D8, 'M', 'χ'),
-    (0x1D6D9, 'M', 'ψ'),
-    (0x1D6DA, 'M', 'ω'),
-    (0x1D6DB, 'M', '∂'),
-    (0x1D6DC, 'M', 'ε'),
-    (0x1D6DD, 'M', 'θ'),
-    (0x1D6DE, 'M', 'κ'),
-    (0x1D6DF, 'M', 'φ'),
-    (0x1D6E0, 'M', 'ρ'),
-    (0x1D6E1, 'M', 'π'),
-    (0x1D6E2, 'M', 'α'),
-    (0x1D6E3, 'M', 'β'),
-    (0x1D6E4, 'M', 'γ'),
-    (0x1D6E5, 'M', 'δ'),
-    (0x1D6E6, 'M', 'ε'),
-    (0x1D6E7, 'M', 'ζ'),
-    (0x1D6E8, 'M', 'η'),
+        (0x1D683, "M", "t"),
+        (0x1D684, "M", "u"),
+        (0x1D685, "M", "v"),
+        (0x1D686, "M", "w"),
+        (0x1D687, "M", "x"),
+        (0x1D688, "M", "y"),
+        (0x1D689, "M", "z"),
+        (0x1D68A, "M", "a"),
+        (0x1D68B, "M", "b"),
+        (0x1D68C, "M", "c"),
+        (0x1D68D, "M", "d"),
+        (0x1D68E, "M", "e"),
+        (0x1D68F, "M", "f"),
+        (0x1D690, "M", "g"),
+        (0x1D691, "M", "h"),
+        (0x1D692, "M", "i"),
+        (0x1D693, "M", "j"),
+        (0x1D694, "M", "k"),
+        (0x1D695, "M", "l"),
+        (0x1D696, "M", "m"),
+        (0x1D697, "M", "n"),
+        (0x1D698, "M", "o"),
+        (0x1D699, "M", "p"),
+        (0x1D69A, "M", "q"),
+        (0x1D69B, "M", "r"),
+        (0x1D69C, "M", "s"),
+        (0x1D69D, "M", "t"),
+        (0x1D69E, "M", "u"),
+        (0x1D69F, "M", "v"),
+        (0x1D6A0, "M", "w"),
+        (0x1D6A1, "M", "x"),
+        (0x1D6A2, "M", "y"),
+        (0x1D6A3, "M", "z"),
+        (0x1D6A4, "M", "ı"),
+        (0x1D6A5, "M", "ȷ"),
+        (0x1D6A6, "X"),
+        (0x1D6A8, "M", "α"),
+        (0x1D6A9, "M", "β"),
+        (0x1D6AA, "M", "γ"),
+        (0x1D6AB, "M", "δ"),
+        (0x1D6AC, "M", "ε"),
+        (0x1D6AD, "M", "ζ"),
+        (0x1D6AE, "M", "η"),
+        (0x1D6AF, "M", "θ"),
+        (0x1D6B0, "M", "ι"),
+        (0x1D6B1, "M", "κ"),
+        (0x1D6B2, "M", "λ"),
+        (0x1D6B3, "M", "μ"),
+        (0x1D6B4, "M", "ν"),
+        (0x1D6B5, "M", "ξ"),
+        (0x1D6B6, "M", "ο"),
+        (0x1D6B7, "M", "π"),
+        (0x1D6B8, "M", "ρ"),
+        (0x1D6B9, "M", "θ"),
+        (0x1D6BA, "M", "σ"),
+        (0x1D6BB, "M", "τ"),
+        (0x1D6BC, "M", "υ"),
+        (0x1D6BD, "M", "φ"),
+        (0x1D6BE, "M", "χ"),
+        (0x1D6BF, "M", "ψ"),
+        (0x1D6C0, "M", "ω"),
+        (0x1D6C1, "M", "∇"),
+        (0x1D6C2, "M", "α"),
+        (0x1D6C3, "M", "β"),
+        (0x1D6C4, "M", "γ"),
+        (0x1D6C5, "M", "δ"),
+        (0x1D6C6, "M", "ε"),
+        (0x1D6C7, "M", "ζ"),
+        (0x1D6C8, "M", "η"),
+        (0x1D6C9, "M", "θ"),
+        (0x1D6CA, "M", "ι"),
+        (0x1D6CB, "M", "κ"),
+        (0x1D6CC, "M", "λ"),
+        (0x1D6CD, "M", "μ"),
+        (0x1D6CE, "M", "ν"),
+        (0x1D6CF, "M", "ξ"),
+        (0x1D6D0, "M", "ο"),
+        (0x1D6D1, "M", "π"),
+        (0x1D6D2, "M", "ρ"),
+        (0x1D6D3, "M", "σ"),
+        (0x1D6D5, "M", "τ"),
+        (0x1D6D6, "M", "υ"),
+        (0x1D6D7, "M", "φ"),
+        (0x1D6D8, "M", "χ"),
+        (0x1D6D9, "M", "ψ"),
+        (0x1D6DA, "M", "ω"),
+        (0x1D6DB, "M", "∂"),
+        (0x1D6DC, "M", "ε"),
+        (0x1D6DD, "M", "θ"),
+        (0x1D6DE, "M", "κ"),
+        (0x1D6DF, "M", "φ"),
+        (0x1D6E0, "M", "ρ"),
+        (0x1D6E1, "M", "π"),
+        (0x1D6E2, "M", "α"),
+        (0x1D6E3, "M", "β"),
+        (0x1D6E4, "M", "γ"),
+        (0x1D6E5, "M", "δ"),
+        (0x1D6E6, "M", "ε"),
+        (0x1D6E7, "M", "ζ"),
+        (0x1D6E8, "M", "η"),
     ]
 
+
 def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D6E9, 'M', 'θ'),
-    (0x1D6EA, 'M', 'ι'),
-    (0x1D6EB, 'M', 'κ'),
-    (0x1D6EC, 'M', 'λ'),
-    (0x1D6ED, 'M', 'μ'),
-    (0x1D6EE, 'M', 'ν'),
-    (0x1D6EF, 'M', 'ξ'),
-    (0x1D6F0, 'M', 'ο'),
-    (0x1D6F1, 'M', 'π'),
-    (0x1D6F2, 'M', 'ρ'),
-    (0x1D6F3, 'M', 'θ'),
-    (0x1D6F4, 'M', 'σ'),
-    (0x1D6F5, 'M', 'τ'),
-    (0x1D6F6, 'M', 'υ'),
-    (0x1D6F7, 'M', 'φ'),
-    (0x1D6F8, 'M', 'χ'),
-    (0x1D6F9, 'M', 'ψ'),
-    (0x1D6FA, 'M', 'ω'),
-    (0x1D6FB, 'M', '∇'),
-    (0x1D6FC, 'M', 'α'),
-    (0x1D6FD, 'M', 'β'),
-    (0x1D6FE, 'M', 'γ'),
-    (0x1D6FF, 'M', 'δ'),
-    (0x1D700, 'M', 'ε'),
-    (0x1D701, 'M', 'ζ'),
-    (0x1D702, 'M', 'η'),
-    (0x1D703, 'M', 'θ'),
-    (0x1D704, 'M', 'ι'),
-    (0x1D705, 'M', 'κ'),
-    (0x1D706, 'M', 'λ'),
-    (0x1D707, 'M', 'μ'),
-    (0x1D708, 'M', 'ν'),
-    (0x1D709, 'M', 'ξ'),
-    (0x1D70A, 'M', 'ο'),
-    (0x1D70B, 'M', 'π'),
-    (0x1D70C, 'M', 'ρ'),
-    (0x1D70D, 'M', 'σ'),
-    (0x1D70F, 'M', 'τ'),
-    (0x1D710, 'M', 'υ'),
-    (0x1D711, 'M', 'φ'),
-    (0x1D712, 'M', 'χ'),
-    (0x1D713, 'M', 'ψ'),
-    (0x1D714, 'M', 'ω'),
-    (0x1D715, 'M', '∂'),
-    (0x1D716, 'M', 'ε'),
-    (0x1D717, 'M', 'θ'),
-    (0x1D718, 'M', 'κ'),
-    (0x1D719, 'M', 'φ'),
-    (0x1D71A, 'M', 'ρ'),
-    (0x1D71B, 'M', 'π'),
-    (0x1D71C, 'M', 'α'),
-    (0x1D71D, 'M', 'β'),
-    (0x1D71E, 'M', 'γ'),
-    (0x1D71F, 'M', 'δ'),
-    (0x1D720, 'M', 'ε'),
-    (0x1D721, 'M', 'ζ'),
-    (0x1D722, 'M', 'η'),
-    (0x1D723, 'M', 'θ'),
-    (0x1D724, 'M', 'ι'),
-    (0x1D725, 'M', 'κ'),
-    (0x1D726, 'M', 'λ'),
-    (0x1D727, 'M', 'μ'),
-    (0x1D728, 'M', 'ν'),
-    (0x1D729, 'M', 'ξ'),
-    (0x1D72A, 'M', 'ο'),
-    (0x1D72B, 'M', 'π'),
-    (0x1D72C, 'M', 'ρ'),
-    (0x1D72D, 'M', 'θ'),
-    (0x1D72E, 'M', 'σ'),
-    (0x1D72F, 'M', 'τ'),
-    (0x1D730, 'M', 'υ'),
-    (0x1D731, 'M', 'φ'),
-    (0x1D732, 'M', 'χ'),
-    (0x1D733, 'M', 'ψ'),
-    (0x1D734, 'M', 'ω'),
-    (0x1D735, 'M', '∇'),
-    (0x1D736, 'M', 'α'),
-    (0x1D737, 'M', 'β'),
-    (0x1D738, 'M', 'γ'),
-    (0x1D739, 'M', 'δ'),
-    (0x1D73A, 'M', 'ε'),
-    (0x1D73B, 'M', 'ζ'),
-    (0x1D73C, 'M', 'η'),
-    (0x1D73D, 'M', 'θ'),
-    (0x1D73E, 'M', 'ι'),
-    (0x1D73F, 'M', 'κ'),
-    (0x1D740, 'M', 'λ'),
-    (0x1D741, 'M', 'μ'),
-    (0x1D742, 'M', 'ν'),
-    (0x1D743, 'M', 'ξ'),
-    (0x1D744, 'M', 'ο'),
-    (0x1D745, 'M', 'π'),
-    (0x1D746, 'M', 'ρ'),
-    (0x1D747, 'M', 'σ'),
-    (0x1D749, 'M', 'τ'),
-    (0x1D74A, 'M', 'υ'),
-    (0x1D74B, 'M', 'φ'),
-    (0x1D74C, 'M', 'χ'),
-    (0x1D74D, 'M', 'ψ'),
-    (0x1D74E, 'M', 'ω'),
+        (0x1D6E9, "M", "θ"),
+        (0x1D6EA, "M", "ι"),
+        (0x1D6EB, "M", "κ"),
+        (0x1D6EC, "M", "λ"),
+        (0x1D6ED, "M", "μ"),
+        (0x1D6EE, "M", "ν"),
+        (0x1D6EF, "M", "ξ"),
+        (0x1D6F0, "M", "ο"),
+        (0x1D6F1, "M", "π"),
+        (0x1D6F2, "M", "ρ"),
+        (0x1D6F3, "M", "θ"),
+        (0x1D6F4, "M", "σ"),
+        (0x1D6F5, "M", "τ"),
+        (0x1D6F6, "M", "υ"),
+        (0x1D6F7, "M", "φ"),
+        (0x1D6F8, "M", "χ"),
+        (0x1D6F9, "M", "ψ"),
+        (0x1D6FA, "M", "ω"),
+        (0x1D6FB, "M", "∇"),
+        (0x1D6FC, "M", "α"),
+        (0x1D6FD, "M", "β"),
+        (0x1D6FE, "M", "γ"),
+        (0x1D6FF, "M", "δ"),
+        (0x1D700, "M", "ε"),
+        (0x1D701, "M", "ζ"),
+        (0x1D702, "M", "η"),
+        (0x1D703, "M", "θ"),
+        (0x1D704, "M", "ι"),
+        (0x1D705, "M", "κ"),
+        (0x1D706, "M", "λ"),
+        (0x1D707, "M", "μ"),
+        (0x1D708, "M", "ν"),
+        (0x1D709, "M", "ξ"),
+        (0x1D70A, "M", "ο"),
+        (0x1D70B, "M", "π"),
+        (0x1D70C, "M", "ρ"),
+        (0x1D70D, "M", "σ"),
+        (0x1D70F, "M", "τ"),
+        (0x1D710, "M", "υ"),
+        (0x1D711, "M", "φ"),
+        (0x1D712, "M", "χ"),
+        (0x1D713, "M", "ψ"),
+        (0x1D714, "M", "ω"),
+        (0x1D715, "M", "∂"),
+        (0x1D716, "M", "ε"),
+        (0x1D717, "M", "θ"),
+        (0x1D718, "M", "κ"),
+        (0x1D719, "M", "φ"),
+        (0x1D71A, "M", "ρ"),
+        (0x1D71B, "M", "π"),
+        (0x1D71C, "M", "α"),
+        (0x1D71D, "M", "β"),
+        (0x1D71E, "M", "γ"),
+        (0x1D71F, "M", "δ"),
+        (0x1D720, "M", "ε"),
+        (0x1D721, "M", "ζ"),
+        (0x1D722, "M", "η"),
+        (0x1D723, "M", "θ"),
+        (0x1D724, "M", "ι"),
+        (0x1D725, "M", "κ"),
+        (0x1D726, "M", "λ"),
+        (0x1D727, "M", "μ"),
+        (0x1D728, "M", "ν"),
+        (0x1D729, "M", "ξ"),
+        (0x1D72A, "M", "ο"),
+        (0x1D72B, "M", "π"),
+        (0x1D72C, "M", "ρ"),
+        (0x1D72D, "M", "θ"),
+        (0x1D72E, "M", "σ"),
+        (0x1D72F, "M", "τ"),
+        (0x1D730, "M", "υ"),
+        (0x1D731, "M", "φ"),
+        (0x1D732, "M", "χ"),
+        (0x1D733, "M", "ψ"),
+        (0x1D734, "M", "ω"),
+        (0x1D735, "M", "∇"),
+        (0x1D736, "M", "α"),
+        (0x1D737, "M", "β"),
+        (0x1D738, "M", "γ"),
+        (0x1D739, "M", "δ"),
+        (0x1D73A, "M", "ε"),
+        (0x1D73B, "M", "ζ"),
+        (0x1D73C, "M", "η"),
+        (0x1D73D, "M", "θ"),
+        (0x1D73E, "M", "ι"),
+        (0x1D73F, "M", "κ"),
+        (0x1D740, "M", "λ"),
+        (0x1D741, "M", "μ"),
+        (0x1D742, "M", "ν"),
+        (0x1D743, "M", "ξ"),
+        (0x1D744, "M", "ο"),
+        (0x1D745, "M", "π"),
+        (0x1D746, "M", "ρ"),
+        (0x1D747, "M", "σ"),
+        (0x1D749, "M", "τ"),
+        (0x1D74A, "M", "υ"),
+        (0x1D74B, "M", "φ"),
+        (0x1D74C, "M", "χ"),
+        (0x1D74D, "M", "ψ"),
+        (0x1D74E, "M", "ω"),
     ]
 
+
 def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D74F, 'M', '∂'),
-    (0x1D750, 'M', 'ε'),
-    (0x1D751, 'M', 'θ'),
-    (0x1D752, 'M', 'κ'),
-    (0x1D753, 'M', 'φ'),
-    (0x1D754, 'M', 'ρ'),
-    (0x1D755, 'M', 'π'),
-    (0x1D756, 'M', 'α'),
-    (0x1D757, 'M', 'β'),
-    (0x1D758, 'M', 'γ'),
-    (0x1D759, 'M', 'δ'),
-    (0x1D75A, 'M', 'ε'),
-    (0x1D75B, 'M', 'ζ'),
-    (0x1D75C, 'M', 'η'),
-    (0x1D75D, 'M', 'θ'),
-    (0x1D75E, 'M', 'ι'),
-    (0x1D75F, 'M', 'κ'),
-    (0x1D760, 'M', 'λ'),
-    (0x1D761, 'M', 'μ'),
-    (0x1D762, 'M', 'ν'),
-    (0x1D763, 'M', 'ξ'),
-    (0x1D764, 'M', 'ο'),
-    (0x1D765, 'M', 'π'),
-    (0x1D766, 'M', 'ρ'),
-    (0x1D767, 'M', 'θ'),
-    (0x1D768, 'M', 'σ'),
-    (0x1D769, 'M', 'τ'),
-    (0x1D76A, 'M', 'υ'),
-    (0x1D76B, 'M', 'φ'),
-    (0x1D76C, 'M', 'χ'),
-    (0x1D76D, 'M', 'ψ'),
-    (0x1D76E, 'M', 'ω'),
-    (0x1D76F, 'M', '∇'),
-    (0x1D770, 'M', 'α'),
-    (0x1D771, 'M', 'β'),
-    (0x1D772, 'M', 'γ'),
-    (0x1D773, 'M', 'δ'),
-    (0x1D774, 'M', 'ε'),
-    (0x1D775, 'M', 'ζ'),
-    (0x1D776, 'M', 'η'),
-    (0x1D777, 'M', 'θ'),
-    (0x1D778, 'M', 'ι'),
-    (0x1D779, 'M', 'κ'),
-    (0x1D77A, 'M', 'λ'),
-    (0x1D77B, 'M', 'μ'),
-    (0x1D77C, 'M', 'ν'),
-    (0x1D77D, 'M', 'ξ'),
-    (0x1D77E, 'M', 'ο'),
-    (0x1D77F, 'M', 'π'),
-    (0x1D780, 'M', 'ρ'),
-    (0x1D781, 'M', 'σ'),
-    (0x1D783, 'M', 'τ'),
-    (0x1D784, 'M', 'υ'),
-    (0x1D785, 'M', 'φ'),
-    (0x1D786, 'M', 'χ'),
-    (0x1D787, 'M', 'ψ'),
-    (0x1D788, 'M', 'ω'),
-    (0x1D789, 'M', '∂'),
-    (0x1D78A, 'M', 'ε'),
-    (0x1D78B, 'M', 'θ'),
-    (0x1D78C, 'M', 'κ'),
-    (0x1D78D, 'M', 'φ'),
-    (0x1D78E, 'M', 'ρ'),
-    (0x1D78F, 'M', 'π'),
-    (0x1D790, 'M', 'α'),
-    (0x1D791, 'M', 'β'),
-    (0x1D792, 'M', 'γ'),
-    (0x1D793, 'M', 'δ'),
-    (0x1D794, 'M', 'ε'),
-    (0x1D795, 'M', 'ζ'),
-    (0x1D796, 'M', 'η'),
-    (0x1D797, 'M', 'θ'),
-    (0x1D798, 'M', 'ι'),
-    (0x1D799, 'M', 'κ'),
-    (0x1D79A, 'M', 'λ'),
-    (0x1D79B, 'M', 'μ'),
-    (0x1D79C, 'M', 'ν'),
-    (0x1D79D, 'M', 'ξ'),
-    (0x1D79E, 'M', 'ο'),
-    (0x1D79F, 'M', 'π'),
-    (0x1D7A0, 'M', 'ρ'),
-    (0x1D7A1, 'M', 'θ'),
-    (0x1D7A2, 'M', 'σ'),
-    (0x1D7A3, 'M', 'τ'),
-    (0x1D7A4, 'M', 'υ'),
-    (0x1D7A5, 'M', 'φ'),
-    (0x1D7A6, 'M', 'χ'),
-    (0x1D7A7, 'M', 'ψ'),
-    (0x1D7A8, 'M', 'ω'),
-    (0x1D7A9, 'M', '∇'),
-    (0x1D7AA, 'M', 'α'),
-    (0x1D7AB, 'M', 'β'),
-    (0x1D7AC, 'M', 'γ'),
-    (0x1D7AD, 'M', 'δ'),
-    (0x1D7AE, 'M', 'ε'),
-    (0x1D7AF, 'M', 'ζ'),
-    (0x1D7B0, 'M', 'η'),
-    (0x1D7B1, 'M', 'θ'),
-    (0x1D7B2, 'M', 'ι'),
-    (0x1D7B3, 'M', 'κ'),
+        (0x1D74F, "M", "∂"),
+        (0x1D750, "M", "ε"),
+        (0x1D751, "M", "θ"),
+        (0x1D752, "M", "κ"),
+        (0x1D753, "M", "φ"),
+        (0x1D754, "M", "ρ"),
+        (0x1D755, "M", "π"),
+        (0x1D756, "M", "α"),
+        (0x1D757, "M", "β"),
+        (0x1D758, "M", "γ"),
+        (0x1D759, "M", "δ"),
+        (0x1D75A, "M", "ε"),
+        (0x1D75B, "M", "ζ"),
+        (0x1D75C, "M", "η"),
+        (0x1D75D, "M", "θ"),
+        (0x1D75E, "M", "ι"),
+        (0x1D75F, "M", "κ"),
+        (0x1D760, "M", "λ"),
+        (0x1D761, "M", "μ"),
+        (0x1D762, "M", "ν"),
+        (0x1D763, "M", "ξ"),
+        (0x1D764, "M", "ο"),
+        (0x1D765, "M", "π"),
+        (0x1D766, "M", "ρ"),
+        (0x1D767, "M", "θ"),
+        (0x1D768, "M", "σ"),
+        (0x1D769, "M", "τ"),
+        (0x1D76A, "M", "υ"),
+        (0x1D76B, "M", "φ"),
+        (0x1D76C, "M", "χ"),
+        (0x1D76D, "M", "ψ"),
+        (0x1D76E, "M", "ω"),
+        (0x1D76F, "M", "∇"),
+        (0x1D770, "M", "α"),
+        (0x1D771, "M", "β"),
+        (0x1D772, "M", "γ"),
+        (0x1D773, "M", "δ"),
+        (0x1D774, "M", "ε"),
+        (0x1D775, "M", "ζ"),
+        (0x1D776, "M", "η"),
+        (0x1D777, "M", "θ"),
+        (0x1D778, "M", "ι"),
+        (0x1D779, "M", "κ"),
+        (0x1D77A, "M", "λ"),
+        (0x1D77B, "M", "μ"),
+        (0x1D77C, "M", "ν"),
+        (0x1D77D, "M", "ξ"),
+        (0x1D77E, "M", "ο"),
+        (0x1D77F, "M", "π"),
+        (0x1D780, "M", "ρ"),
+        (0x1D781, "M", "σ"),
+        (0x1D783, "M", "τ"),
+        (0x1D784, "M", "υ"),
+        (0x1D785, "M", "φ"),
+        (0x1D786, "M", "χ"),
+        (0x1D787, "M", "ψ"),
+        (0x1D788, "M", "ω"),
+        (0x1D789, "M", "∂"),
+        (0x1D78A, "M", "ε"),
+        (0x1D78B, "M", "θ"),
+        (0x1D78C, "M", "κ"),
+        (0x1D78D, "M", "φ"),
+        (0x1D78E, "M", "ρ"),
+        (0x1D78F, "M", "π"),
+        (0x1D790, "M", "α"),
+        (0x1D791, "M", "β"),
+        (0x1D792, "M", "γ"),
+        (0x1D793, "M", "δ"),
+        (0x1D794, "M", "ε"),
+        (0x1D795, "M", "ζ"),
+        (0x1D796, "M", "η"),
+        (0x1D797, "M", "θ"),
+        (0x1D798, "M", "ι"),
+        (0x1D799, "M", "κ"),
+        (0x1D79A, "M", "λ"),
+        (0x1D79B, "M", "μ"),
+        (0x1D79C, "M", "ν"),
+        (0x1D79D, "M", "ξ"),
+        (0x1D79E, "M", "ο"),
+        (0x1D79F, "M", "π"),
+        (0x1D7A0, "M", "ρ"),
+        (0x1D7A1, "M", "θ"),
+        (0x1D7A2, "M", "σ"),
+        (0x1D7A3, "M", "τ"),
+        (0x1D7A4, "M", "υ"),
+        (0x1D7A5, "M", "φ"),
+        (0x1D7A6, "M", "χ"),
+        (0x1D7A7, "M", "ψ"),
+        (0x1D7A8, "M", "ω"),
+        (0x1D7A9, "M", "∇"),
+        (0x1D7AA, "M", "α"),
+        (0x1D7AB, "M", "β"),
+        (0x1D7AC, "M", "γ"),
+        (0x1D7AD, "M", "δ"),
+        (0x1D7AE, "M", "ε"),
+        (0x1D7AF, "M", "ζ"),
+        (0x1D7B0, "M", "η"),
+        (0x1D7B1, "M", "θ"),
+        (0x1D7B2, "M", "ι"),
+        (0x1D7B3, "M", "κ"),
     ]
 
+
 def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1D7B4, 'M', 'λ'),
-    (0x1D7B5, 'M', 'μ'),
-    (0x1D7B6, 'M', 'ν'),
-    (0x1D7B7, 'M', 'ξ'),
-    (0x1D7B8, 'M', 'ο'),
-    (0x1D7B9, 'M', 'π'),
-    (0x1D7BA, 'M', 'ρ'),
-    (0x1D7BB, 'M', 'σ'),
-    (0x1D7BD, 'M', 'τ'),
-    (0x1D7BE, 'M', 'υ'),
-    (0x1D7BF, 'M', 'φ'),
-    (0x1D7C0, 'M', 'χ'),
-    (0x1D7C1, 'M', 'ψ'),
-    (0x1D7C2, 'M', 'ω'),
-    (0x1D7C3, 'M', '∂'),
-    (0x1D7C4, 'M', 'ε'),
-    (0x1D7C5, 'M', 'θ'),
-    (0x1D7C6, 'M', 'κ'),
-    (0x1D7C7, 'M', 'φ'),
-    (0x1D7C8, 'M', 'ρ'),
-    (0x1D7C9, 'M', 'π'),
-    (0x1D7CA, 'M', 'ϝ'),
-    (0x1D7CC, 'X'),
-    (0x1D7CE, 'M', '0'),
-    (0x1D7CF, 'M', '1'),
-    (0x1D7D0, 'M', '2'),
-    (0x1D7D1, 'M', '3'),
-    (0x1D7D2, 'M', '4'),
-    (0x1D7D3, 'M', '5'),
-    (0x1D7D4, 'M', '6'),
-    (0x1D7D5, 'M', '7'),
-    (0x1D7D6, 'M', '8'),
-    (0x1D7D7, 'M', '9'),
-    (0x1D7D8, 'M', '0'),
-    (0x1D7D9, 'M', '1'),
-    (0x1D7DA, 'M', '2'),
-    (0x1D7DB, 'M', '3'),
-    (0x1D7DC, 'M', '4'),
-    (0x1D7DD, 'M', '5'),
-    (0x1D7DE, 'M', '6'),
-    (0x1D7DF, 'M', '7'),
-    (0x1D7E0, 'M', '8'),
-    (0x1D7E1, 'M', '9'),
-    (0x1D7E2, 'M', '0'),
-    (0x1D7E3, 'M', '1'),
-    (0x1D7E4, 'M', '2'),
-    (0x1D7E5, 'M', '3'),
-    (0x1D7E6, 'M', '4'),
-    (0x1D7E7, 'M', '5'),
-    (0x1D7E8, 'M', '6'),
-    (0x1D7E9, 'M', '7'),
-    (0x1D7EA, 'M', '8'),
-    (0x1D7EB, 'M', '9'),
-    (0x1D7EC, 'M', '0'),
-    (0x1D7ED, 'M', '1'),
-    (0x1D7EE, 'M', '2'),
-    (0x1D7EF, 'M', '3'),
-    (0x1D7F0, 'M', '4'),
-    (0x1D7F1, 'M', '5'),
-    (0x1D7F2, 'M', '6'),
-    (0x1D7F3, 'M', '7'),
-    (0x1D7F4, 'M', '8'),
-    (0x1D7F5, 'M', '9'),
-    (0x1D7F6, 'M', '0'),
-    (0x1D7F7, 'M', '1'),
-    (0x1D7F8, 'M', '2'),
-    (0x1D7F9, 'M', '3'),
-    (0x1D7FA, 'M', '4'),
-    (0x1D7FB, 'M', '5'),
-    (0x1D7FC, 'M', '6'),
-    (0x1D7FD, 'M', '7'),
-    (0x1D7FE, 'M', '8'),
-    (0x1D7FF, 'M', '9'),
-    (0x1D800, 'V'),
-    (0x1DA8C, 'X'),
-    (0x1DA9B, 'V'),
-    (0x1DAA0, 'X'),
-    (0x1DAA1, 'V'),
-    (0x1DAB0, 'X'),
-    (0x1DF00, 'V'),
-    (0x1DF1F, 'X'),
-    (0x1DF25, 'V'),
-    (0x1DF2B, 'X'),
-    (0x1E000, 'V'),
-    (0x1E007, 'X'),
-    (0x1E008, 'V'),
-    (0x1E019, 'X'),
-    (0x1E01B, 'V'),
-    (0x1E022, 'X'),
-    (0x1E023, 'V'),
-    (0x1E025, 'X'),
-    (0x1E026, 'V'),
-    (0x1E02B, 'X'),
-    (0x1E030, 'M', 'а'),
-    (0x1E031, 'M', 'б'),
-    (0x1E032, 'M', 'в'),
-    (0x1E033, 'M', 'г'),
-    (0x1E034, 'M', 'д'),
-    (0x1E035, 'M', 'е'),
-    (0x1E036, 'M', 'ж'),
+        (0x1D7B4, "M", "λ"),
+        (0x1D7B5, "M", "μ"),
+        (0x1D7B6, "M", "ν"),
+        (0x1D7B7, "M", "ξ"),
+        (0x1D7B8, "M", "ο"),
+        (0x1D7B9, "M", "π"),
+        (0x1D7BA, "M", "ρ"),
+        (0x1D7BB, "M", "σ"),
+        (0x1D7BD, "M", "τ"),
+        (0x1D7BE, "M", "υ"),
+        (0x1D7BF, "M", "φ"),
+        (0x1D7C0, "M", "χ"),
+        (0x1D7C1, "M", "ψ"),
+        (0x1D7C2, "M", "ω"),
+        (0x1D7C3, "M", "∂"),
+        (0x1D7C4, "M", "ε"),
+        (0x1D7C5, "M", "θ"),
+        (0x1D7C6, "M", "κ"),
+        (0x1D7C7, "M", "φ"),
+        (0x1D7C8, "M", "ρ"),
+        (0x1D7C9, "M", "π"),
+        (0x1D7CA, "M", "ϝ"),
+        (0x1D7CC, "X"),
+        (0x1D7CE, "M", "0"),
+        (0x1D7CF, "M", "1"),
+        (0x1D7D0, "M", "2"),
+        (0x1D7D1, "M", "3"),
+        (0x1D7D2, "M", "4"),
+        (0x1D7D3, "M", "5"),
+        (0x1D7D4, "M", "6"),
+        (0x1D7D5, "M", "7"),
+        (0x1D7D6, "M", "8"),
+        (0x1D7D7, "M", "9"),
+        (0x1D7D8, "M", "0"),
+        (0x1D7D9, "M", "1"),
+        (0x1D7DA, "M", "2"),
+        (0x1D7DB, "M", "3"),
+        (0x1D7DC, "M", "4"),
+        (0x1D7DD, "M", "5"),
+        (0x1D7DE, "M", "6"),
+        (0x1D7DF, "M", "7"),
+        (0x1D7E0, "M", "8"),
+        (0x1D7E1, "M", "9"),
+        (0x1D7E2, "M", "0"),
+        (0x1D7E3, "M", "1"),
+        (0x1D7E4, "M", "2"),
+        (0x1D7E5, "M", "3"),
+        (0x1D7E6, "M", "4"),
+        (0x1D7E7, "M", "5"),
+        (0x1D7E8, "M", "6"),
+        (0x1D7E9, "M", "7"),
+        (0x1D7EA, "M", "8"),
+        (0x1D7EB, "M", "9"),
+        (0x1D7EC, "M", "0"),
+        (0x1D7ED, "M", "1"),
+        (0x1D7EE, "M", "2"),
+        (0x1D7EF, "M", "3"),
+        (0x1D7F0, "M", "4"),
+        (0x1D7F1, "M", "5"),
+        (0x1D7F2, "M", "6"),
+        (0x1D7F3, "M", "7"),
+        (0x1D7F4, "M", "8"),
+        (0x1D7F5, "M", "9"),
+        (0x1D7F6, "M", "0"),
+        (0x1D7F7, "M", "1"),
+        (0x1D7F8, "M", "2"),
+        (0x1D7F9, "M", "3"),
+        (0x1D7FA, "M", "4"),
+        (0x1D7FB, "M", "5"),
+        (0x1D7FC, "M", "6"),
+        (0x1D7FD, "M", "7"),
+        (0x1D7FE, "M", "8"),
+        (0x1D7FF, "M", "9"),
+        (0x1D800, "V"),
+        (0x1DA8C, "X"),
+        (0x1DA9B, "V"),
+        (0x1DAA0, "X"),
+        (0x1DAA1, "V"),
+        (0x1DAB0, "X"),
+        (0x1DF00, "V"),
+        (0x1DF1F, "X"),
+        (0x1DF25, "V"),
+        (0x1DF2B, "X"),
+        (0x1E000, "V"),
+        (0x1E007, "X"),
+        (0x1E008, "V"),
+        (0x1E019, "X"),
+        (0x1E01B, "V"),
+        (0x1E022, "X"),
+        (0x1E023, "V"),
+        (0x1E025, "X"),
+        (0x1E026, "V"),
+        (0x1E02B, "X"),
+        (0x1E030, "M", "а"),
+        (0x1E031, "M", "б"),
+        (0x1E032, "M", "в"),
+        (0x1E033, "M", "г"),
+        (0x1E034, "M", "д"),
+        (0x1E035, "M", "е"),
+        (0x1E036, "M", "ж"),
     ]
 
+
 def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1E037, 'M', 'з'),
-    (0x1E038, 'M', 'и'),
-    (0x1E039, 'M', 'к'),
-    (0x1E03A, 'M', 'л'),
-    (0x1E03B, 'M', 'м'),
-    (0x1E03C, 'M', 'о'),
-    (0x1E03D, 'M', 'п'),
-    (0x1E03E, 'M', 'р'),
-    (0x1E03F, 'M', 'с'),
-    (0x1E040, 'M', 'т'),
-    (0x1E041, 'M', 'у'),
-    (0x1E042, 'M', 'ф'),
-    (0x1E043, 'M', 'х'),
-    (0x1E044, 'M', 'ц'),
-    (0x1E045, 'M', 'ч'),
-    (0x1E046, 'M', 'ш'),
-    (0x1E047, 'M', 'ы'),
-    (0x1E048, 'M', 'э'),
-    (0x1E049, 'M', 'ю'),
-    (0x1E04A, 'M', 'ꚉ'),
-    (0x1E04B, 'M', 'ә'),
-    (0x1E04C, 'M', 'і'),
-    (0x1E04D, 'M', 'ј'),
-    (0x1E04E, 'M', 'ө'),
-    (0x1E04F, 'M', 'ү'),
-    (0x1E050, 'M', 'ӏ'),
-    (0x1E051, 'M', 'а'),
-    (0x1E052, 'M', 'б'),
-    (0x1E053, 'M', 'в'),
-    (0x1E054, 'M', 'г'),
-    (0x1E055, 'M', 'д'),
-    (0x1E056, 'M', 'е'),
-    (0x1E057, 'M', 'ж'),
-    (0x1E058, 'M', 'з'),
-    (0x1E059, 'M', 'и'),
-    (0x1E05A, 'M', 'к'),
-    (0x1E05B, 'M', 'л'),
-    (0x1E05C, 'M', 'о'),
-    (0x1E05D, 'M', 'п'),
-    (0x1E05E, 'M', 'с'),
-    (0x1E05F, 'M', 'у'),
-    (0x1E060, 'M', 'ф'),
-    (0x1E061, 'M', 'х'),
-    (0x1E062, 'M', 'ц'),
-    (0x1E063, 'M', 'ч'),
-    (0x1E064, 'M', 'ш'),
-    (0x1E065, 'M', 'ъ'),
-    (0x1E066, 'M', 'ы'),
-    (0x1E067, 'M', 'ґ'),
-    (0x1E068, 'M', 'і'),
-    (0x1E069, 'M', 'ѕ'),
-    (0x1E06A, 'M', 'џ'),
-    (0x1E06B, 'M', 'ҫ'),
-    (0x1E06C, 'M', 'ꙑ'),
-    (0x1E06D, 'M', 'ұ'),
-    (0x1E06E, 'X'),
-    (0x1E08F, 'V'),
-    (0x1E090, 'X'),
-    (0x1E100, 'V'),
-    (0x1E12D, 'X'),
-    (0x1E130, 'V'),
-    (0x1E13E, 'X'),
-    (0x1E140, 'V'),
-    (0x1E14A, 'X'),
-    (0x1E14E, 'V'),
-    (0x1E150, 'X'),
-    (0x1E290, 'V'),
-    (0x1E2AF, 'X'),
-    (0x1E2C0, 'V'),
-    (0x1E2FA, 'X'),
-    (0x1E2FF, 'V'),
-    (0x1E300, 'X'),
-    (0x1E4D0, 'V'),
-    (0x1E4FA, 'X'),
-    (0x1E7E0, 'V'),
-    (0x1E7E7, 'X'),
-    (0x1E7E8, 'V'),
-    (0x1E7EC, 'X'),
-    (0x1E7ED, 'V'),
-    (0x1E7EF, 'X'),
-    (0x1E7F0, 'V'),
-    (0x1E7FF, 'X'),
-    (0x1E800, 'V'),
-    (0x1E8C5, 'X'),
-    (0x1E8C7, 'V'),
-    (0x1E8D7, 'X'),
-    (0x1E900, 'M', '𞤢'),
-    (0x1E901, 'M', '𞤣'),
-    (0x1E902, 'M', '𞤤'),
-    (0x1E903, 'M', '𞤥'),
-    (0x1E904, 'M', '𞤦'),
-    (0x1E905, 'M', '𞤧'),
-    (0x1E906, 'M', '𞤨'),
-    (0x1E907, 'M', '𞤩'),
-    (0x1E908, 'M', '𞤪'),
-    (0x1E909, 'M', '𞤫'),
-    (0x1E90A, 'M', '𞤬'),
-    (0x1E90B, 'M', '𞤭'),
-    (0x1E90C, 'M', '𞤮'),
-    (0x1E90D, 'M', '𞤯'),
+        (0x1E037, "M", "з"),
+        (0x1E038, "M", "и"),
+        (0x1E039, "M", "к"),
+        (0x1E03A, "M", "л"),
+        (0x1E03B, "M", "м"),
+        (0x1E03C, "M", "о"),
+        (0x1E03D, "M", "п"),
+        (0x1E03E, "M", "р"),
+        (0x1E03F, "M", "с"),
+        (0x1E040, "M", "т"),
+        (0x1E041, "M", "у"),
+        (0x1E042, "M", "ф"),
+        (0x1E043, "M", "х"),
+        (0x1E044, "M", "ц"),
+        (0x1E045, "M", "ч"),
+        (0x1E046, "M", "ш"),
+        (0x1E047, "M", "ы"),
+        (0x1E048, "M", "э"),
+        (0x1E049, "M", "ю"),
+        (0x1E04A, "M", "ꚉ"),
+        (0x1E04B, "M", "ә"),
+        (0x1E04C, "M", "і"),
+        (0x1E04D, "M", "ј"),
+        (0x1E04E, "M", "ө"),
+        (0x1E04F, "M", "ү"),
+        (0x1E050, "M", "ӏ"),
+        (0x1E051, "M", "а"),
+        (0x1E052, "M", "б"),
+        (0x1E053, "M", "в"),
+        (0x1E054, "M", "г"),
+        (0x1E055, "M", "д"),
+        (0x1E056, "M", "е"),
+        (0x1E057, "M", "ж"),
+        (0x1E058, "M", "з"),
+        (0x1E059, "M", "и"),
+        (0x1E05A, "M", "к"),
+        (0x1E05B, "M", "л"),
+        (0x1E05C, "M", "о"),
+        (0x1E05D, "M", "п"),
+        (0x1E05E, "M", "с"),
+        (0x1E05F, "M", "у"),
+        (0x1E060, "M", "ф"),
+        (0x1E061, "M", "х"),
+        (0x1E062, "M", "ц"),
+        (0x1E063, "M", "ч"),
+        (0x1E064, "M", "ш"),
+        (0x1E065, "M", "ъ"),
+        (0x1E066, "M", "ы"),
+        (0x1E067, "M", "ґ"),
+        (0x1E068, "M", "і"),
+        (0x1E069, "M", "ѕ"),
+        (0x1E06A, "M", "џ"),
+        (0x1E06B, "M", "ҫ"),
+        (0x1E06C, "M", "ꙑ"),
+        (0x1E06D, "M", "ұ"),
+        (0x1E06E, "X"),
+        (0x1E08F, "V"),
+        (0x1E090, "X"),
+        (0x1E100, "V"),
+        (0x1E12D, "X"),
+        (0x1E130, "V"),
+        (0x1E13E, "X"),
+        (0x1E140, "V"),
+        (0x1E14A, "X"),
+        (0x1E14E, "V"),
+        (0x1E150, "X"),
+        (0x1E290, "V"),
+        (0x1E2AF, "X"),
+        (0x1E2C0, "V"),
+        (0x1E2FA, "X"),
+        (0x1E2FF, "V"),
+        (0x1E300, "X"),
+        (0x1E4D0, "V"),
+        (0x1E4FA, "X"),
+        (0x1E7E0, "V"),
+        (0x1E7E7, "X"),
+        (0x1E7E8, "V"),
+        (0x1E7EC, "X"),
+        (0x1E7ED, "V"),
+        (0x1E7EF, "X"),
+        (0x1E7F0, "V"),
+        (0x1E7FF, "X"),
+        (0x1E800, "V"),
+        (0x1E8C5, "X"),
+        (0x1E8C7, "V"),
+        (0x1E8D7, "X"),
+        (0x1E900, "M", "𞤢"),
+        (0x1E901, "M", "𞤣"),
+        (0x1E902, "M", "𞤤"),
+        (0x1E903, "M", "𞤥"),
+        (0x1E904, "M", "𞤦"),
+        (0x1E905, "M", "𞤧"),
+        (0x1E906, "M", "𞤨"),
+        (0x1E907, "M", "𞤩"),
+        (0x1E908, "M", "𞤪"),
+        (0x1E909, "M", "𞤫"),
+        (0x1E90A, "M", "𞤬"),
+        (0x1E90B, "M", "𞤭"),
+        (0x1E90C, "M", "𞤮"),
+        (0x1E90D, "M", "𞤯"),
     ]
 
+
 def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1E90E, 'M', '𞤰'),
-    (0x1E90F, 'M', '𞤱'),
-    (0x1E910, 'M', '𞤲'),
-    (0x1E911, 'M', '𞤳'),
-    (0x1E912, 'M', '𞤴'),
-    (0x1E913, 'M', '𞤵'),
-    (0x1E914, 'M', '𞤶'),
-    (0x1E915, 'M', '𞤷'),
-    (0x1E916, 'M', '𞤸'),
-    (0x1E917, 'M', '𞤹'),
-    (0x1E918, 'M', '𞤺'),
-    (0x1E919, 'M', '𞤻'),
-    (0x1E91A, 'M', '𞤼'),
-    (0x1E91B, 'M', '𞤽'),
-    (0x1E91C, 'M', '𞤾'),
-    (0x1E91D, 'M', '𞤿'),
-    (0x1E91E, 'M', '𞥀'),
-    (0x1E91F, 'M', '𞥁'),
-    (0x1E920, 'M', '𞥂'),
-    (0x1E921, 'M', '𞥃'),
-    (0x1E922, 'V'),
-    (0x1E94C, 'X'),
-    (0x1E950, 'V'),
-    (0x1E95A, 'X'),
-    (0x1E95E, 'V'),
-    (0x1E960, 'X'),
-    (0x1EC71, 'V'),
-    (0x1ECB5, 'X'),
-    (0x1ED01, 'V'),
-    (0x1ED3E, 'X'),
-    (0x1EE00, 'M', 'ا'),
-    (0x1EE01, 'M', 'ب'),
-    (0x1EE02, 'M', 'ج'),
-    (0x1EE03, 'M', 'د'),
-    (0x1EE04, 'X'),
-    (0x1EE05, 'M', 'و'),
-    (0x1EE06, 'M', 'ز'),
-    (0x1EE07, 'M', 'ح'),
-    (0x1EE08, 'M', 'ط'),
-    (0x1EE09, 'M', 'ي'),
-    (0x1EE0A, 'M', 'ك'),
-    (0x1EE0B, 'M', 'ل'),
-    (0x1EE0C, 'M', 'م'),
-    (0x1EE0D, 'M', 'ن'),
-    (0x1EE0E, 'M', 'س'),
-    (0x1EE0F, 'M', 'ع'),
-    (0x1EE10, 'M', 'ف'),
-    (0x1EE11, 'M', 'ص'),
-    (0x1EE12, 'M', 'ق'),
-    (0x1EE13, 'M', 'ر'),
-    (0x1EE14, 'M', 'ش'),
-    (0x1EE15, 'M', 'ت'),
-    (0x1EE16, 'M', 'ث'),
-    (0x1EE17, 'M', 'خ'),
-    (0x1EE18, 'M', 'ذ'),
-    (0x1EE19, 'M', 'ض'),
-    (0x1EE1A, 'M', 'ظ'),
-    (0x1EE1B, 'M', 'غ'),
-    (0x1EE1C, 'M', 'ٮ'),
-    (0x1EE1D, 'M', 'ں'),
-    (0x1EE1E, 'M', 'ڡ'),
-    (0x1EE1F, 'M', 'ٯ'),
-    (0x1EE20, 'X'),
-    (0x1EE21, 'M', 'ب'),
-    (0x1EE22, 'M', 'ج'),
-    (0x1EE23, 'X'),
-    (0x1EE24, 'M', 'ه'),
-    (0x1EE25, 'X'),
-    (0x1EE27, 'M', 'ح'),
-    (0x1EE28, 'X'),
-    (0x1EE29, 'M', 'ي'),
-    (0x1EE2A, 'M', 'ك'),
-    (0x1EE2B, 'M', 'ل'),
-    (0x1EE2C, 'M', 'م'),
-    (0x1EE2D, 'M', 'ن'),
-    (0x1EE2E, 'M', 'س'),
-    (0x1EE2F, 'M', 'ع'),
-    (0x1EE30, 'M', 'ف'),
-    (0x1EE31, 'M', 'ص'),
-    (0x1EE32, 'M', 'ق'),
-    (0x1EE33, 'X'),
-    (0x1EE34, 'M', 'ش'),
-    (0x1EE35, 'M', 'ت'),
-    (0x1EE36, 'M', 'ث'),
-    (0x1EE37, 'M', 'خ'),
-    (0x1EE38, 'X'),
-    (0x1EE39, 'M', 'ض'),
-    (0x1EE3A, 'X'),
-    (0x1EE3B, 'M', 'غ'),
-    (0x1EE3C, 'X'),
-    (0x1EE42, 'M', 'ج'),
-    (0x1EE43, 'X'),
-    (0x1EE47, 'M', 'ح'),
-    (0x1EE48, 'X'),
-    (0x1EE49, 'M', 'ي'),
-    (0x1EE4A, 'X'),
-    (0x1EE4B, 'M', 'ل'),
-    (0x1EE4C, 'X'),
-    (0x1EE4D, 'M', 'ن'),
-    (0x1EE4E, 'M', 'س'),
+        (0x1E90E, "M", "𞤰"),
+        (0x1E90F, "M", "𞤱"),
+        (0x1E910, "M", "𞤲"),
+        (0x1E911, "M", "𞤳"),
+        (0x1E912, "M", "𞤴"),
+        (0x1E913, "M", "𞤵"),
+        (0x1E914, "M", "𞤶"),
+        (0x1E915, "M", "𞤷"),
+        (0x1E916, "M", "𞤸"),
+        (0x1E917, "M", "𞤹"),
+        (0x1E918, "M", "𞤺"),
+        (0x1E919, "M", "𞤻"),
+        (0x1E91A, "M", "𞤼"),
+        (0x1E91B, "M", "𞤽"),
+        (0x1E91C, "M", "𞤾"),
+        (0x1E91D, "M", "𞤿"),
+        (0x1E91E, "M", "𞥀"),
+        (0x1E91F, "M", "𞥁"),
+        (0x1E920, "M", "𞥂"),
+        (0x1E921, "M", "𞥃"),
+        (0x1E922, "V"),
+        (0x1E94C, "X"),
+        (0x1E950, "V"),
+        (0x1E95A, "X"),
+        (0x1E95E, "V"),
+        (0x1E960, "X"),
+        (0x1EC71, "V"),
+        (0x1ECB5, "X"),
+        (0x1ED01, "V"),
+        (0x1ED3E, "X"),
+        (0x1EE00, "M", "ا"),
+        (0x1EE01, "M", "ب"),
+        (0x1EE02, "M", "ج"),
+        (0x1EE03, "M", "د"),
+        (0x1EE04, "X"),
+        (0x1EE05, "M", "و"),
+        (0x1EE06, "M", "ز"),
+        (0x1EE07, "M", "ح"),
+        (0x1EE08, "M", "ط"),
+        (0x1EE09, "M", "ي"),
+        (0x1EE0A, "M", "ك"),
+        (0x1EE0B, "M", "ل"),
+        (0x1EE0C, "M", "م"),
+        (0x1EE0D, "M", "ن"),
+        (0x1EE0E, "M", "س"),
+        (0x1EE0F, "M", "ع"),
+        (0x1EE10, "M", "ف"),
+        (0x1EE11, "M", "ص"),
+        (0x1EE12, "M", "ق"),
+        (0x1EE13, "M", "ر"),
+        (0x1EE14, "M", "ش"),
+        (0x1EE15, "M", "ت"),
+        (0x1EE16, "M", "ث"),
+        (0x1EE17, "M", "خ"),
+        (0x1EE18, "M", "ذ"),
+        (0x1EE19, "M", "ض"),
+        (0x1EE1A, "M", "ظ"),
+        (0x1EE1B, "M", "غ"),
+        (0x1EE1C, "M", "ٮ"),
+        (0x1EE1D, "M", "ں"),
+        (0x1EE1E, "M", "ڡ"),
+        (0x1EE1F, "M", "ٯ"),
+        (0x1EE20, "X"),
+        (0x1EE21, "M", "ب"),
+        (0x1EE22, "M", "ج"),
+        (0x1EE23, "X"),
+        (0x1EE24, "M", "ه"),
+        (0x1EE25, "X"),
+        (0x1EE27, "M", "ح"),
+        (0x1EE28, "X"),
+        (0x1EE29, "M", "ي"),
+        (0x1EE2A, "M", "ك"),
+        (0x1EE2B, "M", "ل"),
+        (0x1EE2C, "M", "م"),
+        (0x1EE2D, "M", "ن"),
+        (0x1EE2E, "M", "س"),
+        (0x1EE2F, "M", "ع"),
+        (0x1EE30, "M", "ف"),
+        (0x1EE31, "M", "ص"),
+        (0x1EE32, "M", "ق"),
+        (0x1EE33, "X"),
+        (0x1EE34, "M", "ش"),
+        (0x1EE35, "M", "ت"),
+        (0x1EE36, "M", "ث"),
+        (0x1EE37, "M", "خ"),
+        (0x1EE38, "X"),
+        (0x1EE39, "M", "ض"),
+        (0x1EE3A, "X"),
+        (0x1EE3B, "M", "غ"),
+        (0x1EE3C, "X"),
+        (0x1EE42, "M", "ج"),
+        (0x1EE43, "X"),
+        (0x1EE47, "M", "ح"),
+        (0x1EE48, "X"),
+        (0x1EE49, "M", "ي"),
+        (0x1EE4A, "X"),
+        (0x1EE4B, "M", "ل"),
+        (0x1EE4C, "X"),
+        (0x1EE4D, "M", "ن"),
+        (0x1EE4E, "M", "س"),
     ]
 
+
 def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1EE4F, 'M', 'ع'),
-    (0x1EE50, 'X'),
-    (0x1EE51, 'M', 'ص'),
-    (0x1EE52, 'M', 'ق'),
-    (0x1EE53, 'X'),
-    (0x1EE54, 'M', 'ش'),
-    (0x1EE55, 'X'),
-    (0x1EE57, 'M', 'خ'),
-    (0x1EE58, 'X'),
-    (0x1EE59, 'M', 'ض'),
-    (0x1EE5A, 'X'),
-    (0x1EE5B, 'M', 'غ'),
-    (0x1EE5C, 'X'),
-    (0x1EE5D, 'M', 'ں'),
-    (0x1EE5E, 'X'),
-    (0x1EE5F, 'M', 'ٯ'),
-    (0x1EE60, 'X'),
-    (0x1EE61, 'M', 'ب'),
-    (0x1EE62, 'M', 'ج'),
-    (0x1EE63, 'X'),
-    (0x1EE64, 'M', 'ه'),
-    (0x1EE65, 'X'),
-    (0x1EE67, 'M', 'ح'),
-    (0x1EE68, 'M', 'ط'),
-    (0x1EE69, 'M', 'ي'),
-    (0x1EE6A, 'M', 'ك'),
-    (0x1EE6B, 'X'),
-    (0x1EE6C, 'M', 'م'),
-    (0x1EE6D, 'M', 'ن'),
-    (0x1EE6E, 'M', 'س'),
-    (0x1EE6F, 'M', 'ع'),
-    (0x1EE70, 'M', 'ف'),
-    (0x1EE71, 'M', 'ص'),
-    (0x1EE72, 'M', 'ق'),
-    (0x1EE73, 'X'),
-    (0x1EE74, 'M', 'ش'),
-    (0x1EE75, 'M', 'ت'),
-    (0x1EE76, 'M', 'ث'),
-    (0x1EE77, 'M', 'خ'),
-    (0x1EE78, 'X'),
-    (0x1EE79, 'M', 'ض'),
-    (0x1EE7A, 'M', 'ظ'),
-    (0x1EE7B, 'M', 'غ'),
-    (0x1EE7C, 'M', 'ٮ'),
-    (0x1EE7D, 'X'),
-    (0x1EE7E, 'M', 'ڡ'),
-    (0x1EE7F, 'X'),
-    (0x1EE80, 'M', 'ا'),
-    (0x1EE81, 'M', 'ب'),
-    (0x1EE82, 'M', 'ج'),
-    (0x1EE83, 'M', 'د'),
-    (0x1EE84, 'M', 'ه'),
-    (0x1EE85, 'M', 'و'),
-    (0x1EE86, 'M', 'ز'),
-    (0x1EE87, 'M', 'ح'),
-    (0x1EE88, 'M', 'ط'),
-    (0x1EE89, 'M', 'ي'),
-    (0x1EE8A, 'X'),
-    (0x1EE8B, 'M', 'ل'),
-    (0x1EE8C, 'M', 'م'),
-    (0x1EE8D, 'M', 'ن'),
-    (0x1EE8E, 'M', 'س'),
-    (0x1EE8F, 'M', 'ع'),
-    (0x1EE90, 'M', 'ف'),
-    (0x1EE91, 'M', 'ص'),
-    (0x1EE92, 'M', 'ق'),
-    (0x1EE93, 'M', 'ر'),
-    (0x1EE94, 'M', 'ش'),
-    (0x1EE95, 'M', 'ت'),
-    (0x1EE96, 'M', 'ث'),
-    (0x1EE97, 'M', 'خ'),
-    (0x1EE98, 'M', 'ذ'),
-    (0x1EE99, 'M', 'ض'),
-    (0x1EE9A, 'M', 'ظ'),
-    (0x1EE9B, 'M', 'غ'),
-    (0x1EE9C, 'X'),
-    (0x1EEA1, 'M', 'ب'),
-    (0x1EEA2, 'M', 'ج'),
-    (0x1EEA3, 'M', 'د'),
-    (0x1EEA4, 'X'),
-    (0x1EEA5, 'M', 'و'),
-    (0x1EEA6, 'M', 'ز'),
-    (0x1EEA7, 'M', 'ح'),
-    (0x1EEA8, 'M', 'ط'),
-    (0x1EEA9, 'M', 'ي'),
-    (0x1EEAA, 'X'),
-    (0x1EEAB, 'M', 'ل'),
-    (0x1EEAC, 'M', 'م'),
-    (0x1EEAD, 'M', 'ن'),
-    (0x1EEAE, 'M', 'س'),
-    (0x1EEAF, 'M', 'ع'),
-    (0x1EEB0, 'M', 'ف'),
-    (0x1EEB1, 'M', 'ص'),
-    (0x1EEB2, 'M', 'ق'),
-    (0x1EEB3, 'M', 'ر'),
-    (0x1EEB4, 'M', 'ش'),
-    (0x1EEB5, 'M', 'ت'),
-    (0x1EEB6, 'M', 'ث'),
-    (0x1EEB7, 'M', 'خ'),
-    (0x1EEB8, 'M', 'ذ'),
+        (0x1EE4F, "M", "ع"),
+        (0x1EE50, "X"),
+        (0x1EE51, "M", "ص"),
+        (0x1EE52, "M", "ق"),
+        (0x1EE53, "X"),
+        (0x1EE54, "M", "ش"),
+        (0x1EE55, "X"),
+        (0x1EE57, "M", "خ"),
+        (0x1EE58, "X"),
+        (0x1EE59, "M", "ض"),
+        (0x1EE5A, "X"),
+        (0x1EE5B, "M", "غ"),
+        (0x1EE5C, "X"),
+        (0x1EE5D, "M", "ں"),
+        (0x1EE5E, "X"),
+        (0x1EE5F, "M", "ٯ"),
+        (0x1EE60, "X"),
+        (0x1EE61, "M", "ب"),
+        (0x1EE62, "M", "ج"),
+        (0x1EE63, "X"),
+        (0x1EE64, "M", "ه"),
+        (0x1EE65, "X"),
+        (0x1EE67, "M", "ح"),
+        (0x1EE68, "M", "ط"),
+        (0x1EE69, "M", "ي"),
+        (0x1EE6A, "M", "ك"),
+        (0x1EE6B, "X"),
+        (0x1EE6C, "M", "م"),
+        (0x1EE6D, "M", "ن"),
+        (0x1EE6E, "M", "س"),
+        (0x1EE6F, "M", "ع"),
+        (0x1EE70, "M", "ف"),
+        (0x1EE71, "M", "ص"),
+        (0x1EE72, "M", "ق"),
+        (0x1EE73, "X"),
+        (0x1EE74, "M", "ش"),
+        (0x1EE75, "M", "ت"),
+        (0x1EE76, "M", "ث"),
+        (0x1EE77, "M", "خ"),
+        (0x1EE78, "X"),
+        (0x1EE79, "M", "ض"),
+        (0x1EE7A, "M", "ظ"),
+        (0x1EE7B, "M", "غ"),
+        (0x1EE7C, "M", "ٮ"),
+        (0x1EE7D, "X"),
+        (0x1EE7E, "M", "ڡ"),
+        (0x1EE7F, "X"),
+        (0x1EE80, "M", "ا"),
+        (0x1EE81, "M", "ب"),
+        (0x1EE82, "M", "ج"),
+        (0x1EE83, "M", "د"),
+        (0x1EE84, "M", "ه"),
+        (0x1EE85, "M", "و"),
+        (0x1EE86, "M", "ز"),
+        (0x1EE87, "M", "ح"),
+        (0x1EE88, "M", "ط"),
+        (0x1EE89, "M", "ي"),
+        (0x1EE8A, "X"),
+        (0x1EE8B, "M", "ل"),
+        (0x1EE8C, "M", "م"),
+        (0x1EE8D, "M", "ن"),
+        (0x1EE8E, "M", "س"),
+        (0x1EE8F, "M", "ع"),
+        (0x1EE90, "M", "ف"),
+        (0x1EE91, "M", "ص"),
+        (0x1EE92, "M", "ق"),
+        (0x1EE93, "M", "ر"),
+        (0x1EE94, "M", "ش"),
+        (0x1EE95, "M", "ت"),
+        (0x1EE96, "M", "ث"),
+        (0x1EE97, "M", "خ"),
+        (0x1EE98, "M", "ذ"),
+        (0x1EE99, "M", "ض"),
+        (0x1EE9A, "M", "ظ"),
+        (0x1EE9B, "M", "غ"),
+        (0x1EE9C, "X"),
+        (0x1EEA1, "M", "ب"),
+        (0x1EEA2, "M", "ج"),
+        (0x1EEA3, "M", "د"),
+        (0x1EEA4, "X"),
+        (0x1EEA5, "M", "و"),
+        (0x1EEA6, "M", "ز"),
+        (0x1EEA7, "M", "ح"),
+        (0x1EEA8, "M", "ط"),
+        (0x1EEA9, "M", "ي"),
+        (0x1EEAA, "X"),
+        (0x1EEAB, "M", "ل"),
+        (0x1EEAC, "M", "م"),
+        (0x1EEAD, "M", "ن"),
+        (0x1EEAE, "M", "س"),
+        (0x1EEAF, "M", "ع"),
+        (0x1EEB0, "M", "ف"),
+        (0x1EEB1, "M", "ص"),
+        (0x1EEB2, "M", "ق"),
+        (0x1EEB3, "M", "ر"),
+        (0x1EEB4, "M", "ش"),
+        (0x1EEB5, "M", "ت"),
+        (0x1EEB6, "M", "ث"),
+        (0x1EEB7, "M", "خ"),
+        (0x1EEB8, "M", "ذ"),
     ]
 
+
 def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1EEB9, 'M', 'ض'),
-    (0x1EEBA, 'M', 'ظ'),
-    (0x1EEBB, 'M', 'غ'),
-    (0x1EEBC, 'X'),
-    (0x1EEF0, 'V'),
-    (0x1EEF2, 'X'),
-    (0x1F000, 'V'),
-    (0x1F02C, 'X'),
-    (0x1F030, 'V'),
-    (0x1F094, 'X'),
-    (0x1F0A0, 'V'),
-    (0x1F0AF, 'X'),
-    (0x1F0B1, 'V'),
-    (0x1F0C0, 'X'),
-    (0x1F0C1, 'V'),
-    (0x1F0D0, 'X'),
-    (0x1F0D1, 'V'),
-    (0x1F0F6, 'X'),
-    (0x1F101, '3', '0,'),
-    (0x1F102, '3', '1,'),
-    (0x1F103, '3', '2,'),
-    (0x1F104, '3', '3,'),
-    (0x1F105, '3', '4,'),
-    (0x1F106, '3', '5,'),
-    (0x1F107, '3', '6,'),
-    (0x1F108, '3', '7,'),
-    (0x1F109, '3', '8,'),
-    (0x1F10A, '3', '9,'),
-    (0x1F10B, 'V'),
-    (0x1F110, '3', '(a)'),
-    (0x1F111, '3', '(b)'),
-    (0x1F112, '3', '(c)'),
-    (0x1F113, '3', '(d)'),
-    (0x1F114, '3', '(e)'),
-    (0x1F115, '3', '(f)'),
-    (0x1F116, '3', '(g)'),
-    (0x1F117, '3', '(h)'),
-    (0x1F118, '3', '(i)'),
-    (0x1F119, '3', '(j)'),
-    (0x1F11A, '3', '(k)'),
-    (0x1F11B, '3', '(l)'),
-    (0x1F11C, '3', '(m)'),
-    (0x1F11D, '3', '(n)'),
-    (0x1F11E, '3', '(o)'),
-    (0x1F11F, '3', '(p)'),
-    (0x1F120, '3', '(q)'),
-    (0x1F121, '3', '(r)'),
-    (0x1F122, '3', '(s)'),
-    (0x1F123, '3', '(t)'),
-    (0x1F124, '3', '(u)'),
-    (0x1F125, '3', '(v)'),
-    (0x1F126, '3', '(w)'),
-    (0x1F127, '3', '(x)'),
-    (0x1F128, '3', '(y)'),
-    (0x1F129, '3', '(z)'),
-    (0x1F12A, 'M', '〔s〕'),
-    (0x1F12B, 'M', 'c'),
-    (0x1F12C, 'M', 'r'),
-    (0x1F12D, 'M', 'cd'),
-    (0x1F12E, 'M', 'wz'),
-    (0x1F12F, 'V'),
-    (0x1F130, 'M', 'a'),
-    (0x1F131, 'M', 'b'),
-    (0x1F132, 'M', 'c'),
-    (0x1F133, 'M', 'd'),
-    (0x1F134, 'M', 'e'),
-    (0x1F135, 'M', 'f'),
-    (0x1F136, 'M', 'g'),
-    (0x1F137, 'M', 'h'),
-    (0x1F138, 'M', 'i'),
-    (0x1F139, 'M', 'j'),
-    (0x1F13A, 'M', 'k'),
-    (0x1F13B, 'M', 'l'),
-    (0x1F13C, 'M', 'm'),
-    (0x1F13D, 'M', 'n'),
-    (0x1F13E, 'M', 'o'),
-    (0x1F13F, 'M', 'p'),
-    (0x1F140, 'M', 'q'),
-    (0x1F141, 'M', 'r'),
-    (0x1F142, 'M', 's'),
-    (0x1F143, 'M', 't'),
-    (0x1F144, 'M', 'u'),
-    (0x1F145, 'M', 'v'),
-    (0x1F146, 'M', 'w'),
-    (0x1F147, 'M', 'x'),
-    (0x1F148, 'M', 'y'),
-    (0x1F149, 'M', 'z'),
-    (0x1F14A, 'M', 'hv'),
-    (0x1F14B, 'M', 'mv'),
-    (0x1F14C, 'M', 'sd'),
-    (0x1F14D, 'M', 'ss'),
-    (0x1F14E, 'M', 'ppv'),
-    (0x1F14F, 'M', 'wc'),
-    (0x1F150, 'V'),
-    (0x1F16A, 'M', 'mc'),
-    (0x1F16B, 'M', 'md'),
-    (0x1F16C, 'M', 'mr'),
-    (0x1F16D, 'V'),
-    (0x1F190, 'M', 'dj'),
-    (0x1F191, 'V'),
+        (0x1EEB9, "M", "ض"),
+        (0x1EEBA, "M", "ظ"),
+        (0x1EEBB, "M", "غ"),
+        (0x1EEBC, "X"),
+        (0x1EEF0, "V"),
+        (0x1EEF2, "X"),
+        (0x1F000, "V"),
+        (0x1F02C, "X"),
+        (0x1F030, "V"),
+        (0x1F094, "X"),
+        (0x1F0A0, "V"),
+        (0x1F0AF, "X"),
+        (0x1F0B1, "V"),
+        (0x1F0C0, "X"),
+        (0x1F0C1, "V"),
+        (0x1F0D0, "X"),
+        (0x1F0D1, "V"),
+        (0x1F0F6, "X"),
+        (0x1F101, "3", "0,"),
+        (0x1F102, "3", "1,"),
+        (0x1F103, "3", "2,"),
+        (0x1F104, "3", "3,"),
+        (0x1F105, "3", "4,"),
+        (0x1F106, "3", "5,"),
+        (0x1F107, "3", "6,"),
+        (0x1F108, "3", "7,"),
+        (0x1F109, "3", "8,"),
+        (0x1F10A, "3", "9,"),
+        (0x1F10B, "V"),
+        (0x1F110, "3", "(a)"),
+        (0x1F111, "3", "(b)"),
+        (0x1F112, "3", "(c)"),
+        (0x1F113, "3", "(d)"),
+        (0x1F114, "3", "(e)"),
+        (0x1F115, "3", "(f)"),
+        (0x1F116, "3", "(g)"),
+        (0x1F117, "3", "(h)"),
+        (0x1F118, "3", "(i)"),
+        (0x1F119, "3", "(j)"),
+        (0x1F11A, "3", "(k)"),
+        (0x1F11B, "3", "(l)"),
+        (0x1F11C, "3", "(m)"),
+        (0x1F11D, "3", "(n)"),
+        (0x1F11E, "3", "(o)"),
+        (0x1F11F, "3", "(p)"),
+        (0x1F120, "3", "(q)"),
+        (0x1F121, "3", "(r)"),
+        (0x1F122, "3", "(s)"),
+        (0x1F123, "3", "(t)"),
+        (0x1F124, "3", "(u)"),
+        (0x1F125, "3", "(v)"),
+        (0x1F126, "3", "(w)"),
+        (0x1F127, "3", "(x)"),
+        (0x1F128, "3", "(y)"),
+        (0x1F129, "3", "(z)"),
+        (0x1F12A, "M", "〔s〕"),
+        (0x1F12B, "M", "c"),
+        (0x1F12C, "M", "r"),
+        (0x1F12D, "M", "cd"),
+        (0x1F12E, "M", "wz"),
+        (0x1F12F, "V"),
+        (0x1F130, "M", "a"),
+        (0x1F131, "M", "b"),
+        (0x1F132, "M", "c"),
+        (0x1F133, "M", "d"),
+        (0x1F134, "M", "e"),
+        (0x1F135, "M", "f"),
+        (0x1F136, "M", "g"),
+        (0x1F137, "M", "h"),
+        (0x1F138, "M", "i"),
+        (0x1F139, "M", "j"),
+        (0x1F13A, "M", "k"),
+        (0x1F13B, "M", "l"),
+        (0x1F13C, "M", "m"),
+        (0x1F13D, "M", "n"),
+        (0x1F13E, "M", "o"),
+        (0x1F13F, "M", "p"),
+        (0x1F140, "M", "q"),
+        (0x1F141, "M", "r"),
+        (0x1F142, "M", "s"),
+        (0x1F143, "M", "t"),
+        (0x1F144, "M", "u"),
+        (0x1F145, "M", "v"),
+        (0x1F146, "M", "w"),
+        (0x1F147, "M", "x"),
+        (0x1F148, "M", "y"),
+        (0x1F149, "M", "z"),
+        (0x1F14A, "M", "hv"),
+        (0x1F14B, "M", "mv"),
+        (0x1F14C, "M", "sd"),
+        (0x1F14D, "M", "ss"),
+        (0x1F14E, "M", "ppv"),
+        (0x1F14F, "M", "wc"),
+        (0x1F150, "V"),
+        (0x1F16A, "M", "mc"),
+        (0x1F16B, "M", "md"),
+        (0x1F16C, "M", "mr"),
+        (0x1F16D, "V"),
+        (0x1F190, "M", "dj"),
+        (0x1F191, "V"),
     ]
 
+
 def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1F1AE, 'X'),
-    (0x1F1E6, 'V'),
-    (0x1F200, 'M', 'ほか'),
-    (0x1F201, 'M', 'ココ'),
-    (0x1F202, 'M', 'サ'),
-    (0x1F203, 'X'),
-    (0x1F210, 'M', '手'),
-    (0x1F211, 'M', '字'),
-    (0x1F212, 'M', '双'),
-    (0x1F213, 'M', 'デ'),
-    (0x1F214, 'M', '二'),
-    (0x1F215, 'M', '多'),
-    (0x1F216, 'M', '解'),
-    (0x1F217, 'M', '天'),
-    (0x1F218, 'M', '交'),
-    (0x1F219, 'M', '映'),
-    (0x1F21A, 'M', '無'),
-    (0x1F21B, 'M', '料'),
-    (0x1F21C, 'M', '前'),
-    (0x1F21D, 'M', '後'),
-    (0x1F21E, 'M', '再'),
-    (0x1F21F, 'M', '新'),
-    (0x1F220, 'M', '初'),
-    (0x1F221, 'M', '終'),
-    (0x1F222, 'M', '生'),
-    (0x1F223, 'M', '販'),
-    (0x1F224, 'M', '声'),
-    (0x1F225, 'M', '吹'),
-    (0x1F226, 'M', '演'),
-    (0x1F227, 'M', '投'),
-    (0x1F228, 'M', '捕'),
-    (0x1F229, 'M', '一'),
-    (0x1F22A, 'M', '三'),
-    (0x1F22B, 'M', '遊'),
-    (0x1F22C, 'M', '左'),
-    (0x1F22D, 'M', '中'),
-    (0x1F22E, 'M', '右'),
-    (0x1F22F, 'M', '指'),
-    (0x1F230, 'M', '走'),
-    (0x1F231, 'M', '打'),
-    (0x1F232, 'M', '禁'),
-    (0x1F233, 'M', '空'),
-    (0x1F234, 'M', '合'),
-    (0x1F235, 'M', '満'),
-    (0x1F236, 'M', '有'),
-    (0x1F237, 'M', '月'),
-    (0x1F238, 'M', '申'),
-    (0x1F239, 'M', '割'),
-    (0x1F23A, 'M', '営'),
-    (0x1F23B, 'M', '配'),
-    (0x1F23C, 'X'),
-    (0x1F240, 'M', '〔本〕'),
-    (0x1F241, 'M', '〔三〕'),
-    (0x1F242, 'M', '〔二〕'),
-    (0x1F243, 'M', '〔安〕'),
-    (0x1F244, 'M', '〔点〕'),
-    (0x1F245, 'M', '〔打〕'),
-    (0x1F246, 'M', '〔盗〕'),
-    (0x1F247, 'M', '〔勝〕'),
-    (0x1F248, 'M', '〔敗〕'),
-    (0x1F249, 'X'),
-    (0x1F250, 'M', '得'),
-    (0x1F251, 'M', '可'),
-    (0x1F252, 'X'),
-    (0x1F260, 'V'),
-    (0x1F266, 'X'),
-    (0x1F300, 'V'),
-    (0x1F6D8, 'X'),
-    (0x1F6DC, 'V'),
-    (0x1F6ED, 'X'),
-    (0x1F6F0, 'V'),
-    (0x1F6FD, 'X'),
-    (0x1F700, 'V'),
-    (0x1F777, 'X'),
-    (0x1F77B, 'V'),
-    (0x1F7DA, 'X'),
-    (0x1F7E0, 'V'),
-    (0x1F7EC, 'X'),
-    (0x1F7F0, 'V'),
-    (0x1F7F1, 'X'),
-    (0x1F800, 'V'),
-    (0x1F80C, 'X'),
-    (0x1F810, 'V'),
-    (0x1F848, 'X'),
-    (0x1F850, 'V'),
-    (0x1F85A, 'X'),
-    (0x1F860, 'V'),
-    (0x1F888, 'X'),
-    (0x1F890, 'V'),
-    (0x1F8AE, 'X'),
-    (0x1F8B0, 'V'),
-    (0x1F8B2, 'X'),
-    (0x1F900, 'V'),
-    (0x1FA54, 'X'),
-    (0x1FA60, 'V'),
-    (0x1FA6E, 'X'),
-    (0x1FA70, 'V'),
-    (0x1FA7D, 'X'),
-    (0x1FA80, 'V'),
-    (0x1FA89, 'X'),
+        (0x1F1AE, "X"),
+        (0x1F1E6, "V"),
+        (0x1F200, "M", "ほか"),
+        (0x1F201, "M", "ココ"),
+        (0x1F202, "M", "サ"),
+        (0x1F203, "X"),
+        (0x1F210, "M", "手"),
+        (0x1F211, "M", "字"),
+        (0x1F212, "M", "双"),
+        (0x1F213, "M", "デ"),
+        (0x1F214, "M", "二"),
+        (0x1F215, "M", "多"),
+        (0x1F216, "M", "解"),
+        (0x1F217, "M", "天"),
+        (0x1F218, "M", "交"),
+        (0x1F219, "M", "映"),
+        (0x1F21A, "M", "無"),
+        (0x1F21B, "M", "料"),
+        (0x1F21C, "M", "前"),
+        (0x1F21D, "M", "後"),
+        (0x1F21E, "M", "再"),
+        (0x1F21F, "M", "新"),
+        (0x1F220, "M", "初"),
+        (0x1F221, "M", "終"),
+        (0x1F222, "M", "生"),
+        (0x1F223, "M", "販"),
+        (0x1F224, "M", "声"),
+        (0x1F225, "M", "吹"),
+        (0x1F226, "M", "演"),
+        (0x1F227, "M", "投"),
+        (0x1F228, "M", "捕"),
+        (0x1F229, "M", "一"),
+        (0x1F22A, "M", "三"),
+        (0x1F22B, "M", "遊"),
+        (0x1F22C, "M", "左"),
+        (0x1F22D, "M", "中"),
+        (0x1F22E, "M", "右"),
+        (0x1F22F, "M", "指"),
+        (0x1F230, "M", "走"),
+        (0x1F231, "M", "打"),
+        (0x1F232, "M", "禁"),
+        (0x1F233, "M", "空"),
+        (0x1F234, "M", "合"),
+        (0x1F235, "M", "満"),
+        (0x1F236, "M", "有"),
+        (0x1F237, "M", "月"),
+        (0x1F238, "M", "申"),
+        (0x1F239, "M", "割"),
+        (0x1F23A, "M", "営"),
+        (0x1F23B, "M", "配"),
+        (0x1F23C, "X"),
+        (0x1F240, "M", "〔本〕"),
+        (0x1F241, "M", "〔三〕"),
+        (0x1F242, "M", "〔二〕"),
+        (0x1F243, "M", "〔安〕"),
+        (0x1F244, "M", "〔点〕"),
+        (0x1F245, "M", "〔打〕"),
+        (0x1F246, "M", "〔盗〕"),
+        (0x1F247, "M", "〔勝〕"),
+        (0x1F248, "M", "〔敗〕"),
+        (0x1F249, "X"),
+        (0x1F250, "M", "得"),
+        (0x1F251, "M", "可"),
+        (0x1F252, "X"),
+        (0x1F260, "V"),
+        (0x1F266, "X"),
+        (0x1F300, "V"),
+        (0x1F6D8, "X"),
+        (0x1F6DC, "V"),
+        (0x1F6ED, "X"),
+        (0x1F6F0, "V"),
+        (0x1F6FD, "X"),
+        (0x1F700, "V"),
+        (0x1F777, "X"),
+        (0x1F77B, "V"),
+        (0x1F7DA, "X"),
+        (0x1F7E0, "V"),
+        (0x1F7EC, "X"),
+        (0x1F7F0, "V"),
+        (0x1F7F1, "X"),
+        (0x1F800, "V"),
+        (0x1F80C, "X"),
+        (0x1F810, "V"),
+        (0x1F848, "X"),
+        (0x1F850, "V"),
+        (0x1F85A, "X"),
+        (0x1F860, "V"),
+        (0x1F888, "X"),
+        (0x1F890, "V"),
+        (0x1F8AE, "X"),
+        (0x1F8B0, "V"),
+        (0x1F8B2, "X"),
+        (0x1F900, "V"),
+        (0x1FA54, "X"),
+        (0x1FA60, "V"),
+        (0x1FA6E, "X"),
+        (0x1FA70, "V"),
+        (0x1FA7D, "X"),
+        (0x1FA80, "V"),
+        (0x1FA89, "X"),
     ]
 
+
 def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x1FA90, 'V'),
-    (0x1FABE, 'X'),
-    (0x1FABF, 'V'),
-    (0x1FAC6, 'X'),
-    (0x1FACE, 'V'),
-    (0x1FADC, 'X'),
-    (0x1FAE0, 'V'),
-    (0x1FAE9, 'X'),
-    (0x1FAF0, 'V'),
-    (0x1FAF9, 'X'),
-    (0x1FB00, 'V'),
-    (0x1FB93, 'X'),
-    (0x1FB94, 'V'),
-    (0x1FBCB, 'X'),
-    (0x1FBF0, 'M', '0'),
-    (0x1FBF1, 'M', '1'),
-    (0x1FBF2, 'M', '2'),
-    (0x1FBF3, 'M', '3'),
-    (0x1FBF4, 'M', '4'),
-    (0x1FBF5, 'M', '5'),
-    (0x1FBF6, 'M', '6'),
-    (0x1FBF7, 'M', '7'),
-    (0x1FBF8, 'M', '8'),
-    (0x1FBF9, 'M', '9'),
-    (0x1FBFA, 'X'),
-    (0x20000, 'V'),
-    (0x2A6E0, 'X'),
-    (0x2A700, 'V'),
-    (0x2B73A, 'X'),
-    (0x2B740, 'V'),
-    (0x2B81E, 'X'),
-    (0x2B820, 'V'),
-    (0x2CEA2, 'X'),
-    (0x2CEB0, 'V'),
-    (0x2EBE1, 'X'),
-    (0x2EBF0, 'V'),
-    (0x2EE5E, 'X'),
-    (0x2F800, 'M', '丽'),
-    (0x2F801, 'M', '丸'),
-    (0x2F802, 'M', '乁'),
-    (0x2F803, 'M', '𠄢'),
-    (0x2F804, 'M', '你'),
-    (0x2F805, 'M', '侮'),
-    (0x2F806, 'M', '侻'),
-    (0x2F807, 'M', '倂'),
-    (0x2F808, 'M', '偺'),
-    (0x2F809, 'M', '備'),
-    (0x2F80A, 'M', '僧'),
-    (0x2F80B, 'M', '像'),
-    (0x2F80C, 'M', '㒞'),
-    (0x2F80D, 'M', '𠘺'),
-    (0x2F80E, 'M', '免'),
-    (0x2F80F, 'M', '兔'),
-    (0x2F810, 'M', '兤'),
-    (0x2F811, 'M', '具'),
-    (0x2F812, 'M', '𠔜'),
-    (0x2F813, 'M', '㒹'),
-    (0x2F814, 'M', '內'),
-    (0x2F815, 'M', '再'),
-    (0x2F816, 'M', '𠕋'),
-    (0x2F817, 'M', '冗'),
-    (0x2F818, 'M', '冤'),
-    (0x2F819, 'M', '仌'),
-    (0x2F81A, 'M', '冬'),
-    (0x2F81B, 'M', '况'),
-    (0x2F81C, 'M', '𩇟'),
-    (0x2F81D, 'M', '凵'),
-    (0x2F81E, 'M', '刃'),
-    (0x2F81F, 'M', '㓟'),
-    (0x2F820, 'M', '刻'),
-    (0x2F821, 'M', '剆'),
-    (0x2F822, 'M', '割'),
-    (0x2F823, 'M', '剷'),
-    (0x2F824, 'M', '㔕'),
-    (0x2F825, 'M', '勇'),
-    (0x2F826, 'M', '勉'),
-    (0x2F827, 'M', '勤'),
-    (0x2F828, 'M', '勺'),
-    (0x2F829, 'M', '包'),
-    (0x2F82A, 'M', '匆'),
-    (0x2F82B, 'M', '北'),
-    (0x2F82C, 'M', '卉'),
-    (0x2F82D, 'M', '卑'),
-    (0x2F82E, 'M', '博'),
-    (0x2F82F, 'M', '即'),
-    (0x2F830, 'M', '卽'),
-    (0x2F831, 'M', '卿'),
-    (0x2F834, 'M', '𠨬'),
-    (0x2F835, 'M', '灰'),
-    (0x2F836, 'M', '及'),
-    (0x2F837, 'M', '叟'),
-    (0x2F838, 'M', '𠭣'),
-    (0x2F839, 'M', '叫'),
-    (0x2F83A, 'M', '叱'),
-    (0x2F83B, 'M', '吆'),
-    (0x2F83C, 'M', '咞'),
-    (0x2F83D, 'M', '吸'),
-    (0x2F83E, 'M', '呈'),
-    (0x2F83F, 'M', '周'),
-    (0x2F840, 'M', '咢'),
+        (0x1FA90, "V"),
+        (0x1FABE, "X"),
+        (0x1FABF, "V"),
+        (0x1FAC6, "X"),
+        (0x1FACE, "V"),
+        (0x1FADC, "X"),
+        (0x1FAE0, "V"),
+        (0x1FAE9, "X"),
+        (0x1FAF0, "V"),
+        (0x1FAF9, "X"),
+        (0x1FB00, "V"),
+        (0x1FB93, "X"),
+        (0x1FB94, "V"),
+        (0x1FBCB, "X"),
+        (0x1FBF0, "M", "0"),
+        (0x1FBF1, "M", "1"),
+        (0x1FBF2, "M", "2"),
+        (0x1FBF3, "M", "3"),
+        (0x1FBF4, "M", "4"),
+        (0x1FBF5, "M", "5"),
+        (0x1FBF6, "M", "6"),
+        (0x1FBF7, "M", "7"),
+        (0x1FBF8, "M", "8"),
+        (0x1FBF9, "M", "9"),
+        (0x1FBFA, "X"),
+        (0x20000, "V"),
+        (0x2A6E0, "X"),
+        (0x2A700, "V"),
+        (0x2B73A, "X"),
+        (0x2B740, "V"),
+        (0x2B81E, "X"),
+        (0x2B820, "V"),
+        (0x2CEA2, "X"),
+        (0x2CEB0, "V"),
+        (0x2EBE1, "X"),
+        (0x2EBF0, "V"),
+        (0x2EE5E, "X"),
+        (0x2F800, "M", "丽"),
+        (0x2F801, "M", "丸"),
+        (0x2F802, "M", "乁"),
+        (0x2F803, "M", "𠄢"),
+        (0x2F804, "M", "你"),
+        (0x2F805, "M", "侮"),
+        (0x2F806, "M", "侻"),
+        (0x2F807, "M", "倂"),
+        (0x2F808, "M", "偺"),
+        (0x2F809, "M", "備"),
+        (0x2F80A, "M", "僧"),
+        (0x2F80B, "M", "像"),
+        (0x2F80C, "M", "㒞"),
+        (0x2F80D, "M", "𠘺"),
+        (0x2F80E, "M", "免"),
+        (0x2F80F, "M", "兔"),
+        (0x2F810, "M", "兤"),
+        (0x2F811, "M", "具"),
+        (0x2F812, "M", "𠔜"),
+        (0x2F813, "M", "㒹"),
+        (0x2F814, "M", "內"),
+        (0x2F815, "M", "再"),
+        (0x2F816, "M", "𠕋"),
+        (0x2F817, "M", "冗"),
+        (0x2F818, "M", "冤"),
+        (0x2F819, "M", "仌"),
+        (0x2F81A, "M", "冬"),
+        (0x2F81B, "M", "况"),
+        (0x2F81C, "M", "𩇟"),
+        (0x2F81D, "M", "凵"),
+        (0x2F81E, "M", "刃"),
+        (0x2F81F, "M", "㓟"),
+        (0x2F820, "M", "刻"),
+        (0x2F821, "M", "剆"),
+        (0x2F822, "M", "割"),
+        (0x2F823, "M", "剷"),
+        (0x2F824, "M", "㔕"),
+        (0x2F825, "M", "勇"),
+        (0x2F826, "M", "勉"),
+        (0x2F827, "M", "勤"),
+        (0x2F828, "M", "勺"),
+        (0x2F829, "M", "包"),
+        (0x2F82A, "M", "匆"),
+        (0x2F82B, "M", "北"),
+        (0x2F82C, "M", "卉"),
+        (0x2F82D, "M", "卑"),
+        (0x2F82E, "M", "博"),
+        (0x2F82F, "M", "即"),
+        (0x2F830, "M", "卽"),
+        (0x2F831, "M", "卿"),
+        (0x2F834, "M", "𠨬"),
+        (0x2F835, "M", "灰"),
+        (0x2F836, "M", "及"),
+        (0x2F837, "M", "叟"),
+        (0x2F838, "M", "𠭣"),
+        (0x2F839, "M", "叫"),
+        (0x2F83A, "M", "叱"),
+        (0x2F83B, "M", "吆"),
+        (0x2F83C, "M", "咞"),
+        (0x2F83D, "M", "吸"),
+        (0x2F83E, "M", "呈"),
+        (0x2F83F, "M", "周"),
+        (0x2F840, "M", "咢"),
     ]
 
+
 def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F841, 'M', '哶'),
-    (0x2F842, 'M', '唐'),
-    (0x2F843, 'M', '啓'),
-    (0x2F844, 'M', '啣'),
-    (0x2F845, 'M', '善'),
-    (0x2F847, 'M', '喙'),
-    (0x2F848, 'M', '喫'),
-    (0x2F849, 'M', '喳'),
-    (0x2F84A, 'M', '嗂'),
-    (0x2F84B, 'M', '圖'),
-    (0x2F84C, 'M', '嘆'),
-    (0x2F84D, 'M', '圗'),
-    (0x2F84E, 'M', '噑'),
-    (0x2F84F, 'M', '噴'),
-    (0x2F850, 'M', '切'),
-    (0x2F851, 'M', '壮'),
-    (0x2F852, 'M', '城'),
-    (0x2F853, 'M', '埴'),
-    (0x2F854, 'M', '堍'),
-    (0x2F855, 'M', '型'),
-    (0x2F856, 'M', '堲'),
-    (0x2F857, 'M', '報'),
-    (0x2F858, 'M', '墬'),
-    (0x2F859, 'M', '𡓤'),
-    (0x2F85A, 'M', '売'),
-    (0x2F85B, 'M', '壷'),
-    (0x2F85C, 'M', '夆'),
-    (0x2F85D, 'M', '多'),
-    (0x2F85E, 'M', '夢'),
-    (0x2F85F, 'M', '奢'),
-    (0x2F860, 'M', '𡚨'),
-    (0x2F861, 'M', '𡛪'),
-    (0x2F862, 'M', '姬'),
-    (0x2F863, 'M', '娛'),
-    (0x2F864, 'M', '娧'),
-    (0x2F865, 'M', '姘'),
-    (0x2F866, 'M', '婦'),
-    (0x2F867, 'M', '㛮'),
-    (0x2F868, 'X'),
-    (0x2F869, 'M', '嬈'),
-    (0x2F86A, 'M', '嬾'),
-    (0x2F86C, 'M', '𡧈'),
-    (0x2F86D, 'M', '寃'),
-    (0x2F86E, 'M', '寘'),
-    (0x2F86F, 'M', '寧'),
-    (0x2F870, 'M', '寳'),
-    (0x2F871, 'M', '𡬘'),
-    (0x2F872, 'M', '寿'),
-    (0x2F873, 'M', '将'),
-    (0x2F874, 'X'),
-    (0x2F875, 'M', '尢'),
-    (0x2F876, 'M', '㞁'),
-    (0x2F877, 'M', '屠'),
-    (0x2F878, 'M', '屮'),
-    (0x2F879, 'M', '峀'),
-    (0x2F87A, 'M', '岍'),
-    (0x2F87B, 'M', '𡷤'),
-    (0x2F87C, 'M', '嵃'),
-    (0x2F87D, 'M', '𡷦'),
-    (0x2F87E, 'M', '嵮'),
-    (0x2F87F, 'M', '嵫'),
-    (0x2F880, 'M', '嵼'),
-    (0x2F881, 'M', '巡'),
-    (0x2F882, 'M', '巢'),
-    (0x2F883, 'M', '㠯'),
-    (0x2F884, 'M', '巽'),
-    (0x2F885, 'M', '帨'),
-    (0x2F886, 'M', '帽'),
-    (0x2F887, 'M', '幩'),
-    (0x2F888, 'M', '㡢'),
-    (0x2F889, 'M', '𢆃'),
-    (0x2F88A, 'M', '㡼'),
-    (0x2F88B, 'M', '庰'),
-    (0x2F88C, 'M', '庳'),
-    (0x2F88D, 'M', '庶'),
-    (0x2F88E, 'M', '廊'),
-    (0x2F88F, 'M', '𪎒'),
-    (0x2F890, 'M', '廾'),
-    (0x2F891, 'M', '𢌱'),
-    (0x2F893, 'M', '舁'),
-    (0x2F894, 'M', '弢'),
-    (0x2F896, 'M', '㣇'),
-    (0x2F897, 'M', '𣊸'),
-    (0x2F898, 'M', '𦇚'),
-    (0x2F899, 'M', '形'),
-    (0x2F89A, 'M', '彫'),
-    (0x2F89B, 'M', '㣣'),
-    (0x2F89C, 'M', '徚'),
-    (0x2F89D, 'M', '忍'),
-    (0x2F89E, 'M', '志'),
-    (0x2F89F, 'M', '忹'),
-    (0x2F8A0, 'M', '悁'),
-    (0x2F8A1, 'M', '㤺'),
-    (0x2F8A2, 'M', '㤜'),
-    (0x2F8A3, 'M', '悔'),
-    (0x2F8A4, 'M', '𢛔'),
-    (0x2F8A5, 'M', '惇'),
-    (0x2F8A6, 'M', '慈'),
-    (0x2F8A7, 'M', '慌'),
-    (0x2F8A8, 'M', '慎'),
+        (0x2F841, "M", "哶"),
+        (0x2F842, "M", "唐"),
+        (0x2F843, "M", "啓"),
+        (0x2F844, "M", "啣"),
+        (0x2F845, "M", "善"),
+        (0x2F847, "M", "喙"),
+        (0x2F848, "M", "喫"),
+        (0x2F849, "M", "喳"),
+        (0x2F84A, "M", "嗂"),
+        (0x2F84B, "M", "圖"),
+        (0x2F84C, "M", "嘆"),
+        (0x2F84D, "M", "圗"),
+        (0x2F84E, "M", "噑"),
+        (0x2F84F, "M", "噴"),
+        (0x2F850, "M", "切"),
+        (0x2F851, "M", "壮"),
+        (0x2F852, "M", "城"),
+        (0x2F853, "M", "埴"),
+        (0x2F854, "M", "堍"),
+        (0x2F855, "M", "型"),
+        (0x2F856, "M", "堲"),
+        (0x2F857, "M", "報"),
+        (0x2F858, "M", "墬"),
+        (0x2F859, "M", "𡓤"),
+        (0x2F85A, "M", "売"),
+        (0x2F85B, "M", "壷"),
+        (0x2F85C, "M", "夆"),
+        (0x2F85D, "M", "多"),
+        (0x2F85E, "M", "夢"),
+        (0x2F85F, "M", "奢"),
+        (0x2F860, "M", "𡚨"),
+        (0x2F861, "M", "𡛪"),
+        (0x2F862, "M", "姬"),
+        (0x2F863, "M", "娛"),
+        (0x2F864, "M", "娧"),
+        (0x2F865, "M", "姘"),
+        (0x2F866, "M", "婦"),
+        (0x2F867, "M", "㛮"),
+        (0x2F868, "X"),
+        (0x2F869, "M", "嬈"),
+        (0x2F86A, "M", "嬾"),
+        (0x2F86C, "M", "𡧈"),
+        (0x2F86D, "M", "寃"),
+        (0x2F86E, "M", "寘"),
+        (0x2F86F, "M", "寧"),
+        (0x2F870, "M", "寳"),
+        (0x2F871, "M", "𡬘"),
+        (0x2F872, "M", "寿"),
+        (0x2F873, "M", "将"),
+        (0x2F874, "X"),
+        (0x2F875, "M", "尢"),
+        (0x2F876, "M", "㞁"),
+        (0x2F877, "M", "屠"),
+        (0x2F878, "M", "屮"),
+        (0x2F879, "M", "峀"),
+        (0x2F87A, "M", "岍"),
+        (0x2F87B, "M", "𡷤"),
+        (0x2F87C, "M", "嵃"),
+        (0x2F87D, "M", "𡷦"),
+        (0x2F87E, "M", "嵮"),
+        (0x2F87F, "M", "嵫"),
+        (0x2F880, "M", "嵼"),
+        (0x2F881, "M", "巡"),
+        (0x2F882, "M", "巢"),
+        (0x2F883, "M", "㠯"),
+        (0x2F884, "M", "巽"),
+        (0x2F885, "M", "帨"),
+        (0x2F886, "M", "帽"),
+        (0x2F887, "M", "幩"),
+        (0x2F888, "M", "㡢"),
+        (0x2F889, "M", "𢆃"),
+        (0x2F88A, "M", "㡼"),
+        (0x2F88B, "M", "庰"),
+        (0x2F88C, "M", "庳"),
+        (0x2F88D, "M", "庶"),
+        (0x2F88E, "M", "廊"),
+        (0x2F88F, "M", "𪎒"),
+        (0x2F890, "M", "廾"),
+        (0x2F891, "M", "𢌱"),
+        (0x2F893, "M", "舁"),
+        (0x2F894, "M", "弢"),
+        (0x2F896, "M", "㣇"),
+        (0x2F897, "M", "𣊸"),
+        (0x2F898, "M", "𦇚"),
+        (0x2F899, "M", "形"),
+        (0x2F89A, "M", "彫"),
+        (0x2F89B, "M", "㣣"),
+        (0x2F89C, "M", "徚"),
+        (0x2F89D, "M", "忍"),
+        (0x2F89E, "M", "志"),
+        (0x2F89F, "M", "忹"),
+        (0x2F8A0, "M", "悁"),
+        (0x2F8A1, "M", "㤺"),
+        (0x2F8A2, "M", "㤜"),
+        (0x2F8A3, "M", "悔"),
+        (0x2F8A4, "M", "𢛔"),
+        (0x2F8A5, "M", "惇"),
+        (0x2F8A6, "M", "慈"),
+        (0x2F8A7, "M", "慌"),
+        (0x2F8A8, "M", "慎"),
     ]
 
+
 def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F8A9, 'M', '慌'),
-    (0x2F8AA, 'M', '慺'),
-    (0x2F8AB, 'M', '憎'),
-    (0x2F8AC, 'M', '憲'),
-    (0x2F8AD, 'M', '憤'),
-    (0x2F8AE, 'M', '憯'),
-    (0x2F8AF, 'M', '懞'),
-    (0x2F8B0, 'M', '懲'),
-    (0x2F8B1, 'M', '懶'),
-    (0x2F8B2, 'M', '成'),
-    (0x2F8B3, 'M', '戛'),
-    (0x2F8B4, 'M', '扝'),
-    (0x2F8B5, 'M', '抱'),
-    (0x2F8B6, 'M', '拔'),
-    (0x2F8B7, 'M', '捐'),
-    (0x2F8B8, 'M', '𢬌'),
-    (0x2F8B9, 'M', '挽'),
-    (0x2F8BA, 'M', '拼'),
-    (0x2F8BB, 'M', '捨'),
-    (0x2F8BC, 'M', '掃'),
-    (0x2F8BD, 'M', '揤'),
-    (0x2F8BE, 'M', '𢯱'),
-    (0x2F8BF, 'M', '搢'),
-    (0x2F8C0, 'M', '揅'),
-    (0x2F8C1, 'M', '掩'),
-    (0x2F8C2, 'M', '㨮'),
-    (0x2F8C3, 'M', '摩'),
-    (0x2F8C4, 'M', '摾'),
-    (0x2F8C5, 'M', '撝'),
-    (0x2F8C6, 'M', '摷'),
-    (0x2F8C7, 'M', '㩬'),
-    (0x2F8C8, 'M', '敏'),
-    (0x2F8C9, 'M', '敬'),
-    (0x2F8CA, 'M', '𣀊'),
-    (0x2F8CB, 'M', '旣'),
-    (0x2F8CC, 'M', '書'),
-    (0x2F8CD, 'M', '晉'),
-    (0x2F8CE, 'M', '㬙'),
-    (0x2F8CF, 'M', '暑'),
-    (0x2F8D0, 'M', '㬈'),
-    (0x2F8D1, 'M', '㫤'),
-    (0x2F8D2, 'M', '冒'),
-    (0x2F8D3, 'M', '冕'),
-    (0x2F8D4, 'M', '最'),
-    (0x2F8D5, 'M', '暜'),
-    (0x2F8D6, 'M', '肭'),
-    (0x2F8D7, 'M', '䏙'),
-    (0x2F8D8, 'M', '朗'),
-    (0x2F8D9, 'M', '望'),
-    (0x2F8DA, 'M', '朡'),
-    (0x2F8DB, 'M', '杞'),
-    (0x2F8DC, 'M', '杓'),
-    (0x2F8DD, 'M', '𣏃'),
-    (0x2F8DE, 'M', '㭉'),
-    (0x2F8DF, 'M', '柺'),
-    (0x2F8E0, 'M', '枅'),
-    (0x2F8E1, 'M', '桒'),
-    (0x2F8E2, 'M', '梅'),
-    (0x2F8E3, 'M', '𣑭'),
-    (0x2F8E4, 'M', '梎'),
-    (0x2F8E5, 'M', '栟'),
-    (0x2F8E6, 'M', '椔'),
-    (0x2F8E7, 'M', '㮝'),
-    (0x2F8E8, 'M', '楂'),
-    (0x2F8E9, 'M', '榣'),
-    (0x2F8EA, 'M', '槪'),
-    (0x2F8EB, 'M', '檨'),
-    (0x2F8EC, 'M', '𣚣'),
-    (0x2F8ED, 'M', '櫛'),
-    (0x2F8EE, 'M', '㰘'),
-    (0x2F8EF, 'M', '次'),
-    (0x2F8F0, 'M', '𣢧'),
-    (0x2F8F1, 'M', '歔'),
-    (0x2F8F2, 'M', '㱎'),
-    (0x2F8F3, 'M', '歲'),
-    (0x2F8F4, 'M', '殟'),
-    (0x2F8F5, 'M', '殺'),
-    (0x2F8F6, 'M', '殻'),
-    (0x2F8F7, 'M', '𣪍'),
-    (0x2F8F8, 'M', '𡴋'),
-    (0x2F8F9, 'M', '𣫺'),
-    (0x2F8FA, 'M', '汎'),
-    (0x2F8FB, 'M', '𣲼'),
-    (0x2F8FC, 'M', '沿'),
-    (0x2F8FD, 'M', '泍'),
-    (0x2F8FE, 'M', '汧'),
-    (0x2F8FF, 'M', '洖'),
-    (0x2F900, 'M', '派'),
-    (0x2F901, 'M', '海'),
-    (0x2F902, 'M', '流'),
-    (0x2F903, 'M', '浩'),
-    (0x2F904, 'M', '浸'),
-    (0x2F905, 'M', '涅'),
-    (0x2F906, 'M', '𣴞'),
-    (0x2F907, 'M', '洴'),
-    (0x2F908, 'M', '港'),
-    (0x2F909, 'M', '湮'),
-    (0x2F90A, 'M', '㴳'),
-    (0x2F90B, 'M', '滋'),
-    (0x2F90C, 'M', '滇'),
+        (0x2F8A9, "M", "慌"),
+        (0x2F8AA, "M", "慺"),
+        (0x2F8AB, "M", "憎"),
+        (0x2F8AC, "M", "憲"),
+        (0x2F8AD, "M", "憤"),
+        (0x2F8AE, "M", "憯"),
+        (0x2F8AF, "M", "懞"),
+        (0x2F8B0, "M", "懲"),
+        (0x2F8B1, "M", "懶"),
+        (0x2F8B2, "M", "成"),
+        (0x2F8B3, "M", "戛"),
+        (0x2F8B4, "M", "扝"),
+        (0x2F8B5, "M", "抱"),
+        (0x2F8B6, "M", "拔"),
+        (0x2F8B7, "M", "捐"),
+        (0x2F8B8, "M", "𢬌"),
+        (0x2F8B9, "M", "挽"),
+        (0x2F8BA, "M", "拼"),
+        (0x2F8BB, "M", "捨"),
+        (0x2F8BC, "M", "掃"),
+        (0x2F8BD, "M", "揤"),
+        (0x2F8BE, "M", "𢯱"),
+        (0x2F8BF, "M", "搢"),
+        (0x2F8C0, "M", "揅"),
+        (0x2F8C1, "M", "掩"),
+        (0x2F8C2, "M", "㨮"),
+        (0x2F8C3, "M", "摩"),
+        (0x2F8C4, "M", "摾"),
+        (0x2F8C5, "M", "撝"),
+        (0x2F8C6, "M", "摷"),
+        (0x2F8C7, "M", "㩬"),
+        (0x2F8C8, "M", "敏"),
+        (0x2F8C9, "M", "敬"),
+        (0x2F8CA, "M", "𣀊"),
+        (0x2F8CB, "M", "旣"),
+        (0x2F8CC, "M", "書"),
+        (0x2F8CD, "M", "晉"),
+        (0x2F8CE, "M", "㬙"),
+        (0x2F8CF, "M", "暑"),
+        (0x2F8D0, "M", "㬈"),
+        (0x2F8D1, "M", "㫤"),
+        (0x2F8D2, "M", "冒"),
+        (0x2F8D3, "M", "冕"),
+        (0x2F8D4, "M", "最"),
+        (0x2F8D5, "M", "暜"),
+        (0x2F8D6, "M", "肭"),
+        (0x2F8D7, "M", "䏙"),
+        (0x2F8D8, "M", "朗"),
+        (0x2F8D9, "M", "望"),
+        (0x2F8DA, "M", "朡"),
+        (0x2F8DB, "M", "杞"),
+        (0x2F8DC, "M", "杓"),
+        (0x2F8DD, "M", "𣏃"),
+        (0x2F8DE, "M", "㭉"),
+        (0x2F8DF, "M", "柺"),
+        (0x2F8E0, "M", "枅"),
+        (0x2F8E1, "M", "桒"),
+        (0x2F8E2, "M", "梅"),
+        (0x2F8E3, "M", "𣑭"),
+        (0x2F8E4, "M", "梎"),
+        (0x2F8E5, "M", "栟"),
+        (0x2F8E6, "M", "椔"),
+        (0x2F8E7, "M", "㮝"),
+        (0x2F8E8, "M", "楂"),
+        (0x2F8E9, "M", "榣"),
+        (0x2F8EA, "M", "槪"),
+        (0x2F8EB, "M", "檨"),
+        (0x2F8EC, "M", "𣚣"),
+        (0x2F8ED, "M", "櫛"),
+        (0x2F8EE, "M", "㰘"),
+        (0x2F8EF, "M", "次"),
+        (0x2F8F0, "M", "𣢧"),
+        (0x2F8F1, "M", "歔"),
+        (0x2F8F2, "M", "㱎"),
+        (0x2F8F3, "M", "歲"),
+        (0x2F8F4, "M", "殟"),
+        (0x2F8F5, "M", "殺"),
+        (0x2F8F6, "M", "殻"),
+        (0x2F8F7, "M", "𣪍"),
+        (0x2F8F8, "M", "𡴋"),
+        (0x2F8F9, "M", "𣫺"),
+        (0x2F8FA, "M", "汎"),
+        (0x2F8FB, "M", "𣲼"),
+        (0x2F8FC, "M", "沿"),
+        (0x2F8FD, "M", "泍"),
+        (0x2F8FE, "M", "汧"),
+        (0x2F8FF, "M", "洖"),
+        (0x2F900, "M", "派"),
+        (0x2F901, "M", "海"),
+        (0x2F902, "M", "流"),
+        (0x2F903, "M", "浩"),
+        (0x2F904, "M", "浸"),
+        (0x2F905, "M", "涅"),
+        (0x2F906, "M", "𣴞"),
+        (0x2F907, "M", "洴"),
+        (0x2F908, "M", "港"),
+        (0x2F909, "M", "湮"),
+        (0x2F90A, "M", "㴳"),
+        (0x2F90B, "M", "滋"),
+        (0x2F90C, "M", "滇"),
     ]
 
+
 def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F90D, 'M', '𣻑'),
-    (0x2F90E, 'M', '淹'),
-    (0x2F90F, 'M', '潮'),
-    (0x2F910, 'M', '𣽞'),
-    (0x2F911, 'M', '𣾎'),
-    (0x2F912, 'M', '濆'),
-    (0x2F913, 'M', '瀹'),
-    (0x2F914, 'M', '瀞'),
-    (0x2F915, 'M', '瀛'),
-    (0x2F916, 'M', '㶖'),
-    (0x2F917, 'M', '灊'),
-    (0x2F918, 'M', '災'),
-    (0x2F919, 'M', '灷'),
-    (0x2F91A, 'M', '炭'),
-    (0x2F91B, 'M', '𠔥'),
-    (0x2F91C, 'M', '煅'),
-    (0x2F91D, 'M', '𤉣'),
-    (0x2F91E, 'M', '熜'),
-    (0x2F91F, 'X'),
-    (0x2F920, 'M', '爨'),
-    (0x2F921, 'M', '爵'),
-    (0x2F922, 'M', '牐'),
-    (0x2F923, 'M', '𤘈'),
-    (0x2F924, 'M', '犀'),
-    (0x2F925, 'M', '犕'),
-    (0x2F926, 'M', '𤜵'),
-    (0x2F927, 'M', '𤠔'),
-    (0x2F928, 'M', '獺'),
-    (0x2F929, 'M', '王'),
-    (0x2F92A, 'M', '㺬'),
-    (0x2F92B, 'M', '玥'),
-    (0x2F92C, 'M', '㺸'),
-    (0x2F92E, 'M', '瑇'),
-    (0x2F92F, 'M', '瑜'),
-    (0x2F930, 'M', '瑱'),
-    (0x2F931, 'M', '璅'),
-    (0x2F932, 'M', '瓊'),
-    (0x2F933, 'M', '㼛'),
-    (0x2F934, 'M', '甤'),
-    (0x2F935, 'M', '𤰶'),
-    (0x2F936, 'M', '甾'),
-    (0x2F937, 'M', '𤲒'),
-    (0x2F938, 'M', '異'),
-    (0x2F939, 'M', '𢆟'),
-    (0x2F93A, 'M', '瘐'),
-    (0x2F93B, 'M', '𤾡'),
-    (0x2F93C, 'M', '𤾸'),
-    (0x2F93D, 'M', '𥁄'),
-    (0x2F93E, 'M', '㿼'),
-    (0x2F93F, 'M', '䀈'),
-    (0x2F940, 'M', '直'),
-    (0x2F941, 'M', '𥃳'),
-    (0x2F942, 'M', '𥃲'),
-    (0x2F943, 'M', '𥄙'),
-    (0x2F944, 'M', '𥄳'),
-    (0x2F945, 'M', '眞'),
-    (0x2F946, 'M', '真'),
-    (0x2F948, 'M', '睊'),
-    (0x2F949, 'M', '䀹'),
-    (0x2F94A, 'M', '瞋'),
-    (0x2F94B, 'M', '䁆'),
-    (0x2F94C, 'M', '䂖'),
-    (0x2F94D, 'M', '𥐝'),
-    (0x2F94E, 'M', '硎'),
-    (0x2F94F, 'M', '碌'),
-    (0x2F950, 'M', '磌'),
-    (0x2F951, 'M', '䃣'),
-    (0x2F952, 'M', '𥘦'),
-    (0x2F953, 'M', '祖'),
-    (0x2F954, 'M', '𥚚'),
-    (0x2F955, 'M', '𥛅'),
-    (0x2F956, 'M', '福'),
-    (0x2F957, 'M', '秫'),
-    (0x2F958, 'M', '䄯'),
-    (0x2F959, 'M', '穀'),
-    (0x2F95A, 'M', '穊'),
-    (0x2F95B, 'M', '穏'),
-    (0x2F95C, 'M', '𥥼'),
-    (0x2F95D, 'M', '𥪧'),
-    (0x2F95F, 'X'),
-    (0x2F960, 'M', '䈂'),
-    (0x2F961, 'M', '𥮫'),
-    (0x2F962, 'M', '篆'),
-    (0x2F963, 'M', '築'),
-    (0x2F964, 'M', '䈧'),
-    (0x2F965, 'M', '𥲀'),
-    (0x2F966, 'M', '糒'),
-    (0x2F967, 'M', '䊠'),
-    (0x2F968, 'M', '糨'),
-    (0x2F969, 'M', '糣'),
-    (0x2F96A, 'M', '紀'),
-    (0x2F96B, 'M', '𥾆'),
-    (0x2F96C, 'M', '絣'),
-    (0x2F96D, 'M', '䌁'),
-    (0x2F96E, 'M', '緇'),
-    (0x2F96F, 'M', '縂'),
-    (0x2F970, 'M', '繅'),
-    (0x2F971, 'M', '䌴'),
-    (0x2F972, 'M', '𦈨'),
-    (0x2F973, 'M', '𦉇'),
+        (0x2F90D, "M", "𣻑"),
+        (0x2F90E, "M", "淹"),
+        (0x2F90F, "M", "潮"),
+        (0x2F910, "M", "𣽞"),
+        (0x2F911, "M", "𣾎"),
+        (0x2F912, "M", "濆"),
+        (0x2F913, "M", "瀹"),
+        (0x2F914, "M", "瀞"),
+        (0x2F915, "M", "瀛"),
+        (0x2F916, "M", "㶖"),
+        (0x2F917, "M", "灊"),
+        (0x2F918, "M", "災"),
+        (0x2F919, "M", "灷"),
+        (0x2F91A, "M", "炭"),
+        (0x2F91B, "M", "𠔥"),
+        (0x2F91C, "M", "煅"),
+        (0x2F91D, "M", "𤉣"),
+        (0x2F91E, "M", "熜"),
+        (0x2F91F, "X"),
+        (0x2F920, "M", "爨"),
+        (0x2F921, "M", "爵"),
+        (0x2F922, "M", "牐"),
+        (0x2F923, "M", "𤘈"),
+        (0x2F924, "M", "犀"),
+        (0x2F925, "M", "犕"),
+        (0x2F926, "M", "𤜵"),
+        (0x2F927, "M", "𤠔"),
+        (0x2F928, "M", "獺"),
+        (0x2F929, "M", "王"),
+        (0x2F92A, "M", "㺬"),
+        (0x2F92B, "M", "玥"),
+        (0x2F92C, "M", "㺸"),
+        (0x2F92E, "M", "瑇"),
+        (0x2F92F, "M", "瑜"),
+        (0x2F930, "M", "瑱"),
+        (0x2F931, "M", "璅"),
+        (0x2F932, "M", "瓊"),
+        (0x2F933, "M", "㼛"),
+        (0x2F934, "M", "甤"),
+        (0x2F935, "M", "𤰶"),
+        (0x2F936, "M", "甾"),
+        (0x2F937, "M", "𤲒"),
+        (0x2F938, "M", "異"),
+        (0x2F939, "M", "𢆟"),
+        (0x2F93A, "M", "瘐"),
+        (0x2F93B, "M", "𤾡"),
+        (0x2F93C, "M", "𤾸"),
+        (0x2F93D, "M", "𥁄"),
+        (0x2F93E, "M", "㿼"),
+        (0x2F93F, "M", "䀈"),
+        (0x2F940, "M", "直"),
+        (0x2F941, "M", "𥃳"),
+        (0x2F942, "M", "𥃲"),
+        (0x2F943, "M", "𥄙"),
+        (0x2F944, "M", "𥄳"),
+        (0x2F945, "M", "眞"),
+        (0x2F946, "M", "真"),
+        (0x2F948, "M", "睊"),
+        (0x2F949, "M", "䀹"),
+        (0x2F94A, "M", "瞋"),
+        (0x2F94B, "M", "䁆"),
+        (0x2F94C, "M", "䂖"),
+        (0x2F94D, "M", "𥐝"),
+        (0x2F94E, "M", "硎"),
+        (0x2F94F, "M", "碌"),
+        (0x2F950, "M", "磌"),
+        (0x2F951, "M", "䃣"),
+        (0x2F952, "M", "𥘦"),
+        (0x2F953, "M", "祖"),
+        (0x2F954, "M", "𥚚"),
+        (0x2F955, "M", "𥛅"),
+        (0x2F956, "M", "福"),
+        (0x2F957, "M", "秫"),
+        (0x2F958, "M", "䄯"),
+        (0x2F959, "M", "穀"),
+        (0x2F95A, "M", "穊"),
+        (0x2F95B, "M", "穏"),
+        (0x2F95C, "M", "𥥼"),
+        (0x2F95D, "M", "𥪧"),
+        (0x2F95F, "X"),
+        (0x2F960, "M", "䈂"),
+        (0x2F961, "M", "𥮫"),
+        (0x2F962, "M", "篆"),
+        (0x2F963, "M", "築"),
+        (0x2F964, "M", "䈧"),
+        (0x2F965, "M", "𥲀"),
+        (0x2F966, "M", "糒"),
+        (0x2F967, "M", "䊠"),
+        (0x2F968, "M", "糨"),
+        (0x2F969, "M", "糣"),
+        (0x2F96A, "M", "紀"),
+        (0x2F96B, "M", "𥾆"),
+        (0x2F96C, "M", "絣"),
+        (0x2F96D, "M", "䌁"),
+        (0x2F96E, "M", "緇"),
+        (0x2F96F, "M", "縂"),
+        (0x2F970, "M", "繅"),
+        (0x2F971, "M", "䌴"),
+        (0x2F972, "M", "𦈨"),
+        (0x2F973, "M", "𦉇"),
     ]
 
+
 def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F974, 'M', '䍙'),
-    (0x2F975, 'M', '𦋙'),
-    (0x2F976, 'M', '罺'),
-    (0x2F977, 'M', '𦌾'),
-    (0x2F978, 'M', '羕'),
-    (0x2F979, 'M', '翺'),
-    (0x2F97A, 'M', '者'),
-    (0x2F97B, 'M', '𦓚'),
-    (0x2F97C, 'M', '𦔣'),
-    (0x2F97D, 'M', '聠'),
-    (0x2F97E, 'M', '𦖨'),
-    (0x2F97F, 'M', '聰'),
-    (0x2F980, 'M', '𣍟'),
-    (0x2F981, 'M', '䏕'),
-    (0x2F982, 'M', '育'),
-    (0x2F983, 'M', '脃'),
-    (0x2F984, 'M', '䐋'),
-    (0x2F985, 'M', '脾'),
-    (0x2F986, 'M', '媵'),
-    (0x2F987, 'M', '𦞧'),
-    (0x2F988, 'M', '𦞵'),
-    (0x2F989, 'M', '𣎓'),
-    (0x2F98A, 'M', '𣎜'),
-    (0x2F98B, 'M', '舁'),
-    (0x2F98C, 'M', '舄'),
-    (0x2F98D, 'M', '辞'),
-    (0x2F98E, 'M', '䑫'),
-    (0x2F98F, 'M', '芑'),
-    (0x2F990, 'M', '芋'),
-    (0x2F991, 'M', '芝'),
-    (0x2F992, 'M', '劳'),
-    (0x2F993, 'M', '花'),
-    (0x2F994, 'M', '芳'),
-    (0x2F995, 'M', '芽'),
-    (0x2F996, 'M', '苦'),
-    (0x2F997, 'M', '𦬼'),
-    (0x2F998, 'M', '若'),
-    (0x2F999, 'M', '茝'),
-    (0x2F99A, 'M', '荣'),
-    (0x2F99B, 'M', '莭'),
-    (0x2F99C, 'M', '茣'),
-    (0x2F99D, 'M', '莽'),
-    (0x2F99E, 'M', '菧'),
-    (0x2F99F, 'M', '著'),
-    (0x2F9A0, 'M', '荓'),
-    (0x2F9A1, 'M', '菊'),
-    (0x2F9A2, 'M', '菌'),
-    (0x2F9A3, 'M', '菜'),
-    (0x2F9A4, 'M', '𦰶'),
-    (0x2F9A5, 'M', '𦵫'),
-    (0x2F9A6, 'M', '𦳕'),
-    (0x2F9A7, 'M', '䔫'),
-    (0x2F9A8, 'M', '蓱'),
-    (0x2F9A9, 'M', '蓳'),
-    (0x2F9AA, 'M', '蔖'),
-    (0x2F9AB, 'M', '𧏊'),
-    (0x2F9AC, 'M', '蕤'),
-    (0x2F9AD, 'M', '𦼬'),
-    (0x2F9AE, 'M', '䕝'),
-    (0x2F9AF, 'M', '䕡'),
-    (0x2F9B0, 'M', '𦾱'),
-    (0x2F9B1, 'M', '𧃒'),
-    (0x2F9B2, 'M', '䕫'),
-    (0x2F9B3, 'M', '虐'),
-    (0x2F9B4, 'M', '虜'),
-    (0x2F9B5, 'M', '虧'),
-    (0x2F9B6, 'M', '虩'),
-    (0x2F9B7, 'M', '蚩'),
-    (0x2F9B8, 'M', '蚈'),
-    (0x2F9B9, 'M', '蜎'),
-    (0x2F9BA, 'M', '蛢'),
-    (0x2F9BB, 'M', '蝹'),
-    (0x2F9BC, 'M', '蜨'),
-    (0x2F9BD, 'M', '蝫'),
-    (0x2F9BE, 'M', '螆'),
-    (0x2F9BF, 'X'),
-    (0x2F9C0, 'M', '蟡'),
-    (0x2F9C1, 'M', '蠁'),
-    (0x2F9C2, 'M', '䗹'),
-    (0x2F9C3, 'M', '衠'),
-    (0x2F9C4, 'M', '衣'),
-    (0x2F9C5, 'M', '𧙧'),
-    (0x2F9C6, 'M', '裗'),
-    (0x2F9C7, 'M', '裞'),
-    (0x2F9C8, 'M', '䘵'),
-    (0x2F9C9, 'M', '裺'),
-    (0x2F9CA, 'M', '㒻'),
-    (0x2F9CB, 'M', '𧢮'),
-    (0x2F9CC, 'M', '𧥦'),
-    (0x2F9CD, 'M', '䚾'),
-    (0x2F9CE, 'M', '䛇'),
-    (0x2F9CF, 'M', '誠'),
-    (0x2F9D0, 'M', '諭'),
-    (0x2F9D1, 'M', '變'),
-    (0x2F9D2, 'M', '豕'),
-    (0x2F9D3, 'M', '𧲨'),
-    (0x2F9D4, 'M', '貫'),
-    (0x2F9D5, 'M', '賁'),
-    (0x2F9D6, 'M', '贛'),
-    (0x2F9D7, 'M', '起'),
+        (0x2F974, "M", "䍙"),
+        (0x2F975, "M", "𦋙"),
+        (0x2F976, "M", "罺"),
+        (0x2F977, "M", "𦌾"),
+        (0x2F978, "M", "羕"),
+        (0x2F979, "M", "翺"),
+        (0x2F97A, "M", "者"),
+        (0x2F97B, "M", "𦓚"),
+        (0x2F97C, "M", "𦔣"),
+        (0x2F97D, "M", "聠"),
+        (0x2F97E, "M", "𦖨"),
+        (0x2F97F, "M", "聰"),
+        (0x2F980, "M", "𣍟"),
+        (0x2F981, "M", "䏕"),
+        (0x2F982, "M", "育"),
+        (0x2F983, "M", "脃"),
+        (0x2F984, "M", "䐋"),
+        (0x2F985, "M", "脾"),
+        (0x2F986, "M", "媵"),
+        (0x2F987, "M", "𦞧"),
+        (0x2F988, "M", "𦞵"),
+        (0x2F989, "M", "𣎓"),
+        (0x2F98A, "M", "𣎜"),
+        (0x2F98B, "M", "舁"),
+        (0x2F98C, "M", "舄"),
+        (0x2F98D, "M", "辞"),
+        (0x2F98E, "M", "䑫"),
+        (0x2F98F, "M", "芑"),
+        (0x2F990, "M", "芋"),
+        (0x2F991, "M", "芝"),
+        (0x2F992, "M", "劳"),
+        (0x2F993, "M", "花"),
+        (0x2F994, "M", "芳"),
+        (0x2F995, "M", "芽"),
+        (0x2F996, "M", "苦"),
+        (0x2F997, "M", "𦬼"),
+        (0x2F998, "M", "若"),
+        (0x2F999, "M", "茝"),
+        (0x2F99A, "M", "荣"),
+        (0x2F99B, "M", "莭"),
+        (0x2F99C, "M", "茣"),
+        (0x2F99D, "M", "莽"),
+        (0x2F99E, "M", "菧"),
+        (0x2F99F, "M", "著"),
+        (0x2F9A0, "M", "荓"),
+        (0x2F9A1, "M", "菊"),
+        (0x2F9A2, "M", "菌"),
+        (0x2F9A3, "M", "菜"),
+        (0x2F9A4, "M", "𦰶"),
+        (0x2F9A5, "M", "𦵫"),
+        (0x2F9A6, "M", "𦳕"),
+        (0x2F9A7, "M", "䔫"),
+        (0x2F9A8, "M", "蓱"),
+        (0x2F9A9, "M", "蓳"),
+        (0x2F9AA, "M", "蔖"),
+        (0x2F9AB, "M", "𧏊"),
+        (0x2F9AC, "M", "蕤"),
+        (0x2F9AD, "M", "𦼬"),
+        (0x2F9AE, "M", "䕝"),
+        (0x2F9AF, "M", "䕡"),
+        (0x2F9B0, "M", "𦾱"),
+        (0x2F9B1, "M", "𧃒"),
+        (0x2F9B2, "M", "䕫"),
+        (0x2F9B3, "M", "虐"),
+        (0x2F9B4, "M", "虜"),
+        (0x2F9B5, "M", "虧"),
+        (0x2F9B6, "M", "虩"),
+        (0x2F9B7, "M", "蚩"),
+        (0x2F9B8, "M", "蚈"),
+        (0x2F9B9, "M", "蜎"),
+        (0x2F9BA, "M", "蛢"),
+        (0x2F9BB, "M", "蝹"),
+        (0x2F9BC, "M", "蜨"),
+        (0x2F9BD, "M", "蝫"),
+        (0x2F9BE, "M", "螆"),
+        (0x2F9BF, "X"),
+        (0x2F9C0, "M", "蟡"),
+        (0x2F9C1, "M", "蠁"),
+        (0x2F9C2, "M", "䗹"),
+        (0x2F9C3, "M", "衠"),
+        (0x2F9C4, "M", "衣"),
+        (0x2F9C5, "M", "𧙧"),
+        (0x2F9C6, "M", "裗"),
+        (0x2F9C7, "M", "裞"),
+        (0x2F9C8, "M", "䘵"),
+        (0x2F9C9, "M", "裺"),
+        (0x2F9CA, "M", "㒻"),
+        (0x2F9CB, "M", "𧢮"),
+        (0x2F9CC, "M", "𧥦"),
+        (0x2F9CD, "M", "䚾"),
+        (0x2F9CE, "M", "䛇"),
+        (0x2F9CF, "M", "誠"),
+        (0x2F9D0, "M", "諭"),
+        (0x2F9D1, "M", "變"),
+        (0x2F9D2, "M", "豕"),
+        (0x2F9D3, "M", "𧲨"),
+        (0x2F9D4, "M", "貫"),
+        (0x2F9D5, "M", "賁"),
+        (0x2F9D6, "M", "贛"),
+        (0x2F9D7, "M", "起"),
     ]
 
+
 def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-    (0x2F9D8, 'M', '𧼯'),
-    (0x2F9D9, 'M', '𠠄'),
-    (0x2F9DA, 'M', '跋'),
-    (0x2F9DB, 'M', '趼'),
-    (0x2F9DC, 'M', '跰'),
-    (0x2F9DD, 'M', '𠣞'),
-    (0x2F9DE, 'M', '軔'),
-    (0x2F9DF, 'M', '輸'),
-    (0x2F9E0, 'M', '𨗒'),
-    (0x2F9E1, 'M', '𨗭'),
-    (0x2F9E2, 'M', '邔'),
-    (0x2F9E3, 'M', '郱'),
-    (0x2F9E4, 'M', '鄑'),
-    (0x2F9E5, 'M', '𨜮'),
-    (0x2F9E6, 'M', '鄛'),
-    (0x2F9E7, 'M', '鈸'),
-    (0x2F9E8, 'M', '鋗'),
-    (0x2F9E9, 'M', '鋘'),
-    (0x2F9EA, 'M', '鉼'),
-    (0x2F9EB, 'M', '鏹'),
-    (0x2F9EC, 'M', '鐕'),
-    (0x2F9ED, 'M', '𨯺'),
-    (0x2F9EE, 'M', '開'),
-    (0x2F9EF, 'M', '䦕'),
-    (0x2F9F0, 'M', '閷'),
-    (0x2F9F1, 'M', '𨵷'),
-    (0x2F9F2, 'M', '䧦'),
-    (0x2F9F3, 'M', '雃'),
-    (0x2F9F4, 'M', '嶲'),
-    (0x2F9F5, 'M', '霣'),
-    (0x2F9F6, 'M', '𩅅'),
-    (0x2F9F7, 'M', '𩈚'),
-    (0x2F9F8, 'M', '䩮'),
-    (0x2F9F9, 'M', '䩶'),
-    (0x2F9FA, 'M', '韠'),
-    (0x2F9FB, 'M', '𩐊'),
-    (0x2F9FC, 'M', '䪲'),
-    (0x2F9FD, 'M', '𩒖'),
-    (0x2F9FE, 'M', '頋'),
-    (0x2FA00, 'M', '頩'),
-    (0x2FA01, 'M', '𩖶'),
-    (0x2FA02, 'M', '飢'),
-    (0x2FA03, 'M', '䬳'),
-    (0x2FA04, 'M', '餩'),
-    (0x2FA05, 'M', '馧'),
-    (0x2FA06, 'M', '駂'),
-    (0x2FA07, 'M', '駾'),
-    (0x2FA08, 'M', '䯎'),
-    (0x2FA09, 'M', '𩬰'),
-    (0x2FA0A, 'M', '鬒'),
-    (0x2FA0B, 'M', '鱀'),
-    (0x2FA0C, 'M', '鳽'),
-    (0x2FA0D, 'M', '䳎'),
-    (0x2FA0E, 'M', '䳭'),
-    (0x2FA0F, 'M', '鵧'),
-    (0x2FA10, 'M', '𪃎'),
-    (0x2FA11, 'M', '䳸'),
-    (0x2FA12, 'M', '𪄅'),
-    (0x2FA13, 'M', '𪈎'),
-    (0x2FA14, 'M', '𪊑'),
-    (0x2FA15, 'M', '麻'),
-    (0x2FA16, 'M', '䵖'),
-    (0x2FA17, 'M', '黹'),
-    (0x2FA18, 'M', '黾'),
-    (0x2FA19, 'M', '鼅'),
-    (0x2FA1A, 'M', '鼏'),
-    (0x2FA1B, 'M', '鼖'),
-    (0x2FA1C, 'M', '鼻'),
-    (0x2FA1D, 'M', '𪘀'),
-    (0x2FA1E, 'X'),
-    (0x30000, 'V'),
-    (0x3134B, 'X'),
-    (0x31350, 'V'),
-    (0x323B0, 'X'),
-    (0xE0100, 'I'),
-    (0xE01F0, 'X'),
+        (0x2F9D8, "M", "𧼯"),
+        (0x2F9D9, "M", "𠠄"),
+        (0x2F9DA, "M", "跋"),
+        (0x2F9DB, "M", "趼"),
+        (0x2F9DC, "M", "跰"),
+        (0x2F9DD, "M", "𠣞"),
+        (0x2F9DE, "M", "軔"),
+        (0x2F9DF, "M", "輸"),
+        (0x2F9E0, "M", "𨗒"),
+        (0x2F9E1, "M", "𨗭"),
+        (0x2F9E2, "M", "邔"),
+        (0x2F9E3, "M", "郱"),
+        (0x2F9E4, "M", "鄑"),
+        (0x2F9E5, "M", "𨜮"),
+        (0x2F9E6, "M", "鄛"),
+        (0x2F9E7, "M", "鈸"),
+        (0x2F9E8, "M", "鋗"),
+        (0x2F9E9, "M", "鋘"),
+        (0x2F9EA, "M", "鉼"),
+        (0x2F9EB, "M", "鏹"),
+        (0x2F9EC, "M", "鐕"),
+        (0x2F9ED, "M", "𨯺"),
+        (0x2F9EE, "M", "開"),
+        (0x2F9EF, "M", "䦕"),
+        (0x2F9F0, "M", "閷"),
+        (0x2F9F1, "M", "𨵷"),
+        (0x2F9F2, "M", "䧦"),
+        (0x2F9F3, "M", "雃"),
+        (0x2F9F4, "M", "嶲"),
+        (0x2F9F5, "M", "霣"),
+        (0x2F9F6, "M", "𩅅"),
+        (0x2F9F7, "M", "𩈚"),
+        (0x2F9F8, "M", "䩮"),
+        (0x2F9F9, "M", "䩶"),
+        (0x2F9FA, "M", "韠"),
+        (0x2F9FB, "M", "𩐊"),
+        (0x2F9FC, "M", "䪲"),
+        (0x2F9FD, "M", "𩒖"),
+        (0x2F9FE, "M", "頋"),
+        (0x2FA00, "M", "頩"),
+        (0x2FA01, "M", "𩖶"),
+        (0x2FA02, "M", "飢"),
+        (0x2FA03, "M", "䬳"),
+        (0x2FA04, "M", "餩"),
+        (0x2FA05, "M", "馧"),
+        (0x2FA06, "M", "駂"),
+        (0x2FA07, "M", "駾"),
+        (0x2FA08, "M", "䯎"),
+        (0x2FA09, "M", "𩬰"),
+        (0x2FA0A, "M", "鬒"),
+        (0x2FA0B, "M", "鱀"),
+        (0x2FA0C, "M", "鳽"),
+        (0x2FA0D, "M", "䳎"),
+        (0x2FA0E, "M", "䳭"),
+        (0x2FA0F, "M", "鵧"),
+        (0x2FA10, "M", "𪃎"),
+        (0x2FA11, "M", "䳸"),
+        (0x2FA12, "M", "𪄅"),
+        (0x2FA13, "M", "𪈎"),
+        (0x2FA14, "M", "𪊑"),
+        (0x2FA15, "M", "麻"),
+        (0x2FA16, "M", "䵖"),
+        (0x2FA17, "M", "黹"),
+        (0x2FA18, "M", "黾"),
+        (0x2FA19, "M", "鼅"),
+        (0x2FA1A, "M", "鼏"),
+        (0x2FA1B, "M", "鼖"),
+        (0x2FA1C, "M", "鼻"),
+        (0x2FA1D, "M", "𪘀"),
+        (0x2FA1E, "X"),
+        (0x30000, "V"),
+        (0x3134B, "X"),
+        (0x31350, "V"),
+        (0x323B0, "X"),
+        (0xE0100, "I"),
+        (0xE01F0, "X"),
     ]
 
+
 uts46data = tuple(
     _seg_0()
     + _seg_1()
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index dbcdf7135f0..3bea515e18c 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -7,7 +7,7 @@ platformdirs==4.3.6
 pyproject-hooks==1.0.0
 requests==2.32.3
     certifi==2024.8.30
-    idna==3.7
+    idna==3.10
     urllib3==1.26.20
 rich==13.7.1
     pygments==2.18.0

From 0daddaf38eb28eb2174dd171fb238be047823f5c Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 9 Nov 2024 20:26:33 -0500
Subject: [PATCH 619/992] Upgrade rich to 13.9.4

---
 news/rich.vendor.rst                   |  1 +
 src/pip/_vendor/rich/_inspect.py       |  2 -
 src/pip/_vendor/rich/_null_file.py     |  2 +-
 src/pip/_vendor/rich/_win32_console.py |  7 +-
 src/pip/_vendor/rich/align.py          |  1 +
 src/pip/_vendor/rich/ansi.py           |  1 +
 src/pip/_vendor/rich/cells.py          | 53 ++++++++------
 src/pip/_vendor/rich/color.py          |  4 +-
 src/pip/_vendor/rich/console.py        | 82 ++++++++++++++--------
 src/pip/_vendor/rich/default_styles.py |  3 +-
 src/pip/_vendor/rich/filesize.py       |  3 +-
 src/pip/_vendor/rich/highlighter.py    |  2 +-
 src/pip/_vendor/rich/live.py           |  2 +-
 src/pip/_vendor/rich/logging.py        |  8 +++
 src/pip/_vendor/rich/padding.py        | 10 +--
 src/pip/_vendor/rich/panel.py          | 20 ++++--
 src/pip/_vendor/rich/pretty.py         | 71 ++++++++++++-------
 src/pip/_vendor/rich/progress.py       | 34 ++++++---
 src/pip/_vendor/rich/progress_bar.py   |  2 +-
 src/pip/_vendor/rich/prompt.py         | 33 +++++++--
 src/pip/_vendor/rich/segment.py        | 52 +++++++++-----
 src/pip/_vendor/rich/spinner.py        |  1 +
 src/pip/_vendor/rich/style.py          |  2 +-
 src/pip/_vendor/rich/syntax.py         | 24 ++++---
 src/pip/_vendor/rich/table.py          | 23 +++---
 src/pip/_vendor/rich/text.py           | 16 +++--
 src/pip/_vendor/rich/theme.py          |  4 +-
 src/pip/_vendor/rich/traceback.py      | 96 +++++++++++++++++++-------
 src/pip/_vendor/rich/tree.py           | 24 ++++---
 src/pip/_vendor/vendor.txt             |  2 +-
 30 files changed, 391 insertions(+), 194 deletions(-)
 create mode 100644 news/rich.vendor.rst

diff --git a/news/rich.vendor.rst b/news/rich.vendor.rst
new file mode 100644
index 00000000000..046c0d8b43c
--- /dev/null
+++ b/news/rich.vendor.rst
@@ -0,0 +1 @@
+Upgrade rich to 13.9.4
diff --git a/src/pip/_vendor/rich/_inspect.py b/src/pip/_vendor/rich/_inspect.py
index 30446ceb3f0..e87698d1fa8 100644
--- a/src/pip/_vendor/rich/_inspect.py
+++ b/src/pip/_vendor/rich/_inspect.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import inspect
 from inspect import cleandoc, getdoc, getfile, isclass, ismodule, signature
 from typing import Any, Collection, Iterable, Optional, Tuple, Type, Union
diff --git a/src/pip/_vendor/rich/_null_file.py b/src/pip/_vendor/rich/_null_file.py
index b659673ef3c..6ae05d3e2a9 100644
--- a/src/pip/_vendor/rich/_null_file.py
+++ b/src/pip/_vendor/rich/_null_file.py
@@ -46,7 +46,7 @@ def __iter__(self) -> Iterator[str]:
         return iter([""])
 
     def __enter__(self) -> IO[str]:
-        pass
+        return self
 
     def __exit__(
         self,
diff --git a/src/pip/_vendor/rich/_win32_console.py b/src/pip/_vendor/rich/_win32_console.py
index 81b10829053..2eba1b9b4ab 100644
--- a/src/pip/_vendor/rich/_win32_console.py
+++ b/src/pip/_vendor/rich/_win32_console.py
@@ -2,6 +2,7 @@
 
 The API that this module wraps is documented at https://docs.microsoft.com/en-us/windows/console/console-functions
 """
+
 import ctypes
 import sys
 from typing import Any
@@ -380,7 +381,7 @@ def cursor_position(self) -> WindowsCoordinates:
             WindowsCoordinates: The current cursor position.
         """
         coord: COORD = GetConsoleScreenBufferInfo(self._handle).dwCursorPosition
-        return WindowsCoordinates(row=cast(int, coord.Y), col=cast(int, coord.X))
+        return WindowsCoordinates(row=coord.Y, col=coord.X)
 
     @property
     def screen_size(self) -> WindowsCoordinates:
@@ -390,9 +391,7 @@ def screen_size(self) -> WindowsCoordinates:
             WindowsCoordinates: The width and height of the screen as WindowsCoordinates.
         """
         screen_size: COORD = GetConsoleScreenBufferInfo(self._handle).dwSize
-        return WindowsCoordinates(
-            row=cast(int, screen_size.Y), col=cast(int, screen_size.X)
-        )
+        return WindowsCoordinates(row=screen_size.Y, col=screen_size.X)
 
     def write_text(self, text: str) -> None:
         """Write text directly to the terminal without any modification of styles
diff --git a/src/pip/_vendor/rich/align.py b/src/pip/_vendor/rich/align.py
index f7b734fd728..330dcc51192 100644
--- a/src/pip/_vendor/rich/align.py
+++ b/src/pip/_vendor/rich/align.py
@@ -240,6 +240,7 @@ class VerticalCenter(JupyterMixin):
 
     Args:
         renderable (RenderableType): A renderable object.
+        style (StyleType, optional): An optional style to apply to the background. Defaults to None.
     """
 
     def __init__(
diff --git a/src/pip/_vendor/rich/ansi.py b/src/pip/_vendor/rich/ansi.py
index 66365e65360..7de86ce5043 100644
--- a/src/pip/_vendor/rich/ansi.py
+++ b/src/pip/_vendor/rich/ansi.py
@@ -9,6 +9,7 @@
 
 re_ansi = re.compile(
     r"""
+(?:\x1b[0-?])|
 (?:\x1b\](.*?)\x1b\\)|
 (?:\x1b([(@-Z\\-_]|\[[0-?]*[ -/]*[@-~]))
 """,
diff --git a/src/pip/_vendor/rich/cells.py b/src/pip/_vendor/rich/cells.py
index f85f928f75e..a85462271c9 100644
--- a/src/pip/_vendor/rich/cells.py
+++ b/src/pip/_vendor/rich/cells.py
@@ -1,13 +1,33 @@
 from __future__ import annotations
 
-import re
 from functools import lru_cache
 from typing import Callable
 
 from ._cell_widths import CELL_WIDTHS
 
-# Regex to match sequence of the most common character ranges
-_is_single_cell_widths = re.compile("^[\u0020-\u006f\u00a0\u02ff\u0370-\u0482]*$").match
+# Ranges of unicode ordinals that produce a 1-cell wide character
+# This is non-exhaustive, but covers most common Western characters
+_SINGLE_CELL_UNICODE_RANGES: list[tuple[int, int]] = [
+    (0x20, 0x7E),  # Latin (excluding non-printable)
+    (0xA0, 0xAC),
+    (0xAE, 0x002FF),
+    (0x00370, 0x00482),  # Greek / Cyrillic
+    (0x02500, 0x025FC),  # Box drawing, box elements, geometric shapes
+    (0x02800, 0x028FF),  # Braille
+]
+
+# A set of characters that are a single cell wide
+_SINGLE_CELLS = frozenset(
+    [
+        character
+        for _start, _end in _SINGLE_CELL_UNICODE_RANGES
+        for character in map(chr, range(_start, _end + 1))
+    ]
+)
+
+# When called with a string this will return True if all
+# characters are single-cell, otherwise False
+_is_single_cell_widths: Callable[[str], bool] = _SINGLE_CELLS.issuperset
 
 
 @lru_cache(4096)
@@ -23,9 +43,9 @@ def cached_cell_len(text: str) -> int:
     Returns:
         int: Get the number of cells required to display text.
     """
-    _get_size = get_character_cell_size
-    total_size = sum(_get_size(character) for character in text)
-    return total_size
+    if _is_single_cell_widths(text):
+        return len(text)
+    return sum(map(get_character_cell_size, text))
 
 
 def cell_len(text: str, _cell_len: Callable[[str], int] = cached_cell_len) -> int:
@@ -39,9 +59,9 @@ def cell_len(text: str, _cell_len: Callable[[str], int] = cached_cell_len) -> in
     """
     if len(text) < 512:
         return _cell_len(text)
-    _get_size = get_character_cell_size
-    total_size = sum(_get_size(character) for character in text)
-    return total_size
+    if _is_single_cell_widths(text):
+        return len(text)
+    return sum(map(get_character_cell_size, text))
 
 
 @lru_cache(maxsize=4096)
@@ -54,20 +74,7 @@ def get_character_cell_size(character: str) -> int:
     Returns:
         int: Number of cells (0, 1 or 2) occupied by that character.
     """
-    return _get_codepoint_cell_size(ord(character))
-
-
-@lru_cache(maxsize=4096)
-def _get_codepoint_cell_size(codepoint: int) -> int:
-    """Get the cell size of a character.
-
-    Args:
-        codepoint (int): Codepoint of a character.
-
-    Returns:
-        int: Number of cells (0, 1 or 2) occupied by that character.
-    """
-
+    codepoint = ord(character)
     _table = CELL_WIDTHS
     lower_bound = 0
     upper_bound = len(_table) - 1
diff --git a/src/pip/_vendor/rich/color.py b/src/pip/_vendor/rich/color.py
index 4270a278d59..e2c23a6a91b 100644
--- a/src/pip/_vendor/rich/color.py
+++ b/src/pip/_vendor/rich/color.py
@@ -1,5 +1,5 @@
-import platform
 import re
+import sys
 from colorsys import rgb_to_hls
 from enum import IntEnum
 from functools import lru_cache
@@ -15,7 +15,7 @@
     from .text import Text
 
 
-WINDOWS = platform.system() == "Windows"
+WINDOWS = sys.platform == "win32"
 
 
 class ColorSystem(IntEnum):
diff --git a/src/pip/_vendor/rich/console.py b/src/pip/_vendor/rich/console.py
index a11c7c137f0..572884542a1 100644
--- a/src/pip/_vendor/rich/console.py
+++ b/src/pip/_vendor/rich/console.py
@@ -1,6 +1,5 @@
 import inspect
 import os
-import platform
 import sys
 import threading
 import zlib
@@ -76,7 +75,7 @@
 
 JUPYTER_DEFAULT_COLUMNS = 115
 JUPYTER_DEFAULT_LINES = 100
-WINDOWS = platform.system() == "Windows"
+WINDOWS = sys.platform == "win32"
 
 HighlighterType = Callable[[Union[str, "Text"]], "Text"]
 JustifyMethod = Literal["default", "left", "center", "right", "full"]
@@ -90,15 +89,15 @@ class NoChange:
 NO_CHANGE = NoChange()
 
 try:
-    _STDIN_FILENO = sys.__stdin__.fileno()
+    _STDIN_FILENO = sys.__stdin__.fileno()  # type: ignore[union-attr]
 except Exception:
     _STDIN_FILENO = 0
 try:
-    _STDOUT_FILENO = sys.__stdout__.fileno()
+    _STDOUT_FILENO = sys.__stdout__.fileno()  # type: ignore[union-attr]
 except Exception:
     _STDOUT_FILENO = 1
 try:
-    _STDERR_FILENO = sys.__stderr__.fileno()
+    _STDERR_FILENO = sys.__stderr__.fileno()  # type: ignore[union-attr]
 except Exception:
     _STDERR_FILENO = 2
 
@@ -1006,19 +1005,14 @@ def size(self) -> ConsoleDimensions:
         width: Optional[int] = None
         height: Optional[int] = None
 
-        if WINDOWS:  # pragma: no cover
+        streams = _STD_STREAMS_OUTPUT if WINDOWS else _STD_STREAMS
+        for file_descriptor in streams:
             try:
-                width, height = os.get_terminal_size()
+                width, height = os.get_terminal_size(file_descriptor)
             except (AttributeError, ValueError, OSError):  # Probably not a terminal
                 pass
-        else:
-            for file_descriptor in _STD_STREAMS:
-                try:
-                    width, height = os.get_terminal_size(file_descriptor)
-                except (AttributeError, ValueError, OSError):
-                    pass
-                else:
-                    break
+            else:
+                break
 
         columns = self._environ.get("COLUMNS")
         if columns is not None and columns.isdigit():
@@ -1309,7 +1303,7 @@ def render(
 
         renderable = rich_cast(renderable)
         if hasattr(renderable, "__rich_console__") and not isclass(renderable):
-            render_iterable = renderable.__rich_console__(self, _options)  # type: ignore[union-attr]
+            render_iterable = renderable.__rich_console__(self, _options)
         elif isinstance(renderable, str):
             text_renderable = self.render_str(
                 renderable, highlight=_options.highlight, markup=_options.markup
@@ -1386,9 +1380,14 @@ def render_lines(
                 extra_lines = render_options.height - len(lines)
                 if extra_lines > 0:
                     pad_line = [
-                        [Segment(" " * render_options.max_width, style), Segment("\n")]
-                        if new_lines
-                        else [Segment(" " * render_options.max_width, style)]
+                        (
+                            [
+                                Segment(" " * render_options.max_width, style),
+                                Segment("\n"),
+                            ]
+                            if new_lines
+                            else [Segment(" " * render_options.max_width, style)]
+                        )
                     ]
                     lines.extend(pad_line * extra_lines)
 
@@ -1437,9 +1436,11 @@ def render_str(
             rich_text.overflow = overflow
         else:
             rich_text = Text(
-                _emoji_replace(text, default_variant=self._emoji_variant)
-                if emoji_enabled
-                else text,
+                (
+                    _emoji_replace(text, default_variant=self._emoji_variant)
+                    if emoji_enabled
+                    else text
+                ),
                 justify=justify,
                 overflow=overflow,
                 style=style,
@@ -1536,7 +1537,11 @@ def check_text() -> None:
             if isinstance(renderable, str):
                 append_text(
                     self.render_str(
-                        renderable, emoji=emoji, markup=markup, highlighter=_highlighter
+                        renderable,
+                        emoji=emoji,
+                        markup=markup,
+                        highlight=highlight,
+                        highlighter=_highlighter,
                     )
                 )
             elif isinstance(renderable, Text):
@@ -1986,6 +1991,20 @@ def log(
             ):
                 buffer_extend(line)
 
+    def on_broken_pipe(self) -> None:
+        """This function is called when a `BrokenPipeError` is raised.
+
+        This can occur when piping Textual output in Linux and macOS.
+        The default implementation is to exit the app, but you could implement
+        this method in a subclass to change the behavior.
+
+        See https://docs.python.org/3/library/signal.html#note-on-sigpipe for details.
+        """
+        self.quiet = True
+        devnull = os.open(os.devnull, os.O_WRONLY)
+        os.dup2(devnull, sys.stdout.fileno())
+        raise SystemExit(1)
+
     def _check_buffer(self) -> None:
         """Check if the buffer may be rendered. Render it if it can (e.g. Console.quiet is False)
         Rendering is supported on Windows, Unix and Jupyter environments. For
@@ -1995,8 +2014,17 @@ def _check_buffer(self) -> None:
         if self.quiet:
             del self._buffer[:]
             return
+
+        try:
+            self._write_buffer()
+        except BrokenPipeError:
+            self.on_broken_pipe()
+
+    def _write_buffer(self) -> None:
+        """Write the buffer to the output file."""
+
         with self._lock:
-            if self.record:
+            if self.record and not self._buffer_index:
                 with self._record_buffer_lock:
                     self._record_buffer.extend(self._buffer[:])
 
@@ -2166,7 +2194,7 @@ def save_text(self, path: str, *, clear: bool = True, styles: bool = False) -> N
 
         """
         text = self.export_text(clear=clear, styles=styles)
-        with open(path, "wt", encoding="utf-8") as write_file:
+        with open(path, "w", encoding="utf-8") as write_file:
             write_file.write(text)
 
     def export_html(
@@ -2272,7 +2300,7 @@ def save_html(
             code_format=code_format,
             inline_styles=inline_styles,
         )
-        with open(path, "wt", encoding="utf-8") as write_file:
+        with open(path, "w", encoding="utf-8") as write_file:
             write_file.write(html)
 
     def export_svg(
@@ -2561,7 +2589,7 @@ def save_svg(
             font_aspect_ratio=font_aspect_ratio,
             unique_id=unique_id,
         )
-        with open(path, "wt", encoding="utf-8") as write_file:
+        with open(path, "w", encoding="utf-8") as write_file:
             write_file.write(svg)
 
 
diff --git a/src/pip/_vendor/rich/default_styles.py b/src/pip/_vendor/rich/default_styles.py
index dca37193abf..6c0d73231d8 100644
--- a/src/pip/_vendor/rich/default_styles.py
+++ b/src/pip/_vendor/rich/default_styles.py
@@ -54,7 +54,7 @@
     "logging.level.notset": Style(dim=True),
     "logging.level.debug": Style(color="green"),
     "logging.level.info": Style(color="blue"),
-    "logging.level.warning": Style(color="red"),
+    "logging.level.warning": Style(color="yellow"),
     "logging.level.error": Style(color="red", bold=True),
     "logging.level.critical": Style(color="red", bold=True, reverse=True),
     "log.level": Style.null(),
@@ -120,6 +120,7 @@
     "traceback.exc_type": Style(color="bright_red", bold=True),
     "traceback.exc_value": Style.null(),
     "traceback.offset": Style(color="bright_red", bold=True),
+    "traceback.error_range": Style(underline=True, bold=True, dim=False),
     "bar.back": Style(color="grey23"),
     "bar.complete": Style(color="rgb(249,38,114)"),
     "bar.finished": Style(color="rgb(114,156,31)"),
diff --git a/src/pip/_vendor/rich/filesize.py b/src/pip/_vendor/rich/filesize.py
index 99f118e2010..83bc9118d2b 100644
--- a/src/pip/_vendor/rich/filesize.py
+++ b/src/pip/_vendor/rich/filesize.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 """Functions for reporting filesizes. Borrowed from https://github.com/PyFilesystem/pyfilesystem2
 
 The functions declared in this module should cover the different
@@ -27,7 +26,7 @@ def _to_str(
     if size == 1:
         return "1 byte"
     elif size < base:
-        return "{:,} bytes".format(size)
+        return f"{size:,} bytes"
 
     for i, suffix in enumerate(suffixes, 2):  # noqa: B007
         unit = base**i
diff --git a/src/pip/_vendor/rich/highlighter.py b/src/pip/_vendor/rich/highlighter.py
index 27714b25b40..e4c462e2b63 100644
--- a/src/pip/_vendor/rich/highlighter.py
+++ b/src/pip/_vendor/rich/highlighter.py
@@ -98,7 +98,7 @@ class ReprHighlighter(RegexHighlighter):
             r"(?P(?\B(/[-\w._+]+)*\/)(?P[-\w._+]*)?",
             r"(?b?'''.*?(?(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#~]*)",
+            r"(?P(file|https|http|ws|wss)://[-0-9a-zA-Z$_+!`(),.?/;:&=%#~@]*)",
         ),
     ]
 
diff --git a/src/pip/_vendor/rich/live.py b/src/pip/_vendor/rich/live.py
index f0529a781cf..8738cf09f49 100644
--- a/src/pip/_vendor/rich/live.py
+++ b/src/pip/_vendor/rich/live.py
@@ -37,7 +37,7 @@ class Live(JupyterMixin, RenderHook):
 
     Args:
         renderable (RenderableType, optional): The renderable to live display. Defaults to displaying nothing.
-        console (Console, optional): Optional Console instance. Default will an internal Console instance writing to stdout.
+        console (Console, optional): Optional Console instance. Defaults to an internal Console instance writing to stdout.
         screen (bool, optional): Enable alternate screen mode. Defaults to False.
         auto_refresh (bool, optional): Enable auto refresh. If disabled, you will need to call `refresh()` or `update()` with refresh flag. Defaults to True
         refresh_per_second (float, optional): Number of times per second to refresh the live display. Defaults to 4.
diff --git a/src/pip/_vendor/rich/logging.py b/src/pip/_vendor/rich/logging.py
index 91368dda78a..ff8d5d95f49 100644
--- a/src/pip/_vendor/rich/logging.py
+++ b/src/pip/_vendor/rich/logging.py
@@ -36,11 +36,13 @@ class RichHandler(Handler):
         markup (bool, optional): Enable console markup in log messages. Defaults to False.
         rich_tracebacks (bool, optional): Enable rich tracebacks with syntax highlighting and formatting. Defaults to False.
         tracebacks_width (Optional[int], optional): Number of characters used to render tracebacks, or None for full width. Defaults to None.
+        tracebacks_code_width (int, optional): Number of code characters used to render tracebacks, or None for full width. Defaults to 88.
         tracebacks_extra_lines (int, optional): Additional lines of code to render tracebacks, or None for full width. Defaults to None.
         tracebacks_theme (str, optional): Override pygments theme used in traceback.
         tracebacks_word_wrap (bool, optional): Enable word wrapping of long tracebacks lines. Defaults to True.
         tracebacks_show_locals (bool, optional): Enable display of locals in tracebacks. Defaults to False.
         tracebacks_suppress (Sequence[Union[str, ModuleType]]): Optional sequence of modules or paths to exclude from traceback.
+        tracebacks_max_frames (int, optional): Optional maximum number of frames returned by traceback.
         locals_max_length (int, optional): Maximum length of containers before abbreviating, or None for no abbreviation.
             Defaults to 10.
         locals_max_string (int, optional): Maximum length of string before truncating, or None to disable. Defaults to 80.
@@ -74,11 +76,13 @@ def __init__(
         markup: bool = False,
         rich_tracebacks: bool = False,
         tracebacks_width: Optional[int] = None,
+        tracebacks_code_width: int = 88,
         tracebacks_extra_lines: int = 3,
         tracebacks_theme: Optional[str] = None,
         tracebacks_word_wrap: bool = True,
         tracebacks_show_locals: bool = False,
         tracebacks_suppress: Iterable[Union[str, ModuleType]] = (),
+        tracebacks_max_frames: int = 100,
         locals_max_length: int = 10,
         locals_max_string: int = 80,
         log_time_format: Union[str, FormatTimeCallable] = "[%x %X]",
@@ -104,6 +108,8 @@ def __init__(
         self.tracebacks_word_wrap = tracebacks_word_wrap
         self.tracebacks_show_locals = tracebacks_show_locals
         self.tracebacks_suppress = tracebacks_suppress
+        self.tracebacks_max_frames = tracebacks_max_frames
+        self.tracebacks_code_width = tracebacks_code_width
         self.locals_max_length = locals_max_length
         self.locals_max_string = locals_max_string
         self.keywords = keywords
@@ -140,6 +146,7 @@ def emit(self, record: LogRecord) -> None:
                 exc_value,
                 exc_traceback,
                 width=self.tracebacks_width,
+                code_width=self.tracebacks_code_width,
                 extra_lines=self.tracebacks_extra_lines,
                 theme=self.tracebacks_theme,
                 word_wrap=self.tracebacks_word_wrap,
@@ -147,6 +154,7 @@ def emit(self, record: LogRecord) -> None:
                 locals_max_length=self.locals_max_length,
                 locals_max_string=self.locals_max_string,
                 suppress=self.tracebacks_suppress,
+                max_frames=self.tracebacks_max_frames,
             )
             message = record.getMessage()
             if self.formatter:
diff --git a/src/pip/_vendor/rich/padding.py b/src/pip/_vendor/rich/padding.py
index 1b2204f59f2..0161cd18219 100644
--- a/src/pip/_vendor/rich/padding.py
+++ b/src/pip/_vendor/rich/padding.py
@@ -1,4 +1,4 @@
-from typing import cast, List, Optional, Tuple, TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, List, Optional, Tuple, Union
 
 if TYPE_CHECKING:
     from .console import (
@@ -7,11 +7,11 @@
         RenderableType,
         RenderResult,
     )
+
 from .jupyter import JupyterMixin
 from .measure import Measurement
-from .style import Style
 from .segment import Segment
-
+from .style import Style
 
 PaddingDimensions = Union[int, Tuple[int], Tuple[int, int], Tuple[int, int, int, int]]
 
@@ -66,10 +66,10 @@ def unpack(pad: "PaddingDimensions") -> Tuple[int, int, int, int]:
             _pad = pad[0]
             return (_pad, _pad, _pad, _pad)
         if len(pad) == 2:
-            pad_top, pad_right = cast(Tuple[int, int], pad)
+            pad_top, pad_right = pad
             return (pad_top, pad_right, pad_top, pad_right)
         if len(pad) == 4:
-            top, right, bottom, left = cast(Tuple[int, int, int, int], pad)
+            top, right, bottom, left = pad
             return (top, right, bottom, left)
         raise ValueError(f"1, 2 or 4 integers required for padding; {len(pad)} given")
 
diff --git a/src/pip/_vendor/rich/panel.py b/src/pip/_vendor/rich/panel.py
index 95f4c84cf0b..8cfa6f4a243 100644
--- a/src/pip/_vendor/rich/panel.py
+++ b/src/pip/_vendor/rich/panel.py
@@ -22,11 +22,13 @@ class Panel(JupyterMixin):
 
     Args:
         renderable (RenderableType): A console renderable object.
-        box (Box, optional): A Box instance that defines the look of the border (see :ref:`appendix_box`.
-            Defaults to box.ROUNDED.
+        box (Box, optional): A Box instance that defines the look of the border (see :ref:`appendix_box`. Defaults to box.ROUNDED.
+        title (Optional[TextType], optional): Optional title displayed in panel header. Defaults to None.
+        title_align (AlignMethod, optional): Alignment of title. Defaults to "center".
+        subtitle (Optional[TextType], optional): Optional subtitle displayed in panel footer. Defaults to None.
+        subtitle_align (AlignMethod, optional): Alignment of subtitle. Defaults to "center".
         safe_box (bool, optional): Disable box characters that don't display on windows legacy terminal with *raster* fonts. Defaults to True.
-        expand (bool, optional): If True the panel will stretch to fill the console
-            width, otherwise it will be sized to fit the contents. Defaults to True.
+        expand (bool, optional): If True the panel will stretch to fill the console width, otherwise it will be sized to fit the contents. Defaults to True.
         style (str, optional): The style of the panel (border and contents). Defaults to "none".
         border_style (str, optional): The style of the border. Defaults to "none".
         width (Optional[int], optional): Optional width of panel. Defaults to None to auto-detect.
@@ -144,7 +146,8 @@ def __rich_console__(
             Padding(self.renderable, _padding) if any(_padding) else self.renderable
         )
         style = console.get_style(self.style)
-        border_style = style + console.get_style(self.border_style)
+        partial_border_style = console.get_style(self.border_style)
+        border_style = style + partial_border_style
         width = (
             options.max_width
             if self.width is None
@@ -172,6 +175,9 @@ def align_text(
             text = text.copy()
             text.truncate(width)
             excess_space = width - cell_len(text.plain)
+            if text.style:
+                text.stylize(console.get_style(text.style))
+
             if excess_space:
                 if align == "left":
                     return Text.assemble(
@@ -200,7 +206,7 @@ def align_text(
 
         title_text = self._title
         if title_text is not None:
-            title_text.stylize_before(border_style)
+            title_text.stylize_before(partial_border_style)
 
         child_width = (
             width - 2
@@ -249,7 +255,7 @@ def align_text(
 
         subtitle_text = self._subtitle
         if subtitle_text is not None:
-            subtitle_text.stylize_before(border_style)
+            subtitle_text.stylize_before(partial_border_style)
 
         if subtitle_text is None or width <= 4:
             yield Segment(box.get_bottom([width - 2]), border_style)
diff --git a/src/pip/_vendor/rich/pretty.py b/src/pip/_vendor/rich/pretty.py
index 9b9e3ba9086..c4a274f8cd7 100644
--- a/src/pip/_vendor/rich/pretty.py
+++ b/src/pip/_vendor/rich/pretty.py
@@ -3,6 +3,7 @@
 import dataclasses
 import inspect
 import os
+import reprlib
 import sys
 from array import array
 from collections import Counter, UserDict, UserList, defaultdict, deque
@@ -15,6 +16,7 @@
     Any,
     Callable,
     DefaultDict,
+    Deque,
     Dict,
     Iterable,
     List,
@@ -77,7 +79,10 @@ def _is_dataclass_repr(obj: object) -> bool:
     # Digging in to a lot of internals here
     # Catching all exceptions in case something is missing on a non CPython implementation
     try:
-        return obj.__repr__.__code__.co_filename == dataclasses.__file__
+        return obj.__repr__.__code__.co_filename in (
+            dataclasses.__file__,
+            reprlib.__file__,
+        )
     except Exception:  # pragma: no coverage
         return False
 
@@ -130,17 +135,19 @@ def _ipy_display_hook(
         if _safe_isinstance(value, ConsoleRenderable):
             console.line()
         console.print(
-            value
-            if _safe_isinstance(value, RichRenderable)
-            else Pretty(
-                value,
-                overflow=overflow,
-                indent_guides=indent_guides,
-                max_length=max_length,
-                max_string=max_string,
-                max_depth=max_depth,
-                expand_all=expand_all,
-                margin=12,
+            (
+                value
+                if _safe_isinstance(value, RichRenderable)
+                else Pretty(
+                    value,
+                    overflow=overflow,
+                    indent_guides=indent_guides,
+                    max_length=max_length,
+                    max_string=max_string,
+                    max_depth=max_depth,
+                    expand_all=expand_all,
+                    margin=12,
+                )
             ),
             crop=crop,
             new_line_start=True,
@@ -196,16 +203,18 @@ def display_hook(value: Any) -> None:
             assert console is not None
             builtins._ = None  # type: ignore[attr-defined]
             console.print(
-                value
-                if _safe_isinstance(value, RichRenderable)
-                else Pretty(
-                    value,
-                    overflow=overflow,
-                    indent_guides=indent_guides,
-                    max_length=max_length,
-                    max_string=max_string,
-                    max_depth=max_depth,
-                    expand_all=expand_all,
+                (
+                    value
+                    if _safe_isinstance(value, RichRenderable)
+                    else Pretty(
+                        value,
+                        overflow=overflow,
+                        indent_guides=indent_guides,
+                        max_length=max_length,
+                        max_string=max_string,
+                        max_depth=max_depth,
+                        expand_all=expand_all,
+                    )
                 ),
                 crop=crop,
             )
@@ -353,6 +362,16 @@ def _get_braces_for_defaultdict(_object: DefaultDict[Any, Any]) -> Tuple[str, st
     )
 
 
+def _get_braces_for_deque(_object: Deque[Any]) -> Tuple[str, str, str]:
+    if _object.maxlen is None:
+        return ("deque([", "])", "deque()")
+    return (
+        "deque([",
+        f"], maxlen={_object.maxlen})",
+        f"deque(maxlen={_object.maxlen})",
+    )
+
+
 def _get_braces_for_array(_object: "array[Any]") -> Tuple[str, str, str]:
     return (f"array({_object.typecode!r}, [", "])", f"array({_object.typecode!r})")
 
@@ -362,7 +381,7 @@ def _get_braces_for_array(_object: "array[Any]") -> Tuple[str, str, str]:
     array: _get_braces_for_array,
     defaultdict: _get_braces_for_defaultdict,
     Counter: lambda _object: ("Counter({", "})", "Counter()"),
-    deque: lambda _object: ("deque([", "])", "deque()"),
+    deque: _get_braces_for_deque,
     dict: lambda _object: ("{", "}", "{}"),
     UserDict: lambda _object: ("{", "}", "{}"),
     frozenset: lambda _object: ("frozenset({", "})", "frozenset()"),
@@ -762,7 +781,9 @@ def iter_attrs() -> (
                 )
 
                 for last, field in loop_last(
-                    field for field in fields(obj) if field.repr
+                    field
+                    for field in fields(obj)
+                    if field.repr and hasattr(obj, field.name)
                 ):
                     child_node = _traverse(getattr(obj, field.name), depth=depth + 1)
                     child_node.key_repr = field.name
@@ -846,7 +867,7 @@ def iter_attrs() -> (
             pop_visited(obj_id)
         else:
             node = Node(value_repr=to_repr(obj), last=root)
-        node.is_tuple = _safe_isinstance(obj, tuple)
+        node.is_tuple = type(obj) == tuple
         node.is_namedtuple = _is_namedtuple(obj)
         return node
 
diff --git a/src/pip/_vendor/rich/progress.py b/src/pip/_vendor/rich/progress.py
index 2420c24e646..ec086d9885d 100644
--- a/src/pip/_vendor/rich/progress.py
+++ b/src/pip/_vendor/rich/progress.py
@@ -39,6 +39,11 @@
 else:
     from pip._vendor.typing_extensions import Literal  # pragma: no cover
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from pip._vendor.typing_extensions import Self  # pragma: no cover
+
 from . import filesize, get_console
 from .console import Console, Group, JustifyMethod, RenderableType
 from .highlighter import Highlighter
@@ -70,7 +75,7 @@ def __init__(self, progress: "Progress", task_id: "TaskID", update_period: float
         self.done = Event()
 
         self.completed = 0
-        super().__init__()
+        super().__init__(daemon=True)
 
     def run(self) -> None:
         task_id = self.task_id
@@ -78,7 +83,7 @@ def run(self) -> None:
         update_period = self.update_period
         last_completed = 0
         wait = self.done.wait
-        while not wait(update_period):
+        while not wait(update_period) and self.progress.live.is_started:
             completed = self.completed
             if last_completed != completed:
                 advance(task_id, completed - last_completed)
@@ -104,6 +109,7 @@ def track(
     sequence: Union[Sequence[ProgressType], Iterable[ProgressType]],
     description: str = "Working...",
     total: Optional[float] = None,
+    completed: int = 0,
     auto_refresh: bool = True,
     console: Optional[Console] = None,
     transient: bool = False,
@@ -123,6 +129,7 @@ def track(
         sequence (Iterable[ProgressType]): A sequence (must support "len") you wish to iterate over.
         description (str, optional): Description of task show next to progress bar. Defaults to "Working".
         total: (float, optional): Total number of steps. Default is len(sequence).
+        completed (int, optional): Number of steps completed so far. Defaults to 0.
         auto_refresh (bool, optional): Automatic refresh, disable to force a refresh after each iteration. Default is True.
         transient: (bool, optional): Clear the progress on exit. Defaults to False.
         console (Console, optional): Console to write to. Default creates internal Console instance.
@@ -166,7 +173,11 @@ def track(
 
     with progress:
         yield from progress.track(
-            sequence, total=total, description=description, update_period=update_period
+            sequence,
+            total=total,
+            completed=completed,
+            description=description,
+            update_period=update_period,
         )
 
 
@@ -269,6 +280,9 @@ def tell(self) -> int:
     def write(self, s: Any) -> int:
         raise UnsupportedOperation("write")
 
+    def writelines(self, lines: Iterable[Any]) -> None:
+        raise UnsupportedOperation("writelines")
+
 
 class _ReadContext(ContextManager[_I], Generic[_I]):
     """A utility class to handle a context for both a reader and a progress."""
@@ -1050,7 +1064,7 @@ class Progress(JupyterMixin):
     """Renders an auto-updating progress bar(s).
 
     Args:
-        console (Console, optional): Optional Console instance. Default will an internal Console instance writing to stdout.
+        console (Console, optional): Optional Console instance. Defaults to an internal Console instance writing to stdout.
         auto_refresh (bool, optional): Enable auto refresh. If disabled, you will need to call `refresh()`.
         refresh_per_second (Optional[float], optional): Number of times per second to refresh the progress information or None to use default (10). Defaults to None.
         speed_estimate_period: (float, optional): Period (in seconds) used to calculate the speed estimate. Defaults to 30.
@@ -1161,10 +1175,10 @@ def start(self) -> None:
     def stop(self) -> None:
         """Stop the progress display."""
         self.live.stop()
-        if not self.console.is_interactive:
+        if not self.console.is_interactive and not self.console.is_jupyter:
             self.console.print()
 
-    def __enter__(self) -> "Progress":
+    def __enter__(self) -> Self:
         self.start()
         return self
 
@@ -1180,6 +1194,7 @@ def track(
         self,
         sequence: Union[Iterable[ProgressType], Sequence[ProgressType]],
         total: Optional[float] = None,
+        completed: int = 0,
         task_id: Optional[TaskID] = None,
         description: str = "Working...",
         update_period: float = 0.1,
@@ -1189,6 +1204,7 @@ def track(
         Args:
             sequence (Sequence[ProgressType]): A sequence of values you want to iterate over and track progress.
             total: (float, optional): Total number of steps. Default is len(sequence).
+            completed (int, optional): Number of steps completed so far. Defaults to 0.
             task_id: (TaskID): Task to track. Default is new task.
             description: (str, optional): Description of task, if new task is created.
             update_period (float, optional): Minimum time (in seconds) between calls to update(). Defaults to 0.1.
@@ -1200,9 +1216,9 @@ def track(
             total = float(length_hint(sequence)) or None
 
         if task_id is None:
-            task_id = self.add_task(description, total=total)
+            task_id = self.add_task(description, total=total, completed=completed)
         else:
-            self.update(task_id, total=total)
+            self.update(task_id, total=total, completed=completed)
 
         if self.live.auto_refresh:
             with _TrackThread(self, task_id, update_period) as track_thread:
@@ -1326,7 +1342,7 @@ def open(
         # normalize the mode (always rb, rt)
         _mode = "".join(sorted(mode, reverse=False))
         if _mode not in ("br", "rt", "r"):
-            raise ValueError("invalid mode {!r}".format(mode))
+            raise ValueError(f"invalid mode {mode!r}")
 
         # patch buffering to provide the same behaviour as the builtin `open`
         line_buffering = buffering == 1
diff --git a/src/pip/_vendor/rich/progress_bar.py b/src/pip/_vendor/rich/progress_bar.py
index a2bf326144b..41794f76787 100644
--- a/src/pip/_vendor/rich/progress_bar.py
+++ b/src/pip/_vendor/rich/progress_bar.py
@@ -108,7 +108,7 @@ def _get_pulse_segments(
 
         for index in range(PULSE_SIZE):
             position = index / PULSE_SIZE
-            fade = 0.5 + cos((position * pi * 2)) / 2.0
+            fade = 0.5 + cos(position * pi * 2) / 2.0
             color = blend_rgb(fore_color, back_color, cross_fade=fade)
             append(_Segment(bar, _Style(color=from_triplet(color))))
         return segments
diff --git a/src/pip/_vendor/rich/prompt.py b/src/pip/_vendor/rich/prompt.py
index 75ff0481684..fccb70dbd29 100644
--- a/src/pip/_vendor/rich/prompt.py
+++ b/src/pip/_vendor/rich/prompt.py
@@ -36,6 +36,7 @@ class PromptBase(Generic[PromptType]):
         console (Console, optional): A Console instance or None to use global console. Defaults to None.
         password (bool, optional): Enable password input. Defaults to False.
         choices (List[str], optional): A list of valid choices. Defaults to None.
+        case_sensitive (bool, optional): Matching of choices should be case-sensitive. Defaults to True.
         show_default (bool, optional): Show default in prompt. Defaults to True.
         show_choices (bool, optional): Show choices in prompt. Defaults to True.
     """
@@ -57,6 +58,7 @@ def __init__(
         console: Optional[Console] = None,
         password: bool = False,
         choices: Optional[List[str]] = None,
+        case_sensitive: bool = True,
         show_default: bool = True,
         show_choices: bool = True,
     ) -> None:
@@ -69,6 +71,7 @@ def __init__(
         self.password = password
         if choices is not None:
             self.choices = choices
+        self.case_sensitive = case_sensitive
         self.show_default = show_default
         self.show_choices = show_choices
 
@@ -81,6 +84,7 @@ def ask(
         console: Optional[Console] = None,
         password: bool = False,
         choices: Optional[List[str]] = None,
+        case_sensitive: bool = True,
         show_default: bool = True,
         show_choices: bool = True,
         default: DefaultType,
@@ -97,6 +101,7 @@ def ask(
         console: Optional[Console] = None,
         password: bool = False,
         choices: Optional[List[str]] = None,
+        case_sensitive: bool = True,
         show_default: bool = True,
         show_choices: bool = True,
         stream: Optional[TextIO] = None,
@@ -111,6 +116,7 @@ def ask(
         console: Optional[Console] = None,
         password: bool = False,
         choices: Optional[List[str]] = None,
+        case_sensitive: bool = True,
         show_default: bool = True,
         show_choices: bool = True,
         default: Any = ...,
@@ -126,6 +132,7 @@ def ask(
             console (Console, optional): A Console instance or None to use global console. Defaults to None.
             password (bool, optional): Enable password input. Defaults to False.
             choices (List[str], optional): A list of valid choices. Defaults to None.
+            case_sensitive (bool, optional): Matching of choices should be case-sensitive. Defaults to True.
             show_default (bool, optional): Show default in prompt. Defaults to True.
             show_choices (bool, optional): Show choices in prompt. Defaults to True.
             stream (TextIO, optional): Optional text file open for reading to get input. Defaults to None.
@@ -135,6 +142,7 @@ def ask(
             console=console,
             password=password,
             choices=choices,
+            case_sensitive=case_sensitive,
             show_default=show_default,
             show_choices=show_choices,
         )
@@ -212,7 +220,9 @@ def check_choice(self, value: str) -> bool:
             bool: True if choice was valid, otherwise False.
         """
         assert self.choices is not None
-        return value.strip() in self.choices
+        if self.case_sensitive:
+            return value.strip() in self.choices
+        return value.strip().lower() in [choice.lower() for choice in self.choices]
 
     def process_response(self, value: str) -> PromptType:
         """Process response from user, convert to prompt type.
@@ -232,9 +242,17 @@ def process_response(self, value: str) -> PromptType:
         except ValueError:
             raise InvalidResponse(self.validate_error_message)
 
-        if self.choices is not None and not self.check_choice(value):
-            raise InvalidResponse(self.illegal_choice_message)
-
+        if self.choices is not None:
+            if not self.check_choice(value):
+                raise InvalidResponse(self.illegal_choice_message)
+
+            if not self.case_sensitive:
+                # return the original choice, not the lower case version
+                return_value = self.response_type(
+                    self.choices[
+                        [choice.lower() for choice in self.choices].index(value.lower())
+                    ]
+                )
         return return_value
 
     def on_validate_error(self, value: str, error: InvalidResponse) -> None:
@@ -371,5 +389,12 @@ def process_response(self, value: str) -> bool:
         fruit = Prompt.ask("Enter a fruit", choices=["apple", "orange", "pear"])
         print(f"fruit={fruit!r}")
 
+        doggie = Prompt.ask(
+            "What's the best Dog? (Case INSENSITIVE)",
+            choices=["Border Terrier", "Collie", "Labradoodle"],
+            case_sensitive=False,
+        )
+        print(f"doggie={doggie!r}")
+
     else:
         print("[b]OK :loudly_crying_face:")
diff --git a/src/pip/_vendor/rich/segment.py b/src/pip/_vendor/rich/segment.py
index 93edbbdeb72..4b5f9979221 100644
--- a/src/pip/_vendor/rich/segment.py
+++ b/src/pip/_vendor/rich/segment.py
@@ -109,41 +109,51 @@ def is_control(self) -> bool:
     @classmethod
     @lru_cache(1024 * 16)
     def _split_cells(cls, segment: "Segment", cut: int) -> Tuple["Segment", "Segment"]:
+        """Split a segment in to two at a given cell position.
+
+        Note that splitting a double-width character, may result in that character turning
+        into two spaces.
+
+        Args:
+            segment (Segment): A segment to split.
+            cut (int): A cell position to cut on.
+
+        Returns:
+            A tuple of two segments.
+        """
         text, style, control = segment
         _Segment = Segment
-
         cell_length = segment.cell_length
         if cut >= cell_length:
             return segment, _Segment("", style, control)
 
         cell_size = get_character_cell_size
 
-        pos = int((cut / cell_length) * (len(text) - 1))
+        pos = int((cut / cell_length) * len(text))
 
-        before = text[:pos]
-        cell_pos = cell_len(before)
-        if cell_pos == cut:
-            return (
-                _Segment(before, style, control),
-                _Segment(text[pos:], style, control),
-            )
-        while pos < len(text):
-            char = text[pos]
-            pos += 1
-            cell_pos += cell_size(char)
+        while True:
             before = text[:pos]
-            if cell_pos == cut:
+            cell_pos = cell_len(before)
+            out_by = cell_pos - cut
+            if not out_by:
                 return (
                     _Segment(before, style, control),
                     _Segment(text[pos:], style, control),
                 )
-            if cell_pos > cut:
+            if out_by == -1 and cell_size(text[pos]) == 2:
+                return (
+                    _Segment(text[:pos] + " ", style, control),
+                    _Segment(" " + text[pos + 1 :], style, control),
+                )
+            if out_by == +1 and cell_size(text[pos - 1]) == 2:
                 return (
-                    _Segment(before[: pos - 1] + " ", style, control),
+                    _Segment(text[: pos - 1] + " ", style, control),
                     _Segment(" " + text[pos:], style, control),
                 )
-
-        raise AssertionError("Will never reach here")
+            if cell_pos < cut:
+                pos += 1
+            else:
+                pos -= 1
 
     def split_cells(self, cut: int) -> Tuple["Segment", "Segment"]:
         """Split segment in to two segments at the specified column.
@@ -151,10 +161,14 @@ def split_cells(self, cut: int) -> Tuple["Segment", "Segment"]:
         If the cut point falls in the middle of a 2-cell wide character then it is replaced
         by two spaces, to preserve the display width of the parent segment.
 
+        Args:
+            cut (int): Offset within the segment to cut.
+
         Returns:
             Tuple[Segment, Segment]: Two segments.
         """
         text, style, control = self
+        assert cut >= 0
 
         if _is_single_cell_widths(text):
             # Fast path with all 1 cell characters
@@ -604,7 +618,7 @@ def divide(
         while True:
             cut = next(iter_cuts, -1)
             if cut == -1:
-                return []
+                return
             if cut != 0:
                 break
             yield []
diff --git a/src/pip/_vendor/rich/spinner.py b/src/pip/_vendor/rich/spinner.py
index 91ea630e10f..70570b6b096 100644
--- a/src/pip/_vendor/rich/spinner.py
+++ b/src/pip/_vendor/rich/spinner.py
@@ -38,6 +38,7 @@ def __init__(
         self.text: "Union[RenderableType, Text]" = (
             Text.from_markup(text) if isinstance(text, str) else text
         )
+        self.name = name
         self.frames = cast(List[str], spinner["frames"])[:]
         self.interval = cast(float, spinner["interval"])
         self.start_time: Optional[float] = None
diff --git a/src/pip/_vendor/rich/style.py b/src/pip/_vendor/rich/style.py
index 313c889496d..262fd6ecad6 100644
--- a/src/pip/_vendor/rich/style.py
+++ b/src/pip/_vendor/rich/style.py
@@ -663,7 +663,7 @@ def clear_meta_and_links(self) -> "Style":
         style._set_attributes = self._set_attributes
         style._link = None
         style._link_id = ""
-        style._hash = self._hash
+        style._hash = None
         style._null = False
         style._meta = None
         return style
diff --git a/src/pip/_vendor/rich/syntax.py b/src/pip/_vendor/rich/syntax.py
index c26fd8784e8..f3d483c3d07 100644
--- a/src/pip/_vendor/rich/syntax.py
+++ b/src/pip/_vendor/rich/syntax.py
@@ -1,5 +1,4 @@
 import os.path
-import platform
 import re
 import sys
 import textwrap
@@ -52,7 +51,7 @@
 
 TokenType = Tuple[str, ...]
 
-WINDOWS = platform.system() == "Windows"
+WINDOWS = sys.platform == "win32"
 DEFAULT_THEME = "monokai"
 
 # The following styles are based on https://github.com/pygments/pygments/blob/master/pygments/formatters/terminal.py
@@ -222,6 +221,7 @@ class _SyntaxHighlightRange(NamedTuple):
     style: StyleType
     start: SyntaxPosition
     end: SyntaxPosition
+    style_before: bool = False
 
 
 class Syntax(JupyterMixin):
@@ -535,7 +535,11 @@ def tokens_to_spans() -> Iterable[Tuple[str, Optional[Style]]]:
         return text
 
     def stylize_range(
-        self, style: StyleType, start: SyntaxPosition, end: SyntaxPosition
+        self,
+        style: StyleType,
+        start: SyntaxPosition,
+        end: SyntaxPosition,
+        style_before: bool = False,
     ) -> None:
         """
         Adds a custom style on a part of the code, that will be applied to the syntax display when it's rendered.
@@ -545,8 +549,11 @@ def stylize_range(
             style (StyleType): The style to apply.
             start (Tuple[int, int]): The start of the range, in the form `[line number, column index]`.
             end (Tuple[int, int]): The end of the range, in the form `[line number, column index]`.
+            style_before (bool): Apply the style before any existing styles.
         """
-        self._stylized_ranges.append(_SyntaxHighlightRange(style, start, end))
+        self._stylized_ranges.append(
+            _SyntaxHighlightRange(style, start, end, style_before)
+        )
 
     def _get_line_numbers_color(self, blend: float = 0.3) -> Color:
         background_style = self._theme.get_background_style() + self.background_style
@@ -620,9 +627,7 @@ def __rich_console__(
     ) -> RenderResult:
         segments = Segments(self._get_syntax(console, options))
         if self.padding:
-            yield Padding(
-                segments, style=self._theme.get_background_style(), pad=self.padding
-            )
+            yield Padding(segments, style=self._get_base_style(), pad=self.padding)
         else:
             yield segments
 
@@ -788,7 +793,10 @@ def _apply_stylized_ranges(self, text: Text) -> None:
                 newlines_offsets, stylized_range.end
             )
             if start is not None and end is not None:
-                text.stylize(stylized_range.style, start, end)
+                if stylized_range.style_before:
+                    text.stylize_before(stylized_range.style, start, end)
+                else:
+                    text.stylize(stylized_range.style, start, end)
 
     def _process_code(self, code: str) -> Tuple[bool, str]:
         """
diff --git a/src/pip/_vendor/rich/table.py b/src/pip/_vendor/rich/table.py
index 43c718ebf59..654c8555411 100644
--- a/src/pip/_vendor/rich/table.py
+++ b/src/pip/_vendor/rich/table.py
@@ -54,7 +54,7 @@ class Column:
         show_footer (bool, optional): Show a footer row. Defaults to False.
         show_edge (bool, optional): Draw a box around the outside of the table. Defaults to True.
         show_lines (bool, optional): Draw lines between every row. Defaults to False.
-        leading (bool, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
+        leading (int, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
         style (Union[str, Style], optional): Default style for the table. Defaults to "none".
         row_styles (List[Union, str], optional): Optional list of row styles, if more than one style is given then the styles will alternate. Defaults to None.
         header_style (Union[str, Style], optional): Style of the header. Defaults to "table.header".
@@ -106,6 +106,9 @@ class Column:
     no_wrap: bool = False
     """bool: Prevent wrapping of text within the column. Defaults to ``False``."""
 
+    highlight: bool = False
+    """bool: Apply highlighter to column. Defaults to ``False``."""
+
     _index: int = 0
     """Index of column."""
 
@@ -167,7 +170,7 @@ class Table(JupyterMixin):
         show_footer (bool, optional): Show a footer row. Defaults to False.
         show_edge (bool, optional): Draw a box around the outside of the table. Defaults to True.
         show_lines (bool, optional): Draw lines between every row. Defaults to False.
-        leading (bool, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
+        leading (int, optional): Number of blank lines between rows (precludes ``show_lines``). Defaults to 0.
         style (Union[str, Style], optional): Default style for the table. Defaults to "none".
         row_styles (List[Union, str], optional): Optional list of row styles, if more than one style is given then the styles will alternate. Defaults to None.
         header_style (Union[str, Style], optional): Style of the header. Defaults to "table.header".
@@ -365,6 +368,7 @@ def add_column(
         footer: "RenderableType" = "",
         *,
         header_style: Optional[StyleType] = None,
+        highlight: Optional[bool] = None,
         footer_style: Optional[StyleType] = None,
         style: Optional[StyleType] = None,
         justify: "JustifyMethod" = "left",
@@ -384,6 +388,7 @@ def add_column(
             footer (RenderableType, optional): Text or renderable for the footer.
                 Defaults to "".
             header_style (Union[str, Style], optional): Style for the header, or None for default. Defaults to None.
+            highlight (bool, optional): Whether to highlight the text. The default of None uses the value of the table (self) object.
             footer_style (Union[str, Style], optional): Style for the footer, or None for default. Defaults to None.
             style (Union[str, Style], optional): Style for the column cells, or None for default. Defaults to None.
             justify (JustifyMethod, optional): Alignment for cells. Defaults to "left".
@@ -401,6 +406,7 @@ def add_column(
             header=header,
             footer=footer,
             header_style=header_style or "",
+            highlight=highlight if highlight is not None else self.highlight,
             footer_style=footer_style or "",
             style=style or "",
             justify=justify,
@@ -445,7 +451,7 @@ def add_cell(column: Column, renderable: "RenderableType") -> None:
             ]
         for index, renderable in enumerate(cell_renderables):
             if index == len(columns):
-                column = Column(_index=index)
+                column = Column(_index=index, highlight=self.highlight)
                 for _ in self.rows:
                     add_cell(column, Text(""))
                 self.columns.append(column)
@@ -775,16 +781,16 @@ def _render(
                     _Segment(_box.head_right, border_style),
                     _Segment(_box.head_vertical, border_style),
                 ),
-                (
-                    _Segment(_box.foot_left, border_style),
-                    _Segment(_box.foot_right, border_style),
-                    _Segment(_box.foot_vertical, border_style),
-                ),
                 (
                     _Segment(_box.mid_left, border_style),
                     _Segment(_box.mid_right, border_style),
                     _Segment(_box.mid_vertical, border_style),
                 ),
+                (
+                    _Segment(_box.foot_left, border_style),
+                    _Segment(_box.foot_right, border_style),
+                    _Segment(_box.foot_vertical, border_style),
+                ),
             ]
             if show_edge:
                 yield _Segment(_box.get_top(widths), border_style)
@@ -818,6 +824,7 @@ def _render(
                     no_wrap=column.no_wrap,
                     overflow=column.overflow,
                     height=None,
+                    highlight=column.highlight,
                 )
                 lines = console.render_lines(
                     cell.renderable,
diff --git a/src/pip/_vendor/rich/text.py b/src/pip/_vendor/rich/text.py
index 209aa943483..5a0c6b142b8 100644
--- a/src/pip/_vendor/rich/text.py
+++ b/src/pip/_vendor/rich/text.py
@@ -11,6 +11,7 @@
     List,
     NamedTuple,
     Optional,
+    Pattern,
     Tuple,
     Union,
 )
@@ -173,7 +174,7 @@ def __str__(self) -> str:
         return self.plain
 
     def __repr__(self) -> str:
-        return f""
+        return f""
 
     def __add__(self, other: Any) -> "Text":
         if isinstance(other, (str, Text)):
@@ -591,7 +592,7 @@ def extend_style(self, spaces: int) -> None:
 
     def highlight_regex(
         self,
-        re_highlight: str,
+        re_highlight: Union[Pattern[str], str],
         style: Optional[Union[GetStyleCallable, StyleType]] = None,
         *,
         style_prefix: str = "",
@@ -600,7 +601,7 @@ def highlight_regex(
         translated to styles.
 
         Args:
-            re_highlight (str): A regular expression.
+            re_highlight (Union[re.Pattern, str]): A regular expression object or string.
             style (Union[GetStyleCallable, StyleType]): Optional style to apply to whole match, or a callable
                 which accepts the matched text and returns a style. Defaults to None.
             style_prefix (str, optional): Optional prefix to add to style group names.
@@ -612,7 +613,9 @@ def highlight_regex(
         append_span = self._spans.append
         _Span = Span
         plain = self.plain
-        for match in re.finditer(re_highlight, plain):
+        if isinstance(re_highlight, str):
+            re_highlight = re.compile(re_highlight)
+        for match in re_highlight.finditer(plain):
             get_span = match.span
             if style:
                 start, end = get_span()
@@ -998,7 +1001,7 @@ def append(
                 self._text.append(text.plain)
                 self._spans.extend(
                     _Span(start + text_length, end + text_length, style)
-                    for start, end, style in text._spans
+                    for start, end, style in text._spans.copy()
                 )
                 self._length += len(text)
         return self
@@ -1020,7 +1023,7 @@ def append_text(self, text: "Text") -> "Text":
         self._text.append(text.plain)
         self._spans.extend(
             _Span(start + text_length, end + text_length, style)
-            for start, end, style in text._spans
+            for start, end, style in text._spans.copy()
         )
         self._length += len(text)
         return self
@@ -1041,6 +1044,7 @@ def append_tokens(
         _Span = Span
         offset = len(self)
         for content, style in tokens:
+            content = strip_control_codes(content)
             append_text(content)
             if style:
                 append_span(_Span(offset, offset + len(content), style))
diff --git a/src/pip/_vendor/rich/theme.py b/src/pip/_vendor/rich/theme.py
index 471dfb2f927..227f1d8635f 100644
--- a/src/pip/_vendor/rich/theme.py
+++ b/src/pip/_vendor/rich/theme.py
@@ -1,5 +1,5 @@
 import configparser
-from typing import Dict, List, IO, Mapping, Optional
+from typing import IO, Dict, List, Mapping, Optional
 
 from .default_styles import DEFAULT_STYLES
 from .style import Style, StyleType
@@ -69,7 +69,7 @@ def read(
         Returns:
             Theme: A new theme instance.
         """
-        with open(path, "rt", encoding=encoding) as config_file:
+        with open(path, encoding=encoding) as config_file:
             return cls.from_file(config_file, source=path, inherit=inherit)
 
 
diff --git a/src/pip/_vendor/rich/traceback.py b/src/pip/_vendor/rich/traceback.py
index f223ad44bfe..28d742b4fd0 100644
--- a/src/pip/_vendor/rich/traceback.py
+++ b/src/pip/_vendor/rich/traceback.py
@@ -1,10 +1,9 @@
-from __future__ import absolute_import
-
+import inspect
 import linecache
 import os
-import platform
 import sys
 from dataclasses import dataclass, field
+from itertools import islice
 from traceback import walk_tb
 from types import ModuleType, TracebackType
 from typing import (
@@ -39,7 +38,7 @@
 from .text import Text
 from .theme import Theme
 
-WINDOWS = platform.system() == "Windows"
+WINDOWS = sys.platform == "win32"
 
 LOCALS_MAX_LENGTH = 10
 LOCALS_MAX_STRING = 80
@@ -49,6 +48,7 @@ def install(
     *,
     console: Optional[Console] = None,
     width: Optional[int] = 100,
+    code_width: Optional[int] = 88,
     extra_lines: int = 3,
     theme: Optional[str] = None,
     word_wrap: bool = False,
@@ -69,6 +69,7 @@ def install(
     Args:
         console (Optional[Console], optional): Console to write exception to. Default uses internal Console instance.
         width (Optional[int], optional): Width (in characters) of traceback. Defaults to 100.
+        code_width (Optional[int], optional): Code width (in characters) of traceback. Defaults to 88.
         extra_lines (int, optional): Extra lines of code. Defaults to 3.
         theme (Optional[str], optional): Pygments theme to use in traceback. Defaults to ``None`` which will pick
             a theme appropriate for the platform.
@@ -105,6 +106,7 @@ def excepthook(
                 value,
                 traceback,
                 width=width,
+                code_width=code_width,
                 extra_lines=extra_lines,
                 theme=theme,
                 word_wrap=word_wrap,
@@ -179,6 +181,7 @@ class Frame:
     name: str
     line: str = ""
     locals: Optional[Dict[str, pretty.Node]] = None
+    last_instruction: Optional[Tuple[Tuple[int, int], Tuple[int, int]]] = None
 
 
 @dataclass
@@ -215,6 +218,7 @@ class Traceback:
         trace (Trace, optional): A `Trace` object produced from `extract`. Defaults to None, which uses
             the last exception.
         width (Optional[int], optional): Number of characters used to traceback. Defaults to 100.
+        code_width (Optional[int], optional): Number of code characters used to traceback. Defaults to 88.
         extra_lines (int, optional): Additional lines of code to render. Defaults to 3.
         theme (str, optional): Override pygments theme used in traceback.
         word_wrap (bool, optional): Enable word wrapping of long lines. Defaults to False.
@@ -243,6 +247,7 @@ def __init__(
         trace: Optional[Trace] = None,
         *,
         width: Optional[int] = 100,
+        code_width: Optional[int] = 88,
         extra_lines: int = 3,
         theme: Optional[str] = None,
         word_wrap: bool = False,
@@ -266,6 +271,7 @@ def __init__(
             )
         self.trace = trace
         self.width = width
+        self.code_width = code_width
         self.extra_lines = extra_lines
         self.theme = Syntax.get_theme(theme or "ansi_dark")
         self.word_wrap = word_wrap
@@ -297,6 +303,7 @@ def from_exception(
         traceback: Optional[TracebackType],
         *,
         width: Optional[int] = 100,
+        code_width: Optional[int] = 88,
         extra_lines: int = 3,
         theme: Optional[str] = None,
         word_wrap: bool = False,
@@ -316,6 +323,7 @@ def from_exception(
             exc_value (BaseException): Exception value.
             traceback (TracebackType): Python Traceback object.
             width (Optional[int], optional): Number of characters used to traceback. Defaults to 100.
+            code_width (Optional[int], optional): Number of code characters used to traceback. Defaults to 88.
             extra_lines (int, optional): Additional lines of code to render. Defaults to 3.
             theme (str, optional): Override pygments theme used in traceback.
             word_wrap (bool, optional): Enable word wrapping of long lines. Defaults to False.
@@ -346,6 +354,7 @@ def from_exception(
         return cls(
             rich_traceback,
             width=width,
+            code_width=code_width,
             extra_lines=extra_lines,
             theme=theme,
             word_wrap=word_wrap,
@@ -436,6 +445,35 @@ def get_locals(
 
             for frame_summary, line_no in walk_tb(traceback):
                 filename = frame_summary.f_code.co_filename
+
+                last_instruction: Optional[Tuple[Tuple[int, int], Tuple[int, int]]]
+                last_instruction = None
+                if sys.version_info >= (3, 11):
+                    instruction_index = frame_summary.f_lasti // 2
+                    instruction_position = next(
+                        islice(
+                            frame_summary.f_code.co_positions(),
+                            instruction_index,
+                            instruction_index + 1,
+                        )
+                    )
+                    (
+                        start_line,
+                        end_line,
+                        start_column,
+                        end_column,
+                    ) = instruction_position
+                    if (
+                        start_line is not None
+                        and end_line is not None
+                        and start_column is not None
+                        and end_column is not None
+                    ):
+                        last_instruction = (
+                            (start_line, start_column),
+                            (end_line, end_column),
+                        )
+
                 if filename and not filename.startswith("<"):
                     if not os.path.isabs(filename):
                         filename = os.path.join(_IMPORT_CWD, filename)
@@ -446,16 +484,20 @@ def get_locals(
                     filename=filename or "?",
                     lineno=line_no,
                     name=frame_summary.f_code.co_name,
-                    locals={
-                        key: pretty.traverse(
-                            value,
-                            max_length=locals_max_length,
-                            max_string=locals_max_string,
-                        )
-                        for key, value in get_locals(frame_summary.f_locals.items())
-                    }
-                    if show_locals
-                    else None,
+                    locals=(
+                        {
+                            key: pretty.traverse(
+                                value,
+                                max_length=locals_max_length,
+                                max_string=locals_max_string,
+                            )
+                            for key, value in get_locals(frame_summary.f_locals.items())
+                            if not (inspect.isfunction(value) or inspect.isclass(value))
+                        }
+                        if show_locals
+                        else None
+                    ),
+                    last_instruction=last_instruction,
                 )
                 append(frame)
                 if frame_summary.f_locals.get("_rich_traceback_guard", False):
@@ -695,7 +737,7 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
                         ),
                         highlight_lines={frame.lineno},
                         word_wrap=self.word_wrap,
-                        code_width=88,
+                        code_width=self.code_width,
                         indent_guides=self.indent_guides,
                         dedent=False,
                     )
@@ -705,6 +747,14 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
                         (f"\n{error}", "traceback.error"),
                     )
                 else:
+                    if frame.last_instruction is not None:
+                        start, end = frame.last_instruction
+                        syntax.stylize_range(
+                            style="traceback.error_range",
+                            start=start,
+                            end=end,
+                            style_before=True,
+                        )
                     yield (
                         Columns(
                             [
@@ -719,12 +769,12 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
 
 
 if __name__ == "__main__":  # pragma: no cover
-    from .console import Console
-
-    console = Console()
+    install(show_locals=True)
     import sys
 
-    def bar(a: Any) -> None:  # 这是对亚洲语言支持的测试。面对模棱两可的想法，拒绝猜测的诱惑
+    def bar(
+        a: Any,
+    ) -> None:  # 这是对亚洲语言支持的测试。面对模棱两可的想法，拒绝猜测的诱惑
         one = 1
         print(one / a)
 
@@ -742,12 +792,6 @@ def foo(a: Any) -> None:
         bar(a)
 
     def error() -> None:
-        try:
-            try:
-                foo(0)
-            except:
-                slfkjsldkfj  # type: ignore[name-defined]
-        except:
-            console.print_exception(show_locals=True)
+        foo(0)
 
     error()
diff --git a/src/pip/_vendor/rich/tree.py b/src/pip/_vendor/rich/tree.py
index 64bc75d2286..27c5cf7b239 100644
--- a/src/pip/_vendor/rich/tree.py
+++ b/src/pip/_vendor/rich/tree.py
@@ -8,18 +8,32 @@
 from .style import Style, StyleStack, StyleType
 from .styled import Styled
 
+GuideType = Tuple[str, str, str, str]
+
 
 class Tree(JupyterMixin):
     """A renderable for a tree structure.
 
+    Attributes:
+        ASCII_GUIDES (GuideType): Guide lines used when Console.ascii_only is True.
+        TREE_GUIDES (List[GuideType, GuideType, GuideType]): Default guide lines.
+
     Args:
         label (RenderableType): The renderable or str for the tree label.
         style (StyleType, optional): Style of this tree. Defaults to "tree".
         guide_style (StyleType, optional): Style of the guide lines. Defaults to "tree.line".
         expanded (bool, optional): Also display children. Defaults to True.
         highlight (bool, optional): Highlight renderable (if str). Defaults to False.
+        hide_root (bool, optional): Hide the root node. Defaults to False.
     """
 
+    ASCII_GUIDES = ("    ", "|   ", "+-- ", "`-- ")
+    TREE_GUIDES = [
+        ("    ", "│   ", "├── ", "└── "),
+        ("    ", "┃   ", "┣━━ ", "┗━━ "),
+        ("    ", "║   ", "╠══ ", "╚══ "),
+    ]
+
     def __init__(
         self,
         label: RenderableType,
@@ -82,21 +96,15 @@ def __rich_console__(
         guide_style = get_style(self.guide_style, default="") or null_style
         SPACE, CONTINUE, FORK, END = range(4)
 
-        ASCII_GUIDES = ("    ", "|   ", "+-- ", "`-- ")
-        TREE_GUIDES = [
-            ("    ", "│   ", "├── ", "└── "),
-            ("    ", "┃   ", "┣━━ ", "┗━━ "),
-            ("    ", "║   ", "╠══ ", "╚══ "),
-        ]
         _Segment = Segment
 
         def make_guide(index: int, style: Style) -> Segment:
             """Make a Segment for a level of the guide lines."""
             if options.ascii_only:
-                line = ASCII_GUIDES[index]
+                line = self.ASCII_GUIDES[index]
             else:
                 guide = 1 if style.bold else (2 if style.underline2 else 0)
-                line = TREE_GUIDES[0 if options.legacy_windows else guide][index]
+                line = self.TREE_GUIDES[0 if options.legacy_windows else guide][index]
             return _Segment(line, style)
 
         levels: List[Segment] = [make_guide(CONTINUE, guide_style)]
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 3bea515e18c..b4b837881eb 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -9,7 +9,7 @@ requests==2.32.3
     certifi==2024.8.30
     idna==3.10
     urllib3==1.26.20
-rich==13.7.1
+rich==13.9.4
     pygments==2.18.0
     typing_extensions==4.12.2
 resolvelib==1.0.1

From 2845a520b41b94f6464b40510f150d2e28fb8945 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 10 Nov 2024 11:23:34 -0500
Subject: [PATCH 620/992] Upgrade packaging to 24.2

---
 news/packaging.vendor.rst                     |   1 +
 src/pip/_vendor/packaging/__init__.py         |   4 +-
 src/pip/_vendor/packaging/_elffile.py         |   8 +-
 src/pip/_vendor/packaging/_manylinux.py       |   1 +
 .../_vendor/packaging/licenses/__init__.py    | 145 ++++
 src/pip/_vendor/packaging/licenses/_spdx.py   | 759 ++++++++++++++++++
 src/pip/_vendor/packaging/markers.py          |  24 +-
 src/pip/_vendor/packaging/metadata.py         | 107 ++-
 src/pip/_vendor/packaging/specifiers.py       |  27 +-
 src/pip/_vendor/packaging/tags.py             |  40 +-
 src/pip/_vendor/packaging/utils.py            |  77 +-
 src/pip/_vendor/packaging/version.py          |  33 +-
 src/pip/_vendor/vendor.txt                    |   2 +-
 tools/vendoring/patches/packaging.patch       | 122 ---
 14 files changed, 1104 insertions(+), 246 deletions(-)
 create mode 100644 news/packaging.vendor.rst
 create mode 100644 src/pip/_vendor/packaging/licenses/__init__.py
 create mode 100644 src/pip/_vendor/packaging/licenses/_spdx.py
 delete mode 100644 tools/vendoring/patches/packaging.patch

diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst
new file mode 100644
index 00000000000..d03b06e2c6f
--- /dev/null
+++ b/news/packaging.vendor.rst
@@ -0,0 +1 @@
+Upgrade packaging to 24.2
diff --git a/src/pip/_vendor/packaging/__init__.py b/src/pip/_vendor/packaging/__init__.py
index 9ba41d83579..d79f73c574f 100644
--- a/src/pip/_vendor/packaging/__init__.py
+++ b/src/pip/_vendor/packaging/__init__.py
@@ -6,10 +6,10 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "24.1"
+__version__ = "24.2"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
 
 __license__ = "BSD-2-Clause or Apache-2.0"
-__copyright__ = "2014 %s" % __author__
+__copyright__ = f"2014 {__author__}"
diff --git a/src/pip/_vendor/packaging/_elffile.py b/src/pip/_vendor/packaging/_elffile.py
index f7a02180bfe..25f4282cc29 100644
--- a/src/pip/_vendor/packaging/_elffile.py
+++ b/src/pip/_vendor/packaging/_elffile.py
@@ -48,8 +48,8 @@ def __init__(self, f: IO[bytes]) -> None:
 
         try:
             ident = self._read("16B")
-        except struct.error:
-            raise ELFInvalid("unable to parse identification")
+        except struct.error as e:
+            raise ELFInvalid("unable to parse identification") from e
         magic = bytes(ident[:4])
         if magic != b"\x7fELF":
             raise ELFInvalid(f"invalid magic: {magic!r}")
@@ -67,11 +67,11 @@ def __init__(self, f: IO[bytes]) -> None:
                 (2, 1): ("HHIQQQIHHH", ">IIQQQQQQ", (0, 2, 5)),  # 64-bit MSB.
             }[(self.capacity, self.encoding)]
-        except KeyError:
+        except KeyError as e:
             raise ELFInvalid(
                 f"unrecognized capacity ({self.capacity}) or "
                 f"encoding ({self.encoding})"
-            )
+            ) from e
 
         try:
             (
diff --git a/src/pip/_vendor/packaging/_manylinux.py b/src/pip/_vendor/packaging/_manylinux.py
index 08f651fbd8d..61339a6fcc1 100644
--- a/src/pip/_vendor/packaging/_manylinux.py
+++ b/src/pip/_vendor/packaging/_manylinux.py
@@ -164,6 +164,7 @@ def _parse_glibc_version(version_str: str) -> tuple[int, int]:
             f"Expected glibc version with 2 components major.minor,"
             f" got: {version_str}",
             RuntimeWarning,
+            stacklevel=2,
         )
         return -1, -1
     return int(m.group("major")), int(m.group("minor"))
diff --git a/src/pip/_vendor/packaging/licenses/__init__.py b/src/pip/_vendor/packaging/licenses/__init__.py
new file mode 100644
index 00000000000..71a1a7794e0
--- /dev/null
+++ b/src/pip/_vendor/packaging/licenses/__init__.py
@@ -0,0 +1,145 @@
+#######################################################################################
+#
+# Adapted from:
+#  https://github.com/pypa/hatch/blob/5352e44/backend/src/hatchling/licenses/parse.py
+#
+# MIT License
+#
+# Copyright (c) 2017-present Ofek Lev 
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this
+# software and associated documentation files (the "Software"), to deal in the Software
+# without restriction, including without limitation the rights to use, copy, modify,
+# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies
+# or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+#
+# With additional allowance of arbitrary `LicenseRef-` identifiers, not just
+# `LicenseRef-Public-Domain` and `LicenseRef-Proprietary`.
+#
+#######################################################################################
+from __future__ import annotations
+
+import re
+from typing import NewType, cast
+
+from pip._vendor.packaging.licenses._spdx import EXCEPTIONS, LICENSES
+
+__all__ = [
+    "NormalizedLicenseExpression",
+    "InvalidLicenseExpression",
+    "canonicalize_license_expression",
+]
+
+license_ref_allowed = re.compile("^[A-Za-z0-9.-]*$")
+
+NormalizedLicenseExpression = NewType("NormalizedLicenseExpression", str)
+
+
+class InvalidLicenseExpression(ValueError):
+    """Raised when a license-expression string is invalid
+
+    >>> canonicalize_license_expression("invalid")
+    Traceback (most recent call last):
+        ...
+    packaging.licenses.InvalidLicenseExpression: Invalid license expression: 'invalid'
+    """
+
+
+def canonicalize_license_expression(
+    raw_license_expression: str,
+) -> NormalizedLicenseExpression:
+    if not raw_license_expression:
+        message = f"Invalid license expression: {raw_license_expression!r}"
+        raise InvalidLicenseExpression(message)
+
+    # Pad any parentheses so tokenization can be achieved by merely splitting on
+    # whitespace.
+    license_expression = raw_license_expression.replace("(", " ( ").replace(")", " ) ")
+    licenseref_prefix = "LicenseRef-"
+    license_refs = {
+        ref.lower(): "LicenseRef-" + ref[len(licenseref_prefix) :]
+        for ref in license_expression.split()
+        if ref.lower().startswith(licenseref_prefix.lower())
+    }
+
+    # Normalize to lower case so we can look up licenses/exceptions
+    # and so boolean operators are Python-compatible.
+    license_expression = license_expression.lower()
+
+    tokens = license_expression.split()
+
+    # Rather than implementing boolean logic, we create an expression that Python can
+    # parse. Everything that is not involved with the grammar itself is treated as
+    # `False` and the expression should evaluate as such.
+    python_tokens = []
+    for token in tokens:
+        if token not in {"or", "and", "with", "(", ")"}:
+            python_tokens.append("False")
+        elif token == "with":
+            python_tokens.append("or")
+        elif token == "(" and python_tokens and python_tokens[-1] not in {"or", "and"}:
+            message = f"Invalid license expression: {raw_license_expression!r}"
+            raise InvalidLicenseExpression(message)
+        else:
+            python_tokens.append(token)
+
+    python_expression = " ".join(python_tokens)
+    try:
+        invalid = eval(python_expression, globals(), locals())
+    except Exception:
+        invalid = True
+
+    if invalid is not False:
+        message = f"Invalid license expression: {raw_license_expression!r}"
+        raise InvalidLicenseExpression(message) from None
+
+    # Take a final pass to check for unknown licenses/exceptions.
+    normalized_tokens = []
+    for token in tokens:
+        if token in {"or", "and", "with", "(", ")"}:
+            normalized_tokens.append(token.upper())
+            continue
+
+        if normalized_tokens and normalized_tokens[-1] == "WITH":
+            if token not in EXCEPTIONS:
+                message = f"Unknown license exception: {token!r}"
+                raise InvalidLicenseExpression(message)
+
+            normalized_tokens.append(EXCEPTIONS[token]["id"])
+        else:
+            if token.endswith("+"):
+                final_token = token[:-1]
+                suffix = "+"
+            else:
+                final_token = token
+                suffix = ""
+
+            if final_token.startswith("licenseref-"):
+                if not license_ref_allowed.match(final_token):
+                    message = f"Invalid licenseref: {final_token!r}"
+                    raise InvalidLicenseExpression(message)
+                normalized_tokens.append(license_refs[final_token] + suffix)
+            else:
+                if final_token not in LICENSES:
+                    message = f"Unknown license: {final_token!r}"
+                    raise InvalidLicenseExpression(message)
+                normalized_tokens.append(LICENSES[final_token]["id"] + suffix)
+
+    normalized_expression = " ".join(normalized_tokens)
+
+    return cast(
+        NormalizedLicenseExpression,
+        normalized_expression.replace("( ", "(").replace(" )", ")"),
+    )
diff --git a/src/pip/_vendor/packaging/licenses/_spdx.py b/src/pip/_vendor/packaging/licenses/_spdx.py
new file mode 100644
index 00000000000..eac22276a34
--- /dev/null
+++ b/src/pip/_vendor/packaging/licenses/_spdx.py
@@ -0,0 +1,759 @@
+
+from __future__ import annotations
+
+from typing import TypedDict
+
+class SPDXLicense(TypedDict):
+    id: str
+    deprecated: bool
+
+class SPDXException(TypedDict):
+    id: str
+    deprecated: bool
+
+
+VERSION = '3.25.0'
+
+LICENSES: dict[str, SPDXLicense] = {
+    '0bsd': {'id': '0BSD', 'deprecated': False},
+    '3d-slicer-1.0': {'id': '3D-Slicer-1.0', 'deprecated': False},
+    'aal': {'id': 'AAL', 'deprecated': False},
+    'abstyles': {'id': 'Abstyles', 'deprecated': False},
+    'adacore-doc': {'id': 'AdaCore-doc', 'deprecated': False},
+    'adobe-2006': {'id': 'Adobe-2006', 'deprecated': False},
+    'adobe-display-postscript': {'id': 'Adobe-Display-PostScript', 'deprecated': False},
+    'adobe-glyph': {'id': 'Adobe-Glyph', 'deprecated': False},
+    'adobe-utopia': {'id': 'Adobe-Utopia', 'deprecated': False},
+    'adsl': {'id': 'ADSL', 'deprecated': False},
+    'afl-1.1': {'id': 'AFL-1.1', 'deprecated': False},
+    'afl-1.2': {'id': 'AFL-1.2', 'deprecated': False},
+    'afl-2.0': {'id': 'AFL-2.0', 'deprecated': False},
+    'afl-2.1': {'id': 'AFL-2.1', 'deprecated': False},
+    'afl-3.0': {'id': 'AFL-3.0', 'deprecated': False},
+    'afmparse': {'id': 'Afmparse', 'deprecated': False},
+    'agpl-1.0': {'id': 'AGPL-1.0', 'deprecated': True},
+    'agpl-1.0-only': {'id': 'AGPL-1.0-only', 'deprecated': False},
+    'agpl-1.0-or-later': {'id': 'AGPL-1.0-or-later', 'deprecated': False},
+    'agpl-3.0': {'id': 'AGPL-3.0', 'deprecated': True},
+    'agpl-3.0-only': {'id': 'AGPL-3.0-only', 'deprecated': False},
+    'agpl-3.0-or-later': {'id': 'AGPL-3.0-or-later', 'deprecated': False},
+    'aladdin': {'id': 'Aladdin', 'deprecated': False},
+    'amd-newlib': {'id': 'AMD-newlib', 'deprecated': False},
+    'amdplpa': {'id': 'AMDPLPA', 'deprecated': False},
+    'aml': {'id': 'AML', 'deprecated': False},
+    'aml-glslang': {'id': 'AML-glslang', 'deprecated': False},
+    'ampas': {'id': 'AMPAS', 'deprecated': False},
+    'antlr-pd': {'id': 'ANTLR-PD', 'deprecated': False},
+    'antlr-pd-fallback': {'id': 'ANTLR-PD-fallback', 'deprecated': False},
+    'any-osi': {'id': 'any-OSI', 'deprecated': False},
+    'apache-1.0': {'id': 'Apache-1.0', 'deprecated': False},
+    'apache-1.1': {'id': 'Apache-1.1', 'deprecated': False},
+    'apache-2.0': {'id': 'Apache-2.0', 'deprecated': False},
+    'apafml': {'id': 'APAFML', 'deprecated': False},
+    'apl-1.0': {'id': 'APL-1.0', 'deprecated': False},
+    'app-s2p': {'id': 'App-s2p', 'deprecated': False},
+    'apsl-1.0': {'id': 'APSL-1.0', 'deprecated': False},
+    'apsl-1.1': {'id': 'APSL-1.1', 'deprecated': False},
+    'apsl-1.2': {'id': 'APSL-1.2', 'deprecated': False},
+    'apsl-2.0': {'id': 'APSL-2.0', 'deprecated': False},
+    'arphic-1999': {'id': 'Arphic-1999', 'deprecated': False},
+    'artistic-1.0': {'id': 'Artistic-1.0', 'deprecated': False},
+    'artistic-1.0-cl8': {'id': 'Artistic-1.0-cl8', 'deprecated': False},
+    'artistic-1.0-perl': {'id': 'Artistic-1.0-Perl', 'deprecated': False},
+    'artistic-2.0': {'id': 'Artistic-2.0', 'deprecated': False},
+    'aswf-digital-assets-1.0': {'id': 'ASWF-Digital-Assets-1.0', 'deprecated': False},
+    'aswf-digital-assets-1.1': {'id': 'ASWF-Digital-Assets-1.1', 'deprecated': False},
+    'baekmuk': {'id': 'Baekmuk', 'deprecated': False},
+    'bahyph': {'id': 'Bahyph', 'deprecated': False},
+    'barr': {'id': 'Barr', 'deprecated': False},
+    'bcrypt-solar-designer': {'id': 'bcrypt-Solar-Designer', 'deprecated': False},
+    'beerware': {'id': 'Beerware', 'deprecated': False},
+    'bitstream-charter': {'id': 'Bitstream-Charter', 'deprecated': False},
+    'bitstream-vera': {'id': 'Bitstream-Vera', 'deprecated': False},
+    'bittorrent-1.0': {'id': 'BitTorrent-1.0', 'deprecated': False},
+    'bittorrent-1.1': {'id': 'BitTorrent-1.1', 'deprecated': False},
+    'blessing': {'id': 'blessing', 'deprecated': False},
+    'blueoak-1.0.0': {'id': 'BlueOak-1.0.0', 'deprecated': False},
+    'boehm-gc': {'id': 'Boehm-GC', 'deprecated': False},
+    'borceux': {'id': 'Borceux', 'deprecated': False},
+    'brian-gladman-2-clause': {'id': 'Brian-Gladman-2-Clause', 'deprecated': False},
+    'brian-gladman-3-clause': {'id': 'Brian-Gladman-3-Clause', 'deprecated': False},
+    'bsd-1-clause': {'id': 'BSD-1-Clause', 'deprecated': False},
+    'bsd-2-clause': {'id': 'BSD-2-Clause', 'deprecated': False},
+    'bsd-2-clause-darwin': {'id': 'BSD-2-Clause-Darwin', 'deprecated': False},
+    'bsd-2-clause-first-lines': {'id': 'BSD-2-Clause-first-lines', 'deprecated': False},
+    'bsd-2-clause-freebsd': {'id': 'BSD-2-Clause-FreeBSD', 'deprecated': True},
+    'bsd-2-clause-netbsd': {'id': 'BSD-2-Clause-NetBSD', 'deprecated': True},
+    'bsd-2-clause-patent': {'id': 'BSD-2-Clause-Patent', 'deprecated': False},
+    'bsd-2-clause-views': {'id': 'BSD-2-Clause-Views', 'deprecated': False},
+    'bsd-3-clause': {'id': 'BSD-3-Clause', 'deprecated': False},
+    'bsd-3-clause-acpica': {'id': 'BSD-3-Clause-acpica', 'deprecated': False},
+    'bsd-3-clause-attribution': {'id': 'BSD-3-Clause-Attribution', 'deprecated': False},
+    'bsd-3-clause-clear': {'id': 'BSD-3-Clause-Clear', 'deprecated': False},
+    'bsd-3-clause-flex': {'id': 'BSD-3-Clause-flex', 'deprecated': False},
+    'bsd-3-clause-hp': {'id': 'BSD-3-Clause-HP', 'deprecated': False},
+    'bsd-3-clause-lbnl': {'id': 'BSD-3-Clause-LBNL', 'deprecated': False},
+    'bsd-3-clause-modification': {'id': 'BSD-3-Clause-Modification', 'deprecated': False},
+    'bsd-3-clause-no-military-license': {'id': 'BSD-3-Clause-No-Military-License', 'deprecated': False},
+    'bsd-3-clause-no-nuclear-license': {'id': 'BSD-3-Clause-No-Nuclear-License', 'deprecated': False},
+    'bsd-3-clause-no-nuclear-license-2014': {'id': 'BSD-3-Clause-No-Nuclear-License-2014', 'deprecated': False},
+    'bsd-3-clause-no-nuclear-warranty': {'id': 'BSD-3-Clause-No-Nuclear-Warranty', 'deprecated': False},
+    'bsd-3-clause-open-mpi': {'id': 'BSD-3-Clause-Open-MPI', 'deprecated': False},
+    'bsd-3-clause-sun': {'id': 'BSD-3-Clause-Sun', 'deprecated': False},
+    'bsd-4-clause': {'id': 'BSD-4-Clause', 'deprecated': False},
+    'bsd-4-clause-shortened': {'id': 'BSD-4-Clause-Shortened', 'deprecated': False},
+    'bsd-4-clause-uc': {'id': 'BSD-4-Clause-UC', 'deprecated': False},
+    'bsd-4.3reno': {'id': 'BSD-4.3RENO', 'deprecated': False},
+    'bsd-4.3tahoe': {'id': 'BSD-4.3TAHOE', 'deprecated': False},
+    'bsd-advertising-acknowledgement': {'id': 'BSD-Advertising-Acknowledgement', 'deprecated': False},
+    'bsd-attribution-hpnd-disclaimer': {'id': 'BSD-Attribution-HPND-disclaimer', 'deprecated': False},
+    'bsd-inferno-nettverk': {'id': 'BSD-Inferno-Nettverk', 'deprecated': False},
+    'bsd-protection': {'id': 'BSD-Protection', 'deprecated': False},
+    'bsd-source-beginning-file': {'id': 'BSD-Source-beginning-file', 'deprecated': False},
+    'bsd-source-code': {'id': 'BSD-Source-Code', 'deprecated': False},
+    'bsd-systemics': {'id': 'BSD-Systemics', 'deprecated': False},
+    'bsd-systemics-w3works': {'id': 'BSD-Systemics-W3Works', 'deprecated': False},
+    'bsl-1.0': {'id': 'BSL-1.0', 'deprecated': False},
+    'busl-1.1': {'id': 'BUSL-1.1', 'deprecated': False},
+    'bzip2-1.0.5': {'id': 'bzip2-1.0.5', 'deprecated': True},
+    'bzip2-1.0.6': {'id': 'bzip2-1.0.6', 'deprecated': False},
+    'c-uda-1.0': {'id': 'C-UDA-1.0', 'deprecated': False},
+    'cal-1.0': {'id': 'CAL-1.0', 'deprecated': False},
+    'cal-1.0-combined-work-exception': {'id': 'CAL-1.0-Combined-Work-Exception', 'deprecated': False},
+    'caldera': {'id': 'Caldera', 'deprecated': False},
+    'caldera-no-preamble': {'id': 'Caldera-no-preamble', 'deprecated': False},
+    'catharon': {'id': 'Catharon', 'deprecated': False},
+    'catosl-1.1': {'id': 'CATOSL-1.1', 'deprecated': False},
+    'cc-by-1.0': {'id': 'CC-BY-1.0', 'deprecated': False},
+    'cc-by-2.0': {'id': 'CC-BY-2.0', 'deprecated': False},
+    'cc-by-2.5': {'id': 'CC-BY-2.5', 'deprecated': False},
+    'cc-by-2.5-au': {'id': 'CC-BY-2.5-AU', 'deprecated': False},
+    'cc-by-3.0': {'id': 'CC-BY-3.0', 'deprecated': False},
+    'cc-by-3.0-at': {'id': 'CC-BY-3.0-AT', 'deprecated': False},
+    'cc-by-3.0-au': {'id': 'CC-BY-3.0-AU', 'deprecated': False},
+    'cc-by-3.0-de': {'id': 'CC-BY-3.0-DE', 'deprecated': False},
+    'cc-by-3.0-igo': {'id': 'CC-BY-3.0-IGO', 'deprecated': False},
+    'cc-by-3.0-nl': {'id': 'CC-BY-3.0-NL', 'deprecated': False},
+    'cc-by-3.0-us': {'id': 'CC-BY-3.0-US', 'deprecated': False},
+    'cc-by-4.0': {'id': 'CC-BY-4.0', 'deprecated': False},
+    'cc-by-nc-1.0': {'id': 'CC-BY-NC-1.0', 'deprecated': False},
+    'cc-by-nc-2.0': {'id': 'CC-BY-NC-2.0', 'deprecated': False},
+    'cc-by-nc-2.5': {'id': 'CC-BY-NC-2.5', 'deprecated': False},
+    'cc-by-nc-3.0': {'id': 'CC-BY-NC-3.0', 'deprecated': False},
+    'cc-by-nc-3.0-de': {'id': 'CC-BY-NC-3.0-DE', 'deprecated': False},
+    'cc-by-nc-4.0': {'id': 'CC-BY-NC-4.0', 'deprecated': False},
+    'cc-by-nc-nd-1.0': {'id': 'CC-BY-NC-ND-1.0', 'deprecated': False},
+    'cc-by-nc-nd-2.0': {'id': 'CC-BY-NC-ND-2.0', 'deprecated': False},
+    'cc-by-nc-nd-2.5': {'id': 'CC-BY-NC-ND-2.5', 'deprecated': False},
+    'cc-by-nc-nd-3.0': {'id': 'CC-BY-NC-ND-3.0', 'deprecated': False},
+    'cc-by-nc-nd-3.0-de': {'id': 'CC-BY-NC-ND-3.0-DE', 'deprecated': False},
+    'cc-by-nc-nd-3.0-igo': {'id': 'CC-BY-NC-ND-3.0-IGO', 'deprecated': False},
+    'cc-by-nc-nd-4.0': {'id': 'CC-BY-NC-ND-4.0', 'deprecated': False},
+    'cc-by-nc-sa-1.0': {'id': 'CC-BY-NC-SA-1.0', 'deprecated': False},
+    'cc-by-nc-sa-2.0': {'id': 'CC-BY-NC-SA-2.0', 'deprecated': False},
+    'cc-by-nc-sa-2.0-de': {'id': 'CC-BY-NC-SA-2.0-DE', 'deprecated': False},
+    'cc-by-nc-sa-2.0-fr': {'id': 'CC-BY-NC-SA-2.0-FR', 'deprecated': False},
+    'cc-by-nc-sa-2.0-uk': {'id': 'CC-BY-NC-SA-2.0-UK', 'deprecated': False},
+    'cc-by-nc-sa-2.5': {'id': 'CC-BY-NC-SA-2.5', 'deprecated': False},
+    'cc-by-nc-sa-3.0': {'id': 'CC-BY-NC-SA-3.0', 'deprecated': False},
+    'cc-by-nc-sa-3.0-de': {'id': 'CC-BY-NC-SA-3.0-DE', 'deprecated': False},
+    'cc-by-nc-sa-3.0-igo': {'id': 'CC-BY-NC-SA-3.0-IGO', 'deprecated': False},
+    'cc-by-nc-sa-4.0': {'id': 'CC-BY-NC-SA-4.0', 'deprecated': False},
+    'cc-by-nd-1.0': {'id': 'CC-BY-ND-1.0', 'deprecated': False},
+    'cc-by-nd-2.0': {'id': 'CC-BY-ND-2.0', 'deprecated': False},
+    'cc-by-nd-2.5': {'id': 'CC-BY-ND-2.5', 'deprecated': False},
+    'cc-by-nd-3.0': {'id': 'CC-BY-ND-3.0', 'deprecated': False},
+    'cc-by-nd-3.0-de': {'id': 'CC-BY-ND-3.0-DE', 'deprecated': False},
+    'cc-by-nd-4.0': {'id': 'CC-BY-ND-4.0', 'deprecated': False},
+    'cc-by-sa-1.0': {'id': 'CC-BY-SA-1.0', 'deprecated': False},
+    'cc-by-sa-2.0': {'id': 'CC-BY-SA-2.0', 'deprecated': False},
+    'cc-by-sa-2.0-uk': {'id': 'CC-BY-SA-2.0-UK', 'deprecated': False},
+    'cc-by-sa-2.1-jp': {'id': 'CC-BY-SA-2.1-JP', 'deprecated': False},
+    'cc-by-sa-2.5': {'id': 'CC-BY-SA-2.5', 'deprecated': False},
+    'cc-by-sa-3.0': {'id': 'CC-BY-SA-3.0', 'deprecated': False},
+    'cc-by-sa-3.0-at': {'id': 'CC-BY-SA-3.0-AT', 'deprecated': False},
+    'cc-by-sa-3.0-de': {'id': 'CC-BY-SA-3.0-DE', 'deprecated': False},
+    'cc-by-sa-3.0-igo': {'id': 'CC-BY-SA-3.0-IGO', 'deprecated': False},
+    'cc-by-sa-4.0': {'id': 'CC-BY-SA-4.0', 'deprecated': False},
+    'cc-pddc': {'id': 'CC-PDDC', 'deprecated': False},
+    'cc0-1.0': {'id': 'CC0-1.0', 'deprecated': False},
+    'cddl-1.0': {'id': 'CDDL-1.0', 'deprecated': False},
+    'cddl-1.1': {'id': 'CDDL-1.1', 'deprecated': False},
+    'cdl-1.0': {'id': 'CDL-1.0', 'deprecated': False},
+    'cdla-permissive-1.0': {'id': 'CDLA-Permissive-1.0', 'deprecated': False},
+    'cdla-permissive-2.0': {'id': 'CDLA-Permissive-2.0', 'deprecated': False},
+    'cdla-sharing-1.0': {'id': 'CDLA-Sharing-1.0', 'deprecated': False},
+    'cecill-1.0': {'id': 'CECILL-1.0', 'deprecated': False},
+    'cecill-1.1': {'id': 'CECILL-1.1', 'deprecated': False},
+    'cecill-2.0': {'id': 'CECILL-2.0', 'deprecated': False},
+    'cecill-2.1': {'id': 'CECILL-2.1', 'deprecated': False},
+    'cecill-b': {'id': 'CECILL-B', 'deprecated': False},
+    'cecill-c': {'id': 'CECILL-C', 'deprecated': False},
+    'cern-ohl-1.1': {'id': 'CERN-OHL-1.1', 'deprecated': False},
+    'cern-ohl-1.2': {'id': 'CERN-OHL-1.2', 'deprecated': False},
+    'cern-ohl-p-2.0': {'id': 'CERN-OHL-P-2.0', 'deprecated': False},
+    'cern-ohl-s-2.0': {'id': 'CERN-OHL-S-2.0', 'deprecated': False},
+    'cern-ohl-w-2.0': {'id': 'CERN-OHL-W-2.0', 'deprecated': False},
+    'cfitsio': {'id': 'CFITSIO', 'deprecated': False},
+    'check-cvs': {'id': 'check-cvs', 'deprecated': False},
+    'checkmk': {'id': 'checkmk', 'deprecated': False},
+    'clartistic': {'id': 'ClArtistic', 'deprecated': False},
+    'clips': {'id': 'Clips', 'deprecated': False},
+    'cmu-mach': {'id': 'CMU-Mach', 'deprecated': False},
+    'cmu-mach-nodoc': {'id': 'CMU-Mach-nodoc', 'deprecated': False},
+    'cnri-jython': {'id': 'CNRI-Jython', 'deprecated': False},
+    'cnri-python': {'id': 'CNRI-Python', 'deprecated': False},
+    'cnri-python-gpl-compatible': {'id': 'CNRI-Python-GPL-Compatible', 'deprecated': False},
+    'coil-1.0': {'id': 'COIL-1.0', 'deprecated': False},
+    'community-spec-1.0': {'id': 'Community-Spec-1.0', 'deprecated': False},
+    'condor-1.1': {'id': 'Condor-1.1', 'deprecated': False},
+    'copyleft-next-0.3.0': {'id': 'copyleft-next-0.3.0', 'deprecated': False},
+    'copyleft-next-0.3.1': {'id': 'copyleft-next-0.3.1', 'deprecated': False},
+    'cornell-lossless-jpeg': {'id': 'Cornell-Lossless-JPEG', 'deprecated': False},
+    'cpal-1.0': {'id': 'CPAL-1.0', 'deprecated': False},
+    'cpl-1.0': {'id': 'CPL-1.0', 'deprecated': False},
+    'cpol-1.02': {'id': 'CPOL-1.02', 'deprecated': False},
+    'cronyx': {'id': 'Cronyx', 'deprecated': False},
+    'crossword': {'id': 'Crossword', 'deprecated': False},
+    'crystalstacker': {'id': 'CrystalStacker', 'deprecated': False},
+    'cua-opl-1.0': {'id': 'CUA-OPL-1.0', 'deprecated': False},
+    'cube': {'id': 'Cube', 'deprecated': False},
+    'curl': {'id': 'curl', 'deprecated': False},
+    'cve-tou': {'id': 'cve-tou', 'deprecated': False},
+    'd-fsl-1.0': {'id': 'D-FSL-1.0', 'deprecated': False},
+    'dec-3-clause': {'id': 'DEC-3-Clause', 'deprecated': False},
+    'diffmark': {'id': 'diffmark', 'deprecated': False},
+    'dl-de-by-2.0': {'id': 'DL-DE-BY-2.0', 'deprecated': False},
+    'dl-de-zero-2.0': {'id': 'DL-DE-ZERO-2.0', 'deprecated': False},
+    'doc': {'id': 'DOC', 'deprecated': False},
+    'docbook-schema': {'id': 'DocBook-Schema', 'deprecated': False},
+    'docbook-xml': {'id': 'DocBook-XML', 'deprecated': False},
+    'dotseqn': {'id': 'Dotseqn', 'deprecated': False},
+    'drl-1.0': {'id': 'DRL-1.0', 'deprecated': False},
+    'drl-1.1': {'id': 'DRL-1.1', 'deprecated': False},
+    'dsdp': {'id': 'DSDP', 'deprecated': False},
+    'dtoa': {'id': 'dtoa', 'deprecated': False},
+    'dvipdfm': {'id': 'dvipdfm', 'deprecated': False},
+    'ecl-1.0': {'id': 'ECL-1.0', 'deprecated': False},
+    'ecl-2.0': {'id': 'ECL-2.0', 'deprecated': False},
+    'ecos-2.0': {'id': 'eCos-2.0', 'deprecated': True},
+    'efl-1.0': {'id': 'EFL-1.0', 'deprecated': False},
+    'efl-2.0': {'id': 'EFL-2.0', 'deprecated': False},
+    'egenix': {'id': 'eGenix', 'deprecated': False},
+    'elastic-2.0': {'id': 'Elastic-2.0', 'deprecated': False},
+    'entessa': {'id': 'Entessa', 'deprecated': False},
+    'epics': {'id': 'EPICS', 'deprecated': False},
+    'epl-1.0': {'id': 'EPL-1.0', 'deprecated': False},
+    'epl-2.0': {'id': 'EPL-2.0', 'deprecated': False},
+    'erlpl-1.1': {'id': 'ErlPL-1.1', 'deprecated': False},
+    'etalab-2.0': {'id': 'etalab-2.0', 'deprecated': False},
+    'eudatagrid': {'id': 'EUDatagrid', 'deprecated': False},
+    'eupl-1.0': {'id': 'EUPL-1.0', 'deprecated': False},
+    'eupl-1.1': {'id': 'EUPL-1.1', 'deprecated': False},
+    'eupl-1.2': {'id': 'EUPL-1.2', 'deprecated': False},
+    'eurosym': {'id': 'Eurosym', 'deprecated': False},
+    'fair': {'id': 'Fair', 'deprecated': False},
+    'fbm': {'id': 'FBM', 'deprecated': False},
+    'fdk-aac': {'id': 'FDK-AAC', 'deprecated': False},
+    'ferguson-twofish': {'id': 'Ferguson-Twofish', 'deprecated': False},
+    'frameworx-1.0': {'id': 'Frameworx-1.0', 'deprecated': False},
+    'freebsd-doc': {'id': 'FreeBSD-DOC', 'deprecated': False},
+    'freeimage': {'id': 'FreeImage', 'deprecated': False},
+    'fsfap': {'id': 'FSFAP', 'deprecated': False},
+    'fsfap-no-warranty-disclaimer': {'id': 'FSFAP-no-warranty-disclaimer', 'deprecated': False},
+    'fsful': {'id': 'FSFUL', 'deprecated': False},
+    'fsfullr': {'id': 'FSFULLR', 'deprecated': False},
+    'fsfullrwd': {'id': 'FSFULLRWD', 'deprecated': False},
+    'ftl': {'id': 'FTL', 'deprecated': False},
+    'furuseth': {'id': 'Furuseth', 'deprecated': False},
+    'fwlw': {'id': 'fwlw', 'deprecated': False},
+    'gcr-docs': {'id': 'GCR-docs', 'deprecated': False},
+    'gd': {'id': 'GD', 'deprecated': False},
+    'gfdl-1.1': {'id': 'GFDL-1.1', 'deprecated': True},
+    'gfdl-1.1-invariants-only': {'id': 'GFDL-1.1-invariants-only', 'deprecated': False},
+    'gfdl-1.1-invariants-or-later': {'id': 'GFDL-1.1-invariants-or-later', 'deprecated': False},
+    'gfdl-1.1-no-invariants-only': {'id': 'GFDL-1.1-no-invariants-only', 'deprecated': False},
+    'gfdl-1.1-no-invariants-or-later': {'id': 'GFDL-1.1-no-invariants-or-later', 'deprecated': False},
+    'gfdl-1.1-only': {'id': 'GFDL-1.1-only', 'deprecated': False},
+    'gfdl-1.1-or-later': {'id': 'GFDL-1.1-or-later', 'deprecated': False},
+    'gfdl-1.2': {'id': 'GFDL-1.2', 'deprecated': True},
+    'gfdl-1.2-invariants-only': {'id': 'GFDL-1.2-invariants-only', 'deprecated': False},
+    'gfdl-1.2-invariants-or-later': {'id': 'GFDL-1.2-invariants-or-later', 'deprecated': False},
+    'gfdl-1.2-no-invariants-only': {'id': 'GFDL-1.2-no-invariants-only', 'deprecated': False},
+    'gfdl-1.2-no-invariants-or-later': {'id': 'GFDL-1.2-no-invariants-or-later', 'deprecated': False},
+    'gfdl-1.2-only': {'id': 'GFDL-1.2-only', 'deprecated': False},
+    'gfdl-1.2-or-later': {'id': 'GFDL-1.2-or-later', 'deprecated': False},
+    'gfdl-1.3': {'id': 'GFDL-1.3', 'deprecated': True},
+    'gfdl-1.3-invariants-only': {'id': 'GFDL-1.3-invariants-only', 'deprecated': False},
+    'gfdl-1.3-invariants-or-later': {'id': 'GFDL-1.3-invariants-or-later', 'deprecated': False},
+    'gfdl-1.3-no-invariants-only': {'id': 'GFDL-1.3-no-invariants-only', 'deprecated': False},
+    'gfdl-1.3-no-invariants-or-later': {'id': 'GFDL-1.3-no-invariants-or-later', 'deprecated': False},
+    'gfdl-1.3-only': {'id': 'GFDL-1.3-only', 'deprecated': False},
+    'gfdl-1.3-or-later': {'id': 'GFDL-1.3-or-later', 'deprecated': False},
+    'giftware': {'id': 'Giftware', 'deprecated': False},
+    'gl2ps': {'id': 'GL2PS', 'deprecated': False},
+    'glide': {'id': 'Glide', 'deprecated': False},
+    'glulxe': {'id': 'Glulxe', 'deprecated': False},
+    'glwtpl': {'id': 'GLWTPL', 'deprecated': False},
+    'gnuplot': {'id': 'gnuplot', 'deprecated': False},
+    'gpl-1.0': {'id': 'GPL-1.0', 'deprecated': True},
+    'gpl-1.0+': {'id': 'GPL-1.0+', 'deprecated': True},
+    'gpl-1.0-only': {'id': 'GPL-1.0-only', 'deprecated': False},
+    'gpl-1.0-or-later': {'id': 'GPL-1.0-or-later', 'deprecated': False},
+    'gpl-2.0': {'id': 'GPL-2.0', 'deprecated': True},
+    'gpl-2.0+': {'id': 'GPL-2.0+', 'deprecated': True},
+    'gpl-2.0-only': {'id': 'GPL-2.0-only', 'deprecated': False},
+    'gpl-2.0-or-later': {'id': 'GPL-2.0-or-later', 'deprecated': False},
+    'gpl-2.0-with-autoconf-exception': {'id': 'GPL-2.0-with-autoconf-exception', 'deprecated': True},
+    'gpl-2.0-with-bison-exception': {'id': 'GPL-2.0-with-bison-exception', 'deprecated': True},
+    'gpl-2.0-with-classpath-exception': {'id': 'GPL-2.0-with-classpath-exception', 'deprecated': True},
+    'gpl-2.0-with-font-exception': {'id': 'GPL-2.0-with-font-exception', 'deprecated': True},
+    'gpl-2.0-with-gcc-exception': {'id': 'GPL-2.0-with-GCC-exception', 'deprecated': True},
+    'gpl-3.0': {'id': 'GPL-3.0', 'deprecated': True},
+    'gpl-3.0+': {'id': 'GPL-3.0+', 'deprecated': True},
+    'gpl-3.0-only': {'id': 'GPL-3.0-only', 'deprecated': False},
+    'gpl-3.0-or-later': {'id': 'GPL-3.0-or-later', 'deprecated': False},
+    'gpl-3.0-with-autoconf-exception': {'id': 'GPL-3.0-with-autoconf-exception', 'deprecated': True},
+    'gpl-3.0-with-gcc-exception': {'id': 'GPL-3.0-with-GCC-exception', 'deprecated': True},
+    'graphics-gems': {'id': 'Graphics-Gems', 'deprecated': False},
+    'gsoap-1.3b': {'id': 'gSOAP-1.3b', 'deprecated': False},
+    'gtkbook': {'id': 'gtkbook', 'deprecated': False},
+    'gutmann': {'id': 'Gutmann', 'deprecated': False},
+    'haskellreport': {'id': 'HaskellReport', 'deprecated': False},
+    'hdparm': {'id': 'hdparm', 'deprecated': False},
+    'hidapi': {'id': 'HIDAPI', 'deprecated': False},
+    'hippocratic-2.1': {'id': 'Hippocratic-2.1', 'deprecated': False},
+    'hp-1986': {'id': 'HP-1986', 'deprecated': False},
+    'hp-1989': {'id': 'HP-1989', 'deprecated': False},
+    'hpnd': {'id': 'HPND', 'deprecated': False},
+    'hpnd-dec': {'id': 'HPND-DEC', 'deprecated': False},
+    'hpnd-doc': {'id': 'HPND-doc', 'deprecated': False},
+    'hpnd-doc-sell': {'id': 'HPND-doc-sell', 'deprecated': False},
+    'hpnd-export-us': {'id': 'HPND-export-US', 'deprecated': False},
+    'hpnd-export-us-acknowledgement': {'id': 'HPND-export-US-acknowledgement', 'deprecated': False},
+    'hpnd-export-us-modify': {'id': 'HPND-export-US-modify', 'deprecated': False},
+    'hpnd-export2-us': {'id': 'HPND-export2-US', 'deprecated': False},
+    'hpnd-fenneberg-livingston': {'id': 'HPND-Fenneberg-Livingston', 'deprecated': False},
+    'hpnd-inria-imag': {'id': 'HPND-INRIA-IMAG', 'deprecated': False},
+    'hpnd-intel': {'id': 'HPND-Intel', 'deprecated': False},
+    'hpnd-kevlin-henney': {'id': 'HPND-Kevlin-Henney', 'deprecated': False},
+    'hpnd-markus-kuhn': {'id': 'HPND-Markus-Kuhn', 'deprecated': False},
+    'hpnd-merchantability-variant': {'id': 'HPND-merchantability-variant', 'deprecated': False},
+    'hpnd-mit-disclaimer': {'id': 'HPND-MIT-disclaimer', 'deprecated': False},
+    'hpnd-netrek': {'id': 'HPND-Netrek', 'deprecated': False},
+    'hpnd-pbmplus': {'id': 'HPND-Pbmplus', 'deprecated': False},
+    'hpnd-sell-mit-disclaimer-xserver': {'id': 'HPND-sell-MIT-disclaimer-xserver', 'deprecated': False},
+    'hpnd-sell-regexpr': {'id': 'HPND-sell-regexpr', 'deprecated': False},
+    'hpnd-sell-variant': {'id': 'HPND-sell-variant', 'deprecated': False},
+    'hpnd-sell-variant-mit-disclaimer': {'id': 'HPND-sell-variant-MIT-disclaimer', 'deprecated': False},
+    'hpnd-sell-variant-mit-disclaimer-rev': {'id': 'HPND-sell-variant-MIT-disclaimer-rev', 'deprecated': False},
+    'hpnd-uc': {'id': 'HPND-UC', 'deprecated': False},
+    'hpnd-uc-export-us': {'id': 'HPND-UC-export-US', 'deprecated': False},
+    'htmltidy': {'id': 'HTMLTIDY', 'deprecated': False},
+    'ibm-pibs': {'id': 'IBM-pibs', 'deprecated': False},
+    'icu': {'id': 'ICU', 'deprecated': False},
+    'iec-code-components-eula': {'id': 'IEC-Code-Components-EULA', 'deprecated': False},
+    'ijg': {'id': 'IJG', 'deprecated': False},
+    'ijg-short': {'id': 'IJG-short', 'deprecated': False},
+    'imagemagick': {'id': 'ImageMagick', 'deprecated': False},
+    'imatix': {'id': 'iMatix', 'deprecated': False},
+    'imlib2': {'id': 'Imlib2', 'deprecated': False},
+    'info-zip': {'id': 'Info-ZIP', 'deprecated': False},
+    'inner-net-2.0': {'id': 'Inner-Net-2.0', 'deprecated': False},
+    'intel': {'id': 'Intel', 'deprecated': False},
+    'intel-acpi': {'id': 'Intel-ACPI', 'deprecated': False},
+    'interbase-1.0': {'id': 'Interbase-1.0', 'deprecated': False},
+    'ipa': {'id': 'IPA', 'deprecated': False},
+    'ipl-1.0': {'id': 'IPL-1.0', 'deprecated': False},
+    'isc': {'id': 'ISC', 'deprecated': False},
+    'isc-veillard': {'id': 'ISC-Veillard', 'deprecated': False},
+    'jam': {'id': 'Jam', 'deprecated': False},
+    'jasper-2.0': {'id': 'JasPer-2.0', 'deprecated': False},
+    'jpl-image': {'id': 'JPL-image', 'deprecated': False},
+    'jpnic': {'id': 'JPNIC', 'deprecated': False},
+    'json': {'id': 'JSON', 'deprecated': False},
+    'kastrup': {'id': 'Kastrup', 'deprecated': False},
+    'kazlib': {'id': 'Kazlib', 'deprecated': False},
+    'knuth-ctan': {'id': 'Knuth-CTAN', 'deprecated': False},
+    'lal-1.2': {'id': 'LAL-1.2', 'deprecated': False},
+    'lal-1.3': {'id': 'LAL-1.3', 'deprecated': False},
+    'latex2e': {'id': 'Latex2e', 'deprecated': False},
+    'latex2e-translated-notice': {'id': 'Latex2e-translated-notice', 'deprecated': False},
+    'leptonica': {'id': 'Leptonica', 'deprecated': False},
+    'lgpl-2.0': {'id': 'LGPL-2.0', 'deprecated': True},
+    'lgpl-2.0+': {'id': 'LGPL-2.0+', 'deprecated': True},
+    'lgpl-2.0-only': {'id': 'LGPL-2.0-only', 'deprecated': False},
+    'lgpl-2.0-or-later': {'id': 'LGPL-2.0-or-later', 'deprecated': False},
+    'lgpl-2.1': {'id': 'LGPL-2.1', 'deprecated': True},
+    'lgpl-2.1+': {'id': 'LGPL-2.1+', 'deprecated': True},
+    'lgpl-2.1-only': {'id': 'LGPL-2.1-only', 'deprecated': False},
+    'lgpl-2.1-or-later': {'id': 'LGPL-2.1-or-later', 'deprecated': False},
+    'lgpl-3.0': {'id': 'LGPL-3.0', 'deprecated': True},
+    'lgpl-3.0+': {'id': 'LGPL-3.0+', 'deprecated': True},
+    'lgpl-3.0-only': {'id': 'LGPL-3.0-only', 'deprecated': False},
+    'lgpl-3.0-or-later': {'id': 'LGPL-3.0-or-later', 'deprecated': False},
+    'lgpllr': {'id': 'LGPLLR', 'deprecated': False},
+    'libpng': {'id': 'Libpng', 'deprecated': False},
+    'libpng-2.0': {'id': 'libpng-2.0', 'deprecated': False},
+    'libselinux-1.0': {'id': 'libselinux-1.0', 'deprecated': False},
+    'libtiff': {'id': 'libtiff', 'deprecated': False},
+    'libutil-david-nugent': {'id': 'libutil-David-Nugent', 'deprecated': False},
+    'liliq-p-1.1': {'id': 'LiLiQ-P-1.1', 'deprecated': False},
+    'liliq-r-1.1': {'id': 'LiLiQ-R-1.1', 'deprecated': False},
+    'liliq-rplus-1.1': {'id': 'LiLiQ-Rplus-1.1', 'deprecated': False},
+    'linux-man-pages-1-para': {'id': 'Linux-man-pages-1-para', 'deprecated': False},
+    'linux-man-pages-copyleft': {'id': 'Linux-man-pages-copyleft', 'deprecated': False},
+    'linux-man-pages-copyleft-2-para': {'id': 'Linux-man-pages-copyleft-2-para', 'deprecated': False},
+    'linux-man-pages-copyleft-var': {'id': 'Linux-man-pages-copyleft-var', 'deprecated': False},
+    'linux-openib': {'id': 'Linux-OpenIB', 'deprecated': False},
+    'loop': {'id': 'LOOP', 'deprecated': False},
+    'lpd-document': {'id': 'LPD-document', 'deprecated': False},
+    'lpl-1.0': {'id': 'LPL-1.0', 'deprecated': False},
+    'lpl-1.02': {'id': 'LPL-1.02', 'deprecated': False},
+    'lppl-1.0': {'id': 'LPPL-1.0', 'deprecated': False},
+    'lppl-1.1': {'id': 'LPPL-1.1', 'deprecated': False},
+    'lppl-1.2': {'id': 'LPPL-1.2', 'deprecated': False},
+    'lppl-1.3a': {'id': 'LPPL-1.3a', 'deprecated': False},
+    'lppl-1.3c': {'id': 'LPPL-1.3c', 'deprecated': False},
+    'lsof': {'id': 'lsof', 'deprecated': False},
+    'lucida-bitmap-fonts': {'id': 'Lucida-Bitmap-Fonts', 'deprecated': False},
+    'lzma-sdk-9.11-to-9.20': {'id': 'LZMA-SDK-9.11-to-9.20', 'deprecated': False},
+    'lzma-sdk-9.22': {'id': 'LZMA-SDK-9.22', 'deprecated': False},
+    'mackerras-3-clause': {'id': 'Mackerras-3-Clause', 'deprecated': False},
+    'mackerras-3-clause-acknowledgment': {'id': 'Mackerras-3-Clause-acknowledgment', 'deprecated': False},
+    'magaz': {'id': 'magaz', 'deprecated': False},
+    'mailprio': {'id': 'mailprio', 'deprecated': False},
+    'makeindex': {'id': 'MakeIndex', 'deprecated': False},
+    'martin-birgmeier': {'id': 'Martin-Birgmeier', 'deprecated': False},
+    'mcphee-slideshow': {'id': 'McPhee-slideshow', 'deprecated': False},
+    'metamail': {'id': 'metamail', 'deprecated': False},
+    'minpack': {'id': 'Minpack', 'deprecated': False},
+    'miros': {'id': 'MirOS', 'deprecated': False},
+    'mit': {'id': 'MIT', 'deprecated': False},
+    'mit-0': {'id': 'MIT-0', 'deprecated': False},
+    'mit-advertising': {'id': 'MIT-advertising', 'deprecated': False},
+    'mit-cmu': {'id': 'MIT-CMU', 'deprecated': False},
+    'mit-enna': {'id': 'MIT-enna', 'deprecated': False},
+    'mit-feh': {'id': 'MIT-feh', 'deprecated': False},
+    'mit-festival': {'id': 'MIT-Festival', 'deprecated': False},
+    'mit-khronos-old': {'id': 'MIT-Khronos-old', 'deprecated': False},
+    'mit-modern-variant': {'id': 'MIT-Modern-Variant', 'deprecated': False},
+    'mit-open-group': {'id': 'MIT-open-group', 'deprecated': False},
+    'mit-testregex': {'id': 'MIT-testregex', 'deprecated': False},
+    'mit-wu': {'id': 'MIT-Wu', 'deprecated': False},
+    'mitnfa': {'id': 'MITNFA', 'deprecated': False},
+    'mmixware': {'id': 'MMIXware', 'deprecated': False},
+    'motosoto': {'id': 'Motosoto', 'deprecated': False},
+    'mpeg-ssg': {'id': 'MPEG-SSG', 'deprecated': False},
+    'mpi-permissive': {'id': 'mpi-permissive', 'deprecated': False},
+    'mpich2': {'id': 'mpich2', 'deprecated': False},
+    'mpl-1.0': {'id': 'MPL-1.0', 'deprecated': False},
+    'mpl-1.1': {'id': 'MPL-1.1', 'deprecated': False},
+    'mpl-2.0': {'id': 'MPL-2.0', 'deprecated': False},
+    'mpl-2.0-no-copyleft-exception': {'id': 'MPL-2.0-no-copyleft-exception', 'deprecated': False},
+    'mplus': {'id': 'mplus', 'deprecated': False},
+    'ms-lpl': {'id': 'MS-LPL', 'deprecated': False},
+    'ms-pl': {'id': 'MS-PL', 'deprecated': False},
+    'ms-rl': {'id': 'MS-RL', 'deprecated': False},
+    'mtll': {'id': 'MTLL', 'deprecated': False},
+    'mulanpsl-1.0': {'id': 'MulanPSL-1.0', 'deprecated': False},
+    'mulanpsl-2.0': {'id': 'MulanPSL-2.0', 'deprecated': False},
+    'multics': {'id': 'Multics', 'deprecated': False},
+    'mup': {'id': 'Mup', 'deprecated': False},
+    'naist-2003': {'id': 'NAIST-2003', 'deprecated': False},
+    'nasa-1.3': {'id': 'NASA-1.3', 'deprecated': False},
+    'naumen': {'id': 'Naumen', 'deprecated': False},
+    'nbpl-1.0': {'id': 'NBPL-1.0', 'deprecated': False},
+    'ncbi-pd': {'id': 'NCBI-PD', 'deprecated': False},
+    'ncgl-uk-2.0': {'id': 'NCGL-UK-2.0', 'deprecated': False},
+    'ncl': {'id': 'NCL', 'deprecated': False},
+    'ncsa': {'id': 'NCSA', 'deprecated': False},
+    'net-snmp': {'id': 'Net-SNMP', 'deprecated': True},
+    'netcdf': {'id': 'NetCDF', 'deprecated': False},
+    'newsletr': {'id': 'Newsletr', 'deprecated': False},
+    'ngpl': {'id': 'NGPL', 'deprecated': False},
+    'nicta-1.0': {'id': 'NICTA-1.0', 'deprecated': False},
+    'nist-pd': {'id': 'NIST-PD', 'deprecated': False},
+    'nist-pd-fallback': {'id': 'NIST-PD-fallback', 'deprecated': False},
+    'nist-software': {'id': 'NIST-Software', 'deprecated': False},
+    'nlod-1.0': {'id': 'NLOD-1.0', 'deprecated': False},
+    'nlod-2.0': {'id': 'NLOD-2.0', 'deprecated': False},
+    'nlpl': {'id': 'NLPL', 'deprecated': False},
+    'nokia': {'id': 'Nokia', 'deprecated': False},
+    'nosl': {'id': 'NOSL', 'deprecated': False},
+    'noweb': {'id': 'Noweb', 'deprecated': False},
+    'npl-1.0': {'id': 'NPL-1.0', 'deprecated': False},
+    'npl-1.1': {'id': 'NPL-1.1', 'deprecated': False},
+    'nposl-3.0': {'id': 'NPOSL-3.0', 'deprecated': False},
+    'nrl': {'id': 'NRL', 'deprecated': False},
+    'ntp': {'id': 'NTP', 'deprecated': False},
+    'ntp-0': {'id': 'NTP-0', 'deprecated': False},
+    'nunit': {'id': 'Nunit', 'deprecated': True},
+    'o-uda-1.0': {'id': 'O-UDA-1.0', 'deprecated': False},
+    'oar': {'id': 'OAR', 'deprecated': False},
+    'occt-pl': {'id': 'OCCT-PL', 'deprecated': False},
+    'oclc-2.0': {'id': 'OCLC-2.0', 'deprecated': False},
+    'odbl-1.0': {'id': 'ODbL-1.0', 'deprecated': False},
+    'odc-by-1.0': {'id': 'ODC-By-1.0', 'deprecated': False},
+    'offis': {'id': 'OFFIS', 'deprecated': False},
+    'ofl-1.0': {'id': 'OFL-1.0', 'deprecated': False},
+    'ofl-1.0-no-rfn': {'id': 'OFL-1.0-no-RFN', 'deprecated': False},
+    'ofl-1.0-rfn': {'id': 'OFL-1.0-RFN', 'deprecated': False},
+    'ofl-1.1': {'id': 'OFL-1.1', 'deprecated': False},
+    'ofl-1.1-no-rfn': {'id': 'OFL-1.1-no-RFN', 'deprecated': False},
+    'ofl-1.1-rfn': {'id': 'OFL-1.1-RFN', 'deprecated': False},
+    'ogc-1.0': {'id': 'OGC-1.0', 'deprecated': False},
+    'ogdl-taiwan-1.0': {'id': 'OGDL-Taiwan-1.0', 'deprecated': False},
+    'ogl-canada-2.0': {'id': 'OGL-Canada-2.0', 'deprecated': False},
+    'ogl-uk-1.0': {'id': 'OGL-UK-1.0', 'deprecated': False},
+    'ogl-uk-2.0': {'id': 'OGL-UK-2.0', 'deprecated': False},
+    'ogl-uk-3.0': {'id': 'OGL-UK-3.0', 'deprecated': False},
+    'ogtsl': {'id': 'OGTSL', 'deprecated': False},
+    'oldap-1.1': {'id': 'OLDAP-1.1', 'deprecated': False},
+    'oldap-1.2': {'id': 'OLDAP-1.2', 'deprecated': False},
+    'oldap-1.3': {'id': 'OLDAP-1.3', 'deprecated': False},
+    'oldap-1.4': {'id': 'OLDAP-1.4', 'deprecated': False},
+    'oldap-2.0': {'id': 'OLDAP-2.0', 'deprecated': False},
+    'oldap-2.0.1': {'id': 'OLDAP-2.0.1', 'deprecated': False},
+    'oldap-2.1': {'id': 'OLDAP-2.1', 'deprecated': False},
+    'oldap-2.2': {'id': 'OLDAP-2.2', 'deprecated': False},
+    'oldap-2.2.1': {'id': 'OLDAP-2.2.1', 'deprecated': False},
+    'oldap-2.2.2': {'id': 'OLDAP-2.2.2', 'deprecated': False},
+    'oldap-2.3': {'id': 'OLDAP-2.3', 'deprecated': False},
+    'oldap-2.4': {'id': 'OLDAP-2.4', 'deprecated': False},
+    'oldap-2.5': {'id': 'OLDAP-2.5', 'deprecated': False},
+    'oldap-2.6': {'id': 'OLDAP-2.6', 'deprecated': False},
+    'oldap-2.7': {'id': 'OLDAP-2.7', 'deprecated': False},
+    'oldap-2.8': {'id': 'OLDAP-2.8', 'deprecated': False},
+    'olfl-1.3': {'id': 'OLFL-1.3', 'deprecated': False},
+    'oml': {'id': 'OML', 'deprecated': False},
+    'openpbs-2.3': {'id': 'OpenPBS-2.3', 'deprecated': False},
+    'openssl': {'id': 'OpenSSL', 'deprecated': False},
+    'openssl-standalone': {'id': 'OpenSSL-standalone', 'deprecated': False},
+    'openvision': {'id': 'OpenVision', 'deprecated': False},
+    'opl-1.0': {'id': 'OPL-1.0', 'deprecated': False},
+    'opl-uk-3.0': {'id': 'OPL-UK-3.0', 'deprecated': False},
+    'opubl-1.0': {'id': 'OPUBL-1.0', 'deprecated': False},
+    'oset-pl-2.1': {'id': 'OSET-PL-2.1', 'deprecated': False},
+    'osl-1.0': {'id': 'OSL-1.0', 'deprecated': False},
+    'osl-1.1': {'id': 'OSL-1.1', 'deprecated': False},
+    'osl-2.0': {'id': 'OSL-2.0', 'deprecated': False},
+    'osl-2.1': {'id': 'OSL-2.1', 'deprecated': False},
+    'osl-3.0': {'id': 'OSL-3.0', 'deprecated': False},
+    'padl': {'id': 'PADL', 'deprecated': False},
+    'parity-6.0.0': {'id': 'Parity-6.0.0', 'deprecated': False},
+    'parity-7.0.0': {'id': 'Parity-7.0.0', 'deprecated': False},
+    'pddl-1.0': {'id': 'PDDL-1.0', 'deprecated': False},
+    'php-3.0': {'id': 'PHP-3.0', 'deprecated': False},
+    'php-3.01': {'id': 'PHP-3.01', 'deprecated': False},
+    'pixar': {'id': 'Pixar', 'deprecated': False},
+    'pkgconf': {'id': 'pkgconf', 'deprecated': False},
+    'plexus': {'id': 'Plexus', 'deprecated': False},
+    'pnmstitch': {'id': 'pnmstitch', 'deprecated': False},
+    'polyform-noncommercial-1.0.0': {'id': 'PolyForm-Noncommercial-1.0.0', 'deprecated': False},
+    'polyform-small-business-1.0.0': {'id': 'PolyForm-Small-Business-1.0.0', 'deprecated': False},
+    'postgresql': {'id': 'PostgreSQL', 'deprecated': False},
+    'ppl': {'id': 'PPL', 'deprecated': False},
+    'psf-2.0': {'id': 'PSF-2.0', 'deprecated': False},
+    'psfrag': {'id': 'psfrag', 'deprecated': False},
+    'psutils': {'id': 'psutils', 'deprecated': False},
+    'python-2.0': {'id': 'Python-2.0', 'deprecated': False},
+    'python-2.0.1': {'id': 'Python-2.0.1', 'deprecated': False},
+    'python-ldap': {'id': 'python-ldap', 'deprecated': False},
+    'qhull': {'id': 'Qhull', 'deprecated': False},
+    'qpl-1.0': {'id': 'QPL-1.0', 'deprecated': False},
+    'qpl-1.0-inria-2004': {'id': 'QPL-1.0-INRIA-2004', 'deprecated': False},
+    'radvd': {'id': 'radvd', 'deprecated': False},
+    'rdisc': {'id': 'Rdisc', 'deprecated': False},
+    'rhecos-1.1': {'id': 'RHeCos-1.1', 'deprecated': False},
+    'rpl-1.1': {'id': 'RPL-1.1', 'deprecated': False},
+    'rpl-1.5': {'id': 'RPL-1.5', 'deprecated': False},
+    'rpsl-1.0': {'id': 'RPSL-1.0', 'deprecated': False},
+    'rsa-md': {'id': 'RSA-MD', 'deprecated': False},
+    'rscpl': {'id': 'RSCPL', 'deprecated': False},
+    'ruby': {'id': 'Ruby', 'deprecated': False},
+    'ruby-pty': {'id': 'Ruby-pty', 'deprecated': False},
+    'sax-pd': {'id': 'SAX-PD', 'deprecated': False},
+    'sax-pd-2.0': {'id': 'SAX-PD-2.0', 'deprecated': False},
+    'saxpath': {'id': 'Saxpath', 'deprecated': False},
+    'scea': {'id': 'SCEA', 'deprecated': False},
+    'schemereport': {'id': 'SchemeReport', 'deprecated': False},
+    'sendmail': {'id': 'Sendmail', 'deprecated': False},
+    'sendmail-8.23': {'id': 'Sendmail-8.23', 'deprecated': False},
+    'sgi-b-1.0': {'id': 'SGI-B-1.0', 'deprecated': False},
+    'sgi-b-1.1': {'id': 'SGI-B-1.1', 'deprecated': False},
+    'sgi-b-2.0': {'id': 'SGI-B-2.0', 'deprecated': False},
+    'sgi-opengl': {'id': 'SGI-OpenGL', 'deprecated': False},
+    'sgp4': {'id': 'SGP4', 'deprecated': False},
+    'shl-0.5': {'id': 'SHL-0.5', 'deprecated': False},
+    'shl-0.51': {'id': 'SHL-0.51', 'deprecated': False},
+    'simpl-2.0': {'id': 'SimPL-2.0', 'deprecated': False},
+    'sissl': {'id': 'SISSL', 'deprecated': False},
+    'sissl-1.2': {'id': 'SISSL-1.2', 'deprecated': False},
+    'sl': {'id': 'SL', 'deprecated': False},
+    'sleepycat': {'id': 'Sleepycat', 'deprecated': False},
+    'smlnj': {'id': 'SMLNJ', 'deprecated': False},
+    'smppl': {'id': 'SMPPL', 'deprecated': False},
+    'snia': {'id': 'SNIA', 'deprecated': False},
+    'snprintf': {'id': 'snprintf', 'deprecated': False},
+    'softsurfer': {'id': 'softSurfer', 'deprecated': False},
+    'soundex': {'id': 'Soundex', 'deprecated': False},
+    'spencer-86': {'id': 'Spencer-86', 'deprecated': False},
+    'spencer-94': {'id': 'Spencer-94', 'deprecated': False},
+    'spencer-99': {'id': 'Spencer-99', 'deprecated': False},
+    'spl-1.0': {'id': 'SPL-1.0', 'deprecated': False},
+    'ssh-keyscan': {'id': 'ssh-keyscan', 'deprecated': False},
+    'ssh-openssh': {'id': 'SSH-OpenSSH', 'deprecated': False},
+    'ssh-short': {'id': 'SSH-short', 'deprecated': False},
+    'ssleay-standalone': {'id': 'SSLeay-standalone', 'deprecated': False},
+    'sspl-1.0': {'id': 'SSPL-1.0', 'deprecated': False},
+    'standardml-nj': {'id': 'StandardML-NJ', 'deprecated': True},
+    'sugarcrm-1.1.3': {'id': 'SugarCRM-1.1.3', 'deprecated': False},
+    'sun-ppp': {'id': 'Sun-PPP', 'deprecated': False},
+    'sun-ppp-2000': {'id': 'Sun-PPP-2000', 'deprecated': False},
+    'sunpro': {'id': 'SunPro', 'deprecated': False},
+    'swl': {'id': 'SWL', 'deprecated': False},
+    'swrule': {'id': 'swrule', 'deprecated': False},
+    'symlinks': {'id': 'Symlinks', 'deprecated': False},
+    'tapr-ohl-1.0': {'id': 'TAPR-OHL-1.0', 'deprecated': False},
+    'tcl': {'id': 'TCL', 'deprecated': False},
+    'tcp-wrappers': {'id': 'TCP-wrappers', 'deprecated': False},
+    'termreadkey': {'id': 'TermReadKey', 'deprecated': False},
+    'tgppl-1.0': {'id': 'TGPPL-1.0', 'deprecated': False},
+    'threeparttable': {'id': 'threeparttable', 'deprecated': False},
+    'tmate': {'id': 'TMate', 'deprecated': False},
+    'torque-1.1': {'id': 'TORQUE-1.1', 'deprecated': False},
+    'tosl': {'id': 'TOSL', 'deprecated': False},
+    'tpdl': {'id': 'TPDL', 'deprecated': False},
+    'tpl-1.0': {'id': 'TPL-1.0', 'deprecated': False},
+    'ttwl': {'id': 'TTWL', 'deprecated': False},
+    'ttyp0': {'id': 'TTYP0', 'deprecated': False},
+    'tu-berlin-1.0': {'id': 'TU-Berlin-1.0', 'deprecated': False},
+    'tu-berlin-2.0': {'id': 'TU-Berlin-2.0', 'deprecated': False},
+    'ubuntu-font-1.0': {'id': 'Ubuntu-font-1.0', 'deprecated': False},
+    'ucar': {'id': 'UCAR', 'deprecated': False},
+    'ucl-1.0': {'id': 'UCL-1.0', 'deprecated': False},
+    'ulem': {'id': 'ulem', 'deprecated': False},
+    'umich-merit': {'id': 'UMich-Merit', 'deprecated': False},
+    'unicode-3.0': {'id': 'Unicode-3.0', 'deprecated': False},
+    'unicode-dfs-2015': {'id': 'Unicode-DFS-2015', 'deprecated': False},
+    'unicode-dfs-2016': {'id': 'Unicode-DFS-2016', 'deprecated': False},
+    'unicode-tou': {'id': 'Unicode-TOU', 'deprecated': False},
+    'unixcrypt': {'id': 'UnixCrypt', 'deprecated': False},
+    'unlicense': {'id': 'Unlicense', 'deprecated': False},
+    'upl-1.0': {'id': 'UPL-1.0', 'deprecated': False},
+    'urt-rle': {'id': 'URT-RLE', 'deprecated': False},
+    'vim': {'id': 'Vim', 'deprecated': False},
+    'vostrom': {'id': 'VOSTROM', 'deprecated': False},
+    'vsl-1.0': {'id': 'VSL-1.0', 'deprecated': False},
+    'w3c': {'id': 'W3C', 'deprecated': False},
+    'w3c-19980720': {'id': 'W3C-19980720', 'deprecated': False},
+    'w3c-20150513': {'id': 'W3C-20150513', 'deprecated': False},
+    'w3m': {'id': 'w3m', 'deprecated': False},
+    'watcom-1.0': {'id': 'Watcom-1.0', 'deprecated': False},
+    'widget-workshop': {'id': 'Widget-Workshop', 'deprecated': False},
+    'wsuipa': {'id': 'Wsuipa', 'deprecated': False},
+    'wtfpl': {'id': 'WTFPL', 'deprecated': False},
+    'wxwindows': {'id': 'wxWindows', 'deprecated': True},
+    'x11': {'id': 'X11', 'deprecated': False},
+    'x11-distribute-modifications-variant': {'id': 'X11-distribute-modifications-variant', 'deprecated': False},
+    'x11-swapped': {'id': 'X11-swapped', 'deprecated': False},
+    'xdebug-1.03': {'id': 'Xdebug-1.03', 'deprecated': False},
+    'xerox': {'id': 'Xerox', 'deprecated': False},
+    'xfig': {'id': 'Xfig', 'deprecated': False},
+    'xfree86-1.1': {'id': 'XFree86-1.1', 'deprecated': False},
+    'xinetd': {'id': 'xinetd', 'deprecated': False},
+    'xkeyboard-config-zinoviev': {'id': 'xkeyboard-config-Zinoviev', 'deprecated': False},
+    'xlock': {'id': 'xlock', 'deprecated': False},
+    'xnet': {'id': 'Xnet', 'deprecated': False},
+    'xpp': {'id': 'xpp', 'deprecated': False},
+    'xskat': {'id': 'XSkat', 'deprecated': False},
+    'xzoom': {'id': 'xzoom', 'deprecated': False},
+    'ypl-1.0': {'id': 'YPL-1.0', 'deprecated': False},
+    'ypl-1.1': {'id': 'YPL-1.1', 'deprecated': False},
+    'zed': {'id': 'Zed', 'deprecated': False},
+    'zeeff': {'id': 'Zeeff', 'deprecated': False},
+    'zend-2.0': {'id': 'Zend-2.0', 'deprecated': False},
+    'zimbra-1.3': {'id': 'Zimbra-1.3', 'deprecated': False},
+    'zimbra-1.4': {'id': 'Zimbra-1.4', 'deprecated': False},
+    'zlib': {'id': 'Zlib', 'deprecated': False},
+    'zlib-acknowledgement': {'id': 'zlib-acknowledgement', 'deprecated': False},
+    'zpl-1.1': {'id': 'ZPL-1.1', 'deprecated': False},
+    'zpl-2.0': {'id': 'ZPL-2.0', 'deprecated': False},
+    'zpl-2.1': {'id': 'ZPL-2.1', 'deprecated': False},
+}
+
+EXCEPTIONS: dict[str, SPDXException] = {
+    '389-exception': {'id': '389-exception', 'deprecated': False},
+    'asterisk-exception': {'id': 'Asterisk-exception', 'deprecated': False},
+    'asterisk-linking-protocols-exception': {'id': 'Asterisk-linking-protocols-exception', 'deprecated': False},
+    'autoconf-exception-2.0': {'id': 'Autoconf-exception-2.0', 'deprecated': False},
+    'autoconf-exception-3.0': {'id': 'Autoconf-exception-3.0', 'deprecated': False},
+    'autoconf-exception-generic': {'id': 'Autoconf-exception-generic', 'deprecated': False},
+    'autoconf-exception-generic-3.0': {'id': 'Autoconf-exception-generic-3.0', 'deprecated': False},
+    'autoconf-exception-macro': {'id': 'Autoconf-exception-macro', 'deprecated': False},
+    'bison-exception-1.24': {'id': 'Bison-exception-1.24', 'deprecated': False},
+    'bison-exception-2.2': {'id': 'Bison-exception-2.2', 'deprecated': False},
+    'bootloader-exception': {'id': 'Bootloader-exception', 'deprecated': False},
+    'classpath-exception-2.0': {'id': 'Classpath-exception-2.0', 'deprecated': False},
+    'clisp-exception-2.0': {'id': 'CLISP-exception-2.0', 'deprecated': False},
+    'cryptsetup-openssl-exception': {'id': 'cryptsetup-OpenSSL-exception', 'deprecated': False},
+    'digirule-foss-exception': {'id': 'DigiRule-FOSS-exception', 'deprecated': False},
+    'ecos-exception-2.0': {'id': 'eCos-exception-2.0', 'deprecated': False},
+    'erlang-otp-linking-exception': {'id': 'erlang-otp-linking-exception', 'deprecated': False},
+    'fawkes-runtime-exception': {'id': 'Fawkes-Runtime-exception', 'deprecated': False},
+    'fltk-exception': {'id': 'FLTK-exception', 'deprecated': False},
+    'fmt-exception': {'id': 'fmt-exception', 'deprecated': False},
+    'font-exception-2.0': {'id': 'Font-exception-2.0', 'deprecated': False},
+    'freertos-exception-2.0': {'id': 'freertos-exception-2.0', 'deprecated': False},
+    'gcc-exception-2.0': {'id': 'GCC-exception-2.0', 'deprecated': False},
+    'gcc-exception-2.0-note': {'id': 'GCC-exception-2.0-note', 'deprecated': False},
+    'gcc-exception-3.1': {'id': 'GCC-exception-3.1', 'deprecated': False},
+    'gmsh-exception': {'id': 'Gmsh-exception', 'deprecated': False},
+    'gnat-exception': {'id': 'GNAT-exception', 'deprecated': False},
+    'gnome-examples-exception': {'id': 'GNOME-examples-exception', 'deprecated': False},
+    'gnu-compiler-exception': {'id': 'GNU-compiler-exception', 'deprecated': False},
+    'gnu-javamail-exception': {'id': 'gnu-javamail-exception', 'deprecated': False},
+    'gpl-3.0-interface-exception': {'id': 'GPL-3.0-interface-exception', 'deprecated': False},
+    'gpl-3.0-linking-exception': {'id': 'GPL-3.0-linking-exception', 'deprecated': False},
+    'gpl-3.0-linking-source-exception': {'id': 'GPL-3.0-linking-source-exception', 'deprecated': False},
+    'gpl-cc-1.0': {'id': 'GPL-CC-1.0', 'deprecated': False},
+    'gstreamer-exception-2005': {'id': 'GStreamer-exception-2005', 'deprecated': False},
+    'gstreamer-exception-2008': {'id': 'GStreamer-exception-2008', 'deprecated': False},
+    'i2p-gpl-java-exception': {'id': 'i2p-gpl-java-exception', 'deprecated': False},
+    'kicad-libraries-exception': {'id': 'KiCad-libraries-exception', 'deprecated': False},
+    'lgpl-3.0-linking-exception': {'id': 'LGPL-3.0-linking-exception', 'deprecated': False},
+    'libpri-openh323-exception': {'id': 'libpri-OpenH323-exception', 'deprecated': False},
+    'libtool-exception': {'id': 'Libtool-exception', 'deprecated': False},
+    'linux-syscall-note': {'id': 'Linux-syscall-note', 'deprecated': False},
+    'llgpl': {'id': 'LLGPL', 'deprecated': False},
+    'llvm-exception': {'id': 'LLVM-exception', 'deprecated': False},
+    'lzma-exception': {'id': 'LZMA-exception', 'deprecated': False},
+    'mif-exception': {'id': 'mif-exception', 'deprecated': False},
+    'nokia-qt-exception-1.1': {'id': 'Nokia-Qt-exception-1.1', 'deprecated': True},
+    'ocaml-lgpl-linking-exception': {'id': 'OCaml-LGPL-linking-exception', 'deprecated': False},
+    'occt-exception-1.0': {'id': 'OCCT-exception-1.0', 'deprecated': False},
+    'openjdk-assembly-exception-1.0': {'id': 'OpenJDK-assembly-exception-1.0', 'deprecated': False},
+    'openvpn-openssl-exception': {'id': 'openvpn-openssl-exception', 'deprecated': False},
+    'pcre2-exception': {'id': 'PCRE2-exception', 'deprecated': False},
+    'ps-or-pdf-font-exception-20170817': {'id': 'PS-or-PDF-font-exception-20170817', 'deprecated': False},
+    'qpl-1.0-inria-2004-exception': {'id': 'QPL-1.0-INRIA-2004-exception', 'deprecated': False},
+    'qt-gpl-exception-1.0': {'id': 'Qt-GPL-exception-1.0', 'deprecated': False},
+    'qt-lgpl-exception-1.1': {'id': 'Qt-LGPL-exception-1.1', 'deprecated': False},
+    'qwt-exception-1.0': {'id': 'Qwt-exception-1.0', 'deprecated': False},
+    'romic-exception': {'id': 'romic-exception', 'deprecated': False},
+    'rrdtool-floss-exception-2.0': {'id': 'RRDtool-FLOSS-exception-2.0', 'deprecated': False},
+    'sane-exception': {'id': 'SANE-exception', 'deprecated': False},
+    'shl-2.0': {'id': 'SHL-2.0', 'deprecated': False},
+    'shl-2.1': {'id': 'SHL-2.1', 'deprecated': False},
+    'stunnel-exception': {'id': 'stunnel-exception', 'deprecated': False},
+    'swi-exception': {'id': 'SWI-exception', 'deprecated': False},
+    'swift-exception': {'id': 'Swift-exception', 'deprecated': False},
+    'texinfo-exception': {'id': 'Texinfo-exception', 'deprecated': False},
+    'u-boot-exception-2.0': {'id': 'u-boot-exception-2.0', 'deprecated': False},
+    'ubdl-exception': {'id': 'UBDL-exception', 'deprecated': False},
+    'universal-foss-exception-1.0': {'id': 'Universal-FOSS-exception-1.0', 'deprecated': False},
+    'vsftpd-openssl-exception': {'id': 'vsftpd-openssl-exception', 'deprecated': False},
+    'wxwindows-exception-3.1': {'id': 'WxWindows-exception-3.1', 'deprecated': False},
+    'x11vnc-openssl-exception': {'id': 'x11vnc-openssl-exception', 'deprecated': False},
+}
diff --git a/src/pip/_vendor/packaging/markers.py b/src/pip/_vendor/packaging/markers.py
index 7ac7bb69a53..fb7f49cf8cd 100644
--- a/src/pip/_vendor/packaging/markers.py
+++ b/src/pip/_vendor/packaging/markers.py
@@ -18,9 +18,9 @@
 
 __all__ = [
     "InvalidMarker",
+    "Marker",
     "UndefinedComparison",
     "UndefinedEnvironmentName",
-    "Marker",
     "default_environment",
 ]
 
@@ -232,7 +232,7 @@ def _evaluate_markers(markers: MarkerList, environment: dict[str, str]) -> bool:
 
 
 def format_full_version(info: sys._version_info) -> str:
-    version = "{0.major}.{0.minor}.{0.micro}".format(info)
+    version = f"{info.major}.{info.minor}.{info.micro}"
     kind = info.releaselevel
     if kind != "final":
         version += kind[0] + str(info.serial)
@@ -309,12 +309,6 @@ def evaluate(self, environment: dict[str, str] | None = None) -> bool:
         """
         current_environment = cast("dict[str, str]", default_environment())
         current_environment["extra"] = ""
-        # Work around platform.python_version() returning something that is not PEP 440
-        # compliant for non-tagged Python builds. We preserve default_environment()'s
-        # behavior of returning platform.python_version() verbatim, and leave it to the
-        # caller to provide a syntactically valid version if they want to override it.
-        if current_environment["python_full_version"].endswith("+"):
-            current_environment["python_full_version"] += "local"
         if environment is not None:
             current_environment.update(environment)
             # The API used to allow setting extra to None. We need to handle this
@@ -322,4 +316,16 @@ def evaluate(self, environment: dict[str, str] | None = None) -> bool:
             if current_environment["extra"] is None:
                 current_environment["extra"] = ""
 
-        return _evaluate_markers(self._markers, current_environment)
+        return _evaluate_markers(
+            self._markers, _repair_python_full_version(current_environment)
+        )
+
+
+def _repair_python_full_version(env: dict[str, str]) -> dict[str, str]:
+    """
+    Work around platform.python_version() returning something that is not PEP 440
+    compliant for non-tagged Python builds.
+    """
+    if env["python_full_version"].endswith("+"):
+        env["python_full_version"] += "local"
+    return env
diff --git a/src/pip/_vendor/packaging/metadata.py b/src/pip/_vendor/packaging/metadata.py
index eb8dc844d28..721f411cfc4 100644
--- a/src/pip/_vendor/packaging/metadata.py
+++ b/src/pip/_vendor/packaging/metadata.py
@@ -5,6 +5,8 @@
 import email.message
 import email.parser
 import email.policy
+import pathlib
+import sys
 import typing
 from typing import (
     Any,
@@ -15,15 +17,16 @@
     cast,
 )
 
-from . import requirements, specifiers, utils
+from . import licenses, requirements, specifiers, utils
 from . import version as version_module
+from .licenses import NormalizedLicenseExpression
 
 T = typing.TypeVar("T")
 
 
-try:
-    ExceptionGroup
-except NameError:  # pragma: no cover
+if sys.version_info >= (3, 11):  # pragma: no cover
+    ExceptionGroup = ExceptionGroup
+else:  # pragma: no cover
 
     class ExceptionGroup(Exception):
         """A minimal implementation of :external:exc:`ExceptionGroup` from Python 3.11.
@@ -42,9 +45,6 @@ def __init__(self, message: str, exceptions: list[Exception]) -> None:
         def __repr__(self) -> str:
             return f"{self.__class__.__name__}({self.message!r}, {self.exceptions!r})"
 
-else:  # pragma: no cover
-    ExceptionGroup = ExceptionGroup
-
 
 class InvalidMetadata(ValueError):
     """A metadata field contains invalid data."""
@@ -128,6 +128,10 @@ class RawMetadata(TypedDict, total=False):
     # No new fields were added in PEP 685, just some edge case were
     # tightened up to provide better interoptability.
 
+    # Metadata 2.4 - PEP 639
+    license_expression: str
+    license_files: list[str]
+
 
 _STRING_FIELDS = {
     "author",
@@ -137,6 +141,7 @@ class RawMetadata(TypedDict, total=False):
     "download_url",
     "home_page",
     "license",
+    "license_expression",
     "maintainer",
     "maintainer_email",
     "metadata_version",
@@ -149,6 +154,7 @@ class RawMetadata(TypedDict, total=False):
 _LIST_FIELDS = {
     "classifiers",
     "dynamic",
+    "license_files",
     "obsoletes",
     "obsoletes_dist",
     "platforms",
@@ -167,7 +173,7 @@ class RawMetadata(TypedDict, total=False):
 
 
 def _parse_keywords(data: str) -> list[str]:
-    """Split a string of comma-separate keyboards into a list of keywords."""
+    """Split a string of comma-separated keywords into a list of keywords."""
     return [k.strip() for k in data.split(",")]
 
 
@@ -216,16 +222,18 @@ def _get_payload(msg: email.message.Message, source: bytes | str) -> str:
     # If our source is a str, then our caller has managed encodings for us,
     # and we don't need to deal with it.
     if isinstance(source, str):
-        payload: str = msg.get_payload()
+        payload = msg.get_payload()
+        assert isinstance(payload, str)
         return payload
     # If our source is a bytes, then we're managing the encoding and we need
     # to deal with it.
     else:
-        bpayload: bytes = msg.get_payload(decode=True)
+        bpayload = msg.get_payload(decode=True)
+        assert isinstance(bpayload, bytes)
         try:
             return bpayload.decode("utf8", "strict")
-        except UnicodeDecodeError:
-            raise ValueError("payload in an invalid encoding")
+        except UnicodeDecodeError as exc:
+            raise ValueError("payload in an invalid encoding") from exc
 
 
 # The various parse_FORMAT functions here are intended to be as lenient as
@@ -251,6 +259,8 @@ def _get_payload(msg: email.message.Message, source: bytes | str) -> str:
     "home-page": "home_page",
     "keywords": "keywords",
     "license": "license",
+    "license-expression": "license_expression",
+    "license-file": "license_files",
     "maintainer": "maintainer",
     "maintainer-email": "maintainer_email",
     "metadata-version": "metadata_version",
@@ -426,7 +436,7 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
         payload = _get_payload(parsed, data)
     except ValueError:
         unparsed.setdefault("description", []).append(
-            parsed.get_payload(decode=isinstance(data, bytes))
+            parsed.get_payload(decode=isinstance(data, bytes))  # type: ignore[call-overload]
         )
     else:
         if payload:
@@ -453,8 +463,8 @@ def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
 
 
 # Keep the two values in sync.
-_VALID_METADATA_VERSIONS = ["1.0", "1.1", "1.2", "2.1", "2.2", "2.3"]
-_MetadataVersion = Literal["1.0", "1.1", "1.2", "2.1", "2.2", "2.3"]
+_VALID_METADATA_VERSIONS = ["1.0", "1.1", "1.2", "2.1", "2.2", "2.3", "2.4"]
+_MetadataVersion = Literal["1.0", "1.1", "1.2", "2.1", "2.2", "2.3", "2.4"]
 
 _REQUIRED_ATTRS = frozenset(["metadata_version", "name", "version"])
 
@@ -535,7 +545,7 @@ def _process_name(self, value: str) -> str:
         except utils.InvalidName as exc:
             raise self._invalid_metadata(
                 f"{value!r} is invalid for {{field}}", cause=exc
-            )
+            ) from exc
         else:
             return value
 
@@ -547,7 +557,7 @@ def _process_version(self, value: str) -> version_module.Version:
         except version_module.InvalidVersion as exc:
             raise self._invalid_metadata(
                 f"{value!r} is invalid for {{field}}", cause=exc
-            )
+            ) from exc
 
     def _process_summary(self, value: str) -> str:
         """Check the field contains no newlines."""
@@ -591,10 +601,12 @@ def _process_dynamic(self, value: list[str]) -> list[str]:
         for dynamic_field in map(str.lower, value):
             if dynamic_field in {"name", "version", "metadata-version"}:
                 raise self._invalid_metadata(
-                    f"{value!r} is not allowed as a dynamic field"
+                    f"{dynamic_field!r} is not allowed as a dynamic field"
                 )
             elif dynamic_field not in _EMAIL_TO_RAW_MAPPING:
-                raise self._invalid_metadata(f"{value!r} is not a valid dynamic field")
+                raise self._invalid_metadata(
+                    f"{dynamic_field!r} is not a valid dynamic field"
+                )
         return list(map(str.lower, value))
 
     def _process_provides_extra(
@@ -608,7 +620,7 @@ def _process_provides_extra(
         except utils.InvalidName as exc:
             raise self._invalid_metadata(
                 f"{name!r} is invalid for {{field}}", cause=exc
-            )
+            ) from exc
         else:
             return normalized_names
 
@@ -618,7 +630,7 @@ def _process_requires_python(self, value: str) -> specifiers.SpecifierSet:
         except specifiers.InvalidSpecifier as exc:
             raise self._invalid_metadata(
                 f"{value!r} is invalid for {{field}}", cause=exc
-            )
+            ) from exc
 
     def _process_requires_dist(
         self,
@@ -629,10 +641,49 @@ def _process_requires_dist(
             for req in value:
                 reqs.append(requirements.Requirement(req))
         except requirements.InvalidRequirement as exc:
-            raise self._invalid_metadata(f"{req!r} is invalid for {{field}}", cause=exc)
+            raise self._invalid_metadata(
+                f"{req!r} is invalid for {{field}}", cause=exc
+            ) from exc
         else:
             return reqs
 
+    def _process_license_expression(
+        self, value: str
+    ) -> NormalizedLicenseExpression | None:
+        try:
+            return licenses.canonicalize_license_expression(value)
+        except ValueError as exc:
+            raise self._invalid_metadata(
+                f"{value!r} is invalid for {{field}}", cause=exc
+            ) from exc
+
+    def _process_license_files(self, value: list[str]) -> list[str]:
+        paths = []
+        for path in value:
+            if ".." in path:
+                raise self._invalid_metadata(
+                    f"{path!r} is invalid for {{field}}, "
+                    "parent directory indicators are not allowed"
+                )
+            if "*" in path:
+                raise self._invalid_metadata(
+                    f"{path!r} is invalid for {{field}}, paths must be resolved"
+                )
+            if (
+                pathlib.PurePosixPath(path).is_absolute()
+                or pathlib.PureWindowsPath(path).is_absolute()
+            ):
+                raise self._invalid_metadata(
+                    f"{path!r} is invalid for {{field}}, paths must be relative"
+                )
+            if pathlib.PureWindowsPath(path).as_posix() != path:
+                raise self._invalid_metadata(
+                    f"{path!r} is invalid for {{field}}, "
+                    "paths must use '/' delimiter"
+                )
+            paths.append(path)
+        return paths
+
 
 class Metadata:
     """Representation of distribution metadata.
@@ -688,8 +739,8 @@ def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> Metadata:
                             field = _RAW_TO_EMAIL_MAPPING[key]
                             exc = InvalidMetadata(
                                 field,
-                                "{field} introduced in metadata version "
-                                "{field_metadata_version}, not {metadata_version}",
+                                f"{field} introduced in metadata version "
+                                f"{field_metadata_version}, not {metadata_version}",
                             )
                             exceptions.append(exc)
                             continue
@@ -733,6 +784,8 @@ def from_email(cls, data: bytes | str, *, validate: bool = True) -> Metadata:
     metadata_version: _Validator[_MetadataVersion] = _Validator()
     """:external:ref:`core-metadata-metadata-version`
     (required; validated to be a valid metadata version)"""
+    # `name` is not normalized/typed to NormalizedName so as to provide access to
+    # the original/raw name.
     name: _Validator[str] = _Validator()
     """:external:ref:`core-metadata-name`
     (required; validated using :func:`~packaging.utils.canonicalize_name` and its
@@ -770,6 +823,12 @@ def from_email(cls, data: bytes | str, *, validate: bool = True) -> Metadata:
     """:external:ref:`core-metadata-maintainer-email`"""
     license: _Validator[str | None] = _Validator()
     """:external:ref:`core-metadata-license`"""
+    license_expression: _Validator[NormalizedLicenseExpression | None] = _Validator(
+        added="2.4"
+    )
+    """:external:ref:`core-metadata-license-expression`"""
+    license_files: _Validator[list[str] | None] = _Validator(added="2.4")
+    """:external:ref:`core-metadata-license-file`"""
     classifiers: _Validator[list[str] | None] = _Validator(added="1.1")
     """:external:ref:`core-metadata-classifier`"""
     requires_dist: _Validator[list[requirements.Requirement] | None] = _Validator(
diff --git a/src/pip/_vendor/packaging/specifiers.py b/src/pip/_vendor/packaging/specifiers.py
index f3ac480fa68..f18016e1663 100644
--- a/src/pip/_vendor/packaging/specifiers.py
+++ b/src/pip/_vendor/packaging/specifiers.py
@@ -234,7 +234,7 @@ def __init__(self, spec: str = "", prereleases: bool | None = None) -> None:
         """
         match = self._regex.search(spec)
         if not match:
-            raise InvalidSpecifier(f"Invalid specifier: '{spec}'")
+            raise InvalidSpecifier(f"Invalid specifier: {spec!r}")
 
         self._spec: tuple[str, str] = (
             match.group("operator").strip(),
@@ -256,7 +256,7 @@ def prereleases(self) -> bool:
         # operators, and if they are if they are including an explicit
         # prerelease.
         operator, version = self._spec
-        if operator in ["==", ">=", "<=", "~=", "==="]:
+        if operator in ["==", ">=", "<=", "~=", "===", ">", "<"]:
             # The == specifier can include a trailing .*, if it does we
             # want to remove before parsing.
             if operator == "==" and version.endswith(".*"):
@@ -694,12 +694,18 @@ class SpecifierSet(BaseSpecifier):
     specifiers (``>=3.0,!=3.1``), or no specifier at all.
     """
 
-    def __init__(self, specifiers: str = "", prereleases: bool | None = None) -> None:
+    def __init__(
+        self,
+        specifiers: str | Iterable[Specifier] = "",
+        prereleases: bool | None = None,
+    ) -> None:
         """Initialize a SpecifierSet instance.
 
         :param specifiers:
             The string representation of a specifier or a comma-separated list of
             specifiers which will be parsed and normalized before use.
+            May also be an iterable of ``Specifier`` instances, which will be used
+            as is.
         :param prereleases:
             This tells the SpecifierSet if it should accept prerelease versions if
             applicable or not. The default of ``None`` will autodetect it from the
@@ -710,12 +716,17 @@ def __init__(self, specifiers: str = "", prereleases: bool | None = None) -> Non
             raised.
         """
 
-        # Split on `,` to break each individual specifier into it's own item, and
-        # strip each item to remove leading/trailing whitespace.
-        split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
+        if isinstance(specifiers, str):
+            # Split on `,` to break each individual specifier into its own item, and
+            # strip each item to remove leading/trailing whitespace.
+            split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
 
-        # Make each individual specifier a Specifier and save in a frozen set for later.
-        self._specs = frozenset(map(Specifier, split_specifiers))
+            # Make each individual specifier a Specifier and save in a frozen set
+            # for later.
+            self._specs = frozenset(map(Specifier, split_specifiers))
+        else:
+            # Save the supplied specifiers in a frozen set.
+            self._specs = frozenset(specifiers)
 
         # Store our prereleases value so we can use it later to determine if
         # we accept prereleases or not.
diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
index 703f0ed53c0..f5903402abb 100644
--- a/src/pip/_vendor/packaging/tags.py
+++ b/src/pip/_vendor/packaging/tags.py
@@ -47,7 +47,7 @@ class Tag:
     is also supported.
     """
 
-    __slots__ = ["_interpreter", "_abi", "_platform", "_hash"]
+    __slots__ = ["_abi", "_hash", "_interpreter", "_platform"]
 
     def __init__(self, interpreter: str, abi: str, platform: str) -> None:
         self._interpreter = interpreter.lower()
@@ -235,9 +235,8 @@ def cpython_tags(
     if use_abi3:
         for minor_version in range(python_version[1] - 1, 1, -1):
             for platform_ in platforms:
-                interpreter = "cp{version}".format(
-                    version=_version_nodot((python_version[0], minor_version))
-                )
+                version = _version_nodot((python_version[0], minor_version))
+                interpreter = f"cp{version}"
                 yield Tag(interpreter, "abi3", platform_)
 
 
@@ -435,24 +434,22 @@ def mac_platforms(
     if (10, 0) <= version and version < (11, 0):
         # Prior to Mac OS 11, each yearly release of Mac OS bumped the
         # "minor" version number.  The major version was always 10.
+        major_version = 10
         for minor_version in range(version[1], -1, -1):
-            compat_version = 10, minor_version
+            compat_version = major_version, minor_version
             binary_formats = _mac_binary_formats(compat_version, arch)
             for binary_format in binary_formats:
-                yield "macosx_{major}_{minor}_{binary_format}".format(
-                    major=10, minor=minor_version, binary_format=binary_format
-                )
+                yield f"macosx_{major_version}_{minor_version}_{binary_format}"
 
     if version >= (11, 0):
         # Starting with Mac OS 11, each yearly release bumps the major version
         # number.   The minor versions are now the midyear updates.
+        minor_version = 0
         for major_version in range(version[0], 10, -1):
-            compat_version = major_version, 0
+            compat_version = major_version, minor_version
             binary_formats = _mac_binary_formats(compat_version, arch)
             for binary_format in binary_formats:
-                yield "macosx_{major}_{minor}_{binary_format}".format(
-                    major=major_version, minor=0, binary_format=binary_format
-                )
+                yield f"macosx_{major_version}_{minor_version}_{binary_format}"
 
     if version >= (11, 0):
         # Mac OS 11 on x86_64 is compatible with binaries from previous releases.
@@ -462,25 +459,18 @@ def mac_platforms(
         # However, the "universal2" binary format can have a
         # macOS version earlier than 11.0 when the x86_64 part of the binary supports
         # that version of macOS.
+        major_version = 10
         if arch == "x86_64":
             for minor_version in range(16, 3, -1):
-                compat_version = 10, minor_version
+                compat_version = major_version, minor_version
                 binary_formats = _mac_binary_formats(compat_version, arch)
                 for binary_format in binary_formats:
-                    yield "macosx_{major}_{minor}_{binary_format}".format(
-                        major=compat_version[0],
-                        minor=compat_version[1],
-                        binary_format=binary_format,
-                    )
+                    yield f"macosx_{major_version}_{minor_version}_{binary_format}"
         else:
             for minor_version in range(16, 3, -1):
-                compat_version = 10, minor_version
+                compat_version = major_version, minor_version
                 binary_format = "universal2"
-                yield "macosx_{major}_{minor}_{binary_format}".format(
-                    major=compat_version[0],
-                    minor=compat_version[1],
-                    binary_format=binary_format,
-                )
+                yield f"macosx_{major_version}_{minor_version}_{binary_format}"
 
 
 def ios_platforms(
@@ -500,7 +490,7 @@ def ios_platforms(
         # if iOS is the current platform, ios_ver *must* be defined. However,
         # it won't exist for CPython versions before 3.13, which causes a mypy
         # error.
-        _, release, _, _ = platform.ios_ver()  # type: ignore[attr-defined]
+        _, release, _, _ = platform.ios_ver()  # type: ignore[attr-defined, unused-ignore]
         version = cast("AppleVersion", tuple(map(int, release.split(".")[:2])))
 
     if multiarch is None:
diff --git a/src/pip/_vendor/packaging/utils.py b/src/pip/_vendor/packaging/utils.py
index d33da5bb8bd..23450953df7 100644
--- a/src/pip/_vendor/packaging/utils.py
+++ b/src/pip/_vendor/packaging/utils.py
@@ -4,11 +4,12 @@
 
 from __future__ import annotations
 
+import functools
 import re
 from typing import NewType, Tuple, Union, cast
 
 from .tags import Tag, parse_tag
-from .version import InvalidVersion, Version
+from .version import InvalidVersion, Version, _TrimmedRelease
 
 BuildTag = Union[Tuple[()], Tuple[int, str]]
 NormalizedName = NewType("NormalizedName", str)
@@ -54,52 +55,40 @@ def is_normalized_name(name: str) -> bool:
     return _normalized_regex.match(name) is not None
 
 
+@functools.singledispatch
 def canonicalize_version(
     version: Version | str, *, strip_trailing_zero: bool = True
 ) -> str:
     """
-    This is very similar to Version.__str__, but has one subtle difference
-    with the way it handles the release segment.
-    """
-    if isinstance(version, str):
-        try:
-            parsed = Version(version)
-        except InvalidVersion:
-            # Legacy versions cannot be normalized
-            return version
-    else:
-        parsed = version
-
-    parts = []
+    Return a canonical form of a version as a string.
 
-    # Epoch
-    if parsed.epoch != 0:
-        parts.append(f"{parsed.epoch}!")
+    >>> canonicalize_version('1.0.1')
+    '1.0.1'
 
-    # Release segment
-    release_segment = ".".join(str(x) for x in parsed.release)
-    if strip_trailing_zero:
-        # NB: This strips trailing '.0's to normalize
-        release_segment = re.sub(r"(\.0)+$", "", release_segment)
-    parts.append(release_segment)
+    Per PEP 625, versions may have multiple canonical forms, differing
+    only by trailing zeros.
 
-    # Pre-release
-    if parsed.pre is not None:
-        parts.append("".join(str(x) for x in parsed.pre))
+    >>> canonicalize_version('1.0.0')
+    '1'
+    >>> canonicalize_version('1.0.0', strip_trailing_zero=False)
+    '1.0.0'
 
-    # Post-release
-    if parsed.post is not None:
-        parts.append(f".post{parsed.post}")
+    Invalid versions are returned unaltered.
 
-    # Development release
-    if parsed.dev is not None:
-        parts.append(f".dev{parsed.dev}")
+    >>> canonicalize_version('foo bar baz')
+    'foo bar baz'
+    """
+    return str(_TrimmedRelease(str(version)) if strip_trailing_zero else version)
 
-    # Local version segment
-    if parsed.local is not None:
-        parts.append(f"+{parsed.local}")
 
-    return "".join(parts)
+@canonicalize_version.register
+def _(version: str, *, strip_trailing_zero: bool = True) -> str:
+    try:
+        parsed = Version(version)
+    except InvalidVersion:
+        # Legacy versions cannot be normalized
+        return version
+    return canonicalize_version(parsed, strip_trailing_zero=strip_trailing_zero)
 
 
 def parse_wheel_filename(
@@ -107,28 +96,28 @@ def parse_wheel_filename(
 ) -> tuple[NormalizedName, Version, BuildTag, frozenset[Tag]]:
     if not filename.endswith(".whl"):
         raise InvalidWheelFilename(
-            f"Invalid wheel filename (extension must be '.whl'): {filename}"
+            f"Invalid wheel filename (extension must be '.whl'): {filename!r}"
         )
 
     filename = filename[:-4]
     dashes = filename.count("-")
     if dashes not in (4, 5):
         raise InvalidWheelFilename(
-            f"Invalid wheel filename (wrong number of parts): {filename}"
+            f"Invalid wheel filename (wrong number of parts): {filename!r}"
         )
 
     parts = filename.split("-", dashes - 2)
     name_part = parts[0]
     # See PEP 427 for the rules on escaping the project name.
     if "__" in name_part or re.match(r"^[\w\d._]*$", name_part, re.UNICODE) is None:
-        raise InvalidWheelFilename(f"Invalid project name: {filename}")
+        raise InvalidWheelFilename(f"Invalid project name: {filename!r}")
     name = canonicalize_name(name_part)
 
     try:
         version = Version(parts[1])
     except InvalidVersion as e:
         raise InvalidWheelFilename(
-            f"Invalid wheel filename (invalid version): {filename}"
+            f"Invalid wheel filename (invalid version): {filename!r}"
         ) from e
 
     if dashes == 5:
@@ -136,7 +125,7 @@ def parse_wheel_filename(
         build_match = _build_tag_regex.match(build_part)
         if build_match is None:
             raise InvalidWheelFilename(
-                f"Invalid build number: {build_part} in '{filename}'"
+                f"Invalid build number: {build_part} in {filename!r}"
             )
         build = cast(BuildTag, (int(build_match.group(1)), build_match.group(2)))
     else:
@@ -153,14 +142,14 @@ def parse_sdist_filename(filename: str) -> tuple[NormalizedName, Version]:
     else:
         raise InvalidSdistFilename(
             f"Invalid sdist filename (extension must be '.tar.gz' or '.zip'):"
-            f" {filename}"
+            f" {filename!r}"
         )
 
     # We are requiring a PEP 440 version, which cannot contain dashes,
     # so we split on the last dash.
     name_part, sep, version_part = file_stem.rpartition("-")
     if not sep:
-        raise InvalidSdistFilename(f"Invalid sdist filename: {filename}")
+        raise InvalidSdistFilename(f"Invalid sdist filename: {filename!r}")
 
     name = canonicalize_name(name_part)
 
@@ -168,7 +157,7 @@ def parse_sdist_filename(filename: str) -> tuple[NormalizedName, Version]:
         version = Version(version_part)
     except InvalidVersion as e:
         raise InvalidSdistFilename(
-            f"Invalid sdist filename (invalid version): {filename}"
+            f"Invalid sdist filename (invalid version): {filename!r}"
         ) from e
 
     return (name, version)
diff --git a/src/pip/_vendor/packaging/version.py b/src/pip/_vendor/packaging/version.py
index 8b0a040848d..21f44ca09b5 100644
--- a/src/pip/_vendor/packaging/version.py
+++ b/src/pip/_vendor/packaging/version.py
@@ -15,7 +15,7 @@
 
 from ._structures import Infinity, InfinityType, NegativeInfinity, NegativeInfinityType
 
-__all__ = ["VERSION_PATTERN", "parse", "Version", "InvalidVersion"]
+__all__ = ["VERSION_PATTERN", "InvalidVersion", "Version", "parse"]
 
 LocalType = Tuple[Union[int, str], ...]
 
@@ -199,7 +199,7 @@ def __init__(self, version: str) -> None:
         # Validate the version and parse it into pieces
         match = self._regex.search(version)
         if not match:
-            raise InvalidVersion(f"Invalid version: '{version}'")
+            raise InvalidVersion(f"Invalid version: {version!r}")
 
         # Store the parsed out pieces of the version
         self._version = _Version(
@@ -232,7 +232,7 @@ def __repr__(self) -> str:
         return f""
 
     def __str__(self) -> str:
-        """A string representation of the version that can be rounded-tripped.
+        """A string representation of the version that can be round-tripped.
 
         >>> str(Version("1.0a5"))
         '1.0a5'
@@ -350,8 +350,8 @@ def public(self) -> str:
         '1.2.3'
         >>> Version("1.2.3+abc").public
         '1.2.3'
-        >>> Version("1.2.3+abc.dev1").public
-        '1.2.3'
+        >>> Version("1!1.2.3dev1+abc").public
+        '1!1.2.3.dev1'
         """
         return str(self).split("+", 1)[0]
 
@@ -363,7 +363,7 @@ def base_version(self) -> str:
         '1.2.3'
         >>> Version("1.2.3+abc").base_version
         '1.2.3'
-        >>> Version("1!1.2.3+abc.dev1").base_version
+        >>> Version("1!1.2.3dev1+abc").base_version
         '1!1.2.3'
 
         The "base version" is the public version of the project without any pre or post
@@ -451,6 +451,23 @@ def micro(self) -> int:
         return self.release[2] if len(self.release) >= 3 else 0
 
 
+class _TrimmedRelease(Version):
+    @property
+    def release(self) -> tuple[int, ...]:
+        """
+        Release segment without any trailing zeros.
+
+        >>> _TrimmedRelease('1.0.0').release
+        (1,)
+        >>> _TrimmedRelease('0.0').release
+        (0,)
+        """
+        rel = super().release
+        nonzeros = (index for index, val in enumerate(rel) if val)
+        last_nonzero = max(nonzeros, default=0)
+        return rel[: last_nonzero + 1]
+
+
 def _parse_letter_version(
     letter: str | None, number: str | bytes | SupportsInt | None
 ) -> tuple[str, int] | None:
@@ -476,7 +493,9 @@ def _parse_letter_version(
             letter = "post"
 
         return letter, int(number)
-    if not letter and number:
+
+    assert not letter
+    if number:
         # We assume if we are given a number, but we are not given a letter
         # then this is using the implicit post release syntax (e.g. 1.0-1)
         letter = "post"
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index b4b837881eb..36c135675a4 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -2,7 +2,7 @@ CacheControl==0.14.1
 distlib==0.3.9
 distro==1.9.0
 msgpack==1.1.0
-packaging==24.1
+packaging==24.2
 platformdirs==4.3.6
 pyproject-hooks==1.0.0
 requests==2.32.3
diff --git a/tools/vendoring/patches/packaging.patch b/tools/vendoring/patches/packaging.patch
deleted file mode 100644
index 1d109e55f62..00000000000
--- a/tools/vendoring/patches/packaging.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
-index 6667d2990..cb11c60b8 100644
---- a/src/pip/_vendor/packaging/tags.py
-+++ b/src/pip/_vendor/packaging/tags.py
-@@ -25,7 +25,7 @@ from . import _manylinux, _musllinux
- logger = logging.getLogger(__name__)
-
- PythonVersion = Sequence[int]
--MacVersion = Tuple[int, int]
-+AppleVersion = Tuple[int, int]
-
- INTERPRETER_SHORT_NAMES: dict[str, str] = {
-     "python": "py",  # Generic.
-@@ -363,7 +363,7 @@ def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str:
-     return "i386"
-
-
--def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
-+def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]:
-     formats = [cpu_arch]
-     if cpu_arch == "x86_64":
-         if version < (10, 4):
-@@ -396,7 +396,7 @@ def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
-
-
- def mac_platforms(
--    version: MacVersion | None = None, arch: str | None = None
-+    version: AppleVersion | None = None, arch: str | None = None
- ) -> Iterator[str]:
-     """
-     Yields the platform tags for a macOS system.
-@@ -408,7 +408,7 @@ def mac_platforms(
-     """
-     version_str, _, cpu_arch = platform.mac_ver()
-     if version is None:
--        version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
-+        version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2])))
-         if version == (10, 16):
-             # When built against an older macOS SDK, Python will report macOS 10.16
-             # instead of the real version.
-@@ -424,7 +424,7 @@ def mac_platforms(
-                 stdout=subprocess.PIPE,
-                 text=True,
-             ).stdout
--            version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
-+            version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2])))
-     else:
-         version = version
-     if arch is None:
-@@ -483,6 +483,63 @@ def mac_platforms(
-                 )
-
-
-+def ios_platforms(
-+    version: AppleVersion | None = None, multiarch: str | None = None
-+) -> Iterator[str]:
-+    """
-+    Yields the platform tags for an iOS system.
-+
-+    :param version: A two-item tuple specifying the iOS version to generate
-+        platform tags for. Defaults to the current iOS version.
-+    :param multiarch: The CPU architecture+ABI to generate platform tags for -
-+        (the value used by `sys.implementation._multiarch` e.g.,
-+        `arm64_iphoneos` or `x84_64_iphonesimulator`). Defaults to the current
-+        multiarch value.
-+    """
-+    if version is None:
-+        # if iOS is the current platform, ios_ver *must* be defined. However,
-+        # it won't exist for CPython versions before 3.13, which causes a mypy
-+        # error.
-+        _, release, _, _ = platform.ios_ver()  # type: ignore[attr-defined]
-+        version = cast("AppleVersion", tuple(map(int, release.split(".")[:2])))
-+
-+    if multiarch is None:
-+        multiarch = sys.implementation._multiarch
-+    multiarch = multiarch.replace("-", "_")
-+
-+    ios_platform_template = "ios_{major}_{minor}_{multiarch}"
-+
-+    # Consider any iOS major.minor version from the version requested, down to
-+    # 12.0. 12.0 is the first iOS version that is known to have enough features
-+    # to support CPython. Consider every possible minor release up to X.9. There
-+    # highest the minor has ever gone is 8 (14.8 and 15.8) but having some extra
-+    # candidates that won't ever match doesn't really hurt, and it saves us from
-+    # having to keep an explicit list of known iOS versions in the code. Return
-+    # the results descending order of version number.
-+
-+    # If the requested major version is less than 12, there won't be any matches.
-+    if version[0] < 12:
-+        return
-+
-+    # Consider the actual X.Y version that was requested.
-+    yield ios_platform_template.format(
-+        major=version[0], minor=version[1], multiarch=multiarch
-+    )
-+
-+    # Consider every minor version from X.0 to the minor version prior to the
-+    # version requested by the platform.
-+    for minor in range(version[1] - 1, -1, -1):
-+        yield ios_platform_template.format(
-+            major=version[0], minor=minor, multiarch=multiarch
-+        )
-+
-+    for major in range(version[0] - 1, 11, -1):
-+        for minor in range(9, -1, -1):
-+            yield ios_platform_template.format(
-+                major=major, minor=minor, multiarch=multiarch
-+            )
-+
-+
- def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
-     linux = _normalize_string(sysconfig.get_platform())
-     if not linux.startswith("linux_"):
-@@ -512,6 +569,8 @@ def platform_tags() -> Iterator[str]:
-     """
-     if platform.system() == "Darwin":
-         return mac_platforms()
-+    elif platform.system() == "iOS":
-+        return ios_platforms()
-     elif platform.system() == "Linux":
-         return _linux_platforms()
-     else:

From 79148f16e269fe8c38d45cfb71c6abc044c7ca5f Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 7 Dec 2024 15:22:33 -0500
Subject: [PATCH 621/992] Upgrade tomli to 2.2.1

---
 news/tomli.vendor.rst                |   1 +
 pyproject.toml                       |   3 +
 src/pip/_vendor/tomli/LICENSE-HEADER |   3 +
 src/pip/_vendor/tomli/__init__.py    |   5 +-
 src/pip/_vendor/tomli/_parser.py     | 237 ++++++++++++++++++---------
 src/pip/_vendor/tomli/_re.py         |  15 +-
 src/pip/_vendor/vendor.txt           |   2 +-
 7 files changed, 177 insertions(+), 89 deletions(-)
 create mode 100644 news/tomli.vendor.rst
 create mode 100644 src/pip/_vendor/tomli/LICENSE-HEADER

diff --git a/news/tomli.vendor.rst b/news/tomli.vendor.rst
new file mode 100644
index 00000000000..53b3bd07be4
--- /dev/null
+++ b/news/tomli.vendor.rst
@@ -0,0 +1 @@
+Upgrade tomli to 2.2.1
diff --git a/pyproject.toml b/pyproject.toml
index 711e6bc8485..684fd6d968e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -123,6 +123,9 @@ drop = [
   "bin/",
   # interpreter and OS specific msgpack libs
   "msgpack/*.so",
+  # optional accelerator extension libraries
+  "*mypyc*.so",
+  "tomli/*.so",
   # unneeded parts of setuptools
   "easy_install.py",
   "setuptools",
diff --git a/src/pip/_vendor/tomli/LICENSE-HEADER b/src/pip/_vendor/tomli/LICENSE-HEADER
new file mode 100644
index 00000000000..aba78dd2cfc
--- /dev/null
+++ b/src/pip/_vendor/tomli/LICENSE-HEADER
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: MIT
+SPDX-FileCopyrightText: 2021 Taneli Hukkinen
+Licensed to PSF under a Contributor Agreement.
diff --git a/src/pip/_vendor/tomli/__init__.py b/src/pip/_vendor/tomli/__init__.py
index 4c6ec97ec69..2b08d6e7419 100644
--- a/src/pip/_vendor/tomli/__init__.py
+++ b/src/pip/_vendor/tomli/__init__.py
@@ -3,9 +3,6 @@
 # Licensed to PSF under a Contributor Agreement.
 
 __all__ = ("loads", "load", "TOMLDecodeError")
-__version__ = "2.0.1"  # DO NOT EDIT THIS LINE MANUALLY. LET bump2version UTILITY DO IT
+__version__ = "2.2.1"  # DO NOT EDIT THIS LINE MANUALLY. LET bump2version UTILITY DO IT
 
 from ._parser import TOMLDecodeError, load, loads
-
-# Pretend this exception was created here.
-TOMLDecodeError.__module__ = __name__
diff --git a/src/pip/_vendor/tomli/_parser.py b/src/pip/_vendor/tomli/_parser.py
index f1bb0aa19a5..b548e8b8045 100644
--- a/src/pip/_vendor/tomli/_parser.py
+++ b/src/pip/_vendor/tomli/_parser.py
@@ -6,8 +6,10 @@
 
 from collections.abc import Iterable
 import string
+import sys
 from types import MappingProxyType
-from typing import Any, BinaryIO, NamedTuple
+from typing import IO, Any, Final, NamedTuple
+import warnings
 
 from ._re import (
     RE_DATETIME,
@@ -19,25 +21,36 @@
 )
 from ._types import Key, ParseFloat, Pos
 
-ASCII_CTRL = frozenset(chr(i) for i in range(32)) | frozenset(chr(127))
+# Inline tables/arrays are implemented using recursion. Pathologically
+# nested documents cause pure Python to raise RecursionError (which is OK),
+# but mypyc binary wheels will crash unrecoverably (not OK). According to
+# mypyc docs this will be fixed in the future:
+# https://mypyc.readthedocs.io/en/latest/differences_from_python.html#stack-overflows
+# Before mypyc's fix is in, recursion needs to be limited by this library.
+# Choosing `sys.getrecursionlimit()` as maximum inline table/array nesting
+# level, as it allows more nesting than pure Python, but still seems a far
+# lower number than where mypyc binaries crash.
+MAX_INLINE_NESTING: Final = sys.getrecursionlimit()
+
+ASCII_CTRL: Final = frozenset(chr(i) for i in range(32)) | frozenset(chr(127))
 
 # Neither of these sets include quotation mark or backslash. They are
 # currently handled as separate cases in the parser functions.
-ILLEGAL_BASIC_STR_CHARS = ASCII_CTRL - frozenset("\t")
-ILLEGAL_MULTILINE_BASIC_STR_CHARS = ASCII_CTRL - frozenset("\t\n")
+ILLEGAL_BASIC_STR_CHARS: Final = ASCII_CTRL - frozenset("\t")
+ILLEGAL_MULTILINE_BASIC_STR_CHARS: Final = ASCII_CTRL - frozenset("\t\n")
 
-ILLEGAL_LITERAL_STR_CHARS = ILLEGAL_BASIC_STR_CHARS
-ILLEGAL_MULTILINE_LITERAL_STR_CHARS = ILLEGAL_MULTILINE_BASIC_STR_CHARS
+ILLEGAL_LITERAL_STR_CHARS: Final = ILLEGAL_BASIC_STR_CHARS
+ILLEGAL_MULTILINE_LITERAL_STR_CHARS: Final = ILLEGAL_MULTILINE_BASIC_STR_CHARS
 
-ILLEGAL_COMMENT_CHARS = ILLEGAL_BASIC_STR_CHARS
+ILLEGAL_COMMENT_CHARS: Final = ILLEGAL_BASIC_STR_CHARS
 
-TOML_WS = frozenset(" \t")
-TOML_WS_AND_NEWLINE = TOML_WS | frozenset("\n")
-BARE_KEY_CHARS = frozenset(string.ascii_letters + string.digits + "-_")
-KEY_INITIAL_CHARS = BARE_KEY_CHARS | frozenset("\"'")
-HEXDIGIT_CHARS = frozenset(string.hexdigits)
+TOML_WS: Final = frozenset(" \t")
+TOML_WS_AND_NEWLINE: Final = TOML_WS | frozenset("\n")
+BARE_KEY_CHARS: Final = frozenset(string.ascii_letters + string.digits + "-_")
+KEY_INITIAL_CHARS: Final = BARE_KEY_CHARS | frozenset("\"'")
+HEXDIGIT_CHARS: Final = frozenset(string.hexdigits)
 
-BASIC_STR_ESCAPE_REPLACEMENTS = MappingProxyType(
+BASIC_STR_ESCAPE_REPLACEMENTS: Final = MappingProxyType(
     {
         "\\b": "\u0008",  # backspace
         "\\t": "\u0009",  # tab
@@ -50,11 +63,71 @@
 )
 
 
+class DEPRECATED_DEFAULT:
+    """Sentinel to be used as default arg during deprecation
+    period of TOMLDecodeError's free-form arguments."""
+
+
 class TOMLDecodeError(ValueError):
-    """An error raised if a document is not valid TOML."""
+    """An error raised if a document is not valid TOML.
+
+    Adds the following attributes to ValueError:
+    msg: The unformatted error message
+    doc: The TOML document being parsed
+    pos: The index of doc where parsing failed
+    lineno: The line corresponding to pos
+    colno: The column corresponding to pos
+    """
+
+    def __init__(
+        self,
+        msg: str | type[DEPRECATED_DEFAULT] = DEPRECATED_DEFAULT,
+        doc: str | type[DEPRECATED_DEFAULT] = DEPRECATED_DEFAULT,
+        pos: Pos | type[DEPRECATED_DEFAULT] = DEPRECATED_DEFAULT,
+        *args: Any,
+    ):
+        if (
+            args
+            or not isinstance(msg, str)
+            or not isinstance(doc, str)
+            or not isinstance(pos, int)
+        ):
+            warnings.warn(
+                "Free-form arguments for TOMLDecodeError are deprecated. "
+                "Please set 'msg' (str), 'doc' (str) and 'pos' (int) arguments only.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            if pos is not DEPRECATED_DEFAULT:
+                args = pos, *args
+            if doc is not DEPRECATED_DEFAULT:
+                args = doc, *args
+            if msg is not DEPRECATED_DEFAULT:
+                args = msg, *args
+            ValueError.__init__(self, *args)
+            return
+
+        lineno = doc.count("\n", 0, pos) + 1
+        if lineno == 1:
+            colno = pos + 1
+        else:
+            colno = pos - doc.rindex("\n", 0, pos)
+
+        if pos >= len(doc):
+            coord_repr = "end of document"
+        else:
+            coord_repr = f"line {lineno}, column {colno}"
+        errmsg = f"{msg} (at {coord_repr})"
+        ValueError.__init__(self, errmsg)
+
+        self.msg = msg
+        self.doc = doc
+        self.pos = pos
+        self.lineno = lineno
+        self.colno = colno
 
 
-def load(__fp: BinaryIO, *, parse_float: ParseFloat = float) -> dict[str, Any]:
+def load(__fp: IO[bytes], *, parse_float: ParseFloat = float) -> dict[str, Any]:
     """Parse TOML from a binary file object."""
     b = __fp.read()
     try:
@@ -71,7 +144,12 @@ def loads(__s: str, *, parse_float: ParseFloat = float) -> dict[str, Any]:  # no
 
     # The spec allows converting "\r\n" to "\n", even in string
     # literals. Let's do so to simplify parsing.
-    src = __s.replace("\r\n", "\n")
+    try:
+        src = __s.replace("\r\n", "\n")
+    except (AttributeError, TypeError):
+        raise TypeError(
+            f"Expected str object, not '{type(__s).__qualname__}'"
+        ) from None
     pos = 0
     out = Output(NestedDict(), Flags())
     header: Key = ()
@@ -113,7 +191,7 @@ def loads(__s: str, *, parse_float: ParseFloat = float) -> dict[str, Any]:  # no
                 pos, header = create_dict_rule(src, pos, out)
             pos = skip_chars(src, pos, TOML_WS)
         elif char != "#":
-            raise suffixed_err(src, pos, "Invalid statement")
+            raise TOMLDecodeError("Invalid statement", src, pos)
 
         # 3. Skip comment
         pos = skip_comment(src, pos)
@@ -124,8 +202,8 @@ def loads(__s: str, *, parse_float: ParseFloat = float) -> dict[str, Any]:  # no
         except IndexError:
             break
         if char != "\n":
-            raise suffixed_err(
-                src, pos, "Expected newline or end of document after a statement"
+            raise TOMLDecodeError(
+                "Expected newline or end of document after a statement", src, pos
             )
         pos += 1
 
@@ -136,10 +214,10 @@ class Flags:
     """Flags that map to parsed keys/namespaces."""
 
     # Marks an immutable namespace (inline array or inline table).
-    FROZEN = 0
+    FROZEN: Final = 0
     # Marks a nest that has been explicitly created and can no longer
     # be opened using the "[table]" syntax.
-    EXPLICIT_NEST = 1
+    EXPLICIT_NEST: Final = 1
 
     def __init__(self) -> None:
         self._flags: dict[str, dict] = {}
@@ -185,8 +263,8 @@ def is_(self, key: Key, flag: int) -> bool:
             cont = inner_cont["nested"]
         key_stem = key[-1]
         if key_stem in cont:
-            cont = cont[key_stem]
-            return flag in cont["flags"] or flag in cont["recursive_flags"]
+            inner_cont = cont[key_stem]
+            return flag in inner_cont["flags"] or flag in inner_cont["recursive_flags"]
         return False
 
 
@@ -251,12 +329,12 @@ def skip_until(
     except ValueError:
         new_pos = len(src)
         if error_on_eof:
-            raise suffixed_err(src, new_pos, f"Expected {expect!r}") from None
+            raise TOMLDecodeError(f"Expected {expect!r}", src, new_pos) from None
 
     if not error_on.isdisjoint(src[pos:new_pos]):
         while src[pos] not in error_on:
             pos += 1
-        raise suffixed_err(src, pos, f"Found invalid character {src[pos]!r}")
+        raise TOMLDecodeError(f"Found invalid character {src[pos]!r}", src, pos)
     return new_pos
 
 
@@ -287,15 +365,17 @@ def create_dict_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
     pos, key = parse_key(src, pos)
 
     if out.flags.is_(key, Flags.EXPLICIT_NEST) or out.flags.is_(key, Flags.FROZEN):
-        raise suffixed_err(src, pos, f"Cannot declare {key} twice")
+        raise TOMLDecodeError(f"Cannot declare {key} twice", src, pos)
     out.flags.set(key, Flags.EXPLICIT_NEST, recursive=False)
     try:
         out.data.get_or_create_nest(key)
     except KeyError:
-        raise suffixed_err(src, pos, "Cannot overwrite a value") from None
+        raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
 
     if not src.startswith("]", pos):
-        raise suffixed_err(src, pos, "Expected ']' at the end of a table declaration")
+        raise TOMLDecodeError(
+            "Expected ']' at the end of a table declaration", src, pos
+        )
     return pos + 1, key
 
 
@@ -305,7 +385,7 @@ def create_list_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
     pos, key = parse_key(src, pos)
 
     if out.flags.is_(key, Flags.FROZEN):
-        raise suffixed_err(src, pos, f"Cannot mutate immutable namespace {key}")
+        raise TOMLDecodeError(f"Cannot mutate immutable namespace {key}", src, pos)
     # Free the namespace now that it points to another empty list item...
     out.flags.unset_all(key)
     # ...but this key precisely is still prohibited from table declaration
@@ -313,17 +393,19 @@ def create_list_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
     try:
         out.data.append_nest_to_list(key)
     except KeyError:
-        raise suffixed_err(src, pos, "Cannot overwrite a value") from None
+        raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
 
     if not src.startswith("]]", pos):
-        raise suffixed_err(src, pos, "Expected ']]' at the end of an array declaration")
+        raise TOMLDecodeError(
+            "Expected ']]' at the end of an array declaration", src, pos
+        )
     return pos + 2, key
 
 
 def key_value_rule(
     src: str, pos: Pos, out: Output, header: Key, parse_float: ParseFloat
 ) -> Pos:
-    pos, key, value = parse_key_value_pair(src, pos, parse_float)
+    pos, key, value = parse_key_value_pair(src, pos, parse_float, nest_lvl=0)
     key_parent, key_stem = key[:-1], key[-1]
     abs_key_parent = header + key_parent
 
@@ -331,22 +413,22 @@ def key_value_rule(
     for cont_key in relative_path_cont_keys:
         # Check that dotted key syntax does not redefine an existing table
         if out.flags.is_(cont_key, Flags.EXPLICIT_NEST):
-            raise suffixed_err(src, pos, f"Cannot redefine namespace {cont_key}")
+            raise TOMLDecodeError(f"Cannot redefine namespace {cont_key}", src, pos)
         # Containers in the relative path can't be opened with the table syntax or
         # dotted key/value syntax in following table sections.
         out.flags.add_pending(cont_key, Flags.EXPLICIT_NEST)
 
     if out.flags.is_(abs_key_parent, Flags.FROZEN):
-        raise suffixed_err(
-            src, pos, f"Cannot mutate immutable namespace {abs_key_parent}"
+        raise TOMLDecodeError(
+            f"Cannot mutate immutable namespace {abs_key_parent}", src, pos
         )
 
     try:
         nest = out.data.get_or_create_nest(abs_key_parent)
     except KeyError:
-        raise suffixed_err(src, pos, "Cannot overwrite a value") from None
+        raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
     if key_stem in nest:
-        raise suffixed_err(src, pos, "Cannot overwrite a value")
+        raise TOMLDecodeError("Cannot overwrite a value", src, pos)
     # Mark inline table and array namespaces recursively immutable
     if isinstance(value, (dict, list)):
         out.flags.set(header + key, Flags.FROZEN, recursive=True)
@@ -355,7 +437,7 @@ def key_value_rule(
 
 
 def parse_key_value_pair(
-    src: str, pos: Pos, parse_float: ParseFloat
+    src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
 ) -> tuple[Pos, Key, Any]:
     pos, key = parse_key(src, pos)
     try:
@@ -363,10 +445,10 @@ def parse_key_value_pair(
     except IndexError:
         char = None
     if char != "=":
-        raise suffixed_err(src, pos, "Expected '=' after a key in a key/value pair")
+        raise TOMLDecodeError("Expected '=' after a key in a key/value pair", src, pos)
     pos += 1
     pos = skip_chars(src, pos, TOML_WS)
-    pos, value = parse_value(src, pos, parse_float)
+    pos, value = parse_value(src, pos, parse_float, nest_lvl)
     return pos, key, value
 
 
@@ -401,7 +483,7 @@ def parse_key_part(src: str, pos: Pos) -> tuple[Pos, str]:
         return parse_literal_str(src, pos)
     if char == '"':
         return parse_one_line_basic_str(src, pos)
-    raise suffixed_err(src, pos, "Invalid initial character for a key part")
+    raise TOMLDecodeError("Invalid initial character for a key part", src, pos)
 
 
 def parse_one_line_basic_str(src: str, pos: Pos) -> tuple[Pos, str]:
@@ -409,7 +491,9 @@ def parse_one_line_basic_str(src: str, pos: Pos) -> tuple[Pos, str]:
     return parse_basic_str(src, pos, multiline=False)
 
 
-def parse_array(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, list]:
+def parse_array(
+    src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
+) -> tuple[Pos, list]:
     pos += 1
     array: list = []
 
@@ -417,7 +501,7 @@ def parse_array(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, list]
     if src.startswith("]", pos):
         return pos + 1, array
     while True:
-        pos, val = parse_value(src, pos, parse_float)
+        pos, val = parse_value(src, pos, parse_float, nest_lvl)
         array.append(val)
         pos = skip_comments_and_array_ws(src, pos)
 
@@ -425,7 +509,7 @@ def parse_array(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, list]
         if c == "]":
             return pos + 1, array
         if c != ",":
-            raise suffixed_err(src, pos, "Unclosed array")
+            raise TOMLDecodeError("Unclosed array", src, pos)
         pos += 1
 
         pos = skip_comments_and_array_ws(src, pos)
@@ -433,7 +517,9 @@ def parse_array(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, list]
             return pos + 1, array
 
 
-def parse_inline_table(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, dict]:
+def parse_inline_table(
+    src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
+) -> tuple[Pos, dict]:
     pos += 1
     nested_dict = NestedDict()
     flags = Flags()
@@ -442,23 +528,23 @@ def parse_inline_table(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos
     if src.startswith("}", pos):
         return pos + 1, nested_dict.dict
     while True:
-        pos, key, value = parse_key_value_pair(src, pos, parse_float)
+        pos, key, value = parse_key_value_pair(src, pos, parse_float, nest_lvl)
         key_parent, key_stem = key[:-1], key[-1]
         if flags.is_(key, Flags.FROZEN):
-            raise suffixed_err(src, pos, f"Cannot mutate immutable namespace {key}")
+            raise TOMLDecodeError(f"Cannot mutate immutable namespace {key}", src, pos)
         try:
             nest = nested_dict.get_or_create_nest(key_parent, access_lists=False)
         except KeyError:
-            raise suffixed_err(src, pos, "Cannot overwrite a value") from None
+            raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
         if key_stem in nest:
-            raise suffixed_err(src, pos, f"Duplicate inline table key {key_stem!r}")
+            raise TOMLDecodeError(f"Duplicate inline table key {key_stem!r}", src, pos)
         nest[key_stem] = value
         pos = skip_chars(src, pos, TOML_WS)
         c = src[pos : pos + 1]
         if c == "}":
             return pos + 1, nested_dict.dict
         if c != ",":
-            raise suffixed_err(src, pos, "Unclosed inline table")
+            raise TOMLDecodeError("Unclosed inline table", src, pos)
         if isinstance(value, (dict, list)):
             flags.set(key, Flags.FROZEN, recursive=True)
         pos += 1
@@ -480,7 +566,7 @@ def parse_basic_str_escape(
             except IndexError:
                 return pos, ""
             if char != "\n":
-                raise suffixed_err(src, pos, "Unescaped '\\' in a string")
+                raise TOMLDecodeError("Unescaped '\\' in a string", src, pos)
             pos += 1
         pos = skip_chars(src, pos, TOML_WS_AND_NEWLINE)
         return pos, ""
@@ -491,7 +577,7 @@ def parse_basic_str_escape(
     try:
         return pos, BASIC_STR_ESCAPE_REPLACEMENTS[escape_id]
     except KeyError:
-        raise suffixed_err(src, pos, "Unescaped '\\' in a string") from None
+        raise TOMLDecodeError("Unescaped '\\' in a string", src, pos) from None
 
 
 def parse_basic_str_escape_multiline(src: str, pos: Pos) -> tuple[Pos, str]:
@@ -501,11 +587,13 @@ def parse_basic_str_escape_multiline(src: str, pos: Pos) -> tuple[Pos, str]:
 def parse_hex_char(src: str, pos: Pos, hex_len: int) -> tuple[Pos, str]:
     hex_str = src[pos : pos + hex_len]
     if len(hex_str) != hex_len or not HEXDIGIT_CHARS.issuperset(hex_str):
-        raise suffixed_err(src, pos, "Invalid hex value")
+        raise TOMLDecodeError("Invalid hex value", src, pos)
     pos += hex_len
     hex_int = int(hex_str, 16)
     if not is_unicode_scalar_value(hex_int):
-        raise suffixed_err(src, pos, "Escaped character is not a Unicode scalar value")
+        raise TOMLDecodeError(
+            "Escaped character is not a Unicode scalar value", src, pos
+        )
     return pos, chr(hex_int)
 
 
@@ -562,7 +650,7 @@ def parse_basic_str(src: str, pos: Pos, *, multiline: bool) -> tuple[Pos, str]:
         try:
             char = src[pos]
         except IndexError:
-            raise suffixed_err(src, pos, "Unterminated string") from None
+            raise TOMLDecodeError("Unterminated string", src, pos) from None
         if char == '"':
             if not multiline:
                 return pos + 1, result + src[start_pos:pos]
@@ -577,13 +665,21 @@ def parse_basic_str(src: str, pos: Pos, *, multiline: bool) -> tuple[Pos, str]:
             start_pos = pos
             continue
         if char in error_on:
-            raise suffixed_err(src, pos, f"Illegal character {char!r}")
+            raise TOMLDecodeError(f"Illegal character {char!r}", src, pos)
         pos += 1
 
 
 def parse_value(  # noqa: C901
-    src: str, pos: Pos, parse_float: ParseFloat
+    src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
 ) -> tuple[Pos, Any]:
+    if nest_lvl > MAX_INLINE_NESTING:
+        # Pure Python should have raised RecursionError already.
+        # This ensures mypyc binaries eventually do the same.
+        raise RecursionError(  # pragma: no cover
+            "TOML inline arrays/tables are nested more than the allowed"
+            f" {MAX_INLINE_NESTING} levels"
+        )
+
     try:
         char: str | None = src[pos]
     except IndexError:
@@ -613,11 +709,11 @@ def parse_value(  # noqa: C901
 
     # Arrays
     if char == "[":
-        return parse_array(src, pos, parse_float)
+        return parse_array(src, pos, parse_float, nest_lvl + 1)
 
     # Inline tables
     if char == "{":
-        return parse_inline_table(src, pos, parse_float)
+        return parse_inline_table(src, pos, parse_float, nest_lvl + 1)
 
     # Dates and times
     datetime_match = RE_DATETIME.match(src, pos)
@@ -625,7 +721,7 @@ def parse_value(  # noqa: C901
         try:
             datetime_obj = match_to_datetime(datetime_match)
         except ValueError as e:
-            raise suffixed_err(src, pos, "Invalid date or datetime") from e
+            raise TOMLDecodeError("Invalid date or datetime", src, pos) from e
         return datetime_match.end(), datetime_obj
     localtime_match = RE_LOCALTIME.match(src, pos)
     if localtime_match:
@@ -646,24 +742,7 @@ def parse_value(  # noqa: C901
     if first_four in {"-inf", "+inf", "-nan", "+nan"}:
         return pos + 4, parse_float(first_four)
 
-    raise suffixed_err(src, pos, "Invalid value")
-
-
-def suffixed_err(src: str, pos: Pos, msg: str) -> TOMLDecodeError:
-    """Return a `TOMLDecodeError` where error message is suffixed with
-    coordinates in source."""
-
-    def coord_repr(src: str, pos: Pos) -> str:
-        if pos >= len(src):
-            return "end of document"
-        line = src.count("\n", 0, pos) + 1
-        if line == 1:
-            column = pos + 1
-        else:
-            column = pos - src.rindex("\n", 0, pos)
-        return f"line {line}, column {column}"
-
-    return TOMLDecodeError(f"{msg} (at {coord_repr(src, pos)})")
+    raise TOMLDecodeError("Invalid value", src, pos)
 
 
 def is_unicode_scalar_value(codepoint: int) -> bool:
@@ -679,7 +758,7 @@ def make_safe_parse_float(parse_float: ParseFloat) -> ParseFloat:
     instead of returning illegal types.
     """
     # The default `float` callable never returns illegal types. Optimize it.
-    if parse_float is float:  # type: ignore[comparison-overlap]
+    if parse_float is float:
         return float
 
     def safe_parse_float(float_str: str) -> Any:
diff --git a/src/pip/_vendor/tomli/_re.py b/src/pip/_vendor/tomli/_re.py
index 994bb7493fd..513486618cd 100644
--- a/src/pip/_vendor/tomli/_re.py
+++ b/src/pip/_vendor/tomli/_re.py
@@ -7,16 +7,18 @@
 from datetime import date, datetime, time, timedelta, timezone, tzinfo
 from functools import lru_cache
 import re
-from typing import Any
+from typing import Any, Final
 
 from ._types import ParseFloat
 
 # E.g.
 # - 00:32:00.999999
 # - 00:32:00
-_TIME_RE_STR = r"([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(?:\.([0-9]{1,6})[0-9]*)?"
+_TIME_RE_STR: Final = (
+    r"([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(?:\.([0-9]{1,6})[0-9]*)?"
+)
 
-RE_NUMBER = re.compile(
+RE_NUMBER: Final = re.compile(
     r"""
 0
 (?:
@@ -35,8 +37,8 @@
 """,
     flags=re.VERBOSE,
 )
-RE_LOCALTIME = re.compile(_TIME_RE_STR)
-RE_DATETIME = re.compile(
+RE_LOCALTIME: Final = re.compile(_TIME_RE_STR)
+RE_DATETIME: Final = re.compile(
     rf"""
 ([0-9]{{4}})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])  # date, e.g. 1988-10-27
 (?:
@@ -84,6 +86,9 @@ def match_to_datetime(match: re.Match) -> datetime | date:
     return datetime(year, month, day, hour, minute, sec, micros, tzinfo=tz)
 
 
+# No need to limit cache size. This is only ever called on input
+# that matched RE_DATETIME, so there is an implicit bound of
+# 24 (hours) * 60 (minutes) * 2 (offset direction) = 2880.
 @lru_cache(maxsize=None)
 def cached_tz(hour_str: str, minute_str: str, sign_str: str) -> timezone:
     sign = 1 if sign_str == "+" else -1
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 36c135675a4..f86b8b54a53 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -14,5 +14,5 @@ rich==13.9.4
     typing_extensions==4.12.2
 resolvelib==1.0.1
 setuptools==70.3.0
-tomli==2.0.1
+tomli==2.2.1
 truststore==0.10.0

From 8dbbb2ef9f34ad54e1d1dabe058463d0b4e5cb04 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 7 Dec 2024 15:42:17 -0500
Subject: [PATCH 622/992] Convert more record classes to dataclasses (#12659)

- Removes BestCandidateResult's iter_all() and iter_applicable()
  methods as they were redundant
- Removes ParsedLine's is_requirement attribute as it was awkward to use
  (to please mypy, you would need to add asserts on .requirement)
- Removes ParsedRequirement's defaults as they conflict with slots (Python
  3.10 dataclasses have a built-in workaround that we can't use yet...)
---
 ...df-d6ab-4d9b-8113-55c27a237dfd.trivial.rst |  0
 src/pip/_internal/index/package_finder.py     | 50 ++++-------
 src/pip/_internal/operations/freeze.py        | 24 +++---
 src/pip/_internal/req/req_file.py             | 82 +++++++++----------
 .../resolution/resolvelib/factory.py          |  2 +-
 tests/unit/test_index.py                      |  8 +-
 6 files changed, 75 insertions(+), 91 deletions(-)
 create mode 100644 news/c33bb4df-d6ab-4d9b-8113-55c27a237dfd.trivial.rst

diff --git a/news/c33bb4df-d6ab-4d9b-8113-55c27a237dfd.trivial.rst b/news/c33bb4df-d6ab-4d9b-8113-55c27a237dfd.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index 0d65ce35f37..8b89e768225 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -334,44 +334,30 @@ class CandidatePreferences:
     allow_all_prereleases: bool = False
 
 
+@dataclass(frozen=True)
 class BestCandidateResult:
     """A collection of candidates, returned by `PackageFinder.find_best_candidate`.
 
     This class is only intended to be instantiated by CandidateEvaluator's
     `compute_best_candidate()` method.
-    """
-
-    def __init__(
-        self,
-        candidates: List[InstallationCandidate],
-        applicable_candidates: List[InstallationCandidate],
-        best_candidate: Optional[InstallationCandidate],
-    ) -> None:
-        """
-        :param candidates: A sequence of all available candidates found.
-        :param applicable_candidates: The applicable candidates.
-        :param best_candidate: The most preferred candidate found, or None
-            if no applicable candidates were found.
-        """
-        assert set(applicable_candidates) <= set(candidates)
-
-        if best_candidate is None:
-            assert not applicable_candidates
-        else:
-            assert best_candidate in applicable_candidates
 
-        self._applicable_candidates = applicable_candidates
-        self._candidates = candidates
+    :param all_candidates: A sequence of all available candidates found.
+    :param applicable_candidates: The applicable candidates.
+    :param best_candidate: The most preferred candidate found, or None
+        if no applicable candidates were found.
+    """
 
-        self.best_candidate = best_candidate
+    all_candidates: List[InstallationCandidate]
+    applicable_candidates: List[InstallationCandidate]
+    best_candidate: Optional[InstallationCandidate]
 
-    def iter_all(self) -> Iterable[InstallationCandidate]:
-        """Iterate through all candidates."""
-        return iter(self._candidates)
+    def __post_init__(self) -> None:
+        assert set(self.applicable_candidates) <= set(self.all_candidates)
 
-    def iter_applicable(self) -> Iterable[InstallationCandidate]:
-        """Iterate through the applicable candidates."""
-        return iter(self._applicable_candidates)
+        if self.best_candidate is None:
+            assert not self.applicable_candidates
+        else:
+            assert self.best_candidate in self.applicable_candidates
 
 
 class CandidateEvaluator:
@@ -929,7 +915,7 @@ def _format_versions(cand_iter: Iterable[InstallationCandidate]) -> str:
                 "Could not find a version that satisfies the requirement %s "
                 "(from versions: %s)",
                 req,
-                _format_versions(best_candidate_result.iter_all()),
+                _format_versions(best_candidate_result.all_candidates),
             )
 
             raise DistributionNotFound(f"No matching distribution found for {req}")
@@ -963,7 +949,7 @@ def _should_install_candidate(
             logger.debug(
                 "Using version %s (newest of versions: %s)",
                 best_candidate.version,
-                _format_versions(best_candidate_result.iter_applicable()),
+                _format_versions(best_candidate_result.applicable_candidates),
             )
             return best_candidate
 
@@ -971,7 +957,7 @@ def _should_install_candidate(
         logger.debug(
             "Installed version (%s) is most up-to-date (past versions: %s)",
             installed_version,
-            _format_versions(best_candidate_result.iter_applicable()),
+            _format_versions(best_candidate_result.applicable_candidates),
         )
         raise BestVersionAlreadyInstalled
 
diff --git a/src/pip/_internal/operations/freeze.py b/src/pip/_internal/operations/freeze.py
index bb1039fb776..ae5dd37f9db 100644
--- a/src/pip/_internal/operations/freeze.py
+++ b/src/pip/_internal/operations/freeze.py
@@ -1,9 +1,10 @@
 import collections
 import logging
 import os
+from dataclasses import dataclass, field
 from typing import Container, Dict, Generator, Iterable, List, NamedTuple, Optional, Set
 
-from pip._vendor.packaging.utils import canonicalize_name
+from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
 from pip._vendor.packaging.version import InvalidVersion
 
 from pip._internal.exceptions import BadCommand, InstallationError
@@ -220,19 +221,16 @@ def _get_editable_info(dist: BaseDistribution) -> _EditableInfo:
     )
 
 
+@dataclass(frozen=True)
 class FrozenRequirement:
-    def __init__(
-        self,
-        name: str,
-        req: str,
-        editable: bool,
-        comments: Iterable[str] = (),
-    ) -> None:
-        self.name = name
-        self.canonical_name = canonicalize_name(name)
-        self.req = req
-        self.editable = editable
-        self.comments = comments
+    name: str
+    req: str
+    editable: bool
+    comments: Iterable[str] = field(default_factory=tuple)
+
+    @property
+    def canonical_name(self) -> NormalizedName:
+        return canonicalize_name(self.name)
 
     @classmethod
     def from_dist(cls, dist: BaseDistribution) -> "FrozenRequirement":
diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index eb2a1f69921..dee7f2fe81b 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -8,6 +8,7 @@
 import re
 import shlex
 import urllib.parse
+from dataclasses import dataclass
 from optparse import Values
 from typing import (
     TYPE_CHECKING,
@@ -84,49 +85,48 @@
 logger = logging.getLogger(__name__)
 
 
+@dataclass(frozen=True)
 class ParsedRequirement:
-    def __init__(
-        self,
-        requirement: str,
-        is_editable: bool,
-        comes_from: str,
-        constraint: bool,
-        options: Optional[Dict[str, Any]] = None,
-        line_source: Optional[str] = None,
-    ) -> None:
-        self.requirement = requirement
-        self.is_editable = is_editable
-        self.comes_from = comes_from
-        self.options = options
-        self.constraint = constraint
-        self.line_source = line_source
+    # TODO: replace this with slots=True when dropping Python 3.9 support.
+    __slots__ = (
+        "requirement",
+        "is_editable",
+        "comes_from",
+        "constraint",
+        "options",
+        "line_source",
+    )
+
+    requirement: str
+    is_editable: bool
+    comes_from: str
+    constraint: bool
+    options: Optional[Dict[str, Any]]
+    line_source: Optional[str]
 
 
+@dataclass(frozen=True)
 class ParsedLine:
-    def __init__(
-        self,
-        filename: str,
-        lineno: int,
-        args: str,
-        opts: Values,
-        constraint: bool,
-    ) -> None:
-        self.filename = filename
-        self.lineno = lineno
-        self.opts = opts
-        self.constraint = constraint
-
-        if args:
-            self.is_requirement = True
-            self.is_editable = False
-            self.requirement = args
-        elif opts.editables:
-            self.is_requirement = True
-            self.is_editable = True
+    __slots__ = ("filename", "lineno", "args", "opts", "constraint")
+
+    filename: str
+    lineno: int
+    args: str
+    opts: Values
+    constraint: bool
+
+    @property
+    def is_editable(self) -> bool:
+        return bool(self.opts.editables)
+
+    @property
+    def requirement(self) -> Optional[str]:
+        if self.args:
+            return self.args
+        elif self.is_editable:
             # We don't support multiple -e on one line
-            self.requirement = opts.editables[0]
-        else:
-            self.is_requirement = False
+            return self.opts.editables[0]
+        return None
 
 
 def parse_requirements(
@@ -179,7 +179,7 @@ def handle_requirement_line(
         line.lineno,
     )
 
-    assert line.is_requirement
+    assert line.requirement is not None
 
     # get the options that apply to requirements
     if line.is_editable:
@@ -301,7 +301,7 @@ def handle_line(
     affect the finder.
     """
 
-    if line.is_requirement:
+    if line.requirement is not None:
         parsed_req = handle_requirement_line(line, options)
         return parsed_req
     else:
@@ -340,7 +340,7 @@ def _parse_and_recurse(
         parsed_files_stack: List[Dict[str, Optional[str]]],
     ) -> Generator[ParsedLine, None, None]:
         for line in self._parse_file(filename, constraint):
-            if not line.is_requirement and (
+            if line.requirement is None and (
                 line.opts.requirements or line.opts.constraints
             ):
                 # parse a nested requirements file
diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
index dc6e2e12e1f..6c273eb88db 100644
--- a/src/pip/_internal/resolution/resolvelib/factory.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -309,7 +309,7 @@ def iter_index_candidate_infos() -> Iterator[IndexCandidateInfo]:
                 specifier=specifier,
                 hashes=hashes,
             )
-            icans = list(result.iter_applicable())
+            icans = result.applicable_candidates
 
             # PEP 592: Yanked releases are ignored unless the specifier
             # explicitly pins a version (via '==' or '===') that can be
diff --git a/tests/unit/test_index.py b/tests/unit/test_index.py
index 8faa4a56a0a..cbbca03817e 100644
--- a/tests/unit/test_index.py
+++ b/tests/unit/test_index.py
@@ -467,13 +467,13 @@ def test_compute_best_candidate(self) -> None:
         )
         result = evaluator.compute_best_candidate(candidates)
 
-        assert result._candidates == candidates
+        assert result.all_candidates == candidates
         expected_applicable = candidates[:2]
         assert [str(c.version) for c in expected_applicable] == [
             "1.10",
             "1.11",
         ]
-        assert result._applicable_candidates == expected_applicable
+        assert result.applicable_candidates == expected_applicable
 
         assert result.best_candidate is expected_applicable[1]
 
@@ -490,8 +490,8 @@ def test_compute_best_candidate__none_best(self) -> None:
         )
         result = evaluator.compute_best_candidate(candidates)
 
-        assert result._candidates == candidates
-        assert result._applicable_candidates == []
+        assert result.all_candidates == candidates
+        assert result.applicable_candidates == []
         assert result.best_candidate is None
 
     @pytest.mark.parametrize(

From a194b4548849105b311f84d25a793be1c520a41b Mon Sep 17 00:00:00 2001
From: JoshuaPerdue <33358750+JoshuaPerdue@users.noreply.github.com>
Date: Sat, 7 Dec 2024 14:46:46 -0600
Subject: [PATCH 623/992] Correct typos in docs and code comments (#13032)

Also move "Selected quotes from research participants" out of a random paragraph.
---
 .../development/architecture/command-line-interface.rst     | 2 +-
 docs/html/development/architecture/overview.rst             | 2 +-
 .../research-results/improving-pips-documentation.md        | 2 +-
 docs/html/ux-research-design/research-results/personas.md   | 2 +-
 .../research-results/pip-force-reinstall.md                 | 6 +++---
 .../research-results/prioritizing-features.md               | 4 ++--
 .../research-results/users-and-security.md                  | 5 +++--
 news/13031.trivial.rst                                      | 1 +
 src/pip/_internal/configuration.py                          | 2 +-
 src/pip/_internal/metadata/__init__.py                      | 4 ++--
 src/pip/_internal/metadata/importlib/_dists.py              | 2 +-
 src/pip/_internal/pyproject.py                              | 2 +-
 12 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 news/13031.trivial.rst

diff --git a/docs/html/development/architecture/command-line-interface.rst b/docs/html/development/architecture/command-line-interface.rst
index 725199bf580..283adc7c105 100644
--- a/docs/html/development/architecture/command-line-interface.rst
+++ b/docs/html/development/architecture/command-line-interface.rst
@@ -154,7 +154,7 @@ Its main addition consists of the following function:
 
   .. py:method:: get_default_values()
 
-    Overrides the original method to allow updating the defaults ater the instantiation of the
+    Overrides the original method to allow updating the defaults after the instantiation of the
     option parser.
 
 It allows overriding the default options and arguments using the ``Configuration`` class
diff --git a/docs/html/development/architecture/overview.rst b/docs/html/development/architecture/overview.rst
index 63445754a76..a003d9a9ec8 100644
--- a/docs/html/development/architecture/overview.rst
+++ b/docs/html/development/architecture/overview.rst
@@ -134,7 +134,7 @@ Once it has those, it selects one file and downloads it.
 cannot….should not be …. ? I want only the Flask …. Why am I getting the
 whole list?
 
-Answer: It's not every file, just files of Flask. No API for getting alllllll
+Answer: It's not every file, just files of Flask. No API for getting all
 files on PyPI. It’s for getting all files of Flask.)
 
 .. _`tracking issue`: https://github.com/pypa/pip/issues/6831
diff --git a/docs/html/ux-research-design/research-results/improving-pips-documentation.md b/docs/html/ux-research-design/research-results/improving-pips-documentation.md
index 765a8f1069a..d7f547668b4 100644
--- a/docs/html/ux-research-design/research-results/improving-pips-documentation.md
+++ b/docs/html/ux-research-design/research-results/improving-pips-documentation.md
@@ -512,7 +512,7 @@ _Suggested content:_
 _Page purpose:_
 
 - To onboard people who want to contribute to pip's docs
-- To share previous research and recommendataions related to pip's docs
+- To share previous research and recommendations related to pip's docs
 
 _Suggested content:_
 
diff --git a/docs/html/ux-research-design/research-results/personas.md b/docs/html/ux-research-design/research-results/personas.md
index e4f1a3df44b..afdac02a32c 100644
--- a/docs/html/ux-research-design/research-results/personas.md
+++ b/docs/html/ux-research-design/research-results/personas.md
@@ -2,7 +2,7 @@
 
 ## Problem
 
-We want to develop personas for pip's user to facilate faster user-centered decision making for the pip development team.
+We want to develop personas for pip's user to facilitate faster user-centered decision making for the pip development team.
 
 [Skip to recommendations](#recommendations)
 
diff --git a/docs/html/ux-research-design/research-results/pip-force-reinstall.md b/docs/html/ux-research-design/research-results/pip-force-reinstall.md
index 4ba84b876d3..2f3e2339c4e 100644
--- a/docs/html/ux-research-design/research-results/pip-force-reinstall.md
+++ b/docs/html/ux-research-design/research-results/pip-force-reinstall.md
@@ -66,7 +66,7 @@ Most respondents use `--force-reinstall` "almost never" (65.6%):
 ![screenshot of survey question of how often users use --force-reinstall](https://i.imgur.com/fjLQUPV.png)
 ![bar chart of how often users use --force-reinstall](https://i.imgur.com/Xe1XDkI.png)
 
-Amongst respondents who said they use `--force-resinstall` often or very often:
+Amongst respondents who said they use `--force-reinstall` often or very often:
 
 - 54.54% (6/11) of respondents thought that pip should install the same version of requests - i.e. that `--force-reinstall` should _not_ implicitly upgrade
 - 45.45% (5/11) of respondents thought that pip should upgrade requests to the latest version - i.e that `--force-reinstall` _should_ implicitly upgrade
@@ -76,7 +76,7 @@ Respondents find `--force-reinstall` less useful than useful:
 ![screenshot of survey question of how useful users find --force-reinstall](https://i.imgur.com/6cv4lFn.png)
 ![bar chart of how useful users find --force-reinstall](https://i.imgur.com/gMUBDBo.png)
 
-Amongst respondents who said they find `--force-resinstall` useful or very useful:
+Amongst respondents who said they find `--force-reinstall` useful or very useful:
 
 - 38.46% (20/52) of respondents thought that pip should install the same version of requests - i.e. that `--force-reinstall` should _not_ implicitly upgrade
 - 50% (26/52) of respondents thought that pip should upgrade requests to the latest version - i.e that `--force-reinstall` _should_ implicitly upgrade
@@ -89,7 +89,7 @@ In this case, we recommend showing the following message when a user tries to us
 
 > Error: the pip install --force-reinstall option no longer exists. Use pip uninstall then pip install to replace up-to-date packages, or pip install --upgrade to update your packages to the latest available versions.
 
-Should the pip development team wish to keep `--force-resintall`, we recommend maintaining the current (implicit upgrade) behaviour, as pip's users have not expressed a clear preference for a different behaviour.
+Should the pip development team wish to keep `--force-reinstall`, we recommend maintaining the current (implicit upgrade) behaviour, as pip's users have not expressed a clear preference for a different behaviour.
 
 In this case, we recommend upgrading the [help text](https://pip.pypa.io/en/stable/reference/pip_install/#cmdoption-force-reinstall) to be more explicit:
 
diff --git a/docs/html/ux-research-design/research-results/prioritizing-features.md b/docs/html/ux-research-design/research-results/prioritizing-features.md
index 3642042f333..4e0d0250c08 100644
--- a/docs/html/ux-research-design/research-results/prioritizing-features.md
+++ b/docs/html/ux-research-design/research-results/prioritizing-features.md
@@ -109,9 +109,9 @@ Results varied by the amount of Python experience the user had.
 
 ![Screenshot of Install a package from wheels](https://i.imgur.com/9DMBfNL.png)
 
-#### Install apackage from a local directory
+#### Install a package from a local directory
 
-![Screenshot of Install apackage from a local directory](https://i.imgur.com/Jp95rak.png)
+![Screenshot of Install a package from a local directory](https://i.imgur.com/Jp95rak.png)
 
 #### Control where you want your installed package to live on your computer
 
diff --git a/docs/html/ux-research-design/research-results/users-and-security.md b/docs/html/ux-research-design/research-results/users-and-security.md
index fbc8f492f3c..8e3a12d9682 100644
--- a/docs/html/ux-research-design/research-results/users-and-security.md
+++ b/docs/html/ux-research-design/research-results/users-and-security.md
@@ -56,6 +56,8 @@ Both of these groups identified their "sphere of influence" and did their best t
 
 ### User thoughts about security
 
+Selected quotes from research participants
+
 #### Responsibility as author
 
 Participants who spent a lot of their time writing Python code - either for community or as part of their job - expressed a responsibility to their users for the code they wrote - people who wrote code which was made public expressed a stronger responsibility.
@@ -76,8 +78,7 @@ Participants also explained they rely on code security scanning and checking sof
 
 #### Reliance on good software development practices
 
-A small number of participants e### Selected quotes from research participants
-xplained they have good software practices in place, which help with writing secure software.
+A small number of participants explained they have good software practices in place, which help with writing secure software.
 
 > "We have a book about ethics of code - we have mandatory certification."
 
diff --git a/news/13031.trivial.rst b/news/13031.trivial.rst
new file mode 100644
index 00000000000..d765e810e40
--- /dev/null
+++ b/news/13031.trivial.rst
@@ -0,0 +1 @@
+Correct documentation errors.
diff --git a/src/pip/_internal/configuration.py b/src/pip/_internal/configuration.py
index c25273d5f0b..ffeda1d47a1 100644
--- a/src/pip/_internal/configuration.py
+++ b/src/pip/_internal/configuration.py
@@ -330,7 +330,7 @@ def iter_config_files(self) -> Iterable[Tuple[Kind, List[str]]]:
         This should be treated like items of a dictionary. The order
         here doesn't affect what gets overridden. That is controlled
         by OVERRIDE_ORDER. However this does control the order they are
-        displayed to the user. It's probably most ergononmic to display
+        displayed to the user. It's probably most ergonomic to display
         things in the same order as OVERRIDE_ORDER
         """
         # SMELL: Move the conditions out of this function
diff --git a/src/pip/_internal/metadata/__init__.py b/src/pip/_internal/metadata/__init__.py
index aa232b6cabd..1ea1e7fd2e5 100644
--- a/src/pip/_internal/metadata/__init__.py
+++ b/src/pip/_internal/metadata/__init__.py
@@ -30,7 +30,7 @@ def _should_use_importlib_metadata() -> bool:
     """Whether to use the ``importlib.metadata`` or ``pkg_resources`` backend.
 
     By default, pip uses ``importlib.metadata`` on Python 3.11+, and
-    ``pkg_resourcess`` otherwise. This can be overridden by a couple of ways:
+    ``pkg_resources`` otherwise. This can be overridden by a couple of ways:
 
     * If environment variable ``_PIP_USE_IMPORTLIB_METADATA`` is set, it
       dictates whether ``importlib.metadata`` is used, regardless of Python
@@ -71,7 +71,7 @@ def get_default_environment() -> BaseEnvironment:
 
     This returns an Environment instance from the chosen backend. The default
     Environment instance should be built from ``sys.path`` and may use caching
-    to share instance state accorss calls.
+    to share instance state across calls.
     """
     return select_backend().Environment.default()
 
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index 36cd326232e..5e92b12755e 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -190,7 +190,7 @@ def read_text(self, path: InfoPath) -> str:
         return content
 
     def iter_entry_points(self) -> Iterable[BaseEntryPoint]:
-        # importlib.metadata's EntryPoint structure sasitfies BaseEntryPoint.
+        # importlib.metadata's EntryPoint structure satisfies BaseEntryPoint.
         return self._dist.entry_points
 
     def _metadata_impl(self) -> email.message.Message:
diff --git a/src/pip/_internal/pyproject.py b/src/pip/_internal/pyproject.py
index 2a9cad4803e..0e8452f39dc 100644
--- a/src/pip/_internal/pyproject.py
+++ b/src/pip/_internal/pyproject.py
@@ -73,7 +73,7 @@ def load_pyproject_toml(
         build_system = None
 
     # The following cases must use PEP 517
-    # We check for use_pep517 being non-None and falsey because that means
+    # We check for use_pep517 being non-None and falsy because that means
     # the user explicitly requested --no-use-pep517.  The value 0 as
     # opposed to False can occur when the value is provided via an
     # environment variable or config file option (due to the quirk of

From 667acf4e5e95783900c0b6f29c7520a69c178b5b Mon Sep 17 00:00:00 2001
From: Justin van Heek 
Date: Mon, 9 Dec 2024 17:40:33 -0500
Subject: [PATCH 624/992] Inherit HTTP cache file read/write permissions from
 cache directory (#13070)

The NamedTemporaryFile class used to create HTTP cache files is hard-coded to use
file mode 600 (owner read/write only). This makes it impossible to share a pip
cache with other users.

With this patch, once a cache file is committed, its permissions are updated to
inherit the read/write permissions of the cache directory. As before, the owner
read/write permissions will always be set to avoid a completely unusable cache.

---------

Co-authored-by: Richard Si 
---
 news/11012.feature.rst             |  3 +++
 src/pip/_internal/network/cache.py | 12 ++++++++++++
 tests/unit/test_network_cache.py   | 31 ++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 news/11012.feature.rst

diff --git a/news/11012.feature.rst b/news/11012.feature.rst
new file mode 100644
index 00000000000..d913306c176
--- /dev/null
+++ b/news/11012.feature.rst
@@ -0,0 +1,3 @@
+Files in the network cache will inherit the read/write permissions of pip's cache
+directory (in addition to the current user retaining read/write access). This
+enables a single cache to be shared among multiple users.
diff --git a/src/pip/_internal/network/cache.py b/src/pip/_internal/network/cache.py
index 4d0fb545dc2..fca04e6945f 100644
--- a/src/pip/_internal/network/cache.py
+++ b/src/pip/_internal/network/cache.py
@@ -76,6 +76,18 @@ def _write(self, path: str, data: bytes) -> None:
 
             with adjacent_tmp_file(path) as f:
                 f.write(data)
+                # Inherit the read/write permissions of the cache directory
+                # to enable multi-user cache use-cases.
+                mode = (
+                    os.stat(self.directory).st_mode
+                    & 0o666  # select read/write permissions of cache directory
+                    | 0o600  # set owner read/write permissions
+                )
+                # Change permissions only if there is no risk of following a symlink.
+                if os.chmod in os.supports_fd:
+                    os.chmod(f.fileno(), mode)
+                elif os.chmod in os.supports_follow_symlinks:
+                    os.chmod(f.name, mode, follow_symlinks=False)
 
             replace(f.name, path)
 
diff --git a/tests/unit/test_network_cache.py b/tests/unit/test_network_cache.py
index 6bba8fc670b..af15acae450 100644
--- a/tests/unit/test_network_cache.py
+++ b/tests/unit/test_network_cache.py
@@ -82,3 +82,34 @@ def test_cache_hashes_are_same(self, cache_tmpdir: Path) -> None:
         key = "test key"
         fake_cache = Mock(FileCache, directory=cache.directory, encode=FileCache.encode)
         assert cache._get_cache_path(key) == FileCache._fn(fake_cache, key)
+
+    @pytest.mark.skipif("sys.platform == 'win32'")
+    @pytest.mark.skipif(
+        os.chmod not in os.supports_fd and os.chmod not in os.supports_follow_symlinks,
+        reason="requires os.chmod to support file descriptors or not follow symlinks",
+    )
+    @pytest.mark.parametrize(
+        "perms, expected_perms", [(0o300, 0o600), (0o700, 0o600), (0o777, 0o666)]
+    )
+    def test_cache_inherit_perms(
+        self, cache_tmpdir: Path, perms: int, expected_perms: int
+    ) -> None:
+        key = "foo"
+        with chmod(cache_tmpdir, perms):
+            cache = SafeFileCache(os.fspath(cache_tmpdir))
+            cache.set(key, b"bar")
+        assert (os.stat(cache._get_cache_path(key)).st_mode & 0o777) == expected_perms
+
+    @pytest.mark.skipif("sys.platform == 'win32'")
+    def test_cache_not_inherit_perms(
+        self, cache_tmpdir: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setattr(os, "supports_fd", os.supports_fd - {os.chmod})
+        monkeypatch.setattr(
+            os, "supports_follow_symlinks", os.supports_follow_symlinks - {os.chmod}
+        )
+        key = "foo"
+        with chmod(cache_tmpdir, 0o777):
+            cache = SafeFileCache(os.fspath(cache_tmpdir))
+            cache.set(key, b"bar")
+        assert (os.stat(cache._get_cache_path(key)).st_mode & 0o777) == 0o600

From d3ac6a2d992d94c4952657ad9b0601c623006fb8 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 10 Dec 2024 14:18:14 -0500
Subject: [PATCH 625/992] Remove unused news file GHA workflow and bot config
 (#13107)

The PSF Chronographer essentially replaces the news file check GHA
workflow. And we haven't used the triage-new-issues bot in ages.
---
 .github/triage-new-issues.yml   |  7 -------
 .github/workflows/news-file.yml | 25 -------------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 .github/triage-new-issues.yml
 delete mode 100644 .github/workflows/news-file.yml

diff --git a/.github/triage-new-issues.yml b/.github/triage-new-issues.yml
deleted file mode 100644
index 32b656d4a68..00000000000
--- a/.github/triage-new-issues.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is based off of reading the actual source code of the bot. :/
-# https://github.com/tunnckoCoreLabs/triage-new-issues/blob/2ff406030ecce4c25f7bdd454125ba54db1301bd/src/index.js#L7
-#
-# While this file is currently a no-op, it serves the purpose of
-# documenting that this bot is indeed being used, since this is a
-# non-standard probot bot.
-label: "needs triage"
diff --git a/.github/workflows/news-file.yml b/.github/workflows/news-file.yml
deleted file mode 100644
index 398ad1b7e67..00000000000
--- a/.github/workflows/news-file.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Check
-
-on:
-  pull_request:
-    types: [labeled, unlabeled, opened, reopened, synchronize]
-
-jobs:
-  check-news-entry:
-    name: news entry
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # `towncrier check` runs `git diff --name-only origin/main...`, which
-          # needs a non-shallow clone.
-          fetch-depth: 0
-
-      - name: Check news entry
-        if: "!contains(github.event.pull_request.labels.*.name, 'skip news')"
-        run: |
-          if ! pipx run towncrier check --compare-with origin/${{ github.base_ref }}; then
-            echo "Please see https://pip.pypa.io/dev/news-entry-failure for guidance."
-            false
-          fi

From 947917be5d8d826efde3f0ad398ec6128cf5bfe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Randy=20D=C3=B6ring?=
 <30527984+radoering@users.noreply.github.com>
Date: Tue, 10 Dec 2024 22:55:13 +0100
Subject: [PATCH 626/992] Fix options and default in `--keyring-provider` help
 (#13110)

The `auto` mode was added a while ago, but the option help was not
updated to reflect this.
---
 news/a6275be8-84ca-48bf-98dc-1ccb196e7f47.trivial.rst | 0
 src/pip/_internal/cli/cmdoptions.py                   | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 news/a6275be8-84ca-48bf-98dc-1ccb196e7f47.trivial.rst

diff --git a/news/a6275be8-84ca-48bf-98dc-1ccb196e7f47.trivial.rst b/news/a6275be8-84ca-48bf-98dc-1ccb196e7f47.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index 0b7cff77bdd..eeb7e651b79 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -260,8 +260,8 @@ class PipOption(Option):
     default="auto",
     help=(
         "Enable the credential lookup via the keyring library if user input is allowed."
-        " Specify which mechanism to use [disabled, import, subprocess]."
-        " (default: disabled)"
+        " Specify which mechanism to use [auto, disabled, import, subprocess]."
+        " (default: %default)"
     ),
 )
 

From 8936feef3bc181d04c16ee5ade9731d745ee4200 Mon Sep 17 00:00:00 2001
From: charwick <1117120+charwick@users.noreply.github.com>
Date: Thu, 12 Dec 2024 16:19:00 -0500
Subject: [PATCH 627/992] Return file size along with count on cache purge or
 removal (#13108)

---
 news/12176.feature.rst              | 1 +
 src/pip/_internal/commands/cache.py | 5 ++++-
 tests/functional/test_cache.py      | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 news/12176.feature.rst

diff --git a/news/12176.feature.rst b/news/12176.feature.rst
new file mode 100644
index 00000000000..5ff3b31f891
--- /dev/null
+++ b/news/12176.feature.rst
@@ -0,0 +1 @@
+Pip now returns the size, along with the number, of files cleared on ``pip cache purge`` and ``pip cache remove``
diff --git a/src/pip/_internal/commands/cache.py b/src/pip/_internal/commands/cache.py
index 328336152cc..ad65641edb2 100644
--- a/src/pip/_internal/commands/cache.py
+++ b/src/pip/_internal/commands/cache.py
@@ -8,6 +8,7 @@
 from pip._internal.exceptions import CommandError, PipError
 from pip._internal.utils import filesystem
 from pip._internal.utils.logging import getLogger
+from pip._internal.utils.misc import format_size
 
 logger = getLogger(__name__)
 
@@ -180,10 +181,12 @@ def remove_cache_items(self, options: Values, args: List[Any]) -> None:
         if not files:
             logger.warning(no_matching_msg)
 
+        bytes_removed = 0
         for filename in files:
+            bytes_removed += os.stat(filename).st_size
             os.unlink(filename)
             logger.verbose("Removed %s", filename)
-        logger.info("Files removed: %s", len(files))
+        logger.info("Files removed: %s (%s)", len(files), format_size(bytes_removed))
 
     def purge_cache(self, options: Values, args: List[Any]) -> None:
         if args:
diff --git a/tests/functional/test_cache.py b/tests/functional/test_cache.py
index 5b7e585260d..247bfcd4be0 100644
--- a/tests/functional/test_cache.py
+++ b/tests/functional/test_cache.py
@@ -256,7 +256,7 @@ def test_cache_purge_with_empty_cache(script: PipTestEnvironment) -> None:
     and exit without an error code."""
     result = script.pip("cache", "purge", allow_stderr_warning=True)
     assert result.stderr == "WARNING: No matching packages\n"
-    assert result.stdout == "Files removed: 0\n"
+    assert result.stdout == "Files removed: 0 (0 bytes)\n"
 
 
 @pytest.mark.usefixtures("populate_wheel_cache")
@@ -265,7 +265,7 @@ def test_cache_remove_with_bad_pattern(script: PipTestEnvironment) -> None:
     and exit without an error code."""
     result = script.pip("cache", "remove", "aaa", allow_stderr_warning=True)
     assert result.stderr == 'WARNING: No matching packages for pattern "aaa"\n'
-    assert result.stdout == "Files removed: 0\n"
+    assert result.stdout == "Files removed: 0 (0 bytes)\n"
 
 
 def test_cache_list_too_many_args(script: PipTestEnvironment) -> None:

From 34fc0e20bd91f7facd1ba735c892a487309003f3 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 14 Dec 2024 16:38:41 -0500
Subject: [PATCH 628/992] Pass CA and client TLS certificates to build
 subprocesses (#13063)

The _PIP_STANDALONE_CERT environment variable hack is no longer required
as pip doesn't run a zip archive of itself to provision build dependencies
these days (which due to a CPython bug would leave behind temporary certifi
files).

Some people do depend on this private envvar in the wild, so the removal
has been called out in the news entry.
---
 news/5502.bugfix.rst                      |  2 ++
 src/pip/_internal/build_env.py            |  6 +++--
 src/pip/_internal/index/package_finder.py | 14 ++++++++++
 src/pip/_vendor/requests/certs.py         |  9 +------
 tests/functional/test_install.py          | 32 +++++++++++++++++++++++
 tools/vendoring/patches/requests.patch    | 20 --------------
 6 files changed, 53 insertions(+), 30 deletions(-)
 create mode 100644 news/5502.bugfix.rst

diff --git a/news/5502.bugfix.rst b/news/5502.bugfix.rst
new file mode 100644
index 00000000000..674c431bd3e
--- /dev/null
+++ b/news/5502.bugfix.rst
@@ -0,0 +1,2 @@
+Configured TLS server and client certificates are now used while installing build dependencies.
+Consequently, the private ``_PIP_STANDALONE_CERT`` environment variable is no longer used.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index 0f1e2667caf..b2cc6682291 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -246,6 +246,8 @@ def _install_requirements(
             # target from config file or env var should be ignored
             "--target",
             "",
+            "--cert",
+            finder.custom_cert or where(),
         ]
         if logger.getEffectiveLevel() <= logging.DEBUG:
             args.append("-vv")
@@ -272,19 +274,19 @@ def _install_requirements(
 
         for host in finder.trusted_hosts:
             args.extend(["--trusted-host", host])
+        if finder.client_cert:
+            args.extend(["--client-cert", finder.client_cert])
         if finder.allow_all_prereleases:
             args.append("--pre")
         if finder.prefer_binary:
             args.append("--prefer-binary")
         args.append("--")
         args.extend(requirements)
-        extra_environ = {"_PIP_STANDALONE_CERT": where()}
         with open_spinner(f"Installing {kind}") as spinner:
             call_subprocess(
                 args,
                 command_desc=f"pip subprocess to install {kind}",
                 spinner=spinner,
-                extra_environ=extra_environ,
             )
 
 
diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index 8b89e768225..86efb9adac0 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -666,6 +666,20 @@ def trusted_hosts(self) -> Iterable[str]:
         for host_port in self._link_collector.session.pip_trusted_origins:
             yield build_netloc(*host_port)
 
+    @property
+    def custom_cert(self) -> Optional[str]:
+        # session.verify is either a boolean (use default bundle/no SSL
+        # verification) or a string path to a custom CA bundle to use. We only
+        # care about the latter.
+        verify = self._link_collector.session.verify
+        return verify if isinstance(verify, str) else None
+
+    @property
+    def client_cert(self) -> Optional[str]:
+        cert = self._link_collector.session.cert
+        assert not isinstance(cert, tuple), "pip only supports PEM client certs"
+        return cert
+
     @property
     def allow_all_prereleases(self) -> bool:
         return self._candidate_prefs.allow_all_prereleases
diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py
index 38696a1fb34..2743144b994 100644
--- a/src/pip/_vendor/requests/certs.py
+++ b/src/pip/_vendor/requests/certs.py
@@ -11,14 +11,7 @@
 environment, you can change the definition of where() to return a separately
 packaged CA bundle.
 """
-
-import os
-
-if "_PIP_STANDALONE_CERT" not in os.environ:
-    from pip._vendor.certifi import where
-else:
-    def where():
-        return os.environ["_PIP_STANDALONE_CERT"]
+from pip._vendor.certifi import where
 
 if __name__ == "__main__":
     print(where())
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 4718beb948c..35d4e58b65e 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -2361,6 +2361,38 @@ def test_install_sends_client_cert(
         assert environ["SSL_CLIENT_CERT"]
 
 
+def test_install_sends_certs_for_pep518_deps(
+    script: PipTestEnvironment,
+    cert_factory: CertFactory,
+    data: TestData,
+    common_wheels: Path,
+) -> None:
+    cert_path = cert_factory()
+    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+    ctx.load_cert_chain(cert_path, cert_path)
+    ctx.load_verify_locations(cafile=cert_path)
+    ctx.verify_mode = ssl.CERT_REQUIRED
+
+    setuptools_pkg = next(common_wheels.glob("setuptools*")).name
+    server = make_mock_server(ssl_context=ctx)
+    server.mock.side_effect = [
+        package_page({setuptools_pkg: f"/files/{setuptools_pkg}"}),
+        file_response(common_wheels / setuptools_pkg),
+    ]
+    url = f"https://{server.host}:{server.port}/simple"
+
+    args = ["install", str(data.packages / "pep517_setup_and_pyproject")]
+    args.extend(["--index-url", url])
+    args.extend(["--cert", cert_path, "--client-cert", cert_path])
+
+    with server_running(server):
+        script.pip(*args)
+
+    for call_args in server.mock.call_args_list:
+        environ, _ = call_args.args
+        assert environ.get("SSL_CLIENT_CERT", "")
+
+
 def test_install_skip_work_dir_pkg(script: PipTestEnvironment, data: TestData) -> None:
     """
     Test that install of a package in working directory
diff --git a/tools/vendoring/patches/requests.patch b/tools/vendoring/patches/requests.patch
index c205250eeb1..715f8f5a39b 100644
--- a/tools/vendoring/patches/requests.patch
+++ b/tools/vendoring/patches/requests.patch
@@ -84,26 +84,6 @@ index 8fbcd656..094e2046 100644
  
  try:
      from urllib3.contrib import pyopenssl
-diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py
-index be422c3e..3daf06f6 100644
---- a/src/pip/_vendor/requests/certs.py
-+++ b/src/pip/_vendor/requests/certs.py
-@@ -11,7 +11,14 @@ If you are packaging Requests, e.g., for a Linux distribution or a managed
- environment, you can change the definition of where() to return a separately
- packaged CA bundle.
- """
--from certifi import where
-+
-+import os
-+
-+if "_PIP_STANDALONE_CERT" not in os.environ:
-+    from certifi import where
-+else:
-+    def where():
-+        return os.environ["_PIP_STANDALONE_CERT"]
- 
- if __name__ == "__main__":
-     print(where())
 diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
 index 9d4e72c60..04230fc8d 100644
 --- a/src/pip/_vendor/requests/__init__.py

From 90add483b1846744c91b9de7f4c6f4d1b33230a4 Mon Sep 17 00:00:00 2001
From: July Tikhonov 
Date: Tue, 17 Dec 2024 01:38:05 +0300
Subject: [PATCH 629/992] Add missing space in running as root warning message
 (#13116)

---
 src/pip/_internal/utils/misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index c0a3e4d3b9d..c07405267d6 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -764,7 +764,7 @@ def warn_if_run_as_root() -> None:
     logger.warning(
         "Running pip as the 'root' user can result in broken permissions and "
         "conflicting behaviour with the system package manager, possibly "
-        "rendering your system unusable."
+        "rendering your system unusable. "
         "It is recommended to use a virtual environment instead: "
         "https://pip.pypa.io/warnings/venv. "
         "Use the --root-user-action option if you know what you are doing and "

From 3b91f42e461de3f23e9bed46a8c5695435f930fb Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 16 Dec 2024 17:46:22 -0500
Subject: [PATCH 630/992] Rerun time based retry tests to avoid flaky failures
 (#12869)

Also increase the time tolerance to account for more extreme variation.
---
 .../36c500b0-9c6e-49ca-bbdb-774ef0adbbfb.trivial.rst |  0
 tests/unit/test_utils_retry.py                       | 12 +++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 news/36c500b0-9c6e-49ca-bbdb-774ef0adbbfb.trivial.rst

diff --git a/news/36c500b0-9c6e-49ca-bbdb-774ef0adbbfb.trivial.rst b/news/36c500b0-9c6e-49ca-bbdb-774ef0adbbfb.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/unit/test_utils_retry.py b/tests/unit/test_utils_retry.py
index 4331d0e2604..bdb2f23b480 100644
--- a/tests/unit/test_utils_retry.py
+++ b/tests/unit/test_utils_retry.py
@@ -73,22 +73,24 @@ def _raise_error() -> NoReturn:
 @pytest.mark.skipif(
     sys.platform == "win32", reason="Too flaky on Windows due to poor timer resolution"
 )
+@pytest.mark.flaky(reruns=3, reruns_delay=1)
 @pytest.mark.parametrize("wait_duration", [0.015, 0.045, 0.15])
 def test_retry_wait(wait_duration: float) -> None:
     function, timestamps = create_timestamped_callable()
-    # Only the first retry will be scheduled before the time limit is exceeded.
-    wrapped = retry(wait=wait_duration, stop_after_delay=0.01)(function)
+    wrapped = retry(wait=wait_duration, stop_after_delay=0.1)(function)
     start_time = perf_counter()
     with pytest.raises(RuntimeError):
         wrapped()
-    assert len(timestamps) == 2
-    # Add a margin of 10% to permit for unavoidable variation.
+    assert len(timestamps) >= 2
+    # Just check the first retry, with a margin of 10% to permit for
+    # unavoidable variation.
     assert timestamps[1] - start_time >= (wait_duration * 0.9)
 
 
 @pytest.mark.skipif(
     sys.platform == "win32", reason="Too flaky on Windows due to poor timer resolution"
 )
+@pytest.mark.flaky(reruns=3, reruns_delay=1)
 @pytest.mark.parametrize(
     "call_duration, max_allowed_calls", [(0.01, 11), (0.04, 3), (0.15, 1)]
 )
@@ -109,7 +111,7 @@ class MyClass:
         def __init__(self) -> None:
             self.calls = 0
 
-        @retry(wait=0, stop_after_delay=0.01)
+        @retry(wait=0, stop_after_delay=3)
         def method(self, string: str) -> str:
             self.calls += 1
             if self.calls >= 5:

From e9f58aab3f83e72046f660e6a2500808a5d47e87 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 21 Dec 2024 18:23:02 -0500
Subject: [PATCH 631/992] Remove redundant prefix in failed PEP 517 builds
 error message

The error handling logic will add the ERROR: prefix already. Including one in the error message results in two ERROR: prefixes.

    ERROR: ERROR: Failed to build installable wheels for some pyproject.toml based projects (simplewheel, singlemodule)
---
 src/pip/_internal/commands/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index 70acf202be9..232a34a6d3e 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -433,7 +433,7 @@ def run(self, options: Values, args: List[str]) -> int:
 
             if build_failures:
                 raise InstallationError(
-                    "ERROR: Failed to build installable wheels for some "
+                    "Failed to build installable wheels for some "
                     "pyproject.toml based projects ({})".format(
                         ", ".join(r.name for r in build_failures)  # type: ignore
                     )

From 7c218b97a982b2bca701020cf12e861324853283 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 22 Dec 2024 16:46:35 -0500
Subject: [PATCH 632/992] Speed up nox docs sessions (#13118)

* Use --jobs auto in docs nox sessions

On my 8 core system, a clean cold build takes 5-6 seconds instead of
10-11 seconds. Nothing major, but it's a welcomed QoL improvement. FYI,
this flag doesn't work and will be ignored on Windows.

* Stop installing pip twice in docs nox sessions

At some point, session.install("pip") in the docs and docs-live nox
sessions was changed to install pip in editable mode, presumably to
enable reruns w/o dependency installation (-R flag) to pick up changes
for our pip sphinx extension. This doesn't do anything though as pip
is reinstalled normally as it's declared in docs/requirements.txt.

I think it's a fair compromise that if you want to pick up changes in
pip's source that show up in the documentation, you should not be using
the -R nox flag.
---
 noxfile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 2051362769c..0d6192d1904 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -127,7 +127,6 @@ def test(session: nox.Session) -> None:
 
 @nox.session
 def docs(session: nox.Session) -> None:
-    session.install("-e", ".")
     session.install("-r", REQUIREMENTS["docs"])
 
     def get_sphinx_build_command(kind: str) -> List[str]:
@@ -143,6 +142,7 @@ def get_sphinx_build_command(kind: str) -> List[str]:
             "-c", "docs/html",  # see note above
             "-d", "docs/build/doctrees/" + kind,
             "-b", kind,
+            "--jobs", "auto",
             "docs/" + kind,
             "docs/build/" + kind,
         ]
@@ -154,7 +154,6 @@ def get_sphinx_build_command(kind: str) -> List[str]:
 
 @nox.session(name="docs-live")
 def docs_live(session: nox.Session) -> None:
-    session.install("-e", ".")
     session.install("-r", REQUIREMENTS["docs"], "sphinx-autobuild")
 
     session.run(
@@ -163,6 +162,7 @@ def docs_live(session: nox.Session) -> None:
         "-b=dirhtml",
         "docs/html",
         "docs/build/livehtml",
+        "--jobs=auto",
         *session.posargs,
     )
 

From c340d7eeff9f28cc5a2cc8bb2f6b157c6127df12 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 24 Dec 2024 16:53:48 -0500
Subject: [PATCH 633/992] test: Skip build/install steps with nox's
 --no-install flag

This saves time when you want to rerun the test suite with different
pytest arguments but you haven't made any code changes in-between.
---
 .pre-commit-config.yaml |  2 +-
 noxfile.py              | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3b3f73e2bba..3353bf682fc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,7 +35,7 @@ repos:
     args: ["--pretty", "--show-error-codes"]
     additional_dependencies: [
         'keyring==24.2.0',
-        'nox==2023.4.22',
+        'nox==2024.03.02',
         'pytest',
         'types-docutils==0.20.0.3',
         'types-setuptools==68.2.0.0',
diff --git a/noxfile.py b/noxfile.py
index 0d6192d1904..6e6e144bccb 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -19,6 +19,7 @@
 
 nox.options.reuse_existing_virtualenvs = True
 nox.options.sessions = ["lint"]
+nox.needs_version = ">=2024.03.02"  # for session.run_install()
 
 LOCATIONS = {
     "common-wheels": "tests/data/common_wheels",
@@ -44,7 +45,9 @@ def run_with_protected_pip(session: nox.Session, *arguments: str) -> None:
     env = {"VIRTUAL_ENV": session.virtualenv.location}
 
     command = ("python", LOCATIONS["protected-pip"]) + arguments
-    session.run(*command, env=env, silent=True)
+    # By using run_install(), these installation steps can be skipped when -R
+    # or --no-install is passed.
+    session.run_install(*command, env=env, silent=True)
 
 
 def should_update_common_wheels() -> bool:
@@ -84,8 +87,13 @@ def test(session: nox.Session) -> None:
         session.log(msg)
 
     # Build source distribution
+    # HACK: we want to skip building and installing pip when nox's --no-install
+    # flag is given (to save time when running tests back to back with different
+    # arguments), but unfortunately nox does not expose this configuration state
+    # yet. https://github.com/wntrblm/nox/issues/710
+    no_install = "-R" in sys.argv or "--no-install" in sys.argv
     sdist_dir = os.path.join(session.virtualenv.location, "sdist")
-    if os.path.exists(sdist_dir):
+    if not no_install and os.path.exists(sdist_dir):
         shutil.rmtree(sdist_dir, ignore_errors=True)
 
     run_with_protected_pip(session, "install", "build")
@@ -94,7 +102,7 @@ def test(session: nox.Session) -> None:
     # pip, so uninstall pip to force build to provision a known good version of pip.
     run_with_protected_pip(session, "uninstall", "pip", "-y")
     # fmt: off
-    session.run(
+    session.run_install(
         "python", "-I", "-m", "build", "--sdist", "--outdir", sdist_dir,
         silent=True,
     )

From 5ce1145511bc59422765998a5a039388a9068155 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 24 Dec 2024 16:57:15 -0500
Subject: [PATCH 634/992] CI: micro-optimize test collection & pass nox's
 --no-install

Pytest can be pretty slow to collect pip's entire test suite and
prepare for test execution. I've observed a ~15s delay from invoking
pytest to the first test running in CI in the worst case. This can be
improved by reducing how many files pytest has to process while
collecting tests. In short, passing tests/unit is faster than -m unit.

In addition, use nox's --no-install flag to skip redundant build and
install steps on the 2nd nox session invocation (for the integration
tests), which was made possible by the previous commit.
---
 .github/workflows/ci.yml | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2af281c7027..a946a3d3e36 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -149,17 +149,17 @@ jobs:
       - name: Run unit tests
         run: >-
           nox -s test-${{ matrix.python.key || matrix.python }} --
-          -m unit
+          tests/unit
           --verbose --numprocesses auto --showlocals
       - name: Run integration tests
         run: >-
-          nox -s test-${{ matrix.python.key || matrix.python }} --
-          -m integration
+          nox -s test-${{ matrix.python.key || matrix.python }} --no-install --
+          tests/functional
           --verbose --numprocesses auto --showlocals
           --durations=5
 
   tests-windows:
-    name: tests / ${{ matrix.python }} / ${{ matrix.os }} / ${{ matrix.group }}
+    name: tests / ${{ matrix.python }} / ${{ matrix.os }} / ${{ matrix.group.number }}
     runs-on: ${{ matrix.os }}-latest
 
     needs: [packaging, determine-changes]
@@ -180,7 +180,9 @@ jobs:
           # - "3.11"
           # - "3.12"
           - "3.13"
-        group: [1, 2]
+        group:
+          - { number: 1, pytest-filter: "not test_install" }
+          - { number: 2, pytest-filter: "test_install" }
 
     steps:
       - uses: actions/checkout@v4
@@ -198,29 +200,19 @@ jobs:
           TEMP: "C:\\Temp"
 
       # Main check
-      - name: Run unit tests
-        if: matrix.group == 1
+      - name: Run unit tests (group 1)
+        if: matrix.group.number == 1
         run: >-
           nox -s test-${{ matrix.python }} --
-          -m unit
+          tests/unit
           --verbose --numprocesses auto --showlocals
         env:
           TEMP: "C:\\Temp"
 
-      - name: Run integration tests (group 1)
-        if: matrix.group == 1
+      - name: Run integration tests (group ${{ matrix.group.number }})
         run: >-
-          nox -s test-${{ matrix.python }} --
-          -m integration -k "not test_install"
-          --verbose --numprocesses auto --showlocals
-        env:
-          TEMP: "C:\\Temp"
-
-      - name: Run integration tests (group 2)
-        if: matrix.group == 2
-        run: >-
-          nox -s test-${{ matrix.python }} --
-          -m integration -k "test_install"
+          nox -s test-${{ matrix.python }} --no-install --
+          tests/functional -k "${{ matrix.group.pytest-filter }}"
           --verbose --numprocesses auto --showlocals
         env:
           TEMP: "C:\\Temp"
@@ -251,7 +243,7 @@ jobs:
       - name: Run integration tests
         run: >-
           nox -s test-3.10 --
-          -m integration
+          tests/functional
           --verbose --numprocesses auto --showlocals
           --durations=5
           --use-zipapp

From dd6c4adb2e3a4dd2d99b9854d41ae9d3ce783cfb Mon Sep 17 00:00:00 2001
From: Dos Moonen 
Date: Sat, 28 Dec 2024 18:38:40 +0100
Subject: [PATCH 635/992] Remove section about non-existing `--force-keyring`
 flag (#12455)

I must have messed up while merging/rebasing at some point...
---
 docs/html/topics/authentication.md | 19 -------------------
 news/12455.doc.rst                 |  1 +
 2 files changed, 1 insertion(+), 19 deletions(-)
 create mode 100644 news/12455.doc.rst

diff --git a/docs/html/topics/authentication.md b/docs/html/topics/authentication.md
index a2649071762..076a9269f5c 100644
--- a/docs/html/topics/authentication.md
+++ b/docs/html/topics/authentication.md
@@ -163,25 +163,6 @@ from the subprocess in which they run Pip. You won't know whether the keyring
 backend is waiting the user input or not in such situations.
 ```
 
-pip is conservative and does not query keyring at all when `--no-input` is used
-because the keyring might require user interaction such as prompting the user
-on the console. You can force keyring usage by passing `--force-keyring` or one
-of the following:
-
-```bash
-# possibly with --user, --global or --site
-$ pip config set global.force-keyring true
-# or
-$ export PIP_FORCE_KEYRING=1
-```
-
-```{warning}
-Be careful when doing this since it could cause tools such as pipx and Pipenv
-to appear to hang. They show their own progress indicator while hiding output
-from the subprocess in which they run Pip. You won't know whether the keyring
-backend is waiting the user input or not in such situations.
-```
-
 Note that `keyring` (the Python package) needs to be installed separately from
 pip. This can create a bootstrapping issue if you need the credentials stored in
 the keyring to download and install keyring.
diff --git a/news/12455.doc.rst b/news/12455.doc.rst
new file mode 100644
index 00000000000..2e0d4c1970c
--- /dev/null
+++ b/news/12455.doc.rst
@@ -0,0 +1 @@
+Removed section about non-existing ``--force-keyring`` flag.

From f8f0f5ac2f477fef70bd47f9816648505743cff2 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 29 Dec 2024 13:13:42 -0500
Subject: [PATCH 636/992] ci: use much faster D: drive for TEMP on Windows
 (#13129)

This is apparently an inherent limitation of Azure (which powers GHA)
which uses a slow C: drive for the OS (read-optimized) and a fast D:
drive for working space.

A Dev Drive/ReFS volume was considered, but after a fair bit of testing,
it offered a smaller improvement in Windows CI times than simply
moving TEMP to the D: drive.
---
 .github/workflows/ci.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a946a3d3e36..40e7adb32dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -185,19 +185,20 @@ jobs:
           - { number: 2, pytest-filter: "test_install" }
 
     steps:
+      # The D: drive is significantly faster than the system C: drive.
+      # https://github.com/actions/runner-images/issues/8755
+      - name: Set TEMP to D:/Temp
+        run: |
+          mkdir "D:\\Temp"
+          echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
+
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
 
-      # We use C:\Temp (which is already available on the worker)
-      # as a temporary directory for all of the tests because the
-      # default value (under the user dir) is more deeply nested
-      # and causes tests to fail with "path too long" errors.
       - run: pip install nox
-        env:
-          TEMP: "C:\\Temp"
 
       # Main check
       - name: Run unit tests (group 1)
@@ -206,16 +207,12 @@ jobs:
           nox -s test-${{ matrix.python }} --
           tests/unit
           --verbose --numprocesses auto --showlocals
-        env:
-          TEMP: "C:\\Temp"
 
       - name: Run integration tests (group ${{ matrix.group.number }})
         run: >-
           nox -s test-${{ matrix.python }} --no-install --
           tests/functional -k "${{ matrix.group.pytest-filter }}"
           --verbose --numprocesses auto --showlocals
-        env:
-          TEMP: "C:\\Temp"
 
   tests-zipapp:
     name: tests / zipapp

From bc553db53c264abe3bb63c6bcd6fc6f303c6f6e3 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Tue, 31 Dec 2024 13:54:37 -0500
Subject: [PATCH 637/992] Trim pyproject.toml and MANIFEST.in (#13137)

This mostly removes legacy references to files that do not exist
anymore. In addition, the smarter exclude_also coverage option is
used instead of exclude_lines.
---
 MANIFEST.in    | 6 ------
 pyproject.toml | 7 +------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 814da8265ca..6f4197565d3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,21 +7,16 @@ include pyproject.toml
 
 include src/pip/_vendor/README.rst
 include src/pip/_vendor/vendor.txt
-include src/pip/_vendor/pyparsing/diagram/template.jinja2
 recursive-include  src/pip/_vendor *LICENSE*
 recursive-include  src/pip/_vendor *COPYING*
 
-include docs/docutils.conf
 include docs/requirements.txt
 
 exclude .git-blame-ignore-revs
-exclude .coveragerc
 exclude .mailmap
-exclude .appveyor.yml
 exclude .readthedocs.yml
 exclude .pre-commit-config.yaml
 exclude .readthedocs-custom-redirects.yml
-exclude tox.ini
 exclude noxfile.py
 
 recursive-include src/pip/_vendor *.pem
@@ -34,6 +29,5 @@ recursive-exclude src/pip/_vendor *.pyi
 prune .github
 prune docs/build
 prune news
-prune tasks
 prune tests
 prune tools
diff --git a/pyproject.toml b/pyproject.toml
index 684fd6d968e..5d8dde277be 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,8 +60,6 @@ exclude = ["contrib", "docs", "tests*", "tasks"]
 "pip" = ["py.typed"]
 "pip._vendor" = ["vendor.txt"]
 "pip._vendor.certifi" = ["*.pem"]
-"pip._vendor.requests" = ["*.pem"]
-"pip._vendor.distlib._backport" = ["sysconfig.cfg"]
 "pip._vendor.distlib" = [
     "t32.exe",
     "t64.exe",
@@ -307,10 +305,7 @@ source0 = [
 ]
 
 [tool.coverage.report]
-exclude_lines = [
-    # We must re-state the default because the `exclude_lines` option overrides
-    # it.
-    "pragma: no cover",
+exclude_also = [
     # This excludes typing-specific code, which will be validated by mypy anyway.
     "if TYPE_CHECKING",
 ]

From ffbf6f0ce61170d6437ad5ff3a90086200ba9e2a Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 4 Jan 2025 19:48:31 -0500
Subject: [PATCH 638/992] perf: Avoid unnecessary URL processing while parsing
 links (#13132)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are three optimizations in this commit, in descending order of
impact:

- If the file URL in the "project detail" response is already absolute,
  then avoid calling urljoin() as it's expensive (mostly because it
  calls urlparse() on both of its URL arguments) and does nothing. While
  it'd be more correct to check whether the file URL has a scheme, we'd
  need to parse the URL which is what we're trying to avoid in the first
  place. Anyway, by simply checking if the URL starts with http[s]://,
  we can avoid slow urljoin() calls for PyPI responses.

- Replacing urllib.parse.urlparse() with urllib.parse.urlsplit() in
  _ensure_quoted_url(). The URL parsing functions are equivalent for our
  needs[^1]. However, urlsplit() is faster, and we achieve better cache
  utilization of its internal cache if we call it directly[^2].

- Calculating the Link.path property in advance as it's very hot.

[^1]: we don't care about URL parameters AFAIK (which are different than
  the query component!)

[^2]: urlparse() calls urlsplit() internally, but it passes the authority
  parameter (unlike any of our calls) so it bypasses the cache.

Co-authored-by: Stéphane Bidoul 
---
 news/13132.feature.rst           |  1 +
 src/pip/_internal/models/link.py | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 news/13132.feature.rst

diff --git a/news/13132.feature.rst b/news/13132.feature.rst
new file mode 100644
index 00000000000..d8cd57e7c56
--- /dev/null
+++ b/news/13132.feature.rst
@@ -0,0 +1 @@
+Optimize package collection by avoiding unnecessary URL parsing and other processing.
diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index 2f41f2f6a09..612a42f95c1 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -170,12 +170,23 @@ def _ensure_quoted_url(url: str) -> str:
     and without double-quoting other characters.
     """
     # Split the URL into parts according to the general structure
-    # `scheme://netloc/path;parameters?query#fragment`.
-    result = urllib.parse.urlparse(url)
+    # `scheme://netloc/path?query#fragment`.
+    result = urllib.parse.urlsplit(url)
     # If the netloc is empty, then the URL refers to a local filesystem path.
     is_local_path = not result.netloc
     path = _clean_url_path(result.path, is_local_path=is_local_path)
-    return urllib.parse.urlunparse(result._replace(path=path))
+    return urllib.parse.urlunsplit(result._replace(path=path))
+
+
+def _absolute_link_url(base_url: str, url: str) -> str:
+    """
+    A faster implementation of urllib.parse.urljoin with a shortcut
+    for absolute http/https URLs.
+    """
+    if url.startswith(("https://", "http://")):
+        return url
+    else:
+        return urllib.parse.urljoin(base_url, url)
 
 
 @functools.total_ordering
@@ -185,6 +196,7 @@ class Link:
     __slots__ = [
         "_parsed_url",
         "_url",
+        "_path",
         "_hashes",
         "comes_from",
         "requires_python",
@@ -241,6 +253,8 @@ def __init__(
         # Store the url as a private attribute to prevent accidentally
         # trying to set a new value.
         self._url = url
+        # The .path property is hot, so calculate its value ahead of time.
+        self._path = urllib.parse.unquote(self._parsed_url.path)
 
         link_hash = LinkHash.find_hash_url_fragment(url)
         hashes_from_link = {} if link_hash is None else link_hash.as_dict()
@@ -270,7 +284,7 @@ def from_json(
         if file_url is None:
             return None
 
-        url = _ensure_quoted_url(urllib.parse.urljoin(page_url, file_url))
+        url = _ensure_quoted_url(_absolute_link_url(page_url, file_url))
         pyrequire = file_data.get("requires-python")
         yanked_reason = file_data.get("yanked")
         hashes = file_data.get("hashes", {})
@@ -322,7 +336,7 @@ def from_element(
         if not href:
             return None
 
-        url = _ensure_quoted_url(urllib.parse.urljoin(base_url, href))
+        url = _ensure_quoted_url(_absolute_link_url(base_url, href))
         pyrequire = anchor_attribs.get("data-requires-python")
         yanked_reason = anchor_attribs.get("data-yanked")
 
@@ -421,7 +435,7 @@ def netloc(self) -> str:
 
     @property
     def path(self) -> str:
-        return urllib.parse.unquote(self._parsed_url.path)
+        return self._path
 
     def splitext(self) -> Tuple[str, str]:
         return splitext(posixpath.basename(self.path.rstrip("/")))

From eafc29ed05ef2c0a004de1d48dfe6e3d03fd5e45 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 10 Jan 2025 09:28:39 -0500
Subject: [PATCH 639/992] Switch to ubuntu-22.04 for github workflow

---
 .github/workflows/ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40e7adb32dc..f6e09cb73ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ concurrency:
 jobs:
   docs:
     name: docs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
       - run: nox -s docs
 
   determine-changes:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       tests: ${{ steps.filter.outputs.tests }}
       vendoring: ${{ steps.filter.outputs.vendoring }}
@@ -64,7 +64,7 @@ jobs:
 
   packaging:
     name: packaging
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
 
   vendoring:
     name: vendoring
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs: [determine-changes]
     if: >-
@@ -112,7 +112,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, macos-13, macos-latest]
+        os: [ubuntu-22.04, macos-13, macos-latest]
         python:
           - "3.8"
           - "3.9"
@@ -129,7 +129,7 @@ jobs:
           allow-prereleases: true
 
       - name: Install Ubuntu dependencies
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-22.04'
         run: |
           sudo apt-get update
           sudo apt-get install bzr
@@ -216,7 +216,7 @@ jobs:
 
   tests-zipapp:
     name: tests / zipapp
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     needs: [packaging, determine-changes]
     if: >-
@@ -257,7 +257,7 @@ jobs:
       - tests-zipapp
       - vendoring
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Decide whether the needed jobs succeeded or failed

From c93a9c026bd1c642bd85b01f57f6bb4118e861f6 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 10 Jan 2025 10:29:24 -0500
Subject: [PATCH 640/992] NEWS ENTRY

---
 news/13152.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/13152.trivial.rst

diff --git a/news/13152.trivial.rst b/news/13152.trivial.rst
new file mode 100644
index 00000000000..1720322f606
--- /dev/null
+++ b/news/13152.trivial.rst
@@ -0,0 +1 @@
+Switch to ubuntu-22.04 for github workflow.

From cb56edbf301e1b7f1d2bfaf0b8d8ef3d1ac60442 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 10 Jan 2025 22:52:54 -0500
Subject: [PATCH 641/992] ci: run zipapp tests on M1 macOS (#13130)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The macos-latest runner is significantly faster than even the
ubuntu-latest runners (11 minutes vs 17 minutes). Once the Windows jobs
are made faster in a separate commit, we should have ~15 minute CI. ✨
---
 .github/workflows/ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f6e09cb73ea..fa6dea0f30e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -216,7 +216,10 @@ jobs:
 
   tests-zipapp:
     name: tests / zipapp
-    runs-on: ubuntu-22.04
+    # The macos-latest (M1) runners are the fastest available on GHA, even
+    # beating out the ubuntu-latest runners. The zipapp tests are slow by
+    # nature, and we don't care where they run, so we pick the fastest one.
+    runs-on: macos-latest
 
     needs: [packaging, determine-changes]
     if: >-
@@ -229,10 +232,8 @@ jobs:
         with:
           python-version: "3.10"
 
-      - name: Install Ubuntu dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install bzr
+      - name: Install MacOS dependencies
+        run: brew install breezy subversion
 
       - run: pip install nox
 

From 23e9222f3996472fddcd2bf020eff4821beb7e17 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 11 Jan 2025 17:49:58 -0500
Subject: [PATCH 642/992] Fix mypy 1.14.1 error (#13148)

---
 .pre-commit-config.yaml              | 2 +-
 news/13148.trivial.rst               | 1 +
 src/pip/_internal/utils/unpacking.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 news/13148.trivial.rst

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3353bf682fc..c1153ef3bcc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -28,7 +28,7 @@ repos:
       args: [--fix, --exit-non-zero-on-fix]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.13.0
+  rev: v1.14.1
   hooks:
   - id: mypy
     exclude: tests/data
diff --git a/news/13148.trivial.rst b/news/13148.trivial.rst
new file mode 100644
index 00000000000..dcdd0bf5e8d
--- /dev/null
+++ b/news/13148.trivial.rst
@@ -0,0 +1 @@
+Fix mypy 1.14.1 error
diff --git a/src/pip/_internal/utils/unpacking.py b/src/pip/_internal/utils/unpacking.py
index 875e30e13ab..87a6d19ab5a 100644
--- a/src/pip/_internal/utils/unpacking.py
+++ b/src/pip/_internal/utils/unpacking.py
@@ -176,7 +176,7 @@ def untar_file(filename: str, location: str) -> None:
         )
         mode = "r:*"
 
-    tar = tarfile.open(filename, mode, encoding="utf-8")
+    tar = tarfile.open(filename, mode, encoding="utf-8")  # type: ignore
     try:
         leading = has_leading_dir([member.name for member in tar.getmembers()])
 

From 39be130110d703b8ae7e817772a523241a52bd27 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sat, 11 Jan 2025 23:04:00 +0000
Subject: [PATCH 643/992] pre-commit autoupdate:  ruff (#13144)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.8.2 → v0.8.6](https://github.com/astral-sh/ruff-pre-commit/compare/v0.8.2...v0.8.6)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c1153ef3bcc..55ceda910a4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.8.2
+  rev: v0.8.6
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]

From d1c0dad488e909cbfdca5b92f0f7f5a53cc5a2b0 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 11 Jan 2025 21:45:06 -0500
Subject: [PATCH 644/992] Pass --proxy to build subprocesses (#13124)

Similar to --cert and --client-cert, the --proxy flag was not passed
down to the isolated build environment. This was simply an oversight.

I opted to store the original proxy string in a new attribute on the
session as digging into the .proxies dictionary felt janky, and so did
passing the proxy string to the finder as an argument.

Co-authored-by: lcmartin 
---
 news/6018.bugfix.rst                      |  1 +
 src/pip/_internal/build_env.py            |  2 ++
 src/pip/_internal/cli/index_command.py    |  1 +
 src/pip/_internal/index/package_finder.py |  4 ++++
 src/pip/_internal/network/session.py      |  1 +
 tests/functional/test_proxy.py            | 16 ++++++++++++++++
 6 files changed, 25 insertions(+)
 create mode 100644 news/6018.bugfix.rst

diff --git a/news/6018.bugfix.rst b/news/6018.bugfix.rst
new file mode 100644
index 00000000000..0171b5bbc3b
--- /dev/null
+++ b/news/6018.bugfix.rst
@@ -0,0 +1 @@
+The ``--proxy`` command-line option is now respected while installing build dependencies.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index b2cc6682291..e820dc3d5fb 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -272,6 +272,8 @@ def _install_requirements(
         for link in finder.find_links:
             args.extend(["--find-links", link])
 
+        if finder.proxy:
+            args.extend(["--proxy", finder.proxy])
         for host in finder.trusted_hosts:
             args.extend(["--trusted-host", host])
         if finder.client_cert:
diff --git a/src/pip/_internal/cli/index_command.py b/src/pip/_internal/cli/index_command.py
index db105d0fef9..295108ed605 100644
--- a/src/pip/_internal/cli/index_command.py
+++ b/src/pip/_internal/cli/index_command.py
@@ -123,6 +123,7 @@ def _build_session(
                 "https": options.proxy,
             }
             session.trust_env = False
+            session.pip_proxy = options.proxy
 
         # Determine if we can prompt the user for authentication or not
         session.auth.prompting = not options.no_input
diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index 86efb9adac0..c10103320e3 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -661,6 +661,10 @@ def find_links(self) -> List[str]:
     def index_urls(self) -> List[str]:
         return self.search_scope.index_urls
 
+    @property
+    def proxy(self) -> Optional[str]:
+        return self._link_collector.session.pip_proxy
+
     @property
     def trusted_hosts(self) -> Iterable[str]:
         for host_port in self._link_collector.session.pip_trusted_origins:
diff --git a/src/pip/_internal/network/session.py b/src/pip/_internal/network/session.py
index 1765b4f6bd7..5e10f8f5615 100644
--- a/src/pip/_internal/network/session.py
+++ b/src/pip/_internal/network/session.py
@@ -339,6 +339,7 @@ def __init__(
         # Namespace the attribute with "pip_" just in case to prevent
         # possible conflicts with the base class.
         self.pip_trusted_origins: List[Tuple[str, Optional[int]]] = []
+        self.pip_proxy = None
 
         # Attach our User Agent to the request
         self.headers["User-Agent"] = user_agent()
diff --git a/tests/functional/test_proxy.py b/tests/functional/test_proxy.py
index ab53637900f..52f7ea55d52 100644
--- a/tests/functional/test_proxy.py
+++ b/tests/functional/test_proxy.py
@@ -90,3 +90,19 @@ def test_proxy_does_not_override_netrc(
             "simple",
         )
         script.assert_installed(simple="3.0")
+
+
+@pytest.mark.network
+def test_build_deps_use_proxy_from_cli(
+    script: PipTestEnvironment, capfd: pytest.CaptureFixture[str], data: TestData
+) -> None:
+    args = ["wheel", "-v", str(data.packages / "pep517_setup_and_pyproject")]
+    args.extend(["--proxy", "http://127.0.0.1:9000"])
+
+    with proxy.Proxy(port=9000, num_acceptors=1, plugins=[AccessLogPlugin]):
+        result = script.pip(*args)
+
+    wheel_path = script.scratch / "pep517_setup_and_pyproject-1.0-py3-none-any.whl"
+    result.did_create(wheel_path)
+    access_log, _ = capfd.readouterr()
+    assert "CONNECT" in access_log, "setuptools was not fetched using proxy"

From 394e032625d9330f6c34e3bfdcc6435b50fe76f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 12 Jan 2025 04:07:25 +0100
Subject: [PATCH 645/992] Support PEP 639 License-Expression and License-File
 in JSON output (#13134)

Adds PEP 639 support to `pip inspect` and `pip install --report`.
---
 news/13134.feature.rst              | 4 ++++
 src/pip/_internal/metadata/_json.py | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 news/13134.feature.rst

diff --git a/news/13134.feature.rst b/news/13134.feature.rst
new file mode 100644
index 00000000000..b87f67d376d
--- /dev/null
+++ b/news/13134.feature.rst
@@ -0,0 +1,4 @@
+Support :pep:`639` License-Expression and License-File metadata fields in JSON
+output. ``pip inspect`` and ``pip install --report`` now emit
+``license_expression`` and ``license_file`` fields in the ``metadata`` object,
+if the corresponding fields are present in the installed ``METADATA`` file.
diff --git a/src/pip/_internal/metadata/_json.py b/src/pip/_internal/metadata/_json.py
index 9097dd58590..f3aeab3225f 100644
--- a/src/pip/_internal/metadata/_json.py
+++ b/src/pip/_internal/metadata/_json.py
@@ -23,6 +23,8 @@
     ("Maintainer", False),
     ("Maintainer-email", False),
     ("License", False),
+    ("License-Expression", False),
+    ("License-File", True),
     ("Classifier", True),
     ("Requires-Dist", True),
     ("Requires-Python", False),

From d2bb8ebf355c27d6620321dc69545faac318d0c2 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" 
Date: Sat, 11 Jan 2025 22:34:38 -0500
Subject: [PATCH 646/992] Add non-functional WheelDistribution.locate_file()
 method (#11685)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

importlib.metadata.Distribution was always meant to be a proper ABC with
API enforcement, but this enforcement was never added (probably due to
Python 2.7 compatibility concerns). Upstream would like to fix this
wart, so let's define a locate_file() method that simply raises
NotImplementedError as permitted.

Co-authored-by: Stéphane Bidoul 
Co-authored-by: Richard Si 
---
 src/pip/_internal/metadata/importlib/_dists.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index 5e92b12755e..cf8685439a9 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -2,6 +2,7 @@
 import importlib.metadata
 import pathlib
 import zipfile
+from os import PathLike
 from typing import (
     Collection,
     Dict,
@@ -95,6 +96,11 @@ def read_text(self, filename: str) -> Optional[str]:
             raise UnsupportedWheel(error)
         return text
 
+    def locate_file(self, path: str | PathLike[str]) -> pathlib.Path:
+        # This method doesn't make sense for our in-memory wheel, but the API
+        # requires us to define it.
+        raise NotImplementedError
+
 
 class Distribution(BaseDistribution):
     def __init__(

From dafc0952eca3dd2f6162dae7fb3df9c1c93892b6 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 11 Jan 2025 23:34:45 -0500
Subject: [PATCH 647/992] Upgrade pyproject-hooks to 1.2.0 (#13125)

---
 news/pyproject-hooks.vendor.rst               |   1 +
 .../operations/build/metadata_editable.py     |   1 +
 src/pip/_internal/utils/misc.py               |  27 +-
 src/pip/_vendor/pyproject_hooks.pyi           |   1 -
 src/pip/_vendor/pyproject_hooks/__init__.py   |  26 +-
 src/pip/_vendor/pyproject_hooks/_compat.py    |   8 -
 src/pip/_vendor/pyproject_hooks/_impl.py      | 282 +++++++++++-------
 .../pyproject_hooks/_in_process/__init__.py   |   7 +-
 .../_in_process/_in_process.py                | 190 +++++++-----
 src/pip/_vendor/pyproject_hooks/py.typed      |   0
 src/pip/_vendor/vendor.txt                    |   2 +-
 11 files changed, 333 insertions(+), 212 deletions(-)
 create mode 100644 news/pyproject-hooks.vendor.rst
 delete mode 100644 src/pip/_vendor/pyproject_hooks.pyi
 delete mode 100644 src/pip/_vendor/pyproject_hooks/_compat.py
 create mode 100644 src/pip/_vendor/pyproject_hooks/py.typed

diff --git a/news/pyproject-hooks.vendor.rst b/news/pyproject-hooks.vendor.rst
new file mode 100644
index 00000000000..44af87f5e58
--- /dev/null
+++ b/news/pyproject-hooks.vendor.rst
@@ -0,0 +1 @@
+Upgrade pyproject-hooks to 1.2.0
diff --git a/src/pip/_internal/operations/build/metadata_editable.py b/src/pip/_internal/operations/build/metadata_editable.py
index 27c69f0d1ea..3397ccf0f92 100644
--- a/src/pip/_internal/operations/build/metadata_editable.py
+++ b/src/pip/_internal/operations/build/metadata_editable.py
@@ -38,4 +38,5 @@ def generate_editable_metadata(
             except InstallationSubprocessError as error:
                 raise MetadataGenerationFailed(package_details=details) from error
 
+    assert distinfo_dir is not None
     return os.path.join(metadata_dir, distinfo_dir)
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index c07405267d6..44f6a05fbdd 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -19,12 +19,13 @@
     Any,
     BinaryIO,
     Callable,
-    Dict,
     Generator,
     Iterable,
     Iterator,
     List,
+    Mapping,
     Optional,
+    Sequence,
     TextIO,
     Tuple,
     Type,
@@ -667,7 +668,7 @@ def __init__(
     def build_wheel(
         self,
         wheel_directory: str,
-        config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+        config_settings: Optional[Mapping[str, Any]] = None,
         metadata_directory: Optional[str] = None,
     ) -> str:
         cs = self.config_holder.config_settings
@@ -678,7 +679,7 @@ def build_wheel(
     def build_sdist(
         self,
         sdist_directory: str,
-        config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+        config_settings: Optional[Mapping[str, Any]] = None,
     ) -> str:
         cs = self.config_holder.config_settings
         return super().build_sdist(sdist_directory, config_settings=cs)
@@ -686,7 +687,7 @@ def build_sdist(
     def build_editable(
         self,
         wheel_directory: str,
-        config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+        config_settings: Optional[Mapping[str, Any]] = None,
         metadata_directory: Optional[str] = None,
     ) -> str:
         cs = self.config_holder.config_settings
@@ -695,27 +696,27 @@ def build_editable(
         )
 
     def get_requires_for_build_wheel(
-        self, config_settings: Optional[Dict[str, Union[str, List[str]]]] = None
-    ) -> List[str]:
+        self, config_settings: Optional[Mapping[str, Any]] = None
+    ) -> Sequence[str]:
         cs = self.config_holder.config_settings
         return super().get_requires_for_build_wheel(config_settings=cs)
 
     def get_requires_for_build_sdist(
-        self, config_settings: Optional[Dict[str, Union[str, List[str]]]] = None
-    ) -> List[str]:
+        self, config_settings: Optional[Mapping[str, Any]] = None
+    ) -> Sequence[str]:
         cs = self.config_holder.config_settings
         return super().get_requires_for_build_sdist(config_settings=cs)
 
     def get_requires_for_build_editable(
-        self, config_settings: Optional[Dict[str, Union[str, List[str]]]] = None
-    ) -> List[str]:
+        self, config_settings: Optional[Mapping[str, Any]] = None
+    ) -> Sequence[str]:
         cs = self.config_holder.config_settings
         return super().get_requires_for_build_editable(config_settings=cs)
 
     def prepare_metadata_for_build_wheel(
         self,
         metadata_directory: str,
-        config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+        config_settings: Optional[Mapping[str, Any]] = None,
         _allow_fallback: bool = True,
     ) -> str:
         cs = self.config_holder.config_settings
@@ -728,9 +729,9 @@ def prepare_metadata_for_build_wheel(
     def prepare_metadata_for_build_editable(
         self,
         metadata_directory: str,
-        config_settings: Optional[Dict[str, Union[str, List[str]]]] = None,
+        config_settings: Optional[Mapping[str, Any]] = None,
         _allow_fallback: bool = True,
-    ) -> str:
+    ) -> Optional[str]:
         cs = self.config_holder.config_settings
         return super().prepare_metadata_for_build_editable(
             metadata_directory=metadata_directory,
diff --git a/src/pip/_vendor/pyproject_hooks.pyi b/src/pip/_vendor/pyproject_hooks.pyi
deleted file mode 100644
index e68245481d5..00000000000
--- a/src/pip/_vendor/pyproject_hooks.pyi
+++ /dev/null
@@ -1 +0,0 @@
-from pyproject_hooks import *
\ No newline at end of file
diff --git a/src/pip/_vendor/pyproject_hooks/__init__.py b/src/pip/_vendor/pyproject_hooks/__init__.py
index ddfcf7f72f3..746b89f7e71 100644
--- a/src/pip/_vendor/pyproject_hooks/__init__.py
+++ b/src/pip/_vendor/pyproject_hooks/__init__.py
@@ -1,8 +1,9 @@
 """Wrappers to call pyproject.toml-based build backend hooks.
 """
 
+from typing import TYPE_CHECKING
+
 from ._impl import (
-    BackendInvalid,
     BackendUnavailable,
     BuildBackendHookCaller,
     HookMissing,
@@ -11,13 +12,20 @@
     quiet_subprocess_runner,
 )
 
-__version__ = '1.0.0'
+__version__ = "1.2.0"
 __all__ = [
-    'BackendUnavailable',
-    'BackendInvalid',
-    'HookMissing',
-    'UnsupportedOperation',
-    'default_subprocess_runner',
-    'quiet_subprocess_runner',
-    'BuildBackendHookCaller',
+    "BackendUnavailable",
+    "BackendInvalid",
+    "HookMissing",
+    "UnsupportedOperation",
+    "default_subprocess_runner",
+    "quiet_subprocess_runner",
+    "BuildBackendHookCaller",
 ]
+
+BackendInvalid = BackendUnavailable  # Deprecated alias, previously a separate exception
+
+if TYPE_CHECKING:
+    from ._impl import SubprocessRunner
+
+    __all__ += ["SubprocessRunner"]
diff --git a/src/pip/_vendor/pyproject_hooks/_compat.py b/src/pip/_vendor/pyproject_hooks/_compat.py
deleted file mode 100644
index 95e509c0143..00000000000
--- a/src/pip/_vendor/pyproject_hooks/_compat.py
+++ /dev/null
@@ -1,8 +0,0 @@
-__all__ = ("tomllib",)
-
-import sys
-
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    from pip._vendor import tomli as tomllib
diff --git a/src/pip/_vendor/pyproject_hooks/_impl.py b/src/pip/_vendor/pyproject_hooks/_impl.py
index 37b0e6531f1..d1e9d7bb8c6 100644
--- a/src/pip/_vendor/pyproject_hooks/_impl.py
+++ b/src/pip/_vendor/pyproject_hooks/_impl.py
@@ -6,48 +6,72 @@
 from os.path import abspath
 from os.path import join as pjoin
 from subprocess import STDOUT, check_call, check_output
+from typing import TYPE_CHECKING, Any, Iterator, Mapping, Optional, Sequence
 
 from ._in_process import _in_proc_script_path
 
+if TYPE_CHECKING:
+    from typing import Protocol
 
-def write_json(obj, path, **kwargs):
-    with open(path, 'w', encoding='utf-8') as f:
+    class SubprocessRunner(Protocol):
+        """A protocol for the subprocess runner."""
+
+        def __call__(
+            self,
+            cmd: Sequence[str],
+            cwd: Optional[str] = None,
+            extra_environ: Optional[Mapping[str, str]] = None,
+        ) -> None:
+            ...
+
+
+def write_json(obj: Mapping[str, Any], path: str, **kwargs) -> None:
+    with open(path, "w", encoding="utf-8") as f:
         json.dump(obj, f, **kwargs)
 
 
-def read_json(path):
-    with open(path, encoding='utf-8') as f:
+def read_json(path: str) -> Mapping[str, Any]:
+    with open(path, encoding="utf-8") as f:
         return json.load(f)
 
 
 class BackendUnavailable(Exception):
     """Will be raised if the backend cannot be imported in the hook process."""
-    def __init__(self, traceback):
-        self.traceback = traceback
 
-
-class BackendInvalid(Exception):
-    """Will be raised if the backend is invalid."""
-    def __init__(self, backend_name, backend_path, message):
-        super().__init__(message)
+    def __init__(
+        self,
+        traceback: str,
+        message: Optional[str] = None,
+        backend_name: Optional[str] = None,
+        backend_path: Optional[Sequence[str]] = None,
+    ) -> None:
+        # Preserving arg order for the sake of API backward compatibility.
         self.backend_name = backend_name
         self.backend_path = backend_path
+        self.traceback = traceback
+        super().__init__(message or "Error while importing backend")
 
 
 class HookMissing(Exception):
     """Will be raised on missing hooks (if a fallback can't be used)."""
-    def __init__(self, hook_name):
+
+    def __init__(self, hook_name: str) -> None:
         super().__init__(hook_name)
         self.hook_name = hook_name
 
 
 class UnsupportedOperation(Exception):
     """May be raised by build_sdist if the backend indicates that it can't."""
-    def __init__(self, traceback):
+
+    def __init__(self, traceback: str) -> None:
         self.traceback = traceback
 
 
-def default_subprocess_runner(cmd, cwd=None, extra_environ=None):
+def default_subprocess_runner(
+    cmd: Sequence[str],
+    cwd: Optional[str] = None,
+    extra_environ: Optional[Mapping[str, str]] = None,
+) -> None:
     """The default method of calling the wrapper subprocess.
 
     This uses :func:`subprocess.check_call` under the hood.
@@ -59,7 +83,11 @@ def default_subprocess_runner(cmd, cwd=None, extra_environ=None):
     check_call(cmd, cwd=cwd, env=env)
 
 
-def quiet_subprocess_runner(cmd, cwd=None, extra_environ=None):
+def quiet_subprocess_runner(
+    cmd: Sequence[str],
+    cwd: Optional[str] = None,
+    extra_environ: Optional[Mapping[str, str]] = None,
+) -> None:
     """Call the subprocess while suppressing output.
 
     This uses :func:`subprocess.check_output` under the hood.
@@ -71,7 +99,7 @@ def quiet_subprocess_runner(cmd, cwd=None, extra_environ=None):
     check_output(cmd, cwd=cwd, env=env, stderr=STDOUT)
 
 
-def norm_and_check(source_tree, requested):
+def norm_and_check(source_tree: str, requested: str) -> str:
     """Normalise and check a backend path.
 
     Ensure that the requested backend path is specified as a relative path,
@@ -96,17 +124,16 @@ def norm_and_check(source_tree, requested):
 
 
 class BuildBackendHookCaller:
-    """A wrapper to call the build backend hooks for a source directory.
-    """
+    """A wrapper to call the build backend hooks for a source directory."""
 
     def __init__(
-            self,
-            source_dir,
-            build_backend,
-            backend_path=None,
-            runner=None,
-            python_executable=None,
-    ):
+        self,
+        source_dir: str,
+        build_backend: str,
+        backend_path: Optional[Sequence[str]] = None,
+        runner: Optional["SubprocessRunner"] = None,
+        python_executable: Optional[str] = None,
+    ) -> None:
         """
         :param source_dir: The source directory to invoke the build backend for
         :param build_backend: The build backend spec
@@ -121,9 +148,7 @@ def __init__(
         self.source_dir = abspath(source_dir)
         self.build_backend = build_backend
         if backend_path:
-            backend_path = [
-                norm_and_check(self.source_dir, p) for p in backend_path
-            ]
+            backend_path = [norm_and_check(self.source_dir, p) for p in backend_path]
         self.backend_path = backend_path
         self._subprocess_runner = runner
         if not python_executable:
@@ -131,10 +156,12 @@ def __init__(
         self.python_executable = python_executable
 
     @contextmanager
-    def subprocess_runner(self, runner):
+    def subprocess_runner(self, runner: "SubprocessRunner") -> Iterator[None]:
         """A context manager for temporarily overriding the default
         :ref:`subprocess runner `.
 
+        :param runner: The new subprocess runner to use within the context.
+
         .. code-block:: python
 
             hook_caller = BuildBackendHookCaller(...)
@@ -148,33 +175,44 @@ def subprocess_runner(self, runner):
         finally:
             self._subprocess_runner = prev
 
-    def _supported_features(self):
+    def _supported_features(self) -> Sequence[str]:
         """Return the list of optional features supported by the backend."""
-        return self._call_hook('_supported_features', {})
+        return self._call_hook("_supported_features", {})
 
-    def get_requires_for_build_wheel(self, config_settings=None):
+    def get_requires_for_build_wheel(
+        self,
+        config_settings: Optional[Mapping[str, Any]] = None,
+    ) -> Sequence[str]:
         """Get additional dependencies required for building a wheel.
 
+        :param config_settings: The configuration settings for the build backend
         :returns: A list of :pep:`dependency specifiers <508>`.
-        :rtype: list[str]
 
         .. admonition:: Fallback
 
             If the build backend does not defined a hook with this name, an
             empty list will be returned.
         """
-        return self._call_hook('get_requires_for_build_wheel', {
-            'config_settings': config_settings
-        })
+        return self._call_hook(
+            "get_requires_for_build_wheel", {"config_settings": config_settings}
+        )
 
     def prepare_metadata_for_build_wheel(
-            self, metadata_directory, config_settings=None,
-            _allow_fallback=True):
+        self,
+        metadata_directory: str,
+        config_settings: Optional[Mapping[str, Any]] = None,
+        _allow_fallback: bool = True,
+    ) -> str:
         """Prepare a ``*.dist-info`` folder with metadata for this project.
 
+        :param metadata_directory: The directory to write the metadata to
+        :param config_settings: The configuration settings for the build backend
+        :param _allow_fallback:
+            Whether to allow the fallback to building a wheel and extracting
+            the metadata from it. Should be passed as a keyword argument only.
+
         :returns: Name of the newly created subfolder within
                   ``metadata_directory``, containing the metadata.
-        :rtype: str
 
         .. admonition:: Fallback
 
@@ -183,17 +221,26 @@ def prepare_metadata_for_build_wheel(
             wheel via the ``build_wheel`` hook and the dist-info extracted from
             that will be returned.
         """
-        return self._call_hook('prepare_metadata_for_build_wheel', {
-            'metadata_directory': abspath(metadata_directory),
-            'config_settings': config_settings,
-            '_allow_fallback': _allow_fallback,
-        })
+        return self._call_hook(
+            "prepare_metadata_for_build_wheel",
+            {
+                "metadata_directory": abspath(metadata_directory),
+                "config_settings": config_settings,
+                "_allow_fallback": _allow_fallback,
+            },
+        )
 
     def build_wheel(
-            self, wheel_directory, config_settings=None,
-            metadata_directory=None):
+        self,
+        wheel_directory: str,
+        config_settings: Optional[Mapping[str, Any]] = None,
+        metadata_directory: Optional[str] = None,
+    ) -> str:
         """Build a wheel from this project.
 
+        :param wheel_directory: The directory to write the wheel to
+        :param config_settings: The configuration settings for the build backend
+        :param metadata_directory: The directory to reuse existing metadata from
         :returns:
             The name of the newly created wheel within ``wheel_directory``.
 
@@ -206,35 +253,48 @@ def build_wheel(
         """
         if metadata_directory is not None:
             metadata_directory = abspath(metadata_directory)
-        return self._call_hook('build_wheel', {
-            'wheel_directory': abspath(wheel_directory),
-            'config_settings': config_settings,
-            'metadata_directory': metadata_directory,
-        })
-
-    def get_requires_for_build_editable(self, config_settings=None):
+        return self._call_hook(
+            "build_wheel",
+            {
+                "wheel_directory": abspath(wheel_directory),
+                "config_settings": config_settings,
+                "metadata_directory": metadata_directory,
+            },
+        )
+
+    def get_requires_for_build_editable(
+        self,
+        config_settings: Optional[Mapping[str, Any]] = None,
+    ) -> Sequence[str]:
         """Get additional dependencies required for building an editable wheel.
 
+        :param config_settings: The configuration settings for the build backend
         :returns: A list of :pep:`dependency specifiers <508>`.
-        :rtype: list[str]
 
         .. admonition:: Fallback
 
             If the build backend does not defined a hook with this name, an
             empty list will be returned.
         """
-        return self._call_hook('get_requires_for_build_editable', {
-            'config_settings': config_settings
-        })
+        return self._call_hook(
+            "get_requires_for_build_editable", {"config_settings": config_settings}
+        )
 
     def prepare_metadata_for_build_editable(
-            self, metadata_directory, config_settings=None,
-            _allow_fallback=True):
+        self,
+        metadata_directory: str,
+        config_settings: Optional[Mapping[str, Any]] = None,
+        _allow_fallback: bool = True,
+    ) -> Optional[str]:
         """Prepare a ``*.dist-info`` folder with metadata for this project.
 
+        :param metadata_directory: The directory to write the metadata to
+        :param config_settings: The configuration settings for the build backend
+        :param _allow_fallback:
+            Whether to allow the fallback to building a wheel and extracting
+            the metadata from it. Should be passed as a keyword argument only.
         :returns: Name of the newly created subfolder within
                   ``metadata_directory``, containing the metadata.
-        :rtype: str
 
         .. admonition:: Fallback
 
@@ -243,17 +303,26 @@ def prepare_metadata_for_build_editable(
             wheel via the ``build_editable`` hook and the dist-info
             extracted from that will be returned.
         """
-        return self._call_hook('prepare_metadata_for_build_editable', {
-            'metadata_directory': abspath(metadata_directory),
-            'config_settings': config_settings,
-            '_allow_fallback': _allow_fallback,
-        })
+        return self._call_hook(
+            "prepare_metadata_for_build_editable",
+            {
+                "metadata_directory": abspath(metadata_directory),
+                "config_settings": config_settings,
+                "_allow_fallback": _allow_fallback,
+            },
+        )
 
     def build_editable(
-            self, wheel_directory, config_settings=None,
-            metadata_directory=None):
+        self,
+        wheel_directory: str,
+        config_settings: Optional[Mapping[str, Any]] = None,
+        metadata_directory: Optional[str] = None,
+    ) -> str:
         """Build an editable wheel from this project.
 
+        :param wheel_directory: The directory to write the wheel to
+        :param config_settings: The configuration settings for the build backend
+        :param metadata_directory: The directory to reuse existing metadata from
         :returns:
             The name of the newly created wheel within ``wheel_directory``.
 
@@ -267,43 +336,55 @@ def build_editable(
         """
         if metadata_directory is not None:
             metadata_directory = abspath(metadata_directory)
-        return self._call_hook('build_editable', {
-            'wheel_directory': abspath(wheel_directory),
-            'config_settings': config_settings,
-            'metadata_directory': metadata_directory,
-        })
-
-    def get_requires_for_build_sdist(self, config_settings=None):
+        return self._call_hook(
+            "build_editable",
+            {
+                "wheel_directory": abspath(wheel_directory),
+                "config_settings": config_settings,
+                "metadata_directory": metadata_directory,
+            },
+        )
+
+    def get_requires_for_build_sdist(
+        self,
+        config_settings: Optional[Mapping[str, Any]] = None,
+    ) -> Sequence[str]:
         """Get additional dependencies required for building an sdist.
 
         :returns: A list of :pep:`dependency specifiers <508>`.
-        :rtype: list[str]
         """
-        return self._call_hook('get_requires_for_build_sdist', {
-            'config_settings': config_settings
-        })
-
-    def build_sdist(self, sdist_directory, config_settings=None):
+        return self._call_hook(
+            "get_requires_for_build_sdist", {"config_settings": config_settings}
+        )
+
+    def build_sdist(
+        self,
+        sdist_directory: str,
+        config_settings: Optional[Mapping[str, Any]] = None,
+    ) -> str:
         """Build an sdist from this project.
 
         :returns:
             The name of the newly created sdist within ``wheel_directory``.
         """
-        return self._call_hook('build_sdist', {
-            'sdist_directory': abspath(sdist_directory),
-            'config_settings': config_settings,
-        })
+        return self._call_hook(
+            "build_sdist",
+            {
+                "sdist_directory": abspath(sdist_directory),
+                "config_settings": config_settings,
+            },
+        )
 
-    def _call_hook(self, hook_name, kwargs):
-        extra_environ = {'PEP517_BUILD_BACKEND': self.build_backend}
+    def _call_hook(self, hook_name: str, kwargs: Mapping[str, Any]) -> Any:
+        extra_environ = {"_PYPROJECT_HOOKS_BUILD_BACKEND": self.build_backend}
 
         if self.backend_path:
             backend_path = os.pathsep.join(self.backend_path)
-            extra_environ['PEP517_BACKEND_PATH'] = backend_path
+            extra_environ["_PYPROJECT_HOOKS_BACKEND_PATH"] = backend_path
 
         with tempfile.TemporaryDirectory() as td:
-            hook_input = {'kwargs': kwargs}
-            write_json(hook_input, pjoin(td, 'input.json'), indent=2)
+            hook_input = {"kwargs": kwargs}
+            write_json(hook_input, pjoin(td, "input.json"), indent=2)
 
             # Run the hook in a subprocess
             with _in_proc_script_path() as script:
@@ -311,20 +392,19 @@ def _call_hook(self, hook_name, kwargs):
                 self._subprocess_runner(
                     [python, abspath(str(script)), hook_name, td],
                     cwd=self.source_dir,
-                    extra_environ=extra_environ
+                    extra_environ=extra_environ,
                 )
 
-            data = read_json(pjoin(td, 'output.json'))
-            if data.get('unsupported'):
-                raise UnsupportedOperation(data.get('traceback', ''))
-            if data.get('no_backend'):
-                raise BackendUnavailable(data.get('traceback', ''))
-            if data.get('backend_invalid'):
-                raise BackendInvalid(
+            data = read_json(pjoin(td, "output.json"))
+            if data.get("unsupported"):
+                raise UnsupportedOperation(data.get("traceback", ""))
+            if data.get("no_backend"):
+                raise BackendUnavailable(
+                    data.get("traceback", ""),
+                    message=data.get("backend_error", ""),
                     backend_name=self.build_backend,
                     backend_path=self.backend_path,
-                    message=data.get('backend_error', '')
                 )
-            if data.get('hook_missing'):
-                raise HookMissing(data.get('missing_hook_name') or hook_name)
-            return data['return_val']
+            if data.get("hook_missing"):
+                raise HookMissing(data.get("missing_hook_name") or hook_name)
+            return data["return_val"]
diff --git a/src/pip/_vendor/pyproject_hooks/_in_process/__init__.py b/src/pip/_vendor/pyproject_hooks/_in_process/__init__.py
index 917fa065b3c..906d0ba20e1 100644
--- a/src/pip/_vendor/pyproject_hooks/_in_process/__init__.py
+++ b/src/pip/_vendor/pyproject_hooks/_in_process/__init__.py
@@ -11,8 +11,11 @@
 except AttributeError:
     # Python 3.8 compatibility
     def _in_proc_script_path():
-        return resources.path(__package__, '_in_process.py')
+        return resources.path(__package__, "_in_process.py")
+
 else:
+
     def _in_proc_script_path():
         return resources.as_file(
-            resources.files(__package__).joinpath('_in_process.py'))
+            resources.files(__package__).joinpath("_in_process.py")
+        )
diff --git a/src/pip/_vendor/pyproject_hooks/_in_process/_in_process.py b/src/pip/_vendor/pyproject_hooks/_in_process/_in_process.py
index ee511ff20d7..d689bab7219 100644
--- a/src/pip/_vendor/pyproject_hooks/_in_process/_in_process.py
+++ b/src/pip/_vendor/pyproject_hooks/_in_process/_in_process.py
@@ -3,8 +3,8 @@
 It expects:
 - Command line args: hook_name, control_dir
 - Environment variables:
-      PEP517_BUILD_BACKEND=entry.point:spec
-      PEP517_BACKEND_PATH=paths (separated with os.pathsep)
+      _PYPROJECT_HOOKS_BUILD_BACKEND=entry.point:spec
+      _PYPROJECT_HOOKS_BACKEND_PATH=paths (separated with os.pathsep)
 - control_dir/input.json:
   - {"kwargs": {...}}
 
@@ -21,6 +21,7 @@
 import traceback
 from glob import glob
 from importlib import import_module
+from importlib.machinery import PathFinder
 from os.path import join as pjoin
 
 # This file is run as a script, and `import wrappers` is not zip-safe, so we
@@ -28,69 +29,93 @@
 
 
 def write_json(obj, path, **kwargs):
-    with open(path, 'w', encoding='utf-8') as f:
+    with open(path, "w", encoding="utf-8") as f:
         json.dump(obj, f, **kwargs)
 
 
 def read_json(path):
-    with open(path, encoding='utf-8') as f:
+    with open(path, encoding="utf-8") as f:
         return json.load(f)
 
 
 class BackendUnavailable(Exception):
     """Raised if we cannot import the backend"""
-    def __init__(self, traceback):
-        self.traceback = traceback
 
-
-class BackendInvalid(Exception):
-    """Raised if the backend is invalid"""
-    def __init__(self, message):
+    def __init__(self, message, traceback=None):
+        super().__init__(message)
         self.message = message
+        self.traceback = traceback
 
 
 class HookMissing(Exception):
     """Raised if a hook is missing and we are not executing the fallback"""
+
     def __init__(self, hook_name=None):
         super().__init__(hook_name)
         self.hook_name = hook_name
 
 
-def contained_in(filename, directory):
-    """Test if a file is located within the given directory."""
-    filename = os.path.normcase(os.path.abspath(filename))
-    directory = os.path.normcase(os.path.abspath(directory))
-    return os.path.commonprefix([filename, directory]) == directory
-
-
 def _build_backend():
     """Find and load the build backend"""
-    # Add in-tree backend directories to the front of sys.path.
-    backend_path = os.environ.get('PEP517_BACKEND_PATH')
+    backend_path = os.environ.get("_PYPROJECT_HOOKS_BACKEND_PATH")
+    ep = os.environ["_PYPROJECT_HOOKS_BUILD_BACKEND"]
+    mod_path, _, obj_path = ep.partition(":")
+
     if backend_path:
+        # Ensure in-tree backend directories have the highest priority when importing.
         extra_pathitems = backend_path.split(os.pathsep)
-        sys.path[:0] = extra_pathitems
+        sys.meta_path.insert(0, _BackendPathFinder(extra_pathitems, mod_path))
 
-    ep = os.environ['PEP517_BUILD_BACKEND']
-    mod_path, _, obj_path = ep.partition(':')
     try:
         obj = import_module(mod_path)
     except ImportError:
-        raise BackendUnavailable(traceback.format_exc())
-
-    if backend_path:
-        if not any(
-            contained_in(obj.__file__, path)
-            for path in extra_pathitems
-        ):
-            raise BackendInvalid("Backend was not loaded from backend-path")
+        msg = f"Cannot import {mod_path!r}"
+        raise BackendUnavailable(msg, traceback.format_exc())
 
     if obj_path:
-        for path_part in obj_path.split('.'):
+        for path_part in obj_path.split("."):
             obj = getattr(obj, path_part)
     return obj
 
 
+class _BackendPathFinder:
+    """Implements the MetaPathFinder interface to locate modules in ``backend-path``.
+
+    Since the environment provided by the frontend can contain all sorts of
+    MetaPathFinders, the only way to ensure the backend is loaded from the
+    right place is to prepend our own.
+    """
+
+    def __init__(self, backend_path, backend_module):
+        self.backend_path = backend_path
+        self.backend_module = backend_module
+        self.backend_parent, _, _ = backend_module.partition(".")
+
+    def find_spec(self, fullname, _path, _target=None):
+        if "." in fullname:
+            # Rely on importlib to find nested modules based on parent's path
+            return None
+
+        # Ignore other items in _path or sys.path and use backend_path instead:
+        spec = PathFinder.find_spec(fullname, path=self.backend_path)
+        if spec is None and fullname == self.backend_parent:
+            # According to the spec, the backend MUST be loaded from backend-path.
+            # Therefore, we can halt the import machinery and raise a clean error.
+            msg = f"Cannot find module {self.backend_module!r} in {self.backend_path!r}"
+            raise BackendUnavailable(msg)
+
+        return spec
+
+    if sys.version_info >= (3, 8):
+
+        def find_distributions(self, context=None):
+            # Delayed import: Python 3.7 does not contain importlib.metadata
+            from importlib.metadata import DistributionFinder, MetadataPathFinder
+
+            context = DistributionFinder.Context(path=self.backend_path)
+            return MetadataPathFinder.find_distributions(context=context)
+
+
 def _supported_features():
     """Return the list of options features supported by the backend.
 
@@ -133,7 +158,8 @@ def get_requires_for_build_editable(config_settings):
 
 
 def prepare_metadata_for_build_wheel(
-        metadata_directory, config_settings, _allow_fallback):
+    metadata_directory, config_settings, _allow_fallback
+):
     """Invoke optional prepare_metadata_for_build_wheel
 
     Implements a fallback by building a wheel if the hook isn't defined,
@@ -150,12 +176,14 @@ def prepare_metadata_for_build_wheel(
     # fallback to build_wheel outside the try block to avoid exception chaining
     # which can be confusing to users and is not relevant
     whl_basename = backend.build_wheel(metadata_directory, config_settings)
-    return _get_wheel_metadata_from_wheel(whl_basename, metadata_directory,
-                                          config_settings)
+    return _get_wheel_metadata_from_wheel(
+        whl_basename, metadata_directory, config_settings
+    )
 
 
 def prepare_metadata_for_build_editable(
-        metadata_directory, config_settings, _allow_fallback):
+    metadata_directory, config_settings, _allow_fallback
+):
     """Invoke optional prepare_metadata_for_build_editable
 
     Implements a fallback by building an editable wheel if the hook isn't
@@ -171,24 +199,24 @@ def prepare_metadata_for_build_editable(
         try:
             build_hook = backend.build_editable
         except AttributeError:
-            raise HookMissing(hook_name='build_editable')
+            raise HookMissing(hook_name="build_editable")
         else:
             whl_basename = build_hook(metadata_directory, config_settings)
-            return _get_wheel_metadata_from_wheel(whl_basename,
-                                                  metadata_directory,
-                                                  config_settings)
+            return _get_wheel_metadata_from_wheel(
+                whl_basename, metadata_directory, config_settings
+            )
     else:
         return hook(metadata_directory, config_settings)
 
 
-WHEEL_BUILT_MARKER = 'PEP517_ALREADY_BUILT_WHEEL'
+WHEEL_BUILT_MARKER = "PYPROJECT_HOOKS_ALREADY_BUILT_WHEEL"
 
 
 def _dist_info_files(whl_zip):
     """Identify the .dist-info folder inside a wheel ZipFile."""
     res = []
     for path in whl_zip.namelist():
-        m = re.match(r'[^/\\]+-[^/\\]+\.dist-info/', path)
+        m = re.match(r"[^/\\]+-[^/\\]+\.dist-info/", path)
         if m:
             res.append(path)
     if res:
@@ -196,40 +224,41 @@ def _dist_info_files(whl_zip):
     raise Exception("No .dist-info folder found in wheel")
 
 
-def _get_wheel_metadata_from_wheel(
-        whl_basename, metadata_directory, config_settings):
+def _get_wheel_metadata_from_wheel(whl_basename, metadata_directory, config_settings):
     """Extract the metadata from a wheel.
 
     Fallback for when the build backend does not
     define the 'get_wheel_metadata' hook.
     """
     from zipfile import ZipFile
-    with open(os.path.join(metadata_directory, WHEEL_BUILT_MARKER), 'wb'):
+
+    with open(os.path.join(metadata_directory, WHEEL_BUILT_MARKER), "wb"):
         pass  # Touch marker file
 
     whl_file = os.path.join(metadata_directory, whl_basename)
     with ZipFile(whl_file) as zipf:
         dist_info = _dist_info_files(zipf)
         zipf.extractall(path=metadata_directory, members=dist_info)
-    return dist_info[0].split('/')[0]
+    return dist_info[0].split("/")[0]
 
 
 def _find_already_built_wheel(metadata_directory):
-    """Check for a wheel already built during the get_wheel_metadata hook.
-    """
+    """Check for a wheel already built during the get_wheel_metadata hook."""
     if not metadata_directory:
         return None
     metadata_parent = os.path.dirname(metadata_directory)
     if not os.path.isfile(pjoin(metadata_parent, WHEEL_BUILT_MARKER)):
         return None
 
-    whl_files = glob(os.path.join(metadata_parent, '*.whl'))
+    whl_files = glob(os.path.join(metadata_parent, "*.whl"))
     if not whl_files:
-        print('Found wheel built marker, but no .whl files')
+        print("Found wheel built marker, but no .whl files")
         return None
     if len(whl_files) > 1:
-        print('Found multiple .whl files; unspecified behaviour. '
-              'Will call build_wheel.')
+        print(
+            "Found multiple .whl files; unspecified behaviour. "
+            "Will call build_wheel."
+        )
         return None
 
     # Exactly one .whl file
@@ -248,8 +277,9 @@ def build_wheel(wheel_directory, config_settings, metadata_directory=None):
         shutil.copy2(prebuilt_whl, wheel_directory)
         return os.path.basename(prebuilt_whl)
 
-    return _build_backend().build_wheel(wheel_directory, config_settings,
-                                        metadata_directory)
+    return _build_backend().build_wheel(
+        wheel_directory, config_settings, metadata_directory
+    )
 
 
 def build_editable(wheel_directory, config_settings, metadata_directory=None):
@@ -293,6 +323,7 @@ class _DummyException(Exception):
 
 class GotUnsupportedOperation(Exception):
     """For internal use when backend raises UnsupportedOperation"""
+
     def __init__(self, traceback):
         self.traceback = traceback
 
@@ -302,20 +333,20 @@ def build_sdist(sdist_directory, config_settings):
     backend = _build_backend()
     try:
         return backend.build_sdist(sdist_directory, config_settings)
-    except getattr(backend, 'UnsupportedOperation', _DummyException):
+    except getattr(backend, "UnsupportedOperation", _DummyException):
         raise GotUnsupportedOperation(traceback.format_exc())
 
 
 HOOK_NAMES = {
-    'get_requires_for_build_wheel',
-    'prepare_metadata_for_build_wheel',
-    'build_wheel',
-    'get_requires_for_build_editable',
-    'prepare_metadata_for_build_editable',
-    'build_editable',
-    'get_requires_for_build_sdist',
-    'build_sdist',
-    '_supported_features',
+    "get_requires_for_build_wheel",
+    "prepare_metadata_for_build_wheel",
+    "build_wheel",
+    "get_requires_for_build_editable",
+    "prepare_metadata_for_build_editable",
+    "build_editable",
+    "get_requires_for_build_sdist",
+    "build_sdist",
+    "_supported_features",
 }
 
 
@@ -326,28 +357,33 @@ def main():
     control_dir = sys.argv[2]
     if hook_name not in HOOK_NAMES:
         sys.exit("Unknown hook: %s" % hook_name)
+
+    # Remove the parent directory from sys.path to avoid polluting the backend
+    # import namespace with this directory.
+    here = os.path.dirname(__file__)
+    if here in sys.path:
+        sys.path.remove(here)
+
     hook = globals()[hook_name]
 
-    hook_input = read_json(pjoin(control_dir, 'input.json'))
+    hook_input = read_json(pjoin(control_dir, "input.json"))
 
-    json_out = {'unsupported': False, 'return_val': None}
+    json_out = {"unsupported": False, "return_val": None}
     try:
-        json_out['return_val'] = hook(**hook_input['kwargs'])
+        json_out["return_val"] = hook(**hook_input["kwargs"])
     except BackendUnavailable as e:
-        json_out['no_backend'] = True
-        json_out['traceback'] = e.traceback
-    except BackendInvalid as e:
-        json_out['backend_invalid'] = True
-        json_out['backend_error'] = e.message
+        json_out["no_backend"] = True
+        json_out["traceback"] = e.traceback
+        json_out["backend_error"] = e.message
     except GotUnsupportedOperation as e:
-        json_out['unsupported'] = True
-        json_out['traceback'] = e.traceback
+        json_out["unsupported"] = True
+        json_out["traceback"] = e.traceback
     except HookMissing as e:
-        json_out['hook_missing'] = True
-        json_out['missing_hook_name'] = e.hook_name or hook_name
+        json_out["hook_missing"] = True
+        json_out["missing_hook_name"] = e.hook_name or hook_name
 
-    write_json(json_out, pjoin(control_dir, 'output.json'), indent=2)
+    write_json(json_out, pjoin(control_dir, "output.json"), indent=2)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/src/pip/_vendor/pyproject_hooks/py.typed b/src/pip/_vendor/pyproject_hooks/py.typed
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index f86b8b54a53..f04a9c1e73c 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -4,7 +4,7 @@ distro==1.9.0
 msgpack==1.1.0
 packaging==24.2
 platformdirs==4.3.6
-pyproject-hooks==1.0.0
+pyproject-hooks==1.2.0
 requests==2.32.3
     certifi==2024.8.30
     idna==3.10

From d18fca10cc5b4c597cf2c8488be4e7b1d4968355 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 12 Jan 2025 00:25:33 -0500
Subject: [PATCH 648/992] Deprecate Python 2 relic --no-python-version-warning

---
 news/13154.removal.rst                | 2 ++
 src/pip/_internal/cli/base_command.py | 9 +++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 news/13154.removal.rst

diff --git a/news/13154.removal.rst b/news/13154.removal.rst
new file mode 100644
index 00000000000..c41e92bf1f7
--- /dev/null
+++ b/news/13154.removal.rst
@@ -0,0 +1,2 @@
+Deprecate the ``no-python-version-warning`` flag as it has long done nothing
+since Python 2 support was removed in pip 21.0.
diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py
index bc1ab65949d..5d69fcefc25 100644
--- a/src/pip/_internal/cli/base_command.py
+++ b/src/pip/_internal/cli/base_command.py
@@ -29,6 +29,7 @@
     NetworkConnectionError,
     PreviousBuildDirError,
 )
+from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.filesystem import check_path_owner
 from pip._internal.utils.logging import BrokenStdoutLoggingError, setup_logging
 from pip._internal.utils.misc import get_prog, normalize_path
@@ -228,4 +229,12 @@ def _main(self, args: List[str]) -> int:
                 )
                 options.cache_dir = None
 
+        if options.no_python_version_warning:
+            deprecated(
+                reason="--no-python-verison-warning is deprecated.",
+                replacement="to remove the flag as it's a no-op",
+                gone_in="25.1",
+                issue=13154,
+            )
+
         return self._run_wrapper(level_number, options, args)

From 654c3da58e36ae9a573ad3658ef7cdc5366940dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 12 Jan 2025 17:13:25 +0100
Subject: [PATCH 649/992] Postpone removal of setup.py develop support to 25.1

---
 src/pip/_internal/req/req_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index f9d1b963aec..3262d82658e 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -837,7 +837,7 @@ def install(
                     "try using --config-settings editable_mode=compat. "
                     "Please consult the setuptools documentation for more information"
                 ),
-                gone_in="25.0",
+                gone_in="25.1",
                 issue=11457,
             )
             if self.config_settings:

From 4ad729572d4b68d7fbafc3d6183fdb59c3001b7d Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 12 Jan 2025 12:30:18 -0500
Subject: [PATCH 650/992] Postpone removal of non-bare names in egg fragment to
 25.1 (#13159)

The only way for editable VCS URL installs to request an extra is to
place them in the egg fragment. Of course, this is undocumented
and deprecated behaviour, but we should ensure
`pip install -e name[extra] @ VCS_URL` actually works before breaking
our users.
---
 src/pip/_internal/cli/base_command.py | 2 +-
 src/pip/_internal/models/link.py      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py
index 5d69fcefc25..362f84b6b0b 100644
--- a/src/pip/_internal/cli/base_command.py
+++ b/src/pip/_internal/cli/base_command.py
@@ -231,7 +231,7 @@ def _main(self, args: List[str]) -> int:
 
         if options.no_python_version_warning:
             deprecated(
-                reason="--no-python-verison-warning is deprecated.",
+                reason="--no-python-version-warning is deprecated.",
                 replacement="to remove the flag as it's a no-op",
                 gone_in="25.1",
                 issue=13154,
diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index 612a42f95c1..27ad016090c 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -466,10 +466,10 @@ def _egg_fragment(self) -> Optional[str]:
         project_name = match.group(1)
         if not self._project_name_re.match(project_name):
             deprecated(
-                reason=f"{self} contains an egg fragment with a non-PEP 508 name",
+                reason=f"{self} contains an egg fragment with a non-PEP 508 name.",
                 replacement="to use the req @ url syntax, and remove the egg fragment",
-                gone_in="25.0",
-                issue=11617,
+                gone_in="25.1",
+                issue=13157,
             )
 
         return project_name

From a84a9403a493f46ec8c02975d9f832b2f19dc24d Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 12 Jan 2025 17:04:59 -0500
Subject: [PATCH 651/992] perf: cache requires-python checks & skip debug
 logging (#13128)

The requires-python check is pretty fast, but when performed for
10000 links, the checks consume a nontrivial amount of time. For
example, while installing (pre-cached + --dry-run) a pared down list of
homeassistant dependencies (n=117), link evaluation took 15% of the
total runtime, with requires-python evaluation accounting for half
(7.5%) of that.

The cache can be kept pretty small as requires-python specifiers often
repeat, and when they do change, it's often in chunks (or between
entirely different packages). For example, setuptools has like 1500
links, but only ~12 different `requires-python` specifiers.

In addition, _log_skipped_link() is a hot method and unfortunately
expensive as it hashes the link on every call. Fortunately, we can
return early when debug logging is not enabled. In the same
homeassistant run, this saves 0.7% of the runtime.
---
 news/13128.feature.rst                    | 1 +
 src/pip/_internal/index/package_finder.py | 5 +++++
 src/pip/_internal/utils/packaging.py      | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 news/13128.feature.rst

diff --git a/news/13128.feature.rst b/news/13128.feature.rst
new file mode 100644
index 00000000000..6985d78b87e
--- /dev/null
+++ b/news/13128.feature.rst
@@ -0,0 +1 @@
+Cache ``python-requires`` checks while filtering potential installation candidates.
diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index c10103320e3..85628ee5d7a 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -736,6 +736,11 @@ def _sort_links(self, links: Iterable[Link]) -> List[Link]:
         return no_eggs + eggs
 
     def _log_skipped_link(self, link: Link, result: LinkType, detail: str) -> None:
+        # This is a hot method so don't waste time hashing links unless we're
+        # actually going to log 'em.
+        if not logger.isEnabledFor(logging.DEBUG):
+            return
+
         entry = (link, result, detail)
         if entry not in self._logged_links:
             # Put the link at the end so the reason is more visible and because
diff --git a/src/pip/_internal/utils/packaging.py b/src/pip/_internal/utils/packaging.py
index 4b8fa0fe397..caad70f7fd1 100644
--- a/src/pip/_internal/utils/packaging.py
+++ b/src/pip/_internal/utils/packaging.py
@@ -11,6 +11,7 @@
 logger = logging.getLogger(__name__)
 
 
+@functools.lru_cache(maxsize=32)
 def check_requires_python(
     requires_python: Optional[str], version_info: Tuple[int, ...]
 ) -> bool:

From 679deb778fb815e5ce2742b0c40fb658828f501d Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Mon, 13 Jan 2025 07:45:34 -0500
Subject: [PATCH 652/992] Add note on change in pre-release behavior from
 Packaging 24.2

---
 news/13163.feature.rst | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 news/13163.feature.rst

diff --git a/news/13163.feature.rst b/news/13163.feature.rst
new file mode 100644
index 00000000000..8d5709d230c
--- /dev/null
+++ b/news/13163.feature.rst
@@ -0,0 +1,5 @@
+Note: Packaging 24.2 changes how pre-release specifiers with ``<`` and ``>``
+behave. Including a pre-release version with these specifiers now implies
+accepting pre-releases (e.g., ``<2.0dev`` can include ``1.0rc1``). To avoid
+implying pre-releases, avoid specifying them (e.g., use ``<2.0``).
+The exception is ``!=``, which never implies pre-releases.

From e175125b75727971a72990fec6e96d63f21235de Mon Sep 17 00:00:00 2001
From: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com>
Date: Tue, 14 Jan 2025 20:05:56 +0200
Subject: [PATCH 653/992] Remove `import re` from script template

---
 src/pip/_internal/operations/install/wheel.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index aef42aa9eef..3bc8da42ddf 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -412,6 +412,19 @@ def _raise_for_invalid_entrypoint(specification: str) -> None:
 
 
 class PipScriptMaker(ScriptMaker):
+    # Override distlib's default script template with one that
+    # doesn't import `re` module, allowing scripts to load faster.
+    script_template = r"""# -*- coding: utf-8 -*-
+import sys
+from %(module)s import %(import_name)s
+if __name__ == '__main__':
+    if sys.argv[0].endswith('-script.pyw'):
+        sys.argv[0] = sys.argv[0][: -11]
+    elif sys.argv[0].endswith('.exe'):
+        sys.argv[0] = sys.argv[0][: -4]
+    sys.exit(%(func)s())
+"""
+
     def make(
         self, specification: str, options: Optional[Dict[str, Any]] = None
     ) -> List[str]:

From 9b993f0084b5c04b946a36d6f844b50b7fa37f01 Mon Sep 17 00:00:00 2001
From: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com>
Date: Tue, 14 Jan 2025 20:20:54 +0200
Subject: [PATCH 654/992] Add NEWS

---
 news/13165.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/13165.feature.rst

diff --git a/news/13165.feature.rst b/news/13165.feature.rst
new file mode 100644
index 00000000000..e21ddac50ad
--- /dev/null
+++ b/news/13165.feature.rst
@@ -0,0 +1 @@
+Speed up small CLI tools by removing ``import re`` from the executable template.

From c05853f9e1c00dbc5f7ce44268e2c1f23bf44bc9 Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos
 <3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Wed, 15 Jan 2025 00:09:48 +0100
Subject: [PATCH 655/992] Upgrade to ruff 0.9.1

---
 .pre-commit-config.yaml | 2 +-
 tests/ruff.toml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 55ceda910a4..ebbd323b389 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.8.6
+  rev: v0.9.1
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
diff --git a/tests/ruff.toml b/tests/ruff.toml
index 366d8a5814b..a2b54f33a05 100644
--- a/tests/ruff.toml
+++ b/tests/ruff.toml
@@ -4,7 +4,7 @@ extend = "../pyproject.toml"
 # And extend linting to include pytest specific rules and configuration
 [lint]
 extend-select = ["PT"]
-ignore = ["PT004", "PT011"]
+ignore = ["PT011"]
 
 [lint.flake8-pytest-style]
 mark-parentheses = false

From 1d49aa3b7fb930d5923f8c6d03fea51ad9f38aa1 Mon Sep 17 00:00:00 2001
From: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com>
Date: Wed, 15 Jan 2025 01:17:46 +0200
Subject: [PATCH 656/992] Address PR review

---
 src/pip/_internal/operations/install/wheel.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index 3bc8da42ddf..da3b5bd8125 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -418,10 +418,8 @@ class PipScriptMaker(ScriptMaker):
 import sys
 from %(module)s import %(import_name)s
 if __name__ == '__main__':
-    if sys.argv[0].endswith('-script.pyw'):
-        sys.argv[0] = sys.argv[0][: -11]
-    elif sys.argv[0].endswith('.exe'):
-        sys.argv[0] = sys.argv[0][: -4]
+    if sys.argv[0].endswith('.exe'):
+        sys.argv[0] = sys.argv[0][:-4]
     sys.exit(%(func)s())
 """
 

From 88cb374fe9e32c1a66d65722952866e5582a5e3f Mon Sep 17 00:00:00 2001
From: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com>
Date: Thu, 16 Jan 2025 08:27:15 +0200
Subject: [PATCH 657/992] Remove legacy file encoding declaration

---
 src/pip/_internal/operations/install/wheel.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index da3b5bd8125..0e94cb80678 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -414,8 +414,7 @@ def _raise_for_invalid_entrypoint(specification: str) -> None:
 class PipScriptMaker(ScriptMaker):
     # Override distlib's default script template with one that
     # doesn't import `re` module, allowing scripts to load faster.
-    script_template = r"""# -*- coding: utf-8 -*-
-import sys
+    script_template = r"""import sys
 from %(module)s import %(import_name)s
 if __name__ == '__main__':
     if sys.argv[0].endswith('.exe'):

From 80abbe3e5dc9b267f1800e8942e05fb21cab5eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 12 Jan 2025 15:24:20 +0100
Subject: [PATCH 658/992] Add trusted publisher release workfiow

---
 .github/workflows/release.yml             | 46 +++++++++++++++++++++++
 docs/html/development/release-process.rst |  7 +---
 2 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..aa87fa91584
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,46 @@
+name: Publish Python 🐍 distribution 📦 to PyPI
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    name: Build distribution 📦
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+      - name: Build a binary wheel and a source tarball
+        run: pipx run build
+      - name: Store the distribution packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+
+  publish-to-pypi:
+    name: >-
+      Publish Python 🐍 distribution 📦 to PyPI
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/project/pip/${{ github.ref_name }}
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v4
+        with:
+          name: python-package-distributions
+          path: dist/
+      - name: Publish distribution 📦 to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/docs/html/development/release-process.rst b/docs/html/development/release-process.rst
index 5bf0d278b71..77ee9b5d46b 100644
--- a/docs/html/development/release-process.rst
+++ b/docs/html/development/release-process.rst
@@ -146,11 +146,8 @@ Creating a new release
    This will update the relevant files and tag the correct commit.
 #. Submit the ``release/YY.N`` branch as a pull request and ensure CI passes.
    Merge the changes back into ``main`` and pull them back locally.
-#. Build the release artifacts using ``nox -s build-release -- YY.N``.
-   This will checkout the tag, generate the distribution files to be
-   uploaded and checkout the main branch again.
-#. Upload the release to PyPI using ``nox -s upload-release -- YY.N``.
-#. Push the tag created by ``prepare-release``.
+#. Push the tag created by ``prepare-release``. This will trigger the release
+   workflow on GitHub and publish to PyPI.
 #. Regenerate the ``get-pip.py`` script in the `get-pip repository`_ (as
    documented there) and commit the results.
 #. Submit a Pull Request to `CPython`_ adding the new version of pip

From 2c5ff943b2f815f5f4a2e59c0e47b2788b224efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 12 Jan 2025 15:40:33 +0100
Subject: [PATCH 659/992] Use pinned build dpendencies in the release workflow

---
 .github/workflows/release.yml |  9 ++++-----
 MANIFEST.in                   |  3 +++
 build-requirements.in         |  2 ++
 build-requirements.txt        | 24 ++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 build-requirements.in
 create mode 100644 build-requirements.txt

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aa87fa91584..f82467f57ec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,12 +12,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
       - name: Build a binary wheel and a source tarball
-        run: pipx run build
+        run: |
+          python3 -m venv build-env
+          build-env/bin/python -m pip install --no-deps --require-hashes -r build-requirements.txt
+          build-env/bin/python -m build --no-isolation
       - name: Store the distribution packages
         uses: actions/upload-artifact@v4
         with:
diff --git a/MANIFEST.in b/MANIFEST.in
index 6f4197565d3..98b43257057 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,9 @@ include README.rst
 include SECURITY.md
 include pyproject.toml
 
+include build-requirements.in
+include build-requirements.txt
+
 include src/pip/_vendor/README.rst
 include src/pip/_vendor/vendor.txt
 recursive-include  src/pip/_vendor *LICENSE*
diff --git a/build-requirements.in b/build-requirements.in
new file mode 100644
index 00000000000..4bc215a28d0
--- /dev/null
+++ b/build-requirements.in
@@ -0,0 +1,2 @@
+build
+setuptools
diff --git a/build-requirements.txt b/build-requirements.txt
new file mode 100644
index 00000000000..ad876c4ada0
--- /dev/null
+++ b/build-requirements.txt
@@ -0,0 +1,24 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --allow-unsafe --generate-hashes build-requirements.in
+#
+build==1.2.2.post1 \
+    --hash=sha256:1d61c0887fa860c01971625baae8bdd338e517b836a2f70dd1f7aa3a6b2fc5b5 \
+    --hash=sha256:b36993e92ca9375a219c99e606a122ff365a760a2d4bba0caa09bd5278b608b7
+    # via -r build-requirements.in
+packaging==24.2 \
+    --hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
+    --hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f
+    # via build
+pyproject-hooks==1.2.0 \
+    --hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
+    --hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
+    # via build
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==75.8.0 \
+    --hash=sha256:c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6 \
+    --hash=sha256:e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3
+    # via -r build-requirements.in

From 21fbe62a321db2ee353e935d808b05c4fd5cbf3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 12 Jan 2025 15:49:57 +0100
Subject: [PATCH 660/992] Pin GitHub actions used for release

---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f82467f57ec..d5b8c1c09fe 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Build a binary wheel and a source tarball
         run: |
           python3 -m venv build-env
-          build-env/bin/python -m pip install --no-deps --require-hashes -r build-requirements.txt
+          build-env/bin/python -m pip install --no-deps --only-binary :all: --require-hashes -r build-requirements.txt
           build-env/bin/python -m build --no-isolation
       - name: Store the distribution packages
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
         with:
           name: python-package-distributions
           path: dist/
@@ -37,9 +37,9 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
         with:
           name: python-package-distributions
           path: dist/
       - name: Publish distribution 📦 to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70 # release/v1

From 1d270e75ef7f09ee61111494714156da7de53e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Tue, 14 Jan 2025 14:48:31 +0100
Subject: [PATCH 661/992] Factor out build script

also, set SOURCE_DATE_EPOCH, and use python -I
---
 .github/workflows/release.yml |  5 +--
 MANIFEST.in                   |  1 +
 build-project.py              | 62 +++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100755 build-project.py

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d5b8c1c09fe..84c3f5366db 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,10 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Build a binary wheel and a source tarball
-        run: |
-          python3 -m venv build-env
-          build-env/bin/python -m pip install --no-deps --only-binary :all: --require-hashes -r build-requirements.txt
-          build-env/bin/python -m build --no-isolation
+        run: ./build-project.py
       - name: Store the distribution packages
         uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
         with:
diff --git a/MANIFEST.in b/MANIFEST.in
index 98b43257057..cb8e14df96b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,6 +7,7 @@ include pyproject.toml
 
 include build-requirements.in
 include build-requirements.txt
+include build-project.py
 
 include src/pip/_vendor/README.rst
 include src/pip/_vendor/vendor.txt
diff --git a/build-project.py b/build-project.py
new file mode 100755
index 00000000000..a89eec16296
--- /dev/null
+++ b/build-project.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+"""Build pip using pinned build requirements."""
+
+import subprocess
+import sys
+import tempfile
+from pathlib import Path
+
+
+def get_git_head_timestamp() -> str:
+    return subprocess.run(
+        [
+            "git",
+            "log",
+            "-1",
+            "--pretty=format:%ct",
+        ],
+        text=True,
+        stdout=subprocess.PIPE,
+    ).stdout.strip()
+
+
+def main() -> None:
+    with tempfile.TemporaryDirectory() as build_env:
+        subprocess.run(
+            [
+                sys.executable,
+                "-m",
+                "venv",
+                build_env,
+            ],
+            check=True,
+        )
+        build_python = Path(build_env) / "bin" / "python"
+        subprocess.run(
+            [
+                build_python,
+                "-Im",
+                "pip",
+                "install",
+                "--no-deps",
+                "--only-binary=:all:",
+                "--require-hashes",
+                "-r",
+                Path(__file__).parent / "build-requirements.txt",
+            ],
+            check=True,
+        )
+        subprocess.run(
+            [
+                build_python,
+                "-Im",
+                "build",
+                "--no-isolation",
+            ],
+            check=True,
+            env={"SOURCE_DATE_EPOCH": get_git_head_timestamp()},
+        )
+
+
+if __name__ == "__main__":
+    main()

From e968c6174bd5ecfaa21bc96173599486fb02dc03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Tue, 14 Jan 2025 15:13:00 +0100
Subject: [PATCH 662/992] Update nox session to use new build script

---
 noxfile.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 6e6e144bccb..70e24a01142 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -339,7 +339,7 @@ def build_release(session: nox.Session) -> None:
         )
 
     session.log("# Install dependencies")
-    session.install("build", "twine")
+    session.install("twine")
 
     with release.isolated_temporary_checkout(session, version) as build_dir:
         session.log(
@@ -375,11 +375,11 @@ def build_dists(session: nox.Session) -> List[str]:
         )
 
     session.log("# Build distributions")
-    session.run("python", "-m", "build", silent=True)
+    session.run("python", "build-project.py", silent=True)
     produced_dists = glob.glob("dist/*")
 
     session.log(f"# Verify distributions: {', '.join(produced_dists)}")
-    session.run("twine", "check", *produced_dists, silent=True)
+    session.run("twine", "check", "--strict", *produced_dists, silent=True)
 
     return produced_dists
 

From f22ff81ba7845132949df17819b5c81a00f5ba8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Tue, 14 Jan 2025 15:19:08 +0100
Subject: [PATCH 663/992] Add news

---
 news/13048.process.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/13048.process.rst

diff --git a/news/13048.process.rst b/news/13048.process.rst
new file mode 100644
index 00000000000..a6c03018998
--- /dev/null
+++ b/news/13048.process.rst
@@ -0,0 +1 @@
+Use PyPI trusted publisher workflow for release.

From 4c389522e67a5656fb250381de44aef7c6f473e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Tue, 14 Jan 2025 15:29:36 +0100
Subject: [PATCH 664/992] Add dependabot config for build requirements

---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2390d8c809e..a3a55e8b329 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,3 +8,7 @@ updates:
       github-actions:
         patterns:
           - "*"
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "monthly"

From 48fb3d541b7120a2b88a2618dc227402cf29cebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Tue, 14 Jan 2025 16:40:59 +0100
Subject: [PATCH 665/992] Update news
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) 
---
 news/13048.process.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/news/13048.process.rst b/news/13048.process.rst
index a6c03018998..b4d18461b7a 100644
--- a/news/13048.process.rst
+++ b/news/13048.process.rst
@@ -1 +1,3 @@
-Use PyPI trusted publisher workflow for release.
+Started releasing to PyPI from a GitHub Actions CI/CD workflow that implements trusted publishing and bundles :pep:`740` digital attestations.
+
+In addition to being signed, the released distribution packages are now reproducible through the commit timestamp.

From b6e5f3fc31f0b2b1af7c964fa6c874fac021dcc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Wed, 15 Jan 2025 11:24:45 +0100
Subject: [PATCH 666/992] Add persist-credential: false to release workflow

Following recommendation from zizmor
---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 84c3f5366db..9506eeb3304 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,6 +12,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          persist-credentials: false
       - name: Build a binary wheel and a source tarball
         run: ./build-project.py
       - name: Store the distribution packages

From 08fe349a35ae759f0fbf988a99e5794ac55bafd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Wed, 15 Jan 2025 13:09:51 +0100
Subject: [PATCH 667/992] Run dependebot weekly to get feedback sooner

We can can back to monthly later when we have a better understanding of how it works.
---
 .github/dependabot.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a3a55e8b329..456596841a9 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     groups:
       github-actions:
         patterns:
@@ -11,4 +11,4 @@ updates:
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"

From 1801d83b7a81fea1ac0bd36c6184398315c74117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 19 Jan 2025 12:43:00 +0100
Subject: [PATCH 668/992] Make build-project.py portable

---
 build-project.py | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/build-project.py b/build-project.py
index a89eec16296..78e183da08a 100755
--- a/build-project.py
+++ b/build-project.py
@@ -2,9 +2,22 @@
 """Build pip using pinned build requirements."""
 
 import subprocess
-import sys
 import tempfile
+import venv
+from os import PathLike
 from pathlib import Path
+from types import SimpleNamespace
+
+
+class EnvBuilder(venv.EnvBuilder):
+    """A subclass of venv.EnvBuilder that exposes the python executable command."""
+
+    def ensure_directories(
+        self, env_dir: str | bytes | PathLike[str] | PathLike[bytes]
+    ) -> SimpleNamespace:
+        context = super().ensure_directories(env_dir)
+        self.env_exec_cmd = context.env_exec_cmd
+        return context
 
 
 def get_git_head_timestamp() -> str:
@@ -22,19 +35,11 @@ def get_git_head_timestamp() -> str:
 
 def main() -> None:
     with tempfile.TemporaryDirectory() as build_env:
+        env_builder = EnvBuilder(with_pip=True)
+        env_builder.create(build_env)
         subprocess.run(
             [
-                sys.executable,
-                "-m",
-                "venv",
-                build_env,
-            ],
-            check=True,
-        )
-        build_python = Path(build_env) / "bin" / "python"
-        subprocess.run(
-            [
-                build_python,
+                env_builder.env_exec_cmd,
                 "-Im",
                 "pip",
                 "install",
@@ -48,7 +53,7 @@ def main() -> None:
         )
         subprocess.run(
             [
-                build_python,
+                env_builder.env_exec_cmd,
                 "-Im",
                 "build",
                 "--no-isolation",

From 3b0215f71514315cb3927d8b9a3a6d484f9df562 Mon Sep 17 00:00:00 2001
From: shenxianpeng 
Date: Sun, 19 Jan 2025 19:18:46 +0200
Subject: [PATCH 669/992] docs: Integrate `sphinx-issues` into the Sphinx
 config (#12616)

By using sphinx-issues, we can use consistent roles for common links.
---
 NEWS.rst               |  4 ++--
 docs/html/conf.py      | 14 +++++---------
 docs/requirements.txt  |  1 +
 news/12551.trivial.rst |  1 +
 4 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 news/12551.trivial.rst

diff --git a/NEWS.rst b/NEWS.rst
index 5ebf7141b1d..2fd470a4065 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -3350,7 +3350,7 @@ Improved Documentation
 - Upgrade the bundled copy of requests to 2.6.0, fixing CVE-2015-2296.
 - Display format of latest package when using ``pip list --outdated``. (#2475)
 - Don't use pywin32 as ctypes should always be available on Windows, using
-  pywin32 prevented uninstallation of pywin32 on Windows. (:pull:`2467`)
+  pywin32 prevented uninstallation of pywin32 on Windows. (:pr:`2467`)
 - Normalize the ``--wheel-dir`` option, expanding out constructs such as ``~``
   when used. (#2441)
 - Display a warning when an undefined extra has been requested. (#2142)
@@ -3641,7 +3641,7 @@ Improved Documentation
   --no-download`` are now formally deprecated.  See #906 for discussion on
   possible alternatives, or lack thereof, in future releases.
 - **DEPRECATION** ``pip zip`` and ``pip unzip`` are now formally deprecated.
-- pip will now install Mac OSX platform wheels from PyPI. (:pull:`1278`)
+- pip will now install Mac OSX platform wheels from PyPI. (:pr:`1278`)
 - pip now generates the appropriate platform-specific console scripts when
   installing wheels. (#1251)
 - pip now confirms a wheel is supported when installing directly from a path or
diff --git a/docs/html/conf.py b/docs/html/conf.py
index 683ea7b87d8..be95eca2941 100644
--- a/docs/html/conf.py
+++ b/docs/html/conf.py
@@ -17,7 +17,6 @@
     # first-party extensions
     "sphinx.ext.autodoc",
     "sphinx.ext.todo",
-    "sphinx.ext.extlinks",
     "sphinx.ext.intersphinx",
     # our extensions
     "pip_sphinxext",
@@ -26,6 +25,7 @@
     "sphinx_copybutton",
     "sphinx_inline_tabs",
     "sphinxcontrib.towncrier",
+    "sphinx_issues",
 ]
 
 # General information about the project.
@@ -71,14 +71,6 @@
     "pypug": ("https://packaging.python.org", None),
 }
 
-# -- Options for extlinks -------------------------------------------------------------
-
-extlinks = {
-    "issue": ("https://github.com/pypa/pip/issues/%s", "#%s"),
-    "pull": ("https://github.com/pypa/pip/pull/%s", "PR #%s"),
-    "pypi": ("https://pypi.org/project/%s/", "%s"),
-}
-
 # -- Options for towncrier_draft extension --------------------------------------------
 
 towncrier_draft_autoversion_mode = "draft"  # or: 'sphinx-release', 'sphinx-version'
@@ -137,3 +129,7 @@ def to_document_name(path: str, base_dir: str) -> str:
 copybutton_prompt_text = r"\$ | C\:\> "
 copybutton_prompt_is_regexp = True
 copybutton_only_copy_prompt_lines = False
+
+# -- Options for sphinx_issues --------------------------------------------------------
+
+issues_default_group_project = "pypa/pip"
diff --git a/docs/requirements.txt b/docs/requirements.txt
index b3ea82a9de1..98c1527e9cc 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -7,6 +7,7 @@ myst_parser
 sphinx-copybutton
 sphinx-inline-tabs
 sphinxcontrib-towncrier >= 0.2.0a0
+sphinx-issues
 
 # `docs.pipext` uses pip's internals to generate documentation. So, we install
 # the current directory to make it work.
diff --git a/news/12551.trivial.rst b/news/12551.trivial.rst
new file mode 100644
index 00000000000..bfd5e9f1e9e
--- /dev/null
+++ b/news/12551.trivial.rst
@@ -0,0 +1 @@
+Integrate ``sphinx-issues`` into the Sphinx config.

From 41c807c5938d269703c6ff2644fb3b7dc88eda4e Mon Sep 17 00:00:00 2001
From: Karolina Surma 
Date: Tue, 7 Jan 2025 12:52:35 +0100
Subject: [PATCH 670/992] Show License-Expression if present in package
 metadata

With Core Metadata 2.4 a new field, License-Expression, has been added.
If it's present, favor it over the deprecated (with PEP 639) legacy
unstructured License field.

Closes: #13112
---
 news/13112.feature.rst                        |   1 +
 src/pip/_internal/commands/show.py            |   9 +++-
 .../license.dist-0.1-py2.py3-none-any.whl     | Bin 0 -> 1789 bytes
 .../license.dist-0.2-py2.py3-none-any.whl     | Bin 0 -> 1770 bytes
 tests/functional/test_show.py                 |  43 +++++++++++++++++-
 5 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 news/13112.feature.rst
 create mode 100644 tests/data/packages/license.dist-0.1-py2.py3-none-any.whl
 create mode 100644 tests/data/packages/license.dist-0.2-py2.py3-none-any.whl

diff --git a/news/13112.feature.rst b/news/13112.feature.rst
new file mode 100644
index 00000000000..bf60883211f
--- /dev/null
+++ b/news/13112.feature.rst
@@ -0,0 +1 @@
+Prefer to display ``License-Expression`` in ``pip show`` if metadata version is at least 2.4.
diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py
index c54d548f5fb..b47500cf8b4 100644
--- a/src/pip/_internal/commands/show.py
+++ b/src/pip/_internal/commands/show.py
@@ -66,6 +66,7 @@ class _PackageInfo(NamedTuple):
     author: str
     author_email: str
     license: str
+    license_expression: str
     entry_points: List[str]
     files: Optional[List[str]]
 
@@ -161,6 +162,7 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
             author=metadata.get("Author", ""),
             author_email=metadata.get("Author-email", ""),
             license=metadata.get("License", ""),
+            license_expression=metadata.get("License-Expression", ""),
             entry_points=entry_points,
             files=files,
         )
@@ -180,13 +182,18 @@ def print_results(
         if i > 0:
             write_output("---")
 
+        metadata_version_tuple = tuple(map(int, dist.metadata_version.split(".")))
+
         write_output("Name: %s", dist.name)
         write_output("Version: %s", dist.version)
         write_output("Summary: %s", dist.summary)
         write_output("Home-page: %s", dist.homepage)
         write_output("Author: %s", dist.author)
         write_output("Author-email: %s", dist.author_email)
-        write_output("License: %s", dist.license)
+        if metadata_version_tuple >= (2, 4) and dist.license_expression:
+            write_output("License-Expression: %s", dist.license_expression)
+        else:
+            write_output("License: %s", dist.license)
         write_output("Location: %s", dist.location)
         if dist.editable_project_location is not None:
             write_output(
diff --git a/tests/data/packages/license.dist-0.1-py2.py3-none-any.whl b/tests/data/packages/license.dist-0.1-py2.py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..b1a73258dd18d718cc0362c758f70afd0a05028e
GIT binary patch
literal 1789
zcmWIWW@Zs#U|`^2P%kx&DsdP5e;>&6U}RuWW{_dX$xKeoD^Ar*$t*6>HPADJFf#Mf
z^7VaPLmXWkLmWdxI2o9KF78j~Skj+fTEWf0$nt`jfdNd!_B;9=HV|Q*+Kb*>|`i=%VTL2Q_n8+BF&?dei=0{$IaM<;H>qbxMAEWo%(b
zcW#n6(NJz$+SzqXHPHUoCW~NxXO0u<%&Hu!g|XbqNAm1F+8%s<92=9
zduz9?l6fNV^Zz={1)uj{pRE}dzwfJ0CfD7#_Y1aMwfI`3#`A`cWnR=8|KiAu72i%+
zTni9gIxANHzS!o!bKNUDW&Xuj$i+Hqs&g%FOqQ_^`u@dg#~p|8pQg;!hpq)*d%={!
zlDN0+=n=gu;sNlm(*lNF0E24LC1BX81H(=cf7k`NI{OE?fJ2S}7;0ETuJ+7Xzh(ml
zh6leV?e#pJu%>~X-(Zz+_=Npe-d<8z9kk%ahsDzV`DZr0&b$9I+x6t`#`#AK)=3D@
zm5{uAg_S3CquaH|$G#P=$x45|lr`mM_YwitXuG2}nJQeJTrWP}TyyEACi}0Vi*e>}
z_c!lKi&5Nl{=MkInXh-xte&l_^!30BODqgCw!Tk~*|W^gV)BnmHD3%(6<@xLe&=|&yRLET&fjVk
z(yDe0r;o}b0?RZ-*)ikl?jkc_KotYADlvhjmsMU24zRX%mw>ss7)eca!fC%|2L{*r
zqZ_U*Y49k#E~e3}dBT8)|FX#m2T7}jPg)6o%2&qTeWLfya;JUFykjc4QSZJ!Z1z?+
z{(ndP$}(xL+Vo8m%x~#s96Xn^=)tBh(UMcDqR>qdxWuoBLQY{U?M@*tB$J_3g%>O~3Eg
zAKv3^+-_}WR}la4$g3GTv&>Ih@vQmfxA~QTt{Ch7{Yn(GT1h#4&AJU84q%@)AlxgVso-T)!&gBw~OZb$6
z%TTtWHyCAyx)x&fs{sX3WRRthCWrKwz82$$t=
z`v-Cm9Ec-a1~NuJK0Y%qvm`!Vub>j_pi7^{0-P`tNPssZlN>XyqD}&AJTNgbY-t2B
zi7NP5Aq5{=p@(b{X1RcDkqyv3JQl%937|EgQUZ@Pm^lhzO+#ZQ6A{)x@)yu5Q2xSd
z6|QuGuxd-=KVZp^$4Agq1GEK{YVg>C8RrmNKvA=$aRv+A7R(d?G#r!yFbrp918HUj
O!hgVEe+e{#fdK&Mm}u?*

literal 0
HcmV?d00001

diff --git a/tests/data/packages/license.dist-0.2-py2.py3-none-any.whl b/tests/data/packages/license.dist-0.2-py2.py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..db5662bdc1e9e1dd587f77c4a7a2f49acacc369b
GIT binary patch
literal 1770
zcmWIWW@Zs#U|`^2U@SF_ih2EN+ZiBFjgf&tnL&mjCo?%UuQ*jNC9}9h*Fet*!pO`^
z%h&gH4RLgF3~>w%;bdUmw75TgKMii(0l-Sxar9=c~!x{j}WG0VHa&hJpms)mSPd(VF>=Y8DQyIMVCnn}g1>&w?Y
zzj?>MKIr`2zY@x??_Hk6b2H^dW>d(u#iAW{_V@0(cCFZUXS#F$+0^3C
zcXm9@n7!oxbFPW1f0l)}Z=WY;wxD6&?Z1JoR$CgUE?3WMy|XIk?d?}PYNT((O*&@Z
zxomF9iK{YR$xb(2cpm9sYg*OMz-4PFf2h{OI(yq+FJJb>h0xKxuGBO9z4&I2=57vH8omxLR;cgjQg{++)9f{
zTlW@Emf7?rG@#>;?tCRVb0$`oUthi?O*#2x4rA%gjQrW3?mLEF%wMtV{Cm-ZD<4~~
zES~SH6cWEWIE0;dmaOFbeL9xgRJYsah$I?*XMAMuucV!`Ao|wf+3yVQ-G5wDzo(
i3u#dtny+=fVH~>%+19JFx3gC{hA#ZTNDlijT1){3fJzAH4>9_dV6`qa94!wyr`H=X6ZHwx1ufS6aD`)M#*QULHs<-FV
z+m|)0&ZpQ;jk_N_9bgX6J`Pl@MdI^W5!jkNq~(9CPs!WjUXmbr5r1yltat9$QEIi3&<8}
z0`0?N5v-H|S_3L2@K}SHqY&0KG=?z|VGSgIfvf_?CswO)r4xizTN+;ji+Magf~Fdv
wEud6`#}>>uhu8v&nk|j3EO1*eQvlF#Pzt~>oRtlvnH32C0fYS-& None:
     """
     Test that all the fields are present
     """
+    # future-compat: once pip adopts PEP 639 in pyproject.toml and
+    # its build backend produces metadata 2.4 or greater,
+    # it will display "License-Expression" rather than License
+    verbose = script.pip("show", "--verbose", "pip").stdout
+    match = re.search(r"Metadata-Version:\s(\d+\.\d+)", verbose)
+    if match is not None:
+        metadata_version = match.group(1)
+        metadata_version_tuple = tuple(map(int, metadata_version.split(".")))
+        if metadata_version_tuple >= (2, 4) and "License-Expression" in verbose:
+            license_str = "License-Expression"
+        else:
+            license_str = "License"
+    else:
+        license_str = "License"
+
     result = script.pip("show", "pip")
     lines = result.stdout.splitlines()
     expected = {
@@ -226,7 +241,7 @@ def test_all_fields(script: PipTestEnvironment) -> None:
         "Home-page",
         "Author",
         "Author-email",
-        "License",
+        f"{license_str}",
         "Location",
         "Editable project location",
         "Requires",
@@ -410,3 +425,29 @@ def test_show_populate_homepage_from_project_urls(
     result = script.pip("show", "simple", cwd=pkg_path)
     lines = result.stdout.splitlines()
     assert "Home-page: https://example.com" in lines
+
+
+def test_show_license_expression(script: PipTestEnvironment, data: TestData) -> None:
+    """
+    Show License-Expression if present in metadata >= 2.4.
+    """
+    wheel_file = data.packages.joinpath("license.dist-0.1-py2.py3-none-any.whl")
+    script.pip("install", "--no-index", wheel_file)
+    result = script.pip("show", "license.dist")
+    lines = result.stdout.splitlines()
+    assert "License-Expression: MIT AND MIT-0" in lines
+    assert "License: The legacy license declaration" not in lines
+
+
+def test_show_license_for_metadata_24(
+    script: PipTestEnvironment, data: TestData
+) -> None:
+    """
+    Show License if License-Expression is not there for metadata >= 2.4.
+    """
+    wheel_file = data.packages.joinpath("license.dist-0.2-py2.py3-none-any.whl")
+    script.pip("install", "--no-index", wheel_file)
+    result = script.pip("show", "license.dist")
+    lines = result.stdout.splitlines()
+    assert "License-Expression: " not in lines
+    assert "License: The legacy license declaration" in lines

From 40c42149a51a63e8416c047d5ddc0da1694387ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 07:39:49 +0000
Subject: [PATCH 671/992] Bump pypa/gh-action-pypi-publish in the
 github-actions group

Bumps the github-actions group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish).


Updates `pypa/gh-action-pypi-publish` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases)
- [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/67339c736fd9354cd4f8cb0b744f2b82a74b5c70...76f52bc884231f62b9a034ebfe128415bbaabdfc)

---
updated-dependencies:
- dependency-name: pypa/gh-action-pypi-publish
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] 
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9506eeb3304..60b32a5c960 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -41,4 +41,4 @@ jobs:
           name: python-package-distributions
           path: dist/
       - name: Publish distribution 📦 to PyPI
-        uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70 # release/v1
+        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # release/v1

From adc4f9951b51b6a06e405b8960dd0c5f030f0fb5 Mon Sep 17 00:00:00 2001
From: Matthew Hughes 
Date: Fri, 24 Jan 2025 22:56:57 +0000
Subject: [PATCH 672/992] Reorder requirements file decoding (#12795)

This changes the decoding process to more closely match the encoding
rules in the requirements file format specification.

The `auto_decode` function was removed and all decoding logic moved to
the `pip._internal.req.req_file` module because:

* This function was only ever used to decode requirements file
* It was never really a generic 'util' function, it was always tied to
  the idiosyncrasies of decoding requirements files.
* The module lived under `_internal` so I felt comfortable removing it

A warning was added when we _do_ fallback to using the locale defined
encoding to encourage users to move to an explicit encoding definition
via a coding style comment.

This fixes two existing bugs. Firstly, when:

* a requirements file is encoded as UTF-8, and
* some bytes in the file are incompatible with the system locale

Previously, assuming no BOM or PEP-263 style comment, we would default
to using the encoding from the system locale, which would then fail (see
issue #12771). Now UTF-8 is tried first over the system locale.

Secondly, when decoding a file starting with a UTF-32 little endian Byte
Order Marker. Previously this would always fail since
`codecs.BOM_UTF32_LE` is `codecs.BOM_UTF16_LE` followed by two null
bytes, and because of the ordering of the list of BOMs the UTF-16 case
would be run first and match the file prefix so we would incorrectly
deduce that the file was UTF-16 little endian encoded. I can't imagine
this is a popular encoding for a requirements file.

Fixes: #12771
---
 .../reference/requirements-file-format.md     |   6 +-
 news/12771.feature.rst                        |   2 +
 src/pip/_internal/req/req_file.py             |  53 +++++++-
 src/pip/_internal/utils/encoding.py           |  36 ------
 tests/unit/test_req_file.py                   | 114 ++++++++++++++++++
 tests/unit/test_utils.py                      |  46 +------
 6 files changed, 171 insertions(+), 86 deletions(-)
 create mode 100644 news/12771.feature.rst
 delete mode 100644 src/pip/_internal/utils/encoding.py

diff --git a/docs/html/reference/requirements-file-format.md b/docs/html/reference/requirements-file-format.md
index 01047587161..020a6e51b5b 100644
--- a/docs/html/reference/requirements-file-format.md
+++ b/docs/html/reference/requirements-file-format.md
@@ -56,9 +56,9 @@ examples of all these forms, see {ref}`pip install Examples`.
 
 ### Encoding
 
-Requirements files are `utf-8` encoding by default and also support
-{pep}`263` style comments to change the encoding (i.e.
-`# -*- coding:  -*-`).
+The default encoding for requirement files is `UTF-8` unless a different
+encoding is specified using a {pep}`263` style comment (e.g. `# -*- coding:
+ -*-`).
 
 ### Line continuations
 
diff --git a/news/12771.feature.rst b/news/12771.feature.rst
new file mode 100644
index 00000000000..68b2f14aade
--- /dev/null
+++ b/news/12771.feature.rst
@@ -0,0 +1,2 @@
+Reorder the encoding detection when decoding a requirements file, relying on
+UTF-8 over the locale encoding by default.
diff --git a/src/pip/_internal/req/req_file.py b/src/pip/_internal/req/req_file.py
index dee7f2fe81b..f6ba70fe7f6 100644
--- a/src/pip/_internal/req/req_file.py
+++ b/src/pip/_internal/req/req_file.py
@@ -2,11 +2,14 @@
 Requirements file parsing
 """
 
+import codecs
+import locale
 import logging
 import optparse
 import os
 import re
 import shlex
+import sys
 import urllib.parse
 from dataclasses import dataclass
 from optparse import Values
@@ -26,7 +29,6 @@
 from pip._internal.cli import cmdoptions
 from pip._internal.exceptions import InstallationError, RequirementsFileParseError
 from pip._internal.models.search_scope import SearchScope
-from pip._internal.utils.encoding import auto_decode
 
 if TYPE_CHECKING:
     from pip._internal.index.package_finder import PackageFinder
@@ -82,6 +84,21 @@
     str(o().dest) for o in SUPPORTED_OPTIONS_EDITABLE_REQ
 ]
 
+# order of BOMS is important: codecs.BOM_UTF16_LE is a prefix of codecs.BOM_UTF32_LE
+# so data.startswith(BOM_UTF16_LE) would be true for UTF32_LE data
+BOMS: List[Tuple[bytes, str]] = [
+    (codecs.BOM_UTF8, "utf-8"),
+    (codecs.BOM_UTF32, "utf-32"),
+    (codecs.BOM_UTF32_BE, "utf-32-be"),
+    (codecs.BOM_UTF32_LE, "utf-32-le"),
+    (codecs.BOM_UTF16, "utf-16"),
+    (codecs.BOM_UTF16_BE, "utf-16-be"),
+    (codecs.BOM_UTF16_LE, "utf-16-le"),
+]
+
+PEP263_ENCODING_RE = re.compile(rb"coding[:=]\s*([-\w.]+)")
+DEFAULT_ENCODING = "utf-8"
+
 logger = logging.getLogger(__name__)
 
 
@@ -568,7 +585,39 @@ def get_file_content(url: str, session: "PipSession") -> Tuple[str, str]:
     # Assume this is a bare path.
     try:
         with open(url, "rb") as f:
-            content = auto_decode(f.read())
+            raw_content = f.read()
     except OSError as exc:
         raise InstallationError(f"Could not open requirements file: {exc}")
+
+    content = _decode_req_file(raw_content, url)
+
     return url, content
+
+
+def _decode_req_file(data: bytes, url: str) -> str:
+    for bom, encoding in BOMS:
+        if data.startswith(bom):
+            return data[len(bom) :].decode(encoding)
+
+    for line in data.split(b"\n")[:2]:
+        if line[0:1] == b"#":
+            result = PEP263_ENCODING_RE.search(line)
+            if result is not None:
+                encoding = result.groups()[0].decode("ascii")
+                return data.decode(encoding)
+
+    try:
+        return data.decode(DEFAULT_ENCODING)
+    except UnicodeDecodeError:
+        locale_encoding = locale.getpreferredencoding(False) or sys.getdefaultencoding()
+        logging.warning(
+            "unable to decode data from %s with default encoding %s, "
+            "falling back to encoding from locale: %s. "
+            "If this is intentional you should specify the encoding with a "
+            "PEP-263 style comment, e.g. '# -*- coding: %s -*-'",
+            url,
+            DEFAULT_ENCODING,
+            locale_encoding,
+            locale_encoding,
+        )
+        return data.decode(locale_encoding)
diff --git a/src/pip/_internal/utils/encoding.py b/src/pip/_internal/utils/encoding.py
deleted file mode 100644
index 008f06a79bf..00000000000
--- a/src/pip/_internal/utils/encoding.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import codecs
-import locale
-import re
-import sys
-from typing import List, Tuple
-
-BOMS: List[Tuple[bytes, str]] = [
-    (codecs.BOM_UTF8, "utf-8"),
-    (codecs.BOM_UTF16, "utf-16"),
-    (codecs.BOM_UTF16_BE, "utf-16-be"),
-    (codecs.BOM_UTF16_LE, "utf-16-le"),
-    (codecs.BOM_UTF32, "utf-32"),
-    (codecs.BOM_UTF32_BE, "utf-32-be"),
-    (codecs.BOM_UTF32_LE, "utf-32-le"),
-]
-
-ENCODING_RE = re.compile(rb"coding[:=]\s*([-\w.]+)")
-
-
-def auto_decode(data: bytes) -> str:
-    """Check a bytes string for a BOM to correctly detect the encoding
-
-    Fallback to locale.getpreferredencoding(False) like open() on Python3"""
-    for bom, encoding in BOMS:
-        if data.startswith(bom):
-            return data[len(bom) :].decode(encoding)
-    # Lets check the first two lines as in PEP263
-    for line in data.split(b"\n")[:2]:
-        if line[0:1] == b"#" and ENCODING_RE.search(line):
-            result = ENCODING_RE.search(line)
-            assert result is not None
-            encoding = result.groups()[0].decode("ascii")
-            return data.decode(encoding)
-    return data.decode(
-        locale.getpreferredencoding(False) or sys.getdefaultencoding(),
-    )
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 1cc030681db..60b14940d27 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -1,3 +1,4 @@
+import codecs
 import collections
 import logging
 import os
@@ -955,3 +956,116 @@ def test_install_requirements_with_options(
             )
 
         assert req.global_options == [global_option]
+
+    @pytest.mark.parametrize(
+        "raw_req_file,expected_name,expected_spec",
+        [
+            pytest.param(
+                b"Django==1.4.2",
+                "Django",
+                "==1.4.2",
+                id="defaults to UTF-8",
+            ),
+            pytest.param(
+                "# coding=latin1\nDjango==1.4.2 # Pas trop de café".encode("latin-1"),
+                "Django",
+                "==1.4.2",
+                id="decodes based on PEP-263 style headers",
+            ),
+        ],
+    )
+    def test_general_decoding(
+        self,
+        raw_req_file: bytes,
+        expected_name: str,
+        expected_spec: str,
+        tmpdir: Path,
+        session: PipSession,
+    ) -> None:
+        req_file = tmpdir / "requirements.txt"
+        req_file.write_bytes(raw_req_file)
+
+        reqs = tuple(parse_reqfile(req_file.resolve(), session=session))
+
+        assert len(reqs) == 1
+        assert reqs[0].name == expected_name
+        assert reqs[0].specifier == expected_spec
+
+    @pytest.mark.parametrize(
+        "bom,encoding",
+        [
+            (codecs.BOM_UTF8, "utf-8"),
+            (codecs.BOM_UTF16_BE, "utf-16-be"),
+            (codecs.BOM_UTF16_LE, "utf-16-le"),
+            (codecs.BOM_UTF32_BE, "utf-32-be"),
+            (codecs.BOM_UTF32_LE, "utf-32-le"),
+            # BOM automatically added when encoding byte-order dependent encodings
+            (b"", "utf-16"),
+            (b"", "utf-32"),
+        ],
+    )
+    def test_decoding_with_BOM(
+        self, bom: bytes, encoding: str, tmpdir: Path, session: PipSession
+    ) -> None:
+        req_name = "Django"
+        req_specifier = "==1.4.2"
+        encoded_contents = bom + f"{req_name}{req_specifier}".encode(encoding)
+        req_file = tmpdir / "requirements.txt"
+        req_file.write_bytes(encoded_contents)
+
+        reqs = tuple(parse_reqfile(req_file.resolve(), session=session))
+
+        assert len(reqs) == 1
+        assert reqs[0].name == req_name
+        assert reqs[0].specifier == req_specifier
+
+    def test_warns_and_fallsback_to_locale_on_utf8_decode_fail(
+        self,
+        tmpdir: Path,
+        session: PipSession,
+        caplog: pytest.LogCaptureFixture,
+    ) -> None:
+        # \xff is valid in latin-1 but not UTF-8
+        data = b"pip<=24.0 # some comment\xff\n"
+        locale_encoding = "latin-1"
+        req_file = tmpdir / "requirements.txt"
+        req_file.write_bytes(data)
+
+        # it's hard to rely on a locale definitely existing for testing
+        # so patch things out for simplicity
+        with caplog.at_level(logging.WARNING), mock.patch(
+            "locale.getpreferredencoding", return_value=locale_encoding
+        ):
+            reqs = tuple(parse_reqfile(req_file.resolve(), session=session))
+
+        assert len(caplog.records) == 1
+        assert (
+            caplog.records[0].msg
+            == "unable to decode data from %s with default encoding %s, "
+            "falling back to encoding from locale: %s. "
+            "If this is intentional you should specify the encoding with a "
+            "PEP-263 style comment, e.g. '# -*- coding: %s -*-'"
+        )
+        assert caplog.records[0].args == (
+            str(req_file),
+            "utf-8",
+            locale_encoding,
+            locale_encoding,
+        )
+
+        assert len(reqs) == 1
+        assert reqs[0].name == "pip"
+        assert str(reqs[0].specifier) == "<=24.0"
+
+    @pytest.mark.parametrize("encoding", ["utf-8", "gbk"])
+    def test_errors_on_non_decodable_data(
+        self, encoding: str, tmpdir: Path, session: PipSession
+    ) -> None:
+        data = b"\xff"
+        req_file = tmpdir / "requirements.txt"
+        req_file.write_bytes(data)
+
+        with pytest.raises(UnicodeDecodeError), mock.patch(
+            "locale.getpreferredencoding", return_value=encoding
+        ):
+            next(parse_reqfile(req_file.resolve(), session=session))
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 6627a89496d..e2d1710739a 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -3,7 +3,6 @@
 
 """
 
-import codecs
 import os
 import shutil
 import stat
@@ -12,7 +11,7 @@
 from io import BytesIO
 from pathlib import Path
 from typing import Any, Callable, Iterator, List, NoReturn, Optional, Tuple, Type
-from unittest.mock import Mock, patch
+from unittest.mock import Mock
 
 import pytest
 
@@ -21,7 +20,6 @@
 from pip._internal.exceptions import HashMismatch, HashMissing, InstallationError
 from pip._internal.utils.deprecation import PipDeprecationWarning, deprecated
 from pip._internal.utils.egg_link import egg_link_path_from_location
-from pip._internal.utils.encoding import BOMS, auto_decode
 from pip._internal.utils.glibc import (
     glibc_version_string,
     glibc_version_string_confstr,
@@ -445,48 +443,6 @@ def test_has_one_of(self) -> None:
         assert not empty_hashes.has_one_of({"sha256": "xyzt"})
 
 
-class TestEncoding:
-    """Tests for pip._internal.utils.encoding"""
-
-    def test_auto_decode_utf_16_le(self) -> None:
-        data = (
-            b"\xff\xfeD\x00j\x00a\x00n\x00g\x00o\x00=\x00"
-            b"=\x001\x00.\x004\x00.\x002\x00"
-        )
-        assert data.startswith(codecs.BOM_UTF16_LE)
-        assert auto_decode(data) == "Django==1.4.2"
-
-    def test_auto_decode_utf_16_be(self) -> None:
-        data = (
-            b"\xfe\xff\x00D\x00j\x00a\x00n\x00g\x00o\x00="
-            b"\x00=\x001\x00.\x004\x00.\x002"
-        )
-        assert data.startswith(codecs.BOM_UTF16_BE)
-        assert auto_decode(data) == "Django==1.4.2"
-
-    def test_auto_decode_no_bom(self) -> None:
-        assert auto_decode(b"foobar") == "foobar"
-
-    def test_auto_decode_pep263_headers(self) -> None:
-        latin1_req = "# coding=latin1\n# Pas trop de café"
-        assert auto_decode(latin1_req.encode("latin1")) == latin1_req
-
-    def test_auto_decode_no_preferred_encoding(self) -> None:
-        om, em = Mock(), Mock()
-        om.return_value = "ascii"
-        em.return_value = None
-        data = "data"
-        with patch("sys.getdefaultencoding", om):
-            with patch("locale.getpreferredencoding", em):
-                ret = auto_decode(data.encode(sys.getdefaultencoding()))
-        assert ret == data
-
-    @pytest.mark.parametrize("encoding", [encoding for bom, encoding in BOMS])
-    def test_all_encodings_are_valid(self, encoding: str) -> None:
-        # we really only care that there is no LookupError
-        assert "".encode(encoding).decode(encoding) == ""
-
-
 def raises(error: Type[Exception]) -> NoReturn:
     raise error
 

From d35384ef91cb372a5223a01f980e5deb84c8fde5 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 24 Jan 2025 18:09:21 -0500
Subject: [PATCH 673/992] Copyedit news entries before 25.0

---
 news/12176.feature.rst                       | 2 +-
 news/13048.process.rst                       | 2 --
 news/13079.bugfix.rst                        | 3 ++-
 news/13112.feature.rst                       | 2 +-
 news/13134.feature.rst                       | 2 +-
 news/{13163.feature.rst => 13163.bugfix.rst} | 2 +-
 news/5502.bugfix.rst                         | 5 +++--
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename news/{13163.feature.rst => 13163.bugfix.rst} (75%)

diff --git a/news/12176.feature.rst b/news/12176.feature.rst
index 5ff3b31f891..0e78f737cf8 100644
--- a/news/12176.feature.rst
+++ b/news/12176.feature.rst
@@ -1 +1 @@
-Pip now returns the size, along with the number, of files cleared on ``pip cache purge`` and ``pip cache remove``
+Return the size, along with the number, of files cleared on ``pip cache purge`` and ``pip cache remove``
diff --git a/news/13048.process.rst b/news/13048.process.rst
index b4d18461b7a..9e19f1f8017 100644
--- a/news/13048.process.rst
+++ b/news/13048.process.rst
@@ -1,3 +1 @@
 Started releasing to PyPI from a GitHub Actions CI/CD workflow that implements trusted publishing and bundles :pep:`740` digital attestations.
-
-In addition to being signed, the released distribution packages are now reproducible through the commit timestamp.
diff --git a/news/13079.bugfix.rst b/news/13079.bugfix.rst
index 5b297f5a12e..52db10b1781 100644
--- a/news/13079.bugfix.rst
+++ b/news/13079.bugfix.rst
@@ -1 +1,2 @@
-This change fixes a security bug allowing a wheel to execute code during installation.
+Fix a security bug allowing a specially crafted wheel to execute code during
+installation.
diff --git a/news/13112.feature.rst b/news/13112.feature.rst
index bf60883211f..1f9e44a49c6 100644
--- a/news/13112.feature.rst
+++ b/news/13112.feature.rst
@@ -1 +1 @@
-Prefer to display ``License-Expression`` in ``pip show`` if metadata version is at least 2.4.
+Prefer to display :pep:`639` ``License-Expression`` in ``pip show`` if metadata version is at least 2.4.
diff --git a/news/13134.feature.rst b/news/13134.feature.rst
index b87f67d376d..6509c158130 100644
--- a/news/13134.feature.rst
+++ b/news/13134.feature.rst
@@ -1,4 +1,4 @@
-Support :pep:`639` License-Expression and License-File metadata fields in JSON
+Support :pep:`639` ``License-Expression`` and ``License-File`` metadata fields in JSON
 output. ``pip inspect`` and ``pip install --report`` now emit
 ``license_expression`` and ``license_file`` fields in the ``metadata`` object,
 if the corresponding fields are present in the installed ``METADATA`` file.
diff --git a/news/13163.feature.rst b/news/13163.bugfix.rst
similarity index 75%
rename from news/13163.feature.rst
rename to news/13163.bugfix.rst
index 8d5709d230c..22d80d9a65a 100644
--- a/news/13163.feature.rst
+++ b/news/13163.bugfix.rst
@@ -1,4 +1,4 @@
-Note: Packaging 24.2 changes how pre-release specifiers with ``<`` and ``>``
+The inclusion of packaging 24.2 changes how pre-release specifiers with ``<`` and ``>``
 behave. Including a pre-release version with these specifiers now implies
 accepting pre-releases (e.g., ``<2.0dev`` can include ``1.0rc1``). To avoid
 implying pre-releases, avoid specifying them (e.g., use ``<2.0``).
diff --git a/news/5502.bugfix.rst b/news/5502.bugfix.rst
index 674c431bd3e..c8d27d99b9a 100644
--- a/news/5502.bugfix.rst
+++ b/news/5502.bugfix.rst
@@ -1,2 +1,3 @@
-Configured TLS server and client certificates are now used while installing build dependencies.
-Consequently, the private ``_PIP_STANDALONE_CERT`` environment variable is no longer used.
+The ``--cert`` and ``--client-cert`` command-line options are now respected while
+installing build dependencies. Consequently, the private ``_PIP_STANDALONE_CERT``
+environment variable is no longer used.

From 74a7f3335338712af44be95241daf62e756f27ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 26 Jan 2025 11:34:57 +0100
Subject: [PATCH 674/992] Update AUTHORS.txt

---
 AUTHORS.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 8ccefbc6e59..f42daec02e2 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -125,6 +125,7 @@ burrows
 Bussonnier Matthias
 bwoodsend
 c22
+Caleb Brown
 Caleb Martinez
 Calvin Smith
 Carl Meyer
@@ -134,6 +135,7 @@ Carter Thayer
 Cass
 Chandrasekhar Atina
 Charlie Marsh
+charwick
 Chih-Hsuan Yen
 Chris Brinker
 Chris Hunt
@@ -403,18 +405,22 @@ Josh Cannon
 Josh Hansen
 Josh Schneier
 Joshua
+JoshuaPerdue
 Juan Luis Cano Rodríguez
 Juanjo Bazán
 Judah Rand
 Julian Berman
 Julian Gethmann
 Julien Demoor
+July Tikhonov
 Jussi Kukkonen
+Justin van Heek
 jwg4
 Jyrki Pulliainen
 Kai Chen
 Kai Mueller
 Kamal Bin Mustafa
+Karolina Surma
 kasium
 kaustav haldar
 keanemind
@@ -625,6 +631,7 @@ R. David Murray
 Rafael Caricio
 Ralf Schmitt
 Ran Benita
+Randy Döring
 Razzi Abuissa
 rdb
 Reece Dunham

From f47b5874299848c688336ae7c8d69534013fe2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 26 Jan 2025 11:35:32 +0100
Subject: [PATCH 675/992] Bump for release

---
 NEWS.rst                                      | 65 +++++++++++++++++++
 news/11012.feature.rst                        |  3 -
 news/11820.bugfix.rst                         |  1 -
 news/12176.feature.rst                        |  1 -
 news/12455.doc.rst                            |  1 -
 news/12551.trivial.rst                        |  1 -
 news/12771.feature.rst                        |  2 -
 news/13031.trivial.rst                        |  1 -
 news/13048.process.rst                        |  1 -
 news/13072.trivial.rst                        |  0
 news/13079.bugfix.rst                         |  2 -
 news/13112.feature.rst                        |  1 -
 news/13128.feature.rst                        |  1 -
 news/13132.feature.rst                        |  1 -
 news/13134.feature.rst                        |  4 --
 news/13148.trivial.rst                        |  1 -
 news/13152.trivial.rst                        |  1 -
 news/13154.removal.rst                        |  2 -
 news/13163.bugfix.rst                         |  5 --
 ...b0-9c6e-49ca-bbdb-774ef0adbbfb.trivial.rst |  0
 news/5502.bugfix.rst                          |  3 -
 news/6018.bugfix.rst                          |  1 -
 news/CacheControl.vendor.rst                  |  1 -
 ...e8-84ca-48bf-98dc-1ccb196e7f47.trivial.rst |  0
 ...bb-2dcc-43d0-83ff-c762e7e55bf9.trivial.rst |  0
 ...df-d6ab-4d9b-8113-55c27a237dfd.trivial.rst |  0
 news/idna.vendor.rst                          |  1 -
 news/msgpack.vendor.rst                       |  1 -
 news/packaging.vendor.rst                     |  1 -
 news/platformdirs.vendor.rst                  |  1 -
 news/pyproject-hooks.vendor.rst               |  1 -
 news/rich.vendor.rst                          |  1 -
 news/tomli.vendor.rst                         |  1 -
 src/pip/__init__.py                           |  2 +-
 34 files changed, 66 insertions(+), 42 deletions(-)
 delete mode 100644 news/11012.feature.rst
 delete mode 100644 news/11820.bugfix.rst
 delete mode 100644 news/12176.feature.rst
 delete mode 100644 news/12455.doc.rst
 delete mode 100644 news/12551.trivial.rst
 delete mode 100644 news/12771.feature.rst
 delete mode 100644 news/13031.trivial.rst
 delete mode 100644 news/13048.process.rst
 delete mode 100644 news/13072.trivial.rst
 delete mode 100644 news/13079.bugfix.rst
 delete mode 100644 news/13112.feature.rst
 delete mode 100644 news/13128.feature.rst
 delete mode 100644 news/13132.feature.rst
 delete mode 100644 news/13134.feature.rst
 delete mode 100644 news/13148.trivial.rst
 delete mode 100644 news/13152.trivial.rst
 delete mode 100644 news/13154.removal.rst
 delete mode 100644 news/13163.bugfix.rst
 delete mode 100644 news/36c500b0-9c6e-49ca-bbdb-774ef0adbbfb.trivial.rst
 delete mode 100644 news/5502.bugfix.rst
 delete mode 100644 news/6018.bugfix.rst
 delete mode 100644 news/CacheControl.vendor.rst
 delete mode 100644 news/a6275be8-84ca-48bf-98dc-1ccb196e7f47.trivial.rst
 delete mode 100644 news/ba0bd1bb-2dcc-43d0-83ff-c762e7e55bf9.trivial.rst
 delete mode 100644 news/c33bb4df-d6ab-4d9b-8113-55c27a237dfd.trivial.rst
 delete mode 100644 news/idna.vendor.rst
 delete mode 100644 news/msgpack.vendor.rst
 delete mode 100644 news/packaging.vendor.rst
 delete mode 100644 news/platformdirs.vendor.rst
 delete mode 100644 news/pyproject-hooks.vendor.rst
 delete mode 100644 news/rich.vendor.rst
 delete mode 100644 news/tomli.vendor.rst

diff --git a/NEWS.rst b/NEWS.rst
index 2fd470a4065..9b1387666bd 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,71 @@
 
 .. towncrier release notes start
 
+25.0 (2025-01-26)
+=================
+
+Deprecations and Removals
+-------------------------
+
+- Deprecate the ``no-python-version-warning`` flag as it has long done nothing
+  since Python 2 support was removed in pip 21.0. (`#13154 `_)
+
+Features
+--------
+
+- Prefer to display :pep:`639` ``License-Expression`` in ``pip show`` if metadata version is at least 2.4. (`#13112 `_)
+- Support :pep:`639` ``License-Expression`` and ``License-File`` metadata fields in JSON
+  output. ``pip inspect`` and ``pip install --report`` now emit
+  ``license_expression`` and ``license_file`` fields in the ``metadata`` object,
+  if the corresponding fields are present in the installed ``METADATA`` file. (`#13134 `_)
+- Files in the network cache will inherit the read/write permissions of pip's cache
+  directory (in addition to the current user retaining read/write access). This
+  enables a single cache to be shared among multiple users. (`#11012 `_)
+- Return the size, along with the number, of files cleared on ``pip cache purge`` and ``pip cache remove`` (`#12176 `_)
+- Cache ``python-requires`` checks while filtering potential installation candidates. (`#13128 `_)
+- Optimize package collection by avoiding unnecessary URL parsing and other processing. (`#13132 `_)
+
+Bug Fixes
+---------
+
+- Reorder the encoding detection when decoding a requirements file, relying on
+  UTF-8 over the locale encoding by default, matching the documented behaviour.
+  (`#12771 `_)
+- The pip version self check is disabled on ``EXTERNALLY-MANAGED`` environments. (`#11820 `_)
+- Fix a security bug allowing a specially crafted wheel to execute code during
+  installation. (`#13079 `_)
+- The inclusion of ``packaging`` 24.2 changes how pre-release specifiers with ``<`` and ``>``
+  behave. Including a pre-release version with these specifiers now implies
+  accepting pre-releases (e.g., ``<2.0dev`` can include ``1.0rc1``). To avoid
+  implying pre-releases, avoid specifying them (e.g., use ``<2.0``).
+  The exception is ``!=``, which never implies pre-releases. (`#13163 `_)
+- The ``--cert`` and ``--client-cert`` command-line options are now respected while
+  installing build dependencies. Consequently, the private ``_PIP_STANDALONE_CERT``
+  environment variable is no longer used. (`#5502 `_)
+- The ``--proxy`` command-line option is now respected while installing build dependencies. (`#6018 `_)
+
+Vendored Libraries
+------------------
+
+- Upgrade CacheControl to 0.14.1
+- Upgrade idna to 3.10
+- Upgrade msgpack to 1.1.0
+- Upgrade packaging to 24.2
+- Upgrade platformdirs to 4.3.6
+- Upgrade pyproject-hooks to 1.2.0
+- Upgrade rich to 13.9.4
+- Upgrade tomli to 2.2.1
+
+Improved Documentation
+----------------------
+
+- Removed section about non-existing ``--force-keyring`` flag. (`#12455 `_)
+
+Process
+-------
+
+- Started releasing to PyPI from a GitHub Actions CI/CD workflow that implements trusted publishing and bundles :pep:`740` digital attestations.
+
 24.3.1 (2024-10-27)
 ===================
 
diff --git a/news/11012.feature.rst b/news/11012.feature.rst
deleted file mode 100644
index d913306c176..00000000000
--- a/news/11012.feature.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Files in the network cache will inherit the read/write permissions of pip's cache
-directory (in addition to the current user retaining read/write access). This
-enables a single cache to be shared among multiple users.
diff --git a/news/11820.bugfix.rst b/news/11820.bugfix.rst
deleted file mode 100644
index 68b23ef11ec..00000000000
--- a/news/11820.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-The pip version self check is disabled on ``EXTERNALLY-MANAGED`` environments.
diff --git a/news/12176.feature.rst b/news/12176.feature.rst
deleted file mode 100644
index 0e78f737cf8..00000000000
--- a/news/12176.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Return the size, along with the number, of files cleared on ``pip cache purge`` and ``pip cache remove``
diff --git a/news/12455.doc.rst b/news/12455.doc.rst
deleted file mode 100644
index 2e0d4c1970c..00000000000
--- a/news/12455.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removed section about non-existing ``--force-keyring`` flag.
diff --git a/news/12551.trivial.rst b/news/12551.trivial.rst
deleted file mode 100644
index bfd5e9f1e9e..00000000000
--- a/news/12551.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Integrate ``sphinx-issues`` into the Sphinx config.
diff --git a/news/12771.feature.rst b/news/12771.feature.rst
deleted file mode 100644
index 68b2f14aade..00000000000
--- a/news/12771.feature.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Reorder the encoding detection when decoding a requirements file, relying on
-UTF-8 over the locale encoding by default.
diff --git a/news/13031.trivial.rst b/news/13031.trivial.rst
deleted file mode 100644
index d765e810e40..00000000000
--- a/news/13031.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Correct documentation errors.
diff --git a/news/13048.process.rst b/news/13048.process.rst
deleted file mode 100644
index 9e19f1f8017..00000000000
--- a/news/13048.process.rst
+++ /dev/null
@@ -1 +0,0 @@
-Started releasing to PyPI from a GitHub Actions CI/CD workflow that implements trusted publishing and bundles :pep:`740` digital attestations.
diff --git a/news/13072.trivial.rst b/news/13072.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/13079.bugfix.rst b/news/13079.bugfix.rst
deleted file mode 100644
index 52db10b1781..00000000000
--- a/news/13079.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a security bug allowing a specially crafted wheel to execute code during
-installation.
diff --git a/news/13112.feature.rst b/news/13112.feature.rst
deleted file mode 100644
index 1f9e44a49c6..00000000000
--- a/news/13112.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Prefer to display :pep:`639` ``License-Expression`` in ``pip show`` if metadata version is at least 2.4.
diff --git a/news/13128.feature.rst b/news/13128.feature.rst
deleted file mode 100644
index 6985d78b87e..00000000000
--- a/news/13128.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Cache ``python-requires`` checks while filtering potential installation candidates.
diff --git a/news/13132.feature.rst b/news/13132.feature.rst
deleted file mode 100644
index d8cd57e7c56..00000000000
--- a/news/13132.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Optimize package collection by avoiding unnecessary URL parsing and other processing.
diff --git a/news/13134.feature.rst b/news/13134.feature.rst
deleted file mode 100644
index 6509c158130..00000000000
--- a/news/13134.feature.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Support :pep:`639` ``License-Expression`` and ``License-File`` metadata fields in JSON
-output. ``pip inspect`` and ``pip install --report`` now emit
-``license_expression`` and ``license_file`` fields in the ``metadata`` object,
-if the corresponding fields are present in the installed ``METADATA`` file.
diff --git a/news/13148.trivial.rst b/news/13148.trivial.rst
deleted file mode 100644
index dcdd0bf5e8d..00000000000
--- a/news/13148.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix mypy 1.14.1 error
diff --git a/news/13152.trivial.rst b/news/13152.trivial.rst
deleted file mode 100644
index 1720322f606..00000000000
--- a/news/13152.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Switch to ubuntu-22.04 for github workflow.
diff --git a/news/13154.removal.rst b/news/13154.removal.rst
deleted file mode 100644
index c41e92bf1f7..00000000000
--- a/news/13154.removal.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Deprecate the ``no-python-version-warning`` flag as it has long done nothing
-since Python 2 support was removed in pip 21.0.
diff --git a/news/13163.bugfix.rst b/news/13163.bugfix.rst
deleted file mode 100644
index 22d80d9a65a..00000000000
--- a/news/13163.bugfix.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-The inclusion of packaging 24.2 changes how pre-release specifiers with ``<`` and ``>``
-behave. Including a pre-release version with these specifiers now implies
-accepting pre-releases (e.g., ``<2.0dev`` can include ``1.0rc1``). To avoid
-implying pre-releases, avoid specifying them (e.g., use ``<2.0``).
-The exception is ``!=``, which never implies pre-releases.
diff --git a/news/36c500b0-9c6e-49ca-bbdb-774ef0adbbfb.trivial.rst b/news/36c500b0-9c6e-49ca-bbdb-774ef0adbbfb.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/5502.bugfix.rst b/news/5502.bugfix.rst
deleted file mode 100644
index c8d27d99b9a..00000000000
--- a/news/5502.bugfix.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-The ``--cert`` and ``--client-cert`` command-line options are now respected while
-installing build dependencies. Consequently, the private ``_PIP_STANDALONE_CERT``
-environment variable is no longer used.
diff --git a/news/6018.bugfix.rst b/news/6018.bugfix.rst
deleted file mode 100644
index 0171b5bbc3b..00000000000
--- a/news/6018.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-The ``--proxy`` command-line option is now respected while installing build dependencies.
diff --git a/news/CacheControl.vendor.rst b/news/CacheControl.vendor.rst
deleted file mode 100644
index be97db23956..00000000000
--- a/news/CacheControl.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade CacheControl to 0.14.1
diff --git a/news/a6275be8-84ca-48bf-98dc-1ccb196e7f47.trivial.rst b/news/a6275be8-84ca-48bf-98dc-1ccb196e7f47.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/ba0bd1bb-2dcc-43d0-83ff-c762e7e55bf9.trivial.rst b/news/ba0bd1bb-2dcc-43d0-83ff-c762e7e55bf9.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/c33bb4df-d6ab-4d9b-8113-55c27a237dfd.trivial.rst b/news/c33bb4df-d6ab-4d9b-8113-55c27a237dfd.trivial.rst
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/news/idna.vendor.rst b/news/idna.vendor.rst
deleted file mode 100644
index ef21715c5a4..00000000000
--- a/news/idna.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade idna to 3.10
diff --git a/news/msgpack.vendor.rst b/news/msgpack.vendor.rst
deleted file mode 100644
index d9efb5bc3f5..00000000000
--- a/news/msgpack.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade msgpack to 1.1.0
diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst
deleted file mode 100644
index d03b06e2c6f..00000000000
--- a/news/packaging.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade packaging to 24.2
diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
deleted file mode 100644
index 360a631e567..00000000000
--- a/news/platformdirs.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade platformdirs to 4.3.6
diff --git a/news/pyproject-hooks.vendor.rst b/news/pyproject-hooks.vendor.rst
deleted file mode 100644
index 44af87f5e58..00000000000
--- a/news/pyproject-hooks.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade pyproject-hooks to 1.2.0
diff --git a/news/rich.vendor.rst b/news/rich.vendor.rst
deleted file mode 100644
index 046c0d8b43c..00000000000
--- a/news/rich.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade rich to 13.9.4
diff --git a/news/tomli.vendor.rst b/news/tomli.vendor.rst
deleted file mode 100644
index 53b3bd07be4..00000000000
--- a/news/tomli.vendor.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade tomli to 2.2.1
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index 4eff4299c01..d047e4789e8 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "25.0.dev0"
+__version__ = "25.0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From f58b0414bdb846467b29befe918ae828cc02afd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 26 Jan 2025 11:35:34 +0100
Subject: [PATCH 676/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index d047e4789e8..72909e402d3 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "25.0"
+__version__ = "25.1.dev0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 86827e47a5454ccb83bc1685aa14752db8892f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 26 Jan 2025 15:13:39 +0100
Subject: [PATCH 677/992] Add build-project.py compatibility note

---
 build-project.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-project.py b/build-project.py
index 78e183da08a..5f7cc204218 100755
--- a/build-project.py
+++ b/build-project.py
@@ -36,6 +36,9 @@ def get_git_head_timestamp() -> str:
 def main() -> None:
     with tempfile.TemporaryDirectory() as build_env:
         env_builder = EnvBuilder(with_pip=True)
+        # If this venv creation step fails, you may be hitting
+        # https://github.com/astral-sh/python-build-standalone/issues/381
+        # Try running with a another Python distribution.
         env_builder.create(build_env)
         subprocess.run(
             [

From 6f8a7843810c5860baed09001b654899ee8e8769 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 26 Jan 2025 10:49:21 -0500
Subject: [PATCH 678/992] Patch out EXTERNALLY-MANAGED for self-check tests
 (#13179)

This helps redistributors test against their distro Python w/o
spurious errors.
---
 tests/unit/test_self_check_outdated.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/test_self_check_outdated.py b/tests/unit/test_self_check_outdated.py
index a5310ca7b19..fba794bc810 100644
--- a/tests/unit/test_self_check_outdated.py
+++ b/tests/unit/test_self_check_outdated.py
@@ -38,6 +38,7 @@ def test_get_statefile_name_known_values(key: str, expected: str) -> None:
 @freeze_time("1970-01-02T11:00:00Z")
 @patch("pip._internal.self_outdated_check._self_version_check_logic")
 @patch("pip._internal.self_outdated_check.SelfCheckState")
+@patch("pip._internal.self_outdated_check.check_externally_managed", new=lambda: None)
 def test_pip_self_version_check_calls_underlying_implementation(
     mocked_state: Mock, mocked_function: Mock, tmpdir: Path
 ) -> None:

From 2b300f8c846c4bba4c8e76129848abdc71e110b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 26 Jan 2025 15:47:12 +0100
Subject: [PATCH 679/992] Update the release process docs

To mention the required approval step.
---
 docs/html/development/release-process.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/html/development/release-process.rst b/docs/html/development/release-process.rst
index 77ee9b5d46b..8b56c5e3a8f 100644
--- a/docs/html/development/release-process.rst
+++ b/docs/html/development/release-process.rst
@@ -147,7 +147,12 @@ Creating a new release
 #. Submit the ``release/YY.N`` branch as a pull request and ensure CI passes.
    Merge the changes back into ``main`` and pull them back locally.
 #. Push the tag created by ``prepare-release``. This will trigger the release
-   workflow on GitHub and publish to PyPI.
+   workflow on GitHub.
+#. Go to https://github.com/pypa/pip/actions, find the latest ``Publish Python
+   🐍 distribution 📦 to PyPI`` workflow run, open it, wait for the build step
+   to complete, then approve the PyPI environment to let the publishing step
+   run. If you desire, you have the possibility to download and inspect the
+   artifacts before approving.
 #. Regenerate the ``get-pip.py`` script in the `get-pip repository`_ (as
    documented there) and commit the results.
 #. Submit a Pull Request to `CPython`_ adding the new version of pip

From a2022f11f7849d10a8debe8f24dceb3da837eb04 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 26 Jan 2025 11:00:48 -0500
Subject: [PATCH 680/992] Fix locate_file() type hints for older Pythons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🤦
---
 news/13181.bugfix.rst                          | 2 ++
 src/pip/_internal/metadata/importlib/_dists.py | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 news/13181.bugfix.rst

diff --git a/news/13181.bugfix.rst b/news/13181.bugfix.rst
new file mode 100644
index 00000000000..ff1d872da8d
--- /dev/null
+++ b/news/13181.bugfix.rst
@@ -0,0 +1,2 @@
+Restore opt-in ``importlib.metadata`` backend support on Python 3.10 and lower
+by fixing an unsupported type annotation.
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index cf8685439a9..d220b616e28 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -11,6 +11,7 @@
     Mapping,
     Optional,
     Sequence,
+    Union,
     cast,
 )
 
@@ -96,7 +97,7 @@ def read_text(self, filename: str) -> Optional[str]:
             raise UnsupportedWheel(error)
         return text
 
-    def locate_file(self, path: str | PathLike[str]) -> pathlib.Path:
+    def locate_file(self, path: Union[str, "PathLike[str]"]) -> pathlib.Path:
         # This method doesn't make sense for our in-memory wheel, but the API
         # requires us to define it.
         raise NotImplementedError

From d70900037cdae161ebfa0ea163bdc887fb9e8a31 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 26 Jan 2025 11:27:38 -0500
Subject: [PATCH 681/992] Enable linting rule FA102

---
 build-project.py | 3 ++-
 pyproject.toml   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build-project.py b/build-project.py
index 5f7cc204218..2108669ca6f 100755
--- a/build-project.py
+++ b/build-project.py
@@ -7,13 +7,14 @@
 from os import PathLike
 from pathlib import Path
 from types import SimpleNamespace
+from typing import Union
 
 
 class EnvBuilder(venv.EnvBuilder):
     """A subclass of venv.EnvBuilder that exposes the python executable command."""
 
     def ensure_directories(
-        self, env_dir: str | bytes | PathLike[str] | PathLike[bytes]
+        self, env_dir: Union[str, bytes, "PathLike[str]", "PathLike[bytes]"]
     ) -> SimpleNamespace:
         context = super().ensure_directories(env_dir)
         self.env_exec_cmd = context.env_exec_cmd
diff --git a/pyproject.toml b/pyproject.toml
index 5d8dde277be..17f5effb2ae 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -184,6 +184,7 @@ select = [
     "W",
     "RUF100",
     "UP",
+    "FA102",
 ]
 
 [tool.ruff.lint.isort]

From 50b2f8c8a1d9dbd86c361de870e03d52d21a0f0e Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 26 Jan 2025 11:34:40 -0500
Subject: [PATCH 682/992] NEWS ENTRY

---
 news/13182.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/13182.trivial.rst

diff --git a/news/13182.trivial.rst b/news/13182.trivial.rst
new file mode 100644
index 00000000000..c2a4d5b79e5
--- /dev/null
+++ b/news/13182.trivial.rst
@@ -0,0 +1 @@
+Enabling linting rule FA102.

From 2d42f9a472cabc20b6054e308a9affb11c388e09 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 26 Jan 2025 12:16:16 -0500
Subject: [PATCH 683/992] Add comment to Ruff config

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 17f5effb2ae..ed79101bf06 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -184,7 +184,7 @@ select = [
     "W",
     "RUF100",
     "UP",
-    "FA102",
+    "FA102",  # future-required-type-annotation
 ]
 
 [tool.ruff.lint.isort]

From ab2c978bbefd647a91eb32f256360eec8454435e Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <164889026+krishanbhasin-px@users.noreply.github.com>
Date: Tue, 28 Jan 2025 16:21:49 +0000
Subject: [PATCH 684/992] [WIP] make `pip index versions` no longer
 experimental

---
 docs/man/commands/index.rst         | 20 ++++++++++++++++++++
 news/13188.feature.rst              |  2 ++
 src/pip/_internal/commands/index.py |  6 ------
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 docs/man/commands/index.rst
 create mode 100644 news/13188.feature.rst

diff --git a/docs/man/commands/index.rst b/docs/man/commands/index.rst
new file mode 100644
index 00000000000..fe00870b965
--- /dev/null
+++ b/docs/man/commands/index.rst
@@ -0,0 +1,20 @@
+:orphan:
+
+===========
+pip-index
+===========
+
+Description
+***********
+
+.. pip-command-description:: index
+
+Usage
+*****
+
+.. pip-command-usage:: index
+
+Options
+*******
+
+.. pip-command-options:: index
diff --git a/news/13188.feature.rst b/news/13188.feature.rst
new file mode 100644
index 00000000000..15cb1fe5d18
--- /dev/null
+++ b/news/13188.feature.rst
@@ -0,0 +1,2 @@
+Remove `experimental` warning from `pip index versions` command and
+add json output support.
\ No newline at end of file
diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py
index 2e2661bba71..82da487bf2a 100644
--- a/src/pip/_internal/commands/index.py
+++ b/src/pip/_internal/commands/index.py
@@ -50,12 +50,6 @@ def run(self, options: Values, args: List[str]) -> int:
             "versions": self.get_available_package_versions,
         }
 
-        logger.warning(
-            "pip index is currently an experimental command. "
-            "It may be removed/changed in a future release "
-            "without prior warning."
-        )
-
         # Determine action
         if not args or args[0] not in handlers:
             logger.error(

From 127134aba9304d1211de99bed9b57f9ee12a7cf8 Mon Sep 17 00:00:00 2001
From: Fredrik Roubert 
Date: Tue, 14 Jan 2025 03:32:30 +0900
Subject: [PATCH 685/992] Switch to using lstat() instead of stat() to not
 match symlink targets.

The convenience function samefile() calls stat() and samestat(), but
this leads to treating a symlink and its target as the same which is
unlikely to be intentional here as that doesn't work well with venv.
---
 news/13156.bugfix.rst                  | 1 +
 src/pip/_internal/utils/entrypoints.py | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 news/13156.bugfix.rst

diff --git a/news/13156.bugfix.rst b/news/13156.bugfix.rst
new file mode 100644
index 00000000000..e0553030070
--- /dev/null
+++ b/news/13156.bugfix.rst
@@ -0,0 +1 @@
+Show the correct path to the interpreter also when it's a symlink in a venv in the pip upgrade prompt.
diff --git a/src/pip/_internal/utils/entrypoints.py b/src/pip/_internal/utils/entrypoints.py
index 15013693854..696148c5097 100644
--- a/src/pip/_internal/utils/entrypoints.py
+++ b/src/pip/_internal/utils/entrypoints.py
@@ -77,7 +77,10 @@ def get_best_invocation_for_this_python() -> str:
 
     # Try to use the basename, if it's the first executable.
     found_executable = shutil.which(exe_name)
-    if found_executable and os.path.samefile(found_executable, exe):
+    # Virtual environments often symlink to their parent Python binaries, but we don't
+    # want to treat the Python binaries as equivalent when the environment's Python is
+    # not on PATH (not activated). Thus, we don't follow symlinks.
+    if found_executable and os.path.samestat(os.lstat(found_executable), os.lstat(exe)):
         return exe_name
 
     # Use the full executable name, because we couldn't find something simpler.

From 40187ef5ee41d43462050a7c31dc2b7363686ae6 Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <164889026+krishanbhasin-px@users.noreply.github.com>
Date: Tue, 28 Jan 2025 17:24:56 +0000
Subject: [PATCH 686/992] Add the outline for  structured output

---
 src/pip/_internal/cli/cmdoptions.py |  8 ++++++++
 src/pip/_internal/commands/index.py | 19 +++++++++++++++++++
 tests/functional/test_index.py      | 26 ++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index eeb7e651b79..73539345c3c 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -887,6 +887,14 @@ def _handle_config_settings(
     "pip only finds stable versions.",
 )
 
+json: Callable[..., Option] = partial(
+    Option,
+    "--json",
+    action="store_true",
+    default=False,
+    help="Output data in a machine-readable JSON format.",
+)
+
 disable_pip_version_check: Callable[..., Option] = partial(
     Option,
     "--disable-pip-version-check",
diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py
index 2e2661bba71..9620a1f6eae 100644
--- a/src/pip/_internal/commands/index.py
+++ b/src/pip/_internal/commands/index.py
@@ -1,7 +1,9 @@
+import json
 import logging
 from optparse import Values
 from typing import Any, Iterable, List, Optional
 
+from pip._internal.metadata import get_default_environment
 from pip._vendor.packaging.version import Version
 
 from pip._internal.cli import cmdoptions
@@ -34,6 +36,7 @@ def add_options(self) -> None:
 
         self.cmd_opts.add_option(cmdoptions.ignore_requires_python())
         self.cmd_opts.add_option(cmdoptions.pre())
+        self.cmd_opts.add_option(cmdoptions.json())
         self.cmd_opts.add_option(cmdoptions.no_binary())
         self.cmd_opts.add_option(cmdoptions.only_binary())
 
@@ -134,6 +137,22 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
             formatted_versions = [str(ver) for ver in sorted(versions, reverse=True)]
             latest = formatted_versions[0]
 
+        if options.json:
+            env = get_default_environment()
+            dist = env.get_distribution(query)
+            structured_output = {
+                    "name": query,
+                    "versions": formatted_versions,
+                    "latest": latest,
+                }
+
+            if dist is not None:
+                structured_output["installed_version"] = dist.version
+
+
+            write_output(json.dumps(structured_output))
+            return
+
         write_output(f"{query} ({latest})")
         write_output("Available versions: {}".format(", ".join(formatted_versions)))
         print_dist_installation_info(query, latest)
diff --git a/tests/functional/test_index.py b/tests/functional/test_index.py
index 5a3c27bac9d..6566ddfceae 100644
--- a/tests/functional/test_index.py
+++ b/tests/functional/test_index.py
@@ -1,3 +1,4 @@
+import json
 import pytest
 
 from pip._internal.cli.status_codes import ERROR, SUCCESS
@@ -6,6 +7,31 @@
 from tests.lib import PipTestEnvironment
 
 
+@pytest.mark.network
+def test_json_structured_output(script: PipTestEnvironment) -> None:
+    """
+    Test that --json flag returns structured output
+    """
+    output = script.pip("index", "versions", "pip", "--json", allow_stderr_warning=True)
+    structured_output = json.loads(output.stdout)
+
+    assert "name" in structured_output
+    assert "versions" in structured_output
+    assert "latest" in structured_output
+    assert (
+        "20.2.3, 20.2.2, 20.2.1, 20.2, 20.1.1, 20.1, 20.0.2"
+        ", 20.0.1, 19.3.1, 19.3, 19.2.3, 19.2.2, 19.2.1, 19.2, 19.1.1"
+        ", 19.1, 19.0.3, 19.0.2, 19.0.1, 19.0, 18.1, 18.0, 10.0.1, 10.0.0, "
+        "9.0.3, 9.0.2, 9.0.1, 9.0.0, 8.1.2, 8.1.1, "
+        "8.1.0, 8.0.3, 8.0.2, 8.0.1, 8.0.0, 7.1.2, 7.1.1, 7.1.0, 7.0.3, "
+        "7.0.2, 7.0.1, 7.0.0, 6.1.1, 6.1.0, 6.0.8, 6.0.7, 6.0.6, 6.0.5, "
+        "6.0.4, 6.0.3, 6.0.2, 6.0.1, 6.0, 1.5.6, 1.5.5, 1.5.4, 1.5.3, "
+        "1.5.2, 1.5.1, 1.5, 1.4.1, 1.4, 1.3.1, 1.3, 1.2.1, 1.2, 1.1, 1.0.2,"
+        " 1.0.1, 1.0, 0.8.3, 0.8.2, 0.8.1, 0.8, 0.7.2, 0.7.1, 0.7, 0.6.3, "
+        "0.6.2, 0.6.1, 0.6, 0.5.1, 0.5, 0.4, 0.3.1, "
+        "0.3, 0.2.1, 0.2" in structured_output.get("versions")
+    )
+
 @pytest.mark.network
 def test_list_all_versions_basic_search(script: PipTestEnvironment) -> None:
     """

From 33d7de4f9043b8524c5890bb81a12f0ee8cedba1 Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <8904718+KrishanBhasin@users.noreply.github.com>
Date: Thu, 30 Jan 2025 21:58:57 +0000
Subject: [PATCH 687/992] fixup! Add the outline for  structured output

---
 src/pip/_internal/commands/index.py | 2 +-
 tests/functional/test_index.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py
index 9620a1f6eae..237af495713 100644
--- a/src/pip/_internal/commands/index.py
+++ b/src/pip/_internal/commands/index.py
@@ -147,7 +147,7 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
                 }
 
             if dist is not None:
-                structured_output["installed_version"] = dist.version
+                structured_output["installed_version"] = str(dist.version)
 
 
             write_output(json.dumps(structured_output))
diff --git a/tests/functional/test_index.py b/tests/functional/test_index.py
index 6566ddfceae..3edb17bf17e 100644
--- a/tests/functional/test_index.py
+++ b/tests/functional/test_index.py
@@ -29,7 +29,7 @@ def test_json_structured_output(script: PipTestEnvironment) -> None:
         "1.5.2, 1.5.1, 1.5, 1.4.1, 1.4, 1.3.1, 1.3, 1.2.1, 1.2, 1.1, 1.0.2,"
         " 1.0.1, 1.0, 0.8.3, 0.8.2, 0.8.1, 0.8, 0.7.2, 0.7.1, 0.7, 0.6.3, "
         "0.6.2, 0.6.1, 0.6, 0.5.1, 0.5, 0.4, 0.3.1, "
-        "0.3, 0.2.1, 0.2" in structured_output.get("versions")
+        "0.3, 0.2.1, 0.2" in ", ".join(structured_output.get("versions"))
     )
 
 @pytest.mark.network

From 52a76a55e57f1169b9eff3c40327a3d285d32457 Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <8904718+KrishanBhasin@users.noreply.github.com>
Date: Thu, 30 Jan 2025 21:59:08 +0000
Subject: [PATCH 688/992] lint

---
 src/pip/_internal/commands/index.py | 11 +++++------
 tests/functional/test_index.py      |  2 ++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py
index 237af495713..47f38179999 100644
--- a/src/pip/_internal/commands/index.py
+++ b/src/pip/_internal/commands/index.py
@@ -3,7 +3,6 @@
 from optparse import Values
 from typing import Any, Iterable, List, Optional
 
-from pip._internal.metadata import get_default_environment
 from pip._vendor.packaging.version import Version
 
 from pip._internal.cli import cmdoptions
@@ -13,6 +12,7 @@
 from pip._internal.exceptions import CommandError, DistributionNotFound, PipError
 from pip._internal.index.collector import LinkCollector
 from pip._internal.index.package_finder import PackageFinder
+from pip._internal.metadata import get_default_environment
 from pip._internal.models.selection_prefs import SelectionPreferences
 from pip._internal.models.target_python import TargetPython
 from pip._internal.network.session import PipSession
@@ -141,15 +141,14 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
             env = get_default_environment()
             dist = env.get_distribution(query)
             structured_output = {
-                    "name": query,
-                    "versions": formatted_versions,
-                    "latest": latest,
-                }
+                "name": query,
+                "versions": formatted_versions,
+                "latest": latest,
+            }
 
             if dist is not None:
                 structured_output["installed_version"] = str(dist.version)
 
-
             write_output(json.dumps(structured_output))
             return
 
diff --git a/tests/functional/test_index.py b/tests/functional/test_index.py
index 3edb17bf17e..2d60ba21bfe 100644
--- a/tests/functional/test_index.py
+++ b/tests/functional/test_index.py
@@ -1,4 +1,5 @@
 import json
+
 import pytest
 
 from pip._internal.cli.status_codes import ERROR, SUCCESS
@@ -32,6 +33,7 @@ def test_json_structured_output(script: PipTestEnvironment) -> None:
         "0.3, 0.2.1, 0.2" in ", ".join(structured_output.get("versions"))
     )
 
+
 @pytest.mark.network
 def test_list_all_versions_basic_search(script: PipTestEnvironment) -> None:
     """

From 47f94de1fe81d00cfc1d9eec1653bb0e53e6f0d2 Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <8904718+KrishanBhasin@users.noreply.github.com>
Date: Thu, 30 Jan 2025 22:15:59 +0000
Subject: [PATCH 689/992] add news entry

---
 news/13194.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/13194.feature.rst

diff --git a/news/13194.feature.rst b/news/13194.feature.rst
new file mode 100644
index 00000000000..f8141cf08ce
--- /dev/null
+++ b/news/13194.feature.rst
@@ -0,0 +1 @@
+Add a structured `--json` output to `pip index versions`

From 88d748b4fcac8d2a2b0d64ed3e5495c15282c3c3 Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <8904718+KrishanBhasin@users.noreply.github.com>
Date: Thu, 30 Jan 2025 22:21:10 +0000
Subject: [PATCH 690/992] fixup! add news entry

---
 news/13194.feature.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/13194.feature.rst b/news/13194.feature.rst
index f8141cf08ce..0ed40e3ab0b 100644
--- a/news/13194.feature.rst
+++ b/news/13194.feature.rst
@@ -1 +1 @@
-Add a structured `--json` output to `pip index versions`
+Add a structured ``--json`` output to ``pip index versions``

From f3548985fd7ffce6637bd87daab553605c3c2d1d Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <8904718+KrishanBhasin@users.noreply.github.com>
Date: Thu, 30 Jan 2025 22:41:19 +0000
Subject: [PATCH 691/992] fixup! fixup! Add the outline for  structured output

---
 tests/functional/test_index.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/functional/test_index.py b/tests/functional/test_index.py
index 2d60ba21bfe..b58ad4a50d6 100644
--- a/tests/functional/test_index.py
+++ b/tests/functional/test_index.py
@@ -16,9 +16,13 @@ def test_json_structured_output(script: PipTestEnvironment) -> None:
     output = script.pip("index", "versions", "pip", "--json", allow_stderr_warning=True)
     structured_output = json.loads(output.stdout)
 
+    assert isinstance(structured_output, dict)
     assert "name" in structured_output
-    assert "versions" in structured_output
+    assert structured_output["name"] == "pip"
     assert "latest" in structured_output
+    assert isinstance(structured_output["latest"], str)
+    assert "versions" in structured_output
+    assert isinstance(structured_output["versions"], list)
     assert (
         "20.2.3, 20.2.2, 20.2.1, 20.2, 20.1.1, 20.1, 20.0.2"
         ", 20.0.1, 19.3.1, 19.3, 19.2.3, 19.2.2, 19.2.1, 19.2, 19.1.1"
@@ -30,7 +34,7 @@ def test_json_structured_output(script: PipTestEnvironment) -> None:
         "1.5.2, 1.5.1, 1.5, 1.4.1, 1.4, 1.3.1, 1.3, 1.2.1, 1.2, 1.1, 1.0.2,"
         " 1.0.1, 1.0, 0.8.3, 0.8.2, 0.8.1, 0.8, 0.7.2, 0.7.1, 0.7, 0.6.3, "
         "0.6.2, 0.6.1, 0.6, 0.5.1, 0.5, 0.4, 0.3.1, "
-        "0.3, 0.2.1, 0.2" in ", ".join(structured_output.get("versions"))
+        "0.3, 0.2.1, 0.2" in ", ".join(structured_output["versions"])
     )
 
 

From 519c21210b24fc2b884741262ea3274827b4a9c5 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 30 Jan 2025 18:55:32 -0500
Subject: [PATCH 692/992] Don't pass --cert to build subprocesses unless also
 given on CLI

This fixes a regression introduced by commit 34fc0e20bd91f7facd1. After
that patch, --cert would always be given to the nested pip call, either
pointing to pip's CA bundle, or to whatever the user had set on the CLI.
This means truststore is always disabled... which is bad.

We used to have to do some shenanigans to pass the CA bundle to the
subprocess as certifi doesn't (didn't?) really play nice when in a
zipfile. Regardless, we stopped packing pip into a zipfile to provision
the build environment a while ago, so we can simply do the normal thing
and pass --cert when it's actually given. Otherwise, the subprocess will
find its CA bundle without fuss.

There apparently aren't any truststore tests (as testing system CAs is
probably a pain), so I didn't add one here either. At some point, we
should, though.
---
 news/13186.bugfix.rst          | 1 +
 src/pip/_internal/build_env.py | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 news/13186.bugfix.rst

diff --git a/news/13186.bugfix.rst b/news/13186.bugfix.rst
new file mode 100644
index 00000000000..0c60275d2b8
--- /dev/null
+++ b/news/13186.bugfix.rst
@@ -0,0 +1 @@
+Fix regression where truststore would never be used while installing build dependencies.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index e820dc3d5fb..e8d1aca0d6a 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -11,7 +11,6 @@
 from types import TracebackType
 from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple, Type, Union
 
-from pip._vendor.certifi import where
 from pip._vendor.packaging.version import Version
 
 from pip import __file__ as pip_location
@@ -246,8 +245,6 @@ def _install_requirements(
             # target from config file or env var should be ignored
             "--target",
             "",
-            "--cert",
-            finder.custom_cert or where(),
         ]
         if logger.getEffectiveLevel() <= logging.DEBUG:
             args.append("-vv")
@@ -276,6 +273,8 @@ def _install_requirements(
             args.extend(["--proxy", finder.proxy])
         for host in finder.trusted_hosts:
             args.extend(["--trusted-host", host])
+        if finder.custom_cert:
+            args.extend(["--cert", finder.custom_cert])
         if finder.client_cert:
             args.extend(["--client-cert", finder.client_cert])
         if finder.allow_all_prereleases:

From acfcae8941bb12ecfc372a05c875a7b414992604 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Thu, 30 Jan 2025 08:17:02 -0500
Subject: [PATCH 693/992] Update black to 25.1.0

---
 .pre-commit-config.yaml                                 | 2 +-
 noxfile.py                                              | 3 +--
 src/pip/_internal/build_env.py                          | 3 +--
 src/pip/_internal/cache.py                              | 3 +--
 src/pip/_internal/cli/__init__.py                       | 3 +--
 src/pip/_internal/cli/autocompletion.py                 | 3 +--
 src/pip/_internal/cli/main.py                           | 3 +--
 src/pip/_internal/cli/main_parser.py                    | 3 +--
 src/pip/_internal/index/__init__.py                     | 3 +--
 src/pip/_internal/models/__init__.py                    | 3 +--
 src/pip/_internal/models/direct_url.py                  | 2 +-
 src/pip/_internal/network/__init__.py                   | 3 +--
 src/pip/_internal/network/cache.py                      | 3 +--
 src/pip/_internal/network/download.py                   | 3 +--
 src/pip/_internal/network/xmlrpc.py                     | 3 +--
 src/pip/_internal/operations/build/metadata.py          | 3 +--
 src/pip/_internal/operations/build/metadata_editable.py | 3 +--
 src/pip/_internal/operations/build/metadata_legacy.py   | 3 +--
 src/pip/_internal/operations/check.py                   | 3 +--
 src/pip/_internal/operations/install/__init__.py        | 3 +--
 src/pip/_internal/operations/install/editable_legacy.py | 3 +--
 src/pip/_internal/operations/install/wheel.py           | 3 +--
 src/pip/_internal/operations/prepare.py                 | 3 +--
 src/pip/_internal/req/req_uninstall.py                  | 2 +-
 src/pip/_internal/utils/compatibility_tags.py           | 3 +--
 src/pip/_internal/utils/datetime.py                     | 3 +--
 src/pip/_internal/utils/filetypes.py                    | 3 +--
 src/pip/_internal/utils/unpacking.py                    | 3 +--
 src/pip/_internal/utils/wheel.py                        | 3 +--
 src/pip/_internal/wheel_builder.py                      | 3 +--
 tests/functional/test_cli.py                            | 3 +--
 tests/functional/test_configuration.py                  | 3 +--
 tests/lib/configuration_helpers.py                      | 3 +--
 tests/lib/filesystem.py                                 | 3 +--
 tests/lib/options_helpers.py                            | 3 +--
 tests/lib/requests_mocks.py                             | 3 +--
 tests/lib/server.py                                     | 2 +-
 tests/lib/test_wheel.py                                 | 3 +--
 tests/lib/wheel.py                                      | 3 +--
 tests/unit/resolution_resolvelib/test_resolver.py       | 2 +-
 tests/unit/test_appdirs.py                              | 2 +-
 tests/unit/test_base_command.py                         | 4 ++--
 tests/unit/test_configuration.py                        | 3 +--
 tests/unit/test_models.py                               | 3 +--
 tools/release/check_version.py                          | 3 +--
 45 files changed, 46 insertions(+), 84 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ebbd323b389..279884b1446 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
     exclude: .patch
 
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 24.10.0
+  rev: 25.1.0
   hooks:
   - id: black
 
diff --git a/noxfile.py b/noxfile.py
index 70e24a01142..80c7358e034 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -1,5 +1,4 @@
-"""Automation using nox.
-"""
+"""Automation using nox."""
 
 import argparse
 import glob
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index e820dc3d5fb..d56e23d93c9 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -1,5 +1,4 @@
-"""Build Environment used for isolation during sdist building
-"""
+"""Build Environment used for isolation during sdist building"""
 
 import logging
 import os
diff --git a/src/pip/_internal/cache.py b/src/pip/_internal/cache.py
index 6b4512672db..97d917193d3 100644
--- a/src/pip/_internal/cache.py
+++ b/src/pip/_internal/cache.py
@@ -1,5 +1,4 @@
-"""Cache Management
-"""
+"""Cache Management"""
 
 import hashlib
 import json
diff --git a/src/pip/_internal/cli/__init__.py b/src/pip/_internal/cli/__init__.py
index e589bb917e2..5fcddf5d81e 100644
--- a/src/pip/_internal/cli/__init__.py
+++ b/src/pip/_internal/cli/__init__.py
@@ -1,4 +1,3 @@
-"""Subpackage containing all of pip's command line interface related code
-"""
+"""Subpackage containing all of pip's command line interface related code"""
 
 # This file intentionally does not import submodules
diff --git a/src/pip/_internal/cli/autocompletion.py b/src/pip/_internal/cli/autocompletion.py
index f3f70ac8553..4fa461293c7 100644
--- a/src/pip/_internal/cli/autocompletion.py
+++ b/src/pip/_internal/cli/autocompletion.py
@@ -1,5 +1,4 @@
-"""Logic that powers autocompletion installed by ``pip completion``.
-"""
+"""Logic that powers autocompletion installed by ``pip completion``."""
 
 import optparse
 import os
diff --git a/src/pip/_internal/cli/main.py b/src/pip/_internal/cli/main.py
index 563ac79c984..377476c18c3 100644
--- a/src/pip/_internal/cli/main.py
+++ b/src/pip/_internal/cli/main.py
@@ -1,5 +1,4 @@
-"""Primary application entrypoint.
-"""
+"""Primary application entrypoint."""
 
 import locale
 import logging
diff --git a/src/pip/_internal/cli/main_parser.py b/src/pip/_internal/cli/main_parser.py
index 5ade356b9c2..c52684a81fe 100644
--- a/src/pip/_internal/cli/main_parser.py
+++ b/src/pip/_internal/cli/main_parser.py
@@ -1,5 +1,4 @@
-"""A single place for constructing and exposing the main parser
-"""
+"""A single place for constructing and exposing the main parser"""
 
 import os
 import subprocess
diff --git a/src/pip/_internal/index/__init__.py b/src/pip/_internal/index/__init__.py
index 7a17b7b3b6a..197dd757de9 100644
--- a/src/pip/_internal/index/__init__.py
+++ b/src/pip/_internal/index/__init__.py
@@ -1,2 +1 @@
-"""Index interaction code
-"""
+"""Index interaction code"""
diff --git a/src/pip/_internal/models/__init__.py b/src/pip/_internal/models/__init__.py
index 7855226e4b5..7b1fc295032 100644
--- a/src/pip/_internal/models/__init__.py
+++ b/src/pip/_internal/models/__init__.py
@@ -1,2 +1 @@
-"""A package that contains models that represent entities.
-"""
+"""A package that contains models that represent entities."""
diff --git a/src/pip/_internal/models/direct_url.py b/src/pip/_internal/models/direct_url.py
index fc5ec8d4aa9..8f990dd0ca1 100644
--- a/src/pip/_internal/models/direct_url.py
+++ b/src/pip/_internal/models/direct_url.py
@@ -1,4 +1,4 @@
-""" PEP 610 """
+"""PEP 610"""
 
 import json
 import re
diff --git a/src/pip/_internal/network/__init__.py b/src/pip/_internal/network/__init__.py
index b51bde91b2e..0ae1f5626bc 100644
--- a/src/pip/_internal/network/__init__.py
+++ b/src/pip/_internal/network/__init__.py
@@ -1,2 +1 @@
-"""Contains purely network-related utilities.
-"""
+"""Contains purely network-related utilities."""
diff --git a/src/pip/_internal/network/cache.py b/src/pip/_internal/network/cache.py
index fca04e6945f..2fe00f40263 100644
--- a/src/pip/_internal/network/cache.py
+++ b/src/pip/_internal/network/cache.py
@@ -1,5 +1,4 @@
-"""HTTP cache implementation.
-"""
+"""HTTP cache implementation."""
 
 import os
 from contextlib import contextmanager
diff --git a/src/pip/_internal/network/download.py b/src/pip/_internal/network/download.py
index 5c3bce3d2fd..9c6d7016579 100644
--- a/src/pip/_internal/network/download.py
+++ b/src/pip/_internal/network/download.py
@@ -1,5 +1,4 @@
-"""Download files with progress indicators.
-"""
+"""Download files with progress indicators."""
 
 import email.message
 import logging
diff --git a/src/pip/_internal/network/xmlrpc.py b/src/pip/_internal/network/xmlrpc.py
index 22ec8d2f4a6..ba5caf337e2 100644
--- a/src/pip/_internal/network/xmlrpc.py
+++ b/src/pip/_internal/network/xmlrpc.py
@@ -1,5 +1,4 @@
-"""xmlrpclib.Transport implementation
-"""
+"""xmlrpclib.Transport implementation"""
 
 import logging
 import urllib.parse
diff --git a/src/pip/_internal/operations/build/metadata.py b/src/pip/_internal/operations/build/metadata.py
index c66ac354deb..a546809ecd5 100644
--- a/src/pip/_internal/operations/build/metadata.py
+++ b/src/pip/_internal/operations/build/metadata.py
@@ -1,5 +1,4 @@
-"""Metadata generation logic for source distributions.
-"""
+"""Metadata generation logic for source distributions."""
 
 import os
 
diff --git a/src/pip/_internal/operations/build/metadata_editable.py b/src/pip/_internal/operations/build/metadata_editable.py
index 3397ccf0f92..27ecd7d3d80 100644
--- a/src/pip/_internal/operations/build/metadata_editable.py
+++ b/src/pip/_internal/operations/build/metadata_editable.py
@@ -1,5 +1,4 @@
-"""Metadata generation logic for source distributions.
-"""
+"""Metadata generation logic for source distributions."""
 
 import os
 
diff --git a/src/pip/_internal/operations/build/metadata_legacy.py b/src/pip/_internal/operations/build/metadata_legacy.py
index c01dd1c678a..e385b5ddf76 100644
--- a/src/pip/_internal/operations/build/metadata_legacy.py
+++ b/src/pip/_internal/operations/build/metadata_legacy.py
@@ -1,5 +1,4 @@
-"""Metadata generation logic for legacy source distributions.
-"""
+"""Metadata generation logic for legacy source distributions."""
 
 import logging
 import os
diff --git a/src/pip/_internal/operations/check.py b/src/pip/_internal/operations/check.py
index 4b6fbc4c375..c6d676d6e61 100644
--- a/src/pip/_internal/operations/check.py
+++ b/src/pip/_internal/operations/check.py
@@ -1,5 +1,4 @@
-"""Validation of dependencies of packages
-"""
+"""Validation of dependencies of packages"""
 
 import logging
 from contextlib import suppress
diff --git a/src/pip/_internal/operations/install/__init__.py b/src/pip/_internal/operations/install/__init__.py
index 24d6a5dd31f..2645a4acad0 100644
--- a/src/pip/_internal/operations/install/__init__.py
+++ b/src/pip/_internal/operations/install/__init__.py
@@ -1,2 +1 @@
-"""For modules related to installing packages.
-"""
+"""For modules related to installing packages."""
diff --git a/src/pip/_internal/operations/install/editable_legacy.py b/src/pip/_internal/operations/install/editable_legacy.py
index 9aaa699a645..644bcec111f 100644
--- a/src/pip/_internal/operations/install/editable_legacy.py
+++ b/src/pip/_internal/operations/install/editable_legacy.py
@@ -1,5 +1,4 @@
-"""Legacy editable installation process, i.e. `setup.py develop`.
-"""
+"""Legacy editable installation process, i.e. `setup.py develop`."""
 
 import logging
 from typing import Optional, Sequence
diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index aef42aa9eef..769c433d043 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -1,5 +1,4 @@
-"""Support for installing and building the "wheel" binary package format.
-"""
+"""Support for installing and building the "wheel" binary package format."""
 
 import collections
 import compileall
diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py
index e6aa3447200..a1c02d7dba9 100644
--- a/src/pip/_internal/operations/prepare.py
+++ b/src/pip/_internal/operations/prepare.py
@@ -1,5 +1,4 @@
-"""Prepares a distribution for installation
-"""
+"""Prepares a distribution for installation"""
 
 # The following comment should be removed at some point in the future.
 # mypy: strict-optional=False
diff --git a/src/pip/_internal/req/req_uninstall.py b/src/pip/_internal/req/req_uninstall.py
index 26df20844b3..e48c53eb1e4 100644
--- a/src/pip/_internal/req/req_uninstall.py
+++ b/src/pip/_internal/req/req_uninstall.py
@@ -38,7 +38,7 @@ def _script_names(
 
 
 def _unique(
-    fn: Callable[..., Generator[Any, None, None]]
+    fn: Callable[..., Generator[Any, None, None]],
 ) -> Callable[..., Generator[Any, None, None]]:
     @functools.wraps(fn)
     def unique(*args: Any, **kw: Any) -> Generator[Any, None, None]:
diff --git a/src/pip/_internal/utils/compatibility_tags.py b/src/pip/_internal/utils/compatibility_tags.py
index 2e7b7450dce..43d6a4aa4bd 100644
--- a/src/pip/_internal/utils/compatibility_tags.py
+++ b/src/pip/_internal/utils/compatibility_tags.py
@@ -1,5 +1,4 @@
-"""Generate and work with PEP 425 Compatibility Tags.
-"""
+"""Generate and work with PEP 425 Compatibility Tags."""
 
 import re
 from typing import List, Optional, Tuple
diff --git a/src/pip/_internal/utils/datetime.py b/src/pip/_internal/utils/datetime.py
index 8668b3b0ec1..776e49898f7 100644
--- a/src/pip/_internal/utils/datetime.py
+++ b/src/pip/_internal/utils/datetime.py
@@ -1,5 +1,4 @@
-"""For when pip wants to check the date or time.
-"""
+"""For when pip wants to check the date or time."""
 
 import datetime
 
diff --git a/src/pip/_internal/utils/filetypes.py b/src/pip/_internal/utils/filetypes.py
index 5948570178f..5644638222c 100644
--- a/src/pip/_internal/utils/filetypes.py
+++ b/src/pip/_internal/utils/filetypes.py
@@ -1,5 +1,4 @@
-"""Filetype information.
-"""
+"""Filetype information."""
 
 from typing import Tuple
 
diff --git a/src/pip/_internal/utils/unpacking.py b/src/pip/_internal/utils/unpacking.py
index 87a6d19ab5a..9a4ad8a334f 100644
--- a/src/pip/_internal/utils/unpacking.py
+++ b/src/pip/_internal/utils/unpacking.py
@@ -1,5 +1,4 @@
-"""Utilities related archives.
-"""
+"""Utilities related archives."""
 
 import logging
 import os
diff --git a/src/pip/_internal/utils/wheel.py b/src/pip/_internal/utils/wheel.py
index f85aee8a3f9..70e186cdfd1 100644
--- a/src/pip/_internal/utils/wheel.py
+++ b/src/pip/_internal/utils/wheel.py
@@ -1,5 +1,4 @@
-"""Support functions for working with wheel files.
-"""
+"""Support functions for working with wheel files."""
 
 import logging
 from email.message import Message
diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py
index 93f8e1f5b2f..00319cb5673 100644
--- a/src/pip/_internal/wheel_builder.py
+++ b/src/pip/_internal/wheel_builder.py
@@ -1,5 +1,4 @@
-"""Orchestrator for building wheels from InstallRequirements.
-"""
+"""Orchestrator for building wheels from InstallRequirements."""
 
 import logging
 import os.path
diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index 5be66d88eac..65946a1f46a 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -1,5 +1,4 @@
-"""Basic CLI functionality checks.
-"""
+"""Basic CLI functionality checks."""
 
 import subprocess
 import sys
diff --git a/tests/functional/test_configuration.py b/tests/functional/test_configuration.py
index 56cac572c4f..f049adf6b21 100644
--- a/tests/functional/test_configuration.py
+++ b/tests/functional/test_configuration.py
@@ -1,5 +1,4 @@
-"""Tests for the config command
-"""
+"""Tests for the config command"""
 
 import re
 import textwrap
diff --git a/tests/lib/configuration_helpers.py b/tests/lib/configuration_helpers.py
index b6e398c5bf1..a802c569878 100644
--- a/tests/lib/configuration_helpers.py
+++ b/tests/lib/configuration_helpers.py
@@ -1,5 +1,4 @@
-"""Helpers for tests that check configuration
-"""
+"""Helpers for tests that check configuration"""
 
 import contextlib
 import functools
diff --git a/tests/lib/filesystem.py b/tests/lib/filesystem.py
index e05e2703e9c..363220e1129 100644
--- a/tests/lib/filesystem.py
+++ b/tests/lib/filesystem.py
@@ -1,5 +1,4 @@
-"""Helpers for filesystem-dependent tests.
-"""
+"""Helpers for filesystem-dependent tests."""
 
 import os
 from contextlib import contextmanager
diff --git a/tests/lib/options_helpers.py b/tests/lib/options_helpers.py
index 4444fa3e97b..92325dddbd1 100644
--- a/tests/lib/options_helpers.py
+++ b/tests/lib/options_helpers.py
@@ -1,5 +1,4 @@
-"""Provides helper classes for testing option handling in pip
-"""
+"""Provides helper classes for testing option handling in pip"""
 
 from optparse import Values
 from typing import List, Tuple
diff --git a/tests/lib/requests_mocks.py b/tests/lib/requests_mocks.py
index a70a9b2b048..971afaed027 100644
--- a/tests/lib/requests_mocks.py
+++ b/tests/lib/requests_mocks.py
@@ -1,5 +1,4 @@
-"""Helper classes as mocks for requests objects.
-"""
+"""Helper classes as mocks for requests objects."""
 
 from io import BytesIO
 from typing import Any, Callable, Dict, Iterator, List, Optional
diff --git a/tests/lib/server.py b/tests/lib/server.py
index 96ac5930dc9..faeaa66eb1d 100644
--- a/tests/lib/server.py
+++ b/tests/lib/server.py
@@ -48,7 +48,7 @@ def make_environ(self) -> Dict[str, Any]:
 
 
 def _mock_wsgi_adapter(
-    mock: Callable[["WSGIEnvironment", "StartResponse"], "WSGIApplication"]
+    mock: Callable[["WSGIEnvironment", "StartResponse"], "WSGIApplication"],
 ) -> "WSGIApplication":
     """Uses a mock to record function arguments and provide
     the actual function that should respond.
diff --git a/tests/lib/test_wheel.py b/tests/lib/test_wheel.py
index abbfaf77ef5..ebf448ff503 100644
--- a/tests/lib/test_wheel.py
+++ b/tests/lib/test_wheel.py
@@ -1,5 +1,4 @@
-"""Tests for wheel helper.
-"""
+"""Tests for wheel helper."""
 
 import csv
 from email import message_from_string
diff --git a/tests/lib/wheel.py b/tests/lib/wheel.py
index e2634e72c86..43b382919f6 100644
--- a/tests/lib/wheel.py
+++ b/tests/lib/wheel.py
@@ -1,5 +1,4 @@
-"""Helper for building wheels as would be in test cases.
-"""
+"""Helper for building wheels as would be in test cases."""
 
 import csv
 import itertools
diff --git a/tests/unit/resolution_resolvelib/test_resolver.py b/tests/unit/resolution_resolvelib/test_resolver.py
index 18238eef134..9a0e4c90825 100644
--- a/tests/unit/resolution_resolvelib/test_resolver.py
+++ b/tests/unit/resolution_resolvelib/test_resolver.py
@@ -35,7 +35,7 @@ def resolver(preparer: RequirementPreparer, finder: PackageFinder) -> Resolver:
 
 
 def _make_graph(
-    edges: List[Tuple[Optional[str], Optional[str]]]
+    edges: List[Tuple[Optional[str], Optional[str]]],
 ) -> "DirectedGraph[Optional[str]]":
     """Build graph from edge declarations."""
 
diff --git a/tests/unit/test_appdirs.py b/tests/unit/test_appdirs.py
index 6e6521dd5c0..51bd6828e2a 100644
--- a/tests/unit/test_appdirs.py
+++ b/tests/unit/test_appdirs.py
@@ -66,7 +66,7 @@ def test_user_cache_dir_unicode(self, monkeypatch: pytest.MonkeyPatch) -> None:
             return
 
         def my_get_win_folder(csidl_name: str) -> str:
-            return "\u00DF\u00E4\u03B1\u20AC"
+            return "\u00df\u00e4\u03b1\u20ac"
 
         monkeypatch.setattr(
             platformdirs.windows,  # type: ignore
diff --git a/tests/unit/test_base_command.py b/tests/unit/test_base_command.py
index f9fae651422..87665fbde43 100644
--- a/tests/unit/test_base_command.py
+++ b/tests/unit/test_base_command.py
@@ -56,8 +56,8 @@ class FakeCommandWithUnicode(FakeCommand):
     _name = "fake_unicode"
 
     def run(self, options: Values, args: List[str]) -> int:
-        logging.getLogger("pip.tests").info(b"bytes here \xE9")
-        logging.getLogger("pip.tests").info(b"unicode here \xC3\xA9".decode("utf-8"))
+        logging.getLogger("pip.tests").info(b"bytes here \xe9")
+        logging.getLogger("pip.tests").info(b"unicode here \xc3\xa9".decode("utf-8"))
         return SUCCESS
 
 
diff --git a/tests/unit/test_configuration.py b/tests/unit/test_configuration.py
index 29a268c7875..73b7d68c399 100644
--- a/tests/unit/test_configuration.py
+++ b/tests/unit/test_configuration.py
@@ -1,5 +1,4 @@
-"""Tests for all things related to the configuration
-"""
+"""Tests for all things related to the configuration"""
 
 import re
 from unittest.mock import MagicMock
diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py
index 2550cae412d..c09314e50cf 100644
--- a/tests/unit/test_models.py
+++ b/tests/unit/test_models.py
@@ -1,5 +1,4 @@
-"""Tests for various classes in pip._internal.models
-"""
+"""Tests for various classes in pip._internal.models"""
 
 from pip._vendor.packaging.version import parse as parse_version
 
diff --git a/tools/release/check_version.py b/tools/release/check_version.py
index de3658faacd..f5c880533e7 100644
--- a/tools/release/check_version.py
+++ b/tools/release/check_version.py
@@ -1,5 +1,4 @@
-"""Checks if the version is acceptable, as per this project's release process.
-"""
+"""Checks if the version is acceptable, as per this project's release process."""
 
 import sys
 from datetime import datetime

From b2c367de292d0dcf54816a5bd4fc654ad2df41b9 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 3 Feb 2025 12:02:51 -0500
Subject: [PATCH 694/992] Add Black 25.1.0 to .git-ignore-blame-revs

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f09b08660e7..f39564897ec 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -34,3 +34,4 @@ c7ee560e00b85f7486b452c14ff49e4737996eda  # Blacken tools/
 94999255d5ede440c37137d210666fdf64302e75  # Reformat the codebase, with black
 585037a80a1177f1fa92e159a7079855782e543e  # Cleanup implicit string concatenation
 8a6f6ac19b80a6dc35900a47016c851d9fcd2ee2  # Blacken src/pip/_internal/resolution directory
+acfcae8941bb12ecfc372a05c875a7b414992604  # Reformat with Black's 2025 code style

From 50f72f22329ae89de3416b00d730d9bbb7ed5931 Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <8904718+KrishanBhasin@users.noreply.github.com>
Date: Wed, 5 Feb 2025 20:16:40 +0000
Subject: [PATCH 695/992] refactor if/else block

---
 src/pip/_internal/commands/index.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py
index 47f38179999..5c0c41175c9 100644
--- a/src/pip/_internal/commands/index.py
+++ b/src/pip/_internal/commands/index.py
@@ -150,8 +150,8 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
                 structured_output["installed_version"] = str(dist.version)
 
             write_output(json.dumps(structured_output))
-            return
 
-        write_output(f"{query} ({latest})")
-        write_output("Available versions: {}".format(", ".join(formatted_versions)))
-        print_dist_installation_info(query, latest)
+        else:
+            write_output(f"{query} ({latest})")
+            write_output("Available versions: {}".format(", ".join(formatted_versions)))
+            print_dist_installation_info(query, latest)

From d31e8057ecb7323c11f6216c5cd668d9f1a2a726 Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <8904718+KrishanBhasin@users.noreply.github.com>
Date: Wed, 5 Feb 2025 21:45:28 +0000
Subject: [PATCH 696/992] avoid duplication of dist lookup

---
 src/pip/_internal/commands/index.py  | 12 +++++++-----
 src/pip/_internal/commands/search.py | 15 +++++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py
index 5c0c41175c9..61e57fddb80 100644
--- a/src/pip/_internal/commands/index.py
+++ b/src/pip/_internal/commands/index.py
@@ -8,11 +8,13 @@
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.req_command import IndexGroupCommand
 from pip._internal.cli.status_codes import ERROR, SUCCESS
-from pip._internal.commands.search import print_dist_installation_info
+from pip._internal.commands.search import (
+    get_installed_distribution,
+    print_dist_installation_info_if_exists,
+)
 from pip._internal.exceptions import CommandError, DistributionNotFound, PipError
 from pip._internal.index.collector import LinkCollector
 from pip._internal.index.package_finder import PackageFinder
-from pip._internal.metadata import get_default_environment
 from pip._internal.models.selection_prefs import SelectionPreferences
 from pip._internal.models.target_python import TargetPython
 from pip._internal.network.session import PipSession
@@ -137,9 +139,9 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
             formatted_versions = [str(ver) for ver in sorted(versions, reverse=True)]
             latest = formatted_versions[0]
 
+        dist = get_installed_distribution(query)
+
         if options.json:
-            env = get_default_environment()
-            dist = env.get_distribution(query)
             structured_output = {
                 "name": query,
                 "versions": formatted_versions,
@@ -154,4 +156,4 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
         else:
             write_output(f"{query} ({latest})")
             write_output("Available versions: {}".format(", ".join(formatted_versions)))
-            print_dist_installation_info(query, latest)
+            print_dist_installation_info_if_exists(latest, dist)
diff --git a/src/pip/_internal/commands/search.py b/src/pip/_internal/commands/search.py
index 74b8d656b47..a42927d4198 100644
--- a/src/pip/_internal/commands/search.py
+++ b/src/pip/_internal/commands/search.py
@@ -14,6 +14,7 @@
 from pip._internal.cli.status_codes import NO_MATCHES_FOUND, SUCCESS
 from pip._internal.exceptions import CommandError
 from pip._internal.metadata import get_default_environment
+from pip._internal.metadata.base import BaseDistribution
 from pip._internal.models.index import PyPI
 from pip._internal.network.xmlrpc import PipXmlrpcTransport
 from pip._internal.utils.logging import indent_log
@@ -111,9 +112,9 @@ def transform_hits(hits: List[Dict[str, str]]) -> List["TransformedHit"]:
     return list(packages.values())
 
 
-def print_dist_installation_info(name: str, latest: str) -> None:
-    env = get_default_environment()
-    dist = env.get_distribution(name)
+def print_dist_installation_info_if_exists(
+    latest: str, dist: Optional[BaseDistribution]
+) -> None:
     if dist is not None:
         with indent_log():
             if dist.version == latest:
@@ -130,6 +131,11 @@ def print_dist_installation_info(name: str, latest: str) -> None:
                     write_output("LATEST:    %s", latest)
 
 
+def get_installed_distribution(name: str) -> Optional[BaseDistribution]:
+    env = get_default_environment()
+    return env.get_distribution(name)
+
+
 def print_results(
     hits: List["TransformedHit"],
     name_column_width: Optional[int] = None,
@@ -163,7 +169,8 @@ def print_results(
         line = f"{name_latest:{name_column_width}} - {summary}"
         try:
             write_output(line)
-            print_dist_installation_info(name, latest)
+            dist = get_installed_distribution(name)
+            print_dist_installation_info_if_exists(latest, dist)
         except UnicodeEncodeError:
             pass
 

From 37765ffb9f9e0997622ed0497bcaa7519273c158 Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <8904718+KrishanBhasin@users.noreply.github.com>
Date: Thu, 6 Feb 2025 07:09:23 +0000
Subject: [PATCH 697/992] fixup! avoid duplication of dist lookup

---
 src/pip/_internal/commands/index.py  | 4 ++--
 src/pip/_internal/commands/search.py | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/commands/index.py b/src/pip/_internal/commands/index.py
index 61e57fddb80..14f0feb6114 100644
--- a/src/pip/_internal/commands/index.py
+++ b/src/pip/_internal/commands/index.py
@@ -10,7 +10,7 @@
 from pip._internal.cli.status_codes import ERROR, SUCCESS
 from pip._internal.commands.search import (
     get_installed_distribution,
-    print_dist_installation_info_if_exists,
+    print_dist_installation_info,
 )
 from pip._internal.exceptions import CommandError, DistributionNotFound, PipError
 from pip._internal.index.collector import LinkCollector
@@ -156,4 +156,4 @@ def get_available_package_versions(self, options: Values, args: List[Any]) -> No
         else:
             write_output(f"{query} ({latest})")
             write_output("Available versions: {}".format(", ".join(formatted_versions)))
-            print_dist_installation_info_if_exists(latest, dist)
+            print_dist_installation_info(latest, dist)
diff --git a/src/pip/_internal/commands/search.py b/src/pip/_internal/commands/search.py
index a42927d4198..4f0f7866efd 100644
--- a/src/pip/_internal/commands/search.py
+++ b/src/pip/_internal/commands/search.py
@@ -112,9 +112,7 @@ def transform_hits(hits: List[Dict[str, str]]) -> List["TransformedHit"]:
     return list(packages.values())
 
 
-def print_dist_installation_info_if_exists(
-    latest: str, dist: Optional[BaseDistribution]
-) -> None:
+def print_dist_installation_info(latest: str, dist: Optional[BaseDistribution]) -> None:
     if dist is not None:
         with indent_log():
             if dist.version == latest:
@@ -170,7 +168,7 @@ def print_results(
         try:
             write_output(line)
             dist = get_installed_distribution(name)
-            print_dist_installation_info_if_exists(latest, dist)
+            print_dist_installation_info(latest, dist)
         except UnicodeEncodeError:
             pass
 

From 42a7c282919867e99d11f97a1e7de62e4e8a755a Mon Sep 17 00:00:00 2001
From: Seth Michael Larson 
Date: Fri, 7 Feb 2025 15:45:11 -0600
Subject: [PATCH 698/992] Update truststore to 0.10.1

---
 news/truststore.vendor.rst               |  1 +
 src/pip/_vendor/truststore/__init__.py   |  4 ++--
 src/pip/_vendor/truststore/_api.py       | 19 ++++++++++++++++++-
 src/pip/_vendor/vendor.txt               |  2 +-
 tools/vendoring/patches/truststore.patch | 20 ++++++++++++++++++++
 5 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 news/truststore.vendor.rst
 create mode 100644 tools/vendoring/patches/truststore.patch

diff --git a/news/truststore.vendor.rst b/news/truststore.vendor.rst
new file mode 100644
index 00000000000..f8ce27e4b32
--- /dev/null
+++ b/news/truststore.vendor.rst
@@ -0,0 +1 @@
+Upgrade truststore to 0.10.1
diff --git a/src/pip/_vendor/truststore/__init__.py b/src/pip/_vendor/truststore/__init__.py
index e468bf8cebd..cdff8143feb 100644
--- a/src/pip/_vendor/truststore/__init__.py
+++ b/src/pip/_vendor/truststore/__init__.py
@@ -7,7 +7,7 @@
 
 # Detect Python runtimes which don't implement SSLObject.get_unverified_chain() API
 # This API only became public in Python 3.13 but was available in CPython and PyPy since 3.10.
-if _sys.version_info < (3, 13):
+if _sys.version_info < (3, 13) and _sys.implementation.name not in ("cpython", "pypy"):
     try:
         import ssl as _ssl
     except ImportError:
@@ -33,4 +33,4 @@
 del _api, _sys  # type: ignore[name-defined] # noqa: F821
 
 __all__ = ["SSLContext", "inject_into_ssl", "extract_from_ssl"]
-__version__ = "0.10.0"
+__version__ = "0.10.1"
diff --git a/src/pip/_vendor/truststore/_api.py b/src/pip/_vendor/truststore/_api.py
index aeb023af756..2c0ce196a36 100644
--- a/src/pip/_vendor/truststore/_api.py
+++ b/src/pip/_vendor/truststore/_api.py
@@ -5,7 +5,7 @@
 import sys
 import typing
 
-import _ssl  # type: ignore[import-not-found]
+import _ssl
 
 from ._ssl_constants import (
     _original_SSLContext,
@@ -43,6 +43,23 @@ def inject_into_ssl() -> None:
     except ImportError:
         pass
 
+    # requests starting with 2.32.0 added a preloaded SSL context to improve concurrent performance;
+    # this unfortunately leads to a RecursionError, which can be avoided by patching the preloaded SSL context with
+    # the truststore patched instance
+    # also see https://github.com/psf/requests/pull/6667
+    try:
+        from pip._vendor.requests import adapters as requests_adapters
+
+        preloaded_context = getattr(requests_adapters, "_preloaded_ssl_context", None)
+        if preloaded_context is not None:
+            setattr(
+                requests_adapters,
+                "_preloaded_ssl_context",
+                SSLContext(ssl.PROTOCOL_TLS_CLIENT),
+            )
+    except ImportError:
+        pass
+
 
 def extract_from_ssl() -> None:
     """Restores the :class:`ssl.SSLContext` class to its original state"""
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index f04a9c1e73c..4a1933596b6 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -15,4 +15,4 @@ rich==13.9.4
 resolvelib==1.0.1
 setuptools==70.3.0
 tomli==2.2.1
-truststore==0.10.0
+truststore==0.10.1
diff --git a/tools/vendoring/patches/truststore.patch b/tools/vendoring/patches/truststore.patch
new file mode 100644
index 00000000000..d8d6351d9d4
--- /dev/null
+++ b/tools/vendoring/patches/truststore.patch
@@ -0,0 +1,20 @@
+diff --git a/src/pip/_vendor/truststore/_api.py b/src/pip/_vendor/truststore/_api.py
+index 47b7a63ab..d09d3096f 100644
+--- a/src/pip/_vendor/truststore/_api.py
++++ b/src/pip/_vendor/truststore/_api.py
+@@ -48,12 +48,12 @@ def inject_into_ssl() -> None:
+     # the truststore patched instance
+     # also see https://github.com/psf/requests/pull/6667
+     try:
+-        import requests.adapters
++        from pip._vendor.requests import adapters as requests_adapters
+
+-        preloaded_context = getattr(requests.adapters, "_preloaded_ssl_context", None)
++        preloaded_context = getattr(requests_adapters, "_preloaded_ssl_context", None)
+         if preloaded_context is not None:
+             setattr(
+-                requests.adapters,
++                requests_adapters,
+                 "_preloaded_ssl_context",
+                 SSLContext(ssl.PROTOCOL_TLS_CLIENT),
+             )

From dc696c28332ade10cfe7ce95bda7d6c2868f2083 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 26 Jan 2025 10:49:21 -0500
Subject: [PATCH 699/992] Patch out EXTERNALLY-MANAGED for self-check tests
 (#13179)

This helps redistributors test against their distro Python w/o
spurious errors.
---
 tests/unit/test_self_check_outdated.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/test_self_check_outdated.py b/tests/unit/test_self_check_outdated.py
index a5310ca7b19..fba794bc810 100644
--- a/tests/unit/test_self_check_outdated.py
+++ b/tests/unit/test_self_check_outdated.py
@@ -38,6 +38,7 @@ def test_get_statefile_name_known_values(key: str, expected: str) -> None:
 @freeze_time("1970-01-02T11:00:00Z")
 @patch("pip._internal.self_outdated_check._self_version_check_logic")
 @patch("pip._internal.self_outdated_check.SelfCheckState")
+@patch("pip._internal.self_outdated_check.check_externally_managed", new=lambda: None)
 def test_pip_self_version_check_calls_underlying_implementation(
     mocked_state: Mock, mocked_function: Mock, tmpdir: Path
 ) -> None:

From 202344eed3009a2546052b1885bdbcaee8295620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 26 Jan 2025 15:47:12 +0100
Subject: [PATCH 700/992] Update the release process docs

To mention the required approval step.
---
 docs/html/development/release-process.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/html/development/release-process.rst b/docs/html/development/release-process.rst
index 77ee9b5d46b..8b56c5e3a8f 100644
--- a/docs/html/development/release-process.rst
+++ b/docs/html/development/release-process.rst
@@ -147,7 +147,12 @@ Creating a new release
 #. Submit the ``release/YY.N`` branch as a pull request and ensure CI passes.
    Merge the changes back into ``main`` and pull them back locally.
 #. Push the tag created by ``prepare-release``. This will trigger the release
-   workflow on GitHub and publish to PyPI.
+   workflow on GitHub.
+#. Go to https://github.com/pypa/pip/actions, find the latest ``Publish Python
+   🐍 distribution 📦 to PyPI`` workflow run, open it, wait for the build step
+   to complete, then approve the PyPI environment to let the publishing step
+   run. If you desire, you have the possibility to download and inspect the
+   artifacts before approving.
 #. Regenerate the ``get-pip.py`` script in the `get-pip repository`_ (as
    documented there) and commit the results.
 #. Submit a Pull Request to `CPython`_ adding the new version of pip

From e612988a6155466a8da620b237639bc2682ecb68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 26 Jan 2025 15:13:39 +0100
Subject: [PATCH 701/992] Add build-project.py compatibility note

---
 build-project.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build-project.py b/build-project.py
index 78e183da08a..5f7cc204218 100755
--- a/build-project.py
+++ b/build-project.py
@@ -36,6 +36,9 @@ def get_git_head_timestamp() -> str:
 def main() -> None:
     with tempfile.TemporaryDirectory() as build_env:
         env_builder = EnvBuilder(with_pip=True)
+        # If this venv creation step fails, you may be hitting
+        # https://github.com/astral-sh/python-build-standalone/issues/381
+        # Try running with a another Python distribution.
         env_builder.create(build_env)
         subprocess.run(
             [

From aea86290d9b12ddbd2cb63f16c35d3e22f822bce Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 26 Jan 2025 11:00:48 -0500
Subject: [PATCH 702/992] Fix locate_file() type hints for older Pythons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🤦
---
 news/13181.bugfix.rst                          | 2 ++
 src/pip/_internal/metadata/importlib/_dists.py | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 news/13181.bugfix.rst

diff --git a/news/13181.bugfix.rst b/news/13181.bugfix.rst
new file mode 100644
index 00000000000..ff1d872da8d
--- /dev/null
+++ b/news/13181.bugfix.rst
@@ -0,0 +1,2 @@
+Restore opt-in ``importlib.metadata`` backend support on Python 3.10 and lower
+by fixing an unsupported type annotation.
diff --git a/src/pip/_internal/metadata/importlib/_dists.py b/src/pip/_internal/metadata/importlib/_dists.py
index cf8685439a9..d220b616e28 100644
--- a/src/pip/_internal/metadata/importlib/_dists.py
+++ b/src/pip/_internal/metadata/importlib/_dists.py
@@ -11,6 +11,7 @@
     Mapping,
     Optional,
     Sequence,
+    Union,
     cast,
 )
 
@@ -96,7 +97,7 @@ def read_text(self, filename: str) -> Optional[str]:
             raise UnsupportedWheel(error)
         return text
 
-    def locate_file(self, path: str | PathLike[str]) -> pathlib.Path:
+    def locate_file(self, path: Union[str, "PathLike[str]"]) -> pathlib.Path:
         # This method doesn't make sense for our in-memory wheel, but the API
         # requires us to define it.
         raise NotImplementedError

From ebd0a52e123af8f89b0f3e8e18627653f4c83bfe Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 30 Jan 2025 18:55:32 -0500
Subject: [PATCH 703/992] Don't pass --cert to build subprocesses unless also
 given on CLI

This fixes a regression introduced by commit 34fc0e20bd91f7facd1. After
that patch, --cert would always be given to the nested pip call, either
pointing to pip's CA bundle, or to whatever the user had set on the CLI.
This means truststore is always disabled... which is bad.

We used to have to do some shenanigans to pass the CA bundle to the
subprocess as certifi doesn't (didn't?) really play nice when in a
zipfile. Regardless, we stopped packing pip into a zipfile to provision
the build environment a while ago, so we can simply do the normal thing
and pass --cert when it's actually given. Otherwise, the subprocess will
find its CA bundle without fuss.

There apparently aren't any truststore tests (as testing system CAs is
probably a pain), so I didn't add one here either. At some point, we
should, though.
---
 news/13186.bugfix.rst          | 1 +
 src/pip/_internal/build_env.py | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 news/13186.bugfix.rst

diff --git a/news/13186.bugfix.rst b/news/13186.bugfix.rst
new file mode 100644
index 00000000000..0c60275d2b8
--- /dev/null
+++ b/news/13186.bugfix.rst
@@ -0,0 +1 @@
+Fix regression where truststore would never be used while installing build dependencies.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index e820dc3d5fb..e8d1aca0d6a 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -11,7 +11,6 @@
 from types import TracebackType
 from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple, Type, Union
 
-from pip._vendor.certifi import where
 from pip._vendor.packaging.version import Version
 
 from pip import __file__ as pip_location
@@ -246,8 +245,6 @@ def _install_requirements(
             # target from config file or env var should be ignored
             "--target",
             "",
-            "--cert",
-            finder.custom_cert or where(),
         ]
         if logger.getEffectiveLevel() <= logging.DEBUG:
             args.append("-vv")
@@ -276,6 +273,8 @@ def _install_requirements(
             args.extend(["--proxy", finder.proxy])
         for host in finder.trusted_hosts:
             args.extend(["--trusted-host", host])
+        if finder.custom_cert:
+            args.extend(["--cert", finder.custom_cert])
         if finder.client_cert:
             args.extend(["--client-cert", finder.client_cert])
         if finder.allow_all_prereleases:

From bc7c88cb3de9c9af769c51517833ea48bbe70d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 9 Feb 2025 17:55:30 +0100
Subject: [PATCH 704/992] Bump for release

---
 NEWS.rst              | 9 +++++++++
 news/13181.bugfix.rst | 2 --
 news/13186.bugfix.rst | 1 -
 src/pip/__init__.py   | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 news/13181.bugfix.rst
 delete mode 100644 news/13186.bugfix.rst

diff --git a/NEWS.rst b/NEWS.rst
index 9b1387666bd..ab71ef12420 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,6 +9,15 @@
 
 .. towncrier release notes start
 
+25.0.1 (2025-02-09)
+===================
+
+Bug Fixes
+---------
+
+- Fix an unsupported type annotation on Python 3.10 and earlier. (`#13181 `_)
+- Fix a regression where truststore would never be used while installing build dependencies. (`#13186 `_)
+
 25.0 (2025-01-26)
 =================
 
diff --git a/news/13181.bugfix.rst b/news/13181.bugfix.rst
deleted file mode 100644
index ff1d872da8d..00000000000
--- a/news/13181.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Restore opt-in ``importlib.metadata`` backend support on Python 3.10 and lower
-by fixing an unsupported type annotation.
diff --git a/news/13186.bugfix.rst b/news/13186.bugfix.rst
deleted file mode 100644
index 0c60275d2b8..00000000000
--- a/news/13186.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix regression where truststore would never be used while installing build dependencies.
diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index d047e4789e8..d628f93ee21 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "25.0"
+__version__ = "25.0.1"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 1acc4857e4512ddd304bafe62e77c3111249a4e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 9 Feb 2025 17:55:33 +0100
Subject: [PATCH 705/992] Bump for development

---
 src/pip/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/__init__.py b/src/pip/__init__.py
index d628f93ee21..72909e402d3 100644
--- a/src/pip/__init__.py
+++ b/src/pip/__init__.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-__version__ = "25.0.1"
+__version__ = "25.1.dev0"
 
 
 def main(args: Optional[List[str]] = None) -> int:

From 5dd3c2bb09c361c22a0387eed939cd5a1c11cfed Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 9 Feb 2025 12:41:30 -0500
Subject: [PATCH 706/992] Bump ruff, codespell, and mypy pre-commit hooks

---
 .pre-commit-config.yaml | 6 +++---
 noxfile.py              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 279884b1446..769373ae8a4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,13 +22,13 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.1
+  rev: v0.9.5
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.14.1
+  rev: v1.15.0
   hooks:
   - id: mypy
     exclude: tests/data
@@ -54,7 +54,7 @@ repos:
     exclude: NEWS.rst  # The errors flagged in NEWS.rst are old.
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.3.0
+  rev: v2.4.1
   hooks:
     - id: codespell
       exclude: AUTHORS.txt|tests/data
diff --git a/noxfile.py b/noxfile.py
index 80c7358e034..e3f902b42df 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -82,7 +82,7 @@ def test(session: nox.Session) -> None:
         )
         # fmt: on
     else:
-        msg = f"Re-using existing common-wheels at {LOCATIONS['common-wheels']}."
+        msg = f"Reusing existing common-wheels at {LOCATIONS['common-wheels']}."
         session.log(msg)
 
     # Build source distribution

From 1838962e799ba4c10731f7bb9e215e20b27b1018 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Thu, 31 Oct 2024 07:49:46 -0400
Subject: [PATCH 707/992] Upgrade resolvelib to 1.1.0

---
 news/resolvelib.vendor.rst                    |   1 +
 src/pip/_vendor/resolvelib/__init__.py        |   5 +-
 src/pip/_vendor/resolvelib/__init__.pyi       |  11 -
 src/pip/_vendor/resolvelib/compat/__init__.py |   0
 .../resolvelib/compat/collections_abc.py      |   6 -
 .../resolvelib/compat/collections_abc.pyi     |   1 -
 src/pip/_vendor/resolvelib/providers.py       | 143 ++++--
 src/pip/_vendor/resolvelib/providers.pyi      |  44 --
 src/pip/_vendor/resolvelib/reporters.py       |  30 +-
 src/pip/_vendor/resolvelib/reporters.pyi      |  11 -
 src/pip/_vendor/resolvelib/resolvers.pyi      |  79 ----
 .../_vendor/resolvelib/resolvers/__init__.py  |  27 ++
 .../_vendor/resolvelib/resolvers/abstract.py  |  47 ++
 .../_vendor/resolvelib/resolvers/criterion.py |  48 ++
 .../resolvelib/resolvers/exceptions.py        |  57 +++
 .../{resolvers.py => resolvers/resolution.py} | 428 +++++++++---------
 src/pip/_vendor/resolvelib/structs.py         | 147 +++---
 src/pip/_vendor/resolvelib/structs.pyi        |  40 --
 src/pip/_vendor/vendor.txt                    |   2 +-
 19 files changed, 612 insertions(+), 515 deletions(-)
 create mode 100644 news/resolvelib.vendor.rst
 delete mode 100644 src/pip/_vendor/resolvelib/__init__.pyi
 delete mode 100644 src/pip/_vendor/resolvelib/compat/__init__.py
 delete mode 100644 src/pip/_vendor/resolvelib/compat/collections_abc.py
 delete mode 100644 src/pip/_vendor/resolvelib/compat/collections_abc.pyi
 delete mode 100644 src/pip/_vendor/resolvelib/providers.pyi
 delete mode 100644 src/pip/_vendor/resolvelib/reporters.pyi
 delete mode 100644 src/pip/_vendor/resolvelib/resolvers.pyi
 create mode 100644 src/pip/_vendor/resolvelib/resolvers/__init__.py
 create mode 100644 src/pip/_vendor/resolvelib/resolvers/abstract.py
 create mode 100644 src/pip/_vendor/resolvelib/resolvers/criterion.py
 create mode 100644 src/pip/_vendor/resolvelib/resolvers/exceptions.py
 rename src/pip/_vendor/resolvelib/{resolvers.py => resolvers/resolution.py} (67%)
 delete mode 100644 src/pip/_vendor/resolvelib/structs.pyi

diff --git a/news/resolvelib.vendor.rst b/news/resolvelib.vendor.rst
new file mode 100644
index 00000000000..d5e12f5b945
--- /dev/null
+++ b/news/resolvelib.vendor.rst
@@ -0,0 +1 @@
+Upgrade resolvelib to 1.1.0
diff --git a/src/pip/_vendor/resolvelib/__init__.py b/src/pip/_vendor/resolvelib/__init__.py
index d92acc7bedf..c655c597c6f 100644
--- a/src/pip/_vendor/resolvelib/__init__.py
+++ b/src/pip/_vendor/resolvelib/__init__.py
@@ -11,12 +11,13 @@
     "ResolutionTooDeep",
 ]
 
-__version__ = "1.0.1"
+__version__ = "1.1.0"
 
 
-from .providers import AbstractProvider, AbstractResolver
+from .providers import AbstractProvider
 from .reporters import BaseReporter
 from .resolvers import (
+    AbstractResolver,
     InconsistentCandidate,
     RequirementsConflicted,
     ResolutionError,
diff --git a/src/pip/_vendor/resolvelib/__init__.pyi b/src/pip/_vendor/resolvelib/__init__.pyi
deleted file mode 100644
index d64c52ced00..00000000000
--- a/src/pip/_vendor/resolvelib/__init__.pyi
+++ /dev/null
@@ -1,11 +0,0 @@
-__version__: str
-
-from .providers import AbstractProvider as AbstractProvider
-from .providers import AbstractResolver as AbstractResolver
-from .reporters import BaseReporter as BaseReporter
-from .resolvers import InconsistentCandidate as InconsistentCandidate
-from .resolvers import RequirementsConflicted as RequirementsConflicted
-from .resolvers import ResolutionError as ResolutionError
-from .resolvers import ResolutionImpossible as ResolutionImpossible
-from .resolvers import ResolutionTooDeep as ResolutionTooDeep
-from .resolvers import Resolver as Resolver
diff --git a/src/pip/_vendor/resolvelib/compat/__init__.py b/src/pip/_vendor/resolvelib/compat/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/pip/_vendor/resolvelib/compat/collections_abc.py b/src/pip/_vendor/resolvelib/compat/collections_abc.py
deleted file mode 100644
index 1becc5093c5..00000000000
--- a/src/pip/_vendor/resolvelib/compat/collections_abc.py
+++ /dev/null
@@ -1,6 +0,0 @@
-__all__ = ["Mapping", "Sequence"]
-
-try:
-    from collections.abc import Mapping, Sequence
-except ImportError:
-    from collections import Mapping, Sequence
diff --git a/src/pip/_vendor/resolvelib/compat/collections_abc.pyi b/src/pip/_vendor/resolvelib/compat/collections_abc.pyi
deleted file mode 100644
index 2a088b19a93..00000000000
--- a/src/pip/_vendor/resolvelib/compat/collections_abc.pyi
+++ /dev/null
@@ -1 +0,0 @@
-from collections.abc import Mapping, Sequence
diff --git a/src/pip/_vendor/resolvelib/providers.py b/src/pip/_vendor/resolvelib/providers.py
index e99d87ee75f..524e3d83272 100644
--- a/src/pip/_vendor/resolvelib/providers.py
+++ b/src/pip/_vendor/resolvelib/providers.py
@@ -1,30 +1,58 @@
-class AbstractProvider(object):
+from __future__ import annotations
+
+from typing import (
+    TYPE_CHECKING,
+    Generic,
+    Iterable,
+    Iterator,
+    Mapping,
+    Sequence,
+)
+
+from .structs import CT, KT, RT, Matches, RequirementInformation
+
+if TYPE_CHECKING:
+    from typing import Any, Protocol
+
+    class Preference(Protocol):
+        def __lt__(self, __other: Any) -> bool: ...
+
+
+class AbstractProvider(Generic[RT, CT, KT]):
     """Delegate class to provide the required interface for the resolver."""
 
-    def identify(self, requirement_or_candidate):
-        """Given a requirement, return an identifier for it.
+    def identify(self, requirement_or_candidate: RT | CT) -> KT:
+        """Given a requirement or candidate, return an identifier for it.
 
-        This is used to identify a requirement, e.g. whether two requirements
-        should have their specifier parts merged.
+        This is used to identify, e.g. whether two requirements
+        should have their specifier parts merged or a candidate matches a
+        requirement via ``find_matches()``.
         """
         raise NotImplementedError
 
     def get_preference(
         self,
-        identifier,
-        resolutions,
-        candidates,
-        information,
-        backtrack_causes,
-    ):
+        identifier: KT,
+        resolutions: Mapping[KT, CT],
+        candidates: Mapping[KT, Iterator[CT]],
+        information: Mapping[KT, Iterator[RequirementInformation[RT, CT]]],
+        backtrack_causes: Sequence[RequirementInformation[RT, CT]],
+    ) -> Preference:
         """Produce a sort key for given requirement based on preference.
 
+        As this is a sort key it will be called O(n) times per backtrack
+        step, where n is the number of `identifier`s, if you have a check
+        which is expensive in some sense. E.g. It needs to make O(n) checks
+        per call or takes significant wall clock time, consider using
+        `narrow_requirement_selection` to filter the `identifier`s, which
+        is applied before this sort key is called.
+
         The preference is defined as "I think this requirement should be
         resolved first". The lower the return value is, the more preferred
         this group of arguments is.
 
         :param identifier: An identifier as returned by ``identify()``. This
-            identifies the dependency matches which should be returned.
+            identifies the requirement being considered.
         :param resolutions: Mapping of candidates currently pinned by the
             resolver. Each key is an identifier, and the value is a candidate.
             The candidate may conflict with requirements from ``information``.
@@ -32,8 +60,9 @@ def get_preference(
             Each value is an iterator of candidates.
         :param information: Mapping of requirement information of each package.
             Each value is an iterator of *requirement information*.
-        :param backtrack_causes: Sequence of requirement information that were
-            the requirements that caused the resolver to most recently backtrack.
+        :param backtrack_causes: Sequence of *requirement information* that are
+            the requirements that caused the resolver to most recently
+            backtrack.
 
         A *requirement information* instance is a named tuple with two members:
 
@@ -60,15 +89,21 @@ def get_preference(
         """
         raise NotImplementedError
 
-    def find_matches(self, identifier, requirements, incompatibilities):
+    def find_matches(
+        self,
+        identifier: KT,
+        requirements: Mapping[KT, Iterator[RT]],
+        incompatibilities: Mapping[KT, Iterator[CT]],
+    ) -> Matches[CT]:
         """Find all possible candidates that satisfy the given constraints.
 
-        :param identifier: An identifier as returned by ``identify()``. This
-            identifies the dependency matches of which should be returned.
+        :param identifier: An identifier as returned by ``identify()``. All
+            candidates returned by this method should produce the same
+            identifier.
         :param requirements: A mapping of requirements that all returned
             candidates must satisfy. Each key is an identifier, and the value
             an iterator of requirements for that dependency.
-        :param incompatibilities: A mapping of known incompatibilities of
+        :param incompatibilities: A mapping of known incompatibile candidates of
             each dependency. Each key is an identifier, and the value an
             iterator of incompatibilities known to the resolver. All
             incompatibilities *must* be excluded from the return value.
@@ -89,7 +124,7 @@ def find_matches(self, identifier, requirements, incompatibilities):
         """
         raise NotImplementedError
 
-    def is_satisfied_by(self, requirement, candidate):
+    def is_satisfied_by(self, requirement: RT, candidate: CT) -> bool:
         """Whether the given requirement can be satisfied by a candidate.
 
         The candidate is guaranteed to have been generated from the
@@ -100,7 +135,7 @@ def is_satisfied_by(self, requirement, candidate):
         """
         raise NotImplementedError
 
-    def get_dependencies(self, candidate):
+    def get_dependencies(self, candidate: CT) -> Iterable[RT]:
         """Get dependencies of a candidate.
 
         This should return a collection of requirements that `candidate`
@@ -108,26 +143,54 @@ def get_dependencies(self, candidate):
         """
         raise NotImplementedError
 
+    def narrow_requirement_selection(
+        self,
+        identifiers: Iterable[KT],
+        resolutions: Mapping[KT, CT],
+        candidates: Mapping[KT, Iterator[CT]],
+        information: Mapping[KT, Iterator[RequirementInformation[RT, CT]]],
+        backtrack_causes: Sequence[RequirementInformation[RT, CT]],
+    ) -> Iterable[KT]:
+        """
+        An optional method to narrow the selection of requirements being
+        considered during resolution. This method is called O(1) time per
+        backtrack step.
+
+        :param identifiers: An iterable of `identifiers` as returned by
+            ``identify()``. These identify all requirements currently being
+            considered.
+        :param resolutions: A mapping of candidates currently pinned by the
+            resolver. Each key is an identifier, and the value is a candidate
+            that may conflict with requirements from ``information``.
+        :param candidates: A mapping of each dependency's possible candidates.
+            Each value is an iterator of candidates.
+        :param information: A mapping of requirement information for each package.
+            Each value is an iterator of *requirement information*.
+        :param backtrack_causes: A sequence of *requirement information* that are
+            the requirements causing the resolver to most recently
+            backtrack.
 
-class AbstractResolver(object):
-    """The thing that performs the actual resolution work."""
-
-    base_exception = Exception
-
-    def __init__(self, provider, reporter):
-        self.provider = provider
-        self.reporter = reporter
-
-    def resolve(self, requirements, **kwargs):
-        """Take a collection of constraints, spit out the resolution result.
-
-        This returns a representation of the final resolution state, with one
-        guarenteed attribute ``mapping`` that contains resolved candidates as
-        values. The keys are their respective identifiers.
-
-        :param requirements: A collection of constraints.
-        :param kwargs: Additional keyword arguments that subclasses may accept.
+        A *requirement information* instance is a named tuple with two members:
 
-        :raises: ``self.base_exception`` or its subclass.
+        * ``requirement`` specifies a requirement contributing to the current
+          list of candidates.
+        * ``parent`` specifies the candidate that provides (is depended on for)
+          the requirement, or ``None`` to indicate a root requirement.
+
+        Must return a non-empty subset of `identifiers`, with the default
+        implementation being to return `identifiers` unchanged. Those `identifiers`
+        will then be passed to the sort key `get_preference` to pick the most
+        prefered requirement to attempt to pin, unless `narrow_requirement_selection`
+        returns only 1 requirement, in which case that will be used without
+        calling the sort key `get_preference`.
+
+        This method is designed to be used by the provider to optimize the
+        dependency resolution, e.g. if a check cost is O(m) and it can be done
+        against all identifiers at once then filtering the requirement selection
+        here will cost O(m) but making it part of the sort key in `get_preference`
+        will cost O(m*n), where n is the number of `identifiers`.
+
+        Returns:
+            Iterable[KT]: A non-empty subset of `identifiers`.
         """
-        raise NotImplementedError
+        return identifiers
diff --git a/src/pip/_vendor/resolvelib/providers.pyi b/src/pip/_vendor/resolvelib/providers.pyi
deleted file mode 100644
index ec054194ee3..00000000000
--- a/src/pip/_vendor/resolvelib/providers.pyi
+++ /dev/null
@@ -1,44 +0,0 @@
-from typing import (
-    Any,
-    Generic,
-    Iterable,
-    Iterator,
-    Mapping,
-    Protocol,
-    Sequence,
-    Union,
-)
-
-from .reporters import BaseReporter
-from .resolvers import RequirementInformation
-from .structs import CT, KT, RT, Matches
-
-class Preference(Protocol):
-    def __lt__(self, __other: Any) -> bool: ...
-
-class AbstractProvider(Generic[RT, CT, KT]):
-    def identify(self, requirement_or_candidate: Union[RT, CT]) -> KT: ...
-    def get_preference(
-        self,
-        identifier: KT,
-        resolutions: Mapping[KT, CT],
-        candidates: Mapping[KT, Iterator[CT]],
-        information: Mapping[KT, Iterator[RequirementInformation[RT, CT]]],
-        backtrack_causes: Sequence[RequirementInformation[RT, CT]],
-    ) -> Preference: ...
-    def find_matches(
-        self,
-        identifier: KT,
-        requirements: Mapping[KT, Iterator[RT]],
-        incompatibilities: Mapping[KT, Iterator[CT]],
-    ) -> Matches: ...
-    def is_satisfied_by(self, requirement: RT, candidate: CT) -> bool: ...
-    def get_dependencies(self, candidate: CT) -> Iterable[RT]: ...
-
-class AbstractResolver(Generic[RT, CT, KT]):
-    base_exception = Exception
-    provider: AbstractProvider[RT, CT, KT]
-    reporter: BaseReporter
-    def __init__(
-        self, provider: AbstractProvider[RT, CT, KT], reporter: BaseReporter
-    ): ...
diff --git a/src/pip/_vendor/resolvelib/reporters.py b/src/pip/_vendor/resolvelib/reporters.py
index 688b5e10d86..26c9f6e6f92 100644
--- a/src/pip/_vendor/resolvelib/reporters.py
+++ b/src/pip/_vendor/resolvelib/reporters.py
@@ -1,26 +1,36 @@
-class BaseReporter(object):
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Collection, Generic
+
+from .structs import CT, KT, RT, RequirementInformation, State
+
+if TYPE_CHECKING:
+    from .resolvers import Criterion
+
+
+class BaseReporter(Generic[RT, CT, KT]):
     """Delegate class to provider progress reporting for the resolver."""
 
-    def starting(self):
+    def starting(self) -> None:
         """Called before the resolution actually starts."""
 
-    def starting_round(self, index):
+    def starting_round(self, index: int) -> None:
         """Called before each round of resolution starts.
 
         The index is zero-based.
         """
 
-    def ending_round(self, index, state):
+    def ending_round(self, index: int, state: State[RT, CT, KT]) -> None:
         """Called before each round of resolution ends.
 
         This is NOT called if the resolution ends at this round. Use `ending`
         if you want to report finalization. The index is zero-based.
         """
 
-    def ending(self, state):
+    def ending(self, state: State[RT, CT, KT]) -> None:
         """Called before the resolution ends successfully."""
 
-    def adding_requirement(self, requirement, parent):
+    def adding_requirement(self, requirement: RT, parent: CT | None) -> None:
         """Called when adding a new requirement into the resolve criteria.
 
         :param requirement: The additional requirement to be applied to filter
@@ -30,14 +40,16 @@ def adding_requirement(self, requirement, parent):
             requirements passed in from ``Resolver.resolve()``.
         """
 
-    def resolving_conflicts(self, causes):
+    def resolving_conflicts(
+        self, causes: Collection[RequirementInformation[RT, CT]]
+    ) -> None:
         """Called when starting to attempt requirement conflict resolution.
 
         :param causes: The information on the collision that caused the backtracking.
         """
 
-    def rejecting_candidate(self, criterion, candidate):
+    def rejecting_candidate(self, criterion: Criterion[RT, CT], candidate: CT) -> None:
         """Called when rejecting a candidate during backtracking."""
 
-    def pinning(self, candidate):
+    def pinning(self, candidate: CT) -> None:
         """Called when adding a candidate to the potential solution."""
diff --git a/src/pip/_vendor/resolvelib/reporters.pyi b/src/pip/_vendor/resolvelib/reporters.pyi
deleted file mode 100644
index b2ad286ba06..00000000000
--- a/src/pip/_vendor/resolvelib/reporters.pyi
+++ /dev/null
@@ -1,11 +0,0 @@
-from typing import Any
-
-class BaseReporter:
-    def starting(self) -> Any: ...
-    def starting_round(self, index: int) -> Any: ...
-    def ending_round(self, index: int, state: Any) -> Any: ...
-    def ending(self, state: Any) -> Any: ...
-    def adding_requirement(self, requirement: Any, parent: Any) -> Any: ...
-    def rejecting_candidate(self, criterion: Any, candidate: Any) -> Any: ...
-    def resolving_conflicts(self, causes: Any) -> Any: ...
-    def pinning(self, candidate: Any) -> Any: ...
diff --git a/src/pip/_vendor/resolvelib/resolvers.pyi b/src/pip/_vendor/resolvelib/resolvers.pyi
deleted file mode 100644
index 528a1a259af..00000000000
--- a/src/pip/_vendor/resolvelib/resolvers.pyi
+++ /dev/null
@@ -1,79 +0,0 @@
-from typing import (
-    Collection,
-    Generic,
-    Iterable,
-    Iterator,
-    List,
-    Mapping,
-    Optional,
-)
-
-from .providers import AbstractProvider, AbstractResolver
-from .structs import CT, KT, RT, DirectedGraph, IterableView
-
-# This should be a NamedTuple, but Python 3.6 has a bug that prevents it.
-# https://stackoverflow.com/a/50531189/1376863
-class RequirementInformation(tuple, Generic[RT, CT]):
-    requirement: RT
-    parent: Optional[CT]
-
-class Criterion(Generic[RT, CT, KT]):
-    candidates: IterableView[CT]
-    information: Collection[RequirementInformation[RT, CT]]
-    incompatibilities: List[CT]
-    @classmethod
-    def from_requirement(
-        cls,
-        provider: AbstractProvider[RT, CT, KT],
-        requirement: RT,
-        parent: Optional[CT],
-    ) -> Criterion[RT, CT, KT]: ...
-    def iter_requirement(self) -> Iterator[RT]: ...
-    def iter_parent(self) -> Iterator[Optional[CT]]: ...
-    def merged_with(
-        self,
-        provider: AbstractProvider[RT, CT, KT],
-        requirement: RT,
-        parent: Optional[CT],
-    ) -> Criterion[RT, CT, KT]: ...
-    def excluded_of(self, candidates: List[CT]) -> Criterion[RT, CT, KT]: ...
-
-class ResolverException(Exception): ...
-
-class RequirementsConflicted(ResolverException, Generic[RT, CT, KT]):
-    criterion: Criterion[RT, CT, KT]
-
-class ResolutionError(ResolverException): ...
-
-class InconsistentCandidate(ResolverException, Generic[RT, CT, KT]):
-    candidate: CT
-    criterion: Criterion[RT, CT, KT]
-
-class ResolutionImpossible(ResolutionError, Generic[RT, CT]):
-    causes: List[RequirementInformation[RT, CT]]
-
-class ResolutionTooDeep(ResolutionError):
-    round_count: int
-
-# This should be a NamedTuple, but Python 3.6 has a bug that prevents it.
-# https://stackoverflow.com/a/50531189/1376863
-class State(tuple, Generic[RT, CT, KT]):
-    mapping: Mapping[KT, CT]
-    criteria: Mapping[KT, Criterion[RT, CT, KT]]
-    backtrack_causes: Collection[RequirementInformation[RT, CT]]
-
-class Resolution(Generic[RT, CT, KT]):
-    def resolve(
-        self, requirements: Iterable[RT], max_rounds: int
-    ) -> State[RT, CT, KT]: ...
-
-class Result(Generic[RT, CT, KT]):
-    mapping: Mapping[KT, CT]
-    graph: DirectedGraph[Optional[KT]]
-    criteria: Mapping[KT, Criterion[RT, CT, KT]]
-
-class Resolver(AbstractResolver, Generic[RT, CT, KT]):
-    base_exception = ResolverException
-    def resolve(
-        self, requirements: Iterable[RT], max_rounds: int = 100
-    ) -> Result[RT, CT, KT]: ...
diff --git a/src/pip/_vendor/resolvelib/resolvers/__init__.py b/src/pip/_vendor/resolvelib/resolvers/__init__.py
new file mode 100644
index 00000000000..7b2c5d597eb
--- /dev/null
+++ b/src/pip/_vendor/resolvelib/resolvers/__init__.py
@@ -0,0 +1,27 @@
+from ..structs import RequirementInformation
+from .abstract import AbstractResolver, Result
+from .criterion import Criterion
+from .exceptions import (
+    InconsistentCandidate,
+    RequirementsConflicted,
+    ResolutionError,
+    ResolutionImpossible,
+    ResolutionTooDeep,
+    ResolverException,
+)
+from .resolution import Resolution, Resolver
+
+__all__ = [
+    "AbstractResolver",
+    "InconsistentCandidate",
+    "Resolver",
+    "Resolution",
+    "RequirementsConflicted",
+    "ResolutionError",
+    "ResolutionImpossible",
+    "ResolutionTooDeep",
+    "RequirementInformation",
+    "ResolverException",
+    "Result",
+    "Criterion",
+]
diff --git a/src/pip/_vendor/resolvelib/resolvers/abstract.py b/src/pip/_vendor/resolvelib/resolvers/abstract.py
new file mode 100644
index 00000000000..f9b5a7aa1fa
--- /dev/null
+++ b/src/pip/_vendor/resolvelib/resolvers/abstract.py
@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import collections
+from typing import TYPE_CHECKING, Any, Generic, Iterable, Mapping, NamedTuple
+
+from ..structs import CT, KT, RT, DirectedGraph
+
+if TYPE_CHECKING:
+    from ..providers import AbstractProvider
+    from ..reporters import BaseReporter
+    from .criterion import Criterion
+
+    class Result(NamedTuple, Generic[RT, CT, KT]):
+        mapping: Mapping[KT, CT]
+        graph: DirectedGraph[KT | None]
+        criteria: Mapping[KT, Criterion[RT, CT]]
+
+else:
+    Result = collections.namedtuple("Result", ["mapping", "graph", "criteria"])
+
+
+class AbstractResolver(Generic[RT, CT, KT]):
+    """The thing that performs the actual resolution work."""
+
+    base_exception = Exception
+
+    def __init__(
+        self,
+        provider: AbstractProvider[RT, CT, KT],
+        reporter: BaseReporter[RT, CT, KT],
+    ) -> None:
+        self.provider = provider
+        self.reporter = reporter
+
+    def resolve(self, requirements: Iterable[RT], **kwargs: Any) -> Result[RT, CT, KT]:
+        """Take a collection of constraints, spit out the resolution result.
+
+        This returns a representation of the final resolution state, with one
+        guarenteed attribute ``mapping`` that contains resolved candidates as
+        values. The keys are their respective identifiers.
+
+        :param requirements: A collection of constraints.
+        :param kwargs: Additional keyword arguments that subclasses may accept.
+
+        :raises: ``self.base_exception`` or its subclass.
+        """
+        raise NotImplementedError
diff --git a/src/pip/_vendor/resolvelib/resolvers/criterion.py b/src/pip/_vendor/resolvelib/resolvers/criterion.py
new file mode 100644
index 00000000000..ee5019ccd03
--- /dev/null
+++ b/src/pip/_vendor/resolvelib/resolvers/criterion.py
@@ -0,0 +1,48 @@
+from __future__ import annotations
+
+from typing import Collection, Generic, Iterable, Iterator
+
+from ..structs import CT, RT, RequirementInformation
+
+
+class Criterion(Generic[RT, CT]):
+    """Representation of possible resolution results of a package.
+
+    This holds three attributes:
+
+    * `information` is a collection of `RequirementInformation` pairs.
+      Each pair is a requirement contributing to this criterion, and the
+      candidate that provides the requirement.
+    * `incompatibilities` is a collection of all known not-to-work candidates
+      to exclude from consideration.
+    * `candidates` is a collection containing all possible candidates deducted
+      from the union of contributing requirements and known incompatibilities.
+      It should never be empty, except when the criterion is an attribute of a
+      raised `RequirementsConflicted` (in which case it is always empty).
+
+    .. note::
+        This class is intended to be externally immutable. **Do not** mutate
+        any of its attribute containers.
+    """
+
+    def __init__(
+        self,
+        candidates: Iterable[CT],
+        information: Collection[RequirementInformation[RT, CT]],
+        incompatibilities: Collection[CT],
+    ) -> None:
+        self.candidates = candidates
+        self.information = information
+        self.incompatibilities = incompatibilities
+
+    def __repr__(self) -> str:
+        requirements = ", ".join(
+            f"({req!r}, via={parent!r})" for req, parent in self.information
+        )
+        return f"Criterion({requirements})"
+
+    def iter_requirement(self) -> Iterator[RT]:
+        return (i.requirement for i in self.information)
+
+    def iter_parent(self) -> Iterator[CT | None]:
+        return (i.parent for i in self.information)
diff --git a/src/pip/_vendor/resolvelib/resolvers/exceptions.py b/src/pip/_vendor/resolvelib/resolvers/exceptions.py
new file mode 100644
index 00000000000..35e275576f7
--- /dev/null
+++ b/src/pip/_vendor/resolvelib/resolvers/exceptions.py
@@ -0,0 +1,57 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Collection, Generic
+
+from ..structs import CT, RT, RequirementInformation
+
+if TYPE_CHECKING:
+    from .criterion import Criterion
+
+
+class ResolverException(Exception):
+    """A base class for all exceptions raised by this module.
+
+    Exceptions derived by this class should all be handled in this module. Any
+    bubbling pass the resolver should be treated as a bug.
+    """
+
+
+class RequirementsConflicted(ResolverException, Generic[RT, CT]):
+    def __init__(self, criterion: Criterion[RT, CT]) -> None:
+        super().__init__(criterion)
+        self.criterion = criterion
+
+    def __str__(self) -> str:
+        return "Requirements conflict: {}".format(
+            ", ".join(repr(r) for r in self.criterion.iter_requirement()),
+        )
+
+
+class InconsistentCandidate(ResolverException, Generic[RT, CT]):
+    def __init__(self, candidate: CT, criterion: Criterion[RT, CT]):
+        super().__init__(candidate, criterion)
+        self.candidate = candidate
+        self.criterion = criterion
+
+    def __str__(self) -> str:
+        return "Provided candidate {!r} does not satisfy {}".format(
+            self.candidate,
+            ", ".join(repr(r) for r in self.criterion.iter_requirement()),
+        )
+
+
+class ResolutionError(ResolverException):
+    pass
+
+
+class ResolutionImpossible(ResolutionError, Generic[RT, CT]):
+    def __init__(self, causes: Collection[RequirementInformation[RT, CT]]):
+        super().__init__(causes)
+        # causes is a list of RequirementInformation objects
+        self.causes = causes
+
+
+class ResolutionTooDeep(ResolutionError):
+    def __init__(self, round_count: int) -> None:
+        super().__init__(round_count)
+        self.round_count = round_count
diff --git a/src/pip/_vendor/resolvelib/resolvers.py b/src/pip/_vendor/resolvelib/resolvers/resolution.py
similarity index 67%
rename from src/pip/_vendor/resolvelib/resolvers.py
rename to src/pip/_vendor/resolvelib/resolvers/resolution.py
index 2c3d0e306f9..da3c66e2ab7 100644
--- a/src/pip/_vendor/resolvelib/resolvers.py
+++ b/src/pip/_vendor/resolvelib/resolvers/resolution.py
@@ -1,127 +1,90 @@
+from __future__ import annotations
+
 import collections
 import itertools
 import operator
-
-from .providers import AbstractResolver
-from .structs import DirectedGraph, IteratorMapping, build_iter_view
-
-RequirementInformation = collections.namedtuple(
-    "RequirementInformation", ["requirement", "parent"]
+from typing import TYPE_CHECKING, Collection, Generic, Iterable, Mapping
+
+from ..structs import (
+    CT,
+    KT,
+    RT,
+    DirectedGraph,
+    IterableView,
+    IteratorMapping,
+    RequirementInformation,
+    State,
+    build_iter_view,
+)
+from .abstract import AbstractResolver, Result
+from .criterion import Criterion
+from .exceptions import (
+    InconsistentCandidate,
+    RequirementsConflicted,
+    ResolutionImpossible,
+    ResolutionTooDeep,
+    ResolverException,
 )
 
+if TYPE_CHECKING:
+    from ..providers import AbstractProvider, Preference
+    from ..reporters import BaseReporter
 
-class ResolverException(Exception):
-    """A base class for all exceptions raised by this module.
-
-    Exceptions derived by this class should all be handled in this module. Any
-    bubbling pass the resolver should be treated as a bug.
-    """
-
-
-class RequirementsConflicted(ResolverException):
-    def __init__(self, criterion):
-        super(RequirementsConflicted, self).__init__(criterion)
-        self.criterion = criterion
-
-    def __str__(self):
-        return "Requirements conflict: {}".format(
-            ", ".join(repr(r) for r in self.criterion.iter_requirement()),
-        )
-
-
-class InconsistentCandidate(ResolverException):
-    def __init__(self, candidate, criterion):
-        super(InconsistentCandidate, self).__init__(candidate, criterion)
-        self.candidate = candidate
-        self.criterion = criterion
-
-    def __str__(self):
-        return "Provided candidate {!r} does not satisfy {}".format(
-            self.candidate,
-            ", ".join(repr(r) for r in self.criterion.iter_requirement()),
-        )
-
-
-class Criterion(object):
-    """Representation of possible resolution results of a package.
-
-    This holds three attributes:
-
-    * `information` is a collection of `RequirementInformation` pairs.
-      Each pair is a requirement contributing to this criterion, and the
-      candidate that provides the requirement.
-    * `incompatibilities` is a collection of all known not-to-work candidates
-      to exclude from consideration.
-    * `candidates` is a collection containing all possible candidates deducted
-      from the union of contributing requirements and known incompatibilities.
-      It should never be empty, except when the criterion is an attribute of a
-      raised `RequirementsConflicted` (in which case it is always empty).
-
-    .. note::
-        This class is intended to be externally immutable. **Do not** mutate
-        any of its attribute containers.
-    """
-
-    def __init__(self, candidates, information, incompatibilities):
-        self.candidates = candidates
-        self.information = information
-        self.incompatibilities = incompatibilities
-
-    def __repr__(self):
-        requirements = ", ".join(
-            "({!r}, via={!r})".format(req, parent)
-            for req, parent in self.information
-        )
-        return "Criterion({})".format(requirements)
-
-    def iter_requirement(self):
-        return (i.requirement for i in self.information)
-
-    def iter_parent(self):
-        return (i.parent for i in self.information)
-
-
-class ResolutionError(ResolverException):
-    pass
-
-
-class ResolutionImpossible(ResolutionError):
-    def __init__(self, causes):
-        super(ResolutionImpossible, self).__init__(causes)
-        # causes is a list of RequirementInformation objects
-        self.causes = causes
 
+def _build_result(state: State[RT, CT, KT]) -> Result[RT, CT, KT]:
+    mapping = state.mapping
+    all_keys: dict[int, KT | None] = {id(v): k for k, v in mapping.items()}
+    all_keys[id(None)] = None
 
-class ResolutionTooDeep(ResolutionError):
-    def __init__(self, round_count):
-        super(ResolutionTooDeep, self).__init__(round_count)
-        self.round_count = round_count
+    graph: DirectedGraph[KT | None] = DirectedGraph()
+    graph.add(None)  # Sentinel as root dependencies' parent.
 
+    connected: set[KT | None] = {None}
+    for key, criterion in state.criteria.items():
+        if not _has_route_to_root(state.criteria, key, all_keys, connected):
+            continue
+        if key not in graph:
+            graph.add(key)
+        for p in criterion.iter_parent():
+            try:
+                pkey = all_keys[id(p)]
+            except KeyError:
+                continue
+            if pkey not in graph:
+                graph.add(pkey)
+            graph.connect(pkey, key)
 
-# Resolution state in a round.
-State = collections.namedtuple("State", "mapping criteria backtrack_causes")
+    return Result(
+        mapping={k: v for k, v in mapping.items() if k in connected},
+        graph=graph,
+        criteria=state.criteria,
+    )
 
 
-class Resolution(object):
+class Resolution(Generic[RT, CT, KT]):
     """Stateful resolution object.
 
     This is designed as a one-off object that holds information to kick start
     the resolution process, and holds the results afterwards.
     """
 
-    def __init__(self, provider, reporter):
+    def __init__(
+        self,
+        provider: AbstractProvider[RT, CT, KT],
+        reporter: BaseReporter[RT, CT, KT],
+    ) -> None:
         self._p = provider
         self._r = reporter
-        self._states = []
+        self._states: list[State[RT, CT, KT]] = []
 
     @property
-    def state(self):
+    def state(self) -> State[RT, CT, KT]:
         try:
             return self._states[-1]
-        except IndexError:
-            raise AttributeError("state")
+        except IndexError as e:
+            raise AttributeError("state") from e
 
-    def _push_new_state(self):
+    def _push_new_state(self) -> None:
         """Push a new state into history.
 
         This new state will be used to hold resolution results of the next
@@ -135,7 +98,12 @@ def _push_new_state(self):
         )
         self._states.append(state)
 
-    def _add_to_criteria(self, criteria, requirement, parent):
+    def _add_to_criteria(
+        self,
+        criteria: dict[KT, Criterion[RT, CT]],
+        requirement: RT,
+        parent: CT | None,
+    ) -> None:
         self._r.adding_requirement(requirement=requirement, parent=parent)
 
         identifier = self._p.identify(requirement_or_candidate=requirement)
@@ -174,7 +142,9 @@ def _add_to_criteria(self, criteria, requirement, parent):
             raise RequirementsConflicted(criterion)
         criteria[identifier] = criterion
 
-    def _remove_information_from_criteria(self, criteria, parents):
+    def _remove_information_from_criteria(
+        self, criteria: dict[KT, Criterion[RT, CT]], parents: Collection[KT]
+    ) -> None:
         """Remove information from parents of criteria.
 
         Concretely, removes all values from each criterion's ``information``
@@ -199,7 +169,7 @@ def _remove_information_from_criteria(self, criteria, parents):
                 criterion.incompatibilities,
             )
 
-    def _get_preference(self, name):
+    def _get_preference(self, name: KT) -> Preference:
         return self._p.get_preference(
             identifier=name,
             resolutions=self.state.mapping,
@@ -214,7 +184,9 @@ def _get_preference(self, name):
             backtrack_causes=self.state.backtrack_causes,
         )
 
-    def _is_current_pin_satisfying(self, name, criterion):
+    def _is_current_pin_satisfying(
+        self, name: KT, criterion: Criterion[RT, CT]
+    ) -> bool:
         try:
             current_pin = self.state.mapping[name]
         except KeyError:
@@ -224,16 +196,16 @@ def _is_current_pin_satisfying(self, name, criterion):
             for r in criterion.iter_requirement()
         )
 
-    def _get_updated_criteria(self, candidate):
+    def _get_updated_criteria(self, candidate: CT) -> dict[KT, Criterion[RT, CT]]:
         criteria = self.state.criteria.copy()
         for requirement in self._p.get_dependencies(candidate=candidate):
             self._add_to_criteria(criteria, requirement, parent=candidate)
         return criteria
 
-    def _attempt_to_pin_criterion(self, name):
+    def _attempt_to_pin_criterion(self, name: KT) -> list[Criterion[RT, CT]]:
         criterion = self.state.criteria[name]
 
-        causes = []
+        causes: list[Criterion[RT, CT]] = []
         for candidate in criterion.candidates:
             try:
                 criteria = self._get_updated_criteria(candidate)
@@ -267,7 +239,42 @@ def _attempt_to_pin_criterion(self, name):
         # end, signal for backtracking.
         return causes
 
-    def _backjump(self, causes):
+    def _patch_criteria(
+        self, incompatibilities_from_broken: list[tuple[KT, list[CT]]]
+    ) -> bool:
+        # Create a new state from the last known-to-work one, and apply
+        # the previously gathered incompatibility information.
+        for k, incompatibilities in incompatibilities_from_broken:
+            if not incompatibilities:
+                continue
+            try:
+                criterion = self.state.criteria[k]
+            except KeyError:
+                continue
+            matches = self._p.find_matches(
+                identifier=k,
+                requirements=IteratorMapping(
+                    self.state.criteria,
+                    operator.methodcaller("iter_requirement"),
+                ),
+                incompatibilities=IteratorMapping(
+                    self.state.criteria,
+                    operator.attrgetter("incompatibilities"),
+                    {k: incompatibilities},
+                ),
+            )
+            candidates: IterableView[CT] = build_iter_view(matches)
+            if not candidates:
+                return False
+            incompatibilities.extend(criterion.incompatibilities)
+            self.state.criteria[k] = Criterion(
+                candidates=candidates,
+                information=list(criterion.information),
+                incompatibilities=incompatibilities,
+            )
+        return True
+
+    def _backjump(self, causes: list[RequirementInformation[RT, CT]]) -> bool:
         """Perform backjumping.
 
         When we enter here, the stack is like this::
@@ -298,7 +305,7 @@ def _backjump(self, causes):
             the new Z and go back to step 2.
         5b. If the incompatibilities apply cleanly, end backtracking.
         """
-        incompatible_reqs = itertools.chain(
+        incompatible_reqs: Iterable[CT | RT] = itertools.chain(
             (c.parent for c in causes if c.parent is not None),
             (c.requirement for c in causes),
         )
@@ -307,66 +314,44 @@ def _backjump(self, causes):
             # Remove the state that triggered backtracking.
             del self._states[-1]
 
-            # Ensure to backtrack to a state that caused the incompatibility
-            incompatible_state = False
-            while not incompatible_state:
+            # Optimistically backtrack to a state that caused the incompatibility
+            broken_state = self.state
+            while True:
                 # Retrieve the last candidate pin and known incompatibilities.
                 try:
                     broken_state = self._states.pop()
                     name, candidate = broken_state.mapping.popitem()
                 except (IndexError, KeyError):
-                    raise ResolutionImpossible(causes)
+                    raise ResolutionImpossible(causes) from None
+
+                # Only backjump if the current broken state is
+                # an incompatible dependency
+                if name not in incompatible_deps:
+                    break
+
+                # If the current dependencies and the incompatible dependencies
+                # are overlapping then we have found a cause of the incompatibility
                 current_dependencies = {
-                    self._p.identify(d)
-                    for d in self._p.get_dependencies(candidate)
+                    self._p.identify(d) for d in self._p.get_dependencies(candidate)
                 }
-                incompatible_state = not current_dependencies.isdisjoint(
-                    incompatible_deps
-                )
+                if not current_dependencies.isdisjoint(incompatible_deps):
+                    break
+
+                # Fallback: We should not backtrack to the point where
+                # broken_state.mapping is empty, so stop backtracking for
+                # a chance for the resolution to recover
+                if not broken_state.mapping:
+                    break
 
             incompatibilities_from_broken = [
-                (k, list(v.incompatibilities))
-                for k, v in broken_state.criteria.items()
+                (k, list(v.incompatibilities)) for k, v in broken_state.criteria.items()
             ]
 
             # Also mark the newly known incompatibility.
             incompatibilities_from_broken.append((name, [candidate]))
 
-            # Create a new state from the last known-to-work one, and apply
-            # the previously gathered incompatibility information.
-            def _patch_criteria():
-                for k, incompatibilities in incompatibilities_from_broken:
-                    if not incompatibilities:
-                        continue
-                    try:
-                        criterion = self.state.criteria[k]
-                    except KeyError:
-                        continue
-                    matches = self._p.find_matches(
-                        identifier=k,
-                        requirements=IteratorMapping(
-                            self.state.criteria,
-                            operator.methodcaller("iter_requirement"),
-                        ),
-                        incompatibilities=IteratorMapping(
-                            self.state.criteria,
-                            operator.attrgetter("incompatibilities"),
-                            {k: incompatibilities},
-                        ),
-                    )
-                    candidates = build_iter_view(matches)
-                    if not candidates:
-                        return False
-                    incompatibilities.extend(criterion.incompatibilities)
-                    self.state.criteria[k] = Criterion(
-                        candidates=candidates,
-                        information=list(criterion.information),
-                        incompatibilities=incompatibilities,
-                    )
-                return True
-
             self._push_new_state()
-            success = _patch_criteria()
+            success = self._patch_criteria(incompatibilities_from_broken)
 
             # It works! Let's work on this new state.
             if success:
@@ -378,7 +363,13 @@ def _patch_criteria():
         # No way to backtrack anymore.
         return False
 
-    def resolve(self, requirements, max_rounds):
+    def _extract_causes(
+        self, criteron: list[Criterion[RT, CT]]
+    ) -> list[RequirementInformation[RT, CT]]:
+        """Extract causes from list of criterion and deduplicate"""
+        return list({id(i): i for c in criteron for i in c.information}.values())
+
+    def resolve(self, requirements: Iterable[RT], max_rounds: int) -> State[RT, CT, KT]:
         if self._states:
             raise RuntimeError("already resolved")
 
@@ -396,7 +387,7 @@ def resolve(self, requirements, max_rounds):
             try:
                 self._add_to_criteria(self.state.criteria, r, parent=None)
             except RequirementsConflicted as e:
-                raise ResolutionImpossible(e.criterion.information)
+                raise ResolutionImpossible(e.criterion.information) from e
 
         # The root state is saved as a sentinel so the first ever pin can have
         # something to backtrack to if it fails. The root state is basically
@@ -418,16 +409,42 @@ def resolve(self, requirements, max_rounds):
                 return self.state
 
             # keep track of satisfied names to calculate diff after pinning
-            satisfied_names = set(self.state.criteria.keys()) - set(
-                unsatisfied_names
-            )
+            satisfied_names = set(self.state.criteria.keys()) - set(unsatisfied_names)
+
+            if len(unsatisfied_names) > 1:
+                narrowed_unstatisfied_names = list(
+                    self._p.narrow_requirement_selection(
+                        identifiers=unsatisfied_names,
+                        resolutions=self.state.mapping,
+                        candidates=IteratorMapping(
+                            self.state.criteria,
+                            operator.attrgetter("candidates"),
+                        ),
+                        information=IteratorMapping(
+                            self.state.criteria,
+                            operator.attrgetter("information"),
+                        ),
+                        backtrack_causes=self.state.backtrack_causes,
+                    )
+                )
+            else:
+                narrowed_unstatisfied_names = unsatisfied_names
+
+            # If there are no unsatisfied names use unsatisfied names
+            if not narrowed_unstatisfied_names:
+                raise RuntimeError("narrow_requirement_selection returned 0 names")
 
-            # Choose the most preferred unpinned criterion to try.
-            name = min(unsatisfied_names, key=self._get_preference)
-            failure_causes = self._attempt_to_pin_criterion(name)
+            # If there is only 1 unsatisfied name skip calling self._get_preference
+            if len(narrowed_unstatisfied_names) > 1:
+                # Choose the most preferred unpinned criterion to try.
+                name = min(narrowed_unstatisfied_names, key=self._get_preference)
+            else:
+                name = narrowed_unstatisfied_names[0]
 
-            if failure_causes:
-                causes = [i for c in failure_causes for i in c.information]
+            failure_criterion = self._attempt_to_pin_criterion(name)
+
+            if failure_criterion:
+                causes = self._extract_causes(failure_criterion)
                 # Backjump if pinning fails. The backjump process puts us in
                 # an unpinned state, so we can work on it in the next round.
                 self._r.resolving_conflicts(causes=causes)
@@ -457,64 +474,16 @@ def resolve(self, requirements, max_rounds):
         raise ResolutionTooDeep(max_rounds)
 
 
-def _has_route_to_root(criteria, key, all_keys, connected):
-    if key in connected:
-        return True
-    if key not in criteria:
-        return False
-    for p in criteria[key].iter_parent():
-        try:
-            pkey = all_keys[id(p)]
-        except KeyError:
-            continue
-        if pkey in connected:
-            connected.add(key)
-            return True
-        if _has_route_to_root(criteria, pkey, all_keys, connected):
-            connected.add(key)
-            return True
-    return False
-
-
-Result = collections.namedtuple("Result", "mapping graph criteria")
-
-
-def _build_result(state):
-    mapping = state.mapping
-    all_keys = {id(v): k for k, v in mapping.items()}
-    all_keys[id(None)] = None
-
-    graph = DirectedGraph()
-    graph.add(None)  # Sentinel as root dependencies' parent.
-
-    connected = {None}
-    for key, criterion in state.criteria.items():
-        if not _has_route_to_root(state.criteria, key, all_keys, connected):
-            continue
-        if key not in graph:
-            graph.add(key)
-        for p in criterion.iter_parent():
-            try:
-                pkey = all_keys[id(p)]
-            except KeyError:
-                continue
-            if pkey not in graph:
-                graph.add(pkey)
-            graph.connect(pkey, key)
-
-    return Result(
-        mapping={k: v for k, v in mapping.items() if k in connected},
-        graph=graph,
-        criteria=state.criteria,
-    )
-
-
-class Resolver(AbstractResolver):
+class Resolver(AbstractResolver[RT, CT, KT]):
     """The thing that performs the actual resolution work."""
 
     base_exception = ResolverException
 
-    def resolve(self, requirements, max_rounds=100):
+    def resolve(  # type: ignore[override]
+        self,
+        requirements: Iterable[RT],
+        max_rounds: int = 100,
+    ) -> Result[RT, CT, KT]:
         """Take a collection of constraints, spit out the resolution result.
 
         The return value is a representation to the final resolution result. It
@@ -545,3 +514,28 @@ def resolve(self, requirements, max_rounds=100):
         resolution = Resolution(self.provider, self.reporter)
         state = resolution.resolve(requirements, max_rounds=max_rounds)
         return _build_result(state)
+
+
+def _has_route_to_root(
+    criteria: Mapping[KT, Criterion[RT, CT]],
+    key: KT | None,
+    all_keys: dict[int, KT | None],
+    connected: set[KT | None],
+) -> bool:
+    if key in connected:
+        return True
+    if key not in criteria:
+        return False
+    assert key is not None
+    for p in criteria[key].iter_parent():
+        try:
+            pkey = all_keys[id(p)]
+        except KeyError:
+            continue
+        if pkey in connected:
+            connected.add(key)
+            return True
+        if _has_route_to_root(criteria, pkey, all_keys, connected):
+            connected.add(key)
+            return True
+    return False
diff --git a/src/pip/_vendor/resolvelib/structs.py b/src/pip/_vendor/resolvelib/structs.py
index 359a34f6018..18c74d41548 100644
--- a/src/pip/_vendor/resolvelib/structs.py
+++ b/src/pip/_vendor/resolvelib/structs.py
@@ -1,34 +1,73 @@
-import itertools
-
-from .compat import collections_abc
-
+from __future__ import annotations
 
-class DirectedGraph(object):
+import itertools
+from collections import namedtuple
+from typing import (
+    TYPE_CHECKING,
+    Callable,
+    Generic,
+    Iterable,
+    Iterator,
+    Mapping,
+    NamedTuple,
+    Sequence,
+    TypeVar,
+    Union,
+)
+
+KT = TypeVar("KT")  # Identifier.
+RT = TypeVar("RT")  # Requirement.
+CT = TypeVar("CT")  # Candidate.
+
+Matches = Union[Iterable[CT], Callable[[], Iterable[CT]]]
+
+if TYPE_CHECKING:
+    from .resolvers.criterion import Criterion
+
+    class RequirementInformation(NamedTuple, Generic[RT, CT]):
+        requirement: RT
+        parent: CT | None
+
+    class State(NamedTuple, Generic[RT, CT, KT]):
+        """Resolution state in a round."""
+
+        mapping: dict[KT, CT]
+        criteria: dict[KT, Criterion[RT, CT]]
+        backtrack_causes: list[RequirementInformation[RT, CT]]
+
+else:
+    RequirementInformation = namedtuple(
+        "RequirementInformation", ["requirement", "parent"]
+    )
+    State = namedtuple("State", ["mapping", "criteria", "backtrack_causes"])
+
+
+class DirectedGraph(Generic[KT]):
     """A graph structure with directed edges."""
 
-    def __init__(self):
-        self._vertices = set()
-        self._forwards = {}  #  -> Set[]
-        self._backwards = {}  #  -> Set[]
+    def __init__(self) -> None:
+        self._vertices: set[KT] = set()
+        self._forwards: dict[KT, set[KT]] = {}  #  -> Set[]
+        self._backwards: dict[KT, set[KT]] = {}  #  -> Set[]
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[KT]:
         return iter(self._vertices)
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._vertices)
 
-    def __contains__(self, key):
+    def __contains__(self, key: KT) -> bool:
         return key in self._vertices
 
-    def copy(self):
+    def copy(self) -> DirectedGraph[KT]:
         """Return a shallow copy of this graph."""
-        other = DirectedGraph()
+        other = type(self)()
         other._vertices = set(self._vertices)
         other._forwards = {k: set(v) for k, v in self._forwards.items()}
         other._backwards = {k: set(v) for k, v in self._backwards.items()}
         return other
 
-    def add(self, key):
+    def add(self, key: KT) -> None:
         """Add a new vertex to the graph."""
         if key in self._vertices:
             raise ValueError("vertex exists")
@@ -36,7 +75,7 @@ def add(self, key):
         self._forwards[key] = set()
         self._backwards[key] = set()
 
-    def remove(self, key):
+    def remove(self, key: KT) -> None:
         """Remove a vertex from the graph, disconnecting all edges from/to it."""
         self._vertices.remove(key)
         for f in self._forwards.pop(key):
@@ -44,10 +83,10 @@ def remove(self, key):
         for t in self._backwards.pop(key):
             self._forwards[t].remove(key)
 
-    def connected(self, f, t):
+    def connected(self, f: KT, t: KT) -> bool:
         return f in self._backwards[t] and t in self._forwards[f]
 
-    def connect(self, f, t):
+    def connect(self, f: KT, t: KT) -> None:
         """Connect two existing vertices.
 
         Nothing happens if the vertices are already connected.
@@ -57,56 +96,59 @@ def connect(self, f, t):
         self._forwards[f].add(t)
         self._backwards[t].add(f)
 
-    def iter_edges(self):
+    def iter_edges(self) -> Iterator[tuple[KT, KT]]:
         for f, children in self._forwards.items():
             for t in children:
                 yield f, t
 
-    def iter_children(self, key):
+    def iter_children(self, key: KT) -> Iterator[KT]:
         return iter(self._forwards[key])
 
-    def iter_parents(self, key):
+    def iter_parents(self, key: KT) -> Iterator[KT]:
         return iter(self._backwards[key])
 
 
-class IteratorMapping(collections_abc.Mapping):
-    def __init__(self, mapping, accessor, appends=None):
+class IteratorMapping(Mapping[KT, Iterator[CT]], Generic[RT, CT, KT]):
+    def __init__(
+        self,
+        mapping: Mapping[KT, RT],
+        accessor: Callable[[RT], Iterable[CT]],
+        appends: Mapping[KT, Iterable[CT]] | None = None,
+    ) -> None:
         self._mapping = mapping
         self._accessor = accessor
-        self._appends = appends or {}
+        self._appends: Mapping[KT, Iterable[CT]] = appends or {}
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "IteratorMapping({!r}, {!r}, {!r})".format(
             self._mapping,
             self._accessor,
             self._appends,
         )
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return bool(self._mapping or self._appends)
 
-    __nonzero__ = __bool__  # XXX: Python 2.
-
-    def __contains__(self, key):
+    def __contains__(self, key: object) -> bool:
         return key in self._mapping or key in self._appends
 
-    def __getitem__(self, k):
+    def __getitem__(self, k: KT) -> Iterator[CT]:
         try:
             v = self._mapping[k]
         except KeyError:
             return iter(self._appends[k])
         return itertools.chain(self._accessor(v), self._appends.get(k, ()))
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[KT]:
         more = (k for k in self._appends if k not in self._mapping)
         return itertools.chain(self._mapping, more)
 
-    def __len__(self):
+    def __len__(self) -> int:
         more = sum(1 for k in self._appends if k not in self._mapping)
         return len(self._mapping) + more
 
 
-class _FactoryIterableView(object):
+class _FactoryIterableView(Iterable[RT]):
     """Wrap an iterator factory returned by `find_matches()`.
 
     Calling `iter()` on this class would invoke the underlying iterator
@@ -115,56 +157,53 @@ class _FactoryIterableView(object):
     built-in Python sequence types.
     """
 
-    def __init__(self, factory):
+    def __init__(self, factory: Callable[[], Iterable[RT]]) -> None:
         self._factory = factory
-        self._iterable = None
+        self._iterable: Iterable[RT] | None = None
 
-    def __repr__(self):
-        return "{}({})".format(type(self).__name__, list(self))
+    def __repr__(self) -> str:
+        return f"{type(self).__name__}({list(self)})"
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         try:
             next(iter(self))
         except StopIteration:
             return False
         return True
 
-    __nonzero__ = __bool__  # XXX: Python 2.
-
-    def __iter__(self):
-        iterable = (
-            self._factory() if self._iterable is None else self._iterable
-        )
+    def __iter__(self) -> Iterator[RT]:
+        iterable = self._factory() if self._iterable is None else self._iterable
         self._iterable, current = itertools.tee(iterable)
         return current
 
 
-class _SequenceIterableView(object):
+class _SequenceIterableView(Iterable[RT]):
     """Wrap an iterable returned by find_matches().
 
     This is essentially just a proxy to the underlying sequence that provides
     the same interface as `_FactoryIterableView`.
     """
 
-    def __init__(self, sequence):
+    def __init__(self, sequence: Sequence[RT]):
         self._sequence = sequence
 
-    def __repr__(self):
-        return "{}({})".format(type(self).__name__, self._sequence)
+    def __repr__(self) -> str:
+        return f"{type(self).__name__}({self._sequence})"
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return bool(self._sequence)
 
-    __nonzero__ = __bool__  # XXX: Python 2.
-
-    def __iter__(self):
+    def __iter__(self) -> Iterator[RT]:
         return iter(self._sequence)
 
 
-def build_iter_view(matches):
+def build_iter_view(matches: Matches[CT]) -> Iterable[CT]:
     """Build an iterable view from the value returned by `find_matches()`."""
     if callable(matches):
         return _FactoryIterableView(matches)
-    if not isinstance(matches, collections_abc.Sequence):
+    if not isinstance(matches, Sequence):
         matches = list(matches)
     return _SequenceIterableView(matches)
+
+
+IterableView = Iterable
diff --git a/src/pip/_vendor/resolvelib/structs.pyi b/src/pip/_vendor/resolvelib/structs.pyi
deleted file mode 100644
index 0ac59f0f00a..00000000000
--- a/src/pip/_vendor/resolvelib/structs.pyi
+++ /dev/null
@@ -1,40 +0,0 @@
-from abc import ABCMeta
-from typing import (
-    Callable,
-    Container,
-    Generic,
-    Iterable,
-    Iterator,
-    Mapping,
-    Tuple,
-    TypeVar,
-    Union,
-)
-
-KT = TypeVar("KT")  # Identifier.
-RT = TypeVar("RT")  # Requirement.
-CT = TypeVar("CT")  # Candidate.
-_T = TypeVar("_T")
-
-Matches = Union[Iterable[CT], Callable[[], Iterable[CT]]]
-
-class IteratorMapping(Mapping[KT, _T], metaclass=ABCMeta):
-    pass
-
-class IterableView(Container[CT], Iterable[CT], metaclass=ABCMeta):
-    pass
-
-class DirectedGraph(Generic[KT]):
-    def __iter__(self) -> Iterator[KT]: ...
-    def __len__(self) -> int: ...
-    def __contains__(self, key: KT) -> bool: ...
-    def copy(self) -> "DirectedGraph[KT]": ...
-    def add(self, key: KT) -> None: ...
-    def remove(self, key: KT) -> None: ...
-    def connected(self, f: KT, t: KT) -> bool: ...
-    def connect(self, f: KT, t: KT) -> None: ...
-    def iter_edges(self) -> Iterable[Tuple[KT, KT]]: ...
-    def iter_children(self, key: KT) -> Iterable[KT]: ...
-    def iter_parents(self, key: KT) -> Iterable[KT]: ...
-
-def build_iter_view(matches: Matches) -> IterableView[CT]: ...
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index f04a9c1e73c..7e5f614e845 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -12,7 +12,7 @@ requests==2.32.3
 rich==13.9.4
     pygments==2.18.0
     typing_extensions==4.12.2
-resolvelib==1.0.1
+resolvelib==1.1.0
 setuptools==70.3.0
 tomli==2.2.1
 truststore==0.10.0

From 1ed6fc39281492a3804e696fe4b08c001e40a312 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 10 Nov 2024 15:09:49 -0500
Subject: [PATCH 708/992] Remove depth preference

---
 .../resolution/resolvelib/provider.py         | 20 -----
 .../resolution_resolvelib/test_provider.py    | 78 -------------------
 2 files changed, 98 deletions(-)
 delete mode 100644 tests/unit/resolution_resolvelib/test_provider.py

diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index fb0dd85f112..8aee30e3915 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -1,4 +1,3 @@
-import collections
 import math
 from functools import lru_cache
 from typing import (
@@ -100,7 +99,6 @@ def __init__(
         self._ignore_dependencies = ignore_dependencies
         self._upgrade_strategy = upgrade_strategy
         self._user_requested = user_requested
-        self._known_depths: Dict[str, float] = collections.defaultdict(lambda: math.inf)
 
     def identify(self, requirement_or_candidate: Union[Requirement, Candidate]) -> str:
         return requirement_or_candidate.name
@@ -157,23 +155,6 @@ def get_preference(
         direct = candidate is not None
         pinned = any(op[:2] == "==" for op in operators)
         unfree = bool(operators)
-
-        try:
-            requested_order: Union[int, float] = self._user_requested[identifier]
-        except KeyError:
-            requested_order = math.inf
-            if has_information:
-                parent_depths = (
-                    self._known_depths[parent.name] if parent is not None else 0.0
-                    for _, parent in information[identifier]
-                )
-                inferred_depth = min(d for d in parent_depths) + 1.0
-            else:
-                inferred_depth = math.inf
-        else:
-            inferred_depth = 1.0
-        self._known_depths[identifier] = inferred_depth
-
         requested_order = self._user_requested.get(identifier, math.inf)
 
         # Requires-Python has only one candidate and the check is basically
@@ -190,7 +171,6 @@ def get_preference(
             not direct,
             not pinned,
             not backtrack_cause,
-            inferred_depth,
             requested_order,
             not unfree,
             identifier,
diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
deleted file mode 100644
index 5f30e2bc1dd..00000000000
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ /dev/null
@@ -1,78 +0,0 @@
-from typing import TYPE_CHECKING, List, Optional
-
-from pip._vendor.resolvelib.resolvers import RequirementInformation
-
-from pip._internal.models.candidate import InstallationCandidate
-from pip._internal.models.link import Link
-from pip._internal.req.constructors import install_req_from_req_string
-from pip._internal.resolution.resolvelib.factory import Factory
-from pip._internal.resolution.resolvelib.provider import PipProvider
-from pip._internal.resolution.resolvelib.requirements import SpecifierRequirement
-
-if TYPE_CHECKING:
-    from pip._internal.resolution.resolvelib.provider import PreferenceInformation
-
-
-def build_requirement_information(
-    name: str, parent: Optional[InstallationCandidate]
-) -> List["PreferenceInformation"]:
-    install_requirement = install_req_from_req_string(name)
-    # RequirementInformation is typed as a tuple, but it is a namedtupled.
-    # https://github.com/sarugaku/resolvelib/blob/7bc025aa2a4e979597c438ad7b17d2e8a08a364e/src/resolvelib/resolvers.pyi#L20-L22
-    requirement_information: PreferenceInformation = RequirementInformation(
-        requirement=SpecifierRequirement(install_requirement),  # type: ignore[call-arg]
-        parent=parent,
-    )
-    return [requirement_information]
-
-
-def test_provider_known_depths(factory: Factory) -> None:
-    # Root requirement is specified by the user
-    # therefore has an inferred depth of 1
-    root_requirement_name = "my-package"
-    provider = PipProvider(
-        factory=factory,
-        constraints={},
-        ignore_dependencies=False,
-        upgrade_strategy="to-satisfy-only",
-        user_requested={root_requirement_name: 0},
-    )
-
-    root_requirement_information = build_requirement_information(
-        name=root_requirement_name, parent=None
-    )
-    provider.get_preference(
-        identifier=root_requirement_name,
-        resolutions={},
-        candidates={},
-        information={root_requirement_name: root_requirement_information},
-        backtrack_causes=[],
-    )
-    assert provider._known_depths == {root_requirement_name: 1.0}
-
-    # Transitive requirement is a dependency of root requirement
-    # theforefore has an inferred depth of 2
-    root_package_candidate = InstallationCandidate(
-        root_requirement_name,
-        "1.0",
-        Link("https://{root_requirement_name}.com"),
-    )
-    transitive_requirement_name = "my-transitive-package"
-
-    transitive_package_information = build_requirement_information(
-        name=transitive_requirement_name, parent=root_package_candidate
-    )
-    provider.get_preference(
-        identifier=transitive_requirement_name,
-        resolutions={},
-        candidates={},
-        information={
-            root_requirement_name: root_requirement_information,
-            transitive_requirement_name: transitive_package_information,
-        },
-        backtrack_causes=[],
-    )
-    assert provider._known_depths == {
-        transitive_requirement_name: 2.0,
-        root_requirement_name: 1.0,
-    }

From 70151ae4a4d14636786b2b56e4394431bf4a1878 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 10 Nov 2024 15:14:43 -0500
Subject: [PATCH 709/992] Fix type hints for resolvelib 1.1.0

---
 src/pip/_internal/resolution/resolvelib/factory.py  |  2 +-
 src/pip/_internal/resolution/resolvelib/reporter.py | 10 ++++++----
 src/pip/_internal/resolution/resolvelib/resolver.py |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
index 6c273eb88db..55c11b29158 100644
--- a/src/pip/_internal/resolution/resolvelib/factory.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
@@ -748,7 +748,7 @@ def get_installation_error(
         # The simplest case is when we have *one* cause that can't be
         # satisfied. We just report that case.
         if len(e.causes) == 1:
-            req, parent = e.causes[0]
+            req, parent = next(iter(e.causes))
             if req.name not in constraints:
                 return self._report_single_requirement_conflict(req, parent)
 
diff --git a/src/pip/_internal/resolution/resolvelib/reporter.py b/src/pip/_internal/resolution/resolvelib/reporter.py
index 0594569d850..f8ad815fe9f 100644
--- a/src/pip/_internal/resolution/resolvelib/reporter.py
+++ b/src/pip/_internal/resolution/resolvelib/reporter.py
@@ -1,6 +1,6 @@
 from collections import defaultdict
 from logging import getLogger
-from typing import Any, DefaultDict
+from typing import Any, DefaultDict, Optional
 
 from pip._vendor.resolvelib.reporters import BaseReporter
 
@@ -9,7 +9,7 @@
 logger = getLogger(__name__)
 
 
-class PipReporter(BaseReporter):
+class PipReporter(BaseReporter[Requirement, Candidate, str]):
     def __init__(self) -> None:
         self.reject_count_by_package: DefaultDict[str, int] = defaultdict(int)
 
@@ -55,7 +55,7 @@ def rejecting_candidate(self, criterion: Any, candidate: Candidate) -> None:
         logger.debug(msg)
 
 
-class PipDebuggingReporter(BaseReporter):
+class PipDebuggingReporter(BaseReporter[Requirement, Candidate, str]):
     """A reporter that does an info log for every event it sees."""
 
     def starting(self) -> None:
@@ -71,7 +71,9 @@ def ending_round(self, index: int, state: Any) -> None:
     def ending(self, state: Any) -> None:
         logger.info("Reporter.ending(%r)", state)
 
-    def adding_requirement(self, requirement: Requirement, parent: Candidate) -> None:
+    def adding_requirement(
+        self, requirement: Requirement, parent: Optional[Candidate]
+    ) -> None:
         logger.info("Reporter.adding_requirement(%r, %r)", requirement, parent)
 
     def rejecting_candidate(self, criterion: Any, candidate: Candidate) -> None:
diff --git a/src/pip/_internal/resolution/resolvelib/resolver.py b/src/pip/_internal/resolution/resolvelib/resolver.py
index c12beef0b2a..e6d5f303740 100644
--- a/src/pip/_internal/resolution/resolvelib/resolver.py
+++ b/src/pip/_internal/resolution/resolvelib/resolver.py
@@ -82,7 +82,7 @@ def resolve(
             user_requested=collected.user_requested,
         )
         if "PIP_RESOLVER_DEBUG" in os.environ:
-            reporter: BaseReporter = PipDebuggingReporter()
+            reporter: BaseReporter[Requirement, Candidate, str] = PipDebuggingReporter()
         else:
             reporter = PipReporter()
         resolver: RLResolver[Requirement, Candidate, str] = RLResolver(

From 0cd381f4c1e89b881e4f94829a4c6d99e43a2195 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 12 Jan 2025 13:04:09 -0500
Subject: [PATCH 710/992] Remove resolution depth from docs and doc string

---
 docs/html/topics/more-dependency-resolution.md      | 2 --
 src/pip/_internal/resolution/resolvelib/provider.py | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/docs/html/topics/more-dependency-resolution.md b/docs/html/topics/more-dependency-resolution.md
index b955e2ec114..21520528781 100644
--- a/docs/html/topics/more-dependency-resolution.md
+++ b/docs/html/topics/more-dependency-resolution.md
@@ -160,8 +160,6 @@ follows:
     explicit URL.
 * If equal, prefer if any requirement is "pinned", i.e. contains
     operator ``===`` or ``==``.
-* If equal, calculate an approximate "depth" and resolve requirements
-    closer to the user-specified requirements first.
 * Order user-specified requirements by the order they are specified.
 * If equal, prefers "non-free" requirements, i.e. contains at least one
     operator, such as ``>=`` or ``<``.
diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index 8aee30e3915..74cdb9d80f9 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -122,10 +122,6 @@ def get_preference(
           explicit URL.
         * If equal, prefer if any requirement is "pinned", i.e. contains
           operator ``===`` or ``==``.
-        * If equal, calculate an approximate "depth" and resolve requirements
-          closer to the user-specified requirements first. If the depth cannot
-          by determined (eg: due to no matching parents), it is considered
-          infinite.
         * Order user-specified requirements by the order they are specified.
         * If equal, prefers "non-free" requirements, i.e. contains at least one
           operator, such as ``>=`` or ``<``.

From 3a2647c380e5b644edc48afc20b58d34e009d539 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 12 Jan 2025 13:11:22 -0500
Subject: [PATCH 711/992] Update news item

---
 news/13001.bugfix.rst      | 5 +++++
 news/resolvelib.vendor.rst | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 news/13001.bugfix.rst

diff --git a/news/13001.bugfix.rst b/news/13001.bugfix.rst
new file mode 100644
index 00000000000..1c0db47415a
--- /dev/null
+++ b/news/13001.bugfix.rst
@@ -0,0 +1,5 @@
+Resolvelib 1.1.0 fixes a known issue where pip would report a
+ResolutionImpossible error even though there is a valid solution.
+However, the performance of some very complex dependency resolutions
+that previously resolved may be slower or result in a ResolutionTooDeep
+error.
diff --git a/news/resolvelib.vendor.rst b/news/resolvelib.vendor.rst
index d5e12f5b945..09a40292332 100644
--- a/news/resolvelib.vendor.rst
+++ b/news/resolvelib.vendor.rst
@@ -1 +1 @@
-Upgrade resolvelib to 1.1.0
+Upgrade resolvelib to 1.1.0.

From dad133e48557a4252dd599971233b12f3a077247 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 9 Feb 2025 13:09:34 -0500
Subject: [PATCH 712/992] add repr to RequiresPythonCandidate

---
 src/pip/_internal/resolution/resolvelib/candidates.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 6617644fe53..1d21ede72cc 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -552,6 +552,9 @@ def __init__(self, py_version_info: Optional[Tuple[int, ...]]) -> None:
     def __str__(self) -> str:
         return f"Python {self._version}"
 
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}({self._version!r})"
+
     @property
     def project_name(self) -> NormalizedName:
         return REQUIRES_PYTHON_IDENTIFIER

From 30f46b67d60fef17c5d3f0faf1236d8f5b19952e Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 9 Feb 2025 13:14:44 -0500
Subject: [PATCH 713/992] NEWS ENTRY

---
 news/13216.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/13216.trivial.rst

diff --git a/news/13216.trivial.rst b/news/13216.trivial.rst
new file mode 100644
index 00000000000..e7f3d0cc23e
--- /dev/null
+++ b/news/13216.trivial.rst
@@ -0,0 +1 @@
+ Add repr to RequiresPythonCandidate.

From 6154c3801be5f18e078950e4b01fde4072aa8ebc Mon Sep 17 00:00:00 2001
From: Md Sujauddin Sekh <61101752+sujaudd1n@users.noreply.github.com>
Date: Sun, 9 Feb 2025 23:46:54 +0530
Subject: [PATCH 714/992] Fix 404 link in User Guide under "User Install"
 (#13198)

The new link points to
https://docs.python.org/3/library/sysconfig.html#sysconfig-user-scheme
---
 docs/html/user_guide.rst                              | 2 +-
 news/4880ea82-528e-4eac-8334-30de7b32fb13.trivial.rst | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 news/4880ea82-528e-4eac-8334-30de7b32fb13.trivial.rst

diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index aa2e3ad8e26..2837c2537b8 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -630,7 +630,7 @@ User Installs
 =============
 
 With Python 2.6 came the `"user scheme" for installation
-`_,
+`_,
 which means that all Python distributions support an alternative install
 location that is specific to a user.  The default location for each OS is
 explained in the python documentation for the `site.USER_BASE
diff --git a/news/4880ea82-528e-4eac-8334-30de7b32fb13.trivial.rst b/news/4880ea82-528e-4eac-8334-30de7b32fb13.trivial.rst
new file mode 100644
index 00000000000..e69de29bb2d

From 3994c61fe82711cc9b96523d4b5525e3b6254ecf Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 9 Feb 2025 13:20:14 -0500
Subject: [PATCH 715/992] perf: pass --no-compile for build deps (#13192)

As the build environment is ephemeral, it's wasteful to pre-compile
everything, especially as not every Python module will be used/compiled
in most cases. In addition, the argument is that compilation ensures
read-only installations are not slower than necessary is moot as the
build environment is by design writable.

This saves ~200ms while installing setuptools while building pip itself.
For context, a pip install . (with --no-index and --find-links) takes
3400ms on main and pip wheel . takes 2200ms on main.

So, it's not a major win, but it's also nothing to sneeze at. Packages
using smaller backends, like flit, will likely see smaller improvements.
---
 news/7294.feature.rst          | 2 ++
 src/pip/_internal/build_env.py | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 news/7294.feature.rst

diff --git a/news/7294.feature.rst b/news/7294.feature.rst
new file mode 100644
index 00000000000..ee459870210
--- /dev/null
+++ b/news/7294.feature.rst
@@ -0,0 +1,2 @@
+Build environment dependencies are no longer compiled to bytecode during
+installation for a minor performance improvement.
diff --git a/src/pip/_internal/build_env.py b/src/pip/_internal/build_env.py
index 2612d4d14e8..22c7476702b 100644
--- a/src/pip/_internal/build_env.py
+++ b/src/pip/_internal/build_env.py
@@ -240,6 +240,10 @@ def _install_requirements(
             prefix.path,
             "--no-warn-script-location",
             "--disable-pip-version-check",
+            # As the build environment is ephemeral, it's wasteful to
+            # pre-compile everything, especially as not every Python
+            # module will be used/compiled in most cases.
+            "--no-compile",
             # The prefix specified two lines above, thus
             # target from config file or env var should be ignored
             "--target",

From 9423fd37a4afdffeb5ff222b9dd5b3cc51433b75 Mon Sep 17 00:00:00 2001
From: Krishan Bhasin <8904718+KrishanBhasin@users.noreply.github.com>
Date: Sun, 2 Feb 2025 09:33:44 +0000
Subject: [PATCH 716/992] Add docs for pip index

---
 docs/html/cli/index.md            |  1 +
 docs/html/cli/pip_index.rst       | 55 +++++++++++++++++++++++++++++++
 docs/html/reference/pip_index.rst | 11 +++++++
 news/13188.feature.rst            |  3 +-
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 docs/html/cli/pip_index.rst
 create mode 100644 docs/html/reference/pip_index.rst

diff --git a/docs/html/cli/index.md b/docs/html/cli/index.md
index 4b56dbeb4cb..902fe406e6e 100644
--- a/docs/html/cli/index.md
+++ b/docs/html/cli/index.md
@@ -37,6 +37,7 @@ pip_hash
 :caption: Package Index information
 
 pip_search
+pip_index
 ```
 
 ```{toctree}
diff --git a/docs/html/cli/pip_index.rst b/docs/html/cli/pip_index.rst
new file mode 100644
index 00000000000..89e56195c14
--- /dev/null
+++ b/docs/html/cli/pip_index.rst
@@ -0,0 +1,55 @@
+.. _`pip index`:
+
+===========
+pip index
+===========
+
+
+
+Usage
+=====
+
+.. tab:: Unix/macOS
+
+   .. pip-command-usage:: index "python -m pip"
+
+.. tab:: Windows
+
+   .. pip-command-usage:: index "py -m pip"
+
+
+Description
+===========
+
+.. pip-command-description:: index
+
+
+
+Options
+=======
+
+.. pip-command-options:: index
+
+
+
+Examples
+========
+
+#. Search for "peppercorn" versions
+
+   .. tab:: Unix/macOS
+
+      .. code-block:: console
+
+         $ python -m pip index versions peppercorn
+         peppercorn (0.6)
+         Available versions: 0.6, 0.5, 0.4, 0.3, 0.2, 0.1
+
+
+   .. tab:: Windows
+
+      .. code-block:: console
+
+         C:\> py -m pip index peppercorn
+         peppercorn (0.6)
+         Available versions: 0.6, 0.5, 0.4, 0.3, 0.2, 0.1
diff --git a/docs/html/reference/pip_index.rst b/docs/html/reference/pip_index.rst
new file mode 100644
index 00000000000..b80c1ada996
--- /dev/null
+++ b/docs/html/reference/pip_index.rst
@@ -0,0 +1,11 @@
+:orphan:
+
+.. meta::
+
+  :http-equiv=refresh: 3; url=../../cli/pip_index/
+
+This page has moved
+===================
+
+You should be redirected automatically in 3 seconds. If that didn't
+work, here's a link: :doc:`../cli/pip_index`
diff --git a/news/13188.feature.rst b/news/13188.feature.rst
index 15cb1fe5d18..d8bd807fb73 100644
--- a/news/13188.feature.rst
+++ b/news/13188.feature.rst
@@ -1,2 +1 @@
-Remove `experimental` warning from `pip index versions` command and
-add json output support.
\ No newline at end of file
+Remove ``experimental`` warning from ``pip index versions`` command.

From 35349891d166faa5c6929dcd5e9ad7cf7015e539 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 12 Feb 2025 15:00:02 -0500
Subject: [PATCH 717/992] Add get_console() to query global rich consoles

For an install progress bar, we'd like to emit logs while the progress
bar updates (for uninstallation messages, etc.). To avoid interwoven
logs, we need to log to the same console that the progress bar is using.

This is easiest to achieve by simply storing a global stdout and stderr
console, queried via a get_console() helper.
---
 src/pip/_internal/utils/logging.py | 33 ++++++++++++++++++------------
 tests/unit/test_logging.py         | 10 ++++++---
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/pip/_internal/utils/logging.py b/src/pip/_internal/utils/logging.py
index 62035fc40ec..099a92c496d 100644
--- a/src/pip/_internal/utils/logging.py
+++ b/src/pip/_internal/utils/logging.py
@@ -8,7 +8,7 @@
 from dataclasses import dataclass
 from io import TextIOWrapper
 from logging import Filter
-from typing import Any, ClassVar, Generator, List, Optional, TextIO, Type
+from typing import Any, ClassVar, Generator, List, Optional, Type
 
 from pip._vendor.rich.console import (
     Console,
@@ -29,6 +29,8 @@
 from pip._internal.utils.misc import ensure_dir
 
 _log_state = threading.local()
+_stdout_console = None
+_stderr_console = None
 subprocess_logger = getLogger("pip.subprocessor")
 
 
@@ -144,12 +146,21 @@ def on_broken_pipe(self) -> None:
         raise BrokenPipeError() from None
 
 
+def get_console(*, stderr: bool = False) -> Console:
+    if stderr:
+        assert _stderr_console is not None, "stderr rich console is missing!"
+        return _stderr_console
+    else:
+        assert _stdout_console is not None, "stdout rich console is missing!"
+        return _stdout_console
+
+
 class RichPipStreamHandler(RichHandler):
     KEYWORDS: ClassVar[Optional[List[str]]] = []
 
-    def __init__(self, stream: Optional[TextIO], no_color: bool) -> None:
+    def __init__(self, console: Console) -> None:
         super().__init__(
-            console=PipConsole(file=stream, no_color=no_color, soft_wrap=True),
+            console=console,
             show_time=False,
             show_level=False,
             show_path=False,
@@ -266,10 +277,6 @@ def setup_logging(verbosity: int, no_color: bool, user_log_file: Optional[str])
     vendored_log_level = "WARNING" if level in ["INFO", "ERROR"] else "DEBUG"
 
     # Shorthands for clarity
-    log_streams = {
-        "stdout": "ext://sys.stdout",
-        "stderr": "ext://sys.stderr",
-    }
     handler_classes = {
         "stream": "pip._internal.utils.logging.RichPipStreamHandler",
         "file": "pip._internal.utils.logging.BetterRotatingFileHandler",
@@ -277,6 +284,9 @@ def setup_logging(verbosity: int, no_color: bool, user_log_file: Optional[str])
     handlers = ["console", "console_errors", "console_subprocess"] + (
         ["user_log"] if include_user_log else []
     )
+    global _stdout_console, stderr_console
+    _stdout_console = PipConsole(file=sys.stdout, no_color=no_color, soft_wrap=True)
+    _stderr_console = PipConsole(file=sys.stderr, no_color=no_color, soft_wrap=True)
 
     logging.config.dictConfig(
         {
@@ -311,16 +321,14 @@ def setup_logging(verbosity: int, no_color: bool, user_log_file: Optional[str])
                 "console": {
                     "level": level,
                     "class": handler_classes["stream"],
-                    "no_color": no_color,
-                    "stream": log_streams["stdout"],
+                    "console": _stdout_console,
                     "filters": ["exclude_subprocess", "exclude_warnings"],
                     "formatter": "indent",
                 },
                 "console_errors": {
                     "level": "WARNING",
                     "class": handler_classes["stream"],
-                    "no_color": no_color,
-                    "stream": log_streams["stderr"],
+                    "console": _stderr_console,
                     "filters": ["exclude_subprocess"],
                     "formatter": "indent",
                 },
@@ -329,8 +337,7 @@ def setup_logging(verbosity: int, no_color: bool, user_log_file: Optional[str])
                 "console_subprocess": {
                     "level": level,
                     "class": handler_classes["stream"],
-                    "stream": log_streams["stderr"],
-                    "no_color": no_color,
+                    "console": _stderr_console,
                     "filters": ["restrict_to_subprocess"],
                     "formatter": "indent",
                 },
diff --git a/tests/unit/test_logging.py b/tests/unit/test_logging.py
index f673ed29def..a227bd67fa2 100644
--- a/tests/unit/test_logging.py
+++ b/tests/unit/test_logging.py
@@ -10,6 +10,7 @@
 from pip._internal.utils.logging import (
     BrokenStdoutLoggingError,
     IndentingFormatter,
+    PipConsole,
     RichPipStreamHandler,
     indent_log,
 )
@@ -142,7 +143,8 @@ def test_broken_pipe_in_stderr_flush(self) -> None:
         record = self._make_log_record()
 
         with redirect_stderr(StringIO()) as stderr:
-            handler = RichPipStreamHandler(stream=stderr, no_color=True)
+            console = PipConsole(file=stderr, no_color=True, soft_wrap=True)
+            handler = RichPipStreamHandler(console)
             with patch("sys.stderr.flush") as mock_flush:
                 mock_flush.side_effect = BrokenPipeError()
                 # The emit() call raises no exception.
@@ -165,7 +167,8 @@ def test_broken_pipe_in_stdout_write(self) -> None:
         record = self._make_log_record()
 
         with redirect_stdout(StringIO()) as stdout:
-            handler = RichPipStreamHandler(stream=stdout, no_color=True)
+            console = PipConsole(file=stdout, no_color=True, soft_wrap=True)
+            handler = RichPipStreamHandler(console)
             with patch("sys.stdout.write") as mock_write:
                 mock_write.side_effect = BrokenPipeError()
                 with pytest.raises(BrokenStdoutLoggingError):
@@ -180,7 +183,8 @@ def test_broken_pipe_in_stdout_flush(self) -> None:
         record = self._make_log_record()
 
         with redirect_stdout(StringIO()) as stdout:
-            handler = RichPipStreamHandler(stream=stdout, no_color=True)
+            console = PipConsole(file=stdout, no_color=True, soft_wrap=True)
+            handler = RichPipStreamHandler(console)
             with patch("sys.stdout.flush") as mock_flush:
                 mock_flush.side_effect = BrokenPipeError()
                 with pytest.raises(BrokenStdoutLoggingError):

From 24e364eb7366c263218876beeefae7897a4d08c8 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 12 Feb 2025 16:34:20 -0500
Subject: [PATCH 718/992] =?UTF-8?q?feat:=20Installation=20progress=20bar?=
 =?UTF-8?q?=20=E2=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Installation can be pretty slow so it'd be nice to provide progress
feedback to the user.

This commit adds a new progress renderer designed for installation:

- The progress bar will wait one refresh cycle (1000ms/6 = 170ms) before
  appearing. This avoids unsightly very short flashes.

- The progress bar is transient (i.e. it will disappear once all
  packages have been installed). This choice was made to avoid adding
  more clutter to pip install's output (despite the download progress
  bar being persistent).

- The progress bar won't be used at all if there's only one package to
  install.
---
 news/12712.feature.rst                 |  1 +
 src/pip/_internal/cli/progress_bars.py | 51 +++++++++++++++++++++++---
 src/pip/_internal/commands/install.py  |  1 +
 src/pip/_internal/req/__init__.py      | 15 +++++++-
 4 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 news/12712.feature.rst

diff --git a/news/12712.feature.rst b/news/12712.feature.rst
new file mode 100644
index 00000000000..adba2bf8451
--- /dev/null
+++ b/news/12712.feature.rst
@@ -0,0 +1 @@
+Display a transient progress bar during package installation.
diff --git a/src/pip/_internal/cli/progress_bars.py b/src/pip/_internal/cli/progress_bars.py
index 3d9dde8ed88..a7d77cfaa8f 100644
--- a/src/pip/_internal/cli/progress_bars.py
+++ b/src/pip/_internal/cli/progress_bars.py
@@ -1,11 +1,12 @@
 import functools
 import sys
-from typing import Callable, Generator, Iterable, Iterator, Optional, Tuple
+from typing import Callable, Generator, Iterable, Iterator, Optional, Tuple, TypeVar
 
 from pip._vendor.rich.progress import (
     BarColumn,
     DownloadColumn,
     FileSizeColumn,
+    MofNCompleteColumn,
     Progress,
     ProgressColumn,
     SpinnerColumn,
@@ -16,12 +17,14 @@
 )
 
 from pip._internal.cli.spinners import RateLimiter
-from pip._internal.utils.logging import get_indentation
+from pip._internal.req.req_install import InstallRequirement
+from pip._internal.utils.logging import get_console, get_indentation
 
-DownloadProgressRenderer = Callable[[Iterable[bytes]], Iterator[bytes]]
+T = TypeVar("T")
+ProgressRenderer = Callable[[Iterable[T]], Iterator[T]]
 
 
-def _rich_progress_bar(
+def _rich_download_progress_bar(
     iterable: Iterable[bytes],
     *,
     bar_type: str,
@@ -57,6 +60,28 @@ def _rich_progress_bar(
             progress.update(task_id, advance=len(chunk))
 
 
+def _rich_install_progress_bar(
+    iterable: Iterable[InstallRequirement], *, total: int
+) -> Iterator[InstallRequirement]:
+    columns = (
+        TextColumn("{task.fields[indent]}"),
+        BarColumn(),
+        MofNCompleteColumn(),
+        TextColumn("{task.description}"),
+    )
+    console = get_console()
+
+    bar = Progress(*columns, refresh_per_second=6, console=console, transient=True)
+    # Hiding the progress bar at initialization forces a refresh cycle to occur
+    # until the bar appears, avoiding very short flashes.
+    task = bar.add_task("", total=total, indent=" " * get_indentation(), visible=False)
+    with bar:
+        for req in iterable:
+            bar.update(task, description=rf"\[{req.name}]", visible=True)
+            yield req
+            bar.advance(task)
+
+
 def _raw_progress_bar(
     iterable: Iterable[bytes],
     *,
@@ -81,14 +106,28 @@ def write_progress(current: int, total: int) -> None:
 
 def get_download_progress_renderer(
     *, bar_type: str, size: Optional[int] = None
-) -> DownloadProgressRenderer:
+) -> ProgressRenderer[bytes]:
     """Get an object that can be used to render the download progress.
 
     Returns a callable, that takes an iterable to "wrap".
     """
     if bar_type == "on":
-        return functools.partial(_rich_progress_bar, bar_type=bar_type, size=size)
+        return functools.partial(
+            _rich_download_progress_bar, bar_type=bar_type, size=size
+        )
     elif bar_type == "raw":
         return functools.partial(_raw_progress_bar, size=size)
     else:
         return iter  # no-op, when passed an iterator
+
+
+def get_install_progress_renderer(
+    *, bar_type: str, total: int
+) -> ProgressRenderer[InstallRequirement]:
+    """Get an object that can be used to render the install progress.
+    Returns a callable, that takes an iterable to "wrap".
+    """
+    if bar_type == "on":
+        return functools.partial(_rich_install_progress_bar, total=total)
+    else:
+        return iter
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index 232a34a6d3e..5239d010421 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -464,6 +464,7 @@ def run(self, options: Values, args: List[str]) -> int:
                 warn_script_location=warn_script_location,
                 use_user_site=options.use_user_site,
                 pycompile=options.compile,
+                progress_bar=options.progress_bar,
             )
 
             lib_locations = get_lib_location_guesses(
diff --git a/src/pip/_internal/req/__init__.py b/src/pip/_internal/req/__init__.py
index 422d851d729..bf282dab8bc 100644
--- a/src/pip/_internal/req/__init__.py
+++ b/src/pip/_internal/req/__init__.py
@@ -3,6 +3,7 @@
 from dataclasses import dataclass
 from typing import Generator, List, Optional, Sequence, Tuple
 
+from pip._internal.cli.progress_bars import get_install_progress_renderer
 from pip._internal.utils.logging import indent_log
 
 from .req_file import parse_requirements
@@ -41,6 +42,7 @@ def install_given_reqs(
     warn_script_location: bool,
     use_user_site: bool,
     pycompile: bool,
+    progress_bar: str,
 ) -> List[InstallationResult]:
     """
     Install everything in the given list.
@@ -57,8 +59,19 @@ def install_given_reqs(
 
     installed = []
 
+    show_progress = logger.isEnabledFor(logging.INFO) and len(to_install) > 1
+
+    items = iter(to_install.values())
+    if show_progress:
+        renderer = get_install_progress_renderer(
+            bar_type=progress_bar, total=len(to_install)
+        )
+        items = renderer(items)
+
     with indent_log():
-        for req_name, requirement in to_install.items():
+        for requirement in items:
+            req_name = requirement.name
+            assert req_name is not None
             if requirement.should_reinstall:
                 logger.info("Attempting uninstall: %s", req_name)
                 with indent_log():

From 1a8c17a38fda9748bbd7e7559e27abf43372cb12 Mon Sep 17 00:00:00 2001
From: Joa 
Date: Thu, 13 Feb 2025 05:58:39 +0100
Subject: [PATCH 719/992] Gracefully handle Windows registry access errors
 during mimetype detection (#13183)

---
 news/12769.bugfix.rst                   | 1 +
 src/pip/_internal/operations/prepare.py | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 news/12769.bugfix.rst

diff --git a/news/12769.bugfix.rst b/news/12769.bugfix.rst
new file mode 100644
index 00000000000..fd27fc5c184
--- /dev/null
+++ b/news/12769.bugfix.rst
@@ -0,0 +1 @@
+Gracefully handle Windows registry access errors while guessing the MIME type of a file.
diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py
index a1c02d7dba9..b7beee55dce 100644
--- a/src/pip/_internal/operations/prepare.py
+++ b/src/pip/_internal/operations/prepare.py
@@ -87,7 +87,12 @@ class File:
 
     def __post_init__(self) -> None:
         if self.content_type is None:
-            self.content_type = mimetypes.guess_type(self.path)[0]
+            # Try to guess the file's MIME type. If the system MIME tables
+            # can't be loaded, give up.
+            try:
+                self.content_type = mimetypes.guess_type(self.path)[0]
+            except OSError:
+                pass
 
 
 def get_http_url(

From 93d43c9f5cdd40388253be757419b9312da1d24c Mon Sep 17 00:00:00 2001
From: Pradyun Gedam 
Date: Thu, 13 Feb 2025 10:16:58 +0000
Subject: [PATCH 720/992] Enable verbose logging with `--debug` (#12710)

This helps ensure that all relevant context is presented when a failure
happens and diagnosis is being done through the use of `--debug`.

Co-authored-by: Pradyun Gedam 
Co-authored-by: Richard Si 
---
 news/12710.feature.rst                | 1 +
 src/pip/_internal/cli/base_command.py | 2 ++
 tests/unit/test_base_command.py       | 6 ++++++
 3 files changed, 9 insertions(+)
 create mode 100644 news/12710.feature.rst

diff --git a/news/12710.feature.rst b/news/12710.feature.rst
new file mode 100644
index 00000000000..4b65e4f041c
--- /dev/null
+++ b/news/12710.feature.rst
@@ -0,0 +1 @@
+Using ``--debug`` also enables verbose logging.
diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py
index 362f84b6b0b..509f7463ba8 100644
--- a/src/pip/_internal/cli/base_command.py
+++ b/src/pip/_internal/cli/base_command.py
@@ -172,6 +172,8 @@ def _main(self, args: List[str]) -> int:
 
         # Set verbosity so that it can be used elsewhere.
         self.verbosity = options.verbose - options.quiet
+        if options.debug_mode:
+            self.verbosity = 2
 
         reconfigure(no_color=options.no_color)
         level_number = setup_logging(
diff --git a/tests/unit/test_base_command.py b/tests/unit/test_base_command.py
index 87665fbde43..33d2a95a3c2 100644
--- a/tests/unit/test_base_command.py
+++ b/tests/unit/test_base_command.py
@@ -107,6 +107,12 @@ def test_handle_pip_version_check_called(mock_handle_version_check: Mock) -> Non
     mock_handle_version_check.assert_called_once()
 
 
+def test_debug_enables_verbose_logs() -> None:
+    cmd = FakeCommand()
+    cmd.main(["fake", "--debug"])
+    assert cmd.verbosity >= 2
+
+
 def test_log_command_success(fixed_time: None, tmpdir: Path) -> None:
     """Test the --log option logs when command succeeds."""
     cmd = FakeCommand()

From ce9451518f17cedf1efb3481526ae760bfdbe1a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= 
Date: Sun, 16 Feb 2025 19:55:02 +0100
Subject: [PATCH 721/992] Fix a typo in pip list --include-editable help
 (#13223)

---
 src/pip/_internal/commands/list.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index 84943702410..a8b4f7af9fe 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -125,7 +125,7 @@ def add_options(self) -> None:
             "--include-editable",
             action="store_true",
             dest="include_editable",
-            help="Include editable package from output.",
+            help="Include editable package in output.",
             default=True,
         )
         self.cmd_opts.add_option(cmdoptions.list_exclude())

From b4c2ffdcd728d3545369b5bf991f7fd9f1923262 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 16 Feb 2025 15:54:13 -0500
Subject: [PATCH 722/992] Update news items

---
 news/13001.bugfix.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/news/13001.bugfix.rst b/news/13001.bugfix.rst
index 1c0db47415a..3d9888d8d1d 100644
--- a/news/13001.bugfix.rst
+++ b/news/13001.bugfix.rst
@@ -1,5 +1,4 @@
 Resolvelib 1.1.0 fixes a known issue where pip would report a
 ResolutionImpossible error even though there is a valid solution.
-However, the performance of some very complex dependency resolutions
-that previously resolved may be slower or result in a ResolutionTooDeep
-error.
+However, some very complex dependency resolutions that previously
+resolved may resolve slower or fail with an ResolutionTooDeep error.

From fb55c1d59c8387d2af4cef3596884de8c7271d95 Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Thu, 31 Oct 2024 19:43:49 -0500
Subject: [PATCH 723/992] Add 'dependency-groups==1.3.0' to vendored libs

Steps taken:
- add `dependency-groups==1.3.0` to vendor.txt
- add dependency-groups to vendor __init__.py
- run vendoring sync
- examine results to confirm apparent correctness (rewritten tomli
  imports)
---
 src/pip/_vendor/__init__.py                   |   1 +
 src/pip/_vendor/dependency_groups/LICENSE.txt |   9 +
 src/pip/_vendor/dependency_groups/__init__.py |  13 ++
 src/pip/_vendor/dependency_groups/__main__.py |  65 ++++++
 .../dependency_groups/_implementation.py      | 213 ++++++++++++++++++
 .../_lint_dependency_groups.py                |  59 +++++
 .../_vendor/dependency_groups/_pip_wrapper.py |  62 +++++
 .../_vendor/dependency_groups/_toml_compat.py |   9 +
 src/pip/_vendor/dependency_groups/py.typed    |   0
 src/pip/_vendor/vendor.txt                    |   1 +
 10 files changed, 432 insertions(+)
 create mode 100644 src/pip/_vendor/dependency_groups/LICENSE.txt
 create mode 100644 src/pip/_vendor/dependency_groups/__init__.py
 create mode 100644 src/pip/_vendor/dependency_groups/__main__.py
 create mode 100644 src/pip/_vendor/dependency_groups/_implementation.py
 create mode 100644 src/pip/_vendor/dependency_groups/_lint_dependency_groups.py
 create mode 100644 src/pip/_vendor/dependency_groups/_pip_wrapper.py
 create mode 100644 src/pip/_vendor/dependency_groups/_toml_compat.py
 create mode 100644 src/pip/_vendor/dependency_groups/py.typed

diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
index 561089ccc0c..34ccb990791 100644
--- a/src/pip/_vendor/__init__.py
+++ b/src/pip/_vendor/__init__.py
@@ -60,6 +60,7 @@ def vendored(modulename):
     # Actually alias all of our vendored dependencies.
     vendored("cachecontrol")
     vendored("certifi")
+    vendored("dependency-groups")
     vendored("distlib")
     vendored("distro")
     vendored("packaging")
diff --git a/src/pip/_vendor/dependency_groups/LICENSE.txt b/src/pip/_vendor/dependency_groups/LICENSE.txt
new file mode 100644
index 00000000000..b9723b85ed7
--- /dev/null
+++ b/src/pip/_vendor/dependency_groups/LICENSE.txt
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2024-present Stephen Rosen 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/pip/_vendor/dependency_groups/__init__.py b/src/pip/_vendor/dependency_groups/__init__.py
new file mode 100644
index 00000000000..9fec2029949
--- /dev/null
+++ b/src/pip/_vendor/dependency_groups/__init__.py
@@ -0,0 +1,13 @@
+from ._implementation import (
+    CyclicDependencyError,
+    DependencyGroupInclude,
+    DependencyGroupResolver,
+    resolve,
+)
+
+__all__ = (
+    "CyclicDependencyError",
+    "DependencyGroupInclude",
+    "DependencyGroupResolver",
+    "resolve",
+)
diff --git a/src/pip/_vendor/dependency_groups/__main__.py b/src/pip/_vendor/dependency_groups/__main__.py
new file mode 100644
index 00000000000..48ebb0d41cf
--- /dev/null
+++ b/src/pip/_vendor/dependency_groups/__main__.py
@@ -0,0 +1,65 @@
+import argparse
+import sys
+
+from ._implementation import resolve
+from ._toml_compat import tomllib
+
+
+def main() -> None:
+    if tomllib is None:
+        print(
+            "Usage error: dependency-groups CLI requires tomli or Python 3.11+",
+            file=sys.stderr,
+        )
+        raise SystemExit(2)
+
+    parser = argparse.ArgumentParser(
+        description=(
+            "A dependency-groups CLI. Prints out a resolved group, newline-delimited."
+        )
+    )
+    parser.add_argument(
+        "GROUP_NAME", nargs="*", help="The dependency group(s) to resolve."
+    )
+    parser.add_argument(
+        "-f",
+        "--pyproject-file",
+        default="pyproject.toml",
+        help="The pyproject.toml file. Defaults to trying in the current directory.",
+    )
+    parser.add_argument(
+        "-o",
+        "--output",
+        help="An output file. Defaults to stdout.",
+    )
+    parser.add_argument(
+        "-l",
+        "--list",
+        action="store_true",
+        help="List the available dependency groups",
+    )
+    args = parser.parse_args()
+
+    with open(args.pyproject_file, "rb") as fp:
+        pyproject = tomllib.load(fp)
+
+    dependency_groups_raw = pyproject.get("dependency-groups", {})
+
+    if args.list:
+        print(*dependency_groups_raw.keys())
+        return
+    if not args.GROUP_NAME:
+        print("A GROUP_NAME is required", file=sys.stderr)
+        raise SystemExit(3)
+
+    content = "\n".join(resolve(dependency_groups_raw, *args.GROUP_NAME))
+
+    if args.output is None or args.output == "-":
+        print(content)
+    else:
+        with open(args.output, "w", encoding="utf-8") as fp:
+            print(content, file=fp)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/pip/_vendor/dependency_groups/_implementation.py b/src/pip/_vendor/dependency_groups/_implementation.py
new file mode 100644
index 00000000000..80d91693820
--- /dev/null
+++ b/src/pip/_vendor/dependency_groups/_implementation.py
@@ -0,0 +1,213 @@
+from __future__ import annotations
+
+import dataclasses
+import re
+from collections.abc import Mapping
+
+from pip._vendor.packaging.requirements import Requirement
+
+
+def _normalize_name(name: str) -> str:
+    return re.sub(r"[-_.]+", "-", name).lower()
+
+
+def _normalize_group_names(
+    dependency_groups: Mapping[str, str | Mapping[str, str]]
+) -> Mapping[str, str | Mapping[str, str]]:
+    original_names: dict[str, list[str]] = {}
+    normalized_groups = {}
+
+    for group_name, value in dependency_groups.items():
+        normed_group_name = _normalize_name(group_name)
+        original_names.setdefault(normed_group_name, []).append(group_name)
+        normalized_groups[normed_group_name] = value
+
+    errors = []
+    for normed_name, names in original_names.items():
+        if len(names) > 1:
+            errors.append(f"{normed_name} ({', '.join(names)})")
+    if errors:
+        raise ValueError(f"Duplicate dependency group names: {', '.join(errors)}")
+
+    return normalized_groups
+
+
+@dataclasses.dataclass
+class DependencyGroupInclude:
+    include_group: str
+
+
+class CyclicDependencyError(ValueError):
+    """
+    An error representing the detection of a cycle.
+    """
+
+    def __init__(self, requested_group: str, group: str, include_group: str) -> None:
+        self.requested_group = requested_group
+        self.group = group
+        self.include_group = include_group
+
+        if include_group == group:
+            reason = f"{group} includes itself"
+        else:
+            reason = f"{include_group} -> {group}, {group} -> {include_group}"
+        super().__init__(
+            "Cyclic dependency group include while resolving "
+            f"{requested_group}: {reason}"
+        )
+
+
+class DependencyGroupResolver:
+    """
+    A resolver for Dependency Group data.
+
+    This class handles caching, name normalization, cycle detection, and other
+    parsing requirements. There are only two public methods for exploring the data:
+    ``lookup()`` and ``resolve()``.
+
+    :param dependency_groups: A mapping, as provided via pyproject
+        ``[dependency-groups]``.
+    """
+
+    def __init__(
+        self,
+        dependency_groups: Mapping[str, str | Mapping[str, str]],
+    ) -> None:
+        if not isinstance(dependency_groups, Mapping):
+            raise TypeError("Dependency Groups table is not a mapping")
+        self.dependency_groups = _normalize_group_names(dependency_groups)
+        # a map of group names to parsed data
+        self._parsed_groups: dict[
+            str, tuple[Requirement | DependencyGroupInclude, ...]
+        ] = {}
+        # a map of group names to their ancestors, used for cycle detection
+        self._include_graph_ancestors: dict[str, tuple[str, ...]] = {}
+        # a cache of completed resolutions to Requirement lists
+        self._resolve_cache: dict[str, tuple[Requirement, ...]] = {}
+
+    def lookup(self, group: str) -> tuple[Requirement | DependencyGroupInclude, ...]:
+        """
+        Lookup a group name, returning the parsed dependency data for that group.
+        This will not resolve includes.
+
+        :param group: the name of the group to lookup
+
+        :raises ValueError: if the data does not appear to be valid dependency group
+            data
+        :raises TypeError: if the data is not a string
+        :raises LookupError: if group name is absent
+        :raises packaging.requirements.InvalidRequirement: if a specifier is not valid
+        """
+        if not isinstance(group, str):
+            raise TypeError("Dependency group name is not a str")
+        group = _normalize_name(group)
+        return self._parse_group(group)
+
+    def resolve(self, group: str) -> tuple[Requirement, ...]:
+        """
+        Resolve a dependency group to a list of requirements.
+
+        :param group: the name of the group to resolve
+
+        :raises TypeError: if the inputs appear to be the wrong types
+        :raises ValueError: if the data does not appear to be valid dependency group
+            data
+        :raises LookupError: if group name is absent
+        :raises packaging.requirements.InvalidRequirement: if a specifier is not valid
+        """
+        if not isinstance(group, str):
+            raise TypeError("Dependency group name is not a str")
+        group = _normalize_name(group)
+        return self._resolve(group, group)
+
+    def _parse_group(
+        self, group: str
+    ) -> tuple[Requirement | DependencyGroupInclude, ...]:
+        # short circuit -- never do the work twice
+        if group in self._parsed_groups:
+            return self._parsed_groups[group]
+
+        if group not in self.dependency_groups:
+            raise LookupError(f"Dependency group '{group}' not found")
+
+        raw_group = self.dependency_groups[group]
+        if not isinstance(raw_group, list):
+            raise TypeError(f"Dependency group '{group}' is not a list")
+
+        elements: list[Requirement | DependencyGroupInclude] = []
+        for item in raw_group:
+            if isinstance(item, str):
+                # packaging.requirements.Requirement parsing ensures that this is a
+                # valid PEP 508 Dependency Specifier
+                # raises InvalidRequirement on failure
+                elements.append(Requirement(item))
+            elif isinstance(item, dict):
+                if tuple(item.keys()) != ("include-group",):
+                    raise ValueError(f"Invalid dependency group item: {item}")
+
+                include_group = next(iter(item.values()))
+                elements.append(DependencyGroupInclude(include_group=include_group))
+            else:
+                raise ValueError(f"Invalid dependency group item: {item}")
+
+        self._parsed_groups[group] = tuple(elements)
+        return self._parsed_groups[group]
+
+    def _resolve(self, group: str, requested_group: str) -> tuple[Requirement, ...]:
+        """
+        This is a helper for cached resolution to strings.
+
+        :param group: The name of the group to resolve.
+        :param requested_group: The group which was used in the original, user-facing
+            request.
+        """
+        if group in self._resolve_cache:
+            return self._resolve_cache[group]
+
+        parsed = self._parse_group(group)
+
+        resolved_group = []
+        for item in parsed:
+            if isinstance(item, Requirement):
+                resolved_group.append(item)
+            elif isinstance(item, DependencyGroupInclude):
+                if item.include_group in self._include_graph_ancestors.get(group, ()):
+                    raise CyclicDependencyError(
+                        requested_group, group, item.include_group
+                    )
+                self._include_graph_ancestors[item.include_group] = (
+                    *self._include_graph_ancestors.get(group, ()),
+                    group,
+                )
+                resolved_group.extend(
+                    self._resolve(item.include_group, requested_group)
+                )
+            else:  # unreachable
+                raise NotImplementedError(
+                    f"Invalid dependency group item after parse: {item}"
+                )
+
+        self._resolve_cache[group] = tuple(resolved_group)
+        return self._resolve_cache[group]
+
+
+def resolve(
+    dependency_groups: Mapping[str, str | Mapping[str, str]], /, *groups: str
+) -> tuple[str, ...]:
+    """
+    Resolve a dependency group to a tuple of requirements, as strings.
+
+    :param dependency_groups: the parsed contents of the ``[dependency-groups]`` table
+        from ``pyproject.toml``
+    :param groups: the name of the group(s) to resolve
+
+    :raises TypeError: if the inputs appear to be the wrong types
+    :raises ValueError: if the data does not appear to be valid dependency group data
+    :raises LookupError: if group name is absent
+    :raises packaging.requirements.InvalidRequirement: if a specifier is not valid
+    """
+    return tuple(
+        str(r)
+        for group in groups
+        for r in DependencyGroupResolver(dependency_groups).resolve(group)
+    )
diff --git a/src/pip/_vendor/dependency_groups/_lint_dependency_groups.py b/src/pip/_vendor/dependency_groups/_lint_dependency_groups.py
new file mode 100644
index 00000000000..09454bdc280
--- /dev/null
+++ b/src/pip/_vendor/dependency_groups/_lint_dependency_groups.py
@@ -0,0 +1,59 @@
+from __future__ import annotations
+
+import argparse
+import sys
+
+from ._implementation import DependencyGroupResolver
+from ._toml_compat import tomllib
+
+
+def main(*, argv: list[str] | None = None) -> None:
+    if tomllib is None:
+        print(
+            "Usage error: dependency-groups CLI requires tomli or Python 3.11+",
+            file=sys.stderr,
+        )
+        raise SystemExit(2)
+
+    parser = argparse.ArgumentParser(
+        description=(
+            "Lint Dependency Groups for validity. "
+            "This will eagerly load and check all of your Dependency Groups."
+        )
+    )
+    parser.add_argument(
+        "-f",
+        "--pyproject-file",
+        default="pyproject.toml",
+        help="The pyproject.toml file. Defaults to trying in the current directory.",
+    )
+    args = parser.parse_args(argv if argv is not None else sys.argv[1:])
+
+    with open(args.pyproject_file, "rb") as fp:
+        pyproject = tomllib.load(fp)
+    dependency_groups_raw = pyproject.get("dependency-groups", {})
+
+    errors: list[str] = []
+    try:
+        resolver = DependencyGroupResolver(dependency_groups_raw)
+    except (ValueError, TypeError) as e:
+        errors.append(f"{type(e).__name__}: {e}")
+    else:
+        for groupname in resolver.dependency_groups:
+            try:
+                resolver.resolve(groupname)
+            except (LookupError, ValueError, TypeError) as e:
+                errors.append(f"{type(e).__name__}: {e}")
+
+    if errors:
+        print("errors encountered while examining dependency groups:")
+        for msg in errors:
+            print(f"  {msg}")
+        sys.exit(1)
+    else:
+        print("ok")
+        sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/pip/_vendor/dependency_groups/_pip_wrapper.py b/src/pip/_vendor/dependency_groups/_pip_wrapper.py
new file mode 100644
index 00000000000..f86d8961ba2
--- /dev/null
+++ b/src/pip/_vendor/dependency_groups/_pip_wrapper.py
@@ -0,0 +1,62 @@
+from __future__ import annotations
+
+import argparse
+import subprocess
+import sys
+
+from ._implementation import DependencyGroupResolver
+from ._toml_compat import tomllib
+
+
+def _invoke_pip(deps: list[str]) -> None:
+    subprocess.check_call([sys.executable, "-m", "pip", "install", *deps])
+
+
+def main(*, argv: list[str] | None = None) -> None:
+    if tomllib is None:
+        print(
+            "Usage error: dependency-groups CLI requires tomli or Python 3.11+",
+            file=sys.stderr,
+        )
+        raise SystemExit(2)
+
+    parser = argparse.ArgumentParser(description="Install Dependency Groups.")
+    parser.add_argument(
+        "DEPENDENCY_GROUP", nargs="+", help="The dependency groups to install."
+    )
+    parser.add_argument(
+        "-f",
+        "--pyproject-file",
+        default="pyproject.toml",
+        help="The pyproject.toml file. Defaults to trying in the current directory.",
+    )
+    args = parser.parse_args(argv if argv is not None else sys.argv[1:])
+
+    with open(args.pyproject_file, "rb") as fp:
+        pyproject = tomllib.load(fp)
+    dependency_groups_raw = pyproject.get("dependency-groups", {})
+
+    errors: list[str] = []
+    resolved: list[str] = []
+    try:
+        resolver = DependencyGroupResolver(dependency_groups_raw)
+    except (ValueError, TypeError) as e:
+        errors.append(f"{type(e).__name__}: {e}")
+    else:
+        for groupname in args.DEPENDENCY_GROUP:
+            try:
+                resolved.extend(str(r) for r in resolver.resolve(groupname))
+            except (LookupError, ValueError, TypeError) as e:
+                errors.append(f"{type(e).__name__}: {e}")
+
+    if errors:
+        print("errors encountered while examining dependency groups:")
+        for msg in errors:
+            print(f"  {msg}")
+        sys.exit(1)
+
+    _invoke_pip(resolved)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/pip/_vendor/dependency_groups/_toml_compat.py b/src/pip/_vendor/dependency_groups/_toml_compat.py
new file mode 100644
index 00000000000..8d6f921c2a5
--- /dev/null
+++ b/src/pip/_vendor/dependency_groups/_toml_compat.py
@@ -0,0 +1,9 @@
+try:
+    import tomllib
+except ImportError:
+    try:
+        from pip._vendor import tomli as tomllib  # type: ignore[no-redef, unused-ignore]
+    except ModuleNotFoundError:  # pragma: no cover
+        tomllib = None  # type: ignore[assignment, unused-ignore]
+
+__all__ = ("tomllib",)
diff --git a/src/pip/_vendor/dependency_groups/py.typed b/src/pip/_vendor/dependency_groups/py.typed
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 03f8d428d04..c9db74290db 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -16,3 +16,4 @@ resolvelib==1.1.0
 setuptools==70.3.0
 tomli==2.2.1
 truststore==0.10.1
+dependency-groups==1.3.0

From 8c542cdfbe464e8973f32322f2f1be212edfbcad Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Thu, 31 Oct 2024 20:07:06 -0500
Subject: [PATCH 724/992] Implement Dependency Group option: `--group`

`--group` is supported on `download` and `install` commands.
The option is parsed into the more verbose and explicit
`dependency_groups` name on the parsed args.

Both of these commands invoke the same processor for resolving
dependency groups, which loads `pyproject.toml` and resolves the list
of provided groups against the `[dependency-groups]` table.

A small alteration is made to `pip wheel` to initialize
`dependency_groups = []`, as this allows for some lower-level
consistency in the handling of the commands.
---
 src/pip/_internal/cli/cmdoptions.py           | 11 ++++
 src/pip/_internal/cli/req_command.py          | 20 ++++++-
 src/pip/_internal/commands/download.py        |  1 +
 src/pip/_internal/commands/install.py         |  1 +
 src/pip/_internal/commands/wheel.py           |  4 ++
 src/pip/_internal/req/req_dependency_group.py | 59 +++++++++++++++++++
 6 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 src/pip/_internal/req/req_dependency_group.py

diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index eeb7e651b79..7367407a50d 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -733,6 +733,17 @@ def _handle_no_cache_dir(
     help="Don't install package dependencies.",
 )
 
+dependency_groups: Callable[..., Option] = partial(
+    Option,
+    "--group",
+    dest="dependency_groups",
+    default=[],
+    action="append",
+    metavar="group",
+    help="Install a named dependency-group from `pyproject.toml` "
+    "in the current directory.",
+)
+
 ignore_requires_python: Callable[..., Option] = partial(
     Option,
     "--ignore-requires-python",
diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
index 92900f94ff4..5354194d9e8 100644
--- a/src/pip/_internal/cli/req_command.py
+++ b/src/pip/_internal/cli/req_command.py
@@ -28,6 +28,7 @@
     install_req_from_parsed_requirement,
     install_req_from_req_string,
 )
+from pip._internal.req.req_dependency_group import parse_dependency_groups
 from pip._internal.req.req_file import parse_requirements
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.resolution.base import BaseResolver
@@ -240,6 +241,18 @@ def get_requirements(
             )
             requirements.append(req_to_add)
 
+        if options.dependency_groups:
+            for req in parse_dependency_groups(
+                options.dependency_groups, session, finder=finder, options=options
+            ):
+                req_to_add = install_req_from_req_string(
+                    req,
+                    isolated=options.isolated_mode,
+                    use_pep517=options.use_pep517,
+                    user_supplied=True,
+                )
+                requirements.append(req_to_add)
+
         for req in options.editables:
             req_to_add = install_req_from_editable(
                 req,
@@ -272,7 +285,12 @@ def get_requirements(
         if any(req.has_hash_options for req in requirements):
             options.require_hashes = True
 
-        if not (args or options.editables or options.requirements):
+        if not (
+            args
+            or options.editables
+            or options.requirements
+            or options.dependency_groups
+        ):
             opts = {"name": self.name}
             if options.find_links:
                 raise CommandError(
diff --git a/src/pip/_internal/commands/download.py b/src/pip/_internal/commands/download.py
index 917bbb91d83..51277b0d6a5 100644
--- a/src/pip/_internal/commands/download.py
+++ b/src/pip/_internal/commands/download.py
@@ -38,6 +38,7 @@ class DownloadCommand(RequirementCommand):
     def add_options(self) -> None:
         self.cmd_opts.add_option(cmdoptions.constraints())
         self.cmd_opts.add_option(cmdoptions.requirements())
+        self.cmd_opts.add_option(cmdoptions.dependency_groups())
         self.cmd_opts.add_option(cmdoptions.no_deps())
         self.cmd_opts.add_option(cmdoptions.global_options())
         self.cmd_opts.add_option(cmdoptions.no_binary())
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index 5239d010421..d97a3de8c2f 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -84,6 +84,7 @@ def add_options(self) -> None:
         self.cmd_opts.add_option(cmdoptions.pre())
 
         self.cmd_opts.add_option(cmdoptions.editable())
+        self.cmd_opts.add_option(cmdoptions.dependency_groups())
         self.cmd_opts.add_option(
             "--dry-run",
             action="store_true",
diff --git a/src/pip/_internal/commands/wheel.py b/src/pip/_internal/commands/wheel.py
index 278719f4e0c..f45e1692207 100644
--- a/src/pip/_internal/commands/wheel.py
+++ b/src/pip/_internal/commands/wheel.py
@@ -102,6 +102,10 @@ def add_options(self) -> None:
 
     @with_cleanup
     def run(self, options: Values, args: List[str]) -> int:
+        # dependency-groups aren't desirable with `pip wheel`, but providing it
+        # consistently allows RequirementCommand to expect it to be present
+        options.dependency_groups = []
+
         session = self.get_default_session(options)
 
         finder = self._build_package_finder(options, session)
diff --git a/src/pip/_internal/req/req_dependency_group.py b/src/pip/_internal/req/req_dependency_group.py
new file mode 100644
index 00000000000..1750d4dd06c
--- /dev/null
+++ b/src/pip/_internal/req/req_dependency_group.py
@@ -0,0 +1,59 @@
+import optparse
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
+
+from pip._vendor import tomli
+from pip._vendor.dependency_groups import resolve as resolve_dependency_group
+
+from pip._internal.exceptions import InstallationError
+from pip._internal.network.session import PipSession
+
+if TYPE_CHECKING:
+    from pip._internal.index.package_finder import PackageFinder
+
+
+def parse_dependency_groups(
+    groups: List[str],
+    session: PipSession,
+    finder: Optional["PackageFinder"] = None,
+    options: Optional[optparse.Values] = None,
+) -> List[str]:
+    """
+    Parse dependency groups data in a way which is sensitive to the `pip` context and
+    raises InstallationErrors if anything goes wrong.
+    """
+    pyproject = _load_pyproject()
+
+    if "dependency-groups" not in pyproject:
+        raise InstallationError(
+            "[dependency-groups] table was missing. Cannot resolve '--group' options."
+        )
+    raw_dependency_groups = pyproject["dependency-groups"]
+    if not isinstance(raw_dependency_groups, dict):
+        raise InstallationError(
+            "[dependency-groups] table was malformed. Cannot resolve '--group' options."
+        )
+
+    try:
+        return list(resolve_dependency_group(raw_dependency_groups, *groups))
+    except (ValueError, TypeError, LookupError) as e:
+        raise InstallationError("[dependency-groups] resolution failed: {e}") from e
+
+
+def _load_pyproject() -> Dict[str, Any]:
+    """
+    This helper loads pyproject.toml from the current working directory.
+
+    It does not allow specification of the path to be used and raises an
+    InstallationError if the operation fails.
+    """
+    try:
+        with open("pyproject.toml", "rb") as fp:
+            return tomli.load(fp)
+    except FileNotFoundError:
+        raise InstallationError(
+            "pyproject.toml not found. Cannot resolve '--group' options."
+        )
+    except tomli.TOMLDecodeError as e:
+        raise InstallationError(f"Error parsing pyproject.toml: {e}") from e
+    except OSError as e:
+        raise InstallationError(f"Error reading pyproject.toml: {e}") from e

From 99df94ae9e7cb082b71903bc143fa4ea4ada4035 Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Mon, 4 Nov 2024 18:21:30 -0600
Subject: [PATCH 725/992] Add unit tests for dependency group loading

A new unit test module is added for parsing dependency groups and used
to verify all of the pip-defined behaviors for handling
dependency-groups.

In one path, the underlying exception message from `dependency-groups`
is exposed to users, where it should offer some explanation of why
parsing failed, and this is therefore tested.

Some related changes are applied to the dependency groups usage sites
in the src tree. The signature of the dependency group requirement
parse function is simplified, and its usage is therefore updated.
A bugfix is applied to add a missing `f` on an intended f-string.
---
 src/pip/_internal/cli/req_command.py          |   4 +-
 src/pip/_internal/req/req_dependency_group.py |  16 +--
 tests/unit/test_req_dependency_group.py       | 116 ++++++++++++++++++
 3 files changed, 120 insertions(+), 16 deletions(-)
 create mode 100644 tests/unit/test_req_dependency_group.py

diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
index 5354194d9e8..26bb8159fa8 100644
--- a/src/pip/_internal/cli/req_command.py
+++ b/src/pip/_internal/cli/req_command.py
@@ -242,9 +242,7 @@ def get_requirements(
             requirements.append(req_to_add)
 
         if options.dependency_groups:
-            for req in parse_dependency_groups(
-                options.dependency_groups, session, finder=finder, options=options
-            ):
+            for req in parse_dependency_groups(options.dependency_groups):
                 req_to_add = install_req_from_req_string(
                     req,
                     isolated=options.isolated_mode,
diff --git a/src/pip/_internal/req/req_dependency_group.py b/src/pip/_internal/req/req_dependency_group.py
index 1750d4dd06c..aa9839ead59 100644
--- a/src/pip/_internal/req/req_dependency_group.py
+++ b/src/pip/_internal/req/req_dependency_group.py
@@ -1,22 +1,12 @@
-import optparse
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import Any, Dict, List
 
 from pip._vendor import tomli
 from pip._vendor.dependency_groups import resolve as resolve_dependency_group
 
 from pip._internal.exceptions import InstallationError
-from pip._internal.network.session import PipSession
 
-if TYPE_CHECKING:
-    from pip._internal.index.package_finder import PackageFinder
 
-
-def parse_dependency_groups(
-    groups: List[str],
-    session: PipSession,
-    finder: Optional["PackageFinder"] = None,
-    options: Optional[optparse.Values] = None,
-) -> List[str]:
+def parse_dependency_groups(groups: List[str]) -> List[str]:
     """
     Parse dependency groups data in a way which is sensitive to the `pip` context and
     raises InstallationErrors if anything goes wrong.
@@ -36,7 +26,7 @@ def parse_dependency_groups(
     try:
         return list(resolve_dependency_group(raw_dependency_groups, *groups))
     except (ValueError, TypeError, LookupError) as e:
-        raise InstallationError("[dependency-groups] resolution failed: {e}") from e
+        raise InstallationError(f"[dependency-groups] resolution failed: {e}") from e
 
 
 def _load_pyproject() -> Dict[str, Any]:
diff --git a/tests/unit/test_req_dependency_group.py b/tests/unit/test_req_dependency_group.py
new file mode 100644
index 00000000000..dd78fd031ac
--- /dev/null
+++ b/tests/unit/test_req_dependency_group.py
@@ -0,0 +1,116 @@
+import errno
+from pathlib import Path
+from typing import Any
+
+import pytest
+
+from pip._internal.exceptions import InstallationError
+from pip._internal.req.req_dependency_group import parse_dependency_groups
+
+
+def test_parse_simple_dependency_groups(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    pyproject = tmp_path.joinpath("pyproject.toml")
+    pyproject.write_text(
+        """\
+[dependency-groups]
+foo = ["bar"]
+"""
+    )
+    monkeypatch.chdir(tmp_path)
+
+    result = list(parse_dependency_groups(["foo"]))
+
+    assert len(result) == 1, result
+    assert result[0] == "bar"
+
+
+def test_parse_cyclic_dependency_groups(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    pyproject = tmp_path.joinpath("pyproject.toml")
+    pyproject.write_text(
+        """\
+[dependency-groups]
+foo = [{include-group="bar"}]
+bar = [{include-group="foo"}]
+"""
+    )
+    monkeypatch.chdir(tmp_path)
+
+    with pytest.raises(
+        InstallationError, match=r"\[dependency-groups\] resolution failed:"
+    ) as excinfo:
+        parse_dependency_groups(["foo"])
+
+    exception = excinfo.value
+    assert (
+        "Cyclic dependency group include while resolving foo: foo -> bar, bar -> foo"
+    ) in str(exception)
+
+
+def test_parse_with_no_dependency_groups_defined(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    pyproject = tmp_path.joinpath("pyproject.toml")
+    pyproject.write_text(
+        """\
+"""
+    )
+    monkeypatch.chdir(tmp_path)
+
+    with pytest.raises(
+        InstallationError, match=r"\[dependency-groups\] table was missing\."
+    ):
+        parse_dependency_groups(["foo"])
+
+
+def test_parse_with_no_pyproject_file(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.chdir(tmp_path)
+
+    with pytest.raises(InstallationError, match=r"pyproject\.toml not found\."):
+        parse_dependency_groups(["foo"])
+
+
+def test_parse_with_malformed_pyproject_file(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    pyproject = tmp_path.joinpath("pyproject.toml")
+    pyproject.write_text(
+        """\
+[dependency-groups  # no closing bracket
+foo = ["bar"]
+"""
+    )
+    monkeypatch.chdir(tmp_path)
+
+    with pytest.raises(InstallationError, match=r"Error parsing pyproject\.toml"):
+        parse_dependency_groups(["foo"])
+
+
+def test_parse_gets_unexpected_oserror(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    pyproject = tmp_path.joinpath("pyproject.toml")
+    pyproject.write_text(
+        """\
+[dependency-groups]
+foo = ["bar"]
+"""
+    )
+    monkeypatch.chdir(tmp_path)
+
+    # inject an implementation of `tomli.load()` which emits an 'OSError(EPIPE, ...)'
+    # as though we were loading from a fifo or other unusual filetype
+    def epipe_toml_load(*args: Any, **kwargs: Any) -> None:
+        raise OSError(errno.EPIPE, "Broken pipe")
+
+    monkeypatch.setattr(
+        "pip._internal.req.req_dependency_group.tomli.load", epipe_toml_load
+    )
+
+    with pytest.raises(InstallationError, match=r"Error reading pyproject\.toml"):
+        parse_dependency_groups(["foo"])

From 8f389d37c2b6e5d45b097985876364a3316c6334 Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Mon, 4 Nov 2024 18:47:19 -0600
Subject: [PATCH 726/992] Add initial functional tests for dependency-groups

This initial suite of tests is modeled fairly closely on existing
tests for requirements files.

Tests cover the following cases:
- installing an empty dependency group (and nothing else)
- installing from a simple / straightforward group
- installing from multiple groups in a single command
- normalizing names from the CLI and pyproject.toml to match
- applying a constraints file to a dependency-group install
---
 tests/functional/test_install.py      | 15 +++++
 tests/functional/test_install_reqs.py | 95 +++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 35d4e58b65e..c999398d2b7 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -318,6 +318,21 @@ def test_install_exit_status_code_when_blank_requirements_file(
     script.pip("install", "-r", "blank.txt")
 
 
+def test_install_exit_status_code_when_empty_dependency_group(
+    script: PipTestEnvironment,
+) -> None:
+    """
+    Test install exit status code is 0 when empty dependency group specified
+    """
+    script.scratch_path.joinpath("pyproject.toml").write_text(
+        """\
+[dependency-groups]
+empty = []
+"""
+    )
+    script.pip("install", "--group", "empty")
+
+
 @pytest.mark.network
 def test_basic_install_from_pypi(script: PipTestEnvironment) -> None:
     """
diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index b1aed6ad3f4..2d5ef8b0304 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -93,6 +93,75 @@ def test_requirements_file(script: PipTestEnvironment) -> None:
     assert result.files_created[script.site_packages / fn].dir
 
 
+@pytest.mark.network
+def test_dependency_group(script: PipTestEnvironment) -> None:
+    """
+    Test installing from a dependency group.
+
+    """
+    pyproject = script.scratch_path / "pyproject.toml"
+    pyproject.write_text(
+        textwrap.dedent(
+            """\
+            [dependency-groups]
+            initools = [
+                "INITools==0.2",
+                "peppercorn<=0.6",
+            ]
+            """
+        )
+    )
+    result = script.pip("install", "--group", "initools")
+    result.did_create(script.site_packages / "INITools-0.2.dist-info")
+    result.did_create(script.site_packages / "initools")
+    assert result.files_created[script.site_packages / "peppercorn"].dir
+    assert result.files_created[script.site_packages / "peppercorn-0.6.dist-info"].dir
+
+
+@pytest.mark.network
+def test_multiple_dependency_groups(script: PipTestEnvironment) -> None:
+    """
+    Test installing from two dependency groups simultaneously.
+
+    """
+    pyproject = script.scratch_path / "pyproject.toml"
+    pyproject.write_text(
+        textwrap.dedent(
+            """\
+            [dependency-groups]
+            initools = ["INITools==0.2"]
+            peppercorn = ["peppercorn<=0.6"]
+            """
+        )
+    )
+    result = script.pip("install", "--group", "initools", "--group", "peppercorn")
+    result.did_create(script.site_packages / "INITools-0.2.dist-info")
+    result.did_create(script.site_packages / "initools")
+    assert result.files_created[script.site_packages / "peppercorn"].dir
+    assert result.files_created[script.site_packages / "peppercorn-0.6.dist-info"].dir
+
+
+@pytest.mark.network
+def test_dependency_group_with_non_normalized_name(script: PipTestEnvironment) -> None:
+    """
+    Test installing from a dependency group with a non-normalized name, verifying that
+    the pyproject.toml content and CLI arg are normalized to match.
+
+    """
+    pyproject = script.scratch_path / "pyproject.toml"
+    pyproject.write_text(
+        textwrap.dedent(
+            """\
+            [dependency-groups]
+            INITOOLS = ["INITools==0.2"]
+            """
+        )
+    )
+    result = script.pip("install", "--group", "IniTools")
+    result.did_create(script.site_packages / "INITools-0.2.dist-info")
+    result.did_create(script.site_packages / "initools")
+
+
 def test_schema_check_in_requirements_file(script: PipTestEnvironment) -> None:
     """
     Test installing from a requirements file with an invalid vcs schema..
@@ -212,6 +281,32 @@ def test_package_in_constraints_and_dependencies(
     assert "installed TopoRequires-0.0.1" in result.stdout
 
 
+def test_constraints_apply_to_dependency_groups(
+    script: PipTestEnvironment, data: TestData
+) -> None:
+    script.scratch_path.joinpath("constraints.txt").write_text("TopoRequires==0.0.1")
+    pyproject = script.scratch_path / "pyproject.toml"
+    pyproject.write_text(
+        textwrap.dedent(
+            """\
+            [dependency-groups]
+            mylibs = ["TopoRequires2"]
+            """
+        )
+    )
+    result = script.pip(
+        "install",
+        "--no-index",
+        "-f",
+        data.find_links,
+        "-c",
+        script.scratch_path / "constraints.txt",
+        "--group",
+        "mylibs",
+    )
+    assert "installed TopoRequires-0.0.1" in result.stdout
+
+
 def test_multiple_constraints_files(script: PipTestEnvironment, data: TestData) -> None:
     script.scratch_path.joinpath("outer.txt").write_text("-c inner.txt")
     script.scratch_path.joinpath("inner.txt").write_text("Upper==1.0")

From f7ac91b6ac02ba84f7af761c001a382ac280f5b2 Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Mon, 4 Nov 2024 18:54:25 -0600
Subject: [PATCH 727/992] Add a news fragment for `--group` support

---
 news/12963.feature.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 news/12963.feature.rst

diff --git a/news/12963.feature.rst b/news/12963.feature.rst
new file mode 100644
index 00000000000..232dc3522e8
--- /dev/null
+++ b/news/12963.feature.rst
@@ -0,0 +1,3 @@
+- Add a ``--group`` option which allows installation from PEP 735 Dependency
+  Groups. Only ``pyproject.toml`` files in the current working directory are
+  supported.

From b3de128d24b0e619628a081f3f512ec780329bdf Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Fri, 8 Nov 2024 09:27:04 -0600
Subject: [PATCH 728/992] Support `--group` on `pip wheel`

Per review, support on `pip wheel` is desirable. This is net-net
simpler, since we don't need any trickery to "dodge" the fact that it
is a `RequirementCommand` but wasn't supporting `--group`.

The desire to *not* support `--group` here was based on a mistaken
idea about what `pip wheel` does.
---
 src/pip/_internal/cli/req_command.py   |  1 +
 src/pip/_internal/commands/download.py |  1 -
 src/pip/_internal/commands/install.py  |  1 -
 src/pip/_internal/commands/wheel.py    |  4 ---
 tests/functional/test_wheel.py         | 36 ++++++++++++++++++++++++++
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
index 26bb8159fa8..82164e8a720 100644
--- a/src/pip/_internal/cli/req_command.py
+++ b/src/pip/_internal/cli/req_command.py
@@ -80,6 +80,7 @@ class RequirementCommand(IndexGroupCommand):
     def __init__(self, *args: Any, **kw: Any) -> None:
         super().__init__(*args, **kw)
 
+        self.cmd_opts.add_option(cmdoptions.dependency_groups())
         self.cmd_opts.add_option(cmdoptions.no_clean())
 
     @staticmethod
diff --git a/src/pip/_internal/commands/download.py b/src/pip/_internal/commands/download.py
index 51277b0d6a5..917bbb91d83 100644
--- a/src/pip/_internal/commands/download.py
+++ b/src/pip/_internal/commands/download.py
@@ -38,7 +38,6 @@ class DownloadCommand(RequirementCommand):
     def add_options(self) -> None:
         self.cmd_opts.add_option(cmdoptions.constraints())
         self.cmd_opts.add_option(cmdoptions.requirements())
-        self.cmd_opts.add_option(cmdoptions.dependency_groups())
         self.cmd_opts.add_option(cmdoptions.no_deps())
         self.cmd_opts.add_option(cmdoptions.global_options())
         self.cmd_opts.add_option(cmdoptions.no_binary())
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index d97a3de8c2f..5239d010421 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -84,7 +84,6 @@ def add_options(self) -> None:
         self.cmd_opts.add_option(cmdoptions.pre())
 
         self.cmd_opts.add_option(cmdoptions.editable())
-        self.cmd_opts.add_option(cmdoptions.dependency_groups())
         self.cmd_opts.add_option(
             "--dry-run",
             action="store_true",
diff --git a/src/pip/_internal/commands/wheel.py b/src/pip/_internal/commands/wheel.py
index f45e1692207..278719f4e0c 100644
--- a/src/pip/_internal/commands/wheel.py
+++ b/src/pip/_internal/commands/wheel.py
@@ -102,10 +102,6 @@ def add_options(self) -> None:
 
     @with_cleanup
     def run(self, options: Values, args: List[str]) -> int:
-        # dependency-groups aren't desirable with `pip wheel`, but providing it
-        # consistently allows RequirementCommand to expect it to be present
-        options.dependency_groups = []
-
         session = self.get_default_session(options)
 
         finder = self._build_package_finder(options, session)
diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py
index da2bd2d7904..e1ede880496 100644
--- a/tests/functional/test_wheel.py
+++ b/tests/functional/test_wheel.py
@@ -3,6 +3,7 @@
 import os
 import re
 import sys
+import textwrap
 from pathlib import Path
 
 import pytest
@@ -69,6 +70,41 @@ def test_pip_wheel_success(script: PipTestEnvironment, data: TestData) -> None:
     assert "Successfully built simple" in result.stdout, result.stdout
 
 
+def test_pip_wheel_success_with_dependency_group(
+    script: PipTestEnvironment, data: TestData
+) -> None:
+    """
+    Test 'pip wheel' success.
+    """
+    pyproject = script.scratch_path / "pyproject.toml"
+    pyproject.write_text(
+        textwrap.dedent(
+            """\
+            [dependency-groups]
+            simple = ["simple==3.0"]
+            """
+        )
+    )
+    result = script.pip(
+        "wheel",
+        "--no-index",
+        "-f",
+        data.find_links,
+        "--group",
+        "simple",
+    )
+    wheel_file_name = f"simple-3.0-py{pyversion[0]}-none-any.whl"
+    wheel_file_path = script.scratch / wheel_file_name
+    assert re.search(
+        r"Created wheel for simple: "
+        rf"filename={re.escape(wheel_file_name)} size=\d+ sha256=[A-Fa-f0-9]{{64}}",
+        result.stdout,
+    )
+    assert re.search(r"^\s+Stored in directory: ", result.stdout, re.M)
+    result.did_create(wheel_file_path)
+    assert "Successfully built simple" in result.stdout, result.stdout
+
+
 def test_pip_wheel_build_cache(script: PipTestEnvironment, data: TestData) -> None:
     """
     Test 'pip wheel' builds and caches.

From 34c85e0189709897a4e5fe523214842df7bcf71e Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Fri, 8 Nov 2024 09:35:36 -0600
Subject: [PATCH 729/992] Review feedback: use dedent in tests

---
 tests/unit/test_req_dependency_group.py | 48 ++++++++++++++-----------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/tests/unit/test_req_dependency_group.py b/tests/unit/test_req_dependency_group.py
index dd78fd031ac..48caf6b211f 100644
--- a/tests/unit/test_req_dependency_group.py
+++ b/tests/unit/test_req_dependency_group.py
@@ -1,4 +1,5 @@
 import errno
+import textwrap
 from pathlib import Path
 from typing import Any
 
@@ -13,10 +14,12 @@ def test_parse_simple_dependency_groups(
 ) -> None:
     pyproject = tmp_path.joinpath("pyproject.toml")
     pyproject.write_text(
-        """\
-[dependency-groups]
-foo = ["bar"]
-"""
+        textwrap.dedent(
+            """\
+            [dependency-groups]
+            foo = ["bar"]
+            """
+        )
     )
     monkeypatch.chdir(tmp_path)
 
@@ -31,11 +34,13 @@ def test_parse_cyclic_dependency_groups(
 ) -> None:
     pyproject = tmp_path.joinpath("pyproject.toml")
     pyproject.write_text(
-        """\
-[dependency-groups]
-foo = [{include-group="bar"}]
-bar = [{include-group="foo"}]
-"""
+        textwrap.dedent(
+            """\
+            [dependency-groups]
+            foo = [{include-group="bar"}]
+            bar = [{include-group="foo"}]
+            """
+        )
     )
     monkeypatch.chdir(tmp_path)
 
@@ -54,10 +59,7 @@ def test_parse_with_no_dependency_groups_defined(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     pyproject = tmp_path.joinpath("pyproject.toml")
-    pyproject.write_text(
-        """\
-"""
-    )
+    pyproject.write_text("")
     monkeypatch.chdir(tmp_path)
 
     with pytest.raises(
@@ -80,10 +82,12 @@ def test_parse_with_malformed_pyproject_file(
 ) -> None:
     pyproject = tmp_path.joinpath("pyproject.toml")
     pyproject.write_text(
-        """\
-[dependency-groups  # no closing bracket
-foo = ["bar"]
-"""
+        textwrap.dedent(
+            """\
+            [dependency-groups  # no closing bracket
+            foo = ["bar"]
+            """
+        )
     )
     monkeypatch.chdir(tmp_path)
 
@@ -96,10 +100,12 @@ def test_parse_gets_unexpected_oserror(
 ) -> None:
     pyproject = tmp_path.joinpath("pyproject.toml")
     pyproject.write_text(
-        """\
-[dependency-groups]
-foo = ["bar"]
-"""
+        textwrap.dedent(
+            """\
+            [dependency-groups]
+            foo = ["bar"]
+            """
+        )
     )
     monkeypatch.chdir(tmp_path)
 

From 5a7269a52bd8ac9b0c1ae4899e4be470ed411da9 Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Sat, 14 Dec 2024 22:00:18 -0600
Subject: [PATCH 730/992] Update `--group` option to take `[path:]name`

In discussions about the correct interface for `pip` to use
[dependency-groups], no strong consensus arose. However, the option
with the most support appears to be to make it possible to pass a file
path plus a group name.

This change converts the `--group` option to take colon-separated
path:groupname pairs, with the path part optional. The CLI parsing
code is responsible for handling the syntax and for filling in a
default path of `"pyproject.toml"`.

If a path is provided, it must have a basename of `pyproject.toml`.
Failing to meet this constraint is an error at arg parsing time.

The `dependency_groups` usage is updated to create a
DependencyGroupResolver per `pyproject.toml` file provided. This
ensures that we only parse each file once, and we keep the results of
previous resolutions when resolving multiple dependency groups from
the same file. (Technically, the implementation is a resolver per
path, which is subtly different from per-file, in that it doesn't
account for symlinks, hardlinks, etc.)
---
 src/pip/_internal/cli/cmdoptions.py           | 38 ++++++++-
 src/pip/_internal/req/req_dependency_group.py | 85 ++++++++++++-------
 tests/functional/test_install.py              | 24 ++++++
 tests/functional/test_install_reqs.py         | 24 +++++-
 tests/unit/test_req_dependency_group.py       | 21 +++--
 5 files changed, 147 insertions(+), 45 deletions(-)

diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index 7367407a50d..71c7c2685a9 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -13,6 +13,7 @@
 import importlib.util
 import logging
 import os
+import pathlib
 import textwrap
 from functools import partial
 from optparse import SUPPRESS_HELP, Option, OptionGroup, OptionParser, Values
@@ -733,15 +734,44 @@ def _handle_no_cache_dir(
     help="Don't install package dependencies.",
 )
 
+
+def _handle_dependency_group(
+    option: Option, opt: str, value: str, parser: OptionParser
+) -> None:
+    """
+    Process a value provided for the --group option.
+
+    Splits on the rightmost ":", and validates that the path (if present) ends
+    in `pyproject.toml`. Defaults the path to `pyproject.toml` when one is not given.
+
+    `:` cannot appear in dependency group names, so this is a safe and simple parse.
+
+    This is an optparse.Option callback for the dependency_groups option.
+    """
+    path, sep, groupname = value.rpartition(":")
+    if not sep:
+        path = "pyproject.toml"
+    else:
+        # check for 'pyproject.toml' filenames using pathlib
+        if pathlib.PurePath(path).name != "pyproject.toml":
+            msg = "group paths use 'pyproject.toml' filenames"
+            raise_option_error(parser, option=option, msg=msg)
+
+    parser.values.dependency_groups.append((path, groupname))
+
+
 dependency_groups: Callable[..., Option] = partial(
     Option,
     "--group",
     dest="dependency_groups",
     default=[],
-    action="append",
-    metavar="group",
-    help="Install a named dependency-group from `pyproject.toml` "
-    "in the current directory.",
+    type=str,
+    action="callback",
+    callback=_handle_dependency_group,
+    metavar="[path:]group",
+    help='Install a named dependency-group from a "pyproject.toml" file. '
+    'If a path is given, it must end in "pyproject.toml:". '
+    'Defaults to using "pyproject.toml" in the current directory.',
 )
 
 ignore_requires_python: Callable[..., Option] = partial(
diff --git a/src/pip/_internal/req/req_dependency_group.py b/src/pip/_internal/req/req_dependency_group.py
index aa9839ead59..8f124de5b81 100644
--- a/src/pip/_internal/req/req_dependency_group.py
+++ b/src/pip/_internal/req/req_dependency_group.py
@@ -1,49 +1,74 @@
-from typing import Any, Dict, List
+from typing import Any, Dict, Iterable, Iterator, List, Tuple
 
 from pip._vendor import tomli
-from pip._vendor.dependency_groups import resolve as resolve_dependency_group
+from pip._vendor.dependency_groups import DependencyGroupResolver
 
 from pip._internal.exceptions import InstallationError
 
 
-def parse_dependency_groups(groups: List[str]) -> List[str]:
+def parse_dependency_groups(groups: List[Tuple[str, str]]) -> List[str]:
     """
-    Parse dependency groups data in a way which is sensitive to the `pip` context and
-    raises InstallationErrors if anything goes wrong.
+    Parse dependency groups data as provided via the CLI, in a `[path:]group` syntax.
+
+    Raises InstallationErrors if anything goes wrong.
     """
-    pyproject = _load_pyproject()
-
-    if "dependency-groups" not in pyproject:
-        raise InstallationError(
-            "[dependency-groups] table was missing. Cannot resolve '--group' options."
-        )
-    raw_dependency_groups = pyproject["dependency-groups"]
-    if not isinstance(raw_dependency_groups, dict):
-        raise InstallationError(
-            "[dependency-groups] table was malformed. Cannot resolve '--group' options."
-        )
+    resolvers = _build_resolvers(path for (path, _) in groups)
+    return list(_resolve_all_groups(resolvers, groups))
 
-    try:
-        return list(resolve_dependency_group(raw_dependency_groups, *groups))
-    except (ValueError, TypeError, LookupError) as e:
-        raise InstallationError(f"[dependency-groups] resolution failed: {e}") from e
+
+def _resolve_all_groups(
+    resolvers: Dict[str, DependencyGroupResolver], groups: List[Tuple[str, str]]
+) -> Iterator[str]:
+    """
+    Run all resolution, converting any error from `DependencyGroupResolver` into
+    an InstallationError.
+    """
+    for path, groupname in groups:
+        resolver = resolvers[path]
+        try:
+            yield from (str(req) for req in resolver.resolve(groupname))
+        except (ValueError, TypeError, LookupError) as e:
+            raise InstallationError(
+                f"[dependency-groups] resolution failed for '{groupname}' "
+                f"from '{path}': {e}"
+            ) from e
+
+
+def _build_resolvers(paths: Iterable[str]) -> Dict[str, Any]:
+    resolvers = {}
+    for path in paths:
+        if path in resolvers:
+            continue
+
+        pyproject = _load_pyproject(path)
+        if "dependency-groups" not in pyproject:
+            raise InstallationError(
+                f"[dependency-groups] table was missing from '{path}'. "
+                "Cannot resolve '--group' option."
+            )
+        raw_dependency_groups = pyproject["dependency-groups"]
+        if not isinstance(raw_dependency_groups, dict):
+            raise InstallationError(
+                f"[dependency-groups] table was malformed in {path}. "
+                "Cannot resolve '--group' option."
+            )
+
+        resolvers[path] = DependencyGroupResolver(raw_dependency_groups)
+    return resolvers
 
 
-def _load_pyproject() -> Dict[str, Any]:
+def _load_pyproject(path: str) -> Dict[str, Any]:
     """
-    This helper loads pyproject.toml from the current working directory.
+    This helper loads a pyproject.toml as TOML.
 
-    It does not allow specification of the path to be used and raises an
-    InstallationError if the operation fails.
+    It raises an InstallationError if the operation fails.
     """
     try:
-        with open("pyproject.toml", "rb") as fp:
+        with open(path, "rb") as fp:
             return tomli.load(fp)
     except FileNotFoundError:
-        raise InstallationError(
-            "pyproject.toml not found. Cannot resolve '--group' options."
-        )
+        raise InstallationError(f"{path} not found. Cannot resolve '--group' option.")
     except tomli.TOMLDecodeError as e:
-        raise InstallationError(f"Error parsing pyproject.toml: {e}") from e
+        raise InstallationError(f"Error parsing {path}: {e}") from e
     except OSError as e:
-        raise InstallationError(f"Error reading pyproject.toml: {e}") from e
+        raise InstallationError(f"Error reading {path}: {e}") from e
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index c999398d2b7..8ada80ed19a 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -333,6 +333,30 @@ def test_install_exit_status_code_when_empty_dependency_group(
     script.pip("install", "--group", "empty")
 
 
+@pytest.mark.parametrize("file_exists", [True, False])
+def test_install_dependency_group_bad_filename_error(
+    script: PipTestEnvironment, file_exists: bool
+) -> None:
+    """
+    Test install exit status code is 2 (usage error) when a dependency group path is
+    specified which isn't a `pyproject.toml`
+    """
+    if file_exists:
+        script.scratch_path.joinpath("not-pyproject.toml").write_text(
+            textwrap.dedent(
+                """
+                [dependency-groups]
+                publish = ["twine"]
+                """
+            )
+        )
+    result = script.pip(
+        "install", "--group", "not-pyproject.toml:publish", expect_error=True
+    )
+    assert "group paths use 'pyproject.toml' filenames" in result.stderr
+    assert result.returncode == 2
+
+
 @pytest.mark.network
 def test_basic_install_from_pypi(script: PipTestEnvironment) -> None:
     """
diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index 2d5ef8b0304..45103dc7c74 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -94,10 +94,22 @@ def test_requirements_file(script: PipTestEnvironment) -> None:
 
 
 @pytest.mark.network
-def test_dependency_group(script: PipTestEnvironment) -> None:
+@pytest.mark.parametrize(
+    "path, groupname",
+    [
+        (None, "initools"),
+        ("pyproject.toml", "initools"),
+        ("./pyproject.toml", "initools"),
+        (lambda path: path.absolute(), "initools"),
+    ],
+)
+def test_dependency_group(
+    script: PipTestEnvironment,
+    path: Any,
+    groupname: str,
+) -> None:
     """
     Test installing from a dependency group.
-
     """
     pyproject = script.scratch_path / "pyproject.toml"
     pyproject.write_text(
@@ -111,7 +123,13 @@ def test_dependency_group(script: PipTestEnvironment) -> None:
             """
         )
     )
-    result = script.pip("install", "--group", "initools")
+    if path is None:
+        arg = groupname
+    else:
+        if callable(path):
+            path = path(pyproject)
+        arg = f"{path}:{groupname}"
+    result = script.pip("install", "--group", arg)
     result.did_create(script.site_packages / "INITools-0.2.dist-info")
     result.did_create(script.site_packages / "initools")
     assert result.files_created[script.site_packages / "peppercorn"].dir
diff --git a/tests/unit/test_req_dependency_group.py b/tests/unit/test_req_dependency_group.py
index 48caf6b211f..b596f6fc5d7 100644
--- a/tests/unit/test_req_dependency_group.py
+++ b/tests/unit/test_req_dependency_group.py
@@ -23,7 +23,7 @@ def test_parse_simple_dependency_groups(
     )
     monkeypatch.chdir(tmp_path)
 
-    result = list(parse_dependency_groups(["foo"]))
+    result = list(parse_dependency_groups([("pyproject.toml", "foo")]))
 
     assert len(result) == 1, result
     assert result[0] == "bar"
@@ -45,9 +45,13 @@ def test_parse_cyclic_dependency_groups(
     monkeypatch.chdir(tmp_path)
 
     with pytest.raises(
-        InstallationError, match=r"\[dependency-groups\] resolution failed:"
+        InstallationError,
+        match=(
+            r"\[dependency-groups\] resolution failed for "
+            r"'foo' from 'pyproject\.toml':"
+        ),
     ) as excinfo:
-        parse_dependency_groups(["foo"])
+        parse_dependency_groups([("pyproject.toml", "foo")])
 
     exception = excinfo.value
     assert (
@@ -63,9 +67,10 @@ def test_parse_with_no_dependency_groups_defined(
     monkeypatch.chdir(tmp_path)
 
     with pytest.raises(
-        InstallationError, match=r"\[dependency-groups\] table was missing\."
+        InstallationError,
+        match=(r"\[dependency-groups\] table was missing from 'pyproject\.toml'\."),
     ):
-        parse_dependency_groups(["foo"])
+        parse_dependency_groups([("pyproject.toml", "foo")])
 
 
 def test_parse_with_no_pyproject_file(
@@ -74,7 +79,7 @@ def test_parse_with_no_pyproject_file(
     monkeypatch.chdir(tmp_path)
 
     with pytest.raises(InstallationError, match=r"pyproject\.toml not found\."):
-        parse_dependency_groups(["foo"])
+        parse_dependency_groups([("pyproject.toml", "foo")])
 
 
 def test_parse_with_malformed_pyproject_file(
@@ -92,7 +97,7 @@ def test_parse_with_malformed_pyproject_file(
     monkeypatch.chdir(tmp_path)
 
     with pytest.raises(InstallationError, match=r"Error parsing pyproject\.toml"):
-        parse_dependency_groups(["foo"])
+        parse_dependency_groups([("pyproject.toml", "foo")])
 
 
 def test_parse_gets_unexpected_oserror(
@@ -119,4 +124,4 @@ def epipe_toml_load(*args: Any, **kwargs: Any) -> None:
     )
 
     with pytest.raises(InstallationError, match=r"Error reading pyproject\.toml"):
-        parse_dependency_groups(["foo"])
+        parse_dependency_groups([("pyproject.toml", "foo")])

From ee02fa3fb54ac7ecb88ff45c486cc3cc2fcbbe31 Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Sun, 15 Dec 2024 12:41:26 -0600
Subject: [PATCH 731/992] Update --group news fragment

---
 news/12963.feature.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/news/12963.feature.rst b/news/12963.feature.rst
index 232dc3522e8..66320c7ba90 100644
--- a/news/12963.feature.rst
+++ b/news/12963.feature.rst
@@ -1,3 +1,4 @@
 - Add a ``--group`` option which allows installation from PEP 735 Dependency
-  Groups. Only ``pyproject.toml`` files in the current working directory are
-  supported.
+  Groups. ``--group`` accepts arguments of the form ``group`` or
+  ``path:group``, where the default path is ``pyproject.toml``, and installs
+  the named Dependency Group from the provided ``pyproject.toml`` file.

From 9c4cb13992dc9ed720ec7c11fc9c7b6880dfedbf Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Mon, 27 Jan 2025 19:03:40 -0600
Subject: [PATCH 732/992] Update src/pip/_internal/cli/cmdoptions.py

Co-authored-by: Paul Moore 
---
 src/pip/_internal/cli/cmdoptions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index 71c7c2685a9..81fed6e940d 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -770,7 +770,7 @@ def _handle_dependency_group(
     callback=_handle_dependency_group,
     metavar="[path:]group",
     help='Install a named dependency-group from a "pyproject.toml" file. '
-    'If a path is given, it must end in "pyproject.toml:". '
+    'If a path is given, the name of the file must be "pyproject.toml". '
     'Defaults to using "pyproject.toml" in the current directory.',
 )
 

From 3e466760206a0277778cf695a7f0f0a3c571b01a Mon Sep 17 00:00:00 2001
From: Stephen Rosen 
Date: Mon, 27 Jan 2025 22:47:59 -0600
Subject: [PATCH 733/992] Add Dependency Groups to user guide doc

The new section comes after `requirements.txt` and `constraints.txt`
documentation but before documentation about wheels.

The doc attempts to be beginner-friendly and balance
- clarity about the path behavior
- explanation of `[dependency-groups]` itself
- justification of the path-oriented design -- in the form of an
  example of installing from two different subprojects simultaneously

There is therefore ample material not covered in the new section --
e.g., there is no mention of `include-group`, which is explained at
length in the specification doc.
---
 docs/html/user_guide.rst | 92 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/docs/html/user_guide.rst b/docs/html/user_guide.rst
index 2837c2537b8..d6a0acf9cd8 100644
--- a/docs/html/user_guide.rst
+++ b/docs/html/user_guide.rst
@@ -256,6 +256,98 @@ Same as requirements files, constraints files can also be served via a URL,
 e.g. http://example.com/constraints.txt, so that your organization can store and
 serve them in a centralized place.
 
+
+.. _`Dependency Groups`:
+
+
+Dependency Groups
+=================
+
+"Dependency Groups" are lists of items to be installed stored in a
+``pyproject.toml`` file.
+
+A dependency group is logically just a list of requirements, similar to the
+contents of :ref:`Requirements Files`. Unlike requirements files, dependency
+groups cannot contain non-package arguments for :ref:`pip install`.
+
+Groups can be declared like so:
+
+.. code-block:: toml
+
+    # pyproject.toml
+    [dependency-groups]
+    groupA = [
+        "pkg1",
+        "pkg2",
+    ]
+
+and installed with :ref:`pip install` like so:
+
+.. tab:: Unix/macOS
+
+   .. code-block:: shell
+
+      python -m pip install --group groupA
+
+.. tab:: Windows
+
+   .. code-block:: shell
+
+      py -m pip install --group groupA
+
+Full details on the contents of ``[dependency-groups]`` and more examples are
+available in :ref:`the specification documentation `.
+
+.. note::
+
+    Dependency Groups are defined by a standard, and therefore do not support
+    ``pip``-specific syntax for requirements, only :ref:`standard dependency
+    specifiers `.
+
+``pip`` does not search projects or directories to discover ``pyproject.toml``
+files. The ``--group`` option is used to pass the path to the file,
+and if the path is omitted, as in the example above, it defaults to
+``pyproject.toml`` in the current directory. Using explicit paths,
+:ref:`pip install` can use a file from another directory. For example:
+
+.. tab:: Unix/macOS
+
+   .. code-block:: shell
+
+      python -m pip install --group './project/subproject/pyproject.toml:groupA'
+
+.. tab:: Windows
+
+   .. code-block:: shell
+
+      py -m pip install --group './project/subproject/pyproject.toml:groupA'
+
+
+This also makes it possible to install groups from multiple different projects
+at once. For example, with a directory structure like so::
+
+    + project/
+      + sub1/
+        - pyproject.toml
+      + sub2/
+        - pyproject.toml
+
+it is possible to install, from the ``project/`` directory, groups from the
+subprojects thusly:
+
+.. tab:: Unix/macOS
+
+   .. code-block:: shell
+
+      python -m pip install --group './sub1/pyproject.toml:groupA' --group './sub2/pyproject.toml:groupB'
+
+.. tab:: Windows
+
+   .. code-block:: shell
+
+      py -m pip install --group './sub1/pyproject.toml:groupA' --group './sub2/pyproject.toml:groupB'
+
+
 .. _`Installing from Wheels`:
 
 

From 76895a0019964ad285551e119d4bcad733aaac50 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 21 Feb 2025 18:22:29 -0500
Subject: [PATCH 734/992] Cache truststore SSLContext as
 load_verify_locations() is slow (#13199)

SSLContext can be reused across connections as per the Python docs:

> SSLContext is designed to be shared and used by multiple connections.
> Thus, it is thread-safe as long as it is not reconfigured after being
> used by a connection.

In addition, requests has been using a global SSLContext and the world
hasn't blown up so I'm going to say this is pretty safe.
---
 src/pip/_internal/cli/index_command.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pip/_internal/cli/index_command.py b/src/pip/_internal/cli/index_command.py
index 295108ed605..87a1e088564 100644
--- a/src/pip/_internal/cli/index_command.py
+++ b/src/pip/_internal/cli/index_command.py
@@ -9,6 +9,7 @@
 import logging
 import os
 import sys
+from functools import lru_cache
 from optparse import Values
 from typing import TYPE_CHECKING, List, Optional
 
@@ -25,6 +26,7 @@
 logger = logging.getLogger(__name__)
 
 
+@lru_cache
 def _create_truststore_ssl_context() -> Optional["SSLContext"]:
     if sys.version_info < (3, 10):
         logger.debug("Disabling truststore because Python version isn't 3.10+")

From 87f59c42bf0528173fbf9da305752e485675d7fb Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 21 Feb 2025 19:56:55 -0500
Subject: [PATCH 735/992] Use `parse_wheel_filename` to parse wheel filename,
 with fallback

---
 src/pip/_internal/index/package_finder.py     |  6 +-
 src/pip/_internal/metadata/importlib/_envs.py | 12 ++-
 src/pip/_internal/models/wheel.py             | 96 +++++++++++--------
 tests/functional/test_install_wheel.py        |  2 +-
 tests/unit/test_models_wheel.py               | 29 ++++--
 5 files changed, 84 insertions(+), 61 deletions(-)

diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index 85628ee5d7a..ce0842b07e6 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -514,11 +514,7 @@ def _sort_key(self, candidate: InstallationCandidate) -> CandidateSortingKey:
                 )
             if self._prefer_binary:
                 binary_preference = 1
-            if wheel.build_tag is not None:
-                match = re.match(r"^(\d+)(.*)$", wheel.build_tag)
-                assert match is not None, "guaranteed by filename validation"
-                build_tag_groups = match.groups()
-                build_tag = (int(build_tag_groups[0]), build_tag_groups[1])
+            build_tag = wheel.build_tag
         else:  # sdist
             pri = -(support_num)
         has_allowed_hash = int(link.is_hash_allowed(self._hashes))
diff --git a/src/pip/_internal/metadata/importlib/_envs.py b/src/pip/_internal/metadata/importlib/_envs.py
index 4d906fd3149..681fd241fdc 100644
--- a/src/pip/_internal/metadata/importlib/_envs.py
+++ b/src/pip/_internal/metadata/importlib/_envs.py
@@ -8,10 +8,14 @@
 import zipimport
 from typing import Iterator, List, Optional, Sequence, Set, Tuple
 
-from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
+from pip._vendor.packaging.utils import (
+    InvalidWheelFilename,
+    NormalizedName,
+    canonicalize_name,
+    parse_wheel_filename,
+)
 
 from pip._internal.metadata.base import BaseDistribution, BaseEnvironment
-from pip._internal.models.wheel import Wheel
 from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.filetypes import WHEEL_EXTENSION
 
@@ -26,7 +30,9 @@ def _looks_like_wheel(location: str) -> bool:
         return False
     if not os.path.isfile(location):
         return False
-    if not Wheel.wheel_file_re.match(os.path.basename(location)):
+    try:
+        parse_wheel_filename(os.path.basename(location))
+    except InvalidWheelFilename:
         return False
     return zipfile.is_zipfile(location)
 
diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index ea8560089d3..a1e6accf727 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -6,10 +6,10 @@
 from typing import Dict, Iterable, List
 
 from pip._vendor.packaging.tags import Tag
+from pip._vendor.packaging.utils import BuildTag, parse_wheel_filename
 from pip._vendor.packaging.utils import (
-    InvalidWheelFilename as PackagingInvalidWheelName,
+    InvalidWheelFilename as _PackagingInvalidWheelFilename,
 )
-from pip._vendor.packaging.utils import parse_wheel_filename
 
 from pip._internal.exceptions import InvalidWheelFilename
 from pip._internal.utils.deprecation import deprecated
@@ -18,7 +18,7 @@
 class Wheel:
     """A wheel file"""
 
-    wheel_file_re = re.compile(
+    legacy_wheel_file_re = re.compile(
         r"""^(?P(?P[^\s-]+?)-(?P[^\s-]*?))
         ((-(?P\d[^-]*?))?-(?P[^\s-]+?)-(?P[^\s-]+?)-(?P[^\s-]+?)
         \.whl|\.dist-info)$""",
@@ -26,46 +26,58 @@ class Wheel:
     )
 
     def __init__(self, filename: str) -> None:
-        """
-        :raises InvalidWheelFilename: when the filename is invalid for a wheel
-        """
-        wheel_info = self.wheel_file_re.match(filename)
-        if not wheel_info:
-            raise InvalidWheelFilename(f"{filename} is not a valid wheel filename.")
         self.filename = filename
-        self.name = wheel_info.group("name").replace("_", "-")
-        _version = wheel_info.group("ver")
-        if "_" in _version:
-            try:
-                parse_wheel_filename(filename)
-            except PackagingInvalidWheelName as e:
-                deprecated(
-                    reason=(
-                        f"Wheel filename {filename!r} is not correctly normalised. "
-                        "Future versions of pip will raise the following error:\n"
-                        f"{e.args[0]}\n\n"
-                    ),
-                    replacement=(
-                        "to rename the wheel to use a correctly normalised "
-                        "name (this may require updating the version in "
-                        "the project metadata)"
-                    ),
-                    gone_in="25.1",
-                    issue=12938,
-                )
-
-            _version = _version.replace("_", "-")
-
-        self.version = _version
-        self.build_tag = wheel_info.group("build")
-        self.pyversions = wheel_info.group("pyver").split(".")
-        self.abis = wheel_info.group("abi").split(".")
-        self.plats = wheel_info.group("plat").split(".")
-
-        # All the tag combinations from this file
-        self.file_tags = {
-            Tag(x, y, z) for x in self.pyversions for y in self.abis for z in self.plats
-        }
+
+        # To make mypy happy specify type hints that can come from either
+        # parse_wheel_filename or the legacy_wheel_file_re match.
+        self.name: str
+        self.build_tag: BuildTag
+
+        try:
+            wheel_info = parse_wheel_filename(filename)
+            self.name, _version, self.build_tag, self.file_tags = wheel_info
+            self.version = str(_version)
+        except _PackagingInvalidWheelFilename as e:
+            # Check if the wheel filename is in the legacy format
+            legacy_wheel_info = self.legacy_wheel_file_re.match(filename)
+            if not legacy_wheel_info:
+                raise InvalidWheelFilename(e.args[0]) from None
+
+            deprecated(
+                reason=(
+                    f"Wheel filename {filename!r} is not correctly normalised. "
+                    "Future versions of pip will raise the following error:\n"
+                    f"{e.args[0]}\n\n"
+                ),
+                replacement=(
+                    "to rename the wheel to use a correctly normalised "
+                    "name (this may require updating the version in "
+                    "the project metadata)"
+                ),
+                gone_in="25.3",
+                issue=12938,
+            )
+
+            self.name = legacy_wheel_info.group("name").replace("_", "-")
+            self.version = legacy_wheel_info.group("ver").replace("_", "-")
+
+            # Parse the build tag
+            build_tag = legacy_wheel_info.group("build")
+            match = re.match(r"^(\d+)(.*)$", build_tag)
+            assert match is not None, "guaranteed by filename validation"
+            build_tag_groups = match.groups()
+            self.build_tag = (int(build_tag_groups[0]), build_tag_groups[1])
+
+            # Generate the file tags
+            pyversions = legacy_wheel_info.group("pyver").split(".")
+            abis = legacy_wheel_info.group("abi").split(".")
+            plats = legacy_wheel_info.group("plat").split(".")
+            self.file_tags = frozenset(
+                Tag(interpreter=py, abi=abi, platform=plat)
+                for py in pyversions
+                for abi in abis
+                for plat in plats
+            )
 
     def get_formatted_file_tags(self) -> List[str]:
         """Return the wheel's tags as a sorted list of strings."""
diff --git a/tests/functional/test_install_wheel.py b/tests/functional/test_install_wheel.py
index 7e7aeaf7a81..e01ecfb57f3 100644
--- a/tests/functional/test_install_wheel.py
+++ b/tests/functional/test_install_wheel.py
@@ -190,7 +190,7 @@ def test_install_from_wheel_with_headers(script: PipTestEnvironment) -> None:
     dist_info_folder = script.site_packages / "headers.dist-0.1.dist-info"
     result.did_create(dist_info_folder)
 
-    header_scheme_path = get_header_scheme_path_for_script(script, "headers.dist")
+    header_scheme_path = get_header_scheme_path_for_script(script, "headers-dist")
     header_path = header_scheme_path / "header.h"
     assert header_path.read_text() == header_text
 
diff --git a/tests/unit/test_models_wheel.py b/tests/unit/test_models_wheel.py
index e87b2c107a0..46991e3487b 100644
--- a/tests/unit/test_models_wheel.py
+++ b/tests/unit/test_models_wheel.py
@@ -12,17 +12,24 @@ def test_std_wheel_pattern(self) -> None:
         w = Wheel("simple-1.1.1-py2-none-any.whl")
         assert w.name == "simple"
         assert w.version == "1.1.1"
-        assert w.pyversions == ["py2"]
-        assert w.abis == ["none"]
-        assert w.plats == ["any"]
+        assert w.build_tag == ()
+        assert w.file_tags == frozenset(
+            [Tag(interpreter="py2", abi="none", platform="any")]
+        )
 
     def test_wheel_pattern_multi_values(self) -> None:
         w = Wheel("simple-1.1-py2.py3-abi1.abi2-any.whl")
         assert w.name == "simple"
         assert w.version == "1.1"
-        assert w.pyversions == ["py2", "py3"]
-        assert w.abis == ["abi1", "abi2"]
-        assert w.plats == ["any"]
+        assert w.build_tag == ()
+        assert w.file_tags == frozenset(
+            [
+                Tag(interpreter="py2", abi="abi1", platform="any"),
+                Tag(interpreter="py2", abi="abi2", platform="any"),
+                Tag(interpreter="py3", abi="abi1", platform="any"),
+                Tag(interpreter="py3", abi="abi2", platform="any"),
+            ]
+        )
 
     def test_wheel_with_build_tag(self) -> None:
         # pip doesn't do anything with build tags, but theoretically, we might
@@ -30,16 +37,18 @@ def test_wheel_with_build_tag(self) -> None:
         w = Wheel("simple-1.1-4-py2-none-any.whl")
         assert w.name == "simple"
         assert w.version == "1.1"
-        assert w.pyversions == ["py2"]
-        assert w.abis == ["none"]
-        assert w.plats == ["any"]
+        assert w.build_tag == (4, "")
+        assert w.file_tags == frozenset(
+            [Tag(interpreter="py2", abi="none", platform="any")]
+        )
 
     def test_single_digit_version(self) -> None:
         w = Wheel("simple-1-py2-none-any.whl")
         assert w.version == "1"
 
     def test_non_pep440_version(self) -> None:
-        w = Wheel("simple-_invalid_-py2-none-any.whl")
+        with pytest.warns(deprecation.PipDeprecationWarning):
+            w = Wheel("simple-_invalid_-py2-none-any.whl")
         assert w.version == "-invalid-"
 
     def test_missing_version_raises(self) -> None:

From c153810324716fdb217d407e861bdcf3e4aa6ef4 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 21 Feb 2025 20:02:17 -0500
Subject: [PATCH 736/992] NEWS ENTRY

---
 news/13229.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/13229.bugfix.rst

diff --git a/news/13229.bugfix.rst b/news/13229.bugfix.rst
new file mode 100644
index 00000000000..e13f0731cf2
--- /dev/null
+++ b/news/13229.bugfix.rst
@@ -0,0 +1 @@
+Expand deprecation warning for wheels with non-standard file names.

From 00698f6f0cb5b1782f8de71e3a19e2c7644d2866 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 21 Feb 2025 20:09:39 -0500
Subject: [PATCH 737/992] Make legacy build_tag lazy

---
 src/pip/_internal/models/wheel.py | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index a1e6accf727..d905d652e3c 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -3,7 +3,7 @@
 """
 
 import re
-from typing import Dict, Iterable, List
+from typing import Dict, Iterable, List, Optional
 
 from pip._vendor.packaging.tags import Tag
 from pip._vendor.packaging.utils import BuildTag, parse_wheel_filename
@@ -31,11 +31,11 @@ def __init__(self, filename: str) -> None:
         # To make mypy happy specify type hints that can come from either
         # parse_wheel_filename or the legacy_wheel_file_re match.
         self.name: str
-        self.build_tag: BuildTag
+        self._build_tag: Optional[BuildTag] = None
 
         try:
             wheel_info = parse_wheel_filename(filename)
-            self.name, _version, self.build_tag, self.file_tags = wheel_info
+            self.name, _version, self._build_tag, self.file_tags = wheel_info
             self.version = str(_version)
         except _PackagingInvalidWheelFilename as e:
             # Check if the wheel filename is in the legacy format
@@ -61,14 +61,7 @@ def __init__(self, filename: str) -> None:
             self.name = legacy_wheel_info.group("name").replace("_", "-")
             self.version = legacy_wheel_info.group("ver").replace("_", "-")
 
-            # Parse the build tag
-            build_tag = legacy_wheel_info.group("build")
-            match = re.match(r"^(\d+)(.*)$", build_tag)
-            assert match is not None, "guaranteed by filename validation"
-            build_tag_groups = match.groups()
-            self.build_tag = (int(build_tag_groups[0]), build_tag_groups[1])
-
-            # Generate the file tags
+            # Generate the file tags from the legacy wheel filename
             pyversions = legacy_wheel_info.group("pyver").split(".")
             abis = legacy_wheel_info.group("abi").split(".")
             plats = legacy_wheel_info.group("plat").split(".")
@@ -79,6 +72,22 @@ def __init__(self, filename: str) -> None:
                 for plat in plats
             )
 
+    @property
+    def build_tag(self) -> BuildTag:
+        if self._build_tag is not None:
+            return self._build_tag
+
+        # Parse the build tag from the legacy wheel filename
+        legacy_wheel_info = self.legacy_wheel_file_re.match(self.filename)
+        assert legacy_wheel_info is not None, "guaranteed by filename validation"
+        build_tag = legacy_wheel_info.group("build")
+        match = re.match(r"^(\d+)(.*)$", build_tag)
+        assert match is not None, "guaranteed by filename validation"
+        build_tag_groups = match.groups()
+        self._build_tag = (int(build_tag_groups[0]), build_tag_groups[1])
+
+        return self._build_tag
+
     def get_formatted_file_tags(self) -> List[str]:
         """Return the wheel's tags as a sorted list of strings."""
         return sorted(str(tag) for tag in self.file_tags)

From 55a4e1d55db68daa14440b7c9cf15cf92b143947 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 22 Feb 2025 13:09:43 -0500
Subject: [PATCH 738/992] `PipProvider.get_preference` unit tests

---
 .../resolution_resolvelib/test_provider.py    | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 tests/unit/resolution_resolvelib/test_provider.py

diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
new file mode 100644
index 00000000000..45536a9eab3
--- /dev/null
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -0,0 +1,109 @@
+import math
+from typing import TYPE_CHECKING, Dict, Iterable, Optional, Sequence
+
+import pytest
+
+from pip._vendor.resolvelib.resolvers import RequirementInformation
+
+from pip._internal.req.constructors import install_req_from_req_string
+from pip._internal.resolution.resolvelib.base import Candidate
+from pip._internal.resolution.resolvelib.candidates import REQUIRES_PYTHON_IDENTIFIER
+from pip._internal.resolution.resolvelib.factory import Factory
+from pip._internal.resolution.resolvelib.provider import PipProvider
+from pip._internal.resolution.resolvelib.requirements import SpecifierRequirement
+
+if TYPE_CHECKING:
+    from pip._vendor.resolvelib.providers import Preference
+
+    from pip._internal.resolution.resolvelib.base import Candidate, Requirement
+
+    PreferenceInformation = RequirementInformation[Requirement, Candidate]
+
+
+def build_req_info(
+    name: str, parent: Optional[Candidate] = None
+) -> "PreferenceInformation":
+    install_requirement = install_req_from_req_string(name)
+
+    requirement_information: PreferenceInformation = RequirementInformation(
+        requirement=SpecifierRequirement(install_requirement),
+        parent=parent,
+    )
+
+    return requirement_information
+
+
+@pytest.mark.parametrize(
+    "identifier, information, backtrack_causes, user_requested, expected",
+    [
+        # Test case for REQUIRES_PYTHON_IDENTIFIER
+        (
+            REQUIRES_PYTHON_IDENTIFIER,
+            {REQUIRES_PYTHON_IDENTIFIER: [build_req_info("python")]},
+            [],
+            {},
+            (False, False, True, True, math.inf, True, REQUIRES_PYTHON_IDENTIFIER),
+        ),
+        # Pinned package with "=="
+        (
+            "pinned-package",
+            {"pinned-package": [build_req_info("pinned-package==1.0")]},
+            [],
+            {},
+            (True, False, False, True, math.inf, False, "pinned-package"),
+        ),
+        # Package that caused backtracking
+        (
+            "backtrack-package",
+            {"backtrack-package": [build_req_info("backtrack-package")]},
+            [build_req_info("backtrack-package")],
+            {},
+            (True, False, True, False, math.inf, True, "backtrack-package"),
+        ),
+        # Root package requested by user
+        (
+            "root-package",
+            {"root-package": [build_req_info("root-package")]},
+            [],
+            {"root-package": 1},
+            (True, False, True, True, 1, True, "root-package"),
+        ),
+        # Unfree package (with specifier operator)
+        (
+            "unfree-package",
+            {"unfree-package": [build_req_info("unfree-package<1")]},
+            [],
+            {},
+            (True, False, True, True, math.inf, False, "unfree-package"),
+        ),
+        # Free package (no operator)
+        (
+            "free-package",
+            {"free-package": [build_req_info("free-package")]},
+            [],
+            {},
+            (True, False, True, True, math.inf, True, "free-package"),
+        ),
+    ],
+)
+def test_get_preference(
+    identifier: str,
+    information: Dict[str, Iterable["PreferenceInformation"]],
+    backtrack_causes: Sequence["PreferenceInformation"],
+    user_requested: Dict[str, int],
+    expected: "Preference",
+    factory: Factory,
+) -> None:
+    provider = PipProvider(
+        factory=factory,
+        constraints={},
+        ignore_dependencies=False,
+        upgrade_strategy="to-satisfy-only",
+        user_requested=user_requested,
+    )
+
+    preference = provider.get_preference(
+        identifier, {}, {}, information, backtrack_causes
+    )
+
+    assert preference == expected, f"Expected {expected}, got {preference}"

From 910a71291c2b0f9923566f97fd9c579dfbbaa949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 23 Feb 2025 11:02:21 +0100
Subject: [PATCH 739/992] _should_build is never called for constraints

The only call sites are in pip install in pip wheel,
after resolution, so there are never constraint requirements there.
---
 src/pip/_internal/wheel_builder.py | 5 ++---
 tests/unit/test_wheel_builder.py   | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py
index 00319cb5673..3f187a6fa03 100644
--- a/src/pip/_internal/wheel_builder.py
+++ b/src/pip/_internal/wheel_builder.py
@@ -46,9 +46,8 @@ def _should_build(
     need_wheel: bool,
 ) -> bool:
     """Return whether an InstallRequirement should be built into a wheel."""
-    if req.constraint:
-        # never build requirements that are merely constraints
-        return False
+    assert not req.constraint
+
     if req.is_wheel:
         if need_wheel:
             logger.info(
diff --git a/tests/unit/test_wheel_builder.py b/tests/unit/test_wheel_builder.py
index a657e900b42..3f822e37deb 100644
--- a/tests/unit/test_wheel_builder.py
+++ b/tests/unit/test_wheel_builder.py
@@ -51,8 +51,6 @@ class ReqMock:
         # We build, whether pep 517 is enabled or not.
         (ReqMock(use_pep517=True), True),
         (ReqMock(use_pep517=False), True),
-        # We don't build constraints.
-        (ReqMock(constraint=True), False),
         # We don't build reqs that are already wheels.
         (ReqMock(is_wheel=True), False),
         # We build editables if the backend supports PEP 660.
@@ -90,7 +88,6 @@ def test_should_build_for_install_command(req: ReqMock, expected: bool) -> None:
     "req, expected",
     [
         (ReqMock(), True),
-        (ReqMock(constraint=True), False),
         (ReqMock(is_wheel=True), False),
         (ReqMock(editable=True, use_pep517=False), True),
         (ReqMock(editable=True, use_pep517=True), True),

From 7a2a143bfa158ca8a3b767cd238040a1297b2614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 23 Feb 2025 11:09:19 +0100
Subject: [PATCH 740/992] remove should_build_for_wheel_command

In pip wheel, we always want wheels, of course.
should_build_for_wheel_command was only called when is_wheel is False,
so the logging statement part of _should_build was never reached.
Since this is the only side effect and _should_build otherwise always return
true in these circumstances, it can be removed.
---
 src/pip/_internal/commands/wheel.py |  4 ++--
 src/pip/_internal/wheel_builder.py  |  6 ------
 tests/unit/test_wheel_builder.py    | 18 ------------------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/pip/_internal/commands/wheel.py b/src/pip/_internal/commands/wheel.py
index 278719f4e0c..b380754bc89 100644
--- a/src/pip/_internal/commands/wheel.py
+++ b/src/pip/_internal/commands/wheel.py
@@ -16,7 +16,7 @@
 )
 from pip._internal.utils.misc import ensure_dir, normalize_path
 from pip._internal.utils.temp_dir import TempDirectory
-from pip._internal.wheel_builder import build, should_build_for_wheel_command
+from pip._internal.wheel_builder import build
 
 logger = logging.getLogger(__name__)
 
@@ -150,7 +150,7 @@ def run(self, options: Values, args: List[str]) -> int:
         for req in requirement_set.requirements.values():
             if req.is_wheel:
                 preparer.save_linked_requirement(req)
-            elif should_build_for_wheel_command(req):
+            else:
                 reqs_to_build.append(req)
 
         preparer.prepare_linked_requirements_more(requirement_set.requirements.values())
diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py
index 3f187a6fa03..636b5c2a4d2 100644
--- a/src/pip/_internal/wheel_builder.py
+++ b/src/pip/_internal/wheel_builder.py
@@ -73,12 +73,6 @@ def _should_build(
     return True
 
 
-def should_build_for_wheel_command(
-    req: InstallRequirement,
-) -> bool:
-    return _should_build(req, need_wheel=True)
-
-
 def should_build_for_install_command(
     req: InstallRequirement,
 ) -> bool:
diff --git a/tests/unit/test_wheel_builder.py b/tests/unit/test_wheel_builder.py
index 3f822e37deb..74f03228217 100644
--- a/tests/unit/test_wheel_builder.py
+++ b/tests/unit/test_wheel_builder.py
@@ -84,24 +84,6 @@ def test_should_build_for_install_command(req: ReqMock, expected: bool) -> None:
     assert should_build is expected
 
 
-@pytest.mark.parametrize(
-    "req, expected",
-    [
-        (ReqMock(), True),
-        (ReqMock(is_wheel=True), False),
-        (ReqMock(editable=True, use_pep517=False), True),
-        (ReqMock(editable=True, use_pep517=True), True),
-        (ReqMock(source_dir=None), True),
-        (ReqMock(link=Link("git+https://g.c/org/repo")), True),
-    ],
-)
-def test_should_build_for_wheel_command(req: ReqMock, expected: bool) -> None:
-    should_build = wheel_builder.should_build_for_wheel_command(
-        cast(InstallRequirement, req)
-    )
-    assert should_build is expected
-
-
 @pytest.mark.parametrize(
     "req, expected",
     [

From 670cc638a469e400e8ab86130587dac5974ffa3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 23 Feb 2025 11:12:01 +0100
Subject: [PATCH 741/992] Simplify _should_build

The need_wheel argument is now always False
---
 src/pip/_internal/wheel_builder.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py
index 636b5c2a4d2..31e58ed3468 100644
--- a/src/pip/_internal/wheel_builder.py
+++ b/src/pip/_internal/wheel_builder.py
@@ -43,26 +43,13 @@ def _contains_egg_info(s: str) -> bool:
 
 def _should_build(
     req: InstallRequirement,
-    need_wheel: bool,
 ) -> bool:
     """Return whether an InstallRequirement should be built into a wheel."""
     assert not req.constraint
 
     if req.is_wheel:
-        if need_wheel:
-            logger.info(
-                "Skipping %s, due to already being wheel.",
-                req.name,
-            )
         return False
 
-    if need_wheel:
-        # i.e. pip wheel, not pip install
-        return True
-
-    # From this point, this concerns the pip install command only
-    # (need_wheel=False).
-
     if not req.source_dir:
         return False
 
@@ -76,7 +63,7 @@ def _should_build(
 def should_build_for_install_command(
     req: InstallRequirement,
 ) -> bool:
-    return _should_build(req, need_wheel=False)
+    return _should_build(req)
 
 
 def _should_cache(

From 5b20593ef6c3719d5f33785476ed9fff36890006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 23 Feb 2025 11:34:46 +0100
Subject: [PATCH 742/992] source_dir is always set when building a wheel or for
 editables

It is a remnant of the `setup.py install` era, and we can safely assume it is always set.
---
 src/pip/_internal/wheel_builder.py | 3 +--
 tests/unit/test_wheel_builder.py   | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py
index 31e58ed3468..3cf02e01d98 100644
--- a/src/pip/_internal/wheel_builder.py
+++ b/src/pip/_internal/wheel_builder.py
@@ -50,8 +50,7 @@ def _should_build(
     if req.is_wheel:
         return False
 
-    if not req.source_dir:
-        return False
+    assert req.source_dir
 
     if req.editable:
         # we only build PEP 660 editable requirements
diff --git a/tests/unit/test_wheel_builder.py b/tests/unit/test_wheel_builder.py
index 74f03228217..d3d6801ede6 100644
--- a/tests/unit/test_wheel_builder.py
+++ b/tests/unit/test_wheel_builder.py
@@ -63,8 +63,6 @@ class ReqMock:
             ReqMock(editable=True, use_pep517=True, supports_pyproject_editable=False),
             False,
         ),
-        # We don't build if there is no source dir (whatever that means!).
-        (ReqMock(source_dir=None), False),
         # By default (i.e. when binaries are allowed), VCS requirements
         # should be built in install mode.
         (

From eacfb6b905fff601d49e46b075e68aacc5d5605a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 23 Feb 2025 12:17:27 +0100
Subject: [PATCH 743/992] Use ephemeral port in proxy tests

This is to avoid "address already in use" errors when running tests concurrently.
---
 tests/functional/test_proxy.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/tests/functional/test_proxy.py b/tests/functional/test_proxy.py
index 52f7ea55d52..b69166ff3a3 100644
--- a/tests/functional/test_proxy.py
+++ b/tests/functional/test_proxy.py
@@ -25,16 +25,15 @@ def on_access_log(self, context: Dict[str, Any]) -> None:
 def test_proxy_overrides_env(
     script: PipTestEnvironment, capfd: pytest.CaptureFixture[str]
 ) -> None:
-    with proxy.Proxy(
-        port=8899,
-        num_acceptors=1,
-    ), proxy.Proxy(plugins=[AccessLogPlugin], port=8888, num_acceptors=1):
-        script.environ["http_proxy"] = "127.0.0.1:8888"
-        script.environ["https_proxy"] = "127.0.0.1:8888"
+    with proxy.Proxy(port=0, num_acceptors=1) as proxy1, proxy.Proxy(
+        plugins=[AccessLogPlugin], port=0, num_acceptors=1
+    ) as proxy2:
+        script.environ["http_proxy"] = f"127.0.0.1:{proxy2.flags.port}"
+        script.environ["https_proxy"] = f"127.0.0.1:{proxy2.flags.port}"
         result = script.pip(
             "download",
             "--proxy",
-            "http://127.0.0.1:8899",
+            f"http://127.0.0.1:{proxy1.flags.port}",
             "--trusted-host",
             "127.0.0.1",
             "-d",
@@ -72,12 +71,12 @@ def test_proxy_does_not_override_netrc(
 
     netrc = script.scratch_path / ".netrc"
     netrc.write_text(f"machine {server.host} login USERNAME password PASSWORD")
-    with proxy.Proxy(port=8888, num_acceptors=1), server_running(server):
+    with proxy.Proxy(port=0, num_acceptors=1) as proxy1, server_running(server):
         script.environ["NETRC"] = netrc
         script.pip(
             "install",
             "--proxy",
-            "http://127.0.0.1:8888",
+            f"http://127.0.0.1:{proxy1.flags.port}",
             "--trusted-host",
             "127.0.0.1",
             "--no-cache-dir",
@@ -96,10 +95,9 @@ def test_proxy_does_not_override_netrc(
 def test_build_deps_use_proxy_from_cli(
     script: PipTestEnvironment, capfd: pytest.CaptureFixture[str], data: TestData
 ) -> None:
-    args = ["wheel", "-v", str(data.packages / "pep517_setup_and_pyproject")]
-    args.extend(["--proxy", "http://127.0.0.1:9000"])
-
-    with proxy.Proxy(port=9000, num_acceptors=1, plugins=[AccessLogPlugin]):
+    with proxy.Proxy(port=0, num_acceptors=1, plugins=[AccessLogPlugin]) as proxy1:
+        args = ["wheel", "-v", str(data.packages / "pep517_setup_and_pyproject")]
+        args.extend(["--proxy", f"http://127.0.0.1:{proxy1.flags.port}"])
         result = script.pip(*args)
 
     wheel_path = script.scratch / "pep517_setup_and_pyproject-1.0-py3-none-any.whl"

From cbf2d3015a2db6b895b8234ae5c14b2ff9192d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 23 Feb 2025 12:20:09 +0100
Subject: [PATCH 744/992] Minor stylistic refactoring in proxy test

---
 tests/functional/test_proxy.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/functional/test_proxy.py b/tests/functional/test_proxy.py
index b69166ff3a3..d4946675b24 100644
--- a/tests/functional/test_proxy.py
+++ b/tests/functional/test_proxy.py
@@ -96,9 +96,13 @@ def test_build_deps_use_proxy_from_cli(
     script: PipTestEnvironment, capfd: pytest.CaptureFixture[str], data: TestData
 ) -> None:
     with proxy.Proxy(port=0, num_acceptors=1, plugins=[AccessLogPlugin]) as proxy1:
-        args = ["wheel", "-v", str(data.packages / "pep517_setup_and_pyproject")]
-        args.extend(["--proxy", f"http://127.0.0.1:{proxy1.flags.port}"])
-        result = script.pip(*args)
+        result = script.pip(
+            "wheel",
+            "-v",
+            str(data.packages / "pep517_setup_and_pyproject"),
+            "--proxy",
+            f"http://127.0.0.1:{proxy1.flags.port}",
+        )
 
     wheel_path = script.scratch / "pep517_setup_and_pyproject-1.0-py3-none-any.whl"
     result.did_create(wheel_path)

From abb2a4c51215242d3eec7720bd7b74642d8f4844 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Mon, 24 Feb 2025 01:17:42 +0000
Subject: [PATCH 745/992] Drop support for Python 3.8

---
 .github/workflows/ci.yml                      |  4 +--
 docs/html/development/ci.rst                  | 25 +++++--------------
 docs/html/installation.md                     |  2 +-
 news/12989.removal.rst                        |  1 +
 noxfile.py                                    |  2 +-
 pyproject.toml                                |  4 +--
 src/pip/__pip-runner__.py                     |  2 +-
 src/pip/_internal/locations/__init__.py       |  1 -
 .../resolution/resolvelib/found_candidates.py | 19 ++------------
 src/pip/_internal/utils/unpacking.py          |  1 -
 tests/functional/test_proxy.py                |  7 +++---
 tests/functional/test_uninstall_user.py       |  2 +-
 tests/lib/compat.py                           |  5 +---
 tests/unit/test_req_file.py                   | 10 +++++---
 14 files changed, 27 insertions(+), 58 deletions(-)
 create mode 100644 news/12989.removal.rst

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa6dea0f30e..8b582e10499 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -114,7 +114,6 @@ jobs:
       matrix:
         os: [ubuntu-22.04, macos-13, macos-latest]
         python:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
@@ -172,10 +171,9 @@ jobs:
       matrix:
         os: [Windows]
         python:
-          - "3.8"
+          - "3.9"
           # Commented out, since Windows tests are expensively slow,
           # only test the oldest and newest Python supported by pip
-          # - "3.9"
           # - "3.10"
           # - "3.11"
           # - "3.12"
diff --git a/docs/html/development/ci.rst b/docs/html/development/ci.rst
index ef1f7125dfe..f2db084addb 100644
--- a/docs/html/development/ci.rst
+++ b/docs/html/development/ci.rst
@@ -18,7 +18,6 @@ Supported interpreters
 
 pip support a variety of Python interpreters:
 
-- CPython 3.8
 - CPython 3.9
 - CPython 3.10
 - CPython 3.11
@@ -91,9 +90,7 @@ Actual testing
 +------------------------------+---------------+-----------------+
 |       **interpreter**        |   **unit**    | **integration** |
 +-----------+----------+-------+---------------+-----------------+
-|           |   x86    | CP3.8 |               |                 |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |               |                 |
+|           |   x86    | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|               |                 |
 |           |          +-------+---------------+-----------------+
@@ -105,9 +102,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |  Windows  +----------+-------+---------------+-----------------+
-|           |   x64    | CP3.8 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |               |                 |
+|           |   x64    | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|               |                 |
 |           |          +-------+---------------+-----------------+
@@ -119,9 +114,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
-|           |   x86    | CP3.8 |               |                 |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |               |                 |
+|           |   x86    | CP3.9 |               |                 |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|               |                 |
 |           |          +-------+---------------+-----------------+
@@ -133,9 +126,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   Linux   +----------+-------+---------------+-----------------+
-|           |   x64    | CP3.8 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |   GitHub      |   GitHub        |
+|           |   x64    | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
@@ -147,9 +138,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 +-----------+----------+-------+---------------+-----------------+
-|           |  arm64   | CP3.8 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |   GitHub      |   GitHub        |
+|           |  arm64   | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
@@ -161,9 +150,7 @@ Actual testing
 |           |          +-------+---------------+-----------------+
 |           |          | PyPy3 |               |                 |
 |   macOS   +----------+-------+---------------+-----------------+
-|           |   x64    | CP3.8 |   GitHub      |   GitHub        |
-|           |          +-------+---------------+-----------------+
-|           |          | CP3.9 |   GitHub      |   GitHub        |
+|           |   x64    | CP3.9 |   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
 |           |          | CP3.10|   GitHub      |   GitHub        |
 |           |          +-------+---------------+-----------------+
diff --git a/docs/html/installation.md b/docs/html/installation.md
index ffc8199ddc2..11c48dfc768 100644
--- a/docs/html/installation.md
+++ b/docs/html/installation.md
@@ -126,7 +126,7 @@ $ pip install --upgrade pip
 The current version of pip works on:
 
 - Windows, Linux and macOS.
-- CPython 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, and latest PyPy3.
+- CPython 3.9, 3.10, 3.11, 3.12, 3.13, and latest PyPy3.
 
 pip is tested to work on the latest patch version of the Python interpreter,
 for each of the minor versions listed above. Previous patch versions are
diff --git a/news/12989.removal.rst b/news/12989.removal.rst
new file mode 100644
index 00000000000..50f0008c677
--- /dev/null
+++ b/news/12989.removal.rst
@@ -0,0 +1 @@
+Drop support for Python 3.8.
diff --git a/noxfile.py b/noxfile.py
index e3f902b42df..57f5e897d63 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -69,7 +69,7 @@ def should_update_common_wheels() -> bool:
 # -----------------------------------------------------------------------------
 # Development Commands
 # -----------------------------------------------------------------------------
-@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3"])
+@nox.session(python=["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3"])
 def test(session: nox.Session) -> None:
     # Get the common wheels.
     if should_update_common_wheels():
diff --git a/pyproject.toml b/pyproject.toml
index ed79101bf06..c0fda2e1423 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,6 @@ classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
@@ -28,7 +27,7 @@ authors = [
 
 # NOTE: requires-python is duplicated in __pip-runner__.py.
 # When changing this value, please change the other copy as well.
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 [project.scripts]
 pip = "pip._internal.cli.main:main"
@@ -152,6 +151,7 @@ distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
 #
 
 [tool.ruff]
+target-version = "py38"  # Pin Ruff to Python 3.8
 src = ["src"]
 line-length = 88
 extend-exclude = [
diff --git a/src/pip/__pip-runner__.py b/src/pip/__pip-runner__.py
index c633787fced..d6be157831a 100644
--- a/src/pip/__pip-runner__.py
+++ b/src/pip/__pip-runner__.py
@@ -9,7 +9,7 @@
 import sys
 
 # Copied from pyproject.toml
-PYTHON_REQUIRES = (3, 8)
+PYTHON_REQUIRES = (3, 9)
 
 
 def version_str(version):  # type: ignore
diff --git a/src/pip/_internal/locations/__init__.py b/src/pip/_internal/locations/__init__.py
index 32382be7fe5..e5b4b9eec60 100644
--- a/src/pip/_internal/locations/__init__.py
+++ b/src/pip/_internal/locations/__init__.py
@@ -304,7 +304,6 @@ def get_scheme(
             user
             and k == "platlib"
             and not WINDOWS
-            and sys.version_info >= (3, 9)
             and _PLATLIBDIR != "lib"
             and _looks_like_bpo_44860()
         )
diff --git a/src/pip/_internal/resolution/resolvelib/found_candidates.py b/src/pip/_internal/resolution/resolvelib/found_candidates.py
index a1d57e0f4b2..dd07a4072f2 100644
--- a/src/pip/_internal/resolution/resolvelib/found_candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/found_candidates.py
@@ -11,7 +11,7 @@
 import functools
 import logging
 from collections.abc import Sequence
-from typing import TYPE_CHECKING, Any, Callable, Iterator, Optional, Set, Tuple
+from typing import Any, Callable, Iterator, Optional, Set, Tuple
 
 from pip._vendor.packaging.version import _BaseVersion
 
@@ -23,21 +23,6 @@
 
 IndexCandidateInfo = Tuple[_BaseVersion, Callable[[], Optional[Candidate]]]
 
-if TYPE_CHECKING:
-    SequenceCandidate = Sequence[Candidate]
-else:
-    # For compatibility: Python before 3.9 does not support using [] on the
-    # Sequence class.
-    #
-    # >>> from collections.abc import Sequence
-    # >>> Sequence[str]
-    # Traceback (most recent call last):
-    #   File "", line 1, in 
-    # TypeError: 'ABCMeta' object is not subscriptable
-    #
-    # TODO: Remove this block after dropping Python 3.8 support.
-    SequenceCandidate = Sequence
-
 
 def _iter_built(infos: Iterator[IndexCandidateInfo]) -> Iterator[Candidate]:
     """Iterator for ``FoundCandidates``.
@@ -124,7 +109,7 @@ def _iter_built_with_inserted(
         yield installed
 
 
-class FoundCandidates(SequenceCandidate):
+class FoundCandidates(Sequence[Candidate]):
     """A lazy sequence to provide candidates to the resolver.
 
     The intended usage is to return this from `find_matches()` so the resolver
diff --git a/src/pip/_internal/utils/unpacking.py b/src/pip/_internal/utils/unpacking.py
index 9a4ad8a334f..feb40f8289b 100644
--- a/src/pip/_internal/utils/unpacking.py
+++ b/src/pip/_internal/utils/unpacking.py
@@ -208,7 +208,6 @@ def pip_filter(member: tarfile.TarInfo, path: str) -> tarfile.TarInfo:
                         member = data_filter(member, location)
                     except tarfile.LinkOutsideDestinationError:
                         if sys.version_info[:3] in {
-                            (3, 8, 17),
                             (3, 9, 17),
                             (3, 10, 12),
                             (3, 11, 4),
diff --git a/tests/functional/test_proxy.py b/tests/functional/test_proxy.py
index d4946675b24..d2570ab4fe5 100644
--- a/tests/functional/test_proxy.py
+++ b/tests/functional/test_proxy.py
@@ -25,9 +25,10 @@ def on_access_log(self, context: Dict[str, Any]) -> None:
 def test_proxy_overrides_env(
     script: PipTestEnvironment, capfd: pytest.CaptureFixture[str]
 ) -> None:
-    with proxy.Proxy(port=0, num_acceptors=1) as proxy1, proxy.Proxy(
-        plugins=[AccessLogPlugin], port=0, num_acceptors=1
-    ) as proxy2:
+    with (
+        proxy.Proxy(port=0, num_acceptors=1) as proxy1,
+        proxy.Proxy(plugins=[AccessLogPlugin], port=0, num_acceptors=1) as proxy2,
+    ):
         script.environ["http_proxy"] = f"127.0.0.1:{proxy2.flags.port}"
         script.environ["https_proxy"] = f"127.0.0.1:{proxy2.flags.port}"
         result = script.pip(
diff --git a/tests/functional/test_uninstall_user.py b/tests/functional/test_uninstall_user.py
index c49120ec28d..664ba72daeb 100644
--- a/tests/functional/test_uninstall_user.py
+++ b/tests/functional/test_uninstall_user.py
@@ -79,7 +79,7 @@ def test_uninstall_from_usersite_with_dist_in_global_site(
     @pytest.mark.xfail(
         sys.platform == "darwin"
         and platform.machine() == "arm64"
-        and sys.version_info[:2] in {(3, 8), (3, 9)},
+        and sys.version_info[:2] == (3, 9),
         reason="Unexpected egg-link install path",
     )
     def test_uninstall_editable_from_usersite(
diff --git a/tests/lib/compat.py b/tests/lib/compat.py
index 866ac7a7734..8208eb22b0a 100644
--- a/tests/lib/compat.py
+++ b/tests/lib/compat.py
@@ -17,10 +17,7 @@ def blocked_signals() -> Iterator[None]:
         # valid_signals() was added in Python 3.8 (and not using it results
         # in a warning on pthread_sigmask() call)
         mask: Iterable[int]
-        try:
-            mask = signal.valid_signals()
-        except AttributeError:
-            mask = set(range(1, signal.NSIG))
+        mask = signal.valid_signals()
 
         old_mask = signal.pthread_sigmask(  # type: ignore[attr-defined]
             signal.SIG_SETMASK,  # type: ignore[attr-defined]
diff --git a/tests/unit/test_req_file.py b/tests/unit/test_req_file.py
index 60b14940d27..593eeba3594 100644
--- a/tests/unit/test_req_file.py
+++ b/tests/unit/test_req_file.py
@@ -1033,8 +1033,9 @@ def test_warns_and_fallsback_to_locale_on_utf8_decode_fail(
 
         # it's hard to rely on a locale definitely existing for testing
         # so patch things out for simplicity
-        with caplog.at_level(logging.WARNING), mock.patch(
-            "locale.getpreferredencoding", return_value=locale_encoding
+        with (
+            caplog.at_level(logging.WARNING),
+            mock.patch("locale.getpreferredencoding", return_value=locale_encoding),
         ):
             reqs = tuple(parse_reqfile(req_file.resolve(), session=session))
 
@@ -1065,7 +1066,8 @@ def test_errors_on_non_decodable_data(
         req_file = tmpdir / "requirements.txt"
         req_file.write_bytes(data)
 
-        with pytest.raises(UnicodeDecodeError), mock.patch(
-            "locale.getpreferredencoding", return_value=encoding
+        with (
+            pytest.raises(UnicodeDecodeError),
+            mock.patch("locale.getpreferredencoding", return_value=encoding),
         ):
             next(parse_reqfile(req_file.resolve(), session=session))

From 82bda8c4ce2d5aad4720452084e1abe26323d4d4 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Mon, 24 Feb 2025 13:06:15 +0000
Subject: [PATCH 746/992] Respond to review comments

---
 pyproject.toml                          | 1 +
 tests/functional/test_uninstall_user.py | 2 +-
 tests/lib/compat.py                     | 5 +----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c0fda2e1423..23830a24881 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -151,6 +151,7 @@ distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
 #
 
 [tool.ruff]
+# Pinned to delay pyupgrade changes (https://github.com/pypa/pip/issues/13236)
 target-version = "py38"  # Pin Ruff to Python 3.8
 src = ["src"]
 line-length = 88
diff --git a/tests/functional/test_uninstall_user.py b/tests/functional/test_uninstall_user.py
index 664ba72daeb..63ba5e581d0 100644
--- a/tests/functional/test_uninstall_user.py
+++ b/tests/functional/test_uninstall_user.py
@@ -79,7 +79,7 @@ def test_uninstall_from_usersite_with_dist_in_global_site(
     @pytest.mark.xfail(
         sys.platform == "darwin"
         and platform.machine() == "arm64"
-        and sys.version_info[:2] == (3, 9),
+        and sys.version_info[:2] < (3, 10),
         reason="Unexpected egg-link install path",
     )
     def test_uninstall_editable_from_usersite(
diff --git a/tests/lib/compat.py b/tests/lib/compat.py
index 8208eb22b0a..88dadab2efe 100644
--- a/tests/lib/compat.py
+++ b/tests/lib/compat.py
@@ -2,7 +2,7 @@
 
 import contextlib
 import signal
-from typing import Callable, ContextManager, Iterable, Iterator
+from typing import Callable, ContextManager, Iterator
 
 # Applies on Windows.
 if not hasattr(signal, "pthread_sigmask"):
@@ -14,9 +14,6 @@
     @contextlib.contextmanager
     def blocked_signals() -> Iterator[None]:
         """Block all signals for e.g. starting a worker thread."""
-        # valid_signals() was added in Python 3.8 (and not using it results
-        # in a warning on pthread_sigmask() call)
-        mask: Iterable[int]
         mask = signal.valid_signals()
 
         old_mask = signal.pthread_sigmask(  # type: ignore[attr-defined]

From 502d08cc404625c9687e0c1aa08f502994e0fc18 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 24 Feb 2025 22:43:38 -0500
Subject: [PATCH 747/992] Remove even moar legacy Python 3.8 code

---
 src/pip/_internal/commands/search.py          | 11 +++++-----
 src/pip/_internal/metadata/__init__.py        |  7 +------
 src/pip/_internal/operations/install/wheel.py | 21 ++++++++-----------
 src/pip/_internal/utils/misc.py               | 18 ----------------
 4 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/src/pip/_internal/commands/search.py b/src/pip/_internal/commands/search.py
index 74b8d656b47..89bba094119 100644
--- a/src/pip/_internal/commands/search.py
+++ b/src/pip/_internal/commands/search.py
@@ -5,7 +5,7 @@
 import xmlrpc.client
 from collections import OrderedDict
 from optparse import Values
-from typing import TYPE_CHECKING, Dict, List, Optional, TypedDict
+from typing import Dict, List, Optional, TypedDict
 
 from pip._vendor.packaging.version import parse as parse_version
 
@@ -19,12 +19,11 @@
 from pip._internal.utils.logging import indent_log
 from pip._internal.utils.misc import write_output
 
-if TYPE_CHECKING:
 
-    class TransformedHit(TypedDict):
-        name: str
-        summary: str
-        versions: List[str]
+class TransformedHit(TypedDict):
+    name: str
+    summary: str
+    versions: List[str]
 
 
 logger = logging.getLogger(__name__)
diff --git a/src/pip/_internal/metadata/__init__.py b/src/pip/_internal/metadata/__init__.py
index 1ea1e7fd2e5..3535e5699bc 100644
--- a/src/pip/_internal/metadata/__init__.py
+++ b/src/pip/_internal/metadata/__init__.py
@@ -2,17 +2,12 @@
 import functools
 import os
 import sys
-from typing import TYPE_CHECKING, List, Optional, Type, cast
+from typing import List, Literal, Optional, Protocol, Type, cast
 
 from pip._internal.utils.misc import strtobool
 
 from .base import BaseDistribution, BaseEnvironment, FilesystemWheel, MemoryWheel, Wheel
 
-if TYPE_CHECKING:
-    from typing import Literal, Protocol
-else:
-    Protocol = object
-
 __all__ = [
     "BaseDistribution",
     "BaseEnvironment",
diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
index 769c433d043..73e4bfc7c00 100644
--- a/src/pip/_internal/operations/install/wheel.py
+++ b/src/pip/_internal/operations/install/wheel.py
@@ -13,10 +13,10 @@
 import warnings
 from base64 import urlsafe_b64encode
 from email.message import Message
+from io import StringIO
 from itertools import chain, filterfalse, starmap
 from typing import (
     IO,
-    TYPE_CHECKING,
     Any,
     BinaryIO,
     Callable,
@@ -50,7 +50,7 @@
 from pip._internal.models.direct_url import DIRECT_URL_METADATA_NAME, DirectUrl
 from pip._internal.models.scheme import SCHEME_KEYS, Scheme
 from pip._internal.utils.filesystem import adjacent_tmp_file, replace
-from pip._internal.utils.misc import StreamWrapper, ensure_dir, hash_file, partition
+from pip._internal.utils.misc import ensure_dir, hash_file, partition
 from pip._internal.utils.unpacking import (
     current_umask,
     is_within_directory,
@@ -59,15 +59,14 @@
 )
 from pip._internal.utils.wheel import parse_wheel
 
-if TYPE_CHECKING:
 
-    class File(Protocol):
-        src_record_path: "RecordPath"
-        dest_path: str
-        changed: bool
+class File(Protocol):
+    src_record_path: "RecordPath"
+    dest_path: str
+    changed: bool
 
-        def save(self) -> None:
-            pass
+    def save(self) -> None:
+        pass
 
 
 logger = logging.getLogger(__name__)
@@ -608,9 +607,7 @@ def pyc_output_path(path: str) -> str:
 
     # Compile all of the pyc files for the installed files
     if pycompile:
-        with contextlib.redirect_stdout(
-            StreamWrapper.from_stream(sys.stdout)
-        ) as stdout:
+        with contextlib.redirect_stdout(StringIO()) as stdout:
             with warnings.catch_warnings():
                 warnings.filterwarnings("ignore")
                 for path in pyc_source_file_paths():
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
index 44f6a05fbdd..156accda1bd 100644
--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
@@ -11,7 +11,6 @@
 import urllib.parse
 from dataclasses import dataclass
 from functools import partial
-from io import StringIO
 from itertools import filterfalse, tee, zip_longest
 from pathlib import Path
 from types import FunctionType, TracebackType
@@ -26,7 +25,6 @@
     Mapping,
     Optional,
     Sequence,
-    TextIO,
     Tuple,
     Type,
     TypeVar,
@@ -375,22 +373,6 @@ def write_output(msg: Any, *args: Any) -> None:
     logger.info(msg, *args)
 
 
-class StreamWrapper(StringIO):
-    orig_stream: TextIO
-
-    @classmethod
-    def from_stream(cls, orig_stream: TextIO) -> "StreamWrapper":
-        ret = cls()
-        ret.orig_stream = orig_stream
-        return ret
-
-    # compileall.compile_dir() needs stdout.encoding to print to stdout
-    # type ignore is because TextIOBase.encoding is writeable
-    @property
-    def encoding(self) -> str:  # type: ignore
-        return self.orig_stream.encoding
-
-
 # Simulates an enum
 def enum(*sequential: Any, **named: Any) -> Type[Any]:
     enums = dict(zip(sequential, range(len(sequential))), **named)

From b49dd3ad9e9ac4dff389edf801d982501ccd9a94 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Mon, 24 Feb 2025 23:16:54 -0500
Subject: [PATCH 748/992] Update news entry

---
 news/13229.bugfix.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/news/13229.bugfix.rst b/news/13229.bugfix.rst
index e13f0731cf2..fa9d600954e 100644
--- a/news/13229.bugfix.rst
+++ b/news/13229.bugfix.rst
@@ -1 +1,4 @@
-Expand deprecation warning for wheels with non-standard file names.
+Parse wheel filenames according to `binary distribution format specification
+`_.
+When a filename doesn't match the spec a deprecation warning is emitted and the
+filename is parsed using the old method.

From 2feaca93746d05beb2d376b369ff4f1fc28297f3 Mon Sep 17 00:00:00 2001
From: Dustin Ingram 
Date: Wed, 26 Feb 2025 00:00:55 -0500
Subject: [PATCH 749/992] Fix wheel name normalization in tests (#13246)

Setuptools v75.8.1 normalizes the filenames of the wheels it produces in
compliance with a "recent" change in the wheel specification. This also
applies to the .dist-info directories.
---
 tests/functional/test_install.py         | 36 ++++++++++++------------
 tests/functional/test_install_reqs.py    | 10 +++----
 tests/functional/test_install_upgrade.py | 14 ++++-----
 tests/functional/test_install_user.py    |  6 ++--
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 8ada80ed19a..974012eca01 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -291,7 +291,7 @@ def test_pip_second_command_line_interface_works(
     args.extend(["install", "INITools==0.2"])
     args.extend(["-f", os.fspath(data.packages)])
     result = script.run(*args)
-    dist_info_folder = script.site_packages / "INITools-0.2.dist-info"
+    dist_info_folder = script.site_packages / "initools-0.2.dist-info"
     initools_folder = script.site_packages / "initools"
     result.did_create(dist_info_folder)
     result.did_create(initools_folder)
@@ -363,7 +363,7 @@ def test_basic_install_from_pypi(script: PipTestEnvironment) -> None:
     Test installing a package from PyPI.
     """
     result = script.pip("install", "INITools==0.2")
-    dist_info_folder = script.site_packages / "INITools-0.2.dist-info"
+    dist_info_folder = script.site_packages / "initools-0.2.dist-info"
     initools_folder = script.site_packages / "initools"
     result.did_create(dist_info_folder)
     result.did_create(initools_folder)
@@ -555,7 +555,7 @@ def test_basic_install_from_local_directory(
     args.append(os.fspath(to_install))
     result = script.pip(*args)
     fspkg_folder = script.site_packages / "fspkg"
-    dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
+    dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
     result.did_create(fspkg_folder)
     result.did_create(dist_info_folder)
 
@@ -577,7 +577,7 @@ def test_basic_install_relative_directory(
     """
     Test installing a requirement using a relative path.
     """
-    dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
+    dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
     egg_link_file = script.site_packages / "FSPkg.egg-link"
     package_folder = script.site_packages / "fspkg"
 
@@ -871,7 +871,7 @@ def test_install_from_local_directory_with_in_tree_build(
     assert not in_tree_build_dir.exists()
     result = script.pip("install", to_install)
     fspkg_folder = script.site_packages / "fspkg"
-    dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
+    dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
     result.did_create(fspkg_folder)
     result.did_create(dist_info_folder)
     assert in_tree_build_dir.exists()
@@ -1025,7 +1025,7 @@ def test_install_curdir(script: PipTestEnvironment, data: TestData) -> None:
         rmtree(egg_info)
     result = script.pip("install", curdir, cwd=run_from)
     fspkg_folder = script.site_packages / "fspkg"
-    dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
+    dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
     result.did_create(fspkg_folder)
     result.did_create(dist_info_folder)
 
@@ -1037,7 +1037,7 @@ def test_install_pardir(script: PipTestEnvironment, data: TestData) -> None:
     run_from = data.packages.joinpath("FSPkg", "fspkg")
     result = script.pip("install", pardir, cwd=run_from)
     fspkg_folder = script.site_packages / "fspkg"
-    dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
+    dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
     result.did_create(fspkg_folder)
     result.did_create(dist_info_folder)
 
@@ -1550,9 +1550,9 @@ def test_url_req_case_mismatch_no_index(
     )
 
     # only Upper-1.0.tar.gz should get installed.
-    dist_info_folder = script.site_packages / "Upper-1.0.dist-info"
+    dist_info_folder = script.site_packages / "upper-1.0.dist-info"
     result.did_create(dist_info_folder)
-    dist_info_folder = script.site_packages / "Upper-2.0.dist-info"
+    dist_info_folder = script.site_packages / "upper-2.0.dist-info"
     result.did_not_create(dist_info_folder)
 
 
@@ -1578,10 +1578,10 @@ def test_url_req_case_mismatch_file_index(
         "install", "--index-url", data.find_links3, Dinner, "requiredinner"
     )
 
-    # only Upper-1.0.tar.gz should get installed.
-    dist_info_folder = script.site_packages / "Dinner-1.0.dist-info"
+    # only Dinner-1.0.tar.gz should get installed.
+    dist_info_folder = script.site_packages / "dinner-1.0.dist-info"
     result.did_create(dist_info_folder)
-    dist_info_folder = script.site_packages / "Dinner-2.0.dist-info"
+    dist_info_folder = script.site_packages / "dinner-2.0.dist-info"
     result.did_not_create(dist_info_folder)
 
 
@@ -1602,9 +1602,9 @@ def test_url_incorrect_case_no_index(
     )
 
     # only Upper-2.0.tar.gz should get installed.
-    dist_info_folder = script.site_packages / "Upper-1.0.dist-info"
+    dist_info_folder = script.site_packages / "upper-1.0.dist-info"
     result.did_not_create(dist_info_folder)
-    dist_info_folder = script.site_packages / "Upper-2.0.dist-info"
+    dist_info_folder = script.site_packages / "upper-2.0.dist-info"
     result.did_create(dist_info_folder)
 
 
@@ -1624,10 +1624,10 @@ def test_url_incorrect_case_file_index(
         expect_stderr=True,
     )
 
-    # only Upper-2.0.tar.gz should get installed.
-    dist_info_folder = script.site_packages / "Dinner-1.0.dist-info"
+    # only Dinner-2.0.tar.gz should get installed.
+    dist_info_folder = script.site_packages / "dinner-1.0.dist-info"
     result.did_not_create(dist_info_folder)
-    dist_info_folder = script.site_packages / "Dinner-2.0.dist-info"
+    dist_info_folder = script.site_packages / "dinner-2.0.dist-info"
     result.did_create(dist_info_folder)
 
     # Should show index-url location in output
@@ -1798,7 +1798,7 @@ def test_install_builds_wheels(script: PipTestEnvironment, data: TestData) -> No
     # into the cache
     assert wheels != [], str(res)
     assert wheels == [
-        f"Upper-2.0-py{sys.version_info[0]}-none-any.whl",
+        f"upper-2.0-py{sys.version_info[0]}-none-any.whl",
     ]
 
 
diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index 45103dc7c74..7a553ae9192 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -86,7 +86,7 @@ def test_requirements_file(script: PipTestEnvironment) -> None:
         )
     )
     result = script.pip("install", "-r", script.scratch_path / "initools-req.txt")
-    result.did_create(script.site_packages / "INITools-0.2.dist-info")
+    result.did_create(script.site_packages / "initools-0.2.dist-info")
     result.did_create(script.site_packages / "initools")
     assert result.files_created[script.site_packages / other_lib_name].dir
     fn = f"{other_lib_name}-{other_lib_version}.dist-info"
@@ -130,7 +130,7 @@ def test_dependency_group(
             path = path(pyproject)
         arg = f"{path}:{groupname}"
     result = script.pip("install", "--group", arg)
-    result.did_create(script.site_packages / "INITools-0.2.dist-info")
+    result.did_create(script.site_packages / "initools-0.2.dist-info")
     result.did_create(script.site_packages / "initools")
     assert result.files_created[script.site_packages / "peppercorn"].dir
     assert result.files_created[script.site_packages / "peppercorn-0.6.dist-info"].dir
@@ -153,7 +153,7 @@ def test_multiple_dependency_groups(script: PipTestEnvironment) -> None:
         )
     )
     result = script.pip("install", "--group", "initools", "--group", "peppercorn")
-    result.did_create(script.site_packages / "INITools-0.2.dist-info")
+    result.did_create(script.site_packages / "initools-0.2.dist-info")
     result.did_create(script.site_packages / "initools")
     assert result.files_created[script.site_packages / "peppercorn"].dir
     assert result.files_created[script.site_packages / "peppercorn-0.6.dist-info"].dir
@@ -176,7 +176,7 @@ def test_dependency_group_with_non_normalized_name(script: PipTestEnvironment) -
         )
     )
     result = script.pip("install", "--group", "IniTools")
-    result.did_create(script.site_packages / "INITools-0.2.dist-info")
+    result.did_create(script.site_packages / "initools-0.2.dist-info")
     result.did_create(script.site_packages / "initools")
 
 
@@ -215,7 +215,7 @@ def test_relative_requirements_file(
     URLs, use an egg= definition.
 
     """
-    dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
+    dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
     egg_link_file = script.site_packages / "FSPkg.egg-link"
     package_folder = script.site_packages / "fspkg"
 
diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py
index 00036c1ef05..43b43d64f82 100644
--- a/tests/functional/test_install_upgrade.py
+++ b/tests/functional/test_install_upgrade.py
@@ -144,8 +144,8 @@ def test_upgrade_to_specific_version(script: PipTestEnvironment) -> None:
     script.pip("install", "INITools==0.1")
     result = script.pip("install", "INITools==0.2")
     assert result.files_created, "pip install with specific version did not upgrade"
-    assert script.site_packages / "INITools-0.1.dist-info" in result.files_deleted
-    result.did_create(script.site_packages / "INITools-0.2.dist-info")
+    assert script.site_packages / "initools-0.1.dist-info" in result.files_deleted
+    result.did_create(script.site_packages / "initools-0.2.dist-info")
 
 
 @pytest.mark.network
@@ -157,7 +157,7 @@ def test_upgrade_if_requested(script: PipTestEnvironment) -> None:
     script.pip("install", "INITools==0.1")
     result = script.pip("install", "--upgrade", "INITools")
     assert result.files_created, "pip install --upgrade did not upgrade"
-    result.did_not_create(script.site_packages / "INITools-0.1.dist-info")
+    result.did_not_create(script.site_packages / "initools-0.1.dist-info")
 
 
 def test_upgrade_with_newest_already_installed(
@@ -319,8 +319,8 @@ def test_should_not_install_always_from_cache(script: PipTestEnvironment) -> Non
     script.pip("install", "INITools==0.2")
     script.pip("uninstall", "-y", "INITools")
     result = script.pip("install", "INITools==0.1")
-    result.did_not_create(script.site_packages / "INITools-0.2.dist-info")
-    result.did_create(script.site_packages / "INITools-0.1.dist-info")
+    result.did_not_create(script.site_packages / "initools-0.2.dist-info")
+    result.did_create(script.site_packages / "initools-0.1.dist-info")
 
 
 @pytest.mark.network
@@ -332,8 +332,8 @@ def test_install_with_ignoreinstalled_requested(script: PipTestEnvironment) -> N
     result = script.pip("install", "-I", "INITools==0.3")
     assert result.files_created, "pip install -I did not install"
     # both the old and new metadata should be present.
-    assert os.path.exists(script.site_packages_path / "INITools-0.1.dist-info")
-    assert os.path.exists(script.site_packages_path / "INITools-0.3.dist-info")
+    assert os.path.exists(script.site_packages_path / "initools-0.1.dist-info")
+    assert os.path.exists(script.site_packages_path / "initools-0.3.dist-info")
 
 
 @pytest.mark.network
diff --git a/tests/functional/test_install_user.py b/tests/functional/test_install_user.py
index 604072d765f..0b1e025cbbe 100644
--- a/tests/functional/test_install_user.py
+++ b/tests/functional/test_install_user.py
@@ -53,7 +53,7 @@ def test_reset_env_system_site_packages_usersite(
             "('initools').project_name)",
         )
         project_name = result.stdout.strip()
-        assert "INITools" == project_name, project_name
+        assert "initools" == project_name, project_name
 
     @pytest.mark.xfail
     @pytest.mark.network
@@ -95,7 +95,7 @@ def test_install_from_current_directory_into_usersite(
         fspkg_folder = script.user_site / "fspkg"
         result.did_create(fspkg_folder)
 
-        dist_info_folder = script.user_site / "FSPkg-0.1.dev0.dist-info"
+        dist_info_folder = script.user_site / "fspkg-0.1.dev0.dist-info"
         result.did_create(dist_info_folder)
 
     def test_install_user_venv_nositepkgs_fails(
@@ -133,7 +133,7 @@ def test_install_user_conflict_in_usersite(
         result2 = script.pip("install", "--user", "INITools==0.1", "--no-binary=:all:")
 
         # usersite has 0.1
-        dist_info_folder = script.user_site / "INITools-0.1.dist-info"
+        dist_info_folder = script.user_site / "initools-0.1.dist-info"
         initools_v3_file = (
             # file only in 0.3
             script.base_path

From 83155a11c19f5a05b5ca35c42e7de60580461acc Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 26 Feb 2025 00:15:48 -0500
Subject: [PATCH 750/992] Rewrite flaky test_vcs_url_urlquote_normalization to
 use local git repo (#13243)

Looking at the VCS code, I'm not actually sure if the original test is
testing what's supposed to be testing nowadays. The docstring suggests
it's testing the compare_urls() method in vcs/versioncontrol.py but it
never called in the original test.

Anyway, this test has been particularly flaky as Launchpad frequently
timeouts. We don't need to test bzr here, so let's switch to test
against a local git repository.
---
 tests/functional/test_install.py | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
index 974012eca01..1dc46cf8621 100644
--- a/tests/functional/test_install.py
+++ b/tests/functional/test_install.py
@@ -519,26 +519,15 @@ def test_install_editable_from_bazaar(script: PipTestEnvironment) -> None:
     result.assert_installed("testpackage", with_files=[".bzr"])
 
 
-@pytest.mark.network
-@need_bzr
-def test_vcs_url_urlquote_normalization(
-    script: PipTestEnvironment, tmpdir: Path
-) -> None:
+def test_vcs_url_urlquote_normalization(script: PipTestEnvironment) -> None:
     """
     Test that urlquoted characters are normalized for repo URL comparison.
     """
-    script.pip(
-        "install",
-        "-e",
-        "{url}/#egg=django-wikiapp".format(
-            url=local_checkout(
-                "bzr+http://bazaar.launchpad.net/"
-                "%7Edjango-wikiapp/django-wikiapp"
-                "/release-0.1",
-                tmpdir,
-            )
-        ),
+    pkg_path = _create_test_package(
+        script.scratch_path, name="django_wikiapp", vcs="git"
     )
+    url = f"git+{pkg_path.as_uri().replace('django_', 'django%5F')}/#egg=django_wikiapp"
+    script.pip("install", "-e", url)
 
 
 @pytest.mark.parametrize("resolver", ["", "--use-deprecated=legacy-resolver"])

From 331400c30bb65845e8e7feeb589066dab9e571fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Feb 2025 11:46:11 -0500
Subject: [PATCH 751/992] Bump actions/upload-artifact from 4.6.0 to 4.6.1
 (#13240)

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 60b32a5c960..a3995a32cf1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Build a binary wheel and a source tarball
         run: ./build-project.py
       - name: Store the distribution packages
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
         with:
           name: python-package-distributions
           path: dist/

From 02ad3a537342fb8b8d6403ae791e7e9371c56071 Mon Sep 17 00:00:00 2001
From: developer 
Date: Sat, 1 Mar 2025 15:10:24 +0300
Subject: [PATCH 752/992] docs: detailed information about the --platform and
 --python-version parameters of the download command is provided

---
 docs/html/cli/pip_download.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/html/cli/pip_download.rst b/docs/html/cli/pip_download.rst
index d247c51ccfb..129df492b97 100644
--- a/docs/html/cli/pip_download.rst
+++ b/docs/html/cli/pip_download.rst
@@ -47,7 +47,15 @@ constrained download requirement. If some of your dependencies are not
 available as binaries, you can build them manually for your target platform
 and let pip download know where to find them using ``--find-links``.
 
+.. note::
+To determine the appropriate values for ``--python-version`` and ``--platform``, you can query the target system using the following commands:
 
+- For the Python version, use :func:`sysconfig.get_python_version() `.
+- For the platform, use :func:`sysconfig.get_platform() `.
+
+Refer to the official Python documentation for more details:
+- `sysconfig.get_python_version() `_
+- `sysconfig.get_platform() `_
 
 Options
 =======

From c4433cb82317c4cdec03a3c5961f38656bceb719 Mon Sep 17 00:00:00 2001
From: developer 
Date: Sat, 1 Mar 2025 15:19:16 +0300
Subject: [PATCH 753/992] added news

---
 news/6369.doc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/6369.doc.rst

diff --git a/news/6369.doc.rst b/news/6369.doc.rst
new file mode 100644
index 00000000000..e85d3763620
--- /dev/null
+++ b/news/6369.doc.rst
@@ -0,0 +1 @@
+Provided information about the --platform and --python-version options of the ``pip download`` command
\ No newline at end of file

From 5aeda3b4c166a856adf32dea1919e2af06993cba Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 1 Mar 2025 10:00:09 -0500
Subject: [PATCH 754/992] Add wheel build tag to pip list columns output
 (#13231)

Co-authored-by: q0w <43147888+q0w@users.noreply.github.com>
---
 news/5210.feature.rst              |  1 +
 src/pip/_internal/commands/list.py | 24 ++++++++++++++++++++----
 tests/functional/test_list.py      | 14 ++++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 news/5210.feature.rst

diff --git a/news/5210.feature.rst b/news/5210.feature.rst
new file mode 100644
index 00000000000..c7e9e513f62
--- /dev/null
+++ b/news/5210.feature.rst
@@ -0,0 +1 @@
+Display wheel build tag in ``pip list`` columns output if set.
diff --git a/src/pip/_internal/commands/list.py b/src/pip/_internal/commands/list.py
index a8b4f7af9fe..b03085070d2 100644
--- a/src/pip/_internal/commands/list.py
+++ b/src/pip/_internal/commands/list.py
@@ -1,5 +1,6 @@
 import json
 import logging
+from email.parser import Parser
 from optparse import Values
 from typing import TYPE_CHECKING, Generator, List, Optional, Sequence, Tuple, cast
 
@@ -323,17 +324,29 @@ def format_for_columns(
     if running_outdated:
         header.extend(["Latest", "Type"])
 
-    has_editables = any(x.editable for x in pkgs)
-    if has_editables:
-        header.append("Editable project location")
+    def wheel_build_tag(dist: BaseDistribution) -> Optional[str]:
+        try:
+            wheel_file = dist.read_text("WHEEL")
+        except FileNotFoundError:
+            return None
+        return Parser().parsestr(wheel_file).get("Build")
+
+    build_tags = [wheel_build_tag(p) for p in pkgs]
+    has_build_tags = any(build_tags)
+    if has_build_tags:
+        header.append("Build")
 
     if options.verbose >= 1:
         header.append("Location")
     if options.verbose >= 1:
         header.append("Installer")
 
+    has_editables = any(x.editable for x in pkgs)
+    if has_editables:
+        header.append("Editable project location")
+
     data = []
-    for proj in pkgs:
+    for i, proj in enumerate(pkgs):
         # if we're working on the 'outdated' list, separate out the
         # latest_version and type
         row = [proj.raw_name, proj.raw_version]
@@ -342,6 +355,9 @@ def format_for_columns(
             row.append(str(proj.latest_version))
             row.append(proj.latest_filetype)
 
+        if has_build_tags:
+            row.append(build_tags[i] or "")
+
         if has_editables:
             row.append(proj.editable_project_location or "")
 
diff --git a/tests/functional/test_list.py b/tests/functional/test_list.py
index e611fe7cb64..468e6acd6c2 100644
--- a/tests/functional/test_list.py
+++ b/tests/functional/test_list.py
@@ -12,6 +12,7 @@
     TestData,
     _create_test_package,
     create_test_package_with_setup,
+    make_wheel,
     wheel,
 )
 from tests.lib.direct_url import get_created_direct_url_path
@@ -751,3 +752,16 @@ def test_list_pep610_editable(script: PipTestEnvironment) -> None:
             break
     else:
         pytest.fail("package 'testpkg' not found in pip list result")
+
+
+def test_list_wheel_build(script: PipTestEnvironment) -> None:
+    package = make_wheel(
+        name="package",
+        version="3.0",
+        wheel_metadata_updates={"Build": "123"},
+    ).save_to_dir(script.scratch_path)
+    script.pip("install", package, "--no-index")
+
+    result = script.pip("list")
+    assert "Build" in result.stdout, str(result)
+    assert "123" in result.stdout, str(result)

From 6b662f346d00c31a4d27280aa442d68b762aba34 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 1 Mar 2025 10:25:40 -0500
Subject: [PATCH 755/992] Do not prefer star specified package as though it
 were a pinned package

---
 src/pip/_internal/resolution/resolvelib/provider.py | 6 +++---
 tests/unit/resolution_resolvelib/test_provider.py   | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index 74cdb9d80f9..40326001eaa 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -142,14 +142,14 @@ def get_preference(
         else:
             candidate, ireqs = None, ()
 
-        operators = [
-            specifier.operator
+        operators: list[tuple[str, str]] = [
+            (specifier.operator, specifier.version)
             for specifier_set in (ireq.specifier for ireq in ireqs if ireq)
             for specifier in specifier_set
         ]
 
         direct = candidate is not None
-        pinned = any(op[:2] == "==" for op in operators)
+        pinned = any(((op[:2] == "==") and ("*" not in ver)) for op, ver in operators)
         unfree = bool(operators)
         requested_order = self._user_requested.get(identifier, math.inf)
 
diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index 45536a9eab3..d37076a9356 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -52,6 +52,14 @@ def build_req_info(
             {},
             (True, False, False, True, math.inf, False, "pinned-package"),
         ),
+        # Star-specified package, i.e. with "*"
+        (
+            "star-specified-package",
+            {"star-specified-package": [build_req_info("star-specified-package==1.*")]},
+            [],
+            {},
+            (True, False, True, True, math.inf, False, "star-specified-package"),
+        ),
         # Package that caused backtracking
         (
             "backtrack-package",

From 18cae7970e59f3c07ccad1f047a8964492d90e0f Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 1 Mar 2025 10:32:19 -0500
Subject: [PATCH 756/992] NEWS ENTRY

---
 news/13252.bugfix.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 news/13252.bugfix.rst

diff --git a/news/13252.bugfix.rst b/news/13252.bugfix.rst
new file mode 100644
index 00000000000..47737458964
--- /dev/null
+++ b/news/13252.bugfix.rst
@@ -0,0 +1,3 @@
+When choosing a preferred requirement for resolving dependencies
+do not consider a specifier with a * in it, e.g. "==1.*", to be a
+pinned specifier.

From a2c40d4e8d51386c423d4c2362f4e284b0884d8f Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 1 Mar 2025 10:51:16 -0500
Subject: [PATCH 757/992] Move Requires Python candidate check to
 `narrow_requirement_selection`

---
 .../resolution/resolvelib/provider.py         | 27 ++++++--
 .../resolution_resolvelib/test_provider.py    | 66 +++++++++++++++----
 2 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index 74cdb9d80f9..f41e9fd5df9 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -103,6 +103,28 @@ def __init__(
     def identify(self, requirement_or_candidate: Union[Requirement, Candidate]) -> str:
         return requirement_or_candidate.name
 
+    def narrow_requirement_selection(
+        self,
+        identifiers: Iterable[str],
+        resolutions: Mapping[str, Candidate],
+        candidates: Mapping[str, Iterator[Candidate]],
+        information: Mapping[str, Iterator["PreferenceInformation"]],
+        backtrack_causes: Sequence["PreferenceInformation"],
+    ) -> Iterable[str]:
+        """Produce a subset of identifiers that should be considered before others.
+
+        Currently pip narrows the following selection:
+            * Requires-Python is always considered first.
+        """
+        for identifier in identifiers:
+            # Requires-Python has only one candidate and the check is basically
+            # free, so we always do it first to avoid needless work if it fails.
+            # This skips calling get_preference() for all other identifiers.
+            if identifier == REQUIRES_PYTHON_IDENTIFIER:
+                return [identifier]
+
+        return identifiers
+
     def get_preference(
         self,
         identifier: str,
@@ -153,17 +175,12 @@ def get_preference(
         unfree = bool(operators)
         requested_order = self._user_requested.get(identifier, math.inf)
 
-        # Requires-Python has only one candidate and the check is basically
-        # free, so we always do it first to avoid needless work if it fails.
-        requires_python = identifier == REQUIRES_PYTHON_IDENTIFIER
-
         # Prefer the causes of backtracking on the assumption that the problem
         # resolving the dependency tree is related to the failures that caused
         # the backtracking
         backtrack_cause = self.is_backtrack_cause(identifier, backtrack_causes)
 
         return (
-            not requires_python,
             not direct,
             not pinned,
             not backtrack_cause,
diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index 45536a9eab3..2bd29e71910 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -1,5 +1,5 @@
 import math
-from typing import TYPE_CHECKING, Dict, Iterable, Optional, Sequence
+from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Sequence
 
 import pytest
 
@@ -36,21 +36,13 @@ def build_req_info(
 @pytest.mark.parametrize(
     "identifier, information, backtrack_causes, user_requested, expected",
     [
-        # Test case for REQUIRES_PYTHON_IDENTIFIER
-        (
-            REQUIRES_PYTHON_IDENTIFIER,
-            {REQUIRES_PYTHON_IDENTIFIER: [build_req_info("python")]},
-            [],
-            {},
-            (False, False, True, True, math.inf, True, REQUIRES_PYTHON_IDENTIFIER),
-        ),
         # Pinned package with "=="
         (
             "pinned-package",
             {"pinned-package": [build_req_info("pinned-package==1.0")]},
             [],
             {},
-            (True, False, False, True, math.inf, False, "pinned-package"),
+            (False, False, True, math.inf, False, "pinned-package"),
         ),
         # Package that caused backtracking
         (
@@ -58,7 +50,7 @@ def build_req_info(
             {"backtrack-package": [build_req_info("backtrack-package")]},
             [build_req_info("backtrack-package")],
             {},
-            (True, False, True, False, math.inf, True, "backtrack-package"),
+            (False, True, False, math.inf, True, "backtrack-package"),
         ),
         # Root package requested by user
         (
@@ -66,7 +58,7 @@ def build_req_info(
             {"root-package": [build_req_info("root-package")]},
             [],
             {"root-package": 1},
-            (True, False, True, True, 1, True, "root-package"),
+            (False, True, True, 1, True, "root-package"),
         ),
         # Unfree package (with specifier operator)
         (
@@ -74,7 +66,7 @@ def build_req_info(
             {"unfree-package": [build_req_info("unfree-package<1")]},
             [],
             {},
-            (True, False, True, True, math.inf, False, "unfree-package"),
+            (False, True, True, math.inf, False, "unfree-package"),
         ),
         # Free package (no operator)
         (
@@ -82,7 +74,7 @@ def build_req_info(
             {"free-package": [build_req_info("free-package")]},
             [],
             {},
-            (True, False, True, True, math.inf, True, "free-package"),
+            (False, True, True, math.inf, True, "free-package"),
         ),
     ],
 )
@@ -107,3 +99,49 @@ def test_get_preference(
     )
 
     assert preference == expected, f"Expected {expected}, got {preference}"
+
+
+@pytest.mark.parametrize(
+    "identifiers, expected",
+    [
+        # Case 1: REQUIRES_PYTHON_IDENTIFIER is present at the beginning
+        (
+            [REQUIRES_PYTHON_IDENTIFIER, "package1", "package2"],
+            [REQUIRES_PYTHON_IDENTIFIER],
+        ),
+        # Case 2: REQUIRES_PYTHON_IDENTIFIER is present in the middle
+        (
+            ["package1", REQUIRES_PYTHON_IDENTIFIER, "package2"],
+            [REQUIRES_PYTHON_IDENTIFIER],
+        ),
+        # Case 3: REQUIRES_PYTHON_IDENTIFIER is not present
+        (
+            ["package1", "package2"],
+            ["package1", "package2"],
+        ),
+        # Case 4: Empty list of identifiers
+        (
+            [],
+            [],
+        ),
+    ],
+)
+def test_narrow_requirement_selection(
+    identifiers: List[str],
+    expected: List[str],
+    factory: Factory,
+) -> None:
+    """Test that narrow_requirement_selection correctly prioritizes
+    REQUIRES_PYTHON_IDENTIFIER when present in the list of identifiers.
+    """
+    provider = PipProvider(
+        factory=factory,
+        constraints={},
+        ignore_dependencies=False,
+        upgrade_strategy="to-satisfy-only",
+        user_requested={},
+    )
+
+    result = provider.narrow_requirement_selection(identifiers, {}, {}, {}, [])
+
+    assert list(result) == expected, f"Expected {expected}, got {list(result)}"

From 0f1f5fe093f990a024754873716c5b39ea26aca1 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 1 Mar 2025 11:38:11 -0500
Subject: [PATCH 758/992] Move backtrack cause preference to
 `narrow_requirement_selection`

---
 .../resolution/resolvelib/provider.py         | 40 +++++++------
 .../resolution_resolvelib/test_provider.py    | 57 ++++++++++++-------
 2 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index f41e9fd5df9..a28ecbb795f 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -114,8 +114,21 @@ def narrow_requirement_selection(
         """Produce a subset of identifiers that should be considered before others.
 
         Currently pip narrows the following selection:
-            * Requires-Python is always considered first.
+            * Requires-Python, if present is always returned by itself
+            * Backtrack causes are considered next because they can be identified
+              in linear time here, whereas because get_preference() is called
+              for each identifier, it would be quadratic to check for them there.
+              Further, the current backtrack causes likely need to be resolved
+              before other requirements as a resolution can't be found while
+              there is a conflict.
         """
+        backtrack_idenifiers = set()
+        for info in backtrack_causes:
+            backtrack_idenifiers.add(info.requirement.name)
+            if info.parent is not None:
+                backtrack_idenifiers.add(info.parent.name)
+
+        current_backtrack_causes = []
         for identifier in identifiers:
             # Requires-Python has only one candidate and the check is basically
             # free, so we always do it first to avoid needless work if it fails.
@@ -123,6 +136,14 @@ def narrow_requirement_selection(
             if identifier == REQUIRES_PYTHON_IDENTIFIER:
                 return [identifier]
 
+            # Check if this identifier is a backtrack cause
+            if identifier in backtrack_idenifiers:
+                current_backtrack_causes.append(identifier)
+                continue
+
+        if current_backtrack_causes:
+            return current_backtrack_causes
+
         return identifiers
 
     def get_preference(
@@ -175,15 +196,9 @@ def get_preference(
         unfree = bool(operators)
         requested_order = self._user_requested.get(identifier, math.inf)
 
-        # Prefer the causes of backtracking on the assumption that the problem
-        # resolving the dependency tree is related to the failures that caused
-        # the backtracking
-        backtrack_cause = self.is_backtrack_cause(identifier, backtrack_causes)
-
         return (
             not direct,
             not pinned,
-            not backtrack_cause,
             requested_order,
             not unfree,
             identifier,
@@ -238,14 +253,3 @@ def is_satisfied_by(self, requirement: Requirement, candidate: Candidate) -> boo
     def get_dependencies(self, candidate: Candidate) -> Sequence[Requirement]:
         with_requires = not self._ignore_dependencies
         return [r for r in candidate.iter_dependencies(with_requires) if r is not None]
-
-    @staticmethod
-    def is_backtrack_cause(
-        identifier: str, backtrack_causes: Sequence["PreferenceInformation"]
-    ) -> bool:
-        for backtrack_cause in backtrack_causes:
-            if identifier == backtrack_cause.requirement.name:
-                return True
-            if backtrack_cause.parent and identifier == backtrack_cause.parent.name:
-                return True
-        return False
diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index 2bd29e71910..da86b54698d 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -42,15 +42,7 @@ def build_req_info(
             {"pinned-package": [build_req_info("pinned-package==1.0")]},
             [],
             {},
-            (False, False, True, math.inf, False, "pinned-package"),
-        ),
-        # Package that caused backtracking
-        (
-            "backtrack-package",
-            {"backtrack-package": [build_req_info("backtrack-package")]},
-            [build_req_info("backtrack-package")],
-            {},
-            (False, True, False, math.inf, True, "backtrack-package"),
+            (False, False, math.inf, False, "pinned-package"),
         ),
         # Root package requested by user
         (
@@ -58,7 +50,7 @@ def build_req_info(
             {"root-package": [build_req_info("root-package")]},
             [],
             {"root-package": 1},
-            (False, True, True, 1, True, "root-package"),
+            (False, True, 1, True, "root-package"),
         ),
         # Unfree package (with specifier operator)
         (
@@ -66,7 +58,7 @@ def build_req_info(
             {"unfree-package": [build_req_info("unfree-package<1")]},
             [],
             {},
-            (False, True, True, math.inf, False, "unfree-package"),
+            (False, True, math.inf, False, "unfree-package"),
         ),
         # Free package (no operator)
         (
@@ -74,7 +66,7 @@ def build_req_info(
             {"free-package": [build_req_info("free-package")]},
             [],
             {},
-            (False, True, True, math.inf, True, "free-package"),
+            (False, True, math.inf, True, "free-package"),
         ),
     ],
 )
@@ -102,37 +94,56 @@ def test_get_preference(
 
 
 @pytest.mark.parametrize(
-    "identifiers, expected",
+    "identifiers, backtrack_causes, expected",
     [
-        # Case 1: REQUIRES_PYTHON_IDENTIFIER is present at the beginning
+        # REQUIRES_PYTHON_IDENTIFIER is present
         (
-            [REQUIRES_PYTHON_IDENTIFIER, "package1", "package2"],
+            [REQUIRES_PYTHON_IDENTIFIER, "package1", "package2", "backtrack-package"],
+            [build_req_info("backtrack-package")],
             [REQUIRES_PYTHON_IDENTIFIER],
         ),
-        # Case 2: REQUIRES_PYTHON_IDENTIFIER is present in the middle
+        # REQUIRES_PYTHON_IDENTIFIER is present after backtrack causes
         (
-            ["package1", REQUIRES_PYTHON_IDENTIFIER, "package2"],
+            ["package1", "package2", "backtrack-package", REQUIRES_PYTHON_IDENTIFIER],
+            [build_req_info("backtrack-package")],
             [REQUIRES_PYTHON_IDENTIFIER],
         ),
-        # Case 3: REQUIRES_PYTHON_IDENTIFIER is not present
+        # Backtrack causes present (direct requirement)
+        (
+            ["package1", "package2", "backtrack-package"],
+            [build_req_info("backtrack-package")],
+            ["backtrack-package"],
+        ),
+        # Multiple backtrack causes
+        (
+            ["package1", "backtrack1", "backtrack2", "package2"],
+            [build_req_info("backtrack1"), build_req_info("backtrack2")],
+            ["backtrack1", "backtrack2"],
+        ),
+        # No special identifiers - return all
         (
             ["package1", "package2"],
+            [],
             ["package1", "package2"],
         ),
-        # Case 4: Empty list of identifiers
+        # Empty list of identifiers
         (
             [],
             [],
+            [],
         ),
     ],
 )
 def test_narrow_requirement_selection(
     identifiers: List[str],
+    backtrack_causes: Sequence["PreferenceInformation"],
     expected: List[str],
     factory: Factory,
 ) -> None:
-    """Test that narrow_requirement_selection correctly prioritizes
-    REQUIRES_PYTHON_IDENTIFIER when present in the list of identifiers.
+    """Test that narrow_requirement_selection correctly prioritizes identifiers:
+    1. REQUIRES_PYTHON_IDENTIFIER (if present)
+    2. Backtrack causes (if present)
+    3. All other identifiers (as-is)
     """
     provider = PipProvider(
         factory=factory,
@@ -142,6 +153,8 @@ def test_narrow_requirement_selection(
         user_requested={},
     )
 
-    result = provider.narrow_requirement_selection(identifiers, {}, {}, {}, [])
+    result = provider.narrow_requirement_selection(
+        identifiers, {}, {}, {}, backtrack_causes
+    )
 
     assert list(result) == expected, f"Expected {expected}, got {list(result)}"

From 0f3250e7e379d73cec1df81bb7f654a4349f6729 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 1 Mar 2025 11:38:18 -0500
Subject: [PATCH 759/992] Update docs

---
 .../html/topics/more-dependency-resolution.md | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/docs/html/topics/more-dependency-resolution.md b/docs/html/topics/more-dependency-resolution.md
index 21520528781..c0afd3a4e28 100644
--- a/docs/html/topics/more-dependency-resolution.md
+++ b/docs/html/topics/more-dependency-resolution.md
@@ -132,6 +132,8 @@ operations:
 * `get_preference` - this provides information to the resolver to help it choose
   which requirement to look at "next" when working through the resolution
   process.
+* `narrow_requirement_selection` - this provides a way to limit the number of
+  identifiers passed to `get_preference`.
 * `find_matches` - given a set of constraints, determine what candidates exist
   that satisfy them. This is essentially where the finder interacts with the
   resolver.
@@ -140,12 +142,12 @@ operations:
 * `get_dependencies` - get the dependency metadata for a candidate. This is
   the implementation of the process of getting and reading package metadata.
 
-Of these methods, the only non-trivial one is the `get_preference` method. This
-implements the heuristics used to guide the resolution, telling it which
-requirement to try to satisfy next. It's this method that is responsible for
-trying to guess which route through the dependency tree will be most productive.
-As noted above, it's doing this with limited information. See the following
-diagram
+Of these methods, the only non-trivial ones are the `get_preference` and
+`narrow_requirement_selection` methods. These implement heuristics used
+to guide the resolution, telling it which requirement to try to satisfy next.
+It's these methods that are responsible for trying to guess which route through
+the dependency tree will be most productive. As noted above, it's doing this
+with limited information. See the following diagram:
 
 ![](deps.png)
 
@@ -153,6 +155,13 @@ When the provider is asked to choose between the red requirements (A->B and
 A->C) it doesn't know anything about the dependencies of B or C (i.e., the
 grey parts of the graph).
 
+Pip's current implementation of the provider implements
+`narrow_requirement_selection` as follows:
+
+* If Requires-Python is present only consider that
+* If there are causes of resolution conflict (backtrack causes) then
+  only consider them until there are no longer any resolution conflicts
+
 Pip's current implementation of the provider implements `get_preference` as
 follows:
 

From 86a46e0c65c1bc5e0b68ecb3fc1017440a0a58d4 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 1 Mar 2025 11:43:28 -0500
Subject: [PATCH 760/992] NEWS ENTRY

---
 news/13253.feature.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 news/13253.feature.rst

diff --git a/news/13253.feature.rst b/news/13253.feature.rst
new file mode 100644
index 00000000000..712e1639e16
--- /dev/null
+++ b/news/13253.feature.rst
@@ -0,0 +1,2 @@
+Speed up resolution by first only considering the preference of
+candidates that must be required to complete the resolution.

From 3981979a1eb6ad2601452d99607f56e48d8b5c1f Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 1 Mar 2025 12:05:25 -0500
Subject: [PATCH 761/992] Fix `backtrack_idenifiers` typo

---
 src/pip/_internal/resolution/resolvelib/provider.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index a28ecbb795f..d7ebc3b3869 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -122,11 +122,11 @@ def narrow_requirement_selection(
               before other requirements as a resolution can't be found while
               there is a conflict.
         """
-        backtrack_idenifiers = set()
+        backtrack_identifiers = set()
         for info in backtrack_causes:
-            backtrack_idenifiers.add(info.requirement.name)
+            backtrack_identifiers.add(info.requirement.name)
             if info.parent is not None:
-                backtrack_idenifiers.add(info.parent.name)
+                backtrack_identifiers.add(info.parent.name)
 
         current_backtrack_causes = []
         for identifier in identifiers:
@@ -137,7 +137,7 @@ def narrow_requirement_selection(
                 return [identifier]
 
             # Check if this identifier is a backtrack cause
-            if identifier in backtrack_idenifiers:
+            if identifier in backtrack_identifiers:
                 current_backtrack_causes.append(identifier)
                 continue
 

From 6727e652291be6bc2a2c39c4fb7bf0ab626493a2 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 1 Mar 2025 15:30:25 -0500
Subject: [PATCH 762/992] Fix tests from merge

---
 tests/unit/resolution_resolvelib/test_provider.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index 054566ed383..690217e85ce 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -42,7 +42,7 @@ def build_req_info(
             {"pinned-package": [build_req_info("pinned-package==1.0")]},
             [],
             {},
-            (True, False, False, True, math.inf, False, "pinned-package"),
+            (False, False, math.inf, False, "pinned-package"),
         ),
         # Star-specified package, i.e. with "*"
         (
@@ -50,7 +50,7 @@ def build_req_info(
             {"star-specified-package": [build_req_info("star-specified-package==1.*")]},
             [],
             {},
-            (True, False, True, True, math.inf, False, "star-specified-package"),
+            (False, True, math.inf, False, "star-specified-package"),
         ),
         # Package that caused backtracking
         (
@@ -58,7 +58,7 @@ def build_req_info(
             {"backtrack-package": [build_req_info("backtrack-package")]},
             [build_req_info("backtrack-package")],
             {},
-            (True, False, True, False, math.inf, True, "backtrack-package"),
+            (False, True, math.inf, True, "backtrack-package"),
         ),
         # Root package requested by user
         (

From eb949e2d15d705862ac927432ebe292efbeb87a1 Mon Sep 17 00:00:00 2001
From: developer 
Date: Sun, 2 Mar 2025 10:05:07 +0300
Subject: [PATCH 763/992] fix: linter remarks

---
 docs/html/cli/pip_download.rst | 13 +++++++------
 news/6369.doc.rst              |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/html/cli/pip_download.rst b/docs/html/cli/pip_download.rst
index 129df492b97..666d2afab93 100644
--- a/docs/html/cli/pip_download.rst
+++ b/docs/html/cli/pip_download.rst
@@ -48,14 +48,15 @@ available as binaries, you can build them manually for your target platform
 and let pip download know where to find them using ``--find-links``.
 
 .. note::
-To determine the appropriate values for ``--python-version`` and ``--platform``, you can query the target system using the following commands:
 
-- For the Python version, use :func:`sysconfig.get_python_version() `.
-- For the platform, use :func:`sysconfig.get_platform() `.
+   To determine the appropriate values for ``--python-version`` and ``--platform``, you can query the target system using the following commands:
 
-Refer to the official Python documentation for more details:
-- `sysconfig.get_python_version() `_
-- `sysconfig.get_platform() `_
+   - For the Python version, use :func:`sysconfig.get_python_version() `.
+   - For the platform, use :func:`sysconfig.get_platform() `.
+
+   Refer to the official Python documentation for more details:
+   - `sysconfig.get_python_version() `_
+   - `sysconfig.get_platform() `_
 
 Options
 =======
diff --git a/news/6369.doc.rst b/news/6369.doc.rst
index e85d3763620..00742e20ff5 100644
--- a/news/6369.doc.rst
+++ b/news/6369.doc.rst
@@ -1 +1 @@
-Provided information about the --platform and --python-version options of the ``pip download`` command
\ No newline at end of file
+Provided information about the --platform and --python-version options of the ``pip download`` command

From 29cd0c4eb72458c946ca5d681a3a3a74a015a0d9 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 4 Mar 2025 16:24:34 -0500
Subject: [PATCH 764/992] pre-commit autoupdate (#13258)

Ruff v0.9.5 -> v0.9.9

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 769373ae8a4..30b55ef5e9f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.5
+  rev: v0.9.9
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]

From 459249ef4e9066a6fd60bf3877b4eb9cc6067f86 Mon Sep 17 00:00:00 2001
From: iTrooz 
Date: Wed, 5 Mar 2025 22:58:24 +0100
Subject: [PATCH 765/992] Disable Git/SSH prompts when --no-input is given
 (#13228)

---
 news/12718.bugfix.rst                   |  1 +
 src/pip/_internal/vcs/git.py            | 11 +++++++++-
 tests/functional/test_install_config.py | 28 +++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 news/12718.bugfix.rst

diff --git a/news/12718.bugfix.rst b/news/12718.bugfix.rst
new file mode 100644
index 00000000000..fccfde4ad40
--- /dev/null
+++ b/news/12718.bugfix.rst
@@ -0,0 +1 @@
+Disable Git and SSH prompts when ``--no-input`` is passed.
diff --git a/src/pip/_internal/vcs/git.py b/src/pip/_internal/vcs/git.py
index 0425debb3ae..9c926e969f1 100644
--- a/src/pip/_internal/vcs/git.py
+++ b/src/pip/_internal/vcs/git.py
@@ -5,7 +5,7 @@
 import urllib.parse
 import urllib.request
 from dataclasses import replace
-from typing import List, Optional, Tuple
+from typing import Any, List, Optional, Tuple
 
 from pip._internal.exceptions import BadCommand, InstallationError
 from pip._internal.utils.misc import HiddenText, display_path, hide_url
@@ -77,6 +77,15 @@ class Git(VersionControl):
     def get_base_rev_args(rev: str) -> List[str]:
         return [rev]
 
+    @classmethod
+    def run_command(cls, *args: Any, **kwargs: Any) -> str:
+        if os.environ.get("PIP_NO_INPUT"):
+            extra_environ = kwargs.get("extra_environ", {})
+            extra_environ["GIT_TERMINAL_PROMPT"] = "0"
+            extra_environ["GIT_SSH_COMMAND"] = "ssh -oBatchMode=yes"
+            kwargs["extra_environ"] = extra_environ
+        return super().run_command(*args, **kwargs)
+
     def is_immutable_rev_checkout(self, url: str, dest: str) -> bool:
         _, rev_options = self.get_url_rev_options(hide_url(url))
         if not rev_options.rev:
diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py
index d111bc5f7bc..b8fa56bffc9 100644
--- a/tests/functional/test_install_config.py
+++ b/tests/functional/test_install_config.py
@@ -341,6 +341,34 @@ def test_do_not_prompt_for_authentication(
     assert "ERROR: HTTP error 401" in result.stderr
 
 
+def test_do_not_prompt_for_authentication_git(
+    script: PipTestEnvironment, data: TestData, cert_factory: CertFactory
+) -> None:
+    """Test behaviour if --no-input option is given while installing
+    from a git http url requiring authentication
+    """
+    server = make_mock_server()
+    # Disable vscode user/password prompt, will make tests fail inside vscode
+    script.environ["GIT_ASKPASS"] = ""
+
+    # Return 401 on all URLs
+    server.mock.side_effect = lambda _, __: authorization_response(
+        data.packages / "simple-3.0.tar.gz"
+    )
+
+    url = f"git+http://{server.host}:{server.port}/simple"
+
+    with server_running(server):
+        result = script.pip(
+            "install",
+            url,
+            "--no-input",
+            expect_error=True,
+        )
+
+    assert "terminal prompts disabled" in result.stderr
+
+
 @pytest.fixture(params=(True, False), ids=("interactive", "noninteractive"))
 def interactive(request: pytest.FixtureRequest) -> bool:
     return request.param

From a276c781c425d688efb3e9651ab7bbc5e9d34663 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Thu, 6 Mar 2025 10:31:01 -0500
Subject: [PATCH 766/992] Fix direct preference in `PipProvider.get_preference`

---
 src/pip/_internal/resolution/resolvelib/provider.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index 40326001eaa..d27587c79ce 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -16,6 +16,7 @@
 from .base import Candidate, Constraint, Requirement
 from .candidates import REQUIRES_PYTHON_IDENTIFIER
 from .factory import Factory
+from .requirements import ExplicitRequirement
 
 if TYPE_CHECKING:
     from pip._vendor.resolvelib.providers import Preference
@@ -138,9 +139,9 @@ def get_preference(
 
         if has_information:
             lookups = (r.get_candidate_lookup() for r, _ in information[identifier])
-            candidate, ireqs = zip(*lookups)
+            _icandidates, ireqs = zip(*lookups)
         else:
-            candidate, ireqs = None, ()
+            _icandidates, ireqs = (), ()
 
         operators: list[tuple[str, str]] = [
             (specifier.operator, specifier.version)
@@ -148,7 +149,9 @@ def get_preference(
             for specifier in specifier_set
         ]
 
-        direct = candidate is not None
+        direct = any(
+            isinstance(r, ExplicitRequirement) for r, _ in information[identifier]
+        )
         pinned = any(((op[:2] == "==") and ("*" not in ver)) for op, ver in operators)
         unfree = bool(operators)
         requested_order = self._user_requested.get(identifier, math.inf)

From f4a5ac17bf0717d3f584e8de0d333080fa334494 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Thu, 6 Mar 2025 10:31:26 -0500
Subject: [PATCH 767/992] Add new explicit requirement test

---
 .../resolution_resolvelib/test_provider.py    | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index d37076a9356..c94c0da279b 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -10,7 +10,10 @@
 from pip._internal.resolution.resolvelib.candidates import REQUIRES_PYTHON_IDENTIFIER
 from pip._internal.resolution.resolvelib.factory import Factory
 from pip._internal.resolution.resolvelib.provider import PipProvider
-from pip._internal.resolution.resolvelib.requirements import SpecifierRequirement
+from pip._internal.resolution.resolvelib.requirements import (
+    ExplicitRequirement,
+    SpecifierRequirement,
+)
 
 if TYPE_CHECKING:
     from pip._vendor.resolvelib.providers import Preference
@@ -20,6 +23,12 @@
     PreferenceInformation = RequirementInformation[Requirement, Candidate]
 
 
+class FakeCandidate(Candidate):
+    """A minimal fake candidate for testing purposes."""
+
+    def __init__(self, *args: object, **kwargs: object) -> None: ...
+
+
 def build_req_info(
     name: str, parent: Optional[Candidate] = None
 ) -> "PreferenceInformation":
@@ -33,6 +42,14 @@ def build_req_info(
     return requirement_information
 
 
+def build_explicit_req_info(
+    url: str, parent: Optional[Candidate] = None
+) -> "PreferenceInformation":
+    """Build a direct requirement using a minimal FakeCandidate."""
+    direct_requirement = ExplicitRequirement(FakeCandidate(url))
+    return RequirementInformation(requirement=direct_requirement, parent=parent)
+
+
 @pytest.mark.parametrize(
     "identifier, information, backtrack_causes, user_requested, expected",
     [
@@ -42,7 +59,7 @@ def build_req_info(
             {REQUIRES_PYTHON_IDENTIFIER: [build_req_info("python")]},
             [],
             {},
-            (False, False, True, True, math.inf, True, REQUIRES_PYTHON_IDENTIFIER),
+            (False, True, True, True, math.inf, True, REQUIRES_PYTHON_IDENTIFIER),
         ),
         # Pinned package with "=="
         (
@@ -50,7 +67,7 @@ def build_req_info(
             {"pinned-package": [build_req_info("pinned-package==1.0")]},
             [],
             {},
-            (True, False, False, True, math.inf, False, "pinned-package"),
+            (True, True, False, True, math.inf, False, "pinned-package"),
         ),
         # Star-specified package, i.e. with "*"
         (
@@ -58,7 +75,7 @@ def build_req_info(
             {"star-specified-package": [build_req_info("star-specified-package==1.*")]},
             [],
             {},
-            (True, False, True, True, math.inf, False, "star-specified-package"),
+            (True, True, True, True, math.inf, False, "star-specified-package"),
         ),
         # Package that caused backtracking
         (
@@ -66,7 +83,7 @@ def build_req_info(
             {"backtrack-package": [build_req_info("backtrack-package")]},
             [build_req_info("backtrack-package")],
             {},
-            (True, False, True, False, math.inf, True, "backtrack-package"),
+            (True, True, True, False, math.inf, True, "backtrack-package"),
         ),
         # Root package requested by user
         (
@@ -74,7 +91,7 @@ def build_req_info(
             {"root-package": [build_req_info("root-package")]},
             [],
             {"root-package": 1},
-            (True, False, True, True, 1, True, "root-package"),
+            (True, True, True, True, 1, True, "root-package"),
         ),
         # Unfree package (with specifier operator)
         (
@@ -82,7 +99,7 @@ def build_req_info(
             {"unfree-package": [build_req_info("unfree-package<1")]},
             [],
             {},
-            (True, False, True, True, math.inf, False, "unfree-package"),
+            (True, True, True, True, math.inf, False, "unfree-package"),
         ),
         # Free package (no operator)
         (
@@ -90,7 +107,15 @@ def build_req_info(
             {"free-package": [build_req_info("free-package")]},
             [],
             {},
-            (True, False, True, True, math.inf, True, "free-package"),
+            (True, True, True, True, math.inf, True, "free-package"),
+        ),
+        # Test case for "direct" preference (explicit URL)
+        (
+            "direct-package",
+            {"direct-package": [build_explicit_req_info("direct-package")]},
+            [],
+            {},
+            (True, False, True, True, math.inf, True, "direct-package"),
         ),
     ],
 )

From 8284705e459efcee6e4d5e317f115065cf10922e Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Thu, 6 Mar 2025 10:31:32 -0500
Subject: [PATCH 768/992] NEWS ENTRY

---
 news/13244.bugfix.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 news/13244.bugfix.rst

diff --git a/news/13244.bugfix.rst b/news/13244.bugfix.rst
new file mode 100644
index 00000000000..10944cf558a
--- /dev/null
+++ b/news/13244.bugfix.rst
@@ -0,0 +1,2 @@
+While resolving dependencies prefer if any of the known requirements are
+"direct", e.g. points to an explicit URL.

From 6c8311b4dafd5a7b9ab2feff09a5af9c61f7365a Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 6 Mar 2025 16:47:46 -0500
Subject: [PATCH 769/992] Implement PEP 753 normalization for Home-Page
 fallback (#13242)

We treat "homepage" as a well-known project URL, using it to replace
the Home-Page core metadata field if it's undefined. This patch updates
the normalization logic to follow PEP 753.

The logic emitting the raw project URLs was left unchanged as we don't
really care for well-known vs. boring URLs here.
---
 news/13135.feature.rst             |  3 +++
 src/pip/_internal/commands/show.py | 14 +++++++++-----
 tests/functional/test_show.py      |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 news/13135.feature.rst

diff --git a/news/13135.feature.rst b/news/13135.feature.rst
new file mode 100644
index 00000000000..02deaeda58e
--- /dev/null
+++ b/news/13135.feature.rst
@@ -0,0 +1,3 @@
+Use :pep:`753` "Well-known Project URLs in Metadata" normalization rules when
+identifying an equivalent project URL to replace a missing ``Home-Page`` field
+in ``pip show``.
diff --git a/src/pip/_internal/commands/show.py b/src/pip/_internal/commands/show.py
index b47500cf8b4..7aaf6f4b6ca 100644
--- a/src/pip/_internal/commands/show.py
+++ b/src/pip/_internal/commands/show.py
@@ -1,4 +1,5 @@
 import logging
+import string
 from optparse import Values
 from typing import Generator, Iterable, Iterator, List, NamedTuple, Optional
 
@@ -13,6 +14,13 @@
 logger = logging.getLogger(__name__)
 
 
+def normalize_project_url_label(label: str) -> str:
+    # This logic is from PEP 753 (Well-known Project URLs in Metadata).
+    chars_to_remove = string.punctuation + string.whitespace
+    removal_map = str.maketrans("", "", chars_to_remove)
+    return label.translate(removal_map).lower()
+
+
 class ShowCommand(Command):
     """
     Show information about one or more installed packages.
@@ -135,13 +143,9 @@ def _get_requiring_packages(current_dist: BaseDistribution) -> Iterator[str]:
         if not homepage:
             # It's common that there is a "homepage" Project-URL, but Home-page
             # remains unset (especially as PEP 621 doesn't surface the field).
-            #
-            # This logic was taken from PyPI's codebase.
             for url in project_urls:
                 url_label, url = url.split(",", maxsplit=1)
-                normalized_label = (
-                    url_label.casefold().replace("-", "").replace("_", "").strip()
-                )
+                normalized_label = normalize_project_url_label(url_label)
                 if normalized_label == "homepage":
                     homepage = url.strip()
                     break
diff --git a/tests/functional/test_show.py b/tests/functional/test_show.py
index b7caea46ff8..ea831935372 100644
--- a/tests/functional/test_show.py
+++ b/tests/functional/test_show.py
@@ -408,7 +408,8 @@ def test_show_deduplicate_requirements(script: PipTestEnvironment) -> None:
 
 
 @pytest.mark.parametrize(
-    "project_url", ["Home-page", "home-page", "Homepage", "homepage"]
+    "project_url",
+    ["Home-page", "home-page", "Homepage", "homepage", "home_PAGE", "home page"],
 )
 def test_show_populate_homepage_from_project_urls(
     script: PipTestEnvironment, project_url: str

From 443099b71a3ba30da2a3c0d5f05a13203274532e Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 6 Mar 2025 17:00:53 -0500
Subject: [PATCH 770/992] Upgrade CacheControl to 0.14.2

---
 news/CacheControl.vendor.rst                  |  1 +
 src/pip/_vendor/cachecontrol/__init__.py      |  2 +-
 src/pip/_vendor/cachecontrol/adapter.py       | 19 +++++--
 .../_vendor/cachecontrol/caches/file_cache.py | 57 ++++---------------
 src/pip/_vendor/cachecontrol/controller.py    | 13 ++++-
 src/pip/_vendor/vendor.txt                    |  2 +-
 6 files changed, 38 insertions(+), 56 deletions(-)
 create mode 100644 news/CacheControl.vendor.rst

diff --git a/news/CacheControl.vendor.rst b/news/CacheControl.vendor.rst
new file mode 100644
index 00000000000..10a5c64b7aa
--- /dev/null
+++ b/news/CacheControl.vendor.rst
@@ -0,0 +1 @@
+Upgrade CacheControl to 0.14.2
diff --git a/src/pip/_vendor/cachecontrol/__init__.py b/src/pip/_vendor/cachecontrol/__init__.py
index 21916243c56..7be1e04f526 100644
--- a/src/pip/_vendor/cachecontrol/__init__.py
+++ b/src/pip/_vendor/cachecontrol/__init__.py
@@ -9,7 +9,7 @@
 
 __author__ = "Eric Larson"
 __email__ = "eric@ionrock.org"
-__version__ = "0.14.1"
+__version__ = "0.14.2"
 
 from pip._vendor.cachecontrol.adapter import CacheControlAdapter
 from pip._vendor.cachecontrol.controller import CacheController
diff --git a/src/pip/_vendor/cachecontrol/adapter.py b/src/pip/_vendor/cachecontrol/adapter.py
index 34a9eb82798..18084d12fae 100644
--- a/src/pip/_vendor/cachecontrol/adapter.py
+++ b/src/pip/_vendor/cachecontrol/adapter.py
@@ -5,6 +5,7 @@
 
 import functools
 import types
+import weakref
 import zlib
 from typing import TYPE_CHECKING, Any, Collection, Mapping
 
@@ -128,19 +129,25 @@ def build_response(  # type: ignore[override]
                 response._fp = CallbackFileWrapper(  # type: ignore[assignment]
                     response._fp,  # type: ignore[arg-type]
                     functools.partial(
-                        self.controller.cache_response, request, response
+                        self.controller.cache_response, request, weakref.ref(response)
                     ),
                 )
                 if response.chunked:
-                    super_update_chunk_length = response._update_chunk_length
+                    super_update_chunk_length = response.__class__._update_chunk_length
 
-                    def _update_chunk_length(self: HTTPResponse) -> None:
-                        super_update_chunk_length()
+                    def _update_chunk_length(
+                        weak_self: weakref.ReferenceType[HTTPResponse],
+                    ) -> None:
+                        self = weak_self()
+                        if self is None:
+                            return
+
+                        super_update_chunk_length(self)
                         if self.chunk_left == 0:
                             self._fp._close()  # type: ignore[union-attr]
 
-                    response._update_chunk_length = types.MethodType(  # type: ignore[method-assign]
-                        _update_chunk_length, response
+                    response._update_chunk_length = functools.partial(  # type: ignore[method-assign]
+                        _update_chunk_length, weakref.ref(response)
                     )
 
         resp: Response = super().build_response(request, response)
diff --git a/src/pip/_vendor/cachecontrol/caches/file_cache.py b/src/pip/_vendor/cachecontrol/caches/file_cache.py
index 81d2ef46cf8..45c632c7f72 100644
--- a/src/pip/_vendor/cachecontrol/caches/file_cache.py
+++ b/src/pip/_vendor/cachecontrol/caches/file_cache.py
@@ -5,6 +5,7 @@
 
 import hashlib
 import os
+import tempfile
 from textwrap import dedent
 from typing import IO, TYPE_CHECKING
 from pathlib import Path
@@ -18,47 +19,6 @@
     from filelock import BaseFileLock
 
 
-def _secure_open_write(filename: str, fmode: int) -> IO[bytes]:
-    # We only want to write to this file, so open it in write only mode
-    flags = os.O_WRONLY
-
-    # os.O_CREAT | os.O_EXCL will fail if the file already exists, so we only
-    #  will open *new* files.
-    # We specify this because we want to ensure that the mode we pass is the
-    # mode of the file.
-    flags |= os.O_CREAT | os.O_EXCL
-
-    # Do not follow symlinks to prevent someone from making a symlink that
-    # we follow and insecurely open a cache file.
-    if hasattr(os, "O_NOFOLLOW"):
-        flags |= os.O_NOFOLLOW
-
-    # On Windows we'll mark this file as binary
-    if hasattr(os, "O_BINARY"):
-        flags |= os.O_BINARY
-
-    # Before we open our file, we want to delete any existing file that is
-    # there
-    try:
-        os.remove(filename)
-    except OSError:
-        # The file must not exist already, so we can just skip ahead to opening
-        pass
-
-    # Open our file, the use of os.O_CREAT | os.O_EXCL will ensure that if a
-    # race condition happens between the os.remove and this line, that an
-    # error will be raised. Because we utilize a lockfile this should only
-    # happen if someone is attempting to attack us.
-    fd = os.open(filename, flags, fmode)
-    try:
-        return os.fdopen(fd, "wb")
-
-    except:
-        # An error occurred wrapping our FD in a file object
-        os.close(fd)
-        raise
-
-
 class _FileCacheMixin:
     """Shared implementation for both FileCache variants."""
 
@@ -122,15 +82,18 @@ def _write(self, path: str, data: bytes) -> None:
         Safely write the data to the given path.
         """
         # Make sure the directory exists
-        try:
-            os.makedirs(os.path.dirname(path), self.dirmode)
-        except OSError:
-            pass
+        dirname = os.path.dirname(path)
+        os.makedirs(dirname, self.dirmode, exist_ok=True)
 
         with self.lock_class(path + ".lock"):
             # Write our actual file
-            with _secure_open_write(path, self.filemode) as fh:
-                fh.write(data)
+            (fd, name) = tempfile.mkstemp(dir=dirname)
+            try:
+                os.write(fd, data)
+            finally:
+                os.close(fd)
+            os.chmod(name, self.filemode)
+            os.replace(name, path)
 
     def _delete(self, key: str, suffix: str) -> None:
         name = self._fn(key) + suffix
diff --git a/src/pip/_vendor/cachecontrol/controller.py b/src/pip/_vendor/cachecontrol/controller.py
index f0ff6e1bedc..d92d991c001 100644
--- a/src/pip/_vendor/cachecontrol/controller.py
+++ b/src/pip/_vendor/cachecontrol/controller.py
@@ -12,6 +12,7 @@
 import logging
 import re
 import time
+import weakref
 from email.utils import parsedate_tz
 from typing import TYPE_CHECKING, Collection, Mapping
 
@@ -323,7 +324,7 @@ def _cache_set(
     def cache_response(
         self,
         request: PreparedRequest,
-        response: HTTPResponse,
+        response_or_ref: HTTPResponse | weakref.ReferenceType[HTTPResponse],
         body: bytes | None = None,
         status_codes: Collection[int] | None = None,
     ) -> None:
@@ -332,6 +333,16 @@ def cache_response(
 
         This assumes a requests Response object.
         """
+        if isinstance(response_or_ref, weakref.ReferenceType):
+            response = response_or_ref()
+            if response is None:
+                # The weakref can be None only in case the user used streamed request
+                # and did not consume or close it, and holds no reference to requests.Response.
+                # In such case, we don't want to cache the response.
+                return
+        else:
+            response = response_or_ref
+
         # From httplib2: Don't cache 206's since we aren't going to
         #                handle byte range requests
         cacheable_status_codes = status_codes or self.cacheable_status_codes
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index c9db74290db..3dfbbb2a946 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -1,4 +1,4 @@
-CacheControl==0.14.1
+CacheControl==0.14.2
 distlib==0.3.9
 distro==1.9.0
 msgpack==1.1.0

From dd1570672f13c56d8e3b79669eccab762f397804 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 6 Mar 2025 17:01:18 -0500
Subject: [PATCH 771/992] Upgrade certifi to 2025.1.31

---
 news/certifi.vendor.rst             |   1 +
 src/pip/_vendor/certifi/__init__.py |   2 +-
 src/pip/_vendor/certifi/cacert.pem  | 276 ++++++++++++----------------
 src/pip/_vendor/vendor.txt          |   2 +-
 4 files changed, 125 insertions(+), 156 deletions(-)
 create mode 100644 news/certifi.vendor.rst

diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
new file mode 100644
index 00000000000..d872593d4b8
--- /dev/null
+++ b/news/certifi.vendor.rst
@@ -0,0 +1 @@
+Upgrade certifi to 2025.1.31
diff --git a/src/pip/_vendor/certifi/__init__.py b/src/pip/_vendor/certifi/__init__.py
index f61d77fa382..177082e0fb1 100644
--- a/src/pip/_vendor/certifi/__init__.py
+++ b/src/pip/_vendor/certifi/__init__.py
@@ -1,4 +1,4 @@
 from .core import contents, where
 
 __all__ = ["contents", "where"]
-__version__ = "2024.08.30"
+__version__ = "2025.01.31"
diff --git a/src/pip/_vendor/certifi/cacert.pem b/src/pip/_vendor/certifi/cacert.pem
index 3c165a1b85e..860f259bd7e 100644
--- a/src/pip/_vendor/certifi/cacert.pem
+++ b/src/pip/_vendor/certifi/cacert.pem
@@ -474,47 +474,6 @@ ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
 Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
 -----END CERTIFICATE-----
 
-# Issuer: CN=SwissSign Silver CA - G2 O=SwissSign AG
-# Subject: CN=SwissSign Silver CA - G2 O=SwissSign AG
-# Label: "SwissSign Silver CA - G2"
-# Serial: 5700383053117599563
-# MD5 Fingerprint: e0:06:a1:c9:7d:cf:c9:fc:0d:c0:56:75:96:d8:62:13
-# SHA1 Fingerprint: 9b:aa:e5:9f:56:ee:21:cb:43:5a:be:25:93:df:a7:f0:40:d1:1d:cb
-# SHA256 Fingerprint: be:6c:4d:a2:bb:b9:ba:59:b6:f3:93:97:68:37:42:46:c3:c0:05:99:3f:a9:8f:02:0d:1d:ed:be:d4:8a:81:d5
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
-IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
-RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
-U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
-Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
-YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
-nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
-6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
-eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
-c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
-MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
-HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
-jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
-5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
-rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
-F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
-wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
-AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
-WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
-xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
-2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
-IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
-aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
-em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
-dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
-OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
-hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
-tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
 # Issuer: CN=SecureTrust CA O=SecureTrust Corporation
 # Subject: CN=SecureTrust CA O=SecureTrust Corporation
 # Label: "SecureTrust CA"
@@ -763,35 +722,6 @@ uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
 XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
 -----END CERTIFICATE-----
 
-# Issuer: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
-# Subject: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
-# Label: "SecureSign RootCA11"
-# Serial: 1
-# MD5 Fingerprint: b7:52:74:e2:92:b4:80:93:f2:75:e4:cc:d7:f2:ea:26
-# SHA1 Fingerprint: 3b:c4:9f:48:f8:f3:73:a0:9c:1e:bd:f8:5b:b1:c3:65:c7:d8:11:b3
-# SHA256 Fingerprint: bf:0f:ee:fb:9e:3a:58:1a:d5:f9:e9:db:75:89:98:57:43:d2:61:08:5c:4d:31:4f:6f:5d:72:59:aa:42:16:12
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
-MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
-A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
-MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
-Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
-QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
-i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
-h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
-MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
-UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
-8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
-h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
-KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
-X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
-QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
-pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
-QSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
 # Issuer: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
 # Subject: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
 # Label: "Microsec e-Szigno Root CA 2009"
@@ -3100,50 +3030,6 @@ LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG
 mpv0
 -----END CERTIFICATE-----
 
-# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only
-# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only
-# Label: "Entrust Root Certification Authority - G4"
-# Serial: 289383649854506086828220374796556676440
-# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88
-# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01
-# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw
-gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL
-Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg
-MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw
-BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0
-MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1
-c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ
-bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ
-2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E
-T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j
-5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM
-C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T
-DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX
-wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A
-2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm
-nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
-dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl
-N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj
-c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS
-5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS
-Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr
-hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/
-B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI
-AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw
-H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+
-b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk
-2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol
-IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk
-5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY
-n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw==
------END CERTIFICATE-----
-
 # Issuer: CN=Microsoft ECC Root Certificate Authority 2017 O=Microsoft Corporation
 # Subject: CN=Microsoft ECC Root Certificate Authority 2017 O=Microsoft Corporation
 # Label: "Microsoft ECC Root Certificate Authority 2017"
@@ -3485,6 +3371,46 @@ DgQWBBQxCpCPtsad0kRLgLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ
 +RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+CAezNIm8BZ/3Hobui3A=
 -----END CERTIFICATE-----
 
+# Issuer: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
+# Subject: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
+# Label: "GLOBALTRUST 2020"
+# Serial: 109160994242082918454945253
+# MD5 Fingerprint: 8a:c7:6f:cb:6d:e3:cc:a2:f1:7c:83:fa:0e:78:d7:e8
+# SHA1 Fingerprint: d0:67:c1:13:51:01:0c:aa:d0:c7:6a:65:37:31:16:26:4f:53:71:a2
+# SHA256 Fingerprint: 9a:29:6a:51:82:d1:d4:51:a2:e3:7f:43:9b:74:da:af:a2:67:52:33:29:f9:0f:9a:0d:20:07:c3:34:e2:3c:9a
+-----BEGIN CERTIFICATE-----
+MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkG
+A1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkw
+FwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYx
+MDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9u
+aXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWiD59b
+RatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9Z
+YybNpyrOVPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3
+QWPKzv9pj2gOlTblzLmMCcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPw
+yJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCmfecqQjuCgGOlYx8ZzHyyZqjC0203b+J+
+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKAA1GqtH6qRNdDYfOiaxaJ
+SaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9ORJitHHmkH
+r96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj0
+4KlGDfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9Me
+dKZssCz3AwyIDMvUclOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIw
+q7ejMZdnrY8XD2zHc+0klGvIg5rQmjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2
+nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1UdIwQYMBaAFNwu
+H9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
+VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJC
+XtzoRlgHNQIw4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd
+6IwPS3BD0IL/qMy/pJTAvoe9iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf
++I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS8cE54+X1+NZK3TTN+2/BT+MAi1bi
+kvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2HcqtbepBEX4tdJP7
+wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxSvTOB
+TI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6C
+MUO+1918oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn
+4rnvyOL2NSl6dPrFf4IFYqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+I
+aFvowdlxfv1k7/9nR4hYJS8+hge9+6jlgqispdNpQ80xiEmEU5LAsTkbOYMBMMTy
+qfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
+-----END CERTIFICATE-----
+
 # Issuer: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
 # Subject: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
 # Label: "ANF Secure Server Root CA"
@@ -4214,46 +4140,6 @@ ut6Dacpps6kFtZaSF4fC0urQe87YQVt8rgIwRt7qy12a7DLCZRawTDBcMPPaTnOG
 BtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
 -----END CERTIFICATE-----
 
-# Issuer: CN=Security Communication RootCA3 O=SECOM Trust Systems CO.,LTD.
-# Subject: CN=Security Communication RootCA3 O=SECOM Trust Systems CO.,LTD.
-# Label: "Security Communication RootCA3"
-# Serial: 16247922307909811815
-# MD5 Fingerprint: 1c:9a:16:ff:9e:5c:e0:4d:8a:14:01:f4:35:5d:29:26
-# SHA1 Fingerprint: c3:03:c8:22:74:92:e5:61:a2:9c:5f:79:91:2b:1e:44:13:91:30:3a
-# SHA256 Fingerprint: 24:a5:5c:2a:b0:51:44:2d:06:17:76:65:41:23:9a:4a:d0:32:d7:c5:51:75:aa:34:ff:de:2f:bc:4f:5c:52:94
------BEGIN CERTIFICATE-----
-MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScw
-JQYDVQQDEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2
-MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UEAxMeU2VjdXJpdHkg
-Q29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4r
-CmDvu20rhvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzA
-lrenfna84xtSGc4RHwsENPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MG
-TfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF7
-9+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGmnpjKIG58u4iFW/vAEGK7
-8vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtYXLVqAvO4
-g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3we
-GVPKp7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst
-+3A7caoreyYn8xrC3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M
-0V9hvqG8OmpI6iZVIhZdXw3/JzOfGAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQ
-T9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0VcwCBEF/VfR2ccCAwEAAaNCMEAw
-HQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
-YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PA
-FNr0Y/Dq9HHuTofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd
-9XbXv8S2gVj/yP9kaWJ5rW4OH3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQI
-UYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASxYfQAW0q3nHE3GYV5v4GwxxMOdnE+
-OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZXSEIx2C/pHF7uNke
-gr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml+LLf
-iAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUV
-nuiZIesnKwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD
-2NCcnWXL0CsnMQMeNuE9dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//
-1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm6Vwdp6POXiUyK+OVrCoHzrQoeIY8Laad
-TdJ0MN1kURXbg4NR16/9M51NZg==
------END CERTIFICATE-----
-
 # Issuer: CN=Security Communication ECC RootCA1 O=SECOM Trust Systems CO.,LTD.
 # Subject: CN=Security Communication ECC RootCA1 O=SECOM Trust Systems CO.,LTD.
 # Label: "Security Communication ECC RootCA1"
@@ -4927,3 +4813,85 @@ Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTrQciu/NWeUUj1vYv0hyCTQSvT
 4P9mLQlO4E/0BdGF9jVg3PVys0Z9AjBEmEYagoUeYWmJSwdLZrWeqrqgHkHZAXQ6
 bkU6iYAZezKYVWOr62Nuk22rGwlgMU4=
 -----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST BR Root CA 2 2023 O=D-Trust GmbH
+# Subject: CN=D-TRUST BR Root CA 2 2023 O=D-Trust GmbH
+# Label: "D-TRUST BR Root CA 2 2023"
+# Serial: 153168538924886464690566649552453098598
+# MD5 Fingerprint: e1:09:ed:d3:60:d4:56:1b:47:1f:b7:0c:5f:1b:5f:85
+# SHA1 Fingerprint: 2d:b0:70:ee:71:94:af:69:68:17:db:79:ce:58:9f:a0:6b:96:f7:87
+# SHA256 Fingerprint: 05:52:e6:f8:3f:df:65:e8:fa:96:70:e6:66:df:28:a4:e2:13:40:b5:10:cb:e5:25:66:f9:7c:4f:b9:4b:2b:d1
+-----BEGIN CERTIFICATE-----
+MIIFqTCCA5GgAwIBAgIQczswBEhb2U14LnNLyaHcZjANBgkqhkiG9w0BAQ0FADBI
+MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlE
+LVRSVVNUIEJSIFJvb3QgQ0EgMiAyMDIzMB4XDTIzMDUwOTA4NTYzMVoXDTM4MDUw
+OTA4NTYzMFowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEi
+MCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDIgMjAyMzCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAK7/CVmRgApKaOYkP7in5Mg6CjoWzckjYaCTcfKr
+i3OPoGdlYNJUa2NRb0kz4HIHE304zQaSBylSa053bATTlfrdTIzZXcFhfUvnKLNE
+gXtRr90zsWh81k5M/itoucpmacTsXld/9w3HnDY25QdgrMBM6ghs7wZ8T1soegj8
+k12b9py0i4a6Ibn08OhZWiihNIQaJZG2tY/vsvmA+vk9PBFy2OMvhnbFeSzBqZCT
+Rphny4NqoFAjpzv2gTng7fC5v2Xx2Mt6++9zA84A9H3X4F07ZrjcjrqDy4d2A/wl
+2ecjbwb9Z/Pg/4S8R7+1FhhGaRTMBffb00msa8yr5LULQyReS2tNZ9/WtT5PeB+U
+cSTq3nD88ZP+npNa5JRal1QMNXtfbO4AHyTsA7oC9Xb0n9Sa7YUsOCIvx9gvdhFP
+/Wxc6PWOJ4d/GUohR5AdeY0cW/jPSoXk7bNbjb7EZChdQcRurDhaTyN0dKkSw/bS
+uREVMweR2Ds3OmMwBtHFIjYoYiMQ4EbMl6zWK11kJNXuHA7e+whadSr2Y23OC0K+
+0bpwHJwh5Q8xaRfX/Aq03u2AnMuStIv13lmiWAmlY0cL4UEyNEHZmrHZqLAbWt4N
+DfTisl01gLmB1IRpkQLLddCNxbU9CZEJjxShFHR5PtbJFR2kWVki3PaKRT08EtY+
+XTIvAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUZ5Dw1t61
+GNVGKX5cq/ieCLxklRAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRCMEAwPqA8oDqG
+OGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfYnJfcm9vdF9jYV8y
+XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQA097N3U9swFrktpSHxQCF16+tI
+FoE9c+CeJyrrd6kTpGoKWloUMz1oH4Guaf2Mn2VsNELZLdB/eBaxOqwjMa1ef67n
+riv6uvw8l5VAk1/DLQOj7aRvU9f6QA4w9QAgLABMjDu0ox+2v5Eyq6+SmNMW5tTR
+VFxDWy6u71cqqLRvpO8NVhTaIasgdp4D/Ca4nj8+AybmTNudX0KEPUUDAxxZiMrc
+LmEkWqTqJwtzEr5SswrPMhfiHocaFpVIbVrg0M8JkiZmkdijYQ6qgYF/6FKC0ULn
+4B0Y+qSFNueG4A3rvNTJ1jxD8V1Jbn6Bm2m1iWKPiFLY1/4nwSPFyysCu7Ff/vtD
+hQNGvl3GyiEm/9cCnnRK3PgTFbGBVzbLZVzRHTF36SXDw7IyN9XxmAnkbWOACKsG
+koHU6XCPpz+y7YaMgmo1yEJagtFSGkUPFaUA8JR7ZSdXOUPPfH/mvTWze/EZTN46
+ls/pdu4D58JDUjxqgejBWoC9EV2Ta/vH5mQ/u2kc6d0li690yVRAysuTEwrt+2aS
+Ecr1wPrYg1UDfNPFIkZ1cGt5SAYqgpq/5usWDiJFAbzdNpQ0qTUmiteXue4Icr80
+knCDgKs4qllo3UCkGJCy89UDyibK79XH4I9TjvAA46jtn/mtd+ArY0+ew+43u3gJ
+hJ65bvspmZDogNOfJA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST EV Root CA 2 2023 O=D-Trust GmbH
+# Subject: CN=D-TRUST EV Root CA 2 2023 O=D-Trust GmbH
+# Label: "D-TRUST EV Root CA 2 2023"
+# Serial: 139766439402180512324132425437959641711
+# MD5 Fingerprint: 96:b4:78:09:f0:09:cb:77:eb:bb:1b:4d:6f:36:bc:b6
+# SHA1 Fingerprint: a5:5b:d8:47:6c:8f:19:f7:4c:f4:6d:6b:b6:c2:79:82:22:df:54:8b
+# SHA256 Fingerprint: 8e:82:21:b2:e7:d4:00:78:36:a1:67:2f:0d:cc:29:9c:33:bc:07:d3:16:f1:32:fa:1a:20:6d:58:71:50:f1:ce
+-----BEGIN CERTIFICATE-----
+MIIFqTCCA5GgAwIBAgIQaSYJfoBLTKCnjHhiU19abzANBgkqhkiG9w0BAQ0FADBI
+MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlE
+LVRSVVNUIEVWIFJvb3QgQ0EgMiAyMDIzMB4XDTIzMDUwOTA5MTAzM1oXDTM4MDUw
+OTA5MTAzMlowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEi
+MCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDIgMjAyMzCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBANiOo4mAC7JXUtypU0w3uX9jFxPvp1sjW2l1sJkK
+F8GLxNuo4MwxusLyzV3pt/gdr2rElYfXR8mV2IIEUD2BCP/kPbOx1sWy/YgJ25yE
+7CUXFId/MHibaljJtnMoPDT3mfd/06b4HEV8rSyMlD/YZxBTfiLNTiVR8CUkNRFe
+EMbsh2aJgWi6zCudR3Mfvc2RpHJqnKIbGKBv7FD0fUDCqDDPvXPIEysQEx6Lmqg6
+lHPTGGkKSv/BAQP/eX+1SH977ugpbzZMlWGG2Pmic4ruri+W7mjNPU0oQvlFKzIb
+RlUWaqZLKfm7lVa/Rh3sHZMdwGWyH6FDrlaeoLGPaxK3YG14C8qKXO0elg6DpkiV
+jTujIcSuWMYAsoS0I6SWhjW42J7YrDRJmGOVxcttSEfi8i4YHtAxq9107PncjLgc
+jmgjutDzUNzPZY9zOjLHfP7KgiJPvo5iR2blzYfi6NUPGJ/lBHJLRjwQ8kTCZFZx
+TnXonMkmdMV9WdEKWw9t/p51HBjGGjp82A0EzM23RWV6sY+4roRIPrN6TagD4uJ+
+ARZZaBhDM7DS3LAaQzXupdqpRlyuhoFBAUp0JuyfBr/CBTdkdXgpaP3F9ev+R/nk
+hbDhezGdpn9yo7nELC7MmVcOIQxFAZRl62UJxmMiCzNJkkg8/M3OsD6Onov4/knF
+NXJHAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqvyREBuH
+kV8Wub9PS5FeAByxMoAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRCMEAwPqA8oDqG
+OGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfZXZfcm9vdF9jYV8y
+XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQCTy6UfmRHsmg1fLBWTxj++EI14
+QvBukEdHjqOSMo1wj/Zbjb6JzkcBahsgIIlbyIIQbODnmaprxiqgYzWRaoUlrRc4
+pZt+UPJ26oUFKidBK7GB0aL2QHWpDsvxVUjY7NHss+jOFKE17MJeNRqrphYBBo7q
+3C+jisosketSjl8MmxfPy3MHGcRqwnNU73xDUmPBEcrCRbH0O1P1aa4846XerOhU
+t7KR/aypH/KH5BfGSah82ApB9PI+53c0BFLd6IHyTS9URZ0V4U/M5d40VxDJI3IX
+cI1QcB9WbMy5/zpaT2N6w25lBx2Eof+pDGOJbbJAiDnXH3dotfyc1dZnaVuodNv8
+ifYbMvekJKZ2t0dT741Jj6m2g1qllpBFYfXeA08mD6iL8AOWsKwV0HFaanuU5nCT
+2vFp4LJiTZ6P/4mdm13NRemUAiKN4DV/6PEEeXFsVIP4M7kFMhtYVRFP0OUnR3Hs
+7dpn1mKmS00PaaLJvOwiS5THaJQXfuKOKD62xur1NGyfN4gHONuGcfrNlUhDbqNP
+gofXNJhuS5N5YHVpD/Aa1VP6IQzCP+k/HxiMkl14p3ZnGbuy6n/pcAlWVqOwDAst
+Nl7F6cTVg8uGF5csbBNvh1qvSaYd2804BC5f4ko1Di1L+KIkBI3Y4WNeApI02phh
+XBxvWHZks/wCuPWdCg==
+-----END CERTIFICATE-----
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 3dfbbb2a946..040a41f8d0e 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -6,7 +6,7 @@ packaging==24.2
 platformdirs==4.3.6
 pyproject-hooks==1.2.0
 requests==2.32.3
-    certifi==2024.8.30
+    certifi==2025.1.31
     idna==3.10
     urllib3==1.26.20
 rich==13.9.4

From 740069b05be293824d9898a5dec5fef4e456bcb3 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 6 Mar 2025 17:01:25 -0500
Subject: [PATCH 772/992] Upgrade pygments to 2.19.1

---
 news/pygments.vendor.rst                      |  1 +
 src/pip/_vendor/pygments/__init__.py          |  4 +-
 src/pip/_vendor/pygments/__main__.py          |  2 +-
 src/pip/_vendor/pygments/cmdline.py           |  2 +-
 src/pip/_vendor/pygments/console.py           |  2 +-
 src/pip/_vendor/pygments/filter.py            |  2 +-
 src/pip/_vendor/pygments/filters/__init__.py  |  2 +-
 src/pip/_vendor/pygments/formatter.py         |  2 +-
 .../_vendor/pygments/formatters/__init__.py   |  2 +-
 .../_vendor/pygments/formatters/_mapping.py   |  0
 src/pip/_vendor/pygments/formatters/bbcode.py |  2 +-
 src/pip/_vendor/pygments/formatters/groff.py  |  2 +-
 src/pip/_vendor/pygments/formatters/html.py   | 16 ++++--
 src/pip/_vendor/pygments/formatters/img.py    |  5 +-
 src/pip/_vendor/pygments/formatters/irc.py    |  2 +-
 src/pip/_vendor/pygments/formatters/latex.py  |  2 +-
 src/pip/_vendor/pygments/formatters/other.py  |  2 +-
 .../pygments/formatters/pangomarkup.py        |  2 +-
 src/pip/_vendor/pygments/formatters/rtf.py    |  2 +-
 src/pip/_vendor/pygments/formatters/svg.py    |  2 +-
 .../_vendor/pygments/formatters/terminal.py   |  2 +-
 .../pygments/formatters/terminal256.py        |  2 +-
 src/pip/_vendor/pygments/lexer.py             |  2 +-
 src/pip/_vendor/pygments/lexers/__init__.py   |  2 +-
 src/pip/_vendor/pygments/lexers/_mapping.py   | 19 +++++--
 src/pip/_vendor/pygments/lexers/python.py     | 51 ++++++++++---------
 src/pip/_vendor/pygments/modeline.py          |  2 +-
 src/pip/_vendor/pygments/plugin.py            |  2 +-
 src/pip/_vendor/pygments/regexopt.py          |  2 +-
 src/pip/_vendor/pygments/scanner.py           |  2 +-
 src/pip/_vendor/pygments/sphinxext.py         |  2 +-
 src/pip/_vendor/pygments/style.py             |  2 +-
 src/pip/_vendor/pygments/styles/__init__.py   |  2 +-
 src/pip/_vendor/pygments/token.py             |  2 +-
 src/pip/_vendor/pygments/unistring.py         |  2 +-
 src/pip/_vendor/pygments/util.py              |  2 +-
 src/pip/_vendor/vendor.txt                    |  2 +-
 37 files changed, 91 insertions(+), 65 deletions(-)
 create mode 100644 news/pygments.vendor.rst
 mode change 100755 => 100644 src/pip/_vendor/pygments/formatters/_mapping.py

diff --git a/news/pygments.vendor.rst b/news/pygments.vendor.rst
new file mode 100644
index 00000000000..3c4f59ee8b6
--- /dev/null
+++ b/news/pygments.vendor.rst
@@ -0,0 +1 @@
+Upgrade pygments to 2.19.1
diff --git a/src/pip/_vendor/pygments/__init__.py b/src/pip/_vendor/pygments/__init__.py
index 60ae9bb8508..38e059a35d9 100644
--- a/src/pip/_vendor/pygments/__init__.py
+++ b/src/pip/_vendor/pygments/__init__.py
@@ -21,12 +21,12 @@
     .. _Pygments master branch:
        https://github.com/pygments/pygments/archive/master.zip#egg=Pygments-dev
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from io import StringIO, BytesIO
 
-__version__ = '2.18.0'
+__version__ = '2.19.1'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff --git a/src/pip/_vendor/pygments/__main__.py b/src/pip/_vendor/pygments/__main__.py
index dcc6e5add71..a2e612f51a8 100644
--- a/src/pip/_vendor/pygments/__main__.py
+++ b/src/pip/_vendor/pygments/__main__.py
@@ -4,7 +4,7 @@
 
     Main entry point for ``python -m pygments``.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/cmdline.py b/src/pip/_vendor/pygments/cmdline.py
index 0a7072eff3e..bf9ad55e54f 100644
--- a/src/pip/_vendor/pygments/cmdline.py
+++ b/src/pip/_vendor/pygments/cmdline.py
@@ -4,7 +4,7 @@
 
     Command line interface.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/console.py b/src/pip/_vendor/pygments/console.py
index 4c1a06219ca..ee1ac27a2ff 100644
--- a/src/pip/_vendor/pygments/console.py
+++ b/src/pip/_vendor/pygments/console.py
@@ -4,7 +4,7 @@
 
     Format colored console output.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/filter.py b/src/pip/_vendor/pygments/filter.py
index aa6f76041b6..5efff438d2b 100644
--- a/src/pip/_vendor/pygments/filter.py
+++ b/src/pip/_vendor/pygments/filter.py
@@ -4,7 +4,7 @@
 
     Module that implements the default filter.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/filters/__init__.py b/src/pip/_vendor/pygments/filters/__init__.py
index 9255ca224db..97380c92d48 100644
--- a/src/pip/_vendor/pygments/filters/__init__.py
+++ b/src/pip/_vendor/pygments/filters/__init__.py
@@ -5,7 +5,7 @@
     Module containing filter lookup functions and default
     filters.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatter.py b/src/pip/_vendor/pygments/formatter.py
index d2666037f7a..0041e41a187 100644
--- a/src/pip/_vendor/pygments/formatter.py
+++ b/src/pip/_vendor/pygments/formatter.py
@@ -4,7 +4,7 @@
 
     Base formatter class.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/__init__.py b/src/pip/_vendor/pygments/formatters/__init__.py
index f19e9931f07..014f2ee8d15 100644
--- a/src/pip/_vendor/pygments/formatters/__init__.py
+++ b/src/pip/_vendor/pygments/formatters/__init__.py
@@ -4,7 +4,7 @@
 
     Pygments formatters.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/_mapping.py b/src/pip/_vendor/pygments/formatters/_mapping.py
old mode 100755
new mode 100644
diff --git a/src/pip/_vendor/pygments/formatters/bbcode.py b/src/pip/_vendor/pygments/formatters/bbcode.py
index 5a05bd961de..b9ca398341f 100644
--- a/src/pip/_vendor/pygments/formatters/bbcode.py
+++ b/src/pip/_vendor/pygments/formatters/bbcode.py
@@ -4,7 +4,7 @@
 
     BBcode formatter.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/groff.py b/src/pip/_vendor/pygments/formatters/groff.py
index 5c8a958f8d7..6527f709bc9 100644
--- a/src/pip/_vendor/pygments/formatters/groff.py
+++ b/src/pip/_vendor/pygments/formatters/groff.py
@@ -4,7 +4,7 @@
 
     Formatter for groff output.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/html.py b/src/pip/_vendor/pygments/formatters/html.py
index 7aa938f5119..e855823a052 100644
--- a/src/pip/_vendor/pygments/formatters/html.py
+++ b/src/pip/_vendor/pygments/formatters/html.py
@@ -4,7 +4,7 @@
 
     Formatter for HTML output.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -44,7 +44,15 @@ def webify(color):
     if color.startswith('calc') or color.startswith('var'):
         return color
     else:
-        return '#' + color
+        # Check if the color can be shortened from 6 to 3 characters
+        color = color.upper()
+        if (len(color) == 6 and
+            (    color[0] == color[1]
+             and color[2] == color[3]
+             and color[4] == color[5])):
+            return f'#{color[0]}{color[2]}{color[4]}'
+        else:
+            return f'#{color}'
 
 
 def _get_ttype_class(ttype):
@@ -62,7 +70,7 @@ def _get_ttype_class(ttype):
 CSSFILE_TEMPLATE = '''\
 /*
 generated by Pygments 
-Copyright 2006-2024 by the Pygments team.
+Copyright 2006-2025 by the Pygments team.
 Licensed under the BSD license, see LICENSE for details.
 */
 %(styledefs)s
@@ -73,7 +81,7 @@ def _get_ttype_class(ttype):
    "http://www.w3.org/TR/html4/strict.dtd">
 
 
diff --git a/src/pip/_vendor/pygments/formatters/img.py b/src/pip/_vendor/pygments/formatters/img.py
index 7542cfad9da..f888d0ba838 100644
--- a/src/pip/_vendor/pygments/formatters/img.py
+++ b/src/pip/_vendor/pygments/formatters/img.py
@@ -4,7 +4,7 @@
 
     Formatter for Pixmap output.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import os
@@ -132,7 +132,8 @@ def _create_mac(self):
                          '/Library/Fonts/', '/System/Library/Fonts/'):
             font_map.update(
                 (os.path.splitext(f)[0].lower(), os.path.join(font_dir, f))
-                for f in os.listdir(font_dir)
+                for _, _, files in os.walk(font_dir)
+                for f in files
                 if f.lower().endswith(('ttf', 'ttc')))
 
         for name in STYLES['NORMAL']:
diff --git a/src/pip/_vendor/pygments/formatters/irc.py b/src/pip/_vendor/pygments/formatters/irc.py
index 468c2876053..fcea04ddc3b 100644
--- a/src/pip/_vendor/pygments/formatters/irc.py
+++ b/src/pip/_vendor/pygments/formatters/irc.py
@@ -4,7 +4,7 @@
 
     Formatter for IRC output
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/latex.py b/src/pip/_vendor/pygments/formatters/latex.py
index 0ec9089b937..65934e4c2b4 100644
--- a/src/pip/_vendor/pygments/formatters/latex.py
+++ b/src/pip/_vendor/pygments/formatters/latex.py
@@ -4,7 +4,7 @@
 
     Formatter for LaTeX fancyvrb output.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/other.py b/src/pip/_vendor/pygments/formatters/other.py
index de8d9dcf896..56918dc8c39 100644
--- a/src/pip/_vendor/pygments/formatters/other.py
+++ b/src/pip/_vendor/pygments/formatters/other.py
@@ -4,7 +4,7 @@
 
     Other formatters: NullFormatter, RawTokenFormatter.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/pangomarkup.py b/src/pip/_vendor/pygments/formatters/pangomarkup.py
index dfed53ab768..94834efdfd5 100644
--- a/src/pip/_vendor/pygments/formatters/pangomarkup.py
+++ b/src/pip/_vendor/pygments/formatters/pangomarkup.py
@@ -4,7 +4,7 @@
 
     Formatter for Pango markup output.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/rtf.py b/src/pip/_vendor/pygments/formatters/rtf.py
index eca2a41a1cd..bc521b5b247 100644
--- a/src/pip/_vendor/pygments/formatters/rtf.py
+++ b/src/pip/_vendor/pygments/formatters/rtf.py
@@ -4,7 +4,7 @@
 
     A formatter that generates RTF files.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/svg.py b/src/pip/_vendor/pygments/formatters/svg.py
index d3e018ffd80..ef0c8e112eb 100644
--- a/src/pip/_vendor/pygments/formatters/svg.py
+++ b/src/pip/_vendor/pygments/formatters/svg.py
@@ -4,7 +4,7 @@
 
     Formatter for SVG output.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/terminal.py b/src/pip/_vendor/pygments/formatters/terminal.py
index 51b902d3e24..33826f2870d 100644
--- a/src/pip/_vendor/pygments/formatters/terminal.py
+++ b/src/pip/_vendor/pygments/formatters/terminal.py
@@ -4,7 +4,7 @@
 
     Formatter for terminal output with ANSI sequences.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/formatters/terminal256.py b/src/pip/_vendor/pygments/formatters/terminal256.py
index 5f254051a80..e8385ced3bc 100644
--- a/src/pip/_vendor/pygments/formatters/terminal256.py
+++ b/src/pip/_vendor/pygments/formatters/terminal256.py
@@ -10,7 +10,7 @@
 
     Formatter version 1.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/lexer.py b/src/pip/_vendor/pygments/lexer.py
index 1348be58782..c05aa8196d4 100644
--- a/src/pip/_vendor/pygments/lexer.py
+++ b/src/pip/_vendor/pygments/lexer.py
@@ -4,7 +4,7 @@
 
     Base lexer classes.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/lexers/__init__.py b/src/pip/_vendor/pygments/lexers/__init__.py
index ac88645a1b0..49184ec8a32 100644
--- a/src/pip/_vendor/pygments/lexers/__init__.py
+++ b/src/pip/_vendor/pygments/lexers/__init__.py
@@ -4,7 +4,7 @@
 
     Pygments lexers.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/lexers/_mapping.py b/src/pip/_vendor/pygments/lexers/_mapping.py
index f3e5c460db3..c0d6a8ad285 100644
--- a/src/pip/_vendor/pygments/lexers/_mapping.py
+++ b/src/pip/_vendor/pygments/lexers/_mapping.py
@@ -93,6 +93,7 @@
     'ClojureScriptLexer': ('pip._vendor.pygments.lexers.jvm', 'ClojureScript', ('clojurescript', 'cljs'), ('*.cljs',), ('text/x-clojurescript', 'application/x-clojurescript')),
     'CobolFreeformatLexer': ('pip._vendor.pygments.lexers.business', 'COBOLFree', ('cobolfree',), ('*.cbl', '*.CBL'), ()),
     'CobolLexer': ('pip._vendor.pygments.lexers.business', 'COBOL', ('cobol',), ('*.cob', '*.COB', '*.cpy', '*.CPY'), ('text/x-cobol',)),
+    'CodeQLLexer': ('pip._vendor.pygments.lexers.codeql', 'CodeQL', ('codeql', 'ql'), ('*.ql', '*.qll'), ()),
     'CoffeeScriptLexer': ('pip._vendor.pygments.lexers.javascript', 'CoffeeScript', ('coffeescript', 'coffee-script', 'coffee'), ('*.coffee',), ('text/coffeescript',)),
     'ColdfusionCFCLexer': ('pip._vendor.pygments.lexers.templates', 'Coldfusion CFC', ('cfc',), ('*.cfc',), ()),
     'ColdfusionHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'Coldfusion HTML', ('cfm',), ('*.cfm', '*.cfml'), ('application/x-coldfusion',)),
@@ -127,6 +128,7 @@
     'Dasm16Lexer': ('pip._vendor.pygments.lexers.asm', 'DASM16', ('dasm16',), ('*.dasm16', '*.dasm'), ('text/x-dasm16',)),
     'DaxLexer': ('pip._vendor.pygments.lexers.dax', 'Dax', ('dax',), ('*.dax',), ()),
     'DebianControlLexer': ('pip._vendor.pygments.lexers.installers', 'Debian Control file', ('debcontrol', 'control'), ('control',), ()),
+    'DebianSourcesLexer': ('pip._vendor.pygments.lexers.installers', 'Debian Sources file', ('debian.sources',), ('*.sources',), ()),
     'DelphiLexer': ('pip._vendor.pygments.lexers.pascal', 'Delphi', ('delphi', 'pas', 'pascal', 'objectpascal'), ('*.pas', '*.dpr'), ('text/x-pascal',)),
     'DesktopLexer': ('pip._vendor.pygments.lexers.configs', 'Desktop file', ('desktop',), ('*.desktop',), ('application/x-desktop',)),
     'DevicetreeLexer': ('pip._vendor.pygments.lexers.devicetree', 'Devicetree', ('devicetree', 'dts'), ('*.dts', '*.dtsi'), ('text/x-c',)),
@@ -155,9 +157,9 @@
     'ErbLexer': ('pip._vendor.pygments.lexers.templates', 'ERB', ('erb',), (), ('application/x-ruby-templating',)),
     'ErlangLexer': ('pip._vendor.pygments.lexers.erlang', 'Erlang', ('erlang',), ('*.erl', '*.hrl', '*.es', '*.escript'), ('text/x-erlang',)),
     'ErlangShellLexer': ('pip._vendor.pygments.lexers.erlang', 'Erlang erl session', ('erl',), ('*.erl-sh',), ('text/x-erl-shellsession',)),
-    'EvoqueHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Evoque', ('html+evoque',), ('*.html',), ('text/html+evoque',)),
+    'EvoqueHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Evoque', ('html+evoque',), (), ('text/html+evoque',)),
     'EvoqueLexer': ('pip._vendor.pygments.lexers.templates', 'Evoque', ('evoque',), ('*.evoque',), ('application/x-evoque',)),
-    'EvoqueXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Evoque', ('xml+evoque',), ('*.xml',), ('application/xml+evoque',)),
+    'EvoqueXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Evoque', ('xml+evoque',), (), ('application/xml+evoque',)),
     'ExeclineLexer': ('pip._vendor.pygments.lexers.shell', 'execline', ('execline',), ('*.exec',), ()),
     'EzhilLexer': ('pip._vendor.pygments.lexers.ezhil', 'Ezhil', ('ezhil',), ('*.n',), ('text/x-ezhil',)),
     'FSharpLexer': ('pip._vendor.pygments.lexers.dotnet', 'F#', ('fsharp', 'f#'), ('*.fs', '*.fsi', '*.fsx'), ('text/x-fsharp',)),
@@ -189,10 +191,12 @@
     'GenshiTextLexer': ('pip._vendor.pygments.lexers.templates', 'Genshi Text', ('genshitext',), (), ('application/x-genshi-text', 'text/x-genshi')),
     'GettextLexer': ('pip._vendor.pygments.lexers.textfmts', 'Gettext Catalog', ('pot', 'po'), ('*.pot', '*.po'), ('application/x-gettext', 'text/x-gettext', 'text/gettext')),
     'GherkinLexer': ('pip._vendor.pygments.lexers.testing', 'Gherkin', ('gherkin', 'cucumber'), ('*.feature',), ('text/x-gherkin',)),
+    'GleamLexer': ('pip._vendor.pygments.lexers.gleam', 'Gleam', ('gleam',), ('*.gleam',), ('text/x-gleam',)),
     'GnuplotLexer': ('pip._vendor.pygments.lexers.graphics', 'Gnuplot', ('gnuplot',), ('*.plot', '*.plt'), ('text/x-gnuplot',)),
     'GoLexer': ('pip._vendor.pygments.lexers.go', 'Go', ('go', 'golang'), ('*.go',), ('text/x-gosrc',)),
     'GoloLexer': ('pip._vendor.pygments.lexers.jvm', 'Golo', ('golo',), ('*.golo',), ()),
     'GoodDataCLLexer': ('pip._vendor.pygments.lexers.business', 'GoodData-CL', ('gooddata-cl',), ('*.gdc',), ('text/x-gooddata-cl',)),
+    'GoogleSqlLexer': ('pip._vendor.pygments.lexers.sql', 'GoogleSQL', ('googlesql', 'zetasql'), ('*.googlesql', '*.googlesql.sql'), ('text/x-google-sql', 'text/x-google-sql-aux')),
     'GosuLexer': ('pip._vendor.pygments.lexers.jvm', 'Gosu', ('gosu',), ('*.gs', '*.gsx', '*.gsp', '*.vark'), ('text/x-gosu',)),
     'GosuTemplateLexer': ('pip._vendor.pygments.lexers.jvm', 'Gosu Template', ('gst',), ('*.gst',), ('text/x-gosu-template',)),
     'GraphQLLexer': ('pip._vendor.pygments.lexers.graphql', 'GraphQL', ('graphql',), ('*.graphql',), ()),
@@ -204,6 +208,7 @@
     'HamlLexer': ('pip._vendor.pygments.lexers.html', 'Haml', ('haml',), ('*.haml',), ('text/x-haml',)),
     'HandlebarsHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Handlebars', ('html+handlebars',), ('*.handlebars', '*.hbs'), ('text/html+handlebars', 'text/x-handlebars-template')),
     'HandlebarsLexer': ('pip._vendor.pygments.lexers.templates', 'Handlebars', ('handlebars',), (), ()),
+    'HareLexer': ('pip._vendor.pygments.lexers.hare', 'Hare', ('hare',), ('*.ha',), ('text/x-hare',)),
     'HaskellLexer': ('pip._vendor.pygments.lexers.haskell', 'Haskell', ('haskell', 'hs'), ('*.hs',), ('text/x-haskell',)),
     'HaxeLexer': ('pip._vendor.pygments.lexers.haxe', 'Haxe', ('haxe', 'hxsl', 'hx'), ('*.hx', '*.hxsl'), ('text/haxe', 'text/x-haxe', 'text/x-hx')),
     'HexdumpLexer': ('pip._vendor.pygments.lexers.hexdump', 'Hexdump', ('hexdump',), (), ()),
@@ -246,6 +251,7 @@
     'JavascriptUL4Lexer': ('pip._vendor.pygments.lexers.ul4', 'Javascript+UL4', ('js+ul4',), ('*.jsul4',), ()),
     'JclLexer': ('pip._vendor.pygments.lexers.scripting', 'JCL', ('jcl',), ('*.jcl',), ('text/x-jcl',)),
     'JsgfLexer': ('pip._vendor.pygments.lexers.grammar_notation', 'JSGF', ('jsgf',), ('*.jsgf',), ('application/jsgf', 'application/x-jsgf', 'text/jsgf')),
+    'Json5Lexer': ('pip._vendor.pygments.lexers.json5', 'JSON5', ('json5',), ('*.json5',), ()),
     'JsonBareObjectLexer': ('pip._vendor.pygments.lexers.data', 'JSONBareObject', (), (), ()),
     'JsonLdLexer': ('pip._vendor.pygments.lexers.data', 'JSON-LD', ('jsonld', 'json-ld'), ('*.jsonld',), ('application/ld+json',)),
     'JsonLexer': ('pip._vendor.pygments.lexers.data', 'JSON', ('json', 'json-object'), ('*.json', '*.jsonl', '*.ndjson', 'Pipfile.lock'), ('application/json', 'application/json-object', 'application/x-ndjson', 'application/jsonl', 'application/json-seq')),
@@ -303,6 +309,7 @@
     'MakoJavascriptLexer': ('pip._vendor.pygments.lexers.templates', 'JavaScript+Mako', ('javascript+mako', 'js+mako'), (), ('application/x-javascript+mako', 'text/x-javascript+mako', 'text/javascript+mako')),
     'MakoLexer': ('pip._vendor.pygments.lexers.templates', 'Mako', ('mako',), ('*.mao',), ('application/x-mako',)),
     'MakoXmlLexer': ('pip._vendor.pygments.lexers.templates', 'XML+Mako', ('xml+mako',), (), ('application/xml+mako',)),
+    'MapleLexer': ('pip._vendor.pygments.lexers.maple', 'Maple', ('maple',), ('*.mpl', '*.mi', '*.mm'), ('text/x-maple',)),
     'MaqlLexer': ('pip._vendor.pygments.lexers.business', 'MAQL', ('maql',), ('*.maql',), ('text/x-gooddata-maql', 'application/x-gooddata-maql')),
     'MarkdownLexer': ('pip._vendor.pygments.lexers.markup', 'Markdown', ('markdown', 'md'), ('*.md', '*.markdown'), ('text/x-markdown',)),
     'MaskLexer': ('pip._vendor.pygments.lexers.javascript', 'Mask', ('mask',), ('*.mask',), ('text/x-mask',)),
@@ -354,6 +361,7 @@
     'NotmuchLexer': ('pip._vendor.pygments.lexers.textfmts', 'Notmuch', ('notmuch',), (), ()),
     'NuSMVLexer': ('pip._vendor.pygments.lexers.smv', 'NuSMV', ('nusmv',), ('*.smv',), ()),
     'NumPyLexer': ('pip._vendor.pygments.lexers.python', 'NumPy', ('numpy',), (), ()),
+    'NumbaIRLexer': ('pip._vendor.pygments.lexers.numbair', 'Numba_IR', ('numba_ir', 'numbair'), ('*.numba_ir',), ('text/x-numba_ir', 'text/x-numbair')),
     'ObjdumpLexer': ('pip._vendor.pygments.lexers.asm', 'objdump', ('objdump',), ('*.objdump',), ('text/x-objdump',)),
     'ObjectiveCLexer': ('pip._vendor.pygments.lexers.objective', 'Objective-C', ('objective-c', 'objectivec', 'obj-c', 'objc'), ('*.m', '*.h'), ('text/x-objective-c',)),
     'ObjectiveCppLexer': ('pip._vendor.pygments.lexers.objective', 'Objective-C++', ('objective-c++', 'objectivec++', 'obj-c++', 'objc++'), ('*.mm', '*.hh'), ('text/x-objective-c++',)),
@@ -372,6 +380,7 @@
     'PanLexer': ('pip._vendor.pygments.lexers.dsls', 'Pan', ('pan',), ('*.pan',), ()),
     'ParaSailLexer': ('pip._vendor.pygments.lexers.parasail', 'ParaSail', ('parasail',), ('*.psi', '*.psl'), ('text/x-parasail',)),
     'PawnLexer': ('pip._vendor.pygments.lexers.pawn', 'Pawn', ('pawn',), ('*.p', '*.pwn', '*.inc'), ('text/x-pawn',)),
+    'PddlLexer': ('pip._vendor.pygments.lexers.pddl', 'PDDL', ('pddl',), ('*.pddl',), ()),
     'PegLexer': ('pip._vendor.pygments.lexers.grammar_notation', 'PEG', ('peg',), ('*.peg',), ('text/x-peg',)),
     'Perl6Lexer': ('pip._vendor.pygments.lexers.perl', 'Perl6', ('perl6', 'pl6', 'raku'), ('*.pl', '*.pm', '*.nqp', '*.p6', '*.6pl', '*.p6l', '*.pl6', '*.6pm', '*.p6m', '*.pm6', '*.t', '*.raku', '*.rakumod', '*.rakutest', '*.rakudoc'), ('text/x-perl6', 'application/x-perl6')),
     'PerlLexer': ('pip._vendor.pygments.lexers.perl', 'Perl', ('perl', 'pl'), ('*.pl', '*.pm', '*.t', '*.perl'), ('text/x-perl', 'application/x-perl')),
@@ -407,7 +416,7 @@
     'Python2Lexer': ('pip._vendor.pygments.lexers.python', 'Python 2.x', ('python2', 'py2'), (), ('text/x-python2', 'application/x-python2')),
     'Python2TracebackLexer': ('pip._vendor.pygments.lexers.python', 'Python 2.x Traceback', ('py2tb',), ('*.py2tb',), ('text/x-python2-traceback',)),
     'PythonConsoleLexer': ('pip._vendor.pygments.lexers.python', 'Python console session', ('pycon', 'python-console'), (), ('text/x-python-doctest',)),
-    'PythonLexer': ('pip._vendor.pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
+    'PythonLexer': ('pip._vendor.pygments.lexers.python', 'Python', ('python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark', 'pyi'), ('*.py', '*.pyw', '*.pyi', '*.jy', '*.sage', '*.sc', 'SConstruct', 'SConscript', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE', '*.tac'), ('text/x-python', 'application/x-python', 'text/x-python3', 'application/x-python3')),
     'PythonTracebackLexer': ('pip._vendor.pygments.lexers.python', 'Python Traceback', ('pytb', 'py3tb'), ('*.pytb', '*.py3tb'), ('text/x-python-traceback', 'text/x-python3-traceback')),
     'PythonUL4Lexer': ('pip._vendor.pygments.lexers.ul4', 'Python+UL4', ('py+ul4',), ('*.pyul4',), ()),
     'QBasicLexer': ('pip._vendor.pygments.lexers.basic', 'QBasic', ('qbasic', 'basic'), ('*.BAS', '*.bas'), ('text/basic',)),
@@ -434,6 +443,7 @@
     'RedLexer': ('pip._vendor.pygments.lexers.rebol', 'Red', ('red', 'red/system'), ('*.red', '*.reds'), ('text/x-red', 'text/x-red-system')),
     'RedcodeLexer': ('pip._vendor.pygments.lexers.esoteric', 'Redcode', ('redcode',), ('*.cw',), ()),
     'RegeditLexer': ('pip._vendor.pygments.lexers.configs', 'reg', ('registry',), ('*.reg',), ('text/x-windows-registry',)),
+    'RegoLexer': ('pip._vendor.pygments.lexers.rego', 'Rego', ('rego',), ('*.rego',), ('text/x-rego',)),
     'ResourceLexer': ('pip._vendor.pygments.lexers.resource', 'ResourceBundle', ('resourcebundle', 'resource'), (), ()),
     'RexxLexer': ('pip._vendor.pygments.lexers.scripting', 'Rexx', ('rexx', 'arexx'), ('*.rexx', '*.rex', '*.rx', '*.arexx'), ('text/x-rexx',)),
     'RhtmlLexer': ('pip._vendor.pygments.lexers.templates', 'RHTML', ('rhtml', 'html+erb', 'html+ruby'), ('*.rhtml',), ('text/html+ruby',)),
@@ -501,6 +511,7 @@
     'TAPLexer': ('pip._vendor.pygments.lexers.testing', 'TAP', ('tap',), ('*.tap',), ()),
     'TNTLexer': ('pip._vendor.pygments.lexers.tnt', 'Typographic Number Theory', ('tnt',), ('*.tnt',), ()),
     'TOMLLexer': ('pip._vendor.pygments.lexers.configs', 'TOML', ('toml',), ('*.toml', 'Pipfile', 'poetry.lock'), ('application/toml',)),
+    'TableGenLexer': ('pip._vendor.pygments.lexers.tablegen', 'TableGen', ('tablegen', 'td'), ('*.td',), ()),
     'TactLexer': ('pip._vendor.pygments.lexers.tact', 'Tact', ('tact',), ('*.tact',), ()),
     'Tads3Lexer': ('pip._vendor.pygments.lexers.int_fiction', 'TADS 3', ('tads3',), ('*.t',), ()),
     'TalLexer': ('pip._vendor.pygments.lexers.tal', 'Tal', ('tal', 'uxntal'), ('*.tal',), ('text/x-uxntal',)),
@@ -524,6 +535,7 @@
     'TodotxtLexer': ('pip._vendor.pygments.lexers.textfmts', 'Todotxt', ('todotxt',), ('todo.txt', '*.todotxt'), ('text/x-todo',)),
     'TransactSqlLexer': ('pip._vendor.pygments.lexers.sql', 'Transact-SQL', ('tsql', 't-sql'), ('*.sql',), ('text/x-tsql',)),
     'TreetopLexer': ('pip._vendor.pygments.lexers.parsers', 'Treetop', ('treetop',), ('*.treetop', '*.tt'), ()),
+    'TsxLexer': ('pip._vendor.pygments.lexers.jsx', 'TSX', ('tsx',), ('*.tsx',), ('text/typescript-tsx',)),
     'TurtleLexer': ('pip._vendor.pygments.lexers.rdf', 'Turtle', ('turtle',), ('*.ttl',), ('text/turtle', 'application/x-turtle')),
     'TwigHtmlLexer': ('pip._vendor.pygments.lexers.templates', 'HTML+Twig', ('html+twig',), ('*.twig',), ('text/html+twig',)),
     'TwigLexer': ('pip._vendor.pygments.lexers.templates', 'Twig', ('twig',), (), ('application/x-twig',)),
@@ -556,6 +568,7 @@
     'VimLexer': ('pip._vendor.pygments.lexers.textedit', 'VimL', ('vim',), ('*.vim', '.vimrc', '.exrc', '.gvimrc', '_vimrc', '_exrc', '_gvimrc', 'vimrc', 'gvimrc'), ('text/x-vim',)),
     'VisualPrologGrammarLexer': ('pip._vendor.pygments.lexers.vip', 'Visual Prolog Grammar', ('visualprologgrammar',), ('*.vipgrm',), ()),
     'VisualPrologLexer': ('pip._vendor.pygments.lexers.vip', 'Visual Prolog', ('visualprolog',), ('*.pro', '*.cl', '*.i', '*.pack', '*.ph'), ()),
+    'VueLexer': ('pip._vendor.pygments.lexers.html', 'Vue', ('vue',), ('*.vue',), ()),
     'VyperLexer': ('pip._vendor.pygments.lexers.vyper', 'Vyper', ('vyper',), ('*.vy',), ()),
     'WDiffLexer': ('pip._vendor.pygments.lexers.diff', 'WDiff', ('wdiff',), ('*.wdiff',), ()),
     'WatLexer': ('pip._vendor.pygments.lexers.webassembly', 'WebAssembly', ('wast', 'wat'), ('*.wat', '*.wast'), ()),
diff --git a/src/pip/_vendor/pygments/lexers/python.py b/src/pip/_vendor/pygments/lexers/python.py
index b2d07f20800..1b78829617a 100644
--- a/src/pip/_vendor/pygments/lexers/python.py
+++ b/src/pip/_vendor/pygments/lexers/python.py
@@ -4,7 +4,7 @@
 
     Lexers for Python and related languages.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -33,7 +33,7 @@ class PythonLexer(RegexLexer):
 
     name = 'Python'
     url = 'https://www.python.org'
-    aliases = ['python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark']
+    aliases = ['python', 'py', 'sage', 'python3', 'py3', 'bazel', 'starlark', 'pyi']
     filenames = [
         '*.py',
         '*.pyw',
@@ -109,11 +109,11 @@ def fstring_rules(ttype):
             (r'\\', Text),
             include('keywords'),
             include('soft-keywords'),
-            (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'funcname'),
-            (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'classname'),
-            (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+            (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'funcname'),
+            (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'classname'),
+            (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
              'fromimport'),
-            (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+            (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
              'import'),
             include('expr'),
         ],
@@ -329,14 +329,14 @@ def fstring_rules(ttype):
             (uni_name, Name.Class, '#pop'),
         ],
         'import': [
-            (r'(\s+)(as)(\s+)', bygroups(Text, Keyword, Text)),
+            (r'(\s+)(as)(\s+)', bygroups(Whitespace, Keyword, Whitespace)),
             (r'\.', Name.Namespace),
             (uni_name, Name.Namespace),
-            (r'(\s*)(,)(\s*)', bygroups(Text, Operator, Text)),
+            (r'(\s*)(,)(\s*)', bygroups(Whitespace, Operator, Whitespace)),
             default('#pop')  # all else: go back
         ],
         'fromimport': [
-            (r'(\s+)(import)\b', bygroups(Text, Keyword.Namespace), '#pop'),
+            (r'(\s+)(import)\b', bygroups(Whitespace, Keyword.Namespace), '#pop'),
             (r'\.', Name.Namespace),
             # if None occurs here, it's "raise x from None", since None can
             # never be a module name
@@ -459,11 +459,11 @@ def innerstring_rules(ttype):
             (r'(in|is|and|or|not)\b', Operator.Word),
             (r'!=|==|<<|>>|[-~+/*%=<>&^|.]', Operator),
             include('keywords'),
-            (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'funcname'),
-            (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'classname'),
-            (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+            (r'(def)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'funcname'),
+            (r'(class)((?:\s|\\\s)+)', bygroups(Keyword, Whitespace), 'classname'),
+            (r'(from)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
              'fromimport'),
-            (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Text),
+            (r'(import)((?:\s|\\\s)+)', bygroups(Keyword.Namespace, Whitespace),
              'import'),
             include('builtins'),
             include('magicfuncs'),
@@ -635,6 +635,7 @@ def innerstring_rules(ttype):
     def analyse_text(text):
         return shebang_matches(text, r'pythonw?2(\.\d)?')
 
+
 class _PythonConsoleLexerBase(RegexLexer):
     name = 'Python console session'
     aliases = ['pycon', 'python-console']
@@ -671,6 +672,7 @@ class _PythonConsoleLexerBase(RegexLexer):
         ],
     }
 
+
 class PythonConsoleLexer(DelegatingLexer):
     """
     For Python console output or doctests, such as:
@@ -719,6 +721,7 @@ def __init__(self, **options):
                 super().__init__(pylexer, _PythonConsoleLexerBase, Other.Code, **options)
         super().__init__(tblexer, _ReplaceInnerCode, Other.Traceback, **options)
 
+
 class PythonTracebackLexer(RegexLexer):
     """
     For Python 3.x tracebacks, with support for chained exceptions.
@@ -851,16 +854,16 @@ class CythonLexer(RegexLexer):
              bygroups(Punctuation, Keyword.Type, Punctuation)),
             (r'!=|==|<<|>>|[-~+/*%=<>&^|.?]', Operator),
             (r'(from)(\d+)(<=)(\s+)(<)(\d+)(:)',
-             bygroups(Keyword, Number.Integer, Operator, Name, Operator,
+             bygroups(Keyword, Number.Integer, Operator, Whitespace, Operator,
                       Name, Punctuation)),
             include('keywords'),
-            (r'(def|property)(\s+)', bygroups(Keyword, Text), 'funcname'),
-            (r'(cp?def)(\s+)', bygroups(Keyword, Text), 'cdef'),
+            (r'(def|property)(\s+)', bygroups(Keyword, Whitespace), 'funcname'),
+            (r'(cp?def)(\s+)', bygroups(Keyword, Whitespace), 'cdef'),
             # (should actually start a block with only cdefs)
             (r'(cdef)(:)', bygroups(Keyword, Punctuation)),
-            (r'(class|struct)(\s+)', bygroups(Keyword, Text), 'classname'),
-            (r'(from)(\s+)', bygroups(Keyword, Text), 'fromimport'),
-            (r'(c?import)(\s+)', bygroups(Keyword, Text), 'import'),
+            (r'(class|struct)(\s+)', bygroups(Keyword, Whitespace), 'classname'),
+            (r'(from)(\s+)', bygroups(Keyword, Whitespace), 'fromimport'),
+            (r'(c?import)(\s+)', bygroups(Keyword, Whitespace), 'import'),
             include('builtins'),
             include('backtick'),
             ('(?:[rR]|[uU][rR]|[rR][uU])"""', String, 'tdqs'),
@@ -938,9 +941,9 @@ class CythonLexer(RegexLexer):
             (r'(public|readonly|extern|api|inline)\b', Keyword.Reserved),
             (r'(struct|enum|union|class)\b', Keyword),
             (r'([a-zA-Z_]\w*)(\s*)(?=[(:#=]|$)',
-             bygroups(Name.Function, Text), '#pop'),
+             bygroups(Name.Function, Whitespace), '#pop'),
             (r'([a-zA-Z_]\w*)(\s*)(,)',
-             bygroups(Name.Function, Text, Punctuation)),
+             bygroups(Name.Function, Whitespace, Punctuation)),
             (r'from\b', Keyword, '#pop'),
             (r'as\b', Keyword),
             (r':', Punctuation, '#pop'),
@@ -952,13 +955,13 @@ class CythonLexer(RegexLexer):
             (r'[a-zA-Z_]\w*', Name.Class, '#pop')
         ],
         'import': [
-            (r'(\s+)(as)(\s+)', bygroups(Text, Keyword, Text)),
+            (r'(\s+)(as)(\s+)', bygroups(Whitespace, Keyword, Whitespace)),
             (r'[a-zA-Z_][\w.]*', Name.Namespace),
-            (r'(\s*)(,)(\s*)', bygroups(Text, Operator, Text)),
+            (r'(\s*)(,)(\s*)', bygroups(Whitespace, Operator, Whitespace)),
             default('#pop')  # all else: go back
         ],
         'fromimport': [
-            (r'(\s+)(c?import)\b', bygroups(Text, Keyword), '#pop'),
+            (r'(\s+)(c?import)\b', bygroups(Whitespace, Keyword), '#pop'),
             (r'[a-zA-Z_.][\w.]*', Name.Namespace),
             # ``cdef foo from "header"``, or ``for foo from 0 < i < 10``
             default('#pop'),
diff --git a/src/pip/_vendor/pygments/modeline.py b/src/pip/_vendor/pygments/modeline.py
index e4d9fe167bd..c310f0edbdc 100644
--- a/src/pip/_vendor/pygments/modeline.py
+++ b/src/pip/_vendor/pygments/modeline.py
@@ -4,7 +4,7 @@
 
     A simple modeline parser (based on pymodeline).
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/plugin.py b/src/pip/_vendor/pygments/plugin.py
index 2e462f2c2f9..498db423849 100644
--- a/src/pip/_vendor/pygments/plugin.py
+++ b/src/pip/_vendor/pygments/plugin.py
@@ -29,7 +29,7 @@
         yourfilter = yourfilter:YourFilter
 
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from importlib.metadata import entry_points
diff --git a/src/pip/_vendor/pygments/regexopt.py b/src/pip/_vendor/pygments/regexopt.py
index c44eedbf2ad..cc8d2c31b54 100644
--- a/src/pip/_vendor/pygments/regexopt.py
+++ b/src/pip/_vendor/pygments/regexopt.py
@@ -5,7 +5,7 @@
     An algorithm that generates optimized regexes for matching long lists of
     literal strings.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/scanner.py b/src/pip/_vendor/pygments/scanner.py
index 112da34917e..3c8c8487316 100644
--- a/src/pip/_vendor/pygments/scanner.py
+++ b/src/pip/_vendor/pygments/scanner.py
@@ -11,7 +11,7 @@
     Have a look at the `DelphiLexer` to get an idea of how to use
     this scanner.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import re
diff --git a/src/pip/_vendor/pygments/sphinxext.py b/src/pip/_vendor/pygments/sphinxext.py
index 34077a2aee8..955d9584f8f 100644
--- a/src/pip/_vendor/pygments/sphinxext.py
+++ b/src/pip/_vendor/pygments/sphinxext.py
@@ -5,7 +5,7 @@
     Sphinx extension to generate automatic documentation of lexers,
     formatters and filters.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/style.py b/src/pip/_vendor/pygments/style.py
index 076e63f831c..be5f8322879 100644
--- a/src/pip/_vendor/pygments/style.py
+++ b/src/pip/_vendor/pygments/style.py
@@ -4,7 +4,7 @@
 
     Basic style object.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/styles/__init__.py b/src/pip/_vendor/pygments/styles/__init__.py
index 712f6e69932..96d53dce0da 100644
--- a/src/pip/_vendor/pygments/styles/__init__.py
+++ b/src/pip/_vendor/pygments/styles/__init__.py
@@ -4,7 +4,7 @@
 
     Contains built-in styles.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/token.py b/src/pip/_vendor/pygments/token.py
index f78018a7aa7..2f3b97e09ac 100644
--- a/src/pip/_vendor/pygments/token.py
+++ b/src/pip/_vendor/pygments/token.py
@@ -4,7 +4,7 @@
 
     Basic token types and the standard tokens.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/unistring.py b/src/pip/_vendor/pygments/unistring.py
index e2c3523e4bb..e3bd2e72738 100644
--- a/src/pip/_vendor/pygments/unistring.py
+++ b/src/pip/_vendor/pygments/unistring.py
@@ -7,7 +7,7 @@
 
     Inspired by chartypes_create.py from the MoinMoin project.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/pygments/util.py b/src/pip/_vendor/pygments/util.py
index 83cf1049253..71c5710ae16 100644
--- a/src/pip/_vendor/pygments/util.py
+++ b/src/pip/_vendor/pygments/util.py
@@ -4,7 +4,7 @@
 
     Utility functions.
 
-    :copyright: Copyright 2006-2024 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 040a41f8d0e..0c7733ff8a5 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -10,7 +10,7 @@ requests==2.32.3
     idna==3.10
     urllib3==1.26.20
 rich==13.9.4
-    pygments==2.18.0
+    pygments==2.19.1
     typing_extensions==4.12.2
 resolvelib==1.1.0
 setuptools==70.3.0

From 81bee6179e0afa268abe50fbb5967c1ca872735f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Mar 2025 18:04:44 -0500
Subject: [PATCH 773/992] Bump actions/download-artifact from 4.1.8 to 4.1.9
 (#13257)

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a3995a32cf1..15e5ee3a576 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
+        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
         with:
           name: python-package-distributions
           path: dist/

From 1a83f72ca8c58899ff225600ea9175ecd49f1e6c Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 7 Mar 2025 09:00:56 -0500
Subject: [PATCH 774/992] Fix tests after merge

---
 tests/unit/resolution_resolvelib/test_provider.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index b4233e605a1..e887a88a8c8 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -99,7 +99,7 @@ def build_explicit_req_info(
             {"free-package": [build_req_info("free-package")]},
             [],
             {},
-            (True, True, True, True, math.inf, True, "free-package"),
+            (True, True, math.inf, True, "free-package"),
         ),
         # Test case for "direct" preference (explicit URL)
         (

From 94fdffdb14a1a558ed47254213beb746e726c2a7 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Fri, 7 Mar 2025 09:30:36 -0500
Subject: [PATCH 775/992] Make checking if direct and getting install
 requirements a one-pass

---
 .../resolution/resolvelib/provider.py         | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index bea4164ce6e..65f393a7039 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -6,13 +6,17 @@
     Iterable,
     Iterator,
     Mapping,
+    Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
 )
 
 from pip._vendor.resolvelib.providers import AbstractProvider
 
+from pip._internal.req.req_install import InstallRequirement
+
 from .base import Candidate, Constraint, Requirement
 from .candidates import REQUIRES_PYTHON_IDENTIFIER
 from .factory import Factory
@@ -180,11 +184,20 @@ def get_preference(
         else:
             has_information = True
 
-        if has_information:
-            lookups = (r.get_candidate_lookup() for r, _ in information[identifier])
-            _icandidates, ireqs = zip(*lookups)
+        if not has_information:
+            direct = False
+            ireqs: Tuple[Optional[InstallRequirement], ...] = ()
         else:
-            _icandidates, ireqs = (), ()
+            # Go through the information and for each requirement,
+            # check if it's explicit (e.g., a direct link) and get the
+            # InstallRequirement (the second element) from get_candidate_lookup()
+            directs, ireqs = zip(
+                *(
+                    (isinstance(r, ExplicitRequirement), r.get_candidate_lookup()[1])
+                    for r, _ in information[identifier]
+                )
+            )
+            direct = any(directs)
 
         operators: list[tuple[str, str]] = [
             (specifier.operator, specifier.version)
@@ -192,9 +205,6 @@ def get_preference(
             for specifier in specifier_set
         ]
 
-        direct = any(
-            isinstance(r, ExplicitRequirement) for r, _ in information[identifier]
-        )
         pinned = any(((op[:2] == "==") and ("*" not in ver)) for op, ver in operators)
         unfree = bool(operators)
         requested_order = self._user_requested.get(identifier, math.inf)

From 5b23c591f133b17b4c91d376c080c2ed31fc20a6 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Fri, 7 Mar 2025 18:38:46 -0500
Subject: [PATCH 776/992] resolvelib: emit Requires-Python dependency first
 (#13270)

This makes the resolver always inspect Requires-Python first when
checking a candidate's consistency, ensuring that no other candidates
are prepared if the Requires-Python check fails.

This regression was masked due to a broken test which checked for the
(nonpresence of the) wrong package name.

The resolvelib provider was also updated to return dependencies lazily.

While ideally we wouldn't prepare candidates unnecessarily, pip has grown
numerous metadata checks (for reporting bad metadata, skipping candidates
with unsupported legacy metadata, etc.) so it's infeasible to stop
preparing candidates upon creation (without a serious architectural
redesign). However, we can create the candidates one-by-one as they're
processed instead of all dependencies at once.

This is necessary so the resolver can process Requires-Python first
without processing other dependencies.

Co-authored-by: Tzu-ping Chung 
---
 news/13270.bugfix.rst                                 | 3 +++
 src/pip/_internal/resolution/resolvelib/candidates.py | 4 +++-
 src/pip/_internal/resolution/resolvelib/provider.py   | 5 +++--
 tests/functional/test_new_resolver_errors.py          | 8 +++++---
 4 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 news/13270.bugfix.rst

diff --git a/news/13270.bugfix.rst b/news/13270.bugfix.rst
new file mode 100644
index 00000000000..9828b666daf
--- /dev/null
+++ b/news/13270.bugfix.rst
@@ -0,0 +1,3 @@
+Fix a regression that causes dependencies to be checked *before* ``Requires-Python``
+project metadata is checked, leading to wasted cycles when the Python version is
+unsupported.
diff --git a/src/pip/_internal/resolution/resolvelib/candidates.py b/src/pip/_internal/resolution/resolvelib/candidates.py
index 1d21ede72cc..d976026ac18 100644
--- a/src/pip/_internal/resolution/resolvelib/candidates.py
+++ b/src/pip/_internal/resolution/resolvelib/candidates.py
@@ -249,10 +249,12 @@ def _prepare(self) -> BaseDistribution:
         return dist
 
     def iter_dependencies(self, with_requires: bool) -> Iterable[Optional[Requirement]]:
+        # Emit the Requires-Python requirement first to fail fast on
+        # unsupported candidates and avoid pointless downloads/preparation.
+        yield self._factory.make_requires_python_requirement(self.dist.requires_python)
         requires = self.dist.iter_dependencies() if with_requires else ()
         for r in requires:
             yield from self._factory.make_requirements_from_spec(str(r), self._ireq)
-        yield self._factory.make_requires_python_requirement(self.dist.requires_python)
 
     def get_install_requirement(self) -> Optional[InstallRequirement]:
         return self._ireq
diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index 161dc10177a..afdffe8191e 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -250,6 +250,7 @@ def _eligible_for_upgrade(identifier: str) -> bool:
     def is_satisfied_by(self, requirement: Requirement, candidate: Candidate) -> bool:
         return requirement.is_satisfied_by(candidate)
 
-    def get_dependencies(self, candidate: Candidate) -> Sequence[Requirement]:
+    def get_dependencies(self, candidate: Candidate) -> Iterable[Requirement]:
         with_requires = not self._ignore_dependencies
-        return [r for r in candidate.iter_dependencies(with_requires) if r is not None]
+        # iter_dependencies() can perform nontrivial work so delay until needed.
+        return (r for r in candidate.iter_dependencies(with_requires) if r is not None)
diff --git a/tests/functional/test_new_resolver_errors.py b/tests/functional/test_new_resolver_errors.py
index 5976de52e39..ebca917d0a5 100644
--- a/tests/functional/test_new_resolver_errors.py
+++ b/tests/functional/test_new_resolver_errors.py
@@ -126,7 +126,9 @@ def test_new_resolver_checks_requires_python_before_dependencies(
         expect_error=True,
     )
 
-    # Resolution should fail because of pkg-a's Requires-Python.
-    # This check should be done before pkg-b, so pkg-b should never be pulled.
+    # Resolution should fail because of pkg-root's Requires-Python.
+    # This is done before dependencies so pkg-dep should never be pulled.
     assert incompatible_python in result.stderr, str(result)
-    assert "pkg-b" not in result.stderr, str(result)
+    # Setuptools produces wheels with normalized names.
+    assert "pkg_dep" not in result.stderr, str(result)
+    assert "pkg_dep" not in result.stdout, str(result)

From 2d772146d94e65c948e41e4b19e1fc3bdfa4feae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Mar 2025 18:48:03 -0500
Subject: [PATCH 777/992] Bump setuptools from 75.8.0 to 75.8.2 (#13255)

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build-requirements.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-requirements.txt b/build-requirements.txt
index ad876c4ada0..d45cae7693e 100644
--- a/build-requirements.txt
+++ b/build-requirements.txt
@@ -18,7 +18,7 @@ pyproject-hooks==1.2.0 \
     # via build
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==75.8.0 \
-    --hash=sha256:c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6 \
-    --hash=sha256:e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3
+setuptools==75.8.2 \
+    --hash=sha256:4880473a969e5f23f2a2be3646b2dfd84af9028716d398e46192f84bc36900d2 \
+    --hash=sha256:558e47c15f1811c1fa7adbd0096669bf76c1d3f433f58324df69f3f5ecac4e8f
     # via -r build-requirements.in

From 873fdf7428dae36393b77581c00beef58928932d Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 8 Mar 2025 13:39:16 -0500
Subject: [PATCH 778/992] tests: Use script.scratch_path over script.temp_path
 (#13272)

script.temp_path is the system temporary directory. scripttest will
check that there aren't any dangling files left in there, thus it's
inappropriate to write long-lived packages there.

These tests are currently passing as scripttest's temporary file
detection logic is broken. However, a newer version of scripttest will
fail.
---
 tests/functional/test_cli.py    | 2 +-
 tests/functional/test_pep517.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index 65946a1f46a..366d0129b2d 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -24,7 +24,7 @@ def test_entrypoints_work(entrypoint: str, script: PipTestEnvironment) -> None:
     if script.zipapp:
         pytest.skip("Zipapp does not include entrypoints")
 
-    fake_pkg = script.temp_path / "fake_pkg"
+    fake_pkg = script.scratch_path / "fake_pkg"
     fake_pkg.mkdir()
     fake_pkg.joinpath("setup.py").write_text(
         dedent(
diff --git a/tests/functional/test_pep517.py b/tests/functional/test_pep517.py
index fd9380d0eb6..34ddd6633ce 100644
--- a/tests/functional/test_pep517.py
+++ b/tests/functional/test_pep517.py
@@ -252,7 +252,7 @@ def test_pep517_backend_requirements_satisfied_by_prerelease(
     script.pip("install", "test_backend", "--no-index", "-f", data.backends)
 
     project_dir = make_project(
-        script.temp_path,
+        script.scratch_path,
         requires=["test_backend", "myreq"],
         backend="test_backend",
     )

From b3882c5ec1cf1b8fc5b1ae3284c8e1674f6ab8a5 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 8 Mar 2025 15:31:32 -0500
Subject: [PATCH 779/992] Prefer requirements with upper bounds

---
 .../html/topics/more-dependency-resolution.md |  7 ++-
 .../resolution/resolvelib/provider.py         | 12 ++++-
 .../resolution_resolvelib/test_provider.py    | 46 ++++++++++++++++---
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/docs/html/topics/more-dependency-resolution.md b/docs/html/topics/more-dependency-resolution.md
index c0afd3a4e28..96036bedf61 100644
--- a/docs/html/topics/more-dependency-resolution.md
+++ b/docs/html/topics/more-dependency-resolution.md
@@ -168,8 +168,11 @@ follows:
 * Prefer if any of the known requirements is "direct", e.g. points to an
     explicit URL.
 * If equal, prefer if any requirement is "pinned", i.e. contains
-    operator ``===`` or ``==``.
+    operator ``===`` or ``==`` without a wildcard.
+* Prefer requirements that are "upper-bounded" using operators that do
+    not allow all future versions, i.e. ``<``, ``<=``, ``~=``, and ``==``
+    with a wildcard.
 * Order user-specified requirements by the order they are specified.
 * If equal, prefers "non-free" requirements, i.e. contains at least one
-    operator, such as ``>=`` or ``<``.
+    operator, such as ``>=`` or ``!=``.
 * If equal, order alphabetically for consistency (helps debuggability).
diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index afdffe8191e..45edadf1aae 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -164,10 +164,13 @@ def get_preference(
         * Prefer if any of the known requirements is "direct", e.g. points to an
           explicit URL.
         * If equal, prefer if any requirement is "pinned", i.e. contains
-          operator ``===`` or ``==``.
+          operator ``===`` or ``==`` without a wildcard.
+        * Prefer requirements that are "upper-bounded" using operators that do
+          not allow all future versions, i.e. ``<``, ``<=``, ``~=``, and ``==``
+          with a wildcard.
         * Order user-specified requirements by the order they are specified.
         * If equal, prefers "non-free" requirements, i.e. contains at least one
-          operator, such as ``>=`` or ``<``.
+          operator, such as ``>=`` or ``!=``.
         * If equal, order alphabetically for consistency (helps debuggability).
         """
         try:
@@ -193,12 +196,17 @@ def get_preference(
 
         direct = candidate is not None
         pinned = any(((op[:2] == "==") and ("*" not in ver)) for op, ver in operators)
+        upper_bounded = any(
+            ((op in ("<", "<=", "~=")) or (op == "==" and "*" in ver))
+            for op, ver in operators
+        )
         unfree = bool(operators)
         requested_order = self._user_requested.get(identifier, math.inf)
 
         return (
             not direct,
             not pinned,
+            not upper_bounded,
             requested_order,
             not unfree,
             identifier,
diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index 690217e85ce..dcca9fd639f 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -42,7 +42,7 @@ def build_req_info(
             {"pinned-package": [build_req_info("pinned-package==1.0")]},
             [],
             {},
-            (False, False, math.inf, False, "pinned-package"),
+            (False, False, True, math.inf, False, "pinned-package"),
         ),
         # Star-specified package, i.e. with "*"
         (
@@ -50,7 +50,7 @@ def build_req_info(
             {"star-specified-package": [build_req_info("star-specified-package==1.*")]},
             [],
             {},
-            (False, True, math.inf, False, "star-specified-package"),
+            (False, True, False, math.inf, False, "star-specified-package"),
         ),
         # Package that caused backtracking
         (
@@ -58,7 +58,7 @@ def build_req_info(
             {"backtrack-package": [build_req_info("backtrack-package")]},
             [build_req_info("backtrack-package")],
             {},
-            (False, True, math.inf, True, "backtrack-package"),
+            (False, True, True, math.inf, True, "backtrack-package"),
         ),
         # Root package requested by user
         (
@@ -66,15 +66,15 @@ def build_req_info(
             {"root-package": [build_req_info("root-package")]},
             [],
             {"root-package": 1},
-            (False, True, 1, True, "root-package"),
+            (False, True, True, 1, True, "root-package"),
         ),
         # Unfree package (with specifier operator)
         (
             "unfree-package",
-            {"unfree-package": [build_req_info("unfree-package<1")]},
+            {"unfree-package": [build_req_info("unfree-package!=1")]},
             [],
             {},
-            (False, True, math.inf, False, "unfree-package"),
+            (False, True, True, math.inf, False, "unfree-package"),
         ),
         # Free package (no operator)
         (
@@ -82,7 +82,39 @@ def build_req_info(
             {"free-package": [build_req_info("free-package")]},
             [],
             {},
-            (False, True, math.inf, True, "free-package"),
+            (False, True, True, math.inf, True, "free-package"),
+        ),
+        # Upper bounded with <= operator
+        (
+            "upper-bound-lte-package",
+            {
+                "upper-bound-lte-package": [
+                    build_req_info("upper-bound-lte-package<=2.0")
+                ]
+            },
+            [],
+            {},
+            (False, True, False, math.inf, False, "upper-bound-lte-package"),
+        ),
+        # Upper bounded with ~= operator
+        (
+            "upper-bound-compatible-package",
+            {
+                "upper-bound-compatible-package": [
+                    build_req_info("upper-bound-compatible-package~=1.0")
+                ]
+            },
+            [],
+            {},
+            (False, True, False, math.inf, False, "upper-bound-compatible-package"),
+        ),
+        # Not upper bounded, using only >= operator
+        (
+            "lower-bound-package",
+            {"lower-bound-package": [build_req_info("lower-bound-package>=1.0")]},
+            [],
+            {},
+            (False, True, True, math.inf, False, "lower-bound-package"),
         ),
     ],
 )

From de28f96a011b6a6b7f245ffcbef30d2ca7996637 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 8 Mar 2025 15:31:38 -0500
Subject: [PATCH 780/992] NEWS ENTRY

---
 news/13273.feature.rst | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 news/13273.feature.rst

diff --git a/news/13273.feature.rst b/news/13273.feature.rst
new file mode 100644
index 00000000000..c4fcb576a76
--- /dev/null
+++ b/news/13273.feature.rst
@@ -0,0 +1,3 @@
+When resolving dependencies, prefer requirements that are "upper-bounded" using
+operators that do not allow all future versions, i.e. ``<``, ``<=``, ``~=``,
+and ``==`` with a wildcard.

From 39f78d6712010d12003c636d1dc6a61be44d55fb Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sun, 5 Jan 2025 14:32:26 -0500
Subject: [PATCH 781/992] Use inline dependency metadata for
 update-rtd-redirects.py

---
 .github/workflows/update-rtd-redirects.yml | 3 +--
 tools/update-rtd-redirects.py              | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-rtd-redirects.yml b/.github/workflows/update-rtd-redirects.yml
index 0beb2b84b97..3e854234bb2 100644
--- a/.github/workflows/update-rtd-redirects.yml
+++ b/.github/workflows/update-rtd-redirects.yml
@@ -22,7 +22,6 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
-      - run: pip install httpx pyyaml rich
-      - run: python tools/update-rtd-redirects.py
+      - run: pipx run tools/update-rtd-redirects.py
         env:
           RTD_API_TOKEN: ${{ secrets.RTD_API_TOKEN }}
diff --git a/tools/update-rtd-redirects.py b/tools/update-rtd-redirects.py
index 2aa90e467e3..8d53f01830d 100644
--- a/tools/update-rtd-redirects.py
+++ b/tools/update-rtd-redirects.py
@@ -3,6 +3,11 @@
 Relevant API reference: https://docs.readthedocs.io/en/stable/api/v3.html#redirects
 """
 
+# /// script
+# requires-python = ">=3.11"
+# dependencies = ["httpx", "rich", "pyyaml"]
+# ///
+
 import operator
 import os
 import sys

From 99601e9832a8ca6ae61de87e9e251b117b50bfd8 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 8 Mar 2025 19:23:12 -0500
Subject: [PATCH 782/992] ci: Skip redirect updates if config unchanged

---
 .github/workflows/update-rtd-redirects.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/update-rtd-redirects.yml b/.github/workflows/update-rtd-redirects.yml
index 3e854234bb2..c1f05cced63 100644
--- a/.github/workflows/update-rtd-redirects.yml
+++ b/.github/workflows/update-rtd-redirects.yml
@@ -3,6 +3,9 @@ name: Update documentation redirects
 on:
   push:
     branches: [main]
+    paths:
+      - ".readthedocs-custom-redirects.yml"
+      - ".readthedocs.yml"
   schedule:
     - cron: 0 0 * * MON # Run every Monday at 00:00 UTC
 

From e7f52d07e4517e23ce884db3811a59be244f96c9 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 9 Mar 2025 12:40:30 -0400
Subject: [PATCH 783/992] Clarify `get_preference` docs

---
 .../html/topics/more-dependency-resolution.md | 33 ++++++++++---------
 .../resolution/resolvelib/provider.py         | 23 +++++++------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/docs/html/topics/more-dependency-resolution.md b/docs/html/topics/more-dependency-resolution.md
index 96036bedf61..132cfef8043 100644
--- a/docs/html/topics/more-dependency-resolution.md
+++ b/docs/html/topics/more-dependency-resolution.md
@@ -160,19 +160,22 @@ Pip's current implementation of the provider implements
 
 * If Requires-Python is present only consider that
 * If there are causes of resolution conflict (backtrack causes) then
-  only consider them until there are no longer any resolution conflicts
-
-Pip's current implementation of the provider implements `get_preference` as
-follows:
-
-* Prefer if any of the known requirements is "direct", e.g. points to an
-    explicit URL.
-* If equal, prefer if any requirement is "pinned", i.e. contains
-    operator ``===`` or ``==`` without a wildcard.
-* Prefer requirements that are "upper-bounded" using operators that do
-    not allow all future versions, i.e. ``<``, ``<=``, ``~=``, and ``==``
-    with a wildcard.
-* Order user-specified requirements by the order they are specified.
-* If equal, prefers "non-free" requirements, i.e. contains at least one
+    only consider them until there are no longer any resolution conflicts
+
+Pip's current implementation of the provider implements `get_preference`
+for known requirements with the following preferences in following order:
+
+* Any requirement that is "direct", e.g., points to an explicit URL.
+* Any requirement that is "pinned", i.e., contains the operator ``===``
+    or ``==`` without a wildcard.
+* Any requirement that imposes an upper version limit, i.e., contains the
+    operator ``<``, ``<=``, ``~=``, or ``==`` with a wildcard. Because
+    pip prioritizes the latest version, preferring explicit upper bounds
+    can rule out infeasible candidates sooner. This does not imply that
+    upper bounds are good practice; they can make dependency management
+    and resolution harder.
+* Order user-specified requirements as they are specified, placing
+    other requirements afterward.
+* Any "non-free" requirement, i.e., one that contains at least one
     operator, such as ``>=`` or ``!=``.
-* If equal, order alphabetically for consistency (helps debuggability).
+* Alphabetical order for consistency (aids debuggability).
diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
index 45edadf1aae..617a993cb03 100644
--- a/src/pip/_internal/resolution/resolvelib/provider.py
+++ b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -161,17 +161,20 @@ def get_preference(
 
         Currently pip considers the following in order:
 
-        * Prefer if any of the known requirements is "direct", e.g. points to an
-          explicit URL.
-        * If equal, prefer if any requirement is "pinned", i.e. contains
-          operator ``===`` or ``==`` without a wildcard.
-        * Prefer requirements that are "upper-bounded" using operators that do
-          not allow all future versions, i.e. ``<``, ``<=``, ``~=``, and ``==``
-          with a wildcard.
-        * Order user-specified requirements by the order they are specified.
-        * If equal, prefers "non-free" requirements, i.e. contains at least one
+        * Any requirement that is "direct", e.g., points to an explicit URL.
+        * Any requirement that is "pinned", i.e., contains the operator ``===``
+          or ``==`` without a wildcard.
+        * Any requirement that imposes an upper version limit, i.e., contains the
+          operator ``<``, ``<=``, ``~=``, or ``==`` with a wildcard. Because
+          pip prioritizes the latest version, preferring explicit upper bounds
+          can rule out infeasible candidates sooner. This does not imply that
+          upper bounds are good practice; they can make dependency management
+          and resolution harder.
+        * Order user-specified requirements as they are specified, placing
+          other requirements afterward.
+        * Any "non-free" requirement, i.e., one that contains at least one
           operator, such as ``>=`` or ``!=``.
-        * If equal, order alphabetically for consistency (helps debuggability).
+        * Alphabetical order for consistency (aids debuggability).
         """
         try:
             next(iter(information[identifier]))

From cb50601c240d9974fb940b1fcc4b40e293c1537c Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 9 Mar 2025 12:40:40 -0400
Subject: [PATCH 784/992] Update NEWS ENTRY

---
 news/13273.feature.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/news/13273.feature.rst b/news/13273.feature.rst
index c4fcb576a76..ad3177ec3dd 100644
--- a/news/13273.feature.rst
+++ b/news/13273.feature.rst
@@ -1,3 +1 @@
-When resolving dependencies, prefer requirements that are "upper-bounded" using
-operators that do not allow all future versions, i.e. ``<``, ``<=``, ``~=``,
-and ``==`` with a wildcard.
+Improved heuristics for determining the order of dependency resolution.

From d7536d4a73b13ef1f351d5118be85fc7b90f1cb5 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 9 Mar 2025 16:53:43 -0400
Subject: [PATCH 785/992] Fix grammar

---
 docs/html/topics/more-dependency-resolution.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/html/topics/more-dependency-resolution.md b/docs/html/topics/more-dependency-resolution.md
index 132cfef8043..c048acd8528 100644
--- a/docs/html/topics/more-dependency-resolution.md
+++ b/docs/html/topics/more-dependency-resolution.md
@@ -163,7 +163,7 @@ Pip's current implementation of the provider implements
     only consider them until there are no longer any resolution conflicts
 
 Pip's current implementation of the provider implements `get_preference`
-for known requirements with the following preferences in following order:
+for known requirements with the following preferences in the following order:
 
 * Any requirement that is "direct", e.g., points to an explicit URL.
 * Any requirement that is "pinned", i.e., contains the operator ``===``

From 1e68d9cb3bd3b57578b0ff0b08f72832ee2dc635 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 9 Mar 2025 16:57:00 -0400
Subject: [PATCH 786/992] Add missing test

---
 tests/unit/resolution_resolvelib/test_provider.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index dcca9fd639f..8db40ddc298 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -96,6 +96,14 @@ def build_req_info(
             {},
             (False, True, False, math.inf, False, "upper-bound-lte-package"),
         ),
+        # Upper bounded with < operator
+        (
+            "upper-bound-lt-package",
+            {"upper-bound-lt-package": [build_req_info("upper-bound-lt-package<2.0")]},
+            [],
+            {},
+            (False, True, False, math.inf, False, "upper-bound-lt-package"),
+        ),
         # Upper bounded with ~= operator
         (
             "upper-bound-compatible-package",

From 251e89e7342726b9922f06751bebb37055605bca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 17:25:38 +0000
Subject: [PATCH 787/992] Bump setuptools from 75.8.2 to 76.0.0

Bumps [setuptools](https://github.com/pypa/setuptools) from 75.8.2 to 76.0.0.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v75.8.2...v76.0.0)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 
---
 build-requirements.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-requirements.txt b/build-requirements.txt
index d45cae7693e..c957b6b6d90 100644
--- a/build-requirements.txt
+++ b/build-requirements.txt
@@ -18,7 +18,7 @@ pyproject-hooks==1.2.0 \
     # via build
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==75.8.2 \
-    --hash=sha256:4880473a969e5f23f2a2be3646b2dfd84af9028716d398e46192f84bc36900d2 \
-    --hash=sha256:558e47c15f1811c1fa7adbd0096669bf76c1d3f433f58324df69f3f5ecac4e8f
+setuptools==76.0.0 \
+    --hash=sha256:199466a166ff664970d0ee145839f5582cb9bca7a0a3a2e795b6a9cb2308e9c6 \
+    --hash=sha256:43b4ee60e10b0d0ee98ad11918e114c70701bc6051662a9a675a0496c1a158f4
     # via -r build-requirements.in

From 16af4af35f1b73a894725ed62ad0624ebafac914 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Tue, 11 Mar 2025 19:23:02 -0400
Subject: [PATCH 788/992] Fix tests after merge

---
 .../resolution_resolvelib/test_provider.py    | 54 ++++++++++++++++---
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/tests/unit/resolution_resolvelib/test_provider.py b/tests/unit/resolution_resolvelib/test_provider.py
index b2bda5ffeb8..5399f60621a 100644
--- a/tests/unit/resolution_resolvelib/test_provider.py
+++ b/tests/unit/resolution_resolvelib/test_provider.py
@@ -59,7 +59,7 @@ def build_explicit_req_info(
             {"pinned-package": [build_req_info("pinned-package==1.0")]},
             [],
             {},
-            (False, False, True, math.inf, False, "pinned-package"),
+            (True, False, True, math.inf, False, "pinned-package"),
         ),
         # Star-specified package, i.e. with "*"
         (
@@ -67,7 +67,7 @@ def build_explicit_req_info(
             {"star-specified-package": [build_req_info("star-specified-package==1.*")]},
             [],
             {},
-            (False, True, False, math.inf, False, "star-specified-package"),
+            (True, True, False, math.inf, False, "star-specified-package"),
         ),
         # Package that caused backtracking
         (
@@ -75,7 +75,7 @@ def build_explicit_req_info(
             {"backtrack-package": [build_req_info("backtrack-package")]},
             [build_req_info("backtrack-package")],
             {},
-            (False, True, True, math.inf, True, "backtrack-package"),
+            (True, True, True, math.inf, True, "backtrack-package"),
         ),
         # Root package requested by user
         (
@@ -83,7 +83,7 @@ def build_explicit_req_info(
             {"root-package": [build_req_info("root-package")]},
             [],
             {"root-package": 1},
-            (False, True, True, 1, True, "root-package"),
+            (True, True, True, 1, True, "root-package"),
         ),
         # Unfree package (with specifier operator)
         (
@@ -91,7 +91,7 @@ def build_explicit_req_info(
             {"unfree-package": [build_req_info("unfree-package!=1")]},
             [],
             {},
-            (False, True, True, math.inf, False, "unfree-package"),
+            (True, True, True, math.inf, False, "unfree-package"),
         ),
         # Free package (no operator)
         (
@@ -99,7 +99,7 @@ def build_explicit_req_info(
             {"free-package": [build_req_info("free-package")]},
             [],
             {},
-            (True, True, math.inf, True, "free-package"),
+            (True, True, True, math.inf, True, "free-package"),
         ),
         # Test case for "direct" preference (explicit URL)
         (
@@ -107,7 +107,47 @@ def build_explicit_req_info(
             {"direct-package": [build_explicit_req_info("direct-package")]},
             [],
             {},
-            (False, True, math.inf, True, "direct-package"),
+            (False, True, True, math.inf, True, "direct-package"),
+        ),
+        # Upper bounded with <= operator
+        (
+            "upper-bound-lte-package",
+            {
+                "upper-bound-lte-package": [
+                    build_req_info("upper-bound-lte-package<=2.0")
+                ]
+            },
+            [],
+            {},
+            (True, True, False, math.inf, False, "upper-bound-lte-package"),
+        ),
+        # Upper bounded with < operator
+        (
+            "upper-bound-lt-package",
+            {"upper-bound-lt-package": [build_req_info("upper-bound-lt-package<2.0")]},
+            [],
+            {},
+            (True, True, False, math.inf, False, "upper-bound-lt-package"),
+        ),
+        # Upper bounded with ~= operator
+        (
+            "upper-bound-compatible-package",
+            {
+                "upper-bound-compatible-package": [
+                    build_req_info("upper-bound-compatible-package~=1.0")
+                ]
+            },
+            [],
+            {},
+            (True, True, False, math.inf, False, "upper-bound-compatible-package"),
+        ),
+        # Not upper bounded, using only >= operator
+        (
+            "lower-bound-package",
+            {"lower-bound-package": [build_req_info("lower-bound-package>=1.0")]},
+            [],
+            {},
+            (True, True, True, math.inf, False, "lower-bound-package"),
         ),
     ],
 )

From 13c73dd0ac64258a5b8425998e65430c0d7cfc99 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Thu, 13 Mar 2025 08:30:08 -0400
Subject: [PATCH 789/992] Remove invalid specifier from resolution
 documentation

---
 docs/html/topics/dependency-resolution.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/html/topics/dependency-resolution.md b/docs/html/topics/dependency-resolution.md
index b932a2cdaf8..8560e67b81b 100644
--- a/docs/html/topics/dependency-resolution.md
+++ b/docs/html/topics/dependency-resolution.md
@@ -245,7 +245,7 @@ To find a version of both `package_coffee` and `package_tea` that depend on
 the same version of `package_water`, you might consider:
 
 - Loosening the range of packages that you are prepared to install
-  (e.g. `pip install "package_coffee>0.44.*" "package_tea>4.0.0"`)
+  (e.g. `pip install "package_coffee>0.44" "package_tea>4.0.0"`)
 - Asking pip to install _any_ version of `package_coffee` and `package_tea`
   by removing the version specifiers altogether (e.g.
   `pip install package_coffee package_tea`)

From 567242115a8b35126ad0d2979b14a9d77c65703a Mon Sep 17 00:00:00 2001
From: nucccc <44038808+nucccc@users.noreply.github.com>
Date: Fri, 14 Mar 2025 04:58:31 +0100
Subject: [PATCH 790/992] Suggest checking "pip config debug" in case of
 InvalidProxyURL error (#12690)

---
 news/12649.feature.rst                |  1 +
 src/pip/_internal/commands/install.py |  8 ++++++++
 tests/unit/test_command_install.py    | 12 ++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 news/12649.feature.rst

diff --git a/news/12649.feature.rst b/news/12649.feature.rst
new file mode 100644
index 00000000000..12719465516
--- /dev/null
+++ b/news/12649.feature.rst
@@ -0,0 +1 @@
+Suggest checking "pip config debug" in case of an InvalidProxyURL error.
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
index 5239d010421..49b8fd78bef 100644
--- a/src/pip/_internal/commands/install.py
+++ b/src/pip/_internal/commands/install.py
@@ -8,6 +8,7 @@
 from typing import List, Optional
 
 from pip._vendor.packaging.utils import canonicalize_name
+from pip._vendor.requests.exceptions import InvalidProxyURL
 from pip._vendor.rich import print_json
 
 # Eagerly import self_outdated_check to avoid crashes. Otherwise,
@@ -766,6 +767,13 @@ def create_os_error_message(
             parts.append(permissions_part)
         parts.append(".\n")
 
+    # Suggest to check "pip config debug" in case of invalid proxy
+    if type(error) is InvalidProxyURL:
+        parts.append(
+            'Consider checking your local proxy configuration with "pip config debug"'
+        )
+        parts.append(".\n")
+
     # Suggest the user to enable Long Paths if path length is
     # more than 260
     if (
diff --git a/tests/unit/test_command_install.py b/tests/unit/test_command_install.py
index 5e7889fe16b..e28edf6449c 100644
--- a/tests/unit/test_command_install.py
+++ b/tests/unit/test_command_install.py
@@ -3,6 +3,8 @@
 
 import pytest
 
+from pip._vendor.requests.exceptions import InvalidProxyURL
+
 from pip._internal.commands import install
 from pip._internal.commands.install import create_os_error_message, decide_user_install
 
@@ -108,6 +110,16 @@ def test_most_cases(
             " file permission\nConsider using the `--user` option or check the"
             " permissions.\n",
         ),
+        # Testing custom InvalidProxyURL with help message
+        #  show_traceback = True, using_user_site = True
+        (
+            InvalidProxyURL(),
+            True,
+            True,
+            "Could not install packages due to an OSError.\n"
+            "Consider checking your local proxy configuration"
+            ' with "pip config debug".\n',
+        ),
     ],
 )
 def test_create_os_error_message(

From 147dc0b6245e08eaac46d25314985fcf47d0d1b9 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger 
Date: Fri, 14 Mar 2025 22:07:02 +0100
Subject: [PATCH 791/992] Fix fish completion when commandline contains
 multiple commands (#9727)

This changes some of the options passed to "complete", see also
https://fishshell.com/docs/current/cmds/complete.html

The flag --current-process means to only include tokens of the current command,
as delimited by shell metacharacters like ;, & and |, and newlines.

This fixes completion of a command line like
"python && pip ". Previously we'd run "eval python" (!)

Also, avoid using "eval" if possible since it's usually not necessary in
fish 3.0.0 and later.

Flag --cut-at-cursor means to only include tokens left of the cursor.
It's extremely unusual in fish that completions use anything right of the
cursor to complete. I didn't check pip sources but I doubt it's an exception.

I also used --cut-at-cursor for the current token because it potentially
offers more completions, and fish will filter them anyway.
for example, now it's possible to get completions on a commandline like

	pip uninstall urllb3
			 ^ cursor is here, so "commmandline -tc" is "url"

This correctly completes to "urllib3", because fish uses fuzzy matching ;)
---
 news/9727.bugfix.rst                     |  1 +
 src/pip/_internal/commands/completion.py | 16 +++++++++++-----
 tests/functional/test_completion.py      | 16 +++++++++++-----
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 news/9727.bugfix.rst

diff --git a/news/9727.bugfix.rst b/news/9727.bugfix.rst
new file mode 100644
index 00000000000..980a4633556
--- /dev/null
+++ b/news/9727.bugfix.rst
@@ -0,0 +1 @@
+Fix fish shell completion when commandline contains multiple commands.
diff --git a/src/pip/_internal/commands/completion.py b/src/pip/_internal/commands/completion.py
index 9e89e279883..fe041d2951a 100644
--- a/src/pip/_internal/commands/completion.py
+++ b/src/pip/_internal/commands/completion.py
@@ -38,12 +38,18 @@
     """,
     "fish": """
         function __fish_complete_pip
-            set -lx COMP_WORDS (commandline -o) ""
-            set -lx COMP_CWORD ( \\
-                math (contains -i -- (commandline -t) $COMP_WORDS)-1 \\
-            )
+            set -lx COMP_WORDS \\
+                (commandline --current-process --tokenize --cut-at-cursor) \\
+                (commandline --current-token --cut-at-cursor)
+            set -lx COMP_CWORD (math (count $COMP_WORDS) - 1)
             set -lx PIP_AUTO_COMPLETE 1
-            string split \\  -- (eval $COMP_WORDS[1])
+            set -l completions
+            if string match -q '2.*' $version
+                set completions (eval $COMP_WORDS[1])
+            else
+                set completions ($COMP_WORDS[1])
+            end
+            string split \\  -- $completions
         end
         complete -fa "(__fish_complete_pip)" -c {prog}
     """,
diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py
index a52b135c8b0..c8410f2ddda 100644
--- a/tests/functional/test_completion.py
+++ b/tests/functional/test_completion.py
@@ -23,12 +23,18 @@
         "fish",
         """\
 function __fish_complete_pip
-    set -lx COMP_WORDS (commandline -o) ""
-    set -lx COMP_CWORD ( \\
-        math (contains -i -- (commandline -t) $COMP_WORDS)-1 \\
-    )
+    set -lx COMP_WORDS \\
+        (commandline --current-process --tokenize --cut-at-cursor) \\
+        (commandline --current-token --cut-at-cursor)
+    set -lx COMP_CWORD (math (count $COMP_WORDS) - 1)
     set -lx PIP_AUTO_COMPLETE 1
-    string split \\  -- (eval $COMP_WORDS[1])
+    set -l completions
+    if string match -q '2.*' $version
+        set completions (eval $COMP_WORDS[1])
+    else
+        set completions ($COMP_WORDS[1])
+    end
+    string split \\  -- $completions
 end
 complete -fa "(__fish_complete_pip)" -c pip""",
     ),

From d97fd0b165c6b2493c6aaa3e84b8cdd24603a6ad Mon Sep 17 00:00:00 2001
From: Alexander Regueiro 
Date: Sat, 15 Mar 2025 15:57:56 +0000
Subject: [PATCH 792/992] Handle multiple paths in `appdirs.site_config_dirs`
 on MacOS (#13280)

This occurs when using Homebrew, for example.
---
 news/12903.bugfix.rst              |  1 +
 src/pip/_internal/utils/appdirs.py |  3 ++-
 tests/unit/test_appdirs.py         | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 news/12903.bugfix.rst

diff --git a/news/12903.bugfix.rst b/news/12903.bugfix.rst
new file mode 100644
index 00000000000..441ecae039e
--- /dev/null
+++ b/news/12903.bugfix.rst
@@ -0,0 +1 @@
+Support multiple global configuration paths returned by ``platformdirs`` on MacOS.
diff --git a/src/pip/_internal/utils/appdirs.py b/src/pip/_internal/utils/appdirs.py
index 16933bf8afe..42b6e548bb2 100644
--- a/src/pip/_internal/utils/appdirs.py
+++ b/src/pip/_internal/utils/appdirs.py
@@ -42,7 +42,8 @@ def user_config_dir(appname: str, roaming: bool = True) -> str:
 # see 
 def site_config_dirs(appname: str) -> List[str]:
     if sys.platform == "darwin":
-        return [_appdirs.site_data_dir(appname, appauthor=False, multipath=True)]
+        dirval = _appdirs.site_data_dir(appname, appauthor=False, multipath=True)
+        return dirval.split(os.pathsep)
 
     dirval = _appdirs.site_config_dir(appname, appauthor=False, multipath=True)
     if sys.platform == "win32":
diff --git a/tests/unit/test_appdirs.py b/tests/unit/test_appdirs.py
index 51bd6828e2a..83a9aec03fb 100644
--- a/tests/unit/test_appdirs.py
+++ b/tests/unit/test_appdirs.py
@@ -109,6 +109,17 @@ def test_site_config_dirs_osx(self, monkeypatch: pytest.MonkeyPatch) -> None:
             "/Library/Application Support/pip",
         ]
 
+    @pytest.mark.skipif(sys.platform != "darwin", reason="MacOS-only test")
+    def test_site_config_dirs_osx_homebrew(
+        self, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setattr(sys, "prefix", "/opt/homebrew/")
+
+        assert appdirs.site_config_dirs("pip") == [
+            "/opt/homebrew/share/pip",
+            "/Library/Application Support/pip",
+        ]
+
     @pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
     def test_site_config_dirs_linux(self, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.delenv("XDG_CONFIG_DIRS", raising=False)

From 99cbedbaaad95f9654718d0f04bea25c42c946d0 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sat, 15 Mar 2025 23:27:17 -0400
Subject: [PATCH 793/992] Diagnostic Error for Resolution Too Deep

---
 docs/html/topics/dependency-resolution.md     | 67 ++++++++++++++++++-
 src/pip/_internal/exceptions.py               | 20 ++++++
 .../resolution/resolvelib/resolver.py         |  5 +-
 3 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/docs/html/topics/dependency-resolution.md b/docs/html/topics/dependency-resolution.md
index b932a2cdaf8..44fb3e2b3db 100644
--- a/docs/html/topics/dependency-resolution.md
+++ b/docs/html/topics/dependency-resolution.md
@@ -39,7 +39,7 @@ of how dependency resolution for Python packages works.
 The user requests `pip install tea`. The package `tea` declares a dependency on
 `hot-water`, `spoon`, `cup`, amongst others.
 
-pip starts by picking the most recent version of `tea` and get the list of
+pip starts by picking the most recent version of `tea` and gets the list of
 dependencies of that version of `tea`. It will then repeat the process for
 those packages, picking the most recent version of `spoon` and then `cup`. Now,
 pip notices that the version of `cup` it has chosen is not compatible with the
@@ -298,7 +298,70 @@ In this situation, you could consider:
 - Refactoring your project to reduce the number of dependencies (for
   example, by breaking up a monolithic code base into smaller pieces).
 
-### Getting help
+## Handling Resolution Too Deep Errors
+
+Sometimes pip's dependency resolver may exceed its search depth and terminate
+with a `ResolutionTooDeepError` exception. This typically occurs when the
+dependency graph is extremely complex or when there are too many package
+versions to evaluate.
+
+To address this error, consider the following strategies:
+
+### Specify Reasonable Lower Bounds
+
+By setting a higher lower bound for your dependencies, you narrow the search
+space. This excludes older versions that might trigger excessive backtracking.
+For example:
+
+```{pip-cli}
+$ pip install "package_coffee>=0.44.0" "package_tea>=4.0.0"
+```
+
+### Use the `--upgrade` Flag
+
+The `--upgrade` flag directs pip to ignore already installed versions and
+search for the latest versions that meet your requirements. This can help
+avoid unnecessary resolution paths:
+
+```{pip-cli}
+$ pip install --upgrade package_coffee package_tea
+```
+
+### Utilize Constraint Files
+
+If you need to impose additional version restrictions on transitive
+dependencies (dependencies of dependencies), consider using a constraint
+file. A constraint file specifies version limits for packages that are
+indirectly required. For example:
+
+```
+# constraints.txt
+indirect_dependency>=2.0.0
+```
+
+Then install your packages with:
+
+```{pip-cli}
+$ pip install --constraint constraints.txt package_coffee package_tea
+```
+
+### Use Upper Bounds Sparingly
+
+Although upper bounds are generally discouraged because they can complicate
+dependency management, they may be necessary when certain versions are known
+to cause conflicts. Use them cautiously—for example:
+
+```{pip-cli}
+$ pip install "package_coffee>=0.44.0,<1.0.0" "package_tea>=4.0.0"
+```
+
+### Report ResolutionTooDeep Errors
+
+If you encounter a `ResolutionTooDeep` error consider reporting it, to help
+the pip team have real world examples to test against, at the dedicated
+[pip issue](https://github.com/pypa/pip/issues/13281).
+
+## Getting help
 
 If none of the suggestions above work for you, we recommend that you ask
 for help on:
diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index 45a876a850d..313bbf51b9a 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -807,3 +807,23 @@ def __init__(
             ),
             hint_stmt="To proceed this package must be uninstalled.",
         )
+
+
+class ResolutionTooDeepError(DiagnosticPipError):
+    """Raised when the dependency resolver exceeds the maximum recursion depth."""
+
+    reference = "resolution-too-deep"
+
+    def __init__(self) -> None:
+        super().__init__(
+            message="Dependency resolution exceeded maximum depth",
+            context=(
+                "Pip cannot resolve the current dependencies as the dependency graph "
+                "is too complex for pip to solve efficiently."
+            ),
+            hint_stmt=(
+                "Try adding lower bounds to constrain your dependencies, "
+                "for example: 'package>=2.0.0' instead of just 'package'. "
+            ),
+            link="https://pip.pypa.io/en/stable/topics/dependency-resolution/#handling-resolution-too-deep-errors",
+        )
diff --git a/src/pip/_internal/resolution/resolvelib/resolver.py b/src/pip/_internal/resolution/resolvelib/resolver.py
index e6d5f303740..24c9b16996a 100644
--- a/src/pip/_internal/resolution/resolvelib/resolver.py
+++ b/src/pip/_internal/resolution/resolvelib/resolver.py
@@ -5,11 +5,12 @@
 from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple, cast
 
 from pip._vendor.packaging.utils import canonicalize_name
-from pip._vendor.resolvelib import BaseReporter, ResolutionImpossible
+from pip._vendor.resolvelib import BaseReporter, ResolutionImpossible, ResolutionTooDeep
 from pip._vendor.resolvelib import Resolver as RLResolver
 from pip._vendor.resolvelib.structs import DirectedGraph
 
 from pip._internal.cache import WheelCache
+from pip._internal.exceptions import ResolutionTooDeepError
 from pip._internal.index.package_finder import PackageFinder
 from pip._internal.operations.prepare import RequirementPreparer
 from pip._internal.req.constructors import install_req_extend_extras
@@ -102,6 +103,8 @@ def resolve(
                 collected.constraints,
             )
             raise error from e
+        except ResolutionTooDeep:
+            raise ResolutionTooDeepError from None
 
         req_set = RequirementSet(check_supported_wheels=check_supported_wheels)
         # process candidates with extras last to ensure their base equivalent is

From 2bc540c6af1f571e9d7cf674375fcaecdc3fc4b6 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 16 Mar 2025 00:09:07 -0400
Subject: [PATCH 794/992] NEWS ENTRY

---
 news/13282.feature.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 news/13282.feature.rst

diff --git a/news/13282.feature.rst b/news/13282.feature.rst
new file mode 100644
index 00000000000..30456b7a664
--- /dev/null
+++ b/news/13282.feature.rst
@@ -0,0 +1,2 @@
+Provide hint, documentation, and link to the documentation when
+resolution too deep error occurs.

From 64b34b4d546413b7ae0aadb88e270cca5acb630c Mon Sep 17 00:00:00 2001
From: developer 
Date: Mon, 17 Mar 2025 05:36:55 +0300
Subject: [PATCH 795/992] fix: changed command sysconfig.get_platform() by
 packaging.tags.sys_tags()

---
 docs/html/cli/pip_download.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/html/cli/pip_download.rst b/docs/html/cli/pip_download.rst
index 666d2afab93..03117136997 100644
--- a/docs/html/cli/pip_download.rst
+++ b/docs/html/cli/pip_download.rst
@@ -52,11 +52,11 @@ and let pip download know where to find them using ``--find-links``.
    To determine the appropriate values for ``--python-version`` and ``--platform``, you can query the target system using the following commands:
 
    - For the Python version, use :func:`sysconfig.get_python_version() `.
-   - For the platform, use :func:`sysconfig.get_platform() `.
+   - For the platform, use :func:`packaging.tags.sys_tags() `.
 
    Refer to the official Python documentation for more details:
    - `sysconfig.get_python_version() `_
-   - `sysconfig.get_platform() `_
+   - `packaging.tags.sys_tags() `_
 
 Options
 =======

From 29e0e689a72f24843342da56563aa1fe6b2f4bfe Mon Sep 17 00:00:00 2001
From: rmorotti 
Date: Tue, 23 Jul 2024 12:05:15 +0100
Subject: [PATCH 796/992] PERF: get_requirement() raise cache from 2048 to 8192
 elements

small performance improvements when installing hundreds of packages.
---
 src/pip/_internal/utils/packaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/utils/packaging.py b/src/pip/_internal/utils/packaging.py
index caad70f7fd1..5bac550d723 100644
--- a/src/pip/_internal/utils/packaging.py
+++ b/src/pip/_internal/utils/packaging.py
@@ -35,7 +35,7 @@ def check_requires_python(
     return python_version in requires_python_specifier
 
 
-@functools.lru_cache(maxsize=2048)
+@functools.lru_cache(maxsize=10000)
 def get_requirement(req_string: str) -> Requirement:
     """Construct a packaging.Requirement object with caching"""
     # Parsing requirement strings is expensive, and is also expected to happen

From 3634e872fef7afd37db87f5ae3b07150f9b7084f Mon Sep 17 00:00:00 2001
From: rmorotti 
Date: Tue, 23 Jul 2024 12:36:50 +0100
Subject: [PATCH 797/992] add news item

---
 news/12873.feature.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 news/12873.feature.rst

diff --git a/news/12873.feature.rst b/news/12873.feature.rst
new file mode 100644
index 00000000000..e982c3ee05e
--- /dev/null
+++ b/news/12873.feature.rst
@@ -0,0 +1,2 @@
+Minor performance improvement when installing packages with a large number
+of dependencies by increasing the requirement string cache size.
\ No newline at end of file

From af8e28ec19a71746fa55eaafd1f820bd9728fc58 Mon Sep 17 00:00:00 2001
From: rmorotti 
Date: Thu, 20 Mar 2025 13:31:54 +0000
Subject: [PATCH 798/992] news item need an empty line

---
 news/12873.feature.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/12873.feature.rst b/news/12873.feature.rst
index e982c3ee05e..440fecc1d9f 100644
--- a/news/12873.feature.rst
+++ b/news/12873.feature.rst
@@ -1,2 +1,2 @@
 Minor performance improvement when installing packages with a large number
-of dependencies by increasing the requirement string cache size.
\ No newline at end of file
+of dependencies by increasing the requirement string cache size.

From 0285e1acedadf5492b3ec3a401b93c58b279f76c Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos Orfanos
 <3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Thu, 20 Mar 2025 21:37:57 +0100
Subject: [PATCH 799/992] Apply ruff/flake8-comprehensions rule C420 (#13284)

C420 Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead

Starting with ruff 0.10.0, the above rule has been stabilized and is
no longer in preview.
---
 src/pip/_internal/locations/_sysconfig.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/locations/_sysconfig.py b/src/pip/_internal/locations/_sysconfig.py
index ca860ea562c..efc3cbadcf2 100644
--- a/src/pip/_internal/locations/_sysconfig.py
+++ b/src/pip/_internal/locations/_sysconfig.py
@@ -161,9 +161,9 @@ def get_scheme(
         scheme_name = "posix_prefix"
 
     if home is not None:
-        variables = {k: home for k in _HOME_KEYS}
+        variables = dict.fromkeys(_HOME_KEYS, home)
     elif prefix is not None:
-        variables = {k: prefix for k in _HOME_KEYS}
+        variables = dict.fromkeys(_HOME_KEYS, prefix)
     else:
         variables = {}
 

From dcbfc44724915a0678db754dd22ac1473e350ce7 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 20 Mar 2025 17:34:02 -0400
Subject: [PATCH 800/992] Revert "Apply ruff/flake8-comprehensions rule C420
 (#13284)"

This reverts commit 0285e1acedadf5492b3ec3a401b93c58b279f76c.
---
 src/pip/_internal/locations/_sysconfig.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/locations/_sysconfig.py b/src/pip/_internal/locations/_sysconfig.py
index efc3cbadcf2..ca860ea562c 100644
--- a/src/pip/_internal/locations/_sysconfig.py
+++ b/src/pip/_internal/locations/_sysconfig.py
@@ -161,9 +161,9 @@ def get_scheme(
         scheme_name = "posix_prefix"
 
     if home is not None:
-        variables = dict.fromkeys(_HOME_KEYS, home)
+        variables = {k: home for k in _HOME_KEYS}
     elif prefix is not None:
-        variables = dict.fromkeys(_HOME_KEYS, prefix)
+        variables = {k: prefix for k in _HOME_KEYS}
     else:
         variables = {}
 

From 6fdeb526b677a365f777801acef7ea621d3d44a3 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 20 Mar 2025 17:34:39 -0400
Subject: [PATCH 801/992] Disable Ruff rule C420
 unnecessary-dict-comprehension-for-iterable

It makes code less readable.
---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 23830a24881..5bc7f455140 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -168,6 +168,7 @@ ignore = [
     "B020",
     "B904", # Ruff enables opinionated warnings by default
     "B905", # Ruff enables opinionated warnings by default
+    "C420", # unnecessary-dict-comprehension-for-iterable (worsens readability)
 ]
 select = [
     "ASYNC",

From fdca73a9195fba13deeaef85ee3cd2ca6f05a8b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 18:21:42 +0000
Subject: [PATCH 802/992] Bump the github-actions group with 2 updates

Bumps the github-actions group with 2 updates: [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/upload-artifact` from 4.6.1 to 4.6.2
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1...ea165f8d65b6e75b540449e92b4886f43607fa02)

Updates `actions/download-artifact` from 4.1.9 to 4.2.1
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/cc203385981b70ca67e1cc392babf9cc229d5806...95815c38cf2ff2164869cbab79da8d1f422bc89e)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] 
---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 15e5ee3a576..e7d7755cd4a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Build a binary wheel and a source tarball
         run: ./build-project.py
       - name: Store the distribution packages
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: python-package-distributions
           path: dist/
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4
         with:
           name: python-package-distributions
           path: dist/

From d551f661cfa3ca33950f3909b751d2f5ea2fb3bb Mon Sep 17 00:00:00 2001
From: Jake Lishman 
Date: Fri, 28 Mar 2025 22:47:36 +0000
Subject: [PATCH 803/992] Provide traceback on setuptools import failure in
 legacy paths (#13291)

In the legacy `setup.py` wrapper importer, failures to import
setuptools might not be because setuptools itself is absent, but
because it failed to import successfully.  This can currently arise (as
of `setuptools==77.0.1`) in seemingly valid environments due to
limitations in the setuptools vendoring.  This commit exposes more of
the failure up to users, to help with debugging failed environments, and
makes it possible for setuptools to expose a better error message
itself through the import system.

The above situation is more likely than setuptools being wholly
absent as the legacy code paths invoke setup.py will check that
setuptools is installed (and install setuptools in a temporary build
env. if not) beforehand.

For some more context, see pypa/setuptools#4894.
---
 news/13290.feature.rst                      |  1 +
 src/pip/_internal/utils/setuptools_build.py |  9 ++++----
 tests/functional/test_install_reqs.py       | 24 +++++++++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 news/13290.feature.rst

diff --git a/news/13290.feature.rst b/news/13290.feature.rst
new file mode 100644
index 00000000000..ec3c1ac2ea7
--- /dev/null
+++ b/news/13290.feature.rst
@@ -0,0 +1 @@
+Include traceback on failure to import ``setuptools`` when ``setup.py`` is being invoked directly.
diff --git a/src/pip/_internal/utils/setuptools_build.py b/src/pip/_internal/utils/setuptools_build.py
index 96d1b246067..f178f4b3d99 100644
--- a/src/pip/_internal/utils/setuptools_build.py
+++ b/src/pip/_internal/utils/setuptools_build.py
@@ -17,16 +17,17 @@
     #   setuptools doesn't think the script is `-c`. This avoids the following warning:
     #     manifest_maker: standard file '-c' not found".
     # - It generates a shim setup.py, for handling setup.cfg-only projects.
-    import os, sys, tokenize
+    import os, sys, tokenize, traceback
 
     try:
         import setuptools
-    except ImportError as error:
+    except ImportError:
         print(
-            "ERROR: Can not execute `setup.py` since setuptools is not available in "
-            "the build environment.",
+            "ERROR: Can not execute `setup.py` since setuptools failed to import in "
+            "the build environment with exception:",
             file=sys.stderr,
         )
+        traceback.print_exc()
         sys.exit(1)
 
     __file__ = %r
diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py
index 7a553ae9192..3c5b6db4a68 100644
--- a/tests/functional/test_install_reqs.py
+++ b/tests/functional/test_install_reqs.py
@@ -13,6 +13,7 @@
     _create_test_package_with_subdirectory,
     create_basic_sdist_for_package,
     create_basic_wheel_for_package,
+    make_wheel,
     need_svn,
     requirements_file,
 )
@@ -917,3 +918,26 @@ def test_config_settings_local_to_package(
     assert "--verbose" not in simple3_args
     simple2_args = simple2_sdist.args()
     assert "--verbose" not in simple2_args
+
+
+def test_nonpep517_setuptools_import_failure(script: PipTestEnvironment) -> None:
+    """Any import failures of `setuptools` should inform the user both that it's
+    not pip's fault, but also exactly what went wrong in the import."""
+    # Install a poisoned version of 'setuptools' that fails to import.
+    name = "setuptools_poisoned"
+    module = """\
+raise ImportError("this 'setuptools' was intentionally poisoned")
+"""
+    path = make_wheel(name, "0.1.0", extra_files={"setuptools.py": module}).save_to_dir(
+        script.scratch_path
+    )
+    script.pip("install", "--no-index", path)
+
+    result = script.pip_install_local("--no-use-pep517", "simple", expect_error=True)
+    nice_message = (
+        "ERROR: Can not execute `setup.py`"
+        " since setuptools failed to import in the build environment"
+    )
+    exc_message = "ImportError: this 'setuptools' was intentionally poisoned"
+    assert nice_message in result.stderr
+    assert exc_message in result.stderr

From e00c5100e3c29828d980fa8e7acf4cf43ec875a9 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 29 Mar 2025 16:44:41 -0400
Subject: [PATCH 804/992] Postpone removal of non-bare names in egg fragment to
 25.2 (#13309)

I don't have time to add support for Direct URLs for VSC editables
which is needed to finish this deprecation before 25.1.
---
 src/pip/_internal/models/link.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index 27ad016090c..0c7a1e9a691 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -468,7 +468,7 @@ def _egg_fragment(self) -> Optional[str]:
             deprecated(
                 reason=f"{self} contains an egg fragment with a non-PEP 508 name.",
                 replacement="to use the req @ url syntax, and remove the egg fragment",
-                gone_in="25.1",
+                gone_in="25.2",
                 issue=13157,
             )
 

From 7eb71fa6fe9734642ec06c9e79aa66e4ee8be899 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 31 Mar 2025 12:19:33 -0400
Subject: [PATCH 805/992] ci: Test packaging flow on Windows (#13184)

Most of pip's maintainers use non-Windows environments, so it's easy for
our tooling to regress on Windows. Let's avoid that for our release
flow.

In addition, remove the dependency on the packaging job by the test
jobs. The packaging job rarely fails so we aren't saving any CI
resources by failing early if the packaging job fails.
---
 .github/workflows/ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b582e10499..98ec373d7c2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,8 +63,11 @@ jobs:
         if: github.event_name == 'pull_request'
 
   packaging:
-    name: packaging
-    runs-on: ubuntu-22.04
+    name: packaging / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, windows-latest]
 
     steps:
       - uses: actions/checkout@v4
@@ -104,7 +107,7 @@ jobs:
     name: tests / ${{ matrix.python.key || matrix.python }} / ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
 
-    needs: [packaging, determine-changes]
+    needs: [determine-changes]
     if: >-
       needs.determine-changes.outputs.tests == 'true' ||
       github.event_name != 'pull_request'

From 5bd617d79b362cb811ba0a733c21b079b9812063 Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Tue, 1 Apr 2025 11:52:12 +0100
Subject: [PATCH 806/992] Upgrade platformdirs to 4.3.7

---
 news/platformdirs.vendor.rst             |  1 +
 src/pip/_vendor/platformdirs/__init__.py | 40 ++++++++++++------------
 src/pip/_vendor/platformdirs/android.py  |  6 ++--
 src/pip/_vendor/platformdirs/api.py      |  5 +--
 src/pip/_vendor/platformdirs/unix.py     |  5 ++-
 src/pip/_vendor/platformdirs/version.py  | 13 +++++---
 src/pip/_vendor/vendor.txt               |  2 +-
 7 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 news/platformdirs.vendor.rst

diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
new file mode 100644
index 00000000000..d1f397d2308
--- /dev/null
+++ b/news/platformdirs.vendor.rst
@@ -0,0 +1 @@
+Upgrade platformdirs to 4.3.7
diff --git a/src/pip/_vendor/platformdirs/__init__.py b/src/pip/_vendor/platformdirs/__init__.py
index edc21fad2e9..2325ec2eb6f 100644
--- a/src/pip/_vendor/platformdirs/__init__.py
+++ b/src/pip/_vendor/platformdirs/__init__.py
@@ -52,7 +52,7 @@ def _set_platform_dir_class() -> type[PlatformDirsABC]:
 
 def user_data_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -76,7 +76,7 @@ def user_data_dir(
 
 def site_data_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     multipath: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -100,7 +100,7 @@ def site_data_dir(
 
 def user_config_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -124,7 +124,7 @@ def user_config_dir(
 
 def site_config_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     multipath: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -148,7 +148,7 @@ def site_config_dir(
 
 def user_cache_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -172,7 +172,7 @@ def user_cache_dir(
 
 def site_cache_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -196,7 +196,7 @@ def site_cache_dir(
 
 def user_state_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -220,7 +220,7 @@ def user_state_dir(
 
 def user_log_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -274,7 +274,7 @@ def user_desktop_dir() -> str:
 
 def user_runtime_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -298,7 +298,7 @@ def user_runtime_dir(
 
 def site_runtime_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -322,7 +322,7 @@ def site_runtime_dir(
 
 def user_data_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -346,7 +346,7 @@ def user_data_path(
 
 def site_data_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     multipath: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -370,7 +370,7 @@ def site_data_path(
 
 def user_config_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -394,7 +394,7 @@ def user_config_path(
 
 def site_config_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     multipath: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -418,7 +418,7 @@ def site_config_path(
 
 def site_cache_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -442,7 +442,7 @@ def site_cache_path(
 
 def user_cache_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -466,7 +466,7 @@ def user_cache_path(
 
 def user_state_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -490,7 +490,7 @@ def user_state_path(
 
 def user_log_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -544,7 +544,7 @@ def user_desktop_path() -> Path:
 
 def user_runtime_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
@@ -568,7 +568,7 @@ def user_runtime_path(
 
 def site_runtime_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
diff --git a/src/pip/_vendor/platformdirs/android.py b/src/pip/_vendor/platformdirs/android.py
index 7004a852422..92efc852d38 100644
--- a/src/pip/_vendor/platformdirs/android.py
+++ b/src/pip/_vendor/platformdirs/android.py
@@ -23,7 +23,7 @@ class Android(PlatformDirsABC):
     @property
     def user_data_dir(self) -> str:
         """:return: data directory tied to the user, e.g. ``/data/user///files/``"""
-        return self._append_app_name_and_version(cast(str, _android_folder()), "files")
+        return self._append_app_name_and_version(cast("str", _android_folder()), "files")
 
     @property
     def site_data_dir(self) -> str:
@@ -36,7 +36,7 @@ def user_config_dir(self) -> str:
         :return: config directory tied to the user, e.g. \
         ``/data/user///shared_prefs/``
         """
-        return self._append_app_name_and_version(cast(str, _android_folder()), "shared_prefs")
+        return self._append_app_name_and_version(cast("str", _android_folder()), "shared_prefs")
 
     @property
     def site_config_dir(self) -> str:
@@ -46,7 +46,7 @@ def site_config_dir(self) -> str:
     @property
     def user_cache_dir(self) -> str:
         """:return: cache directory tied to the user, e.g.,``/data/user///cache/``"""
-        return self._append_app_name_and_version(cast(str, _android_folder()), "cache")
+        return self._append_app_name_and_version(cast("str", _android_folder()), "cache")
 
     @property
     def site_cache_dir(self) -> str:
diff --git a/src/pip/_vendor/platformdirs/api.py b/src/pip/_vendor/platformdirs/api.py
index 18d660e4f8c..a352035ec69 100644
--- a/src/pip/_vendor/platformdirs/api.py
+++ b/src/pip/_vendor/platformdirs/api.py
@@ -8,7 +8,8 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Iterator, Literal
+    from collections.abc import Iterator
+    from typing import Literal
 
 
 class PlatformDirsABC(ABC):  # noqa: PLR0904
@@ -17,7 +18,7 @@ class PlatformDirsABC(ABC):  # noqa: PLR0904
     def __init__(  # noqa: PLR0913, PLR0917
         self,
         appname: str | None = None,
-        appauthor: str | None | Literal[False] = None,
+        appauthor: str | Literal[False] | None = None,
         version: str | None = None,
         roaming: bool = False,  # noqa: FBT001, FBT002
         multipath: bool = False,  # noqa: FBT001, FBT002
diff --git a/src/pip/_vendor/platformdirs/unix.py b/src/pip/_vendor/platformdirs/unix.py
index f1942e92ef4..fc75d8d0747 100644
--- a/src/pip/_vendor/platformdirs/unix.py
+++ b/src/pip/_vendor/platformdirs/unix.py
@@ -6,10 +6,13 @@
 import sys
 from configparser import ConfigParser
 from pathlib import Path
-from typing import Iterator, NoReturn
+from typing import TYPE_CHECKING, NoReturn
 
 from .api import PlatformDirsABC
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 if sys.platform == "win32":
 
     def getuid() -> NoReturn:
diff --git a/src/pip/_vendor/platformdirs/version.py b/src/pip/_vendor/platformdirs/version.py
index afb49243e3d..ed85187adca 100644
--- a/src/pip/_vendor/platformdirs/version.py
+++ b/src/pip/_vendor/platformdirs/version.py
@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.3.6'
-__version_tuple__ = version_tuple = (4, 3, 6)
+__version__ = version = '4.3.7'
+__version_tuple__ = version_tuple = (4, 3, 7)
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 0c7733ff8a5..78b7ed2dd8e 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -3,7 +3,7 @@ distlib==0.3.9
 distro==1.9.0
 msgpack==1.1.0
 packaging==24.2
-platformdirs==4.3.6
+platformdirs==4.3.7
 pyproject-hooks==1.2.0
 requests==2.32.3
     certifi==2025.1.31

From 9490bdf055ec7a086e7ba0ed8d250096d4861a2a Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Tue, 1 Apr 2025 11:52:51 +0100
Subject: [PATCH 807/992] Upgrade rich to 14.0.0

---
 news/rich.vendor.rst                   |   1 +
 src/pip/_vendor/rich/console.py        |  28 +++-
 src/pip/_vendor/rich/default_styles.py |   4 +-
 src/pip/_vendor/rich/diagnose.py       |  13 +-
 src/pip/_vendor/rich/panel.py          |   2 +-
 src/pip/_vendor/rich/style.py          |   2 +-
 src/pip/_vendor/rich/table.py          |   1 -
 src/pip/_vendor/rich/traceback.py      | 171 +++++++++++++++++++------
 src/pip/_vendor/vendor.txt             |   2 +-
 9 files changed, 164 insertions(+), 60 deletions(-)
 create mode 100644 news/rich.vendor.rst

diff --git a/news/rich.vendor.rst b/news/rich.vendor.rst
new file mode 100644
index 00000000000..a2f369fa5aa
--- /dev/null
+++ b/news/rich.vendor.rst
@@ -0,0 +1 @@
+Upgrade rich to 14.0.0
diff --git a/src/pip/_vendor/rich/console.py b/src/pip/_vendor/rich/console.py
index 572884542a1..57474835f92 100644
--- a/src/pip/_vendor/rich/console.py
+++ b/src/pip/_vendor/rich/console.py
@@ -500,7 +500,7 @@ def group(fit: bool = True) -> Callable[..., Callable[..., Group]]:
     """
 
     def decorator(
-        method: Callable[..., Iterable[RenderableType]]
+        method: Callable[..., Iterable[RenderableType]],
     ) -> Callable[..., Group]:
         """Convert a method that returns an iterable of renderables in to a Group."""
 
@@ -735,7 +735,9 @@ def __init__(
         self.get_time = get_time or monotonic
         self.style = style
         self.no_color = (
-            no_color if no_color is not None else "NO_COLOR" in self._environ
+            no_color
+            if no_color is not None
+            else self._environ.get("NO_COLOR", "") != ""
         )
         self.is_interactive = (
             (self.is_terminal and not self.is_dumb_terminal)
@@ -933,11 +935,13 @@ def is_terminal(self) -> bool:
 
         Returns:
             bool: True if the console writing to a device capable of
-            understanding terminal codes, otherwise False.
+                understanding escape sequences, otherwise False.
         """
+        # If dev has explicitly set this value, return it
         if self._force_terminal is not None:
             return self._force_terminal
 
+        # Fudge for Idle
         if hasattr(sys.stdin, "__module__") and sys.stdin.__module__.startswith(
             "idlelib"
         ):
@@ -948,12 +952,22 @@ def is_terminal(self) -> bool:
             # return False for Jupyter, which may have FORCE_COLOR set
             return False
 
-        # If FORCE_COLOR env var has any value at all, we assume a terminal.
-        force_color = self._environ.get("FORCE_COLOR")
-        if force_color is not None:
-            self._force_terminal = True
+        environ = self._environ
+
+        tty_compatible = environ.get("TTY_COMPATIBLE", "")
+        # 0 indicates device is not tty compatible
+        if tty_compatible == "0":
+            return False
+        # 1 indicates device is tty compatible
+        if tty_compatible == "1":
             return True
 
+        # https://force-color.org/
+        force_color = environ.get("FORCE_COLOR")
+        if force_color is not None:
+            return force_color != ""
+
+        # Any other value defaults to auto detect
         isatty: Optional[Callable[[], bool]] = getattr(self.file, "isatty", None)
         try:
             return False if isatty is None else isatty()
diff --git a/src/pip/_vendor/rich/default_styles.py b/src/pip/_vendor/rich/default_styles.py
index 6c0d73231d8..61797bf312c 100644
--- a/src/pip/_vendor/rich/default_styles.py
+++ b/src/pip/_vendor/rich/default_styles.py
@@ -120,7 +120,9 @@
     "traceback.exc_type": Style(color="bright_red", bold=True),
     "traceback.exc_value": Style.null(),
     "traceback.offset": Style(color="bright_red", bold=True),
-    "traceback.error_range": Style(underline=True, bold=True, dim=False),
+    "traceback.error_range": Style(underline=True, bold=True),
+    "traceback.note": Style(color="green", bold=True),
+    "traceback.group.border": Style(color="magenta"),
     "bar.back": Style(color="grey23"),
     "bar.complete": Style(color="rgb(249,38,114)"),
     "bar.finished": Style(color="rgb(114,156,31)"),
diff --git a/src/pip/_vendor/rich/diagnose.py b/src/pip/_vendor/rich/diagnose.py
index ad36183898e..b8b8c4347e8 100644
--- a/src/pip/_vendor/rich/diagnose.py
+++ b/src/pip/_vendor/rich/diagnose.py
@@ -15,16 +15,17 @@ def report() -> None:  # pragma: no cover
     inspect(features)
 
     env_names = (
-        "TERM",
-        "COLORTERM",
         "CLICOLOR",
-        "NO_COLOR",
-        "TERM_PROGRAM",
+        "COLORTERM",
         "COLUMNS",
-        "LINES",
+        "JPY_PARENT_PID",
         "JUPYTER_COLUMNS",
         "JUPYTER_LINES",
-        "JPY_PARENT_PID",
+        "LINES",
+        "NO_COLOR",
+        "TERM_PROGRAM",
+        "TERM",
+        "TTY_COMPATIBLE",
         "VSCODE_VERBOSE_LOGGING",
     )
     env = {name: os.getenv(name) for name in env_names}
diff --git a/src/pip/_vendor/rich/panel.py b/src/pip/_vendor/rich/panel.py
index 8cfa6f4a243..d411e291533 100644
--- a/src/pip/_vendor/rich/panel.py
+++ b/src/pip/_vendor/rich/panel.py
@@ -22,7 +22,7 @@ class Panel(JupyterMixin):
 
     Args:
         renderable (RenderableType): A console renderable object.
-        box (Box, optional): A Box instance that defines the look of the border (see :ref:`appendix_box`. Defaults to box.ROUNDED.
+        box (Box): A Box instance that defines the look of the border (see :ref:`appendix_box`. Defaults to box.ROUNDED.
         title (Optional[TextType], optional): Optional title displayed in panel header. Defaults to None.
         title_align (AlignMethod, optional): Alignment of title. Defaults to "center".
         subtitle (Optional[TextType], optional): Optional subtitle displayed in panel footer. Defaults to None.
diff --git a/src/pip/_vendor/rich/style.py b/src/pip/_vendor/rich/style.py
index 262fd6ecad6..835d06f3eb2 100644
--- a/src/pip/_vendor/rich/style.py
+++ b/src/pip/_vendor/rich/style.py
@@ -524,7 +524,7 @@ def parse(cls, style_definition: str) -> "Style":
                 if not word:
                     raise errors.StyleSyntaxError("color expected after 'on'")
                 try:
-                    Color.parse(word) is None
+                    Color.parse(word)
                 except ColorParseError as error:
                     raise errors.StyleSyntaxError(
                         f"unable to parse {word!r} as background color; {error}"
diff --git a/src/pip/_vendor/rich/table.py b/src/pip/_vendor/rich/table.py
index 654c8555411..2b9e3b5d7e8 100644
--- a/src/pip/_vendor/rich/table.py
+++ b/src/pip/_vendor/rich/table.py
@@ -929,7 +929,6 @@ def align_cell(
 if __name__ == "__main__":  # pragma: no cover
     from pip._vendor.rich.console import Console
     from pip._vendor.rich.highlighter import ReprHighlighter
-    from pip._vendor.rich.table import Table as Table
 
     from ._timer import timer
 
diff --git a/src/pip/_vendor/rich/traceback.py b/src/pip/_vendor/rich/traceback.py
index 28d742b4fd0..f82d06f6d13 100644
--- a/src/pip/_vendor/rich/traceback.py
+++ b/src/pip/_vendor/rich/traceback.py
@@ -26,15 +26,22 @@
 from pip._vendor.pygments.util import ClassNotFound
 
 from . import pretty
-from ._loop import loop_last
+from ._loop import loop_first_last, loop_last
 from .columns import Columns
-from .console import Console, ConsoleOptions, ConsoleRenderable, RenderResult, group
+from .console import (
+    Console,
+    ConsoleOptions,
+    ConsoleRenderable,
+    Group,
+    RenderResult,
+    group,
+)
 from .constrain import Constrain
 from .highlighter import RegexHighlighter, ReprHighlighter
 from .panel import Panel
 from .scope import render_scope
 from .style import Style
-from .syntax import Syntax
+from .syntax import Syntax, SyntaxPosition
 from .text import Text
 from .theme import Theme
 
@@ -44,6 +51,34 @@
 LOCALS_MAX_STRING = 80
 
 
+def _iter_syntax_lines(
+    start: SyntaxPosition, end: SyntaxPosition
+) -> Iterable[Tuple[int, int, int]]:
+    """Yield start and end positions per line.
+
+    Args:
+        start: Start position.
+        end: End position.
+
+    Returns:
+        Iterable of (LINE, COLUMN1, COLUMN2).
+    """
+
+    line1, column1 = start
+    line2, column2 = end
+
+    if line1 == line2:
+        yield line1, column1, column2
+    else:
+        for first, last, line_no in loop_first_last(range(line1, line2 + 1)):
+            if first:
+                yield line_no, column1, -1
+            elif last:
+                yield line_no, 0, column2
+            else:
+                yield line_no, 0, -1
+
+
 def install(
     *,
     console: Optional[Console] = None,
@@ -100,26 +135,25 @@ def excepthook(
         value: BaseException,
         traceback: Optional[TracebackType],
     ) -> None:
-        traceback_console.print(
-            Traceback.from_exception(
-                type_,
-                value,
-                traceback,
-                width=width,
-                code_width=code_width,
-                extra_lines=extra_lines,
-                theme=theme,
-                word_wrap=word_wrap,
-                show_locals=show_locals,
-                locals_max_length=locals_max_length,
-                locals_max_string=locals_max_string,
-                locals_hide_dunder=locals_hide_dunder,
-                locals_hide_sunder=bool(locals_hide_sunder),
-                indent_guides=indent_guides,
-                suppress=suppress,
-                max_frames=max_frames,
-            )
+        exception_traceback = Traceback.from_exception(
+            type_,
+            value,
+            traceback,
+            width=width,
+            code_width=code_width,
+            extra_lines=extra_lines,
+            theme=theme,
+            word_wrap=word_wrap,
+            show_locals=show_locals,
+            locals_max_length=locals_max_length,
+            locals_max_string=locals_max_string,
+            locals_hide_dunder=locals_hide_dunder,
+            locals_hide_sunder=bool(locals_hide_sunder),
+            indent_guides=indent_guides,
+            suppress=suppress,
+            max_frames=max_frames,
         )
+        traceback_console.print(exception_traceback)
 
     def ipy_excepthook_closure(ip: Any) -> None:  # pragma: no cover
         tb_data = {}  # store information about showtraceback call
@@ -191,6 +225,7 @@ class _SyntaxError:
     line: str
     lineno: int
     msg: str
+    notes: List[str] = field(default_factory=list)
 
 
 @dataclass
@@ -200,6 +235,9 @@ class Stack:
     syntax_error: Optional[_SyntaxError] = None
     is_cause: bool = False
     frames: List[Frame] = field(default_factory=list)
+    notes: List[str] = field(default_factory=list)
+    is_group: bool = False
+    exceptions: List["Trace"] = field(default_factory=list)
 
 
 @dataclass
@@ -403,6 +441,8 @@ def extract(
 
         from pip._vendor.rich import _IMPORT_CWD
 
+        notes: List[str] = getattr(exc_value, "__notes__", None) or []
+
         def safe_str(_object: Any) -> str:
             """Don't allow exceptions from __str__ to propagate."""
             try:
@@ -415,8 +455,25 @@ def safe_str(_object: Any) -> str:
                 exc_type=safe_str(exc_type.__name__),
                 exc_value=safe_str(exc_value),
                 is_cause=is_cause,
+                notes=notes,
             )
 
+            if sys.version_info >= (3, 11):
+                if isinstance(exc_value, (BaseExceptionGroup, ExceptionGroup)):
+                    stack.is_group = True
+                    for exception in exc_value.exceptions:
+                        stack.exceptions.append(
+                            Traceback.extract(
+                                type(exception),
+                                exception,
+                                exception.__traceback__,
+                                show_locals=show_locals,
+                                locals_max_length=locals_max_length,
+                                locals_hide_dunder=locals_hide_dunder,
+                                locals_hide_sunder=locals_hide_sunder,
+                            )
+                        )
+
             if isinstance(exc_value, SyntaxError):
                 stack.syntax_error = _SyntaxError(
                     offset=exc_value.offset or 0,
@@ -424,13 +481,14 @@ def safe_str(_object: Any) -> str:
                     lineno=exc_value.lineno or 0,
                     line=exc_value.text or "",
                     msg=exc_value.msg,
+                    notes=notes,
                 )
 
             stacks.append(stack)
             append = stack.frames.append
 
             def get_locals(
-                iter_locals: Iterable[Tuple[str, object]]
+                iter_locals: Iterable[Tuple[str, object]],
             ) -> Iterable[Tuple[str, object]]:
                 """Extract locals from an iterator of key pairs."""
                 if not (locals_hide_dunder or locals_hide_sunder):
@@ -524,6 +582,7 @@ def get_locals(
             break  # pragma: no cover
 
         trace = Trace(stacks=stacks)
+
         return trace
 
     def __rich_console__(
@@ -556,7 +615,9 @@ def __rich_console__(
         )
 
         highlighter = ReprHighlighter()
-        for last, stack in loop_last(reversed(self.trace.stacks)):
+
+        @group()
+        def render_stack(stack: Stack, last: bool) -> RenderResult:
             if stack.frames:
                 stack_renderable: ConsoleRenderable = Panel(
                     self._render_stack(stack),
@@ -569,6 +630,7 @@ def __rich_console__(
                 stack_renderable = Constrain(stack_renderable, self.width)
                 with console.use_theme(traceback_theme):
                     yield stack_renderable
+
             if stack.syntax_error is not None:
                 with console.use_theme(traceback_theme):
                     yield Constrain(
@@ -594,6 +656,24 @@ def __rich_console__(
             else:
                 yield Text.assemble((f"{stack.exc_type}", "traceback.exc_type"))
 
+            for note in stack.notes:
+                yield Text.assemble(("[NOTE] ", "traceback.note"), highlighter(note))
+
+            if stack.is_group:
+                for group_no, group_exception in enumerate(stack.exceptions, 1):
+                    grouped_exceptions: List[Group] = []
+                    for group_last, group_stack in loop_last(group_exception.stacks):
+                        grouped_exceptions.append(render_stack(group_stack, group_last))
+                    yield ""
+                    yield Constrain(
+                        Panel(
+                            Group(*grouped_exceptions),
+                            title=f"Sub-exception #{group_no}",
+                            border_style="traceback.group.border",
+                        ),
+                        self.width,
+                    )
+
             if not last:
                 if stack.is_cause:
                     yield Text.from_markup(
@@ -604,6 +684,9 @@ def __rich_console__(
                         "\n[i]During handling of the above exception, another exception occurred:\n",
                     )
 
+        for last, stack in loop_last(reversed(self.trace.stacks)):
+            yield render_stack(stack, last)
+
     @group()
     def _render_syntax_error(self, syntax_error: _SyntaxError) -> RenderResult:
         highlighter = ReprHighlighter()
@@ -648,17 +731,6 @@ def _render_stack(self, stack: Stack) -> RenderResult:
         path_highlighter = PathHighlighter()
         theme = self.theme
 
-        def read_code(filename: str) -> str:
-            """Read files, and cache results on filename.
-
-            Args:
-                filename (str): Filename to read
-
-            Returns:
-                str: Contents of file
-            """
-            return "".join(linecache.getlines(filename))
-
         def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
             if frame.locals:
                 yield render_scope(
@@ -720,7 +792,8 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
                 continue
             if not suppressed:
                 try:
-                    code = read_code(frame.filename)
+                    code_lines = linecache.getlines(frame.filename)
+                    code = "".join(code_lines)
                     if not code:
                         # code may be an empty string if the file doesn't exist, OR
                         # if the traceback filename is generated dynamically
@@ -749,12 +822,26 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
                 else:
                     if frame.last_instruction is not None:
                         start, end = frame.last_instruction
-                        syntax.stylize_range(
-                            style="traceback.error_range",
-                            start=start,
-                            end=end,
-                            style_before=True,
-                        )
+
+                        # Stylize a line at a time
+                        # So that indentation isn't underlined (which looks bad)
+                        for line1, column1, column2 in _iter_syntax_lines(start, end):
+                            try:
+                                if column1 == 0:
+                                    line = code_lines[line1 - 1]
+                                    column1 = len(line) - len(line.lstrip())
+                                if column2 == -1:
+                                    column2 = len(code_lines[line1 - 1])
+                            except IndexError:
+                                # Being defensive here
+                                # If last_instruction reports a line out-of-bounds, we don't want to crash
+                                continue
+
+                            syntax.stylize_range(
+                                style="traceback.error_range",
+                                start=(line1, column1),
+                                end=(line1, column2),
+                            )
                     yield (
                         Columns(
                             [
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 78b7ed2dd8e..8962e6fce7d 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -9,7 +9,7 @@ requests==2.32.3
     certifi==2025.1.31
     idna==3.10
     urllib3==1.26.20
-rich==13.9.4
+rich==14.0.0
     pygments==2.19.1
     typing_extensions==4.12.2
 resolvelib==1.1.0

From d8b4cd8482b4ecbf39cebd1bb5e90278aae55835 Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Tue, 1 Apr 2025 11:53:28 +0100
Subject: [PATCH 808/992] Upgrade typing_extensions to 4.13.0

---
 news/typing_extensions.vendor.rst    |    1 +
 src/pip/_vendor/typing_extensions.py | 1073 ++++++++++++++++++++++++--
 src/pip/_vendor/vendor.txt           |    2 +-
 3 files changed, 1001 insertions(+), 75 deletions(-)
 create mode 100644 news/typing_extensions.vendor.rst

diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
new file mode 100644
index 00000000000..76ba97d4a2a
--- /dev/null
+++ b/news/typing_extensions.vendor.rst
@@ -0,0 +1 @@
+Upgrade typing_extensions to 4.13.0
diff --git a/src/pip/_vendor/typing_extensions.py b/src/pip/_vendor/typing_extensions.py
index e429384e76a..e0c2fb62ad5 100644
--- a/src/pip/_vendor/typing_extensions.py
+++ b/src/pip/_vendor/typing_extensions.py
@@ -1,9 +1,12 @@
 import abc
+import builtins
 import collections
 import collections.abc
 import contextlib
+import enum
 import functools
 import inspect
+import keyword
 import operator
 import sys
 import types as _types
@@ -62,8 +65,11 @@
     'dataclass_transform',
     'deprecated',
     'Doc',
+    'evaluate_forward_ref',
     'get_overloads',
     'final',
+    'Format',
+    'get_annotations',
     'get_args',
     'get_origin',
     'get_original_bases',
@@ -83,6 +89,7 @@
     'Text',
     'TypeAlias',
     'TypeAliasType',
+    'TypeForm',
     'TypeGuard',
     'TypeIs',
     'TYPE_CHECKING',
@@ -91,6 +98,8 @@
     'ReadOnly',
     'Required',
     'NotRequired',
+    'NoDefault',
+    'NoExtraItems',
 
     # Pure aliases, have always been in typing
     'AbstractSet',
@@ -117,7 +126,6 @@
     'MutableMapping',
     'MutableSequence',
     'MutableSet',
-    'NoDefault',
     'Optional',
     'Pattern',
     'Reversible',
@@ -138,6 +146,9 @@
 GenericMeta = type
 _PEP_696_IMPLEMENTED = sys.version_info >= (3, 13, 0, "beta")
 
+# Added with bpo-45166 to 3.10.1+ and some 3.9 versions
+_FORWARD_REF_HAS_CLASS = "__forward_is_class__" in typing.ForwardRef.__slots__
+
 # The functions below are modified copies of typing internal helpers.
 # They are needed by _ProtocolMeta and they provide support for PEP 646.
 
@@ -867,6 +878,63 @@ def inner(func):
     return inner
 
 
+_NEEDS_SINGLETONMETA = (
+    not hasattr(typing, "NoDefault") or not hasattr(typing, "NoExtraItems")
+)
+
+if _NEEDS_SINGLETONMETA:
+    class SingletonMeta(type):
+        def __setattr__(cls, attr, value):
+            # TypeError is consistent with the behavior of NoneType
+            raise TypeError(
+                f"cannot set {attr!r} attribute of immutable type {cls.__name__!r}"
+            )
+
+
+if hasattr(typing, "NoDefault"):
+    NoDefault = typing.NoDefault
+else:
+    class NoDefaultType(metaclass=SingletonMeta):
+        """The type of the NoDefault singleton."""
+
+        __slots__ = ()
+
+        def __new__(cls):
+            return globals().get("NoDefault") or object.__new__(cls)
+
+        def __repr__(self):
+            return "typing_extensions.NoDefault"
+
+        def __reduce__(self):
+            return "NoDefault"
+
+    NoDefault = NoDefaultType()
+    del NoDefaultType
+
+if hasattr(typing, "NoExtraItems"):
+    NoExtraItems = typing.NoExtraItems
+else:
+    class NoExtraItemsType(metaclass=SingletonMeta):
+        """The type of the NoExtraItems singleton."""
+
+        __slots__ = ()
+
+        def __new__(cls):
+            return globals().get("NoExtraItems") or object.__new__(cls)
+
+        def __repr__(self):
+            return "typing_extensions.NoExtraItems"
+
+        def __reduce__(self):
+            return "NoExtraItems"
+
+    NoExtraItems = NoExtraItemsType()
+    del NoExtraItemsType
+
+if _NEEDS_SINGLETONMETA:
+    del SingletonMeta
+
+
 # Update this to something like >=3.13.0b1 if and when
 # PEP 728 is implemented in CPython
 _PEP_728_IMPLEMENTED = False
@@ -913,7 +981,9 @@ def _get_typeddict_qualifiers(annotation_type):
                 break
 
     class _TypedDictMeta(type):
-        def __new__(cls, name, bases, ns, *, total=True, closed=False):
+
+        def __new__(cls, name, bases, ns, *, total=True, closed=None,
+                    extra_items=NoExtraItems):
             """Create new typed dict class object.
 
             This method is called when TypedDict is subclassed,
@@ -925,6 +995,8 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
                 if type(base) is not _TypedDictMeta and base is not typing.Generic:
                     raise TypeError('cannot inherit from both a TypedDict type '
                                     'and a non-TypedDict base class')
+            if closed is not None and extra_items is not NoExtraItems:
+                raise TypeError(f"Cannot combine closed={closed!r} and extra_items")
 
             if any(issubclass(b, typing.Generic) for b in bases):
                 generic_base = (typing.Generic,)
@@ -964,7 +1036,7 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
             optional_keys = set()
             readonly_keys = set()
             mutable_keys = set()
-            extra_items_type = None
+            extra_items_type = extra_items
 
             for base in bases:
                 base_dict = base.__dict__
@@ -974,13 +1046,12 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
                 optional_keys.update(base_dict.get('__optional_keys__', ()))
                 readonly_keys.update(base_dict.get('__readonly_keys__', ()))
                 mutable_keys.update(base_dict.get('__mutable_keys__', ()))
-                base_extra_items_type = base_dict.get('__extra_items__', None)
-                if base_extra_items_type is not None:
-                    extra_items_type = base_extra_items_type
 
-            if closed and extra_items_type is None:
-                extra_items_type = Never
-            if closed and "__extra_items__" in own_annotations:
+            # This was specified in an earlier version of PEP 728. Support
+            # is retained for backwards compatibility, but only for Python
+            # 3.13 and lower.
+            if (closed and sys.version_info < (3, 14)
+                       and "__extra_items__" in own_annotations):
                 annotation_type = own_annotations.pop("__extra_items__")
                 qualifiers = set(_get_typeddict_qualifiers(annotation_type))
                 if Required in qualifiers:
@@ -1019,8 +1090,7 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
             tp_dict.__optional_keys__ = frozenset(optional_keys)
             tp_dict.__readonly_keys__ = frozenset(readonly_keys)
             tp_dict.__mutable_keys__ = frozenset(mutable_keys)
-            if not hasattr(tp_dict, '__total__'):
-                tp_dict.__total__ = total
+            tp_dict.__total__ = total
             tp_dict.__closed__ = closed
             tp_dict.__extra_items__ = extra_items_type
             return tp_dict
@@ -1036,7 +1106,16 @@ def __subclasscheck__(cls, other):
     _TypedDict = type.__new__(_TypedDictMeta, 'TypedDict', (), {})
 
     @_ensure_subclassable(lambda bases: (_TypedDict,))
-    def TypedDict(typename, fields=_marker, /, *, total=True, closed=False, **kwargs):
+    def TypedDict(
+        typename,
+        fields=_marker,
+        /,
+        *,
+        total=True,
+        closed=None,
+        extra_items=NoExtraItems,
+        **kwargs
+    ):
         """A simple typed namespace. At runtime it is equivalent to a plain dict.
 
         TypedDict creates a dictionary type such that a type checker will expect all
@@ -1096,9 +1175,14 @@ class Point2D(TypedDict):
                 "using the functional syntax, pass an empty dictionary, e.g. "
             ) + example + "."
             warnings.warn(deprecation_msg, DeprecationWarning, stacklevel=2)
-            if closed is not False and closed is not True:
+            # Support a field called "closed"
+            if closed is not False and closed is not True and closed is not None:
                 kwargs["closed"] = closed
-                closed = False
+                closed = None
+            # Or "extra_items"
+            if extra_items is not NoExtraItems:
+                kwargs["extra_items"] = extra_items
+                extra_items = NoExtraItems
             fields = kwargs
         elif kwargs:
             raise TypeError("TypedDict takes either a dict or keyword arguments,"
@@ -1120,7 +1204,8 @@ class Point2D(TypedDict):
             # Setting correct module is necessary to make typed dict classes pickleable.
             ns['__module__'] = module
 
-        td = _TypedDictMeta(typename, (), ns, total=total, closed=closed)
+        td = _TypedDictMeta(typename, (), ns, total=total, closed=closed,
+                            extra_items=extra_items)
         td.__orig_bases__ = (TypedDict,)
         return td
 
@@ -1232,10 +1317,90 @@ def get_type_hints(obj, globalns=None, localns=None, include_extras=False):
             )
         else:  # 3.8
             hint = typing.get_type_hints(obj, globalns=globalns, localns=localns)
+        if sys.version_info < (3, 11):
+            _clean_optional(obj, hint, globalns, localns)
+        if sys.version_info < (3, 9):
+            # In 3.8 eval_type does not flatten Optional[ForwardRef] correctly
+            # This will recreate and and cache Unions.
+            hint = {
+                k: (t
+                    if get_origin(t) != Union
+                    else Union[t.__args__])
+                for k, t in hint.items()
+            }
         if include_extras:
             return hint
         return {k: _strip_extras(t) for k, t in hint.items()}
 
+    _NoneType = type(None)
+
+    def _could_be_inserted_optional(t):
+        """detects Union[..., None] pattern"""
+        # 3.8+ compatible checking before _UnionGenericAlias
+        if get_origin(t) is not Union:
+            return False
+        # Assume if last argument is not None they are user defined
+        if t.__args__[-1] is not _NoneType:
+            return False
+        return True
+
+    # < 3.11
+    def _clean_optional(obj, hints, globalns=None, localns=None):
+        # reverts injected Union[..., None] cases from typing.get_type_hints
+        # when a None default value is used.
+        # see https://github.com/python/typing_extensions/issues/310
+        if not hints or isinstance(obj, type):
+            return
+        defaults = typing._get_defaults(obj)  # avoid accessing __annotations___
+        if not defaults:
+            return
+        original_hints = obj.__annotations__
+        for name, value in hints.items():
+            # Not a Union[..., None] or replacement conditions not fullfilled
+            if (not _could_be_inserted_optional(value)
+                or name not in defaults
+                or defaults[name] is not None
+            ):
+                continue
+            original_value = original_hints[name]
+            # value=NoneType should have caused a skip above but check for safety
+            if original_value is None:
+                original_value = _NoneType
+            # Forward reference
+            if isinstance(original_value, str):
+                if globalns is None:
+                    if isinstance(obj, _types.ModuleType):
+                        globalns = obj.__dict__
+                    else:
+                        nsobj = obj
+                        # Find globalns for the unwrapped object.
+                        while hasattr(nsobj, '__wrapped__'):
+                            nsobj = nsobj.__wrapped__
+                        globalns = getattr(nsobj, '__globals__', {})
+                    if localns is None:
+                        localns = globalns
+                elif localns is None:
+                    localns = globalns
+                if sys.version_info < (3, 9):
+                    original_value = ForwardRef(original_value)
+                else:
+                    original_value = ForwardRef(
+                        original_value,
+                        is_argument=not isinstance(obj, _types.ModuleType)
+                    )
+            original_evaluated = typing._eval_type(original_value, globalns, localns)
+            if sys.version_info < (3, 9) and get_origin(original_evaluated) is Union:
+                # Union[str, None, "str"] is not reduced to Union[str, None]
+                original_evaluated = Union[original_evaluated.__args__]
+            # Compare if values differ. Note that even if equal
+            # value might be cached by typing._tp_cache contrary to original_evaluated
+            if original_evaluated != value or (
+                # 3.10: ForwardRefs of UnionType might be turned into _UnionGenericAlias
+                hasattr(_types, "UnionType")
+                and isinstance(original_evaluated, _types.UnionType)
+                and not isinstance(value, _types.UnionType)
+            ):
+                hints[name] = original_evaluated
 
 # Python 3.9+ has PEP 593 (Annotated)
 if hasattr(typing, 'Annotated'):
@@ -1443,34 +1608,6 @@ def TypeAlias(self, parameters):
     )
 
 
-if hasattr(typing, "NoDefault"):
-    NoDefault = typing.NoDefault
-else:
-    class NoDefaultTypeMeta(type):
-        def __setattr__(cls, attr, value):
-            # TypeError is consistent with the behavior of NoneType
-            raise TypeError(
-                f"cannot set {attr!r} attribute of immutable type {cls.__name__!r}"
-            )
-
-    class NoDefaultType(metaclass=NoDefaultTypeMeta):
-        """The type of the NoDefault singleton."""
-
-        __slots__ = ()
-
-        def __new__(cls):
-            return globals().get("NoDefault") or object.__new__(cls)
-
-        def __repr__(self):
-            return "typing_extensions.NoDefault"
-
-        def __reduce__(self):
-            return "NoDefault"
-
-    NoDefault = NoDefaultType()
-    del NoDefaultType, NoDefaultTypeMeta
-
-
 def _set_default(type_param, default):
     type_param.has_default = lambda: default is not NoDefault
     type_param.__default__ = default
@@ -1761,6 +1898,23 @@ def __call__(self, *args, **kwargs):
 # 3.8-3.9
 if not hasattr(typing, 'Concatenate'):
     # Inherits from list as a workaround for Callable checks in Python < 3.9.2.
+
+    # 3.9.0-1
+    if not hasattr(typing, '_type_convert'):
+        def _type_convert(arg, module=None, *, allow_special_forms=False):
+            """For converting None to type(None), and strings to ForwardRef."""
+            if arg is None:
+                return type(None)
+            if isinstance(arg, str):
+                if sys.version_info <= (3, 9, 6):
+                    return ForwardRef(arg)
+                if sys.version_info <= (3, 9, 7):
+                    return ForwardRef(arg, module=module)
+                return ForwardRef(arg, module=module, is_class=allow_special_forms)
+            return arg
+    else:
+        _type_convert = typing._type_convert
+
     class _ConcatenateGenericAlias(list):
 
         # Trick Generic into looking into this for __parameters__.
@@ -1792,27 +1946,171 @@ def __parameters__(self):
                 tp for tp in self.__args__ if isinstance(tp, (typing.TypeVar, ParamSpec))
             )
 
+        # 3.8; needed for typing._subst_tvars
+        # 3.9 used by __getitem__ below
+        def copy_with(self, params):
+            if isinstance(params[-1], _ConcatenateGenericAlias):
+                params = (*params[:-1], *params[-1].__args__)
+            elif isinstance(params[-1], (list, tuple)):
+                return (*params[:-1], *params[-1])
+            elif (not (params[-1] is ... or isinstance(params[-1], ParamSpec))):
+                raise TypeError("The last parameter to Concatenate should be a "
+                        "ParamSpec variable or ellipsis.")
+            return self.__class__(self.__origin__, params)
+
+        # 3.9; accessed during GenericAlias.__getitem__ when substituting
+        def __getitem__(self, args):
+            if self.__origin__ in (Generic, Protocol):
+                # Can't subscript Generic[...] or Protocol[...].
+                raise TypeError(f"Cannot subscript already-subscripted {self}")
+            if not self.__parameters__:
+                raise TypeError(f"{self} is not a generic class")
+
+            if not isinstance(args, tuple):
+                args = (args,)
+            args = _unpack_args(*(_type_convert(p) for p in args))
+            params = self.__parameters__
+            for param in params:
+                prepare = getattr(param, "__typing_prepare_subst__", None)
+                if prepare is not None:
+                    args = prepare(self, args)
+                # 3.8 - 3.9 & typing.ParamSpec
+                elif isinstance(param, ParamSpec):
+                    i = params.index(param)
+                    if (
+                        i == len(args)
+                        and getattr(param, '__default__', NoDefault) is not NoDefault
+                    ):
+                        args = [*args, param.__default__]
+                    if i >= len(args):
+                        raise TypeError(f"Too few arguments for {self}")
+                    # Special case for Z[[int, str, bool]] == Z[int, str, bool]
+                    if len(params) == 1 and not _is_param_expr(args[0]):
+                        assert i == 0
+                        args = (args,)
+                    elif (
+                        isinstance(args[i], list)
+                        # 3.8 - 3.9
+                        # This class inherits from list do not convert
+                        and not isinstance(args[i], _ConcatenateGenericAlias)
+                    ):
+                        args = (*args[:i], tuple(args[i]), *args[i + 1:])
 
-# 3.8-3.9
+            alen = len(args)
+            plen = len(params)
+            if alen != plen:
+                raise TypeError(
+                    f"Too {'many' if alen > plen else 'few'} arguments for {self};"
+                    f" actual {alen}, expected {plen}"
+                )
+
+            subst = dict(zip(self.__parameters__, args))
+            # determine new args
+            new_args = []
+            for arg in self.__args__:
+                if isinstance(arg, type):
+                    new_args.append(arg)
+                    continue
+                if isinstance(arg, TypeVar):
+                    arg = subst[arg]
+                    if (
+                        (isinstance(arg, typing._GenericAlias) and _is_unpack(arg))
+                        or (
+                            hasattr(_types, "GenericAlias")
+                            and isinstance(arg, _types.GenericAlias)
+                            and getattr(arg, "__unpacked__", False)
+                        )
+                    ):
+                        raise TypeError(f"{arg} is not valid as type argument")
+
+                elif isinstance(arg,
+                    typing._GenericAlias
+                    if not hasattr(_types, "GenericAlias") else
+                    (typing._GenericAlias, _types.GenericAlias)
+                ):
+                    subparams = arg.__parameters__
+                    if subparams:
+                        subargs = tuple(subst[x] for x in subparams)
+                        arg = arg[subargs]
+                new_args.append(arg)
+            return self.copy_with(tuple(new_args))
+
+# 3.10+
+else:
+    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias
+
+    # 3.10
+    if sys.version_info < (3, 11):
+
+        class _ConcatenateGenericAlias(typing._ConcatenateGenericAlias, _root=True):
+            # needed for checks in collections.abc.Callable to accept this class
+            __module__ = "typing"
+
+            def copy_with(self, params):
+                if isinstance(params[-1], (list, tuple)):
+                    return (*params[:-1], *params[-1])
+                if isinstance(params[-1], typing._ConcatenateGenericAlias):
+                    params = (*params[:-1], *params[-1].__args__)
+                elif not (params[-1] is ... or isinstance(params[-1], ParamSpec)):
+                    raise TypeError("The last parameter to Concatenate should be a "
+                            "ParamSpec variable or ellipsis.")
+                return super(typing._ConcatenateGenericAlias, self).copy_with(params)
+
+            def __getitem__(self, args):
+                value = super().__getitem__(args)
+                if isinstance(value, tuple) and any(_is_unpack(t) for t in value):
+                    return tuple(_unpack_args(*(n for n in value)))
+                return value
+
+
+# 3.8-3.9.2
+class _EllipsisDummy: ...
+
+
+# 3.8-3.10
+def _create_concatenate_alias(origin, parameters):
+    if parameters[-1] is ... and sys.version_info < (3, 9, 2):
+        # Hack: Arguments must be types, replace it with one.
+        parameters = (*parameters[:-1], _EllipsisDummy)
+    if sys.version_info >= (3, 10, 2):
+        concatenate = _ConcatenateGenericAlias(origin, parameters,
+                                        _typevar_types=(TypeVar, ParamSpec),
+                                        _paramspec_tvars=True)
+    else:
+        concatenate = _ConcatenateGenericAlias(origin, parameters)
+    if parameters[-1] is not _EllipsisDummy:
+        return concatenate
+    # Remove dummy again
+    concatenate.__args__ = tuple(p if p is not _EllipsisDummy else ...
+                                    for p in concatenate.__args__)
+    if sys.version_info < (3, 10):
+        # backport needs __args__ adjustment only
+        return concatenate
+    concatenate.__parameters__ = tuple(p for p in concatenate.__parameters__
+                                        if p is not _EllipsisDummy)
+    return concatenate
+
+
+# 3.8-3.10
 @typing._tp_cache
 def _concatenate_getitem(self, parameters):
     if parameters == ():
         raise TypeError("Cannot take a Concatenate of no types.")
     if not isinstance(parameters, tuple):
         parameters = (parameters,)
-    if not isinstance(parameters[-1], ParamSpec):
+    if not (parameters[-1] is ... or isinstance(parameters[-1], ParamSpec)):
         raise TypeError("The last parameter to Concatenate should be a "
-                        "ParamSpec variable.")
+                        "ParamSpec variable or ellipsis.")
     msg = "Concatenate[arg, ...]: each arg must be a type."
-    parameters = tuple(typing._type_check(p, msg) for p in parameters)
-    return _ConcatenateGenericAlias(self, parameters)
+    parameters = (*(typing._type_check(p, msg) for p in parameters[:-1]),
+                    parameters[-1])
+    return _create_concatenate_alias(self, parameters)
 
 
-# 3.10+
-if hasattr(typing, 'Concatenate'):
+# 3.11+; Concatenate does not accept ellipsis in 3.10
+if sys.version_info >= (3, 11):
     Concatenate = typing.Concatenate
-    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias
-# 3.9
+# 3.9-3.10
 elif sys.version_info[:2] >= (3, 9):
     @_ExtensionsSpecialForm
     def Concatenate(self, parameters):
@@ -1976,7 +2274,7 @@ def TypeIs(self, parameters):
 
         1. The return value is a boolean.
         2. If the return value is ``True``, the type of its argument
-        is the intersection of the type inside ``TypeGuard`` and the argument's
+        is the intersection of the type inside ``TypeIs`` and the argument's
         previously known type.
 
         For example::
@@ -2024,7 +2322,7 @@ def __getitem__(self, parameters):
 
         1. The return value is a boolean.
         2. If the return value is ``True``, the type of its argument
-        is the intersection of the type inside ``TypeGuard`` and the argument's
+        is the intersection of the type inside ``TypeIs`` and the argument's
         previously known type.
 
         For example::
@@ -2042,6 +2340,69 @@ def f(val: Union[int, Awaitable[int]]) -> int:
         PEP 742 (Narrowing types with TypeIs).
         """)
 
+# 3.14+?
+if hasattr(typing, 'TypeForm'):
+    TypeForm = typing.TypeForm
+# 3.9
+elif sys.version_info[:2] >= (3, 9):
+    class _TypeFormForm(_ExtensionsSpecialForm, _root=True):
+        # TypeForm(X) is equivalent to X but indicates to the type checker
+        # that the object is a TypeForm.
+        def __call__(self, obj, /):
+            return obj
+
+    @_TypeFormForm
+    def TypeForm(self, parameters):
+        """A special form representing the value that results from the evaluation
+        of a type expression. This value encodes the information supplied in the
+        type expression, and it represents the type described by that type expression.
+
+        When used in a type expression, TypeForm describes a set of type form objects.
+        It accepts a single type argument, which must be a valid type expression.
+        ``TypeForm[T]`` describes the set of all type form objects that represent
+        the type T or types that are assignable to T.
+
+        Usage:
+
+            def cast[T](typ: TypeForm[T], value: Any) -> T: ...
+
+            reveal_type(cast(int, "x"))  # int
+
+        See PEP 747 for more information.
+        """
+        item = typing._type_check(parameters, f'{self} accepts only a single type.')
+        return typing._GenericAlias(self, (item,))
+# 3.8
+else:
+    class _TypeFormForm(_ExtensionsSpecialForm, _root=True):
+        def __getitem__(self, parameters):
+            item = typing._type_check(parameters,
+                                      f'{self._name} accepts only a single type')
+            return typing._GenericAlias(self, (item,))
+
+        def __call__(self, obj, /):
+            return obj
+
+    TypeForm = _TypeFormForm(
+        'TypeForm',
+        doc="""A special form representing the value that results from the evaluation
+        of a type expression. This value encodes the information supplied in the
+        type expression, and it represents the type described by that type expression.
+
+        When used in a type expression, TypeForm describes a set of type form objects.
+        It accepts a single type argument, which must be a valid type expression.
+        ``TypeForm[T]`` describes the set of all type form objects that represent
+        the type T or types that are assignable to T.
+
+        Usage:
+
+            def cast[T](typ: TypeForm[T], value: Any) -> T: ...
+
+            reveal_type(cast(int, "x"))  # int
+
+        See PEP 747 for more information.
+        """)
+
 
 # Vendored from cpython typing._SpecialFrom
 class _SpecialForm(typing._Final, _root=True):
@@ -2344,7 +2705,9 @@ def __init__(self, getitem):
             self.__doc__ = _UNPACK_DOC
 
     class _UnpackAlias(typing._GenericAlias, _root=True):
-        __class__ = typing.TypeVar
+        if sys.version_info < (3, 11):
+            # needed for compatibility with Generic[Unpack[Ts]]
+            __class__ = typing.TypeVar
 
         @property
         def __typing_unpacked_tuple_args__(self):
@@ -2357,6 +2720,17 @@ def __typing_unpacked_tuple_args__(self):
                 return arg.__args__
             return None
 
+        @property
+        def __typing_is_unpacked_typevartuple__(self):
+            assert self.__origin__ is Unpack
+            assert len(self.__args__) == 1
+            return isinstance(self.__args__[0], TypeVarTuple)
+
+        def __getitem__(self, args):
+            if self.__typing_is_unpacked_typevartuple__:
+                return args
+            return super().__getitem__(args)
+
     @_UnpackSpecialForm
     def Unpack(self, parameters):
         item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
@@ -2369,6 +2743,28 @@ def _is_unpack(obj):
     class _UnpackAlias(typing._GenericAlias, _root=True):
         __class__ = typing.TypeVar
 
+        @property
+        def __typing_unpacked_tuple_args__(self):
+            assert self.__origin__ is Unpack
+            assert len(self.__args__) == 1
+            arg, = self.__args__
+            if isinstance(arg, typing._GenericAlias):
+                if arg.__origin__ is not tuple:
+                    raise TypeError("Unpack[...] must be used with a tuple type")
+                return arg.__args__
+            return None
+
+        @property
+        def __typing_is_unpacked_typevartuple__(self):
+            assert self.__origin__ is Unpack
+            assert len(self.__args__) == 1
+            return isinstance(self.__args__[0], TypeVarTuple)
+
+        def __getitem__(self, args):
+            if self.__typing_is_unpacked_typevartuple__:
+                return args
+            return super().__getitem__(args)
+
     class _UnpackForm(_ExtensionsSpecialForm, _root=True):
         def __getitem__(self, parameters):
             item = typing._type_check(parameters,
@@ -2381,21 +2777,22 @@ def _is_unpack(obj):
         return isinstance(obj, _UnpackAlias)
 
 
+def _unpack_args(*args):
+    newargs = []
+    for arg in args:
+        subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
+        if subargs is not None and (not (subargs and subargs[-1] is ...)):
+            newargs.extend(subargs)
+        else:
+            newargs.append(arg)
+    return newargs
+
+
 if _PEP_696_IMPLEMENTED:
     from typing import TypeVarTuple
 
 elif hasattr(typing, "TypeVarTuple"):  # 3.11+
 
-    def _unpack_args(*args):
-        newargs = []
-        for arg in args:
-            subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
-            if subargs is not None and not (subargs and subargs[-1] is ...):
-                newargs.extend(subargs)
-            else:
-                newargs.append(arg)
-        return newargs
-
     # Add default parameter - PEP 696
     class TypeVarTuple(metaclass=_TypeVarLikeMeta):
         """Type variable tuple."""
@@ -2845,13 +3242,21 @@ def __init_subclass__(*args, **kwargs):
                 __init_subclass__.__deprecated__ = msg
                 return arg
             elif callable(arg):
+                import asyncio.coroutines
                 import functools
+                import inspect
 
                 @functools.wraps(arg)
                 def wrapper(*args, **kwargs):
                     warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
                     return arg(*args, **kwargs)
 
+                if asyncio.coroutines.iscoroutinefunction(arg):
+                    if sys.version_info >= (3, 12):
+                        wrapper = inspect.markcoroutinefunction(wrapper)
+                    else:
+                        wrapper._is_coroutine = asyncio.coroutines._is_coroutine
+
                 arg.__deprecated__ = wrapper.__deprecated__ = msg
                 return wrapper
             else:
@@ -2860,6 +3265,24 @@ def wrapper(*args, **kwargs):
                     f"a class or callable, not {arg!r}"
                 )
 
+if sys.version_info < (3, 10):
+    def _is_param_expr(arg):
+        return arg is ... or isinstance(
+            arg, (tuple, list, ParamSpec, _ConcatenateGenericAlias)
+        )
+else:
+    def _is_param_expr(arg):
+        return arg is ... or isinstance(
+            arg,
+            (
+                tuple,
+                list,
+                ParamSpec,
+                _ConcatenateGenericAlias,
+                typing._ConcatenateGenericAlias,
+            ),
+        )
+
 
 # We have to do some monkey patching to deal with the dual nature of
 # Unpack/TypeVarTuple:
@@ -2874,6 +3297,17 @@ def _check_generic(cls, parameters, elen=_marker):
 
         This gives a nice error message in case of count mismatch.
         """
+        # If substituting a single ParamSpec with multiple arguments
+        # we do not check the count
+        if (inspect.isclass(cls) and issubclass(cls, typing.Generic)
+            and len(cls.__parameters__) == 1
+            and isinstance(cls.__parameters__[0], ParamSpec)
+            and parameters
+            and not _is_param_expr(parameters[0])
+        ):
+            # Generic modifies parameters variable, but here we cannot do this
+            return
+
         if not elen:
             raise TypeError(f"{cls} is not a generic class")
         if elen is _marker:
@@ -3007,7 +3441,10 @@ def _collect_type_vars(types, typevar_types=None):
         for t in types:
             if _is_unpacked_typevartuple(t):
                 type_var_tuple_encountered = True
-            elif isinstance(t, typevar_types) and t not in tvars:
+            elif (
+                isinstance(t, typevar_types) and not isinstance(t, _UnpackAlias)
+                and t not in tvars
+            ):
                 if enforce_default_ordering:
                     has_default = getattr(t, '__default__', NoDefault) is not NoDefault
                     if has_default:
@@ -3022,6 +3459,13 @@ def _collect_type_vars(types, typevar_types=None):
                 tvars.append(t)
             if _should_collect_from_parameters(t):
                 tvars.extend([t for t in t.__parameters__ if t not in tvars])
+            elif isinstance(t, tuple):
+                # Collect nested type_vars
+                # tuple wrapped by  _prepare_paramspec_params(cls, params)
+                for x in t:
+                    for collected in _collect_type_vars([x]):
+                        if collected not in tvars:
+                            tvars.append(collected)
         return tuple(tvars)
 
     typing._collect_type_vars = _collect_type_vars
@@ -3379,8 +3823,9 @@ def __ror__(self, other):
                 return typing.Union[other, self]
 
 
-if hasattr(typing, "TypeAliasType"):
+if sys.version_info >= (3, 14):
     TypeAliasType = typing.TypeAliasType
+# 3.8-3.13
 else:
     def _is_unionable(obj):
         """Corresponds to is_unionable() in unionobject.c in CPython."""
@@ -3391,6 +3836,37 @@ def _is_unionable(obj):
             TypeAliasType,
         ))
 
+    if sys.version_info < (3, 10):
+        # Copied and pasted from https://github.com/python/cpython/blob/986a4e1b6fcae7fe7a1d0a26aea446107dd58dd2/Objects/genericaliasobject.c#L568-L582,
+        # so that we emulate the behaviour of `types.GenericAlias`
+        # on the latest versions of CPython
+        _ATTRIBUTE_DELEGATION_EXCLUSIONS = frozenset({
+            "__class__",
+            "__bases__",
+            "__origin__",
+            "__args__",
+            "__unpacked__",
+            "__parameters__",
+            "__typing_unpacked_tuple_args__",
+            "__mro_entries__",
+            "__reduce_ex__",
+            "__reduce__",
+            "__copy__",
+            "__deepcopy__",
+        })
+
+        class _TypeAliasGenericAlias(typing._GenericAlias, _root=True):
+            def __getattr__(self, attr):
+                if attr in _ATTRIBUTE_DELEGATION_EXCLUSIONS:
+                    return object.__getattr__(self, attr)
+                return getattr(self.__origin__, attr)
+
+            if sys.version_info < (3, 9):
+                def __getitem__(self, item):
+                    result = super().__getitem__(item)
+                    result.__class__ = type(self)
+                    return result
+
     class TypeAliasType:
         """Create named, parameterized type aliases.
 
@@ -3422,11 +3898,29 @@ class TypeAliasType:
         def __init__(self, name: str, value, *, type_params=()):
             if not isinstance(name, str):
                 raise TypeError("TypeAliasType name must be a string")
+            if not isinstance(type_params, tuple):
+                raise TypeError("type_params must be a tuple")
             self.__value__ = value
             self.__type_params__ = type_params
 
+            default_value_encountered = False
             parameters = []
             for type_param in type_params:
+                if (
+                    not isinstance(type_param, (TypeVar, TypeVarTuple, ParamSpec))
+                    # 3.8-3.11
+                    # Unpack Backport passes isinstance(type_param, TypeVar)
+                    or _is_unpack(type_param)
+                ):
+                    raise TypeError(f"Expected a type param, got {type_param!r}")
+                has_default = (
+                    getattr(type_param, '__default__', NoDefault) is not NoDefault
+                )
+                if default_value_encountered and not has_default:
+                    raise TypeError(f"non-default type parameter '{type_param!r}'"
+                                    " follows default type parameter")
+                if has_default:
+                    default_value_encountered = True
                 if isinstance(type_param, TypeVarTuple):
                     parameters.extend(type_param)
                 else:
@@ -3463,16 +3957,49 @@ def _raise_attribute_error(self, name: str) -> Never:
         def __repr__(self) -> str:
             return self.__name__
 
+        if sys.version_info < (3, 11):
+            def _check_single_param(self, param, recursion=0):
+                # Allow [], [int], [int, str], [int, ...], [int, T]
+                if param is ...:
+                    return ...
+                if param is None:
+                    return None
+                # Note in <= 3.9 _ConcatenateGenericAlias inherits from list
+                if isinstance(param, list) and recursion == 0:
+                    return [self._check_single_param(arg, recursion+1)
+                            for arg in param]
+                return typing._type_check(
+                        param, f'Subscripting {self.__name__} requires a type.'
+                    )
+
+        def _check_parameters(self, parameters):
+            if sys.version_info < (3, 11):
+                return tuple(
+                    self._check_single_param(item)
+                    for item in parameters
+                )
+            return tuple(typing._type_check(
+                        item, f'Subscripting {self.__name__} requires a type.'
+                    )
+                    for item in parameters
+            )
+
         def __getitem__(self, parameters):
+            if not self.__type_params__:
+                raise TypeError("Only generic type aliases are subscriptable")
             if not isinstance(parameters, tuple):
                 parameters = (parameters,)
-            parameters = [
-                typing._type_check(
-                    item, f'Subscripting {self.__name__} requires a type.'
-                )
-                for item in parameters
-            ]
-            return typing._GenericAlias(self, tuple(parameters))
+            # Using 3.9 here will create problems with Concatenate
+            if sys.version_info >= (3, 10):
+                return _types.GenericAlias(self, parameters)
+            type_vars = _collect_type_vars(parameters)
+            parameters = self._check_parameters(parameters)
+            alias = _TypeAliasGenericAlias(self, parameters)
+            # alias.__parameters__ is not complete if Concatenate is present
+            # as it is converted to a list from which no parameters are extracted.
+            if alias.__parameters__ != type_vars:
+                alias.__parameters__ = type_vars
+            return alias
 
         def __reduce__(self):
             return self.__name__
@@ -3599,6 +4126,404 @@ def __eq__(self, other: object) -> bool:
     __all__.append("CapsuleType")
 
 
+# Using this convoluted approach so that this keeps working
+# whether we end up using PEP 649 as written, PEP 749, or
+# some other variation: in any case, inspect.get_annotations
+# will continue to exist and will gain a `format` parameter.
+_PEP_649_OR_749_IMPLEMENTED = (
+    hasattr(inspect, 'get_annotations')
+    and inspect.get_annotations.__kwdefaults__ is not None
+    and "format" in inspect.get_annotations.__kwdefaults__
+)
+
+
+class Format(enum.IntEnum):
+    VALUE = 1
+    FORWARDREF = 2
+    STRING = 3
+
+
+if _PEP_649_OR_749_IMPLEMENTED:
+    get_annotations = inspect.get_annotations
+else:
+    def get_annotations(obj, *, globals=None, locals=None, eval_str=False,
+                        format=Format.VALUE):
+        """Compute the annotations dict for an object.
+
+        obj may be a callable, class, or module.
+        Passing in an object of any other type raises TypeError.
+
+        Returns a dict.  get_annotations() returns a new dict every time
+        it's called; calling it twice on the same object will return two
+        different but equivalent dicts.
+
+        This is a backport of `inspect.get_annotations`, which has been
+        in the standard library since Python 3.10. See the standard library
+        documentation for more:
+
+            https://docs.python.org/3/library/inspect.html#inspect.get_annotations
+
+        This backport adds the *format* argument introduced by PEP 649. The
+        three formats supported are:
+        * VALUE: the annotations are returned as-is. This is the default and
+          it is compatible with the behavior on previous Python versions.
+        * FORWARDREF: return annotations as-is if possible, but replace any
+          undefined names with ForwardRef objects. The implementation proposed by
+          PEP 649 relies on language changes that cannot be backported; the
+          typing-extensions implementation simply returns the same result as VALUE.
+        * STRING: return annotations as strings, in a format close to the original
+          source. Again, this behavior cannot be replicated directly in a backport.
+          As an approximation, typing-extensions retrieves the annotations under
+          VALUE semantics and then stringifies them.
+
+        The purpose of this backport is to allow users who would like to use
+        FORWARDREF or STRING semantics once PEP 649 is implemented, but who also
+        want to support earlier Python versions, to simply write:
+
+            typing_extensions.get_annotations(obj, format=Format.FORWARDREF)
+
+        """
+        format = Format(format)
+
+        if eval_str and format is not Format.VALUE:
+            raise ValueError("eval_str=True is only supported with format=Format.VALUE")
+
+        if isinstance(obj, type):
+            # class
+            obj_dict = getattr(obj, '__dict__', None)
+            if obj_dict and hasattr(obj_dict, 'get'):
+                ann = obj_dict.get('__annotations__', None)
+                if isinstance(ann, _types.GetSetDescriptorType):
+                    ann = None
+            else:
+                ann = None
+
+            obj_globals = None
+            module_name = getattr(obj, '__module__', None)
+            if module_name:
+                module = sys.modules.get(module_name, None)
+                if module:
+                    obj_globals = getattr(module, '__dict__', None)
+            obj_locals = dict(vars(obj))
+            unwrap = obj
+        elif isinstance(obj, _types.ModuleType):
+            # module
+            ann = getattr(obj, '__annotations__', None)
+            obj_globals = obj.__dict__
+            obj_locals = None
+            unwrap = None
+        elif callable(obj):
+            # this includes types.Function, types.BuiltinFunctionType,
+            # types.BuiltinMethodType, functools.partial, functools.singledispatch,
+            # "class funclike" from Lib/test/test_inspect... on and on it goes.
+            ann = getattr(obj, '__annotations__', None)
+            obj_globals = getattr(obj, '__globals__', None)
+            obj_locals = None
+            unwrap = obj
+        elif hasattr(obj, '__annotations__'):
+            ann = obj.__annotations__
+            obj_globals = obj_locals = unwrap = None
+        else:
+            raise TypeError(f"{obj!r} is not a module, class, or callable.")
+
+        if ann is None:
+            return {}
+
+        if not isinstance(ann, dict):
+            raise ValueError(f"{obj!r}.__annotations__ is neither a dict nor None")
+
+        if not ann:
+            return {}
+
+        if not eval_str:
+            if format is Format.STRING:
+                return {
+                    key: value if isinstance(value, str) else typing._type_repr(value)
+                    for key, value in ann.items()
+                }
+            return dict(ann)
+
+        if unwrap is not None:
+            while True:
+                if hasattr(unwrap, '__wrapped__'):
+                    unwrap = unwrap.__wrapped__
+                    continue
+                if isinstance(unwrap, functools.partial):
+                    unwrap = unwrap.func
+                    continue
+                break
+            if hasattr(unwrap, "__globals__"):
+                obj_globals = unwrap.__globals__
+
+        if globals is None:
+            globals = obj_globals
+        if locals is None:
+            locals = obj_locals or {}
+
+        # "Inject" type parameters into the local namespace
+        # (unless they are shadowed by assignments *in* the local namespace),
+        # as a way of emulating annotation scopes when calling `eval()`
+        if type_params := getattr(obj, "__type_params__", ()):
+            locals = {param.__name__: param for param in type_params} | locals
+
+        return_value = {key:
+            value if not isinstance(value, str) else eval(value, globals, locals)
+            for key, value in ann.items() }
+        return return_value
+
+
+if hasattr(typing, "evaluate_forward_ref"):
+    evaluate_forward_ref = typing.evaluate_forward_ref
+else:
+    # Implements annotationlib.ForwardRef.evaluate
+    def _eval_with_owner(
+        forward_ref, *, owner=None, globals=None, locals=None, type_params=None
+    ):
+        if forward_ref.__forward_evaluated__:
+            return forward_ref.__forward_value__
+        if getattr(forward_ref, "__cell__", None) is not None:
+            try:
+                value = forward_ref.__cell__.cell_contents
+            except ValueError:
+                pass
+            else:
+                forward_ref.__forward_evaluated__ = True
+                forward_ref.__forward_value__ = value
+                return value
+        if owner is None:
+            owner = getattr(forward_ref, "__owner__", None)
+
+        if (
+            globals is None
+            and getattr(forward_ref, "__forward_module__", None) is not None
+        ):
+            globals = getattr(
+                sys.modules.get(forward_ref.__forward_module__, None), "__dict__", None
+            )
+        if globals is None:
+            globals = getattr(forward_ref, "__globals__", None)
+        if globals is None:
+            if isinstance(owner, type):
+                module_name = getattr(owner, "__module__", None)
+                if module_name:
+                    module = sys.modules.get(module_name, None)
+                    if module:
+                        globals = getattr(module, "__dict__", None)
+            elif isinstance(owner, _types.ModuleType):
+                globals = getattr(owner, "__dict__", None)
+            elif callable(owner):
+                globals = getattr(owner, "__globals__", None)
+
+        # If we pass None to eval() below, the globals of this module are used.
+        if globals is None:
+            globals = {}
+
+        if locals is None:
+            locals = {}
+            if isinstance(owner, type):
+                locals.update(vars(owner))
+
+        if type_params is None and owner is not None:
+            # "Inject" type parameters into the local namespace
+            # (unless they are shadowed by assignments *in* the local namespace),
+            # as a way of emulating annotation scopes when calling `eval()`
+            type_params = getattr(owner, "__type_params__", None)
+
+        # type parameters require some special handling,
+        # as they exist in their own scope
+        # but `eval()` does not have a dedicated parameter for that scope.
+        # For classes, names in type parameter scopes should override
+        # names in the global scope (which here are called `localns`!),
+        # but should in turn be overridden by names in the class scope
+        # (which here are called `globalns`!)
+        if type_params is not None:
+            globals = dict(globals)
+            locals = dict(locals)
+            for param in type_params:
+                param_name = param.__name__
+                if (
+                    _FORWARD_REF_HAS_CLASS and not forward_ref.__forward_is_class__
+                ) or param_name not in globals:
+                    globals[param_name] = param
+                    locals.pop(param_name, None)
+
+        arg = forward_ref.__forward_arg__
+        if arg.isidentifier() and not keyword.iskeyword(arg):
+            if arg in locals:
+                value = locals[arg]
+            elif arg in globals:
+                value = globals[arg]
+            elif hasattr(builtins, arg):
+                return getattr(builtins, arg)
+            else:
+                raise NameError(arg)
+        else:
+            code = forward_ref.__forward_code__
+            value = eval(code, globals, locals)
+        forward_ref.__forward_evaluated__ = True
+        forward_ref.__forward_value__ = value
+        return value
+
+    def _lax_type_check(
+        value, msg, is_argument=True, *, module=None, allow_special_forms=False
+    ):
+        """
+        A lax Python 3.11+ like version of typing._type_check
+        """
+        if hasattr(typing, "_type_convert"):
+            if _FORWARD_REF_HAS_CLASS:
+                type_ = typing._type_convert(
+                    value,
+                    module=module,
+                    allow_special_forms=allow_special_forms,
+                )
+            # module was added with bpo-41249 before is_class (bpo-46539)
+            elif "__forward_module__" in typing.ForwardRef.__slots__:
+                type_ = typing._type_convert(value, module=module)
+            else:
+                type_ = typing._type_convert(value)
+        else:
+            if value is None:
+                return type(None)
+            if isinstance(value, str):
+                return ForwardRef(value)
+            type_ = value
+        invalid_generic_forms = (Generic, Protocol)
+        if not allow_special_forms:
+            invalid_generic_forms += (ClassVar,)
+            if is_argument:
+                invalid_generic_forms += (Final,)
+        if (
+            isinstance(type_, typing._GenericAlias)
+            and get_origin(type_) in invalid_generic_forms
+        ):
+            raise TypeError(f"{type_} is not valid as type argument") from None
+        if type_ in (Any, LiteralString, NoReturn, Never, Self, TypeAlias):
+            return type_
+        if allow_special_forms and type_ in (ClassVar, Final):
+            return type_
+        if (
+            isinstance(type_, (_SpecialForm, typing._SpecialForm))
+            or type_ in (Generic, Protocol)
+        ):
+            raise TypeError(f"Plain {type_} is not valid as type argument") from None
+        if type(type_) is tuple:  # lax version with tuple instead of callable
+            raise TypeError(f"{msg} Got {type_!r:.100}.")
+        return type_
+
+    def evaluate_forward_ref(
+        forward_ref,
+        *,
+        owner=None,
+        globals=None,
+        locals=None,
+        type_params=None,
+        format=Format.VALUE,
+        _recursive_guard=frozenset(),
+    ):
+        """Evaluate a forward reference as a type hint.
+
+        This is similar to calling the ForwardRef.evaluate() method,
+        but unlike that method, evaluate_forward_ref() also:
+
+        * Recursively evaluates forward references nested within the type hint.
+        * Rejects certain objects that are not valid type hints.
+        * Replaces type hints that evaluate to None with types.NoneType.
+        * Supports the *FORWARDREF* and *STRING* formats.
+
+        *forward_ref* must be an instance of ForwardRef. *owner*, if given,
+        should be the object that holds the annotations that the forward reference
+        derived from, such as a module, class object, or function. It is used to
+        infer the namespaces to use for looking up names. *globals* and *locals*
+        can also be explicitly given to provide the global and local namespaces.
+        *type_params* is a tuple of type parameters that are in scope when
+        evaluating the forward reference. This parameter must be provided (though
+        it may be an empty tuple) if *owner* is not given and the forward reference
+        does not already have an owner set. *format* specifies the format of the
+        annotation and is a member of the annotationlib.Format enum.
+
+        """
+        if format == Format.STRING:
+            return forward_ref.__forward_arg__
+        if forward_ref.__forward_arg__ in _recursive_guard:
+            return forward_ref
+
+        # Evaluate the forward reference
+        try:
+            value = _eval_with_owner(
+                forward_ref,
+                owner=owner,
+                globals=globals,
+                locals=locals,
+                type_params=type_params,
+            )
+        except NameError:
+            if format == Format.FORWARDREF:
+                return forward_ref
+            else:
+                raise
+
+        msg = "Forward references must evaluate to types."
+        if not _FORWARD_REF_HAS_CLASS:
+            allow_special_forms = not forward_ref.__forward_is_argument__
+        else:
+            allow_special_forms = forward_ref.__forward_is_class__
+        type_ = _lax_type_check(
+            value,
+            msg,
+            is_argument=forward_ref.__forward_is_argument__,
+            allow_special_forms=allow_special_forms,
+        )
+
+        # Recursively evaluate the type
+        if isinstance(type_, ForwardRef):
+            if getattr(type_, "__forward_module__", True) is not None:
+                globals = None
+            return evaluate_forward_ref(
+                type_,
+                globals=globals,
+                locals=locals,
+                 type_params=type_params, owner=owner,
+                _recursive_guard=_recursive_guard, format=format
+            )
+        if sys.version_info < (3, 12, 5) and type_params:
+            # Make use of type_params
+            locals = dict(locals) if locals else {}
+            for tvar in type_params:
+                if tvar.__name__ not in locals:  # lets not overwrite something present
+                    locals[tvar.__name__] = tvar
+        if sys.version_info < (3, 9):
+            return typing._eval_type(
+                type_,
+                globals,
+                locals,
+            )
+        if sys.version_info < (3, 12, 5):
+            return typing._eval_type(
+                type_,
+                globals,
+                locals,
+                recursive_guard=_recursive_guard | {forward_ref.__forward_arg__},
+            )
+        if sys.version_info < (3, 14):
+            return typing._eval_type(
+                type_,
+                globals,
+                locals,
+                type_params,
+                recursive_guard=_recursive_guard | {forward_ref.__forward_arg__},
+            )
+        return typing._eval_type(
+            type_,
+            globals,
+            locals,
+            type_params,
+            recursive_guard=_recursive_guard | {forward_ref.__forward_arg__},
+            format=format,
+            owner=owner,
+        )
+
+
 # Aliases for items that have always been in typing.
 # Explicitly assign these (rather than using `from typing import *` at the top),
 # so that we get a CI error if one of these is deleted from typing.py
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 8962e6fce7d..c867341699f 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -11,7 +11,7 @@ requests==2.32.3
     urllib3==1.26.20
 rich==14.0.0
     pygments==2.19.1
-    typing_extensions==4.12.2
+    typing_extensions==4.13.0
 resolvelib==1.1.0
 setuptools==70.3.0
 tomli==2.2.1

From b4939beca8276177b1f719efe523e5c9eb4fc3af Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Tue, 1 Apr 2025 12:09:30 +0100
Subject: [PATCH 809/992] Document command to upgrade vendored libraries

---
 src/pip/_vendor/README.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/pip/_vendor/README.rst b/src/pip/_vendor/README.rst
index e3fe8041ce2..a925e8cc6aa 100644
--- a/src/pip/_vendor/README.rst
+++ b/src/pip/_vendor/README.rst
@@ -115,6 +115,16 @@ Vendoring is automated via the `vendoring `
 Launch it via ``vendoring sync . -v`` (requires ``vendoring>=0.2.2``).
 Tool configuration is done via ``pyproject.toml``.
 
+To update the vendored library versions, we have a session defined in ``nox``.
+The command to upgrade everything is::
+
+    nox -s vendoring -- --upgrade-all --skip urllib3 --skip setuptools
+
+At the time of writing (April 2025) we do not upgrade ``urllib3`` because the
+next version is a major upgrade and will be handled as an independent PR. We also
+do not upgrade ``setuptools``, because we only rely on ``pkg_resources``, and
+tracking every ``setuptools`` change is unnecessary for our needs.
+
 
 Managing Local Patches
 ======================

From 56d326913fdcb43dab45b080df603615320bad20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 13 Oct 2024 12:24:44 +0200
Subject: [PATCH 810/992] Never use the pkg_resources backend on python 3.14+

---
 news/13010.removal.rst                        |  2 ++
 src/pip/_internal/metadata/__init__.py        | 24 +++++++++++++------
 src/pip/_internal/metadata/importlib/_envs.py |  7 +++---
 tests/functional/test_uninstall.py            |  4 ++++
 4 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 news/13010.removal.rst

diff --git a/news/13010.removal.rst b/news/13010.removal.rst
new file mode 100644
index 00000000000..1b665cc20bf
--- /dev/null
+++ b/news/13010.removal.rst
@@ -0,0 +1,2 @@
+On python 3.14+, the ``pkg_resources`` metadata backend is not used anymore,
+and pip does not attempt to detect installed ``.egg`` distributions.
diff --git a/src/pip/_internal/metadata/__init__.py b/src/pip/_internal/metadata/__init__.py
index 3535e5699bc..df03c47d97e 100644
--- a/src/pip/_internal/metadata/__init__.py
+++ b/src/pip/_internal/metadata/__init__.py
@@ -25,20 +25,30 @@ def _should_use_importlib_metadata() -> bool:
     """Whether to use the ``importlib.metadata`` or ``pkg_resources`` backend.
 
     By default, pip uses ``importlib.metadata`` on Python 3.11+, and
-    ``pkg_resources`` otherwise. This can be overridden by a couple of ways:
+    ``pkg_resources`` otherwise. Up to Python 3.13, This can be
+    overridden by a couple of ways:
 
     * If environment variable ``_PIP_USE_IMPORTLIB_METADATA`` is set, it
-      dictates whether ``importlib.metadata`` is used, regardless of Python
-      version.
-    * On Python 3.11+, Python distributors can patch ``importlib.metadata``
-      to add a global constant ``_PIP_USE_IMPORTLIB_METADATA = False``. This
-      makes pip use ``pkg_resources`` (unless the user set the aforementioned
-      environment variable to *True*).
+      dictates whether ``importlib.metadata`` is used, for Python <3.14.
+    * On Python 3.11, 3.12 and 3.13, Python distributors can patch
+      ``importlib.metadata`` to add a global constant
+      ``_PIP_USE_IMPORTLIB_METADATA = False``. This makes pip use
+      ``pkg_resources`` (unless the user set the aforementioned environment
+      variable to *True*).
+
+    On Python 3.14+, the ``pkg_resources`` backend cannot be used.
     """
+    if sys.version_info >= (3, 14):
+        # On Python >=3.14 we only support importlib.metadata.
+        return True
     with contextlib.suppress(KeyError, ValueError):
+        # On Python <3.14, if the environment variable is set, we obey what it says.
         return bool(strtobool(os.environ["_PIP_USE_IMPORTLIB_METADATA"]))
     if sys.version_info < (3, 11):
+        # On Python <3.11, we always use pkg_resources, unless the environment
+        # variable was set.
         return False
+    # On Python 3.11, 3.12 and 3.13, we check if the global constant is set.
     import importlib.metadata
 
     return bool(getattr(importlib.metadata, "_PIP_USE_IMPORTLIB_METADATA", True))
diff --git a/src/pip/_internal/metadata/importlib/_envs.py b/src/pip/_internal/metadata/importlib/_envs.py
index 681fd241fdc..c7b09d215e3 100644
--- a/src/pip/_internal/metadata/importlib/_envs.py
+++ b/src/pip/_internal/metadata/importlib/_envs.py
@@ -179,9 +179,10 @@ def _iter_distributions(self) -> Iterator[BaseDistribution]:
         finder = _DistributionFinder()
         for location in self._paths:
             yield from finder.find(location)
-            for dist in finder.find_eggs(location):
-                _emit_egg_deprecation(dist.location)
-                yield dist
+            if sys.version_info < (3, 14):
+                for dist in finder.find_eggs(location):
+                    _emit_egg_deprecation(dist.location)
+                    yield dist
             # This must go last because that's how pkg_resources tie-breaks.
             yield from finder.find_linked(location)
 
diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py
index d86ba172002..db2d25f2233 100644
--- a/tests/functional/test_uninstall.py
+++ b/tests/functional/test_uninstall.py
@@ -628,6 +628,10 @@ def test_uninstall_with_symlink(
     assert symlink_target.stat().st_mode == st_mode
 
 
+@pytest.mark.skipif(
+    "sys.version_info >= (3, 14)",
+    reason="Uninstall of .egg distributions not supported in Python 3.14+",
+)
 def test_uninstall_setuptools_develop_install(
     script: PipTestEnvironment, data: TestData
 ) -> None:

From 258f95e5cb2fd2f1cc93cb83fdeb96ef0e47c19c Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Thu, 3 Apr 2025 11:06:30 -0400
Subject: [PATCH 811/992] Reverse --no-python-version-warning deprecation
 (#13308)

This flag is way more prevalent than initially thought. Since this flag
is already a no-op, it's better to hide it from CLI help. This way, we can
avoid unnecessary churn, but avoid/discourage new occurrences of the flag.

The deprecation has already achieved the goal of communicating that
this flag is unnecessary today.
---
 news/13303.removal.rst                | 4 ++++
 src/pip/_internal/cli/base_command.py | 9 ---------
 src/pip/_internal/cli/cmdoptions.py   | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 news/13303.removal.rst

diff --git a/news/13303.removal.rst b/news/13303.removal.rst
new file mode 100644
index 00000000000..a198277a1a1
--- /dev/null
+++ b/news/13303.removal.rst
@@ -0,0 +1,4 @@
+Hide ``--no-python-version-warning`` from CLI help and documentation
+as it's useless since Python 2 support was removed. Despite being
+formerly slated for removal, the flag will remain as a no-op to
+avoid breakage.
diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py
index 509f7463ba8..1d71d67e7a4 100644
--- a/src/pip/_internal/cli/base_command.py
+++ b/src/pip/_internal/cli/base_command.py
@@ -29,7 +29,6 @@
     NetworkConnectionError,
     PreviousBuildDirError,
 )
-from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.filesystem import check_path_owner
 from pip._internal.utils.logging import BrokenStdoutLoggingError, setup_logging
 from pip._internal.utils.misc import get_prog, normalize_path
@@ -231,12 +230,4 @@ def _main(self, args: List[str]) -> int:
                 )
                 options.cache_dir = None
 
-        if options.no_python_version_warning:
-            deprecated(
-                reason="--no-python-version-warning is deprecated.",
-                replacement="to remove the flag as it's a no-op",
-                gone_in="25.1",
-                issue=13154,
-            )
-
         return self._run_wrapper(level_number, options, args)
diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index 93969be93b9..89be4a7b45a 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -1039,7 +1039,7 @@ def check_list_path_option(options: Values) -> None:
     dest="no_python_version_warning",
     action="store_true",
     default=False,
-    help="Silence deprecation warnings for upcoming unsupported Pythons.",
+    help=SUPPRESS_HELP,  # No-op, a hold-over from the Python 2->3 transition.
 )
 
 

From feef19f813cc060b528750cd5cb224f106ad3228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 5 Apr 2025 14:02:06 +0200
Subject: [PATCH 812/992] Warn when the pkg_resource metadata backend is used

with Python 3.11, 3.12, 3.13.
---
 news/13318.removal.rst                 |  4 ++++
 src/pip/_internal/metadata/__init__.py | 29 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 news/13318.removal.rst

diff --git a/news/13318.removal.rst b/news/13318.removal.rst
new file mode 100644
index 00000000000..5ccf542f136
--- /dev/null
+++ b/news/13318.removal.rst
@@ -0,0 +1,4 @@
+A warning is emitted when the deprecated ``pkg_resources`` library is used to
+inspect and discover installed packages. This warning should only be visible to
+users who set an undocumented environment variable to disable the default
+``importlib.metadata`` backend.
diff --git a/src/pip/_internal/metadata/__init__.py b/src/pip/_internal/metadata/__init__.py
index df03c47d97e..60b62b956bd 100644
--- a/src/pip/_internal/metadata/__init__.py
+++ b/src/pip/_internal/metadata/__init__.py
@@ -4,6 +4,7 @@
 import sys
 from typing import List, Literal, Optional, Protocol, Type, cast
 
+from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.misc import strtobool
 
 from .base import BaseDistribution, BaseEnvironment, FilesystemWheel, MemoryWheel, Wheel
@@ -54,6 +55,31 @@ def _should_use_importlib_metadata() -> bool:
     return bool(getattr(importlib.metadata, "_PIP_USE_IMPORTLIB_METADATA", True))
 
 
+def _emit_pkg_resources_deprecation_if_needed() -> None:
+    if sys.version_info < (3, 11):
+        # All pip versions supporting Python<=3.11 will support pkg_resources,
+        # and pkg_resources is the default for these, so let's not bother users.
+        return
+
+    import importlib.metadata
+
+    if hasattr(importlib.metadata, "_PIP_USE_IMPORTLIB_METADATA"):
+        # The Python distributor has set the global constant, so we don't
+        # warn, since it is not a user decision.
+        return
+
+    # The user has decided to use pkg_resources, so we warn.
+    deprecated(
+        reason="Using the pkg_resources metadata backend is deprecated.",
+        replacement=(
+            "to use the default importlib.metadata backend, "
+            "by unsetting the _PIP_USE_IMPORTLIB_METADATA environment variable"
+        ),
+        gone_in="26.3",
+        issue=13317,
+    )
+
+
 class Backend(Protocol):
     NAME: 'Literal["importlib", "pkg_resources"]'
     Distribution: Type[BaseDistribution]
@@ -66,6 +92,9 @@ def select_backend() -> Backend:
         from . import importlib
 
         return cast(Backend, importlib)
+
+    _emit_pkg_resources_deprecation_if_needed()
+
     from . import pkg_resources
 
     return cast(Backend, pkg_resources)

From 002982f6eddd6411f3009ae9a8be104393e94062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 5 Apr 2025 14:56:39 +0200
Subject: [PATCH 813/992] Deprecate using setup.py bdist_wheel

---
 news/13319.removal.rst                           |  3 +++
 .../_internal/operations/build/wheel_legacy.py   | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 news/13319.removal.rst

diff --git a/news/13319.removal.rst b/news/13319.removal.rst
new file mode 100644
index 00000000000..f5348138888
--- /dev/null
+++ b/news/13319.removal.rst
@@ -0,0 +1,3 @@
+Deprecate the legacy ``setup.py bdist_wheel`` mechanism. To silence the warning,
+and future-proof their setup, users should enable ``--use-pep517`` or add a
+``pyproject.toml`` file to the projects they control.
diff --git a/src/pip/_internal/operations/build/wheel_legacy.py b/src/pip/_internal/operations/build/wheel_legacy.py
index 3ee2a7058d3..473018173f5 100644
--- a/src/pip/_internal/operations/build/wheel_legacy.py
+++ b/src/pip/_internal/operations/build/wheel_legacy.py
@@ -3,6 +3,7 @@
 from typing import List, Optional
 
 from pip._internal.cli.spinners import open_spinner
+from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.setuptools_build import make_setuptools_bdist_wheel_args
 from pip._internal.utils.subprocess import call_subprocess, format_command_args
 
@@ -68,6 +69,21 @@ def build_wheel_legacy(
 
     Returns path to wheel if successfully built. Otherwise, returns None.
     """
+    deprecated(
+        reason=(
+            f"Building {name!r} using the legacy setup.py bdist_wheel mechanism, "
+            "which will be removed in a future version."
+        ),
+        replacement=(
+            "to use the standardized build interface by "
+            "setting the `--use-pep517` option, "
+            "(possibly combined with `--no-build-isolation`), "
+            f"or adding a `pyproject.toml` file to the source tree of {name!r}"
+        ),
+        gone_in="25.3",
+        issue=6334,
+    )
+
     wheel_args = make_setuptools_bdist_wheel_args(
         setup_py_path,
         global_options=global_options,

From 1d18b5fd1934b68600ac389bccdba6c510ee1911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 5 Apr 2025 15:17:43 +0200
Subject: [PATCH 814/992] Update tests to use pep 517

---
 tests/functional/test_install_index.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/functional/test_install_index.py b/tests/functional/test_install_index.py
index 72b0b9db7bd..73b122a6141 100644
--- a/tests/functional/test_install_index.py
+++ b/tests/functional/test_install_index.py
@@ -27,6 +27,8 @@ def test_find_links_no_doctype(script: PipTestEnvironment, data: TestData) -> No
     result = script.pip(
         "install",
         "simple==1.0",
+        "--use-pep517",
+        "--no-build-isolation",
         "--no-index",
         "--find-links",
         script.scratch_path,

From d6cb790d364769747c7f3d5147b9a7ebe01d494a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 5 Apr 2025 16:52:13 +0200
Subject: [PATCH 815/992] Signal that --build-option and --global-option will
 be removed at the same time as bdist_wheel

---
 src/pip/_internal/req/req_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index 3262d82658e..785fa3cb6a5 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -925,7 +925,7 @@ def check_legacy_setup_py_options(
             reason="--build-option and --global-option are deprecated.",
             issue=11859,
             replacement="to use --config-settings",
-            gone_in=None,
+            gone_in="25.3",
         )
         logger.warning(
             "Implying --no-binary=:all: due to the presence of "

From fff82552a79648f51e7e02bb491702440310fbcf Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 6 Apr 2025 14:10:17 -0400
Subject: [PATCH 816/992] Create a build project directory

---
 .github/dependabot.yml                                      | 2 +-
 .github/workflows/release.yml                               | 2 +-
 MANIFEST.in                                                 | 6 +++---
 build-project/.python-version                               | 1 +
 build-project.py => build-project/build-project.py          | 0
 .../build-requirements.in                                   | 0
 .../build-requirements.txt                                  | 0
 noxfile.py                                                  | 2 +-
 8 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 build-project/.python-version
 rename build-project.py => build-project/build-project.py (100%)
 rename build-requirements.in => build-project/build-requirements.in (100%)
 rename build-requirements.txt => build-project/build-requirements.txt (100%)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 456596841a9..d8e12fbdf6e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,6 +9,6 @@ updates:
         patterns:
           - "*"
   - package-ecosystem: "pip"
-    directory: "/"
+    directory: "/build-project"
     schedule:
       interval: "weekly"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e7d7755cd4a..d7d76f5d7d7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Build a binary wheel and a source tarball
-        run: ./build-project.py
+        run: ./build-project/build-project.py
       - name: Store the distribution packages
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
diff --git a/MANIFEST.in b/MANIFEST.in
index cb8e14df96b..8a1c5c6f109 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,9 +5,9 @@ include README.rst
 include SECURITY.md
 include pyproject.toml
 
-include build-requirements.in
-include build-requirements.txt
-include build-project.py
+include build-project/build-requirements.in
+include build-project/build-requirements.txt
+include build-project/build-project.py
 
 include src/pip/_vendor/README.rst
 include src/pip/_vendor/vendor.txt
diff --git a/build-project/.python-version b/build-project/.python-version
new file mode 100644
index 00000000000..e4fba218358
--- /dev/null
+++ b/build-project/.python-version
@@ -0,0 +1 @@
+3.12
diff --git a/build-project.py b/build-project/build-project.py
similarity index 100%
rename from build-project.py
rename to build-project/build-project.py
diff --git a/build-requirements.in b/build-project/build-requirements.in
similarity index 100%
rename from build-requirements.in
rename to build-project/build-requirements.in
diff --git a/build-requirements.txt b/build-project/build-requirements.txt
similarity index 100%
rename from build-requirements.txt
rename to build-project/build-requirements.txt
diff --git a/noxfile.py b/noxfile.py
index 57f5e897d63..d37c9a94766 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -374,7 +374,7 @@ def build_dists(session: nox.Session) -> List[str]:
         )
 
     session.log("# Build distributions")
-    session.run("python", "build-project.py", silent=True)
+    session.run("python", "build-project/build-project.py", silent=True)
     produced_dists = glob.glob("dist/*")
 
     session.log(f"# Verify distributions: {', '.join(produced_dists)}")

From e3e0abff24cd60d2d03d899b4daa17134121c103 Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 6 Apr 2025 14:21:22 -0400
Subject: [PATCH 817/992] Add ".python-version" to manifest

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 8a1c5c6f109..95e966d9624 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,6 +8,7 @@ include pyproject.toml
 include build-project/build-requirements.in
 include build-project/build-requirements.txt
 include build-project/build-project.py
+include build-project/.python-version
 
 include src/pip/_vendor/README.rst
 include src/pip/_vendor/vendor.txt

From 4021f2de546f77b438f83b8b849fe449d8f4946d Mon Sep 17 00:00:00 2001
From: Damian Shaw 
Date: Sun, 6 Apr 2025 14:53:14 -0400
Subject: [PATCH 818/992] Set cwd=Path(__file__).parent.parent in build project
 build call

---
 build-project/build-project.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-project/build-project.py b/build-project/build-project.py
index 2108669ca6f..3bfa764c097 100755
--- a/build-project/build-project.py
+++ b/build-project/build-project.py
@@ -64,6 +64,7 @@ def main() -> None:
             ],
             check=True,
             env={"SOURCE_DATE_EPOCH": get_git_head_timestamp()},
+            cwd=Path(__file__).parent.parent,
         )
 
 

From 005c2e702acf64a3568de83ca28004088837d924 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Apr 2025 23:38:49 -0400
Subject: [PATCH 819/992] Bump setuptools from 76.0.0 to 78.1.0 in
 /build-project (#13322)

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build-project/build-requirements.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-project/build-requirements.txt b/build-project/build-requirements.txt
index c957b6b6d90..60493af0e44 100644
--- a/build-project/build-requirements.txt
+++ b/build-project/build-requirements.txt
@@ -18,7 +18,7 @@ pyproject-hooks==1.2.0 \
     # via build
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==76.0.0 \
-    --hash=sha256:199466a166ff664970d0ee145839f5582cb9bca7a0a3a2e795b6a9cb2308e9c6 \
-    --hash=sha256:43b4ee60e10b0d0ee98ad11918e114c70701bc6051662a9a675a0496c1a158f4
+setuptools==78.1.0 \
+    --hash=sha256:18fd474d4a82a5f83dac888df697af65afa82dec7323d09c3e37d1f14288da54 \
+    --hash=sha256:3e386e96793c8702ae83d17b853fb93d3e09ef82ec62722e61da5cd22376dcd8
     # via -r build-requirements.in

From d8745c2710f4bcbdbbb9e33cd9471d626b0beeeb Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 18:25:10 +0000
Subject: [PATCH 820/992] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.9.9 → v0.11.4](https://github.com/astral-sh/ruff-pre-commit/compare/v0.9.9...v0.11.4)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 30b55ef5e9f..90573b0c725 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.9
+  rev: v0.11.4
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]

From 5e12ee48ab28715a892f3ee025bd77ce16d0406b Mon Sep 17 00:00:00 2001
From: Stefano Rivera 
Date: Thu, 10 Apr 2025 18:41:47 -0400
Subject: [PATCH 821/992] Remove check for wheel in --no-use-pep517

setuptools includes native bdist_wheel support since 70.1.0, we don't
need the wheel library.
---
 news/13330.bugfix.rst               | 1 +
 src/pip/_internal/cli/cmdoptions.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 news/13330.bugfix.rst

diff --git a/news/13330.bugfix.rst b/news/13330.bugfix.rst
new file mode 100644
index 00000000000..ab244fc40dd
--- /dev/null
+++ b/news/13330.bugfix.rst
@@ -0,0 +1 @@
+Don't require the ``wheel`` library to be installed to use ``--no-use-pep517``, any more.
diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index 89be4a7b45a..0427fef048e 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -824,9 +824,9 @@ def _handle_no_use_pep517(
         """
         raise_option_error(parser, option=option, msg=msg)
 
-    # If user doesn't wish to use pep517, we check if setuptools and wheel are installed
+    # If user doesn't wish to use pep517, we check if setuptools is installed
     # and raise error if it is not.
-    packages = ("setuptools", "wheel")
+    packages = ("setuptools",)
     if not all(importlib.util.find_spec(package) for package in packages):
         msg = (
             f"It is not possible to use --no-use-pep517 "

From 3427d969981c01a824e27a89151ec40d911818b2 Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Fri, 11 Apr 2025 15:28:22 +0100
Subject: [PATCH 822/992] Upgrade typing_extensions to 4.13.2

---
 news/typing_extensions.vendor.rst    |  2 +-
 src/pip/_vendor/typing_extensions.py | 42 ++++++++++++++++++++--------
 src/pip/_vendor/vendor.txt           |  2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
index 76ba97d4a2a..48de90c4aa4 100644
--- a/news/typing_extensions.vendor.rst
+++ b/news/typing_extensions.vendor.rst
@@ -1 +1 @@
-Upgrade typing_extensions to 4.13.0
+Upgrade typing_extensions to 4.13.2
diff --git a/src/pip/_vendor/typing_extensions.py b/src/pip/_vendor/typing_extensions.py
index e0c2fb62ad5..da8126b5bf6 100644
--- a/src/pip/_vendor/typing_extensions.py
+++ b/src/pip/_vendor/typing_extensions.py
@@ -2072,7 +2072,7 @@ def _create_concatenate_alias(origin, parameters):
     if parameters[-1] is ... and sys.version_info < (3, 9, 2):
         # Hack: Arguments must be types, replace it with one.
         parameters = (*parameters[:-1], _EllipsisDummy)
-    if sys.version_info >= (3, 10, 2):
+    if sys.version_info >= (3, 10, 3):
         concatenate = _ConcatenateGenericAlias(origin, parameters,
                                         _typevar_types=(TypeVar, ParamSpec),
                                         _paramspec_tvars=True)
@@ -3123,7 +3123,8 @@ def method(self) -> None:
         return arg
 
 
-if hasattr(warnings, "deprecated"):
+# Python 3.13.3+ contains a fix for the wrapped __new__
+if sys.version_info >= (3, 13, 3):
     deprecated = warnings.deprecated
 else:
     _T = typing.TypeVar("_T")
@@ -3203,7 +3204,7 @@ def __call__(self, arg: _T, /) -> _T:
                 original_new = arg.__new__
 
                 @functools.wraps(original_new)
-                def __new__(cls, *args, **kwargs):
+                def __new__(cls, /, *args, **kwargs):
                     if cls is arg:
                         warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
                     if original_new is not object.__new__:
@@ -3827,14 +3828,27 @@ def __ror__(self, other):
     TypeAliasType = typing.TypeAliasType
 # 3.8-3.13
 else:
-    def _is_unionable(obj):
-        """Corresponds to is_unionable() in unionobject.c in CPython."""
-        return obj is None or isinstance(obj, (
-            type,
-            _types.GenericAlias,
-            _types.UnionType,
-            TypeAliasType,
-        ))
+    if sys.version_info >= (3, 12):
+        # 3.12-3.14
+        def _is_unionable(obj):
+            """Corresponds to is_unionable() in unionobject.c in CPython."""
+            return obj is None or isinstance(obj, (
+                type,
+                _types.GenericAlias,
+                _types.UnionType,
+                typing.TypeAliasType,
+                TypeAliasType,
+            ))
+    else:
+        # 3.8-3.11
+        def _is_unionable(obj):
+            """Corresponds to is_unionable() in unionobject.c in CPython."""
+            return obj is None or isinstance(obj, (
+                type,
+                _types.GenericAlias,
+                _types.UnionType,
+                TypeAliasType,
+            ))
 
     if sys.version_info < (3, 10):
         # Copied and pasted from https://github.com/python/cpython/blob/986a4e1b6fcae7fe7a1d0a26aea446107dd58dd2/Objects/genericaliasobject.c#L568-L582,
@@ -4371,7 +4385,11 @@ def _lax_type_check(
         A lax Python 3.11+ like version of typing._type_check
         """
         if hasattr(typing, "_type_convert"):
-            if _FORWARD_REF_HAS_CLASS:
+            if (
+                sys.version_info >= (3, 10, 3)
+                or (3, 9, 10) < sys.version_info[:3] < (3, 10)
+            ):
+                # allow_special_forms introduced later cpython/#30926 (bpo-46539)
                 type_ = typing._type_convert(
                     value,
                     module=module,
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index c867341699f..b3e6fd491b8 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -11,7 +11,7 @@ requests==2.32.3
     urllib3==1.26.20
 rich==14.0.0
     pygments==2.19.1
-    typing_extensions==4.13.0
+    typing_extensions==4.13.2
 resolvelib==1.1.0
 setuptools==70.3.0
 tomli==2.2.1

From 69ff3a373c5005a2a52e2b40019a09f1424ee186 Mon Sep 17 00:00:00 2001
From: developer 
Date: Fri, 11 Apr 2025 22:16:30 +0300
Subject: [PATCH 823/992] fix: replaced sys_tags() by platform_tags()

---
 docs/html/cli/pip_download.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/html/cli/pip_download.rst b/docs/html/cli/pip_download.rst
index 03117136997..524d5e67929 100644
--- a/docs/html/cli/pip_download.rst
+++ b/docs/html/cli/pip_download.rst
@@ -52,11 +52,11 @@ and let pip download know where to find them using ``--find-links``.
    To determine the appropriate values for ``--python-version`` and ``--platform``, you can query the target system using the following commands:
 
    - For the Python version, use :func:`sysconfig.get_python_version() `.
-   - For the platform, use :func:`packaging.tags.sys_tags() `.
+   - For the platform, use :func:`packaging.tags.platform_tags() `.
 
    Refer to the official Python documentation for more details:
    - `sysconfig.get_python_version() `_
-   - `packaging.tags.sys_tags() `_
+   - `packaging.tags.platform_tags() `_
 
 Options
 =======

From 4c2e8eaef0e4d9ffcce8e60de6cc7d77e93d26ad Mon Sep 17 00:00:00 2001
From: George Margaritis 
Date: Sat, 12 Apr 2025 02:51:26 +0300
Subject: [PATCH 824/992] Introduce resumable downloads with --resume-retries
 (#12991)

Add the option --resume-retries to allow pip to retry a download X
number of times.

When a download times out or fails midway through and the download
size is known, a HTTP range request will be issued to resume the
download. If the server supports a partial download (i.e. returns 206
Partial Content), the download will be resumed. If the server responds
with 200 (i.e., the server does NOT support range requests or the file
has changed since the last request), we fall back to restarting the
download. This repeats as necessary until the download is complete or
no more retries remain.

The number of resumes currently defaults to zero, but it is expected to
be increased sometime after the 25.1 release once we've gotten feedback.

Signed-off-by: gmargaritis 
Co-authored-by: Yichi Yang 
Co-authored-by: Richard Si 
---
 news/12991.feature.rst                  |   3 +
 src/pip/_internal/cli/cmdoptions.py     |  15 +-
 src/pip/_internal/cli/progress_bars.py  |  19 +-
 src/pip/_internal/cli/req_command.py    |   1 +
 src/pip/_internal/exceptions.py         |  33 ++++
 src/pip/_internal/models/link.py        |   8 +-
 src/pip/_internal/network/download.py   | 210 ++++++++++++++++----
 src/pip/_internal/operations/prepare.py |   5 +-
 tests/unit/test_network_download.py     | 242 +++++++++++++++++++++++-
 tests/unit/test_operations_prepare.py   |   4 +-
 tests/unit/test_req.py                  |   1 +
 11 files changed, 483 insertions(+), 58 deletions(-)
 create mode 100644 news/12991.feature.rst

diff --git a/news/12991.feature.rst b/news/12991.feature.rst
new file mode 100644
index 00000000000..26c2df389ed
--- /dev/null
+++ b/news/12991.feature.rst
@@ -0,0 +1,3 @@
+Add support to enable resuming incomplete downloads.
+
+Control the number of retry attempts using the ``--resume-retries`` flag.
diff --git a/src/pip/_internal/cli/cmdoptions.py b/src/pip/_internal/cli/cmdoptions.py
index 0427fef048e..88392836cd9 100644
--- a/src/pip/_internal/cli/cmdoptions.py
+++ b/src/pip/_internal/cli/cmdoptions.py
@@ -281,8 +281,17 @@ class PipOption(Option):
     dest="retries",
     type="int",
     default=5,
-    help="Maximum number of retries each connection should attempt "
-    "(default %default times).",
+    help="Maximum attempts to establish a new HTTP connection. (default: %default)",
+)
+
+resume_retries: Callable[..., Option] = partial(
+    Option,
+    "--resume-retries",
+    dest="resume_retries",
+    type="int",
+    default=0,
+    help="Maximum attempts to resume or restart an incomplete download. "
+    "(default: %default)",
 )
 
 timeout: Callable[..., Option] = partial(
@@ -1077,7 +1086,6 @@ def check_list_path_option(options: Values) -> None:
     help=("Enable deprecated functionality, that will be removed in the future."),
 )
 
-
 ##########
 # groups #
 ##########
@@ -1110,6 +1118,7 @@ def check_list_path_option(options: Values) -> None:
         no_python_version_warning,
         use_new_feature,
         use_deprecated_feature,
+        resume_retries,
     ],
 }
 
diff --git a/src/pip/_internal/cli/progress_bars.py b/src/pip/_internal/cli/progress_bars.py
index a7d77cfaa8f..ab9d76b252e 100644
--- a/src/pip/_internal/cli/progress_bars.py
+++ b/src/pip/_internal/cli/progress_bars.py
@@ -29,6 +29,7 @@ def _rich_download_progress_bar(
     *,
     bar_type: str,
     size: Optional[int],
+    initial_progress: Optional[int] = None,
 ) -> Generator[bytes, None, None]:
     assert bar_type == "on", "This should only be used in the default mode."
 
@@ -54,6 +55,8 @@ def _rich_download_progress_bar(
 
     progress = Progress(*columns, refresh_per_second=5)
     task_id = progress.add_task(" " * (get_indentation() + 2), total=total)
+    if initial_progress is not None:
+        progress.update(task_id, advance=initial_progress)
     with progress:
         for chunk in iterable:
             yield chunk
@@ -86,12 +89,13 @@ def _raw_progress_bar(
     iterable: Iterable[bytes],
     *,
     size: Optional[int],
+    initial_progress: Optional[int] = None,
 ) -> Generator[bytes, None, None]:
     def write_progress(current: int, total: int) -> None:
         sys.stdout.write(f"Progress {current} of {total}\n")
         sys.stdout.flush()
 
-    current = 0
+    current = initial_progress or 0
     total = size or 0
     rate_limiter = RateLimiter(0.25)
 
@@ -105,7 +109,7 @@ def write_progress(current: int, total: int) -> None:
 
 
 def get_download_progress_renderer(
-    *, bar_type: str, size: Optional[int] = None
+    *, bar_type: str, size: Optional[int] = None, initial_progress: Optional[int] = None
 ) -> ProgressRenderer[bytes]:
     """Get an object that can be used to render the download progress.
 
@@ -113,10 +117,17 @@ def get_download_progress_renderer(
     """
     if bar_type == "on":
         return functools.partial(
-            _rich_download_progress_bar, bar_type=bar_type, size=size
+            _rich_download_progress_bar,
+            bar_type=bar_type,
+            size=size,
+            initial_progress=initial_progress,
         )
     elif bar_type == "raw":
-        return functools.partial(_raw_progress_bar, size=size)
+        return functools.partial(
+            _raw_progress_bar,
+            size=size,
+            initial_progress=initial_progress,
+        )
     else:
         return iter  # no-op, when passed an iterator
 
diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
index 82164e8a720..d9b51427055 100644
--- a/src/pip/_internal/cli/req_command.py
+++ b/src/pip/_internal/cli/req_command.py
@@ -144,6 +144,7 @@ def make_requirement_preparer(
             lazy_wheel=lazy_wheel,
             verbosity=verbosity,
             legacy_resolver=legacy_resolver,
+            resume_retries=options.resume_retries,
         )
 
     @classmethod
diff --git a/src/pip/_internal/exceptions.py b/src/pip/_internal/exceptions.py
index 313bbf51b9a..4fe4aadef2f 100644
--- a/src/pip/_internal/exceptions.py
+++ b/src/pip/_internal/exceptions.py
@@ -27,6 +27,7 @@
     from pip._vendor.requests.models import Request, Response
 
     from pip._internal.metadata import BaseDistribution
+    from pip._internal.models.link import Link
     from pip._internal.req.req_install import InstallRequirement
 
 logger = logging.getLogger(__name__)
@@ -809,6 +810,38 @@ def __init__(
         )
 
 
+class IncompleteDownloadError(DiagnosticPipError):
+    """Raised when the downloader receives fewer bytes than advertised
+    in the Content-Length header."""
+
+    reference = "incomplete-download"
+
+    def __init__(
+        self, link: "Link", received: int, expected: int, *, retries: int
+    ) -> None:
+        # Dodge circular import.
+        from pip._internal.utils.misc import format_size
+
+        download_status = f"{format_size(received)}/{format_size(expected)}"
+        if retries:
+            retry_status = f"after {retries} attempts "
+            hint = "Use --resume-retries to configure resume attempt limit."
+        else:
+            retry_status = ""
+            hint = "Consider using --resume-retries to enable download resumption."
+        message = Text(
+            f"Download failed {retry_status}because not enough bytes "
+            f"were received ({download_status})"
+        )
+
+        super().__init__(
+            message=message,
+            context=f"URL: {link.redacted_url}",
+            hint_stmt=hint,
+            note_stmt="This is an issue with network connectivity, not pip.",
+        )
+
+
 class ResolutionTooDeepError(DiagnosticPipError):
     """Raised when the dependency resolver exceeds the maximum recursion depth."""
 
diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index 0c7a1e9a691..f0560f6ec26 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -380,9 +380,9 @@ def __str__(self) -> str:
         else:
             rp = ""
         if self.comes_from:
-            return f"{redact_auth_from_url(self._url)} (from {self.comes_from}){rp}"
+            return f"{self.redacted_url} (from {self.comes_from}){rp}"
         else:
-            return redact_auth_from_url(str(self._url))
+            return self.redacted_url
 
     def __repr__(self) -> str:
         return f""
@@ -404,6 +404,10 @@ def __lt__(self, other: Any) -> bool:
     def url(self) -> str:
         return self._url
 
+    @property
+    def redacted_url(self) -> str:
+        return redact_auth_from_url(self.url)
+
     @property
     def filename(self) -> str:
         path = self.path.rstrip("/")
diff --git a/src/pip/_internal/network/download.py b/src/pip/_internal/network/download.py
index 9c6d7016579..15ef58b9c93 100644
--- a/src/pip/_internal/network/download.py
+++ b/src/pip/_internal/network/download.py
@@ -4,12 +4,14 @@
 import logging
 import mimetypes
 import os
-from typing import Iterable, Optional, Tuple
+from http import HTTPStatus
+from typing import BinaryIO, Iterable, Optional, Tuple
 
 from pip._vendor.requests.models import Response
+from pip._vendor.urllib3.exceptions import ReadTimeoutError
 
 from pip._internal.cli.progress_bars import get_download_progress_renderer
-from pip._internal.exceptions import NetworkConnectionError
+from pip._internal.exceptions import IncompleteDownloadError, NetworkConnectionError
 from pip._internal.models.index import PyPI
 from pip._internal.models.link import Link
 from pip._internal.network.cache import is_from_cache
@@ -27,13 +29,21 @@ def _get_http_response_size(resp: Response) -> Optional[int]:
         return None
 
 
+def _get_http_response_etag_or_last_modified(resp: Response) -> Optional[str]:
+    """
+    Return either the ETag or Last-Modified header (or None if neither exists).
+    The return value can be used in an If-Range header.
+    """
+    return resp.headers.get("etag", resp.headers.get("last-modified"))
+
+
 def _prepare_download(
     resp: Response,
     link: Link,
     progress_bar: str,
+    total_length: Optional[int],
+    range_start: Optional[int] = 0,
 ) -> Iterable[bytes]:
-    total_length = _get_http_response_size(resp)
-
     if link.netloc == PyPI.file_storage_domain:
         url = link.show_url
     else:
@@ -42,10 +52,17 @@ def _prepare_download(
     logged_url = redact_auth_from_url(url)
 
     if total_length:
-        logged_url = f"{logged_url} ({format_size(total_length)})"
+        if range_start:
+            logged_url = (
+                f"{logged_url} ({format_size(range_start)}/{format_size(total_length)})"
+            )
+        else:
+            logged_url = f"{logged_url} ({format_size(total_length)})"
 
     if is_from_cache(resp):
         logger.info("Using cached %s", logged_url)
+    elif range_start:
+        logger.info("Resuming download %s", logged_url)
     else:
         logger.info("Downloading %s", logged_url)
 
@@ -65,7 +82,9 @@ def _prepare_download(
     if not show_progress:
         return chunks
 
-    renderer = get_download_progress_renderer(bar_type=progress_bar, size=total_length)
+    renderer = get_download_progress_renderer(
+        bar_type=progress_bar, size=total_length, initial_progress=range_start
+    )
     return renderer(chunks)
 
 
@@ -112,10 +131,27 @@ def _get_http_response_filename(resp: Response, link: Link) -> str:
     return filename
 
 
-def _http_get_download(session: PipSession, link: Link) -> Response:
+def _http_get_download(
+    session: PipSession,
+    link: Link,
+    range_start: Optional[int] = 0,
+    if_range: Optional[str] = None,
+) -> Response:
     target_url = link.url.split("#", 1)[0]
-    resp = session.get(target_url, headers=HEADERS, stream=True)
-    raise_for_status(resp)
+    headers = HEADERS.copy()
+    # request a partial download
+    if range_start:
+        headers["Range"] = f"bytes={range_start}-"
+    # make sure the file hasn't changed
+    if if_range:
+        headers["If-Range"] = if_range
+    try:
+        resp = session.get(target_url, headers=headers, stream=True)
+        raise_for_status(resp)
+    except NetworkConnectionError as e:
+        assert e.response is not None
+        logger.critical("HTTP error %s while getting %s", e.response.status_code, link)
+        raise
     return resp
 
 
@@ -124,30 +160,140 @@ def __init__(
         self,
         session: PipSession,
         progress_bar: str,
+        resume_retries: int,
     ) -> None:
+        assert (
+            resume_retries >= 0
+        ), "Number of max resume retries must be bigger or equal to zero"
         self._session = session
         self._progress_bar = progress_bar
+        self._resume_retries = resume_retries
 
     def __call__(self, link: Link, location: str) -> Tuple[str, str]:
         """Download the file given by link into location."""
-        try:
-            resp = _http_get_download(self._session, link)
-        except NetworkConnectionError as e:
-            assert e.response is not None
-            logger.critical(
-                "HTTP error %s while getting %s", e.response.status_code, link
-            )
-            raise
+        resp = _http_get_download(self._session, link)
+        # NOTE: The original download size needs to be passed down everywhere
+        # so if the download is resumed (with a HTTP Range request) the progress
+        # bar will report the right size.
+        total_length = _get_http_response_size(resp)
+        content_type = resp.headers.get("Content-Type", "")
 
         filename = _get_http_response_filename(resp, link)
         filepath = os.path.join(location, filename)
 
-        chunks = _prepare_download(resp, link, self._progress_bar)
         with open(filepath, "wb") as content_file:
+            bytes_received = self._process_response(
+                resp, link, content_file, 0, total_length
+            )
+            # If possible, check for an incomplete download and attempt resuming.
+            if total_length and bytes_received < total_length:
+                self._attempt_resume(
+                    resp, link, content_file, total_length, bytes_received
+                )
+
+        return filepath, content_type
+
+    def _process_response(
+        self,
+        resp: Response,
+        link: Link,
+        content_file: BinaryIO,
+        bytes_received: int,
+        total_length: Optional[int],
+    ) -> int:
+        """Process the response and write the chunks to the file."""
+        chunks = _prepare_download(
+            resp, link, self._progress_bar, total_length, range_start=bytes_received
+        )
+        return self._write_chunks_to_file(
+            chunks, content_file, allow_partial=bool(total_length)
+        )
+
+    def _write_chunks_to_file(
+        self, chunks: Iterable[bytes], content_file: BinaryIO, *, allow_partial: bool
+    ) -> int:
+        """Write the chunks to the file and return the number of bytes received."""
+        bytes_received = 0
+        try:
             for chunk in chunks:
+                bytes_received += len(chunk)
                 content_file.write(chunk)
-        content_type = resp.headers.get("Content-Type", "")
-        return filepath, content_type
+        except ReadTimeoutError as e:
+            # If partial downloads are OK (the download will be retried), don't bail.
+            if not allow_partial:
+                raise e
+
+            # Ensuring bytes_received is returned to attempt resume
+            logger.warning("Connection timed out while downloading.")
+
+        return bytes_received
+
+    def _attempt_resume(
+        self,
+        resp: Response,
+        link: Link,
+        content_file: BinaryIO,
+        total_length: Optional[int],
+        bytes_received: int,
+    ) -> None:
+        """Attempt to resume the download if connection was dropped."""
+        etag_or_last_modified = _get_http_response_etag_or_last_modified(resp)
+
+        attempts_left = self._resume_retries
+        while total_length and attempts_left and bytes_received < total_length:
+            attempts_left -= 1
+
+            logger.warning(
+                "Attempting to resume incomplete download (%s/%s, attempt %d)",
+                format_size(bytes_received),
+                format_size(total_length),
+                (self._resume_retries - attempts_left),
+            )
+
+            try:
+                # Try to resume the download using a HTTP range request.
+                resume_resp = _http_get_download(
+                    self._session,
+                    link,
+                    range_start=bytes_received,
+                    if_range=etag_or_last_modified,
+                )
+
+                # Fallback: if the server responded with 200 (i.e., the file has
+                # since been modified or range requests are unsupported) or any
+                # other unexpected status, restart the download from the beginning.
+                must_restart = resume_resp.status_code != HTTPStatus.PARTIAL_CONTENT
+                if must_restart:
+                    bytes_received, total_length, etag_or_last_modified = (
+                        self._reset_download_state(resume_resp, content_file)
+                    )
+
+                bytes_received += self._process_response(
+                    resume_resp, link, content_file, bytes_received, total_length
+                )
+            except (ConnectionError, ReadTimeoutError, OSError):
+                continue
+
+        # No more resume attempts. Raise an error if the download is still incomplete.
+        if total_length and bytes_received < total_length:
+            os.remove(content_file.name)
+            raise IncompleteDownloadError(
+                link, bytes_received, total_length, retries=self._resume_retries
+            )
+
+    def _reset_download_state(
+        self,
+        resp: Response,
+        content_file: BinaryIO,
+    ) -> Tuple[int, Optional[int], Optional[str]]:
+        """Reset the download state to restart downloading from the beginning."""
+        content_file.seek(0)
+        content_file.truncate()
+        bytes_received = 0
+        total_length = _get_http_response_size(resp)
+        etag_or_last_modified = _get_http_response_etag_or_last_modified(resp)
+
+        return bytes_received, total_length, etag_or_last_modified
 
 
 class BatchDownloader:
@@ -155,32 +301,14 @@ def __init__(
         self,
         session: PipSession,
         progress_bar: str,
+        resume_retries: int,
     ) -> None:
-        self._session = session
-        self._progress_bar = progress_bar
+        self._downloader = Downloader(session, progress_bar, resume_retries)
 
     def __call__(
         self, links: Iterable[Link], location: str
     ) -> Iterable[Tuple[Link, Tuple[str, str]]]:
         """Download the files given by links into location."""
         for link in links:
-            try:
-                resp = _http_get_download(self._session, link)
-            except NetworkConnectionError as e:
-                assert e.response is not None
-                logger.critical(
-                    "HTTP error %s while getting %s",
-                    e.response.status_code,
-                    link,
-                )
-                raise
-
-            filename = _get_http_response_filename(resp, link)
-            filepath = os.path.join(location, filename)
-
-            chunks = _prepare_download(resp, link, self._progress_bar)
-            with open(filepath, "wb") as content_file:
-                for chunk in chunks:
-                    content_file.write(chunk)
-            content_type = resp.headers.get("Content-Type", "")
+            filepath, content_type = self._downloader(link, location)
             yield link, (filepath, content_type)
diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py
index b7beee55dce..531070a03ad 100644
--- a/src/pip/_internal/operations/prepare.py
+++ b/src/pip/_internal/operations/prepare.py
@@ -235,6 +235,7 @@ def __init__(
         lazy_wheel: bool,
         verbosity: int,
         legacy_resolver: bool,
+        resume_retries: int,
     ) -> None:
         super().__init__()
 
@@ -242,8 +243,8 @@ def __init__(
         self.build_dir = build_dir
         self.build_tracker = build_tracker
         self._session = session
-        self._download = Downloader(session, progress_bar)
-        self._batch_download = BatchDownloader(session, progress_bar)
+        self._download = Downloader(session, progress_bar, resume_retries)
+        self._batch_download = BatchDownloader(session, progress_bar, resume_retries)
         self.finder = finder
 
         # Where still-packed archives should be written to. If None, they are
diff --git a/tests/unit/test_network_download.py b/tests/unit/test_network_download.py
index 14998d229bf..128b62b0622 100644
--- a/tests/unit/test_network_download.py
+++ b/tests/unit/test_network_download.py
@@ -1,53 +1,79 @@
 import logging
 import sys
-from typing import Dict
+from pathlib import Path
+from typing import Dict, List, Optional, Tuple
+from unittest.mock import MagicMock, call, patch
 
 import pytest
 
+from pip._internal.exceptions import IncompleteDownloadError
 from pip._internal.models.link import Link
 from pip._internal.network.download import (
+    Downloader,
+    _get_http_response_size,
+    _http_get_download,
     _prepare_download,
     parse_content_disposition,
     sanitize_content_filename,
 )
+from pip._internal.network.session import PipSession
+from pip._internal.network.utils import HEADERS
 
 from tests.lib.requests_mocks import MockResponse
 
 
 @pytest.mark.parametrize(
-    "url, headers, from_cache, expected",
+    "url, headers, from_cache, range_start, expected",
     [
         (
             "http://example.com/foo.tgz",
             {},
             False,
+            None,
             "Downloading http://example.com/foo.tgz",
         ),
         (
             "http://example.com/foo.tgz",
             {"content-length": "2"},
             False,
+            None,
             "Downloading http://example.com/foo.tgz (2 bytes)",
         ),
         (
             "http://example.com/foo.tgz",
             {"content-length": "2"},
             True,
+            None,
             "Using cached http://example.com/foo.tgz (2 bytes)",
         ),
-        ("https://files.pythonhosted.org/foo.tgz", {}, False, "Downloading foo.tgz"),
+        (
+            "https://files.pythonhosted.org/foo.tgz",
+            {},
+            False,
+            None,
+            "Downloading foo.tgz",
+        ),
         (
             "https://files.pythonhosted.org/foo.tgz",
             {"content-length": "2"},
             False,
+            None,
             "Downloading foo.tgz (2 bytes)",
         ),
         (
             "https://files.pythonhosted.org/foo.tgz",
             {"content-length": "2"},
             True,
+            None,
             "Using cached foo.tgz",
         ),
+        (
+            "http://example.com/foo.tgz",
+            {"content-length": "200"},
+            False,
+            100,
+            "Resuming download http://example.com/foo.tgz (100 bytes/200 bytes)",
+        ),
     ],
 )
 def test_prepare_download__log(
@@ -55,6 +81,7 @@ def test_prepare_download__log(
     url: str,
     headers: Dict[str, str],
     from_cache: bool,
+    range_start: Optional[int],
     expected: str,
 ) -> None:
     caplog.set_level(logging.INFO)
@@ -64,7 +91,14 @@ def test_prepare_download__log(
     if from_cache:
         resp.from_cache = from_cache
     link = Link(url)
-    _prepare_download(resp, link, progress_bar="on")
+    total_length = _get_http_response_size(resp)
+    _prepare_download(
+        resp,
+        link,
+        progress_bar="on",
+        total_length=total_length,
+        range_start=range_start,
+    )
 
     assert len(caplog.records) == 1
     record = caplog.records[0]
@@ -114,6 +148,29 @@ def test_sanitize_content_filename__platform_dependent(
     assert sanitize_content_filename(filename) == expected
 
 
+@pytest.mark.parametrize(
+    "range_start, if_range, expected_headers",
+    [
+        (None, None, HEADERS),
+        (1234, None, {**HEADERS, "Range": "bytes=1234-"}),
+        (1234, '"etag"', {**HEADERS, "Range": "bytes=1234-", "If-Range": '"etag"'}),
+    ],
+)
+def test_http_get_download(
+    range_start: Optional[int],
+    if_range: Optional[str],
+    expected_headers: Dict[str, str],
+) -> None:
+    session = PipSession()
+    session.get = MagicMock()
+    link = Link("http://example.com/foo.tgz")
+    with patch("pip._internal.network.download.raise_for_status"):
+        _http_get_download(session, link, range_start, if_range)
+    session.get.assert_called_once_with(
+        "http://example.com/foo.tgz", headers=expected_headers, stream=True
+    )
+
+
 @pytest.mark.parametrize(
     "content_disposition, default_filename, expected",
     [
@@ -125,3 +182,180 @@ def test_parse_content_disposition(
 ) -> None:
     actual = parse_content_disposition(content_disposition, default_filename)
     assert actual == expected
+
+
+@pytest.mark.parametrize(
+    "resume_retries,mock_responses,expected_resume_args,expected_bytes",
+    [
+        # If content-length is not provided, the download will
+        # always "succeed" since we don't have a way to check if
+        # the download is complete.
+        (
+            0,
+            [({}, 200, b"0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89")],
+            [],
+            b"0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89",
+        ),
+        # Complete download (content-length matches body)
+        (
+            0,
+            [({"content-length": "36"}, 200, b"0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89")],
+            [],
+            b"0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89",
+        ),
+        # Incomplete download without resume retries
+        (
+            0,
+            [({"content-length": "36"}, 200, b"0cfa7e9d-1868-4dd7-9fb3-")],
+            [],
+            None,
+        ),
+        # Incomplete download with resume retries
+        (
+            5,
+            [
+                ({"content-length": "36"}, 200, b"0cfa7e9d-1868-4dd7-9fb3-"),
+                ({"content-length": "12"}, 206, b"f2561d5dfd89"),
+            ],
+            [(24, None)],
+            b"0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89",
+        ),
+        # If the server responds with 200 (e.g. no range header support or the file
+        # has changed between the requests) the downloader should restart instead of
+        # attempting to resume. The downloaded file should not be affected.
+        (
+            5,
+            [
+                ({"content-length": "36"}, 200, b"0cfa7e9d-1868-4dd7-9fb3-"),
+                ({"content-length": "36"}, 200, b"0cfa7e9d-1868-"),
+                (
+                    {"content-length": "36"},
+                    200,
+                    b"0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89",
+                ),
+            ],
+            [(24, None), (14, None)],
+            b"0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89",
+        ),
+        # File size could change between requests. Make sure this is handled correctly.
+        (
+            5,
+            [
+                ({"content-length": "36"}, 200, b"0cfa7e9d-1868-4dd7-9fb3-"),
+                (
+                    {"content-length": "40"},
+                    200,
+                    b"new-0cfa7e9d-1868-4dd7-9fb3-f2561d5d",
+                ),
+                ({"content-length": "4"}, 206, b"fd89"),
+            ],
+            [(24, None), (36, None)],
+            b"new-0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89",
+        ),
+        # The downloader should fail after n resume_retries attempts.
+        # This prevents the downloader from getting stuck if the connection
+        # is unstable and the server doesn't not support range requests.
+        (
+            1,
+            [
+                ({"content-length": "36"}, 200, b"0cfa7e9d-1868-4dd7-9fb3-"),
+                ({"content-length": "36"}, 200, b"0cfa7e9d-1868-"),
+            ],
+            [(24, None)],
+            None,
+        ),
+        # The downloader should use If-Range header to make the range
+        # request conditional if it is possible to check for modifications
+        # (e.g. if we know the creation time of the initial response).
+        (
+            5,
+            [
+                (
+                    {
+                        "content-length": "36",
+                        "last-modified": "Wed, 21 Oct 2015 07:28:00 GMT",
+                    },
+                    200,
+                    b"0cfa7e9d-1868-4dd7-9fb3-",
+                ),
+                (
+                    {
+                        "content-length": "12",
+                        "last-modified": "Wed, 21 Oct 2015 07:54:00 GMT",
+                    },
+                    206,
+                    b"f2561d5dfd89",
+                ),
+            ],
+            [(24, "Wed, 21 Oct 2015 07:28:00 GMT")],
+            b"0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89",
+        ),
+        # ETag is preferred over Last-Modified for the If-Range condition.
+        (
+            5,
+            [
+                (
+                    {
+                        "content-length": "36",
+                        "last-modified": "Wed, 21 Oct 2015 07:28:00 GMT",
+                        "etag": '"33a64df551425fcc55e4d42a148795d9f25f89d4"',
+                    },
+                    200,
+                    b"0cfa7e9d-1868-4dd7-9fb3-",
+                ),
+                (
+                    {
+                        "content-length": "12",
+                        "last-modified": "Wed, 21 Oct 2015 07:54:00 GMT",
+                        "etag": '"33a64df551425fcc55e4d42a148795d9f25f89d4"',
+                    },
+                    206,
+                    b"f2561d5dfd89",
+                ),
+            ],
+            [(24, '"33a64df551425fcc55e4d42a148795d9f25f89d4"')],
+            b"0cfa7e9d-1868-4dd7-9fb3-f2561d5dfd89",
+        ),
+    ],
+)
+def test_downloader(
+    resume_retries: int,
+    mock_responses: List[Tuple[Dict[str, str], int, bytes]],
+    # list of (range_start, if_range)
+    expected_resume_args: List[Tuple[Optional[int], Optional[int]]],
+    # expected_bytes is None means the download should fail
+    expected_bytes: Optional[bytes],
+    tmpdir: Path,
+) -> None:
+    session = PipSession()
+    link = Link("http://example.com/foo.tgz")
+    downloader = Downloader(session, "on", resume_retries)
+
+    responses = []
+    for headers, status_code, body in mock_responses:
+        resp = MockResponse(body)
+        resp.headers = headers
+        resp.status_code = status_code
+        responses.append(resp)
+    _http_get_download = MagicMock(side_effect=responses)
+
+    with patch("pip._internal.network.download._http_get_download", _http_get_download):
+        if expected_bytes is None:
+            remove = MagicMock(return_value=None)
+            with patch("os.remove", remove):
+                with pytest.raises(IncompleteDownloadError):
+                    downloader(link, str(tmpdir))
+            # Make sure the incomplete file is removed
+            remove.assert_called_once()
+        else:
+            filepath, _ = downloader(link, str(tmpdir))
+            with open(filepath, "rb") as downloaded_file:
+                downloaded_bytes = downloaded_file.read()
+                assert downloaded_bytes == expected_bytes
+
+    calls = [call(session, link)]  # the initial request
+    for range_start, if_range in expected_resume_args:
+        calls.append(call(session, link, range_start=range_start, if_range=if_range))
+
+    # Make sure that the download makes additional requests for resumption
+    _http_get_download.assert_has_calls(calls)
diff --git a/tests/unit/test_operations_prepare.py b/tests/unit/test_operations_prepare.py
index 86e26c11801..bc6edcb3b9a 100644
--- a/tests/unit/test_operations_prepare.py
+++ b/tests/unit/test_operations_prepare.py
@@ -32,7 +32,7 @@ def _fake_session_get(*args: Any, **kwargs: Any) -> Dict[str, str]:
 
     session = Mock()
     session.get = _fake_session_get
-    download = Downloader(session, progress_bar="on")
+    download = Downloader(session, progress_bar="on", resume_retries=0)
 
     uri = data.packages.joinpath("simple-1.0.tar.gz").as_uri()
     link = Link(uri)
@@ -78,7 +78,7 @@ def test_download_http_url__no_directory_traversal(
         "content-disposition": 'attachment;filename="../out_dir_file"',
     }
     session.get.return_value = resp
-    download = Downloader(session, progress_bar="on")
+    download = Downloader(session, progress_bar="on", resume_retries=0)
 
     download_dir = os.fspath(tmpdir.joinpath("download"))
     os.mkdir(download_dir)
diff --git a/tests/unit/test_req.py b/tests/unit/test_req.py
index e243a718725..327597a8c0f 100644
--- a/tests/unit/test_req.py
+++ b/tests/unit/test_req.py
@@ -109,6 +109,7 @@ def _basic_resolver(
                 lazy_wheel=False,
                 verbosity=0,
                 legacy_resolver=True,
+                resume_retries=0,
             )
             yield Resolver(
                 preparer=preparer,

From af6cb23682b79fbb114410c802bd904b99ef359a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 5 Apr 2025 13:23:21 +0200
Subject: [PATCH 825/992] Postpone removal of legacy editable installs to 25.3

---
 src/pip/_internal/req/req_install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
index 3262d82658e..60c07d8bb91 100644
--- a/src/pip/_internal/req/req_install.py
+++ b/src/pip/_internal/req/req_install.py
@@ -837,7 +837,7 @@ def install(
                     "try using --config-settings editable_mode=compat. "
                     "Please consult the setuptools documentation for more information"
                 ),
-                gone_in="25.1",
+                gone_in="25.3",
                 issue=11457,
             )
             if self.config_settings:

From c23be8a2d711855d4936a64200dd33fca972a4aa Mon Sep 17 00:00:00 2001
From: Bradley Reynolds 
Date: Sat, 12 Apr 2025 10:09:46 -0500
Subject: [PATCH 826/992] Fixup changelog entry for #12963 (#13331)

---
 news/12963.feature.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/news/12963.feature.rst b/news/12963.feature.rst
index 66320c7ba90..5d8a4cfaec6 100644
--- a/news/12963.feature.rst
+++ b/news/12963.feature.rst
@@ -1,4 +1,4 @@
-- Add a ``--group`` option which allows installation from PEP 735 Dependency
-  Groups. ``--group`` accepts arguments of the form ``group`` or
-  ``path:group``, where the default path is ``pyproject.toml``, and installs
-  the named Dependency Group from the provided ``pyproject.toml`` file.
+Add a ``--group`` option which allows installation from :pep:`735` Dependency
+Groups. ``--group`` accepts arguments of the form ``group`` or
+``path:group``, where the default path is ``pyproject.toml``, and installs
+the named Dependency Group from the provided ``pyproject.toml`` file.

From 354e9d46c7624f0b41074a6d43b4840d8a7e2111 Mon Sep 17 00:00:00 2001
From: Matthew Hughes 
Date: Sun, 13 Apr 2025 16:03:05 +0100
Subject: [PATCH 827/992] Use tags in docs building to split up requirements
 (#13168)

The goal is to allow a build of just the `man` pages with a minimal set
of dependencies, like:

    sphinx-build \
        --tag man \
        -c docs/html \
        -d docs/build/doctrees/man \
        -b man \
        docs/man \
        docs/build/man

This is for the sake of people distributing `pip` who want to build
exclusively the man pages (and find the HTML build dependencies
problematic).
---
 docs/html/conf.py  | 31 ++++++++++++++++++++-----------
 news/13168.doc.rst |  3 +++
 noxfile.py         |  1 +
 3 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 news/13168.doc.rst

diff --git a/docs/html/conf.py b/docs/html/conf.py
index be95eca2941..0c390c9245a 100644
--- a/docs/html/conf.py
+++ b/docs/html/conf.py
@@ -14,20 +14,29 @@
 # -- General configuration ------------------------------------------------------------
 
 extensions = [
-    # first-party extensions
-    "sphinx.ext.autodoc",
-    "sphinx.ext.todo",
-    "sphinx.ext.intersphinx",
-    # our extensions
+    # extensions common to all builds
     "pip_sphinxext",
-    # third-party extensions
-    "myst_parser",
-    "sphinx_copybutton",
-    "sphinx_inline_tabs",
-    "sphinxcontrib.towncrier",
-    "sphinx_issues",
 ]
 
+# 'tags' is a injected by sphinx
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-tags
+if "man" not in tags:  # type: ignore[name-defined] # noqa: F821
+    # extensions not needed for building man pages
+    extensions.extend(
+        (
+            # first-party extensions
+            "sphinx.ext.autodoc",
+            "sphinx.ext.todo",
+            "sphinx.ext.intersphinx",
+            # third-party extensions
+            "myst_parser",
+            "sphinx_copybutton",
+            "sphinx_inline_tabs",
+            "sphinxcontrib.towncrier",
+            "sphinx_issues",
+        ),
+    )
+
 # General information about the project.
 project = "pip"
 copyright = "The pip developers"
diff --git a/news/13168.doc.rst b/news/13168.doc.rst
new file mode 100644
index 00000000000..7681e00fcdb
--- /dev/null
+++ b/news/13168.doc.rst
@@ -0,0 +1,3 @@
+Added support for building only the man pages with minimal dependencies using
+the sphinx-build ``--tag man`` option. This enables distributors to generate man
+pages without requiring HTML documentation dependencies.
diff --git a/noxfile.py b/noxfile.py
index d37c9a94766..2484af5ff49 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -145,6 +145,7 @@ def get_sphinx_build_command(kind: str) -> List[str]:
         return [
             "sphinx-build",
             "--keep-going",
+            "--tag", kind,
             "-W",
             "-c", "docs/html",  # see note above
             "-d", "docs/build/doctrees/" + kind,

From 68adf7380d6491cff7382a22feaaf2d6e017a5da Mon Sep 17 00:00:00 2001
From: developer 
Date: Sun, 13 Apr 2025 21:33:07 +0300
Subject: [PATCH 828/992] fix: added packaging documentation to configuration
 and removed links repetitions

---
 docs/html/cli/pip_download.rst | 4 ----
 docs/html/conf.py              | 1 +
 news/6369.doc.rst              | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 news/6369.doc.rst

diff --git a/docs/html/cli/pip_download.rst b/docs/html/cli/pip_download.rst
index 524d5e67929..52fa2c651da 100644
--- a/docs/html/cli/pip_download.rst
+++ b/docs/html/cli/pip_download.rst
@@ -54,10 +54,6 @@ and let pip download know where to find them using ``--find-links``.
    - For the Python version, use :func:`sysconfig.get_python_version() `.
    - For the platform, use :func:`packaging.tags.platform_tags() `.
 
-   Refer to the official Python documentation for more details:
-   - `sysconfig.get_python_version() `_
-   - `packaging.tags.platform_tags() `_
-
 Options
 =======
 
diff --git a/docs/html/conf.py b/docs/html/conf.py
index be95eca2941..309354d875e 100644
--- a/docs/html/conf.py
+++ b/docs/html/conf.py
@@ -69,6 +69,7 @@
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
     "pypug": ("https://packaging.python.org", None),
+    "packaging": ("https://packaging.pypa.io/en/stable/", None),
 }
 
 # -- Options for towncrier_draft extension --------------------------------------------
diff --git a/news/6369.doc.rst b/news/6369.doc.rst
deleted file mode 100644
index 00742e20ff5..00000000000
--- a/news/6369.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Provided information about the --platform and --python-version options of the ``pip download`` command

From 1c00ca39e58e96f5001e6c06166556f2e3996677 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 14 Apr 2025 17:32:13 -0400
Subject: [PATCH 829/992] Remove log_streams from FreezeCommand

This is no longer necessary after commit e7b7239be35b717fadf77e12fca59efcf1f79b4f
---
 src/pip/_internal/commands/freeze.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pip/_internal/commands/freeze.py b/src/pip/_internal/commands/freeze.py
index 885fdfeb83b..f8de335b283 100644
--- a/src/pip/_internal/commands/freeze.py
+++ b/src/pip/_internal/commands/freeze.py
@@ -32,7 +32,6 @@ class FreezeCommand(Command):
     ignore_require_venv = True
     usage = """
       %prog [options]"""
-    log_streams = ("ext://sys.stderr", "ext://sys.stderr")
 
     def add_options(self) -> None:
         self.cmd_opts.add_option(

From 7c9a6b108dc3c425194245d6226d5657af5c1780 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 14 Apr 2025 17:33:20 -0400
Subject: [PATCH 830/992] Remove _fix_abiflags from locations

It's no longer needed after commit 99d13226e44fef23d04cbd2f364ce57cbde1ecef
---
 src/pip/_internal/locations/__init__.py | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/pip/_internal/locations/__init__.py b/src/pip/_internal/locations/__init__.py
index e5b4b9eec60..dfb5dd36066 100644
--- a/src/pip/_internal/locations/__init__.py
+++ b/src/pip/_internal/locations/__init__.py
@@ -4,7 +4,7 @@
 import pathlib
 import sys
 import sysconfig
-from typing import Any, Dict, Generator, Optional, Tuple
+from typing import Any, Dict, Optional
 
 from pip._internal.models.scheme import SCHEME_KEYS, Scheme
 from pip._internal.utils.compat import WINDOWS
@@ -174,22 +174,6 @@ def _looks_like_msys2_mingw_scheme() -> bool:
     )
 
 
-def _fix_abiflags(parts: Tuple[str]) -> Generator[str, None, None]:
-    ldversion = sysconfig.get_config_var("LDVERSION")
-    abiflags = getattr(sys, "abiflags", None)
-
-    # LDVERSION does not end with sys.abiflags. Just return the path unchanged.
-    if not ldversion or not abiflags or not ldversion.endswith(abiflags):
-        yield from parts
-        return
-
-    # Strip sys.abiflags from LDVERSION-based path components.
-    for part in parts:
-        if part.endswith(ldversion):
-            part = part[: (0 - len(abiflags))]
-        yield part
-
-
 @functools.lru_cache(maxsize=None)
 def _warn_mismatched(old: pathlib.Path, new: pathlib.Path, *, key: str) -> None:
     issue_url = "https://github.com/pypa/pip/issues/10151"

From b9a2543106592416e8dfd7d5169a61f694d573d8 Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 14 Apr 2025 17:34:24 -0400
Subject: [PATCH 831/992] Remove pkg_resources era safe_extra()

PEP 685 renders this normalization helper useless.
---
 src/pip/_internal/utils/packaging.py | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/pip/_internal/utils/packaging.py b/src/pip/_internal/utils/packaging.py
index 5bac550d723..1295b7ffe20 100644
--- a/src/pip/_internal/utils/packaging.py
+++ b/src/pip/_internal/utils/packaging.py
@@ -1,13 +1,10 @@
 import functools
 import logging
-import re
-from typing import NewType, Optional, Tuple, cast
+from typing import Optional, Tuple
 
 from pip._vendor.packaging import specifiers, version
 from pip._vendor.packaging.requirements import Requirement
 
-NormalizedExtra = NewType("NormalizedExtra", str)
-
 logger = logging.getLogger(__name__)
 
 
@@ -44,15 +41,3 @@ def get_requirement(req_string: str) -> Requirement:
     # minimize repeated parsing of the same string to construct equivalent
     # Requirement objects.
     return Requirement(req_string)
-
-
-def safe_extra(extra: str) -> NormalizedExtra:
-    """Convert an arbitrary string to a standard 'extra' name
-
-    Any runs of non-alphanumeric characters are replaced with a single '_',
-    and the result is always lowercased.
-
-    This function is duplicated from ``pkg_resources``. Note that this is not
-    the same to either ``canonicalize_name`` or ``_egg_link_name``.
-    """
-    return cast(NormalizedExtra, re.sub("[^A-Za-z0-9.-]+", "_", extra).lower())

From e74c2d741715697de2e2716bf5cf1b5dc4f4b8ef Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Mon, 14 Apr 2025 22:13:06 -0400
Subject: [PATCH 832/992] Revert _log_skipped_link() optimization (#13333)

The addition of if not logger.isEnabledFor(logging.DEBUG) in
_log_skipped_link() means that skipped links are not stored, preventing
requires_python_skipped_reasons() from ever returning anything.
---
 news/13333.bugfix.rst                     | 2 ++
 src/pip/_internal/index/package_finder.py | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 news/13333.bugfix.rst

diff --git a/news/13333.bugfix.rst b/news/13333.bugfix.rst
new file mode 100644
index 00000000000..77eaaebff62
--- /dev/null
+++ b/news/13333.bugfix.rst
@@ -0,0 +1,2 @@
+Fix regression that suppressed errors indicating which packages were ignored
+due to incompatible ``requires-python`` metadata.
diff --git a/src/pip/_internal/index/package_finder.py b/src/pip/_internal/index/package_finder.py
index ce0842b07e6..652712ac908 100644
--- a/src/pip/_internal/index/package_finder.py
+++ b/src/pip/_internal/index/package_finder.py
@@ -732,11 +732,6 @@ def _sort_links(self, links: Iterable[Link]) -> List[Link]:
         return no_eggs + eggs
 
     def _log_skipped_link(self, link: Link, result: LinkType, detail: str) -> None:
-        # This is a hot method so don't waste time hashing links unless we're
-        # actually going to log 'em.
-        if not logger.isEnabledFor(logging.DEBUG):
-            return
-
         entry = (link, result, detail)
         if entry not in self._logged_links:
             # Put the link at the end so the reason is more visible and because

From 8c48ffb1173d6cb06c0f6f5d1cc4adf3d963d3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 9 Feb 2025 12:16:29 +0100
Subject: [PATCH 833/992] Vendor tomli-w

---
 news/tomli-w.vendor.rst             |   1 +
 src/pip/_vendor/tomli_w/LICENSE     |  21 +++
 src/pip/_vendor/tomli_w/__init__.py |   4 +
 src/pip/_vendor/tomli_w/_writer.py  | 229 ++++++++++++++++++++++++++++
 src/pip/_vendor/tomli_w/py.typed    |   1 +
 src/pip/_vendor/vendor.txt          |   1 +
 6 files changed, 257 insertions(+)
 create mode 100644 news/tomli-w.vendor.rst
 create mode 100644 src/pip/_vendor/tomli_w/LICENSE
 create mode 100644 src/pip/_vendor/tomli_w/__init__.py
 create mode 100644 src/pip/_vendor/tomli_w/_writer.py
 create mode 100644 src/pip/_vendor/tomli_w/py.typed

diff --git a/news/tomli-w.vendor.rst b/news/tomli-w.vendor.rst
new file mode 100644
index 00000000000..92e0d41fc70
--- /dev/null
+++ b/news/tomli-w.vendor.rst
@@ -0,0 +1 @@
+Vendor tomli-w 1.2.0
diff --git a/src/pip/_vendor/tomli_w/LICENSE b/src/pip/_vendor/tomli_w/LICENSE
new file mode 100644
index 00000000000..e859590f886
--- /dev/null
+++ b/src/pip/_vendor/tomli_w/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Taneli Hukkinen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/pip/_vendor/tomli_w/__init__.py b/src/pip/_vendor/tomli_w/__init__.py
new file mode 100644
index 00000000000..6349c1f05bc
--- /dev/null
+++ b/src/pip/_vendor/tomli_w/__init__.py
@@ -0,0 +1,4 @@
+__all__ = ("dumps", "dump")
+__version__ = "1.2.0"  # DO NOT EDIT THIS LINE MANUALLY. LET bump2version UTILITY DO IT
+
+from pip._vendor.tomli_w._writer import dump, dumps
diff --git a/src/pip/_vendor/tomli_w/_writer.py b/src/pip/_vendor/tomli_w/_writer.py
new file mode 100644
index 00000000000..b1acd3f26ba
--- /dev/null
+++ b/src/pip/_vendor/tomli_w/_writer.py
@@ -0,0 +1,229 @@
+from __future__ import annotations
+
+from collections.abc import Mapping
+from datetime import date, datetime, time
+from types import MappingProxyType
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from collections.abc import Generator
+    from decimal import Decimal
+    from typing import IO, Any, Final
+
+ASCII_CTRL = frozenset(chr(i) for i in range(32)) | frozenset(chr(127))
+ILLEGAL_BASIC_STR_CHARS = frozenset('"\\') | ASCII_CTRL - frozenset("\t")
+BARE_KEY_CHARS = frozenset(
+    "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789" "-_"
+)
+ARRAY_TYPES = (list, tuple)
+MAX_LINE_LENGTH = 100
+
+COMPACT_ESCAPES = MappingProxyType(
+    {
+        "\u0008": "\\b",  # backspace
+        "\u000A": "\\n",  # linefeed
+        "\u000C": "\\f",  # form feed
+        "\u000D": "\\r",  # carriage return
+        "\u0022": '\\"',  # quote
+        "\u005C": "\\\\",  # backslash
+    }
+)
+
+
+class Context:
+    def __init__(self, allow_multiline: bool, indent: int):
+        if indent < 0:
+            raise ValueError("Indent width must be non-negative")
+        self.allow_multiline: Final = allow_multiline
+        # cache rendered inline tables (mapping from object id to rendered inline table)
+        self.inline_table_cache: Final[dict[int, str]] = {}
+        self.indent_str: Final = " " * indent
+
+
+def dump(
+    obj: Mapping[str, Any],
+    fp: IO[bytes],
+    /,
+    *,
+    multiline_strings: bool = False,
+    indent: int = 4,
+) -> None:
+    ctx = Context(multiline_strings, indent)
+    for chunk in gen_table_chunks(obj, ctx, name=""):
+        fp.write(chunk.encode())
+
+
+def dumps(
+    obj: Mapping[str, Any], /, *, multiline_strings: bool = False, indent: int = 4
+) -> str:
+    ctx = Context(multiline_strings, indent)
+    return "".join(gen_table_chunks(obj, ctx, name=""))
+
+
+def gen_table_chunks(
+    table: Mapping[str, Any],
+    ctx: Context,
+    *,
+    name: str,
+    inside_aot: bool = False,
+) -> Generator[str, None, None]:
+    yielded = False
+    literals = []
+    tables: list[tuple[str, Any, bool]] = []  # => [(key, value, inside_aot)]
+    for k, v in table.items():
+        if isinstance(v, Mapping):
+            tables.append((k, v, False))
+        elif is_aot(v) and not all(is_suitable_inline_table(t, ctx) for t in v):
+            tables.extend((k, t, True) for t in v)
+        else:
+            literals.append((k, v))
+
+    if inside_aot or name and (literals or not tables):
+        yielded = True
+        yield f"[[{name}]]\n" if inside_aot else f"[{name}]\n"
+
+    if literals:
+        yielded = True
+        for k, v in literals:
+            yield f"{format_key_part(k)} = {format_literal(v, ctx)}\n"
+
+    for k, v, in_aot in tables:
+        if yielded:
+            yield "\n"
+        else:
+            yielded = True
+        key_part = format_key_part(k)
+        display_name = f"{name}.{key_part}" if name else key_part
+        yield from gen_table_chunks(v, ctx, name=display_name, inside_aot=in_aot)
+
+
+def format_literal(obj: object, ctx: Context, *, nest_level: int = 0) -> str:
+    if isinstance(obj, bool):
+        return "true" if obj else "false"
+    if isinstance(obj, (int, float, date, datetime)):
+        return str(obj)
+    if isinstance(obj, time):
+        if obj.tzinfo:
+            raise ValueError("TOML does not support offset times")
+        return str(obj)
+    if isinstance(obj, str):
+        return format_string(obj, allow_multiline=ctx.allow_multiline)
+    if isinstance(obj, ARRAY_TYPES):
+        return format_inline_array(obj, ctx, nest_level)
+    if isinstance(obj, Mapping):
+        return format_inline_table(obj, ctx)
+
+    # Lazy import to improve module import time
+    from decimal import Decimal
+
+    if isinstance(obj, Decimal):
+        return format_decimal(obj)
+    raise TypeError(
+        f"Object of type '{type(obj).__qualname__}' is not TOML serializable"
+    )
+
+
+def format_decimal(obj: Decimal) -> str:
+    if obj.is_nan():
+        return "nan"
+    if obj.is_infinite():
+        return "-inf" if obj.is_signed() else "inf"
+    dec_str = str(obj).lower()
+    return dec_str if "." in dec_str or "e" in dec_str else dec_str + ".0"
+
+
+def format_inline_table(obj: Mapping, ctx: Context) -> str:
+    # check cache first
+    obj_id = id(obj)
+    if obj_id in ctx.inline_table_cache:
+        return ctx.inline_table_cache[obj_id]
+
+    if not obj:
+        rendered = "{}"
+    else:
+        rendered = (
+            "{ "
+            + ", ".join(
+                f"{format_key_part(k)} = {format_literal(v, ctx)}"
+                for k, v in obj.items()
+            )
+            + " }"
+        )
+    ctx.inline_table_cache[obj_id] = rendered
+    return rendered
+
+
+def format_inline_array(obj: tuple | list, ctx: Context, nest_level: int) -> str:
+    if not obj:
+        return "[]"
+    item_indent = ctx.indent_str * (1 + nest_level)
+    closing_bracket_indent = ctx.indent_str * nest_level
+    return (
+        "[\n"
+        + ",\n".join(
+            item_indent + format_literal(item, ctx, nest_level=nest_level + 1)
+            for item in obj
+        )
+        + f",\n{closing_bracket_indent}]"
+    )
+
+
+def format_key_part(part: str) -> str:
+    try:
+        only_bare_key_chars = BARE_KEY_CHARS.issuperset(part)
+    except TypeError:
+        raise TypeError(
+            f"Invalid mapping key '{part}' of type '{type(part).__qualname__}'."
+            " A string is required."
+        ) from None
+
+    if part and only_bare_key_chars:
+        return part
+    return format_string(part, allow_multiline=False)
+
+
+def format_string(s: str, *, allow_multiline: bool) -> str:
+    do_multiline = allow_multiline and "\n" in s
+    if do_multiline:
+        result = '"""\n'
+        s = s.replace("\r\n", "\n")
+    else:
+        result = '"'
+
+    pos = seq_start = 0
+    while True:
+        try:
+            char = s[pos]
+        except IndexError:
+            result += s[seq_start:pos]
+            if do_multiline:
+                return result + '"""'
+            return result + '"'
+        if char in ILLEGAL_BASIC_STR_CHARS:
+            result += s[seq_start:pos]
+            if char in COMPACT_ESCAPES:
+                if do_multiline and char == "\n":
+                    result += "\n"
+                else:
+                    result += COMPACT_ESCAPES[char]
+            else:
+                result += "\\u" + hex(ord(char))[2:].rjust(4, "0")
+            seq_start = pos + 1
+        pos += 1
+
+
+def is_aot(obj: Any) -> bool:
+    """Decides if an object behaves as an array of tables (i.e. a nonempty list
+    of dicts)."""
+    return bool(
+        isinstance(obj, ARRAY_TYPES)
+        and obj
+        and all(isinstance(v, Mapping) for v in obj)
+    )
+
+
+def is_suitable_inline_table(obj: Mapping, ctx: Context) -> bool:
+    """Use heuristics to decide if the inline-style representation is a good
+    choice for a given table."""
+    rendered_inline = f"{ctx.indent_str}{format_inline_table(obj, ctx)},"
+    return len(rendered_inline) <= MAX_LINE_LENGTH and "\n" not in rendered_inline
diff --git a/src/pip/_vendor/tomli_w/py.typed b/src/pip/_vendor/tomli_w/py.typed
new file mode 100644
index 00000000000..7632ecf7754
--- /dev/null
+++ b/src/pip/_vendor/tomli_w/py.typed
@@ -0,0 +1 @@
+# Marker file for PEP 561
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index 0c7733ff8a5..447d3a22487 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -15,5 +15,6 @@ rich==13.9.4
 resolvelib==1.1.0
 setuptools==70.3.0
 tomli==2.2.1
+tomli-w==1.2.0
 truststore==0.10.1
 dependency-groups==1.3.0

From 4072aff9cf7b54798313db970a66bdc68d968b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 8 Feb 2025 19:24:52 +0100
Subject: [PATCH 834/992] Add pip lock command (PEP 751)

---
 src/pip/_internal/commands/__init__.py |   5 +
 src/pip/_internal/commands/lock.py     | 138 ++++++++++++++++++++
 src/pip/_internal/models/pylock.py     | 170 +++++++++++++++++++++++++
 tests/functional/test_cli.py           |   2 +-
 tests/unit/test_commands.py            |  22 +++-
 5 files changed, 333 insertions(+), 4 deletions(-)
 create mode 100644 src/pip/_internal/commands/lock.py
 create mode 100644 src/pip/_internal/models/pylock.py

diff --git a/src/pip/_internal/commands/__init__.py b/src/pip/_internal/commands/__init__.py
index 858a4101416..bc4f216a826 100644
--- a/src/pip/_internal/commands/__init__.py
+++ b/src/pip/_internal/commands/__init__.py
@@ -23,6 +23,11 @@
         "InstallCommand",
         "Install packages.",
     ),
+    "lock": CommandInfo(
+        "pip._internal.commands.lock",
+        "LockCommand",
+        "Generate a lock file.",
+    ),
     "download": CommandInfo(
         "pip._internal.commands.download",
         "DownloadCommand",
diff --git a/src/pip/_internal/commands/lock.py b/src/pip/_internal/commands/lock.py
new file mode 100644
index 00000000000..5ca4289fe04
--- /dev/null
+++ b/src/pip/_internal/commands/lock.py
@@ -0,0 +1,138 @@
+import sys
+from optparse import Values
+from typing import List
+
+from pip._internal.cache import WheelCache
+from pip._internal.cli import cmdoptions
+from pip._internal.cli.req_command import (
+    RequirementCommand,
+    with_cleanup,
+)
+from pip._internal.cli.status_codes import SUCCESS
+from pip._internal.models.pylock import Pylock
+from pip._internal.operations.build.build_tracker import get_build_tracker
+from pip._internal.req.req_install import (
+    check_legacy_setup_py_options,
+)
+from pip._internal.utils.logging import getLogger
+from pip._internal.utils.misc import (
+    get_pip_version,
+)
+from pip._internal.utils.temp_dir import TempDirectory
+
+logger = getLogger(__name__)
+
+
+class LockCommand(RequirementCommand):
+    """
+    Lock packages from:
+
+    - PyPI (and other indexes) using requirement specifiers.
+    - VCS project urls.
+    - Local project directories.
+    - Local or remote source archives.
+
+    pip also supports locking from "requirements files", which provide
+    an easy way to specify a whole environment to be installed.
+    """
+
+    usage = """
+      %prog [options]  [package-index-options] ...
+      %prog [options] -r  [package-index-options] ...
+      %prog [options] [-e]  ...
+      %prog [options] [-e]  ...
+      %prog [options]  ..."""
+
+    def add_options(self) -> None:
+        self.cmd_opts.add_option(cmdoptions.requirements())
+        self.cmd_opts.add_option(cmdoptions.constraints())
+        self.cmd_opts.add_option(cmdoptions.no_deps())
+        self.cmd_opts.add_option(cmdoptions.pre())
+
+        self.cmd_opts.add_option(cmdoptions.editable())
+
+        self.cmd_opts.add_option(cmdoptions.src())
+
+        self.cmd_opts.add_option(cmdoptions.ignore_requires_python())
+        self.cmd_opts.add_option(cmdoptions.no_build_isolation())
+        self.cmd_opts.add_option(cmdoptions.use_pep517())
+        self.cmd_opts.add_option(cmdoptions.no_use_pep517())
+        self.cmd_opts.add_option(cmdoptions.check_build_deps())
+
+        self.cmd_opts.add_option(cmdoptions.config_settings())
+
+        self.cmd_opts.add_option(cmdoptions.no_binary())
+        self.cmd_opts.add_option(cmdoptions.only_binary())
+        self.cmd_opts.add_option(cmdoptions.prefer_binary())
+        self.cmd_opts.add_option(cmdoptions.require_hashes())
+        self.cmd_opts.add_option(cmdoptions.progress_bar())
+
+        index_opts = cmdoptions.make_option_group(
+            cmdoptions.index_group,
+            self.parser,
+        )
+
+        self.parser.insert_option_group(0, index_opts)
+        self.parser.insert_option_group(0, self.cmd_opts)
+
+    @with_cleanup
+    def run(self, options: Values, args: List[str]) -> int:
+        logger.verbose("Using %s", get_pip_version())
+
+        session = self.get_default_session(options)
+
+        finder = self._build_package_finder(
+            options=options,
+            session=session,
+            ignore_requires_python=options.ignore_requires_python,
+        )
+        build_tracker = self.enter_context(get_build_tracker())
+
+        directory = TempDirectory(
+            delete=not options.no_clean,
+            kind="install",
+            globally_managed=True,
+        )
+
+        reqs = self.get_requirements(args, options, finder, session)
+        check_legacy_setup_py_options(options, reqs)
+
+        wheel_cache = WheelCache(options.cache_dir)
+
+        # Only when installing is it permitted to use PEP 660.
+        # In other circumstances (pip wheel, pip download) we generate
+        # regular (i.e. non editable) metadata and wheels.
+        for req in reqs:
+            req.permit_editable_wheels = True
+
+        preparer = self.make_requirement_preparer(
+            temp_build_dir=directory,
+            options=options,
+            build_tracker=build_tracker,
+            session=session,
+            finder=finder,
+            use_user_site=False,
+            verbosity=self.verbosity,
+        )
+        resolver = self.make_resolver(
+            preparer=preparer,
+            finder=finder,
+            options=options,
+            wheel_cache=wheel_cache,
+            use_user_site=False,
+            ignore_installed=True,
+            ignore_requires_python=options.ignore_requires_python,
+            upgrade_strategy="to-satisfy-only",
+            use_pep517=options.use_pep517,
+        )
+
+        self.trace_basic_info(finder)
+
+        requirement_set = resolver.resolve(reqs, check_supported_wheels=True)
+
+        pyproject_lock = Pylock.from_install_requirements(
+            requirement_set.requirements.values()
+        )
+        sys.stdout.write(pyproject_lock.as_toml())
+
+        return SUCCESS
diff --git a/src/pip/_internal/models/pylock.py b/src/pip/_internal/models/pylock.py
new file mode 100644
index 00000000000..b5e3e1849f2
--- /dev/null
+++ b/src/pip/_internal/models/pylock.py
@@ -0,0 +1,170 @@
+import dataclasses
+from dataclasses import dataclass
+from typing import Any, Dict, Iterable, List, Optional, Tuple
+
+from pip._vendor import tomli_w
+from pip._vendor.typing_extensions import Self
+
+from pip._internal.models.direct_url import ArchiveInfo, DirInfo, VcsInfo
+from pip._internal.models.link import Link
+from pip._internal.req.req_install import InstallRequirement
+from pip._internal.utils.urls import url_to_path
+
+
+def _toml_dict_factory(data: List[Tuple[str, Any]]) -> Dict[str, Any]:
+    return {key.replace("_", "-"): value for key, value in data if value is not None}
+
+
+@dataclass
+class PackageVcs:
+    type: str
+    url: Optional[str]
+    # (not supported) path: Optional[str]
+    requested_revision: Optional[str]
+    commit_id: str
+    subdirectory: Optional[str]
+
+
+@dataclass
+class PackageDirectory:
+    path: str
+    editable: Optional[bool]
+    subdirectory: Optional[str]
+
+
+@dataclass
+class PackageArchive:
+    url: Optional[str]
+    # (not supported) path: Optional[str]
+    # (not supported) size: Optional[int]
+    hashes: Dict[str, str]
+    subdirectory: Optional[str]
+
+
+@dataclass
+class PackageSdist:
+    name: str
+    # (not supported) upload_time: Optional[datetime]
+    url: Optional[str]
+    # (not supported) path: Optional[str]
+    # (not supported) size: Optional[int]
+    hashes: Dict[str, str]
+
+
+@dataclass
+class PackageWheel:
+    name: str
+    # (not supported) upload_time: Optional[datetime]
+    url: Optional[str]
+    # (not supported) path: Optional[str]
+    # (not supported) size: Optional[int]
+    hashes: Dict[str, str]
+
+
+@dataclass
+class Package:
+    name: str
+    version: Optional[str] = None
+    # (not supported) marker: Optional[str]
+    # (not supported) requires_python: Optional[str]
+    # (not supported) dependencies
+    direct: Optional[bool] = None
+    vcs: Optional[PackageVcs] = None
+    directory: Optional[PackageDirectory] = None
+    archive: Optional[PackageArchive] = None
+    # (not supported) index: Optional[str]
+    sdist: Optional[PackageSdist] = None
+    wheels: Optional[List[PackageWheel]] = None
+    # (not supported) attestation_identities: Optional[List[Dict[str, Any]]]
+    # (not supported) tool: Optional[Dict[str, Any]]
+
+    @classmethod
+    def from_install_requirement(cls, ireq: InstallRequirement) -> Self:
+        dist = ireq.get_dist()
+        download_info = ireq.download_info
+        assert download_info
+        package = cls(
+            name=dist.canonical_name,
+            version=str(dist.version),
+        )
+        package.direct = ireq.is_direct if ireq.is_direct else None
+        if package.direct:
+            if isinstance(download_info.info, VcsInfo):
+                package.vcs = PackageVcs(
+                    type=download_info.info.vcs,
+                    url=download_info.url,
+                    requested_revision=download_info.info.requested_revision,
+                    commit_id=download_info.info.commit_id,
+                    subdirectory=download_info.subdirectory,
+                )
+            elif isinstance(download_info.info, DirInfo):
+                package.directory = PackageDirectory(
+                    path=url_to_path(download_info.url),
+                    editable=(
+                        download_info.info.editable
+                        if download_info.info.editable
+                        else None
+                    ),
+                    subdirectory=download_info.subdirectory,
+                )
+            elif isinstance(download_info.info, ArchiveInfo):
+                if not download_info.info.hashes:
+                    raise NotImplementedError()
+                package.archive = PackageArchive(
+                    url=download_info.url,
+                    hashes=download_info.info.hashes,
+                    subdirectory=download_info.subdirectory,
+                )
+            else:
+                # should never happen
+                raise NotImplementedError()
+        else:
+            if isinstance(download_info.info, ArchiveInfo):
+                if not download_info.info.hashes:
+                    raise NotImplementedError()
+                link = Link(download_info.url)
+                if link.is_wheel:
+                    package.wheels = [
+                        PackageWheel(
+                            name=link.filename,
+                            url=download_info.url,
+                            hashes=download_info.info.hashes,
+                        )
+                    ]
+                else:
+                    package.sdist = PackageSdist(
+                        name=link.filename,
+                        url=download_info.url,
+                        hashes=download_info.info.hashes,
+                    )
+            else:
+                # should never happen
+                raise NotImplementedError()
+        return package
+
+
+@dataclass
+class Pylock:
+    lock_version: str = "1.0"
+    # (not supported) environments: Optional[List[str]]
+    # (not supported) requires_python: Optional[str]
+    created_by: str = "pip"
+    packages: List[Package] = dataclasses.field(default_factory=list)
+    # (not supported) tool: Optional[Dict[str, Any]]
+
+    def as_toml(self) -> str:
+        return tomli_w.dumps(dataclasses.asdict(self, dict_factory=_toml_dict_factory))
+
+    @classmethod
+    def from_install_requirements(
+        cls, install_requirements: Iterable[InstallRequirement]
+    ) -> Self:
+        return cls(
+            packages=sorted(
+                (
+                    Package.from_install_requirement(ireq)
+                    for ireq in install_requirements
+                ),
+                key=lambda p: p.name,
+            )
+        )
diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
index 366d0129b2d..6d2e2a12935 100644
--- a/tests/functional/test_cli.py
+++ b/tests/functional/test_cli.py
@@ -57,7 +57,7 @@ def test_entrypoints_work(entrypoint: str, script: PipTestEnvironment) -> None:
     sorted(
         set(commands_dict).symmetric_difference(
             # Exclude commands that are expected to use the network.
-            {"install", "download", "search", "index", "wheel"}
+            {"install", "download", "search", "index", "lock", "wheel"}
         )
     ),
 )
diff --git a/tests/unit/test_commands.py b/tests/unit/test_commands.py
index 9d5aefec298..59c0b8821da 100644
--- a/tests/unit/test_commands.py
+++ b/tests/unit/test_commands.py
@@ -14,7 +14,14 @@
 
 # These are the expected names of the commands whose classes inherit from
 # IndexGroupCommand.
-EXPECTED_INDEX_GROUP_COMMANDS = ["download", "index", "install", "list", "wheel"]
+EXPECTED_INDEX_GROUP_COMMANDS = [
+    "download",
+    "index",
+    "install",
+    "list",
+    "lock",
+    "wheel",
+]
 
 
 def check_commands(pred: Callable[[Command], bool], expected: List[str]) -> None:
@@ -53,7 +60,16 @@ def test_session_commands() -> None:
     def is_session_command(command: Command) -> bool:
         return isinstance(command, SessionCommandMixin)
 
-    expected = ["download", "index", "install", "list", "search", "uninstall", "wheel"]
+    expected = [
+        "download",
+        "index",
+        "install",
+        "list",
+        "lock",
+        "search",
+        "uninstall",
+        "wheel",
+    ]
     check_commands(is_session_command, expected)
 
 
@@ -124,7 +140,7 @@ def test_requirement_commands() -> None:
     def is_requirement_command(command: Command) -> bool:
         return isinstance(command, RequirementCommand)
 
-    check_commands(is_requirement_command, ["download", "install", "wheel"])
+    check_commands(is_requirement_command, ["download", "install", "lock", "wheel"])
 
 
 @pytest.mark.parametrize("flag", ["", "--outdated", "--uptodate"])

From deb2713f67eb1430659c52bf4e0042c3a3b54bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 9 Feb 2025 10:53:29 +0100
Subject: [PATCH 835/992] lock: do not emit version for direct URLs

It could be dynamic, so not emitting it is a better default. In the future we could consider emitting it when we know it is not dynamic.
---
 src/pip/_internal/models/pylock.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pip/_internal/models/pylock.py b/src/pip/_internal/models/pylock.py
index b5e3e1849f2..05f3300a8d1 100644
--- a/src/pip/_internal/models/pylock.py
+++ b/src/pip/_internal/models/pylock.py
@@ -83,10 +83,7 @@ def from_install_requirement(cls, ireq: InstallRequirement) -> Self:
         dist = ireq.get_dist()
         download_info = ireq.download_info
         assert download_info
-        package = cls(
-            name=dist.canonical_name,
-            version=str(dist.version),
-        )
+        package = cls(name=dist.canonical_name)
         package.direct = ireq.is_direct if ireq.is_direct else None
         if package.direct:
             if isinstance(download_info.info, VcsInfo):
@@ -119,6 +116,7 @@ def from_install_requirement(cls, ireq: InstallRequirement) -> Self:
                 # should never happen
                 raise NotImplementedError()
         else:
+            package.version = str(dist.version)
             if isinstance(download_info.info, ArchiveInfo):
                 if not download_info.info.hashes:
                     raise NotImplementedError()

From 605f3b37f5d7ab8c484db0f63b31363982616981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 9 Feb 2025 11:06:45 +0100
Subject: [PATCH 836/992] lock: use relativate paths for directories

---
 src/pip/_internal/commands/lock.py |  3 ++-
 src/pip/_internal/models/pylock.py | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pip/_internal/commands/lock.py b/src/pip/_internal/commands/lock.py
index 5ca4289fe04..bde2c2cda09 100644
--- a/src/pip/_internal/commands/lock.py
+++ b/src/pip/_internal/commands/lock.py
@@ -1,5 +1,6 @@
 import sys
 from optparse import Values
+from pathlib import Path
 from typing import List
 
 from pip._internal.cache import WheelCache
@@ -131,7 +132,7 @@ def run(self, options: Values, args: List[str]) -> int:
         requirement_set = resolver.resolve(reqs, check_supported_wheels=True)
 
         pyproject_lock = Pylock.from_install_requirements(
-            requirement_set.requirements.values()
+            requirement_set.requirements.values(), base_dir=Path.cwd()
         )
         sys.stdout.write(pyproject_lock.as_toml())
 
diff --git a/src/pip/_internal/models/pylock.py b/src/pip/_internal/models/pylock.py
index 05f3300a8d1..ed3c38c47b2 100644
--- a/src/pip/_internal/models/pylock.py
+++ b/src/pip/_internal/models/pylock.py
@@ -1,5 +1,6 @@
 import dataclasses
 from dataclasses import dataclass
+from pathlib import Path
 from typing import Any, Dict, Iterable, List, Optional, Tuple
 
 from pip._vendor import tomli_w
@@ -79,7 +80,7 @@ class Package:
     # (not supported) tool: Optional[Dict[str, Any]]
 
     @classmethod
-    def from_install_requirement(cls, ireq: InstallRequirement) -> Self:
+    def from_install_requirement(cls, ireq: InstallRequirement, base_dir: Path) -> Self:
         dist = ireq.get_dist()
         download_info = ireq.download_info
         assert download_info
@@ -96,7 +97,11 @@ def from_install_requirement(cls, ireq: InstallRequirement) -> Self:
                 )
             elif isinstance(download_info.info, DirInfo):
                 package.directory = PackageDirectory(
-                    path=url_to_path(download_info.url),
+                    path=(
+                        Path(url_to_path(download_info.url))
+                        .relative_to(base_dir, walk_up=True)
+                        .as_posix()
+                    ),
                     editable=(
                         download_info.info.editable
                         if download_info.info.editable
@@ -155,12 +160,12 @@ def as_toml(self) -> str:
 
     @classmethod
     def from_install_requirements(
-        cls, install_requirements: Iterable[InstallRequirement]
+        cls, install_requirements: Iterable[InstallRequirement], base_dir: Path
     ) -> Self:
         return cls(
             packages=sorted(
                 (
-                    Package.from_install_requirement(ireq)
+                    Package.from_install_requirement(ireq, base_dir)
                     for ireq in install_requirements
                 ),
                 key=lambda p: p.name,

From 2a331a39bfda19b2b6b284f7dc655f3c994150c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 9 Feb 2025 13:11:16 +0100
Subject: [PATCH 837/992] lock: add --output

---
 src/pip/_internal/commands/lock.py | 34 +++++++++++++++++++++++++-----
 src/pip/_internal/models/pylock.py |  7 ++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/pip/_internal/commands/lock.py b/src/pip/_internal/commands/lock.py
index bde2c2cda09..ca06ccd2bd0 100644
--- a/src/pip/_internal/commands/lock.py
+++ b/src/pip/_internal/commands/lock.py
@@ -10,7 +10,7 @@
     with_cleanup,
 )
 from pip._internal.cli.status_codes import SUCCESS
-from pip._internal.models.pylock import Pylock
+from pip._internal.models.pylock import Pylock, is_valid_pylock_file_name
 from pip._internal.operations.build.build_tracker import get_build_tracker
 from pip._internal.req.req_install import (
     check_legacy_setup_py_options,
@@ -45,6 +45,17 @@ class LockCommand(RequirementCommand):
       %prog [options]  ..."""
 
     def add_options(self) -> None:
+        self.cmd_opts.add_option(
+            cmdoptions.PipOption(
+                "--output",
+                "-o",
+                dest="output_file",
+                metavar="path",
+                type="path",
+                default="pylock.toml",
+                help="Lock file name (default=pylock.toml). Use - for stdout.",
+            )
+        )
         self.cmd_opts.add_option(cmdoptions.requirements())
         self.cmd_opts.add_option(cmdoptions.constraints())
         self.cmd_opts.add_option(cmdoptions.no_deps())
@@ -131,9 +142,22 @@ def run(self, options: Values, args: List[str]) -> int:
 
         requirement_set = resolver.resolve(reqs, check_supported_wheels=True)
 
-        pyproject_lock = Pylock.from_install_requirements(
-            requirement_set.requirements.values(), base_dir=Path.cwd()
-        )
-        sys.stdout.write(pyproject_lock.as_toml())
+        if options.output_file == "-":
+            base_dir = Path.cwd()
+        else:
+            output_file_path = Path(options.output_file)
+            if not is_valid_pylock_file_name(output_file_path):
+                logger.warning(
+                    "%s is not a valid lock file name.",
+                    output_file_path,
+                )
+            base_dir = output_file_path.parent.absolute()
+        pylock_toml = Pylock.from_install_requirements(
+            requirement_set.requirements.values(), base_dir=base_dir
+        ).as_toml()
+        if options.output_file == "-":
+            sys.stdout.write(pylock_toml)
+        else:
+            output_file_path.write_text(pylock_toml, encoding="utf-8")
 
         return SUCCESS
diff --git a/src/pip/_internal/models/pylock.py b/src/pip/_internal/models/pylock.py
index ed3c38c47b2..0c09d624f29 100644
--- a/src/pip/_internal/models/pylock.py
+++ b/src/pip/_internal/models/pylock.py
@@ -1,4 +1,5 @@
 import dataclasses
+import re
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, Iterable, List, Optional, Tuple
@@ -11,6 +12,12 @@
 from pip._internal.req.req_install import InstallRequirement
 from pip._internal.utils.urls import url_to_path
 
+PYLOCK_FILE_NAME_RE = re.compile(r"^pylock\.([^.]+)\.toml$")
+
+
+def is_valid_pylock_file_name(path: Path) -> bool:
+    return path.name == "pylock.toml" or bool(re.match(PYLOCK_FILE_NAME_RE, path.name))
+
 
 def _toml_dict_factory(data: List[Tuple[str, Any]]) -> Dict[str, Any]:
     return {key.replace("_", "-"): value for key, value in data if value is not None}

From 5f9005d873d2be75c04b6b4d9c93a024ea7921cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 8 Mar 2025 11:48:04 +0100
Subject: [PATCH 838/992] lock: update to latest PEP 751

---
 src/pip/_internal/models/pylock.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pip/_internal/models/pylock.py b/src/pip/_internal/models/pylock.py
index 0c09d624f29..623c949552b 100644
--- a/src/pip/_internal/models/pylock.py
+++ b/src/pip/_internal/models/pylock.py
@@ -45,6 +45,7 @@ class PackageArchive:
     url: Optional[str]
     # (not supported) path: Optional[str]
     # (not supported) size: Optional[int]
+    # (not supported) upload_time: Optional[datetime]
     hashes: Dict[str, str]
     subdirectory: Optional[str]
 
@@ -76,7 +77,6 @@ class Package:
     # (not supported) marker: Optional[str]
     # (not supported) requires_python: Optional[str]
     # (not supported) dependencies
-    direct: Optional[bool] = None
     vcs: Optional[PackageVcs] = None
     directory: Optional[PackageDirectory] = None
     archive: Optional[PackageArchive] = None
@@ -92,8 +92,7 @@ def from_install_requirement(cls, ireq: InstallRequirement, base_dir: Path) -> S
         download_info = ireq.download_info
         assert download_info
         package = cls(name=dist.canonical_name)
-        package.direct = ireq.is_direct if ireq.is_direct else None
-        if package.direct:
+        if ireq.is_direct:
             if isinstance(download_info.info, VcsInfo):
                 package.vcs = PackageVcs(
                     type=download_info.info.vcs,
@@ -158,6 +157,8 @@ class Pylock:
     lock_version: str = "1.0"
     # (not supported) environments: Optional[List[str]]
     # (not supported) requires_python: Optional[str]
+    # (not supported) extras: List[str] = []
+    # (not supported) dependency_groups: List[str] = []
     created_by: str = "pip"
     packages: List[Package] = dataclasses.field(default_factory=list)
     # (not supported) tool: Optional[Dict[str, Any]]

From 50e85e3a53b122bd6bfec932fb8863782c49c127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 5 Apr 2025 14:19:07 +0200
Subject: [PATCH 839/992] lock: emit an experimental warning

---
 src/pip/_internal/commands/lock.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pip/_internal/commands/lock.py b/src/pip/_internal/commands/lock.py
index ca06ccd2bd0..8c7bb1f7cb4 100644
--- a/src/pip/_internal/commands/lock.py
+++ b/src/pip/_internal/commands/lock.py
@@ -91,6 +91,12 @@ def add_options(self) -> None:
     def run(self, options: Values, args: List[str]) -> int:
         logger.verbose("Using %s", get_pip_version())
 
+        logger.warning(
+            "pip lock is currently an experimental command. "
+            "It may be removed/changed in a future release "
+            "without prior warning."
+        )
+
         session = self.get_default_session(options)
 
         finder = self._build_package_finder(

From 2f5feef3dd57252e83a2f19b81a1133c68c3b3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 5 Apr 2025 14:27:24 +0200
Subject: [PATCH 840/992] lock: add documentation

---
 docs/html/cli/index.md             |  7 +++++
 docs/html/cli/pip_lock.rst         | 50 ++++++++++++++++++++++++++++++
 docs/man/commands/lock.rst         | 20 ++++++++++++
 docs/man/index.rst                 |  3 ++
 src/pip/_internal/commands/lock.py | 12 ++++---
 5 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 docs/html/cli/pip_lock.rst
 create mode 100644 docs/man/commands/lock.rst

diff --git a/docs/html/cli/index.md b/docs/html/cli/index.md
index 902fe406e6e..a3aef3b10ba 100644
--- a/docs/html/cli/index.md
+++ b/docs/html/cli/index.md
@@ -23,6 +23,13 @@ pip_freeze
 pip_check
 ```
 
+```{toctree}
+:maxdepth: 1
+:caption: Resolving dependencies
+
+pip_lock
+```
+
 ```{toctree}
 :maxdepth: 1
 :caption: Handling Distribution Files
diff --git a/docs/html/cli/pip_lock.rst b/docs/html/cli/pip_lock.rst
new file mode 100644
index 00000000000..8465df38518
--- /dev/null
+++ b/docs/html/cli/pip_lock.rst
@@ -0,0 +1,50 @@
+
+.. _`pip lock`:
+
+========
+pip lock
+========
+
+
+
+Usage
+=====
+
+.. tab:: Unix/macOS
+
+   .. pip-command-usage:: lock "python -m pip"
+
+.. tab:: Windows
+
+   .. pip-command-usage:: lock "py -m pip"
+
+
+Description
+===========
+
+.. pip-command-description:: lock
+
+Options
+=======
+
+.. pip-command-options:: lock
+
+.. pip-index-options:: lock
+
+
+Examples
+========
+
+#. Emit a ``pylock.toml`` for the the project in the current directory
+
+   .. tab:: Unix/macOS
+
+      .. code-block:: shell
+
+         python -m pip lock -e .
+
+   .. tab:: Windows
+
+      .. code-block:: shell
+
+         py -m pip lock -e .
diff --git a/docs/man/commands/lock.rst b/docs/man/commands/lock.rst
new file mode 100644
index 00000000000..ca1de2ce28c
--- /dev/null
+++ b/docs/man/commands/lock.rst
@@ -0,0 +1,20 @@
+:orphan:
+
+========
+pip-lock
+========
+
+Description
+***********
+
+.. pip-command-description:: lock
+
+Usage
+*****
+
+.. pip-command-usage:: lock
+
+Options
+*******
+
+.. pip-command-options:: lock
diff --git a/docs/man/index.rst b/docs/man/index.rst
index 526e83e8883..f45f0d4fed2 100644
--- a/docs/man/index.rst
+++ b/docs/man/index.rst
@@ -34,6 +34,9 @@ pip-uninstall(1)
 pip-freeze(1)
     Output installed packages in requirements format.
 
+pip-lock(1)
+    Generate a lock file for requirements and their dependencies.
+
 pip-list(1)
     List installed packages.
 
diff --git a/src/pip/_internal/commands/lock.py b/src/pip/_internal/commands/lock.py
index 8c7bb1f7cb4..1925a2d73c6 100644
--- a/src/pip/_internal/commands/lock.py
+++ b/src/pip/_internal/commands/lock.py
@@ -26,22 +26,24 @@
 
 class LockCommand(RequirementCommand):
     """
-    Lock packages from:
+    EXPERIMENTAL - Lock packages and their dependencies from:
 
     - PyPI (and other indexes) using requirement specifiers.
     - VCS project urls.
     - Local project directories.
     - Local or remote source archives.
 
-    pip also supports locking from "requirements files", which provide
-    an easy way to specify a whole environment to be installed.
+    pip also supports locking from "requirements files", which provide an easy
+    way to specify a whole environment to be installed.
+
+    The generated lock file is only guaranteed to be valid for the current
+    python version and platform.
     """
 
     usage = """
+      %prog [options] [-e]  ...
       %prog [options]  [package-index-options] ...
       %prog [options] -r  [package-index-options] ...
-      %prog [options] [-e]  ...
-      %prog [options] [-e]  ...
       %prog [options]  ..."""
 
     def add_options(self) -> None:

From c04eae6d3f4670661daf2e9b9953301a02fc6891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sat, 12 Apr 2025 13:25:09 +0200
Subject: [PATCH 841/992] lock: add tests

---
 tests/functional/test_lock.py | 237 ++++++++++++++++++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100644 tests/functional/test_lock.py

diff --git a/tests/functional/test_lock.py b/tests/functional/test_lock.py
new file mode 100644
index 00000000000..861fc87b6d4
--- /dev/null
+++ b/tests/functional/test_lock.py
@@ -0,0 +1,237 @@
+import sys
+import textwrap
+from pathlib import Path
+
+from pip._internal.utils.urls import path_to_url
+
+from ..lib import PipTestEnvironment, TestData
+
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    from pip._vendor import tomli as tomllib
+
+
+def test_lock_wheel_from_findlinks(
+    script: PipTestEnvironment, shared_data: TestData, tmp_path: Path
+) -> None:
+    """Test locking a simple wheel package, to the default pylock.toml."""
+    result = script.pip(
+        "lock",
+        "simplewheel==2.0",
+        "--no-index",
+        "--find-links",
+        str(shared_data.root / "packages/"),
+        expect_stderr=True,  # for the experimental warning
+    )
+    result.did_create(Path("scratch") / "pylock.toml")
+    pylock = tomllib.loads(script.scratch_path.joinpath("pylock.toml").read_text())
+    assert pylock == {
+        "created-by": "pip",
+        "lock-version": "1.0",
+        "packages": [
+            {
+                "name": "simplewheel",
+                "version": "2.0",
+                "wheels": [
+                    {
+                        "name": "simplewheel-2.0-1-py2.py3-none-any.whl",
+                        "url": path_to_url(
+                            str(
+                                shared_data.root
+                                / "packages"
+                                / "simplewheel-2.0-1-py2.py3-none-any.whl"
+                            )
+                        ),
+                        "hashes": {
+                            "sha256": (
+                                "71e1ca6b16ae3382a698c284013f6650"
+                                "4f2581099b2ce4801f60e9536236ceee"
+                            )
+                        },
+                    }
+                ],
+            },
+        ],
+    }
+
+
+def test_lock_sdist_from_findlinks(
+    script: PipTestEnvironment, shared_data: TestData
+) -> None:
+    """Test locking a simple wheel package, to the default pylock.toml."""
+    result = script.pip(
+        "lock",
+        "simple==2.0",
+        "--no-binary=simple",
+        "--quiet",
+        "--output=-",
+        "--no-index",
+        "--find-links",
+        str(shared_data.root / "packages/"),
+        expect_stderr=True,  # for the experimental warning
+    )
+    pylock = tomllib.loads(result.stdout)
+    assert pylock["packages"] == [
+        {
+            "name": "simple",
+            "sdist": {
+                "hashes": {
+                    "sha256": (
+                        "3a084929238d13bcd3bb928af04f3bac"
+                        "7ca2357d419e29f01459dc848e2d69a4"
+                    ),
+                },
+                "name": "simple-2.0.tar.gz",
+                "url": path_to_url(
+                    str(shared_data.root / "packages" / "simple-2.0.tar.gz")
+                ),
+            },
+            "version": "2.0",
+        },
+    ]
+
+
+def test_lock_local_directory(
+    script: PipTestEnvironment, shared_data: TestData, tmp_path: Path
+) -> None:
+    project_path = tmp_path / "pkga"
+    project_path.mkdir()
+    project_path.joinpath("pyproject.toml").write_text(
+        textwrap.dedent(
+            """\
+            [project]
+            name = "pkga"
+            version = "1.0"
+            """
+        )
+    )
+    result = script.pip(
+        "lock",
+        ".",
+        "--quiet",
+        "--output=-",
+        "--no-build-isolation",  # to use the pre-installed setuptools
+        "--no-index",
+        "--find-links",
+        str(shared_data.root / "packages/"),
+        cwd=project_path,
+        expect_stderr=True,  # for the experimental warning
+    )
+    pylock = tomllib.loads(result.stdout)
+    assert pylock["packages"] == [
+        {
+            "name": "pkga",
+            "directory": {"path": "."},
+        },
+    ]
+
+
+def test_lock_local_editable_with_dep(
+    script: PipTestEnvironment, shared_data: TestData, tmp_path: Path
+) -> None:
+    project_path = tmp_path / "pkga"
+    project_path.mkdir()
+    project_path.joinpath("pyproject.toml").write_text(
+        textwrap.dedent(
+            """\
+            [project]
+            name = "pkga"
+            version = "1.0"
+            dependencies = ["simplewheel==2.0"]
+            """
+        )
+    )
+    result = script.pip(
+        "lock",
+        "-e",
+        ".",
+        "--quiet",
+        "--output=-",
+        "--no-build-isolation",  # to use the pre-installed setuptools
+        "--no-index",
+        "--find-links",
+        str(shared_data.root / "packages/"),
+        cwd=project_path,
+        expect_stderr=True,  # for the experimental warning
+    )
+    pylock = tomllib.loads(result.stdout)
+    assert pylock["packages"] == [
+        {
+            "name": "pkga",
+            "directory": {"editable": True, "path": "."},
+        },
+        {
+            "name": "simplewheel",
+            "version": "2.0",
+            "wheels": [
+                {
+                    "name": "simplewheel-2.0-1-py2.py3-none-any.whl",
+                    "url": path_to_url(
+                        str(
+                            shared_data.root
+                            / "packages"
+                            / "simplewheel-2.0-1-py2.py3-none-any.whl"
+                        )
+                    ),
+                    "hashes": {
+                        "sha256": (
+                            "71e1ca6b16ae3382a698c284013f6650"
+                            "4f2581099b2ce4801f60e9536236ceee"
+                        )
+                    },
+                }
+            ],
+        },
+    ]
+
+
+def test_lock_vcs(script: PipTestEnvironment, shared_data: TestData) -> None:
+    result = script.pip(
+        "lock",
+        "git+https://github.com/pypa/pip-test-package@0.1.2",
+        "--quiet",
+        "--output=-",
+        "--no-build-isolation",  # to use the pre-installed setuptools
+        "--no-index",
+        expect_stderr=True,  # for the experimental warning
+    )
+    pylock = tomllib.loads(result.stdout)
+    assert pylock["packages"] == [
+        {
+            "name": "pip-test-package",
+            "vcs": {
+                "type": "git",
+                "url": "https://github.com/pypa/pip-test-package",
+                "requested-revision": "0.1.2",
+                "commit-id": "f1c1020ebac81f9aeb5c766ff7a772f709e696ee",
+            },
+        },
+    ]
+
+
+def test_lock_archive(script: PipTestEnvironment, shared_data: TestData) -> None:
+    result = script.pip(
+        "lock",
+        "https://github.com/pypa/pip-test-package/tarball/0.1.2",
+        "--quiet",
+        "--output=-",
+        "--no-build-isolation",  # to use the pre-installed setuptools
+        "--no-index",
+        expect_stderr=True,  # for the experimental warning
+    )
+    pylock = tomllib.loads(result.stdout)
+    assert pylock["packages"] == [
+        {
+            "name": "pip-test-package",
+            "archive": {
+                "url": "https://github.com/pypa/pip-test-package/tarball/0.1.2",
+                "hashes": {
+                    "sha256": (
+                        "1b176298e5ecd007da367bfda91aad3c"
+                        "4a6534227faceda087b00e5b14d596bf"
+                    ),
+                },
+            },
+        },
+    ]

From 8fb8996d14fbe6a588d6891bbd05a9875ac021c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 13 Apr 2025 11:27:39 +0200
Subject: [PATCH 842/992] lock: do not attempt to walk up when computing
 relative paths

This option of relative_to appeared in Python 3.12.
I estimate supporting this is not worth the additional complexity
at the moment.
---
 src/pip/_internal/models/pylock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/pylock.py b/src/pip/_internal/models/pylock.py
index 623c949552b..73f99a49dda 100644
--- a/src/pip/_internal/models/pylock.py
+++ b/src/pip/_internal/models/pylock.py
@@ -105,7 +105,7 @@ def from_install_requirement(cls, ireq: InstallRequirement, base_dir: Path) -> S
                 package.directory = PackageDirectory(
                     path=(
                         Path(url_to_path(download_info.url))
-                        .relative_to(base_dir, walk_up=True)
+                        .relative_to(base_dir)
                         .as_posix()
                     ),
                     editable=(

From 5c7025d0e56f2bb0b7fcce53573af1781e588d99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= 
Date: Sun, 13 Apr 2025 17:19:08 +0200
Subject: [PATCH 843/992] lock: use canonical base dir to compute relavite
 directories

To avoid symlink issues.
---
 src/pip/_internal/commands/lock.py | 2 +-
 src/pip/_internal/models/pylock.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pip/_internal/commands/lock.py b/src/pip/_internal/commands/lock.py
index 1925a2d73c6..39f27e8677b 100644
--- a/src/pip/_internal/commands/lock.py
+++ b/src/pip/_internal/commands/lock.py
@@ -159,7 +159,7 @@ def run(self, options: Values, args: List[str]) -> int:
                     "%s is not a valid lock file name.",
                     output_file_path,
                 )
-            base_dir = output_file_path.parent.absolute()
+            base_dir = output_file_path.parent
         pylock_toml = Pylock.from_install_requirements(
             requirement_set.requirements.values(), base_dir=base_dir
         ).as_toml()
diff --git a/src/pip/_internal/models/pylock.py b/src/pip/_internal/models/pylock.py
index 73f99a49dda..d9decb2964f 100644
--- a/src/pip/_internal/models/pylock.py
+++ b/src/pip/_internal/models/pylock.py
@@ -88,6 +88,7 @@ class Package:
 
     @classmethod
     def from_install_requirement(cls, ireq: InstallRequirement, base_dir: Path) -> Self:
+        base_dir = base_dir.resolve()
         dist = ireq.get_dist()
         download_info = ireq.download_info
         assert download_info
@@ -105,6 +106,7 @@ def from_install_requirement(cls, ireq: InstallRequirement, base_dir: Path) -> S
                 package.directory = PackageDirectory(
                     path=(
                         Path(url_to_path(download_info.url))
+                        .resolve()
                         .relative_to(base_dir)
                         .as_posix()
                     ),

From eb9bef989554e8bd69dd0c31acbee7822fd6d82e Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Wed, 16 Apr 2025 20:39:31 -0400
Subject: [PATCH 844/992] ci: don't gate Windows CI on packaging job (#13338)

I already removed the dependency for the Unix jobs, but I forgot to
update the Windows matrix. There's no point starting the Windows
jobs 1.5 minutes late by waiting for the packaging jobs to complete.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 98ec373d7c2..815617e1c19 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -164,7 +164,7 @@ jobs:
     name: tests / ${{ matrix.python }} / ${{ matrix.os }} / ${{ matrix.group.number }}
     runs-on: ${{ matrix.os }}-latest
 
-    needs: [packaging, determine-changes]
+    needs: [determine-changes]
     if: >-
       needs.determine-changes.outputs.tests == 'true' ||
       github.event_name != 'pull_request'

From c278f82a19448c3377295012c792e81dea8b2daf Mon Sep 17 00:00:00 2001
From: Paul Moore 
Date: Sat, 19 Apr 2025 13:18:30 +0100
Subject: [PATCH 845/992] Upgrade packaging to 25.0

---
 news/packaging.vendor.rst                     |  1 +
 src/pip/_vendor/packaging/__init__.py         |  2 +-
 src/pip/_vendor/packaging/_elffile.py         |  3 +-
 src/pip/_vendor/packaging/_manylinux.py       |  3 +-
 src/pip/_vendor/packaging/_parser.py          |  3 +-
 src/pip/_vendor/packaging/_tokenizer.py       |  9 ++-
 .../_vendor/packaging/licenses/__init__.py    |  2 +-
 src/pip/_vendor/packaging/markers.py          | 75 +++++++++++++------
 src/pip/_vendor/packaging/metadata.py         |  3 +-
 src/pip/_vendor/packaging/specifiers.py       |  3 +-
 src/pip/_vendor/packaging/tags.py             | 39 ++++++++++
 src/pip/_vendor/vendor.txt                    |  2 +-
 12 files changed, 106 insertions(+), 39 deletions(-)
 create mode 100644 news/packaging.vendor.rst

diff --git a/news/packaging.vendor.rst b/news/packaging.vendor.rst
new file mode 100644
index 00000000000..bda87053f10
--- /dev/null
+++ b/news/packaging.vendor.rst
@@ -0,0 +1 @@
+Upgrade packaging to 25.0
diff --git a/src/pip/_vendor/packaging/__init__.py b/src/pip/_vendor/packaging/__init__.py
index d79f73c574f..d45c22cfd88 100644
--- a/src/pip/_vendor/packaging/__init__.py
+++ b/src/pip/_vendor/packaging/__init__.py
@@ -6,7 +6,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "24.2"
+__version__ = "25.0"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
diff --git a/src/pip/_vendor/packaging/_elffile.py b/src/pip/_vendor/packaging/_elffile.py
index 25f4282cc29..7a5afc33b0a 100644
--- a/src/pip/_vendor/packaging/_elffile.py
+++ b/src/pip/_vendor/packaging/_elffile.py
@@ -69,8 +69,7 @@ def __init__(self, f: IO[bytes]) -> None:
             }[(self.capacity, self.encoding)]
         except KeyError as e:
             raise ELFInvalid(
-                f"unrecognized capacity ({self.capacity}) or "
-                f"encoding ({self.encoding})"
+                f"unrecognized capacity ({self.capacity}) or encoding ({self.encoding})"
             ) from e
 
         try:
diff --git a/src/pip/_vendor/packaging/_manylinux.py b/src/pip/_vendor/packaging/_manylinux.py
index 61339a6fcc1..95f55762e86 100644
--- a/src/pip/_vendor/packaging/_manylinux.py
+++ b/src/pip/_vendor/packaging/_manylinux.py
@@ -161,8 +161,7 @@ def _parse_glibc_version(version_str: str) -> tuple[int, int]:
     m = re.match(r"(?P[0-9]+)\.(?P[0-9]+)", version_str)
     if not m:
         warnings.warn(
-            f"Expected glibc version with 2 components major.minor,"
-            f" got: {version_str}",
+            f"Expected glibc version with 2 components major.minor, got: {version_str}",
             RuntimeWarning,
             stacklevel=2,
         )
diff --git a/src/pip/_vendor/packaging/_parser.py b/src/pip/_vendor/packaging/_parser.py
index c1238c06eab..0007c0aa64a 100644
--- a/src/pip/_vendor/packaging/_parser.py
+++ b/src/pip/_vendor/packaging/_parser.py
@@ -349,6 +349,5 @@ def _parse_marker_op(tokenizer: Tokenizer) -> Op:
         return Op(tokenizer.read().text)
     else:
         return tokenizer.raise_syntax_error(
-            "Expected marker operator, one of "
-            "<=, <, !=, ==, >=, >, ~=, ===, in, not in"
+            "Expected marker operator, one of <=, <, !=, ==, >=, >, ~=, ===, in, not in"
         )
diff --git a/src/pip/_vendor/packaging/_tokenizer.py b/src/pip/_vendor/packaging/_tokenizer.py
index 89d041605c0..d28a9b6cf5d 100644
--- a/src/pip/_vendor/packaging/_tokenizer.py
+++ b/src/pip/_vendor/packaging/_tokenizer.py
@@ -68,7 +68,8 @@ def __str__(self) -> str:
                 |platform[._](version|machine|python_implementation)
                 |python_implementation
                 |implementation_(name|version)
-                |extra
+                |extras?
+                |dependency_groups
             )\b
         """,
         re.VERBOSE,
@@ -119,9 +120,9 @@ def check(self, name: str, *, peek: bool = False) -> bool:
         another check. If `peek` is set to `True`, the token is not loaded and
         would need to be checked again.
         """
-        assert (
-            self.next_token is None
-        ), f"Cannot check for {name!r}, already have {self.next_token!r}"
+        assert self.next_token is None, (
+            f"Cannot check for {name!r}, already have {self.next_token!r}"
+        )
         assert name in self.rules, f"Unknown token name: {name!r}"
 
         expression = self.rules[name]
diff --git a/src/pip/_vendor/packaging/licenses/__init__.py b/src/pip/_vendor/packaging/licenses/__init__.py
index 71a1a7794e0..031f277fc63 100644
--- a/src/pip/_vendor/packaging/licenses/__init__.py
+++ b/src/pip/_vendor/packaging/licenses/__init__.py
@@ -37,8 +37,8 @@
 from pip._vendor.packaging.licenses._spdx import EXCEPTIONS, LICENSES
 
 __all__ = [
-    "NormalizedLicenseExpression",
     "InvalidLicenseExpression",
+    "NormalizedLicenseExpression",
     "canonicalize_license_expression",
 ]
 
diff --git a/src/pip/_vendor/packaging/markers.py b/src/pip/_vendor/packaging/markers.py
index fb7f49cf8cd..e7cea57297a 100644
--- a/src/pip/_vendor/packaging/markers.py
+++ b/src/pip/_vendor/packaging/markers.py
@@ -8,7 +8,7 @@
 import os
 import platform
 import sys
-from typing import Any, Callable, TypedDict, cast
+from typing import AbstractSet, Any, Callable, Literal, TypedDict, Union, cast
 
 from ._parser import MarkerAtom, MarkerList, Op, Value, Variable
 from ._parser import parse_marker as _parse_marker
@@ -17,6 +17,7 @@
 from .utils import canonicalize_name
 
 __all__ = [
+    "EvaluateContext",
     "InvalidMarker",
     "Marker",
     "UndefinedComparison",
@@ -24,7 +25,9 @@
     "default_environment",
 ]
 
-Operator = Callable[[str, str], bool]
+Operator = Callable[[str, Union[str, AbstractSet[str]]], bool]
+EvaluateContext = Literal["metadata", "lock_file", "requirement"]
+MARKERS_ALLOWING_SET = {"extras", "dependency_groups"}
 
 
 class InvalidMarker(ValueError):
@@ -174,13 +177,14 @@ def _format_marker(
 }
 
 
-def _eval_op(lhs: str, op: Op, rhs: str) -> bool:
-    try:
-        spec = Specifier("".join([op.serialize(), rhs]))
-    except InvalidSpecifier:
-        pass
-    else:
-        return spec.contains(lhs, prereleases=True)
+def _eval_op(lhs: str, op: Op, rhs: str | AbstractSet[str]) -> bool:
+    if isinstance(rhs, str):
+        try:
+            spec = Specifier("".join([op.serialize(), rhs]))
+        except InvalidSpecifier:
+            pass
+        else:
+            return spec.contains(lhs, prereleases=True)
 
     oper: Operator | None = _operators.get(op.serialize())
     if oper is None:
@@ -189,19 +193,29 @@ def _eval_op(lhs: str, op: Op, rhs: str) -> bool:
     return oper(lhs, rhs)
 
 
-def _normalize(*values: str, key: str) -> tuple[str, ...]:
+def _normalize(
+    lhs: str, rhs: str | AbstractSet[str], key: str
+) -> tuple[str, str | AbstractSet[str]]:
     # PEP 685 – Comparison of extra names for optional distribution dependencies
     # https://peps.python.org/pep-0685/
     # > When comparing extra names, tools MUST normalize the names being
     # > compared using the semantics outlined in PEP 503 for names
     if key == "extra":
-        return tuple(canonicalize_name(v) for v in values)
+        assert isinstance(rhs, str), "extra value must be a string"
+        return (canonicalize_name(lhs), canonicalize_name(rhs))
+    if key in MARKERS_ALLOWING_SET:
+        if isinstance(rhs, str):  # pragma: no cover
+            return (canonicalize_name(lhs), canonicalize_name(rhs))
+        else:
+            return (canonicalize_name(lhs), {canonicalize_name(v) for v in rhs})
 
     # other environment markers don't have such standards
-    return values
+    return lhs, rhs
 
 
-def _evaluate_markers(markers: MarkerList, environment: dict[str, str]) -> bool:
+def _evaluate_markers(
+    markers: MarkerList, environment: dict[str, str | AbstractSet[str]]
+) -> bool:
     groups: list[list[bool]] = [[]]
 
     for marker in markers:
@@ -220,7 +234,7 @@ def _evaluate_markers(markers: MarkerList, environment: dict[str, str]) -> bool:
                 lhs_value = lhs.value
                 environment_key = rhs.value
                 rhs_value = environment[environment_key]
-
+            assert isinstance(lhs_value, str), "lhs must be a string"
             lhs_value, rhs_value = _normalize(lhs_value, rhs_value, key=environment_key)
             groups[-1].append(_eval_op(lhs_value, op, rhs_value))
         else:
@@ -298,22 +312,36 @@ def __eq__(self, other: Any) -> bool:
 
         return str(self) == str(other)
 
-    def evaluate(self, environment: dict[str, str] | None = None) -> bool:
+    def evaluate(
+        self,
+        environment: dict[str, str] | None = None,
+        context: EvaluateContext = "metadata",
+    ) -> bool:
         """Evaluate a marker.
 
         Return the boolean from evaluating the given marker against the
         environment. environment is an optional argument to override all or
-        part of the determined environment.
+        part of the determined environment. The *context* parameter specifies what
+        context the markers are being evaluated for, which influences what markers
+        are considered valid. Acceptable values are "metadata" (for core metadata;
+        default), "lock_file", and "requirement" (i.e. all other situations).
 
         The environment is determined from the current Python process.
         """
-        current_environment = cast("dict[str, str]", default_environment())
-        current_environment["extra"] = ""
+        current_environment = cast(
+            "dict[str, str | AbstractSet[str]]", default_environment()
+        )
+        if context == "lock_file":
+            current_environment.update(
+                extras=frozenset(), dependency_groups=frozenset()
+            )
+        elif context == "metadata":
+            current_environment["extra"] = ""
         if environment is not None:
             current_environment.update(environment)
             # The API used to allow setting extra to None. We need to handle this
             # case for backwards compatibility.
-            if current_environment["extra"] is None:
+            if "extra" in current_environment and current_environment["extra"] is None:
                 current_environment["extra"] = ""
 
         return _evaluate_markers(
@@ -321,11 +349,14 @@ def evaluate(self, environment: dict[str, str] | None = None) -> bool:
         )
 
 
-def _repair_python_full_version(env: dict[str, str]) -> dict[str, str]:
+def _repair_python_full_version(
+    env: dict[str, str | AbstractSet[str]],
+) -> dict[str, str | AbstractSet[str]]:
     """
     Work around platform.python_version() returning something that is not PEP 440
     compliant for non-tagged Python builds.
     """
-    if env["python_full_version"].endswith("+"):
-        env["python_full_version"] += "local"
+    python_full_version = cast(str, env["python_full_version"])
+    if python_full_version.endswith("+"):
+        env["python_full_version"] = f"{python_full_version}local"
     return env
diff --git a/src/pip/_vendor/packaging/metadata.py b/src/pip/_vendor/packaging/metadata.py
index 721f411cfc4..3bd8602d36c 100644
--- a/src/pip/_vendor/packaging/metadata.py
+++ b/src/pip/_vendor/packaging/metadata.py
@@ -678,8 +678,7 @@ def _process_license_files(self, value: list[str]) -> list[str]:
                 )
             if pathlib.PureWindowsPath(path).as_posix() != path:
                 raise self._invalid_metadata(
-                    f"{path!r} is invalid for {{field}}, "
-                    "paths must use '/' delimiter"
+                    f"{path!r} is invalid for {{field}}, paths must use '/' delimiter"
                 )
             paths.append(path)
         return paths
diff --git a/src/pip/_vendor/packaging/specifiers.py b/src/pip/_vendor/packaging/specifiers.py
index f18016e1663..47c3929a1d8 100644
--- a/src/pip/_vendor/packaging/specifiers.py
+++ b/src/pip/_vendor/packaging/specifiers.py
@@ -816,8 +816,7 @@ def __and__(self, other: SpecifierSet | str) -> SpecifierSet:
             specifier._prereleases = self._prereleases
         else:
             raise ValueError(
-                "Cannot combine SpecifierSets with True and False prerelease "
-                "overrides."
+                "Cannot combine SpecifierSets with True and False prerelease overrides."
             )
 
         return specifier
diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
index f5903402abb..8522f59c4f2 100644
--- a/src/pip/_vendor/packaging/tags.py
+++ b/src/pip/_vendor/packaging/tags.py
@@ -530,6 +530,43 @@ def ios_platforms(
             )
 
 
+def android_platforms(
+    api_level: int | None = None, abi: str | None = None
+) -> Iterator[str]:
+    """
+    Yields the :attr:`~Tag.platform` tags for Android. If this function is invoked on
+    non-Android platforms, the ``api_level`` and ``abi`` arguments are required.
+
+    :param int api_level: The maximum `API level
+        `__ to return. Defaults
+        to the current system's version, as returned by ``platform.android_ver``.
+    :param str abi: The `Android ABI `__,
+        e.g. ``arm64_v8a``. Defaults to the current system's ABI , as returned by
+        ``sysconfig.get_platform``. Hyphens and periods will be replaced with
+        underscores.
+    """
+    if platform.system() != "Android" and (api_level is None or abi is None):
+        raise TypeError(
+            "on non-Android platforms, the api_level and abi arguments are required"
+        )
+
+    if api_level is None:
+        # Python 3.13 was the first version to return platform.system() == "Android",
+        # and also the first version to define platform.android_ver().
+        api_level = platform.android_ver().api_level  # type: ignore[attr-defined]
+
+    if abi is None:
+        abi = sysconfig.get_platform().split("-")[-1]
+    abi = _normalize_string(abi)
+
+    # 16 is the minimum API level known to have enough features to support CPython
+    # without major patching. Yield every API level from the maximum down to the
+    # minimum, inclusive.
+    min_api_level = 16
+    for ver in range(api_level, min_api_level - 1, -1):
+        yield f"android_{ver}_{abi}"
+
+
 def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
     linux = _normalize_string(sysconfig.get_platform())
     if not linux.startswith("linux_"):
@@ -561,6 +598,8 @@ def platform_tags() -> Iterator[str]:
         return mac_platforms()
     elif platform.system() == "iOS":
         return ios_platforms()
+    elif platform.system() == "Android":
+        return android_platforms()
     elif platform.system() == "Linux":
         return _linux_platforms()
     else:
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
index a56dac1ace6..283d57f5f34 100644
--- a/src/pip/_vendor/vendor.txt
+++ b/src/pip/_vendor/vendor.txt
@@ -2,7 +2,7 @@ CacheControl==0.14.2
 distlib==0.3.9
 distro==1.9.0
 msgpack==1.1.0
-packaging==24.2
+packaging==25.0
 platformdirs==4.3.7
 pyproject-hooks==1.2.0
 requests==2.32.3

From d14ace5136f3a02195d2f0912850a69befe9339a Mon Sep 17 00:00:00 2001
From: Richard Si 
Date: Sat, 19 Apr 2025 09:38:59 -0400
Subject: [PATCH 846/992] Trim unused pygments formatters and CLI (#13337)

The formatters are exclusively used by the pygments CLI which is already
broken because it depends on lexers we've trimmed a long time ago.
---
 pyproject.toml                                |   4 +-
 src/pip/_vendor/pygments/cmdline.py           | 668 ------------
 src/pip/_vendor/pygments/formatters/bbcode.py | 108 --
 src/pip/_vendor/pygments/formatters/groff.py  | 170 ---
 src/pip/_vendor/pygments/formatters/html.py   | 995 ------------------
 src/pip/_vendor/pygments/formatters/img.py    | 686 ------------
 src/pip/_vendor/pygments/formatters/irc.py    | 154 ---
 src/pip/_vendor/pygments/formatters/latex.py  | 518 ---------
 src/pip/_vendor/pygments/formatters/other.py  | 160 ---
 .../pygments/formatters/pangomarkup.py        |  83 --
 src/pip/_vendor/pygments/formatters/rtf.py    | 349 ------
 src/pip/_vendor/pygments/formatters/svg.py    | 185 ----
 .../_vendor/pygments/formatters/terminal.py   | 127 ---
 .../pygments/formatters/terminal256.py        | 338 ------
 14 files changed, 3 insertions(+), 4542 deletions(-)
 delete mode 100644 src/pip/_vendor/pygments/cmdline.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/bbcode.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/groff.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/html.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/img.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/irc.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/latex.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/other.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/pangomarkup.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/rtf.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/svg.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/terminal.py
 delete mode 100644 src/pip/_vendor/pygments/formatters/terminal256.py

diff --git a/pyproject.toml b/pyproject.toml
index 5bc7f455140..5d79eae2637 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -130,9 +130,11 @@ drop = [
   "_distutils_hack",
   "distutils-precedence.pth",
   "pkg_resources/extern/",
-  # trim vendored pygments styles and lexers
+  # trim vendored pygments styles, lexers, formatters, and CLI
   "pygments/styles/[!_]*.py",
   '^pygments/lexers/(?!python|__init__|_mapping).*\.py$',
+  '^pygments/formatters/(?!__init__|_mapping).*\.py$',
+  '^pygments/cmdline\.py$',
   # trim rich's markdown support
   "rich/markdown.py",
 ]
diff --git a/src/pip/_vendor/pygments/cmdline.py b/src/pip/_vendor/pygments/cmdline.py
deleted file mode 100644
index bf9ad55e54f..00000000000
--- a/src/pip/_vendor/pygments/cmdline.py
+++ /dev/null
@@ -1,668 +0,0 @@
-"""
-    pygments.cmdline
-    ~~~~~~~~~~~~~~~~
-
-    Command line interface.
-
-    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-import os
-import sys
-import shutil
-import argparse
-from textwrap import dedent
-
-from pip._vendor.pygments import __version__, highlight
-from pip._vendor.pygments.util import ClassNotFound, OptionError, docstring_headline, \
-    guess_decode, guess_decode_from_terminal, terminal_encoding, \
-    UnclosingTextIOWrapper
-from pip._vendor.pygments.lexers import get_all_lexers, get_lexer_by_name, guess_lexer, \
-    load_lexer_from_file, get_lexer_for_filename, find_lexer_class_for_filename
-from pip._vendor.pygments.lexers.special import TextLexer
-from pip._vendor.pygments.formatters.latex import LatexEmbeddedLexer, LatexFormatter
-from pip._vendor.pygments.formatters import get_all_formatters, get_formatter_by_name, \
-    load_formatter_from_file, get_formatter_for_filename, find_formatter_class
-from pip._vendor.pygments.formatters.terminal import TerminalFormatter
-from pip._vendor.pygments.formatters.terminal256 import Terminal256Formatter, TerminalTrueColorFormatter
-from pip._vendor.pygments.filters import get_all_filters, find_filter_class
-from pip._vendor.pygments.styles import get_all_styles, get_style_by_name
-
-
-def _parse_options(o_strs):
-    opts = {}
-    if not o_strs:
-        return opts
-    for o_str in o_strs:
-        if not o_str.strip():
-            continue
-        o_args = o_str.split(',')
-        for o_arg in o_args:
-            o_arg = o_arg.strip()
-            try:
-                o_key, o_val = o_arg.split('=', 1)
-                o_key = o_key.strip()
-                o_val = o_val.strip()
-            except ValueError:
-                opts[o_arg] = True
-            else:
-                opts[o_key] = o_val
-    return opts
-
-
-def _parse_filters(f_strs):
-    filters = []
-    if not f_strs:
-        return filters
-    for f_str in f_strs:
-        if ':' in f_str:
-            fname, fopts = f_str.split(':', 1)
-            filters.append((fname, _parse_options([fopts])))
-        else:
-            filters.append((f_str, {}))
-    return filters
-
-
-def _print_help(what, name):
-    try:
-        if what == 'lexer':
-            cls = get_lexer_by_name(name)
-            print(f"Help on the {cls.name} lexer:")
-            print(dedent(cls.__doc__))
-        elif what == 'formatter':
-            cls = find_formatter_class(name)
-            print(f"Help on the {cls.name} formatter:")
-            print(dedent(cls.__doc__))
-        elif what == 'filter':
-            cls = find_filter_class(name)
-            print(f"Help on the {name} filter:")
-            print(dedent(cls.__doc__))
-        return 0
-    except (AttributeError, ValueError):
-        print(f"{what} not found!", file=sys.stderr)
-        return 1
-
-
-def _print_list(what):
-    if what == 'lexer':
-        print()
-        print("Lexers:")
-        print("~~~~~~~")
-
-        info = []
-        for fullname, names, exts, _ in get_all_lexers():
-            tup = (', '.join(names)+':', fullname,
-                   exts and '(filenames ' + ', '.join(exts) + ')' or '')
-            info.append(tup)
-        info.sort()
-        for i in info:
-            print(('* {}\n    {} {}').format(*i))
-
-    elif what == 'formatter':
-        print()
-        print("Formatters:")
-        print("~~~~~~~~~~~")
-
-        info = []
-        for cls in get_all_formatters():
-            doc = docstring_headline(cls)
-            tup = (', '.join(cls.aliases) + ':', doc, cls.filenames and
-                   '(filenames ' + ', '.join(cls.filenames) + ')' or '')
-            info.append(tup)
-        info.sort()
-        for i in info:
-            print(('* {}\n    {} {}').format(*i))
-
-    elif what == 'filter':
-        print()
-        print("Filters:")
-        print("~~~~~~~~")
-
-        for name in get_all_filters():
-            cls = find_filter_class(name)
-            print("* " + name + ':')
-            print(f"    {docstring_headline(cls)}")
-
-    elif what == 'style':
-        print()
-        print("Styles:")
-        print("~~~~~~~")
-
-        for name in get_all_styles():
-            cls = get_style_by_name(name)
-            print("* " + name + ':')
-            print(f"    {docstring_headline(cls)}")
-
-
-def _print_list_as_json(requested_items):
-    import json
-    result = {}
-    if 'lexer' in requested_items:
-        info = {}
-        for fullname, names, filenames, mimetypes in get_all_lexers():
-            info[fullname] = {
-                'aliases': names,
-                'filenames': filenames,
-                'mimetypes': mimetypes
-            }
-        result['lexers'] = info
-
-    if 'formatter' in requested_items:
-        info = {}
-        for cls in get_all_formatters():
-            doc = docstring_headline(cls)
-            info[cls.name] = {
-                'aliases': cls.aliases,
-                'filenames': cls.filenames,
-                'doc': doc
-            }
-        result['formatters'] = info
-
-    if 'filter' in requested_items:
-        info = {}
-        for name in get_all_filters():
-            cls = find_filter_class(name)
-            info[name] = {
-                'doc': docstring_headline(cls)
-            }
-        result['filters'] = info
-
-    if 'style' in requested_items:
-        info = {}
-        for name in get_all_styles():
-            cls = get_style_by_name(name)
-            info[name] = {
-                'doc': docstring_headline(cls)
-            }
-        result['styles'] = info
-
-    json.dump(result, sys.stdout)
-
-def main_inner(parser, argns):
-    if argns.help:
-        parser.print_help()
-        return 0
-
-    if argns.V:
-        print(f'Pygments version {__version__}, (c) 2006-2024 by Georg Brandl, Matthäus '
-              'Chajdas and contributors.')
-        return 0
-
-    def is_only_option(opt):
-        return not any(v for (k, v) in vars(argns).items() if k != opt)
-
-    # handle ``pygmentize -L``
-    if argns.L is not None:
-        arg_set = set()
-        for k, v in vars(argns).items():
-            if v:
-                arg_set.add(k)
-
-        arg_set.discard('L')
-        arg_set.discard('json')
-
-        if arg_set:
-            parser.print_help(sys.stderr)
-            return 2
-
-        # print version
-        if not argns.json:
-            main(['', '-V'])
-        allowed_types = {'lexer', 'formatter', 'filter', 'style'}
-        largs = [arg.rstrip('s') for arg in argns.L]
-        if any(arg not in allowed_types for arg in largs):
-            parser.print_help(sys.stderr)
-            return 0
-        if not largs:
-            largs = allowed_types
-        if not argns.json:
-            for arg in largs:
-                _print_list(arg)
-        else:
-            _print_list_as_json(largs)
-        return 0
-
-    # handle ``pygmentize -H``
-    if argns.H:
-        if not is_only_option('H'):
-            parser.print_help(sys.stderr)
-            return 2
-        what, name = argns.H
-        if what not in ('lexer', 'formatter', 'filter'):
-            parser.print_help(sys.stderr)
-            return 2
-        return _print_help(what, name)
-
-    # parse -O options
-    parsed_opts = _parse_options(argns.O or [])
-
-    # parse -P options
-    for p_opt in argns.P or []:
-        try:
-            name, value = p_opt.split('=', 1)
-        except ValueError:
-            parsed_opts[p_opt] = True
-        else:
-            parsed_opts[name] = value
-
-    # encodings
-    inencoding = parsed_opts.get('inencoding', parsed_opts.get('encoding'))
-    outencoding = parsed_opts.get('outencoding', parsed_opts.get('encoding'))
-
-    # handle ``pygmentize -N``
-    if argns.N:
-        lexer = find_lexer_class_for_filename(argns.N)
-        if lexer is None:
-            lexer = TextLexer
-
-        print(lexer.aliases[0])
-        return 0
-
-    # handle ``pygmentize -C``
-    if argns.C:
-        inp = sys.stdin.buffer.read()
-        try:
-            lexer = guess_lexer(inp, inencoding=inencoding)
-        except ClassNotFound:
-            lexer = TextLexer
-
-        print(lexer.aliases[0])
-        return 0
-
-    # handle ``pygmentize -S``
-    S_opt = argns.S
-    a_opt = argns.a
-    if S_opt is not None:
-        f_opt = argns.f
-        if not f_opt:
-            parser.print_help(sys.stderr)
-            return 2
-        if argns.l or argns.INPUTFILE:
-            parser.print_help(sys.stderr)
-            return 2
-
-        try:
-            parsed_opts['style'] = S_opt
-            fmter = get_formatter_by_name(f_opt, **parsed_opts)
-        except ClassNotFound as err:
-            print(err, file=sys.stderr)
-            return 1
-
-        print(fmter.get_style_defs(a_opt or ''))
-        return 0
-
-    # if no -S is given, -a is not allowed
-    if argns.a is not None:
-        parser.print_help(sys.stderr)
-        return 2
-
-    # parse -F options
-    F_opts = _parse_filters(argns.F or [])
-
-    # -x: allow custom (eXternal) lexers and formatters
-    allow_custom_lexer_formatter = bool(argns.x)
-
-    # select lexer
-    lexer = None
-
-    # given by name?
-    lexername = argns.l
-    if lexername:
-        # custom lexer, located relative to user's cwd
-        if allow_custom_lexer_formatter and '.py' in lexername:
-            try:
-                filename = None
-                name = None
-                if ':' in lexername:
-                    filename, name = lexername.rsplit(':', 1)
-
-                    if '.py' in name:
-                        # This can happen on Windows: If the lexername is
-                        # C:\lexer.py -- return to normal load path in that case
-                        name = None
-
-                if filename and name:
-                    lexer = load_lexer_from_file(filename, name,
-                                                 **parsed_opts)
-                else:
-                    lexer = load_lexer_from_file(lexername, **parsed_opts)
-            except ClassNotFound as err:
-                print('Error:', err, file=sys.stderr)
-                return 1
-        else:
-            try:
-                lexer = get_lexer_by_name(lexername, **parsed_opts)
-            except (OptionError, ClassNotFound) as err:
-                print('Error:', err, file=sys.stderr)
-                return 1
-
-    # read input code
-    code = None
-
-    if argns.INPUTFILE:
-        if argns.s:
-            print('Error: -s option not usable when input file specified',
-                  file=sys.stderr)
-            return 2
-
-        infn = argns.INPUTFILE
-        try:
-            with open(infn, 'rb') as infp:
-                code = infp.read()
-        except Exception as err:
-            print('Error: cannot read infile:', err, file=sys.stderr)
-            return 1
-        if not inencoding:
-            code, inencoding = guess_decode(code)
-
-        # do we have to guess the lexer?
-        if not lexer:
-            try:
-                lexer = get_lexer_for_filename(infn, code, **parsed_opts)
-            except ClassNotFound as err:
-                if argns.g:
-                    try:
-                        lexer = guess_lexer(code, **parsed_opts)
-                    except ClassNotFound:
-                        lexer = TextLexer(**parsed_opts)
-                else:
-                    print('Error:', err, file=sys.stderr)
-                    return 1
-            except OptionError as err:
-                print('Error:', err, file=sys.stderr)
-                return 1
-
-    elif not argns.s:  # treat stdin as full file (-s support is later)
-        # read code from terminal, always in binary mode since we want to
-        # decode ourselves and be tolerant with it
-        code = sys.stdin.buffer.read()  # use .buffer to get a binary stream
-        if not inencoding:
-            code, inencoding = guess_decode_from_terminal(code, sys.stdin)
-            # else the lexer will do the decoding
-        if not lexer:
-            try:
-                lexer = guess_lexer(code, **parsed_opts)
-            except ClassNotFound:
-                lexer = TextLexer(**parsed_opts)
-
-    else:  # -s option needs a lexer with -l
-        if not lexer:
-            print('Error: when using -s a lexer has to be selected with -l',
-                  file=sys.stderr)
-            return 2
-
-    # process filters
-    for fname, fopts in F_opts:
-        try:
-            lexer.add_filter(fname, **fopts)
-        except ClassNotFound as err:
-            print('Error:', err, file=sys.stderr)
-            return 1
-
-    # select formatter
-    outfn = argns.o
-    fmter = argns.f
-    if fmter:
-        # custom formatter, located relative to user's cwd
-        if allow_custom_lexer_formatter and '.py' in fmter:
-            try:
-                filename = None
-                name = None
-                if ':' in fmter:
-                    # Same logic as above for custom lexer
-                    filename, name = fmter.rsplit(':', 1)
-
-                    if '.py' in name:
-                        name = None
-
-                if filename and name:
-                    fmter = load_formatter_from_file(filename, name,
-                                                     **parsed_opts)
-                else:
-                    fmter = load_formatter_from_file(fmter, **parsed_opts)
-            except ClassNotFound as err:
-                print('Error:', err, file=sys.stderr)
-                return 1
-        else:
-            try:
-                fmter = get_formatter_by_name(fmter, **parsed_opts)
-            except (OptionError, ClassNotFound) as err:
-                print('Error:', err, file=sys.stderr)
-                return 1
-
-    if outfn:
-        if not fmter:
-            try:
-                fmter = get_formatter_for_filename(outfn, **parsed_opts)
-            except (OptionError, ClassNotFound) as err:
-                print('Error:', err, file=sys.stderr)
-                return 1
-        try:
-            outfile = open(outfn, 'wb')
-        except Exception as err:
-            print('Error: cannot open outfile:', err, file=sys.stderr)
-            return 1
-    else:
-        if not fmter:
-            if os.environ.get('COLORTERM','') in ('truecolor', '24bit'):
-                fmter = TerminalTrueColorFormatter(**parsed_opts)
-            elif '256' in os.environ.get('TERM', ''):
-                fmter = Terminal256Formatter(**parsed_opts)
-            else:
-                fmter = TerminalFormatter(**parsed_opts)
-        outfile = sys.stdout.buffer
-
-    # determine output encoding if not explicitly selected
-    if not outencoding:
-        if outfn:
-            # output file? use lexer encoding for now (can still be None)
-            fmter.encoding = inencoding
-        else:
-            # else use terminal encoding
-            fmter.encoding = terminal_encoding(sys.stdout)
-
-    # provide coloring under Windows, if possible
-    if not outfn and sys.platform in ('win32', 'cygwin') and \
-       fmter.name in ('Terminal', 'Terminal256'):  # pragma: no cover
-        # unfortunately colorama doesn't support binary streams on Py3
-        outfile = UnclosingTextIOWrapper(outfile, encoding=fmter.encoding)
-        fmter.encoding = None
-        try:
-            import colorama.initialise
-        except ImportError:
-            pass
-        else:
-            outfile = colorama.initialise.wrap_stream(
-                outfile, convert=None, strip=None, autoreset=False, wrap=True)
-
-    # When using the LaTeX formatter and the option `escapeinside` is
-    # specified, we need a special lexer which collects escaped text
-    # before running the chosen language lexer.
-    escapeinside = parsed_opts.get('escapeinside', '')
-    if len(escapeinside) == 2 and isinstance(fmter, LatexFormatter):
-        left = escapeinside[0]
-        right = escapeinside[1]
-        lexer = LatexEmbeddedLexer(left, right, lexer)
-
-    # ... and do it!
-    if not argns.s:
-        # process whole input as per normal...
-        try:
-            highlight(code, lexer, fmter, outfile)
-        finally:
-            if outfn:
-                outfile.close()
-        return 0
-    else:
-        # line by line processing of stdin (eg: for 'tail -f')...
-        try:
-            while 1:
-                line = sys.stdin.buffer.readline()
-                if not line:
-                    break
-                if not inencoding:
-                    line = guess_decode_from_terminal(line, sys.stdin)[0]
-                highlight(line, lexer, fmter, outfile)
-                if hasattr(outfile, 'flush'):
-                    outfile.flush()
-            return 0
-        except KeyboardInterrupt:  # pragma: no cover
-            return 0
-        finally:
-            if outfn:
-                outfile.close()
-
-
-class HelpFormatter(argparse.HelpFormatter):
-    def __init__(self, prog, indent_increment=2, max_help_position=16, width=None):
-        if width is None:
-            try:
-                width = shutil.get_terminal_size().columns - 2
-            except Exception:
-                pass
-        argparse.HelpFormatter.__init__(self, prog, indent_increment,
-                                        max_help_position, width)
-
-
-def main(args=sys.argv):
-    """
-    Main command line entry point.
-    """
-    desc = "Highlight an input file and write the result to an output file."
-    parser = argparse.ArgumentParser(description=desc, add_help=False,
-                                     formatter_class=HelpFormatter)
-
-    operation = parser.add_argument_group('Main operation')
-    lexersel = operation.add_mutually_exclusive_group()
-    lexersel.add_argument(
-        '-l', metavar='LEXER',
-        help='Specify the lexer to use.  (Query names with -L.)  If not '
-        'given and -g is not present, the lexer is guessed from the filename.')
-    lexersel.add_argument(
-        '-g', action='store_true',
-        help='Guess the lexer from the file contents, or pass through '
-        'as plain text if nothing can be guessed.')
-    operation.add_argument(
-        '-F', metavar='FILTER[:options]', action='append',
-        help='Add a filter to the token stream.  (Query names with -L.) '
-        'Filter options are given after a colon if necessary.')
-    operation.add_argument(
-        '-f', metavar='FORMATTER',
-        help='Specify the formatter to use.  (Query names with -L.) '
-        'If not given, the formatter is guessed from the output filename, '
-        'and defaults to the terminal formatter if the output is to the '
-        'terminal or an unknown file extension.')
-    operation.add_argument(
-        '-O', metavar='OPTION=value[,OPTION=value,...]', action='append',
-        help='Give options to the lexer and formatter as a comma-separated '
-        'list of key-value pairs. '
-        'Example: `-O bg=light,python=cool`.')
-    operation.add_argument(
-        '-P', metavar='OPTION=value', action='append',
-        help='Give a single option to the lexer and formatter - with this '
-        'you can pass options whose value contains commas and equal signs. '
-        'Example: `-P "heading=Pygments, the Python highlighter"`.')
-    operation.add_argument(
-        '-o', metavar='OUTPUTFILE',
-        help='Where to write the output.  Defaults to standard output.')
-
-    operation.add_argument(
-        'INPUTFILE', nargs='?',
-        help='Where to read the input.  Defaults to standard input.')
-
-    flags = parser.add_argument_group('Operation flags')
-    flags.add_argument(
-        '-v', action='store_true',
-        help='Print a detailed traceback on unhandled exceptions, which '
-        'is useful for debugging and bug reports.')
-    flags.add_argument(
-        '-s', action='store_true',
-        help='Process lines one at a time until EOF, rather than waiting to '
-        'process the entire file.  This only works for stdin, only for lexers '
-        'with no line-spanning constructs, and is intended for streaming '
-        'input such as you get from `tail -f`. '
-        'Example usage: `tail -f sql.log | pygmentize -s -l sql`.')
-    flags.add_argument(
-        '-x', action='store_true',
-        help='Allow custom lexers and formatters to be loaded from a .py file '
-        'relative to the current working directory. For example, '
-        '`-l ./customlexer.py -x`. By default, this option expects a file '
-        'with a class named CustomLexer or CustomFormatter; you can also '
-        'specify your own class name with a colon (`-l ./lexer.py:MyLexer`). '
-        'Users should be very careful not to use this option with untrusted '
-        'files, because it will import and run them.')
-    flags.add_argument('--json', help='Output as JSON. This can '
-        'be only used in conjunction with -L.',
-        default=False,
-        action='store_true')
-
-    special_modes_group = parser.add_argument_group(
-        'Special modes - do not do any highlighting')
-    special_modes = special_modes_group.add_mutually_exclusive_group()
-    special_modes.add_argument(
-        '-S', metavar='STYLE -f formatter',
-        help='Print style definitions for STYLE for a formatter '
-        'given with -f. The argument given by -a is formatter '
-        'dependent.')
-    special_modes.add_argument(
-        '-L', nargs='*', metavar='WHAT',
-        help='List lexers, formatters, styles or filters -- '
-        'give additional arguments for the thing(s) you want to list '
-        '(e.g. "styles"), or omit them to list everything.')
-    special_modes.add_argument(
-        '-N', metavar='FILENAME',
-        help='Guess and print out a lexer name based solely on the given '
-        'filename. Does not take input or highlight anything. If no specific '
-        'lexer can be determined, "text" is printed.')
-    special_modes.add_argument(
-        '-C', action='store_true',
-        help='Like -N, but print out a lexer name based solely on '
-        'a given content from standard input.')
-    special_modes.add_argument(
-        '-H', action='store', nargs=2, metavar=('NAME', 'TYPE'),
-        help='Print detailed help for the object  of type , '
-        'where  is one of "lexer", "formatter" or "filter".')
-    special_modes.add_argument(
-        '-V', action='store_true',
-        help='Print the package version.')
-    special_modes.add_argument(
-        '-h', '--help', action='store_true',
-        help='Print this help.')
-    special_modes_group.add_argument(
-        '-a', metavar='ARG',
-        help='Formatter-specific additional argument for the -S (print '
-        'style sheet) mode.')
-
-    argns = parser.parse_args(args[1:])
-
-    try:
-        return main_inner(parser, argns)
-    except BrokenPipeError:
-        # someone closed our stdout, e.g. by quitting a pager.
-        return 0
-    except Exception:
-        if argns.v:
-            print(file=sys.stderr)
-            print('*' * 65, file=sys.stderr)
-            print('An unhandled exception occurred while highlighting.',
-                  file=sys.stderr)
-            print('Please report the whole traceback to the issue tracker at',
-                  file=sys.stderr)
-            print('.',
-                  file=sys.stderr)
-            print('*' * 65, file=sys.stderr)
-            print(file=sys.stderr)
-            raise
-        import traceback
-        info = traceback.format_exception(*sys.exc_info())
-        msg = info[-1].strip()
-        if len(info) >= 3:
-            # extract relevant file and position info
-            msg += '\n   (f{})'.format(info[-2].split('\n')[0].strip()[1:])
-        print(file=sys.stderr)
-        print('*** Error while highlighting:', file=sys.stderr)
-        print(msg, file=sys.stderr)
-        print('*** If this is a bug you want to report, please rerun with -v.',
-              file=sys.stderr)
-        return 1
diff --git a/src/pip/_vendor/pygments/formatters/bbcode.py b/src/pip/_vendor/pygments/formatters/bbcode.py
deleted file mode 100644
index b9ca398341f..00000000000
--- a/src/pip/_vendor/pygments/formatters/bbcode.py
+++ /dev/null
@@ -1,108 +0,0 @@
-"""
-    pygments.formatters.bbcode
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    BBcode formatter.
-
-    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-
-from pip._vendor.pygments.formatter import Formatter
-from pip._vendor.pygments.util import get_bool_opt
-
-__all__ = ['BBCodeFormatter']
-
-
-class BBCodeFormatter(Formatter):
-    """
-    Format tokens with BBcodes. These formatting codes are used by many
-    bulletin boards, so you can highlight your sourcecode with pygments before
-    posting it there.
-
-    This formatter has no support for background colors and borders, as there
-    are no common BBcode tags for that.
-
-    Some board systems (e.g. phpBB) don't support colors in their [code] tag,
-    so you can't use the highlighting together with that tag.
-    Text in a [code] tag usually is shown with a monospace font (which this
-    formatter can do with the ``monofont`` option) and no spaces (which you
-    need for indentation) are removed.
-
-    Additional options accepted:
-
-    `style`
-        The style to use, can be a string or a Style subclass (default:
-        ``'default'``).
-
-    `codetag`
-        If set to true, put the output into ``[code]`` tags (default:
-        ``false``)
-
-    `monofont`
-        If set to true, add a tag to show the code with a monospace font
-        (default: ``false``).
-    """
-    name = 'BBCode'
-    aliases = ['bbcode', 'bb']
-    filenames = []
-
-    def __init__(self, **options):
-        Formatter.__init__(self, **options)
-        self._code = get_bool_opt(options, 'codetag', False)
-        self._mono = get_bool_opt(options, 'monofont', False)
-
-        self.styles = {}
-        self._make_styles()
-
-    def _make_styles(self):
-        for ttype, ndef in self.style:
-            start = end = ''
-            if ndef['color']:
-                start += '[color=#{}]'.format(ndef['color'])
-                end = '[/color]' + end
-            if ndef['bold']:
-                start += '[b]'
-                end = '[/b]' + end
-            if ndef['italic']:
-                start += '[i]'
-                end = '[/i]' + end
-            if ndef['underline']:
-                start += '[u]'
-                end = '[/u]' + end
-            # there are no common BBcodes for background-color and border
-
-            self.styles[ttype] = start, end
-
-    def format_unencoded(self, tokensource, outfile):
-        if self._code:
-            outfile.write('[code]')
-        if self._mono:
-            outfile.write('[font=monospace]')
-
-        lastval = ''
-        lasttype = None
-
-        for ttype, value in tokensource:
-            while ttype not in self.styles:
-                ttype = ttype.parent
-            if ttype == lasttype:
-                lastval += value
-            else:
-                if lastval:
-                    start, end = self.styles[lasttype]
-                    outfile.write(''.join((start, lastval, end)))
-                lastval = value
-                lasttype = ttype
-
-        if lastval:
-            start, end = self.styles[lasttype]
-            outfile.write(''.join((start, lastval, end)))
-
-        if self._mono:
-            outfile.write('[/font]')
-        if self._code:
-            outfile.write('[/code]')
-        if self._code or self._mono:
-            outfile.write('\n')
diff --git a/src/pip/_vendor/pygments/formatters/groff.py b/src/pip/_vendor/pygments/formatters/groff.py
deleted file mode 100644
index 6527f709bc9..00000000000
--- a/src/pip/_vendor/pygments/formatters/groff.py
+++ /dev/null
@@ -1,170 +0,0 @@
-"""
-    pygments.formatters.groff
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Formatter for groff output.
-
-    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-import math
-from pip._vendor.pygments.formatter import Formatter
-from pip._vendor.pygments.util import get_bool_opt, get_int_opt
-
-__all__ = ['GroffFormatter']
-
-
-class GroffFormatter(Formatter):
-    """
-    Format tokens with groff escapes to change their color and font style.
-
-    .. versionadded:: 2.11
-
-    Additional options accepted:
-
-    `style`
-        The style to use, can be a string or a Style subclass (default:
-        ``'default'``).
-
-    `monospaced`
-        If set to true, monospace font will be used (default: ``true``).
-
-    `linenos`
-        If set to true, print the line numbers (default: ``false``).
-
-    `wrap`
-        Wrap lines to the specified number of characters. Disabled if set to 0
-        (default: ``0``).
-    """
-
-    name = 'groff'
-    aliases = ['groff','troff','roff']
-    filenames = []
-
-    def __init__(self, **options):
-        Formatter.__init__(self, **options)
-
-        self.monospaced = get_bool_opt(options, 'monospaced', True)
-        self.linenos = get_bool_opt(options, 'linenos', False)
-        self._lineno = 0
-        self.wrap = get_int_opt(options, 'wrap', 0)
-        self._linelen = 0
-
-        self.styles = {}
-        self._make_styles()
-
-
-    def _make_styles(self):
-        regular = '\\f[CR]' if self.monospaced else '\\f[R]'
-        bold = '\\f[CB]' if self.monospaced else '\\f[B]'
-        italic = '\\f[CI]' if self.monospaced else '\\f[I]'
-
-        for ttype, ndef in self.style:
-            start = end = ''
-            if ndef['color']:
-                start += '\\m[{}]'.format(ndef['color'])
-                end = '\\m[]' + end
-            if ndef['bold']:
-                start += bold
-                end = regular + end
-            if ndef['italic']:
-                start += italic
-                end = regular + end
-            if ndef['bgcolor']:
-                start += '\\M[{}]'.format(ndef['bgcolor'])
-                end = '\\M[]' + end
-
-            self.styles[ttype] = start, end
-
-
-    def _define_colors(self, outfile):
-        colors = set()
-        for _, ndef in self.style:
-            if ndef['color'] is not None:
-                colors.add(ndef['color'])
-
-        for color in sorted(colors):
-            outfile.write('.defcolor ' + color + ' rgb #' + color + '\n')
-
-
-    def _write_lineno(self, outfile):
-        self._lineno += 1
-        outfile.write("%s% 4d " % (self._lineno != 1 and '\n' or '', self._lineno))
-
-
-    def _wrap_line(self, line):
-        length = len(line.rstrip('\n'))
-        space = '     ' if self.linenos else ''
-        newline = ''
-
-        if length > self.wrap:
-            for i in range(0, math.floor(length / self.wrap)):
-                chunk = line[i*self.wrap:i*self.wrap+self.wrap]
-                newline += (chunk + '\n' + space)
-            remainder = length % self.wrap
-            if remainder > 0:
-                newline += line[-remainder-1:]
-                self._linelen = remainder
-        elif self._linelen + length > self.wrap:
-            newline = ('\n' + space) + line
-            self._linelen = length
-        else:
-            newline = line
-            self._linelen += length
-
-        return newline
-
-
-    def _escape_chars(self, text):
-        text = text.replace('\\', '\\[u005C]'). \
-                    replace('.', '\\[char46]'). \
-                    replace('\'', '\\[u0027]'). \
-                    replace('`', '\\[u0060]'). \
-                    replace('~', '\\[u007E]')
-        copy = text
-
-        for char in copy:
-            if len(char) != len(char.encode()):
-                uni = char.encode('unicode_escape') \
-                    .decode()[1:] \
-                    .replace('x', 'u00') \
-                    .upper()
-                text = text.replace(char, '\\[u' + uni[1:] + ']')
-
-        return text
-
-
-    def format_unencoded(self, tokensource, outfile):
-        self._define_colors(outfile)
-
-        outfile.write('.nf\n\\f[CR]\n')
-
-        if self.linenos:
-            self._write_lineno(outfile)
-
-        for ttype, value in tokensource:
-            while ttype not in self.styles:
-                ttype = ttype.parent
-            start, end = self.styles[ttype]
-
-            for line in value.splitlines(True):
-                if self.wrap > 0:
-                    line = self._wrap_line(line)
-
-                if start and end:
-                    text = self._escape_chars(line.rstrip('\n'))
-                    if text != '':
-                        outfile.write(''.join((start, text, end)))
-                else:
-                    outfile.write(self._escape_chars(line.rstrip('\n')))
-
-                if line.endswith('\n'):
-                    if self.linenos:
-                        self._write_lineno(outfile)
-                        self._linelen = 0
-                    else:
-                        outfile.write('\n')
-                        self._linelen = 0
-
-        outfile.write('\n.fi')
diff --git a/src/pip/_vendor/pygments/formatters/html.py b/src/pip/_vendor/pygments/formatters/html.py
deleted file mode 100644
index e855823a052..00000000000
--- a/src/pip/_vendor/pygments/formatters/html.py
+++ /dev/null
@@ -1,995 +0,0 @@
-"""
-    pygments.formatters.html
-    ~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Formatter for HTML output.
-
-    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-import functools
-import os
-import sys
-import os.path
-from io import StringIO
-
-from pip._vendor.pygments.formatter import Formatter
-from pip._vendor.pygments.token import Token, Text, STANDARD_TYPES
-from pip._vendor.pygments.util import get_bool_opt, get_int_opt, get_list_opt
-
-try:
-    import ctags
-except ImportError:
-    ctags = None
-
-__all__ = ['HtmlFormatter']
-
-
-_escape_html_table = {
-    ord('&'): '&',
-    ord('<'): '<',
-    ord('>'): '>',
-    ord('"'): '"',
-    ord("'"): ''',
-}
-
-
-def escape_html(text, table=_escape_html_table):
-    """Escape &, <, > as well as single and double quotes for HTML."""
-    return text.translate(table)
-
-
-def webify(color):
-    if color.startswith('calc') or color.startswith('var'):
-        return color
-    else:
-        # Check if the color can be shortened from 6 to 3 characters
-        color = color.upper()
-        if (len(color) == 6 and
-            (    color[0] == color[1]
-             and color[2] == color[3]
-             and color[4] == color[5])):
-            return f'#{color[0]}{color[2]}{color[4]}'
-        else:
-            return f'#{color}'
-
-
-def _get_ttype_class(ttype):
-    fname = STANDARD_TYPES.get(ttype)
-    if fname:
-        return fname
-    aname = ''
-    while fname is None:
-        aname = '-' + ttype[-1] + aname
-        ttype = ttype.parent
-        fname = STANDARD_TYPES.get(ttype)
-    return fname + aname
-
-
-CSSFILE_TEMPLATE = '''\
-/*
-generated by Pygments 
-Copyright 2006-2025 by the Pygments team.
-Licensed under the BSD license, see LICENSE for details.
-*/
-%(styledefs)s
-'''
-
-DOC_HEADER = '''\
-
-
-
-
-  %(title)s
-  
-  
-
-
-
%(title)s

-
-'''
-
-DOC_HEADER_EXTERNALCSS = '''\
-
-
-
-
-  %(title)s
-  
-  
-
-
-
%(title)s

-
-'''
-
-DOC_FOOTER = '''\
-
-
-'''
-
-
-class HtmlFormatter(Formatter):
-    r"""
-    Format tokens as HTML 4 ```` tags. By default, the content is enclosed
-    in a ``
`` tag, itself wrapped in a ``
`` tag (but see the `nowrap` option).
-    The ``
``'s CSS class can be set by the `cssclass` option.
-
-    If the `linenos` option is set to ``"table"``, the ``
`` is
-    additionally wrapped inside a ```` which has one row and two
-    cells: one containing the line numbers and one containing the code.
-    Example:
-
-    .. sourcecode:: html
-
-        

-        

-          
-          
-        

-            
1
-            2

-          		
-            
def foo(bar):
-              pass
-            

-          

-
-    (whitespace added to improve clarity).
-
-    A list of lines can be specified using the `hl_lines` option to make these
-    lines highlighted (as of Pygments 0.11).
-
-    With the `full` option, a complete HTML 4 document is output, including
-    the style definitions inside a ``